Skip to content

Commit

Permalink
Render landuse=education
Browse files Browse the repository at this point in the history
Render `landuse=education` the same way as `amenity=school` etc.; this
is in line with the stated goals of this tag, and actively stimulates
mappers to stop abusing `amenity-school` to force rendering of shared
grounds.

Fixes gravitystorm#774
  • Loading branch information
jdhoek committed Mar 16, 2022
1 parent 1178dfb commit 864beaa
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions project.mml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Layer:
('landuse_' || (CASE WHEN landuse IN ('quarry', 'vineyard', 'orchard', 'cemetery', 'residential', 'garages', 'meadow', 'grass',
'allotments', 'forest', 'farmyard', 'farmland', 'greenhouse_horticulture',
'recreation_ground', 'village_green', 'retail', 'industrial', 'railway', 'commercial',
'brownfield', 'landfill', 'salt_pond', 'construction', 'plant_nursery', 'religious') THEN landuse END)) AS landuse,
'brownfield', 'landfill', 'salt_pond', 'construction', 'plant_nursery', 'religious', 'education') THEN landuse END)) AS landuse,
('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', 'recreation_ground', 'garden',
'golf_course', 'miniature_golf', 'sports_centre', 'stadium', 'pitch', 'ice_rink',
Expand Down Expand Up @@ -1524,7 +1524,7 @@ Layer:
'landuse_' || CASE WHEN landuse IN ('reservoir', 'basin', 'recreation_ground', 'village_green', 'quarry', 'vineyard', 'orchard', 'cemetery',
'residential', 'garages', 'meadow', 'grass', 'allotments', 'forest', 'farmyard', 'farmland',
'greenhouse_horticulture', 'retail', 'industrial', 'railway', 'commercial', 'brownfield', 'landfill',
'construction', 'salt_pond', 'military', 'plant_nursery') THEN landuse END,
'construction', 'salt_pond', 'military', 'plant_nursery', 'education') THEN landuse END,
'natural_' || CASE WHEN "natural" IN ('peak', 'volcano', 'saddle', 'cave_entrance') AND way_area IS NULL THEN "natural" END,
'natural_' || CASE WHEN "natural" IN ('wood', 'water', 'mud', 'wetland', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath',
'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait', 'cape')
Expand Down
4 changes: 3 additions & 1 deletion style/amenity-points.mss
Original file line number Diff line number Diff line change
Expand Up @@ -2175,6 +2175,7 @@
[feature = 'amenity_school'],
[feature = 'amenity_college'],
[feature = 'amenity_university'],
[feature = 'landuse_education'],
[feature = 'landuse_religious'],
[feature = 'natural_heath'],
[feature = 'natural_scrub'],
Expand Down Expand Up @@ -2286,7 +2287,8 @@
[feature = 'amenity_kindergarten'],
[feature = 'amenity_school'],
[feature = 'amenity_college'],
[feature = 'amenity_university'] {
[feature = 'amenity_university'],
[feature = 'landuse_education'] {
text-fill: darken(@societal_amenities, 80%);
}
[feature = 'landuse_religious'] {
Expand Down
3 changes: 2 additions & 1 deletion style/landcover.mss
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,8 @@
[feature = 'amenity_kindergarten'],
[feature = 'amenity_community_centre'],
[feature = 'amenity_social_facility'],
[feature = 'amenity_arts_centre'] {
[feature = 'amenity_arts_centre'],
[feature = 'landuse_education'] {
[zoom >= 10] {
polygon-fill: @built-up-lowzoom;
[way_pixels >= 4] { polygon-gamma: 0.75; }
Expand Down

0 comments on commit 864beaa

Please sign in to comment.