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.

Sign up for GitHub

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

Drop leisure=common #3619

Merged
merged 1 commit into from
Feb 12, 2019
Merged

Drop leisure=common #3619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 0 additions & 2 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2385,7 +2385,6 @@
[feature = 'leisure_recreation_ground'],
[feature = 'landuse_recreation_ground'],
[feature = 'landuse_village_green'],
[feature = 'leisure_common'],
[feature = 'leisure_garden'],
[feature = 'landuse_quarry'],
[feature = 'landuse_vineyard'],
Expand Down Expand Up @@ -2464,7 +2463,6 @@
[feature = 'leisure_recreation_ground'],
[feature = 'landuse_recreation_ground'],
[feature = 'landuse_village_green'],
[feature = 'leisure_common'],
[feature = 'leisure_garden'] {
text-fill: @leisure-green;
}
Expand Down
5 changes: 2 additions & 3 deletions landcover.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// --- Parks, woods, other green things ---

@grass: #cdebb0; // Lch(90,32,128) also grassland, meadow, common, village_green, garden
@grass: #cdebb0; // Lch(90,32,128) also grassland, meadow, village_green, garden, allotments
@scrub: #c8d7ab; // Lch(84,24,122)
@forest: #add19e; // Lch(80,30,135)
@forest-text: #46673b; // Lch(40,30,135)
Expand Down Expand Up @@ -359,8 +359,7 @@
[feature = 'natural_grassland'][zoom >= 5],
[feature = 'landuse_meadow'][zoom >= 5],
[feature = 'landuse_grass'][zoom >= 10],
[feature = 'landuse_village_green'][zoom >= 10],
[feature = 'leisure_common'][zoom >= 10] {
[feature = 'landuse_village_green'][zoom >= 10] {
polygon-fill: @grass;
[way_pixels >= 4] { polygon-gamma: 0.75; }
[way_pixels >= 64] { polygon-gamma: 0.3; }
Expand Down
10 changes: 5 additions & 5 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Layer:
'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture',
'recreation_ground', 'village_green', 'retail', 'industrial', 'railway', 'commercial',
'brownfield', 'landfill', 'construction', 'plant_nursery', 'religious') THEN landuse ELSE NULL END)) AS landuse,
('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'common', 'garden',
('leisure_' || (CASE WHEN leisure IN ('swimming_pool', 'playground', 'park', 'recreation_ground', 'garden',
'golf_course', 'miniature_golf', 'sports_centre', 'stadium', 'pitch', 'ice_rink',
'track', 'dog_park', 'fitness_station') THEN leisure ELSE NULL END)) AS leisure,
('man_made_' || (CASE WHEN man_made IN ('works', 'wastewater_plant', 'water_works') THEN man_made ELSE NULL END)) AS man_made,
Expand Down Expand Up @@ -1394,7 +1394,7 @@ Layer:
AND NOT tags @> 'capital=>yes'
OR (place IN ('suburb', 'quarter', 'neighbourhood', 'locality', 'isolated_dwelling', 'farm')
OR (place IN ('square')
AND (leisure is NULL OR NOT leisure IN ('park', 'common', 'recreation_ground', 'garden')))
AND (leisure is NULL OR NOT leisure IN ('park', 'recreation_ground', 'garden')))
) AND name IS NOT NULL
ORDER BY CASE
WHEN place = 'suburb' THEN 3
Expand Down Expand Up @@ -1934,7 +1934,7 @@ Layer:
AND (tunnel NOT IN ('yes', 'building_passage') OR tunnel IS NULL)
AND (covered NOT IN ('yes') OR covered IS NULL))
OR (place IN ('square')
AND (leisure IS NULL OR NOT leisure IN ('park', 'common', 'recreation_ground', 'garden')))
AND (leisure IS NULL OR NOT leisure IN ('park', 'recreation_ground', 'garden')))
AND name IS NOT NULL
ORDER BY way_area DESC
) AS roads_area_text_name
Expand Down Expand Up @@ -2126,7 +2126,7 @@ Layer:
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',
'pitch', 'playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina',
'pitch', 'playground', 'park', 'recreation_ground', 'garden', 'nature_reserve', 'marina',
'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley',
'outdoor_seating', 'bird_hide', 'amusement_arcade', 'swimming_area', 'fishing', 'ice_rink') THEN leisure ELSE NULL END,
'power_' || CASE WHEN power IN ('plant', 'station', 'generator', 'sub_station', 'substation') THEN power ELSE NULL END,
Expand Down Expand Up @@ -2328,7 +2328,7 @@ Layer:
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',
'pitch','playground', 'park', 'recreation_ground', 'common', 'garden', 'nature_reserve', 'marina',
'pitch','playground', 'park', 'recreation_ground', 'garden', 'nature_reserve', 'marina',
'slipway', 'picnic_table', 'dog_park', 'fitness_station', 'firepit', 'sauna', 'beach_resort', 'bowling_alley',
'outdoor_seating', 'bird_hide', 'amusement_arcade', 'swimming_area', 'fishing', 'ice_rink') THEN leisure ELSE NULL END,
'power_' || CASE WHEN power IN ('plant', 'station', 'generator', 'sub_station', 'substation') THEN power ELSE NULL END,
Expand Down