Show tidal landcover as soon as their on-ground counterparts

And show beaches/shoals as early as mudflats.

Author: tpetillon

project.mml

@@ -69,13 +69,13 @@ Layer:
               way,
               ('landuse_' || (CASE WHEN landuse IN ('forest', 'farmland', 'residential', 'commercial', 'retail', 'industrial',
                                                     'meadow', 'grass', 'village_green', 'vineyard', 'orchard') THEN landuse END)) AS landuse,
-              ('natural_' || (CASE WHEN "natural" IN ('wood', 'sand', 'scree', 'shingle', 'bare_rock', 'heath', 'grassland', 'scrub') THEN "natural" END)) AS "natural",
+              ('natural_' || (CASE WHEN "natural" IN ('wood', 'sand', 'beach', 'shoal', 'scree', 'shingle', 'bare_rock', 'heath', 'grassland', 'scrub') THEN "natural" END)) AS "natural",
               ('wetland_' || (CASE WHEN "natural" IN ('wetland', 'mud') THEN (CASE WHEN "natural" IN ('mud') THEN "natural" ELSE tags->'wetland' END) END)) AS wetland,
               way_area/NULLIF(POW(!scale_denominator!*0.001*0.28,2),0) AS way_pixels,
               way_area
             FROM planet_osm_polygon
             WHERE (landuse IN ('forest', 'farmland', 'residential', 'commercial', 'retail', 'industrial', 'meadow', 'grass', 'village_green', 'vineyard', 'orchard')
-              OR "natural" IN ('wood', 'wetland', 'mud', 'sand', 'scree', 'shingle', 'bare_rock', 'heath', 'grassland', 'scrub'))
+              OR "natural" IN ('wood', 'wetland', 'mud', 'beach', 'shoal', 'sand', 'scree', 'shingle', 'bare_rock', 'heath', 'grassland', 'scrub'))
               AND way_area > 0.01*!pixel_width!::real*!pixel_height!::real
               AND building IS NULL
           ) AS features
@@ -242,7 +242,7 @@ Layer:
         ) AS features
     properties:
       cache-features: true
-      minzoom: 10
+      minzoom: 5
   - id: water-lines-low-zoom
     geometry: linestring
     <<: *extents

style/landcover.mss

@@ -686,8 +686,8 @@
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
   }
 
-  [feature = 'natural_beach'][zoom >= 10],
-  [feature = 'natural_shoal'][zoom >= 10] {
+  [feature = 'natural_beach'][zoom >= 9],
+  [feature = 'natural_shoal'][zoom >= 9] {
     polygon-fill: @beach;
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }
@@ -742,7 +742,7 @@
 }
 }
 
-#landcover-tidal[zoom >= 10] {
+#landcover-tidal {
   ::low-zoom[zoom < 12] {
     // Increase the lightness of the map by scaling color lightness to be in the 20%-100% range
     image-filters: scale-hsla(0,1, 0,1, 0.2,1, 0,1);
@@ -822,8 +822,8 @@
     }
   }
 
-  [feature = 'natural_beach'][zoom >= 10],
-  [feature = 'natural_shoal'][zoom >= 10] {
+  [feature = 'natural_beach'][zoom >= 9],
+  [feature = 'natural_shoal'][zoom >= 9] {
     polygon-fill: @tidal;
     [way_pixels >= 4]  { polygon-gamma: 0.75; }
     [way_pixels >= 64] { polygon-gamma: 0.3;  }