Fix seamark_code

pull/1491/head
Brian Sperlongano 2023-12-23 22:37:01 -05:00
rodzic 5ef9c8322e
commit 32e87b496d
2 zmienionych plików z 25 dodań i 13 usunięć

Wyświetl plik

@ -1,7 +1,8 @@
CREATE OR REPLACE FUNCTION park_class(boundary text, leisure text, landuse text, historic text) CREATE OR REPLACE FUNCTION park_class(boundary text, leisure text, landuse text, historic text, seamark_type text)
RETURNS text AS RETURNS text AS
$$ $$
SELECT CASE SELECT CASE
WHEN seamark_type <> '' THEN 'marine'
WHEN boundary = 'national_park' THEN 'national_park' WHEN boundary = 'national_park' THEN 'national_park'
WHEN leisure = 'nature_reserve' THEN 'nature_reserve' WHEN leisure = 'nature_reserve' THEN 'nature_reserve'
WHEN landuse = 'recreation_ground' THEN 'recreation_ground' WHEN landuse = 'recreation_ground' THEN 'recreation_ground'

Wyświetl plik

@ -43,7 +43,8 @@ FROM (
NULL AS leisure, NULL AS leisure,
NULL AS landuse, NULL AS landuse,
CASE WHEN boundary='aboriginal_lands' THEN boundary END AS boundary, CASE WHEN boundary='aboriginal_lands' THEN boundary END AS boundary,
NULL AS historic NULL AS historic,
seamark_type
FROM osm_park_polygon_dissolve_z4 FROM osm_park_polygon_dissolve_z4
WHERE zoom_level = 4 WHERE zoom_level = 4
AND geometry && bbox AND geometry && bbox
@ -58,7 +59,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z5 FROM osm_park_polygon_gen_z5
WHERE zoom_level = 5 WHERE zoom_level = 5
AND geometry && bbox AND geometry && bbox
@ -73,7 +75,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z6 FROM osm_park_polygon_gen_z6
WHERE zoom_level = 6 WHERE zoom_level = 6
AND geometry && bbox AND geometry && bbox
@ -88,7 +91,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z7 FROM osm_park_polygon_gen_z7
WHERE zoom_level = 7 WHERE zoom_level = 7
AND geometry && bbox AND geometry && bbox
@ -103,7 +107,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z8 FROM osm_park_polygon_gen_z8
WHERE zoom_level = 8 WHERE zoom_level = 8
AND geometry && bbox AND geometry && bbox
@ -118,7 +123,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z9 FROM osm_park_polygon_gen_z9
WHERE zoom_level = 9 WHERE zoom_level = 9
AND geometry && bbox AND geometry && bbox
@ -133,7 +139,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z10 FROM osm_park_polygon_gen_z10
WHERE zoom_level = 10 WHERE zoom_level = 10
AND geometry && bbox AND geometry && bbox
@ -148,7 +155,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z11 FROM osm_park_polygon_gen_z11
WHERE zoom_level = 11 WHERE zoom_level = 11
AND geometry && bbox AND geometry && bbox
@ -163,7 +171,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z12 FROM osm_park_polygon_gen_z12
WHERE zoom_level = 12 WHERE zoom_level = 12
AND geometry && bbox AND geometry && bbox
@ -178,7 +187,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon_gen_z13 FROM osm_park_polygon_gen_z13
WHERE zoom_level = 13 WHERE zoom_level = 13
AND geometry && bbox AND geometry && bbox
@ -193,7 +203,8 @@ FROM (
leisure, leisure,
landuse, landuse,
boundary, boundary,
historic historic,
seamark_type
FROM osm_park_polygon FROM osm_park_polygon
WHERE zoom_level >= 14 WHERE zoom_level >= 14
AND geometry && bbox AND geometry && bbox
@ -202,7 +213,7 @@ FROM (
UNION ALL UNION ALL
SELECT osm_id, SELECT osm_id,
geometry_point AS geometry, geometry_point AS geometry,
park_class(boundary, leisure, landuse, historic) AS class, park_class(boundary, leisure, landuse, historic, seamark_type) AS class,
name, name,
name_en, name_en,
name_de, name_de,