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

Merge pull request #717 from eva-j/584_urban_areas

Browse Source 
Landuse - removing ne_10m data source
This commit is contained in:
Eva Jelinkova 2019-12-03 20:30:10 +01:00 committed by GitHub
commit 0545f1e27d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
layers/landuse/etl_diagram.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 151 KiB

19
layers/landuse/landuse.sql
View File

@ -11,10 +11,16 @@ CREATE OR REPLACE VIEW landuse_z5 AS (
FROM ne_50m_urban_areas FROM ne_50m_urban_areas
); );
-- etldoc: ne_10m_urban_areas -> landuse_z6 -- etldoc: osm_landuse_polygon_gen7 -> landuse_z6
CREATE OR REPLACE VIEW landuse_z6 AS ( CREATE OR REPLACE VIEW landuse_z6 AS (
SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS tourism, NULL::text AS place, NULL::text AS waterway, scalerank SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway, NULL::int as scalerank
FROM ne_10m_urban_areas FROM osm_landuse_polygon_gen7
);
-- etldoc: osm_landuse_polygon_gen6 -> landuse_z8
CREATE OR REPLACE VIEW landuse_z8 AS (
SELECT osm_id, geometry, landuse, amenity, leisure, tourism, place, waterway, NULL::int as scalerank
FROM osm_landuse_polygon_gen6
); );
-- etldoc: osm_landuse_polygon_gen5 -> landuse_z9 -- etldoc: osm_landuse_polygon_gen5 -> landuse_z9
@ -78,9 +84,10 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$
UNION ALL UNION ALL
-- etldoc: landuse_z6 -> layer_landuse:z6 -- etldoc: landuse_z6 -> layer_landuse:z6
-- etldoc: landuse_z6 -> layer_landuse:z7 -- etldoc: landuse_z6 -> layer_landuse:z7
-- etldoc: landuse_z6 -> layer_landuse:z8 SELECT * FROM landuse_z6 WHERE zoom_level BETWEEN 6 AND 7
SELECT * FROM landuse_z6 UNION ALL
WHERE zoom_level BETWEEN 6 AND 8 AND scalerank-1 <= zoom_level -- etldoc: landuse_z8 -> layer_landuse:z8
SELECT * FROM landuse_z8 WHERE zoom_level = 8
UNION ALL UNION ALL
-- etldoc: landuse_z9 -> layer_landuse:z9 -- etldoc: landuse_z9 -> layer_landuse:z9
SELECT * FROM landuse_z9 WHERE zoom_level = 9 SELECT * FROM landuse_z9 WHERE zoom_level = 9

9
layers/landuse/mapping.yaml
View File

@ -1,4 +1,13 @@
generalized_tables: generalized_tables:
# etldoc: imposm3 -> osm_landuse_polygon_gen7
landuse_polygon_gen7:
source: landuse_polygon_gen6
tolerance: ZRES7
# etldoc: imposm3 -> osm_landuse_polygon_gen6
landuse_polygon_gen6:
source: landuse_polygon_gen5
sql_filter: area>power(ZRES6,2) AND (landuse='residential' OR place='suburb' OR place='neighbourhood')
tolerance: ZRES8
# etldoc: imposm3 -> osm_landuse_polygon_gen5 # etldoc: imposm3 -> osm_landuse_polygon_gen5
landuse_polygon_gen5: landuse_polygon_gen5:
source: landuse_polygon_gen4 source: landuse_polygon_gen4