Merge remote-tracking branch 'upstream/master' into shields

layers/landcover/README.md

@@ -4,8 +4,7 @@
 Read the layer documentation at **http://openmaptiles.org/schema#landcover**
 
 ### Mapping Diagram
-![Mapping diagram for landcover](http://openmaptiles.org/media/mapping_landcover.png)
+![Mapping diagram for landcover](mapping_diagram.png?raw=true)
 
 ### ETL diagram
-![ETL diagram for landcover](http://openmaptiles.org/media/etl_landcover.png)
-
+![ETL diagram for landcover](etl_diagram.png?raw=true)

layers/landcover/landcover.sql

@@ -13,23 +13,23 @@ CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, l
     SELECT CASE
          WHEN landuse IN ('farmland', 'farm', 'orchard', 'vineyard', 'plant_nursery') THEN 'farmland'
          WHEN "natural" IN ('glacier', 'ice_shelf') THEN 'ice'
-         WHEN "natural"='wood' OR landuse IN ('forest', 'wood') THEN 'wood'
+         WHEN "natural"='wood' OR landuse IN ('forest') THEN 'wood'
          WHEN "natural"='grassland' OR landuse IN ('grass', 'meadow', 'allotments', 'grassland', 'park', 'village_green', 'recreation_ground') OR leisure='park' THEN 'grass'
          WHEN "natural"='wetland' OR wetland IN ('bog', 'swamp', 'wet_meadow', 'marsh', 'reedbed', 'saltern', 'tidalflat', 'saltmarsh', 'mangrove') THEN 'wetland'
         ELSE NULL
     END;
 $$ LANGUAGE SQL IMMUTABLE;
 
--- etldoc: ne_110m_glaciated_areas ->  landcover_z0 
+-- etldoc: ne_110m_glaciated_areas ->  landcover_z0
 CREATE OR REPLACE VIEW landcover_z0 AS (
     SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_110m_glaciated_areas
 );
 
 CREATE OR REPLACE VIEW landcover_z2 AS (
-    -- etldoc: ne_50m_glaciated_areas ->  landcover_z2 
+    -- etldoc: ne_50m_glaciated_areas ->  landcover_z2
     SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_50m_glaciated_areas
     UNION ALL
-    -- etldoc: ne_50m_antarctic_ice_shelves_polys ->  landcover_z2     
+    -- etldoc: ne_50m_antarctic_ice_shelves_polys ->  landcover_z2
     SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_50m_antarctic_ice_shelves_polys
 );
 
@@ -37,32 +37,32 @@ CREATE OR REPLACE VIEW landcover_z5 AS (
     -- etldoc: ne_10m_glaciated_areas ->  landcover_z5
     SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_glaciated_areas
     UNION ALL
-    -- etldoc: ne_10m_antarctic_ice_shelves_polys ->  landcover_z5 
+    -- etldoc: ne_10m_antarctic_ice_shelves_polys ->  landcover_z5
     SELECT NULL::bigint AS osm_id, geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_antarctic_ice_shelves_polys
 );
 
 CREATE OR REPLACE VIEW landcover_z8 AS (
-    -- etldoc: osm_landcover_polygon_gen6 ->  landcover_z8  
+    -- etldoc: osm_landcover_polygon_gen6 ->  landcover_z8
     SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen6
 );
 
 CREATE OR REPLACE VIEW landcover_z9 AS (
-    -- etldoc: osm_landcover_polygon_gen5 ->  landcover_z9    
+    -- etldoc: osm_landcover_polygon_gen5 ->  landcover_z9
     SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen5
 );
 
 CREATE OR REPLACE VIEW landcover_z10 AS (
-    -- etldoc: osm_landcover_polygon_gen4 ->  landcover_z10    
+    -- etldoc: osm_landcover_polygon_gen4 ->  landcover_z10
     SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen4
 );
 
 CREATE OR REPLACE VIEW landcover_z11 AS (
-    -- etldoc: osm_landcover_polygon_gen3 ->  landcover_z11    
+    -- etldoc: osm_landcover_polygon_gen3 ->  landcover_z11
     SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen3
 );
 
 CREATE OR REPLACE VIEW landcover_z12 AS (
-    -- etldoc: osm_landcover_polygon_gen2 ->  landcover_z12    
+    -- etldoc: osm_landcover_polygon_gen2 ->  landcover_z12
     SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen2
 );
 
@@ -72,11 +72,11 @@ CREATE OR REPLACE VIEW landcover_z13 AS (
 );
 
 CREATE OR REPLACE VIEW landcover_z14 AS (
-    -- etldoc: osm_landcover_polygon ->  landcover_z14    
+    -- etldoc: osm_landcover_polygon ->  landcover_z14
     SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon
 );
 
--- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled",  
+-- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled",
 -- etldoc:     label="layer_landcover | <z0_1> z0-z1 | <z2_4> z2-z4 | <z5_7> z5-z7 | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
 
 CREATE OR REPLACE FUNCTION layer_landcover(bbox geometry, zoom_level int)
@@ -92,7 +92,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
         SELECT * FROM landcover_z0
         WHERE zoom_level BETWEEN 0 AND 1 AND geometry && bbox
         UNION ALL
-        -- etldoc:  landcover_z2 -> layer_landcover:z2_4        
+        -- etldoc:  landcover_z2 -> layer_landcover:z2_4
         SELECT * FROM landcover_z2
         WHERE zoom_level BETWEEN 2 AND 4 AND geometry && bbox
         UNION ALL
@@ -104,7 +104,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
         SELECT *
         FROM landcover_z8 WHERE zoom_level = 8 AND geometry && bbox
         UNION ALL
-        -- etldoc:  landcover_z9 -> layer_landcover:z9        
+        -- etldoc:  landcover_z9 -> layer_landcover:z9
         SELECT *
         FROM landcover_z9 WHERE zoom_level = 9 AND geometry && bbox
         UNION ALL
@@ -112,19 +112,19 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
         SELECT *
         FROM landcover_z10 WHERE zoom_level = 10 AND geometry && bbox
         UNION ALL
-        -- etldoc:  landcover_z11 -> layer_landcover:z11        
+        -- etldoc:  landcover_z11 -> layer_landcover:z11
         SELECT *
         FROM landcover_z11 WHERE zoom_level = 11 AND geometry && bbox
         UNION ALL
-        -- etldoc:  landcover_z12 -> layer_landcover:z12        
+        -- etldoc:  landcover_z12 -> layer_landcover:z12
         SELECT *
         FROM landcover_z12 WHERE zoom_level = 12 AND geometry && bbox
         UNION ALL
-        -- etldoc:  landcover_z13 -> layer_landcover:z13        
+        -- etldoc:  landcover_z13 -> layer_landcover:z13
         SELECT *
         FROM landcover_z13 WHERE zoom_level = 13 AND geometry && bbox
         UNION ALL
-        -- etldoc:  landcover_z14 -> layer_landcover:z14_        
+        -- etldoc:  landcover_z14 -> layer_landcover:z14_
         SELECT *
         FROM landcover_z14 WHERE zoom_level >= 14 AND geometry && bbox
     ) AS zoom_levels;

layers/landcover/mapping.yaml

@@ -76,6 +76,7 @@ tables:
       # There are 600 parks tagged with landuse=park instead of leisure=park
       - park
       natural:
+      - wood
       - wetland
       - grassland
       leisure:

layers/water/README.md

@@ -7,5 +7,4 @@ Read the layer documentation at **http://openmaptiles.org/schema#water**
 ![Mapping diagram for water](http://openmaptiles.org/media/mapping_water.png)
 
 ### ETL diagram
-![ETL diagram for water](http://openmaptiles.org/media/etl_water.png)
-
+![ETL diagram for water](etl_diagram.png?raw=true)

layers/water/mapping.yaml

@@ -1,5 +1,11 @@
 generalized_tables:
 
+  # etldoc: imposm3 -> osm_water_polygon_gen6
+  water_polygon_gen6:
+    source: water_polygon_gen5
+    sql_filter: area>20000000.0
+    tolerance: 640.0
+
   # etldoc: imposm3 -> osm_water_polygon_gen5
   water_polygon_gen5:
     source: water_polygon_gen4

layers/water/water.sql

@@ -5,66 +5,66 @@ $$ LANGUAGE SQL IMMUTABLE;
 
 
 CREATE OR REPLACE VIEW water_z0 AS (
-    -- etldoc:  ne_110m_ocean ->  water_z0 
+    -- etldoc:  ne_110m_ocean ->  water_z0
     SELECT geometry, 'ocean'::text AS class FROM ne_110m_ocean
     UNION ALL
-    -- etldoc:  ne_110m_lakes ->  water_z0     
+    -- etldoc:  ne_110m_lakes ->  water_z0
     SELECT geometry, 'lake'::text AS class FROM ne_110m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z1 AS (
-    -- etldoc:  ne_110m_ocean ->  water_z1    
+    -- etldoc:  ne_110m_ocean ->  water_z1
     SELECT geometry, 'ocean'::text AS class FROM ne_110m_ocean
     UNION ALL
-    -- etldoc:  ne_110m_lakes ->  water_z1    
+    -- etldoc:  ne_110m_lakes ->  water_z1
     SELECT geometry, 'lake'::text AS class FROM ne_110m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z2 AS (
-    -- etldoc:  ne_50m_ocean ->  water_z2    
+    -- etldoc:  ne_50m_ocean ->  water_z2
     SELECT geometry, 'ocean'::text AS class FROM ne_50m_ocean
     UNION ALL
-    -- etldoc:  ne_50m_lakes ->  water_z2     
+    -- etldoc:  ne_50m_lakes ->  water_z2
     SELECT geometry, 'lake'::text AS class FROM ne_50m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z4 AS (
-    -- etldoc:  ne_50m_ocean ->  water_z4       
+    -- etldoc:  ne_50m_ocean ->  water_z4
     SELECT geometry, 'ocean'::text AS class FROM ne_50m_ocean
     UNION ALL
-    -- etldoc:  ne_50m_lakes ->  water_z4     
+    -- etldoc:  ne_50m_lakes ->  water_z4
     SELECT geometry, 'lake'::text AS class FROM ne_50m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z5 AS (
-    -- etldoc:  ne_10m_ocean ->  water_z5    
+    -- etldoc:  ne_10m_ocean ->  water_z5
     SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
-    -- etldoc:  ne_10m_lakes ->  water_z5    
+    -- etldoc:  ne_10m_lakes ->  water_z5
     SELECT geometry, 'lake'::text AS class FROM ne_10m_lakes
 );
 
 CREATE OR REPLACE VIEW water_z6 AS (
-    -- etldoc:  ne_10m_ocean ->  water_z6     
+    -- etldoc:  ne_10m_ocean ->  water_z6
     SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
-   -- etldoc:  ne_10m_lakes ->  water_z6    
-    SELECT geometry, 'lake'::text AS class FROM ne_10m_lakes
+   -- etldoc:  osm_water_polygon_gen6 ->  water_z6
+    SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen6
 );
 
 CREATE OR REPLACE VIEW water_z7 AS (
-    -- etldoc:  ne_10m_ocean ->  water_z7     
+    -- etldoc:  ne_10m_ocean ->  water_z7
     SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
-    -- etldoc:  osm_water_polygon_gen3 ->  water_z7
+    -- etldoc:  osm_water_polygon_gen5 ->  water_z7
     SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen5
 );
 
 CREATE OR REPLACE VIEW water_z8 AS (
-    -- etldoc:  ne_10m_ocean ->  water_z8     
+    -- etldoc:  ne_10m_ocean ->  water_z8
     SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
-    -- etldoc:  osm_water_polygon_gen2 ->  water_z8         
+    -- etldoc:  osm_water_polygon_gen4 ->  water_z8
     SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen4
 );
 
@@ -72,7 +72,7 @@ CREATE OR REPLACE VIEW water_z9 AS (
     -- etldoc:  osm_ocean_polygon_gen3 ->  water_z9
     SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen3
     UNION ALL
-    -- etldoc:  osm_water_polygon_gen1 ->  water_z9    
+    -- etldoc:  osm_water_polygon_gen3 ->  water_z9
     SELECT geometry, 'lake'::text AS class FROM osm_water_polygon_gen3
 );
 
@@ -88,7 +88,7 @@ CREATE OR REPLACE VIEW water_z11 AS (
     -- etldoc:  osm_ocean_polygon_gen1 ->  water_z11
     SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen1
     UNION ALL
-    -- etldoc:  osm_water_polygon ->  water_z11
+    -- etldoc:  osm_water_polygon_gen1 ->  water_z11
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen1 WHERE area > 40000
 );
 
@@ -96,7 +96,7 @@ CREATE OR REPLACE VIEW water_z12 AS (
     -- etldoc:  osm_ocean_polygon_gen1 ->  water_z12
     SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon
     UNION ALL
-    -- etldoc:  osm_water_polygon ->  water_z12     
+    -- etldoc:  osm_water_polygon ->  water_z12
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 10000
 );
 
@@ -104,7 +104,7 @@ CREATE OR REPLACE VIEW water_z13 AS (
     -- etldoc:  osm_ocean_polygon ->  water_z13
     SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon
     UNION ALL
-    -- etldoc:  osm_water_polygon ->  water_z13    
+    -- etldoc:  osm_water_polygon ->  water_z13
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 5000
 );
 
@@ -112,11 +112,11 @@ CREATE OR REPLACE VIEW water_z14 AS (
     -- etldoc:  osm_ocean_polygon ->  water_z14
     SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon
     UNION ALL
-    -- etldoc:  osm_water_polygon ->  water_z14    
+    -- etldoc:  osm_water_polygon ->  water_z14
     SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon
 );
 
--- etldoc: layer_water [shape=record fillcolor=lightpink, style="rounded,filled",  
+-- etldoc: layer_water [shape=record fillcolor=lightpink, style="rounded,filled",
 -- etldoc:     label="layer_water |<z0> z0|<z1>z1|<z2>z2|<z3>z3 |<z4> z4|<z5>z5|<z6>z6|<z7>z7| <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
 
 CREATE OR REPLACE FUNCTION layer_water (bbox geometry, zoom_level int)
@@ -125,44 +125,44 @@ RETURNS TABLE(geometry geometry, class text) AS $$
         -- etldoc: water_z0 ->  layer_water:z0
         SELECT * FROM water_z0 WHERE zoom_level = 0
         UNION ALL
-        -- etldoc: water_z1 ->  layer_water:z1        
+        -- etldoc: water_z1 ->  layer_water:z1
         SELECT * FROM water_z1 WHERE zoom_level = 1
         UNION ALL
         -- etldoc: water_z2 ->  layer_water:z2
-        -- etldoc: water_z2 ->  layer_water:z3          
+        -- etldoc: water_z2 ->  layer_water:z3
         SELECT * FROM water_z2 WHERE zoom_level BETWEEN 2 AND 3
         UNION ALL
-        -- etldoc: water_z4 ->  layer_water:z4        
+        -- etldoc: water_z4 ->  layer_water:z4
         SELECT * FROM water_z4 WHERE zoom_level = 4
         UNION ALL
-        -- etldoc: water_z5 ->  layer_water:z5        
+        -- etldoc: water_z5 ->  layer_water:z5
         SELECT * FROM water_z5 WHERE zoom_level = 5
         UNION ALL
-        -- etldoc: water_z6 ->  layer_water:z6       
+        -- etldoc: water_z6 ->  layer_water:z6
         SELECT * FROM water_z6 WHERE zoom_level = 6
         UNION ALL
-        -- etldoc: water_z7 ->  layer_water:z7        
+        -- etldoc: water_z7 ->  layer_water:z7
         SELECT * FROM water_z7 WHERE zoom_level = 7
         UNION ALL
-        -- etldoc: water_z8 ->  layer_water:z8        
+        -- etldoc: water_z8 ->  layer_water:z8
         SELECT * FROM water_z8 WHERE zoom_level = 8
         UNION ALL
         -- etldoc: water_z9 ->  layer_water:z9
         SELECT * FROM water_z9 WHERE zoom_level = 9
         UNION ALL
-        -- etldoc: water_z10 ->  layer_water:z10                   
+        -- etldoc: water_z10 ->  layer_water:z10
         SELECT * FROM water_z10 WHERE zoom_level = 10
         UNION ALL
-        -- etldoc: water_z11 ->  layer_water:z11        
+        -- etldoc: water_z11 ->  layer_water:z11
         SELECT * FROM water_z11 WHERE zoom_level = 11
         UNION ALL
-        -- etldoc: water_z12 ->  layer_water:z2        
+        -- etldoc: water_z12 ->  layer_water:z12
         SELECT * FROM water_z12 WHERE zoom_level = 12
         UNION ALL
-        -- etldoc: water_z13 ->  layer_water:z13        
+        -- etldoc: water_z13 ->  layer_water:z13
         SELECT * FROM water_z13 WHERE zoom_level = 13
         UNION ALL
-        -- etldoc: water_z14 ->  layer_water:z14_        
+        -- etldoc: water_z14 ->  layer_water:z14_
         SELECT * FROM water_z14 WHERE zoom_level >= 14
     ) AS zoom_levels
     WHERE geometry && bbox;