Merge pull request #186 from klokantech/forests

Add missing woods, fix openmaptiles/openmaptiles#167

layers/landcover/landcover.sql

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

layers/landcover/mapping.yaml

@@ -76,6 +76,7 @@ tables:
       # There are 600 parks tagged with landuse=park instead of leisure=park
       - park
       natural:
+      - wood
       - wetland
       - grassland
       leisure: