Merge pull request #312 from osm2vectortiles/feature/show-landuse-residential-on-lower-zoomlevel

Additional osm data (landuse={residential, commercial, retail, railway, industrial, military})

osm2vectortiles.tm2source/data.yml

@@ -29,9 +29,16 @@ Layer:
       table: |-
         (
           SELECT osm_ids2mbid(MAX(osm_id), true) AS osm_id, ST_CollectionExtract(ST_Collect(geometry), 3) AS geometry, landuse_class(type) AS class, type
-          FROM landuse_z5toz8
-          WHERE z(!scale_denominator!) BETWEEN 5 AND 8
-            AND geometry && !bbox!
+          FROM (
+            SELECT osm_id, geometry, type
+            FROM landuse_z5toz6
+            WHERE z(!scale_denominator!) BETWEEN 5 AND 6
+            UNION ALL
+            SELECT osm_id, geometry, type
+            FROM landuse_z7toz8
+            WHERE z(!scale_denominator!) BETWEEN 7 AND 8
+          ) AS landuse_z5toz8
+          WHERE geometry && !bbox!
           GROUP BY type
           UNION ALL
           SELECT osm_ids2mbid(osm_id, true) AS osm_id, geometry, landuse_class(type) AS class, type
@@ -55,7 +62,7 @@ Layer:
               SELECT osm_id, geometry, type
               FROM landuse_z13toz14
               WHERE z(!scale_denominator!) BETWEEN 13 AND 14
-            ) AS landuse
+            ) AS landuse_z9toz14
             WHERE geometry && !bbox!
         ) AS data
       type: postgis

src/import-sql/layers/landuse.sql

@@ -1,30 +1,36 @@
-CREATE OR REPLACE VIEW landuse_z5toz8 AS
+CREATE OR REPLACE VIEW landuse_z5toz6 AS
     SELECT osm_id, geometry, type
     FROM osm_landuse_polygon_gen0
     WHERE type IN ('wood', 'forest');
 
+CREATE OR REPLACE VIEW landuse_z7toz8 AS
+    SELECT osm_id, geometry, type
+    FROM osm_landuse_polygon_gen0
+    WHERE type IN ('wood', 'forest', 'residential')
+      AND st_area(geometry) > 1000000;
+
 CREATE OR REPLACE VIEW landuse_z9 AS
     SELECT *
     FROM osm_landuse_polygon_gen0
-    WHERE landuse_class(type) IN ('wood', 'grass', 'cemetery', 'park', 'school')
+    WHERE landuse_class(type) IN ('wood', 'forest', 'residential', 'grass', 'cemetery', 'park', 'school')
       AND st_area(geometry) > 500000;
 
 CREATE OR REPLACE VIEW landuse_z10 AS
     SELECT *
     FROM osm_landuse_polygon_gen0
-    WHERE landuse_class(type) IN ('wood', 'grass', 'cemetery', 'park', 'school')
+    WHERE landuse_class(type) IN ('wood', 'forest', 'residential', 'commercial', 'retail', 'railway', 'industrial', 'grass', 'cemetery', 'park', 'school')
       AND st_area(geometry) > 99000;
 
 CREATE OR REPLACE VIEW landuse_z11 AS
     SELECT *
     FROM osm_landuse_polygon_gen1
-    WHERE landuse_class(type) IN ('wood', 'grass', 'cemetery', 'park', 'school', 'hospital')
+    WHERE landuse_class(type) IN ('wood', 'forest', 'residential','commercial', 'retail', 'railway', 'industrial', 'military', 'grass', 'cemetery', 'park', 'school', 'hospital')
       AND st_area(geometry) > 50000;
 
 CREATE OR REPLACE VIEW landuse_z12 AS
     SELECT *
     FROM osm_landuse_polygon
-    WHERE landuse_class(type) IN ('wood', 'grass', 'cemetery', 'park', 'school', 'hospital')
+    WHERE landuse_class(type) IN ('wood', 'forest', 'residential', 'grass','retail', 'railway', 'industrial', 'military', 'cemetery', 'park', 'school', 'hospital')
       AND st_area(geometry) > 10000;
 
 CREATE OR REPLACE VIEW landuse_z13toz14 AS
@@ -33,7 +39,9 @@ CREATE OR REPLACE VIEW landuse_z13toz14 AS
     WHERE type NOT IN ('wetland', 'marsh', 'swamp', 'bog', 'mud', 'tidalflat', 'national_park', 'nature_reserve', 'protected_area');
 
 CREATE OR REPLACE VIEW landuse_layer AS (
-    SELECT osm_id FROM landuse_z5toz8
+    SELECT osm_id FROM landuse_z5toz6
+    UNION
+    SELECT osm_id FROM landuse_z7toz8
     UNION
     SELECT osm_id FROM landuse_z9
     UNION