From 05992e066cebf043b278836399b5779043e59f87 Mon Sep 17 00:00:00 2001 From: ImreSamu Date: Thu, 10 Nov 2016 14:08:39 +0100 Subject: [PATCH] add etldoc to layer_water --- gen_etl_graph_water.sh | 21 ++++++++++++++++++++ layers/water/mapping.yaml | 9 +++++++++ layers/water/water.sql | 42 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100755 gen_etl_graph_water.sh diff --git a/gen_etl_graph_water.sh b/gen_etl_graph_water.sh new file mode 100755 index 00000000..86547c76 --- /dev/null +++ b/gen_etl_graph_water.sh @@ -0,0 +1,21 @@ + + +ID=water +DOT=${ID}.dot + +echo "digraph G +{ +rankdir=LR; +" > $DOT + +cat ./layers/${ID}/mapping.yaml | grep "# etldoc:" | sed 's/# etldoc://g' >>$DOT + +cat ./layers/${ID}/water.sql | grep "\-\- etldoc:" | sed 's/-- etldoc://g' >>$DOT + +echo " +} +" >> $DOT + +cat $DOT + +dot -Tpng $DOT > layer_${ID}_etl.png diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml index e77772a4..feee49b2 100644 --- a/layers/water/mapping.yaml +++ b/layers/water/mapping.yaml @@ -1,17 +1,26 @@ generalized_tables: + + # etldoc: imposm3 -> osm_water_polygon_gen3 water_polygon_gen3: source: water_polygon sql_filter: area>15000000.0 AND waterway = '' tolerance: 350.0 + + # etldoc: imposm3 -> osm_water_polygon_gen2 water_polygon_gen2: source: water_polygon sql_filter: area>2000000 AND waterway = '' tolerance: 200.0 + + # etldoc: imposm3 -> osm_water_polygon_gen1 water_polygon_gen1: source: water_polygon sql_filter: area>500000 AND waterway = '' tolerance: 100.0 + tables: + + # etldoc: imposm3 -> osm_water_polygon water_polygon: fields: - name: osm_id diff --git a/layers/water/water.sql b/layers/water/water.sql index dab2aa95..e1955f96 100644 --- a/layers/water/water.sql +++ b/layers/water/water.sql @@ -3,101 +3,141 @@ CREATE OR REPLACE FUNCTION water_class(waterway TEXT) RETURNS TEXT AS $$ $$ LANGUAGE SQL IMMUTABLE; + CREATE OR REPLACE VIEW water_z0 AS ( + -- etldoc: ne_110m_ocean -> water_z0 SELECT geom, 'ocean' AS class FROM ne_110m_ocean UNION ALL + -- etldoc: ne_110m_lakes -> water_z0 SELECT geom, 'lake' AS class FROM ne_110m_lakes ); CREATE OR REPLACE VIEW water_z1 AS ( + -- etldoc: ne_110m_ocean -> water_z1 SELECT geom, 'ocean' AS class FROM ne_110m_ocean - UNION ALL + UNION ALL + -- etldoc: ne_110m_lakes -> water_z1 SELECT geom, 'lake' AS class FROM ne_110m_lakes ); CREATE OR REPLACE VIEW water_z2 AS ( + -- etldoc: ne_50m_ocean -> water_z2 SELECT geom, 'ocean' AS class FROM ne_50m_ocean UNION ALL + -- etldoc: ne_110m_lakes -> water_z2 SELECT geom, 'lake' AS class FROM ne_110m_lakes ); CREATE OR REPLACE VIEW water_z4 AS ( + -- etldoc: ne_50m_ocean -> water_z4 SELECT geom, 'ocean' AS class FROM ne_50m_ocean UNION ALL + -- etldoc: ne_50m_lakes -> water_z4 SELECT geom, 'lake' AS class FROM ne_50m_lakes ); CREATE OR REPLACE VIEW water_z5 AS ( + -- etldoc: ne_10m_ocean -> water_z5 SELECT geom, 'ocean' AS class FROM ne_10m_ocean UNION ALL + -- etldoc: ne_10m_lakes -> water_z5 SELECT geom, 'lake' AS class FROM ne_10m_lakes ); CREATE OR REPLACE VIEW water_z6 AS ( + -- etldoc: ne_10m_ocean -> water_z6 SELECT geom, 'ocean' AS class FROM ne_10m_ocean UNION ALL + -- etldoc: ne_10m_lakes -> water_z6 SELECT geom, 'lake' AS class FROM ne_10m_lakes ); CREATE OR REPLACE VIEW water_z7 AS ( + -- etldoc: ne_10m_ocean -> water_z7 SELECT geom, 'ocean' AS class FROM ne_10m_ocean UNION ALL + -- etldoc: osm_water_polygon_gen3 -> water_z7 SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen3 ); CREATE OR REPLACE VIEW water_z8 AS ( + -- etldoc: ne_10m_ocean -> water_z8 SELECT geom, 'ocean' AS class FROM ne_10m_ocean UNION ALL + -- etldoc: osm_water_polygon_gen2 -> water_z8 SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen2 ); CREATE OR REPLACE VIEW water_z9 AS ( + -- etldoc: osm_water_polygon_gen1 -> water_z9 SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen1 ); CREATE OR REPLACE VIEW water_z11 AS ( + -- etldoc: osm_water_polygon -> water_z11 SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 40000 ); CREATE OR REPLACE VIEW water_z12 AS ( + -- etldoc: osm_water_polygon -> water_z12 SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 10000 ); CREATE OR REPLACE VIEW water_z13 AS ( + -- etldoc: osm_water_polygon -> water_z13 SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon WHERE area > 5000 ); CREATE OR REPLACE VIEW water_z14 AS ( + -- etldoc: osm_water_polygon -> water_z14 SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon ); +-- 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_" ] ; + CREATE OR REPLACE FUNCTION layer_water (bbox geometry, zoom_level int) RETURNS TABLE(geom geometry, class text) AS $$ SELECT geom, class::text FROM ( + -- etldoc: water_z0 -> layer_water:z0 SELECT * FROM water_z0 WHERE zoom_level = 0 UNION ALL + -- etldoc: water_z1 -> layer_water:z1 SELECT * FROM water_z1 WHERE zoom_level = 1 UNION ALL + -- etldoc: water_z2 -> layer_water:z2 + -- etldoc: water_z2 -> layer_water:z3 SELECT * FROM water_z2 WHERE zoom_level BETWEEN 2 AND 3 UNION ALL + -- etldoc: water_z4 -> layer_water:z4 SELECT * FROM water_z4 WHERE zoom_level = 4 UNION ALL + -- etldoc: water_z5 -> layer_water:z5 SELECT * FROM water_z5 WHERE zoom_level = 5 UNION ALL + -- etldoc: water_z6 -> layer_water:z6 SELECT * FROM water_z6 WHERE zoom_level = 6 UNION ALL + -- etldoc: water_z7 -> layer_water:z7 SELECT * FROM water_z7 WHERE zoom_level = 7 UNION ALL + -- etldoc: water_z8 -> layer_water:z8 SELECT * FROM water_z8 WHERE zoom_level = 8 UNION ALL + -- etldoc: water_z9 -> layer_water:z9 + -- etldoc: water_z9 -> layer_water:z10 SELECT * FROM water_z9 WHERE zoom_level BETWEEN 9 AND 10 UNION ALL + -- etldoc: water_z11 -> layer_water:z11 SELECT * FROM water_z11 WHERE zoom_level = 11 UNION ALL + -- etldoc: water_z12 -> layer_water:z2 SELECT * FROM water_z12 WHERE zoom_level = 12 UNION ALL + -- etldoc: water_z13 -> layer_water:z13 SELECT * FROM water_z13 WHERE zoom_level = 13 UNION ALL + -- etldoc: water_z14 -> layer_water:z14_ SELECT * FROM water_z14 WHERE zoom_level >= 14 ) AS zoom_levels WHERE geom && bbox;