Switch to ZRes (#214)

layers/landuse/landuse.sql

@@ -17,35 +17,34 @@ CREATE OR REPLACE VIEW landuse_z6 AS (
     FROM ne_10m_urban_areas
 );
 
--- etldoc: osm_landuse_polygon_gen4 -> landuse_z9
+-- etldoc: osm_landuse_polygon_gen5 -> landuse_z9
 CREATE OR REPLACE VIEW landuse_z9 AS (
+    SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
+    FROM osm_landuse_polygon_gen5
+);
+
+-- etldoc: osm_landuse_polygon_gen4 -> landuse_z10
+CREATE OR REPLACE VIEW landuse_z10 AS (
     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 (
+-- etldoc: osm_landuse_polygon_gen3 -> landuse_z11
+CREATE OR REPLACE VIEW landuse_z11 AS (
     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 (
+-- etldoc: osm_landuse_polygon_gen2 -> landuse_z12
+CREATE OR REPLACE VIEW landuse_z12 AS (
     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, NULL::int as scalerank
-    FROM osm_landuse_polygon_gen1
-);
-
--- etldoc: osm_landuse_polygon -> landuse_z13
+-- etldoc: osm_landuse_polygon_gen1 -> landuse_z13
 CREATE OR REPLACE VIEW landuse_z13 AS (
     SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
-    FROM osm_landuse_polygon
-    WHERE ST_Area(geometry) > 20000
+    FROM osm_landuse_polygon_gen1
 );
 
 -- etldoc: osm_landuse_polygon -> landuse_z14

layers/landuse/mapping.yaml

@@ -1,24 +1,29 @@
 generalized_tables:
+  # etldoc: imposm3 -> osm_landuse_polygon_gen5
+  landuse_polygon_gen5:
+    source: landuse_polygon_gen4
+    sql_filter: area>power(ZRES9,2)
+    tolerance: ZRES9
   # etldoc: imposm3 -> osm_landuse_polygon_gen4
   landuse_polygon_gen4:
     source: landuse_polygon_gen3
-    sql_filter: area>2000000
-    tolerance: 160.0
+    sql_filter: area>power(ZRES10,2)
+    tolerance: ZRES10
   # etldoc: imposm3 -> osm_landuse_polygon_gen3
   landuse_polygon_gen3:
     source: landuse_polygon_gen2
-    sql_filter: area>960000
-    tolerance: 80.0
+    sql_filter: area>power(ZRES11,2)
+    tolerance: ZRES11
   # etldoc: imposm3 -> osm_landuse_polygon_gen2
   landuse_polygon_gen2:
     source: landuse_polygon_gen1
-    sql_filter: area>240000
-    tolerance: 40.0
+    sql_filter: area>power(ZRES12,2)
+    tolerance: ZRES12
   # etldoc: imposm3 -> osm_landuse_polygon_gen1
   landuse_polygon_gen1:
     source: landuse_polygon
-    sql_filter: area>60000
-    tolerance: 20.0
+    sql_filter: area>power(ZRES13,2)
+    tolerance: ZRES13
 
 tables:
   # etldoc: imposm3 -> osm_landuse_polygon