From 09bd4f16abdcd59a3a8bd46dae9361c9e40ae3cd Mon Sep 17 00:00:00 2001 From: dryo Date: Sun, 7 Oct 2018 04:11:39 +0200 Subject: [PATCH] Add more swimming icons (#3422) --- amenity-points.mss | 8 ++++++-- project.mml | 21 +++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 3b934c51dd..e196440409 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -1209,7 +1209,9 @@ marker-fill: @office; } - [feature = 'leisure_water_park'][zoom >= 17] { + [feature = 'leisure_water_park'][zoom >= 17], + [feature = 'leisure_sports_centre'][sport = 'swimming'][zoom >= 17], + [feature = 'leisure_swimming_area'][zoom >= 17] { marker-file: url('symbols/leisure/water_park.svg'); marker-placement: interior; marker-fill: @leisure-green; @@ -1914,7 +1916,9 @@ text-dy: 13; } - [feature = 'leisure_water_park'] { + [feature = 'leisure_water_park'], + [feature = 'leisure_sports_centre'][sport = 'swimming'], + [feature = 'leisure_swimming_area'] { [way_area >= 150000][zoom >= 14], [way_area >= 80000][zoom >= 15], [way_area >= 20000][zoom >= 16], diff --git a/project.mml b/project.mml index 780d7a6f25..4c748a52c8 100644 --- a/project.mml +++ b/project.mml @@ -1487,7 +1487,8 @@ Layer: 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, 'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', - 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade') THEN leisure ELSE NULL END, + 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', 'swimming_area') + THEN leisure ELSE NULL END, 'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney', 'storage_tank', 'silo') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END, 'natural_' || CASE WHEN "natural" IN ('spring') THEN "natural" ELSE NULL END, @@ -1519,6 +1520,7 @@ Layer: tags->'tower:construction' as "tower:construction", tags->'tower:type' as "tower:type", tags->'castle_type' as castle_type, + tags->'sport' as sport, tags->'information' as information, CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', @@ -1542,7 +1544,8 @@ Layer: OR shop IS NOT NULL OR (tags->'office') IS NOT NULL OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre', - 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade') + 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating', 'bird_hide', + 'amusement_arcade', 'sports_centre', 'swimming_area') OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney', 'storage_tank', 'silo') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) OR "natural" IN ('spring') @@ -1608,7 +1611,8 @@ Layer: 'office' || CASE WHEN tags->'office' IN ('no', 'vacant', 'closed', 'disused', 'empty') OR (tags->'office') IS NULL THEN NULL ELSE '' END, 'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway', 'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', - 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade') THEN leisure ELSE NULL END, + 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', + 'swimming_area') THEN leisure ELSE NULL END, 'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney', 'storage_tank', 'silo') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END, 'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END, @@ -1659,6 +1663,7 @@ Layer: tags->'tower:construction' as "tower:construction", tags->'tower:type' as "tower:type", tags->'castle_type' as castle_type, + tags->'sport' as sport, tags->'information' as information, CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', 'books', 'butcher', 'clothes', 'computer', 'confectionery', 'fashion', 'convenience', 'department_store', 'doityourself', 'hardware', 'fishmonger', 'florist', @@ -1683,7 +1688,8 @@ Layer: OR (tags->'office') IS NOT NULL OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway', 'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', - 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade') + 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'sports_centre', + 'swimming_area') OR barrier IN ('toll_booth') OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk', 'communications_tower', 'chimney', 'storage_tank', 'silo') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) @@ -2080,7 +2086,7 @@ Layer: 'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track', 'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort', - 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade') THEN leisure ELSE NULL END, + 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'swimming_area') THEN leisure ELSE NULL END, 'power_' || CASE WHEN power IN ('plant', 'station', 'generator', 'sub_station', 'substation') THEN power ELSE NULL END, 'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland', @@ -2125,6 +2131,7 @@ Layer: tags->'office' as office, tags->'recycling_type' as recycling_type, tags->'castle_type' as castle_type, + tags->'sport' as sport, tags->'information' as information, ref, way_area, @@ -2215,6 +2222,7 @@ Layer: office, recycling_type, castle_type, + sport, information, ref, way_area, @@ -2251,7 +2259,7 @@ Layer: 'leisure_' || CASE WHEN leisure IN ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track', 'pitch','playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina', 'slipway', 'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort', - 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade') THEN leisure ELSE NULL END, + 'bowling_alley', 'outdoor_seating', 'bird_hide', 'amusement_arcade', 'swimming_area') THEN leisure ELSE NULL END, 'power_' || CASE WHEN power IN ('plant', 'station', 'generator', 'sub_station', 'substation') THEN power ELSE NULL END, 'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland', @@ -2305,6 +2313,7 @@ Layer: tags->'office' as office, tags->'recycling_type' as recycling_type, tags->'castle_type' as castle_type, + tags->'sport' as sport, tags->'information' as information, ref, NULL AS way_area,