From c1b1913c7cc1c350a34c46bdb234815be95239cd Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 18:37:04 +0000 Subject: [PATCH] Fix wrong etl docs --- layers/landcover/landcover.sql | 12 ++++++------ layers/landuse/landuse.sql | 4 ++-- layers/park/layer.sql | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index 1b8810f..3683cf6 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -42,32 +42,32 @@ CREATE OR REPLACE VIEW landcover_z5 AS ( ); 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", 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", 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", 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", 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", 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", leisure, wetland FROM osm_landcover_polygon_gen1 ); diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index ca88810..48505e5 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW landuse_z6 AS ( FROM ne_10m_urban_areas ); --- etldoc: osm_landuse_polygon_gen3 -> landuse_z10 +-- etldoc: osm_landuse_polygon_gen4 -> 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 @@ -55,7 +55,7 @@ CREATE OR REPLACE VIEW landuse_z14 AS ( ); -- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11| z12| z13| z14_" ] ; +-- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11| z12| z13| z14" ] ; CREATE OR REPLACE FUNCTION layer_landuse(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ diff --git a/layers/park/layer.sql b/layers/park/layer.sql index f684b77..719b1b0 100644 --- a/layers/park/layer.sql +++ b/layers/park/layer.sql @@ -8,7 +8,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ FROM ( -- etldoc: osm_park_polygon_gen8 -> layer_park:z6 SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank - FROM osm_park_polygon_gen6 + FROM osm_park_polygon_gen8 WHERE zoom_level = 6 UNION ALL -- etldoc: osm_park_polygon_gen7 -> layer_park:z7