From 20354741854d22477e20738bb9275913bb4ae5e4 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Wed, 29 Jul 2015 09:33:22 -0400
Subject: [PATCH] Make many toplevel generic presets not serachable (closes
 #2744)

This is to prevent users from accidentally adding e.g. `highway=yes`
---
 data/presets.yaml                   | 4 ++--
 data/presets/presets.json           | 9 ++++++++-
 data/presets/presets/aerialway.json | 3 ++-
 data/presets/presets/aeroway.json   | 3 ++-
 data/presets/presets/highway.json   | 3 ++-
 data/presets/presets/landuse.json   | 2 +-
 data/presets/presets/leisure.json   | 2 +-
 data/presets/presets/man_made.json  | 2 +-
 data/presets/presets/natural.json   | 2 +-
 data/presets/presets/place.json     | 3 ++-
 data/presets/presets/power.json     | 3 ++-
 data/presets/presets/railway.json   | 3 ++-
 data/presets/presets/waterway.json  | 3 ++-
 dist/locales/en.json                | 2 +-
 14 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 641a383cf..e82a65102 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2227,8 +2227,8 @@ en:
         terms: "<translate with synonyms or related terms for 'Junction', separated by commas>"
       landuse:
         # 'landuse=*'
-        name: Landuse
-        terms: "<translate with synonyms or related terms for 'Landuse', separated by commas>"
+        name: Land Use
+        terms: "<translate with synonyms or related terms for 'Land Use', separated by commas>"
       landuse/allotments:
         # landuse=allotments
         name: Allotments
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 506a8acfa..5f7157db6 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -31,6 +31,7 @@
             "funifor",
             "funitel"
         ],
+        "searchable": false,
         "name": "Aerialway"
     },
     "aerialway/cable_car": {
@@ -187,6 +188,7 @@
         "tags": {
             "aeroway": "*"
         },
+        "searchable": false,
         "name": "Aeroway"
     },
     "aeroway/aerodrome": {
@@ -3848,6 +3850,7 @@
         "tags": {
             "highway": "*"
         },
+        "searchable": false,
         "name": "Highway"
     },
     "highway/bridleway": {
@@ -4753,7 +4756,7 @@
         "tags": {
             "landuse": "*"
         },
-        "name": "Landuse"
+        "name": "Land Use"
     },
     "landuse/allotments": {
         "geometry": [
@@ -6622,6 +6625,7 @@
         "tags": {
             "place": "*"
         },
+        "searchable": false,
         "name": "Place"
     },
     "place/city": {
@@ -6791,6 +6795,7 @@
         "fields": [
             "power"
         ],
+        "searchable": false,
         "name": "Power"
     },
     "power/generator": {
@@ -6936,6 +6941,7 @@
         "tags": {
             "railway": "*"
         },
+        "searchable": false,
         "name": "Railway"
     },
     "railway/abandoned": {
@@ -9948,6 +9954,7 @@
         "tags": {
             "waterway": "*"
         },
+        "searchable": false,
         "name": "Waterway"
     },
     "waterway/canal": {
diff --git a/data/presets/presets/aerialway.json b/data/presets/presets/aerialway.json
index bda5e34fa..c7570a42e 100644
--- a/data/presets/presets/aerialway.json
+++ b/data/presets/presets/aerialway.json
@@ -15,5 +15,6 @@
         "funifor",
         "funitel"
     ],
+    "searchable": false,
     "name": "Aerialway"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/aeroway.json b/data/presets/presets/aeroway.json
index 82436fca6..27cd98825 100644
--- a/data/presets/presets/aeroway.json
+++ b/data/presets/presets/aeroway.json
@@ -12,5 +12,6 @@
     "tags": {
         "aeroway": "*"
     },
+    "searchable": false,
     "name": "Aeroway"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/highway.json b/data/presets/presets/highway.json
index c70685b91..ffbe8d986 100644
--- a/data/presets/presets/highway.json
+++ b/data/presets/presets/highway.json
@@ -11,5 +11,6 @@
     "tags": {
         "highway": "*"
     },
+    "searchable": false,
     "name": "Highway"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/landuse.json b/data/presets/presets/landuse.json
index 1498967ae..da9868b4d 100644
--- a/data/presets/presets/landuse.json
+++ b/data/presets/presets/landuse.json
@@ -8,5 +8,5 @@
     "tags": {
         "landuse": "*"
     },
-    "name": "Landuse"
+    "name": "Land Use"
 }
diff --git a/data/presets/presets/leisure.json b/data/presets/presets/leisure.json
index 32c695dd7..b21ef8a46 100644
--- a/data/presets/presets/leisure.json
+++ b/data/presets/presets/leisure.json
@@ -11,4 +11,4 @@
         "leisure": "*"
     },
     "name": "Leisure"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json
index c861d3155..373f837bd 100644
--- a/data/presets/presets/man_made.json
+++ b/data/presets/presets/man_made.json
@@ -12,4 +12,4 @@
         "man_made": "*"
     },
     "name": "Man Made"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/natural.json b/data/presets/presets/natural.json
index f6d4d69f5..9e337b31e 100644
--- a/data/presets/presets/natural.json
+++ b/data/presets/presets/natural.json
@@ -11,4 +11,4 @@
         "natural": "*"
     },
     "name": "Natural"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/place.json b/data/presets/presets/place.json
index 4ce86b570..b0ba0e209 100644
--- a/data/presets/presets/place.json
+++ b/data/presets/presets/place.json
@@ -10,5 +10,6 @@
     "tags": {
         "place": "*"
     },
+    "searchable": false,
     "name": "Place"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/power.json b/data/presets/presets/power.json
index 7f139375e..4f448710c 100644
--- a/data/presets/presets/power.json
+++ b/data/presets/presets/power.json
@@ -11,5 +11,6 @@
     "fields": [
         "power"
     ],
+    "searchable": false,
     "name": "Power"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/railway.json b/data/presets/presets/railway.json
index b1b42ee8a..31f5f02f6 100644
--- a/data/presets/presets/railway.json
+++ b/data/presets/presets/railway.json
@@ -11,5 +11,6 @@
     "tags": {
         "railway": "*"
     },
+    "searchable": false,
     "name": "Railway"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/waterway.json b/data/presets/presets/waterway.json
index 7a5cfefa2..c7a1b6c29 100644
--- a/data/presets/presets/waterway.json
+++ b/data/presets/presets/waterway.json
@@ -11,5 +11,6 @@
     "tags": {
         "waterway": "*"
     },
+    "searchable": false,
     "name": "Waterway"
-}
\ No newline at end of file
+}
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fdeb5bc6b..878e66fc2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2524,7 +2524,7 @@
                 "terms": ""
             },
             "landuse": {
-                "name": "Landuse",
+                "name": "Land Use",
                 "terms": ""
             },
             "landuse/allotments": {