diff --git a/amenity-points.mss b/amenity-points.mss index 2098f74d1e..a739897397 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -1624,6 +1624,8 @@ /* 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], @@ -1872,6 +1874,21 @@ text-placement: interior; } + [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-halo-radius: @standard-halo-radius; + text-halo-fill: @standard-halo-fill; + text-placement: interior; + } + [feature = 'tourism_information'][zoom >= 19], [feature = 'tourism_information']["information"='office'][zoom >= 17] { text-name: "[name]"; diff --git a/project.mml b/project.mml index c0c6b7bb0e..8b6840fbae 100644 --- a/project.mml +++ b/project.mml @@ -2022,7 +2022,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') THEN "natural" ELSE NULL END, + 'water', 'bay', 'strait', 'cape') THEN "natural" ELSE NULL END, 'place_' || CASE WHEN place IN ('island') THEN place ELSE NULL END, 'boundary_' || CASE WHEN boundary IN ('national_park') THEN boundary ELSE NULL END, 'leisure_' || CASE WHEN leisure IN ('nature_reserve') THEN leisure ELSE NULL END @@ -2032,7 +2032,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') + OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water', 'bay', 'strait', 'cape') OR "place" IN ('island') OR boundary IN ('national_park') OR leisure IN ('nature_reserve')) @@ -2094,7 +2094,7 @@ Layer: 'communications_tower', 'telescope', 'chimney', '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') THEN "natural" ELSE NULL END, + 'grassland', 'scrub', 'beach', 'shoal', 'reef', 'glacier', 'strait', 'cape') 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') @@ -2279,7 +2279,7 @@ Layer: 'telescope', 'chimney', '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', 'peak', 'volcano', 'saddle', 'cave_entrance', 'water', 'mud', 'wetland', 'marsh', 'bay', 'spring', - 'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait') + 'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait', 'cape') THEN "natural" ELSE NULL END, 'waterway_' || CASE WHEN waterway IN ('waterfall') THEN waterway ELSE NULL END, 'place_' || CASE WHEN place IN ('island', 'islet') THEN place ELSE NULL END,