Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement issue 2290 (render leisure=resort) #4779

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Layer:
('shop_' || (CASE WHEN shop IN ('mall') AND (tags->'location' NOT IN ('underground') OR (tags->'location') IS NULL) THEN shop END)) AS shop,
('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'garden',
'golf_course', 'miniature_golf', 'sports_centre', 'stadium', 'pitch', 'ice_rink',
'track', 'dog_park', 'fitness_station', 'water_park') THEN leisure END)) AS leisure,
'track', 'dog_park', 'fitness_station', 'water_park', 'resort') THEN leisure END)) AS leisure,
('man_made_' || (CASE WHEN man_made IN ('works', 'wastewater_plant', 'water_works') THEN man_made END)) AS man_made,
('natural_' || (CASE WHEN "natural" IN ('beach', 'shoal', 'heath', 'grassland', 'wood', 'sand', 'scree', 'shingle', 'bare_rock', 'scrub') THEN "natural" END)) AS "natural",
('wetland_' || (CASE WHEN "natural" IN ('wetland', 'mud') THEN (CASE WHEN "natural" = 'mud' THEN "natural" ELSE tags->'wetland' END) END)) AS wetland,
Expand Down Expand Up @@ -1548,7 +1548,7 @@ Layer:
'leisure_' || CASE WHEN leisure IN ('amusement_arcade', 'beach_resort', 'bird_hide', 'bowling_alley', 'dog_park', 'firepit', 'fishing',
'fitness_centre', 'fitness_station', 'garden', 'golf_course', 'ice_rink', 'marina', 'miniature_golf',
'outdoor_seating', 'park', 'picnic_table', 'pitch', 'playground',
'sauna', 'slipway', 'sports_centre', 'stadium', 'swimming_area', 'swimming_pool', 'track', 'water_park') THEN leisure END,
'sauna', 'slipway', 'sports_centre', 'stadium', 'swimming_area', 'swimming_pool', 'track', 'water_park', 'resort') THEN leisure END,
'power_' || CASE WHEN power IN ('plant', 'generator', 'substation') THEN power END,
'man_made_' || CASE WHEN (man_made IN ('chimney', 'communications_tower', 'crane', 'lighthouse', 'mast', 'obelisk', 'silo', 'storage_tank',
'telescope', 'tower', 'wastewater_plant', 'water_tower', 'water_works', 'windmill', 'works')
Expand Down
8 changes: 8 additions & 0 deletions style/amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,12 @@
marker-clip: false;
}

[feature = 'leisure_resort'][zoom >= 16] {
marker-file: url('symbols/leisure/resort.svg');
marker-fill: @accommodation-icon;
marker-clip: false;
}

// Ford tagging on points - ford on lines is defined later
[feature = 'highway_ford'][zoom >= 16] {
marker-file: url('symbols/highway/ford.svg');
Expand Down Expand Up @@ -2389,6 +2395,7 @@
[feature = 'tourism_alpine_hut'][zoom >= 14],
[feature = 'amenity_shelter'][zoom >= 17],
[feature = 'leisure_picnic_table'][zoom >= 17],
[feature = 'leisure_resort'][zoom >= 17],
[feature = 'tourism_hotel'][zoom >= 17],
[feature = 'tourism_motel'][zoom >= 17],
[feature = 'tourism_hostel'][zoom >= 17],
Expand All @@ -2411,6 +2418,7 @@
text-dy: 13;
}
[feature = 'tourism_camp_site'],
[feature = 'leisure_resort'],
[feature = 'tourism_caravan_site'] {
text-dy: 15;
}
Expand Down
1 change: 1 addition & 0 deletions style/landcover.mss
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
[way_pixels >= 64] { polygon-gamma: 0.3; }
}

[feature = 'leisure_resort'],
[feature = 'tourism_camp_site'],
[feature = 'tourism_caravan_site'],
[feature = 'tourism_picnic_site'] {
Expand Down
3 changes: 3 additions & 0 deletions symbols/leisure/resort.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.