cerxes/openmaptiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

etldoc fixes

Browse Source
This commit is contained in:
ImreSamu 2016-12-04 02:52:52 +01:00
parent 1e0b4aa599
commit f5ac3def5e
16 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
layers/aeroway/layer.sql
View File

@ -4,15 +4,15 @@
CREATE OR REPLACE FUNCTION layer_aeroway(bbox geometry, zoom_level int) CREATE OR REPLACE FUNCTION layer_aeroway(bbox geometry, zoom_level int)
RETURNS TABLE(geometry geometry, class text) AS $$ RETURNS TABLE(geometry geometry, class text) AS $$
SELECT geometry, aeroway AS class FROM ( SELECT geometry, aeroway AS class FROM (
-- etldoc: aeroway_z12 -> layer_aeroway:z12 -- etldoc: osm_aeroway_polygon_gen2 -> layer_aeroway:z12
SELECT geometry, aeroway SELECT geometry, aeroway
FROM osm_aeroway_polygon_gen2 WHERE zoom_level = 12 FROM osm_aeroway_polygon_gen2 WHERE zoom_level = 12
UNION ALL UNION ALL
-- etldoc: aeroway_z13 -> layer_aeroway:z13 -- etldoc: osm_aeroway_polygon_gen1 -> layer_aeroway:z13
SELECT geometry, aeroway SELECT geometry, aeroway
FROM osm_aeroway_polygon_gen1 WHERE zoom_level = 13 FROM osm_aeroway_polygon_gen1 WHERE zoom_level = 13
UNION ALL UNION ALL
-- etldoc: aeroway_z14 -> layer_aeroway:z14_ -- etldoc: osm_aeroway_polygon -> layer_aeroway:z14_
SELECT geometry, aeroway SELECT geometry, aeroway
FROM osm_aeroway_polygon WHERE zoom_level >= 14 FROM osm_aeroway_polygon WHERE zoom_level >= 14
) AS zoom_levels ) AS zoom_levels

2
layers/aeroway/mapping.yaml
View File

@ -1,5 +1,5 @@
generalized_tables: generalized_tables:
# etldoc: imposm3 -> osm_landcover_polygon_gen2 # etldoc: imposm3 -> osm_aeroway_polygon_gen2
aeroway_polygon_gen2: aeroway_polygon_gen2:
source: aeroway_polygon_gen1 source: aeroway_polygon_gen1
sql_filter: area>240000 sql_filter: area>240000

2
layers/boundary/boundary.sql
View File

@ -115,7 +115,7 @@ CREATE OR REPLACE VIEW boundary_z12 AS (
); );
-- etldoc: layer_boundary[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: layer_boundary[shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="<sql> layer_boundary |<z0> z0 |<z1_2> z1_2 | <z3> z3 | <z4> z4 | <z5> z5 || <z6> z6 || <z7> z7 | <z8> z8 | <z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13+"] -- etldoc: label="<sql> layer_boundary |<z0> z0 |<z1_2> z1_2 | <z3> z3 | <z4> z4 | <z5> z5 | <z6> z6 | <z7> z7 | <z8> z8 | <z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13+"]
CREATE OR REPLACE FUNCTION layer_boundary (bbox geometry, zoom_level int) CREATE OR REPLACE FUNCTION layer_boundary (bbox geometry, zoom_level int)
RETURNS TABLE(geometry geometry, admin_level int) AS $$ RETURNS TABLE(geometry geometry, admin_level int) AS $$

2
layers/building/building.sql
View File

@ -1,5 +1,5 @@
-- etldoc: layer_building[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: layer_building[shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="layer_building | <z13> z13 | <z14_> z14_ " ] ; -- etldoc: label="layer_building | <z13> z13 | <z14_> z14+ " ] ;
CREATE OR REPLACE FUNCTION layer_building(bbox geometry, zoom_level int) 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 $$ RETURNS TABLE(geom geometry, osm_id bigint, render_height int, render_min_height int) AS $$

2
layers/housenumber/layer.sql
View File

@ -1,6 +1,6 @@
-- etldoc: layer_housenumber[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: layer_housenumber[shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="layer_housenumber | <z14_> z14_" ] ; -- etldoc: label="layer_housenumber | <z14_> z14+" ] ;
CREATE OR REPLACE FUNCTION layer_housenumber(bbox geometry, zoom_level integer) CREATE OR REPLACE FUNCTION layer_housenumber(bbox geometry, zoom_level integer)
RETURNS TABLE(osm_id bigint, geometry geometry, housenumber text) AS $$ RETURNS TABLE(osm_id bigint, geometry geometry, housenumber text) AS $$

2
layers/landcover/landcover.sql
View File

@ -77,7 +77,7 @@ CREATE OR REPLACE VIEW landcover_z14 AS (
); );
-- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="layer_landcover | <z0_1> z0-z1 | <z2_4> z2-z4 | <z5_7> z5-z7 | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ; -- etldoc: label="layer_landcover | <z0_1> z0-z1 | <z2_4> z2-z4 | <z5_7> z5-z7 | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
CREATE OR REPLACE FUNCTION layer_landcover(bbox geometry, zoom_level int) CREATE OR REPLACE FUNCTION layer_landcover(bbox geometry, zoom_level int)
RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$

2
layers/landuse/landuse.sql
View File

@ -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_gen4 -> landuse_z10 -- etldoc: osm_landuse_polygon_gen4 -> landuse_z9
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

6
layers/poi/layer.sql
View File

