From da43e8347be0fbe168db87d813fa50f7f0837c9b Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Sun, 21 Dec 2014 14:59:25 -0800
Subject: [PATCH] Add natural=cave_entrance preset

Fixes #2412
---
 data/presets.yaml                             |  7 +++--
 data/presets/presets.json                     | 27 +++++++++++++++----
 .../presets/natural/cave_entrance.json        | 15 +++++++++++
 data/taginfo.json                             |  4 +++
 dist/locales/en.json                          |  8 ++++--
 5 files changed, 52 insertions(+), 9 deletions(-)
 create mode 100644 data/presets/presets/natural/cave_entrance.json

diff --git a/data/presets.yaml b/data/presets.yaml
index c4b14add5..db3bbd4e0 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1352,8 +1352,8 @@ en:
         name: Farm
         terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
       landuse/farmland:
-        name: Farmland
-        terms: "<translate with synonyms or related terms for 'Farmland', separated by commas>"
+        name: Farm
+        terms: "<translate with synonyms or related terms for 'Farm', separated by commas>"
       landuse/farmyard:
         name: Farmyard
         terms: "<translate with synonyms or related terms for 'Farmyard', separated by commas>"
@@ -1534,6 +1534,9 @@ en:
       natural/beach:
         name: Beach
         terms: "<translate with synonyms or related terms for 'Beach', separated by commas>"
+      natural/cave_entrance:
+        name: Cave Entrance
+        terms: "<translate with synonyms or related terms for 'Cave Entrance', separated by commas>"
       natural/cliff:
         name: Cliff
         terms: "<translate with synonyms or related terms for 'Cliff', separated by commas>"
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8a194f323..93c47cc4a 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4618,7 +4618,8 @@
         },
         "terms": [],
         "name": "Farm",
-        "icon": "farm"
+        "icon": "farm",
+        "searchable": false
     },
     "landuse/farmland": {
         "fields": [
@@ -4631,10 +4632,11 @@
         "tags": {
             "landuse": "farmland"
         },
-        "terms": [],
-        "name": "Farmland",
-        "icon": "farm",
-        "searchable": false
+        "terms": [
+            "farmland"
+        ],
+        "name": "Farm",
+        "icon": "farm"
     },
     "landuse/farmyard": {
         "fields": [
@@ -5495,6 +5497,21 @@
         },
         "name": "Beach"
     },
+    "natural/cave_entrance": {
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "fields": [
+            "fee",
+            "access_simple"
+        ],
+        "terms": [],
+        "tags": {
+            "natural": "cave_entrance"
+        },
+        "name": "Cave Entrance"
+    },
     "natural/cliff": {
         "geometry": [
             "point",
diff --git a/data/presets/presets/natural/cave_entrance.json b/data/presets/presets/natural/cave_entrance.json
new file mode 100644
index 000000000..b40351239
--- /dev/null
+++ b/data/presets/presets/natural/cave_entrance.json
@@ -0,0 +1,15 @@
+{
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "fields": [
+        "fee",
+        "access_simple"
+    ],
+    "terms": [],
+    "tags": {
+        "natural": "cave_entrance"
+    },
+    "name": "Cave Entrance"
+}
\ No newline at end of file
diff --git a/data/taginfo.json b/data/taginfo.json
index 28db82fc3..041b49107 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1306,6 +1306,10 @@
             "key": "natural",
             "value": "beach"
         },
+        {
+            "key": "natural",
+            "value": "cave_entrance"
+        },
         {
             "key": "natural",
             "value": "cliff"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index acd84156f..a909d6160 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2324,8 +2324,8 @@
                 "terms": ""
             },
             "landuse/farmland": {
-                "name": "Farmland",
-                "terms": ""
+                "name": "Farm",
+                "terms": "farmland"
             },
             "landuse/farmyard": {
                 "name": "Farmyard",
@@ -2567,6 +2567,10 @@
                 "name": "Beach",
                 "terms": ""
             },
+            "natural/cave_entrance": {
+                "name": "Cave Entrance",
+                "terms": ""
+            },
             "natural/cliff": {
                 "name": "Cliff",
                 "terms": ""