From 97b827e99730d3e32c78e5010ed2831bbdc63d26 Mon Sep 17 00:00:00 2001 From: "taylor.smock" Date: Mon, 30 Oct 2023 19:42:22 +0000 Subject: [PATCH] Fix #18866: Remove Potlatch2 from the built-in styles. It has been replaced with wiki:Styles/Potlatch2. Users who have the built-in Potlatch2 style enabled when they upgrade to this revision or later will automatically have wiki:Styles/Potlatch2 added to their style list and enabled. git-svn-id: https://josm.openstreetmap.de/svn/trunk@18886 0c6e7542-c601-0410-84e7-c038aed88b3b --- README | 1 - nodist/styles/potlatch2/README | 19 - nodist/styles/potlatch2/build.xml | 12 - .../styles/potlatch2/patched/core_landuse.css | 48 --- nodist/styles/potlatch2/patched/core_pois.css | 153 ------- .../potlatch2/patched/core_relations.css | 8 - nodist/styles/potlatch2/patched/core_ways.css | 126 ------ nodist/styles/potlatch2/patched/potlatch.css | 16 - nodist/styles/potlatch2/prelude.css | 48 --- nodist/styles/potlatch2/source/bikeshops.css | 3 - nodist/styles/potlatch2/source/bugs.css | 9 - .../potlatch2/source/core_interactive.css | 28 -- .../styles/potlatch2/source/core_landuse.css | 43 -- nodist/styles/potlatch2/source/core_pois.css | 142 ------- .../potlatch2/source/core_relations.css | 8 - nodist/styles/potlatch2/source/core_ways.css | 123 ------ nodist/styles/potlatch2/source/enhanced.css | 35 -- nodist/styles/potlatch2/source/gpx.css | 12 - nodist/styles/potlatch2/source/network.css | 35 -- .../styles/potlatch2/source/opencyclemap.css | 150 ------- nodist/styles/potlatch2/source/potlatch.css | 28 -- nodist/styles/potlatch2/source/snapshot.css | 26 -- nodist/styles/potlatch2/source/wireframe.css | 17 - resources/images/icons/ISO_7010_E010.16.png | Bin 612 -> 0 bytes .../icons/accommodation_alpinehut.n.16.png | Bin 568 -> 0 bytes .../accommodation_bed_and_breakfast.n.16.png | Bin 463 -> 0 bytes .../icons/accommodation_camping.n.16.png | Bin 403 -> 0 bytes .../icons/accommodation_caravan_park.n.16.png | Bin 357 -> 0 bytes .../icons/accommodation_chalet.n.16.png | Bin 560 -> 0 bytes .../images/icons/accommodation_hotel.n.16.png | Bin 476 -> 0 bytes .../images/icons/accommodation_motel.n.16.png | Bin 562 -> 0 bytes .../icons/accommodation_shelter2.n.16.png | Bin 736 -> 0 bytes .../icons/accommodation_youth_hostel.n.16.png | Bin 476 -> 0 bytes resources/images/icons/amenity_bench.n.16.png | Bin 379 -> 0 bytes .../icons/amenity_firestation2.n.16.png | Bin 794 -> 0 bytes .../images/icons/amenity_fountain2.n.16.png | Bin 719 -> 0 bytes .../images/icons/amenity_library.n.16.png | Bin 693 -> 0 bytes .../images/icons/amenity_playground.n.16.png | Bin 635 -> 0 bytes .../images/icons/amenity_police2.n.16.png | Bin 739 -> 0 bytes .../images/icons/amenity_post_box.n.16.png | Bin 329 -> 0 bytes .../images/icons/amenity_post_office.n.16.png | Bin 819 -> 0 bytes .../images/icons/amenity_recycling.n.16.png | Bin 554 -> 0 bytes .../images/icons/amenity_toilets.n.16.png | Bin 734 -> 0 bytes .../images/icons/amenity_town_hall.n.16.png | Bin 486 -> 0 bytes .../images/icons/amenity_waste_bin.n.16.png | Bin 618 -> 0 bytes resources/images/icons/barrier_blocks.16.png | Bin 172 -> 0 bytes .../images/icons/barrier_bollard.n.16.png | Bin 182 -> 0 bytes .../images/icons/barrier_cattle_grid.16.png | Bin 114 -> 0 bytes .../images/icons/barrier_cycle_barrier.16.png | Bin 181 -> 0 bytes resources/images/icons/barrier_gate.n.16.png | Bin 221 -> 0 bytes .../images/icons/barrier_kissing_gate.16.png | Bin 233 -> 0 bytes .../images/icons/barrier_lift_gate.n.16.png | Bin 232 -> 0 bytes resources/images/icons/barrier_stile.n.16.png | Bin 245 -> 0 bytes .../images/icons/barrier_toll_booth.n.16.png | Bin 308 -> 0 bytes resources/images/icons/cattle_grid.png | Bin 80 -> 0 bytes .../images/icons/education_nursery3.n.16.png | Bin 746 -> 0 bytes .../images/icons/education_school.n.16.png | Bin 479 -> 0 bytes .../images/icons/emergency-telephone-16.png | Bin 546 -> 0 bytes .../images/icons/emergency_hydrant.n.16.png | Bin 366 -> 0 bytes resources/images/icons/food_bar.n.16.png | Bin 361 -> 0 bytes resources/images/icons/food_cafe.n.16.png | Bin 375 -> 0 bytes .../images/icons/food_drinkingtap.n.16.png | Bin 573 -> 0 bytes resources/images/icons/food_fastfood.n.16.png | Bin 361 -> 0 bytes .../images/icons/food_nightclub.n.16.png | Bin 685 -> 0 bytes resources/images/icons/food_pub.n.16.png | Bin 460 -> 0 bytes .../images/icons/food_restaurant.n.16.png | Bin 491 -> 0 bytes .../images/icons/health_hospital.n.16.png | Bin 533 -> 0 bytes .../images/icons/health_pharmacy.n.16.png | Bin 264 -> 0 bytes .../icons/health_veterinary.n.8E7409.16.png | Bin 673 -> 0 bytes resources/images/icons/manmade_lighthouse.png | Bin 568 -> 0 bytes resources/images/icons/manmade_tower.png | Bin 591 -> 0 bytes resources/images/icons/money_atm.n.16.png | Bin 348 -> 0 bytes resources/images/icons/money_bank2.n.16.png | Bin 335 -> 0 bytes resources/images/icons/natural_peak.n.16.png | Bin 492 -> 0 bytes resources/images/icons/natural_tree.n.16.png | Bin 343 -> 0 bytes resources/images/icons/place.png | Bin 147 -> 0 bytes .../icons/place_of_worship_unknown.n.16.png | Bin 613 -> 0 bytes resources/images/icons/power_station.png | Bin 523 -> 0 bytes .../images/icons/power_substation.n.16.png | Bin 478 -> 0 bytes .../images/icons/power_tower_high2.n.16.png | Bin 704 -> 0 bytes .../images/icons/power_tower_low.n.16.png | Bin 483 -> 0 bytes .../images/icons/shopping_alcohol.n.16.png | Bin 348 -> 0 bytes .../images/icons/shopping_bakery.n.16.png | Bin 550 -> 0 bytes .../images/icons/shopping_bicycle.n.16.png | Bin 457 -> 0 bytes resources/images/icons/shopping_book.n.16.png | Bin 481 -> 0 bytes .../images/icons/shopping_butcher.n.16.png | Bin 421 -> 0 bytes resources/images/icons/shopping_car.n.16.png | Bin 403 -> 0 bytes .../images/icons/shopping_car_repair.n.16.png | Bin 393 -> 0 bytes .../images/icons/shopping_clothes.n.16.png | Bin 348 -> 0 bytes .../icons/shopping_confectionery.n.16.png | Bin 337 -> 0 bytes .../icons/shopping_convenience.n.16.png | Bin 409 -> 0 bytes .../icons/shopping_department_store.n.16.png | Bin 646 -> 0 bytes resources/images/icons/shopping_diy.n.16.png | Bin 449 -> 0 bytes resources/images/icons/shopping_fish.n.16.png | Bin 360 -> 0 bytes .../images/icons/shopping_florist.n.16.png | Bin 514 -> 0 bytes .../icons/shopping_garden_centre.n.16.png | Bin 435 -> 0 bytes resources/images/icons/shopping_gift.n.16.png | Bin 469 -> 0 bytes .../icons/shopping_greengrocer.n.16.png | Bin 413 -> 0 bytes .../icons/shopping_hairdresser.n.16.png | Bin 590 -> 0 bytes resources/images/icons/shopping_hifi.n.16.png | Bin 383 -> 0 bytes .../images/icons/shopping_jewelry.n.16.png | Bin 459 -> 0 bytes .../images/icons/shopping_kiosk.n.16.png | Bin 511 -> 0 bytes .../images/icons/shopping_laundrette.n.16.png | Bin 370 -> 0 bytes .../icons/shopping_marketplace.n.16.png | Bin 664 -> 0 bytes .../images/icons/shopping_motorcycle.n.16.png | Bin 581 -> 0 bytes .../images/icons/shopping_music.n.16.png | Bin 439 -> 0 bytes .../icons/shopping_supermarket.n.16.png | Bin 495 -> 0 bytes resources/images/icons/shopping_toys.n.16.png | Bin 587 -> 0 bytes .../icons/shopping_vending_machine.n.16.png | Bin 739 -> 0 bytes .../icons/sport_leisure_centre.n.16.png | Bin 736 -> 0 bytes .../images/icons/sport_shooting.n.16.png | Bin 509 -> 0 bytes .../icons/sport_swimming_outdoor.n.16.png | Bin 541 -> 0 bytes resources/images/icons/telephone.png | Bin 469 -> 0 bytes .../icons/tourist_archaeological.n.16.png | Bin 433 -> 0 bytes .../icons/tourist_art_gallery2.n.16.png | Bin 745 -> 0 bytes .../images/icons/tourist_battlefield.n.16.png | Bin 544 -> 0 bytes .../images/icons/tourist_castle.n.16.png | Bin 463 -> 0 bytes .../images/icons/tourist_cinema.n.16.png | Bin 481 -> 0 bytes .../images/icons/tourist_information.png | Bin 117 -> 0 bytes .../images/icons/tourist_memorial.n.16.png | Bin 494 -> 0 bytes .../images/icons/tourist_monument.n.16.png | Bin 389 -> 0 bytes .../images/icons/tourist_museum.n.16.png | Bin 348 -> 0 bytes .../images/icons/tourist_picnic.n.16.png | Bin 379 -> 0 bytes resources/images/icons/tourist_ruin.n.16.png | Bin 305 -> 0 bytes .../images/icons/tourist_theatre.n.16.png | Bin 585 -> 0 bytes .../images/icons/tourist_theme_park.n.16.png | Bin 626 -> 0 bytes .../images/icons/tourist_view_point.n.16.png | Bin 617 -> 0 bytes resources/images/icons/tourist_zoo.n.16.png | Bin 472 -> 0 bytes .../images/icons/transport_aerodrome.n.16.png | Bin 478 -> 0 bytes .../icons/transport_airport_gate.n.16.png | Bin 492 -> 0 bytes .../icons/transport_airport_terminal.n.16.png | Bin 716 -> 0 bytes .../icons/transport_bus_station.n.16.png | Bin 608 -> 0 bytes .../images/icons/transport_bus_stop2.n.16.png | Bin 424 -> 0 bytes .../images/icons/transport_car_wash.n.16.png | Bin 594 -> 0 bytes .../images/icons/transport_fuel.n.16.png | Bin 302 -> 0 bytes .../icons/transport_helicopter_pad.n.16.png | Bin 674 -> 0 bytes .../images/icons/transport_marina.n.16.png | Bin 422 -> 0 bytes ...port_miniroundabout_anticlockwise.n.16.png | Bin 589 -> 0 bytes .../icons/transport_parking_bicycle.n.16.png | Bin 533 -> 0 bytes .../icons/transport_parking_car.n.16.png | Bin 415 -> 0 bytes .../images/icons/transport_port.n.16.png | Bin 465 -> 0 bytes .../icons/transport_rental_bicycle.n.16.png | Bin 624 -> 0 bytes .../icons/transport_rental_car.n.16.png | Bin 469 -> 0 bytes .../images/icons/transport_taxi_rank.n.16.png | Bin 531 -> 0 bytes .../icons/transport_train_station.n.16.png | Bin 463 -> 0 bytes .../images/icons/transport_tram_stop.n.16.png | Bin 506 -> 0 bytes .../images/icons/transport_weir.n.16.png | Bin 538 -> 0 bytes .../icons/transport_zebracrossing.n.16.png | Bin 705 -> 0 bytes resources/styles/standard/potlatch2.mapcss | 400 ------------------ .../openstreetmap/josm/data/Preferences.java | 37 ++ .../sources/MapPaintPrefHelper.java | 14 +- .../data/validation/ValidatorCLITest.java | 2 +- 152 files changed, 40 insertions(+), 1503 deletions(-) delete mode 100644 nodist/styles/potlatch2/README delete mode 100644 nodist/styles/potlatch2/build.xml delete mode 100644 nodist/styles/potlatch2/patched/core_landuse.css delete mode 100644 nodist/styles/potlatch2/patched/core_pois.css delete mode 100644 nodist/styles/potlatch2/patched/core_relations.css delete mode 100644 nodist/styles/potlatch2/patched/core_ways.css delete mode 100644 nodist/styles/potlatch2/patched/potlatch.css delete mode 100644 nodist/styles/potlatch2/prelude.css delete mode 100644 nodist/styles/potlatch2/source/bikeshops.css delete mode 100644 nodist/styles/potlatch2/source/bugs.css delete mode 100644 nodist/styles/potlatch2/source/core_interactive.css delete mode 100644 nodist/styles/potlatch2/source/core_landuse.css delete mode 100644 nodist/styles/potlatch2/source/core_pois.css delete mode 100644 nodist/styles/potlatch2/source/core_relations.css delete mode 100644 nodist/styles/potlatch2/source/core_ways.css delete mode 100644 nodist/styles/potlatch2/source/enhanced.css delete mode 100644 nodist/styles/potlatch2/source/gpx.css delete mode 100644 nodist/styles/potlatch2/source/network.css delete mode 100644 nodist/styles/potlatch2/source/opencyclemap.css delete mode 100644 nodist/styles/potlatch2/source/potlatch.css delete mode 100644 nodist/styles/potlatch2/source/snapshot.css delete mode 100644 nodist/styles/potlatch2/source/wireframe.css delete mode 100644 resources/images/icons/ISO_7010_E010.16.png delete mode 100644 resources/images/icons/accommodation_alpinehut.n.16.png delete mode 100644 resources/images/icons/accommodation_bed_and_breakfast.n.16.png delete mode 100644 resources/images/icons/accommodation_camping.n.16.png delete mode 100644 resources/images/icons/accommodation_caravan_park.n.16.png delete mode 100644 resources/images/icons/accommodation_chalet.n.16.png delete mode 100644 resources/images/icons/accommodation_hotel.n.16.png delete mode 100644 resources/images/icons/accommodation_motel.n.16.png delete mode 100644 resources/images/icons/accommodation_shelter2.n.16.png delete mode 100644 resources/images/icons/accommodation_youth_hostel.n.16.png delete mode 100644 resources/images/icons/amenity_bench.n.16.png delete mode 100644 resources/images/icons/amenity_firestation2.n.16.png delete mode 100644 resources/images/icons/amenity_fountain2.n.16.png delete mode 100644 resources/images/icons/amenity_library.n.16.png delete mode 100644 resources/images/icons/amenity_playground.n.16.png delete mode 100644 resources/images/icons/amenity_police2.n.16.png delete mode 100644 resources/images/icons/amenity_post_box.n.16.png delete mode 100644 resources/images/icons/amenity_post_office.n.16.png delete mode 100644 resources/images/icons/amenity_recycling.n.16.png delete mode 100644 resources/images/icons/amenity_toilets.n.16.png delete mode 100644 resources/images/icons/amenity_town_hall.n.16.png delete mode 100644 resources/images/icons/amenity_waste_bin.n.16.png delete mode 100644 resources/images/icons/barrier_blocks.16.png delete mode 100644 resources/images/icons/barrier_bollard.n.16.png delete mode 100644 resources/images/icons/barrier_cattle_grid.16.png delete mode 100644 resources/images/icons/barrier_cycle_barrier.16.png delete mode 100644 resources/images/icons/barrier_gate.n.16.png delete mode 100644 resources/images/icons/barrier_kissing_gate.16.png delete mode 100644 resources/images/icons/barrier_lift_gate.n.16.png delete mode 100644 resources/images/icons/barrier_stile.n.16.png delete mode 100644 resources/images/icons/barrier_toll_booth.n.16.png delete mode 100644 resources/images/icons/cattle_grid.png delete mode 100644 resources/images/icons/education_nursery3.n.16.png delete mode 100644 resources/images/icons/education_school.n.16.png delete mode 100644 resources/images/icons/emergency-telephone-16.png delete mode 100644 resources/images/icons/emergency_hydrant.n.16.png delete mode 100644 resources/images/icons/food_bar.n.16.png delete mode 100644 resources/images/icons/food_cafe.n.16.png delete mode 100644 resources/images/icons/food_drinkingtap.n.16.png delete mode 100644 resources/images/icons/food_fastfood.n.16.png delete mode 100644 resources/images/icons/food_nightclub.n.16.png delete mode 100644 resources/images/icons/food_pub.n.16.png delete mode 100644 resources/images/icons/food_restaurant.n.16.png delete mode 100644 resources/images/icons/health_hospital.n.16.png delete mode 100644 resources/images/icons/health_pharmacy.n.16.png delete mode 100644 resources/images/icons/health_veterinary.n.8E7409.16.png delete mode 100644 resources/images/icons/manmade_lighthouse.png delete mode 100644 resources/images/icons/manmade_tower.png delete mode 100644 resources/images/icons/money_atm.n.16.png delete mode 100644 resources/images/icons/money_bank2.n.16.png delete mode 100644 resources/images/icons/natural_peak.n.16.png delete mode 100644 resources/images/icons/natural_tree.n.16.png delete mode 100644 resources/images/icons/place.png delete mode 100644 resources/images/icons/place_of_worship_unknown.n.16.png delete mode 100644 resources/images/icons/power_station.png delete mode 100644 resources/images/icons/power_substation.n.16.png delete mode 100644 resources/images/icons/power_tower_high2.n.16.png delete mode 100644 resources/images/icons/power_tower_low.n.16.png delete mode 100644 resources/images/icons/shopping_alcohol.n.16.png delete mode 100644 resources/images/icons/shopping_bakery.n.16.png delete mode 100644 resources/images/icons/shopping_bicycle.n.16.png delete mode 100644 resources/images/icons/shopping_book.n.16.png delete mode 100644 resources/images/icons/shopping_butcher.n.16.png delete mode 100644 resources/images/icons/shopping_car.n.16.png delete mode 100644 resources/images/icons/shopping_car_repair.n.16.png delete mode 100644 resources/images/icons/shopping_clothes.n.16.png delete mode 100644 resources/images/icons/shopping_confectionery.n.16.png delete mode 100644 resources/images/icons/shopping_convenience.n.16.png delete mode 100644 resources/images/icons/shopping_department_store.n.16.png delete mode 100644 resources/images/icons/shopping_diy.n.16.png delete mode 100644 resources/images/icons/shopping_fish.n.16.png delete mode 100644 resources/images/icons/shopping_florist.n.16.png delete mode 100644 resources/images/icons/shopping_garden_centre.n.16.png delete mode 100644 resources/images/icons/shopping_gift.n.16.png delete mode 100644 resources/images/icons/shopping_greengrocer.n.16.png delete mode 100644 resources/images/icons/shopping_hairdresser.n.16.png delete mode 100644 resources/images/icons/shopping_hifi.n.16.png delete mode 100644 resources/images/icons/shopping_jewelry.n.16.png delete mode 100644 resources/images/icons/shopping_kiosk.n.16.png delete mode 100644 resources/images/icons/shopping_laundrette.n.16.png delete mode 100644 resources/images/icons/shopping_marketplace.n.16.png delete mode 100644 resources/images/icons/shopping_motorcycle.n.16.png delete mode 100644 resources/images/icons/shopping_music.n.16.png delete mode 100644 resources/images/icons/shopping_supermarket.n.16.png delete mode 100644 resources/images/icons/shopping_toys.n.16.png delete mode 100644 resources/images/icons/shopping_vending_machine.n.16.png delete mode 100644 resources/images/icons/sport_leisure_centre.n.16.png delete mode 100644 resources/images/icons/sport_shooting.n.16.png delete mode 100644 resources/images/icons/sport_swimming_outdoor.n.16.png delete mode 100644 resources/images/icons/telephone.png delete mode 100644 resources/images/icons/tourist_archaeological.n.16.png delete mode 100644 resources/images/icons/tourist_art_gallery2.n.16.png delete mode 100644 resources/images/icons/tourist_battlefield.n.16.png delete mode 100644 resources/images/icons/tourist_castle.n.16.png delete mode 100644 resources/images/icons/tourist_cinema.n.16.png delete mode 100644 resources/images/icons/tourist_information.png delete mode 100644 resources/images/icons/tourist_memorial.n.16.png delete mode 100644 resources/images/icons/tourist_monument.n.16.png delete mode 100644 resources/images/icons/tourist_museum.n.16.png delete mode 100644 resources/images/icons/tourist_picnic.n.16.png delete mode 100644 resources/images/icons/tourist_ruin.n.16.png delete mode 100644 resources/images/icons/tourist_theatre.n.16.png delete mode 100644 resources/images/icons/tourist_theme_park.n.16.png delete mode 100644 resources/images/icons/tourist_view_point.n.16.png delete mode 100644 resources/images/icons/tourist_zoo.n.16.png delete mode 100644 resources/images/icons/transport_aerodrome.n.16.png delete mode 100644 resources/images/icons/transport_airport_gate.n.16.png delete mode 100644 resources/images/icons/transport_airport_terminal.n.16.png delete mode 100644 resources/images/icons/transport_bus_station.n.16.png delete mode 100644 resources/images/icons/transport_bus_stop2.n.16.png delete mode 100644 resources/images/icons/transport_car_wash.n.16.png delete mode 100644 resources/images/icons/transport_fuel.n.16.png delete mode 100644 resources/images/icons/transport_helicopter_pad.n.16.png delete mode 100644 resources/images/icons/transport_marina.n.16.png delete mode 100644 resources/images/icons/transport_miniroundabout_anticlockwise.n.16.png delete mode 100644 resources/images/icons/transport_parking_bicycle.n.16.png delete mode 100644 resources/images/icons/transport_parking_car.n.16.png delete mode 100644 resources/images/icons/transport_port.n.16.png delete mode 100644 resources/images/icons/transport_rental_bicycle.n.16.png delete mode 100644 resources/images/icons/transport_rental_car.n.16.png delete mode 100644 resources/images/icons/transport_taxi_rank.n.16.png delete mode 100644 resources/images/icons/transport_train_station.n.16.png delete mode 100644 resources/images/icons/transport_tram_stop.n.16.png delete mode 100644 resources/images/icons/transport_weir.n.16.png delete mode 100644 resources/images/icons/transport_zebracrossing.n.16.png delete mode 100644 resources/styles/standard/potlatch2.mapcss diff --git a/README b/README index 92eb484519e..6fbc68f13c6 100644 --- a/README +++ b/README @@ -102,7 +102,6 @@ This is an overview of the files and directories in the JOSM code repository: - images/ images, which are not for distribution, but may be useful later (e.g. high resolution and vector versions) - styles/ files needed for map style maintenance - - potlatch2/README infos on how to update the Potlatch 2 style from upstream sources - README this file - resources/ resource files that will be included in the JOSM jar file - data/ data files that will be included in the JOSM jar file diff --git a/nodist/styles/potlatch2/README b/nodist/styles/potlatch2/README deleted file mode 100644 index 327914c8400..00000000000 --- a/nodist/styles/potlatch2/README +++ /dev/null @@ -1,19 +0,0 @@ -The Potlatch 2 styles need to be patched in order to work with the JOSM MapCSS implementation. - -Potlatch 2's repository is git://git.openstreetmap.org/potlatch2.git - - * nodist/styles/potlatch2/source - contains the unmodified source files copied from git.openstreetmap.org/potlatch2.git/history/master:/resources/stylesheets - - * nodist/styles/potlatch2/patched - contains the manually edited version - - * resources/images/icons - copy of git.openstreetmap.org/potlatch2.git/tree/HEAD:/resources/icons - - * resources/styles/standard/potlatch2.mapcss - concatination of the patched files; the ant task 'assemble' helps with this (use build.xml in the current folder) - -When updating from upstream, keep all 4 locations in sync. - -At time of writing, the last update used 28c84372002671c8d71a81a2e423f4965388edd7 (2019-06-21) but better check the commit dates as well. diff --git a/nodist/styles/potlatch2/build.xml b/nodist/styles/potlatch2/build.xml deleted file mode 100644 index 47844d4ae7d..00000000000 --- a/nodist/styles/potlatch2/build.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - -
/* THIS FILE IS AUTO-GENERATED (SEE nodist/styles/potlatch2/README) */ -
- - - - - diff --git a/nodist/styles/potlatch2/patched/core_landuse.css b/nodist/styles/potlatch2/patched/core_landuse.css deleted file mode 100644 index 62905732ba1..00000000000 --- a/nodist/styles/potlatch2/patched/core_landuse.css +++ /dev/null @@ -1,48 +0,0 @@ -/**************** - * core_landuse.css - ****************/ - -/* Landuse */ - -area[natural]:closed { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } -area[natural=beach]:closed { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;} -way[natural=coastline] { z-index: 5; color: black; width: 3; } -area[landuse]:closed { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } -area[landuse=residential]:closed { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } -area[landuse=retail]:closed { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } -area[landuse=commercial]:closed { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } -area[landuse=military]:closed { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; } -area[amenity]:closed, area[shop]:closed { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } -/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */ -area[leisure]:closed { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } -area[tourism]:closed { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} -area[historic]:closed, area[ruins]:closed { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} -area[military]:closed { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} -area[building]:closed { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } -area[natural=water]:closed, -area[waterway][waterway!=dam]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} -way[waterway=dam]!:closed { z-index: 5; color: black; width: 3; } -area[waterway=dam]:closed { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;} -area[man_made]:closed { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } -area[man_made=reservoir_covered]:closed { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } -area[landuse=reservoir]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} -area[landuse=forest]:closed, area[natural=wood]:closed { color: green; width: 2; fill-color: green; fill-opacity: 0.2; prop_area_small_name : 1;} -area[leisure=park]:closed { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} -area[leisure=garden]:closed { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} -area[leisure=pitch]:closed { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;} -area[landuse=recreation_ground]:closed { color: green; fill-color: green; prop_area_small_name : 1;} -area[amenity=parking]:closed { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } -area[public_transport=pay_scale_area]:closed { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } -way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} -way[man_made=pier][floating=yes] { z-index: 5; dashes: 4,2; casing-color: #444;} -area[leisure=marina]:closed { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} -way[leisure=slipway] { z-index: 5; color: grey; width: 3; casing-color: #3434ff; casing-width: 2; } -area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} -way[boundary] { z-index: 5; color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} -/* Perhaps should be filled, on lower zooms. */ -way[boundary=national_park] { z-index: 5; color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} -way[boundary=protected_area] { z-index: 5; color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;} -way[boundary=administrative] { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} -way[boundary=administrative][waterway] { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } -area[landuse=cemetery]:closed { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} -/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ diff --git a/nodist/styles/potlatch2/patched/core_pois.css b/nodist/styles/potlatch2/patched/core_pois.css deleted file mode 100644 index 8e523c1dee3..00000000000 --- a/nodist/styles/potlatch2/patched/core_pois.css +++ /dev/null @@ -1,153 +0,0 @@ - -/**************** - * core_pois.css - ****************/ - -node { text-anchor-horizontal: center; text-anchor-vertical: below; } - -node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 10; font-weight: bold; z-index: 20; } -node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } -node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } -node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; } -node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } -node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } -node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; } -node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } -node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; } -node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } -node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } -node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; } -node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; } -node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; } -node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; } -node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; } -node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; } -node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; } -node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; } -node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; } -node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } -node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } -node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -area[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } -node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } -node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; } -node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; } -node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } -node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } -node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; } -node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } -node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; } -/* More Amenities */ -node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; } -node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; } -node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } -node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } -node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; } -node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; } -node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=place_of_worship] { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; } -node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; } -node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; } -node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; } -node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; } -node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; } -node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; } -node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; } -/* Shops */ -node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; } -node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; } -node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; } -node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } -node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; } -node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; } -node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; } -node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; } -node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; } -node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; } -node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; } -node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; } -node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; } -node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; } -node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; } -node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; } -node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; } -node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; } -node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; } -node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; } -node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; } -node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; } -node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; } -node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; } -node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } -node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } -node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; } -/* More Touristy Items */ -node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; } -node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } -node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } -node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } -node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; } -node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } -node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } -node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; } -node[tourism=theme_park] { icon-image: icons/tourist_theme_park.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; } -node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; } -/* Transport */ -node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; } -node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; } -node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; } -node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; } -node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; } -node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } -node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } -node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; } -node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset:0; text: capacity; font-size: 10; z-index: 20; } -node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } -node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } -node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; } -node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } -node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } -node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } -node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } -node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; } -node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; } -/* Misc */ -node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; } -node[leisure=sports_centre] { icon-image: icons/sport_leisure_centre.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -/* node[landuse=cemetery], node[landuse=grave_yard] { i|||con-image: icons/?.png; z-index: 20; } */ -node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; } -node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; } -/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */ -node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; } -node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -/* P2 previously had these icons instead of "icon-image: cross" which is not standard MapCSS but a P2 keyword we won't implement, so keep the old icons */ -node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; } -node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; } -node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; } -/* Natural */ -node[natural=peak] { icon-image: icons/natural_peak.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[natural=tree] { icon-image: icons/natural_tree.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } - -/* Addressing */ - -node[addr:housenumber], -node[addr:housename] { symbol-shape: circle; symbol-size: 8; symbol-fill-color: #B0E0E6; } -node[addr:housenumber]::hn_casing, -node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; } - -way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} diff --git a/nodist/styles/potlatch2/patched/core_relations.css b/nodist/styles/potlatch2/patched/core_relations.css deleted file mode 100644 index 7ebcd99d8c0..00000000000 --- a/nodist/styles/potlatch2/patched/core_relations.css +++ /dev/null @@ -1,8 +0,0 @@ -/* Route relations */ - -relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; } -relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; } -relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; } diff --git a/nodist/styles/potlatch2/patched/core_ways.css b/nodist/styles/potlatch2/patched/core_ways.css deleted file mode 100644 index c8ae1914956..00000000000 --- a/nodist/styles/potlatch2/patched/core_ways.css +++ /dev/null @@ -1,126 +0,0 @@ -/**************** - * core_ways.css - ****************/ - -/* Roads */ - -way[highway=motorway],way[highway=motorway_link], -way[highway=trunk],way[highway=trunk_link], -way[highway=primary],way[highway=primary_link], -way[highway=secondary],way[highway=secondary_link], -way[highway=tertiary],way[highway=tertiary_link], -way[highway=residential],way[highway=unclassified] { z-index: 5; text: auto; text-color: black; font-size: 12; text-position: line; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round } -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; } -way[highway=tertiary],way[highway=tertiary_link] { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; } -way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } -way[highway=service][service!=parking_aisle] { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 1; } -way[highway=service][service=parking_aisle] { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } -way[highway=service][service=alley] { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } -way[highway=road] { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 1; } -way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } - -/* Road areas */ - -way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} -area[highway=pedestrian]:closed { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */ - -/* Paths */ - -way[highway=steps] { z-index: 5; color: #FF6644; width: 6; dashes: 2, 2; } -way[highway=footway] { z-index: 5; color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;} -way[highway=footway][bicycle=yes]::bike { z-index: 4; color: blue; width: 1; } -way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;} -way[highway=track] { z-index: 5; color: #996644; width: 2; dashes: 4, 2; prop_path : 1;} -way[highway=path] { z-index: 5; color: brown; width: 2; dashes: 2, 2; prop_path : 1;} -way[highway=cycleway] { z-index: 5; color: blue; width: 2; dashes: 4, 2; prop_path : 1;} -way[is_prop_set("prop_path")] { z-index: 5; text: auto; text-color: black; text-position: line; text-offset: 7; font-size: 12; } - -/* Under construction */ - -way[highway=proposed] { z-index: 5; color: #88ffff; width: 6; dashes: 8, 4; } -way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;} - -/* Railways */ - -way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; dashes: 0; } -way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; } - -way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} -way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; } - -way[railway=platform] { z-index: 5; color:black; width: 2; } - -way[railway=subway] { z-index: 6; color: #444444; width: 5; } -way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } - -way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; } -way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;} - -way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } -way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; } - -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } -way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; } - -way[railway=light_rail] { z-index: 6; color: black; width: 4; } -way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; } - -way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; } -way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; } - -/* Waterways */ - -way[waterway=river], -way[waterway=canal], -way[waterway=stream] { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;} -way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;} -way[waterway][tunnel=yes] {z-index: 5; dashes: 8,4;} - -/* Aeroways */ - -way[aeroway=aerodrome]:closed - { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } -way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } -area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } - -way[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; } -way[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; } -way[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; } - -area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; } -area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} - -/* Barriers */ - -way[barrier] {z-index: 5; color: #000000; width: 1} -way[barrier=fence] {z-index: 5; color: #000000; width: 1; dashes: 8,4,2,4; } - -/* Power */ - -way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} -way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} -area[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;} -area[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;} - -/* Leisure */ - -way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 2; } -area[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; } - - -/* Physical decoration */ - -way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: +3; } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: +6; } -way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: +2; } -way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: +6; dashes: 4,4; } - -/* Attribute decoration */ - -/*way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; } -way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }*/ diff --git a/nodist/styles/potlatch2/patched/potlatch.css b/nodist/styles/potlatch2/patched/potlatch.css deleted file mode 100644 index 3bf1e5e59cd..00000000000 --- a/nodist/styles/potlatch2/patched/potlatch.css +++ /dev/null @@ -1,16 +0,0 @@ - -/*@import("stylesheets/core_ways.css");*/ -/*@import("stylesheets/core_pois.css");*/ -/*@import("stylesheets/core_landuse.css");*/ -/*@import("stylesheets/core_relations.css");*/ -way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: auto; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} -/*@import("stylesheets/core_interactive.css");*/ - -/* Rendering for licence status */ - -/*way[_status=no]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; } -way[_status=partial]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; } -way[_status=unsure]::status { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; } -node[_status=no]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: #AA0000; } -node[_status=partial]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; } -node[_status=unsure]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/ diff --git a/nodist/styles/potlatch2/prelude.css b/nodist/styles/potlatch2/prelude.css deleted file mode 100644 index ba6e8146d34..00000000000 --- a/nodist/styles/potlatch2/prelude.css +++ /dev/null @@ -1,48 +0,0 @@ -/* - - Potlatch 2 core stylesheet - - This stylesheet should contain commonly used features and only the most essential extra attributes - (e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in - order not to kill performance on slower systems and those with a less effective Flash Player (i.e. - Linux). - - It is expected that experienced mappers will switch between this and other stylesheets as required. - -*/ - -meta { - title: "Potlatch 2"; - icon: "dialogs/mappaint/pl2_small.svg"; -} - -canvas { - fill-color: #ffffea; -} - -node, area { - text-color: black; -} - -relation[restriction=no_left_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg"; -} -relation[restriction=no_right_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg"; -} -relation[restriction=no_straight_on] { - icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg"; -} -relation[restriction=no_u_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg"; -} -relation[restriction=only_left_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg"; -} -relation[restriction=only_right_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg"; -} -relation[restriction=only_straight_on] { - icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg"; -} - diff --git a/nodist/styles/potlatch2/source/bikeshops.css b/nodist/styles/potlatch2/source/bikeshops.css deleted file mode 100644 index cd74a7fff47..00000000000 --- a/nodist/styles/potlatch2/source/bikeshops.css +++ /dev/null @@ -1,3 +0,0 @@ -node { z-index: 9; - icon-image: features/bike-shop.png; - text-offset: 28; font-family: DejaVu; text: name; font-size: 9; text_color: red; width: 50;} \ No newline at end of file diff --git a/nodist/styles/potlatch2/source/bugs.css b/nodist/styles/potlatch2/source/bugs.css deleted file mode 100644 index 68bd474f991..00000000000 --- a/nodist/styles/potlatch2/source/bugs.css +++ /dev/null @@ -1,9 +0,0 @@ -node[status=fixed] { z-index: 2; - icon-image: features/bugs/fixed.png; } - -node[status=invalid] { z-index: 2; - icon-image: features/bugs/invalid.png; } - -node[status=open] { z-index: 2; - icon-image: features/bugs/open.png; - text-offset: 14; font-family: DejaVu; text: name; font-size: 9; text_color: red; } \ No newline at end of file diff --git a/nodist/styles/potlatch2/source/core_interactive.css b/nodist/styles/potlatch2/source/core_interactive.css deleted file mode 100644 index addf821cd09..00000000000 --- a/nodist/styles/potlatch2/source/core_interactive.css +++ /dev/null @@ -1,28 +0,0 @@ -/* Turn restrictions */ - -relation[type=restriction] node { z-index:11; icon-image: icons/restriction.png; } - -/* Interactive way behaviour */ - -way::highlight :hover { z-index: 2; width: eval('_width+10'); color: #ffff99; } -way::highlight :hover :background { color: lightcyan; } -way::highlight :selected { z-index: 2; width: eval('_width+10'); color: yellow; opacity: 0.7;} -way::highlight :selected :background { color: cyan; } -way::highlight :restrictfrom { z-index: -1; width: eval('_width+10'); color: red; opacity: 0.7;} -way::highlight :restrictto { z-index: -1; width: eval('_width+10'); color: blue; opacity: 0.7;} -/*way !:drawn !:hasTags{ z-index:10; width: 0.5; color: red; }*/ -way !:drawn { z-index:10; width: 1; color: #333333; } -way :tiger { casing-color: #ff00ff;} - -/* Interactive node behaviour */ - -node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; } -node :hoverway { z-index: 9; icon-image: circle; icon-width: 8; color: blue; layer: 5; } -node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #00ac00; casing-color: #004400; casing-width: 1; } -node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 8; color: #BBB; casing-color: #333; casing-width: 1; } -node !:drawn :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 10; color: black; layer: 5; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 8; color: black; } -node !:drawn :selectedway { z-index: 9; icon-image: circle; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; } -node::selectedNode :selected { z-index: 1; icon-image: square; icon-width: eval('_width+10'); color: yellow; interactive: no; layer: 5; } -node::selectedNode :selected :background { color: cyan; } -node::junctionNode :junction :selectedway { z-index: 8; icon-image: circle; icon-width: 12; casing-color: black; casing-width: 1; layer: 5; } diff --git a/nodist/styles/potlatch2/source/core_landuse.css b/nodist/styles/potlatch2/source/core_landuse.css deleted file mode 100644 index 26adf27f9aa..00000000000 --- a/nodist/styles/potlatch2/source/core_landuse.css +++ /dev/null @@ -1,43 +0,0 @@ -/* Landuse */ - -way[natural] :area { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } -way[natural=beach] :area { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; set .area_small_name;} -way[natural=coastline] { color: black; width: 3; } -way[landuse] :area { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } -way[landuse=residential] :area { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } -way[landuse=retail] :area { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } -way[landuse=commercial] :area { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } -way[landuse=military] :area { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; set .area_small_name; } -way[amenity],way[shop] :area { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } -/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */ -way[leisure] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } -way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; set .area_small_name;} -way[historic] :area,way[ruins] :area { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; set .area_small_name;} -way[military] :area { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; set .area_small_name;} -way[building] :area { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } -way[natural=water], -way[waterway][waterway!=dam] :area { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; set .area_small_name;} -way[waterway=dam] { color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; set .area_small_name;} -way[man_made] :area { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } -way[man_made=reservoir_covered] :area { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; set .area_small_name; } -way[landuse=reservoir] :area { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; set .area_small_name;} -way[landuse=forest],way[natural=wood] :area { color: green; width: 2; fill-color: green; fill-opacity: 0.2; set .area_small_name;} -way[leisure=park] :area { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; set .area_small_name;} -way[leisure=garden] :area { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; set .area_small_name;} -way[leisure=pitch] :area { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; set .area_small_name;} -way[landuse=recreation_ground] :area { color: green; fill-color: green; set .area_small_name;} -way[amenity=parking] :area { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } -way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } -way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} -way[man_made=pier][floating=yes] { dashes: 4,2; casing-color: #444;} -way[leisure=marina] :area { color: pink; fill-color: pink; fill-opacity: 0.4; set .area_small_name;} -way[leisure=slipway] { color: grey; width: 3; casing-color: #3434ff; casing-width: 2; } -way[leisure=golf_course] :area { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; set .area_small_name;} -way[boundary] { color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} -/* Perhaps should be filled, on lower zooms. */ -way[boundary=national_park] { color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} -way[boundary=protected_area] { color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;} -way[boundary=administrative] { color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} -way[boundary=administrative][waterway] { opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } -way[landuse=cemetery] { color: #664466; width: 2; fill-color: color: #664466; opacity: 0.2; set .area_small_name;} -/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ diff --git a/nodist/styles/potlatch2/source/core_pois.css b/nodist/styles/potlatch2/source/core_pois.css deleted file mode 100644 index b1793b71ec9..00000000000 --- a/nodist/styles/potlatch2/source/core_pois.css +++ /dev/null @@ -1,142 +0,0 @@ -node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 10; font-weight: bold; z-index: 20; } -node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } -node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } -node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; } -node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } -node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } -node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; } -node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } -node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; } -node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } -node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } -node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; } -node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; } -node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; } -node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; } -node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; } -node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; } -node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; } -node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; } -node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; } -node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } -node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } -node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -way[amenity=school] :area { color: yellow; fill-color: yellow; fill-opacity: 0.1; set .area_small_name; } -node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } -node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; } -node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 15; text: name; font-size: 10; z-index: 20; } -node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } -node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } -node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; } -node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } -node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; } -/* More Amenities */ -node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; } -node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; } -node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } -node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } -node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; } -node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; } -node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[amenity=place_of_worship] { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; } -node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; } -node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; } -node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; } -node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; } -node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; } -node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; } -node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; } -/* Shops */ -node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; } -node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; } -node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; } -node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } -node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; } -node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; } -node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; } -node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; } -node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; } -node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; } -node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; } -node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; } -node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; } -node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; } -node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; } -node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; } -node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; } -node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; } -node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; } -node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; } -node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; } -node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; } -node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; } -node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; } -node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } -node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } -node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; } -/* More Touristy Items */ -node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; } -node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } -node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } -node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } -node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; } -node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } -node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } -node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; } -node[tourism=theme_park] { icon-image: icons/tourist_theme_park.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; } -node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; } -/* Transport */ -node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; } -node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; } -node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; } -node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; } -node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; } -node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } -node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } -node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; } -node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset: 15; text: capacity; font-size: 10; z-index: 20; } -node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } -node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } -node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; } -node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } -node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } -node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } -node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } -node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; } -node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; } -/* Misc */ -node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; } -node[leisure=sports_centre] { icon-image: icons/sport_leisure_centre.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; } -/* node[landuse=cemetery], node[landuse=grave_yard] { icon-image: icons/?.png; z-index: 20; } */ -node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; } -node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; } -/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */ -node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; } -node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[power=tower] { icon-image: cross; icon-width: 7; width: 3; color: #F44; z-index: 20; } -node[power=pole] { icon-image: cross; icon-width: 7; width: 3; color: #444; z-index: 20; } -node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; } -/* Natural */ -node[natural=peak] { icon-image: icons/natural_peak.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; } -node[natural=tree] { icon-image: icons/natural_tree.n.16.png; z-index: 20; text-offset:15; text: name; font-size: 10; z-index: 20; } - -/* Addressing */ - -node[addr:housenumber] !:drawn, -node[addr:housename] !:drawn { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; z-index: 20; } -way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} diff --git a/nodist/styles/potlatch2/source/core_relations.css b/nodist/styles/potlatch2/source/core_relations.css deleted file mode 100644 index a2d5a7437df..00000000000 --- a/nodist/styles/potlatch2/source/core_relations.css +++ /dev/null @@ -1,8 +0,0 @@ -/* Route relations */ - -relation[type=route] way::route { z-index: 1; width: 13; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way::route { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way::route { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way::route { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=mtb] way::route { z-index: 1; width: 12; color: brown; opacity: 0.3; } -relation[type=route][route=foot] way::route { z-index: 1; width: 10; color: #80ff80; opacity: 0.6; } diff --git a/nodist/styles/potlatch2/source/core_ways.css b/nodist/styles/potlatch2/source/core_ways.css deleted file mode 100644 index 1c0c5b7b00d..00000000000 --- a/nodist/styles/potlatch2/source/core_ways.css +++ /dev/null @@ -1,123 +0,0 @@ - -/* Roads */ - -way[highway=motorway],way[highway=motorway_link], -way[highway=trunk],way[highway=trunk_link], -way[highway=primary],way[highway=primary_link], -way[highway=secondary],way[highway=secondary_link], -way[highway=tertiary],way[highway=tertiary_link], -way[highway=residential],way[highway=unclassified] { text: name; text-color: black; font-size: 12; text-position: offset; text-offset: 10; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round } -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; } -way[highway=tertiary],way[highway=tertiary_link] { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; } -way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } -way[highway=service][service!=parking_aisle] { color: white; width: 3; casing-color: gray; casing-width: 1; } -way[highway=service][service=parking_aisle] { color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } -way[highway=service][service=alley] { color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } -way[highway=road] { color: gray; width: 5; casing-color: white; casing-width: 1; } -way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } - -/* Road areas */ - -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} -way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } - -/* Paths */ - -way[highway=steps] { color: #FF6644; width: 6; dashes: 2, 2; } -way[highway=footway] { color: #FF6644; width: 2; dashes: 6, 3; set .path;} -way[highway=footway][bicycle=yes]::bike { z-index: 4; color: blue; width: 1; } -way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; set .path;} -way[highway=track] { color: #996644; width: 2; dashes: 4, 2; set .path;} -way[highway=path] { color: brown; width: 2; dashes: 2, 2; set .path;} -way[highway=cycleway] { color: blue; width: 2; dashes: 4, 2; set .path;} -way .path { text: name; text-color: black; text-position: offset; text-offset: 7; font-size: 12; } - -/* Under construction */ - -way[highway=proposed] { color: #88ffff; width: 6; dashes: 8, 4; } -way[highway=construction] { color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;} - -/* Railways */ - -way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; } -way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; } - -way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} -way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; } - -way[railway=platform] { color:black; width: 2; } - -way[railway=subway] { z-index: 6; color: #444444; width: 5; } -way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } - -way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; } -way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;} - -way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } -way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; } - -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } -way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; } - -way[railway=light_rail] { z-index: 6; color: black; width: 4; } -way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; } - -way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; } -way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; } - -/* Waterways */ - -way[waterway=river], -way[waterway=canal], -way[waterway=stream] { color: #3434ff; width: 2; text:name; text-color: #3434ff; font-size:9; text-position: offset; text-offset: 7;} -way[waterway=drain] {color: #3434ff; width: 1; text:name; text-color: #3434ff; text-position: offset; text-offset: 3;} -way[waterway][tunnel=yes] {dashes: 8,4;} - -/* Aeroways */ - -way[aeroway=aerodrome] :area - { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } -way[aeroway=taxiway] !:area { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } -way[aeroway=taxiway] :area { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } - -way[aeroway=runway] !:area { z-index: 9; color: black; width: 5; } -way[aeroway=runway]::aa !:area { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way[aeroway=runway]::bb !:area { z-index: 13; color: black; width: 3; } -way[aeroway=runway]::cc !:area { z-index: 14; color: white; width: 1; dashes: 4, 16; } - -way[aeroway=runway] :area { z-index: 9; color: black; width: 3; fill-color: #775577; } -way[aeroway=apron] :area { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} - -/* Barriers */ - -way[barrier] {color: #000000; width: 1} -way[barrier=fence] {color: #000000; width: 1; dashes: 8,4,2,4; } - -/* Power */ - -way[power=line] {color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} -way[power=minor_line] {color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} -way[power=station] :area { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; set .area_small_name;} -way[power=generator] :area { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; set .area_small_name;} - -/* Leisure */ - -way[golf=hole] {color: darkgreen; width: 5; casing-color: green; casing-width: 2; } -way[leisure=sports_centre] :area { color: #66ddcc; fill-color: #66ddcc; set .area_small_name; } - - -/* Physical decoration */ - -way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: eval('_width+6'); } -way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: eval('_width+2'); } -way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } - -/* Attribute decoration */ - -way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; } -way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; } diff --git a/nodist/styles/potlatch2/source/enhanced.css b/nodist/styles/potlatch2/source/enhanced.css deleted file mode 100644 index 23966e004cf..00000000000 --- a/nodist/styles/potlatch2/source/enhanced.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - Potlatch 2 enhanced stylesheet - - The aim of this stylesheet is to provide a fuller, more detailed rendering of additional attributes - (e.g. direction, access) used at times by the moderately experienced mapper. - -*/ - -@import("stylesheets/core_ways.css"); -@import("stylesheets/core_pois.css"); -@import("stylesheets/core_landuse.css"); - -/* Access */ - -way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} -way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} - -/* Physical */ - -way[embankment=yes]::hatches, way[cutting=yes]::hatches - { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } - -/* Interactive behaviour */ - -@import("stylesheets/core_relations.css"); -way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} -@import("stylesheets/core_interactive.css"); - -/* Direction on selected ways */ - -way[highway][!oneway][junction!=roundabout]::direction :selected, -way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } -way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } -way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } - diff --git a/nodist/styles/potlatch2/source/gpx.css b/nodist/styles/potlatch2/source/gpx.css deleted file mode 100644 index 80604892063..00000000000 --- a/nodist/styles/potlatch2/source/gpx.css +++ /dev/null @@ -1,12 +0,0 @@ -/* - - Wireframe stylesheet for GPS tracks - -*/ - -way { z-index: 2; width: 1; color: cyan; } -node :poi { z-index: 2; - icon-image: circle; icon-width: 8; color: orange; - casing-color: red; casing-width: 1; - text-offset: 10; font-family: DejaVu; text: name; font-size: 9; text_color: red; } - diff --git a/nodist/styles/potlatch2/source/network.css b/nodist/styles/potlatch2/source/network.css deleted file mode 100644 index d2a60a9fb4b..00000000000 --- a/nodist/styles/potlatch2/source/network.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - Potlatch 2 network stylesheet - - This is a variant of the enhanced stylesheet _without_ landuse and similar polygons. The aim is to - prevent such items distracting the mapper and leading to unwanted junctions (and slowing down - rendering!). - -*/ - -@import("stylesheets/core_ways.css"); -@import("stylesheets/core_pois.css"); - -/* Access */ - -way[access=private]::access,way[access=no]::access { z-index: 10; color: red; width: eval('_width+2'); dashes: 2,5;} -way[access=permissive]::access { z-index: 10; color: green; width: eval('_width+2'); dashes: 1,3;} - -/* Physical */ - -way[embankment=yes]::hatches, way[cutting=yes]::hatches - { z-index: 3; opacity: 0.5; color: grey; width: eval('_width+5'); dashes: 2, 2; } - -/* Interactive behaviour */ - -@import("stylesheets/core_relations.css"); -way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} -@import("stylesheets/core_interactive.css"); - -/* Direction on selected ways */ - -way[highway][!oneway][junction!=roundabout]::direction :selected, -way[aerial_way]::direction :selected { z-index: 14; color: #999922; width: 2; dashes: 3,60; line-style: arrows; } -way[waterway]::direction :selected { z-index: 14; color: #4444CC; width: 2; dashes: 5,60; line-style: arrows; } -way[railway]::direction :selected{ z-index: 14; color: #999999; width: 3; dashes: 4,92; line-style: arrows; } - diff --git a/nodist/styles/potlatch2/source/opencyclemap.css b/nodist/styles/potlatch2/source/opencyclemap.css deleted file mode 100644 index 9bfb71c46c5..00000000000 --- a/nodist/styles/potlatch2/source/opencyclemap.css +++ /dev/null @@ -1,150 +0,0 @@ -/* - - Stylesheet that mimicks, to a certain extent, opencyclemap - Andy Allan, June 2010 - - Based heavily on: - MapCSS demonstration stylesheet - Richard Fairhurst, October 2009 - -*/ - -/* This rule applies to all areas (closed ways). Note that rules are applied in the order - they appear in the file, so later rules may replace this one for some ways. - This is used as a debugger for finding unstyled areas; it's obviously oversimplistic since - it picks up closed-loop highways. */ - -way :area { color: grey; width: 1; fill-color: red; fill-opacity: 0.1; } - -/* A set of fairly standard rules. - We use z-index to make sure high-priority roads appear above minor ones. - The default z-index is 5. If an object matches multiple rules with the same - z-index then the rules are "merged" (but individual properties become one or the other) */ - -/*way[highway=motorway],way[highway=motorway_link], -way[highway=trunk],way[highway=trunk_link], -way[highway=primary],way[highway=primary_link], -way[highway=secondary],way[highway=secondary_link], -way[highway=tertiary],way[highway=tertiary_link], -way[highway=residential] { text: name; text-color: black; font-size: 7; text-position: line;}*/ -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #bfbfcf; width: 7; casing-color: #506077; casing-width: 1; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #c8d8c8; width: 7; casing-color: #477147; casing-width: 1; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #d8c8c8; width: 7; casing-color: #8d4346; casing-width: 1; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #eeeec9; width: 7; casing-color: #a37b48; casing-width: 1; } -way[highway=tertiary],way[highway=unclassified] { z-index: 6; color: #eeeec9; width: 5; casing-color: #999999; casing-width: 1; } -way[highway=residential] { z-index: 5; color: white; width: 5; casing-color: #999; casing-width: 1; } -way[highway=service] { color: white; width: 3; casing-color: #999; casing-width: 1; } - -/* Pedestrian precincts need to be treated carefully. Only closed-loops with an explicit -area=yes tag should be filled. The below doesn't yet work as intended. */ -way[highway=pedestrian] !:area { color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; } -way[highway=pedestrian] :area { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } - -way[highway=steps] { color: #be6c6c; width: 2; dashes: 4, 2; } -way[highway=footway] { color: #be6c6c; width: 2; dashes: 6, 3; } -way[highway=cycleway] { color: blue; width: 1.6; dashes: 5, 4; } -way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; } -way[highway=track] { color: #996644; width: 2; dashes: 4, 2; } -way[highway=path] { color: lightgreen; width: 2; dashes: 2, 2; } - -way[waterway=river], way[waterway=canal] { color: blue; width: 2; text:name; text-color:blue; font-size:9; text-position: offset; text-offset: 7;} - -way[barrier] {color: #000000; width: 1} - -/* Fills can be solid colour or bitmap images */ - - -way[natural] :area { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } -way[landuse] :area { color: #efefef; width: 1; fill-color: #f5f5f5; fill-opacity: 0.3; } -way[amenity],way[shop] :area { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } -way[leisure],way[sport] :area { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } -way[tourism] :area { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; } -way[historic],way[ruins] :area { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; } -way[military] :area { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; } -way[building] :area { color: #8d8d8d; width: 1; fill-color: #e0e0e0; fill-opacity: 0.2; } -way[natural=water], -way[waterway] :area { color: blue; width: 2; fill-color: blue; fill-opacity: 0.2; } -way[landuse=forest],way[natural=wood] :area { color: green; width: 2; fill-color: green; fill-opacity: 0.2; } -way[leisure=pitch],way[leisure=park] { color: #44ff44; width: 1; fill-color: #44ff44; fill-opacity: 0.2; } -way[amenity=parking] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.2; } -way[public_transport=pay_scale_area] :area { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } - -/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ - -node[addr:housenumber], -node[addr:housename] { icon-image: circle; icon-width: 8; color: #B0E0E6; casing-color:blue; casing-width: 1; } -way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} - -/* POIs, too, can have bitmap icons - they can even be transparent */ - -node[amenity=pub] { icon-image: icons/pub.png; text-offset: 15; font-family: DejaVu; text: name; font-size: 9; } -/*node[place] { icon-image: icons/place.png; text-offset: 17; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; text-decoration: underline; } -node[railway=station] { icon-image: icons/station.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 9; font-weight: bold; } -node[aeroway=aerodrome] { icon-image: icons/airport.png; text-offset: 13; font-family: DejaVu; text: name; font-size: 10; } -node[amenity=atm] { icon-image: icons/atm.png; } -node[amenity=bank] { icon-image: icons/bank.png; text-offset: 15; text: name; } -node[highway=bus_stop] { icon-image: icons/bus_stop.png; } -node[amenity=cafe] { icon-image: icons/cafe.png; text-offset: 15; text: name; } -node[shop=convenience] { icon-image: icons/convenience.png; text-offset:15; text:name; } -node[shop=supermarket] { icon-image: icons/supermarket.png; text-offset:15; text:name; } -node[amenity=fast_food] { icon-image: icons/fast_food.png; text-offset:15; text: name; } -node[amenity=fire_station] { icon-image: icons/fire_station.png; } -node[amenity=hospital] { icon-image: icons/hospital.png; } -node[tourism=hotel] { icon-image: icons/hotel.png; } -node[amenity=parking] { icon-image: icons/parking.png; } */ -node[amenity=bicycle_parking] { icon-image: icons/parking_cycle.png; text-offset: 15; text: capacity; text-color: blue } -/* node[amenity=pharmacy] { icon-image: icons/pharmacy.png; } -node[amenity=pharmacy][dispensing=yes] { icon-image: icons/pharmacy_dispensing.png; } -node[amenity=police] { icon-image: icons/police.png; } -node[amenity=post_box] { icon-image: icons/post_box.png; } -node[amenity=recycling] { icon-image: icons/recycling.png; } -node[amenity=restaurant] { icon-image: icons/restaurant.png; } -node[amenity=school] { icon-image: icons/school.png; } -node[amenity=taxi] { icon-image: icons/taxi.png; } -node[amenity=telephone] { icon-image: icons/telephone.png; } -way node[barrier=gate], way node[highway=gate] { icon-image: icons/gate.png; } -node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; }*/ - -/* Important shops */ -node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; text-offset: 15; text: name; } - -/* We can stack styles at different z-index (depth) */ - -way[railway=rail] { z-index: 6; color: #444444; width: 5; } -way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; } -way[railway=platform] { color:black; width: 2; } -way[railway=subway] { z-index: 6; color: #444444; width: 5; } -way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } - -/* Bridge */ -way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: eval('_width+3'); } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: black; width: eval('_width+6'); } - -/* Tunnel */ -way[tunnel=yes]::tunnel1 { z-index: 4; color: white; width: eval('_width+2'); } -way[tunnel=yes]::tunnel2 { z-index: 3; color: black; width: eval('_width+6'); dashes: 4,4; } - -/* Oneway */ -way[oneway=yes]::arrows { z-index: 10; color: #6c70d5; width: 2; dashes: 10,30; line-style: arrows; } - - -/* Change the road colour based on dynamically set "highlighted" tag (see earlier) */ - -way .highlighted { color: pink; } - -/* Interactive editors may choose different behaviour when a user mouses-over or selects - an object. Potlatch 2 supports these but the stand-alone Halcyon viewer does not */ - -@import("stylesheets/core_interactive.css"); - -/* Descendant selectors provide an easy way to style relations: this example means "any way - which is part of a relation whose type=route". */ - -relation[type=route] way::routeline { z-index: 1; width: 17; color: yellow; opacity: 0.3; } -relation[type=route][route=bicycle][network=ncn] way::routeline { z-index: 1; width: 12; color: red; opacity: 0.3; } -relation[type=route][route=bicycle][network=rcn] way::routeline { z-index: 1; width: 12; color: cyan; opacity: 0.3; } -relation[type=route][route=bicycle][network=lcn] way::routeline { z-index: 1; width: 12; color: blue; opacity: 0.3; } -relation[type=route][route=bicycle][network=mtb] way::routeline { z-index: 1; width: 12; color: #48a448; opacity: 0.3; } - - - diff --git a/nodist/styles/potlatch2/source/potlatch.css b/nodist/styles/potlatch2/source/potlatch.css deleted file mode 100644 index 8774333f3ca..00000000000 --- a/nodist/styles/potlatch2/source/potlatch.css +++ /dev/null @@ -1,28 +0,0 @@ -/* - - Potlatch 2 core stylesheet - - This stylesheet should contain commonly used features and only the most essential extra attributes - (e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in - order not to kill performance on slower systems and those with a less effective Flash Player (i.e. - Linux). - - It is expected that experienced mappers will switch between this and other stylesheets as required. - -*/ - -@import("stylesheets/core_ways.css"); -@import("stylesheets/core_pois.css"); -@import("stylesheets/core_landuse.css"); -@import("stylesheets/core_relations.css"); -way .area_small_name {text-color: black; font-size: 10; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} -@import("stylesheets/core_interactive.css"); - -/* Rendering for licence status */ - -way[_status=no]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; } -way[_status=partial]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; } -way[_status=unsure]::status { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; } -node[_status=no]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; } -node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; } -node[_status=unsure]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; } diff --git a/nodist/styles/potlatch2/source/snapshot.css b/nodist/styles/potlatch2/source/snapshot.css deleted file mode 100644 index 891ead6865b..00000000000 --- a/nodist/styles/potlatch2/source/snapshot.css +++ /dev/null @@ -1,26 +0,0 @@ -/* - - Stylesheet that does simple wireframe display - -*/ - -way :hover { z-index: 2; width: 14; color: yellow; linecap: round; } -way :selected { z-index: 2; width: 14; color: yellow; linecap: round; } -way !:drawn { z-index: 1; width: 14; color: #444444; linecap: round; } - -node :selectedway { z-index: 8; icon-image: circle; icon-width: 16; color: green; } -node :hoverway { z-index: 9; icon-image: circle; icon-width: 16; color: blue; } -node :selected { z-index: 9; icon-image: circle; icon-width: 16; color: red; casing-color: black; casing-width: 1; } -node !:drawn :poi { z-index: 6; icon-image: circle; icon-width: 16; color: green; casing-color: black; casing-width: 1; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 16; color: black; } -node :hasTags :selectedway { z-index: 9; icon-image: circle; icon-width: 16; color: black; } - -way[_status=incomplete]::statushighlight { z-index: 0; width: 20; color: #d95f02; linecap: round; } -way[_status=complete]::statushighlight { z-index: 0; width: 18; color: #1b9e77; opacity: 0.4; linecap: round; } -way[_status=complete] { opacity: 0.7; } -node[_status=incomplete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 24; color: #d95f02; } -node[_status=complete]::statushighlight :hasTags { z-index: 5; icon-image: circle; icon-width: 20; color: #1b9e77; opacity: 0.4; } -node[_status=complete] { opacity: 0.7; } - - - diff --git a/nodist/styles/potlatch2/source/wireframe.css b/nodist/styles/potlatch2/source/wireframe.css deleted file mode 100644 index e3e408ce8ce..00000000000 --- a/nodist/styles/potlatch2/source/wireframe.css +++ /dev/null @@ -1,17 +0,0 @@ -/* - - Stylesheet that does simple wireframe display - -*/ - -way :hover { z-index: 2; width: 1; color: blue; } -way :selected { z-index: 2; width: 1; color: red; } -way !:drawn { z-index:10; width: 1; color: black; } - -node :selectedway { z-index: 8; icon-image: square; icon-width: 6; color: green; } -node :hoverway { z-index: 9; icon-image: square; icon-width: 6; color: blue; } -node :selected { z-index: 9; icon-image: square; icon-width: 6; color: red; casing-color: black; casing-width: 1; } -node !:drawn :poi { z-index: 2; icon-image: square; icon-width: 4; color: green; casing-color: black; casing-width: 1; } -node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 6; color: black; } -node :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; } - diff --git a/resources/images/icons/ISO_7010_E010.16.png b/resources/images/icons/ISO_7010_E010.16.png deleted file mode 100644 index ccebe7f6e35768d3a38a29a000bfbfbb620659d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 612 zcmV-q0-ODbP)jwd!G}dT!1JD z0J#IYnorT!au$Hu(_I{~JN^yOKIX;sv=@L@PdmeJUjZP^CzKW~#pO82T5~aXCwz2_ z57J`W#>tJ1OwT2_?DOCW`>`!4p+E8*C9VDh$axZvj=HccUIxJSvPyPYs@YLqMWG}E z&{VMrTc?x5{Z}(469M+DsnLt)qh`5}tbJelB%e*gdh0r&nhI7-*y z+`N|}xe$Q9h#y}pk{tkW{&5c@(I5cP&v6b|w^Cnb2VnBkM~>gSp7nWkfRa{e>b=BB zG>F+?RY<7{&Ih;X y4nAQlHi?F|phKmdt2bbh4OuViR$Bl1oqqsmF`WUVOG+^S0000}M{P)`t{FILw)I&-c6co;f2#CO;rDT7jN!+IQbG z{hfCWU*)>JD6;wUg2YSof==HtY+x)Ops<`^A#7r3)<@qRo!3(St02UUe6X6>I;bP} z)q@o@(P^zVFz?5>@~MhVIZXjrD*+pCX}COHkwxt`q{XCiY6;3K37QnM@l*F=oSSm6 z{-y>AIQ)2VnHLgL^3Eead4ZVuqq` zP!F$vaZyj&crhP!-Ej^1wa--?dh|!-G&+GDabG-a&S|0Qfm?6ki4m&8V-q&`YJ95G zZ;LAbt=zy|wb9*!G~me7MOirf-N%F(Vasj3cfbZ}4i{u*T(Hs2FisHae(!)2uL>~z z7;G0mR&bU2FlpC%0;qXdwfzq*nLA0){{~FauG32^SeNYq5XLRpFpjqk8DKj=yGN8i zIA$pTi+PyR0K8eKsn2z0(!p${A?IMGRLAj`e-(gdhQE#iP~fD05+3POucbhq>g+p5 zHa1;He`ApVbC)RaIv4t%*>cu7-gEyqw$qi?X47KLW9>gCP4D)P2(b_j%e@Ew{R-+fR>$bL9SaJXWAQ6y&u`R$KKMG{P)xu^HFz5{DkqYpgz?EB-x>zE|Pm9P|7HTtauj3LQNgaoQi5BQpytpeuviz*8F1|vrr#6ELMiN;tPS=Iw zx?E|Z0D}9P1-_=YoL-nyz5O@A*m@QW3vQk*+)}tR!wL0wf!TIIlf!acgpVtToK#@b z0{@djqw}+1dNU6}>BYwATDF%mb-{QtH&|eQzBC?rC)4l_a%Xt5W~b{f;Llc|wQNjo z4@19t2_$9;STV)JD%`bqQ|K#DD&lwmd-ugtY0U*89Ga!EVi~sBIe*VAv z(N~;!<*m>EUDiLrG$45Ev;QD)@X5FTt8RaW<0qeggT-Hb{R8H2x&P(=ufPBPYcF|# zYQW@+@4*V?=HEkcV*8nQVDYZA@8Dt|fByZSd+-&i0n;vh04v-Kv|;Au4{&_Ct2;)VAZiq_rv{J-wRoBzk2etDK@ diff --git a/resources/images/icons/accommodation_chalet.n.16.png b/resources/images/icons/accommodation_chalet.n.16.png deleted file mode 100644 index 461dc3fc78e34b23a64c518fc79eb183db250e54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 560 zcmV-00?+-4P)C&yB z;znGm8)+AcV-;JiwBuyjX_8~Y5HO2Y`Vh!>7Vn$qBt)27xDVU}3ha(G&?gp{1*!lj zjCqCuBdm5q5OyL5+%PDGG+fVH9$YB#_;Q6t$phtoOqeu$r06ntvCQmro@-OXJe(Sf;XY7E$`C5*9=Zc)J4w7;vK0lhNaOcfWo_*>NDhRL@WwlIo$a3pwArns7UvRj6 ze4NQqhepxkWZ6T=VwU}YFYT>u*Ztv#tZsx{sSk0rKFo+~vISca^g_0!7b*wGUFxw# zZNze{n0>iv9Rh5I%KT!R=KD3)dl3Mmu5dP9Pk}(;RArD+&twZyHbSNOVU4?Qe>G0tfmdIBUbZ?!s!Yd5qW=^aNr(Q~HG(rB0JLM1kH32?{R#Ni32DXmWQ{>b0I&!= zZ~1hCh{WLYdO)M-@_MPuW`Cv=m!uC#%xc4y0|l3ND;rpV7p+(?RzzVk?{IjJ$J2#2 zexN8I0;&KIDSYn)oG5!N#AX&i0aZw>4^6m?I41e_{V-`kzf1uuLf$n@PlR&*aW=}46!?Wl=;7UZMMBY_0XmO00006$U)`FG9?hufWz`MSUEJ>U7h-#wj=<22?@PQ#1j{SYS-r!{vG0q-IUL?e65 zhLRb9t<_wK9M@--qitsCY^YmvqG4S`aSRFVjVj0(wSG4<3ibB?3DQQas9j~v3JRv} ze+yDo&1&+e?6C#8<2H1d?$EU5iYX|a6_C)+D+T3-8zc`|(0k$qjr-sm8aJa$GIcif z35<>>6zK&Vh(XZ!Aha9ZXxmf4#;OvO&E24K$$=9ogvkpTg8Yg%VtRf5P(U6uZ@W-M zY88Tsa~Z#b_q`xiwCqSYy$}5e=wCO401W&i4#gm2<=T%$s~`K$AdX25W!~b4{!+%J z_xVR~<_V#C*@23MTl5@x7&TwHF4G;$)su^C-IZ|e`6Zyo$r%sduHwd1hAlKlC5kEJ zO zy=xR<5XOJ=?z_9UF}d4(;ROSt!4DFSfGC!+6I%-liH)WBmsp61q_P!@{1pMwLPYKS z2#P@sQRI@`QM-7UB|H%enN;`P=(Z+`7#jZji3 zw1$;U7yuEdhC*cE$@?Y`-!>^!S-mkc6wj~Mx!0(1X*#A{Yyku?Mz}j)BQ(&?lVXBBQ`UDfKKs~g=O7%8!YeCmb_#lhf`Xk&0_r0H zAN@@NEO>*C!icc7S1>;jvDL}3r^l=;&5nQqfCxuYN=IPrM+f_@mFo+CcVGbJ{}6Bv zHd;AmG&Ec}8Iwka#p&3)Y*?6#m>sj;tdMhQIH(&_5tB(U=&6Q=%YJ4w6l^zltZ!$u zeg3+ev6neAm(zEO5fGqI*y%ZZ@4)a@<_4yBaz$pIe(7Eq4=aIz^512qtPjaf!5iPR zXR5Y+wO*-kOa#HdvL(sN`ieE&0!BCO2XmU-bzI2QQA<+G6te6g zU-Bg?f_f0_Vag~Wt;R`_6SA^)OQI7{ka z3K}&b3nhJ&hm?NEO;QCfkg`v#l?swJ^4^~@pi(%OGhl!wpd{obc!QEqe#sYiisGRS zT?9jnC)z5NFrMEEf*~V(2`C4;!|u>UEVanEDks-w2IF2uGOE)L;9;!_MQ1jn_?!<4 zPj5n%#!nO|KI?;eLj-aYz0r1Ei8AFbn~Wt^X9S?#l!~iyYf!1)FAlbpoI+z>v;ei1 zCE;4iUbNSw3FuwpN!-wfk&0zDwjfoc?Gp#}QLCU0b462r44RFJWM?r-lXsx};%?l^ zIYy8@T!e%7Y2DW*EErMBY@mtfvKG>`LOoCrGs{uUv}V8 zy$-hvBDH`1Mq!spG!x*xBK=-rzbiJ#gVg&*a=EmNH^lz44G|-q5Fo*A5L~5Xu zxL#}D8)4<&dfY$__2Z-& zz`^+_xv&i{I_l{C@8n|BdscqRCW@iyZ%o~#YjvIdb$Kt;MeJ#5bgaq0bM9}TbTKBU SWcC;U00009t2_$9;STV)JD%`bqQ|M)N?5bG>`h(+$^a|VWqw>}ZlTy*I5|Egne z{u{4AH3Xy=#ekaQZ~iOHzlWkI@8GNd3AOdLrep_H$D9i0x!P){x3M|?*EMaFJYQ7a0$>5^~DcR4cK!3 z>wg$nd-wDIlszv&igDudqp$yKE`IO@Y=GseNB@8S{Rh$ucSYyfcX$ox0D9G6*+Yl{ z)xZ!&2H$@F`#@uRQh!(*WJ255KIt^Z9@Gxp)7cfBo}+&*N|Zr(OE+|HA7Z|D$(86#Hy` z3W_$6E07JqOb0jK{R9TiTQIx%)LWoJ3JjQg^&?0F7>90q1{Ui&`wqm1W3XPJ#4E4? z&!ufnt+yy#yL?y%EUx08&5_o_zZQNG|}Cq|-K} Sf=OKf00000fhdEP)cPa~QL_z!u{sb-5osbk3DkwHKmYZ207!uLapcX3262UZrjTrEOSV#yg zLTpqtg26`@A*6Qgj(64t1G@yWXz{_BJ8OAT>Weg_F-sjLy>|&NGggE zVNO^B5n*3{XCO4SDJTcefHP+?)`8SS&o7g`!Fc;Cq?gCKAUGKat~$F5Lnsx`@%mun z?a@a0_R7aI@p50ld+8eGyF7B1KwN954#;42st;CzqmbK1@iL1{GKx$pR*zdd+fU%> z=7QEyq~``ehyP?C@1zg6;Ba#mCwoh-)<;_Faciiz)j14V+X;vTQL-k`g(dGrdu<8^ds~qg;_ddm}2J-6Zt5pxvm@-5{UbeKq;=)qWW6>qLC;9s(o)R{jk8;U%&@ z(|91=n5J|`1p^x$=tk1rqsWQ!rn9%zIy?zGh|c;J2NBTv--&Nhmooz6Ht5XT7Q|sG%ud^{*@5Vj{J_b9_)l3Zr01FzjjD zwPKEFEGcJWj4=v&2vB2UVv5Y_hE#h*<@yv~OpX)b`IXn0p3Bf~lsW%nhhC?lAO+l- zlj&*Rc;{2*m)69X!cU~=wyKOrBc7~p(rwoW20b1>n_=(AF9p&Bfw)*Oj>B^=yn^dS zIo|z_o*38P{!pQIJfdF8^V`qgkVsE4J-f)<;wtAyzhD6etX7~i*RIPFO;F4qV+@4hKuo{mc|L&v z8s$p``Eu1F1?Ux3i)T2-(eNTNN+EYdyI!It&qa2hSZb1*j3QJD0++x6BOWmgdTqV) zezzq_S0uQQPD8tq;A9u%y&aFKOZ9)h?dYf&a2?l^Dn+G5Tu<-6CK*^e!ijh|VZeAC zN{2Z$HLHc&jnpf4M`559WmWaXd}fWMmo`{fd7YJ4H}&j&Z=3v|yPQe#jhic7^I*`& zVv+wwzZ8w7W|r69Vs_z00lZ8+`HZBTKxM7glTmapuKqfpcyYq%!A}C}m(AAG*tX-k zAEX{VPDma~6%!)eHmiTDG(h>uNFyYxt}NNt{{TL;N8wrB<#Yf5002ovPDHLkV1nRR BQbqs( diff --git a/resources/images/icons/amenity_library.n.16.png b/resources/images/icons/amenity_library.n.16.png deleted file mode 100644 index b3d038816e299c7b9ff2003849d3d13a162a081f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl482bZ!LR^czIKYU#*pt1;gS9b6 zp(9nN$de5u=*dy+%~1qIUhF`TA}>+a>lCw9#H_T~MPI~OM8TX$s`-o1R}+NtfQ zb}jtz{mb{SAMaf`0`%;(3b*I?ul)J_^U~1`zkmJs_4E7b-HT>adChAKe*5D7g+ps@ zU)cZV`Mu-Y=N#WYcWHM*i8tr+zLd}JUw-@i{`8(D$F|NozHRoIy-N>onl`=CW8JiZ z?_WN?czA8y^ui;Xrk&Zh?AW&1JD0XhEVM26=dTD5*tN9v#e=JBCg+^pw`}jK?)lAO zRYAhQV5|+7+Oed0X;=K}$vF+t@(KI?Oc8P(xJzHH^rSVd{yyv z%Z+RM6W4Zggv{TPczxA=L5Z^bRr;%nS#~{l3$2w8&S`k(c(wm+M_dI%%**S7VISo$ XWoeb4OX|)A`hvmJ)z4*}Q$iB}ZL?@y diff --git a/resources/images/icons/amenity_playground.n.16.png b/resources/images/icons/amenity_playground.n.16.png deleted file mode 100644 index 468ff19584d43bb6078b280746f77ebfe280686d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 635 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47<~hLLR^czIEp>N2*^M|>_uMe z#oioc{(M!zB7J!lg`R9cks@ynpkT2#XR!}wsUL55mhpr_+X6S{0(a&@ca}mA)*=tK zBA`l7_F^Ccn&8Dz;>}s&%~j&VRp!T6?$1{qAW#t?SP>{#87Nd4Bn&jXDp<5SM64!E zqApUVK2oM3O0F?hsR@YUlv@+kTaz@}Q?xtN^tv;R`f@EM71>QLc9>l3IHkmKX0`XM zTHo1qesk&r<~9Vb=u2HSF=Or2+;!9P*G((fG^b+g{Mzk{8n!QL+`X)A_wx3=tGf5E z>D|Ak@8J4Lhc-+;v~kMejZ=?qnR$Hs+%x-@p4-3T!lBidj;z0WV$0Q&TW_7;d*{-j zyO$5&y>jH<)noUs9eaBB!qa;fUp&0_>D`O3pWc4^{O@GU-6P4zu>N(Y15uPfA!|ucM$ji1MBCzUIQvQ=IP=XA|dH|kkPx@L4xhU_uG5B zCTbpicA`V{_y7NDO%g}4x;t3)uH3!y``skbH8~X29@OOhmn+G*d39~-2X)m2 z-?!)Y9zVg$vhb&Cz(J4h*S}g7BUR4dKg`1L{Pg!q_O=fYlvC!I^8C%?UC z&BSzMx7)5AcV&{j=X?=ktJ7C1u`rb2yl|s-@6riOnJCpo>WcLIIH;OXk;vd$@? F2>^blCU5`% diff --git a/resources/images/icons/amenity_police2.n.16.png b/resources/images/icons/amenity_police2.n.16.png deleted file mode 100644 index dd30134159f531833473457cdb8e152355439eec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 739 zcmV<90v!E`P)!a1;S!c?(X*_Tk(B52%25T}((s%mns37Gs0c+ZJ6sK)t7p~rR*bAdkbv6RR5T8ykNZPx`XlIk0?yuh#LJ7QJ~hKB<+Rcr%%BA85!&&#Pt|@_Z+j{ zDNMSDK+l&C-K-ObDIOYyRNypUPVs0k9k1NYi%@>1-gfc@1Niq|4QekMg|nPs*i*=V#%C| z1*)~E&O3zbmr@yV=zTZYx?KUubRSAJyB98!frvQFaVR;pBM^~v6bka^qE9X^l13&O zqsctzO3yv3!cQawA|4N0#-6!45pGT`TddQ_7J2@=U`E=F(P%79A;d88&JV&N+<&Gb VTy;Ts?lJ%X002ovPDHLkV1keTUO@l= diff --git a/resources/images/icons/amenity_post_box.n.16.png b/resources/images/icons/amenity_post_box.n.16.png deleted file mode 100644 index 2056820082a482b03037266616d6610bec4bfc89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$P)G|cg`*psu20myg(#Q({}&l!rnIX;nV07x&~fKp$c|21I}MBy?& zK1>6qlsf$fforF>|G#i}EjA34+xGw8zkmOibj4#g;QHwu|F56f`M)wq7{j?0fkI#d zuAbO}+kma}YyQuy_C^?j&ppU1g?2OOE^f5CU?p{9p|JM1v*f2;AcQlfSsc1lnC&w!aGSf?jVo$Ed5>NIIq-zH1 b0qO++1Q{5lUIBG}00000NkvXXu0mjfx&o98 diff --git a/resources/images/icons/amenity_post_office.n.16.png b/resources/images/icons/amenity_post_office.n.16.png deleted file mode 100644 index 28b736a4fb1650cee72f1157813a999fd2ebbac0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 819 zcmV-31I+x1P)WlF~lg7lP@zodq0bhJD@yS?y zv_6q0rrLO^^;W^ORe>6yQU*{u1LZcu&^Zh+XS=eKi81L;*3Qm4d#&H^e0!<4`$O*m zuVG9K1x?8=+V-8`=|rmzhNBL^R=MQoAN^CA9v?E<%sns$lqz7jqNG927}FF8Mc9Ah zC3bZjWH~p@QZ9qHz6wAnQb)ti-PAX?voJfx$gQhvl!_>&avDr55RA}!?hV4xTJGHV zl;Y|_RRzGFv(uy0)HTr6)6en#HyOJAF&kbnu0cuiycE|larbKg>gt<$(lUO9zyA1+ z^r182_5ycrUO^{X(j;1*VJZ87moL4~=B7t}aSpNf|6*fo<7jO?KVJQSSRzSt>HxZZ zf1fHWKeYcO#dyV4Mt&ZUhEpiV1*_~6Z)&CI>_uE1U`y_;EXv?P07@r3tKQKFS zo0BhIqA}S?Vpp2J3vcmoYJ`d3zOfuoN*d=0hN4PW3!w^L;kr8rMrt{H`c<0@M`M!H z*t`D`wU_l~`LU4~u#g8L}p=Hle_8dITIo5Yfm{2Pgzu+@{vuzKE>X{&)X;d<=Th%m2EVrqI3%letDTALcQnQ zMdoM6Se%=*Dqw*L*micdb@RBe$lwlT06R xcLXC2fY3H;%en2z;hVnvH``lflyXYIz`x}oR%f$4yfgp+002ovPDHLkV1lNukOBYz diff --git a/resources/images/icons/amenity_recycling.n.16.png b/resources/images/icons/amenity_recycling.n.16.png deleted file mode 100644 index ac16b176c321184674d3fa7a4b05b9141499ca89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmV+_0@eMAP)G|cg`*psu20myg(#Q%};ir^#3K^ zoG9u*7Bdukb9_P;tO^$S|KZKk{~)kuMd$xVx6b~DfhAq>|EH8X{V(<52CD_>#V}y+ zs&2T3(|eWxH8}tO_wOH=|NGaE|6AwRz|>+I&=jW(Rs;e+zJ31R6sz>VCRF_Yt0%X> zVy~ax{$K9TkKF(mp5Gh>RCwqAj>U~&{`3m>|BKq9z_=^J5G+;^Ac!!a%%A_$^h%Ha zGpfA6xGqBaf0-X2%qA4vooV#{&ZUDOuc5l2FW2J#ubB0cwmIjTM1H|F53dg4KW*kFKMLAKfw& zdpelg5cL1Tp*8<699|2?>t_^$#pgAJ{{Q&)IauuY_BkN$Aq*(-NIIgbXP4H+En0QV1LdS%!RdQnl>?M)5bAuC=|SS5cKBBgVc*4 z2t^PPJqRik59&dwR#Yl&t=QB`@@s7pw@sQqyW`}MJ*Wp?c$s-`=e_s+euq(OtKMtC z6JW-SF#sr~h|T8y8>6tv28Im{JPAx{C*e=eFZtusH~T2<1AaO?>Carb+jra{AA_It z)BcTD?(s)56E-#l6pw2ZV^I{6FV6GG^KY{H^ecG&2qub{DBZ$cE6P0&Wul!ow%O*$q|6?J^kZ=>*j99iic2i z9D-Vv;H)Zf=kh|RD(#^2#Ra)K8Cb8}`p}6NF*U>d;0|BvV%D zx}dRB1pYUlzD>!BSKiwqohh*M^~W@76-2}zzWR_)-g%i{zWvDAZqS?LluH#iL+S|M#5Zr)=owbQ5^*Z?oSa9|~fr Q;Q#;t07*qoM6N<$g0UB6O8@`> diff --git a/resources/images/icons/amenity_town_hall.n.16.png b/resources/images/icons/amenity_town_hall.n.16.png deleted file mode 100644 index 1921eccaf64e832c21e594709ea288e788779421..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 486 zcmV@P)jS8QhWb`Qn|v3=_?F|MN}<)gr*mC=JE1zCeL1_Szl#o?ip_VR%4xo*(aEk z$EkDID2^R+0YE{)0HpmaN2e|@ak7eAccnIulY)QWl{1$pADhM)4^X^d zXar}@1Vemy^O(4`iHPtg0>Emt)SYkOiVDSXW@qkVa`|EWY@SRm><$}$hxcgO-Ga0q z5DXS@8T0M)0?!}bqP^vs4M`}F@&;J@y3DIbx2dm17=(n@1a`{||IYs+@cPf#c6LZY zf!-hK2?S}Vwb^Vgp{rP;d++bSlD1!!{*}q(O^5Mu*-s#PSVK7I(3=Efd&-Zig_uMPP{r<*|^Br7N{ZQuqF1=+Fq@{{~3Oz>KCk5~Z_ui1b>L^y(4~2aj^1`x z3Pe?fl(@CiV#E|P_ZA6>mW&)9DGl5W~5S&?WuCIAU84~l;Xg;?!0}(OQ z&9q}S{+JpkT-#`<1$uE0g`ZUc!uAkdH}4h965ii{0>SDC%ZqdDt}Rm#LyX1_n|n~W zaZY01OvW-)G3N#?RRA{1D&Pm0|M{6CT^Bif=^jf9zi^VjO~6wVZ^(E@OF4_U=0yrd ziX+2){^tl+Km!GWKNvQ|Tz13DBL%1-7gc&pk_JZq0qRENjO@z>P5=M^07*qoM6N<$ Ef{d>ia{vGU diff --git a/resources/images/icons/barrier_blocks.16.png b/resources/images/icons/barrier_blocks.16.png deleted file mode 100644 index 36915f9d2bfc442fe8194f9618ffff65068c0564..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|#hxyXAr*|t78M^7*e^af(8$c= zpw*kf5MtwDdgXd}{;e$~|Ng9;I(4Z_<_yc?Lo;(ySe8%7IG&K7vG@g=E3E&i&v7eLkOM>BJhFRYk*@f#l4DGw5K!$m` L`njxgN@xNAM6(~@ diff --git a/resources/images/icons/barrier_cycle_barrier.16.png b/resources/images/icons/barrier_cycle_barrier.16.png deleted file mode 100644 index f4b964f79180d654c1ae70f17cbacd6d1c64be12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^0wBx*Bp9q_EZ7UAYCK&WLnOjW&nxmBHV|+Loc}HO z@lr=_pKj-7arPw#Zd@rh(3{7!dsWa%c{`(7U%o_#7v=qwuV8tS7XL!l=Qs;@MW}=5 zDs_EjC&n*=3pssREw(NYK6PMSFKaGC&MkWbDF!R?6xQq-r$EL9S&kJ>w$k-5kT4FyzAOBGd?3m$yHOAy4roadzEz0J=@b4x?5SM~TS*}UM>%?;J XOhka0Hv$m300000NkvXXu0mjfrfOQI diff --git a/resources/images/icons/barrier_kissing_gate.16.png b/resources/images/icons/barrier_kissing_gate.16.png deleted file mode 100644 index 16dd217b17b6a6818afaaf75eb8cd74d00f9c993..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmV9QXR>h@W`qT6@;Gmk9- zCACvwP2A${_qpaP({4tvE600000NkvXXu0mjfJx68@ diff --git a/resources/images/icons/barrier_lift_gate.n.16.png b/resources/images/icons/barrier_lift_gate.n.16.png deleted file mode 100644 index 874cc6b632b72215df531e0dd604d6ccbaaf3789..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmVP)2YZtYw8UtZ+92S8->OI0000DuuW1IK3h=V@|@dgDYOP10?DYX3u+PR&A;2=hjpk#B4aWQ0YeT=yTIgW(S z_VU0NUNt$IA`9N`a#4o!aX0I vybWT)KClc)=it2hOBhkA!01XCPzB}}RoZ)c(_N#|00000NkvXXu0mjf(N<>H diff --git a/resources/images/icons/barrier_toll_booth.n.16.png b/resources/images/icons/barrier_toll_booth.n.16.png deleted file mode 100644 index 348492a2685d7a2082b813d81f815d28edffa008..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmV-40n7f0P)&IRddB-@2$}mt3RNxqoL=O z&wk>UiGiMS0_R+`1mAtocg-o0N}#3TrF+iH#oxMas&6Jn9;9y<+(|D3g6A_(<5U;&xMMbd;?Nf zO+8h3>!C>Pf^gTw(i7Dk@Fi^PxGnx|o|T&UA{=N@YW@b=frE1+m$)tf0000_E)Q!2~4PekAq-DREC1$B+ufXN{JcmLvTlh@5JOhzgTxQBVulvl`m8>_3@5V5prfX3;Q3i)b4`5g7zU zIuRwAiKCgnU++DiKgN4O?0&w_r<{B4z2|(N;QizM0pL3XSV2*z4=)If)%~n_fVFxJMx7Ckb_W*Six{ zbd4aZW^oujM5R{2oASnq6lQ}Ns{^ap{JM#Hy^g)e9=30{p{JRb+)Mn>2-KSIvk#$6 z2yrP6t)@Y26ZwC7nz}emPEhD+Q>qHos>)SuCL5gXPE2-B!awNeRw-fJK29y;>h%g% z(TYO3@PVMBFv&&of{8pf4_qBCCi8Z9kyg^UN#7t>&VlsmHg!X;$}Ix=p;a|vXObby z5LWtESWKH}!&Bi2ugWWu?@7E!FX(CSp`tBhMK*F(|qz!38 z>USDDA?iewv{H*eDoaSqY3x4ivd;tN0VL%lLT@4XTt3#}G5?5}o*5+G6Ql_jB|-H7 z*gA{Rf_`&917>??5zdB@EoXV=hx`L$?sNBWe{!>kIW^bnASI_@&>67tWdjG10|Zk+ zwoI+4+`hx)U}whcV{A8x`doYl6VTa?m15Ys-D2U^J?rfKY2uWCOfcn~;^aPaAI|@s zV?VObqVfo|QNmI52xo~i0yEKa-!cI35g+ax<|2W+08Zj3DA&rI%pEiYDH4v3Y(XpF zIDU*^GRPNcZE%h50biz_yB)-&7yvYr>7^ie_q;z*$2SP*00;Q2)1sS6t<$_@Efx6? c?+x7V|KKWWyZuxYod5s;07*qoM6N<$f(mF^eE4fq~>5`g+hjY6k@Tsuc@AO$3ANs!%9K#cKO10-8Nq#Wc<0~gd@ubMl(-U#-6B=BUnM!}HTfo~BTxzuy~IE$&$3W2W30H+d@}z}uKUHfCx0WEo4xOXG8ceCJ)^J9kK89)0)hegUy_ Vy0%xy87Tk&002ovPDHLkV1o2x)UN;l diff --git a/resources/images/icons/emergency-telephone-16.png b/resources/images/icons/emergency-telephone-16.png deleted file mode 100644 index b740b06c2aeca306a72d446209a285c143b572ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 546 zcmV+-0^R+IP)mTBHqF*$N`qSZL)35bXQ}f|i1vXfN7|R+1_Z zkYHg%C5eoAd?uMYch0?MFT+4yn)okH_dD#(=C@prK6but?>4gF0tg8CAX#8Pdb=4y zAOsR#`kgB?y!CGL^=cOyfCK;sq^0?GUg`R|@h8i_cKQ_p0V1Vld%}MFUzi3#(LCiW=BaUP^NNQzaq7hsuqO%d|tr|%H#{eK0Yetvk5|9J| z{{m(5qSBtJWoA+!cpMM_V>kMLMFn7PqVA=~Jjrzo5E$6WtBqbI;Qqqo(uI>RZ_b|? z%aBAK1w359OMk!KB``IbU78-beg4GR@eGw89nA<}_(KxV2rpKC??i89)+^QM22H_z|;clXNCe^tRE|FEe68Nz@~ zq9axJ-{<$Q{=vY9H&6dH$E#sA1jB&om7f3JzIgBt9lU;a_usT~H)0I%_;>r_0U$nz zjKN}4%Utmr(4M0EZ~cs-e>1DR|2@2M3I)%o_6E!KuLi>l z>!ufi=?jO~0xiyr4LG=d;=h_u3G87|8!r8C zQnACoX%!wA2F$MY2g!lFiWvszxHrcFT|aUR40Z#GJlOv=#i{%|vUvsyZcEk%$zd8$ z?8W&V#wqjT{dfP`alE)ARS&KisP_lM`sqcTAO=j3Fh*!zJFTD_03Fh3Mtr8QK>z>% M07*qoM6N<$f)voLVgLXD diff --git a/resources/images/icons/food_bar.n.16.png b/resources/images/icons/food_bar.n.16.png deleted file mode 100644 index b3c4b42ec1357e24f5bd02bd9dd95ddcc2858cae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmV-v0ha!WP)G|cg`*psu20myg(#Q({}&l!rnIX;0nCElF>SM;U+-?O6g|Ngc8 z|Br8eFEb*&+nn&-@ktR|M2GN|E>%} z>;}N_gnX<2ubi_cxSN^vosDb#n3_#${H2wcCAK&;ttH$^L>PgxE zAKg0pzadHvBuBsi1P0so_Qn1G_pcrQUmYrrkRxmW0-xKz;{Vq9H6ZqgG@vF-;{W5@ z=l)+jvi^U$KR;;(Oe=T&|NhmZ|1j|E-X&N9B5XiwqWb^SdzSpaaCq(iYp1sVzj|^j zn0;*9?Ef{P;+O`Mcyhd=ATzyWDE8!PEb(OjK)Pn29-v+TiSr9ZoCao$00000NkvXX Hu0mjfS3SU3 diff --git a/resources/images/icons/food_cafe.n.16.png b/resources/images/icons/food_cafe.n.16.png deleted file mode 100644 index b05be3cce5d82cf50d016cc7ea48cc89128f98be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmV--0f_#IP)G|cg`*psu20myg(#Q({}&l!rnIX;nX08lU7fCtx4{C{}kBwl=E z^NjyBq2m8beR(hqc>Da`e?s8vr?>zA{rmU-N~zQT zt0%VnKec-issZm_J|Jko)stJnPG8ZN`v3i_$EXIpcyN`V0T&Lh0UNM(YTo}>Pi~$BzfC^?bg7Crhlm7qt^9w`c=MS&`ubi0qzbaS+cS3?;kUyW^ zz3~6-iwFN-KfUw+-j$>Or&qWWPKjhE>o(i4AcYE3ji;8 VkrX%BsUrXY002ovPDHLkV1k#b@?P)eLw~M0j{cjh5tgkpd@fr6hXC> zvNq8d2BAz@I&?>`*SYh3PnVY#rZYa9cX2qs_uA##Iz36={i zBRSb*`TFD z-oA-s8jQ)B&6c|}{Tx4klPk9;7`=9v+|WLb#TJ)uO>pY^J^K20Vm9&S(C7^gp14Z2 zyoo^r{zCSl-FUR@??HgH;h9$D>581VY>I8)E>lkVz`dpOGc_YZgrvxo?Y*%%raLsVI$Fg*XP^Lpguvuqci7H8kxrG|cg`*psu20myg(#Q({}&l!rnIX;o9u_I0I|Lj`7{~*0&8L(ky z$^XU}Me+^UyQ&+)CdPoiT#Ns2p5H^k-@bhKzn~?YI0KsEl>cJ`Q_Eb4GoZwq>;IqM zKQRnwj#ouBpek7Oe{YW2|NcBnFb1(fVj#KKPw${;{`33S|56`rgaIIDe*gLr!xoTV z8=~a?-#oVmMI00kD1iua&gx0oSaDOV(*G0N=b{*J>-;`c1E!U`{l9Q{Eml0G)an1W zg>@(ffDA-)feO&ny;yN$jKcpVUGXRefDFV)2eWE?|Lq!fg3R=iq1cnFvBZ=81L>N9dVqQXa^gt4jz~qP00000NkvXX Hu0mjf_lvN_ diff --git a/resources/images/icons/food_nightclub.n.16.png b/resources/images/icons/food_nightclub.n.16.png deleted file mode 100644 index 535553aae250d542a83eeb9705b23bd6f0ed8653..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 685 zcmV;e0#f~nP)1wk+;jgrGj!;*9VUoWQiMV`?M}3U*(#MnLB+1CP!Ninu3XiXq82x9%pwvb z8yAX#e-H^8Mj-)_1T`@t*7!%_j5Bv;?$7z0OPC>Mr_bf#obxU|ct5T@^W?)X)!p6a z5Vagd1w|@8flVx`0Y?~QLJ^+E`Z0bO6UJ47 z@EBP-V3_pC(}eQw%pkCWaG1=i(>imG=)`?ozj>Ra-)A^Xa7B(W9zhgSt=4#Z{uRFb z;0>_|vfBYL09?BK6c0Y~C@$f;jQLbFO!OuJ2@YRR&_$Eg{41h7<9SG_`b^88e z<9*u8@AC4}CR-b8{IL2Kp%2!85ygtYUfxkdi!@7CSA_891{wc0?@1^lyxU0sllp3xx}H1nHg_?X7(aMRAJ{&!xZBI zus;l;NSRQJ!2)S0vj;-$;X+;cBw&qkv` z|L+dfh^Yj}0q`rQ{*{X;24H)8i!@CE$g+&jKl@}{%Z#-&&dzaX@e2T6U09}d{xS9v zkIulusX?B#HBr{c#1)Ku?<7e_@VFtxjC2QU1nBufz9WuMnp{ zkz~e|14jLk3&8MSsl}wWXPS$(@V9G-vqJeDbOS*I0919X;K~yL1rf=+G?)GX0PqB# TjZ6lS00000NkvXXu0mjfTf{=7 diff --git a/resources/images/icons/food_pub.n.16.png b/resources/images/icons/food_pub.n.16.png deleted file mode 100644 index 37a745bceb8a10a32f3f73b1dae8ebd776f13af0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0WG|cg`*psu20myg(#Q$NqCRF@?Yohx9wj|B}?J3$|8ibqURsL6p zi2X-a3$mD@*qh@Mh*Rpz^Z)zTkN*jQr*|(R3;^nd8vw!|-aP&P^ZREEP48Yk`hWYv z{{Q!`9s|=j4Y+sZ=>Hj&p8q$`srbKpdHes>6Epw!<(mI*j8O#Rb<+y|pV%=Ew*hDN zF8#l-H4?4?9UoXX;s3UUb+`@KvAF5~)&;dV4Y+t@{r|-svA7Lb){_KwA}#}--@o#I zQjr~Q1E!QZ{l9bZ08RsbeEaghK2ip^0U$*mUO&OAxj)YmXuv1bbbxL^i8tr}Uq8S7 z??~0bFkoS8#Q$dxuHZKSgkL_s`F~c84~79-=2rc`a(okE1FoOm`G4K?0t^F=Zl3Y~ z;QC2~4LG`G#{X}h-~WI6@&O74CG+*ui!co+@#J`gELasR`oA~Z3>aPZ|7TQrf$_uw zoBusoCjZL=1kf|nONL@kuEr8i_77+hL|~vEpk4sc=`+66@;SEv0000J!hh!{>W-f_lFN$X{ifA#5X)=pxGmUIE zj%_%PZaI{7LYaI_oPSZFhFPSEUaggGua|POoOraJd$pf@yQhb}s*As@j=!ysz^;+P zu#>~Fl*F@_#k85ox1GtkpwYvw)X1~d$+gzXx7W+K+Rwh;)WzS`#^2V*||9x?9IsgCw3v^OWQ+0NM=jiF`@9^;Q0=Br4 z0001@Nkl6iRr-$jax0>^K9BOdARvsy(CnOFb-002ovPDHLkV1hoI=S%9t2_~k8z$z=>c%`bqQ|H$}}`KteK8&Cd!Kk>r<_kHL8zo|a{|AE$$ z|LE#&0xbr*VB#m3z#YMv|KGKr`Ts0r8&JdI|1V;9{eKa^`~N+K1^-{B?*0F!^4R~| z>{HDEU>fkY4Jg4m z4J3if0Ei)Cv;V&?JA!J!L&N3&pU3P33F0#Vj^9)r`+rwtHo}0n4JZFUP+J7@Bgk|x z{<8iK+<^B}FT%y&)E@u;$aLlZ=g~V62E6Mz2eyS6@b}BF|M#Tl{Rdf!FrXJ`fc0vk z4EXo;_y7A!3qetfFyM9Z;s5s)7Jww+_-*}3xTa?z+fn2mJFffx)ORz&fP1p@{=dpU zNOT~+Z9WBxG1O>$Re0$CJ(+og41fe+)DFyaaEp2J|2K6f{@+(#2r(e{;Q!yxzWo35 z;_LrMR;wYJ%~k>pK7c(Xf-xgdW6l9^2tT%8`~RNgT(GO2dT#vxuJi2w=Mi9=(G8gN z3O$qD;hz5gS-_V6uZs@5&S z&bbQaV>RH;+B+wx#$^GBZ9L4 O00003lpNODCnV!s7-{qYEe`W5lFNOU9<_TU5ge`i;yTG za8Xte6-gOMij|r2J(1=GGk7Nb+d7lSOtLL?K5 zWWi_T<~dx|+fUJS_5ml)J!4nHCGrbOIDY27I(N~~)J{=Z4cQRjvMj~J{P_A<-&nc% zD0W9FkvR{)2A|{ed}h+!OEmnK)i3~3$v6S;H!Qg}gvikjT*Z|{Lta92Zh-#=Xi26L zHZk^2Npw+Ix{(?GPeLh=j1BL3w;Q?;|}^$;R^ zfDoX3kcdaH+6oD)>Z*;BdXe?jhp9hwjbln|ae2*(Hb$n?bSgn;b{t_?w8(W;`)O!w zr|!TNcJ95P&ikm^(n#IGt7^>+=(c2#PA7=XPa|cD*upHSR7}5tg{U8|`vbp+x>eA5 z6?&7hwL1Wbg$$&bCNMdOCC{$f#MN*F_ec-wk&$P0;`8)jcdlW|+fOhs3W${fLI~!S zys@Ex4%u_$2Aj5>U>Oyf#53}St-G74t#9Gui?)>kAe6`mAoV|Cnn^M#t*AvwR&5;0 z(I2Fl!XPU`@BZo4Exx?%&_V%S-#h-E?nliG^*uxahJg9iLT3Em>3!M8>!+6)9q3}X zzZ3UxkMcC2g#%I1(Q3OV5T}6xvLZpEoggJCC08SfNx_qUHZK#dk(*jG00000NkvXX Hu0mjfG<-GT diff --git a/resources/images/icons/manmade_lighthouse.png b/resources/images/icons/manmade_lighthouse.png deleted file mode 100644 index 0d596be67852bc716c65dfe1f53a84161e1e0e95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmV-80>}M{P)SEMLBp&qOMZ_oY1@f4l=!^6i_FRj zejFX)@9Qi4nHl(n0+O?{NR>*6O--SFe~{P;YW|Br+9mK zV0qBJ9@@9JXy4u8<@}s+*cWua4~ZdARb?{ZOR#CJHSBY;A0i0Ff^HY=fSouP0+qc~ z3hW@7%V8WywipqhJ4d6NqJS}&gkb@aC}72y|Njfni%)1t?7;K=iBmYk1u{4D6EYqL zm&r^LFd-bz!+)Eb$gQrzw$7C;?(865C}126U>yFdxU%K_ePk;YSTIg$Zx5d~Hpa&2 zk=y8W4&7F(_U-t%8c8O_h(i#dd2@re!GM#EIFtN4gt*zCUm&kZ{_u}H+s;ab1Ov`_N zzhh&+WMtl}tFuT*mn$$NXb zR#xP=xaGUMyk1`D!ouXax!Iqe(vFVgx3{`jSh!SFz-MRLqN3upwaI#V%6)ypY;4t) zmClBS>&eNtQc~NaqqBGakU0v(Q$i!}LYSPNQM~000YgQchF*`^{VW`uqF)`}^#m8s`820NhDLK~#8N zMbFi412Gf?&};8*lJ?rm3}I#}Gcz;%|98|*RdrrQI+~XOg{n(A0wN^0tWpIit_R1) zl(FuVU+y6VwHvKElap$-u~ix-p$cSo!yP<4K0Uv@MsFR10QvYVnQkjhTW6bm%@d#x z=Ld&(mC8zQu)SjmFgo#m=4LlXy|3?61^}Ud&M)fmq<(e%-UtOScAMCaX*$U78Cw9N zT`QMsHsUYH6r0VW>_4zZK`^rZ0rj}uj&)psCSg45_h(}X8c+#-2DC@|A#iG^S$k5F04 h$c-})Q8#jx`2sgNOj~dt@Kyi-002ovPDHLkV1k|_k{kd4 diff --git a/resources/images/icons/natural_peak.n.16.png b/resources/images/icons/natural_peak.n.16.png deleted file mode 100644 index e028fd13337a5fa28e385b7427f21b63d0fe516b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 492 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJXMsm#F;M&gDp*LEK{GiU4RQ%4V8 zJHB(v=FO#Da~_@A^5WdK8;3W(I=AKZxh-$bZCST)%Fw;VWd{Ql$DuRnhJ`a^2=kB>mTj7i?^E{y+~bngK rU0AW}-<>eEl-+;h5-u1B{QJRh_lJ-VuZ61`&>ak(u6{1-oD!M?000002VoOIv0RM-N%)bBt0O(0XK~yNu zV_?7n{xdLO7yi%qU*^B=e<3VNKmz|+ziB4#bNfBH`#=AGW(-BYC7arU?z;SU`S124 z=GgAo|7>Vx?1*yx1CjS<-<7)WyK|j*BfhxC u;$>V!iIj86%|)lDJv4UyBYvm;>)N`=<&zd&;jy_7vdz=g&t;ucLK6VNKsGx7 diff --git a/resources/images/icons/place_of_worship_unknown.n.16.png b/resources/images/icons/place_of_worship_unknown.n.16.png deleted file mode 100644 index 1aba317a319c946bdce3976d83321d8621beb0c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl47%c*PLR^bI*^9k^h@;Gx2S@@@ zi5Ev@pdgS@>dRg12@)yx1_?rCfoyNiB2P9T_y7O@Kt>VB1df0I{uO(30!=G)XDRXk z%Ci6c^Lx#d+~2=`v?Xa4dazam3Vr$bW^#$+)4LZh9or6dzbO;r7J?r}r$W2o$Ug67I<|e*WNUU4(Q?g8I#Kdppzg zmh~j9o0i`kuk!ZAgNsMjy?SzMTDj|vMU6|l5*D^bzIb?TdWCy|8`J-P|7ydfda_Ng z9N#>x-0i`&<1=e~9$Y)|@$K{NiyG%P1T{p-E$)o_^ZVD@sd>*ITxp6`I<|FIYof-9 z9rGsSTc6lI_sWSa7Y?mCu(toh>nDvdijQxfd-3S{uWeJ;0E1GbB*-uL+qbXZo=+uIyIHyNP(2~QWtkcv3lGgpfa8;G<#e0+d`8j$a_yU0LC{`nu|}yc7IVF$!^UvG+X`wwIsy{GPL2 wvhe4REeESBm*$9Vv1~QBKNuYmGHr|fxBCh?Cl;2>1Nw=<)78&qol`;+02;b0_y7O^ diff --git a/resources/images/icons/power_station.png b/resources/images/icons/power_station.png deleted file mode 100644 index 9788c21d14536084680c063623baabfe63bad733..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)lyyG`_Xk=~zMKrp5kCo-8v{L2lSIu~vBhO&c4V zvY!qZ3@A^Ll_^blXo^@)vT50D#?&}Bcl@x&<~Em2BnXC07WzNRZ|^9Mv3JOqTWsy{ z{3#zT^6ncfy#D`kk|a=?A}#RgI^X}o(mR}-^T`@teK-6U3CIZr=4YZ0NkaW9N_w^S z7ytxbsWLLc(gJVIGf|9b@JK*bqTQiCpw}lyd2)E1DS(_-CwdVO0?_Uv0Kx-+vkPkF z__&ae=bYDp0gg_oWijIFH1#GaK)1u;pUllfK$1`#<@aL*_K*1dYd%=u8u zuehl5;d^lbrHNSWv%mOkoj*?a`5^B5eV%WrFjjMCOJN5=hqnNYqR7C zB4BKk6y$900=F%0+qBy8=5J@9Jl}g N002ovPDHLkV1he(^6>xw diff --git a/resources/images/icons/power_substation.n.16.png b/resources/images/icons/power_substation.n.16.png deleted file mode 100644 index bcf4f06953fba64570fd242b6d5012035517b770..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 478 zcmV<40U`d0P)A6GxN;JQAaIFB3fh+6)hrKwQSeERnWKSOSBF83gJfyA&5Z4B9s60*p??^-;l1X$uKSRto8G466_#C%c2W3{#vkn;_pA+uB$uaAXR&EN|2ouq zw?XHGY6XJAjO0B1Avaff^I9u+dQ{3hzDKtokMssCEwFxz(-B{P(5y3=a@1jEk-eYs zErY~dgRNcu9EI@3Ga#3#Rrs_`yUR+8+iMVHNGO*`m`>xD%Rs5bXiQOr<7gCGf=nPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D03mcmSad^jWnpw_ zZ*Cw|X>DZyGB7bTIx#RhF*P7CFgi6hIy5pr^}O%^00JmUL_t(IPi2xzPZUuQg}-iw zM-PI7piWeDfi74Wqb_}|G{%LAE8`<^qkq7KF8l{B-05FnL)@8|XySs2%HWH{2a$~! zbez!vg|SBlrtwtYR(jwhmA-we>fAb244 z@+iTAEUy{C?>anx3(G5T^Z;Z7XwM`u7NoDjN?vV@urg1O+XS0smM}RD51+z=0xUJ) z>?9M}|@*fu+X}JoI#-XYg2j#Pve7}=m)p|?M2)|VcelEHTt0w4l zny=r1n#k_nkd$R;$n3$4UN*_w`w49dp_&rJP7(Mb=n}!#?{Mp$Yue2#Fgyf*L>8%Y zMqo1K3Ki~xOi$3ICUxjSw-fJOqZVpVe5V*Cn$KeXO~Viqq+t^Z)#b6*(z^@x?}Ne{ zN3?!73>yfHVYcEVNF!OvnO}hE&xwB>HWCO0y}ozQ>20VlhlkD94 z^Cz8t>%3X67cQKFUd=v|q%^#!NJXq$lmB>8Oo}a38rBcnSX=!R%D$3Eb@(CEnow6j mUCHq|ZCbF{m%5t+?*9d#Tg7uUfyCqh0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D03mcmSad^jWnpw_ zZ*Cw|X>DZyGB7bTIx#RhF*P7CFgi6hIy5lR``z3C00B!$L_t(IPwkVvN&`U@g}=!U z$tE%J2Z`VdSg3`K`VNAXm4#qu;bWvpE2P&(0=7PYScnQ1K7=V!h$Pvlad$nl6E!Q* zfVBrMb9V0BvwQB`HQ^0)47ZjRXO52*FjP$U694%XuaJXm*6m;2!^t^Z+(Axzo2#(51?$U@NyFd` z6^Uo?&EOhepXzme$V?&8whXmHSqPNxIXgw=ZODRedl17GPEWZv#@&}^>pQkS^j|KyhL#HM+2T{cA}$yn z9*2+o=$VATU+^z5K_Jj<1iJsg)y4{}Ejd0G5gj{;4bdHiMkt91zq1CK Z<~ylkXd~@pb#wp#002ovPDHLkV1oSG!c71G diff --git a/resources/images/icons/shopping_alcohol.n.16.png b/resources/images/icons/shopping_alcohol.n.16.png deleted file mode 100644 index c1a774b9be1430ffdb8bbdf908142cea2cda1c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmV-i0i*tjP)9rhZ+74O;qJP-KR`503>#i+x%TB+i?wA8K*kH8z<(G%ka6HY2!Lp0 zaUA$L!y2nKpU5@O}YVRS|FPL|ASDMr(Gt^fMJA zfX90uqZ)9HN(O8T-1h%S(UJehDvtf%6Tj#GTI;o>8Swe>=l?(6|M>so-H-pjzyAKe z$!!y92E4!V9xnFt!%vV#(hNA;arXbee~_rTxA7i%fp}~At^Y4hyg>M$R0BXM^IZ2i z@}u!k-l6{&Ctk#Az$=)*wRzW247juU4n%zJHF)a0zvVu%Aukz#L?bXee}DTM=RqJ&gdk@$i?P0y!Z700009p{ diff --git a/resources/images/icons/shopping_bakery.n.16.png b/resources/images/icons/shopping_bakery.n.16.png deleted file mode 100644 index a52d20b9dc653c98572e3e0b486eb89be443a164..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 550 zcmV+>0@?kEP)mp;z2~bDk>W zHOWSiG}+y3^Re0N&&;JERE5@o2j<<`dES|4<_#!8<(V2%{RucC##&H&5KuyjBOi_f z<%D7c#5pb|ms>Lg(F;+sFSFD?)ycokvvhe0{jAQ`{1&wjH7a_AmAREa6C`gXaheYM zKlbs*K4!th8+tf~!_XWu9*wc9Hh>V#5-glsU}z1&hq6{CaU((PV-2xEdqB6|W%c$d z8}~M_DwbR%l}rgX?{Cu1wlU%ca*mvj(8+bA0!IB2_O4CxW>R9L=2LhBkKC)=ltB6w zOFvE{=f>v-uI*BJUt#_3y7=^d^$4E|vvy|<`@2m^ElmkBPcrO%+av!bPwZ+8vuH{J z`WYRG8wrEOk$~E6WncESb1nSK1?b zF*-Yi!rOxA06sLoG|^6K2L$2MVT$jHI1LBS_1J#CeRzzLAj-=RR@uUJTw0kHokEA+ z&mR3&Un(Q}BK!A65{O8WC?(4-h{=d$x#HL3|JuY^h=8Ka;-$rzb`B9}A+7Tt?_pP- o^W4PQQG;sjNC>H4^^kt;H_Gt!F7c4YQTsh8>lg= zGb(_@{tCcMGH}niL66ge0io>>Qb#F7b|Zb8f6Wg$DkF8A8VqpFy3l%RAz%q0u%U~@ zOW>Bc!2sW)5AEkRvKLvz_v3xZ+w({qB)$i*W){M^fJ&r-=3^85Dv#22NiSO1OgLVG=QG ztX~GX(KGMqf2$mm^$dcRAnJ)a3YP_jxvTk+i(xqDv{R2^_f(}96szZl}E=2@EMeULaC0S5ep&5!=8m-Gl;>Yg7 z(we4iemw0v^renI@G!IQ&iv+`cV--dQ<@4>bo5&THK;<~lYvI(T4*5+{&9cvDV&a; zqL?XyM8}vuNuyP!Y(m&?2G;!WL0~LV@if+y$)+BFuz@HqneYzNV3}jT(#~$~X@P6`x>6 zptVsK`86|?Adb%ihkLn)@5kjk=a>i!VJFN)Q$5>@BxxaAq?tT3sh4;40ZV4nM63|s z%K|j*!T|1qgXk6!um_||-gpTr@#B`A*yxN{EdA&cTu(HKDQ(n#8q$XsPmXY1&H z_3P)kYrZjj9YTN8k=#$ZfKILh^V3BAt`02VEA?K5 zUeoEnasgyLca|et7`zPNrEz;qImjGkK#~BWE>O9tU}5=MpfQ{#GGIl?0PRu3Y&-+W zPz~y^G(-@FyCjQohe*na-4if?is73$)002ovPDHLkV1n)5u=M}{ diff --git a/resources/images/icons/shopping_car_repair.n.16.png b/resources/images/icons/shopping_car_repair.n.16.png deleted file mode 100644 index 061be6d5a37a62f0fba7c14e5c3838522fccc5ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmV;40e1e0P)Y^0%AGlB`h&vZErH@6Sg3v-~njlC?AJE4trLTon zWN1TXj=2aaaZpJQ9Og2Y^KrS8#8`rzu{az1=UWu>1fTLaPsaRW;$L7xk7I0$eMAY> zk~KI_4%MJ+WPn^rD5Z1&-{!FIYz%Y5kgY2#3~(h#8lZk&M?2F-VZX5UK>^OQgVIsy zf550RLh-Puja)gYpmX2(8(`ns5K{pq6@JQFdJq#q%ljQLf1RUzT*mBWrU817J(y_| zecoRKlnw~UniN320UuC^CZb8hfaXmTBp;-`!eY353j&f_nO1m-?xzdm z($JPj3nVbr^!_9|p%4b-_wrhpoZZPHx0?&bm!5=}3&^F6{v}pVtFW#u7#9Z2loYk6vgvct&1QcNQ=AR;N;+P_i_Wh_ES5zsmc(;`E?(#XerZc!8*G;Lvc6e| zcA}wk*g^ZCoerRE0w8Tm7+eo9z8hoC=ZLimSKvB_abuvh-}(+vstTqLQv|aBc?yFN z&d`B=rLO@WzZ-ZIE}+rvC|Sbfeu9O)fcNZWhJ4qDYq;ktI_#^8vk!9+uuR8lEqT?#;(sz}oVzjP6kv>ahy# uR6}#GnK{b#AC`#=bg0ofzZDICW@_(ys0BT>9}z780000DsxOQ=Kaq}<8eQ8RE)YPFAp(2G6$fCwV8Ze3U}}5w;lo%orL&c=sL#`T*9oh0a;$Z-ISdBWGle;M_WxNAjMaR<0H0)=}$A zpimIKM#u@B5Yu#u|1d5MxOXlBJD3U7vKo#b$LOASAryg_W6UG{NRdPdzG>_?qF+Po zUG!jUHv9)4{KAMQKf=D+hk0cpho2avEVzaGZXM0TCaT+2XnR^QC;dQQe~p_Xcw6I` j{QR6NBoi-Po^>jpE8f%GeHAw(00000NkvXXu0mjfp=6aY diff --git a/resources/images/icons/shopping_convenience.n.16.png b/resources/images/icons/shopping_convenience.n.16.png deleted file mode 100644 index 9e1cbd159f5903c7b225389896a2f291312b408d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 409 zcmV;K0cQS*P)qlK`#f+19YB&j9rCvbcya3tL?A!_ByK(3|cl=9C9wecqwxFBof_ABKFI|^- zX0J@t8cGARAAp-4ehi@&sX<~t!99JH#*A;~ZrmAQWh_V?ru+a@C0qehHo<%_g`*5= z@Ez3e>$n5)uk-;HlmIaNv7~It{e(z>d@bBO?Fsz=fqKuj2VEh800000NkvXXu0mjf DpAEEs diff --git a/resources/images/icons/shopping_department_store.n.16.png b/resources/images/icons/shopping_department_store.n.16.png deleted file mode 100644 index ee77e5914f181911e433e391fd717e1a1a3554cf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 646 zcmV;10(t$3P)C;-BLxKqK22>U?BAf@-1)GDe00R4tPhtUXwR z^R^R)Q6)OkITQ5_16FRWAZN*y3ah<%F5O7Fw_*bC!?5!Opq+FYf)KYgrDuO0!&C@KGI z($?24dO-4~c^-LSzF;0SkRH?Sk6rl&_<3ITNwGx@IZb9IqeQf%E?s8bb=TG6E^`fP gpQO^y>r&j@Up{6R&_`?s4FCWD07*qoM6N<$f~55&^#A|> diff --git a/resources/images/icons/shopping_diy.n.16.png b/resources/images/icons/shopping_diy.n.16.png deleted file mode 100644 index bae72db065849d2d2ac90760e180484534171c3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 449 zcmV;y0Y3hTP)Ujh$#`u7X{Kg35(tWJeyw| z?6e)aAG^@II^Y0~TlQswcDj99aJWz)y_Zf3sF9HZYN)v~G5RqI31-p^l*7#-T2Ove2E{h*kU-6; zgsH*Ng6h*Mc!GQ=4nf&!+y4lj1O&-|AnOT?kr6GZJ*$C-=78Az=bQ$}=i}1&yrA)- z0Uq&=NQ{QZzX6J4Ip+oS=XLmklqcA)_q-=`61t_3U=|eQ?&WCq(fQEvnfytHWm=wW rxyRu9fWOn|cTTf7TNAjdygli^3exe)>y+f500000NkvXXu0mjf4UX32 diff --git a/resources/images/icons/shopping_fish.n.16.png b/resources/images/icons/shopping_fish.n.16.png deleted file mode 100644 index eb7afeb095f0fb456274502ed6652e360ed58cda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)9r?c&+8ymuoH7mN5VsFMtC7$;8hY)>y6iM79Ayy|go6t@Yafm!@9& zzu9v$X$EX?-thlW?xFt=w?F(30>3{0`oBG7J7EL1_-y%qZ{xlHe}4S=j}Aa$cUIl` zzdaaX(5~oR|Bsd){RTE*fBOFaKi>ZMPYC?``|tn9yC46*yZ#Qy`Tzf5*1@j~yW@6$ z`Tgzp|Bv@R;?)dt#kUvV{{Q^=6U_hn>+k=yHfujIY!BW3<=K&EVAIjT+beJXUz>OB zKgfkZ#qhvA(|QIRHhWX|eg%7BtKZiDM@x?WKT&<+|CQ-iz_x%~gf9xW`fvTeCt=SQ ztkJm6Zr%SazFP)3A(3LhD+)5xO9mj(2+YnONY)I|(+B`3(bH4yaJ10?0000bO;-X(nXenX*PcJ ziH|?>JIO%_DllFRr1ny9 zce&|I{k-51Dh&X4w;Kn;2T1NDVZNHEJXWCHYXrOAyoT5*S_1^T0C`r1ey^jHE}@t# zLMvz}-W2g1dnRaPC4%jqZ3{rFfaqG3>>3pV`lJ4_5~Q3f0|08}8s)<5KLOPA_Iq)@ zbdJn%1~2g!8bQ5Pp#&5>T|QBt!fXbpyO5j`jqzr@LCvV-B7d4kd@D}*{1zhVY~c)M z)uh?)j_(LmRjWw*(l{DFg3uyZ0*LPE^&mVSM$j3Af7FizOW&MwnxAgKdIW1Fgal&ivCoJ90pOv2q)s6QCIaN@KLDCHG!;T#&coB^Y3_g* zh2QK;lM+JHA-LLI&Grj6{%fxC;(@Q4rP`YIAGo8{cZ31em`c~Bs{jB107*qoM6N<$ Eg2HF#;Q#;t diff --git a/resources/images/icons/shopping_garden_centre.n.16.png b/resources/images/icons/shopping_garden_centre.n.16.png deleted file mode 100644 index 645e68248d97ea596bbbceb87baeb45708721d3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 435 zcmV;k0ZjghP)qYIEwhJjlyW7<6|eYDj(Q9ltL$G zoEXP{w+RM}Tc`*A7Y^s1-#zEt!>~T~nDw*Wus@7>MDlvv5*K8MqY+^dk%v_#>}H@hby$51-&Ik}ZOu>(BsLTDZ_MsxF?=1mGohJn*odvi{@(-skcVSCRDjIO zGc6LW1-GhBwlfXj0$h&_Jfr7Zvme1hr~Y3B8v=1VL2PDk#b}(W2%um4k~Mw9y&G7Ncm61R9w- zlTl5EX6oY087jFw7DbCLeB5)t!};9@_gI)FW{R;gT7A}kBGN?i#7d?u_29a0;Fr=Y zOf&Q78gL=H8-+M0g0X#Hu;025x804%Rs^0=4~$w9km6DZ&Ib`%2|-mMxQpF^AK{VqrIB{0p`YuhJ=G9f zi!}ho4y1*E@8=;e%1|5%{9}F;E(&=mSRC1o-o4%P)_mn;x_!impy)OzYp7Qdp;5%$HY%`>-srMXn-2jPfvW-qGlDqlGse3bXP)b zJ%&+jj@4bG`>dP3{tD66CZOp!wQ_{-Q$)N+@0z(U2Q3Bm?4^=q^x+3NLc!x#@z?LTEI757^U87laqXfC*1p zZ!PCnV4Gg3RCN}}H!@r?f#g=wS-|Gdes9Bx>T}ioE3l+?Q!s}n82#_QJ(q5?i^xi3 zs-Qmk1Eu%UP@WXTH{uZX1-7;i*hCC=oP)$qTC6Zr#y!Db?dbnNdhV6=00000NkvXX Hu0mjfO})4Q diff --git a/resources/images/icons/shopping_hairdresser.n.16.png b/resources/images/icons/shopping_hairdresser.n.16.png deleted file mode 100644 index 5ca28379ead336d641741712b32e9f74d90a669a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 590 zcmV-U0n6%(wcyHdk`OM6lHy-b>cg#EFH9KqTAQ4Z9E$@+i z-FMvA5{3m^7!q!KIvcBVh{Gg#CyCVE6z|28B9=cd|FxN(4teWe2l=Lq#8|@BgJ*+S z{kF>c^u06|9xw2oeER?t!O1&V39X?1wT{Y61=1A>cGhNl<9h>hBXb7=$cZnhuT^Mo zHKZoGsXK}T|0zG#OY7t~7$9Ai;1nEGKUGnBRzm4{39;+3F4$j3ak@x$(gy?9qHCy& zb=1DpP<&cM_CXebGXb_KQwl|=2OJELZ^>xpnkdhdp}oG`QV!k5A> zpdmG&i#oQQZDj6eu(Pp49buSoOz37nt)fF}A7wy}J)PmzOqk>VGikD}3p&Ch;op59 zDRd#!3*fiOKFmV*>8ux~3(($auzpx>2F=3;DR4SKEv1@CcjqB=o&(u5&Xb*S{z-=a clCIC>ADLIz@d~bK5dZ)H07*qoM6N<$f^R<&Pyhe` diff --git a/resources/images/icons/shopping_hifi.n.16.png b/resources/images/icons/shopping_hifi.n.16.png deleted file mode 100644 index d30de280d5211ade5c4f3f8fbda1a192b7933b1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmV-_0f7FAP)o2{i2TH_Yjd6!9K8KJVer^EkX5O zd+0oOAnzr(D~d7K_)a}2=5ePQP(CVi0;>PsM`5!7c5qG{RL`nloZrY}@X3Rlba$^@ z4X_Vwu#h&XCq+A_iViU+^g`6mYZ~y^fi`B>vNONgTsFa+;#M)u6r}`)<=ylmW6gkP zc?5TZpvFjEp@K%*XnanZrc8(&M3B5mB61i(U?%|H%p-OZgLB#W1wgzCfMdylN~nUY zD~sfH5{dH!@}9gL$4}$x0HPF?LYhgFugl`DIOOhgp!C%50Ja4iTICixLI=H<9@_Ob z!uw&erw$-JsK@H)h#l}I9`Um{8o7oX->u%M1Gq~LwWk`a^VW|XJx(Kan}WazWIY8h}O7qo9Zg-Lo$3leR_Z z0dHL3B~ZtL6FSuI)w%j|#rW5lKSC#PNXIEQwM4ffYIkZ}o?IeG2s|@D1^&Ka-k)>v z`GV$$CV84uyLRbrR1zQ2eGkSfIe+2^8TCfl` zB5ZCMGzWU_SA5;!A}&iXt|5L96W@=q=(lT!{mK~dceT?)hqUfDxgD==t%i)GXv zF(1tFH+@tZxF9PU*vwLn%j`bd#qk_^UwdTJjA3g?SPj{Kx{vF-Dqk+J7Vnxz{jkoY zGa=jxX&g25*I6vvcelX-?3xA}@dgLa543|9dF(yjQ$gu^3G#IfG@8x;1^!K+|6y3f zvW68q5JabK6^r+cAOlcz_B&@ChCheQk{Q_~BcJ6uMAPn+2Cl4 diff --git a/resources/images/icons/shopping_laundrette.n.16.png b/resources/images/icons/shopping_laundrette.n.16.png deleted file mode 100644 index 7353af7d6447095a4c0f43f1729878b78e98f699..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmV-&0ge8NP)Fbk#> zt=kr&4B=(i8Vjg#g^S{5F@e|>DD9V^AL`)S9QuI{M>rG)Wn+P*T2R;31dZzkYL_*7 z597!{yU?auUhoSNf`2Lo{|5-25TP5Qd*4kb7`Mi>D#V^3;6A(PJ@n)Re2Zf_UB+Re zd{V}IG?xkZ>O~cS9l$Gl@Lzq*-e%xC zTwXwE8ycE7P1LXI>Cc$tj|Dz8!z>% diff --git a/resources/images/icons/shopping_marketplace.n.16.png b/resources/images/icons/shopping_marketplace.n.16.png deleted file mode 100644 index da64fe26f6a3c5a6721890497a42a036e769b33f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 664 zcmV;J0%!e+P)HG?J)^8+_Th(1jZljfs9DKY(As7)V?g-Du3#POEarC-e|D#_6Bhn)BmlHv*=KLxr#Puox};%-713hzVG23c>tF#DWzOB z$Ihoa)LyCK{p8X8x=ZcV8m;$RI*tBuAOF;+{ZX6pPMQ3Ap5gJ3&<{%jP=B*d<;4op z?d2`ue<3PD%7B}73A}*G*#rSrcUM_|eVvQL3tSB1X^a+85HbE|O!0*xv;K_JZ%&a9 z8f&Gs!r=FTPDSIXGf4n?-}Mk6x0YkExQKM~%MAjOLJ}r8S%<5mE3`SD$0YLv`QdUW z6_G%(RixZ5)BU!~xHD#9c>$SMY!+FnFVX+CkN303o$dj;n9X-KX};Sep2g@i|IDZG zT!G3<6}CRu!aw)veAPiCV~+tMAeFXCgp-gYO3?iJ4gVZ+vVTHw6`)sndD4Mqln)w3 zMveX+p?T%L0yH=t5d0h9=3T8-cMniu^Svf=I+{jgOIfx*-o`N0ftex0)RB{O82mBd z{D*S{5dfu3_rLbq8rO%{%>6mq{7^bo*=W4gVAL5Qm}&$-q~Tvfls@lAkLh5F*;7E_ z`2wYO38hdzsK!My&V7g8s-Ceg~RXpsGDahdZEj}H>pxqx$@6O~*AR94nPkrm-R;l;q=fzAXn zZ!@5(=Btno%9vKBv6xxJlzR$xD*qR#nKe+&_-Eig;%+sn7gQMU4UG1UB6Kr^;Pv2N z0pBTKJ@qODSLstL76T@qLyTaG@Awrr6y zZJ^21I?@~AJUK`_OSJkzH$q6hNd6R*b4q>o%Pb#?v|B>nmxsT{za=udRE2N>&b>~u z&IhVp)s|=mf*qX$tGZ;LQg0|R>it81bDTxaLBcBVn*GJ{sJ1&WT`LE)wVabJX9 z)*(O2(+0wpfY5e`v8!}pXoeFzyc1@6`=gCouExH}^2i{#7KEExNrRGAFsbYBx?BG@ zgXtEuH*G9x@+?W`K--#VVa^cMSCtJbf1QV^o1n1!_TnK%b|Yg6)RGD}YS|eH_;nuf zqd5AVK5Wwlh4Q3;-{4VxC_6hqVSbrNU!cXY~=}to9rGea4 zj%ti!Ef@_0ZpdkwMV;X6AtsI!unY?WYvAlWHC=E=SOWQHh~l1z*kO!q-vUyDD!tBr h;w3HW_!o|9{NDzD=?G!@GH?I@002ovPDHLkV1gvR$k_k@ diff --git a/resources/images/icons/shopping_supermarket.n.16.png b/resources/images/icons/shopping_supermarket.n.16.png deleted file mode 100644 index 1f9cf0109e052aa35370cbc4e8ec83534b309838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 495 zcmVwTi>n-V>E*2J3LV%lEiX?!CM7aGl&7*TEUB(`v`~PX2-K;O9Lpr`QtkPcuAR z7iYJdC{BpDm+o;qbX;p2z<2X_HlGn13xRSOz|PsQZY|XEHI!3jRI^o7)C%)!`iEv` zZKl22uc&HOf_(!rM;VBdA`;sP7KkiHa5{d<{PbShq2)t)~Pr_y_$k!p5H}cx%4VJ2(OKVWlnhvhnpevO*Tgoh12G)t7e1 z-Jw}(Qu1$rF6uC^OvtM;QoAXHXTu1N1fh8~b}E|+3g-nFmxen)7!VL$iqfAM?CJUm z>V-N^Mo-)UhrNe*R32I1 z^)uaJRCdE?u$ZsU=MJEIss}0!4Z$4K7h8#eT1{7C+7E#FDM(WiwaRsTQcsm(S&P-HR?haVS$dLf9q3uPd?^2$pu=0Mqn;>U$}(UW9d+AOPSx7aV{ zyvYhl>BeZ*khW9W!stS^TOZFkVT6rd=mHNp2hRJ;^StNH5D~~rQ4l>zko^Abf@;Mpe@V^73VQG&8NQ59h9*6nLgmzO44^b#NLqJXwz8(yS5MRBf z!ciUc{2q3G?7)~b_<@DX3()WCNZ(IG8B;(a97J^tke|+@UZ|t`wTf=Lij~UzlfKEYnd0lKX&+?0!IGH})|w_!XoAfK0yHt{f*G%CS*XYn}Zj0xkh zf!M_uSN3TZwOkFQPo={K2M)v$(P!4B5eeC;EE?Y%Sb4Y-bU$nw-|KgDI0*;I+ev=q z@>zLrD0V64(_EbFeeB5^gr4kGg;!(+K=7q0FiH3mL+pK|Ho6${} zvnG}wEVDuyi8~5!f$E5LdbNBy*^nt$6xO4`gG3iU2hMr`3yXw-YB0bY)vpu$&Q1EB Z`wRVd&7?LL=luWx002ovPDHLkV1nQf5>o&G diff --git a/resources/images/icons/shopping_vending_machine.n.16.png b/resources/images/icons/shopping_vending_machine.n.16.png deleted file mode 100644 index fe8640b153af11a75eee72de5675eea9602e0f89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 739 zcmV<90v!E`P)x3Sm$|KQ02H5Tb5^E~1MdgrNVRyAYzfi=qg+ zC@6>!1ktRth)`RN{4GvxP2Jp&v-6|(`=GHP@`1tm#``?)^FHtQ*{+{bZvobM%d)Ca z0-McN{8r06u&ZUD8vH>)%WdT{TTdAMdqI*}prN%3;f}+QBpD0Q515@Agx`#Yj zZtFS$K2q%SFeZl{LZfbFb``D)FM>@Ga^QtTqo8D+41`Q7iP4vLF){Q=bm1eJrVcs) zuxMU}%9@ba5>O-;1q6vyg$vU%`I&xF@#1ifWt#XGB$R@PwR`r708P^ntJ)2$s3bGA zM0(NNcMWk0j)$g`<)v?v+`|6_xV@%G5Bjd$7Aqnl(LI~q#IwPx^u3D!pE`;!djR zx*LX0P7M&mgW6b*LD#Y={+#asI15-VZq@E^@)BtIOz~MWMWvtpuOw)tSzXIL{SC^@ V8^-@L7vTT^002ovPDHLkV1mDMTPpwn diff --git a/resources/images/icons/sport_leisure_centre.n.16.png b/resources/images/icons/sport_leisure_centre.n.16.png deleted file mode 100644 index fcac3c31f486a8a92cac9e3e0f60ecfdae28df05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 736 zcmV<60w4W}P)UeUN@VbLd*T@a>+R`DV_XZ{`TvRqeP|)Lv=Vv@-k38c`$b{d(EDW0f7R z9UNB4N;dLw&R^~|!<@j3=WGG?g??R+o@fu|kLEF*oW|&zQ37B4j(q5i_7aD4Sq$Nu zz+S(|U<#PvOgJ%@nS*V|hGKs)s<*099xR8!Z-6;uhCAtoE8*f?iec3&lpt5IR)Dd$ zV;G7Jq3cx_#B&kd(QZhW5|-XA!6w--lbk{2W+jFXhcO->N8x(mzXbMOJEjs-(5>lE zyIqUebqxDg``G)shv-!lshbo69|I^0lo5w>+jrZcS=A^4GvvH!FB-#*R2CVz4rljg zNZ+J!dVh-WMHqG4b>!!;ge~x9ywHg{MW_$e=R9c-OdF<0LXp1+k&6iENqkSBW~&By zt9ekxHf|Wv`C(yCmp$KhKTh1AG z(yl6juS1_hc=-K*>|GYkk>;mK_-3@JU9u}e)n-+WT1Nt@MUR`G)zo0ewXQ&_r zyEdT3O18q<;u_1&GRN&>!Z>96^)~rTo^IGBhyo_bgeZx)?cH+LIn%if+B&sjjZJTp zC1(jY?=px6TD$VEIBXqq-M!YWhzMa45+||F(+~$33h5+kW!b84vGZmJ$9B}T|9$^S z4hHjQ3j+&ON*>2!oQ%UtX(io?8i$jiny1IK6fi}e4(V9~FcYBWm&*Q|W@+jV;|Ctc zkNR%R3p&VUa(E?=^UgU(KacRro*7La9&%5pm;6aqU7^ZVHz63;7+yRdJK0A48EK)IwKrA(~07 zH6}C3WMrdgxw6du`+bhKkJy~wlrK)dzXwbE+_Y~v zZ=BPJ8pLUgGA))C*?qUm>dY#YVudgYskLf^aX9LMq$zlPcAd31Yg~jE=$rHBIQVeD zN@azI-UE;QM>Z8F;$pC`%xON$XdEzliwu~=nbkPYyxN0w(a<0jTv(md4&IU*ljqb6c5xssY95_)M5 z-}xkIq9BnG4`Pa5QKHo!sT}nnaDk*MvmCTm1_Ez5$^t)-BAqK(dk9X~cNtz%Yt~c> zLOW?wDwI@~)af>O>OV1EoF>gu`dOdn diff --git a/resources/images/icons/telephone.png b/resources/images/icons/telephone.png deleted file mode 100644 index b2c8f5c188b7f2e34630bc2026ae3d6b4d054dc9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmV;`0V@89P)d}wyy;>&x+@LX5Uq>?xlj|beZankLZKw`sJzZpTY9F z+xXYD@T`gFe8uy=hvs^6;$oEPh;iXz_Wkw4^1SN%=ehB*iROD_-%;B4)}`#4*Z0%L z^S`X_qiNt+XWv%H^umtkfqmp|YT#L>?VPCXpTP3D#`D0u@wC(S&cpM(qwJWW>z118 zkB;bpZQ)&)YdoC*000GaQchDJr{)0g;I(;B0001_Nkl5CFivOD1({ zxVuB~;86VkFJdN&NEy(|DT;^^pq@QeMkIi`>NQ7FWI$a_tv5S405jDh#!CWVer~|Q zh5)e8ShKt$U={Sf+KskAT}`mLHM6}#P*>C4J^TH`qi%;#R}&|vXXh7}SJwzPw;12u z52^=<{MdcM^Gox!g&fJK|MvdT_#A>1Q5t^#{Qd!DL=h44? diff --git a/resources/images/icons/tourist_archaeological.n.16.png b/resources/images/icons/tourist_archaeological.n.16.png deleted file mode 100644 index aa614c6f98795bcbd4b4b11dd1b62619b67bf89c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 433 zcmV;i0Z#sjP)G|cg`*psu20myg(#Q$OV%8AYY-#)+p|NW~+82HYmga1o?xZ!F+ z7Bdukb9@4EHqWj6e`fE}|M#vQ`;QAeym{*Xb&w&Lu z&ML)ez>&?v{`2W+p7g1dR z;yk-|>HqgHAN~^nU^Vxz9>XvIVKZR>Qj2N8-7AL)>qG=5rU3`nPa@iYFC1EpQ}dlm2mV(DiC{MX zhRgl={+~a%3PbbVONai~hD(9e;5T4yWAOh^?_XjV@a5y1|I2!kF%2m3;55<5t&+q+T-kSnZhrllxiaog+OFY>>ph^61OV9unz^1I-@L$ge)yTC0({1Gbt}=rDYn5W$04uB2v+q zxusoD6J2U*na(yfXVbi_Y0li)G~K`Fys}Wo4*bt~c+WY%_qqIE5hsru?SMRR z3Fy5y4T!j4iNn1Rb6^>Y??jSLqf{A-`?32V+rJ13g3|^b07bCGIS-%+6yrwZ7Sw6- z&|Y7L=Bg5uWJclc`JK3WbPa*T4CEa^AEcbxgsv}Dn6UkVrN0wSejH=gpU`RZQIH&p z%ZFCDAszrq*9QgHj=Fx+nhKk*ygtse-uo&dg15#1b#VSecTT7!{66M78|m~_~&@S2{UVkJGf z6^_o&mB@+N3we-u7LamsBSwaLQTZYR#p#h4>eb`#l=FWUlTJG;MN=4$he;tY>2<7E z48Re99EbXfLTIT$%ES;>|GSbjYThdhn+8yy4y8mW>^g0i1CM)s4bLr0w+CnITuakA76&2KSa zYNG~@q2Wytu19PZcK7rFm4nnXTcOU2K}TabhWm`L+pMfVeO=8^J&=m0~1=fYfm3HCf0X{tW!XZdT@q*)Q bCFTADdZclgtSG|cg`*psu20myg(#Q({}&l!rnIX?B}S^ht^ZT9~y^Q!+hM9bsU zP!}Qff5Xg@|Hrq@`9Gz^@jpl}*Z`1ZsV~p}-77l&zkl`k|Iy9U|2M`eA!(HPe_-7N zpxmSXhc-<5UlAw-5=S)vhNqRg{eN=z!vFWLpZs4tHUIyLzLfuOp5Oid^3jd|v+Mj} z>M#vJ#x-G*|F53h_8$cP{rmg>&ZUDuuPMOf2^&!A!~Or_;WhtZ;M%F}|0@H9h%=zX zoAdvfy-R>L|NDP%-NgU9mbU)?`}fcP%f~kUFZbuiZa`ItDA=$4c^1GBo(;D3z}g9L zh1(Z3fW315;Hv+<*{1(jPDuY>8!m+~;KHHR|G$2G`~S;@Hc!WJ?%tK1U{`&5 z{}QO~&Ho!`cOeXT^ZefbHB<6IP6a6dc>`-Yc>Cf$*pTfD8^G+U5V6l-1MXfv^8d%z zPhe9g*+5ehwiO&qc6!_`Hj(NZUv?MwYv?gi(Kec<&|EgfoPYflV9Iq(IOfMOVJ-Hf7 iJlQ{xt{JEYs22c}m^RRo@1NNK0000ukEhQnMf+81b zFNF$C%yA4IbyD-iY0ibYEnK+}8u;M;=6vTncjjJ3uhmR(S~bsUHDYa23mmJNX5>Xo z7NB;Qdck|?0EN#T8{oFDQ+~L1!rsaNWgN_K-Rca2QP&J-2S$j6{jfUJLge?ju!%C( z(1UC2!Co3rDi)wv$U~)4hTM0Gs9Y+_Dp1B6dhn?VKsl|G@cHfog}qnD;BoIOj5YM& zx()$+=o!+9DA{5(_(+tOx1E(l%2-2>7!Owm9Bqw(Po9|iiol6wf++HK49(N`pRlvg1Gg?4Bw``3E%y@zUvA*ldqEj%=)t>C6@c5zN=b5TNg+g3$Y*6ql(B}M zd^Y_bk8!TA5%}N}{NyCC%yh!qa4V#fJY+-xOrveEsqY}SQ3wZMez55;z`&~GN+LGd z%_DSzb+!wCF6Bd$4$R~23Zn#uV;dF?tSW^sYLhC3y}x@&bdcv`-0A=T002ovPDHLk FV1mUp&ZqzY diff --git a/resources/images/icons/tourist_cinema.n.16.png b/resources/images/icons/tourist_cinema.n.16.png deleted file mode 100644 index bd886c8388d55733d36c7a621563587b8aa537b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 481 zcmV<70UrK|P)ZnVPA>iUACfmtCe?|An^yt+ zMyt$)ZA^*ymI=J7oNC#45pfF1=XXI@osTtr4YsZQa2Z+OcBQno;&kmBwv2*0H-Eg%j(Jf&d^2&=Xdu}uRtQW9YVeQN#u zc!lw%5|)5c{LTwg+ttDqP6fX5*V#3Vhe_93-FML;AD3J{>7hN z39f3eyR2pl2*-2-F2d^>V{FcK<04|maBU%5KvB;_Hn@%LX@PgP3s1L4F!xrl1;ozM z00Jw6@Xhz&*gpgBOa~qJ%n>v)$$K^dZQK1-h)yE?V1GUHCgNl{6B?N~NrnF*PEzj| X!L$+LaF#7N00000NkvXXu0mjft>(`M diff --git a/resources/images/icons/tourist_information.png b/resources/images/icons/tourist_information.png deleted file mode 100644 index f4bd52984f50bcba7163e7bd902ddeb6a3270de5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Hl8kyAr*|t8s8o%a0YrFK0n|7 z+uS=|O>NiT$33{{P;bv5>%2+cZAshy`u_}%`!smN4<>S5VYux4e+C2vkvan+%5x>F?%eD&}B$C=0LWtqsni@lmjiA~h#!?L(C_$@LQLaYKYKS4& z7aQddyzV*4Wl{86Jjprdp6|)~efLOe6*4uWkVY7V?2XV~m=@KlGTwiKRVLAUe9a3Z zm(@%7#WN2GCN>Axp*5Ta77$z;!J*HLFt>={>M)M|7W!>@w1(Ujh)5Wv^g}o>cjV(N zV8fEB5_jf}0}`yp}c^J+RnM<2#KNBn_F1 zxE6$8In!A{<6Ct_xCpx9w=mYM!1=D@iv#bJuoe(rVyu8w%D}A{5%Ns@$-a9Wn!J=) zfhIo{+_C}Nj=sO3b1~LseG6E*^p$J|t1@wSx{2FkZ(N*)a-oeE2_sL`vhsu|t4xGe kl`e{g++@BuAxdgL0kgYu>Vn$LSpWb407*qoM6N<$f>7_{6aWAK diff --git a/resources/images/icons/tourist_monument.n.16.png b/resources/images/icons/tourist_monument.n.16.png deleted file mode 100644 index fbfef6042798c1c06205ba4ef628d1f9645bba9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 389 zcmV;00eb$4P)G|cg`*psu20myg(#Q)K8xj+B^<-N)OXV?1uFY)HWkcZ;u48`6Y zpO6Kc;*|gIS<(6b{j10S&+T9F|L*0(|KB{n_kYX0>i_kTGN=Xs^}-F9R_^xy;^B4w zUp&0_f9w33|Enfu{=a@^=l=_b*8E@5m->J2s_y@9U)%>9I=R>Z(*Tg>xeY=87q&+H zKYwu5|IKqM{~2g0Kz;=Ioe&Lj{@ST|!_t6LyBGaGvS}JY`XVqE_N?qgHJ~Y0>Hp!4 zQ~n>?FqtsDX(~8ffKw&R08mQXx4MTU3`%fd14=wOUM*^i`cEpJ-y90^#!H4`Pp-xi jPxcRBKaqridVqQXwI_R7hbHe#00000NkvXXu0mjfVqM5N diff --git a/resources/images/icons/tourist_museum.n.16.png b/resources/images/icons/tourist_museum.n.16.png deleted file mode 100644 index b4e7d123bbe5f029cf1a3457e39330c18610d700..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 348 zcmV-i0i*tjP)G|cg`*psu20myg(#Q(A3t_;KflZx#Bmw0nxl?PeOQ0&d|30>39 zCC&ezKe+lI2HwAV{Qtn(3I8V+*q|5y(#ud2F7bKggpB`Z_AL4T_Qiw$guthFFaDoD zxa$Av$vOY)B4s`^%&7MI3X=Hw{WD1z1QxbMePig!G5rEG6>R&fC%67TyMGx(1Nrws zY!JpO2huaC#QrNR41oT8^ndI88j#;WG)OU+jZY4w7iz$$0dwjD|3AHZ;s3e)EB|kq zR}H2g-aHLrgD_UPg>8`#16mT*zx??286&~``}g<%x6ki!;!p2i{s-xWdx1oZ@Ir|v u$14zrO#G6e*psWV#FPC4>6(FhfO-KmTa1?$&|~HR00000fhdEP)G|cg`*psu20myg(#Q({}&l!rnIX;nV07x&20TT;s{vY2y2QTi) zG9hfhwNu;vgTR@+OaI@$b{x#Ucw{{x0}%MY+6n(3-8u_qcckk6|M&0T|E&vZ@p}P= z%L4@dfBE?4|H=s&aIstG_x*qS;=%tCZ!YWxG(^k)Z%fhy<8{*u|Nr{=4dhg~*rwTK zU~eqzPK1lqN68`#0Qs3zaBlw!gaK8-BL8c`B>qn=a{)^(>5K#MQSjQS`M|LF`@bjK z6wI#-62=UJBb%rH|M2GN|59Hbi~s{!^8L$)|GSp8Vh_ZMK%xKN5DL&R!h(-)pMfmE zG+<`6_y5PY&;4(XSHWpOccw8|&7>kbxB-+W>o(i4AcYE Z3jlDHC{_cd6yyK^002ovPDHLkV1fsIw)Fr2 diff --git a/resources/images/icons/tourist_ruin.n.16.png b/resources/images/icons/tourist_ruin.n.16.png deleted file mode 100644 index 42c4025979b50f448f1a5bdf5aee586345d08480..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmV-10nYx3P)G|cg`*psu20myg(#Q({}&l!rnIX;nV07x%&3@G#C`;QEMe*Xfd zk8YXqf9KK`;#_cG?S%h_H%|F~_2kz7x6bbc8?bJA;s4EZD~U5;@2c+qTj$rnX%LuP z>;O_oz5%~~{rC^`9$5x}z47DQr~i9bc9Cbm*?r6ZZ>kggf12dEbSVcjKtbf)a+00000NkvXXu0mjf Dc0HGW diff --git a/resources/images/icons/tourist_theatre.n.16.png b/resources/images/icons/tourist_theatre.n.16.png deleted file mode 100644 index 02cd7e4a2ac0c064173fe0a9523ee584e8c322f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 585 zcmV-P0=E5$P)v+7HNv+A5bV~uClo~-R9ZxoE^6{pT6^5xI~v|FT8MG&Ut>{^YFcgxu#K>Miut*wvY&XMYsf2%hWS{JZrM+VN_e2{PV5-c%iz5(kfJbsQL4z)7pIHe&BdFn)n87B zx#1Ed!AArO80mciuWJrow*#HkXB8-!9kB?5mNw`MQ{k8%z@3XpFqWP`3&|_3`tf&# zLqYubGE4vxhI$^y0M-sI71kA{ZP+JG9VoTB;=z*Bj__J=!+zEI!!ba0?h#l!b(>-| zbH^e0-1JmyhmOLhhb?55F*Ejd>n(hE*@TKS2XQw)g+`d4`Ha~K8?_q=uPJWm4G6@| zt(=6dfT|0L6w-EsMW6W|3|BJnK$`_wegJnSF4Tpez@Wx0 zQHTqpF-0B<6ilJC^wJmf9w(C+sgDJdPG)X1=RdzWb7bsB>LG9!d?&jyDdKr1DzNP1 zxYzp_L~t&^43GEr7a;t{mP54jp}qk+yN?nTbF9pNVyj*uk!+>=NI%u6$a?PEKSjK- zFZ4hVCfMKGM@wr5>HhOXg&c!dZsFqwQ*WPBF6F6JN`~{Ng#y}Pk+zNu`5*HP42^Pm z^Z_T%UZuE}B|G<#`Og!0Ji_1Ogn;6vw0k?LwhmU8XPJ2Um_2(B7?lV{(B9Rfxnoo5 zG-(#_J~rIAv5h9IW@ngu{gh*8hM3dt=dRr$eewbenfH8|dPQ}!*euX&wh0!erzqqW z7#_LL>5C%>Vuar_lT@REQT!J0_OrEFW)2(cD>~8)mC`z0J!!k(TDgP=WG8`$AnY7X z>_a?cKD?p4k!N7|rs9w5imNs*;vjG)fE7E33qp;7MsPiKO z5tJ%XA*ITOU0hwVahgql7!hYR&N-_Q*pRW2)FXu3;M>@hNf~(Y6Jfy~45w;G8UO$Q M07*qoM6N<$f@~xmAOHXW diff --git a/resources/images/icons/tourist_view_point.n.16.png b/resources/images/icons/tourist_view_point.n.16.png deleted file mode 100644 index 6adccfe358f4ab9584a13ba0113f95e4d6287c21..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 617 zcmV-v0+#)WP)4liKqmjA}b`ZZ+|q=Hl$UC7OqLU6;$e? zGW?SeCKZYmNE9Q(!op#*Z92C;x7=Tz&R*J~Pnh7v1LypB-{uq5>q{6<67O-EIM4LT45|*VgKuJ#3cr3F;DsXt4~c~Wlek{GBc}n$ZrG2R zsqdKedtlP8CgvF%L3qZC`_^N0U(A5iba5|ceG_oh7Q%dD6TR%btd-Ts3?5jI0rt|!z)|vvihr8hOd_g*upxR_2hMVQPBSNKajpY5|MtnX3|Ku1x4RxZ|S%vB& z8?pv;?zCUPhu1DLNyMTEvJvY_w$9NAY`2*U3yam65 zQxwwZ`#xUywy%{~JQhJqwI;WLxp*@(@KT^Iw!$oLEZc=hcpCFjiT;MnK(A5+IAE$T z-3bR<+roKomG6N~+_#YX1yPk}(W{n)2`ovhhxPsilw?OZD|u~$00000NkvXXu0mjf DI?*Db diff --git a/resources/images/icons/tourist_zoo.n.16.png b/resources/images/icons/tourist_zoo.n.16.png deleted file mode 100644 index f8bcdeae60733774976ae0a6f77f3a27f81237d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 472 zcmV;}0Vn>6P)NklG|cg`*psu20myg(#Q({}&l!rnIX=MzCYLz=Kd^4%|2g%6|4Y0% z2^#>^3pZdEFN+4X%{QlMdd5s|m1GX-x{l95W z`TtTM?*Aayym)x+|Eh_ZV8wGAga20s3IG55_s{>!$2R`IcjXAsMSuSZ;rEc(AI!w^i*sPg>3dqv0pj#OQE z!U1`4?bJMQ!UClo39t2_$9;STV)JD%`bqQ|LB-`@~!{1$KU+#Irr{A*RZGp7+rl({Z0H*!7kZu6j z*?ya!0u2DsBpTqn{>lGE*FXK2o_FuR*zCLiSKa>nKVZujGyTs0mQ!#4mmYcjpKa=GgaII1oz^{p zD^yx|AFR-7^`rl?KyS>t^5MVX@`rGF{bdjT&$;>$VL;c}cmK7QJosOA?9Klv7vFc7<7doWwTHpcCG0X86M&kMLX z?~FVD!?r&Ig$eFh;0G$2ckLtC`2sWV{9k_a(|^@P_lb|jjD0V`{*(b4ptk72f0ik? zK~BbQ0FdztUBZ0TBT&GB!UE)faO}kHdX8zpF;0jQ9L5|Dr9P0;(>f(>AX z3~~ae_Z3J6%7|bSpL@I`PUA!l{`k+ zjvm$#f?$^sA}dHncUMpC;lhy;FE_i~TCP()US_J01NuM^aOLDAmyS*N$blezwASY7 zdd&QR$gd*6#iJ8cA_Mv-fx_9Dh<0CnNh07B&L1xN0`JvYTzm18&3J$jSo$2}lpz+u zpXp7r$CHmiFmNy(8UM4YQmZE*Ai#}R^^nvEpxB+83)YCA3+mrPWT%%#&+#{wF)@sZ z9bXXoAnYCx5ya2rKLkSS-BuE9bsdS*;T1l$Qu5LxRYoAcgvHf6Qw38^ot8SO0|8Yi i+ z{(%}q6cmc3sWr&T=kbasCB^0<2wYSuhh0 za0zGyXpcGsd=}rgt0?@o#b8I6eAVUidWC$&MbVoM(vu8?UoGV?+8E*y-i!j+yF!-r$s>`!8VotjD7-oa$ZM=IzeDPJn=LxfPS8y-w&x%Os_ zCRuwp*uvG`IFDwtOwQ$~8-oqd=(ia;nqsIs#<>Fx+&$i;gi6A`Mn793eJ)caQ>s%E z(&>!~uBX!Tq#$|zF4S0-Pjl7-0g*P`-N^VrT0AIo@6#4RVNC>WJUE_NC)&ewB?2gZ z)kBDQTa9#K#X=!=&&iG80FPjywFL1(gur=Z+ z2_76dxi{)i6J>r`zbvJbx}$;h*y>K5`{KuPp^9_2n_J^Pm9IpL&WqlJw{g(ENwlY>^Y+*GXw3}6m0bBz*wg6GAf1T^P yrbbaO0Wk?G4Y#Jxc?`n^Ai{sK>q!@Z=YIj#jVV=oClQYT0000w15~oU#%TFZJD-|<2}MaCarOjGjr$Od(OOf=RBn%$*_uOx;*nlOH6YvOjzaq zlv|C@760OS+O38st#WHD<@kL9Q*|XTDj^&40^-Dofu8RLw7tk+=lwbCxVH|*hb7mY zC?NFOVDAQg=t|vA7Wi_0+(x?;_xCO$@;Q&;pC!y@EBKbHFvi`l4r>UF=(seMT^Asi zx0CYaQ$pU|y#S|DN2ylFoi9!R%aV7ib?oa|pa{qzS8b1KE|<-v9*i$xaK4DWBGe2| zlLZ`osk0Z46U%6grd-uAW_m}4GECyk8xz+)0-@qcqmiu)e5*iook9Gveie@lB zZeiDh`AvZv@}<$mQUh^(sf^3-vg`?LAuvQ1KbankQmsM2URlMo)YuakVvGDn?v2UV ztb^4xz>}N!A%K9t`wA&wQkH7w2ef-TgY`F5+>u=gi?tcQQ1>%bSf`W>)%=Khx;8j5c|XJD9k>l3;G{#%~@ z-}m_2|IlsEz_{z|yZ_5>e!?&Sq!+6JRma}^m!E$RBnHPTZ+#}-fH_w`{ zTWHfz7{{Z6qTqw5pq)A?D&p-$)R!qL;+vqLFAD05Pd@qL4HWS*FNngt;OyFJb+S2~ zf)~6Xi0Hg+Q<+R`lhbCcX_KZ+#)@5L=il$7G#E@p5B$l=KPSKMf4)zsYm@g(4v5-> zMiIYj!-H>_c)7gyUty>TGS_!slayWFmfA1)LXs*pM8UP|g@!Q~V%YgyBY=WQ0m)Y2 zvx)JSMElIV>k0e0=!T4$;dn-v8e|1-9D18W-K``xJyfveaT*Jn6KMEoVD7a9R^Cox z+{GBy+)3fUYaJWu3@<|e4%mS8_Z6&ePoa`zaf^&&?{gSI`}tIHUx$uW?Mdu?mF1od zm>y!3MlLuB{8!^xd$$Z(cTd6WNSu3)mbUg`ET!PEIgtb!drbHvayh}mW*KKb7#MXf ziu0cgh~^MF)j^kHhA+tMg9M@^ZjB`GOWs0lm^q#U zs2IFK2jA#?@2TA{vpDiD=MCUZRKJ%HHSGAF`f6CvizTO5ES;P%+TfpnZZdfzkNyR4sw;0pdUKXH;9r*~;3UxtL&LUi#s)mqZw;eZ`iZlY)N=|F zjZh?2n?jFnK`H!jPhnb+Wh=(^rx|P`RRe5(l*W!{s`FkGVydvLwXeQ5ENQbMar1vP gBgD)lEy?4*0L$X*srY@Wi~s-t07*qoM6N<$f|1M_MF0Q* diff --git a/resources/images/icons/transport_fuel.n.16.png b/resources/images/icons/transport_fuel.n.16.png deleted file mode 100644 index 8fb21bba143d7eabd795e1d092df96b39c49c1a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmV+}0nz@6P)Nkl9t2_$9;STV)JD%`bqQ|K#DD&lwmd-ugtY0U*6N4X8f;=Ks4Ne^Ky) zYafX-z+>Z+{|BCY`yaFO`G3KgcfiReZ~edh;n)9Zmp=SQ1H>5+y6xHjxmQ1uY5>Ca z*3)nQmmPUcssRYwjg~(I1|oR|fNTcS4JY4{XMpjFhyM!?z51WJ_vL?+6^}3yQuNN} z7zR+Dl!1&_WE(K~)=QuP*BgP152S0p{Q;yG0BWwYnRK@u%m4rY07*qoM6N<$g8BxI AiU0rr diff --git a/resources/images/icons/transport_helicopter_pad.n.16.png b/resources/images/icons/transport_helicopter_pad.n.16.png deleted file mode 100644 index 7f261a06b4511f9e0217acd1ae5859e8be0447f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 674 zcmV;T0$u%yP)Z2Sst1ef{&T)K9rZlo?m5O<31 z+_d2gR#O{olQhX`a*ofR@UHy9Lk{nAzr=Ct-A&*!P(~z>PdjGI8TJ)YIN*D` z&+5;J_Fe)G&o(6Y6kr3GkYhGo-5v5GPu*s`hmlx}8Iz1mK*$7Dn znMZR07Y>&gF~g^8ZIrRqixGt|U}hxE>HT^1d;fiddM5@)CBVp}9A^&=(Xy; zl*wX997CLd`EzxyY)MiI%DI^#a-l;682?tYGUCC9ruydORGu-b$j>AbI8NBxyxBea z)FKAv>|44(j>ji+JhQSROV>|eFHTHQdI^!F?{&zQW9FmE!vm$X6q+=itSL@ezY|uC z7|8|{(*eQ(n`RsJ;oxwZu$oV)cV&>0B!O}^#f_sCI`-!KR1oPz*WR_IswD{Z=#UI> z4y}*d%iFxIM+mL(`jLus9@!5DyuRCGA(PV$5Jd^1ZIjkOUw-Q##;nRK|CI4)0}8s) z>Jh9rdssrIheCuW@Y&qp+mirOS~2joVF9cRJDgoRk^-glpwE%)&t3YNWYHjh8Iw0eR5Of{g2VRrmo$=KBu$cK)GtxBjht@Qc-ZC-D6 zh($ diff --git a/resources/images/icons/transport_marina.n.16.png b/resources/images/icons/transport_marina.n.16.png deleted file mode 100644 index 28e19144fb512c49108841e8a11a768963fb8019..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 422 zcmV;X0a^ZuP)9t2_$9;STV)JD%`bqQ|LB-$@~!_~o1XqRU-byY$AND?XJD9k>k~G~ zDHq@WzxDpt|JUFC{EyxB9IF8!y*LfH^WoQjm-SEnS08`#f60wcBpU$M`1#l0|KEQ9 z`|q*w2`L63@TE6D{!hRB0mLTXfN7VAG(d5|{r_xJZxb{?Z1&y%f-~=68gS_8xBq(| zfBnxp;|@*(G?zU1|MbgmQ21aP@aFrU{~&Pk#dnZPFbq&%`~a?I>CI252Ji!Ig@KLt zzF;*#dEtFo z$1mr!+y5hWJpbQ(>h1r^V{iUDug8%RC*OJrG~jw8knsT|KoXvO`vXWX06p}xe(2wx QssI2007*qoM6N<$f)7^JMgRZ+ diff --git a/resources/images/icons/transport_miniroundabout_anticlockwise.n.16.png b/resources/images/icons/transport_miniroundabout_anticlockwise.n.16.png deleted file mode 100644 index 742e5dd0ecf25d4ed6eb3c0f6932a338d8b54d41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmV-T0rM!U_BBs2v&OdRh z=o}|n)t?Ot!9tYX4q!9Ev#dKh=5Vw(j6>ZfHX6BFODRLE_*_WuyhEg;W6 z^D2f(D}(a`F_am?3HCkuj%UFYw0=rs*tAj2Hpu4%JQUc*XLWyD#+A48g+1mxIQ24$ z16?M3(@VJiK7~zELjey3PQHlZEN_2J^~)o1RCi@>aGSe7gzy}mGtf9jZK`)*VG!mu*JIPQ3{t3(5PZ>*CvzVG$HdJ2(4nmaxlBNjw6r5 zr3CWu5c?UP)13V|hN|{yMAnX(C2XfxMJ;eMpCw8gr`r6w6-l6{xGtdud_lL6LU`vd@3OruN$I7S_q-9Bdc#u%Yuf5T;|#ln?r3n~38$O3G; zr;X=9*6d;GWfQE!FB;hSpoSF}6;7PY#N|;1YsrIoXL8`*OCtqbpu8pL^5X&uh|4zE zNCvTDG~P_V^l!j)GHv6{3KB{it71jCFDYPoQwH2L)+~Yy0rozrJ;d9UfZe$VUsJ(L?xy zh4~?wz$Sw4Ow2u<13&5t%dH{6=G(sji^4M2TrE-IXPi%410($e;H{h!%wpfuIu?Wo zKo>O!z$5S{9t2_$9;STV)JD%`ZGQKKY-v?n znoN=b2pqKa*?$lanSGZ$1KLi%{r~>Q-~Wunc;V{XpZ`0~yaVH&bMO9d1&aOs_y2$4 zp;yF(!NX6#|F63J8H7Qu0UHF29hhPgy@0^v8z4LH-v8x5v6+`Yfbk3 z`ucx5FiAfKCL(0ec=GN4um7u$ zBL(E-TQ7kITyF$2KA;<7vf>daKcI+dEPn7`5NJ3=^X(5Hy#Pl|!mBU2PqzR7002ov JPDHLkV1g<8(Aoe1 diff --git a/resources/images/icons/transport_port.n.16.png b/resources/images/icons/transport_port.n.16.png deleted file mode 100644 index 9dcbd5b5dd424694019910e147607ce2b337cb86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 465 zcmV;?0WSWDP)buLKoAQ40~g3Kb&W@xVrnB$$w_8c8&p z-NZdKk?h9!clI@c@g=1255vye+4p<%W@ZJ!5$Y8jqC`)vM3V()sE+_*oEG@YbTbE% z?Q<+B3BqLP?RTJNCx%t=9aioOB<9!cO8EfVn+IqVyay5dg^(dMS;s~fF zI^0Tez_eG#xJScwI0f_b3t7s-^_0f&wTk87TVX&2oftMO@br?(qIx6B1+aS-Q`?cu z2b4{Th|wuLX_*|#XYLEvVB%H-PYZsdcoB!LRPaOv{wF}KD~1~-g9qJW{pLxe_#<`6 zmo(9^AO8WgP-T106X?H4VCyjj2i3uTx9B%m@7s@MjCnK`8@NoeA?tK2KY;qZIQ*|B z%V7S_z(FJpDgB8x8sQZJ*qu3f{=gi?f|`ktX0diM0Nq7tr9~fQ(0!J`=KVWHZ&WnW z_|E!tECmcU-Xqs4i_v#>wk!+!8)X6n2FcM0gp$lD>h|7m=rI4@`Y6k@00000NkvXX Hu0mjfllj)^ diff --git a/resources/images/icons/transport_rental_bicycle.n.16.png b/resources/images/icons/transport_rental_bicycle.n.16.png deleted file mode 100644 index 8268948ac553327cbede4cfcb10e4284d1ed5480..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)-MKXGtTXG3%x?ZW-`F4v4NC)mmh-Xa_nmY8=VPose3I1* z68-A`DTM{Xrx+#66u?tWw}QqWQ>g7xcw9nb5@R>QhIeqfUqj*dEcoXXW)Tz&T>g^5 z#i2=D`m1$M$L9f*TLc)AZEScZLNxO5`$n`Gl=%TV64Rs{to&RR(X4}4u^i5R(r|`! z;=?agw@vt0u2D`_Ta&m#t$2UraZoUkFdXzGEws~sx!o>cX;aMXB>Q-u z=La;m|J|Kw^rkG-4NlUnx@%)?uYy5>S2ZWFTod|Zer?H8KS{4wpJogWKEzor+5r?Ay0000< KMNUMnLSTZw0468^ diff --git a/resources/images/icons/transport_rental_car.n.16.png b/resources/images/icons/transport_rental_car.n.16.png deleted file mode 100644 index 7c20d47f562dc9d2ec5d1f31b9c027ce0ecdc365..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 469 zcmV;`0V@89P)z zeK8qReT?eRq4l|UqA77F_>wPk=4S41&OPT`j++yPxH(ZK&-6d7aJ(=~0OCD)0d=KC zgw>9>d^D=pz@LUAf{n2s$u6QYk1-!Sptx~ z-vB4lGwSU(Mg~PuRQx#)<idQDY1K4(Q&x#eP)#0T?I6v-=)@ z2doA%=va?2Q+6pYsGSd*1KQW3NWA1Ra`wP9?b4(xiE`cqkjfS42S(di;yq~u)mQZH zN^HO@>0cMAfj6Opr9P*G!XP)t_D5xNU3*Cup5!|>E6n82JPhAObA+CLSPoF4=wax`+5gee{ zg2MxC6>5_XNn6qk9b#H*YHfedK?1G0Mf~CC4!QTcr{|nX(v&hGO{rBHn}2&(tlZl3 zpwe16t%kmlElE~R5~J7Z<+e`er&ZvfVbHx3Ad#WO0O8FIENN#_-Bc=OOp z6OW5+oJu+)p8f1%Chd*_=xzw`-u!`8m-E4TB(jv_W9e*eJYe_z3cl349KO(x3T;dz z95GySCR=~Q!k6;@x#<5=7Vb)FEw zFK>!!V!$HmvTe6@Hr8A%V8x{z)<-lfkQHpE0s{@1L>NN<#aX#2r9v4noloil+c9H!GY&hOunmwOS|E^76#D7 z4gee?{}r0wrC8>y!+DoN&!PBB1E&(w`65Pqa&>?&s-w}x+x~PQ zXyB3tnwFmI0j;Yq>b;!9+-=fUUTUKRU@erk2lRO)9e+ePo`>&4$K+MK5-{kE{Rs#q z^62-(5K&ERJu0A~e*?z-a!ybTtURQDnMADsM=)vSk&KDy>jV~QBYv9K-DeK7fdtyt zUQ`R9nOP(sbI9##z2K!6q+${DR|mtJG%mSCy-FpBe!Y=zvsiZQ>8-Xjt18$yP4ZNF(Z z)I~L2iaKU)66n|zD%VI!jD&y5$w>qVPf(Jo-OQ)T-Y?iy6k7n*z?}d9002ovPDHLk FV1mV>(~JNB diff --git a/resources/images/icons/transport_tram_stop.n.16.png b/resources/images/icons/transport_tram_stop.n.16.png deleted file mode 100644 index 5092acf603d5cfe6566dd35badf84f2b89b5f8c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 506 zcmV&(* z_l_B3-cQ$D)EN4lbLix{wgJLmqt@BGep&ixoh&Gs;A&X49tIVq5`v>Y!J3o;tE z7Xi2c`T#lQ&pM#-zz4OvUZ~h`%jDSn3^T#Te+Lvu)jM7&Uwfcl9)dOO`yg9qrykxb z3n*Q2LDPXB(llbf4EfE6{*(ZsOsyU2(TRogPRN+zpl;6xMGHpR@>Z?J5OQ^2wN1$!br#FL<$mICNl;{*yg^S*-25Lb|^zk{d52Myv)eV1YKCvGE& z)BtoEX_g#RmTKDrUFRX9s!cbURa+kDJp1x$j9!wbppB$vLq8sf^uH^f#Mi)U(i@cq wH)$x3kR&jguVI4-U>!gU9vgp>hU4+xPulguoh6L3?EnA(07*qoM6N<$f)bqN7eX}0p|qztB#X{A>#ufeO4!-W3<`AZjrn1mw5Fp<;{;4Rx`7japh=?T}3xsTyY$UD@=^k zIM>)mqsLqCNy31)^DP1gk#}94__}SM7_Bi91(W~^B4CSn{k_TlTEOvoh57XioPf|- zCg1^7EnDBMp5BU>kAnF$=jMrocA?Cy<)m53;n|R2-icHn}yPV3JvA z6>Q|nP|ewJ&b<$dc)B5&yZ{r-%ejm_`J=!_EzeLx=s5Gj_oR6TW2imz6f&34ZQ( z#-piKDvlkbneuhD&5POepV-jRXE7IKg@P!;)7!O8oB*u%zc<{m>;l;!yoY9*x z(GV{tB#KJ_Q6>T82MjYP!_eK+)BUWxKxENMzjX4J`l{;t#PKKJ?-YD>T>%FL{-7sg zVW7#un;#zL%QftT;wJ@W+FWB;5~bG6xaJgfbkU{|3Va_MPd)KbrSc^W^ubegMnrTgB>n1j)ZLp{0+MZEE*d+ znZ~8A2K~S_1#a}EFgn3?1re4iHJod<(b{0{CMZ{9#0qFnTFBKI zxc{z*7x@ap7?@ZMP>q1g-AUx?4JtHrYj;|aD_(@zU!iVO-+wkAD7^jOLnYKU@Mv-! z(`zBR(g}pz=uTTW!FzI>Kmoi^#Rio$ItKb0ZMM+R778S{`2SoCcqUP!R6_`yI$)#8 zH4#JUdsy{j9TbB{FDLM7Z<4-ae58d8NheEHJY$$+i$2!33Y~9pn3H@n#3ZZFUWu z$vOJ`Lm|*%OIop{vbM8e&tn~CEe6uI!Ja2Txw`6_A8W77Mq7J1w~6O0@Os{>NKW4} zwlMuOM diff --git a/resources/styles/standard/potlatch2.mapcss b/resources/styles/standard/potlatch2.mapcss deleted file mode 100644 index 88796b06e7d..00000000000 --- a/resources/styles/standard/potlatch2.mapcss +++ /dev/null @@ -1,400 +0,0 @@ -/* THIS FILE IS AUTO-GENERATED (SEE nodist/styles/potlatch2/README) */ -/* - - Potlatch 2 core stylesheet - - This stylesheet should contain commonly used features and only the most essential extra attributes - (e.g. oneway). It needs to remain simple (not too many nested styles or dash-type decorations) in - order not to kill performance on slower systems and those with a less effective Flash Player (i.e. - Linux). - - It is expected that experienced mappers will switch between this and other stylesheets as required. - -*/ - -meta { - title: "Potlatch 2"; - icon: "dialogs/mappaint/pl2_small.svg"; -} - -canvas { - fill-color: #ffffea; -} - -node, area { - text-color: black; -} - -relation[restriction=no_left_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/no_left_turn.svg"; -} -relation[restriction=no_right_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/no_right_turn.svg"; -} -relation[restriction=no_straight_on] { - icon-image: "presets/vehicle/restriction/turn_restrictions/no_straight_on.svg"; -} -relation[restriction=no_u_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/no_u_turn.svg"; -} -relation[restriction=only_left_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/only_left_turn.svg"; -} -relation[restriction=only_right_turn] { - icon-image: "presets/vehicle/restriction/turn_restrictions/only_right_turn.svg"; -} -relation[restriction=only_straight_on] { - icon-image: "presets/vehicle/restriction/turn_restrictions/only_straight_on.svg"; -} - -/**************** - * core_ways.css - ****************/ - -/* Roads */ - -way[highway=motorway],way[highway=motorway_link], -way[highway=trunk],way[highway=trunk_link], -way[highway=primary],way[highway=primary_link], -way[highway=secondary],way[highway=secondary_link], -way[highway=tertiary],way[highway=tertiary_link], -way[highway=residential],way[highway=unclassified] { z-index: 5; text: auto; text-color: black; font-size: 12; text-position: line; text-halo-color: white; text-halo-radius: 2; linecap: round; casing-linecap: round } -way[highway=motorway],way[highway=motorway_link] { z-index: 9; color: #809BC0; width: 7; casing-color: #1e375a; casing-width: 1; } -way[highway=trunk],way[highway=trunk_link] { z-index: 9; color: #7FC97F; width: 7; casing-color: #245424; casing-width: 1; } -way[highway=primary],way[highway=primary_link] { z-index: 8; color: #E46D71; width: 7; casing-color: #651316; casing-width: 1; } -way[highway=secondary],way[highway=secondary_link] { z-index: 7; color: #FDBF6F; width: 7; casing-color: #b16603; casing-width: 1; } -way[highway=tertiary],way[highway=tertiary_link] { z-index: 6; color: #FEFECB; width: 5; casing-color: #626202; casing-width: 1; } -way[highway=unclassified] { z-index: 6; color: #D0D0D0; width: 5; casing-width: 1; } -way[highway=residential] { z-index: 5; color: #E8E8E8; width: 5; casing-color: gray; casing-width: 1; } -way[highway=service][service!=parking_aisle] { z-index: 5; color: white; width: 3; casing-color: gray; casing-width: 1; } -way[highway=service][service=parking_aisle] { z-index: 5; color: white; width: 1; casing-color: #aaaaaa; casing-width: 1; } -way[highway=service][service=alley] { z-index: 5; color: white; width: 2; dashes: 6,2; casing-color: black; casing-width: 1; } -way[highway=road] { z-index: 5; color: gray; width: 5; casing-color: white; casing-width: 1; } -way[highway=living_street] { z-index: 5; color: #ddffee; width: 3; casing-color: #555555; casing-width: 1; } - -/* Road areas */ - -way[highway=pedestrian]!:closed { z-index: 5; color: #ddddee; width: 5; casing-color: #555555; casing-width: 1; casing-dashes: 2,4;} -area[highway=pedestrian]:closed { color: #555555; width: 1; fill-color: #ddddee; fill-opacity: 0.8; } /* FIXME: dashed outline */ - -/* Paths */ - -way[highway=steps] { z-index: 5; color: #FF6644; width: 6; dashes: 2, 2; } -way[highway=footway] { z-index: 5; color: #FF6644; width: 2; dashes: 6, 3; prop_path : 1;} -way[highway=footway][bicycle=yes]::bike { z-index: 4; color: blue; width: 1; } -way[highway=bridleway] { z-index:9; color: #996644; width: 2; dashes: 4, 2, 2, 2; prop_path : 1;} -way[highway=track] { z-index: 5; color: #996644; width: 2; dashes: 4, 2; prop_path : 1;} -way[highway=path] { z-index: 5; color: brown; width: 2; dashes: 2, 2; prop_path : 1;} -way[highway=cycleway] { z-index: 5; color: blue; width: 2; dashes: 4, 2; prop_path : 1;} -way[is_prop_set("prop_path")] { z-index: 5; text: auto; text-color: black; text-position: line; text-offset: 7; font-size: 12; } - -/* Under construction */ - -way[highway=proposed] { z-index: 5; color: #88ffff; width: 6; dashes: 8, 4; } -way[highway=construction] { z-index: 5; color: #ffffbb; width: 6; dashes: 8, 4; casing-color: #0000aa; casing-width: 1; casing-dashes: 8,4;} - -/* Railways */ - -way[railway=rail] { z-index: 6; color: black; width: 5; linecap: round; dashes: 0; } -way[railway=rail]::dashes { z-index: 7; color: white; width: 3; dashes: 12,12; linecap: round; } - -way[construction=rail] { z-index: 6; color: black; width: 5; dashes: 6, 6, 4, 8;} -way[construction=rail]::inner { z-index: 7; color: white; width: 3; dashes: 6,18; } - -way[railway=platform] { z-index: 5; color:black; width: 2; } - -way[railway=subway] { z-index: 6; color: #444444; width: 5; } -way[railway=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 8,8; } - -way[construction=subway] { z-index: 6; color: #444444; width: 5; dashes: 4, 4; } -way[construction=subway]::dashes { z-index: 7; color: white; width: 3; dashes: 4,12;} - -way[railway=disused][!highway],way[railway=abandoned][!highway] { z-index: 6; color: #444400; width: 3; dashes: 17, 2, 5, 0; } -way[railway=disused][!highway]::dashes,way[railway=abandoned][!highway]::dashes { z-index: 7; color: #999999; width: 2; dashes: 12,12; } - -way[railway=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; } -way[construction=tram] { z-index: 11; color: #999999; width: 2; casing-color: black; casing-width: 2; dashes: 6, 6; casing-dashes: 6, 6; } - -way[railway=light_rail] { z-index: 6; color: black; width: 4; } -way[railway=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,4; } - -way[construction=light_rail] { z-index: 6; color: black; width: 4; dashes: 8, 4, 4, 4; } -way[construction=light_rail]::dashes { z-index: 7; color: #999999; width: 2; dashes: 8,12; } - -/* Waterways */ - -way[waterway=river], -way[waterway=canal], -way[waterway=stream] { z-index: 5; color: #3434ff; width: 2; text:auto; text-color: #3434ff; font-size:9; text-position: line; text-offset: 7;} -way[waterway=drain] {z-index: 5; color: #3434ff; width: 1; text:auto; text-color: #3434ff; text-position: line; text-offset: 3;} -way[waterway][tunnel=yes] {z-index: 5; dashes: 8,4;} - -/* Aeroways */ - -way[aeroway=aerodrome]:closed - { z-index: 3; color: #bb44bb; width: 3; casing-color: #66066; casing-width: 1; } -way[aeroway=taxiway]!:closed { z-index: 8; color: #999999; width: 3; casing-color: #aa66aa; casing-width: 2; } -area[aeroway=taxiway]:closed { z-index: 8; color: #bb99bb; width: 3; fill-color: #ccaacc; } - -way[aeroway=runway]!:closed { z-index: 9; color: black; width: 5; } -way[aeroway=runway]!:closed::aa { z-index: 12; color: white; width: 5; dashes: 0, 20, 4, 76; } -way[aeroway=runway]!:closed::bb { z-index: 13; color: black; width: 3; } -way[aeroway=runway]!:closed::cc { z-index: 14; color: white; width: 1; dashes: 4, 16; } - -area[aeroway=runway]:closed { z-index: 9; color: black; width: 3; fill-color: #775577; } -area[aeroway=apron]:closed { z-index: 4; color: #cc66cc; width: 1; fill-color: #ddaadd; fill-opacity: 0.5;} - -/* Barriers */ - -way[barrier] {z-index: 5; color: #000000; width: 1} -way[barrier=fence] {z-index: 5; color: #000000; width: 1; dashes: 8,4,2,4; } - -/* Power */ - -way[power=line] {z-index: 5; color: darkgray; width: 3; dashes: 12,2; casing-color: black; casing-width: 2; casing-dashes: 4, 38;} -way[power=minor_line] {z-index: 5; color: gray; width: 2; dashes: 2,4; casing-width: 3; casing-color: white; casing-dashes: 2,22;} -area[power=station]:closed { color: black; width: 2; fill-color: #666666; fill-opacity: 0.6; prop_area_small_name : 1;} -area[power=generator]:closed { color: black; width: 2; fill-color: #444444; fill-opacity: 0.6; prop_area_small_name : 1;} - -/* Leisure */ - -way[golf=hole] {z-index: 5; color: darkgreen; width: 5; casing-color: green; casing-width: 2; } -area[leisure=sports_centre]:closed { color: #66ddcc; fill-color: #66ddcc; prop_area_small_name : 1; } - - -/* Physical decoration */ - -way[bridge=yes]::bridge1, way[bridge=viaduct]::bridge1, way[bridge=suspension]::bridge1 { z-index: 4; color: white; width: +3; } -way[bridge=yes]::bridge2, way[bridge=viaduct]::bridge2, way[bridge=suspension]::bridge2 { z-index: 3; color: #444444; width: +6; } -way[tunnel=yes][!waterway]::bridge1 { z-index: 4; color: white; width: +2; } -way[tunnel=yes][!waterway]::bridge2 { z-index: 3; color: black; width: +6; dashes: 4,4; } - -/* Attribute decoration */ - -/*way[oneway=yes]::arrows, way[junction=roundabout]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows; } -way[oneway=-1]::arrows { z-index: 15; color: #555555; width: 2; dashes: 10,50; line-style: arrows-reversed; }*/ - -/**************** - * core_pois.css - ****************/ - -node { text-anchor-horizontal: center; text-anchor-vertical: below; } - -node[place] { icon-image: icons/place.png; font-family: DejaVu; text: auto; font-size: 10; font-weight: bold; z-index: 20; } -node[amenity=telephone] { icon-image: icons/telephone.png; z-index: 20; } -node[barrier=cattle_grid] { icon-image: icons/cattle_grid.png; z-index: 20; } -node[tourism=guesthouse] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=alpine_hut] { icon-image: icons/accommodation_alpinehut.n.16.png; z-index: 20; } -node[tourism=camp_site] { icon-image: icons/accommodation_camping.n.16.png; z-index: 20; } -node[tourism=caravan_site] { icon-image: icons/accommodation_caravan_park.n.16.png; z-index: 20; } -node[tourism=chalet] { icon-image: icons/accommodation_chalet.n.16.png; z-index: 20; } -node[tourism=guest_house],node[tourism=bed_and_breakfast] { icon-image: icons/accommodation_bed_and_breakfast.n.16.png; z-index: 20; } -node[tourism=hotel] { icon-image: icons/accommodation_hotel.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[tourism=hostel] { icon-image: icons/accommodation_youth_hostel.n.16.png; z-index: 20; } -node[tourism=motel] { icon-image: icons/accommodation_motel.n.16.png; z-index: 20; } -node[amenity=fire_station] { icon-image: icons/amenity_firestation2.n.16.png; z-index: 20; } -node[amenity=police] { icon-image: icons/amenity_police2.n.16.png; z-index: 20; } -node[amenity=post_box] { icon-image: icons/amenity_post_box.n.16.png; z-index: 20; } -node[amenity=recycling] { icon-image: icons/amenity_recycling.n.16.png; z-index: 20; } -node[barrier=bollard] { icon-image: icons/barrier_bollard.n.16.png; z-index: 20; } -node[barrier=gate], node[highway=gate] { icon-image: icons/barrier_gate.n.16.png; z-index: 20; } -node[barrier=stile], node[highway=stile] { icon-image: icons/barrier_stile.n.16.png; z-index: 20; } -node[barrier=toll_booth] { icon-image: icons/barrier_toll_booth.n.16.png; z-index: 20; } -node[barrier=lift_gate] { icon-image: icons/barrier_lift_gate.n.16.png; z-index: 20; } -node[barrier=kissing_gate] { icon-image: icons/barrier_kissing_gate.16.png; z-index: 20; } -node[barrier=cycle_barrier] { icon-image: icons/barrier_cycle_barrier.16.png; z-index: 20; } -node[barrier=block] { icon-image: icons/barrier_blocks.16.png; z-index: 20; } -node[barrier=cattle_grid] { icon-image: icons/barrier_cattle_grid.16.png; z-index: 20; } -node[amenity=school] { icon-image: icons/education_school.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -area[amenity=school]:closed { color: yellow; fill-color: yellow; fill-opacity: 0.1; prop_area_small_name : 1; } -node[amenity=bar] { icon-image: icons/food_bar.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=cafe] { icon-image: icons/food_cafe.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=fast_food] { icon-image: icons/food_fastfood.n.16.png; z-index: 20; } -node[amenity=nightclub] { icon-image: icons/food_nightclub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; } -node[amenity=pub] { icon-image: icons/food_pub.n.16.png; text-offset: 0; text: auto; font-size: 10; z-index: 20; } -node[amenity=restaurant] { icon-image: icons/food_restaurant.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=hospital] { icon-image: icons/health_hospital.n.16.png; z-index: 20; } -node[amenity=pharmacy] { icon-image: icons/health_pharmacy.n.16.png; z-index: 20; } -node[emergency=defibrillator] { icon-image: icons/ISO_7010_E010.16.png; z-index: 20; } -node[amenity=atm] { icon-image: icons/money_atm.n.16.png; z-index: 20; } -node[amenity=bank] { icon-image: icons/money_bank2.n.16.png; z-index: 20; } -/* More Amenities */ -node[amenity=bench] { icon-image: icons/amenity_bench.n.16.png; z-index: 20; } -node[amenity=drinking_water] { icon-image: icons/food_drinkingtap.n.16.png; z-index: 20; } -node[amenity=emergency_phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } -node[emergency=phone] { icon-image: icons/emergency-telephone-16.png; z-index: 20; } -node[amenity=fountain] { icon-image: icons/amenity_fountain2.n.16.png; z-index: 20; } -node[amenity=hunting_stand] { icon-image: icons/sport_shooting.n.16.png; z-index: 20; } -node[amenity=kindergarten] { icon-image: icons/education_nursery3.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=library] { icon-image: icons/amenity_library.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=place_of_worship] { icon-image: icons/place_of_worship_unknown.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=post_office] { icon-image: icons/amenity_post_office.n.16.png; z-index: 20; } -node[amenity=shelter] { icon-image: icons/accommodation_shelter2.n.16.png; z-index: 20; } -node[leisure=swimming_pool] { icon-image: icons/sport_swimming_outdoor.n.16.png; z-index: 20; } -node[amenity=townhall] { icon-image: icons/amenity_town_hall.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20; } -node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; } -node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; } -node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; } -node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; } -/* Shops */ -node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; } -node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; } -node[shop=bicycle] { icon-image: icons/shopping_bicycle.n.16.png; z-index: 20; } -node[shop=book], node[shop=books] { icon-image: icons/shopping_book.n.16.png; z-index: 20; } -node[shop=butcher] { icon-image: icons/shopping_butcher.n.16.png; z-index: 20; } -node[shop=car_repair] { icon-image: icons/shopping_car_repair.n.16.png; z-index: 20; } -node[shop=car] { icon-image: icons/shopping_car.n.16.png; z-index: 20; } -node[shop=clothes] { icon-image: icons/shopping_clothes.n.16.png; z-index: 20; } -node[shop=confectionery] { icon-image: icons/shopping_confectionery.n.16.png; z-index: 20; } -node[shop=convenience] { icon-image: icons/shopping_convenience.n.16.png; z-index: 20; } -node[shop=department_store] { icon-image: icons/shopping_department_store.n.16.png; z-index: 20; } -node[shop=doityourself] { icon-image: icons/shopping_diy.n.16.png; z-index: 20; } -node[shop=fishmonger] { icon-image: icons/shopping_fish.n.16.png; z-index: 20; } -node[shop=florist] { icon-image: icons/shopping_florist.n.16.png; z-index: 20; } -node[shop=garden_centre] { icon-image: icons/shopping_garden_centre.n.16.png; z-index: 20; } -node[shop=gift] { icon-image: icons/shopping_gift.n.16.png; z-index: 20; } -node[shop=greengrocer] { icon-image: icons/shopping_greengrocer.n.16.png; z-index: 20; } -node[shop=hairdresser] { icon-image: icons/shopping_hairdresser.n.16.png; z-index: 20; } -node[shop=hifi] { icon-image: icons/shopping_hifi.n.16.png; z-index: 20; } -node[shop=jewelry] { icon-image: icons/shopping_jewelry.n.16.png; z-index: 20; } -node[shop=kiosk] { icon-image: icons/shopping_kiosk.n.16.png; z-index: 20; } -node[shop=laundry] { icon-image: icons/shopping_laundrette.n.16.png; z-index: 20; } -node[amenity=marketplace] { icon-image: icons/shopping_marketplace.n.16.png; z-index: 20; } -node[shop=motorcycle] { icon-image: icons/shopping_motorcycle.n.16.png; z-index: 20; } -node[shop=music] { icon-image: icons/shopping_music.n.16.png; z-index: 20; } -node[shop=supermarket] { icon-image: icons/shopping_supermarket.n.16.png; z-index: 20; } -node[shop=toys] { icon-image: icons/shopping_toys.n.16.png; z-index: 20; } -/* More Touristy Items */ -node[tourism=artwork] { icon-image: icons/tourist_art_gallery2.n.16.png; z-index: 20; } -node[historic=archaeological_site] { icon-image: icons/tourist_archaeological.n.16.png; z-index: 20; } -node[historic=battlefield] { icon-image: icons/tourist_battlefield.n.16.png; z-index: 20; } -node[historic=castle] { icon-image: icons/tourist_castle.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[amenity=cinema] { icon-image: icons/tourist_cinema.n.16.png; z-index: 20; } -node[historic=memorial] { icon-image: icons/tourist_memorial.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[historic=monument] { icon-image: icons/tourist_monument.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[tourism=museum] { icon-image: icons/tourist_museum.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[tourism=information] { icon-image: icons/tourist_information.png; z-index: 20; } -node[tourism=picnic_site] { icon-image: icons/tourist_picnic.n.16.png; z-index: 20; } -node[historic=ruins] { icon-image: icons/tourist_ruin.n.16.png; z-index: 20; } -node[amenity=theatre] { icon-image: icons/tourist_theatre.n.16.png; z-index: 20; } -node[tourism=theme_park] { icon-image: icons/tourist_theme_park.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[tourism=viewpoint] { icon-image: icons/tourist_view_point.n.16.png; z-index: 20; } -node[tourism=zoo] { icon-image: icons/tourist_zoo.n.16.png; z-index: 20; } -/* Transport */ -node[aeroway=aerodrome] { icon-image: icons/transport_aerodrome.n.16.png; z-index: 20; } -node[aeroway=gate] { icon-image: icons/transport_airport_gate.n.16.png; z-index: 20; } -node[aeroway=terminal] { icon-image: icons/transport_airport_terminal.n.16.png; z-index: 20; } -node[aeroway=helipad] { icon-image: icons/transport_helicopter_pad.n.16.png; z-index: 20; } -node[amenity=bus_station] { icon-image: icons/transport_bus_station.n.16.png; z-index: 20; } -node[highway=bus_stop] { icon-image: icons/transport_bus_stop2.n.16.png; z-index: 20; } -node[amenity=fuel] { icon-image: icons/transport_fuel.n.16.png; z-index: 20; } -node[amenity=car_wash] { icon-image: icons/transport_car_wash.n.16.png; z-index: 20; } -node[amenity=bicycle_parking] { icon-image: icons/transport_parking_bicycle.n.16.png; text-offset:0; text: capacity; font-size: 10; z-index: 20; } -node[amenity=parking] { icon-image: icons/transport_parking_car.n.16.png; z-index: 20; } -node[amenity=ferry_terminal] { icon-image: icons/transport_port.n.16.png; z-index: 20; } -node[amenity=bicycle_rental] { icon-image: icons/transport_rental_bicycle.n.16.png; z-index: 20; } -node[amenity=car_rental] { icon-image: icons/transport_rental_car.n.16.png; z-index: 20; } -node[amenity=taxi] { icon-image: icons/transport_taxi_rank.n.16.png; z-index: 20; } -node[railway=station] { icon-image: icons/transport_train_station.n.16.png; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[railway=tram_stop] { icon-image: icons/transport_tram_stop.n.16.png; z-index: 20; } -node[leisure=marina] { icon-image: icons/transport_marina.n.16.png; z-index: 20; } -node[highway=mini_roundabout] { icon-image: icons/transport_miniroundabout_anticlockwise.n.16.png; z-index: 20; } -node[highway=crossing] { icon-image: icons/transport_zebracrossing.n.16.png; z-index: 20; } -/* Misc */ -node[leisure=playground] { icon-image: icons/amenity_playground.n.16.png; z-index: 20; } -node[leisure=sports_centre] { icon-image: icons/sport_leisure_centre.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -/* node[landuse=cemetery], node[landuse=grave_yard] { i|||con-image: icons/?.png; z-index: 20; } */ -node[man_made=survey_point] { icon-image: icons/manmade_lighthouse.png; z-index: 20; } -node[man_made=tower] { icon-image: icons/manmade_tower.png; z-index: 20; } -/* Yes these power stations seem a little backward - but that's seemingly what the side menu uses ATM */ -node[power=station] { icon-image: icons/power_substation.n.16.png; z-index: 20; } -node[power=generator] { icon-image: icons/power_station.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -/* P2 previously had these icons instead of "icon-image: cross" which is not standard MapCSS but a P2 keyword we won't implement, so keep the old icons */ -node[power=tower] { icon-image: icons/power_tower_high2.n.16.png; z-index: 20; } -node[power=pole] { icon-image: icons/power_tower_low.n.16.png; z-index: 20; } -node[waterway=weir] { icon-image: icons/transport_weir.n.16.png; z-index: 20; } -/* Natural */ -node[natural=peak] { icon-image: icons/natural_peak.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } -node[natural=tree] { icon-image: icons/natural_tree.n.16.png; z-index: 20; text-offset:0; text: auto; font-size: 10; z-index: 20; } - -/* Addressing */ - -node[addr:housenumber], -node[addr:housename] { symbol-shape: circle; symbol-size: 8; symbol-fill-color: #B0E0E6; } -node[addr:housenumber]::hn_casing, -node[addr:housename]::hn_casing { z-index: -100; symbol-shape: circle; symbol-size: 10; symbol-fill-color: blue; } - -way[addr:interpolation] { color: #B0E0E6; width: 3; dashes: 3,3;} -/**************** - * core_landuse.css - ****************/ - -/* Landuse */ - -area[natural]:closed { color: #ADD6A5; width: 1; fill-color: #ADD6A5; fill-opacity: 0.2; } -area[natural=beach]:closed { color: #ffdd44; width: 1; fill-color: yellow; fill-opacity: 0.2; prop_area_small_name : 1;} -way[natural=coastline] { z-index: 5; color: black; width: 3; } -area[landuse]:closed { color: #444444; width: 2; fill-color: #444444; fill-opacity: 0.3; } -area[landuse=residential]:closed { color: #666666; width: 2; fill-color: #666666; fill-opacity: 0.15; } -area[landuse=retail]:closed { color: #cc2222; width: 2; fill-color: #aa4422; fill-opacity: 0.15; } -area[landuse=commercial]:closed { color: #4444bb; width: 2; fill-color: #444488; fill-opacity: 0.15; } -area[landuse=military]:closed { color: #ff4444; width: 2; fill-color: #ff4444; fill-opacity: 0.2; prop_area_small_name : 1; } -area[amenity]:closed, area[shop]:closed { color: #ADCEB5; width: 1; fill-color: #ADCEB5; fill-opacity: 0.2; } -/* way[sport] should not be rendered by itself, according to wiki. Can we make it an "if all else fails"? */ -area[leisure]:closed { color: #8CD6B5; width: 1; fill-color: #8CD6B5; fill-opacity: 0.2; } -area[tourism]:closed { color: #F7CECE; width: 1; fill-color: #F7CECE; fill-opacity: 0.2; prop_area_small_name : 1;} -area[historic]:closed, area[ruins]:closed { color: #F7F7DE; width: 1; fill-color: #F7F7DE; fill-opacity: 0.2; prop_area_small_name : 1;} -area[military]:closed { color: #D6D6D6; width: 1; fill-color: #D6D6D6; fill-opacity: 0.2; prop_area_small_name : 1;} -area[building]:closed { color: #bca9a9; width: 1; fill-color: #ff6ec7; fill-opacity: 0.2; } -area[natural=water]:closed, -area[waterway][waterway!=dam]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} -way[waterway=dam]!:closed { z-index: 5; color: black; width: 3; } -area[waterway=dam]:closed { z-index: 5; color: black; width: 1; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1;} -area[man_made]:closed { color: black; width: 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } -area[man_made=reservoir_covered]:closed { color: #3434ff; width: 2; dashes: 4, 2; fill-color: #222222; fill-opacity: 0.1; prop_area_small_name : 1; } -area[landuse=reservoir]:closed { color: #3434ff; width: 2; fill-color: #3434ff; fill-opacity: 0.2; prop_area_small_name : 1;} -area[landuse=forest]:closed, area[natural=wood]:closed { color: green; width: 2; fill-color: green; fill-opacity: 0.2; prop_area_small_name : 1;} -area[leisure=park]:closed { color: #22aa22; width: 2; fill-color: #44ff44; fill-opacity: 0.15; prop_area_small_name : 1;} -area[leisure=garden]:closed { color: #66ff44; width: 1; fill-color: #66ff44; fill-opacity: 0.2; prop_area_small_name : 1;} -area[leisure=pitch]:closed { z-index: 6; color: #88bb44; width: 2; fill-color: #88ff44; fill-opacity: 0.2; prop_area_small_name : 1;} -area[landuse=recreation_ground]:closed { color: green; fill-color: green; prop_area_small_name : 1;} -area[amenity=parking]:closed { color: #bbaa66; width: 1; fill-color: #bbaa66; fill-opacity: 0.2; } -area[public_transport=pay_scale_area]:closed { color: gray; width: 1; fill-color: gray; fill-opacity: 0.1; } -way[man_made=pier] { z-index: 4; color: #777; width: 3; casing-color: black; casing-width: 1;} -way[man_made=pier][floating=yes] { z-index: 5; dashes: 4,2; casing-color: #444;} -area[leisure=marina]:closed { color: pink; fill-color: pink; fill-opacity: 0.4; prop_area_small_name : 1;} -way[leisure=slipway] { z-index: 5; color: grey; width: 3; casing-color: #3434ff; casing-width: 2; } -area[leisure=golf_course]:closed { color: #44ee22; width: 2; fill-color: #44ee22; fill-opacity: 0.2; prop_area_small_name : 1;} -way[boundary] { z-index: 5; color: #000066; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} -/* Perhaps should be filled, on lower zooms. */ -way[boundary=national_park] { z-index: 5; color: #225500; width: 2; opacity: 0.6; dashes: 24,4, 4, 4; z-index: 4;} -way[boundary=protected_area] { z-index: 5; color: #447744; width: 2; opacity: 0.6; dashes: 12,4, 4, 4; z-index: 4;} -way[boundary=administrative] { z-index: 5; color: purple; width: 2; opacity: 0.2; dashes: 24,4; z-index: 4;} -way[boundary=administrative][waterway] { z-index: 5; opacity: 0.8; z-index: 4; dashes: 24,4; width: 6; } -area[landuse=cemetery]:closed { color: #664466; width: 2; fill-color: #664466; opacity: 0.2; prop_area_small_name : 1;} -/* Addressing. Nodes with addresses *and* match POIs should have a poi icon, so we put addressing first */ -/* Route relations */ - -relation[type=route] > way::route { z-index: -1; width: 13; color: blue; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=ncn] > way::route { z-index: -1; width: 12; color: red; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=rcn] > way::route { z-index: -1; width: 12; color: cyan; opacity: 0.3; linecap: none; } -relation[type=route][route=bicycle][network=lcn] > way::route { z-index: -1; width: 12; color: blue; opacity: 0.3; linecap: none; } -relation[type=route][route=mtb] > way::route { z-index: -1; width: 12; color: brown; opacity: 0.3; linecap: none; } -relation[type=route][route=foot] > way::route { z-index: -1; width: 10; color: #80ff80; opacity: 0.6; linecap: none; } - -/*@import("stylesheets/core_ways.css");*/ -/*@import("stylesheets/core_pois.css");*/ -/*@import("stylesheets/core_landuse.css");*/ -/*@import("stylesheets/core_relations.css");*/ -way[is_prop_set("prop_area_small_name")] {text-color: black; font-size: 10; text: auto; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;} -/*@import("stylesheets/core_interactive.css");*/ - -/* Rendering for licence status */ - -/*way[_status=no]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; } -way[_status=partial]::status { z-index: 0; width: eval('_width+7'); color: #AA0000; opacity: 0.6; } -way[_status=unsure]::status { z-index: 0; width: eval('_width+7'); color: darkorange; opacity: 0.6; } -node[_status=no]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: #AA0000; } -node[_status=partial]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: #AA0000; opacity: 0.6; } -node[_status=unsure]::status { z-index: 0; i|||con-image: square; icon-width: eval('_width+7'); color: darkorange; opacity: 0.6; }*/ diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java index 6db9cb1e1ed..6f66b583b9e 100644 --- a/src/org/openstreetmap/josm/data/Preferences.java +++ b/src/org/openstreetmap/josm/data/Preferences.java @@ -900,6 +900,7 @@ private void removeAndUpdateObsolete(int loadedVersion) { putBoolean("preferences.reset.draw.rawgps.lines", true); putInt("draw.rawgps.lines", -1); } + updateMapPaintKnownDefaults(); if (modifiedDefault) { try { saveDefaults(); @@ -911,6 +912,42 @@ private void removeAndUpdateObsolete(int loadedVersion) { } } + /** + * Update the known defaults for the map paintstyles. + * This should be removed sometime after 2024-06-01. + */ + private void updateMapPaintKnownDefaults() { + final String url = "url"; + final String active = "active"; + final String potlatch2 = "resource://styles/standard/potlatch2.mapcss"; + final String remotePotlatch2 = "https://josm.openstreetmap.de/josmfile?page=Styles/Potlatch2&zip=1"; + + // Remove potlatch2 from the known defaults + final List knownDefaults = new ArrayList<>(getList("mappaint.style.known-defaults")); + // See #18866: Potlatch 2 internal theme removed in favor of remote theme by Stereo + knownDefaults.removeIf(potlatch2::equals); + + // Moved from MapPaintPrefHelper for consistency + // XML style is not bundled anymore + knownDefaults.removeIf("resource://styles/standard/elemstyles.xml"::equals); + putList("mappaint.style.known-defaults", knownDefaults); + + // Replace potlatch2 in the current style entries, but only if it is enabled. Otherwise, remove it. + final List> styleEntries = new ArrayList<>(getListOfMaps("mappaint.style.entries")); + final boolean potlatchEnabled = styleEntries.stream().filter(map -> potlatch2.equals(map.get(url))) + .anyMatch(map -> Boolean.parseBoolean(map.get(active))); + final boolean remotePotlatch2Present = styleEntries.stream().anyMatch(map -> remotePotlatch2.equals(map.get(url))); + // Remove potlatch2 if it is not enabled _or_ the remote potlatch2 version is present + styleEntries.removeIf(map -> (!potlatchEnabled || remotePotlatch2Present) && potlatch2.equals(map.get(url))); + styleEntries.replaceAll(HashMap::new); // The maps are initially immutable. + for (Map map : styleEntries) { + if (potlatch2.equals(map.get(url))) { + map.put(url, remotePotlatch2); + } + } + putListOfMaps("mappaint.style.entries", styleEntries); + } + /** * Enables or not the preferences file auto-save mechanism (save each time a setting is changed). * This behaviour is enabled by default. diff --git a/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java b/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java index aa250d0b6f0..35f38775afe 100644 --- a/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java +++ b/src/org/openstreetmap/josm/data/preferences/sources/MapPaintPrefHelper.java @@ -4,8 +4,8 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -72,9 +72,6 @@ private boolean insertNewDefaults(List list) { } Config.getPref().putList("mappaint.style.known-defaults", new ArrayList<>(knownDefaults)); - // XML style is not bundled anymore - list.removeIf(se -> "resource://styles/standard/elemstyles.xml".equals(se.url)); - return changed; } @@ -86,14 +83,7 @@ public Collection getDefault() { defJosmMapcss.icon = new ImageProvider("logo").getResource(); defJosmMapcss.title = tr("JOSM default (MapCSS)"); defJosmMapcss.description = tr("Internal style to be used as base for runtime switchable overlay styles"); - ExtendedSourceEntry defPL2 = new ExtendedSourceEntry(type, "potlatch2.mapcss", "resource://styles/standard/potlatch2.mapcss"); - defPL2.active = false; - defPL2.name = "standard"; - defPL2.icon = new ImageProvider("dialogs/mappaint", "pl2_small").getResource(); - defPL2.title = tr("Potlatch 2"); - defPL2.description = tr("the main Potlatch 2 style"); - - return Arrays.asList(defJosmMapcss, defPL2); + return Collections.singletonList(defJosmMapcss); } @Override diff --git a/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java b/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java index 44a4b5f234e..f54343a3ffb 100644 --- a/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java +++ b/test/unit/org/openstreetmap/josm/data/validation/ValidatorCLITest.java @@ -87,7 +87,7 @@ void tearDown() { } @ParameterizedTest - @ValueSource(strings = {"resources/styles/standard/elemstyles.mapcss", "resources/styles/standard/potlatch2.mapcss"}) + @ValueSource(strings = "resources/styles/standard/elemstyles.mapcss") void testInternalMapcss(final String resourceLocation) { validatorCLI.processArguments(new String[]{"--input", resourceLocation}); assertEquals(2, this.handler.logRecordList.size());