Skip to content

Commit

Permalink
Restrict rendering of natural=cape to nodes, change font to standard
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeisenbe
jeisenbe committed Mar 27, 2019
1 parent b5938d6 commit af44891
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
13 changes: 4 additions & 9 deletions amenity-points.mss
View file
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
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

4 comments on commit af44891

@grischard
Copy link

@grischard grischard commented on af44891 Apr 4, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a pity, I'd tagged some capes as areas and I think it worked well.

So https://www.openstreetmap.org/relation/9375691 should be tagged as a peninsula instead, would that be more correct?

@imagico
Copy link
Collaborator

@imagico imagico commented on af44891 Apr 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without being familiar with the local terminology i can't really tell but according to the French wikipedia the term Cap Ferrat refers to the whole peninsula.

@jeisenbe
Copy link
Collaborator Author

@jeisenbe jeisenbe commented on af44891 Apr 4, 2019 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grischard
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All right, I'll re-tag with the 'peninsula' tag if that's more correct. Thank you two!

Please sign in to comment.