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

adding disp. relations into z1-4

Browse Source
This commit is contained in:
Eva J 2019-12-11 12:05:42 +01:00
parent 0181513b1a
commit fee22d4eb9
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layers/boundary/boundary.sql
View File

@ -20,6 +20,7 @@ CREATE OR REPLACE VIEW boundary_z0 AS (
-- etldoc: ne_50m_admin_0_boundary_lines_land -> boundary_z1 -- etldoc: ne_50m_admin_0_boundary_lines_land -> boundary_z1
-- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z1 -- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z1
-- etldoc: osm_border_disp_linestring_gen11 -> boundary_z1
CREATE OR REPLACE VIEW boundary_z1 AS ( CREATE OR REPLACE VIEW boundary_z1 AS (
SELECT geometry, SELECT geometry,
2 AS admin_level, 2 AS admin_level,
@ -36,11 +37,15 @@ CREATE OR REPLACE VIEW boundary_z1 AS (
NULL AS claimed_by, NULL AS claimed_by,
false AS maritime false AS maritime
FROM ne_50m_admin_1_states_provinces_lines FROM ne_50m_admin_1_states_provinces_lines
UNION ALL
SELECT geometry, admin_level, true AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime
FROM osm_border_disp_linestring_gen11
); );
-- etldoc: ne_50m_admin_0_boundary_lines_land -> boundary_z3 -- etldoc: ne_50m_admin_0_boundary_lines_land -> boundary_z3
-- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z3 -- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z3
-- etldoc: osm_border_disp_linestring_gen11 -> boundary_z3
CREATE OR REPLACE VIEW boundary_z3 AS ( CREATE OR REPLACE VIEW boundary_z3 AS (
SELECT geometry, SELECT geometry,
2 AS admin_level, 2 AS admin_level,
@ -57,12 +62,16 @@ CREATE OR REPLACE VIEW boundary_z3 AS (
NULL AS claimed_by, NULL AS claimed_by,
false AS maritime false AS maritime
FROM ne_50m_admin_1_states_provinces_lines FROM ne_50m_admin_1_states_provinces_lines
UNION ALL
SELECT geometry, admin_level, true AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime
FROM osm_border_disp_linestring_gen11
); );
-- etldoc: ne_10m_admin_0_boundary_lines_land -> boundary_z4 -- etldoc: ne_10m_admin_0_boundary_lines_land -> boundary_z4
-- etldoc: ne_10m_admin_1_states_provinces_lines -> boundary_z4 -- etldoc: ne_10m_admin_1_states_provinces_lines -> boundary_z4
-- etldoc: osm_border_linestring_gen10 -> boundary_z4 -- etldoc: osm_border_linestring_gen10 -> boundary_z4
-- etldoc: osm_border_disp_linestring_gen10 -> boundary_z4
CREATE OR REPLACE VIEW boundary_z4 AS ( CREATE OR REPLACE VIEW boundary_z4 AS (
SELECT geometry, SELECT geometry,
2 AS admin_level, 2 AS admin_level,
@ -85,6 +94,9 @@ CREATE OR REPLACE VIEW boundary_z4 AS (
SELECT geometry, admin_level, disputed, NULL AS disputed_name, NULL AS claimed_by, maritime SELECT geometry, admin_level, disputed, NULL AS disputed_name, NULL AS claimed_by, maritime
FROM osm_border_linestring_gen10 FROM osm_border_linestring_gen10
WHERE maritime=true AND admin_level <= 2 WHERE maritime=true AND admin_level <= 2
UNION ALL
SELECT geometry, admin_level, true AS disputed, edit_name(name) AS disputed_name, claimed_by, maritime
FROM osm_border_disp_linestring_gen10
); );
-- etldoc: osm_border_linestring_gen9 -> boundary_z5 -- etldoc: osm_border_linestring_gen9 -> boundary_z5

BIN
layers/boundary/etl_diagram.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 436 KiB

After

Width:  |  Height:  |  Size: 457 KiB

6
layers/boundary/mapping.yaml
View File

@ -1,5 +1,11 @@
generalized_tables: generalized_tables:
# etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen11
border_disp_linestring_gen11:
source: border_disp_linestring
sql_filter: admin_level = 2
tolerance: 9600
# etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen10 # etldoc: osm_border_disp_linestring -> osm_border_disp_linestring_gen10
border_disp_linestring_gen10: border_disp_linestring_gen10:
source: border_disp_linestring source: border_disp_linestring