From fbef31f776cc6c29b448ed5ecb499b01452b0f56 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Thu, 2 Apr 2020 11:01:20 -0700
Subject: [PATCH] Add shrub preset (close #7482)

---
 data/presets.yaml                       |  5 +++++
 data/presets/presets.json               |  1 +
 data/presets/presets/natural/shrub.json | 21 +++++++++++++++++++++
 data/taginfo.json                       |  1 +
 dist/locales/en.json                    |  4 ++++
 5 files changed, 32 insertions(+)
 create mode 100644 data/presets/presets/natural/shrub.json

diff --git a/data/presets.yaml b/data/presets.yaml
index 2a8e31537..9c8817bd4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -6563,6 +6563,11 @@ en:
         name: Shingle
         # 'terms: beach,gravel,pebbles,riverbed,rounded rock fragments'
         terms: '<translate with synonyms or related terms for ''Shingle'', separated by commas>'
+      natural/shrub:
+        # natural=shrub
+        name: Shrub
+        # 'terms: bush,scrub'
+        terms: '<translate with synonyms or related terms for ''Shrub'', separated by commas>'
       natural/spring:
         # natural=spring
         name: Spring
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 49a108422..3f56ac392 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -823,6 +823,7 @@
   "natural/scree": {"geometry": ["area"], "tags": {"natural": "scree"}, "terms": ["loose rocks"], "name": "Scree"},
   "natural/scrub": {"geometry": ["area"], "tags": {"natural": "scrub"}, "terms": ["bush", "shrubs"], "name": "Scrub"},
   "natural/shingle": {"geometry": ["area"], "tags": {"natural": "shingle"}, "terms": ["beach", "gravel", "pebbles", "riverbed", "rounded rock fragments"], "name": "Shingle"},
+  "natural/shrub": {"icon": "maki-park", "fields": ["height"], "moreFields": ["species/wikidata"], "geometry": ["point", "vertex"], "tags": {"natural": "shrub"}, "terms": ["bush", "scrub"], "name": "Shrub"},
   "natural/spring": {"icon": "maki-water", "fields": ["name", "drinking_water", "intermittent"], "geometry": ["point", "vertex"], "tags": {"natural": "spring"}, "terms": ["aquifer", "hydro", "seep", "water source"], "name": "Spring"},
   "natural/stone": {"icon": "temaki-boulder1", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "stone", "rock"], "name": "Unattached Stone / Boulder"},
   "natural/tree_row": {"icon": "temaki-tree_row", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"},
diff --git a/data/presets/presets/natural/shrub.json b/data/presets/presets/natural/shrub.json
new file mode 100644
index 000000000..f652054ea
--- /dev/null
+++ b/data/presets/presets/natural/shrub.json
@@ -0,0 +1,21 @@
+{
+    "icon": "maki-park",
+    "fields": [
+        "height"
+    ],
+    "moreFields": [
+        "species/wikidata"
+    ],
+    "geometry": [
+        "point",
+        "vertex"
+    ],
+    "tags": {
+        "natural": "shrub"
+    },
+    "terms": [
+        "bush",
+        "scrub"
+    ],
+    "name": "Shrub"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 6fa8985eb..82a3f63c8 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -801,6 +801,7 @@
     {"key": "natural", "value": "scree", "description": "🄿 Scree", "object_types": ["area"]},
     {"key": "natural", "value": "scrub", "description": "🄿 Scrub", "object_types": ["area"]},
     {"key": "natural", "value": "shingle", "description": "🄿 Shingle", "object_types": ["area"]},
+    {"key": "natural", "value": "shrub", "description": "🄿 Shrub", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-15.svg"},
     {"key": "natural", "value": "spring", "description": "🄿 Spring", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "natural", "value": "stone", "description": "🄿 Unattached Stone / Boulder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/boulder1.svg"},
     {"key": "natural", "value": "tree_row", "description": "🄿 Tree Row", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tree_row.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 62fa4008f..ae6aae0b0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -8196,6 +8196,10 @@
                     "name": "Shingle",
                     "terms": "beach,gravel,pebbles,riverbed,rounded rock fragments"
                 },
+                "natural/shrub": {
+                    "name": "Shrub",
+                    "terms": "bush,scrub"
+                },
                 "natural/spring": {
                     "name": "Spring",
                     "terms": "aquifer,hydro,seep,water source"