Skip to content

Commit

Permalink
Add special icon for shop=trade closes #3291 (#3361)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Adamant36 @kocio-pl
Adamant36 authored and kocio-pl committed Aug 30, 2018
1 parent 69d957d commit 0ba5691
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 4 deletions.
10 changes: 10 additions & 0 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,6 +1140,14 @@
[shop = 'ticket'][zoom >= 18] {
marker-file: url('symbols/shop/ticket.svg');
}

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

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

[shop = 'tyres'][zoom >= 18] {
marker-file: url('symbols/shop/tyres.svg');
Expand Down Expand Up @@ -2551,10 +2559,12 @@
[feature = 'shop_tobacco'],
[feature = 'shop_tea'],
[feature = 'shop_ticket'],
[feature = 'shop_trade'],
[feature = 'shop_tyres'],
[feature = 'shop_variety_store'],
[feature = 'shop_video'],
[feature = 'shop_video_games'],
[feature = 'shop_wholesale'],
[feature = 'shop_wine'],
[feature = 'shop_other'] {
[way_pixels > 3000][zoom >= 17],
Expand Down
8 changes: 4 additions & 4 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1529,7 +1529,7 @@ Layer:
'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate',
'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand',
'interior_decoration', 'video', 'paint', 'massage') THEN shop
'interior_decoration', 'video', 'paint', 'massage', 'trade', 'wholesale') 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 @@ -1667,7 +1667,7 @@ Layer:
'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics', 'variety_store', 'wine', 'outdoor',
'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres', 'pastry', 'chocolate',
'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand',
'interior_decoration', 'video', 'paint', 'massage') THEN shop
'interior_decoration', 'video', 'paint', 'massage', 'trade', 'wholesale') THEN shop
ELSE 'other' END AS shop,
NULL AS way_pixels
FROM planet_osm_point
Expand Down Expand Up @@ -2072,7 +2072,7 @@ Layer:
'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', 'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket',
'charity', 'second_hand', 'interior_decoration', 'video', 'paint', 'massage') THEN shop
'charity', 'second_hand', 'interior_decoration', 'video', 'paint', 'massage', 'trade', 'wholesale') THEN shop
WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' 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 ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',
Expand Down Expand Up @@ -2241,7 +2241,7 @@ Layer:
'greengrocer', 'farm', 'stationery', 'laundry', 'dry_cleaning', 'beverages', 'perfumery', 'cosmetics',
'variety_store', 'wine', 'outdoor', 'copyshop', 'sports', 'deli', 'tobacco', 'art', 'tea', 'coffee', 'tyres',
'pastry', 'chocolate', 'music', 'medical_supply','dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand',
'interior_decoration', 'video', 'paint', 'massage') THEN shop
'interior_decoration', 'video', 'paint', 'massage', 'trade', 'wholesale') THEN shop
WHEN shop IN ('no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE 'other' 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 ('swimming_pool', 'water_park', 'miniature_golf', 'golf_course', 'fitness_centre', 'sports_centre', 'stadium', 'track',
Expand Down
31 changes: 31 additions & 0 deletions symbols/shop/trade.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 0ba5691

Please sign in to comment.