From 0804d590733c0ab4ebc8c60d39545caf253a984e Mon Sep 17 00:00:00 2001 From: GunSmoker Date: Wed, 22 Feb 2023 16:39:47 +0300 Subject: [PATCH 1/5] Added leisure_resort feature --- style/amenity-points.mss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/style/amenity-points.mss b/style/amenity-points.mss index b3dafe5f1..b7e78a6be 100644 --- a/style/amenity-points.mss +++ b/style/amenity-points.mss @@ -236,6 +236,12 @@ marker-clip: false; } + [feature = 'leisure_resort'][zoom >= 16] { + marker-file: url('symbols/tourism/chalet.svg'); + marker-fill: @accommodation-icon; + marker-clip: false; + } + // Ford tagging on points - ford on lines is defined later [feature = 'highway_ford'][zoom >= 16] { marker-file: url('symbols/highway/ford.svg'); @@ -2389,6 +2395,7 @@ [feature = 'tourism_alpine_hut'][zoom >= 14], [feature = 'amenity_shelter'][zoom >= 17], [feature = 'leisure_picnic_table'][zoom >= 17], + [feature = 'leisure_resort'][zoom >= 17], [feature = 'tourism_hotel'][zoom >= 17], [feature = 'tourism_motel'][zoom >= 17], [feature = 'tourism_hostel'][zoom >= 17], @@ -2411,6 +2418,7 @@ text-dy: 13; } [feature = 'tourism_camp_site'], + [feature = 'leisure_resort'], [feature = 'tourism_caravan_site'] { text-dy: 15; } From 611b3e8aa6956e94e9157a6412e12ae5129aa00e Mon Sep 17 00:00:00 2001 From: GunSmoker Date: Wed, 22 Feb 2023 16:41:50 +0300 Subject: [PATCH 2/5] Added leisure_resort feature --- style/landcover.mss | 1 + 1 file changed, 1 insertion(+) diff --git a/style/landcover.mss b/style/landcover.mss index 6a177624b..67bb71ee5 100644 --- a/style/landcover.mss +++ b/style/landcover.mss @@ -100,6 +100,7 @@ [way_pixels >= 64] { polygon-gamma: 0.3; } } + [feature = 'leisure_resort'], [feature = 'tourism_camp_site'], [feature = 'tourism_caravan_site'], [feature = 'tourism_picnic_site'] { From 902ec703a726636932096fa5976fa89e316fe4e7 Mon Sep 17 00:00:00 2001 From: GunSmoker Date: Wed, 22 Feb 2023 17:02:46 +0300 Subject: [PATCH 3/5] Added leisure=resort --- project.mml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.mml b/project.mml index fdeef517d..3ae4bce13 100644 --- a/project.mml +++ b/project.mml @@ -109,7 +109,7 @@ Layer: ('shop_' || (CASE WHEN shop IN ('mall') AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL) THEN shop END)) AS shop, ('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'garden', 'golf_course', 'miniature_golf', 'sports_centre', 'stadium', 'pitch', 'ice_rink', - 'track', 'dog_park', 'fitness_station', 'water_park') THEN leisure END)) AS leisure, + 'track', 'dog_park', 'fitness_station', 'water_park', 'resort') THEN leisure END)) AS leisure, ('man_made_' || (CASE WHEN man_made IN ('works', 'wastewater_plant', 'water_works') THEN man_made END)) AS man_made, ('natural_' || (CASE WHEN "natural" IN ('beach', 'shoal', 'heath', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub') THEN "natural" END)) AS "natural", ('wetland_' || (CASE WHEN "natural" IN ('wetland', 'mud') THEN (CASE WHEN "natural" = 'mud' THEN "natural" ELSE tags->'wetland' END) END)) AS wetland, @@ -1548,7 +1548,7 @@ Layer: 'leisure_' || CASE WHEN leisure IN ('amusement_arcade', 'beach_resort', 'bird_hide', 'bowling_alley', 'dog_park', 'firepit', 'fishing', 'fitness_centre', 'fitness_station', 'garden', 'golf_course', 'ice_rink', 'marina', 'miniature_golf', 'outdoor_seating', 'park', 'picnic_table', 'pitch', 'playground', - 'sauna', 'slipway', 'sports_centre', 'stadium', 'swimming_area', 'swimming_pool', 'track', 'water_park') THEN leisure END, + 'sauna', 'slipway', 'sports_centre', 'stadium', 'swimming_area', 'swimming_pool', 'track', 'water_park', 'resort') THEN leisure END, 'power_' || CASE WHEN power IN ('plant', 'generator', 'substation') THEN power END, 'man_made_' || CASE WHEN (man_made IN ('chimney', 'communications_tower', 'crane', 'lighthouse', 'mast', 'obelisk', 'silo', 'storage_tank', 'telescope', 'tower', 'wastewater_plant', 'water_tower', 'water_works', 'windmill', 'works') From 77503fda8a552de87197f64860251ce8269870ec Mon Sep 17 00:00:00 2001 From: GunSmoker Date: Wed, 22 Feb 2023 17:12:39 +0300 Subject: [PATCH 4/5] Created icon for leisure=resort --- symbols/leisure/resort.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 symbols/leisure/resort.svg diff --git a/symbols/leisure/resort.svg b/symbols/leisure/resort.svg new file mode 100644 index 000000000..36d03eae7 --- /dev/null +++ b/symbols/leisure/resort.svg @@ -0,0 +1,3 @@ + + + From 76a4f72f086b4c0035083c588990b39dbf1a6f2c Mon Sep 17 00:00:00 2001 From: GunSmoker Date: Wed, 22 Feb 2023 17:14:26 +0300 Subject: [PATCH 5/5] Changed icon for leisure=resort --- style/amenity-points.mss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/style/amenity-points.mss b/style/amenity-points.mss index b7e78a6be..37d0d96f9 100644 --- a/style/amenity-points.mss +++ b/style/amenity-points.mss @@ -237,7 +237,7 @@ } [feature = 'leisure_resort'][zoom >= 16] { - marker-file: url('symbols/tourism/chalet.svg'); + marker-file: url('symbols/leisure/resort.svg'); marker-fill: @accommodation-icon; marker-clip: false; }