Fix wrong etl docs

pull/62/head
Lukas Martinelli 2016-11-30 18:37:04 +00:00
rodzic 2514f267a9
commit c1b1913c7c
3 zmienionych plików z 9 dodań i 9 usunięć

Wyświetl plik

@ -42,32 +42,32 @@ CREATE OR REPLACE VIEW landcover_z5 AS (
); );
CREATE OR REPLACE VIEW landcover_z8 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 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen6
); );
CREATE OR REPLACE VIEW landcover_z9 AS ( 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 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen5
); );
CREATE OR REPLACE VIEW landcover_z10 AS ( 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 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen4
); );
CREATE OR REPLACE VIEW landcover_z11 AS ( 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 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen3
); );
CREATE OR REPLACE VIEW landcover_z12 AS ( 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 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen2
); );
CREATE OR REPLACE VIEW landcover_z13 AS ( 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 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen1
); );

Wyświetl plik

@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW landuse_z6 AS (
FROM ne_10m_urban_areas 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 ( CREATE OR REPLACE VIEW landuse_z9 AS (
SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank
FROM osm_landuse_polygon_gen4 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: 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: 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) CREATE OR REPLACE FUNCTION layer_landuse(bbox geometry, zoom_level int)
RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$

Wyświetl plik

@ -8,7 +8,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$
FROM ( FROM (
-- etldoc: osm_park_polygon_gen8 -> layer_park:z6 -- etldoc: osm_park_polygon_gen8 -> layer_park:z6
SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank
FROM osm_park_polygon_gen6 FROM osm_park_polygon_gen8
WHERE zoom_level = 6 WHERE zoom_level = 6
UNION ALL UNION ALL
-- etldoc: osm_park_polygon_gen7 -> layer_park:z7 -- etldoc: osm_park_polygon_gen7 -> layer_park:z7