Skip to content

Commit

Permalink
Adding shop=diary
Browse files Browse the repository at this point in the history 
Related gravitystorm#3087
  • Loading branch information
@james2432
james2432 committed Mar 17, 2018
1 parent c650e99 commit 761b790
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 4 deletions.
5 changes: 5 additions & 0 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,10 @@
marker-fill: @amenity-brown;
}

[shop = 'dairy'][zoom >= 18] {
marker-file: url('symbols/shop/dairy.svg');
}

[shop = 'bicycle'][zoom >= 18] {
marker-file: url('symbols/shop/bicycle.svg');
}
Expand Down Expand Up @@ -2101,6 +2105,7 @@
[feature = 'shop_car_repair'],
[feature = 'shop_car_parts'],
[feature = 'shop_cosmetics'],
[feature = 'shop_dairy'],
[feature = 'shop_bicycle'],
[feature = 'shop_farm'],
[feature = 'shop_fishmonger'],
Expand Down
8 changes: 4 additions & 4 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1479,7 +1479,7 @@ Layer:
'mobile_phone', 'motorcycle', 'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery',
'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery',
'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate') THEN shop
'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate', 'dairy') THEN shop
ELSE 'other' END AS shop,
way_area/NULLIF(!pixel_width!::real*!pixel_height!::real,0) AS way_pixels
FROM planet_osm_polygon
Expand Down Expand Up @@ -1593,7 +1593,7 @@ Layer:
'mobile_phone', 'motorcycle', 'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery',
'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery',
'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate') THEN shop
'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate', 'dairy') THEN shop
ELSE 'other' END AS shop,
NULL AS way_pixels
FROM planet_osm_point
Expand Down Expand Up @@ -1985,7 +1985,7 @@ Layer:
'musical_instrument', 'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys',
'travel_agency', 'car_parts', 'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages',
'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea',
'coffee', 'tyres', 'pastry', 'chocolate') THEN shop
'coffee', 'tyres', 'pastry', 'chocolate', 'dairy') THEN shop
WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' 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',
Expand Down Expand Up @@ -2128,7 +2128,7 @@ Layer:
'newsagent', 'optician', 'jewelry', 'jewellery', 'electronics', 'chemist', 'toys', 'travel_agency', 'car_parts',
'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics',
'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres',
'pastry', 'chocolate') THEN shop
'pastry', 'chocolate', 'dairy') THEN shop
WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' 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',
Expand Down
36 changes: 36 additions & 0 deletions symbols/shop/dairy.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 761b790

Please sign in to comment.