diff --git a/project.mml b/project.mml index 780d7a6f25..d4a41b79dd 100644 --- a/project.mml +++ b/project.mml @@ -2019,7 +2019,7 @@ Layer: COALESCE( 'landuse_' || CASE WHEN landuse IN ('forest', 'military', 'farmland') THEN landuse ELSE NULL END, 'natural_' || CASE WHEN "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', - 'water', 'bay') 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 IN ('national_park') THEN boundary ELSE NULL END, 'leisure_' || CASE WHEN leisure IN ('nature_reserve') THEN leisure ELSE NULL END @@ -2028,7 +2028,7 @@ Layer: CASE WHEN building = 'no' OR building IS NULL THEN 'no' ELSE 'yes' END AS is_building -- always no with the where conditions FROM planet_osm_polygon WHERE (landuse IN ('forest', 'military', 'farmland') - OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water', 'bay') + OR "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water', 'bay', 'strait') OR "place" IN ('island') OR boundary IN ('national_park') OR leisure IN ('nature_reserve')) @@ -2090,7 +2090,7 @@ Layer: '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') 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') @@ -2261,7 +2261,7 @@ Layer: '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') + 'scree', 'shingle', 'bare_rock', 'sand', 'heath', 'grassland', 'scrub', 'beach', 'glacier', 'tree', 'strait') 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, diff --git a/water.mss b/water.mss index ff03a547b2..25ae435005 100644 --- a/water.mss +++ b/water.mss @@ -320,6 +320,7 @@ .text[zoom >= 10] { [feature = 'natural_water'], [feature = 'natural_bay'], + [feature = 'natural_strait'], [feature = 'landuse_reservoir'], [feature = 'landuse_basin'], [feature = 'waterway_dock'] {