From c08b0d40c14b1f22cdd6ce85d24a88fd60d8a7f5 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Mon, 16 Dec 2019 10:53:44 -0500
Subject: [PATCH] Update generic preset names to be categorical (e.g. "this is
 a Tourism Feature" instead of "this is a Tourism")

---
 data/presets.yaml                   | 18 +++++++++---------
 data/presets/presets.json           | 18 +++++++++---------
 data/presets/presets/_highway.json  |  2 +-
 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/_power.json    |  2 +-
 data/presets/presets/_railway.json  |  2 +-
 data/presets/presets/_tourism.json  |  2 +-
 data/presets/presets/_waterway.json |  2 +-
 data/taginfo.json                   | 18 +++++++++---------
 dist/locales/en.json                | 18 +++++++++---------
 13 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index 6964128fe..2783ea177 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4792,7 +4792,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Speech Therapist'', separated by commas>'
       highway:
         # highway=*
-        name: Highway
+        name: Highway Feature
       highway/bridleway:
         # highway=bridleway
         name: Bridle Path
@@ -5276,7 +5276,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Junction'', separated by commas>'
       landuse:
         # landuse=*
-        name: Land Use
+        name: Land Use Feature
       landuse/allotments:
         # landuse=allotments
         name: Community Garden
@@ -5479,7 +5479,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Winter Sports Area'', separated by commas>'
       leisure:
         # leisure=*
-        name: Leisure
+        name: Leisure Feature
       leisure/adult_gaming_centre:
         # leisure=adult_gaming_centre
         name: Adult Gaming Center
@@ -5888,7 +5888,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Line'', separated by commas>'
       man_made:
         # man_made=*
-        name: Man Made
+        name: Man Made Feature
       man_made/adit:
         # man_made=adit
         name: Adit
@@ -6244,7 +6244,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Military Trench'', separated by commas>'
       natural:
         # natural=*
-        name: Natural
+        name: Natural Feature
       natural/bare_rock:
         # natural=bare_rock
         name: Bare Rock
@@ -6843,7 +6843,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Temporary Polling Place'', separated by commas>'
       power:
         # power=*
-        name: Power
+        name: Power Feature
       power/cable/underground:
         # 'power=cable, location=underground'
         name: Underground Power Cable
@@ -7110,7 +7110,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Trolleybus Stopping Location'', separated by commas>'
       railway:
         # railway=*
-        name: Railway
+        name: Railway Feature
       railway/abandoned:
         # railway=abandoned
         name: Abandoned Railway
@@ -8020,7 +8020,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Data Center'', separated by commas>'
       tourism:
         # tourism=*
-        name: Tourism
+        name: Tourism Feature
       tourism/alpine_hut:
         # tourism=alpine_hut
         name: Alpine Hut
@@ -8414,7 +8414,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Waterway'', separated by commas>'
       waterway:
         # waterway=*
-        name: Waterway
+        name: Waterway Feature
       waterway/boatyard:
         # waterway=boatyard
         name: Boatyard
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e35667db9..832520f94 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -9,19 +9,19 @@
     "embankment": {"geometry": ["line"], "tags": {"embankment": "yes"}, "name": "Embankment", "matchScore": 0.2, "searchable": false},
     "emergency": {"fields": ["emergency_combo"], "geometry": ["point", "vertex", "area"], "tags": {"emergency": "*"}, "searchable": false, "name": "Emergency Feature"},
     "ford_line": {"geometry": ["line"], "tags": {"ford": "*"}, "name": "Ford", "searchable": false},
-    "highway": {"fields": ["name", "highway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"highway": "*"}, "searchable": false, "name": "Highway"},
+    "highway": {"fields": ["name", "highway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"highway": "*"}, "searchable": false, "name": "Highway Feature"},
     "indoor": {"fields": ["level", "indoor_type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"indoor": "*"}, "matchScore": 0.8, "searchable": false, "name": "Indoor Feature"},
-    "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "searchable": false, "name": "Land Use"},
-    "leisure": {"icon": "maki-pitch", "fields": ["name", "leisure"], "geometry": ["point", "vertex", "line", "area"], "tags": {"leisure": "*"}, "searchable": false, "name": "Leisure"},
-    "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "matchScore": 0.95, "searchable": false, "name": "Man Made"},
-    "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural"},
+    "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "searchable": false, "name": "Land Use Feature"},
+    "leisure": {"icon": "maki-pitch", "fields": ["name", "leisure"], "geometry": ["point", "vertex", "line", "area"], "tags": {"leisure": "*"}, "searchable": false, "name": "Leisure Feature"},
+    "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "matchScore": 0.95, "searchable": false, "name": "Man Made Feature"},
+    "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural Feature"},
     "place": {"fields": ["name", "place"], "moreFields": ["gnis/feature_id"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"},
     "playground": {"icon": "maki-playground", "fields": ["playground", "playground/theme", "min_age", "max_age", "wheelchair", "blind", "height"], "moreFields": ["access_simple", "colour", "ref"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"},
-    "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power"},
-    "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway"},
+    "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power Feature"},
+    "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway Feature"},
     "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"},
-    "tourism": {"icon": "maki-attraction", "fields": ["name", "tourism"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "*"}, "searchable": false, "name": "Tourism"},
-    "waterway": {"fields": ["name", "waterway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"waterway": "*"}, "searchable": false, "name": "Waterway"},
+    "tourism": {"icon": "maki-attraction", "fields": ["name", "tourism"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "*"}, "searchable": false, "name": "Tourism Feature"},
+    "waterway": {"fields": ["name", "waterway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"waterway": "*"}, "searchable": false, "name": "Waterway Feature"},
     "addr/interpolation": {"fields": ["addr/interpolation"], "geometry": ["line"], "tags": {"addr:interpolation": "*"}, "name": "Address Interpolation", "searchable": false, "matchScore": 0.2},
     "address": {"fields": ["address"], "geometry": ["point", "vertex", "area"], "tags": {"addr:*": "*"}, "addTags": {}, "removeTags": {}, "reference": {"key": "addr"}, "name": "Address", "matchScore": 0.15},
     "advertising/billboard": {"icon": "temaki-billboard", "fields": ["direction", "lit"], "geometry": ["point", "vertex", "line"], "tags": {"advertising": "billboard"}, "name": "Billboard"},
diff --git a/data/presets/presets/_highway.json b/data/presets/presets/_highway.json
index 31827c249..a38edc80f 100644
--- a/data/presets/presets/_highway.json
+++ b/data/presets/presets/_highway.json
@@ -13,5 +13,5 @@
         "highway": "*"
     },
     "searchable": false,
-    "name": "Highway"
+    "name": "Highway Feature"
 }
diff --git a/data/presets/presets/_landuse.json b/data/presets/presets/_landuse.json
index 4e51ec7b1..32211475a 100644
--- a/data/presets/presets/_landuse.json
+++ b/data/presets/presets/_landuse.json
@@ -11,5 +11,5 @@
     },
     "matchScore": 0.9,
     "searchable": false,
-    "name": "Land Use"
+    "name": "Land Use Feature"
 }
diff --git a/data/presets/presets/_leisure.json b/data/presets/presets/_leisure.json
index bf86b6520..560cbee8e 100644
--- a/data/presets/presets/_leisure.json
+++ b/data/presets/presets/_leisure.json
@@ -14,5 +14,5 @@
         "leisure": "*"
     },
     "searchable": false,
-    "name": "Leisure"
+    "name": "Leisure Feature"
 }
diff --git a/data/presets/presets/_man_made.json b/data/presets/presets/_man_made.json
index 887cd5997..1e1496439 100644
--- a/data/presets/presets/_man_made.json
+++ b/data/presets/presets/_man_made.json
@@ -18,5 +18,5 @@
     },
     "matchScore": 0.95,
     "searchable": false,
-    "name": "Man Made"
+    "name": "Man Made Feature"
 }
