From 3cc7ad7428b962e11c1e761afdf636ed01f217ee Mon Sep 17 00:00:00 2001
From: JamesKingdom <james@unetworks.org>
Date: Tue, 1 Aug 2017 19:43:38 +0100
Subject: [PATCH] Adding name fields to misc presets

---
 data/presets/presets.json             | 38 ++++++++++++++++++++++++---
 data/presets/presets/_highway.json    |  1 +
 data/presets/presets/_place.json      |  1 +
 data/presets/presets/_roundabout.json |  3 +++
 data/presets/presets/_waterway.json   |  1 +
 data/presets/presets/area.json        |  5 +++-
 data/presets/presets/building.json    |  1 +
 data/presets/presets/club.json        |  1 +
 data/presets/presets/craft.json       |  1 +
 data/presets/presets/junction.json    |  3 +++
 data/presets/presets/landuse.json     |  1 +
 data/presets/presets/leisure.json     |  1 +
 data/presets/presets/line.json        |  5 +++-
 data/presets/presets/man_made.json    |  1 +
 data/presets/presets/natural.json     |  1 +
 data/presets/presets/office.json      |  1 +
 data/presets/presets/piste.json       |  3 ++-
 data/presets/presets/point.json       |  5 +++-
 data/presets/presets/relation.json    |  5 +++-
 data/presets/presets/shop.json        |  1 +
 data/presets/presets/tourism.json     |  1 +
 data/presets/presets/vertex.json      |  5 +++-
 22 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 02896931a..d6861954b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -54,6 +54,7 @@
         },
         "highway": {
             "fields": [
+                "name",
                 "highway"
             ],
             "geometry": [
@@ -70,6 +71,7 @@
         },
         "place": {
             "fields": [
+                "name",
                 "place"
             ],
             "geometry": [
@@ -120,6 +122,9 @@
                 "vertex",
                 "line"
             ],
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "junction": "roundabout"
             },
@@ -128,6 +133,7 @@
         },
         "waterway": {
             "fields": [
+                "name",
                 "waterway"
             ],
             "geometry": [
@@ -3191,6 +3197,9 @@
         },
         "area": {
             "name": "Area",
+            "fields": [
+                "name"
+            ],
             "tags": {
                 "area": "yes"
             },
@@ -3473,6 +3482,7 @@
         "building": {
             "icon": "home",
             "fields": [
+                "name",
                 "building",
                 "levels",
                 "address"
@@ -4076,6 +4086,7 @@
         "club": {
             "icon": "heart",
             "fields": [
+                "name",
                 "club",
                 "operator",
                 "address",
@@ -4097,6 +4108,7 @@
         "craft": {
             "icon": "poi-tool",
             "fields": [
+                "name",
                 "craft",
                 "operator",
                 "address",
@@ -6612,6 +6624,9 @@
         },
         "junction": {
             "icon": "poi-junction",
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "vertex",
                 "area"
@@ -6623,6 +6638,7 @@
         },
         "landuse": {
             "fields": [
+                "name",
                 "landuse"
             ],
             "geometry": [
@@ -7395,6 +7411,7 @@
         "leisure": {
             "icon": "pitch",
             "fields": [
+                "name",
                 "leisure"
             ],
             "geometry": [
@@ -8325,6 +8342,9 @@
         },
         "line": {
             "name": "Line",
+            "fields": [
+                "name"
+            ],
             "tags": {},
             "geometry": [
                 "line"
@@ -8334,6 +8354,7 @@
         "man_made": {
             "icon": "poi-storage-tank",
             "fields": [
+                "name",
                 "man_made"
             ],
             "geometry": [
@@ -8907,6 +8928,7 @@
         "natural": {
             "icon": "natural",
             "fields": [
+                "name",
                 "natural"
             ],
             "geometry": [
@@ -9338,6 +9360,7 @@
         "office": {
             "icon": "commercial",
             "fields": [
+                "name",
                 "office",
                 "address",
                 "building_area",
@@ -9812,6 +9835,7 @@
         "piste": {
             "icon": "skiing",
             "fields": [
+                "name",
                 "piste/type",
                 "piste/difficulty",
                 "piste/grooming",
@@ -10016,6 +10040,9 @@
         },
         "point": {
             "name": "Point",
+            "fields": [
+                "name"
+            ],
             "tags": {},
             "geometry": [
                 "point"
@@ -10642,11 +10669,11 @@
         "relation": {
             "name": "Relation",
             "icon": "relation",
-            "tags": {},
-            "geometry": [
+            "fields": [
                 "relation"
             ],
-            "fields": [
+            "tags": {},
+            "geometry": [
                 "relation"
             ]
         },
@@ -10663,6 +10690,7 @@
         "shop": {
             "icon": "shop",
             "fields": [
+                "name",
                 "shop",
                 "operator",
                 "address",
@@ -13018,6 +13046,7 @@
         "tourism": {
             "icon": "attraction",
             "fields": [
+                "name",
                 "tourism"
             ],
             "geometry": [
@@ -14095,6 +14124,9 @@
         "vertex": {
             "name": "Other",
             "tags": {},
+            "fields": [
+                "name"
+            ],
             "geometry": [
                 "vertex"
             ],
diff --git a/data/presets/presets/_highway.json b/data/presets/presets/_highway.json
index ffbe8d986..31827c249 100644
--- a/data/presets/presets/_highway.json
+++ b/data/presets/presets/_highway.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "highway"
     ],
     "geometry": [
diff --git a/data/presets/presets/_place.json b/data/presets/presets/_place.json
index b0ba0e209..77e7609c3 100644
--- a/data/presets/presets/_place.json
+++ b/data/presets/presets/_place.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "place"
     ],
     "geometry": [
diff --git a/data/presets/presets/_roundabout.json b/data/presets/presets/_roundabout.json
index 05916a536..96c99d4e9 100644
--- a/data/presets/presets/_roundabout.json
+++ b/data/presets/presets/_roundabout.json
@@ -3,6 +3,9 @@
         "vertex",
         "line"
     ],
+    "fields": [
+        "name"
+    ],
     "tags": {
         "junction": "roundabout"
     },
diff --git a/data/presets/presets/_waterway.json b/data/presets/presets/_waterway.json
index c7a1b6c29..062508561 100644
--- a/data/presets/presets/_waterway.json
+++ b/data/presets/presets/_waterway.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "waterway"
     ],
     "geometry": [
diff --git a/data/presets/presets/area.json b/data/presets/presets/area.json
index f1bbfe52a..a3b1c6fa5 100644
--- a/data/presets/presets/area.json
+++ b/data/presets/presets/area.json
@@ -1,8 +1,11 @@
 {
     "name": "Area",
+    "fields": [
+        "name"
+    ],
     "tags": {
         "area": "yes"
     },
     "geometry": ["area"],
     "matchScore": 0.1
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index 62c8fa034..c59c33a65 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -1,6 +1,7 @@
 {
     "icon": "home",
     "fields": [
+        "name",
         "building",
         "levels",
         "address"
diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json
index 45d86d73e..4ba1c4595 100644
--- a/data/presets/presets/club.json
+++ b/data/presets/presets/club.json
@@ -1,6 +1,7 @@
 {
     "icon": "heart",
     "fields": [
+        "name",
         "club",
         "operator",
         "address",
diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
index 912aaee54..2f88a6113 100644
--- a/data/presets/presets/craft.json
+++ b/data/presets/presets/craft.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-tool",
     "fields": [
+        "name",
         "craft",
         "operator",
         "address",
diff --git a/data/presets/presets/junction.json b/data/presets/presets/junction.json
index b72def66a..d7a8e420a 100644
--- a/data/presets/presets/junction.json
+++ b/data/presets/presets/junction.json
@@ -1,5 +1,8 @@
 {
     "icon": "poi-junction",
+    "fields": [
+        "name"
+    ],
     "geometry": [
         "vertex",
         "area"
diff --git a/data/presets/presets/landuse.json b/data/presets/presets/landuse.json
index bb7e3f85e..ed6ad8233 100644
--- a/data/presets/presets/landuse.json
+++ b/data/presets/presets/landuse.json
@@ -1,5 +1,6 @@
 {
     "fields": [
+        "name",
         "landuse"
     ],
     "geometry": [
diff --git a/data/presets/presets/leisure.json b/data/presets/presets/leisure.json
index eefb20ee2..271cf5d3b 100644
--- a/data/presets/presets/leisure.json
+++ b/data/presets/presets/leisure.json
@@ -1,6 +1,7 @@
 {
     "icon": "pitch",
     "fields": [
+        "name",
         "leisure"
     ],
     "geometry": [
diff --git a/data/presets/presets/line.json b/data/presets/presets/line.json
index c8995abed..47872d846 100644
--- a/data/presets/presets/line.json
+++ b/data/presets/presets/line.json
@@ -1,6 +1,9 @@
 {
     "name": "Line",
+    "fields": [
+        "name"
+    ],
     "tags": {},
     "geometry": ["line"],
     "matchScore": 0.1
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/man_made.json b/data/presets/presets/man_made.json
index 09df7cdf8..254b1b229 100644
--- a/data/presets/presets/man_made.json
+++ b/data/presets/presets/man_made.json
@@ -1,6 +1,7 @@
 {
     "icon": "poi-storage-tank",
     "fields": [
+        "name",
         "man_made"
     ],
     "geometry": [
diff --git a/data/presets/presets/natural.json b/data/presets/presets/natural.json
index 3554eeced..9ad9eaca1 100644
--- a/data/presets/presets/natural.json
+++ b/data/presets/presets/natural.json
@@ -1,6 +1,7 @@
 {
     "icon": "natural",
     "fields": [
+        "name",
         "natural"
     ],
     "geometry": [
diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json
index c91fe3581..b978d9192 100644
--- a/data/presets/presets/office.json
+++ b/data/presets/presets/office.json
@@ -1,6 +1,7 @@
 {
     "icon": "commercial",
     "fields": [
+        "name",
         "office",
         "address",
         "building_area",
diff --git a/data/presets/presets/piste.json b/data/presets/presets/piste.json
index 7aee2893d..33a56e0ef 100644
--- a/data/presets/presets/piste.json
+++ b/data/presets/presets/piste.json
@@ -1,6 +1,7 @@
 {
     "icon": "skiing",
     "fields": [
+        "name",
         "piste/type",
         "piste/difficulty",
         "piste/grooming",
@@ -25,4 +26,4 @@
         "piste:type": "*"
     },
     "name": "Piste/Ski Trail"
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/point.json b/data/presets/presets/point.json
index b4946599a..331b0d7ac 100644
--- a/data/presets/presets/point.json
+++ b/data/presets/presets/point.json
@@ -1,6 +1,9 @@
 {
     "name": "Point",
+    "fields": [
+        "name"
+    ],
     "tags": {},
     "geometry": ["point"],
     "matchScore": 0.1
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/relation.json b/data/presets/presets/relation.json
index 96f61c798..d3103f8d1 100644
--- a/data/presets/presets/relation.json
+++ b/data/presets/presets/relation.json
@@ -1,9 +1,12 @@
 {
     "name": "Relation",
     "icon": "relation",
+    "fields": [
+        "name"
+    ],
     "tags": {},
     "geometry": ["relation"],
     "fields": [
         "relation"
     ]
-}
\ No newline at end of file
+}
diff --git a/data/presets/presets/shop.json b/data/presets/presets/shop.json
index d9879e230..f7a9d6bd4 100644
--- a/data/presets/presets/shop.json
+++ b/data/presets/presets/shop.json
@@ -1,6 +1,7 @@
 {
     "icon": "shop",
     "fields": [
+        "name",
         "shop",
         "operator",
         "address",
diff --git a/data/presets/presets/tourism.json b/data/presets/presets/tourism.json
index 2e830d6fe..e72dca6e7 100644
--- a/data/presets/presets/tourism.json
+++ b/data/presets/presets/tourism.json
@@ -1,6 +1,7 @@
 {
     "icon": "attraction",
     "fields": [
+        "name",
         "tourism"
     ],
     "geometry": [
diff --git a/data/presets/presets/vertex.json b/data/presets/presets/vertex.json
index 6d2ea13fd..b1fd4fb81 100644
--- a/data/presets/presets/vertex.json
+++ b/data/presets/presets/vertex.json
@@ -1,6 +1,9 @@
 {
     "name": "Other",
     "tags": {},
+    "fields": [
+        "name"
+    ],
     "geometry": ["vertex"],
     "matchScore": 0.1
-}
\ No newline at end of file
+}