From b77cc7a43ae8157b956067bde7a7081a63728fa7 Mon Sep 17 00:00:00 2001 From: lukasmartinelli Date: Tue, 15 Nov 2016 19:37:19 +0100 Subject: [PATCH 01/30] More nuanced waterway --- layers/waterway/README.md | 1 + layers/waterway/mapping.yaml | 19 +++++--- layers/waterway/merge_waterway.sql | 44 +++++++++++++++++++ layers/waterway/waterway.sql | 69 ++++++++++++++---------------- layers/waterway/waterway.yaml | 4 +- 5 files changed, 93 insertions(+), 44 deletions(-) create mode 100644 layers/waterway/merge_waterway.sql diff --git a/layers/waterway/README.md b/layers/waterway/README.md index 4898394..3b2016f 100644 --- a/layers/waterway/README.md +++ b/layers/waterway/README.md @@ -6,6 +6,7 @@ Too short linestrings are filtered out for some zoom levels. Waterways do no not ## Fields +- **name**: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway or the name from Natural Earth for lower zoom levels. - **class**: The original value of the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag. Can be one of [`stream`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dstream), [`river`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Driver), diff --git a/layers/waterway/mapping.yaml b/layers/waterway/mapping.yaml index 5238b98..a69a9e8 100644 --- a/layers/waterway/mapping.yaml +++ b/layers/waterway/mapping.yaml @@ -1,14 +1,19 @@ generalized_tables: - # etldoc: imposm3 -> osm_waterway_linestring_gen0 - waterway_linestring_gen0: - source: waterway_linestring_gen1 - sql_filter: waterway IN ('river') AND ST_Length(geometry) > 10000 + # etldoc: imposm3 -> osm_waterway_linestring_gen3 + waterway_linestring_gen3: + source: waterway_linestring_gen2 + sql_filter: waterway IN ('river') tolerance: 200.0 - # etldoc: imposm3 -> osm_waterway_linestring_gen1 + # etldoc: imposm3 -> osm_waterway_linestring_gen2 + waterway_linestring_gen2: + source: waterway_linestring_gen1 + sql_filter: waterway IN ('river') + tolerance: 100.0 + # etldoc: imposm3 -> osm_waterway_linestring_gen1 waterway_linestring_gen1: source: waterway_linestring - sql_filter: waterway IN ('river') AND ST_Length(geometry) > 5000 - tolerance: 100.0 + sql_filter: waterway IN ('river') + tolerance: 50.0 tables: # etldoc: imposm3 -> osm_waterway_linestring waterway_linestring: diff --git a/layers/waterway/merge_waterway.sql b/layers/waterway/merge_waterway.sql new file mode 100644 index 0000000..c58b21a --- /dev/null +++ b/layers/waterway/merge_waterway.sql @@ -0,0 +1,44 @@ +-- We merge the waterways by name like the highways +-- This helps to drop not important rivers (since they do not have a name) +-- and also makes it possible to filter out too short rivers + +-- etldoc: osm_waterway_linestring -> osm_important_waterway_linestring +CREATE TABLE IF NOT EXISTS osm_important_waterway_linestring AS ( + SELECT + (ST_Dump(geometry)).geom AS geometry, + name + FROM ( + SELECT + ST_LineMerge(ST_Union(geometry)) AS geometry, + name + FROM osm_waterway_linestring + WHERE name <> '' AND waterway = 'river' + GROUP BY name + ) AS waterway_union +); + +CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_geometry_idx ON osm_important_waterway_linestring USING gist(geometry); + +-- etldoc: osm_important_waterway_linestring -> osm_important_waterway_linestring_gen1 +CREATE TABLE IF NOT EXISTS osm_important_waterway_linestring_gen1 AS ( + SELECT ST_Simplify(geometry, 60) AS geometry, name + FROM osm_important_waterway_linestring + WHERE ST_Length(geometry) > 1000 +); +CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_gen1_geometry_idx ON osm_important_waterway_linestring_gen1 USING gist(geometry); + +-- etldoc: osm_important_waterway_linestring_gen1 -> osm_important_waterway_linestring_gen2 +CREATE TABLE IF NOT EXISTS osm_important_waterway_linestring_gen2 AS ( + SELECT ST_Simplify(geometry, 100) AS geometry, name + FROM osm_important_waterway_linestring_gen1 + WHERE ST_Length(geometry) > 4000 +); +CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_gen2_geometry_idx ON osm_important_waterway_linestring_gen2 USING gist(geometry); + +-- etldoc: osm_important_waterway_linestring_gen2 -> osm_important_waterway_linestring_gen3 +CREATE TABLE IF NOT EXISTS osm_important_waterway_linestring_gen3 AS ( + SELECT ST_Simplify(geometry, 200) AS geometry, name + FROM osm_important_waterway_linestring_gen2 + WHERE ST_Length(geometry) > 8000 +); +CREATE INDEX IF NOT EXISTS osm_important_waterway_linestring_gen3_geometry_idx ON osm_important_waterway_linestring_gen3 USING gist(geometry); diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql index 29cb62c..4444413 100644 --- a/layers/waterway/waterway.sql +++ b/layers/waterway/waterway.sql @@ -1,89 +1,86 @@ -- etldoc: ne_110m_rivers_lake_centerlines -> waterway_z3 CREATE OR REPLACE VIEW waterway_z3 AS ( - SELECT geom AS geometry, 'river' AS class FROM ne_110m_rivers_lake_centerlines + SELECT geom AS geometry, 'river' AS class, name FROM ne_110m_rivers_lake_centerlines WHERE featurecla = 'River' ); -- etldoc: ne_50m_rivers_lake_centerlines -> waterway_z4 CREATE OR REPLACE VIEW waterway_z4 AS ( - SELECT geom AS geometry, 'river' AS class FROM ne_50m_rivers_lake_centerlines + SELECT geom AS geometry, 'river' AS class, name FROM ne_50m_rivers_lake_centerlines WHERE featurecla = 'River' ); -- etldoc: ne_10m_rivers_lake_centerlines -> waterway_z6 CREATE OR REPLACE VIEW waterway_z6 AS ( - SELECT geom AS geometry, 'river' AS class FROM ne_10m_rivers_lake_centerlines + SELECT geom AS geometry, 'river' AS class, name FROM ne_10m_rivers_lake_centerlines WHERE featurecla = 'River' ); --- etldoc: osm_waterway_linestring -> waterway_z8 -CREATE OR REPLACE VIEW waterway_z8 AS ( - SELECT geometry, waterway AS class FROM osm_waterway_linestring - WHERE waterway IN ('river') AND ST_Length(geometry) > 10000 -); - --- etldoc: osm_waterway_linestring -> waterway_z9 +-- etldoc: osm_waterway_linestring_gen3 -> waterway_z9 CREATE OR REPLACE VIEW waterway_z9 AS ( - SELECT geometry, waterway AS class FROM osm_waterway_linestring - WHERE waterway IN ('river') AND ST_Length(geometry) > 5000 + --SELECT geometry, waterway AS class FROM osm_waterway_linestring_gen3 + SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen3 ); --- etldoc: osm_waterway_linestring -> waterway_z11 +-- etldoc: osm_waterway_linestring_gen2 -> waterway_z10 +CREATE OR REPLACE VIEW waterway_z10 AS ( + SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen2 +); + +-- etldoc: osm_waterway_linestring_gen1 -> waterway_z11 CREATE OR REPLACE VIEW waterway_z11 AS ( - SELECT geometry, waterway AS class FROM osm_waterway_linestring - WHERE waterway IN ('river') AND ST_Length(geometry) > 5000 + SELECT geometry, 'river'::text AS class, name FROM osm_waterway_linestring_gen1 ); -- etldoc: osm_waterway_linestring -> waterway_z12 CREATE OR REPLACE VIEW waterway_z12 AS ( - SELECT geometry, waterway AS class FROM osm_waterway_linestring - WHERE waterway IN ('river', 'canal') OR (waterway = 'stream' AND ST_Length(geometry) > 1000) + SELECT geometry, waterway AS class, name FROM osm_waterway_linestring + WHERE waterway IN ('river', 'canal') ); -- etldoc: osm_waterway_linestring -> waterway_z13 CREATE OR REPLACE VIEW waterway_z13 AS ( - SELECT geometry, waterway AS class FROM osm_waterway_linestring - WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch') AND ST_Length(geometry) > 300 + SELECT geometry, waterway::text AS class, name FROM osm_waterway_linestring + WHERE waterway IN ('river', 'canal', 'stream', 'drain', 'ditch') ); -- etldoc: osm_waterway_linestring -> waterway_z14 CREATE OR REPLACE VIEW waterway_z14 AS ( - SELECT geometry, waterway AS class FROM osm_waterway_linestring + SELECT geometry, waterway::text AS class, name FROM osm_waterway_linestring ); - --- 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 | z4_5 | z6_7 | z8 | z9_10 | z11 | z12| z13| z14_" ] ; CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int) -RETURNS TABLE(geometry geometry, class text) AS $$ - SELECT geometry, class FROM ( - -- etldoc: waterway_z3 -> layer_waterway:z3 +RETURNS TABLE(geometry geometry, class text, name text) AS $$ + SELECT geometry, class, name FROM ( + -- etldoc: waterway_z3 -> layer_waterway:z3 SELECT * FROM waterway_z3 WHERE zoom_level = 3 UNION ALL - -- etldoc: waterway_z4 -> layer_waterway:z4_5 + -- etldoc: waterway_z4 -> layer_waterway:z4_5 SELECT * FROM waterway_z4 WHERE zoom_level BETWEEN 4 AND 5 UNION ALL - -- etldoc: waterway_z6 -> layer_waterway:z6_7 - SELECT * FROM waterway_z6 WHERE zoom_level BETWEEN 6 AND 7 + -- etldoc: waterway_z6 -> layer_waterway:z6_8 + SELECT * FROM waterway_z6 WHERE zoom_level BETWEEN 6 AND 8 UNION ALL - -- etldoc: waterway_z8 -> layer_waterway:z8 - SELECT * FROM waterway_z8 WHERE zoom_level = 8 + -- etldoc: waterway_z9 -> layer_waterway:z9 + SELECT * FROM waterway_z9 WHERE zoom_level = 9 UNION ALL - -- etldoc: waterway_z9 -> layer_waterway:z9_10 - SELECT * FROM waterway_z9 WHERE zoom_level BETWEEN 9 AND 10 + -- etldoc: waterway_z10 -> layer_waterway:z10 + SELECT * FROM waterway_z10 WHERE zoom_level = 10 UNION ALL - -- etldoc: waterway_z11 -> layer_waterway:z11 + -- etldoc: waterway_z11 -> layer_waterway:z11 SELECT * FROM waterway_z11 WHERE zoom_level = 11 UNION ALL - -- etldoc: waterway_z12 -> layer_waterway:z12 + -- etldoc: waterway_z12 -> layer_waterway:z12 SELECT * FROM waterway_z12 WHERE zoom_level = 12 UNION ALL - -- etldoc: waterway_z13 -> layer_waterway:z13 + -- etldoc: waterway_z13 -> layer_waterway:z13 SELECT * FROM waterway_z13 WHERE zoom_level = 13 UNION ALL - -- etldoc: waterway_z14 -> layer_waterway:z14_ + -- etldoc: waterway_z14 -> layer_waterway:z14 SELECT * FROM waterway_z14 WHERE zoom_level >= 14 ) AS zoom_levels WHERE geometry && bbox; diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml index e822331..f03dde4 100644 --- a/layers/waterway/waterway.yaml +++ b/layers/waterway/waterway.yaml @@ -6,6 +6,7 @@ layer: Too short linestrings are filtered out for some zoom levels. Waterways do no not have a `subclass`. buffer_size: 4 fields: + name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway or the name from Natural Earth for lower zoom levels. class: | The original value of the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag. Can be one of [`stream`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dstream), @@ -15,8 +16,9 @@ layer: [`ditch`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dditch)`. datasource: geometry_field: geometry - query: (SELECT geometry, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t + query: (SELECT geometry, name, class FROM layer_waterway(!bbox!, z(!scale_denominator!))) AS t schema: + - ./merge_waterway.sql - ./waterway.sql datasources: - type: imposm3 From 98d77b0638b5e7a09110e2e2c7c46ed369160519 Mon Sep 17 00:00:00 2001 From: lukasmartinelli Date: Tue, 15 Nov 2016 21:23:54 +0100 Subject: [PATCH 02/30] Show only linestrings with name on z11 --- layers/waterway/waterway.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql index 4444413..93e0acb 100644 --- a/layers/waterway/waterway.sql +++ b/layers/waterway/waterway.sql @@ -30,7 +30,7 @@ CREATE OR REPLACE VIEW waterway_z10 AS ( -- etldoc: osm_waterway_linestring_gen1 -> waterway_z11 CREATE OR REPLACE VIEW waterway_z11 AS ( - SELECT geometry, 'river'::text AS class, name FROM osm_waterway_linestring_gen1 + SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen1 ); -- etldoc: osm_waterway_linestring -> waterway_z12 From 327bdc7313c1860456efa0df272dfdc322b12470 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Mon, 28 Nov 2016 19:16:00 +0000 Subject: [PATCH 03/30] Remove mappings from landcover and landuse --- layers/landcover/landcover.sql | 2 +- layers/landcover/mapping.yaml | 43 +++++++++++----------- layers/landuse/landuse.sql | 65 +++++++++------------------------- layers/landuse/mapping.yaml | 47 +++++++----------------- 4 files changed, 53 insertions(+), 104 deletions(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index 3123fc5..a0b27ce 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -14,7 +14,7 @@ CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, w WHEN landuse IN ('farmland', 'farm', 'orchard', 'vineyard', 'plant_nursery') THEN 'farmland' WHEN "natural" IN ('glacier', 'ice_shelf') THEN 'ice' WHEN "natural"='wood' OR landuse IN ('forest', 'wood') THEN 'wood' - WHEN "natural"='grassland' OR landuse IN ('grass', 'meadow', 'village_green', 'allotments', 'park', 'recreation_ground', 'grassland') THEN 'grass' + WHEN "natural"='grassland' OR landuse IN ('grass', 'meadow', 'allotments', 'grassland') THEN 'grass' WHEN "natural"='wetland' OR wetland IN ('bog', 'swamp', 'wet_meadow', 'marsh', 'reedbed', 'saltern', 'tidalflat', 'saltmarsh', 'mangrove') THEN 'wetland' ELSE NULL END; diff --git a/layers/landcover/mapping.yaml b/layers/landcover/mapping.yaml index 2ac8741..295c332 100644 --- a/layers/landcover/mapping.yaml +++ b/layers/landcover/mapping.yaml @@ -1,38 +1,44 @@ + generalized_tables: - + + # etldoc: imposm3 -> osm_landcover_polygon_gen6 + landcover_polygon_gen6: + source: landcover_polygon_gen5 + sql_filter: area>15000000 + tolerance: 300.0 + # etldoc: imposm3 -> osm_landcover_polygon_gen5 landcover_polygon_gen5: source: landcover_polygon_gen4 - sql_filter: area>15000000 - tolerance: 300.0 + sql_filter: area>4200000 + tolerance: 200.0 # etldoc: imposm3 -> osm_landcover_polygon_gen4 landcover_polygon_gen4: source: landcover_polygon_gen3 - sql_filter: area>4200000 - tolerance: 200.0 - - # etldoc: imposm3 -> osm_landcover_polygon_gen3 - landcover_polygon_gen3: - source: landcover_polygon_gen2 sql_filter: area>1200000 tolerance: 120.0 - # etldoc: imposm3 -> osm_landcover_polygon_gen2 - landcover_polygon_gen2: - source: landcover_polygon_gen1 + # etldoc: imposm3 -> osm_landcover_polygon_gen3 + landcover_polygon_gen3: + source: landcover_polygon_gen2 sql_filter: area>480000 tolerance: 80.0 - # etldoc: imposm3 -> osm_landcover_polygon_gen1 - landcover_polygon_gen1: - source: landcover_polygon + # etldoc: imposm3 -> osm_landcover_polygon_gen2 + landcover_polygon_gen2: + source: landcover_polygon_gen1 sql_filter: area>240000 tolerance: 50.0 + # etldoc: imposm3 -> osm_landcover_polygon_gen1 + landcover_polygon_gen1: + source: landcover_polygon + sql_filter: area>60000 + tolerance: 20.0 + tables: - - # etldoc: imposm3 -> osm_landcover_polygon + # etldoc: imposm3 -> osm_landcover_polygon landcover_polygon: fields: - name: osm_id @@ -61,9 +67,6 @@ tables: - grass - grassland - meadow - - park - - village_green - - recreation_ground - forest natural: - wetland diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 25361be..321ec60 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -1,7 +1,6 @@ -CREATE OR REPLACE FUNCTION landuse_class(landuse TEXT, amenity TEXT, leisure TEXT, boundary TEXT) RETURNS TEXT AS $$ +CREATE OR REPLACE FUNCTION landuse_class(landuse TEXT, amenity TEXT, leisure TEXT) RETURNS TEXT AS $$ SELECT CASE - WHEN leisure IN ('nature_reserve', 'park') OR boundary='national_park' THEN 'park' WHEN amenity IN ('school', 'university', 'kindergarten', 'college', 'library') THEN 'school' WHEN landuse IN('hospital', 'railway', 'cemetery', 'military', 'residential') THEN landuse ELSE NULL @@ -10,73 +9,53 @@ $$ LANGUAGE SQL IMMUTABLE; -- etldoc: ne_50m_urban_areas -> landuse_z4 CREATE OR REPLACE VIEW landuse_z4 AS ( - SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS boundary, scalerank + SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank FROM ne_50m_urban_areas WHERE scalerank <= 2 ); -- etldoc: ne_50m_urban_areas -> landuse_z5 CREATE OR REPLACE VIEW landuse_z5 AS ( - SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS boundary, scalerank + SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank FROM ne_50m_urban_areas ); -- etldoc: ne_10m_urban_areas -> landuse_z6 CREATE OR REPLACE VIEW landuse_z6 AS ( - SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS boundary, scalerank + SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank FROM ne_10m_urban_areas ); --- etldoc: osm_landuse_polygon_gen5 -> landuse_z8 -CREATE OR REPLACE VIEW landuse_z8 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen5 -); - --- etldoc: osm_landuse_polygon_gen4 -> landuse_z9 -CREATE OR REPLACE VIEW landuse_z9 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen4 -); - --- etldoc: osm_landuse_polygon_gen3 -> landuse_z10 -CREATE OR REPLACE VIEW landuse_z10 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen3 -); - --- etldoc: osm_landuse_polygon_gen2 -> landuse_z11 -CREATE OR REPLACE VIEW landuse_z11 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen2 -); - -- etldoc: osm_landuse_polygon_gen1 -> landuse_z12 CREATE OR REPLACE VIEW landuse_z12 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon_gen1 + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon_gen1 ); -- etldoc: osm_landuse_polygon -> landuse_z13 CREATE OR REPLACE VIEW landuse_z13 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon WHERE ST_Area(geometry) > 60000 ); -- etldoc: osm_landuse_polygon -> landuse_z14 CREATE OR REPLACE VIEW landuse_z14 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, boundary, NULL::int as scalerank FROM osm_landuse_polygon + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon ); --- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11 | z12| z13| z14_" ] ; +-- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled", +-- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z12| z13| z14_" ] ; CREATE OR REPLACE FUNCTION layer_landuse(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ SELECT osm_id, geometry, - landuse_class(landuse, amenity, leisure, boundary) AS class, - COALESCE(NULLIF(landuse, ''), NULLIF(amenity, ''), NULLIF(leisure, ''), NULLIF(boundary, '')) AS subclass + landuse_class(landuse, amenity, leisure) AS class, + COALESCE(NULLIF(landuse, ''), NULLIF(amenity, ''), NULLIF(leisure, '')) AS subclass FROM ( -- etldoc: landuse_z4 -> layer_landuse:z4 SELECT * FROM landuse_z4 WHERE zoom_level = 4 UNION ALL - -- etldoc: landuse_z5 -> layer_landuse:z5 + -- etldoc: landuse_z5 -> layer_landuse:z5 SELECT * FROM landuse_z5 WHERE zoom_level = 5 UNION ALL @@ -84,29 +63,17 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ -- etldoc: landuse_z6 -> layer_landuse:z7 -- etldoc: landuse_z6 -> layer_landuse:z8 -- etldoc: landuse_z6 -> layer_landuse:z9 - -- etldoc: landuse_z6 -> layer_landuse:z10 + -- etldoc: landuse_z6 -> layer_landuse:z10 SELECT * FROM landuse_z6 WHERE zoom_level BETWEEN 6 AND 10 AND scalerank-1 <= zoom_level UNION ALL - -- etldoc: landuse_z8 -> layer_landuse:z8 - SELECT * FROM landuse_z8 WHERE zoom_level = 8 - UNION ALL - -- etldoc: landuse_z9 -> layer_landuse:z9 - SELECT * FROM landuse_z9 WHERE zoom_level = 9 - UNION ALL - -- etldoc: landuse_z10 -> layer_landuse:z10 - SELECT * FROM landuse_z10 WHERE zoom_level = 10 - UNION ALL - -- etldoc: landuse_z11 -> layer_landuse:z11 - SELECT * FROM landuse_z11 WHERE zoom_level = 11 - UNION ALL - -- etldoc: landuse_z12 -> layer_landuse:z12 + -- etldoc: landuse_z12 -> layer_landuse:z12 SELECT * FROM landuse_z12 WHERE zoom_level = 12 UNION ALL - -- etldoc: landuse_z13 -> layer_landuse:z13 + -- etldoc: landuse_z13 -> layer_landuse:z13 SELECT * FROM landuse_z13 WHERE zoom_level = 13 UNION ALL - -- etldoc: landuse_z14 -> layer_landuse:z14_ + -- etldoc: landuse_z14 -> layer_landuse:z14 SELECT * FROM landuse_z14 WHERE zoom_level >= 14 ) AS zoom_levels WHERE geometry && bbox; diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml index 76bffe8..dc3b7ea 100644 --- a/layers/landuse/mapping.yaml +++ b/layers/landuse/mapping.yaml @@ -1,37 +1,17 @@ generalized_tables: - - # etldoc: imposm3 -> osm_landuse_polygon_gen5 - landuse_polygon_gen5: - source: landuse_polygon_gen4 - sql_filter: area>15000000 - tolerance: 300.0 - - # etldoc: imposm3 -> osm_landuse_polygon_gen4 - landuse_polygon_gen4: - source: landuse_polygon_gen3 - sql_filter: area>4200000 - tolerance: 200.0 - - # etldoc: imposm3 -> osm_landuse_polygon_gen3 - landuse_polygon_gen3: - source: landuse_polygon_gen2 - sql_filter: area>1200000 - tolerance: 120.0 - - # etldoc: imposm3 -> osm_landuse_polygon_gen2 + # etldoc: imposm3 -> osm_landuse_polygon_gen2 landuse_polygon_gen2: source: landuse_polygon_gen1 - sql_filter: area>480000 - tolerance: 80.0 - - # etldoc: imposm3 -> osm_landuse_polygon_gen1 - landuse_polygon_gen1: - source: landuse_polygon sql_filter: area>240000 tolerance: 50.0 -tables: + # etldoc: imposm3 -> osm_landuse_polygon_gen1 + landuse_polygon_gen1: + source: landuse_polygon + sql_filter: area>60000 + tolerance: 20.0 +tables: # etldoc: imposm3 -> osm_landuse_polygon landuse_polygon: type: polygon @@ -49,9 +29,6 @@ tables: - name: leisure key: leisure type: string - - name: boundary - key: boundary - type: string - name: area type: pseudoarea mapping: @@ -66,8 +43,10 @@ tables: - railway - cemetery - military + # zoning + - residential + - commercial + - industrial + - retail leisure: - - nature_reserve - - park - boundary: - - national_park + - stadium From 09dddebac412eb3c24e3539078091432c37eb971 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Mon, 28 Nov 2016 19:16:27 +0000 Subject: [PATCH 04/30] Add park layer --- layers/park/class.sql | 7 ++++ layers/park/layer.sql | 46 +++++++++++++++++++++++++++ layers/park/mapping.yaml | 69 ++++++++++++++++++++++++++++++++++++++++ layers/park/park.yaml | 22 +++++++++++++ openmaptiles.yaml | 1 + 5 files changed, 145 insertions(+) create mode 100644 layers/park/class.sql create mode 100644 layers/park/layer.sql create mode 100644 layers/park/mapping.yaml create mode 100644 layers/park/park.yaml diff --git a/layers/park/class.sql b/layers/park/class.sql new file mode 100644 index 0000000..2b2837f --- /dev/null +++ b/layers/park/class.sql @@ -0,0 +1,7 @@ +CREATE OR REPLACE FUNCTION park_class(landuse TEXT, leisure TEXT, boundary TEXT) RETURNS TEXT AS $$ + SELECT CASE + WHEN leisure = 'nature_reserve' OR boundary='national_park' THEN 'national_park' + WHEN landuse IN ('recreation_ground', 'village_green') or leisure = 'park' THEN 'public_park' + ELSE NULL + END; +$$ LANGUAGE SQL IMMUTABLE; diff --git a/layers/park/layer.sql b/layers/park/layer.sql new file mode 100644 index 0000000..cb8ac25 --- /dev/null +++ b/layers/park/layer.sql @@ -0,0 +1,46 @@ +-- etldoc: layer_park[shape=record fillcolor=lightpink, style="rounded,filled", +-- etldoc: label="layer_park | z8 | z9 | z10 | z11 | z12| z13| z14_" ] ; + +CREATE OR REPLACE FUNCTION layer_park(bbox geometry, zoom_level int) +RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ + SELECT osm_id, geometry, + park_class(landuse, leisure, boundary) AS class, + COALESCE(NULLIF(landuse, ''), NULLIF(leisure, ''), NULLIF(boundary, '')) AS subclass + FROM ( + -- etldoc: osm_park_polygon_gen6 -> layer_park:z8 + SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon_gen6 + WHERE zoom_level = 8 + UNION ALL + -- etldoc: osm_park_polygon_gen5 -> layer_park:z9 + SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon_gen5 + WHERE zoom_level = 9 + UNION ALL + -- etldoc: osm_park_polygon_gen4 -> layer_park:z10 + SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon_gen4 + WHERE zoom_level = 10 + UNION ALL + -- etldoc: osm_park_polygon_gen3 -> layer_park:z11 + SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon_gen3 + WHERE zoom_level = 11 + UNION ALL + -- etldoc: osm_park_polygon_gen2 -> layer_park:z12 + SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon_gen2 + WHERE zoom_level = 12 + UNION ALL + -- etldoc: osm_park_polygon_gen1 -> layer_park:z13 + SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon_gen1 + WHERE zoom_level = 13 + UNION ALL + -- etldoc: osm_park_polygon -> layer_park:z14 + SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon + WHERE zoom_level >= 14 + ) AS zoom_levels + WHERE geometry && bbox; +$$ LANGUAGE SQL IMMUTABLE; diff --git a/layers/park/mapping.yaml b/layers/park/mapping.yaml new file mode 100644 index 0000000..167e98b --- /dev/null +++ b/layers/park/mapping.yaml @@ -0,0 +1,69 @@ +generalized_tables: + + # etldoc: imposm3 -> osm_park_polygon_gen6 + park_polygon_gen6: + source: park_polygon_gen5 + sql_filter: area>15000000 + tolerance: 300.0 + + # etldoc: imposm3 -> osm_park_polygon_gen5 + park_polygon_gen5: + source: park_polygon_gen4 + sql_filter: area>4200000 + tolerance: 200.0 + + # etldoc: imposm3 -> osm_park_polygon_gen4 + park_polygon_gen4: + source: park_polygon_gen3 + sql_filter: area>1200000 + tolerance: 120.0 + + # etldoc: imposm3 -> osm_park_polygon_gen3 + park_polygon_gen3: + source: park_polygon_gen2 + sql_filter: area>480000 + tolerance: 80.0 + + # etldoc: imposm3 -> osm_park_polygon_gen2 + park_polygon_gen2: + source: park_polygon_gen1 + sql_filter: area>240000 + tolerance: 50.0 + + # etldoc: imposm3 -> osm_park_polygon_gen1 + park_polygon_gen1: + source: park_polygon + sql_filter: area>60000 + tolerance: 20.0 + +tables: + + # etldoc: imposm3 -> osm_park_polygon + park_polygon: + type: polygon + fields: + - name: osm_id + type: id + - name: geometry + type: validated_geometry + - name: landuse + key: landuse + type: string + - name: leisure + key: leisure + type: string + - name: boundary + key: boundary + type: string + - name: area + type: pseudoarea + mapping: + landuse: + - park + - village_green + - recreation_ground + leisure: + - nature_reserve + - park + boundary: + - national_park diff --git a/layers/park/park.yaml b/layers/park/park.yaml new file mode 100644 index 0000000..575f83a --- /dev/null +++ b/layers/park/park.yaml @@ -0,0 +1,22 @@ +layer: + id: "park" + description: | + Landuse is used to describe use of land by humans.At lower zoom levels this is + from Natural Earth data for residential (urban) areas and at higher zoom levels mostly OSM `landuse` tags. + buffer_size: 4 + fields: + class: | + More generalized groups of either `park`, `school`, `hospital`, `railway`, + `cemetery`, `military`, `residential`. Use this to assign general for landuse. + subclass: | + Original value of either the `amenity`, `landuse`, `leisure` or `boundary` tag. + Use this to do more precise styling. + datasource: + geometry_field: geometry + query: (SELECT geometry, class, subclass FROM layer_park(!bbox!, z(!scale_denominator!))) AS t +schema: + - ./class.sql + - ./layer.sql +datasources: + - type: imposm3 + mapping_file: ./mapping.yaml diff --git a/openmaptiles.yaml b/openmaptiles.yaml index 0ab0126..5944289 100644 --- a/openmaptiles.yaml +++ b/openmaptiles.yaml @@ -12,6 +12,7 @@ tileset: - layers/water/water.yaml - layers/waterway/waterway.yaml - layers/landcover/landcover.yaml + - layers/park/park.yaml - layers/landuse/landuse.yaml name: OpenMapTiles v1.0 description: "A tileset showcasing all layers in OpenMapTiles. http://openmaptiles.org" From 30747a3bc89e51b19d5654bf77d4d88761cf95a4 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Tue, 29 Nov 2016 09:44:59 +0000 Subject: [PATCH 05/30] Use different generalization levels at zooms --- docker-compose.yml | 2 +- layers/water/mapping.yaml | 30 +++++++++++++++++++--------- layers/water/water.sql | 41 +++++++++++++++++++++++++++++++-------- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8e3e8ed..170787e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: links: - postgres import-water: - image: "openmaptiles/import-water" + image: "openmaptiles/import-water:0.2" env_file: .env links: - postgres diff --git a/layers/water/mapping.yaml b/layers/water/mapping.yaml index feee49b..a19fb35 100644 --- a/layers/water/mapping.yaml +++ b/layers/water/mapping.yaml @@ -1,22 +1,34 @@ generalized_tables: + # etldoc: imposm3 -> osm_water_polygon_gen5 + water_polygon_gen5: + source: water_polygon_gen4 + sql_filter: area>10000000.0 + tolerance: 320.0 + + # etldoc: imposm3 -> osm_water_polygon_gen4 + water_polygon_gen4: + source: water_polygon_gen3 + sql_filter: area>5000000.0 + tolerance: 160.0 + # etldoc: imposm3 -> osm_water_polygon_gen3 water_polygon_gen3: - source: water_polygon - sql_filter: area>15000000.0 AND waterway = '' - tolerance: 350.0 + source: water_polygon_gen2 + sql_filter: area>2500000.0 + tolerance: 80.0 - # etldoc: imposm3 -> osm_water_polygon_gen2 + # etldoc: imposm3 -> osm_water_polygon_gen2 water_polygon_gen2: - source: water_polygon - sql_filter: area>2000000 AND waterway = '' - tolerance: 200.0 + source: water_polygon_gen1 + sql_filter: area>1000000 + tolerance: 40.0 - # etldoc: imposm3 -> osm_water_polygon_gen1 + # etldoc: imposm3 -> osm_water_polygon_gen1 water_polygon_gen1: source: water_polygon sql_filter: area>500000 AND waterway = '' - tolerance: 100.0 + tolerance: 20.0 tables: diff --git a/layers/water/water.sql b/layers/water/water.sql index a6cc0df..1823ac0 100644 --- a/layers/water/water.sql +++ b/layers/water/water.sql @@ -56,8 +56,8 @@ CREATE OR REPLACE VIEW water_z7 AS ( -- etldoc: ne_10m_ocean -> water_z7 SELECT geom, 'ocean'::text 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 + -- etldoc: osm_water_polygon_gen3 -> water_z7 + SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen5 ); CREATE OR REPLACE VIEW water_z8 AS ( @@ -65,30 +65,53 @@ CREATE OR REPLACE VIEW water_z8 AS ( SELECT geom, 'ocean'::text 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 + SELECT geometry AS geom, 'lake' AS class FROM osm_water_polygon_gen4 ); CREATE OR REPLACE VIEW water_z9 AS ( + -- etldoc: osm_ocean_polygon_gen3 -> water_z9 + SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen3 + UNION ALL -- etldoc: osm_water_polygon_gen1 -> water_z9 - SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen1 + SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen3 +); + +CREATE OR REPLACE VIEW water_z10 AS ( + -- etldoc: osm_ocean_polygon_gen2 -> water_z10 + SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen2 + UNION ALL + -- etldoc: osm_water_polygon_gen2 -> water_z10 + SELECT geometry AS geom, 'lake'::text AS class FROM osm_water_polygon_gen2 ); 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 + -- etldoc: osm_ocean_polygon_gen1 -> water_z11 + SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon_gen1 + UNION ALL + -- etldoc: osm_water_polygon -> water_z11 + SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon_gen1 WHERE area > 40000 ); CREATE OR REPLACE VIEW water_z12 AS ( + -- etldoc: osm_ocean_polygon_gen1 -> water_z12 + SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon + UNION ALL -- 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_ocean_polygon -> water_z13 + SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon + UNION ALL -- 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_ocean_polygon -> water_z14 + SELECT geometry AS geom, 'ocean'::text AS class FROM osm_ocean_polygon + UNION ALL -- etldoc: osm_water_polygon -> water_z14 SELECT geometry AS geom, water_class(waterway) AS class FROM osm_water_polygon ); @@ -124,9 +147,11 @@ RETURNS TABLE(geom geometry, class text) AS $$ -- 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:z9 + SELECT * FROM water_z9 WHERE zoom_level = 9 + UNION ALL -- etldoc: water_z9 -> layer_water:z10 - SELECT * FROM water_z9 WHERE zoom_level BETWEEN 9 AND 10 + SELECT * FROM water_z9 WHERE zoom_level = 10 UNION ALL -- etldoc: water_z11 -> layer_water:z11 SELECT * FROM water_z11 WHERE zoom_level = 11 From 6f68ab999dd9efde57eccbb34f687bb543bda252 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Tue, 29 Nov 2016 13:33:33 +0000 Subject: [PATCH 06/30] Ensure empty name is NULL in waterway --- layers/waterway/waterway.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql index 293b0de..a5439db 100644 --- a/layers/waterway/waterway.sql +++ b/layers/waterway/waterway.sql @@ -55,7 +55,7 @@ CREATE OR REPLACE VIEW waterway_z14 AS ( CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int) RETURNS TABLE(geometry geometry, class text, name text) AS $$ - SELECT geometry, class, name FROM ( + SELECT geometry, class, NULLIF(name, '') AS name FROM ( -- etldoc: waterway_z3 -> layer_waterway:z3 SELECT * FROM waterway_z3 WHERE zoom_level = 3 UNION ALL From 6c4ac01dfbf509c33cdf3564feed97276eabfa12 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Tue, 29 Nov 2016 14:00:32 +0000 Subject: [PATCH 07/30] More intermediate zoom levels for residential --- layers/landuse/landuse.sql | 32 +++++++++++++++++++++++++------- layers/landuse/mapping.yaml | 8 ++++++-- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 321ec60..961a7df 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -4,7 +4,7 @@ CREATE OR REPLACE FUNCTION landuse_class(landuse TEXT, amenity TEXT, leisure TEX WHEN amenity IN ('school', 'university', 'kindergarten', 'college', 'library') THEN 'school' WHEN landuse IN('hospital', 'railway', 'cemetery', 'military', 'residential') THEN landuse ELSE NULL - END; + END; $$ LANGUAGE SQL IMMUTABLE; -- etldoc: ne_50m_urban_areas -> landuse_z4 @@ -26,15 +26,28 @@ CREATE OR REPLACE VIEW landuse_z6 AS ( FROM ne_10m_urban_areas ); +-- etldoc: osm_landuse_polygon_gen3 -> landuse_z10 +CREATE OR REPLACE VIEW landuse_z10 AS ( + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon_gen3 +); + +-- etldoc: osm_landuse_polygon_gen2 -> landuse_z11 +CREATE OR REPLACE VIEW landuse_z11 AS ( + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + FROM osm_landuse_polygon_gen2 +); + -- etldoc: osm_landuse_polygon_gen1 -> landuse_z12 CREATE OR REPLACE VIEW landuse_z12 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon_gen1 + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + FROM osm_landuse_polygon_gen1 ); -- etldoc: osm_landuse_polygon -> landuse_z13 CREATE OR REPLACE VIEW landuse_z13 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon - WHERE ST_Area(geometry) > 60000 + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + FROM osm_landuse_polygon + WHERE ST_Area(geometry) > 20000 ); -- etldoc: osm_landuse_polygon -> landuse_z14 @@ -43,7 +56,7 @@ CREATE OR REPLACE VIEW landuse_z14 AS ( ); -- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z12| z13| z14_" ] ; +-- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11| z12| z13| z14_" ] ; CREATE OR REPLACE FUNCTION layer_landuse(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ @@ -63,9 +76,14 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ -- etldoc: landuse_z6 -> layer_landuse:z7 -- etldoc: landuse_z6 -> layer_landuse:z8 -- etldoc: landuse_z6 -> layer_landuse:z9 - -- etldoc: landuse_z6 -> layer_landuse:z10 SELECT * FROM landuse_z6 - WHERE zoom_level BETWEEN 6 AND 10 AND scalerank-1 <= zoom_level + WHERE zoom_level BETWEEN 6 AND 9 AND scalerank-1 <= zoom_level + UNION ALL + -- etldoc: landuse_z10 -> layer_landuse:z10 + SELECT * FROM landuse_z10 WHERE zoom_level = 10 + UNION ALL + -- etldoc: landuse_z11 -> layer_landuse:z11 + SELECT * FROM landuse_z11 WHERE zoom_level = 11 UNION ALL -- etldoc: landuse_z12 -> layer_landuse:z12 SELECT * FROM landuse_z12 WHERE zoom_level = 12 diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml index dc3b7ea..2ac1f6c 100644 --- a/layers/landuse/mapping.yaml +++ b/layers/landuse/mapping.yaml @@ -1,10 +1,14 @@ generalized_tables: + # etldoc: imposm3 -> osm_landuse_polygon_gen3 + landuse_polygon_gen2: + source: landuse_polygon_gen2 + sql_filter: area>960000 + tolerance: 160.0 # etldoc: imposm3 -> osm_landuse_polygon_gen2 landuse_polygon_gen2: source: landuse_polygon_gen1 sql_filter: area>240000 - tolerance: 50.0 - + tolerance: 40.0 # etldoc: imposm3 -> osm_landuse_polygon_gen1 landuse_polygon_gen1: source: landuse_polygon From f9def56e0b98f2dc00bc5ff31b5fc89478f849e7 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Tue, 29 Nov 2016 15:08:23 +0000 Subject: [PATCH 08/30] Leave names empty for NE data due to different names --- layers/waterway/waterway.sql | 6 +++--- layers/waterway/waterway.yaml | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql index a5439db..5713fb4 100644 --- a/layers/waterway/waterway.sql +++ b/layers/waterway/waterway.sql @@ -1,19 +1,19 @@ -- etldoc: ne_110m_rivers_lake_centerlines -> waterway_z3 CREATE OR REPLACE VIEW waterway_z3 AS ( - SELECT geom AS geometry, 'river'::text AS class, name FROM ne_110m_rivers_lake_centerlines + SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_110m_rivers_lake_centerlines WHERE featurecla = 'River' ); -- etldoc: ne_50m_rivers_lake_centerlines -> waterway_z4 CREATE OR REPLACE VIEW waterway_z4 AS ( - SELECT geom AS geometry, 'river'::text AS class, name FROM ne_50m_rivers_lake_centerlines + SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_50m_rivers_lake_centerlines WHERE featurecla = 'River' ); -- etldoc: ne_10m_rivers_lake_centerlines -> waterway_z6 CREATE OR REPLACE VIEW waterway_z6 AS ( - SELECT geom AS geometry, 'river'::text AS class, name FROM ne_10m_rivers_lake_centerlines + SELECT geom AS geometry, 'river'::text AS class, NULL AS name FROM ne_10m_rivers_lake_centerlines WHERE featurecla = 'River' ); diff --git a/layers/waterway/waterway.yaml b/layers/waterway/waterway.yaml index f03dde4..187a329 100644 --- a/layers/waterway/waterway.yaml +++ b/layers/waterway/waterway.yaml @@ -1,12 +1,15 @@ layer: id: "waterway" description: | - Rivers based of OpenStreetMap [waterways](http://wiki.openstreetmap.org/wiki/Waterways) for *z8* to *z14* - and Natural Earth rivers and lake centerlines from *z3* to *z7*. - Too short linestrings are filtered out for some zoom levels. Waterways do no not have a `subclass`. + Rivers based of OpenStreetMap [waterways](http://wiki.openstreetmap.org/wiki/Waterways) for *z9* to *z14* + and Natural Earth rivers and lake centerlines from *z3* to *z8*. + Linestrings without a name or which are too short are filtered + out at low zoom levels. Waterways do no not have a `subclass` field. buffer_size: 4 fields: - name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway or the name from Natural Earth for lower zoom levels. + name: | + The OSM [`name`](http://wiki.openstreetmap.org/wiki/Key:name) value of the waterway. + The `name` field is empty for NaturalEarth data until **z9** when OSM data is used. class: | The original value of the [`waterway`](http://wiki.openstreetmap.org/wiki/Key:waterway) tag. Can be one of [`stream`](http://wiki.openstreetmap.org/wiki/Tag:waterway%3Dstream), From 6bc06a683a9f255930d344aba441187b1b3bcbef Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Tue, 29 Nov 2016 19:13:38 +0000 Subject: [PATCH 09/30] Show water names without centerlines --- layers/water_name/layer.sql | 14 ++++++++++---- .../{merge_lakelines.sql => water_lakeline.sql} | 5 +++-- layers/water_name/water_name.yaml | 3 ++- layers/water_name/water_point.sql | 11 +++++++++++ 4 files changed, 26 insertions(+), 7 deletions(-) rename layers/water_name/{merge_lakelines.sql => water_lakeline.sql} (74%) create mode 100644 layers/water_name/water_point.sql diff --git a/layers/water_name/layer.sql b/layers/water_name/layer.sql index 8c9e866..b8935da 100644 --- a/layers/water_name/layer.sql +++ b/layers/water_name/layer.sql @@ -1,16 +1,22 @@ --- etldoc: layer_water_name[shape=record fillcolor=lightpink, style="rounded,filled", +-- etldoc: layer_water_name[shape=record fillcolor=lightpink, style="rounded,filled", -- etldoc: label="layer_water_name | z9_13 | z14_" ] ; CREATE OR REPLACE FUNCTION layer_water_name(bbox geometry, zoom_level integer) RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class text) AS $$ -- etldoc: osm_water_lakeline -> layer_water_name:z9_13 - -- etldoc: osm_water_lakeline -> layer_water_name:z14_ + -- etldoc: osm_water_lakeline -> layer_water_name:z14 SELECT osm_id, geometry, name, name_en, 'lake'::text AS class FROM osm_water_lakeline WHERE geometry && bbox - AND name <> '' AND ((zoom_level BETWEEN 9 AND 13 AND LineLabel(zoom_level, NULLIF(name, ''), geometry)) OR (zoom_level >= 14)) - ORDER BY ST_Length(geometry) DESC; + -- etldoc: osm_water_point -> layer_water_name:z9_13 + UNION ALL + SELECT osm_id, geometry, name, name_en, 'lake'::text AS class + FROM osm_water_point + WHERE geometry && bbox AND ( + (zoom_level BETWEEN 9 AND 13 AND area > 70000*2^(20-zoom_level)) + OR (zoom_level >= 14) + ); $$ LANGUAGE SQL IMMUTABLE; diff --git a/layers/water_name/merge_lakelines.sql b/layers/water_name/water_lakeline.sql similarity index 74% rename from layers/water_name/merge_lakelines.sql rename to layers/water_name/water_lakeline.sql index b74b709..da96587 100644 --- a/layers/water_name/merge_lakelines.sql +++ b/layers/water_name/water_lakeline.sql @@ -1,11 +1,12 @@ - -- etldoc: osm_water_polygon -> osm_water_lakeline +-- etldoc: custom_lakeline -> osm_water_lakeline CREATE TABLE IF NOT EXISTS osm_water_lakeline AS ( SELECT wp.osm_id, ll.wkb_geometry AS geometry, - name, name_en + name, name_en, ST_Area(wp.geometry) AS area FROM osm_water_polygon AS wp INNER JOIN lake_centerline ll ON wp.osm_id = ll.osm_id + WHERE wp.name <> '' ); CREATE INDEX IF NOT EXISTS osm_water_lakeline_geometry_idx ON osm_water_lakeline USING gist(geometry); diff --git a/layers/water_name/water_name.yaml b/layers/water_name/water_name.yaml index 33d6b00..e8dfab8 100644 --- a/layers/water_name/water_name.yaml +++ b/layers/water_name/water_name.yaml @@ -16,7 +16,8 @@ layer: srid: 900913 query: (SELECT geometry, name, name_en, class FROM layer_water_name(!bbox!, z(!scale_denominator!))) AS t schema: - - ./merge_lakelines.sql + - ./water_lakeline.sql + - ./water_point.sql - ./layer.sql datasources: - type: imposm3 diff --git a/layers/water_name/water_point.sql b/layers/water_name/water_point.sql new file mode 100644 index 0000000..281957b --- /dev/null +++ b/layers/water_name/water_point.sql @@ -0,0 +1,11 @@ +-- etldoc: osm_water_polygon -> osm_water_lakeline +CREATE TABLE IF NOT EXISTS osm_water_point AS ( + SELECT + wp.osm_id, topoint(wp.geometry) AS geometry, + wp.name, wp.name_en, ST_Area(wp.geometry) AS area + FROM osm_water_polygon AS wp + LEFT JOIN lake_centerline ll ON wp.osm_id = ll.osm_id + WHERE ll.osm_id IS NULL AND wp.name <> '' +); + +CREATE INDEX IF NOT EXISTS osm_water_point_geometry_idx ON osm_water_point USING gist (geometry); From 5ebb33575e7951ba9f38d5bb395aa10753d08642 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Tue, 29 Nov 2016 19:38:02 +0000 Subject: [PATCH 10/30] Move public parks indicating grass to landcover --- layers/landcover/landcover.sql | 30 +++++++++++++++--------------- layers/landcover/mapping.yaml | 9 +++++++++ layers/park/layer.sql | 19 +++++++++---------- layers/park/mapping.yaml | 5 ----- layers/park/park.yaml | 3 +-- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index a0b27ce..a9832bb 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -9,12 +9,12 @@ --); --CREATE INDEX IF NOT EXISTS landcover_grouped_gen2_geometry_idx ON landcover_grouped_gen2 USING gist(geometry); -CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, wetland VARCHAR) RETURNS TEXT AS $$ +CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, leisure VARCHAR, wetland VARCHAR) RETURNS TEXT AS $$ SELECT CASE WHEN landuse IN ('farmland', 'farm', 'orchard', 'vineyard', 'plant_nursery') THEN 'farmland' WHEN "natural" IN ('glacier', 'ice_shelf') THEN 'ice' WHEN "natural"='wood' OR landuse IN ('forest', 'wood') THEN 'wood' - WHEN "natural"='grassland' OR landuse IN ('grass', 'meadow', 'allotments', 'grassland') THEN 'grass' + WHEN "natural"='grassland' OR landuse IN ('grass', 'meadow', 'allotments', 'grassland', 'park', 'village_green', 'recreation_ground') OR leisure='park' THEN 'grass' WHEN "natural"='wetland' OR wetland IN ('bog', 'swamp', 'wet_meadow', 'marsh', 'reedbed', 'saltern', 'tidalflat', 'saltmarsh', 'mangrove') THEN 'wetland' ELSE NULL END; @@ -22,58 +22,58 @@ $$ LANGUAGE SQL IMMUTABLE; -- etldoc: ne_110m_glaciated_areas -> landcover_z0 CREATE OR REPLACE VIEW landcover_z0 AS ( - SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS wetland FROM ne_110m_glaciated_areas + SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_110m_glaciated_areas ); CREATE OR REPLACE VIEW landcover_z2 AS ( -- etldoc: ne_50m_glaciated_areas -> landcover_z2 - SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS wetland FROM ne_50m_glaciated_areas + SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_50m_glaciated_areas UNION ALL -- etldoc: ne_50m_antarctic_ice_shelves_polys -> landcover_z2 - SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS wetland FROM ne_50m_antarctic_ice_shelves_polys + SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_50m_antarctic_ice_shelves_polys ); CREATE OR REPLACE VIEW landcover_z5 AS ( -- etldoc: ne_10m_glaciated_areas -> landcover_z5 - SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS wetland FROM ne_10m_glaciated_areas + SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'glacier'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_glaciated_areas UNION ALL -- etldoc: ne_10m_antarctic_ice_shelves_polys -> landcover_z5 - SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS wetland FROM ne_10m_antarctic_ice_shelves_polys + SELECT NULL::bigint AS osm_id, geom AS geometry, NULL::text AS landuse, 'ice_shelf'::text AS "natural", NULL::text AS leisure, NULL::text AS wetland FROM ne_10m_antarctic_ice_shelves_polys ); CREATE OR REPLACE VIEW landcover_z8 AS ( -- etldoc: osm_landcover_polygon_gen5 -> landcover_z8 - SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen5 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen5 ); CREATE OR REPLACE VIEW landcover_z9 AS ( -- etldoc: osm_landcover_polygon_gen4 -> landcover_z9 - SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen4 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen4 ); CREATE OR REPLACE VIEW landcover_z10 AS ( -- etldoc: osm_landcover_polygon_gen3 -> landcover_z10 - SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen3 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen3 ); CREATE OR REPLACE VIEW landcover_z11 AS ( -- etldoc: osm_landcover_polygon_gen2 -> landcover_z11 - SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen2 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen2 ); CREATE OR REPLACE VIEW landcover_z12 AS ( -- etldoc: osm_landcover_polygon_gen1 -> landcover_z12 - SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon_gen1 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen1 ); CREATE OR REPLACE VIEW landcover_z13 AS ( -- etldoc: osm_landcover_polygon -> landcover_z13 - SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon WHERE ST_Area(geometry) > 60000 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon WHERE ST_Area(geometry) > 60000 ); CREATE OR REPLACE VIEW landcover_z14 AS ( -- etldoc: osm_landcover_polygon -> landcover_z14 - SELECT osm_id, geometry, landuse, "natural", wetland FROM osm_landcover_polygon + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon ); -- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled", @@ -82,7 +82,7 @@ CREATE OR REPLACE VIEW landcover_z14 AS ( CREATE OR REPLACE FUNCTION layer_landcover(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ SELECT osm_id, geometry, - landcover_class(landuse, "natural", wetland) AS class, + landcover_class(landuse, "natural", leisure, wetland) AS class, COALESCE(NULLIF("natural", ''), NULLIF(landuse, ''), NULLIF('wetland', '')) AS subclass FROM ( -- etldoc: landcover_z0 -> layer_landcover:z0 diff --git a/layers/landcover/mapping.yaml b/layers/landcover/mapping.yaml index 295c332..ffa6d7d 100644 --- a/layers/landcover/mapping.yaml +++ b/layers/landcover/mapping.yaml @@ -48,6 +48,9 @@ tables: - name: landuse key: landuse type: string + - name: leisure + key: leisure + type: string - name: natural key: natural type: string @@ -68,9 +71,15 @@ tables: - grassland - meadow - forest + - village_green + - recreation_ground + # There are 600 parks tagged with landuse=park instead of leisure=park + - park natural: - wetland - grassland + leisure: + - park wetland: - bog - swamp diff --git a/layers/park/layer.sql b/layers/park/layer.sql index cb8ac25..31c6210 100644 --- a/layers/park/layer.sql +++ b/layers/park/layer.sql @@ -2,43 +2,42 @@ -- etldoc: label="layer_park | z8 | z9 | z10 | z11 | z12| z13| z14_" ] ; CREATE OR REPLACE FUNCTION layer_park(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) AS $$ SELECT osm_id, geometry, - park_class(landuse, leisure, boundary) AS class, - COALESCE(NULLIF(landuse, ''), NULLIF(leisure, ''), NULLIF(boundary, '')) AS subclass + COALESCE(NULLIF(leisure, ''), NULLIF(boundary, '')) AS class FROM ( -- etldoc: osm_park_polygon_gen6 -> layer_park:z8 - SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon_gen6 WHERE zoom_level = 8 UNION ALL -- etldoc: osm_park_polygon_gen5 -> layer_park:z9 - SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon_gen5 WHERE zoom_level = 9 UNION ALL -- etldoc: osm_park_polygon_gen4 -> layer_park:z10 - SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon_gen4 WHERE zoom_level = 10 UNION ALL -- etldoc: osm_park_polygon_gen3 -> layer_park:z11 - SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon_gen3 WHERE zoom_level = 11 UNION ALL -- etldoc: osm_park_polygon_gen2 -> layer_park:z12 - SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon_gen2 WHERE zoom_level = 12 UNION ALL -- etldoc: osm_park_polygon_gen1 -> layer_park:z13 - SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon_gen1 WHERE zoom_level = 13 UNION ALL -- etldoc: osm_park_polygon -> layer_park:z14 - SELECT osm_id, geometry, landuse, leisure, boundary, NULL::int as scalerank + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon WHERE zoom_level >= 14 ) AS zoom_levels diff --git a/layers/park/mapping.yaml b/layers/park/mapping.yaml index 167e98b..eb7d081 100644 --- a/layers/park/mapping.yaml +++ b/layers/park/mapping.yaml @@ -58,12 +58,7 @@ tables: - name: area type: pseudoarea mapping: - landuse: - - park - - village_green - - recreation_ground leisure: - nature_reserve - - park boundary: - national_park diff --git a/layers/park/park.yaml b/layers/park/park.yaml index 575f83a..28fcad8 100644 --- a/layers/park/park.yaml +++ b/layers/park/park.yaml @@ -13,9 +13,8 @@ layer: Use this to do more precise styling. datasource: geometry_field: geometry - query: (SELECT geometry, class, subclass FROM layer_park(!bbox!, z(!scale_denominator!))) AS t + query: (SELECT geometry, class FROM layer_park(!bbox!, z(!scale_denominator!))) AS t schema: - - ./class.sql - ./layer.sql datasources: - type: imposm3 From 9ba6a0bb0fd53ea7563a8d6daa07abaf31e98578 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 09:06:23 +0000 Subject: [PATCH 11/30] Fix missing column issues with landcover and landuse --- layers/landcover/landcover.sql | 14 +++++++------- layers/landuse/landuse.sql | 6 ++++-- layers/landuse/mapping.yaml | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index a9832bb..b30a1ea 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -98,31 +98,31 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ WHERE zoom_level BETWEEN 5 AND 7 AND geometry && bbox UNION ALL -- etldoc: landcover_z8 -> layer_landcover:z8 - SELECT osm_id, geometry, landuse, "natural", wetland + SELECT * FROM landcover_z8 WHERE zoom_level = 8 AND geometry && bbox UNION ALL -- etldoc: landcover_z9 -> layer_landcover:z9 - SELECT osm_id, geometry, landuse, "natural", wetland + SELECT * FROM landcover_z9 WHERE zoom_level = 9 AND geometry && bbox UNION ALL -- etldoc: landcover_z10 -> layer_landcover:z10 - SELECT osm_id, geometry, landuse, "natural", wetland + SELECT * FROM landcover_z10 WHERE zoom_level = 10 AND geometry && bbox UNION ALL -- etldoc: landcover_z11 -> layer_landcover:z11 - SELECT osm_id, geometry, landuse, "natural", wetland + SELECT * FROM landcover_z11 WHERE zoom_level = 11 AND geometry && bbox UNION ALL -- etldoc: landcover_z12 -> layer_landcover:z12 - SELECT osm_id, geometry, landuse, "natural", wetland + SELECT * FROM landcover_z12 WHERE zoom_level = 12 AND geometry && bbox UNION ALL -- etldoc: landcover_z13 -> layer_landcover:z13 - SELECT osm_id, ST_Simplify(geometry, 10) AS geometry, landuse, "natural", wetland + SELECT * FROM landcover_z13 WHERE zoom_level = 13 AND geometry && bbox UNION ALL -- etldoc: landcover_z14 -> layer_landcover:z14_ - SELECT osm_id, geometry, landuse, "natural", wetland + SELECT * FROM landcover_z14 WHERE zoom_level >= 14 AND geometry && bbox ) AS zoom_levels; $$ LANGUAGE SQL IMMUTABLE; diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 961a7df..49e5bc1 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -28,7 +28,8 @@ CREATE OR REPLACE VIEW landuse_z6 AS ( -- etldoc: osm_landuse_polygon_gen3 -> landuse_z10 CREATE OR REPLACE VIEW landuse_z10 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon_gen3 + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + FROM osm_landuse_polygon_gen3 ); -- etldoc: osm_landuse_polygon_gen2 -> landuse_z11 @@ -52,7 +53,8 @@ CREATE OR REPLACE VIEW landuse_z13 AS ( -- etldoc: osm_landuse_polygon -> landuse_z14 CREATE OR REPLACE VIEW landuse_z14 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + FROM osm_landuse_polygon ); -- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled", diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml index 2ac1f6c..c3c1d57 100644 --- a/layers/landuse/mapping.yaml +++ b/layers/landuse/mapping.yaml @@ -1,6 +1,6 @@ generalized_tables: # etldoc: imposm3 -> osm_landuse_polygon_gen3 - landuse_polygon_gen2: + landuse_polygon_gen3: source: landuse_polygon_gen2 sql_filter: area>960000 tolerance: 160.0 From dd0ba386333d571eba6c21e04d3955add9423f6e Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 09:09:12 +0000 Subject: [PATCH 12/30] Fix always wetland subclass --- layers/landcover/landcover.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index b30a1ea..d2d6199 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -83,7 +83,10 @@ CREATE OR REPLACE FUNCTION layer_landcover(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ SELECT osm_id, geometry, landcover_class(landuse, "natural", leisure, wetland) AS class, - COALESCE(NULLIF("natural", ''), NULLIF(landuse, ''), NULLIF('wetland', '')) AS subclass + COALESCE( + NULLIF("natural", ''), NULLIF(landuse, ''), + NULLIF(leisure, ''), NULLIF(wetland, '') + ) AS subclass FROM ( -- etldoc: landcover_z0 -> layer_landcover:z0 SELECT * FROM landcover_z0 From 7ca0fc6646ea7d4fd420d979f80330cf41e364ad Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 09:31:44 +0000 Subject: [PATCH 13/30] Remove subclass for landuse --- layers/landuse/landuse.sql | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 49e5bc1..9fe3de6 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -1,12 +1,3 @@ - -CREATE OR REPLACE FUNCTION landuse_class(landuse TEXT, amenity TEXT, leisure TEXT) RETURNS TEXT AS $$ - SELECT CASE - WHEN amenity IN ('school', 'university', 'kindergarten', 'college', 'library') THEN 'school' - WHEN landuse IN('hospital', 'railway', 'cemetery', 'military', 'residential') THEN landuse - ELSE NULL - END; -$$ LANGUAGE SQL IMMUTABLE; - -- etldoc: ne_50m_urban_areas -> landuse_z4 CREATE OR REPLACE VIEW landuse_z4 AS ( SELECT NULL::bigint AS osm_id, geom AS geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank @@ -61,10 +52,13 @@ CREATE OR REPLACE VIEW landuse_z14 AS ( -- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11| z12| z13| z14_" ] ; CREATE OR REPLACE FUNCTION layer_landuse(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) AS $$ SELECT osm_id, geometry, - landuse_class(landuse, amenity, leisure) AS class, - COALESCE(NULLIF(landuse, ''), NULLIF(amenity, ''), NULLIF(leisure, '')) AS subclass + COALESCE( + NULLIF(landuse, ''), + NULLIF(amenity, ''), + NULLIF(leisure, '') + ) AS class FROM ( -- etldoc: landuse_z4 -> layer_landuse:z4 SELECT * FROM landuse_z4 From 4a902ca27343d4d0c2c92bc40c75d31c6aa36c5d Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 09:31:54 +0000 Subject: [PATCH 14/30] Extend docs for park, landuse, landcover --- layers/landcover/landcover.yaml | 11 ++++++----- layers/landuse/landuse.yaml | 17 +++++++++++------ layers/park/park.yaml | 9 ++------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/layers/landcover/landcover.yaml b/layers/landcover/landcover.yaml index dc3f6a5..d638ad9 100644 --- a/layers/landcover/landcover.yaml +++ b/layers/landcover/landcover.yaml @@ -2,16 +2,17 @@ layer: id: "landcover" description: | Landcover is used to describe the physical material at the surface of the earth. At lower zoom levels this is - from Natural Earth data for glaciers and ice shelves and at higher zoom levels the landcover is implied - by OSM tags (like `landuse` or `natural`). + from Natural Earth data for glaciers and ice shelves and at higher zoom levels the [landcover is [implied by OSM tags](http://wiki.openstreetmap.org/wiki/Landcover). The most common use case for this layer + is to style wood (`class=wood`) and grass (`class=`grass`) areas. buffer_size: 4 fields: class: | - More generalized groups of either `farmland`, `ice`, `wood`, `grass` or `wetland`. + More generalized groups of either `farmland`, `ice`, `wood`, `grass` + or `wetland`. Use this to assign general colors to the landcover. subclass: | - Original value of either the `landuse`, `natural` or `wetland` tag. - Use this to do more precise styling. + Original value of either the `landuse`, `natural`, `leisure` or + `wetland` tag. Use this to do more precise styling. datasource: geometry_field: geometry query: (SELECT geometry, class, subclass FROM layer_landcover(!bbox!, z(!scale_denominator!))) AS t diff --git a/layers/landuse/landuse.yaml b/layers/landuse/landuse.yaml index 8abc929..35c57ff 100644 --- a/layers/landuse/landuse.yaml +++ b/layers/landuse/landuse.yaml @@ -6,14 +6,19 @@ layer: buffer_size: 4 fields: class: | - More generalized groups of either `park`, `school`, `hospital`, `railway`, - `cemetery`, `military`, `residential`. Use this to assign general for landuse. - subclass: | - Original value of either the `amenity`, `landuse`, `leisure` or `boundary` tag. - Use this to do more precise styling. + Original value of either the `amenity`, `landuse`, `leisure` + tag. Use this to assign special colors to areas. + Either `school`, `university`, `kindergarten`, `college`, + `library`, `hospital` (from the + [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity) key) + or `railway`, `cemetery`, `military`, `residential`, + `commercial`, `industrial`, `retail` (from the + [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse) key) + as well as `stadium` (from the + [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure) key). datasource: geometry_field: geometry - query: (SELECT geometry, class, subclass FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t + query: (SELECT geometry, class FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t schema: - ./landuse.sql datasources: diff --git a/layers/park/park.yaml b/layers/park/park.yaml index 28fcad8..9068135 100644 --- a/layers/park/park.yaml +++ b/layers/park/park.yaml @@ -1,16 +1,11 @@ layer: id: "park" description: | - Landuse is used to describe use of land by humans.At lower zoom levels this is - from Natural Earth data for residential (urban) areas and at higher zoom levels mostly OSM `landuse` tags. + The park layer contains parks from OpenStreetMap tagged with either [`boundary=national_park`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dnational_park) or [`leisure=nature_reserve`](http://wiki.openstreetmap.org/wiki/Tag:leisure%3Dnature_reserve). buffer_size: 4 fields: class: | - More generalized groups of either `park`, `school`, `hospital`, `railway`, - `cemetery`, `military`, `residential`. Use this to assign general for landuse. - subclass: | - Original value of either the `amenity`, `landuse`, `leisure` or `boundary` tag. - Use this to do more precise styling. + Either `national_park` or `nature_reserve`. datasource: geometry_field: geometry query: (SELECT geometry, class FROM layer_park(!bbox!, z(!scale_denominator!))) AS t From be81fb99e3730056937e63276aa3824253bd6ca0 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 09:59:49 +0000 Subject: [PATCH 15/30] Set image versions for import-lakelines and import-natural-earth --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index fd79506..b9e79c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: - "5432" env_file: .env import-natural-earth: - image: "openmaptiles/import-natural-earth" + image: "openmaptiles/import-natural-earth:1.0" env_file: .env links: - postgres @@ -20,7 +20,7 @@ services: links: - postgres import-lakelines: - image: "openmaptiles/import-lakelines" + image: "openmaptiles/import-lakelines:0.9" env_file: .env links: - postgres From 915cd2bde3edc7e6fb10cc6418f76757c578d0f7 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 11:20:59 +0000 Subject: [PATCH 16/30] Add possible values for landcover, landuse, park doc --- layers/landcover/landcover.yaml | 49 ++++++++++++++++++++++++++++----- layers/landuse/landuse.yaml | 33 ++++++++++++++-------- layers/park/park.yaml | 8 ++++-- 3 files changed, 70 insertions(+), 20 deletions(-) diff --git a/layers/landcover/landcover.yaml b/layers/landcover/landcover.yaml index d638ad9..95f86ac 100644 --- a/layers/landcover/landcover.yaml +++ b/layers/landcover/landcover.yaml @@ -6,13 +6,48 @@ layer: is to style wood (`class=wood`) and grass (`class=`grass`) areas. buffer_size: 4 fields: - class: | - More generalized groups of either `farmland`, `ice`, `wood`, `grass` - or `wetland`. - Use this to assign general colors to the landcover. - subclass: | - Original value of either the `landuse`, `natural`, `leisure` or - `wetland` tag. Use this to do more precise styling. + class: + description: | + Use the **class** to assign natural colors for **landcover**. + values: + - farmland + - ice + - wood + - grass + - wetland + subclass: + description: | + Use **subclass** to do more precise styling. + Original value of either the + [`natural`](http://wiki.openstreetmap.org/wiki/Key:natural), + [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse), + ,[`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure), + or [`wetland`](http://wiki.openstreetmap.org/wiki/Key:wetland) tag. + values: + - allotments + - farm + - farmland + - orchard + - plant_nursery + - vineyard + - grass + - grassland + - meadow + - forest + - village_green + - recreation_ground + - park + - wetland + - grassland + - bog + - swamp + - wet_meadow + - marsh + - reedbed + - saltern + - tidalflat + - saltmarsh + - mangrove datasource: geometry_field: geometry query: (SELECT geometry, class, subclass FROM layer_landcover(!bbox!, z(!scale_denominator!))) AS t diff --git a/layers/landuse/landuse.yaml b/layers/landuse/landuse.yaml index 35c57ff..32f851b 100644 --- a/layers/landuse/landuse.yaml +++ b/layers/landuse/landuse.yaml @@ -5,17 +5,28 @@ layer: from Natural Earth data for residential (urban) areas and at higher zoom levels mostly OSM `landuse` tags. buffer_size: 4 fields: - class: | - Original value of either the `amenity`, `landuse`, `leisure` - tag. Use this to assign special colors to areas. - Either `school`, `university`, `kindergarten`, `college`, - `library`, `hospital` (from the - [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity) key) - or `railway`, `cemetery`, `military`, `residential`, - `commercial`, `industrial`, `retail` (from the - [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse) key) - as well as `stadium` (from the - [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure) key). + class: + description: | + Use the **class** to assign special colors to areas. + Original value of either the + [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity), + [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse), + or [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure) tag. + values: + - school + - university + - kindergarten + - college + - library + - hospital + - railway + - cemetery + - military + - residential + - commercial + - industrial + - retail + - stadium datasource: geometry_field: geometry query: (SELECT geometry, class FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t diff --git a/layers/park/park.yaml b/layers/park/park.yaml index 9068135..9fa2ebf 100644 --- a/layers/park/park.yaml +++ b/layers/park/park.yaml @@ -4,8 +4,12 @@ layer: The park layer contains parks from OpenStreetMap tagged with either [`boundary=national_park`](http://wiki.openstreetmap.org/wiki/Tag:boundary%3Dnational_park) or [`leisure=nature_reserve`](http://wiki.openstreetmap.org/wiki/Tag:leisure%3Dnature_reserve). buffer_size: 4 fields: - class: | - Either `national_park` or `nature_reserve`. + class: + description: | + Use the **class** to differentiate between different parks. + values: + - national_park + - nature_reserve datasource: geometry_field: geometry query: (SELECT geometry, class FROM layer_park(!bbox!, z(!scale_denominator!))) AS t From 071201fe526b1d03acc99b11cb1f2deb941b6ee6 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 12:16:20 +0000 Subject: [PATCH 17/30] No render_height attributes on z13 --- layers/building/building.sql | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/layers/building/building.sql b/layers/building/building.sql index f75ea61..1db198a 100644 --- a/layers/building/building.sql +++ b/layers/building/building.sql @@ -1,22 +1,23 @@ - - - --- 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 | z14_ " ] ; 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 $$ - SELECT geometry, osm_id, - greatest(5, COALESCE(height, levels*3.66,5))::int AS render_height, - greatest(0, COALESCE(min_height, min_level*3.66,0))::int AS render_min_height + SELECT geometry, osm_id, render_height, render_min_height FROM ( - -- etldoc: osm_building_polygon_gen1 -> layer_building:z13 - SELECT osm_id, geometry, height, levels, min_height, min_level FROM osm_building_polygon_gen1 + SELECT + osm_id, geometry, + NULL::int AS render_height, NULL::int AS render_min_height + FROM osm_building_polygon_gen1 WHERE zoom_level = 13 AND geometry && bbox AND area > 1400 UNION ALL -- etldoc: osm_building_polygon -> layer_building:z14_ - SELECT osm_id, geometry, height, levels, min_height, min_level FROM osm_building_polygon + SELECT + osm_id, geometry, + greatest(5, COALESCE(height, levels*3.66,5))::int AS render_height, + greatest(0, COALESCE(min_height, min_level*3.66,0))::int AS render_min_height + FROM osm_building_polygon WHERE zoom_level >= 14 AND geometry && bbox ) AS zoom_levels ORDER BY render_height ASC, ST_YMin(geometry) DESC; From eb847606bb911b5e19732fcd5d58a9ae1490b555 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 13:43:28 +0000 Subject: [PATCH 18/30] Ensure nameless POI have biggest rank --- layers/poi/layer.sql | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/layers/poi/layer.sql b/layers/poi/layer.sql index 78e61b3..c0a75ba 100644 --- a/layers/poi/layer.sql +++ b/layers/poi/layer.sql @@ -4,11 +4,12 @@ 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 $$ - SELECT osm_id, geometry, name, NULLIF(name_en, ''), poi_class(subclass) AS class, subclass, + SELECT osm_id, geometry, NULLIF(name, ''), NULLIF(name_en, ''), poi_class(subclass) AS class, subclass, row_number() OVER ( PARTITION BY LabelGrid(geometry, 100 * pixel_width) - ORDER BY poi_class_rank(poi_class(subclass)) ASC, - length(name) DESC NULLS LAST + ORDER BY + CASE WHEN name = '' THEN 1 ELSE 0 END ASC, + poi_class_rank(poi_class(subclass)) ASC )::int AS "rank" FROM ( -- etldoc: osm_poi_point -> layer_poi:z14 From 1ef69a9fd8bc4692f365f1c84bdd370ecff9d230 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 14:04:59 +0000 Subject: [PATCH 19/30] Show residential from OSM on z9 --- layers/landuse/landuse.sql | 12 ++++++++++-- layers/landuse/mapping.yaml | 7 ++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 9fe3de6..ca88810 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -17,6 +17,12 @@ CREATE OR REPLACE VIEW landuse_z6 AS ( FROM ne_10m_urban_areas ); +-- etldoc: osm_landuse_polygon_gen3 -> landuse_z10 +CREATE OR REPLACE VIEW landuse_z9 AS ( + SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + FROM osm_landuse_polygon_gen4 +); + -- etldoc: osm_landuse_polygon_gen3 -> landuse_z10 CREATE OR REPLACE VIEW landuse_z10 AS ( SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank @@ -71,9 +77,11 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ -- etldoc: landuse_z6 -> layer_landuse:z6 -- etldoc: landuse_z6 -> layer_landuse:z7 -- etldoc: landuse_z6 -> layer_landuse:z8 - -- etldoc: landuse_z6 -> layer_landuse:z9 SELECT * FROM landuse_z6 - WHERE zoom_level BETWEEN 6 AND 9 AND scalerank-1 <= zoom_level + WHERE zoom_level BETWEEN 6 AND 8 AND scalerank-1 <= zoom_level + UNION ALL + -- etldoc: landuse_z9 -> layer_landuse:z9 + SELECT * FROM landuse_z9 WHERE zoom_level = 9 UNION ALL -- etldoc: landuse_z10 -> layer_landuse:z10 SELECT * FROM landuse_z10 WHERE zoom_level = 10 diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml index c3c1d57..3773a38 100644 --- a/layers/landuse/mapping.yaml +++ b/layers/landuse/mapping.yaml @@ -1,9 +1,14 @@ generalized_tables: + # etldoc: imposm3 -> osm_landuse_polygon_gen4 + landuse_polygon_gen4: + source: landuse_polygon_gen3 + sql_filter: area>2000000 + tolerance: 160.0 # etldoc: imposm3 -> osm_landuse_polygon_gen3 landuse_polygon_gen3: source: landuse_polygon_gen2 sql_filter: area>960000 - tolerance: 160.0 + tolerance: 80.0 # etldoc: imposm3 -> osm_landuse_polygon_gen2 landuse_polygon_gen2: source: landuse_polygon_gen1 From 0c3b3b8b63d3c5a7586a382c1ad83522b3f6c376 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 14:15:59 +0000 Subject: [PATCH 20/30] Show large parks on z7 --- layers/park/layer.sql | 5 +++++ layers/park/mapping.yaml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/layers/park/layer.sql b/layers/park/layer.sql index 31c6210..7f79fc1 100644 --- a/layers/park/layer.sql +++ b/layers/park/layer.sql @@ -6,6 +6,11 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ SELECT osm_id, geometry, COALESCE(NULLIF(leisure, ''), NULLIF(boundary, '')) AS class FROM ( + -- etldoc: osm_park_polygon_gen7 -> layer_park:z7 + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon_gen7 + WHERE zoom_level = 7 + UNION ALL -- etldoc: osm_park_polygon_gen6 -> layer_park:z8 SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon_gen6 diff --git a/layers/park/mapping.yaml b/layers/park/mapping.yaml index eb7d081..c1eecb4 100644 --- a/layers/park/mapping.yaml +++ b/layers/park/mapping.yaml @@ -1,4 +1,9 @@ generalized_tables: + # etldoc: imposm3 -> osm_park_polygon_gen6 + park_polygon_gen7: + source: park_polygon_gen6 + sql_filter: area>60000000 + tolerance: 400.0 # etldoc: imposm3 -> osm_park_polygon_gen6 park_polygon_gen6: From e50979b45ca9c41de2af11d88e5971b41b57a58f Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 15:07:58 +0000 Subject: [PATCH 21/30] Nameless POI should have least important rank --- layers/poi/layer.sql | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/layers/poi/layer.sql b/layers/poi/layer.sql index c0a75ba..68dcec1 100644 --- a/layers/poi/layer.sql +++ b/layers/poi/layer.sql @@ -4,12 +4,10 @@ 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 $$ - SELECT osm_id, geometry, NULLIF(name, ''), NULLIF(name_en, ''), poi_class(subclass) AS class, subclass, + SELECT osm_id, geometry, NULLIF(name, '') AS name, NULLIF(name_en, '') AS name_en, poi_class(subclass) AS class, subclass, row_number() OVER ( PARTITION BY LabelGrid(geometry, 100 * pixel_width) - ORDER BY - CASE WHEN name = '' THEN 1 ELSE 0 END ASC, - poi_class_rank(poi_class(subclass)) ASC + ORDER BY CASE WHEN name = '' THEN 2000 ELSE poi_class_rank(poi_class(subclass)) END ASC )::int AS "rank" FROM ( -- etldoc: osm_poi_point -> layer_poi:z14 From a93c066fece02cb1793c8a265bf2681c647c96e7 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 16:25:12 +0000 Subject: [PATCH 22/30] Add missing etldocs slots to waterway layer --- layers/waterway/waterway.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql index 5713fb4..5945595 100644 --- a/layers/waterway/waterway.sql +++ b/layers/waterway/waterway.sql @@ -19,7 +19,6 @@ CREATE OR REPLACE VIEW waterway_z6 AS ( -- etldoc: osm_waterway_linestring_gen3 -> waterway_z9 CREATE OR REPLACE VIEW waterway_z9 AS ( - --SELECT geometry, waterway AS class FROM osm_waterway_linestring_gen3 SELECT geometry, 'river'::text AS class, name FROM osm_important_waterway_linestring_gen3 ); @@ -51,7 +50,7 @@ CREATE OR REPLACE VIEW waterway_z14 AS ( ); -- etldoc: layer_waterway[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_waterway | z3 | z4_5 | z6_7 | z8 | z9_10 | z11 | z12| z13| z14_" ] ; +-- etldoc: label="layer_waterway | z3 | z4-z5 | z6-8 | z9 | z10 | z11 | z12| z13| z14" ]; CREATE OR REPLACE FUNCTION layer_waterway(bbox geometry, zoom_level int) RETURNS TABLE(geometry geometry, class text, name text) AS $$ From 1f27b72a1a90ba611b18e13096a56d8fd6eb696d Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 16:56:26 +0000 Subject: [PATCH 23/30] Show more province boundaries on z6 --- layers/boundary/boundary.sql | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/layers/boundary/boundary.sql b/layers/boundary/boundary.sql index f7cd745..5045e15 100644 --- a/layers/boundary/boundary.sql +++ b/layers/boundary/boundary.sql @@ -56,6 +56,18 @@ CREATE OR REPLACE VIEW boundary_z5 AS ( WHERE scalerank <= 7 AND featurecla = 'Adm-1 boundary' ); +-- etldoc: ne_10m_admin_0_boundary_lines_land -> boundary_z6 +-- etldoc: ne_10m_admin_1_states_provinces_lines_shp -> boundary_z6 + +CREATE OR REPLACE VIEW boundary_z6 AS ( + SELECT geom, 2 AS admin_level + FROM ne_10m_admin_0_boundary_lines_land + UNION ALL + SELECT geom, 4 AS admin_level + FROM ne_10m_admin_1_states_provinces_lines_shp + WHERE scalerank <= 9 AND featurecla = 'Adm-1 boundary' +); + -- 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 ( @@ -102,8 +114,8 @@ CREATE OR REPLACE VIEW boundary_z12 AS ( FROM osm_boundary_linestring_gen1 ); --- etldoc: layer_boundary[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label=" layer_boundary | z0 | z1_2 | z3 | z4 | z5_6 | z7 | z8 | z9 | z10 | z11 | z12| z13_ " ] +-- 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 $$ @@ -120,8 +132,11 @@ RETURNS TABLE(geometry geometry, admin_level int) AS $$ -- etldoc: boundary_z4 -> layer_boundary:z4 SELECT * FROM boundary_z4 WHERE geom && bbox AND zoom_level = 4 UNION ALL - -- etldoc: boundary_z5 -> layer_boundary:z5_6 - SELECT * FROM boundary_z5 WHERE geom && bbox AND zoom_level BETWEEN 5 AND 6 + -- etldoc: boundary_z5 -> layer_boundary:z5 + SELECT * FROM boundary_z5 WHERE geom && bbox AND zoom_level = 5 + UNION ALL + -- etldoc: boundary_z6 -> layer_boundary:z6 + SELECT * FROM boundary_z6 WHERE geom && bbox AND zoom_level = 6 UNION ALL -- etldoc: boundary_z7 -> layer_boundary:z7 SELECT * FROM boundary_z7 WHERE geom && bbox AND zoom_level = 7 @@ -141,7 +156,7 @@ RETURNS TABLE(geometry geometry, admin_level int) AS $$ -- etldoc: boundary_z12 -> layer_boundary:z12 SELECT * FROM boundary_z12 WHERE geom && bbox AND zoom_level = 12 UNION ALL - -- etldoc: boundary_z12 -> layer_boundary:z13_ + -- etldoc: boundary_z12 -> layer_boundary:z13 SELECT * FROM boundary_z12 WHERE geom && bbox AND zoom_level >= 13 ) AS zoom_levels; $$ LANGUAGE SQL IMMUTABLE; From ac51c742e793b7fe5c72e2a8866b7e935ec82cbe Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 17:03:49 +0000 Subject: [PATCH 24/30] Show all cities earlier before z7 --- layers/place/city.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layers/place/city.sql b/layers/place/city.sql index af23866..ab96fe4 100644 --- a/layers/place/city.sql +++ b/layers/place/city.sql @@ -9,7 +9,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, name text, name_en text, class c FROM osm_city_point WHERE geometry && bbox AND ((zoom_level = 2 AND "rank" = 1) - OR (zoom_level BETWEEN 3 AND 7 AND "rank" <= zoom_level) + OR (zoom_level BETWEEN 3 AND 7 AND "rank" <= zoom_level + 1) ) UNION ALL SELECT osm_id, geometry, name, From bcc38a091100434337fd725a91137a1bb746282c Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 17:11:36 +0000 Subject: [PATCH 25/30] Show large parks already on z6 --- layers/park/layer.sql | 7 ++++++- layers/park/mapping.yaml | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/layers/park/layer.sql b/layers/park/layer.sql index 7f79fc1..f684b77 100644 --- a/layers/park/layer.sql +++ b/layers/park/layer.sql @@ -1,11 +1,16 @@ -- etldoc: layer_park[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_park | z8 | z9 | z10 | z11 | z12| z13| z14_" ] ; +-- etldoc: label="layer_park | z6 | z7 | z8 | z9 | z10 | z11 | z12| z13| z14" ] ; CREATE OR REPLACE FUNCTION layer_park(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ SELECT osm_id, geometry, COALESCE(NULLIF(leisure, ''), NULLIF(boundary, '')) AS class FROM ( + -- etldoc: osm_park_polygon_gen8 -> layer_park:z6 + SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank + FROM osm_park_polygon_gen6 + WHERE zoom_level = 6 + UNION ALL -- etldoc: osm_park_polygon_gen7 -> layer_park:z7 SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank FROM osm_park_polygon_gen7 diff --git a/layers/park/mapping.yaml b/layers/park/mapping.yaml index c1eecb4..29fb1f0 100644 --- a/layers/park/mapping.yaml +++ b/layers/park/mapping.yaml @@ -1,5 +1,11 @@ generalized_tables: - # etldoc: imposm3 -> osm_park_polygon_gen6 + # etldoc: imposm3 -> osm_park_polygon_gen8 + park_polygon_gen8: + source: park_polygon_gen6 + sql_filter: area>240000000 + tolerance: 600.0 + + # etldoc: imposm3 -> osm_park_polygon_gen7 park_polygon_gen7: source: park_polygon_gen6 sql_filter: area>60000000 From 8523c91a6b362ed0349cd98b3f7b0803aaa1c044 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 18:26:22 +0000 Subject: [PATCH 26/30] Remove no longer needed park class functions --- layers/park/class.sql | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 layers/park/class.sql diff --git a/layers/park/class.sql b/layers/park/class.sql deleted file mode 100644 index 2b2837f..0000000 --- a/layers/park/class.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE OR REPLACE FUNCTION park_class(landuse TEXT, leisure TEXT, boundary TEXT) RETURNS TEXT AS $$ - SELECT CASE - WHEN leisure = 'nature_reserve' OR boundary='national_park' THEN 'national_park' - WHEN landuse IN ('recreation_ground', 'village_green') or leisure = 'park' THEN 'public_park' - ELSE NULL - END; -$$ LANGUAGE SQL IMMUTABLE; From 2514f267a9cbde90c19f54ffcffc623ed6ff83d1 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 18:30:29 +0000 Subject: [PATCH 27/30] Fix usage of generalized tables in landcover --- layers/landcover/landcover.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index d2d6199..1b8810f 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -43,32 +43,32 @@ CREATE OR REPLACE VIEW landcover_z5 AS ( CREATE OR REPLACE VIEW landcover_z8 AS ( -- etldoc: osm_landcover_polygon_gen5 -> landcover_z8 - SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen5 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen6 ); CREATE OR REPLACE VIEW landcover_z9 AS ( -- etldoc: osm_landcover_polygon_gen4 -> landcover_z9 - SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen4 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen5 ); CREATE OR REPLACE VIEW landcover_z10 AS ( -- etldoc: osm_landcover_polygon_gen3 -> landcover_z10 - SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen3 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen4 ); CREATE OR REPLACE VIEW landcover_z11 AS ( -- etldoc: osm_landcover_polygon_gen2 -> landcover_z11 - SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen2 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen3 ); CREATE OR REPLACE VIEW landcover_z12 AS ( -- etldoc: osm_landcover_polygon_gen1 -> landcover_z12 - SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen1 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen2 ); CREATE OR REPLACE VIEW landcover_z13 AS ( -- etldoc: osm_landcover_polygon -> landcover_z13 - SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon WHERE ST_Area(geometry) > 60000 + SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen1 ); CREATE OR REPLACE VIEW landcover_z14 AS ( From c1b1913c7cc1c350a34c46bdb234815be95239cd Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 18:37:04 +0000 Subject: [PATCH 28/30] Fix wrong etl docs --- layers/landcover/landcover.sql | 12 ++++++------ layers/landuse/landuse.sql | 4 ++-- layers/park/layer.sql | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index 1b8810f..3683cf6 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -42,32 +42,32 @@ CREATE OR REPLACE VIEW landcover_z5 AS ( ); CREATE OR REPLACE VIEW landcover_z8 AS ( - -- etldoc: osm_landcover_polygon_gen5 -> landcover_z8 + -- etldoc: osm_landcover_polygon_gen6 -> landcover_z8 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen6 ); CREATE OR REPLACE VIEW landcover_z9 AS ( - -- etldoc: osm_landcover_polygon_gen4 -> landcover_z9 + -- etldoc: osm_landcover_polygon_gen5 -> landcover_z9 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen5 ); CREATE OR REPLACE VIEW landcover_z10 AS ( - -- etldoc: osm_landcover_polygon_gen3 -> landcover_z10 + -- etldoc: osm_landcover_polygon_gen4 -> landcover_z10 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen4 ); CREATE OR REPLACE VIEW landcover_z11 AS ( - -- etldoc: osm_landcover_polygon_gen2 -> landcover_z11 + -- etldoc: osm_landcover_polygon_gen3 -> landcover_z11 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen3 ); CREATE OR REPLACE VIEW landcover_z12 AS ( - -- etldoc: osm_landcover_polygon_gen1 -> landcover_z12 + -- etldoc: osm_landcover_polygon_gen2 -> landcover_z12 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen2 ); CREATE OR REPLACE VIEW landcover_z13 AS ( - -- etldoc: osm_landcover_polygon -> landcover_z13 + -- etldoc: osm_landcover_polygon_gen1 -> landcover_z13 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen1 ); diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index ca88810..48505e5 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -17,7 +17,7 @@ CREATE OR REPLACE VIEW landuse_z6 AS ( FROM ne_10m_urban_areas ); --- etldoc: osm_landuse_polygon_gen3 -> landuse_z10 +-- etldoc: osm_landuse_polygon_gen4 -> landuse_z10 CREATE OR REPLACE VIEW landuse_z9 AS ( SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank FROM osm_landuse_polygon_gen4 @@ -55,7 +55,7 @@ CREATE OR REPLACE VIEW landuse_z14 AS ( ); -- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11| z12| z13| z14_" ] ; +-- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11| z12| z13| z14" ] ; CREATE OR REPLACE FUNCTION layer_landuse(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ diff --git a/layers/park/layer.sql b/layers/park/layer.sql index f684b77..719b1b0 100644 --- a/layers/park/layer.sql +++ b/layers/park/layer.sql @@ -8,7 +8,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ FROM ( -- etldoc: osm_park_polygon_gen8 -> layer_park:z6 SELECT osm_id, geometry, leisure, boundary, NULL::int as scalerank - FROM osm_park_polygon_gen6 + FROM osm_park_polygon_gen8 WHERE zoom_level = 6 UNION ALL -- etldoc: osm_park_polygon_gen7 -> layer_park:z7 From b0fbdff34cd360100aa614cf29e4f988e0cbacd9 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Wed, 30 Nov 2016 20:40:02 +0100 Subject: [PATCH 29/30] Update README.md --- README.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 46c3a96..a6d0cd3 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,18 @@ ## OpenMapTiles -OpenMapTiles is a collection of vector tile layers you can mix and match to create your own vector tile sets -It is used by [OSM2VectorTiles](http://osm2vectortiles.org/) and we encourage you to collaborate, reuse and adapt existing layers -and add your own layers. +OpenMapTiles is an extensible vector tile schema you can use or mix and match to create your own vector tile sets. +It is used by [OSM2VectorTiles](http://osm2vectortiles.org/) and we encourage you to collaborate, reuse and adapt existing layers and add your own layers. -You define a self contained **Layer** together with SQL files and layer and data source definitions (like a imposm3 mapping file) -that you can then reference in a **Tileset** where you mix and match with other layers. +You define a self contained **Layer** together with SQL files and layer and data source definitions (like an imposm3 mapping file) that you can then reference in a **Tileset** where you mix and match with other layers. + +## Styles + +You can start from several styles supporting the OpenMapTiles vector schema. + +- [OSM Bright](https://github.com/openmaptiles/osm-bright-gl-style) +- [Positron](https://github.com/openmaptiles/positron-gl-style) +- [Dark Matter](https://github.com/openmaptiles/dark-matter-gl-style) +- [Klokantech Basic](https://github.com/openmaptiles/klokantech-basic-gl-style) ## Layers @@ -19,14 +26,14 @@ Layers can be chosen to create a **Tileset** like the `openmaptiles.yaml` tilese - [boundary](https://github.com/openmaptiles/openmaptiles/wiki/boundary) - [building](https://github.com/openmaptiles/openmaptiles/wiki/building) -- [highway](https://github.com/openmaptiles/openmaptiles/wiki/highway) -- [highway_name](https://github.com/openmaptiles/openmaptiles/wiki/highway_name) +- [transportation](https://github.com/openmaptiles/openmaptiles/wiki/transportation) +- [transportation_name](https://github.com/openmaptiles/openmaptiles/wiki/transportation_name) - [housenumber](https://github.com/openmaptiles/openmaptiles/wiki/housenumber) - [landcover](https://github.com/openmaptiles/openmaptiles/wiki/landcover) - [landuse](https://github.com/openmaptiles/openmaptiles/wiki/landuse) - [place](https://github.com/openmaptiles/openmaptiles/wiki/place) - [poi](https://github.com/openmaptiles/openmaptiles/wiki/poi) -- [railway](https://github.com/openmaptiles/openmaptiles/wiki/railway) +- [park](https://github.com/openmaptiles/openmaptiles/wiki/park) - [water](https://github.com/openmaptiles/openmaptiles/wiki/water) - [water_name](https://github.com/openmaptiles/openmaptiles/wiki/water_name) - [waterway](https://github.com/openmaptiles/openmaptiles/wiki/waterway) From 5ec4f0766b6c71fae1c24fdc6b99ee07a732b83f Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Thu, 1 Dec 2016 08:29:34 +0000 Subject: [PATCH 30/30] Add zoom level range slots to landcover diagram --- layers/landcover/landcover.sql | 4 ++-- layers/landuse/landuse.sql | 2 +- layers/park/layer.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index 3683cf6..7cdfc35 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -77,7 +77,7 @@ CREATE OR REPLACE VIEW landcover_z14 AS ( ); -- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_landcover | z0 | z2_4 | z5_7 | z8 | z9 | z10 | z11 | z12| z13| z14_" ] ; +-- etldoc: label="layer_landcover | z0-z1 | z2-z4 | z5-z7 | z8 | z9 | z10 | z11 | z12| z13| z14+" ] ; CREATE OR REPLACE FUNCTION layer_landcover(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ @@ -88,7 +88,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ NULLIF(leisure, ''), NULLIF(wetland, '') ) AS subclass FROM ( - -- etldoc: landcover_z0 -> layer_landcover:z0 + -- etldoc: landcover_z0 -> layer_landcover:z0_1 SELECT * FROM landcover_z0 WHERE zoom_level BETWEEN 0 AND 1 AND geometry && bbox UNION ALL diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index 48505e5..933aafd 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -55,7 +55,7 @@ CREATE OR REPLACE VIEW landuse_z14 AS ( ); -- etldoc: layer_landuse[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11| z12| z13| z14" ] ; +-- etldoc: label="layer_landuse | z4|z5|z6|z7| z8 | z9 | z10 | z11| z12| z13| z14+" ] ; CREATE OR REPLACE FUNCTION layer_landuse(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ diff --git a/layers/park/layer.sql b/layers/park/layer.sql index 719b1b0..8d0bad3 100644 --- a/layers/park/layer.sql +++ b/layers/park/layer.sql @@ -1,5 +1,5 @@ -- etldoc: layer_park[shape=record fillcolor=lightpink, style="rounded,filled", --- etldoc: label="layer_park | z6 | z7 | z8 | z9 | z10 | z11 | z12| z13| z14" ] ; +-- etldoc: label="layer_park | z6 | z7 | z8 | z9 | z10 | z11 | z12| z13| z14+" ] ; CREATE OR REPLACE FUNCTION layer_park(bbox geometry, zoom_level int) RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$