Skip to content

Commit

Permalink
Add rendering for attraction=big_wheel to address gravitystorm#3550
Browse files Browse the repository at this point in the history
  • Loading branch information
Doug Addy committed Feb 20, 2019
1 parent 488fd2c commit 01476ae
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 3 deletions.
10 changes: 9 additions & 1 deletion amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,13 @@
marker-clip: false;
}

[feature = 'tourism_big_wheel'][zoom >= 15] {
marker-file: url('symbols/tourism/big_wheel.svg');
marker-placement: interior;
marker-fill: @tourism;
marker-clip: false;
}

[feature = 'man_made_water_tower'][zoom >= 17] {
marker-file: url('symbols/man_made/water_tower.svg');
marker-fill: @man-made-icon;
Expand Down Expand Up @@ -3281,7 +3288,8 @@
text-placement: interior;
}

[feature = 'tourism_attraction'][zoom >= 17][is_building = 'no'] {
[feature = 'tourism_attraction'][zoom >= 17][is_building = 'no'],
[feature = 'tourism_big_wheel'][zoom >= 17] {
text-name: "[name]";
text-size: @standard-font-size;
text-wrap-width: @standard-wrap-width;
Expand Down
8 changes: 6 additions & 2 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -1500,7 +1500,8 @@ Layer:
'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,
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END
'tourism_' || CASE WHEN tourism IN ('viewpoint') THEN tourism ELSE NULL END,
'tourism_' || CASE WHEN tags->'attraction' IN ('big_wheel') THEN 'big_wheel' ELSE NULL END
) AS feature,
access,
religion,
Expand Down Expand Up @@ -1569,6 +1570,7 @@ Layer:
OR military IN ('bunker')
OR highway IN ('bus_stop', 'elevator', 'traffic_signals')
OR (power = 'generator' AND tags @> '"generator:source"=>wind')
OR tags->'attraction' IN ('big_wheel')
ORDER BY way_area desc
) AS amenity_points_poly
properties:
Expand Down Expand Up @@ -2159,7 +2161,8 @@ Layer:
OR (boundary = 'protected_area' AND tags->'protect_class' IN ('1','1a','1b','2','3','4','5','6','7','97','98','99'))
THEN boundary ELSE NULL END,
'waterway_' || CASE WHEN waterway IN ('dam', 'dock') THEN waterway ELSE NULL END,
'tourism_' || CASE WHEN tourism IN ('viewpoint', 'attraction') THEN tourism ELSE NULL END
'tourism_' || CASE WHEN tourism IN ('viewpoint', 'attraction') THEN tourism ELSE NULL END,
'tourism_' || CASE WHEN tags->'attraction' IN ('big_wheel') THEN tourism ELSE NULL END
) AS feature,
access,
CONCAT(
Expand Down Expand Up @@ -2213,6 +2216,7 @@ Layer:
OR amenity IS NOT NULL -- skip checking a huge list and use a null check
OR (tags->'healthcare') IS NOT NULL
OR tags->'advertising' IN ('column')
OR tags->'attraction' IN ('big_wheel')
OR shop IS NOT NULL
OR (tags->'office') IS NOT NULL
OR leisure IS NOT NULL
Expand Down
48 changes: 48 additions & 0 deletions symbols/tourism/big_wheel.svg
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 01476ae

Please sign in to comment.