From 5ebb33575e7951ba9f38d5bb395aa10753d08642 Mon Sep 17 00:00:00 2001 From: Lukas Martinelli Date: Tue, 29 Nov 2016 19:38:02 +0000 Subject: [PATCH] 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 a0b27ce7..a9832bb3 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 295c332a..ffa6d7d4 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 cb8ac252..31c62107 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 167e98b4..eb7d0816 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 575f83a7..28fcad8f 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