diff --git a/data/presets/presets/_natural.json b/data/presets/presets/_natural.json
index 0887d8d13..a0fa54f52 100644
--- a/data/presets/presets/_natural.json
+++ b/data/presets/presets/_natural.json
@@ -17,5 +17,5 @@
         "natural": "*"
     },
     "searchable": false,
-    "name": "Natural"
+    "name": "Natural Feature"
 }
diff --git a/data/presets/presets/_power.json b/data/presets/presets/_power.json
index ae1731f16..d2a20e061 100644
--- a/data/presets/presets/_power.json
+++ b/data/presets/presets/_power.json
@@ -15,5 +15,5 @@
         "material"
     ],
     "searchable": false,
-    "name": "Power"
+    "name": "Power Feature"
 }
diff --git a/data/presets/presets/_railway.json b/data/presets/presets/_railway.json
index 31f5f02f6..bb63e37ba 100644
--- a/data/presets/presets/_railway.json
+++ b/data/presets/presets/_railway.json
@@ -12,5 +12,5 @@
         "railway": "*"
     },
     "searchable": false,
-    "name": "Railway"
+    "name": "Railway Feature"
 }
diff --git a/data/presets/presets/_tourism.json b/data/presets/presets/_tourism.json
index 298cb1a30..e91e8eabf 100644
--- a/data/presets/presets/_tourism.json
+++ b/data/presets/presets/_tourism.json
@@ -14,5 +14,5 @@
         "tourism": "*"
     },
     "searchable": false,
