Skip to content

Commit

Permalink
Add icons for memorial subtags (#3356)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jragusa @kocio-pl
jragusa authored and kocio-pl committed Nov 7, 2018
1 parent 1419ef8 commit 67327f3
Show file tree
Hide file tree
Showing 7 changed files with 218 additions and 39 deletions.
47 changes: 38 additions & 9 deletions amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,14 @@
}

[feature = 'tourism_artwork'][zoom >= 17] {
marker-file: url('symbols/tourism/artwork.svg');
[artwork_type != 'statue'] {
marker-file: url('symbols/tourism/artwork.svg');
}
[artwork_type = 'statue'] {
marker-file: url('symbols/historic/statue.svg');
}
marker-fill: @memorials;
marker-placement: interior;
marker-clip: false;
}

[feature = 'tourism_camp_site'][zoom >= 16] {
Expand Down Expand Up @@ -810,21 +814,40 @@
marker-clip: false;
}

[feature = 'historic_memorial'][zoom >= 17] {
[feature = 'historic_memorial'][memorial = null][zoom >= 17],
[feature = 'historic_memorial'][memorial != null][memorial != 'blue_plaque'][memorial != 'bust'][memorial != 'plaque'][memorial != 'stele'][memorial != 'stone'][zoom >= 17],
[feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17],
[feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19],
[feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19] {
marker-file: url('symbols/historic/memorial.svg');
[memorial = 'bust']{
marker-file: url('symbols/historic/bust.svg');
}
[memorial = 'blue_plaque'],
[memorial = 'plaque'] {
marker-file: url('symbols/historic/plaque.svg');
}
[memorial = 'statue'] {
marker-file: url('symbols/historic/statue.svg');
}
[memorial = 'stone'] {
marker-file: url('symbols/historic/stone.svg');
}
marker-fill: @memorials;
marker-placement: interior;
marker-clip: false;
}

[feature = 'historic_memorial_plaque'][zoom >= 19] {
marker-file: url('symbols/historic/plaque.svg');
[feature = 'man_made_obelisk'][zoom >= 17] {
marker-file: url('symbols/historic/obelisk.svg');
marker-fill: @memorials;
marker-placement: interior;
marker-clip: false;
}

[feature = 'man_made_obelisk'][zoom >= 16],
[feature = 'historic_monument'][zoom >= 16] {
marker-file: url('symbols/historic/monument.svg');
marker-fill: @memorials;
Expand Down Expand Up @@ -1907,9 +1930,15 @@
}

[feature = 'tourism_artwork'][zoom >= 17],
[feature = 'historic_memorial'][zoom >= 17],
[feature = 'historic_memorial_plaque'][zoom >= 19],
[feature = 'man_made_obelisk'][zoom >= 16],
[feature = 'historic_memorial'][memorial = null][zoom >= 17],
[feature = 'historic_memorial'][memorial != null][memorial != 'blue_plaque'][memorial != 'bust'][memorial != 'plaque'][memorial != 'stele'][memorial != 'stone'][zoom >= 17],
[feature = 'historic_memorial'][memorial = 'statue'][zoom >= 17],
[feature = 'historic_memorial'][memorial = 'bust'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'stele'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'stone'][zoom >= 18],
[feature = 'historic_memorial'][memorial = 'blue_plaque'][zoom >= 19],
[feature = 'historic_memorial'][memorial = 'plaque'][zoom >= 19],
[feature = 'man_made_obelisk'][zoom >= 17],
[feature = 'historic_monument'][zoom >= 16],
[feature = 'historic_fort'][zoom >= 16],
[feature = 'historic_castle'][zoom >= 16],
Expand Down
25 changes: 13 additions & 12 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1468,8 +1468,7 @@ Layer:
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,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
THEN historic ELSE NULL END,
'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END,
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway ELSE NULL END,
'power_' || CASE WHEN power IN ('generator') THEN power ELSE NULL END,
Expand Down Expand Up @@ -1506,6 +1505,8 @@ Layer:
tags->'castle_type' as castle_type,
tags->'sport' as sport,
tags->'information' as information,
tags->'memorial' as memorial,
tags->'artwork_type' as artwork_type,
CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', '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',
Expand Down Expand Up @@ -1534,7 +1535,6 @@ Layer:
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL))
OR "natural" IN ('spring')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
OR tags->'memorial' IN ('plaque')
OR military IN ('bunker')
OR highway IN ('bus_stop', 'elevator', 'traffic_signals')
OR (power = 'generator' AND (tags @> '"generator:source"=>wind' OR tags @> 'power_source=>wind'))
Expand Down Expand Up @@ -1602,8 +1602,7 @@ Layer:
'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END,
'waterway_' || CASE WHEN "waterway" IN ('waterfall') THEN waterway ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
THEN historic ELSE NULL END,
'military_'|| CASE WHEN military IN ('bunker') THEN military ELSE NULL END,
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals') THEN highway
WHEN tags @> 'ford=>yes' OR tags @> 'ford=>stepping_stones' THEN 'ford' ELSE NULL END,
Expand Down Expand Up @@ -1658,6 +1657,8 @@ Layer:
tags->'castle_type' as castle_type,
tags->'sport' as sport,
tags->'information' as information,
tags->'memorial' as memorial,
tags->'artwork_type' as artwork_type,
CASE WHEN shop IN ('supermarket', 'bag', 'bakery', 'beauty', 'bed', 'bookmaker', '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',
Expand Down Expand Up @@ -1689,7 +1690,6 @@ Layer:
OR "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance')
OR waterway IN ('waterfall')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross', 'fort', 'wayside_shrine', 'castle', 'manor', 'city_gate')
OR tags->'memorial' IN ('plaque')
OR military IN ('bunker')
OR tags @> 'emergency=>phone'
OR highway IN ('bus_stop', 'elevator', 'traffic_signals')
Expand Down Expand Up @@ -2095,8 +2095,7 @@ Layer:
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
THEN historic ELSE NULL END,
'highway_' || CASE WHEN highway IN ('services', 'rest_area', 'bus_stop', 'elevator') THEN highway ELSE NULL END,
'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('dam', 'dock') THEN waterway ELSE NULL END,
Expand Down Expand Up @@ -2137,6 +2136,8 @@ Layer:
tags->'castle_type' as castle_type,
tags->'sport' as sport,
tags->'information' as information,
tags->'memorial' as memorial,
tags->'artwork_type' as artwork_type,
ref,
way_area,
CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building
Expand All @@ -2158,7 +2159,6 @@ Layer:
OR place IN ('island', 'islet')
OR military IN ('danger_area', 'bunker')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
OR tags->'memorial' IN ('plaque')
OR highway IN ('services', 'rest_area', 'bus_stop', 'elevator')
OR power IN ('plant', 'station', 'generator', 'sub_station', 'substation')
OR boundary IN ('national_park')
Expand Down Expand Up @@ -2229,6 +2229,7 @@ Layer:
castle_type,
sport,
information,
memorial,
ref,
way_area,
is_building
Expand Down Expand Up @@ -2281,8 +2282,7 @@ Layer:
'barrier_' || CASE WHEN barrier IN ('toll_booth') THEN barrier ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
THEN concat_ws('_', historic, CASE WHEN tags->'memorial' IN ('plaque') THEN tags->'memorial' ELSE NULL END)
ELSE NULL END,
THEN historic ELSE NULL END,
'highway_' || CASE WHEN highway IN ('services', 'rest_area', 'bus_stop', 'elevator') THEN highway ELSE NULL END,
'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('dam', 'weir', 'dock') THEN waterway ELSE NULL END,
Expand Down Expand Up @@ -2321,6 +2321,8 @@ Layer:
tags->'castle_type' as castle_type,
tags->'sport' as sport,
tags->'information' as information,
tags->'memorial' as memorial,
tags->'artwork_type' as artwork_type,
ref,
NULL AS way_area,
CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building
Expand All @@ -2346,7 +2348,6 @@ Layer:
OR barrier IN ('toll_booth')
OR military IN ('danger_area', 'bunker')
OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross', 'fort', 'wayside_shrine', 'castle', 'manor', 'city_gate')
OR tags->'memorial' IN ('plaque')
OR highway IN ('bus_stop', 'services', 'rest_area', 'elevator')
OR power IN ('plant', 'station', 'generator', 'sub_station', 'substation')
OR boundary IN ('national_park')
Expand Down
31 changes: 31 additions & 0 deletions symbols/historic/bust.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.
55 changes: 55 additions & 0 deletions symbols/historic/obelisk.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.
31 changes: 31 additions & 0 deletions symbols/historic/statue.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.
31 changes: 31 additions & 0 deletions symbols/historic/stone.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.
37 changes: 19 additions & 18 deletions symbols/tourism/artwork.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 67327f3

Please sign in to comment.