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

Restrict rendering of natural=cape to nodes, change font to standard #3732

Merged
merged 1 commit into from
Apr 4, 2019
Merged

Restrict rendering of natural=cape to nodes, change font to standard #3732

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
13 changes: 4 additions & 9 deletions amenity-points.mss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1790,8 +1790,6 @@
/* Note that .text is also used in water.mss */
.text-low-zoom[zoom < 10],
.text[zoom >= 10] {
[feature = 'natural_cape'][zoom >= 4][way_pixels > 3000][way_pixels < 800000],
[feature = 'natural_cape'][zoom >= 16][way_pixels < 800000],
[feature = 'place_island'][zoom >= 4][way_pixels > 3000][way_pixels < 800000],
[feature = 'place_island'][zoom >= 16][way_pixels < 800000],
[feature = 'place_islet'][zoom >= 11][way_pixels > 3000][way_pixels < 800000],
Expand Down Expand Up @@ -2065,13 +2063,10 @@
[feature = 'natural_cape'][zoom >= 14] {
text-name: "[name]";
text-fill: #000;
text-size: @landcover-font-size;
text-wrap-width: @landcover-wrap-width-size;
text-line-spacing: @landcover-line-spacing-size;
text-size: @landcover-font-size-big;
text-wrap-width: @landcover-wrap-width-size-big;
text-line-spacing: @landcover-line-spacing-size-big;
text-face-name: @oblique-fonts;
text-size: @standard-font-size;
text-wrap-width: @standard-wrap-width;
text-line-spacing: @standard-line-spacing-size;
text-face-name: @standard-font;
text-halo-radius: @standard-halo-radius;
text-halo-fill: @standard-halo-fill;
text-placement: interior;
Expand Down
6 changes: 3 additions & 3 deletions project.mml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2071,7 +2071,7 @@ Layer:
'landuse_' || CASE WHEN landuse IN ('forest', 'military', 'farmland') THEN landuse ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area') THEN military ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock',
'water', 'bay', 'strait', 'cape') THEN "natural" ELSE NULL END,
'water', 'bay', 'strait') THEN "natural" ELSE NULL END,
'place_' || CASE WHEN place IN ('island') THEN place ELSE NULL END,
'boundary_' || CASE WHEN (boundary = 'protected_area' AND tags->'protect_class' = '24') THEN 'aboriginal_lands'
WHEN boundary IN ('aboriginal_lands', 'national_park')
Expand All @@ -2084,7 +2084,7 @@ Layer:
FROM planet_osm_polygon
WHERE (landuse IN ('forest', 'military', 'farmland')
OR military IN ('danger_area')
OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water', 'bay', 'strait', 'cape')
OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water', 'bay', 'strait')
OR "place" IN ('island')
OR boundary IN ('aboriginal_lands', 'national_park')
OR (boundary = 'protected_area' AND tags->'protect_class' IN ('1','1a','1b','2','3','4','5','6','7','24','97','98','99'))
Expand Down Expand Up @@ -2152,7 +2152,7 @@ Layer:
'communications_tower', 'telescope', 'chimney', 'crane', 'storage_tank', 'silo', 'wastewater_plant', 'water_works')
AND (tags->'location' NOT IN ('roof', 'rooftop') OR (tags->'location') IS NULL)) THEN man_made ELSE NULL END,
'natural_' || CASE WHEN "natural" IN ('wood', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', 'scree', 'shingle', 'bare_rock', 'sand', 'heath',
'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier', 'strait', 'cape') THEN "natural" ELSE NULL END,
'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier', 'strait') THEN "natural" ELSE NULL END,
'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,
'military_' || CASE WHEN military IN ('danger_area', 'bunker') THEN military ELSE NULL END,
'historic_' || CASE WHEN historic IN ('memorial', 'monument', 'archaeological_site', 'fort', 'castle', 'manor', 'city_gate')
Expand Down