[openstreetmap-carto] 02/04: Merge tag 'upstream/2.45.0'
Bas Couwenberg
sebastic at debian.org
Mon Nov 28 23:38:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository openstreetmap-carto.
commit 8a218599115437a017f267454d974405ca6cc0e6
Merge: 8ad8028 66c9f50
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue Nov 29 00:24:07 2016 +0100
Merge tag 'upstream/2.45.0'
Upstream version 2.45.0
.gitignore | 1 +
CARTOGRAPHY.md | 58 ++---
CHANGELOG.md | 17 +-
CODE_OF_CONDUCT.md | 2 +-
CONTRIBUTING.md | 16 ++
INSTALL.md | 6 +-
README.md | 3 +
amenity-points.mss | 270 ++++++++++-----------
buildings.mss | 3 +-
landcover.mss | 62 ++---
preview.png | Bin 85803 -> 310638 bytes
project.mml | 14 +-
project.yaml | 62 +----
roads.mss | 1 +
scripts/shop_values.rb | 56 -----
symbols/{aerodrome.svg => aerodrome.12.svg} | 3 +-
...logical_site.16.svg => archaeological_site.svg} | 6 +-
symbols/{artwork-14.svg => artwork.svg} | 6 +-
symbols/atm.16.svg | 12 -
symbols/atm.svg | 20 ++
symbols/bank.16.svg | 12 -
symbols/bank.svg | 20 ++
symbols/bar.16.svg | 12 -
symbols/bar.svg | 20 ++
symbols/{bench.16.svg => bench.svg} | 15 +-
symbols/beverages-14.svg | 70 ------
symbols/bicycle_parking.16.svg | 40 ---
symbols/bicycle_parking.svg | 39 +++
symbols/biergarten.16.svg | 12 -
symbols/biergarten.svg | 20 ++
symbols/buddhist.16.svg | 12 -
symbols/buddhist.svg | 20 ++
symbols/bus_stop.12.svg | 2 +-
symbols/cafe.16.svg | 12 -
symbols/cafe.svg | 20 ++
symbols/camping.16.svg | 12 -
symbols/camping.svg | 20 ++
symbols/{car_wash-14.svg => car_wash.svg} | 9 +-
symbols/{caravan_park.16.svg => caravan_park.svg} | 6 +-
symbols/{cave.14.svg => cave.svg} | 7 +
...harging_station.16.svg => charging_station.svg} | 24 +-
symbols/christian.16.svg | 12 -
symbols/christian.9.svg | 11 +-
symbols/christian.svg | 20 ++
symbols/cinema.16.svg | 12 -
symbols/cinema.svg | 37 +++
symbols/communications.16.svg | 12 -
symbols/communications.svg | 20 ++
...ommunity_centre-14.svg => community_centre.svg} | 4 +-
symbols/computer-14.svg | 30 ---
symbols/courthouse-16.svg | 40 ---
symbols/{post_office-14.svg => courthouse.svg} | 9 +-
symbols/dentist.16.svg | 12 -
symbols/dentist.svg | 20 ++
symbols/department_store.p.16.svg | 36 ---
symbols/doctors.16.svg | 12 -
symbols/doctors.svg | 20 ++
symbols/drinking_water.16.svg | 12 -
symbols/drinking_water.svg | 20 ++
symbols/{elevator-12.svg => elevator.12.svg} | 2 +-
symbols/embassy.16.svg | 12 -
symbols/embassy.svg | 21 ++
...{emergency_phone.16.svg => emergency_phone.svg} | 6 +-
symbols/entrance.10.svg | 4 +-
symbols/fast_food.16.svg | 12 -
symbols/fast_food.svg | 20 ++
symbols/firestation.16.svg | 12 -
symbols/firestation.svg | 20 ++
symbols/{ford.16.svg => ford.svg} | 6 +-
symbols/{fountain-14.svg => fountain.svg} | 4 +-
symbols/fuel.16.svg | 12 -
symbols/fuel.svg | 20 ++
symbols/generating_patterns/scrub.md | 10 +
symbols/generating_patterns/scrub.svg | 9 +
symbols/{helipad.svg => helipad.16.svg} | 9 +-
symbols/hinduist.16.svg | 12 -
symbols/hinduist.svg | 20 ++
symbols/hospital.16.svg | 12 -
symbols/hospital.svg | 20 ++
symbols/hostel.16.svg | 40 ---
symbols/{copyshop-14.svg => hostel.svg} | 9 +-
symbols/hotel.16.svg | 40 ---
symbols/{post_office-14.svg => hotel.svg} | 9 +-
symbols/hunting-stand.16.svg | 40 ---
symbols/{post_office-14.svg => hunting_stand.svg} | 9 +-
symbols/information.12.svg | 6 +-
symbols/jewish.16.svg | 12 -
symbols/jewish.svg | 20 ++
symbols/laundry-14.svg | 45 ----
symbols/library.14.svg | 38 ---
symbols/{post_office-14.svg => library.svg} | 21 +-
symbols/lighthouse.16.svg | 40 ---
symbols/lighthouse.svg | 37 +++
symbols/memorial.svg | 20 ++
symbols/{monument.16.svg => monument.svg} | 11 +-
symbols/motel.16.svg | 40 ---
symbols/motel.svg | 39 +++
symbols/{motorcycle-14.svg => motorcycle.svg} | 2 +-
symbols/motorcycle_parking.16.svg | 38 ---
symbols/motorcycle_parking.svg | 38 +++
symbols/museum.16.svg | 12 -
symbols/museum.svg | 20 ++
symbols/muslim.16.svg | 12 -
symbols/muslim.svg | 20 ++
symbols/newsagent-14.svg | 46 ----
symbols/{nightclub.14.svg => nightclub.svg} | 4 +-
symbols/parking.svg | 40 ++-
symbols/peak.svg | 7 +
symbols/pharmacy.16.svg | 12 -
symbols/pharmacy.svg | 20 ++
symbols/picnic.16.svg | 12 -
symbols/picnic.svg | 21 ++
symbols/place_of_worship.16.svg | 12 -
symbols/place_of_worship.svg | 20 ++
symbols/playground.16.svg | 19 --
symbols/playground.svg | 25 ++
symbols/police.16.svg | 12 -
symbols/police.svg | 20 ++
symbols/{post_box-12.svg => post_box.12.svg} | 4 +-
symbols/{post_office-14.svg => post_office.svg} | 4 +-
symbols/power_wind-16.svg | 40 ---
symbols/power_wind.svg | 40 +++
symbols/prison.16.svg | 12 -
symbols/prison.svg | 20 ++
symbols/pub.16.svg | 12 -
symbols/pub.svg | 21 ++
symbols/recycling.16.svg | 12 -
symbols/recycling.svg | 20 ++
symbols/rental_bicycle.16.svg | 12 -
symbols/rental_bicycle.svg | 20 ++
symbols/rental_car.16.svg | 12 -
symbols/rental_car.svg | 20 ++
symbols/restaurant.16.svg | 12 -
symbols/restaurant.svg | 20 ++
symbols/saddle.svg | 7 +
symbols/scrub.png | Bin 210 -> 13127 bytes
symbols/{shelter-14.svg => shelter.svg} | 11 +-
symbols/shintoist.16.svg | 12 -
symbols/shintoist.svg | 20 ++
symbols/{shop_alcohol.16.svg => shop/alcohol.svg} | 6 +-
symbols/{art-14.svg => shop/art.svg} | 1 +
symbols/{bag-14.svg => shop/bag.svg} | 4 +-
symbols/shop/bakery.svg | 20 ++
symbols/{beauty-14.svg => shop/beauty.svg} | 4 +-
symbols/{post_office-14.svg => shop/beverages.svg} | 24 +-
symbols/shop/bicycle.svg | 39 +++
symbols/{shop_butcher.png => shop/butcher.png} | Bin
symbols/shop/car.svg | 57 +++++
symbols/{car_parts-14.svg => shop/car_parts.svg} | 4 +-
symbols/shop/car_repair.svg | 39 +++
symbols/{chemist-14.svg => shop/chemist.svg} | 4 +-
symbols/{shop_clothes.16.svg => shop/clothes.svg} | 6 +-
symbols/{tobacco-14.svg => shop/computer.svg} | 15 +-
.../confectionery.svg} | 11 +-
symbols/shop/convenience.svg | 85 +++++++
symbols/{copyshop-14.svg => shop/copyshop.svg} | 4 +-
symbols/{deli-14.svg => shop/deli.svg} | 7 +
symbols/shop/department_store.svg | 38 +++
symbols/{copyshop-14.svg => shop/diy.svg} | 9 +-
.../electronics.svg} | 6 +-
symbols/{florist.16.svg => shop/florist.svg} | 15 +-
.../{shop_furniture.16.svg => shop/furniture.svg} | 6 +-
.../garden_centre.svg} | 4 +-
symbols/{shop_gift.16.svg => shop/gift.svg} | 6 +-
.../{greengrocer-14.svg => shop/greengrocer.svg} | 4 +-
symbols/{copyshop-14.svg => shop/hairdresser.svg} | 9 +-
symbols/{hifi-14.svg => shop/hifi.svg} | 4 +-
symbols/{ice-cream-14.svg => shop/ice_cream.svg} | 4 +-
symbols/{shop_jewelry.16.svg => shop/jewelry.svg} | 6 +-
symbols/{outdoor-14.svg => shop/laundry.svg} | 10 +-
.../mobile_phone.svg} | 6 +-
.../musical_instrument.svg} | 12 +-
symbols/{outdoor-14.svg => shop/newsagent.svg} | 14 +-
.../{shop_optician.16.svg => shop/optician.svg} | 6 +-
symbols/{outdoor-14.svg => shop/outdoor.svg} | 4 +-
symbols/{perfumery-14.svg => shop/perfumery.svg} | 11 +-
symbols/shop/pet.svg | 39 +++
symbols/{photo-14.svg => shop/photo.svg} | 11 +-
symbols/{seafood-14.svg => shop/seafood.svg} | 9 +-
symbols/{post_office-14.svg => shop/shoes.svg} | 9 +-
symbols/shop/sports.svg | 31 +++
symbols/{stationery-14.svg => shop/stationery.svg} | 11 +-
symbols/shop/supermarket.svg | 102 ++++++++
symbols/shop/tea.svg | 65 +++++
symbols/shop/tobacco.svg | 34 +++
symbols/{toys-14.svg => shop/toys.svg} | 27 +--
.../travel_agency.svg} | 11 +-
.../{post_office-14.svg => shop/variety_store.svg} | 15 +-
symbols/shop_bakery.16.svg | 12 -
symbols/shop_bicycle.16.svg | 40 ---
symbols/shop_car.svg | 12 -
symbols/shop_convenience.svg | 16 --
symbols/shop_diy.16.svg | 40 ---
symbols/shop_hairdresser.16.svg | 40 ---
symbols/shop_pet.16.svg | 40 ---
symbols/shop_shoes.16.svg | 40 ---
symbols/shop_supermarket.svg | 20 --
symbols/shopping_car_repair.16.svg | 40 ---
symbols/sikhist.16.svg | 12 -
symbols/sikhist.svg | 20 ++
...{social_facility-14.svg => social_facility.svg} | 4 +-
symbols/sports-14.svg | 61 -----
symbols/taoist.16.svg | 12 -
symbols/taoist.svg | 20 ++
symbols/{taxi.16.svg => taxi.svg} | 6 +-
symbols/tea-14.svg | 67 -----
symbols/{telephone.16.svg => telephone.svg} | 6 +-
symbols/theatre.16.svg | 40 ---
symbols/theatre.svg | 39 +++
symbols/toilets.16.svg | 12 -
symbols/toilets.svg | 20 ++
symbols/tourist_memorial.16.svg | 12 -
symbols/town_hall.16.svg | 12 -
symbols/town_hall.svg | 20 ++
.../{traffic_light.svg => traffic_light.16.svg} | 7 +
symbols/variety_store-14.svg | 35 ---
symbols/{veterinary-14.svg => veterinary.svg} | 4 +-
symbols/{viewpoint.16.svg => viewpoint.svg} | 6 +-
symbols/waste_basket.10.svg | 4 +-
symbols/{water_park.16.svg => water_park.svg} | 6 +-
symbols/{water_tower.16.svg => water_tower.svg} | 14 +-
symbols/{windmill.16.svg => windmill.svg} | 6 +-
222 files changed, 2255 insertions(+), 2181 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/openstreetmap-carto.git
More information about the Pkg-grass-devel
mailing list