From e1ab498936aef378f769b2feeeaf90ecc20324e7 Mon Sep 17 00:00:00 2001
From: jirik <jirik@users.noreply.github.com>
Date: Wed, 8 Nov 2017 13:45:27 +0100
Subject: [PATCH] Add gardens to landcover

---
 layers/landcover/landcover.sql  | 16 ++++++++++------
 layers/landcover/landcover.yaml |  1 +
 layers/landcover/mapping.yaml   |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/layers/landcover/landcover.sql b/layers/landcover/landcover.sql
index 9405676f..8bd83a9c 100644
--- a/layers/landcover/landcover.sql
+++ b/layers/landcover/landcover.sql
@@ -11,12 +11,16 @@
 
 CREATE OR REPLACE FUNCTION landcover_class(landuse VARCHAR, "natural" VARCHAR, leisure VARCHAR, wetland VARCHAR) RETURNS TEXT AS $$
     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') THEN 'wood'
-         WHEN "natural" IN ('bare_rock', 'scree') THEN 'rock'
-         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'
+        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') THEN 'wood'
+        WHEN "natural" IN ('bare_rock', 'scree') THEN 'rock'
+        WHEN "natural"='grassland'
+            OR landuse IN ('grass', 'meadow', 'allotments', 'grassland',
+                'park', 'village_green', 'recreation_ground')
+            OR leisure IN ('park', 'garden')
+            THEN 'grass'
+        WHEN "natural"='wetland' OR wetland IN ('bog', 'swamp', 'wet_meadow', 'marsh', 'reedbed', 'saltern', 'tidalflat', 'saltmarsh', 'mangrove') THEN 'wetland'
         ELSE NULL
     END;
 $$ LANGUAGE SQL IMMUTABLE;
diff --git a/layers/landcover/landcover.yaml b/layers/landcover/landcover.yaml
index f72b0033..ee192d13 100644
--- a/layers/landcover/landcover.yaml
+++ b/layers/landcover/landcover.yaml
@@ -38,6 +38,7 @@ layer:
       - village_green
       - recreation_ground
       - park
+      - garden
       - wetland
       - grassland
       - bog
diff --git a/layers/landcover/mapping.yaml b/layers/landcover/mapping.yaml
index 7e21642e..3504f18c 100644
--- a/layers/landcover/mapping.yaml
+++ b/layers/landcover/mapping.yaml
@@ -92,6 +92,7 @@ tables:
       - scree
       leisure:
       - park
+      - garden
       wetland:
       - bog
       - swamp