diff --git a/amenity-points.mss b/amenity-points.mss index d5d8caa468..46f4445193 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -14,6 +14,7 @@ @culture: @amenity-brown; @public-service: @amenity-brown; @man-made-icon: #555; +@advertising-grey: @man-made-icon; @landform-color: #d08f55; @leisure-green: darken(@park, 60%); @@ -977,6 +978,13 @@ } } + [feature = 'advertising_column'][zoom >= 19]{ + marker-file: url('symbols/advertising/column.svg'); + marker-fill: @advertising-grey; + marker-placement: interior; + marker-clip: false; + } + [feature = 'leisure_water_park'][zoom >= 17] { marker-file: url('symbols/water_park.svg'); marker-placement: interior; diff --git a/project.mml b/project.mml index ceeb8af370..8a5a80e6d6 100644 --- a/project.mml +++ b/project.mml @@ -1442,6 +1442,7 @@ Layer: 'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'waste_disposal', 'shower') THEN amenity ELSE NULL END, + 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop 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') THEN leisure ELSE NULL END, @@ -1489,6 +1490,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'camp_site', 'caravan_site', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'hostel', 'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check + OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'fitness_centre', 'fitness_station', 'firepit', 'sauna') @@ -1543,6 +1545,7 @@ Layer: 'fast_food', 'telephone', 'taxi', 'theatre', 'toilets', 'drinking_water', 'prison', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower') THEN amenity ELSE NULL END, + 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'emergency_' || CASE WHEN tags->'emergency' IN ('phone') THEN tags->'emergency' ELSE NULL END, 'shop' || CASE WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END, 'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway', @@ -1604,6 +1607,7 @@ Layer: 'hotel', 'motel', 'information', 'museum', 'viewpoint', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check OR shop IS NOT NULL + OR tags->'advertising' IN ('column') OR leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table', 'slipway', 'dog_park', 'fitness_centre', 'fitness_station', 'firepit', 'sauna') OR barrier IN ('toll_booth') @@ -1979,6 +1983,7 @@ Layer: 'atm', 'bicycle_rental', 'car_rental', 'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower') THEN amenity ELSE NULL END, + 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', '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', 'photo', 'photo_studio', @@ -2032,6 +2037,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check + OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR leisure IS NOT NULL OR landuse IS NOT NULL @@ -2122,6 +2128,7 @@ Layer: 'car_wash', 'post_box', 'post_office', 'recycling', 'telephone', 'toilets', 'taxi', 'drinking_water', 'hunting_stand', 'nightclub', 'veterinary', 'social_facility', 'charging_station', 'arts_centre', 'ferry_terminal', 'marketplace', 'shower') THEN amenity ELSE NULL END, + 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' else NULL END, 'shop_' || CASE WHEN shop IN ('supermarket', 'bag','bakery', 'beauty', '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', 'photo', 'photo_studio', 'photography', @@ -2180,6 +2187,7 @@ Layer: OR tourism IN ('artwork', 'alpine_hut', 'hotel', 'motel', 'hostel', 'chalet', 'wilderness_hut', 'guest_house', 'apartment', 'camp_site', 'caravan_site', 'theme_park', 'museum', 'viewpoint', 'attraction', 'zoo', 'information', 'picnic_site') OR amenity IS NOT NULL -- skip checking a huge list and use a null check + OR tags->'advertising' IN ('column') OR shop IS NOT NULL OR leisure IS NOT NULL OR landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery', 'residential', diff --git a/symbols/advertising/column.svg b/symbols/advertising/column.svg new file mode 100644 index 0000000000..27d38c76c5 --- /dev/null +++ b/symbols/advertising/column.svg @@ -0,0 +1,11 @@ + + + + + + + + \ No newline at end of file