Merge pull request #62 from openmaptiles/feature/landuse-park-layer

Landuse, Landcover, Park Layer
2016-12-01 09:32:11 +01:00
parent b0fbdff34c 5ec4f0766b
commit d53575faa3
10 changed files with 334 additions and 139 deletions
--- a/layers/landuse/landuse.sql
+++ b/layers/landuse/landuse.sql
@@ -1,112 +1,101 @@
-
-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
-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
+-- etldoc: osm_landuse_polygon_gen4 -> landuse_z10
 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
-    WHERE ST_Area(geometry) > 60000
+    SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
+    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: 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+" ] ;

 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(NULLIF(landuse, ''), NULLIF(amenity, ''), NULLIF(leisure, ''), NULLIF(boundary, '')) AS subclass
+        COALESCE(
+            NULLIF(landuse, ''),
+            NULLIF(amenity, ''),
+            NULLIF(leisure, '')
+        ) AS class
        FROM (
        -- etldoc: landuse_z4 -> layer_landuse:z4
        SELECT * FROM landuse_z4
        WHERE zoom_level = 4
        UNION ALL
-        -- etldoc: landuse_z5 -> layer_landuse:z5        
+        -- etldoc: landuse_z5 -> layer_landuse:z5
        SELECT * FROM landuse_z5
        WHERE zoom_level = 5
        UNION ALL
        -- 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        
+        -- etldoc: landuse_z9 -> layer_landuse:z9
        SELECT * FROM landuse_z9 WHERE zoom_level = 9
        UNION ALL
-        -- etldoc: landuse_z10 -> layer_landuse:z10        
+        -- etldoc: landuse_z10 -> layer_landuse:z10
        SELECT * FROM landuse_z10 WHERE zoom_level = 10
        UNION ALL
-        -- etldoc: landuse_z11 -> layer_landuse:z11        
+        -- etldoc: landuse_z11 -> layer_landuse:z11
        SELECT * FROM landuse_z11 WHERE zoom_level = 11
        UNION ALL
-        -- etldoc: landuse_z12 -> layer_landuse:z12        
+        -- etldoc: landuse_z12 -> layer_landuse:z12
        SELECT * FROM landuse_z12 WHERE zoom_level = 12
        UNION ALL
-        -- etldoc: landuse_z13 -> layer_landuse:z13        
+        -- 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;
--- a/layers/landuse/landuse.yaml
+++ b/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: |
-        More generalized groups of either `park`, `school`, `hospital`, `railway`,
-        `cemetery`, `military`, `residential`. Use this to assign general for landuse.
-    subclass: |
-        Original value of either the `amenity`, `landuse`, `leisure` or `boundary` tag.
-        Use this to do more precise styling.
+    class:
+      description: |
+          Use the **class** to assign special colors to areas.
+          Original value of either the
+          [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity),
+          [`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:
--- a/layers/landuse/mapping.yaml
+++ b/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    
+  # etldoc: imposm3 -> osm_landuse_polygon_gen4
  landuse_polygon_gen4:
    source: landuse_polygon_gen3
-    sql_filter: area>4200000
-    tolerance: 200.0
-
-  # etldoc: imposm3 -> osm_landuse_polygon_gen3    
+    sql_filter: area>2000000
+    tolerance: 160.0
+  # etldoc: imposm3 -> osm_landuse_polygon_gen3
  landuse_polygon_gen3:
    source: landuse_polygon_gen2
-    sql_filter: area>1200000
-    tolerance: 120.0
-
-  # etldoc: imposm3 -> osm_landuse_polygon_gen2    
+    sql_filter: area>960000
+    tolerance: 80.0
+  # etldoc: imposm3 -> osm_landuse_polygon_gen2
  landuse_polygon_gen2:
    source: landuse_polygon_gen1
-    sql_filter: area>480000
-    tolerance: 80.0
-
-  # etldoc: imposm3 -> osm_landuse_polygon_gen1    
+    sql_filter: area>240000
+    tolerance: 40.0
+  # etldoc: imposm3 -> osm_landuse_polygon_gen1
  landuse_polygon_gen1:
    source: landuse_polygon
-    sql_filter: area>240000
-    tolerance: 50.0
+    sql_filter: area>60000
+    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
-      - park
-      boundary:
-      - national_park
+      - stadium