From 8874140207b061c5ca81f30be2c7c14d22987ebe Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Mon, 16 Jan 2017 20:11:35 +0100 Subject: [PATCH] Use boundaries from osmborder --- docker-compose.yml | 7 ++++ layers/boundary/boundary.sql | 60 +++++++++++++++++------------------ layers/boundary/boundary.yaml | 8 +++-- 3 files changed, 43 insertions(+), 32 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 84c5e984..8e75af35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,6 +36,13 @@ services: - ./data:/import - ./build:/mapping - cache:/cache + import-osmborder: + image: "openmaptiles/import-osmborder:0.1" + env_file: .env + links: + - postgres + volumes: + - ./data:/import import-osm-diff: image: "openmaptiles/import-osm:latest" env_file: .env diff --git a/layers/boundary/boundary.sql b/layers/boundary/boundary.sql index 31e951c1..d37524c2 100644 --- a/layers/boundary/boundary.sql +++ b/layers/boundary/boundary.sql @@ -3,7 +3,7 @@ -- etldoc: ne_110m_admin_0_boundary_lines_land -> boundary_z0 CREATE OR REPLACE VIEW boundary_z0 AS ( - SELECT geometry, 2 AS admin_level + SELECT geometry, 2 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_110m_admin_0_boundary_lines_land ); @@ -11,10 +11,10 @@ CREATE OR REPLACE VIEW boundary_z0 AS ( -- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z1 CREATE OR REPLACE VIEW boundary_z1 AS ( - SELECT geometry, 2 AS admin_level + SELECT geometry, 2 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_50m_admin_0_boundary_lines_land UNION ALL - SELECT geometry, 4 AS admin_level + SELECT geometry, 4 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_50m_admin_1_states_provinces_lines WHERE scalerank <= 2 ); @@ -24,10 +24,10 @@ CREATE OR REPLACE VIEW boundary_z1 AS ( -- etldoc: ne_50m_admin_1_states_provinces_lines -> boundary_z3 CREATE OR REPLACE VIEW boundary_z3 AS ( - SELECT geometry, 2 AS admin_level + SELECT geometry, 2 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_50m_admin_0_boundary_lines_land UNION ALL - SELECT geometry, 4 AS admin_level + SELECT geometry, 4 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_50m_admin_1_states_provinces_lines ); @@ -36,10 +36,10 @@ CREATE OR REPLACE VIEW boundary_z3 AS ( -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z4 CREATE OR REPLACE VIEW boundary_z4 AS ( - SELECT geometry, 2 AS admin_level + SELECT geometry, 2 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_10m_admin_0_boundary_lines_land UNION ALL - SELECT geometry, 4 AS admin_level + SELECT geometry, 4 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_10m_admin_1_states_provinces_lines_shp WHERE scalerank <= 3 AND featurecla = 'Adm-1 boundary' ); @@ -48,10 +48,10 @@ CREATE OR REPLACE VIEW boundary_z4 AS ( -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z5 CREATE OR REPLACE VIEW boundary_z5 AS ( - SELECT geometry, 2 AS admin_level + SELECT geometry, 2 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_10m_admin_0_boundary_lines_land UNION ALL - SELECT geometry, 4 AS admin_level + SELECT geometry, 4 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_10m_admin_1_states_provinces_lines_shp WHERE scalerank <= 7 AND featurecla = 'Adm-1 boundary' ); @@ -60,10 +60,10 @@ CREATE OR REPLACE VIEW boundary_z5 AS ( -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z6 CREATE OR REPLACE VIEW boundary_z6 AS ( - SELECT geometry, 2 AS admin_level + SELECT geometry, 2 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_10m_admin_0_boundary_lines_land UNION ALL - SELECT geometry, 4 AS admin_level + SELECT geometry, 4 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_10m_admin_1_states_provinces_lines_shp WHERE scalerank <= 9 AND featurecla = 'Adm-1 boundary' ); @@ -71,55 +71,55 @@ CREATE OR REPLACE VIEW boundary_z6 AS ( -- etldoc: ne_10m_admin_0_boundary_lines_land -> boundary_z7 -- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z7 CREATE OR REPLACE VIEW boundary_z7 AS ( - SELECT geometry, 2 AS admin_level + SELECT geometry, 2 AS admin_level, NULL::bool AS disputed, NULL::bool AS maritime FROM ne_10m_admin_0_boundary_lines_land UNION ALL - SELECT geometry, 4 AS admin_level + SELECT geometry, 4 AS admin_level, NULL AS disputed, NULL AS maritime FROM ne_10m_admin_1_states_provinces_lines_shp WHERE featurecla = 'Adm-1 boundary' ); --- etldoc: osm_boundary_linestring_gen5 -> boundary_z8 +-- etldoc: osm_border_linestring_gen5 -> boundary_z8 CREATE OR REPLACE VIEW boundary_z8 AS ( - SELECT geometry, admin_level - FROM osm_boundary_linestring_gen5 + SELECT geometry, admin_level, disputed, maritime + FROM osm_border_linestring_gen5 WHERE admin_level <= 4 AND ST_Length(geometry) > 1000 ); --- etldoc: osm_boundary_linestring_gen4 -> boundary_z9 +-- etldoc: osm_border_linestring_gen4 -> boundary_z9 CREATE OR REPLACE VIEW boundary_z9 AS ( - SELECT geometry, admin_level - FROM osm_boundary_linestring_gen4 + SELECT geometry, admin_level, disputed, maritime + FROM osm_border_linestring_gen4 WHERE admin_level <= 6 ); --- etldoc: osm_boundary_linestring_gen3 -> boundary_z10 +-- etldoc: osm_border_linestring_gen3 -> boundary_z10 CREATE OR REPLACE VIEW boundary_z10 AS ( - SELECT geometry, admin_level - FROM osm_boundary_linestring_gen3 + SELECT geometry, admin_level, disputed, maritime + FROM osm_border_linestring_gen3 WHERE admin_level <= 6 ); --- etldoc: osm_boundary_linestring_gen2 -> boundary_z11 +-- etldoc: osm_border_linestring_gen2 -> boundary_z11 CREATE OR REPLACE VIEW boundary_z11 AS ( - SELECT geometry, admin_level - FROM osm_boundary_linestring_gen2 + SELECT geometry, admin_level, disputed, maritime + FROM osm_border_linestring_gen2 WHERE admin_level <= 8 ); --- etldoc: osm_boundary_linestring_gen1 -> boundary_z12 +-- etldoc: osm_border_linestring_gen1 -> boundary_z12 CREATE OR REPLACE VIEW boundary_z12 AS ( - SELECT geometry, admin_level - FROM osm_boundary_linestring_gen1 + SELECT geometry, admin_level, disputed, maritime + FROM osm_border_linestring_gen1 ); -- 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+"] CREATE OR REPLACE FUNCTION layer_boundary (bbox geometry, zoom_level int) -RETURNS TABLE(geometry geometry, admin_level int) AS $$ - SELECT geometry, admin_level FROM ( +RETURNS TABLE(geometry geometry, admin_level int, disputed int, maritime int) AS $$ + SELECT geometry, admin_level, disputed::int, maritime::int FROM ( -- etldoc: boundary_z0 -> layer_boundary:z0 SELECT * FROM boundary_z0 WHERE geometry && bbox AND zoom_level = 0 UNION ALL diff --git a/layers/boundary/boundary.yaml b/layers/boundary/boundary.yaml index 29dec595..f4acdc28 100644 --- a/layers/boundary/boundary.yaml +++ b/layers/boundary/boundary.yaml @@ -15,12 +15,16 @@ layer: At low zoom levels the Natural Earth boundaries are mapped to the equivalent admin levels. disputed: description: | - Mark with `1` if the boundary is disputed. + Mark with `1` if the border is disputed. + values: [0, 1] + maritime: + description: | + Mark with `1` if it is a maritime border. values: [0, 1] buffer_size: 4 datasource: geometry_field: geometry - query: (SELECT geometry, admin_level FROM layer_boundary(!bbox!, z(!scale_denominator!))) AS t + query: (SELECT geometry, admin_level, disputed, maritime FROM layer_boundary(!bbox!, z(!scale_denominator!))) AS t schema: - ./boundary.sql datasources: