From 3e0d7a0083a63aed85116fac451ab8aaf6daf9de Mon Sep 17 00:00:00 2001 From: Adamant36 Date: Sat, 11 Aug 2018 15:45:35 -0700 Subject: [PATCH] Adds icon for leisure=outdoor_seating closes #3241 (#3328) --- amenity-points.mss | 9 +++++++++ project.mml | 16 ++++++++++------ symbols/outdoor_seating.svg | 31 +++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 symbols/outdoor_seating.svg diff --git a/amenity-points.mss b/amenity-points.mss index 1adf5bdeb0..af558cd1c2 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -1261,6 +1261,13 @@ marker-clip: false; } + [feature = 'leisure_outdoor_seating'][zoom >= 19] { + marker-file: url('symbols/outdoor_seating.svg'); + marker-fill: @leisure-green; + marker-placement: interior; + marker-clip: false; + } + // Slipway tagging on points - slipway on lines is defined later [feature = 'leisure_slipway'][zoom >= 17] { marker-file: url('symbols/transport_slipway.p.20.svg'); @@ -1666,6 +1673,7 @@ [feature = 'tourism_picnic_site'][zoom >= 17], [feature = 'leisure_bowling_alley'][zoom >= 17], [feature = 'leisure_beach_resort'][zoom >= 17], + [feature = 'leisure_outdoor_seating'][zoom >= 19], [feature = 'leisure_picnic_table'][zoom >= 17] { text-name: "[name]"; text-size: @standard-font-size; @@ -1673,6 +1681,7 @@ text-line-spacing: @standard-line-spacing-size; text-fill: @amenity-brown; [feature = 'tourism_picnic_site'], + [feature = 'leisure_outdoor_seating'], [feature = 'leisure_bowling_alley'], [feature = 'leisure_beach_resort'] { text-fill: @leisure-green; diff --git a/project.mml b/project.mml index 8175c02020..36612185f0 100644 --- a/project.mml +++ b/project.mml @@ -1486,7 +1486,8 @@ Layer: 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, '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') THEN leisure ELSE NULL END, + 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', + 'bowling_alley', 'outdoor_seating') THEN leisure ELSE NULL END, 'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney') 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, @@ -1541,7 +1542,7 @@ 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') + 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating') OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) OR "natural" IN ('spring') @@ -1601,7 +1602,8 @@ Layer: 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, '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') THEN leisure ELSE NULL END, + 'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', + 'bowling_alley', 'outdoor_seating') THEN leisure ELSE NULL END, 'man_made_' || CASE WHEN (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'obelisk', 'communications_tower', 'chimney') 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, @@ -1675,7 +1677,7 @@ Layer: OR tags->'advertising' IN ('column') 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') + 'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley', 'outdoor_seating') OR barrier IN ('toll_booth') OR (man_made IN ('mast', 'tower', 'water_tower', 'lighthouse', 'windmill', 'cross', 'obelisk', 'communications_tower', 'chimney') AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) @@ -2071,7 +2073,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 ('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') THEN leisure ELSE NULL END, + 'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort', + 'bowling_alley', 'outdoor_seating') 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', @@ -2239,7 +2242,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 ('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') THEN leisure ELSE NULL END, + 'slipway', 'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort', + 'bowling_alley', 'outdoor_seating') 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', diff --git a/symbols/outdoor_seating.svg b/symbols/outdoor_seating.svg new file mode 100644 index 0000000000..2373b23aed --- /dev/null +++ b/symbols/outdoor_seating.svg @@ -0,0 +1,31 @@ + + + + + + image/svg+xml + + + + + + + +