From 9b26a333df1671eaf50ad6fa6b142957832a9bb1 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Tue, 16 Apr 2019 23:53:35 +0900 Subject: [PATCH 1/3] Render bays and straits from z14 only, lakes from z5 only --- amenity-points.mss | 5 +---- project.mml | 5 ++--- water.mss | 5 ++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/amenity-points.mss b/amenity-points.mss index 62b5dfe14b..1eac9fcaae 100644 --- a/amenity-points.mss +++ b/amenity-points.mss @@ -2521,7 +2521,6 @@ } } - [feature = 'natural_bay'][zoom >= 14], [feature = 'natural_spring'][zoom >= 16] { text-name: "[name]"; text-size: 10; @@ -2532,9 +2531,7 @@ text-halo-radius: @standard-halo-radius; text-halo-fill: @standard-halo-fill; text-placement: interior; - [feature = 'natural_spring'] { - text-dy: 6; - } + text-dy: 6; } [feature = 'amenity_atm'][zoom >= 19], diff --git a/project.mml b/project.mml index 6af7cb3a6d..361a03951f 100644 --- a/project.mml +++ b/project.mml @@ -2012,8 +2012,7 @@ Layer: COALESCE( '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, + 'natural_' || CASE WHEN "natural" IN ('wood', 'glacier', 'sand', 'scree', 'shingle', 'bare_rock', 'water') 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') @@ -2026,7 +2025,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') 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')) diff --git a/water.mss b/water.mss index 2a75a6164c..2bcc6e3494 100644 --- a/water.mss +++ b/water.mss @@ -334,12 +334,10 @@ .text-low-zoom[zoom < 10], #text-point[zoom >= 10] { [feature = 'natural_water'], - [feature = 'natural_bay'], - [feature = 'natural_strait'], [feature = 'landuse_reservoir'], [feature = 'landuse_basin'], [feature = 'waterway_dock'] { - [zoom >= 0][way_pixels > 3000], + [zoom >= 5][way_pixels > 3000], [zoom >= 17] { text-name: "[name]"; text-size: 10; @@ -370,6 +368,7 @@ } #text-point[zoom >= 14] { + [feature = 'natural_bay'], [feature = 'natural_strait'] { text-name: "[name]"; text-size: 10; From 254630aeefff902b6371063c217b13b0cdb619ce Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 18 Apr 2019 16:07:18 +0900 Subject: [PATCH 2/3] Change minzoom to 5 for water-areas --- project.mml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.mml b/project.mml index 361a03951f..65a2e1bf3c 100644 --- a/project.mml +++ b/project.mml @@ -243,7 +243,7 @@ Layer: ORDER BY COALESCE(layer,0), way_area DESC ) AS water_areas properties: - minzoom: 0 + minzoom: 5 - id: ocean-lz geometry: polygon class: ocean From a4ed8415d785da7d8808bab89177ea8da5b08803 Mon Sep 17 00:00:00 2001 From: jeisenbe Date: Thu, 18 Apr 2019 21:47:38 +0900 Subject: [PATCH 3/3] Change minzoom to 4 for text-low-zoom Place=island text labels are first rendered at z4. None of the other text labels in this layer are rendered earlier now --- project.mml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.mml b/project.mml index 65a2e1bf3c..fc36a04244 100644 --- a/project.mml +++ b/project.mml @@ -2035,7 +2035,7 @@ Layer: ORDER BY way_area DESC ) AS text_poly_low_zoom properties: - minzoom: 0 + minzoom: 4 maxzoom: 9 - id: text-line geometry: linestring