From c3864c8d40ddd269e2f983e30750e1a790536373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Tue, 21 Aug 2018 14:55:38 +0200 Subject: [PATCH 01/19] add icons for memorial subtags --- amenity-points.mss | 29 +++++++++++---- project.mml | 21 +++++------ symbols/memorial/bust.svg | 31 ++++++++++++++++ symbols/{ => memorial}/memorial.svg | 0 symbols/memorial/monument.svg | 31 ++++++++++++++++ symbols/memorial/obelisk.svg | 55 +++++++++++++++++++++++++++++ symbols/{ => memorial}/plaque.svg | 0 symbols/memorial/statue.svg | 31 ++++++++++++++++ symbols/memorial/stone.svg | 31 ++++++++++++++++ symbols/monument.svg | 21 ----------- 10 files changed, 210 insertions(+), 40 deletions(-) create mode 100644 symbols/memorial/bust.svg rename symbols/{ => memorial}/memorial.svg (100%) create mode 100644 symbols/memorial/monument.svg create mode 100644 symbols/memorial/obelisk.svg rename symbols/{ => memorial}/plaque.svg (100%) create mode 100644 symbols/memorial/statue.svg create mode 100644 symbols/memorial/stone.svg delete mode 100644 symbols/monument.svg diff --git a/amenity-points.mss b/amenity-points.mss index 31eccb4a8a..eea93eec8f 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -703,23 +703,38 @@ marker-clip: false; } - [feature = 'historic_memorial'][zoom >= 17] { - marker-file: url('symbols/memorial.svg'); + [feature = 'historic_memorial'][zoom >= 17], + [feature = 'historic_memorial_stele'][zoom >= 19], + [feature = 'historic_memorial_war_memorial'][zoom >= 19] { + marker-file: url('symbols/memorial/memorial.svg'); + [memorial = 'bust'][zoom >= 19] { + marker-file: url('symbols/memorial/bust.svg'); + } + [memorial = 'blue_plaque'][zoom >= 19], + [memorial = 'plaque'][zoom >= 19], + [memorial = 'stolperstein'][zoom >= 19] { + marker-file: url('symbols/memorial/plaque.svg'); + } + [memorial = 'statue'][zoom >= 19] { + marker-file: url('symbols/memorial/statue.svg'); + } + [memorial = 'stone'][zoom >= 19] { + marker-file: url('symbols/memorial/stone.svg'); + } marker-fill: @memorials; marker-placement: interior; marker-clip: false; } - [feature = 'historic_memorial_plaque'][zoom >= 19] { - marker-file: url('symbols/plaque.svg'); + [feature = 'man_made_obelisk'][zoom >= 17] { + marker-file: url('symbols/memorial/obelisk.svg'); marker-fill: @memorials; marker-placement: interior; marker-clip: false; } - [feature = 'man_made_obelisk'][zoom >= 16], [feature = 'historic_monument'][zoom >= 16] { - marker-file: url('symbols/monument.svg'); + marker-file: url('symbols/memorial/monument.svg'); marker-fill: @memorials; marker-placement: interior; marker-clip: false; @@ -1680,7 +1695,7 @@ [feature = 'tourism_artwork'][zoom >= 17], [feature = 'historic_memorial'][zoom >= 17], [feature = 'historic_memorial_plaque'][zoom >= 19], - [feature = 'man_made_obelisk'][zoom >= 16], + [feature = 'man_made_obelisk'][zoom >= 17], [feature = 'historic_monument'][zoom >= 16], [feature = 'historic_fort'][zoom >= 16], [feature = 'historic_castle'][zoom >= 16], diff --git a/project.mml b/project.mml index 2b3c51faa1..21e4a80926 100644 --- a/project.mml +++ b/project.mml @@ -1610,8 +1610,7 @@ Layer: 'man_made_' || CASE WHEN man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk') THEN man_made ELSE NULL END, 'natural_' || CASE WHEN "natural" IN ('spring') THEN "natural" ELSE NULL END, 'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate') - THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END) - ELSE NULL END, + THEN historic ELSE NULL END, 'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END, 'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway ELSE NULL END, 'power_' || CASE WHEN power IN ('generator') THEN power ELSE NULL END, @@ -1638,6 +1637,7 @@ Layer: tags->'tower:type' as "tower:type", tags->'castle_type' as castle_type, tags->'information' as information, + tags->'memorial' as memorial, CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', @@ -1663,7 +1663,6 @@ Layer: OR man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk') OR "natural" IN ('spring') OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate') - OR tags->'memorial' IN ('plaque') OR military IN ('bunker') OR highway IN ('bus_stop', 'elevator', 'traffic_signals') OR (power = 'generator' AND (tags @> '"generator:source"=>wind' OR tags @> 'power_source=>wind')) @@ -1723,8 +1722,7 @@ Layer: 'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END, 'waterway_' || CASE WHEN "waterway" IN ('waterfall') THEN waterway ELSE NULL END, 'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate') - THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END) - ELSE NULL END, + THEN historic ELSE NULL END, 'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END, 'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway WHEN tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones' THEN 'ford' ELSE NULL END, @@ -1768,6 +1766,7 @@ Layer: tags->'tower:type' as "tower:type", tags->'castle_type' as castle_type, tags->'information' as information, + tags->'memorial' as memorial, CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', @@ -1795,7 +1794,6 @@ Layer: OR "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') OR waterway IN ('waterfall') OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross', 'fort', 'wayside_shrine', 'castle', 'manor', 'city_gate') - OR tags->'memorial' IN ('plaque') OR military IN ('bunker') OR tags @> 'emergency=>phone' OR highway IN ('bus_stop', 'elevator', 'traffic_signals') @@ -2194,8 +2192,7 @@ Layer: 'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END, 'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END, 'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate') - THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END) - ELSE NULL END, + THEN historic ELSE NULL END, 'highway_' || CASE WHEN highway IN ('services', 'rest_area', 'bus_stop', 'elevator') THEN highway ELSE NULL END, 'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END, 'waterway_' || CASE WHEN waterway IN ('dam', 'dock') THEN waterway ELSE NULL END, @@ -2226,6 +2223,7 @@ Layer: tags->'recycling_type' as recycling_type, tags->'castle_type' as castle_type, tags->'information' as information, + tags->'memorial' as memorial, ref, way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building @@ -2245,7 +2243,6 @@ Layer: OR place IN ('island', 'islet') OR military IN ('danger_area', 'bunker') OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate') - OR tags->'memorial' IN ('plaque') OR highway IN ('services', 'rest_area', 'bus_stop', 'elevator') OR power IN ('plant', 'station', 'generator', 'sub_station', 'substation') OR boundary IN ('national_park') @@ -2314,6 +2311,7 @@ Layer: recycling_type, castle_type, information, + memorial, ref, way_area, is_building @@ -2362,8 +2360,7 @@ Layer: 'barrier_' || CASE WHEN barrier IN ('toll_booth') THEN barrier ELSE NULL END, 'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END, 'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate') - THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END) - ELSE NULL END, + THEN historic ELSE NULL END, 'highway_' || CASE WHEN highway IN ('services', 'rest_area', 'bus_stop', 'elevator') THEN highway ELSE NULL END, 'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END, 'waterway_' || CASE WHEN waterway IN ('dam', 'weir', 'dock') THEN waterway ELSE NULL END, @@ -2400,6 +2397,7 @@ Layer: tags->'recycling_type' as recycling_type, tags->'castle_type' as castle_type, tags->'information' as information, + tags->'memorial' as memorial, ref, NULL AS way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building @@ -2423,7 +2421,6 @@ Layer: OR barrier IN ('toll_booth') OR military IN ('danger_area', 'bunker') OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross', 'fort', 'wayside_shrine', 'castle', 'manor', 'city_gate') - OR tags->'memorial' IN ('plaque') OR highway IN ('bus_stop', 'services', 'rest_area', 'elevator') OR power IN ('plant', 'station', 'generator', 'sub_station', 'substation') OR boundary IN ('national_park') diff --git a/symbols/memorial/bust.svg b/symbols/memorial/bust.svg new file mode 100644 index 0000000000..0af194b331 --- /dev/null +++ b/symbols/memorial/bust.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/symbols/memorial.svg b/symbols/memorial/memorial.svg similarity index 100% rename from symbols/memorial.svg rename to symbols/memorial/memorial.svg diff --git a/symbols/memorial/monument.svg b/symbols/memorial/monument.svg new file mode 100644 index 0000000000..0ee12f4500 --- /dev/null +++ b/symbols/memorial/monument.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/symbols/memorial/obelisk.svg b/symbols/memorial/obelisk.svg new file mode 100644 index 0000000000..84f8a487a0 --- /dev/null +++ b/symbols/memorial/obelisk.svg @@ -0,0 +1,55 @@ + + + + + + + image/svg+xml + + + + + + + + diff --git a/symbols/plaque.svg b/symbols/memorial/plaque.svg similarity index 100% rename from symbols/plaque.svg rename to symbols/memorial/plaque.svg diff --git a/symbols/memorial/statue.svg b/symbols/memorial/statue.svg new file mode 100644 index 0000000000..b21d1b9c98 --- /dev/null +++ b/symbols/memorial/statue.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/symbols/memorial/stone.svg b/symbols/memorial/stone.svg new file mode 100644 index 0000000000..4c75612592 --- /dev/null +++ b/symbols/memorial/stone.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/symbols/monument.svg b/symbols/monument.svg deleted file mode 100644 index 25890a65a8..0000000000 --- a/symbols/monument.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - image/svg+xml - - - - - - - - - - From 2c1f2f4d586641693bbdac0714dd818ecffd0cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 7 Sep 2018 16:08:41 +0200 Subject: [PATCH 02/19] restore monument icon --- symbols/memorial/memorial_bench.svg | 31 ++++++++++++++++++++++ symbols/memorial/monument.svg | 40 +++++++++++------------------ 2 files changed, 46 insertions(+), 25 deletions(-) create mode 100644 symbols/memorial/memorial_bench.svg diff --git a/symbols/memorial/memorial_bench.svg b/symbols/memorial/memorial_bench.svg new file mode 100644 index 0000000000..0ee12f4500 --- /dev/null +++ b/symbols/memorial/memorial_bench.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/symbols/memorial/monument.svg b/symbols/memorial/monument.svg index 0ee12f4500..25890a65a8 100644 --- a/symbols/memorial/monument.svg +++ b/symbols/memorial/monument.svg @@ -1,31 +1,21 @@ - - - + + - + image/svg+xml - - + + - - + + + + From 7809e2b7e7351f240b49a8f6611f0f77c060e82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 7 Sep 2018 16:46:50 +0200 Subject: [PATCH 03/19] remove war_memorial tag --- amenity-points.mss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index eea93eec8f..c3de22267b 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -704,8 +704,7 @@ } [feature = 'historic_memorial'][zoom >= 17], - [feature = 'historic_memorial_stele'][zoom >= 19], - [feature = 'historic_memorial_war_memorial'][zoom >= 19] { + [feature = 'historic_memorial_stele'][zoom >= 19] { marker-file: url('symbols/memorial/memorial.svg'); [memorial = 'bust'][zoom >= 19] { marker-file: url('symbols/memorial/bust.svg'); From cd9522598d9b55f4604f1c5f39b07d05bd684476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 7 Sep 2018 16:58:55 +0200 Subject: [PATCH 04/19] change folder path --- symbols/{memorial => historic}/bust.svg | 0 symbols/{memorial => historic}/memorial.svg | 0 symbols/{memorial => historic}/memorial_bench.svg | 0 symbols/{memorial => historic}/monument.svg | 0 symbols/{memorial => historic}/obelisk.svg | 0 symbols/{memorial => historic}/plaque.svg | 0 symbols/{memorial => historic}/statue.svg | 0 symbols/{memorial => historic}/stone.svg | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename symbols/{memorial => historic}/bust.svg (100%) rename symbols/{memorial => historic}/memorial.svg (100%) rename symbols/{memorial => historic}/memorial_bench.svg (100%) rename symbols/{memorial => historic}/monument.svg (100%) rename symbols/{memorial => historic}/obelisk.svg (100%) rename symbols/{memorial => historic}/plaque.svg (100%) rename symbols/{memorial => historic}/statue.svg (100%) rename symbols/{memorial => historic}/stone.svg (100%) diff --git a/symbols/memorial/bust.svg b/symbols/historic/bust.svg similarity index 100% rename from symbols/memorial/bust.svg rename to symbols/historic/bust.svg diff --git a/symbols/memorial/memorial.svg b/symbols/historic/memorial.svg similarity index 100% rename from symbols/memorial/memorial.svg rename to symbols/historic/memorial.svg diff --git a/symbols/memorial/memorial_bench.svg b/symbols/historic/memorial_bench.svg similarity index 100% rename from symbols/memorial/memorial_bench.svg rename to symbols/historic/memorial_bench.svg diff --git a/symbols/memorial/monument.svg b/symbols/historic/monument.svg similarity index 100% rename from symbols/memorial/monument.svg rename to symbols/historic/monument.svg diff --git a/symbols/memorial/obelisk.svg b/symbols/historic/obelisk.svg similarity index 100% rename from symbols/memorial/obelisk.svg rename to symbols/historic/obelisk.svg diff --git a/symbols/memorial/plaque.svg b/symbols/historic/plaque.svg similarity index 100% rename from symbols/memorial/plaque.svg rename to symbols/historic/plaque.svg diff --git a/symbols/memorial/statue.svg b/symbols/historic/statue.svg similarity index 100% rename from symbols/memorial/statue.svg rename to symbols/historic/statue.svg diff --git a/symbols/memorial/stone.svg b/symbols/historic/stone.svg similarity index 100% rename from symbols/memorial/stone.svg rename to symbols/historic/stone.svg From 3a6699f77204fb610adbe43fc43bfa1939fcc25f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 7 Sep 2018 17:00:34 +0200 Subject: [PATCH 05/19] change folder path --- amenity-points.mss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index c3de22267b..f4271906fa 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -705,20 +705,20 @@ [feature = 'historic_memorial'][zoom >= 17], [feature = 'historic_memorial_stele'][zoom >= 19] { - marker-file: url('symbols/memorial/memorial.svg'); + marker-file: url('symbols/historic/memorial.svg'); [memorial = 'bust'][zoom >= 19] { - marker-file: url('symbols/memorial/bust.svg'); + marker-file: url('symbols/historic/bust.svg'); } [memorial = 'blue_plaque'][zoom >= 19], [memorial = 'plaque'][zoom >= 19], [memorial = 'stolperstein'][zoom >= 19] { - marker-file: url('symbols/memorial/plaque.svg'); + marker-file: url('symbols/historic/plaque.svg'); } [memorial = 'statue'][zoom >= 19] { - marker-file: url('symbols/memorial/statue.svg'); + marker-file: url('symbols/historic/statue.svg'); } [memorial = 'stone'][zoom >= 19] { - marker-file: url('symbols/memorial/stone.svg'); + marker-file: url('symbols/historic/stone.svg'); } marker-fill: @memorials; marker-placement: interior; @@ -726,14 +726,14 @@ } [feature = 'man_made_obelisk'][zoom >= 17] { - marker-file: url('symbols/memorial/obelisk.svg'); + marker-file: url('symbols/historic/obelisk.svg'); marker-fill: @memorials; marker-placement: interior; marker-clip: false; } [feature = 'historic_monument'][zoom >= 16] { - marker-file: url('symbols/memorial/monument.svg'); + marker-file: url('symbols/historic/monument.svg'); marker-fill: @memorials; marker-placement: interior; marker-clip: false; From 1404814dafae2cff8d508b2e9d8b7a08df7dec33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 19 Oct 2018 11:04:35 +0200 Subject: [PATCH 06/19] remove memorial_bench icon --- symbols/historic/memorial_bench.svg | 31 ----------------------------- 1 file changed, 31 deletions(-) delete mode 100644 symbols/historic/memorial_bench.svg diff --git a/symbols/historic/memorial_bench.svg b/symbols/historic/memorial_bench.svg deleted file mode 100644 index 0ee12f4500..0000000000 --- a/symbols/historic/memorial_bench.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - From 1c3b1d74f345aaebb7ecd305357f3a6f2b570d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 19 Oct 2018 11:33:09 +0200 Subject: [PATCH 07/19] render differently artwork_type=statue and change artwork icon --- amenity-points.mss | 12 ++++++++---- project.mml | 4 ++++ symbols/tourism/artwork.svg | 37 +++++++++++++++++++------------------ 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 399705033b..5074606ddb 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -156,10 +156,14 @@ } [feature = 'tourism_artwork'][zoom >= 17] { - marker-file: url('symbols/tourism/artwork.svg'); - marker-fill: @memorials; - marker-placement: interior; - marker-clip: false; + [artwork_type != 'statue'] { + marker-file: url('symbols/tourism/artwork.svg'); + } + [artwork_type = 'statue'] { + marker-file: url('symbols/historic/statue.svg'); + } + marker-fill: @memorials; + marker-placement: interior; } [feature = 'tourism_camp_site'][zoom >= 16] { diff --git a/project.mml b/project.mml index fbeb20cedb..7bce718788 100644 --- a/project.mml +++ b/project.mml @@ -1657,6 +1657,7 @@ Layer: tags->'castle_type' as castle_type, tags->'information' as information, tags->'memorial' as memorial, + tags->'artwork_type' as artwork_type, CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', @@ -1794,6 +1795,7 @@ Layer: tags->'castle_type' as castle_type, tags->'information' as information, tags->'memorial' as memorial, + tags->'artwork_type' as artwork_type, CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', 'garden_centre', 'hairdresser', 'hifi', 'ice_cream', 'car', 'car_repair', 'bicycle', 'mall', 'pet', @@ -2258,6 +2260,7 @@ Layer: tags->'castle_type' as castle_type, tags->'information' as information, tags->'memorial' as memorial, + tags->'artwork_type' as artwork_type, ref, way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building @@ -2436,6 +2439,7 @@ Layer: tags->'castle_type' as castle_type, tags->'information' as information, tags->'memorial' as memorial, + tags->'artwork_type' as artwork_type, ref, NULL AS way_area, CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building diff --git a/symbols/tourism/artwork.svg b/symbols/tourism/artwork.svg index 014348121c..433e792b9b 100644 --- a/symbols/tourism/artwork.svg +++ b/symbols/tourism/artwork.svg @@ -5,13 +5,15 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - id="svg2" - viewBox="0 0 14 14" - height="14" width="14" - version="1.1"> + height="14" + id="svg3800" + version="1.1" + viewBox="0 0 14 14"> + + id="metadata3805"> @@ -22,17 +24,16 @@ - - - + + + + + From 408f9f7605def429329aec8ef840acb2f4350d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 19 Oct 2018 11:38:55 +0200 Subject: [PATCH 08/19] remove unnecessary white spaces --- amenity-points.mss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 5074606ddb..edb46c5754 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -162,8 +162,8 @@ [artwork_type = 'statue'] { marker-file: url('symbols/historic/statue.svg'); } - marker-fill: @memorials; - marker-placement: interior; + marker-fill: @memorials; + marker-placement: interior; } [feature = 'tourism_camp_site'][zoom >= 16] { From 38519d2dc4322491756453537daaf460e9ec2977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Fri, 19 Oct 2018 22:35:48 +0200 Subject: [PATCH 09/19] fix pixel-aligned icon of stone --- symbols/historic/stone.svg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/symbols/historic/stone.svg b/symbols/historic/stone.svg index 4c75612592..4ac2e84958 100644 --- a/symbols/historic/stone.svg +++ b/symbols/historic/stone.svg @@ -5,11 +5,11 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" - viewBox="0 0 14 14" - height="14" - width="14" + version="1.1" id="svg109" - version="1.1"> + width="14" + height="14" + viewBox="0 0 14 14"> @@ -25,7 +25,7 @@ + style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.38080966;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" + d="M 6,2 C 1.5761781,1.9981574 0,3.9915246 -6.1979257e-6,7.9389842 0,11 3,12 7.738275,11.99037 c 3.993429,0 6.278049,-2.4152505 6.261719,-4.5667636 C 14,5 9,2 6,2 Z M 4,4 H 5 V 5 H 4 Z M 6,4 H 9 V 5 H 6 Z M 2,7 h 9 V 8 H 2 Z m 2,2 h 5 v 1 H 4 Z" + id="path30" /> From a3845c9f5f15a1a5221e86f781118e288db50bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Sun, 21 Oct 2018 12:09:57 +0200 Subject: [PATCH 10/19] remove stolperstein --- amenity-points.mss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index edb46c5754..7bf37869a6 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -776,8 +776,7 @@ marker-file: url('symbols/historic/bust.svg'); } [memorial = 'blue_plaque'][zoom >= 19], - [memorial = 'plaque'][zoom >= 19], - [memorial = 'stolperstein'][zoom >= 19] { + [memorial = 'plaque'][zoom >= 19] { marker-file: url('symbols/historic/plaque.svg'); } [memorial = 'statue'][zoom >= 19] { From ad2c48fdf0991a5d802edce33a26ea2429224bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Wed, 24 Oct 2018 11:44:37 +0200 Subject: [PATCH 11/19] change zoom level --- amenity-points.mss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 7bf37869a6..8d219d71b6 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -769,17 +769,17 @@ marker-clip: false; } - [feature = 'historic_memorial'][zoom >= 17], - [feature = 'historic_memorial_stele'][zoom >= 19] { + [feature = 'historic_memorial'][zoom >= 18], + [feature = 'historic_memorial_stele'][zoom >= 18] { marker-file: url('symbols/historic/memorial.svg'); [memorial = 'bust'][zoom >= 19] { marker-file: url('symbols/historic/bust.svg'); } [memorial = 'blue_plaque'][zoom >= 19], - [memorial = 'plaque'][zoom >= 19] { + [memorial = 'plaque'][zoom >= 17] { marker-file: url('symbols/historic/plaque.svg'); } - [memorial = 'statue'][zoom >= 19] { + [memorial = 'statue'][zoom >= 18] { marker-file: url('symbols/historic/statue.svg'); } [memorial = 'stone'][zoom >= 19] { From 0b5826236f90eac09730e1bf76ad218ff6810ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Wed, 24 Oct 2018 11:49:02 +0200 Subject: [PATCH 12/19] fix memorial_stele --- amenity-points.mss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 8d219d71b6..357c531c43 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -769,8 +769,8 @@ marker-clip: false; } - [feature = 'historic_memorial'][zoom >= 18], - [feature = 'historic_memorial_stele'][zoom >= 18] { + [feature = 'historic_memorial'][zoom >= 17], + [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18] { marker-file: url('symbols/historic/memorial.svg'); [memorial = 'bust'][zoom >= 19] { marker-file: url('symbols/historic/bust.svg'); From e096de19e3e0de8aaf3d27ae74f712c88f10430a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Wed, 24 Oct 2018 22:20:47 +0200 Subject: [PATCH 13/19] change zoom level of memorial=stone to z18 --- amenity-points.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amenity-points.mss b/amenity-points.mss index 357c531c43..1cf18f3bef 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -782,7 +782,7 @@ [memorial = 'statue'][zoom >= 18] { marker-file: url('symbols/historic/statue.svg'); } - [memorial = 'stone'][zoom >= 19] { + [memorial = 'stone'][zoom >= 18] { marker-file: url('symbols/historic/stone.svg'); } marker-fill: @memorials; From 60301c9581c411e9518dc5e49e98101c3491402f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Wed, 24 Oct 2018 22:52:31 +0200 Subject: [PATCH 14/19] fix generic memorial zoom level --- amenity-points.mss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 1cf18f3bef..14434e1e57 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -769,8 +769,10 @@ marker-clip: false; } - [feature = 'historic_memorial'][zoom >= 17], - [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18] { + [feature = 'historic_memorial'][memorial = null][zoom >= 17], + [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 17], + [feature = 'historic_memorial'][memorial != 'bust'][memorial != 'blue_plaque'][zoom >= 18], + [feature = 'historic_memorial'][zoom >= 19] { marker-file: url('symbols/historic/memorial.svg'); [memorial = 'bust'][zoom >= 19] { marker-file: url('symbols/historic/bust.svg'); From a70e5ebbf999c90de4c4dcf917ff7d0d0887d0d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Wed, 24 Oct 2018 23:08:37 +0200 Subject: [PATCH 15/19] fix zoom level of text --- amenity-points.mss | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 14434e1e57..b3adf2231b 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -1846,8 +1846,13 @@ } [feature = 'tourism_artwork'][zoom >= 17], - [feature = 'historic_memorial'][zoom >= 17], - [feature = 'historic_memorial_plaque'][zoom >= 19], + [feature = 'historic_memorial'][memorial = null][zoom >= 17], + [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 17], + [feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18], + [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 18], + [feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19], + [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 19], + [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 19], [feature = 'man_made_obelisk'][zoom >= 17], [feature = 'historic_monument'][zoom >= 16], [feature = 'historic_fort'][zoom >= 16], From f3e38e8cab82c3a764e152ee6ac56ccbd60820b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Wed, 24 Oct 2018 23:11:38 +0200 Subject: [PATCH 16/19] move statue to z17 --- amenity-points.mss | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index b3adf2231b..3680c849f3 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -771,6 +771,7 @@ [feature = 'historic_memorial'][memorial = null][zoom >= 17], [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 17], + [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17], [feature = 'historic_memorial'][memorial != 'bust'][memorial != 'blue_plaque'][zoom >= 18], [feature = 'historic_memorial'][zoom >= 19] { marker-file: url('symbols/historic/memorial.svg'); @@ -781,7 +782,7 @@ [memorial = 'plaque'][zoom >= 17] { marker-file: url('symbols/historic/plaque.svg'); } - [memorial = 'statue'][zoom >= 18] { + [memorial = 'statue'][zoom >= 17] { marker-file: url('symbols/historic/statue.svg'); } [memorial = 'stone'][zoom >= 18] { @@ -1848,8 +1849,8 @@ [feature = 'tourism_artwork'][zoom >= 17], [feature = 'historic_memorial'][memorial = null][zoom >= 17], [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 17], + [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18], - [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19], [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 19], [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 19], From 99e06e9143c30170bfa7d0d491b87a7b012872fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Mon, 29 Oct 2018 10:29:57 +0100 Subject: [PATCH 17/19] code cleaned --- amenity-points.mss | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 3680c849f3..85aaa87320 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -770,22 +770,25 @@ } [feature = 'historic_memorial'][memorial = null][zoom >= 17], - [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17], - [feature = 'historic_memorial'][memorial != 'bust'][memorial != 'blue_plaque'][zoom >= 18], + [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18], + [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18], + [feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18], + [feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19], + [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19], [feature = 'historic_memorial'][zoom >= 19] { marker-file: url('symbols/historic/memorial.svg'); - [memorial = 'bust'][zoom >= 19] { + [memorial = 'bust']{ marker-file: url('symbols/historic/bust.svg'); } - [memorial = 'blue_plaque'][zoom >= 19], - [memorial = 'plaque'][zoom >= 17] { + [memorial = 'blue_plaque'], + [memorial = 'plaque'] { marker-file: url('symbols/historic/plaque.svg'); } - [memorial = 'statue'][zoom >= 17] { + [memorial = 'statue'] { marker-file: url('symbols/historic/statue.svg'); } - [memorial = 'stone'][zoom >= 18] { + [memorial = 'stone'] { marker-file: url('symbols/historic/stone.svg'); } marker-fill: @memorials; @@ -1848,12 +1851,13 @@ [feature = 'tourism_artwork'][zoom >= 17], [feature = 'historic_memorial'][memorial = null][zoom >= 17], - [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17], + [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18], + [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19], - [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 19], - [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 19], + [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19], + [feature = 'historic_memorial'][zoom >= 19], [feature = 'man_made_obelisk'][zoom >= 17], [feature = 'historic_monument'][zoom >= 16], [feature = 'historic_fort'][zoom >= 16], From f1a320a5834642d34cb6628c40cad40abae534e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Tue, 6 Nov 2018 14:56:47 +0100 Subject: [PATCH 18/19] fix filtering of non-usual memorial tags --- amenity-points.mss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 85aaa87320..ced1f18ca7 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -770,13 +770,13 @@ } [feature = 'historic_memorial'][memorial = null][zoom >= 17], + [feature = 'historic_memorial'][memorial != null][memorial != 'blue_plaque'][memorial != 'bust'][memorial != 'plaque'][memorial != 'statue'][memorial != 'stele'][memorial != 'stone'][zoom >= 17] [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19], - [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19], - [feature = 'historic_memorial'][zoom >= 19] { + [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19] { marker-file: url('symbols/historic/memorial.svg'); [memorial = 'bust']{ marker-file: url('symbols/historic/bust.svg'); @@ -1851,13 +1851,13 @@ [feature = 'tourism_artwork'][zoom >= 17], [feature = 'historic_memorial'][memorial = null][zoom >= 17], + [feature = 'historic_memorial'][memorial != null][memorial != 'blue_plaque'][memorial != 'bust'][memorial != 'plaque'][memorial != 'statue'][memorial != 'stele'][memorial != 'stone'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19], [feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19], - [feature = 'historic_memorial'][zoom >= 19], [feature = 'man_made_obelisk'][zoom >= 17], [feature = 'historic_monument'][zoom >= 16], [feature = 'historic_fort'][zoom >= 16], From 65eb88a9606360dcf6da5aee409c859ae83afbb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Ragusa?= Date: Wed, 7 Nov 2018 15:09:18 +0100 Subject: [PATCH 19/19] remove exclusion of statue and add missing comma --- amenity-points.mss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index ced1f18ca7..a16b94a847 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -770,7 +770,7 @@ } [feature = 'historic_memorial'][memorial = null][zoom >= 17], - [feature = 'historic_memorial'][memorial != null][memorial != 'blue_plaque'][memorial != 'bust'][memorial != 'plaque'][memorial != 'statue'][memorial != 'stele'][memorial != 'stone'][zoom >= 17] + [feature = 'historic_memorial'][memorial != null][memorial != 'blue_plaque'][memorial != 'bust'][memorial != 'plaque'][memorial != 'stele'][memorial != 'stone'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18], @@ -1851,7 +1851,7 @@ [feature = 'tourism_artwork'][zoom >= 17], [feature = 'historic_memorial'][memorial = null][zoom >= 17], - [feature = 'historic_memorial'][memorial != null][memorial != 'blue_plaque'][memorial != 'bust'][memorial != 'plaque'][memorial != 'statue'][memorial != 'stele'][memorial != 'stone'][zoom >= 17], + [feature = 'historic_memorial'][memorial != null][memorial != 'blue_plaque'][memorial != 'bust'][memorial != 'plaque'][memorial != 'stele'][memorial != 'stone'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17], [feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18], [feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18],