Skip to content

Commit

Permalink
Move plaque rendering to higher zoom levels
Browse files Browse the repository at this point in the history
  • Loading branch information
@kocio-pl
kocio-pl committed Aug 11, 2017
1 parent c604e4b commit 8b943fd
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 5 deletions.
10 changes: 9 additions & 1 deletion amenity-points.mss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,14 @@
}

[feature = 'historic_memorial'][zoom >= 17] {
marker-file: url('symbols/memorial.svg');
marker-file: url('symbols/memorial.svg');
marker-fill: @amenity-brown;
marker-placement: interior;
marker-clip: false;
}

[feature = 'historic_memorial_plaque'][zoom >= 19] {
marker-file: url('symbols/plaque.svg');
marker-fill: @amenity-brown;
marker-placement: interior;
marker-clip: false;
Expand Down Expand Up @@ -1245,6 +1252,7 @@

[feature = 'tourism_artwork'][zoom >= 17],
[feature = 'historic_memorial'][zoom >= 17],
[feature = 'historic_memorial_plaque'][zoom >= 19],
[feature = 'man_made_obelisk'][zoom >= 16],
[feature = 'historic_monument'][zoom >= 16],
[feature = 'historic_archaeological_site'][zoom >= 17] {
Expand Down
12 changes: 8 additions & 4 deletions project.mml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1571,7 +1571,8 @@ Layer:
'leisure_' || CASE WHEN leisure IN ('water_park', 'playground', 'miniature_golf', 'golf_course', 'picnic_table') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'obelisk') 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') THEN historic ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site') THEN historic ELSE NULL END
|| CASE WHEN tags->'memorial' IN ('plaque') THEN '_plaque' ELSE '' 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,
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END
Expand Down Expand Up @@ -1643,7 +1644,8 @@ Layer:
'dog_park') THEN leisure ELSE NULL END,
'man_made_' || CASE WHEN man_made IN ('mast', 'water_tower', 'lighthouse', 'windmill', 'obelisk') THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'spring', 'cave_entrance') THEN "natural" ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site') THEN historic ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site') THEN historic ELSE NULL END
|| CASE WHEN tags->'memorial' IN ('plaque') THEN '_plaque' ELSE '' END,
'highway_'|| CASE WHEN highway IN ('bus_stop', 'elevator', 'traffic_signals', 'ford') THEN highway ELSE NULL END,
'power_' || CASE WHEN power IN ('generator') THEN power ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END,
Expand Down Expand Up @@ -2033,7 +2035,8 @@ Layer:
'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier') THEN "natural" ELSE NULL END,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site') THEN historic ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site') THEN historic ELSE NULL END
|| CASE WHEN tags->'memorial' IN ('plaque') THEN '_plaque' ELSE '' END,
'highway_' || CASE WHEN highway IN ('services', 'rest_area', 'bus_stop', 'elevator', 'ford') THEN highway ELSE NULL END,
'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('dam') THEN waterway ELSE NULL END,
Expand Down Expand Up @@ -2163,7 +2166,8 @@ Layer:
THEN "natural" ELSE NULL END,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site') THEN historic ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site') THEN historic ELSE NULL END
|| CASE WHEN tags->'memorial' IN ('plaque') THEN '_plaque' ELSE '' END,
'highway_' || CASE WHEN highway IN ('services', 'rest_area', 'bus_stop', 'elevator', 'ford') THEN highway ELSE NULL END,
'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('dam', 'weir') THEN waterway ELSE NULL END,
Expand Down
40 changes: 40 additions & 0 deletions symbols/plaque.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 8b943fd

Please sign in to comment.