@ -1,6 +1,6 @@
-- etldoc: layer_poi[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: layer_poi[shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="layer_poi | <z14_> z14_" ] ; -- etldoc: label="layer_poi | <z14_> z14+" ] ;
CREATE OR REPLACE FUNCTION layer_poi(bbox geometry, zoom_level integer, pixel_width numeric) 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 $$ 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 ORDER BY CASE WHEN name = '' THEN 2000 ELSE poi_class_rank(poi_class(subclass)) END ASC
)::int AS "rank" )::int AS "rank"
FROM ( FROM (
-- etldoc: osm_poi_point -> layer_poi:z14 -- etldoc: osm_poi_point -> layer_poi:z14_
SELECT * FROM osm_poi_point SELECT * FROM osm_poi_point
WHERE geometry && bbox WHERE geometry && bbox
AND zoom_level >= 14 AND zoom_level >= 14
UNION ALL UNION ALL
-- etldoc: osm_poi_polygon -> layer_poi:z14 -- etldoc: osm_poi_polygon -> layer_poi:z14_
SELECT * FROM osm_poi_polygon SELECT * FROM osm_poi_polygon
WHERE geometry && bbox WHERE geometry && bbox
AND zoom_level >= 14 AND zoom_level >= 14

2
layers/transportation/mapping.yaml
View File

@ -200,7 +200,7 @@ tables:
- pedestrian - pedestrian
# TODO: Future table for joining networks # TODO: Future table for joining networks
# etldoc: imposm3 -> osm_route_member # etldoc: imposm3 -> osm_route_member -> "!!!todo:Networks!!!"
route_member: route_member:
type: relation_member type: relation_member
columns: columns:

2
layers/transportation_name/layer.sql
View File

@ -1,6 +1,6 @@
-- etldoc: layer_transportation_name[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: layer_transportation_name[shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="layer_transportation_name | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14_" ] ; -- etldoc: label="layer_transportation_name | <z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> z14+" ] ;
CREATE OR REPLACE FUNCTION layer_transportation_name(bbox geometry, zoom_level integer) 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 $$ RETURNS TABLE(osm_id bigint, geometry geometry, name text, ref text, ref_length int, network text, class text) AS $$

2
layers/transportation_name/merge_highways.sql
View File

@ -3,7 +3,7 @@
-- to allow for nice label rendering -- to allow for nice label rendering
-- Because this works well for roads that do not have relations as well -- 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 ( CREATE TABLE IF NOT EXISTS osm_transportation_name_linestring AS (
SELECT SELECT
(ST_Dump(geometry)).geom AS geometry, (ST_Dump(geometry)).geom AS geometry,

2
layers/water/water.sql
View File

@ -117,7 +117,7 @@ CREATE OR REPLACE VIEW water_z14 AS (
); );
-- etldoc: layer_water [shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: layer_water [shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="layer_water |<z0> z0|<z1>z1|<z2>z2|<z3>z3 |<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_water |<z0> z0|<z1>z1|<z2>z2|<z3>z3 |<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_water (bbox geometry, zoom_level int) CREATE OR REPLACE FUNCTION layer_water (bbox geometry, zoom_level int)
RETURNS TABLE(geom geometry, class text) AS $$ RETURNS TABLE(geom geometry, class text) AS $$

1
layers/water_name/layer.sql
View File

@ -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)) AND ((zoom_level BETWEEN 9 AND 13 AND LineLabel(zoom_level, NULLIF(name, ''), geometry))
OR (zoom_level >= 14)) OR (zoom_level >= 14))
-- etldoc: osm_water_point -> layer_water_name:z9_13 -- etldoc: osm_water_point -> layer_water_name:z9_13
-- etldoc: osm_water_point -> layer_water_name:z14_
UNION ALL UNION ALL
SELECT osm_id, geometry, name, name_en, 'lake'::text AS class SELECT osm_id, geometry, name, name_en, 'lake'::text AS class
FROM osm_water_point FROM osm_water_point

2
layers/water_name/water_lakeline.sql
View File

@ -1,5 +1,5 @@
-- etldoc: osm_water_polygon -> osm_water_lakeline -- 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 ( CREATE TABLE IF NOT EXISTS osm_water_lakeline AS (
SELECT wp.osm_id, SELECT wp.osm_id,
ll.wkb_geometry AS geometry, ll.wkb_geometry AS geometry,

3
layers/water_name/water_point.sql
View File

@ -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 ( CREATE TABLE IF NOT EXISTS osm_water_point AS (
SELECT SELECT
wp.osm_id, topoint(wp.geometry) AS geometry, wp.osm_id, topoint(wp.geometry) AS geometry,

8
layers/waterway/waterway.sql
View File

@ -17,17 +17,17 @@ CREATE OR REPLACE VIEW waterway_z6 AS (
WHERE featurecla = 'River' 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 ( CREATE OR REPLACE VIEW waterway_z9 AS (
SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen3 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 ( CREATE OR REPLACE VIEW waterway_z10 AS (
SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen2 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 ( CREATE OR REPLACE VIEW waterway_z11 AS (
SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen1 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: layer_waterway[shape=record fillcolor=lightpink, style="rounded,filled",
-- etldoc: label="layer_waterway | <z3> z3 |<z4_5> z4-z5 |<z6_8> z6-8 | <z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14> z14" ]; -- etldoc: label="layer_waterway | <z3> z3 |<z4_5> z4-z5 |<z6_8> z6-8 | <z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14> z14+" ];
CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int) CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int)
RETURNS TABLE(geometry geometry, class text, name text) AS $$ RETURNS TABLE(geometry geometry, class text, name text) AS $$