diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 9fe3de6..ca88810 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -17,6 +17,12 @@ CREATE OR REPLACE VIEW landuse_z6 AS ( FROM ne_10m_urban_areas ); +-- etldoc: osm_landuse_polygon_gen3 -> landuse_z10 +CREATE OR REPLACE VIEW landuse_z9 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 ( SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank @@ -71,9 +77,11 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class 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 SELECT * FROM landuse_z6 - WHERE zoom_level BETWEEN 6 AND 9 AND scalerank-1 <= zoom_level + WHERE zoom_level BETWEEN 6 AND 8 AND scalerank-1 <= zoom_level + UNION ALL + -- etldoc: landuse_z9 -> layer_landuse:z9 + SELECT * FROM landuse_z9 WHERE zoom_level = 9 UNION ALL -- etldoc: landuse_z10 -> layer_landuse:z10 SELECT * FROM landuse_z10 WHERE zoom_level = 10 diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml index c3c1d57..3773a38 100644 --- a/layers/landuse/mapping.yaml +++ b/layers/landuse/mapping.yaml @@ -1,9 +1,14 @@ generalized_tables: + # etldoc: imposm3 -> osm_landuse_polygon_gen4 + landuse_polygon_gen4: + source: 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>960000 - tolerance: 160.0 + tolerance: 80.0 # etldoc: imposm3 -> osm_landuse_polygon_gen2 landuse_polygon_gen2: source: landuse_polygon_gen1