From 92c6ab033976561324324d091e1189f301e5e8a3 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 7 May 2018 12:16:25 -0400
Subject: [PATCH] Update clearcut and forest icon and search terms

---
 data/presets.yaml                           |  7 ++++++-
 data/presets/presets.json                   | 20 +++++++++++++++++++
 data/presets/presets/landuse/forest.json    |  3 +++
 data/presets/presets/man_made/clearcut.json | 22 ++++++++++++++-------
 data/taginfo.json                           |  9 +++++++++
 dist/locales/en.json                        |  6 +++++-
 6 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index c76f7fe88..1c6f187eb 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3575,7 +3575,7 @@ en:
       landuse/forest:
         # landuse=forest
         name: Forest
-        # 'terms: tree'
+        # 'terms: cut,forest,lumber,tree'
         terms: '<translate with synonyms or related terms for ''Forest'', separated by commas>'
       landuse/garages:
         # landuse=garages
@@ -4048,6 +4048,11 @@ en:
         # man_made=chimney
         name: Chimney
         terms: '<translate with synonyms or related terms for ''Chimney'', separated by commas>'
+      man_made/clearcut:
+        # man_made=clearcut
+        name: Clearcut Forest
+        # 'terms: cut,forest,lumber,tree,wood'
+        terms: '<translate with synonyms or related terms for ''Clearcut Forest'', separated by commas>'
       man_made/crane:
         # man_made=crane
         name: Crane
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6937f56bb..fb4220312 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -8903,6 +8903,9 @@
                 "landuse": "forest"
             },
             "terms": [
+                "cut",
+                "forest",
+                "lumber",
                 "tree"
             ],
             "name": "Forest"
@@ -11383,6 +11386,23 @@
             },
             "name": "Chimney"
         },
+        "man_made/clearcut": {
+            "icon": "logging",
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "man_made": "clearcut"
+            },
+            "terms": [
+                "cut",
+                "forest",
+                "lumber",
+                "tree",
+                "wood"
+            ],
+            "name": "Clearcut Forest"
+        },
         "man_made/crane": {
             "icon": "poi-crane",
             "fields": [
diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json
index 8b3eee020..7a33eb7de 100644
--- a/data/presets/presets/landuse/forest.json
+++ b/data/presets/presets/landuse/forest.json
@@ -13,6 +13,9 @@
         "landuse": "forest"
     },
     "terms": [
+        "cut",
+        "forest",
+        "lumber",
         "tree"
     ],
     "name": "Forest"
diff --git a/data/presets/presets/man_made/clearcut.json b/data/presets/presets/man_made/clearcut.json
index 01f6dd4ea..46cd2b76c 100644
--- a/data/presets/presets/man_made/clearcut.json
+++ b/data/presets/presets/man_made/clearcut.json
@@ -1,9 +1,17 @@
 {
-  "geometry": [
-    "area"
-  ],
-  "tags": {
-    "man_made": "clearcut"
-  },
-  "name": "Clearcut"
+    "icon": "logging",
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "man_made": "clearcut"
+    },
+    "terms": [
+        "cut",
+        "forest",
+        "lumber",
+        "tree",
+        "wood"
+    ],
+    "name": "Clearcut Forest"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 2d572f84b..eb5086232 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -4736,6 +4736,15 @@
                 "area"
             ]
         },
+        {
+            "key": "man_made",
+            "value": "clearcut",
+            "description": "Clearcut Forest",
+            "object_types": [
+                "area"
+            ],
+            "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/logging-15.svg?sanitize=true"
+        },
         {
             "key": "man_made",
             "value": "crane",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 5c1483d6f..c17b40774 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4497,7 +4497,7 @@
                 },
                 "landuse/forest": {
                     "name": "Forest",
-                    "terms": "tree"
+                    "terms": "cut,forest,lumber,tree"
                 },
                 "landuse/garages": {
                     "name": "Garage Landuse",
@@ -4907,6 +4907,10 @@
                     "name": "Chimney",
                     "terms": ""
                 },
+                "man_made/clearcut": {
+                    "name": "Clearcut Forest",
+                    "terms": "cut,forest,lumber,tree,wood"
+                },
                 "man_made/crane": {
                     "name": "Crane",
                     "terms": ""