From 24af9e64044df23b79823a55128ff34241a0b03b Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Wed, 3 Aug 2016 14:47:26 -0400
Subject: [PATCH] Remove leading underscores from preset id parts Introduced
 with 0d2f78c, but I don't want to break existing translations

---
 build.js                  |   8 +-
 data/presets.yaml         |  48 +--
 data/presets/presets.json | 796 +++++++++++++++++++-------------------
 data/taginfo.json         | 182 ++++-----
 dist/locales/en.json      | 212 +++++-----
 5 files changed, 625 insertions(+), 621 deletions(-)

diff --git a/build.js b/build.js
index 970363659..18df1ba5b 100644
--- a/build.js
+++ b/build.js
@@ -62,7 +62,7 @@ function generateFields() {
     var fields = {};
     glob.sync(__dirname + '/data/presets/fields/**/*.json').forEach(function(file) {
         var field = read(file),
-            id = file.match(/presets\/fields\/([^.]*)\.json/)[1];
+            id = stripLeadingUnderscores(file.match(/presets\/fields\/([^.]*)\.json/)[1]);
 
         validate(file, field, fieldSchema);
 
@@ -134,12 +134,16 @@ function suggestionsToPresets(presets) {
     return presets;
 }
 
+function stripLeadingUnderscores(str) {
+    return str.split('/').map(function(s) {return s.replace(/^_/,''); }).join('/');
+}
+
 function generatePresets() {
     var presets = {};
 
     glob.sync(__dirname + '/data/presets/presets/**/*.json').forEach(function(file) {
         var preset = read(file),
-            id = file.match(/presets\/presets\/([^.]*)\.json/)[1];
+            id = stripLeadingUnderscores(file.match(/presets\/presets\/([^.]*)\.json/)[1]);
 
         validate(file, preset, presetSchema);
 
diff --git a/data/presets.yaml b/data/presets.yaml
index 10432c42f..a7555b2a6 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2137,30 +2137,6 @@ en:
         # embankment=yes
         name: Embankment
         terms: '<translate with synonyms or related terms for ''Embankment'', separated by commas>'
-      emergency/_designated:
-        # emergency=designated
-        name: Emergency Access Designated
-        terms: '<translate with synonyms or related terms for ''Emergency Access Designated'', separated by commas>'
-      emergency/_destination:
-        # emergency=destination
-        name: Emergency Access Destination
-        terms: '<translate with synonyms or related terms for ''Emergency Access Destination'', separated by commas>'
-      emergency/_no:
-        # emergency=no
-        name: Emergency Access No
-        terms: '<translate with synonyms or related terms for ''Emergency Access No'', separated by commas>'
-      emergency/_official:
-        # emergency=official
-        name: Emergency Access Official
-        terms: '<translate with synonyms or related terms for ''Emergency Access Official'', separated by commas>'
-      emergency/_private:
-        # emergency=private
-        name: Emergency Access Private
-        terms: '<translate with synonyms or related terms for ''Emergency Access Private'', separated by commas>'
-      emergency/_yes:
-        # emergency=yes
-        name: Emergency Access Yes
-        terms: '<translate with synonyms or related terms for ''Emergency Access Yes'', separated by commas>'
       emergency/ambulance_station:
         # emergency=ambulance_station
         name: Ambulance Station
@@ -2171,14 +2147,38 @@ en:
         name: Defibrillator
         # 'terms: AED'
         terms: '<translate with synonyms or related terms for ''Defibrillator'', separated by commas>'
+      emergency/designated:
+        # emergency=designated
+        name: Emergency Access Designated
+        terms: '<translate with synonyms or related terms for ''Emergency Access Designated'', separated by commas>'
+      emergency/destination:
+        # emergency=destination
+        name: Emergency Access Destination
+        terms: '<translate with synonyms or related terms for ''Emergency Access Destination'', separated by commas>'
       emergency/fire_hydrant:
         # emergency=fire_hydrant
         name: Fire Hydrant
         terms: '<translate with synonyms or related terms for ''Fire Hydrant'', separated by commas>'
+      emergency/no:
+        # emergency=no
+        name: Emergency Access No
+        terms: '<translate with synonyms or related terms for ''Emergency Access No'', separated by commas>'
+      emergency/official:
+        # emergency=official
+        name: Emergency Access Official
+        terms: '<translate with synonyms or related terms for ''Emergency Access Official'', separated by commas>'
       emergency/phone:
         # emergency=phone
         name: Emergency Phone
         terms: '<translate with synonyms or related terms for ''Emergency Phone'', separated by commas>'
+      emergency/private:
+        # emergency=private
+        name: Emergency Access Private
+        terms: '<translate with synonyms or related terms for ''Emergency Access Private'', separated by commas>'
+      emergency/yes:
+        # emergency=yes
+        name: Emergency Access Yes
+        terms: '<translate with synonyms or related terms for ''Emergency Access Yes'', separated by commas>'
       entrance:
         # entrance=*
         name: Entrance/Exit
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7d5f46a64..39b975c97 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1,19 +1,4 @@
 {
-    "address": {
-        "fields": [
-            "address"
-        ],
-        "geometry": [
-            "point"
-        ],
-        "tags": {
-            "addr:housenumber": "*"
-        },
-        "addTags": {},
-        "removeTags": {},
-        "matchScore": 0.2,
-        "name": "Address"
-    },
     "aerialway": {
         "fields": [
             "aerialway"
@@ -34,6 +19,143 @@
         "searchable": false,
         "name": "Aerialway"
     },
+    "aeroway": {
+        "icon": "airport",
+        "fields": [
+            "aeroway"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "line",
+            "area"
+        ],
+        "tags": {
+            "aeroway": "*"
+        },
+        "searchable": false,
+        "name": "Aeroway"
+    },
+    "amenity": {
+        "fields": [
+            "amenity"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "amenity": "*"
+        },
+        "searchable": false,
+        "name": "Amenity"
+    },
+    "highway": {
+        "fields": [
+            "highway"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "line",
+            "area"
+        ],
+        "tags": {
+            "highway": "*"
+        },
+        "searchable": false,
+        "name": "Highway"
+    },
+    "place": {
+        "fields": [
+            "place"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "place": "*"
+        },
+        "searchable": false,
+        "name": "Place"
+    },
+    "power": {
+        "geometry": [
+            "point",
+            "vertex",
+            "line",
+            "area"
+        ],
+        "tags": {
+            "power": "*"
+        },
+        "fields": [
+            "power"
+        ],
+        "searchable": false,
+        "name": "Power"
+    },
+    "railway": {
+        "fields": [
+            "railway"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "line",
+            "area"
+        ],
+        "tags": {
+            "railway": "*"
+        },
+        "searchable": false,
+        "name": "Railway"
+    },
+    "roundabout": {
+        "geometry": [
+            "vertex",
+            "line"
+        ],
+        "tags": {
+            "junction": "roundabout"
+        },
+        "name": "Roundabout",
+        "searchable": false
+    },
+    "waterway": {
+        "fields": [
+            "waterway"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "line",
+            "area"
+        ],
+        "tags": {
+            "waterway": "*"
+        },
+        "searchable": false,
+        "name": "Waterway"
+    },
+    "address": {
+        "fields": [
+            "address"
+        ],
+        "geometry": [
+            "point"
+        ],
+        "tags": {
+            "addr:housenumber": "*"
+        },
+        "addTags": {},
+        "removeTags": {},
+        "matchScore": 0.2,
+        "name": "Address"
+    },
     "aerialway/cable_car": {
         "geometry": [
             "line"
@@ -174,23 +296,6 @@
         },
         "name": "T-bar Lift"
     },
-    "aeroway": {
-        "icon": "airport",
-        "fields": [
-            "aeroway"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "line",
-            "area"
-        ],
-        "tags": {
-            "aeroway": "*"
-        },
-        "searchable": false,
-        "name": "Aeroway"
-    },
     "aeroway/aerodrome": {
         "icon": "airport",
         "geometry": [
@@ -321,20 +426,37 @@
         },
         "name": "Airport terminal"
     },
-    "amenity": {
+    "amenity/register_office": {
+        "icon": "town-hall",
         "fields": [
-            "amenity"
+            "address",
+            "building_area",
+            "opening_hours",
+            "operator"
         ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [],
+        "tags": {
+            "amenity": "register_office"
+        },
+        "name": "Register Office",
+        "searchable": false
+    },
+    "amenity/swimming_pool": {
+        "icon": "swimming",
         "geometry": [
             "point",
             "vertex",
             "area"
         ],
         "tags": {
-            "amenity": "*"
+            "amenity": "swimming_pool"
         },
-        "searchable": false,
-        "name": "Amenity"
+        "name": "Swimming Pool",
+        "searchable": false
     },
     "amenity/arts_centre": {
         "icon": "theatre",
@@ -1671,25 +1793,6 @@
         },
         "name": "Recycling"
     },
-    "amenity/register_office": {
-        "icon": "town-hall",
-        "fields": [
-            "address",
-            "building_area",
-            "opening_hours",
-            "operator"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "terms": [],
-        "tags": {
-            "amenity": "register_office"
-        },
-        "name": "Register Office",
-        "searchable": false
-    },
     "amenity/restaurant": {
         "icon": "restaurant",
         "fields": [
@@ -1904,19 +2007,6 @@
         },
         "name": "Studio"
     },
-    "amenity/swimming_pool": {
-        "icon": "swimming",
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "tags": {
-            "amenity": "swimming_pool"
-        },
-        "name": "Swimming Pool",
-        "searchable": false
-    },
     "amenity/taxi": {
         "icon": "car",
         "fields": [
@@ -2354,6 +2444,17 @@
         ],
         "name": "Barrier"
     },
+    "barrier/entrance": {
+        "icon": "entrance",
+        "geometry": [
+            "vertex"
+        ],
+        "tags": {
+            "barrier": "entrance"
+        },
+        "name": "Entrance",
+        "searchable": false
+    },
     "barrier/block": {
         "icon": "roadblock",
         "fields": [
@@ -2428,17 +2529,6 @@
         },
         "name": "Trench"
     },
-    "barrier/entrance": {
-        "icon": "entrance",
-        "geometry": [
-            "vertex"
-        ],
-        "tags": {
-            "barrier": "entrance"
-        },
-        "name": "Entrance",
-        "searchable": false
-    },
     "barrier/fence": {
         "icon": "prison",
         "geometry": [
@@ -2579,6 +2669,50 @@
         "terms": [],
         "name": "Building"
     },
+    "building/bunker": {
+        "fields": [
+            "address",
+            "levels"
+        ],
+        "geometry": [
+            "area"
+        ],
+        "tags": {
+            "building": "bunker"
+        },
+        "matchScore": 0.5,
+        "name": "Bunker",
+        "searchable": false
+    },
+    "building/entrance": {
+        "icon": "entrance",
+        "geometry": [
+            "vertex"
+        ],
+        "tags": {
+            "building": "entrance"
+        },
+        "name": "Entrance/Exit",
+        "searchable": false
+    },
+    "building/train_station": {
+        "icon": "building",
+        "fields": [
+            "address",
+            "levels"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "building": "train_station"
+        },
+        "matchScore": 0.5,
+        "name": "Train Station",
+        "searchable": false
+    },
     "building/apartments": {
         "icon": "commercial",
         "fields": [
@@ -2609,21 +2743,6 @@
         "matchScore": 0.5,
         "name": "Barn"
     },
-    "building/bunker": {
-        "fields": [
-            "address",
-            "levels"
-        ],
-        "geometry": [
-            "area"
-        ],
-        "tags": {
-            "building": "bunker"
-        },
-        "matchScore": 0.5,
-        "name": "Bunker",
-        "searchable": false
-    },
     "building/cabin": {
         "icon": "building",
         "fields": [
@@ -2771,17 +2890,6 @@
         "matchScore": 0.5,
         "name": "Dormitory"
     },
-    "building/entrance": {
-        "icon": "entrance",
-        "geometry": [
-            "vertex"
-        ],
-        "tags": {
-            "building": "entrance"
-        },
-        "name": "Entrance/Exit",
-        "searchable": false
-    },
     "building/garage": {
         "icon": "warehouse",
         "fields": [
@@ -3095,24 +3203,6 @@
         "matchScore": 0.5,
         "name": "Row Houses"
     },
-    "building/train_station": {
-        "icon": "building",
-        "fields": [
-            "address",
-            "levels"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "tags": {
-            "building": "train_station"
-        },
-        "matchScore": 0.5,
-        "name": "Train Station",
-        "searchable": false
-    },
     "building/university": {
         "icon": "building",
         "fields": [
@@ -3165,6 +3255,82 @@
         "terms": [],
         "name": "Craft"
     },
+    "craft/jeweler": {
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "craft": "jeweler"
+        },
+        "name": "Jeweler",
+        "searchable": false
+    },
+    "craft/locksmith": {
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "craft": "locksmith"
+        },
+        "name": "Locksmith",
+        "searchable": false
+    },
+    "craft/optician": {
+        "icon": "marker-stroked",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "craft": "optician"
+        },
+        "name": "Optician",
+        "searchable": false
+    },
+    "craft/tailor": {
+        "icon": "clothing-store",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "clothes",
+            "suit"
+        ],
+        "tags": {
+            "craft": "tailor"
+        },
+        "name": "Tailor",
+        "searchable": false
+    },
     "craft/basket_maker": {
         "icon": "art-gallery",
         "fields": [
@@ -3507,24 +3673,6 @@
         },
         "name": "Insulator"
     },
-    "craft/jeweler": {
-        "icon": "marker-stroked",
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "tags": {
-            "craft": "jeweler"
-        },
-        "name": "Jeweler",
-        "searchable": false
-    },
     "craft/key_cutter": {
         "icon": "marker-stroked",
         "fields": [
@@ -3542,24 +3690,6 @@
         },
         "name": "Key Cutter"
     },
-    "craft/locksmith": {
-        "icon": "marker-stroked",
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "tags": {
-            "craft": "locksmith"
-        },
-        "name": "Locksmith",
-        "searchable": false
-    },
     "craft/metal_construction": {
         "icon": "marker-stroked",
         "fields": [
@@ -3577,24 +3707,6 @@
         },
         "name": "Metal Construction"
     },
-    "craft/optician": {
-        "icon": "marker-stroked",
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "tags": {
-            "craft": "optician"
-        },
-        "name": "Optician",
-        "searchable": false
-    },
     "craft/painter": {
         "icon": "art-gallery",
         "fields": [
@@ -3885,28 +3997,6 @@
         },
         "name": "Chimney Sweep"
     },
-    "craft/tailor": {
-        "icon": "clothing-store",
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "terms": [
-            "clothes",
-            "suit"
-        ],
-        "tags": {
-            "craft": "tailor"
-        },
-        "name": "Tailor",
-        "searchable": false
-    },
     "craft/tiler": {
         "icon": "marker-stroked",
         "fields": [
@@ -4022,7 +4112,7 @@
         "name": "Embankment",
         "matchScore": 0.2
     },
-    "emergency/_designated": {
+    "emergency/designated": {
         "fields": [],
         "geometry": [
             "line"
@@ -4035,7 +4125,7 @@
         "searchable": false,
         "matchScore": 0.01
     },
-    "emergency/_destination": {
+    "emergency/destination": {
         "fields": [],
         "geometry": [
             "line"
@@ -4048,7 +4138,7 @@
         "searchable": false,
         "matchScore": 0.01
     },
-    "emergency/_no": {
+    "emergency/no": {
         "fields": [],
         "geometry": [
             "line"
@@ -4061,7 +4151,7 @@
         "searchable": false,
         "matchScore": 0.01
     },
-    "emergency/_official": {
+    "emergency/official": {
         "fields": [],
         "geometry": [
             "line"
@@ -4074,7 +4164,7 @@
         "searchable": false,
         "matchScore": 0.01
     },
-    "emergency/_private": {
+    "emergency/private": {
         "fields": [],
         "geometry": [
             "line"
@@ -4087,7 +4177,7 @@
         "searchable": false,
         "matchScore": 0.01
     },
-    "emergency/_yes": {
+    "emergency/yes": {
         "fields": [],
         "geometry": [
             "line"
@@ -4379,22 +4469,6 @@
         },
         "name": "Blood Donor Center"
     },
-    "highway": {
-        "fields": [
-            "highway"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "line",
-            "area"
-        ],
-        "tags": {
-            "highway": "*"
-        },
-        "searchable": false,
-        "name": "Highway"
-    },
     "highway/bridleway": {
         "fields": [
             "surface",
@@ -5344,6 +5418,22 @@
         },
         "name": "Land Use"
     },
+    "landuse/farm": {
+        "icon": "farm",
+        "fields": [
+            "crop"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "landuse": "farm"
+        },
+        "terms": [],
+        "name": "Farmland",
+        "searchable": false
+    },
     "landuse/allotments": {
         "geometry": [
             "area"
@@ -5421,22 +5511,6 @@
         "terms": [],
         "name": "Construction"
     },
-    "landuse/farm": {
-        "icon": "farm",
-        "fields": [
-            "crop"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "tags": {
-            "landuse": "farm"
-        },
-        "terms": [],
-        "name": "Farmland",
-        "searchable": false
-    },
     "landuse/farmland": {
         "icon": "farm",
         "fields": [
@@ -6244,6 +6318,16 @@
         },
         "name": "Man Made"
     },
+    "man_made/embankment": {
+        "geometry": [
+            "line"
+        ],
+        "tags": {
+            "man_made": "embankment"
+        },
+        "name": "Embankment",
+        "searchable": false
+    },
     "man_made/adit": {
         "geometry": [
             "point",
@@ -6301,16 +6385,6 @@
         },
         "name": "Cut line"
     },
-    "man_made/embankment": {
-        "geometry": [
-            "line"
-        ],
-        "tags": {
-            "man_made": "embankment"
-        },
-        "name": "Embankment",
-        "searchable": false
-    },
     "man_made/flagpole": {
         "geometry": [
             "point"
@@ -7077,6 +7151,25 @@
         "terms": [],
         "name": "Office"
     },
+    "office/travel_agent": {
+        "icon": "suitcase",
+        "fields": [
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "vertex",
+            "area"
+        ],
+        "tags": {
+            "office": "travel_agent"
+        },
+        "terms": [],
+        "name": "Travel Agency",
+        "searchable": false
+    },
     "office/accountant": {
         "icon": "commercial",
         "fields": [
@@ -7448,25 +7541,6 @@
         "terms": [],
         "name": "Therapist"
     },
-    "office/travel_agent": {
-        "icon": "suitcase",
-        "fields": [
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "tags": {
-            "office": "travel_agent"
-        },
-        "terms": [],
-        "name": "Travel Agency",
-        "searchable": false
-    },
     "piste": {
         "icon": "skiing",
         "fields": [
@@ -7495,21 +7569,6 @@
         },
         "name": "Piste/Ski Trail"
     },
-    "place": {
-        "fields": [
-            "place"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "area"
-        ],
-        "tags": {
-            "place": "*"
-        },
-        "searchable": false,
-        "name": "Place"
-    },
     "place/city": {
         "icon": "city",
         "fields": [
@@ -7664,21 +7723,21 @@
         ],
         "matchScore": 0.1
     },
-    "power": {
+    "power/sub_station": {
+        "fields": [
+            "substation",
+            "operator",
+            "building"
+        ],
         "geometry": [
             "point",
-            "vertex",
-            "line",
             "area"
         ],
         "tags": {
-            "power": "*"
+            "power": "sub_station"
         },
-        "fields": [
-            "power"
-        ],
-        "searchable": false,
-        "name": "Power"
+        "name": "Substation",
+        "searchable": false
     },
     "power/generator": {
         "fields": [
@@ -7726,22 +7785,6 @@
         },
         "name": "Power Pole"
     },
-    "power/sub_station": {
-        "fields": [
-            "substation",
-            "operator",
-            "building"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "tags": {
-            "power": "sub_station"
-        },
-        "name": "Substation",
-        "searchable": false
-    },
     "power/substation": {
         "fields": [
             "substation",
@@ -7810,22 +7853,6 @@
         },
         "name": "Stop Position"
     },
-    "railway": {
-        "fields": [
-            "railway"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "line",
-            "area"
-        ],
-        "tags": {
-            "railway": "*"
-        },
-        "searchable": false,
-        "name": "Railway"
-    },
     "railway/abandoned": {
         "icon": "railway-abandoned",
         "geometry": [
@@ -8059,17 +8086,6 @@
             "relation"
         ]
     },
-    "roundabout": {
-        "geometry": [
-            "vertex",
-            "line"
-        ],
-        "tags": {
-            "junction": "roundabout"
-        },
-        "name": "Roundabout",
-        "searchable": false
-    },
     "route/ferry": {
         "icon": "ferry-line",
         "geometry": [
@@ -8099,6 +8115,40 @@
         "terms": [],
         "name": "Shop"
     },
+    "shop/fishmonger": {
+        "icon": "shop",
+        "fields": [
+            "operator",
+            "address",
+            "building_area",
+            "opening_hours"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "fishmonger"
+        },
+        "name": "Fishmonger",
+        "searchable": false
+    },
+    "shop/vacant": {
+        "icon": "shop",
+        "fields": [
+            "address",
+            "building_area"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "tags": {
+            "shop": "vacant"
+        },
+        "name": "Vacant Shop",
+        "searchable": false
+    },
     "shop/alcohol": {
         "icon": "alcohol-shop",
         "fields": [
@@ -8937,24 +8987,6 @@
         },
         "name": "Fashion Store"
     },
-    "shop/fishmonger": {
-        "icon": "shop",
-        "fields": [
-            "operator",
-            "address",
-            "building_area",
-            "opening_hours"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "tags": {
-            "shop": "fishmonger"
-        },
-        "name": "Fishmonger",
-        "searchable": false
-    },
     "shop/florist": {
         "icon": "shop",
         "fields": [
@@ -10041,22 +10073,6 @@
         },
         "name": "Tire Store"
     },
-    "shop/vacant": {
-        "icon": "shop",
-        "fields": [
-            "address",
-            "building_area"
-        ],
-        "geometry": [
-            "point",
-            "area"
-        ],
-        "tags": {
-            "shop": "vacant"
-        },
-        "name": "Vacant Shop",
-        "searchable": false
-    },
     "shop/vacuum_cleaner": {
         "icon": "shop",
         "fields": [
@@ -10609,6 +10625,20 @@
         ],
         "name": "Raised Pedestrian Crossing"
     },
+    "type/multipolygon": {
+        "geometry": [
+            "area",
+            "relation"
+        ],
+        "tags": {
+            "type": "multipolygon"
+        },
+        "removeTags": {},
+        "name": "Multipolygon",
+        "icon": "multipolygon",
+        "searchable": false,
+        "matchScore": 0.1
+    },
     "type/boundary": {
         "geometry": [
             "relation"
@@ -10636,20 +10666,6 @@
         ],
         "icon": "boundary"
     },
-    "type/multipolygon": {
-        "geometry": [
-            "area",
-            "relation"
-        ],
-        "tags": {
-            "type": "multipolygon"
-        },
-        "removeTags": {},
-        "name": "Multipolygon",
-        "icon": "multipolygon",
-        "searchable": false,
-        "matchScore": 0.1
-    },
     "type/restriction": {
         "geometry": [
             "relation"
@@ -11002,22 +11018,6 @@
         ],
         "matchScore": 0.1
     },
-    "waterway": {
-        "fields": [
-            "waterway"
-        ],
-        "geometry": [
-            "point",
-            "vertex",
-            "line",
-            "area"
-        ],
-        "tags": {
-            "waterway": "*"
-        },
-        "searchable": false,
-        "name": "Waterway"
-    },
     "waterway/boatyard": {
         "icon": "harbor",
         "fields": [
diff --git a/data/taginfo.json b/data/taginfo.json
index 966bf58fb..51463c9b0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -13,10 +13,35 @@
     },
     "tags": [
         {
-            "key": "addr:housenumber"
+            "key": "aerialway"
         },
         {
-            "key": "aerialway"
+            "key": "aeroway"
+        },
+        {
+            "key": "amenity"
+        },
+        {
+            "key": "highway"
+        },
+        {
+            "key": "place"
+        },
+        {
+            "key": "power"
+        },
+        {
+            "key": "railway"
+        },
+        {
+            "key": "junction",
+            "value": "roundabout"
+        },
+        {
+            "key": "waterway"
+        },
+        {
+            "key": "addr:housenumber"
         },
         {
             "key": "aerialway",
@@ -54,9 +79,6 @@
             "key": "aerialway",
             "value": "t-bar"
         },
-        {
-            "key": "aeroway"
-        },
         {
             "key": "aeroway",
             "value": "aerodrome"
@@ -90,7 +112,12 @@
             "value": "terminal"
         },
         {
-            "key": "amenity"
+            "key": "amenity",
+            "value": "register_office"
+        },
+        {
+            "key": "amenity",
+            "value": "swimming_pool"
         },
         {
             "key": "amenity",
@@ -352,10 +379,6 @@
             "key": "amenity",
             "value": "recycling"
         },
-        {
-            "key": "amenity",
-            "value": "register_office"
-        },
         {
             "key": "amenity",
             "value": "restaurant"
@@ -392,10 +415,6 @@
             "key": "amenity",
             "value": "studio"
         },
-        {
-            "key": "amenity",
-            "value": "swimming_pool"
-        },
         {
             "key": "amenity",
             "value": "taxi"
@@ -486,6 +505,10 @@
         {
             "key": "barrier"
         },
+        {
+            "key": "barrier",
+            "value": "entrance"
+        },
         {
             "key": "barrier",
             "value": "block"
@@ -510,10 +533,6 @@
             "key": "barrier",
             "value": "ditch"
         },
-        {
-            "key": "barrier",
-            "value": "entrance"
-        },
         {
             "key": "barrier",
             "value": "fence"
@@ -557,6 +576,18 @@
         {
             "key": "building"
         },
+        {
+            "key": "building",
+            "value": "bunker"
+        },
+        {
+            "key": "building",
+            "value": "entrance"
+        },
+        {
+            "key": "building",
+            "value": "train_station"
+        },
         {
             "key": "building",
             "value": "apartments"
@@ -565,10 +596,6 @@
             "key": "building",
             "value": "barn"
         },
-        {
-            "key": "building",
-            "value": "bunker"
-        },
         {
             "key": "building",
             "value": "cabin"
@@ -605,10 +632,6 @@
             "key": "building",
             "value": "dormitory"
         },
-        {
-            "key": "building",
-            "value": "entrance"
-        },
         {
             "key": "building",
             "value": "garage"
@@ -685,10 +708,6 @@
             "key": "building",
             "value": "terrace"
         },
-        {
-            "key": "building",
-            "value": "train_station"
-        },
         {
             "key": "building",
             "value": "university"
@@ -700,6 +719,22 @@
         {
             "key": "craft"
         },
+        {
+            "key": "craft",
+            "value": "jeweler"
+        },
+        {
+            "key": "craft",
+            "value": "locksmith"
+        },
+        {
+            "key": "craft",
+            "value": "optician"
+        },
+        {
+            "key": "craft",
+            "value": "tailor"
+        },
         {
             "key": "craft",
             "value": "basket_maker"
@@ -772,26 +807,14 @@
             "key": "craft",
             "value": "insulation"
         },
-        {
-            "key": "craft",
-            "value": "jeweler"
-        },
         {
             "key": "craft",
             "value": "key_cutter"
         },
-        {
-            "key": "craft",
-            "value": "locksmith"
-        },
         {
             "key": "craft",
             "value": "metal_construction"
         },
-        {
-            "key": "craft",
-            "value": "optician"
-        },
         {
             "key": "craft",
             "value": "painter"
@@ -856,10 +879,6 @@
             "key": "craft",
             "value": "sweep"
         },
-        {
-            "key": "craft",
-            "value": "tailor"
-        },
         {
             "key": "craft",
             "value": "tiler"
@@ -983,9 +1002,6 @@
             "key": "healthcare",
             "value": "blood_donation"
         },
-        {
-            "key": "highway"
-        },
         {
             "key": "highway",
             "value": "bridleway"
@@ -1192,6 +1208,10 @@
         {
             "key": "landuse"
         },
+        {
+            "key": "landuse",
+            "value": "farm"
+        },
         {
             "key": "landuse",
             "value": "allotments"
@@ -1216,10 +1236,6 @@
             "key": "landuse",
             "value": "construction"
         },
-        {
-            "key": "landuse",
-            "value": "farm"
-        },
         {
             "key": "landuse",
             "value": "farmland"
@@ -1418,6 +1434,10 @@
         {
             "key": "man_made"
         },
+        {
+            "key": "man_made",
+            "value": "embankment"
+        },
         {
             "key": "man_made",
             "value": "adit"
@@ -1438,10 +1458,6 @@
             "key": "man_made",
             "value": "cutline"
         },
-        {
-            "key": "man_made",
-            "value": "embankment"
-        },
         {
             "key": "man_made",
             "value": "flagpole"
@@ -1652,6 +1668,10 @@
         {
             "key": "office"
         },
+        {
+            "key": "office",
+            "value": "travel_agent"
+        },
         {
             "key": "office",
             "value": "accountant"
@@ -1732,16 +1752,9 @@
             "key": "office",
             "value": "therapist"
         },
-        {
-            "key": "office",
-            "value": "travel_agent"
-        },
         {
             "key": "piste:type"
         },
-        {
-            "key": "place"
-        },
         {
             "key": "place",
             "value": "city"
@@ -1783,7 +1796,8 @@
             "value": "village"
         },
         {
-            "key": "power"
+            "key": "power",
+            "value": "sub_station"
         },
         {
             "key": "power",
@@ -1801,10 +1815,6 @@
             "key": "power",
             "value": "pole"
         },
-        {
-            "key": "power",
-            "value": "sub_station"
-        },
         {
             "key": "power",
             "value": "substation"
@@ -1825,9 +1835,6 @@
             "key": "public_transport",
             "value": "stop_position"
         },
-        {
-            "key": "railway"
-        },
         {
             "key": "railway",
             "value": "abandoned"
@@ -1880,10 +1887,6 @@
             "key": "railway",
             "value": "tram"
         },
-        {
-            "key": "junction",
-            "value": "roundabout"
-        },
         {
             "key": "route",
             "value": "ferry"
@@ -1891,6 +1894,14 @@
         {
             "key": "shop"
         },
+        {
+            "key": "shop",
+            "value": "fishmonger"
+        },
+        {
+            "key": "shop",
+            "value": "vacant"
+        },
         {
             "key": "shop",
             "value": "alcohol"
@@ -2067,10 +2078,6 @@
             "key": "shop",
             "value": "fashion"
         },
-        {
-            "key": "shop",
-            "value": "fishmonger"
-        },
         {
             "key": "shop",
             "value": "florist"
@@ -2303,10 +2310,6 @@
             "key": "shop",
             "value": "tyres"
         },
-        {
-            "key": "shop",
-            "value": "vacant"
-        },
         {
             "key": "shop",
             "value": "vacuum_cleaner"
@@ -2426,6 +2429,10 @@
             "key": "traffic_calming",
             "value": "table"
         },
+        {
+            "key": "type",
+            "value": "multipolygon"
+        },
         {
             "key": "type",
             "value": "boundary"
@@ -2434,10 +2441,6 @@
             "key": "boundary",
             "value": "administrative"
         },
-        {
-            "key": "type",
-            "value": "multipolygon"
-        },
         {
             "key": "type",
             "value": "restriction"
@@ -2530,9 +2533,6 @@
             "key": "type",
             "value": "site"
         },
-        {
-            "key": "waterway"
-        },
         {
             "key": "waterway",
             "value": "boatyard"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 6c0188500..4b12bf066 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1591,14 +1591,46 @@
             }
         },
         "presets": {
-            "address": {
-                "name": "Address",
-                "terms": ""
-            },
             "aerialway": {
                 "name": "Aerialway",
                 "terms": "ski lift,funifor,funitel"
             },
+            "aeroway": {
+                "name": "Aeroway",
+                "terms": ""
+            },
+            "amenity": {
+                "name": "Amenity",
+                "terms": ""
+            },
+            "highway": {
+                "name": "Highway",
+                "terms": ""
+            },
+            "place": {
+                "name": "Place",
+                "terms": ""
+            },
+            "power": {
+                "name": "Power",
+                "terms": ""
+            },
+            "railway": {
+                "name": "Railway",
+                "terms": ""
+            },
+            "roundabout": {
+                "name": "Roundabout",
+                "terms": ""
+            },
+            "waterway": {
+                "name": "Waterway",
+                "terms": ""
+            },
+            "address": {
+                "name": "Address",
+                "terms": ""
+            },
             "aerialway/cable_car": {
                 "name": "Cable Car",
                 "terms": "tramway,ropeway"
@@ -1635,10 +1667,6 @@
                 "name": "T-bar Lift",
                 "terms": ""
             },
-            "aeroway": {
-                "name": "Aeroway",
-                "terms": ""
-            },
             "aeroway/aerodrome": {
                 "name": "Airport",
                 "terms": "airplane,airport,aerodrome"
@@ -1671,8 +1699,12 @@
                 "name": "Airport terminal",
                 "terms": "airport,aerodrome"
             },
-            "amenity": {
-                "name": "Amenity",
+            "amenity/register_office": {
+                "name": "Register Office",
+                "terms": ""
+            },
+            "amenity/swimming_pool": {
+                "name": "Swimming Pool",
                 "terms": ""
             },
             "amenity/arts_centre": {
@@ -1935,10 +1967,6 @@
                 "name": "Recycling",
                 "terms": "can,bottle,garbage,scrap,trash"
             },
-            "amenity/register_office": {
-                "name": "Register Office",
-                "terms": ""
-            },
             "amenity/restaurant": {
                 "name": "Restaurant",
                 "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
@@ -1975,10 +2003,6 @@
                 "name": "Studio",
                 "terms": "recording,radio,television"
             },
-            "amenity/swimming_pool": {
-                "name": "Swimming Pool",
-                "terms": ""
-            },
             "amenity/taxi": {
                 "name": "Taxi Stand",
                 "terms": "cab"
@@ -2071,6 +2095,10 @@
                 "name": "Barrier",
                 "terms": ""
             },
+            "barrier/entrance": {
+                "name": "Entrance",
+                "terms": ""
+            },
             "barrier/block": {
                 "name": "Block",
                 "terms": ""
@@ -2095,10 +2123,6 @@
                 "name": "Trench",
                 "terms": ""
             },
-            "barrier/entrance": {
-                "name": "Entrance",
-                "terms": ""
-            },
             "barrier/fence": {
                 "name": "Fence",
                 "terms": ""
@@ -2143,6 +2167,18 @@
                 "name": "Building",
                 "terms": ""
             },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": ""
+            },
+            "building/entrance": {
+                "name": "Entrance/Exit",
+                "terms": ""
+            },
+            "building/train_station": {
+                "name": "Train Station",
+                "terms": ""
+            },
             "building/apartments": {
                 "name": "Apartments",
                 "terms": ""
@@ -2151,10 +2187,6 @@
                 "name": "Barn",
                 "terms": ""
             },
-            "building/bunker": {
-                "name": "Bunker",
-                "terms": ""
-            },
             "building/cabin": {
                 "name": "Cabin",
                 "terms": ""
@@ -2191,10 +2223,6 @@
                 "name": "Dormitory",
                 "terms": ""
             },
-            "building/entrance": {
-                "name": "Entrance/Exit",
-                "terms": ""
-            },
             "building/garage": {
                 "name": "Garage",
                 "terms": ""
@@ -2271,10 +2299,6 @@
                 "name": "Row Houses",
                 "terms": "home,terrace,brownstone,family,residence,dwelling"
             },
-            "building/train_station": {
-                "name": "Train Station",
-                "terms": ""
-            },
             "building/university": {
                 "name": "University Building",
                 "terms": "college"
@@ -2287,6 +2311,22 @@
                 "name": "Craft",
                 "terms": ""
             },
+            "craft/jeweler": {
+                "name": "Jeweler",
+                "terms": ""
+            },
+            "craft/locksmith": {
+                "name": "Locksmith",
+                "terms": ""
+            },
+            "craft/optician": {
+                "name": "Optician",
+                "terms": ""
+            },
+            "craft/tailor": {
+                "name": "Tailor",
+                "terms": "clothes,suit"
+            },
             "craft/basket_maker": {
                 "name": "Basket Maker",
                 "terms": ""
@@ -2359,26 +2399,14 @@
                 "name": "Insulator",
                 "terms": ""
             },
-            "craft/jeweler": {
-                "name": "Jeweler",
-                "terms": ""
-            },
             "craft/key_cutter": {
                 "name": "Key Cutter",
                 "terms": ""
             },
-            "craft/locksmith": {
-                "name": "Locksmith",
-                "terms": ""
-            },
             "craft/metal_construction": {
                 "name": "Metal Construction",
                 "terms": ""
             },
-            "craft/optician": {
-                "name": "Optician",
-                "terms": ""
-            },
             "craft/painter": {
                 "name": "Painter",
                 "terms": ""
@@ -2443,10 +2471,6 @@
                 "name": "Chimney Sweep",
                 "terms": ""
             },
-            "craft/tailor": {
-                "name": "Tailor",
-                "terms": "clothes,suit"
-            },
             "craft/tiler": {
                 "name": "Tiler",
                 "terms": ""
@@ -2475,27 +2499,27 @@
                 "name": "Embankment",
                 "terms": ""
             },
-            "emergency/_designated": {
+            "emergency/designated": {
                 "name": "Emergency Access Designated",
                 "terms": ""
             },
-            "emergency/_destination": {
+            "emergency/destination": {
                 "name": "Emergency Access Destination",
                 "terms": ""
             },
-            "emergency/_no": {
+            "emergency/no": {
                 "name": "Emergency Access No",
                 "terms": ""
             },
-            "emergency/_official": {
+            "emergency/official": {
                 "name": "Emergency Access Official",
                 "terms": ""
             },
-            "emergency/_private": {
+            "emergency/private": {
                 "name": "Emergency Access Private",
                 "terms": ""
             },
-            "emergency/_yes": {
+            "emergency/yes": {
                 "name": "Emergency Access Yes",
                 "terms": ""
             },
@@ -2571,10 +2595,6 @@
                 "name": "Blood Donor Center",
                 "terms": "blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation"
             },
-            "highway": {
-                "name": "Highway",
-                "terms": ""
-            },
             "highway/bridleway": {
                 "name": "Bridle Path",
                 "terms": "bridleway,equestrian,horse"
@@ -2783,6 +2803,10 @@
                 "name": "Land Use",
                 "terms": ""
             },
+            "landuse/farm": {
+                "name": "Farmland",
+                "terms": ""
+            },
             "landuse/allotments": {
                 "name": "Community Garden",
                 "terms": "allotment,garden"
@@ -2807,10 +2831,6 @@
                 "name": "Construction",
                 "terms": ""
             },
-            "landuse/farm": {
-                "name": "Farmland",
-                "terms": ""
-            },
             "landuse/farmland": {
                 "name": "Farmland",
                 "terms": ""
@@ -3015,6 +3035,10 @@
                 "name": "Man Made",
                 "terms": ""
             },
+            "man_made/embankment": {
+                "name": "Embankment",
+                "terms": ""
+            },
             "man_made/adit": {
                 "name": "Adit",
                 "terms": "entrance,underground,mine,cave"
@@ -3035,10 +3059,6 @@
                 "name": "Cut line",
                 "terms": ""
             },
-            "man_made/embankment": {
-                "name": "Embankment",
-                "terms": ""
-            },
             "man_made/flagpole": {
                 "name": "Flagpole",
                 "terms": ""
@@ -3251,6 +3271,10 @@
                 "name": "Office",
                 "terms": ""
             },
+            "office/travel_agent": {
+                "name": "Travel Agency",
+                "terms": ""
+            },
             "office/accountant": {
                 "name": "Accountant",
                 "terms": ""
@@ -3331,18 +3355,10 @@
                 "name": "Therapist",
                 "terms": ""
             },
-            "office/travel_agent": {
-                "name": "Travel Agency",
-                "terms": ""
-            },
             "piste": {
                 "name": "Piste/Ski Trail",
                 "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
             },
-            "place": {
-                "name": "Place",
-                "terms": ""
-            },
             "place/city": {
                 "name": "City",
                 "terms": ""
@@ -3387,8 +3403,8 @@
                 "name": "Point",
                 "terms": ""
             },
-            "power": {
-                "name": "Power",
+            "power/sub_station": {
+                "name": "Substation",
                 "terms": ""
             },
             "power/generator": {
@@ -3407,10 +3423,6 @@
                 "name": "Power Pole",
                 "terms": ""
             },
-            "power/sub_station": {
-                "name": "Substation",
-                "terms": ""
-            },
             "power/substation": {
                 "name": "Substation",
                 "terms": ""
@@ -3431,10 +3443,6 @@
                 "name": "Stop Position",
                 "terms": ""
             },
-            "railway": {
-                "name": "Railway",
-                "terms": ""
-            },
             "railway/abandoned": {
                 "name": "Abandoned Railway",
                 "terms": ""
@@ -3491,10 +3499,6 @@
                 "name": "Relation",
                 "terms": ""
             },
-            "roundabout": {
-                "name": "Roundabout",
-                "terms": ""
-            },
             "route/ferry": {
                 "name": "Ferry Route",
                 "terms": ""
@@ -3503,6 +3507,14 @@
                 "name": "Shop",
                 "terms": ""
             },
+            "shop/fishmonger": {
+                "name": "Fishmonger",
+                "terms": ""
+            },
+            "shop/vacant": {
+                "name": "Vacant Shop",
+                "terms": ""
+            },
             "shop/alcohol": {
                 "name": "Liquor Store",
                 "terms": "alcohol,beer,booze,wine"
@@ -3679,10 +3691,6 @@
                 "name": "Fashion Store",
                 "terms": ""
             },
-            "shop/fishmonger": {
-                "name": "Fishmonger",
-                "terms": ""
-            },
             "shop/florist": {
                 "name": "Florist",
                 "terms": "flower"
@@ -3915,10 +3923,6 @@
                 "name": "Tire Store",
                 "terms": ""
             },
-            "shop/vacant": {
-                "name": "Vacant Shop",
-                "terms": ""
-            },
             "shop/vacuum_cleaner": {
                 "name": "Vacuum Cleaner Store",
                 "terms": ""
@@ -4039,6 +4043,10 @@
                 "name": "Raised Pedestrian Crossing",
                 "terms": "speed table,flat top hump"
             },
+            "type/multipolygon": {
+                "name": "Multipolygon",
+                "terms": ""
+            },
             "type/boundary": {
                 "name": "Boundary",
                 "terms": ""
@@ -4047,10 +4055,6 @@
                 "name": "Administrative Boundary",
                 "terms": ""
             },
-            "type/multipolygon": {
-                "name": "Multipolygon",
-                "terms": ""
-            },
             "type/restriction": {
                 "name": "Restriction",
                 "terms": ""
@@ -4147,10 +4151,6 @@
                 "name": "Other",
                 "terms": ""
             },
-            "waterway": {
-                "name": "Waterway",
-                "terms": ""
-            },
             "waterway/boatyard": {
                 "name": "Boatyard",
                 "terms": ""