From 69a6f1ccf3be2c65c121a451a226b5881b9762ea Mon Sep 17 00:00:00 2001
From: Ajith Ranka <ajith@mapbox.com>
Date: Fri, 13 Jan 2017 18:10:59 +0530
Subject: [PATCH] Add a natural features category, fixes #2843

---
 data/presets.yaml                          |  6 ++++
 data/presets/categories.json               | 37 ++++++++++++++++++++++
 data/presets/categories/natual-line.json   |  9 ++++++
 data/presets/categories/natural-area.json  | 17 ++++++++++
 data/presets/categories/natural-point.json | 11 +++++++
 data/presets/presets.json                  |  1 +
 data/presets/presets/natural/cliff.json    |  1 +
 dist/locales/en.json                       |  9 ++++++
 8 files changed, 91 insertions(+)
 create mode 100644 data/presets/categories/natual-line.json
 create mode 100644 data/presets/categories/natural-area.json
 create mode 100644 data/presets/categories/natural-point.json

diff --git a/data/presets.yaml b/data/presets.yaml
index a0258fc1c..2df24a7a0 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -9,6 +9,12 @@ en:
         name: Golf Features
       category-landuse:
         name: Land Use Features
+      category-natual-line:
+        name: Natural Features
+      category-natural-area:
+        name: Natural Features
+      category-natural-point:
+        name: Natural Features
       category-path:
         name: Path Features
       category-rail:
diff --git a/data/presets/categories.json b/data/presets/categories.json
index be59ba85e..b777baef5 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -56,6 +56,43 @@
                 "landuse/military"
             ]
         },
+        "category-natual-line": {
+            "geometry": "line",
+            "name": "Natural Features",
+            "icon": "natural",
+            "members": [
+                "natural/coastline",
+                "natural/tree_row"
+            ]
+        },
+        "category-natural-area": {
+            "geometry": "area",
+            "name": "Natural Features",
+            "icon": "natural",
+            "members": [
+                "natural/water",
+                "natural/wood",
+                "natural/scrub",
+                "natural/wetland",
+                "natural/grassland",
+                "natural/heath",
+                "natural/bare_rock",
+                "natural/beach",
+                "natural/cave_entrance",
+                "natural/glacier"
+            ]
+        },
+        "category-natural-point": {
+            "geometry": "point",
+            "name": "Natural Features",
+            "icon": "natural",
+            "members": [
+                "natural/peak",
+                "natural/cliff",
+                "natural/beach",
+                "natural/cave_entrance"
+            ]
+        },
         "category-path": {
             "geometry": "line",
             "name": "Path Features",
diff --git a/data/presets/categories/natual-line.json b/data/presets/categories/natual-line.json
new file mode 100644
index 000000000..a69c82959
--- /dev/null
+++ b/data/presets/categories/natual-line.json
@@ -0,0 +1,9 @@
+{
+    "geometry": "line",
+    "name": "Natural Features",
+    "icon": "natural",
+    "members": [
+        "natural/coastline",
+        "natural/tree_row"
+    ]
+}
diff --git a/data/presets/categories/natural-area.json b/data/presets/categories/natural-area.json
new file mode 100644
index 000000000..8d18cf536
--- /dev/null
+++ b/data/presets/categories/natural-area.json
@@ -0,0 +1,17 @@
+{
+    "geometry": "area",
+    "name": "Natural Features",
+    "icon": "natural",
+    "members": [
+        "natural/water",
+        "natural/wood",
+        "natural/scrub",
+        "natural/wetland",
+        "natural/grassland",
+        "natural/heath",
+        "natural/bare_rock",
+        "natural/beach",
+        "natural/cave_entrance",
+        "natural/glacier"
+    ]
+}
diff --git a/data/presets/categories/natural-point.json b/data/presets/categories/natural-point.json
new file mode 100644
index 000000000..3950b59ed
--- /dev/null
+++ b/data/presets/categories/natural-point.json
@@ -0,0 +1,11 @@
+{
+    "geometry": "point",
+    "name": "Natural Features",
+    "icon": "natural",
+    "members": [
+        "natural/peak",
+        "natural/cliff",
+        "natural/beach",
+        "natural/cave_entrance"
+    ]
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 16867e3bd..8d659e91b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -7827,6 +7827,7 @@
             "name": "Cave Entrance"
         },
         "natural/cliff": {
+            "icon": "triangle",
             "geometry": [
                 "point",
                 "vertex",
diff --git a/data/presets/presets/natural/cliff.json b/data/presets/presets/natural/cliff.json
index ea857bebb..74f49ca8f 100644
--- a/data/presets/presets/natural/cliff.json
+++ b/data/presets/presets/natural/cliff.json
@@ -1,4 +1,5 @@
 {
+    "icon": "triangle",
     "geometry": [
         "point",
         "vertex",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index ed981101a..e4bba2118 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -707,6 +707,15 @@
                 "category-landuse": {
                     "name": "Land Use Features"
                 },
+                "category-natual-line": {
+                    "name": "Natural Features"
+                },
+                "category-natural-area": {
+                    "name": "Natural Features"
+                },
+                "category-natural-point": {
+                    "name": "Natural Features"
+                },
                 "category-path": {
                     "name": "Path Features"
                 },