Remove mappings from landcover and landuse

layers/landcover/landcover.sql

@@ -14,7 +14,7 @@ CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, w
          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"='grassland' OR landuse IN ('grass', 'meadow', 'village_green', 'allotments', 'park', 'recreation_ground', 'grassland') THEN 'grass'
+         WHEN "natural"='grassland' OR landuse IN ('grass', 'meadow', 'allotments', 'grassland') THEN 'grass'
          WHEN "natural"='wetland' OR wetland IN ('bog', 'swamp', 'wet_meadow', 'marsh', 'reedbed', 'saltern', 'tidalflat', 'saltmarsh', 'mangrove') THEN 'wetland'
         ELSE NULL
     END;

layers/landcover/mapping.yaml

@@ -1,38 +1,44 @@
+
 generalized_tables:
-  
+
+  # etldoc: imposm3 -> osm_landcover_polygon_gen6
+  landcover_polygon_gen6:
+    source: landcover_polygon_gen5
+    sql_filter: area>15000000
+    tolerance: 300.0
+
   # etldoc: imposm3 -> osm_landcover_polygon_gen5
   landcover_polygon_gen5:
     source: landcover_polygon_gen4
-    sql_filter: area>15000000
-    tolerance: 300.0
+    sql_filter: area>4200000
+    tolerance: 200.0
 
   # etldoc: imposm3 -> osm_landcover_polygon_gen4
   landcover_polygon_gen4:
     source: landcover_polygon_gen3
-    sql_filter: area>4200000
-    tolerance: 200.0
-
-  # etldoc: imposm3 -> osm_landcover_polygon_gen3  
-  landcover_polygon_gen3:
-    source: landcover_polygon_gen2
     sql_filter: area>1200000
     tolerance: 120.0
 
-  # etldoc: imposm3 -> osm_landcover_polygon_gen2  
-  landcover_polygon_gen2:
-    source: landcover_polygon_gen1
+  # etldoc: imposm3 -> osm_landcover_polygon_gen3
+  landcover_polygon_gen3:
+    source: landcover_polygon_gen2
     sql_filter: area>480000
     tolerance: 80.0
 
-  # etldoc: imposm3 -> osm_landcover_polygon_gen1  
-  landcover_polygon_gen1:
-    source: landcover_polygon
+  # etldoc: imposm3 -> osm_landcover_polygon_gen2
+  landcover_polygon_gen2:
+    source: landcover_polygon_gen1
     sql_filter: area>240000
     tolerance: 50.0
 
+  # etldoc: imposm3 -> osm_landcover_polygon_gen1
+  landcover_polygon_gen1:
+    source: landcover_polygon
+    sql_filter: area>60000
+    tolerance: 20.0
+
 tables:
-  
-  # etldoc: imposm3 -> osm_landcover_polygon 
+  # etldoc: imposm3 -> osm_landcover_polygon
   landcover_polygon:
     fields:
     - name: osm_id
@@ -61,9 +67,6 @@ tables:
       - grass
       - grassland
       - meadow
-      - park
-      - village_green
-      - recreation_ground
       - forest
       natural:
       - wetland