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,7 +13,7 @@ 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

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

@@ -48,15 +48,15 @@ CREATE OR REPLACE VIEW water_z6 AS (
     -- etldoc:  ne_10m_ocean ->  water_z6
     SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
-   -- etldoc:  ne_10m_lakes ->  water_z6    
+   -- etldoc:  osm_water_polygon_gen6 ->  water_z6
-    SELECT geometry, 'lake'::text AS class FROM ne_10m_lakes
+    SELECT geometry, 'lake' AS class FROM osm_water_polygon_gen6
 );
 
 CREATE OR REPLACE VIEW water_z7 AS (
     -- 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
 );
 
@@ -64,7 +64,7 @@ CREATE OR REPLACE VIEW water_z8 AS (
     -- 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
 );
 
@@ -156,7 +156,7 @@ RETURNS TABLE(geometry geometry, class text) AS $$
         -- 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