From 6ec66e94e3616e391e80dc6631fc99b0411a58fb Mon Sep 17 00:00:00 2001 From: Eva J Date: Wed, 10 Apr 2019 10:04:23 +0200 Subject: [PATCH] distinguish bays from other water polygons --- layers/water/water.sql | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/layers/water/water.sql b/layers/water/water.sql index 2b4e88c..eb8a4b2 100644 --- a/layers/water/water.sql +++ b/layers/water/water.sql @@ -1,5 +1,6 @@ -CREATE OR REPLACE FUNCTION water_class(waterway TEXT) RETURNS TEXT AS $$ +CREATE OR REPLACE FUNCTION water_class(waterway TEXT, "natural" TEXT) RETURNS TEXT AS $$ SELECT CASE + WHEN "natural"='bay' THEN 'bay' WHEN waterway='' THEN 'lake' WHEN waterway='dock' THEN 'dock' ELSE 'river' @@ -53,7 +54,7 @@ CREATE OR REPLACE VIEW water_z6 AS ( SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean UNION ALL -- etldoc: osm_water_polygon_gen6 -> water_z6 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen6 + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon_gen6 ); CREATE OR REPLACE VIEW water_z7 AS ( @@ -61,7 +62,7 @@ CREATE OR REPLACE VIEW water_z7 AS ( SELECT geometry, 'ocean'::text AS class FROM ne_10m_ocean UNION ALL -- etldoc: osm_water_polygon_gen5 -> water_z7 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen5 + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon_gen5 ); CREATE OR REPLACE VIEW water_z8 AS ( @@ -69,7 +70,7 @@ CREATE OR REPLACE VIEW water_z8 AS ( SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen4 UNION ALL -- etldoc: osm_water_polygon_gen4 -> water_z8 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen4 + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon_gen4 ); CREATE OR REPLACE VIEW water_z9 AS ( @@ -77,7 +78,7 @@ CREATE OR REPLACE VIEW water_z9 AS ( SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen3 UNION ALL -- etldoc: osm_water_polygon_gen3 -> water_z9 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen3 + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon_gen3 ); CREATE OR REPLACE VIEW water_z10 AS ( @@ -85,7 +86,7 @@ CREATE OR REPLACE VIEW water_z10 AS ( SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen2 UNION ALL -- etldoc: osm_water_polygon_gen2 -> water_z10 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen2 + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon_gen2 ); CREATE OR REPLACE VIEW water_z11 AS ( @@ -93,7 +94,7 @@ CREATE OR REPLACE VIEW water_z11 AS ( SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon_gen1 UNION ALL -- etldoc: osm_water_polygon_gen1 -> water_z11 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon_gen1 + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon_gen1 ); CREATE OR REPLACE VIEW water_z12 AS ( @@ -101,7 +102,7 @@ CREATE OR REPLACE VIEW water_z12 AS ( SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon UNION ALL -- etldoc: osm_water_polygon -> water_z12 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon ); CREATE OR REPLACE VIEW water_z13 AS ( @@ -109,7 +110,7 @@ CREATE OR REPLACE VIEW water_z13 AS ( SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon UNION ALL -- etldoc: osm_water_polygon -> water_z13 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon ); CREATE OR REPLACE VIEW water_z14 AS ( @@ -117,7 +118,7 @@ CREATE OR REPLACE VIEW water_z14 AS ( SELECT geometry, 'ocean'::text AS class FROM osm_ocean_polygon UNION ALL -- etldoc: osm_water_polygon -> water_z14 - SELECT geometry, water_class(waterway) AS class FROM osm_water_polygon + SELECT geometry, water_class(waterway, "natural") AS class FROM osm_water_polygon ); -- etldoc: layer_water [shape=record fillcolor=lightpink, style="rounded,filled",