From f5ac3def5ef77f69fc1e3813e84628bfceeea779 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Sun, 4 Dec 2016 02:52:52 +0100 Subject: [PATCH] etldoc fixes --- layers/aeroway/layer.sql | 6 +++--- layers/aeroway/mapping.yaml | 2 +- layers/boundary/boundary.sql | 2 +- layers/building/building.sql | 2 +- layers/housenumber/layer.sql | 2 +- layers/landcover/landcover.sql | 2 +- layers/landuse/landuse.sql | 2 +- layers/poi/layer.sql | 6 +++--- layers/transportation/mapping.yaml | 2 +- layers/transportation_name/layer.sql | 2 +- layers/transportation_name/merge_highways.sql | 2 +- layers/water/water.sql | 2 +- layers/water_name/layer.sql | 1 + layers/water_name/water_lakeline.sql | 2 +- layers/water_name/water_point.sql | 3 ++- layers/waterway/waterway.sql | 8 ++++---- 16 files changed, 24 insertions(+), 22 deletions(-) diff --git a/layers/aeroway/layer.sql b/layers/aeroway/layer.sql index 606eb24..8814f5c 100644 --- a/layers/aeroway/layer.sql +++ b/layers/aeroway/layer.sql @@ -4,15 +4,15 @@ CREATE OR REPLACE FUNCTION layer_aeroway(bbox geometry, zoom_level int) RETURNS TABLE(geometry geometry, class text) AS $$ SELECT geometry, aeroway AS class FROM ( - -- etldoc: aeroway_z12 -> layer_aeroway:z12 + -- etldoc: osm_aeroway_polygon_gen2 -> layer_aeroway:z12 SELECT geometry, aeroway FROM osm_aeroway_polygon_gen2 WHERE zoom_level = 12 UNION ALL - -- etldoc: aeroway_z13 -> layer_aeroway:z13 + -- etldoc: osm_aeroway_polygon_gen1 -> layer_aeroway:z13 SELECT geometry, aeroway FROM osm_aeroway_polygon_gen1 WHERE zoom_level = 13 UNION ALL - -- etldoc: aeroway_z14 -> layer_aeroway:z14_ + -- etldoc: osm_aeroway_polygon -> layer_aeroway:z14_ SELECT geometry, aeroway FROM osm_aeroway_polygon WHERE zoom_level >= 14 ) AS zoom_levels diff --git a/layers/aeroway/mapping.yaml b/layers/aeroway/mapping.yaml index 6618c64..0d77037 100644 --- a/layers/aeroway/mapping.yaml +++ b/layers/aeroway/mapping.yaml @@ -1,5 +1,5 @@ generalized_tables: - # etldoc: imposm3 -> osm_landcover_polygon_gen2 + # etldoc: imposm3 -> osm_aeroway_polygon_gen2 aeroway_polygon_gen2: source: aeroway_polygon_gen1 sql_filter: area>240000 diff --git a/layers/boundary/boundary.sql b/layers/boundary/boundary.sql index 5045e15..0e5472d 100644 --- a/layers/boundary/boundary.sql +++ b/layers/boundary/boundary.sql @@ -115,7 +115,7 @@ CREATE OR REPLACE VIEW boundary_z12 AS ( ); -- etldoc: layer_boundary[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label=" layer_boundary | z0 | z1_2 | z3 | z4 | z5 || z6 || z7 | z8 | z9 | z10 | z11 | z12| z13+"] +-- etldoc: label=" layer_boundary | z0 | z1_2 | z3 | z4 | z5 | z6 | z7 | z8 | z9 | z10 | z11 | z12| z13+"] CREATE OR REPLACE FUNCTION layer_boundary (bbox geometry, zoom_level int) RETURNS TABLE(geometry geometry, admin_level int) AS $$ diff --git a/layers/building/building.sql b/layers/building/building.sql index 1db198a..bdef0c5 100644 --- a/layers/building/building.sql +++ b/layers/building/building.sql @@ -1,5 +1,5 @@ -- etldoc: layer_building[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_building | z13 | z14_ " ] ; +-- etldoc: label="layer_building | z13 | z14+ " ] ; CREATE OR REPLACE FUNCTION layer_building(bbox geometry, zoom_level int) RETURNS TABLE(geom geometry, osm_id bigint, render_height int, render_min_height int) AS $$ diff --git a/layers/housenumber/layer.sql b/layers/housenumber/layer.sql index 21f98f3..a40a290 100644 --- a/layers/housenumber/layer.sql +++ b/layers/housenumber/layer.sql @@ -1,6 +1,6 @@ -- etldoc: layer_housenumber[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_housenumber | z14_" ] ; +-- etldoc: label="layer_housenumber | z14+" ] ; CREATE OR REPLACE FUNCTION layer_housenumber(bbox geometry, zoom_level integer) RETURNS TABLE(osm_id bigint, geometry geometry, housenumber text) AS $$ diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index 7cdfc35..ff1e388 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -77,7 +77,7 @@ CREATE OR REPLACE VIEW landcover_z14 AS ( ); -- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_landcover | z0-z1 | z2-z4 | z5-z7 | z8 | z9 | z10 | z11 | z12| z13| z14+" ] ; +-- etldoc: label="layer_landcover | z0-z1 | z2-z4 | z5-z7 | z8 | z9 | z10 | z11 | z12| z13| z14+" ] ; CREATE OR REPLACE FUNCTION layer_landcover(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 933aafd..754882e 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_gen4 -> landuse_z10 +-- etldoc: osm_landuse_polygon_gen4 -> landuse_z9 CREATE OR REPLACE VIEW landuse_z9 AS ( SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon_gen4 diff --git a/layers/poi/layer.sql b/layers/poi/layer.sql index 68dcec1..a76ae10 100644 --- a/layers/poi/layer.sql +++ b/layers/poi/layer.sql @@ -1,6 +1,6 @@ -- etldoc: layer_poi[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_poi | z14_" ] ; +-- etldoc: label="layer_poi | z14+" ] ; CREATE OR REPLACE FUNCTION layer_poi(bbox geometry, zoom_level integer, pixel_width numeric) RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text, subclass text, "rank" int) AS $$ @@ -10,12 +10,12 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t ORDER BY CASE WHEN name = '' THEN 2000 ELSE poi_class_rank(poi_class(subclass)) END ASC )::int AS "rank" FROM ( - -- etldoc: osm_poi_point -> layer_poi:z14 + -- etldoc: osm_poi_point -> layer_poi:z14_ SELECT * FROM osm_poi_point WHERE geometry && bbox AND zoom_level >= 14 UNION ALL - -- etldoc: osm_poi_polygon -> layer_poi:z14 + -- etldoc: osm_poi_polygon -> layer_poi:z14_ SELECT * FROM osm_poi_polygon WHERE geometry && bbox AND zoom_level >= 14 diff --git a/layers/transportation/mapping.yaml b/layers/transportation/mapping.yaml index 7f63747..c442507 100644 --- a/layers/transportation/mapping.yaml +++ b/layers/transportation/mapping.yaml @@ -200,7 +200,7 @@ tables: - pedestrian # TODO: Future table for joining networks -# etldoc: imposm3 -> osm_route_member +# etldoc: imposm3 -> osm_route_member -> "!!!todo:Networks!!!" route_member: type: relation_member columns: diff --git a/layers/transportation_name/layer.sql b/layers/transportation_name/layer.sql index 90716e4..2d68bff 100644 --- a/layers/transportation_name/layer.sql +++ b/layers/transportation_name/layer.sql @@ -1,6 +1,6 @@ -- etldoc: layer_transportation_name[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_transportation_name | z8 | z9 | z10 | z11 | z12| z13| z14_" ] ; +-- etldoc: label="layer_transportation_name | z8 | z9 | z10 | z11 | z12| z13| z14+" ] ; CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer) RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, network text, class text) AS $$ diff --git a/layers/transportation_name/merge_highways.sql b/layers/transportation_name/merge_highways.sql index 4279531..6a58c99 100644 --- a/layers/transportation_name/merge_highways.sql +++ b/layers/transportation_name/merge_highways.sql @@ -3,7 +3,7 @@ -- to allow for nice label rendering -- Because this works well for roads that do not have relations as well --- etldoc: osm_transportation_linestring -> osm_transportation_name_linestring +-- etldoc: osm_highway_linestring -> osm_transportation_name_linestring CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring AS ( SELECT (ST_Dump(geometry)).geom AS geometry, diff --git a/layers/water/water.sql b/layers/water/water.sql index 1823ac0..c3f3a8b 100644 --- a/layers/water/water.sql +++ b/layers/water/water.sql @@ -117,7 +117,7 @@ CREATE OR REPLACE VIEW water_z14 AS ( ); -- etldoc: layer_water [shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_water | z0|z1|z2|z3 | z4|z5|z6|z7| z8 | z9 | z10 | z11 | z12| z13| z14_" ] ; +-- etldoc: label="layer_water | z0|z1|z2|z3 | z4|z5|z6|z7| z8 | z9 | z10 | z11 | z12| z13| z14+" ] ; CREATE OR REPLACE FUNCTION layer_water (bbox geometry, zoom_level int) RETURNS TABLE(geom geometry, class text) AS $$ diff --git a/layers/water_name/layer.sql b/layers/water_name/layer.sql index bf715bb..0bfac8b 100644 --- a/layers/water_name/layer.sql +++ b/layers/water_name/layer.sql @@ -12,6 +12,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class t AND ((zoom_level BETWEEN 9 AND 13 AND LineLabel(zoom_level, NULLIF(name, ''), geometry)) OR (zoom_level >= 14)) -- etldoc: osm_water_point -> layer_water_name:z9_13 + -- etldoc: osm_water_point -> layer_water_name:z14_ UNION ALL SELECT osm_id, geometry, name, name_en, 'lake'::text AS class FROM osm_water_point diff --git a/layers/water_name/water_lakeline.sql b/layers/water_name/water_lakeline.sql index da96587..20381ef 100644 --- a/layers/water_name/water_lakeline.sql +++ b/layers/water_name/water_lakeline.sql @@ -1,5 +1,5 @@ -- etldoc: osm_water_polygon -> osm_water_lakeline --- etldoc: custom_lakeline -> osm_water_lakeline +-- etldoc: lake_centerline -> osm_water_lakeline CREATE TABLE IF NOT EXISTS osm_water_lakeline AS ( SELECT wp.osm_id, ll.wkb_geometry AS geometry, diff --git a/layers/water_name/water_point.sql b/layers/water_name/water_point.sql index 281957b..5f9658a 100644 --- a/layers/water_name/water_point.sql +++ b/layers/water_name/water_point.sql @@ -1,4 +1,5 @@ --- etldoc: osm_water_polygon -> osm_water_lakeline +-- etldoc: osm_water_polygon -> osm_water_point +-- etldoc: lake_centerline -> osm_water_point CREATE TABLE IF NOT EXISTS osm_water_point AS ( SELECT wp.osm_id, topoint(wp.geometry) AS geometry, diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql index 5945595..a55f985 100644 --- a/layers/waterway/waterway.sql +++ b/layers/waterway/waterway.sql @@ -17,17 +17,17 @@ CREATE OR REPLACE VIEW waterway_z6 AS ( WHERE featurecla = 'River' ); --- etldoc: osm_waterway_linestring_gen3 -> waterway_z9 +-- etldoc: osm_important_waterway_linestring_gen3 -> waterway_z9 CREATE OR REPLACE VIEW waterway_z9 AS ( SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen3 ); --- etldoc: osm_waterway_linestring_gen2 -> waterway_z10 +-- etldoc: osm_important_waterway_linestring_gen2 -> waterway_z10 CREATE OR REPLACE VIEW waterway_z10 AS ( SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen2 ); --- etldoc: osm_waterway_linestring_gen1 -> waterway_z11 +-- etldoc:osm_important_waterway_linestring_gen1 -> waterway_z11 CREATE OR REPLACE VIEW waterway_z11 AS ( SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen1 ); @@ -50,7 +50,7 @@ CREATE OR REPLACE VIEW waterway_z14 AS ( ); -- etldoc: layer_waterway[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_waterway | z3 | z4-z5 | z6-8 | z9 | z10 | z11 | z12| z13| z14" ]; +-- etldoc: label="layer_waterway | z3 | z4-z5 | z6-8 | z9 | z10 | z11 | z12| z13| z14+" ]; CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int) RETURNS TABLE(geometry geometry, class text, name text) AS $$