Merge branch 'master' into refactor-landcover

layers/landcover/landcover.sql

@@ -15,11 +15,11 @@ CREATE OR REPLACE FUNCTION landcover_class(subclass VARCHAR) RETURNS TEXT AS $$
         WHEN subclass IN ('glacier', 'ice_shelf') THEN 'ice'
         WHEN subclass IN ('wood', 'forest') THEN 'wood'
         WHEN subclass IN ('bare_rock', 'scree') THEN 'rock'
-        WHEN subclass IN ('grassland', 'grass', 'meadow', 'allotments', 'grassland',
-                          'park', 'village_green', 'recreation_ground', 'park', 'garden') THEN 'grass'
+        WHEN subclass IN ('fell', 'grassland', 'heath', 'scrub', 'tundra', 'grass', 'meadow', 'allotments',
+                          'park', 'village_green', 'recreation_ground', 'garden') THEN 'grass'
         WHEN subclass IN ('wetland', 'bog', 'swamp', 'wet_meadow', 'marsh', 'reedbed',
                           'saltern', 'tidalflat', 'saltmarsh', 'mangrove') THEN 'wetland'
-        WHEN subclass IN ('beach', 'sand') THEN 'sand'
+        WHEN subclass IN ('beach', 'sand', 'dune') THEN 'sand'
         ELSE NULL
     END;
 $$ LANGUAGE SQL IMMUTABLE;

layers/landcover/landcover.yaml

@@ -29,13 +29,17 @@ layer:
       - bare_rock
       - beach
       - bog
+      - dune
+      - scrub
       - farm
       - farmland
+      - fell
       - forest
       - garden
       - glacier
       - grass
       - grassland
+      - heath
       - mangrove
       - marsh
       - meadow
@@ -50,6 +54,7 @@ layer:
       - scree
       - swamp
       - tidalflat
+      - tundra
       - village_green
       - vineyard
       - wet_meadow

layers/landcover/mapping.yaml

@@ -78,12 +78,17 @@ tables:
       natural:
       - wood
       - wetland
+      - fell
       - grassland
+      - heath
+      - scrub
+      - tundra
       - glacier
       - bare_rock
       - scree
       - beach
       - sand
+      - dune
       leisure:
       - park
       - garden