Move public parks indicating grass to landcover

layers/park/layer.sql

@@ -2,43 +2,42 @@
 -- etldoc:     label="layer_park |<z8> z8 |<z9> z9 |<z10> z10 |<z11> z11 |<z12> z12|<z13> z13|<z14_> 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

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

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