Merge branch 'master' into quickstart_v2

README.md

@@ -1,11 +1,18 @@
 ## OpenMapTiles
 
-OpenMapTiles is a collection of vector tile layers you can mix and match to create your own vector tile sets
+OpenMapTiles is an extensible vector tile schema you can use or mix and match to create your own vector tile sets.
-It is used by [OSM2VectorTiles](http://osm2vectortiles.org/) and we encourage you to collaborate, reuse and adapt existing layers
+It is used by [OSM2VectorTiles](http://osm2vectortiles.org/) and we encourage you to collaborate, reuse and adapt existing layers and add your own layers.
-and add your own layers.
 
-You define a self contained **Layer** together with SQL files and layer and data source definitions (like a imposm3 mapping file)
+You define a self contained **Layer** together with SQL files and layer and data source definitions (like an imposm3 mapping file) that you can then reference in a **Tileset** where you mix and match with other layers.
-that you can then reference in a **Tileset** where you mix and match with other layers.
+
+## Styles
+
+You can start from several styles supporting the OpenMapTiles vector schema.
+
+- [OSM Bright](https://github.com/openmaptiles/osm-bright-gl-style)
+- [Positron](https://github.com/openmaptiles/positron-gl-style)
+- [Dark Matter](https://github.com/openmaptiles/dark-matter-gl-style)
+- [Klokantech Basic](https://github.com/openmaptiles/klokantech-basic-gl-style)
 
 ## Layers
 
@@ -19,14 +26,14 @@ Layers can be chosen to create a **Tileset** like the `openmaptiles.yaml` tilese
 
 - [boundary](https://github.com/openmaptiles/openmaptiles/wiki/boundary)
 - [building](https://github.com/openmaptiles/openmaptiles/wiki/building)
-- [highway](https://github.com/openmaptiles/openmaptiles/wiki/highway)
+- [transportation](https://github.com/openmaptiles/openmaptiles/wiki/transportation)
-- [highway_name](https://github.com/openmaptiles/openmaptiles/wiki/highway_name)
+- [transportation_name](https://github.com/openmaptiles/openmaptiles/wiki/transportation_name)
 - [housenumber](https://github.com/openmaptiles/openmaptiles/wiki/housenumber)
 - [landcover](https://github.com/openmaptiles/openmaptiles/wiki/landcover)
 - [landuse](https://github.com/openmaptiles/openmaptiles/wiki/landuse)
 - [place](https://github.com/openmaptiles/openmaptiles/wiki/place)
 - [poi](https://github.com/openmaptiles/openmaptiles/wiki/poi)
-- [railway](https://github.com/openmaptiles/openmaptiles/wiki/railway)
+- [park](https://github.com/openmaptiles/openmaptiles/wiki/park)
 - [water](https://github.com/openmaptiles/openmaptiles/wiki/water)
 - [water_name](https://github.com/openmaptiles/openmaptiles/wiki/water_name)
 - [waterway](https://github.com/openmaptiles/openmaptiles/wiki/waterway)

docker-compose.yml

@@ -10,17 +10,17 @@ services:
      - "5432"
     env_file: .env
   import-natural-earth:
-    image: "openmaptiles/import-natural-earth"
+    image: "openmaptiles/import-natural-earth:1.0"
     env_file: .env
     links:
     - postgres
   import-water:
-    image: "openmaptiles/import-water"
+    image: "openmaptiles/import-water:0.2"
     env_file: .env
     links:
     - postgres
   import-lakelines:
-    image: "openmaptiles/import-lakelines"
+    image: "openmaptiles/import-lakelines:0.9"
     env_file: .env
     links:
     - postgres

layers/boundary/boundary.sql

@@ -56,6 +56,18 @@ CREATE OR REPLACE VIEW boundary_z5 AS (
     WHERE scalerank <= 7 AND featurecla = 'Adm-1 boundary'
 );
 
+-- etldoc: ne_10m_admin_0_boundary_lines_land -> boundary_z6
+-- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z6
+
+CREATE OR REPLACE VIEW boundary_z6 AS (
+    SELECT geom, 2 AS admin_level
+    FROM ne_10m_admin_0_boundary_lines_land
+    UNION ALL
+    SELECT geom, 4 AS admin_level
+    FROM ne_10m_admin_1_states_provinces_lines_shp
+    WHERE scalerank <= 9 AND featurecla = 'Adm-1 boundary'
+);
+
 -- etldoc: ne_10m_admin_0_boundary_lines_land -> boundary_z7
 -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z7
 CREATE OR REPLACE VIEW boundary_z7 AS (
@@ -103,7 +115,7 @@ CREATE OR REPLACE VIEW boundary_z12 AS (
 );
 
 -- etldoc: layer_boundary[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="<sql> layer_boundary |<z0> z0 |<z1_2> z1_2 | <z3> z3 | <z4> z4 |<z5_6> z5_6 | <z7> z7 | <z8> z8 | <z9> z9    |<z10> z10 |<z11> z11 |<z12> z12|<z13_> z13_ " ] 
+-- etldoc:     label="<sql> layer_boundary |<z0> z0 |<z1_2> z1_2 | <z3> z3 | <z4> z4 | <z5> z5 || <z6> z6 || <z7> z7 | <z8> z8 | <z9> z9    |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13+"]
 
 CREATE OR REPLACE FUNCTION layer_boundary (bbox geometry, zoom_level int)
 RETURNS TABLE(geometry geometry, admin_level int) AS $$
@@ -120,8 +132,11 @@ RETURNS TABLE(geometry geometry, admin_level int) AS $$
         -- etldoc: boundary_z4 ->  layer_boundary:z4
         SELECT * FROM boundary_z4 WHERE geom && bbox AND zoom_level = 4
         UNION ALL
-        -- etldoc: boundary_z5 ->  layer_boundary:z5_6
+        -- etldoc: boundary_z5 ->  layer_boundary:z5
-        SELECT * FROM boundary_z5 WHERE geom && bbox AND zoom_level BETWEEN 5 AND 6
+        SELECT * FROM boundary_z5 WHERE geom && bbox AND zoom_level = 5
+        UNION ALL
+        -- etldoc: boundary_z6 ->  layer_boundary:z6
+        SELECT * FROM boundary_z6 WHERE geom && bbox AND zoom_level = 6
         UNION ALL
         -- etldoc: boundary_z7 ->  layer_boundary:z7
         SELECT * FROM boundary_z7 WHERE geom && bbox AND zoom_level = 7
@@ -141,7 +156,7 @@ RETURNS TABLE(geometry geometry, admin_level int) AS $$
         -- etldoc: boundary_z12 ->  layer_boundary:z12
         SELECT * FROM boundary_z12 WHERE geom && bbox AND zoom_level = 12
         UNION ALL
-        -- etldoc: boundary_z12 -> layer_boundary:z13_
+        -- etldoc: boundary_z12 -> layer_boundary:z13
         SELECT * FROM boundary_z12 WHERE geom && bbox AND zoom_level >= 13
     ) AS zoom_levels;
 $$ LANGUAGE SQL IMMUTABLE;

layers/building/building.sql

@@ -1,22 +1,23 @@
-
-
-
 -- etldoc: layer_building[shape=record fillcolor=lightpink, style="rounded,filled",
 -- etldoc:     label="layer_building | <z13> z13 | <z14_> z14_ " ] ;
 
 CREATE OR REPLACE FUNCTION layer_building(bbox geometry, zoom_level int)
 RETURNS TABLE(geom geometry, osm_id bigint, render_height int, render_min_height int) AS $$
-    SELECT geometry, osm_id,
+    SELECT geometry, osm_id, render_height, render_min_height
-    greatest(5, COALESCE(height, levels*3.66,5))::int AS render_height,
-    greatest(0, COALESCE(min_height, min_level*3.66,0))::int AS render_min_height
     FROM (
-
         -- etldoc: osm_building_polygon_gen1 -> layer_building:z13
-        SELECT osm_id, geometry, height, levels, min_height, min_level FROM osm_building_polygon_gen1
+        SELECT
+            osm_id, geometry,
+            NULL::int AS render_height, NULL::int AS render_min_height
+        FROM osm_building_polygon_gen1
         WHERE zoom_level = 13 AND geometry && bbox AND area > 1400
         UNION ALL
         -- etldoc: osm_building_polygon -> layer_building:z14_
-        SELECT osm_id, geometry, height, levels, min_height, min_level FROM osm_building_polygon
+        SELECT
+            osm_id, geometry,
+            greatest(5, COALESCE(height, levels*3.66,5))::int AS render_height,
+            greatest(0, COALESCE(min_height, min_level*3.66,0))::int AS render_min_height
+        FROM osm_building_polygon
         WHERE zoom_level >= 14 AND geometry && bbox
     ) AS zoom_levels
     ORDER BY render_height ASC, ST_YMin(geometry) DESC;

layers/landcover/landcover.sql

@@ -9,12 +9,12 @@
 --);
 --CREATE INDEX IF NOT EXISTS landcover_grouped_gen2_geometry_idx ON landcover_grouped_gen2 USING gist(geometry);
 
-CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, wetland VARCHAR) RETURNS TEXT AS $$
+CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, leisure VARCHAR, wetland VARCHAR) RETURNS TEXT AS $$
     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"='grassland' OR landuse IN ('grass', 'meadow', 'village_green', 'allotments', 'park', 'recreation_ground', 'grassland') THEN 'grass'
+         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;
@@ -22,70 +22,73 @@ $$ LANGUAGE SQL IMMUTABLE;
 
 -- etldoc: ne_110m_glaciated_areas ->  landcover_z0 
 CREATE OR REPLACE VIEW landcover_z0 AS (
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS wetland FROM ne_110m_glaciated_areas
+    SELECT NULL::bigint AS osm_id, geom AS 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 
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS wetland FROM ne_50m_glaciated_areas
+    SELECT NULL::bigint AS osm_id, geom AS 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     
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS wetland FROM ne_50m_antarctic_ice_shelves_polys
+    SELECT NULL::bigint AS osm_id, geom AS 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
 );
 
 CREATE OR REPLACE VIEW landcover_z5 AS (
     -- etldoc: ne_10m_glaciated_areas ->  landcover_z5
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS wetland FROM ne_10m_glaciated_areas
+    SELECT NULL::bigint AS osm_id, geom AS 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 
-    SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS wetland FROM ne_10m_antarctic_ice_shelves_polys
+    SELECT NULL::bigint AS osm_id, geom AS 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_gen5 ->  landcover_z8  
+    -- etldoc: osm_landcover_polygon_gen6 ->  landcover_z8  
-    SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen5
+    SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen6
 );
 
 CREATE OR REPLACE VIEW landcover_z9 AS (
-    -- etldoc: osm_landcover_polygon_gen4 ->  landcover_z9    
+    -- etldoc: osm_landcover_polygon_gen5 ->  landcover_z9    
-    SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen4
+    SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen5
 );
 
 CREATE OR REPLACE VIEW landcover_z10 AS (
-    -- etldoc: osm_landcover_polygon_gen3 ->  landcover_z10    
+    -- etldoc: osm_landcover_polygon_gen4 ->  landcover_z10    
-    SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen3
+    SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen4
 );
 
 CREATE OR REPLACE VIEW landcover_z11 AS (
-    -- etldoc: osm_landcover_polygon_gen2 ->  landcover_z11    
+    -- etldoc: osm_landcover_polygon_gen3 ->  landcover_z11    
-    SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen2
+    SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen3
 );
 
 CREATE OR REPLACE VIEW landcover_z12 AS (
-    -- etldoc: osm_landcover_polygon_gen1 ->  landcover_z12    
+    -- etldoc: osm_landcover_polygon_gen2 ->  landcover_z12    
-    SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen1
+    SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen2
 );
 
 CREATE OR REPLACE VIEW landcover_z13 AS (
-    -- etldoc: osm_landcover_polygon ->  landcover_z13
+    -- etldoc: osm_landcover_polygon_gen1 ->  landcover_z13
-    SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon WHERE ST_Area(geometry) > 60000
+    SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen1
 );
 
 CREATE OR REPLACE VIEW landcover_z14 AS (
     -- etldoc: osm_landcover_polygon ->  landcover_z14    
-    SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon
+    SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon
 );
 
 -- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled",  
--- etldoc:     label="layer_landcover | <z0> z0  | <z2_4> z2_4  | <z5_7> z5_7 | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
+-- 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)
 RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
     SELECT osm_id, geometry,
-        landcover_class(landuse, "natural", wetland) AS class,
+        landcover_class(landuse, "natural", leisure, wetland) AS class,
-        COALESCE(NULLIF("natural", ''), NULLIF(landuse, ''), NULLIF('wetland', '')) AS subclass
+        COALESCE(
+            NULLIF("natural", ''), NULLIF(landuse, ''),
+            NULLIF(leisure, ''), NULLIF(wetland, '')
+        ) AS subclass
         FROM (
-        -- etldoc:  landcover_z0 -> layer_landcover:z0
+        -- etldoc:  landcover_z0 -> layer_landcover:z0_1
         SELECT * FROM landcover_z0
         WHERE zoom_level BETWEEN 0 AND 1 AND geometry && bbox
         UNION ALL
@@ -98,31 +101,31 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
         WHERE zoom_level BETWEEN 5 AND 7 AND geometry && bbox
         UNION ALL
         -- etldoc:  landcover_z8 -> layer_landcover:z8
-        SELECT osm_id, geometry, landuse, "natural", wetland
+        SELECT *
         FROM landcover_z8 WHERE zoom_level = 8 AND geometry && bbox
         UNION ALL
         -- etldoc:  landcover_z9 -> layer_landcover:z9        
-        SELECT osm_id, geometry, landuse, "natural", wetland
+        SELECT *
         FROM landcover_z9 WHERE zoom_level = 9 AND geometry && bbox
         UNION ALL
         -- etldoc:  landcover_z10 -> layer_landcover:z10
-        SELECT osm_id, geometry, landuse, "natural", wetland
+        SELECT *
         FROM landcover_z10 WHERE zoom_level = 10 AND geometry && bbox
         UNION ALL
         -- etldoc:  landcover_z11 -> layer_landcover:z11        
-        SELECT osm_id, geometry, landuse, "natural", wetland
+        SELECT *
         FROM landcover_z11 WHERE zoom_level = 11 AND geometry && bbox
         UNION ALL
         -- etldoc:  landcover_z12 -> layer_landcover:z12        
-        SELECT osm_id, geometry, landuse, "natural", wetland
+        SELECT *
         FROM landcover_z12 WHERE zoom_level = 12 AND geometry && bbox
         UNION ALL
         -- etldoc:  landcover_z13 -> layer_landcover:z13        
-        SELECT osm_id, ST_Simplify(geometry, 10) AS geometry, landuse, "natural", wetland
+        SELECT *
         FROM landcover_z13 WHERE zoom_level = 13 AND geometry && bbox
         UNION ALL
         -- etldoc:  landcover_z14 -> layer_landcover:z14_        
-        SELECT osm_id, geometry, landuse, "natural", wetland
+        SELECT *
         FROM landcover_z14 WHERE zoom_level >= 14 AND geometry && bbox
     ) AS zoom_levels;
 $$ LANGUAGE SQL IMMUTABLE;

layers/landcover/landcover.yaml

@@ -2,16 +2,52 @@ layer:
   id: "landcover"
   description: |
       Landcover is used to describe the physical material at the surface of the earth. At lower zoom levels this is
-      from Natural Earth data for glaciers and ice shelves and at higher zoom levels the landcover is implied
+      from Natural Earth data for glaciers and ice shelves and at higher zoom levels the [landcover is [implied by OSM tags](http://wiki.openstreetmap.org/wiki/Landcover). The most common use case for this layer
-      by OSM tags (like `landuse` or `natural`).
+        is to style wood (`class=wood`) and grass (`class=`grass`) areas.
   buffer_size: 4
   fields:
-    class: |
+    class:
-        More generalized groups of either `farmland`, `ice`, `wood`, `grass` or `wetland`.
+      description: |
-        Use this to assign general colors to the landcover.
+          Use the **class** to assign natural colors for **landcover**.
-    subclass: |
+      values:
-        Original value of either the `landuse`, `natural` or `wetland` tag.
+      - farmland
-        Use this to do more precise styling.
+      - ice
+      - wood
+      - grass
+      - wetland
+    subclass:
+      description: |
+          Use **subclass** to do more precise styling.
+          Original value of either the
+          [`natural`](http://wiki.openstreetmap.org/wiki/Key:natural),
+          [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse),
+          ,[`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure),
+          or [`wetland`](http://wiki.openstreetmap.org/wiki/Key:wetland) tag.
+      values:
+      - allotments
+      - farm
+      - farmland
+      - orchard
+      - plant_nursery
+      - vineyard
+      - grass
+      - grassland
+      - meadow
+      - forest
+      - village_green
+      - recreation_ground
+      - park
+      - wetland
+      - grassland
+      - bog
+      - swamp
+      - wet_meadow
+      - marsh
+      - reedbed
+      - saltern
+      - tidalflat
+      - saltmarsh
+      - mangrove
   datasource:
     geometry_field: geometry
     query: (SELECT geometry, class, subclass FROM layer_landcover(!bbox!, z(!scale_denominator!))) AS t

layers/landcover/mapping.yaml

@@ -1,37 +1,43 @@
+
 generalized_tables:
 
+  # etldoc: imposm3 -> osm_landcover_polygon_gen6
+  landcover_polygon_gen6:
+    source: landcover_polygon_gen5
+    sql_filter: area>15000000
+    tolerance: 300.0
+
   # etldoc: imposm3 -> osm_landcover_polygon_gen5
   landcover_polygon_gen5:
     source: landcover_polygon_gen4
-    sql_filter: area>15000000
+    sql_filter: area>4200000
-    tolerance: 300.0
+    tolerance: 200.0
 
   # etldoc: imposm3 -> osm_landcover_polygon_gen4
   landcover_polygon_gen4:
     source: landcover_polygon_gen3
-    sql_filter: area>4200000
+    sql_filter: area>1200000
-    tolerance: 200.0
+    tolerance: 120.0
 
   # etldoc: imposm3 -> osm_landcover_polygon_gen3
   landcover_polygon_gen3:
     source: landcover_polygon_gen2
-    sql_filter: area>1200000
+    sql_filter: area>480000
-    tolerance: 120.0
+    tolerance: 80.0
 
   # etldoc: imposm3 -> osm_landcover_polygon_gen2
   landcover_polygon_gen2:
     source: landcover_polygon_gen1
-    sql_filter: area>480000
+    sql_filter: area>240000
-    tolerance: 80.0
+    tolerance: 50.0
 
   # etldoc: imposm3 -> osm_landcover_polygon_gen1
   landcover_polygon_gen1:
     source: landcover_polygon
-    sql_filter: area>240000
+    sql_filter: area>60000
-    tolerance: 50.0
+    tolerance: 20.0
 
 tables:
-  
   # etldoc: imposm3 -> osm_landcover_polygon
   landcover_polygon:
     fields:
@@ -42,6 +48,9 @@ tables:
     - name: landuse
       key: landuse
       type: string
+    - name: leisure
+      key: leisure
+      type: string
     - name: natural
       key: natural
       type: string
@@ -61,13 +70,16 @@ tables:
       - grass
       - grassland
       - meadow
-      - park
+      - forest
       - village_green
       - recreation_ground
-      - forest
+      # There are 600 parks tagged with landuse=park instead of leisure=park
+      - park
       natural:
       - wetland
       - grassland
+      leisure:
+      - park
       wetland:
       - bog
       - swamp

layers/landuse/landuse.sql

@@ -1,76 +1,70 @@
-
-CREATE OR REPLACE FUNCTION landuse_class(landuse TEXT, amenity TEXT, leisure TEXT, boundary TEXT) RETURNS TEXT AS $$
-    SELECT CASE
-         WHEN leisure IN ('nature_reserve', 'park') OR boundary='national_park' THEN 'park'
-         WHEN amenity IN ('school', 'university', 'kindergarten', 'college', 'library') THEN 'school'
-         WHEN landuse IN('hospital', 'railway', 'cemetery', 'military', 'residential') THEN landuse
-         ELSE NULL
-	 END;
-$$ LANGUAGE SQL IMMUTABLE;
-
 -- etldoc: ne_50m_urban_areas -> landuse_z4
 CREATE OR REPLACE VIEW landuse_z4 AS (
-    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS boundary, scalerank
+    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
     FROM ne_50m_urban_areas
     WHERE scalerank <= 2
 );
 
 -- etldoc: ne_50m_urban_areas -> landuse_z5
 CREATE OR REPLACE VIEW landuse_z5 AS (
-    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS boundary, scalerank
+    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
     FROM ne_50m_urban_areas
 );
 
 -- etldoc: ne_10m_urban_areas -> landuse_z6
 CREATE OR REPLACE VIEW landuse_z6 AS (
-    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS boundary, scalerank
+    SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank
     FROM ne_10m_urban_areas
 );
 
--- etldoc: osm_landuse_polygon_gen5 -> landuse_z8
+-- etldoc: osm_landuse_polygon_gen4 -> landuse_z10
-CREATE OR REPLACE VIEW landuse_z8 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen5
-);
-
--- etldoc: osm_landuse_polygon_gen4 -> landuse_z9
 CREATE OR REPLACE VIEW landuse_z9 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen4
+    SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
+    FROM osm_landuse_polygon_gen4
 );
 
 -- etldoc: osm_landuse_polygon_gen3 -> landuse_z10
 CREATE OR REPLACE VIEW landuse_z10 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen3
+    SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
+    FROM osm_landuse_polygon_gen3
 );
 
 -- etldoc: osm_landuse_polygon_gen2 -> landuse_z11
 CREATE OR REPLACE VIEW landuse_z11 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen2
+    SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
+    FROM osm_landuse_polygon_gen2
 );
 
 -- etldoc: osm_landuse_polygon_gen1 -> landuse_z12
 CREATE OR REPLACE VIEW landuse_z12 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen1
+    SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
+    FROM osm_landuse_polygon_gen1
 );
 
 -- etldoc: osm_landuse_polygon -> landuse_z13
 CREATE OR REPLACE VIEW landuse_z13 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon
+    SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
-    WHERE ST_Area(geometry) > 60000
+    FROM osm_landuse_polygon
+    WHERE ST_Area(geometry) > 20000
 );
 
 -- etldoc: osm_landuse_polygon -> landuse_z14
 CREATE OR REPLACE VIEW landuse_z14 AS (
-    SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon
+    SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
+    FROM osm_landuse_polygon
 );
 
 -- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_landuse |<z4> z4|<z5>z5|<z6>z6|<z7>z7| <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
+-- etldoc:     label="layer_landuse |<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_landuse(bbox geometry, zoom_level int)
-RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
+RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$
     SELECT osm_id, geometry,
-        landuse_class(landuse, amenity, leisure, boundary) AS class,
+        COALESCE(
-        COALESCE(NULLIF(landuse, ''), NULLIF(amenity, ''), NULLIF(leisure, ''), NULLIF(boundary, '')) AS subclass
+            NULLIF(landuse, ''),
+            NULLIF(amenity, ''),
+            NULLIF(leisure, '')
+        ) AS class
         FROM (
         -- etldoc: landuse_z4 -> layer_landuse:z4
         SELECT * FROM landuse_z4
@@ -83,13 +77,8 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
         -- etldoc: landuse_z6 -> layer_landuse:z6
         -- etldoc: landuse_z6 -> layer_landuse:z7
         -- etldoc: landuse_z6 -> layer_landuse:z8
-        -- etldoc: landuse_z6 -> layer_landuse:z9
-        -- etldoc: landuse_z6 -> layer_landuse:z10                       
         SELECT * FROM landuse_z6
-        WHERE zoom_level BETWEEN 6 AND 10 AND scalerank-1 <= zoom_level
+        WHERE zoom_level BETWEEN 6 AND 8 AND scalerank-1 <= zoom_level
-        UNION ALL
-        -- etldoc: landuse_z8 -> layer_landuse:z8
-        SELECT * FROM landuse_z8 WHERE zoom_level = 8
         UNION ALL
         -- etldoc: landuse_z9 -> layer_landuse:z9
         SELECT * FROM landuse_z9 WHERE zoom_level = 9
@@ -106,7 +95,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$
         -- etldoc: landuse_z13 -> layer_landuse:z13
         SELECT * FROM landuse_z13 WHERE zoom_level = 13
         UNION ALL
-        -- etldoc: landuse_z14 -> layer_landuse:z14_        
+        -- etldoc: landuse_z14 -> layer_landuse:z14
         SELECT * FROM landuse_z14 WHERE zoom_level >= 14
     ) AS zoom_levels
     WHERE geometry && bbox;

layers/landuse/landuse.yaml

@@ -5,15 +5,31 @@ layer:
       from Natural Earth data for residential (urban) areas and at higher zoom levels mostly OSM `landuse` tags.
   buffer_size: 4
   fields:
-    class: |
+    class:
-        More generalized groups of either `park`, `school`, `hospital`, `railway`,
+      description: |
-        `cemetery`, `military`, `residential`. Use this to assign general for landuse.
+          Use the **class** to assign special colors to areas.
-    subclass: |
+          Original value of either the
-        Original value of either the `amenity`, `landuse`, `leisure` or `boundary` tag.
+          [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity),
-        Use this to do more precise styling.
+          [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse),
+          or [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure) tag.
+      values:
+      - school
+      - university
+      - kindergarten
+      - college
+      - library
+      - hospital
+      - railway
+      - cemetery
+      - military
+      - residential
+      - commercial
+      - industrial
+      - retail
+      - stadium
   datasource:
     geometry_field: geometry
-    query: (SELECT geometry, class, subclass FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, class FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t
 schema:
   - ./landuse.sql
 datasources:

layers/landuse/mapping.yaml

@@ -1,37 +1,26 @@
 generalized_tables:
-
-  # etldoc: imposm3 -> osm_landuse_polygon_gen5
-  landuse_polygon_gen5:
-    source: landuse_polygon_gen4
-    sql_filter: area>15000000
-    tolerance: 300.0
-
   # etldoc: imposm3 -> osm_landuse_polygon_gen4
   landuse_polygon_gen4:
     source: landuse_polygon_gen3
-    sql_filter: area>4200000
+    sql_filter: area>2000000
-    tolerance: 200.0
+    tolerance: 160.0
-
   # etldoc: imposm3 -> osm_landuse_polygon_gen3
   landuse_polygon_gen3:
     source: landuse_polygon_gen2
-    sql_filter: area>1200000
+    sql_filter: area>960000
-    tolerance: 120.0
+    tolerance: 80.0
-
   # etldoc: imposm3 -> osm_landuse_polygon_gen2
   landuse_polygon_gen2:
     source: landuse_polygon_gen1
-    sql_filter: area>480000
+    sql_filter: area>240000
-    tolerance: 80.0
+    tolerance: 40.0
-
   # etldoc: imposm3 -> osm_landuse_polygon_gen1
   landuse_polygon_gen1:
     source: landuse_polygon
-    sql_filter: area>240000
+    sql_filter: area>60000
-    tolerance: 50.0
+    tolerance: 20.0
 
 tables:
-
   # etldoc: imposm3 -> osm_landuse_polygon
   landuse_polygon:
     type: polygon
@@ -49,9 +38,6 @@ tables:
     - name: leisure
       key: leisure
       type: string
-    - name: boundary
-      key: boundary
-      type: string
     - name: area
       type: pseudoarea
     mapping:
@@ -66,8 +52,10 @@ tables:
       - railway
       - cemetery
       - military
+      # zoning
+      - residential
+      - commercial
+      - industrial
+      - retail
       leisure:
-      - nature_reserve
+      - stadium
-      - park
-      boundary:
-      - national_park

layers/park/layer.sql

@@ -0,0 +1,55 @@
+-- etldoc: layer_park[shape=record fillcolor=lightpink, style="rounded,filled",
+-- etldoc:     label="layer_park |<z6> z6 |<z7> z7 |<z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14> z14+" ] ;
+
+CREATE OR REPLACE FUNCTION layer_park(bbox geometry, zoom_level int)
+RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$
+    SELECT osm_id, geometry,
+        COALESCE(NULLIF(leisure, ''), NULLIF(boundary, '')) AS class
+        FROM (
+        -- etldoc: osm_park_polygon_gen8 -> layer_park:z6
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon_gen8
+        WHERE zoom_level = 6
+        UNION ALL
+        -- etldoc: osm_park_polygon_gen7 -> layer_park:z7
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon_gen7
+        WHERE zoom_level = 7
+        UNION ALL
+        -- etldoc: osm_park_polygon_gen6 -> layer_park:z8
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon_gen6
+        WHERE zoom_level = 8
+        UNION ALL
+        -- etldoc: osm_park_polygon_gen5 -> layer_park:z9
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon_gen5
+        WHERE zoom_level = 9
+        UNION ALL
+        -- etldoc: osm_park_polygon_gen4 -> layer_park:z10
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon_gen4
+        WHERE zoom_level = 10
+        UNION ALL
+        -- etldoc: osm_park_polygon_gen3 -> layer_park:z11
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon_gen3
+        WHERE zoom_level = 11
+        UNION ALL
+        -- etldoc: osm_park_polygon_gen2 -> layer_park:z12
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon_gen2
+        WHERE zoom_level = 12
+        UNION ALL
+        -- etldoc: osm_park_polygon_gen1 -> layer_park:z13
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon_gen1
+        WHERE zoom_level = 13
+        UNION ALL
+        -- etldoc: osm_park_polygon -> layer_park:z14
+        SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
+        FROM osm_park_polygon
+        WHERE zoom_level >= 14
+    ) AS zoom_levels
+    WHERE geometry && bbox;
+$$ LANGUAGE SQL IMMUTABLE;

layers/park/mapping.yaml

@@ -0,0 +1,75 @@
+generalized_tables:
+  # etldoc: imposm3 -> osm_park_polygon_gen8
+  park_polygon_gen8:
+    source: park_polygon_gen6
+    sql_filter: area>240000000
+    tolerance: 600.0
+
+  # etldoc: imposm3 -> osm_park_polygon_gen7
+  park_polygon_gen7:
+    source: park_polygon_gen6
+    sql_filter: area>60000000
+    tolerance: 400.0
+
+  # etldoc: imposm3 -> osm_park_polygon_gen6
+  park_polygon_gen6:
+    source: park_polygon_gen5
+    sql_filter: area>15000000
+    tolerance: 300.0
+
+  # etldoc: imposm3 -> osm_park_polygon_gen5
+  park_polygon_gen5:
+    source: park_polygon_gen4
+    sql_filter: area>4200000
+    tolerance: 200.0
+
+  # etldoc: imposm3 -> osm_park_polygon_gen4
+  park_polygon_gen4:
+    source: park_polygon_gen3
+    sql_filter: area>1200000
+    tolerance: 120.0
+
+  # etldoc: imposm3 -> osm_park_polygon_gen3
+  park_polygon_gen3:
+    source: park_polygon_gen2
+    sql_filter: area>480000
+    tolerance: 80.0
+
+  # etldoc: imposm3 -> osm_park_polygon_gen2
+  park_polygon_gen2:
+    source: park_polygon_gen1
+    sql_filter: area>240000
+    tolerance: 50.0
+
+  # etldoc: imposm3 -> osm_park_polygon_gen1
+  park_polygon_gen1:
+    source: park_polygon
+    sql_filter: area>60000
+    tolerance: 20.0
+
+tables:
+
+  # etldoc: imposm3 -> osm_park_polygon
+  park_polygon:
+    type: polygon
+    fields:
+    - name: osm_id
+      type: id
+    - name: geometry
+      type: validated_geometry
+    - name: landuse
+      key: landuse
+      type: string
+    - name: leisure
+      key: leisure
+      type: string
+    - name: boundary
+      key: boundary
+      type: string
+    - name: area
+      type: pseudoarea
+    mapping:
+      leisure:
+      - nature_reserve
+      boundary:
+      - national_park

layers/park/park.yaml

@@ -0,0 +1,20 @@
+layer:
+  id: "park"
+  description: |
+      The park layer contains parks from OpenStreetMap tagged with either [`boundary=national_park`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dnational_park) or [`leisure=nature_reserve`](http://wiki.openstreetmap.org/wiki/Tag:leisure%3Dnature_reserve).
+  buffer_size: 4
+  fields:
+    class:
+      description: |
+          Use the **class** to differentiate between different parks.
+      values:
+      - national_park
+      - nature_reserve
+  datasource:
+    geometry_field: geometry
+    query: (SELECT geometry, class FROM layer_park(!bbox!, z(!scale_denominator!))) AS t
+schema:
+  - ./layer.sql
+datasources:
+  - type: imposm3
+    mapping_file: ./mapping.yaml

layers/place/city.sql

@@ -9,7 +9,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class c
     FROM osm_city_point
     WHERE geometry && bbox
       AND ((zoom_level = 2 AND "rank" = 1)
-        OR (zoom_level BETWEEN 3 AND 7 AND "rank" <= zoom_level)
+        OR (zoom_level BETWEEN 3 AND 7 AND "rank" <= zoom_level + 1)
       )
     UNION ALL
     SELECT osm_id, geometry, name,

layers/poi/layer.sql

@@ -4,11 +4,10 @@
 
 CREATE OR REPLACE FUNCTION layer_poi(bbox geometry, zoom_level integer, pixel_width numeric)
 RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text, subclass text, "rank" int) AS $$
-    SELECT osm_id, geometry, name, NULLIF(name_en, ''), poi_class(subclass) AS class, subclass,
+    SELECT osm_id, geometry, NULLIF(name, '') AS name, NULLIF(name_en, '') AS name_en, poi_class(subclass) AS class, subclass,
         row_number() OVER (
             PARTITION BY LabelGrid(geometry, 100 * pixel_width)
-            ORDER BY poi_class_rank(poi_class(subclass)) ASC,
+            ORDER BY CASE WHEN name = '' THEN 2000 ELSE poi_class_rank(poi_class(subclass)) END ASC
-                     length(name) DESC NULLS LAST
         )::int AS "rank"
     FROM (
         -- etldoc: osm_poi_point ->  layer_poi:z14

layers/water/mapping.yaml

@@ -1,22 +1,34 @@
 generalized_tables:
 
+  # etldoc: imposm3 -> osm_water_polygon_gen5
+  water_polygon_gen5:
+    source: water_polygon_gen4
+    sql_filter: area>10000000.0
+    tolerance: 320.0
+
+  # etldoc: imposm3 -> osm_water_polygon_gen4
+  water_polygon_gen4:
+    source: water_polygon_gen3
+    sql_filter: area>5000000.0
+    tolerance: 160.0
+
   # etldoc: imposm3 -> osm_water_polygon_gen3
   water_polygon_gen3:
-    source: water_polygon
+    source: water_polygon_gen2
-    sql_filter: area>15000000.0 AND waterway = ''
+    sql_filter: area>2500000.0
-    tolerance: 350.0
+    tolerance: 80.0
 
   # etldoc: imposm3 -> osm_water_polygon_gen2
   water_polygon_gen2:
-    source: water_polygon
+    source: water_polygon_gen1
-    sql_filter: area>2000000 AND waterway = ''
+    sql_filter: area>1000000
-    tolerance: 200.0
+    tolerance: 40.0
 
   # etldoc: imposm3 -> osm_water_polygon_gen1
   water_polygon_gen1:
     source: water_polygon
     sql_filter: area>500000 AND waterway = ''
-    tolerance: 100.0
+    tolerance: 20.0
 
 tables:
 

layers/water/water.sql

@@ -57,7 +57,7 @@ CREATE OR REPLACE VIEW water_z7 AS (
     SELECT geom, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
     -- etldoc:  osm_water_polygon_gen3 ->  water_z7
-    SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen3
+    SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen5
 );
 
 CREATE OR REPLACE VIEW water_z8 AS (
@@ -65,30 +65,53 @@ CREATE OR REPLACE VIEW water_z8 AS (
     SELECT geom, 'ocean'::text AS class FROM ne_10m_ocean
     UNION ALL
     -- etldoc:  osm_water_polygon_gen2 ->  water_z8         
-    SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen2
+    SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen4
 );
 
 CREATE OR REPLACE VIEW water_z9 AS (
+    -- etldoc:  osm_ocean_polygon_gen3 ->  water_z9
+    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen3
+    UNION ALL
     -- etldoc:  osm_water_polygon_gen1 ->  water_z9    
-    SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen1
+    SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen3
+);
+
+CREATE OR REPLACE VIEW water_z10 AS (
+    -- etldoc:  osm_ocean_polygon_gen2 ->  water_z10
+    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen2
+    UNION ALL
+    -- etldoc:  osm_water_polygon_gen2 ->  water_z10
+    SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen2
 );
 
 CREATE OR REPLACE VIEW water_z11 AS (
+    -- etldoc:  osm_ocean_polygon_gen1 ->  water_z11
+    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen1
+    UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z11
-    SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 40000
+    SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon_gen1 WHERE area > 40000
 );
 
 CREATE OR REPLACE VIEW water_z12 AS (
+    -- etldoc:  osm_ocean_polygon_gen1 ->  water_z12
+    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon
+    UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z12     
     SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 10000
 );
 
 CREATE OR REPLACE VIEW water_z13 AS (
+    -- etldoc:  osm_ocean_polygon ->  water_z13
+    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon
+    UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z13    
     SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 5000
 );
 
 CREATE OR REPLACE VIEW water_z14 AS (
+    -- etldoc:  osm_ocean_polygon ->  water_z14
+    SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon
+    UNION ALL
     -- etldoc:  osm_water_polygon ->  water_z14    
     SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon
 );
@@ -125,8 +148,10 @@ RETURNS TABLE(geom geometry, class text) AS $$
         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_z9 ->  layer_water:z10                   
-        SELECT * FROM water_z9 WHERE zoom_level BETWEEN 9 AND 10
+        SELECT * FROM water_z9 WHERE zoom_level = 10
         UNION ALL
         -- etldoc: water_z11 ->  layer_water:z11        
         SELECT * FROM water_z11 WHERE zoom_level = 11

layers/water_name/layer.sql

@@ -5,12 +5,18 @@
 CREATE OR REPLACE FUNCTION layer_water_name(bbox geometry, zoom_level integer)
 RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text) AS $$
     -- etldoc: osm_water_lakeline ->  layer_water_name:z9_13
-    -- etldoc: osm_water_lakeline ->  layer_water_name:z14_    
+    -- etldoc: osm_water_lakeline ->  layer_water_name:z14
     SELECT osm_id, geometry, name, name_en, 'lake'::text AS class
     FROM osm_water_lakeline
     WHERE geometry && bbox
-      AND name <> ''
       AND ((zoom_level BETWEEN 9 AND 13 AND LineLabel(zoom_level, NULLIF(name, ''), geometry))
         OR (zoom_level >= 14))
-    ORDER BY ST_Length(geometry) DESC;
+    -- etldoc: osm_water_point ->  layer_water_name:z9_13
+    UNION ALL
+    SELECT osm_id, geometry, name, name_en, 'lake'::text AS class
+    FROM osm_water_point
+    WHERE geometry && bbox AND (
+        (zoom_level BETWEEN 9 AND 13 AND area > 70000*2^(20-zoom_level))
+        OR (zoom_level >= 14)
+    );
 $$ LANGUAGE SQL IMMUTABLE;

layers/water_name/water_lakeline.sql

@@ -1,11 +1,12 @@
-
 -- etldoc:  osm_water_polygon ->  osm_water_lakeline
+-- etldoc:  custom_lakeline   ->  osm_water_lakeline
 CREATE TABLE IF NOT EXISTS osm_water_lakeline AS (
 	SELECT wp.osm_id,
 		ll.wkb_geometry AS geometry,
-		name, name_en
+		name, name_en, ST_Area(wp.geometry) AS area
     FROM osm_water_polygon AS wp
     INNER JOIN lake_centerline ll ON wp.osm_id = ll.osm_id
+    WHERE wp.name <> ''
 );
 
 CREATE INDEX IF NOT EXISTS osm_water_lakeline_geometry_idx ON osm_water_lakeline USING gist(geometry);

layers/water_name/water_name.yaml

@@ -16,7 +16,8 @@ layer:
     srid: 900913
     query: (SELECT geometry, name, name_en, class FROM layer_water_name(!bbox!, z(!scale_denominator!))) AS t
 schema:
-  - ./merge_lakelines.sql
+  - ./water_lakeline.sql
+  - ./water_point.sql
   - ./layer.sql
 datasources:
   - type: imposm3

layers/water_name/water_point.sql

@@ -0,0 +1,11 @@
+-- etldoc:  osm_water_polygon ->  osm_water_lakeline
+CREATE TABLE IF NOT EXISTS osm_water_point AS (
+    SELECT
+        wp.osm_id, topoint(wp.geometry) AS geometry,
+        wp.name, wp.name_en, ST_Area(wp.geometry) AS area
+    FROM osm_water_polygon AS wp
+    LEFT JOIN lake_centerline ll ON wp.osm_id = ll.osm_id
+    WHERE ll.osm_id IS NULL AND wp.name <> ''
+);
+
+CREATE INDEX IF NOT EXISTS osm_water_point_geometry_idx ON osm_water_point USING gist (geometry);

layers/waterway/mapping.yaml

@@ -1,14 +1,19 @@
 generalized_tables:
-  # etldoc: imposm3 -> osm_waterway_linestring_gen0 
+  # etldoc: imposm3 -> osm_waterway_linestring_gen3
-  waterway_linestring_gen0:
+  waterway_linestring_gen3:
-    source: waterway_linestring_gen1
+    source: waterway_linestring_gen2
-    sql_filter: waterway IN ('river') AND ST_Length(geometry) > 10000
+    sql_filter: waterway IN ('river')
     tolerance: 200.0
+  # etldoc: imposm3 -> osm_waterway_linestring_gen2
+  waterway_linestring_gen2:
+    source: waterway_linestring_gen1
+    sql_filter: waterway IN ('river')
+    tolerance: 100.0
   # etldoc: imposm3 -> osm_waterway_linestring_gen1
   waterway_linestring_gen1:
     source: waterway_linestring
-    sql_filter: waterway IN ('river') AND ST_Length(geometry) > 5000
+    sql_filter: waterway IN ('river')
-    tolerance: 100.0
+    tolerance: 50.0
 tables:
   # etldoc: imposm3 -> osm_waterway_linestring
   waterway_linestring:

layers/waterway/merge_waterway.sql

@@ -0,0 +1,44 @@
+-- We merge the waterways by name like the highways
+-- This helps to drop not important rivers (since they do not have a name)
+-- and also makes it possible to filter out too short rivers
+
+-- etldoc: osm_waterway_linestring ->  osm_important_waterway_linestring
+CREATE TABLE IF NOT EXISTS osm_important_waterway_linestring AS (
+    SELECT
+        (ST_Dump(geometry)).geom AS geometry,
+        name
+    FROM (
+        SELECT
+            ST_LineMerge(ST_Union(geometry)) AS geometry,
+            name
+        FROM osm_waterway_linestring
+        WHERE name <> '' AND waterway = 'river'
+        GROUP BY name
+    ) AS waterway_union
+);
+
+CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_geometry_idx ON osm_important_waterway_linestring USING gist(geometry);
+
+-- etldoc: osm_important_waterway_linestring -> osm_important_waterway_linestring_gen1
+CREATE TABLE IF NOT EXISTS osm_important_waterway_linestring_gen1 AS (
+    SELECT ST_Simplify(geometry, 60) AS geometry, name
+    FROM osm_important_waterway_linestring
+    WHERE ST_Length(geometry) > 1000
+);
+CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_gen1_geometry_idx ON osm_important_waterway_linestring_gen1 USING gist(geometry);
+
+-- etldoc: osm_important_waterway_linestring_gen1 -> osm_important_waterway_linestring_gen2
+CREATE TABLE IF NOT EXISTS osm_important_waterway_linestring_gen2 AS (
+    SELECT ST_Simplify(geometry, 100) AS geometry, name
+    FROM osm_important_waterway_linestring_gen1
+    WHERE ST_Length(geometry) > 4000
+);
+CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_gen2_geometry_idx ON osm_important_waterway_linestring_gen2 USING gist(geometry);
+
+-- etldoc: osm_important_waterway_linestring_gen2 -> osm_important_waterway_linestring_gen3
+CREATE TABLE IF NOT EXISTS osm_important_waterway_linestring_gen3 AS (
+    SELECT ST_Simplify(geometry, 200) AS geometry, name
+    FROM osm_important_waterway_linestring_gen2
+    WHERE ST_Length(geometry) > 8000
+);
+CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_gen3_geometry_idx ON osm_important_waterway_linestring_gen3 USING gist(geometry);

layers/waterway/waterway.sql

@@ -1,78 +1,74 @@
 
 -- etldoc: ne_110m_rivers_lake_centerlines ->  waterway_z3
 CREATE OR REPLACE VIEW waterway_z3 AS (
-    SELECT geom AS geometry, 'river'::text AS class FROM ne_110m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_110m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 -- etldoc: ne_50m_rivers_lake_centerlines ->  waterway_z4
 CREATE OR REPLACE VIEW waterway_z4 AS (
-    SELECT geom AS geometry, 'river'::text AS class FROM ne_50m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_50m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
 -- etldoc: ne_10m_rivers_lake_centerlines ->  waterway_z6
 CREATE OR REPLACE VIEW waterway_z6 AS (
-    SELECT geom AS geometry, 'river'::text AS class FROM ne_10m_rivers_lake_centerlines
+    SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_10m_rivers_lake_centerlines
     WHERE featurecla = 'River'
 );
 
--- etldoc: osm_waterway_linestring ->  waterway_z8
+-- etldoc: osm_waterway_linestring_gen3 ->  waterway_z9
-CREATE OR REPLACE VIEW waterway_z8 AS (
-    SELECT geometry, waterway AS class FROM osm_waterway_linestring
-    WHERE waterway IN ('river') AND ST_Length(geometry) > 10000
-);
-
--- etldoc: osm_waterway_linestring ->  waterway_z9
 CREATE OR REPLACE VIEW waterway_z9 AS (
-    SELECT geometry, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen3
-    WHERE waterway IN ('river') AND ST_Length(geometry) > 5000
 );
 
--- etldoc: osm_waterway_linestring ->  waterway_z11
+-- etldoc: osm_waterway_linestring_gen2 ->  waterway_z10
+CREATE OR REPLACE VIEW waterway_z10 AS (
+    SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen2
+);
+
+-- etldoc: osm_waterway_linestring_gen1 ->  waterway_z11
 CREATE OR REPLACE VIEW waterway_z11 AS (
-    SELECT geometry, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen1
-    WHERE waterway IN ('river') AND ST_Length(geometry) > 5000
 );
 
 -- etldoc: osm_waterway_linestring ->  waterway_z12
 CREATE OR REPLACE VIEW waterway_z12 AS (
-    SELECT geometry, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway AS class, name FROM osm_waterway_linestring
-    WHERE waterway IN ('river', 'canal') OR (waterway = 'stream' AND ST_Length(geometry) > 1000)
+    WHERE waterway IN ('river', 'canal')
 );
 
 -- etldoc: osm_waterway_linestring ->  waterway_z13
 CREATE OR REPLACE VIEW waterway_z13 AS (
-    SELECT geometry, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway::text AS class, name FROM osm_waterway_linestring
-    WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch') AND ST_Length(geometry) > 300
+    WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch')
 );
 
 -- etldoc: osm_waterway_linestring ->  waterway_z14
 CREATE OR REPLACE VIEW waterway_z14 AS (
-    SELECT geometry, waterway AS class FROM osm_waterway_linestring
+    SELECT geometry, waterway::text AS class, name FROM osm_waterway_linestring
 );
 
-
 -- etldoc: layer_waterway[shape=record fillcolor=lightpink, style="rounded,filled",
--- etldoc:     label="layer_waterway | <z3> z3 |<z4_5> z4_5 |<z6_7> z6_7 | <z8> z8 |<z9_10> z9_10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ;
+-- etldoc:     label="layer_waterway | <z3> z3 |<z4_5> z4-z5 |<z6_8> z6-8 | <z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14> z14" ];
 
 CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int)
-RETURNS TABLE(geometry geometry, class text) AS $$
+RETURNS TABLE(geometry geometry, class text, name text) AS $$
-    SELECT geometry, class FROM (
+    SELECT geometry, class, NULLIF(name, '') AS name FROM (
         -- etldoc: waterway_z3 ->  layer_waterway:z3
         SELECT * FROM waterway_z3 WHERE zoom_level = 3
         UNION ALL
         -- etldoc: waterway_z4 ->  layer_waterway:z4_5
         SELECT * FROM waterway_z4 WHERE zoom_level BETWEEN 4 AND 5
         UNION ALL
-        -- etldoc: waterway_z6 ->  layer_waterway:z6_7           
+        -- etldoc: waterway_z6 ->  layer_waterway:z6_8
-        SELECT * FROM waterway_z6 WHERE zoom_level BETWEEN 6 AND 7
+        SELECT * FROM waterway_z6 WHERE zoom_level BETWEEN 6 AND 8
         UNION ALL
-        -- etldoc: waterway_z8 ->  layer_waterway:z8           
+        -- etldoc: waterway_z9 ->  layer_waterway:z9
-        SELECT * FROM waterway_z8 WHERE zoom_level = 8
+        SELECT * FROM waterway_z9 WHERE zoom_level = 9
         UNION ALL
-        -- etldoc: waterway_z9 ->  layer_waterway:z9_10        
+        -- etldoc: waterway_z10 ->  layer_waterway:z10
-        SELECT * FROM waterway_z9 WHERE zoom_level BETWEEN 9 AND 10
+        SELECT * FROM waterway_z10 WHERE zoom_level = 10
         UNION ALL
         -- etldoc: waterway_z11 ->  layer_waterway:z11
         SELECT * FROM waterway_z11 WHERE zoom_level = 11
@@ -83,7 +79,7 @@ RETURNS TABLE(geometry geometry, class text) AS $$
         -- etldoc: waterway_z13 ->  layer_waterway:z13
         SELECT * FROM waterway_z13 WHERE zoom_level = 13
         UNION ALL
-        -- etldoc: waterway_z14 ->  layer_waterway:z14_        
+        -- etldoc: waterway_z14 ->  layer_waterway:z14
         SELECT * FROM waterway_z14 WHERE zoom_level >= 14
     ) AS zoom_levels
     WHERE geometry && bbox;

layers/waterway/waterway.yaml

@@ -1,11 +1,15 @@
 layer:
   id: "waterway"
   description: |
-      Rivers based of OpenStreetMap [waterways](http://wiki.openstreetmap.org/wiki/Waterways) for *z8* to *z14*
+      Rivers based of OpenStreetMap [waterways](http://wiki.openstreetmap.org/wiki/Waterways) for *z9* to *z14*
-      and Natural Earth rivers and lake centerlines from *z3* to *z7*.
+      and Natural Earth rivers and lake centerlines from *z3* to *z8*.
-      Too short linestrings are filtered out for some zoom levels. Waterways do no not have a `subclass`.
+      Linestrings without a name or which are too short are filtered
+      out at low zoom levels. Waterways do no not have a `subclass` field.
   buffer_size: 4
   fields:
+    name: |
+        The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway.
+        The `name` field is empty for NaturalEarth data until **z9** when OSM data is used.
     class: |
         The original value of the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag.
         Can be one of [`stream`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dstream),
@@ -15,8 +19,9 @@ layer:
         [`ditch`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dditch)`.
   datasource:
     geometry_field: geometry
-    query: (SELECT geometry, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t
+    query: (SELECT geometry, name, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t
 schema:
+  - ./merge_waterway.sql
   - ./waterway.sql
 datasources:
   - type: imposm3

openmaptiles.yaml

@@ -12,6 +12,7 @@ tileset:
     - layers/water/water.yaml
     - layers/waterway/waterway.yaml
     - layers/landcover/landcover.yaml
+    - layers/park/park.yaml
     - layers/landuse/landuse.yaml
   name: OpenMapTiles v1.0
   description: "A tileset showcasing all layers in OpenMapTiles. http://openmaptiles.org"