Skip to content

Commit

Permalink
Add icon for shop=massage (gravitystorm#3309)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jragusa @kocio-pl
jragusa authored and kocio-pl committed Aug 5, 2018
1 parent 83a7ab7 commit e58cc3c
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 6 deletions.
13 changes: 11 additions & 2 deletions amenity-points.mss
View file
Expand Up @@ -834,15 +834,15 @@
}

[feature = 'shop'] {
[shop != 'mall'][zoom >= 17],
[shop != 'mall'][shop != 'massage'][zoom >= 17],
[shop = 'supermarket'][zoom >= 16],
[shop = 'department_store'][zoom >= 16] {
marker-placement: interior;
marker-clip: false;
marker-fill: @shop-icon;
}

[zoom >= 17][zoom < 18][shop != 'supermarket'][shop != 'department_store'][shop != 'mall'] {
[zoom >= 17][zoom < 18][shop != 'supermarket'][shop != 'department_store'][shop != 'mall'][shop != 'massage'] {
marker-width: 4;
marker-line-width: 0;
}
Expand Down Expand Up @@ -1065,6 +1065,11 @@
[shop = 'interior_decoration'][zoom >= 18] {
marker-file: url('symbols/shop/interior_decoration.svg');
}

[shop = 'massage'][zoom >= 18] {
marker-file: url('symbols/shop/massage.svg');
marker-fill: @leisure-green;
}

[shop = 'medical_supply'][zoom >= 18]{
marker-file: url('symbols/shop/medical_supply.svg');
Expand Down Expand Up @@ -2502,6 +2507,7 @@
[feature = 'shop_perfumery'],
[feature = 'shop_furniture'],
[feature = 'shop_kiosk'],
[feature = 'shop_massage'],
[feature = 'shop_medical_supply'],
[feature = 'shop_mobile_phone'],
[feature = 'shop_motorcycle'],
Expand Down Expand Up @@ -2543,6 +2549,9 @@
[feature = 'shop_car_repair'] {
text-fill: @amenity-brown;
}
[feature = 'shop_massage'] {
text-fill: @leisure-green;
}
}
}

Expand Down
12 changes: 8 additions & 4 deletions project.mml
View file
Expand Up @@ -1527,7 +1527,8 @@ Layer:
'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',
'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 'interior_decoration', 'video', 'paint') THEN shop
'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand',
'interior_decoration', 'video', 'paint', 'massage') 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 @@ -1660,7 +1661,8 @@ Layer:
'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',
'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 'interior_decoration', 'video', 'paint') THEN shop
'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand',
'interior_decoration', 'video', 'paint', 'massage') THEN shop
ELSE 'other' END AS shop,
NULL AS way_pixels
FROM planet_osm_point
Expand Down Expand Up @@ -2063,7 +2065,8 @@ 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', 'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 'interior_decoration', 'video', 'paint') THEN shop
'coffee', 'tyres', 'pastry', 'chocolate', 'music', 'medical_supply', 'dairy', 'video_games', 'houseware', 'ticket',
'charity', 'second_hand', 'interior_decoration', 'video', 'paint', 'massage') 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 @@ -2230,7 +2233,8 @@ 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', 'music', 'medical_supply','dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand', 'interior_decoration', 'video', 'paint') THEN shop
'pastry', 'chocolate', 'music', 'medical_supply','dairy', 'video_games', 'houseware', 'ticket', 'charity', 'second_hand',
'interior_decoration', 'video', 'paint', 'massage') 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/massage.svg
View file
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 e58cc3c

Please sign in to comment.