From 70170b2e54194ec922781c6b6fd4df52a62bbd07 Mon Sep 17 00:00:00 2001 From: jirik Date: Wed, 15 Mar 2017 15:35:31 +0100 Subject: [PATCH] Add missing woods, fix openmaptiles/openmaptiles#167 --- layers/landcover/landcover.sql | 36 +++++++++++++++++----------------- layers/landcover/mapping.yaml | 1 + 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql index e27e5f85..d7860c34 100644 --- a/layers/landcover/landcover.sql +++ b/layers/landcover/landcover.sql @@ -13,23 +13,23 @@ CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, l 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"='wood' OR landuse IN ('forest') THEN 'wood' 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; $$ LANGUAGE SQL IMMUTABLE; --- etldoc: ne_110m_glaciated_areas -> landcover_z0 +-- etldoc: ne_110m_glaciated_areas -> landcover_z0 CREATE OR REPLACE VIEW landcover_z0 AS ( SELECT NULL::bigint AS osm_id, 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 + -- etldoc: ne_50m_glaciated_areas -> landcover_z2 SELECT NULL::bigint AS osm_id, 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 + -- etldoc: ne_50m_antarctic_ice_shelves_polys -> landcover_z2 SELECT NULL::bigint AS osm_id, 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 ); @@ -37,32 +37,32 @@ CREATE OR REPLACE VIEW landcover_z5 AS ( -- etldoc: ne_10m_glaciated_areas -> landcover_z5 SELECT NULL::bigint AS osm_id, 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 + -- etldoc: ne_10m_antarctic_ice_shelves_polys -> landcover_z5 SELECT NULL::bigint AS osm_id, 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_gen6 -> 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_gen5 -> 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_gen4 -> 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_gen3 -> 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_gen2 -> landcover_z12 + -- etldoc: osm_landcover_polygon_gen2 -> landcover_z12 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon_gen2 ); @@ -72,11 +72,11 @@ CREATE OR REPLACE VIEW landcover_z13 AS ( ); CREATE OR REPLACE VIEW landcover_z14 AS ( - -- etldoc: osm_landcover_polygon -> landcover_z14 + -- etldoc: osm_landcover_polygon -> landcover_z14 SELECT osm_id, geometry, landuse, "natural", leisure, wetland FROM osm_landcover_polygon ); --- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled", +-- etldoc: layer_landcover[shape=record fillcolor=lightpink, style="rounded,filled", -- 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) @@ -92,7 +92,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ SELECT * FROM landcover_z0 WHERE zoom_level BETWEEN 0 AND 1 AND geometry && bbox UNION ALL - -- etldoc: landcover_z2 -> layer_landcover:z2_4 + -- etldoc: landcover_z2 -> layer_landcover:z2_4 SELECT * FROM landcover_z2 WHERE zoom_level BETWEEN 2 AND 4 AND geometry && bbox UNION ALL @@ -104,7 +104,7 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ SELECT * FROM landcover_z8 WHERE zoom_level = 8 AND geometry && bbox UNION ALL - -- etldoc: landcover_z9 -> layer_landcover:z9 + -- etldoc: landcover_z9 -> layer_landcover:z9 SELECT * FROM landcover_z9 WHERE zoom_level = 9 AND geometry && bbox UNION ALL @@ -112,19 +112,19 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text, subclass text) AS $$ SELECT * FROM landcover_z10 WHERE zoom_level = 10 AND geometry && bbox UNION ALL - -- etldoc: landcover_z11 -> layer_landcover:z11 + -- etldoc: landcover_z11 -> layer_landcover:z11 SELECT * FROM landcover_z11 WHERE zoom_level = 11 AND geometry && bbox UNION ALL - -- etldoc: landcover_z12 -> layer_landcover:z12 + -- etldoc: landcover_z12 -> layer_landcover:z12 SELECT * FROM landcover_z12 WHERE zoom_level = 12 AND geometry && bbox UNION ALL - -- etldoc: landcover_z13 -> layer_landcover:z13 + -- etldoc: landcover_z13 -> layer_landcover:z13 SELECT * FROM landcover_z13 WHERE zoom_level = 13 AND geometry && bbox UNION ALL - -- etldoc: landcover_z14 -> layer_landcover:z14_ + -- etldoc: landcover_z14 -> layer_landcover:z14_ SELECT * FROM landcover_z14 WHERE zoom_level >= 14 AND geometry && bbox ) AS zoom_levels; diff --git a/layers/landcover/mapping.yaml b/layers/landcover/mapping.yaml index 337ac5eb..aa0bb0f4 100644 --- a/layers/landcover/mapping.yaml +++ b/layers/landcover/mapping.yaml @@ -76,6 +76,7 @@ tables: # There are 600 parks tagged with landuse=park instead of leisure=park - park natural: + - wood - wetland - grassland leisure: