diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql index f6628a7..c0e72d4 100644 --- a/layers/landuse/landuse.sql +++ b/layers/landuse/landuse.sql @@ -1,55 +1,55 @@ -- etldoc: ne_50m_urban_areas -> landuse_z4 CREATE OR REPLACE VIEW landuse_z4 AS ( - SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank + SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS tourism, 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, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank + SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS tourism, 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, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, scalerank + SELECT NULL::bigint AS osm_id, geometry, 'residential'::text AS landuse, NULL::text AS amenity, NULL::text AS leisure, NULL::text AS tourism, scalerank FROM ne_10m_urban_areas ); -- etldoc: osm_landuse_polygon_gen5 -> landuse_z9 CREATE OR REPLACE VIEW landuse_z9 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + SELECT osm_id, geometry, landuse, amenity, leisure, tourism, NULL::int as scalerank FROM osm_landuse_polygon_gen5 ); -- etldoc: osm_landuse_polygon_gen4 -> landuse_z10 CREATE OR REPLACE VIEW landuse_z10 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + SELECT osm_id, geometry, landuse, amenity, leisure, tourism, NULL::int as scalerank FROM osm_landuse_polygon_gen4 ); -- etldoc: osm_landuse_polygon_gen3 -> landuse_z11 CREATE OR REPLACE VIEW landuse_z11 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + SELECT osm_id, geometry, landuse, amenity, leisure, tourism, NULL::int as scalerank FROM osm_landuse_polygon_gen3 ); -- etldoc: osm_landuse_polygon_gen2 -> landuse_z12 CREATE OR REPLACE VIEW landuse_z12 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + SELECT osm_id, geometry, landuse, amenity, leisure, tourism, NULL::int as scalerank FROM osm_landuse_polygon_gen2 ); -- etldoc: osm_landuse_polygon_gen1 -> landuse_z13 CREATE OR REPLACE VIEW landuse_z13 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + SELECT osm_id, geometry, landuse, amenity, leisure,tourism, NULL::int as scalerank FROM osm_landuse_polygon_gen1 ); -- etldoc: osm_landuse_polygon -> landuse_z14 CREATE OR REPLACE VIEW landuse_z14 AS ( - SELECT osm_id, geometry, landuse, amenity, leisure, NULL::int as scalerank + SELECT osm_id, geometry, landuse, amenity, leisure, tourism, NULL::int as scalerank FROM osm_landuse_polygon ); @@ -62,7 +62,8 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ COALESCE( NULLIF(landuse, ''), NULLIF(amenity, ''), - NULLIF(leisure, '') + NULLIF(leisure, ''), + NULLIF(tourism, '') ) AS class FROM ( -- etldoc: landuse_z4 -> layer_landuse:z4 @@ -99,4 +100,3 @@ RETURNS TABLE(osm_id bigint, geometry geometry, class text) AS $$ ) AS zoom_levels WHERE geometry && bbox; $$ LANGUAGE SQL IMMUTABLE; - diff --git a/layers/landuse/landuse.yaml b/layers/landuse/landuse.yaml index d6406e8..ee6c263 100644 --- a/layers/landuse/landuse.yaml +++ b/layers/landuse/landuse.yaml @@ -10,6 +10,7 @@ layer: Use the **class** to assign special colors to areas. Original value of either the [`amenity`](http://wiki.openstreetmap.org/wiki/Key:amenity), + [`tourism`](http://wiki.openstreetmap.org/wiki/Key:tourism), [`landuse`](http://wiki.openstreetmap.org/wiki/Key:landuse), or [`leisure`](http://wiki.openstreetmap.org/wiki/Key:leisure) tag. values: @@ -29,6 +30,7 @@ layer: - stadium - pitch - playground + - theme_park datasource: geometry_field: geometry query: (SELECT geometry, class FROM layer_landuse(!bbox!, z(!scale_denominator!))) AS t diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml index 99fdf89..b6f48dd 100644 --- a/layers/landuse/mapping.yaml +++ b/layers/landuse/mapping.yaml @@ -43,6 +43,9 @@ tables: - name: leisure key: leisure type: string + - name: tourism + key: tourism + type: string - name: area type: area - name: webmerc_area @@ -68,3 +71,5 @@ tables: - stadium - pitch - playground + tourism: + - theme_park