-    "name": "Tourism"
+    "name": "Tourism Feature"
 }
diff --git a/data/presets/presets/_waterway.json b/data/presets/presets/_waterway.json
index 062508561..e1b50d123 100644
--- a/data/presets/presets/_waterway.json
+++ b/data/presets/presets/_waterway.json
@@ -13,5 +13,5 @@
         "waterway": "*"
     },
     "searchable": false,
-    "name": "Waterway"
+    "name": "Waterway Feature"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 1c59c2e59..5c1868eb8 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -12,19 +12,19 @@
     {"key": "embankment", "value": "yes", "description": "🄿 Embankment (unsearchable)", "object_types": ["way"]},
     {"key": "emergency", "description": "🄿 Emergency Feature (unsearchable), 🄵 Type, 🄵 Emergency", "object_types": ["node", "area"]},
     {"key": "ford", "description": "🄿 Ford (unsearchable), 🄵 Type, 🄵 Structure", "object_types": ["way"]},
-    {"key": "highway", "description": "🄿 Highway (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
+    {"key": "highway", "description": "🄿 Highway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
     {"key": "indoor", "description": "🄿 Indoor Feature (unsearchable), 🄵 Type, 🄵 Indoor", "object_types": ["node", "way", "area"]},
-    {"key": "landuse", "description": "🄿 Land Use (unsearchable), 🄵 Type", "object_types": ["area"]},
-    {"key": "leisure", "description": "🄿 Leisure (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
-    {"key": "man_made", "description": "🄿 Man Made (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"},
-    {"key": "natural", "description": "🄿 Natural (unsearchable), 🄵 Natural", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/natural-15.svg"},
+    {"key": "landuse", "description": "🄿 Land Use Feature (unsearchable), 🄵 Type", "object_types": ["area"]},
+    {"key": "leisure", "description": "🄿 Leisure Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
+    {"key": "man_made", "description": "🄿 Man Made Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/storage_tank.svg"},
+    {"key": "natural", "description": "🄿 Natural Feature (unsearchable), 🄵 Natural", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/natural-15.svg"},
     {"key": "place", "description": "🄿 Place (unsearchable), 🄵 Type", "object_types": ["node", "area"]},
     {"key": "playground", "description": "🄿 Playground Equipment (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/playground-15.svg"},
-    {"key": "power", "description": "🄿 Power (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
-    {"key": "railway", "description": "🄿 Railway (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
+    {"key": "power", "description": "🄿 Power Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
+    {"key": "railway", "description": "🄿 Railway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
     {"key": "seamark:type", "description": "🄿 Seamark (unsearchable), 🄵 Seamark", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"},
-    {"key": "tourism", "description": "🄿 Tourism (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/attraction-15.svg"},
-    {"key": "waterway", "description": "🄿 Waterway (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
+    {"key": "tourism", "description": "🄿 Tourism Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/attraction-15.svg"},
+    {"key": "waterway", "description": "🄿 Waterway Feature (unsearchable), 🄵 Type", "object_types": ["node", "way", "area"]},
     {"key": "addr:interpolation", "description": "🄿 Address Interpolation (unsearchable)", "object_types": ["way"]},
     {"key": "addr:*", "description": "🄿 Address", "object_types": ["node", "area"]},
     {"key": "advertising", "value": "billboard", "description": "🄿 Billboard", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/billboard.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index d7bb5a4f7..d387362cd 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4818,22 +4818,22 @@
                     "name": "Ford"
                 },
                 "highway": {
-                    "name": "Highway"
+                    "name": "Highway Feature"
                 },
                 "indoor": {
                     "name": "Indoor Feature"
                 },
                 "landuse": {
-                    "name": "Land Use"
+                    "name": "Land Use Feature"
                 },
                 "leisure": {
-                    "name": "Leisure"
+                    "name": "Leisure Feature"
                 },
                 "man_made": {
-                    "name": "Man Made"
+                    "name": "Man Made Feature"
                 },
                 "natural": {
-                    "name": "Natural"
+                    "name": "Natural Feature"
                 },
                 "place": {
                     "name": "Place"
@@ -4842,19 +4842,19 @@
                     "name": "Playground Equipment"
                 },
                 "power": {
-                    "name": "Power"
+                    "name": "Power Feature"
                 },
                 "railway": {
-                    "name": "Railway"
+                    "name": "Railway Feature"
                 },
                 "seamark": {
                     "name": "Seamark"
                 },
                 "tourism": {
-                    "name": "Tourism"
+                    "name": "Tourism Feature"
                 },
                 "waterway": {
-                    "name": "Waterway"
+                    "name": "Waterway Feature"
                 },
                 "addr/interpolation": {
                     "name": "Address Interpolation"