Merge remote-tracking branch 'openstreetmap/pull/903'

[rails.git] / vendor / assets / iD / presets.js

diff --git a/vendor/assets/iD/presets.js b/vendor/assets/iD/presets.js
index 5b3c02589e4b5cc5ec66e01aba1c44eb8c6c2a82..507c415ff2947f2becbd7fcbe418ea7f543f7c5d 100644 (file)
--- a/vendor/assets/iD/presets.js
+++ b/vendor/assets/iD/presets.js
@@ -355,7 +355,8 @@ iD.data.presets = {
         "amenity/atm": {
             "icon": "bank",
             "fields": [
-                "operator"
+                "operator",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -378,7 +379,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -507,7 +509,7 @@ iD.data.presets = {
                 "brand",
                 "opening_hours",
                 "fee",
-                "service/bicycle/chaintool",
+                "service/bicycle/chain_tool",
                 "service/bicycle/pump"
             ],
             "geometry": [
@@ -523,6 +525,28 @@ iD.data.presets = {
             },
             "name": "Bicycle Repair Station"
         },
+        "amenity/biergarten": {
+            "icon": "beer",
+            "fields": [
+                "address",
+                "building_area",
+                "opening_hours",
+                "smoking"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "amenity": "biergarten"
+            },
+            "terms": [
+                "beer",
+                "bier",
+                "booze"
+            ],
+            "name": "Beer Garden"
+        },
         "amenity/boat_rental": {
             "fields": [
                 "operator"
@@ -899,6 +923,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "geometry": [
@@ -1151,7 +1176,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -1346,7 +1372,8 @@ iD.data.presets = {
             "icon": "post",
             "fields": [
                 "operator",
-                "collection_times"
+                "collection_times",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -1532,6 +1559,33 @@ iD.data.presets = {
             },
             "name": "Restaurant"
         },
+        "amenity/sanitary_dump_station": {
+            "fields": [
+                "operator",
+                "access_toilets",
+                "fee",
+                "water_point"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [
+                "Motor Home",
+                "Camper",
+                "Sanitary",
+                "Dump Station",
+                "Elsan",
+                "CDP",
+                "CTDP",
+                "Chemical Toilet"
+            ],
+            "tags": {
+                "amenity": "sanitary_dump_station"
+            },
+            "name": "RV Toilet Disposal"
+        },
         "amenity/school": {
             "icon": "school",
             "fields": [
@@ -1756,7 +1810,8 @@ iD.data.presets = {
                 "operator",
                 "building_area",
                 "access_toilets",
-                "gender"
+                "gender",
+                "fee"
             ],
             "geometry": [
                 "point",
@@ -3782,6 +3837,7 @@ iD.data.presets = {
         "highway/bus_stop": {
             "icon": "bus",
             "fields": [
+                "network",
                 "operator",
                 "bench",
                 "shelter",
@@ -3953,6 +4009,14 @@ iD.data.presets = {
             "tags": {
                 "highway": "motorway_link"
             },
+            "addTags": {
+                "highway": "motorway_link",
+                "oneway": "yes"
+            },
+            "removeTags": {
+                "highway": "motorway_link",
+                "oneway": "yes"
+            },
             "terms": [
                 "ramp",
                 "on ramp",
@@ -4290,6 +4354,7 @@ iD.data.presets = {
                 "surface",
                 "lit",
                 "width",
+                "incline_steps",
                 "access"
             ],
             "icon": "highway-steps",
@@ -4612,8 +4677,6 @@ iD.data.presets = {
                 "landuse"
             ],
             "geometry": [
-                "point",
-                "vertex",
                 "area"
             ],
             "tags": {
@@ -4984,6 +5047,15 @@ iD.data.presets = {
         },
         "leisure/marina": {
             "icon": "harbor",
+            "fields": [
+                "operator",
+                "address",
+                "capacity",
+                "fee",
+                "sanitary_dump_station",
+                "power_supply",
+                "internet_access"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -5377,6 +5449,9 @@ iD.data.presets = {
         },
         "man_made/lighthouse": {
             "icon": "lighthouse",
+            "fields": [
+                "building_area"
+            ],
             "geometry": [
                 "point",
                 "area"
@@ -5386,6 +5461,27 @@ iD.data.presets = {
             },
             "name": "Lighthouse"
         },
+        "man_made/mast": {
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "broadcast tower",
+                "cell phone tower",
+                "cell tower",
+                "guyed tower",
+                "mobile phone tower",
+                "radio tower",
+                "television tower",
+                "transmission mast",
+                "transmission tower",
+                "tv tower"
+            ],
+            "tags": {
+                "man_made": "mast"
+            },
+            "name": "Radio Mast"
+        },
         "man_made/observation": {
             "geometry": [
                 "point",
@@ -5401,6 +5497,25 @@ iD.data.presets = {
             },
             "name": "Observation Tower"
         },
+        "man_made/petroleum_well": {
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "drilling rig",
+                "oil derrick",
+                "oil drill",
+                "oil horse",
+                "oil rig",
+                "oil pump",
+                "petroleum well",
+                "pumpjack"
+            ],
+            "tags": {
+                "man_made": "petroleum_well"
+            },
+            "name": "Oil Well"
+        },
         "man_made/pier": {
             "geometry": [
                 "line",
@@ -5425,6 +5540,45 @@ iD.data.presets = {
             },
             "name": "Pipeline"
         },
+        "man_made/silo": {
+            "fields": [
+                "building_area",
+                "crop"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "grain",
+                "corn",
+                "wheat"
+            ],
+            "tags": {
+                "man_made": "silo"
+            },
+            "name": "Silo"
+        },
+        "man_made/storage_tank": {
+            "fields": [
+                "building_area",
+                "content"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "water",
+                "oil",
+                "gas",
+                "petrol"
+            ],
+            "tags": {
+                "man_made": "storage_tank"
+            },
+            "name": "Storage Tank"
+        },
         "man_made/survey_point": {
             "icon": "monument",
             "fields": [
@@ -6294,6 +6448,17 @@ iD.data.presets = {
             },
             "name": "City"
         },
+        "place/farm": {
+            "icon": "farm",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "place": "farm"
+            },
+            "name": "Farm"
+        },
         "place/hamlet": {
             "icon": "triangle-stroked",
             "fields": [
@@ -6538,8 +6703,8 @@ iD.data.presets = {
         "public_transport/platform": {
             "fields": [
                 "ref",
-                "operator",
                 "network",
+                "operator",
                 "shelter"
             ],
             "geometry": [
@@ -6557,8 +6722,8 @@ iD.data.presets = {
             "icon": "bus",
             "fields": [
                 "ref",
-                "operator",
-                "network"
+                "network",
+                "operator"
             ],
             "geometry": [
                 "vertex"
@@ -6592,7 +6757,8 @@ iD.data.presets = {
                 "railway": "abandoned"
             },
             "fields": [
-                "structure"
+                "structure",
+                "service_rail"
             ],
             "terms": [],
             "name": "Abandoned Railway"
@@ -6606,7 +6772,8 @@ iD.data.presets = {
                 "railway": "disused"
             },
             "fields": [
-                "structure"
+                "structure",
+                "service_rail"
             ],
             "terms": [],
             "name": "Disused Railway"
@@ -6624,7 +6791,8 @@ iD.data.presets = {
             ],
             "fields": [
                 "structure",
-                "gauge"
+                "gauge",
+                "service_rail"
             ],
             "tags": {
                 "railway": "funicular"
@@ -6678,7 +6846,8 @@ iD.data.presets = {
             },
             "fields": [
                 "structure",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [],
             "name": "Monorail"
@@ -6694,7 +6863,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [
                 "narrow gauge railway",
@@ -6725,7 +6895,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [],
             "name": "Rail"
@@ -6733,6 +6904,7 @@ iD.data.presets = {
         "railway/station": {
             "icon": "rail",
             "fields": [
+                "network",
                 "operator",
                 "address",
                 "building_area"
@@ -6753,17 +6925,18 @@ iD.data.presets = {
         },
         "railway/subway": {
             "icon": "railway-subway",
-            "fields": [
-                "structure",
-                "gauge",
-                "electrified"
-            ],
             "geometry": [
                 "line"
             ],
             "tags": {
                 "railway": "subway"
             },
+            "fields": [
+                "structure",
+                "gauge",
+                "electrified",
+                "service_rail"
+            ],
             "terms": [],
             "name": "Subway"
         },
@@ -6789,7 +6962,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [
                 "streetcar"
@@ -6807,6 +6981,17 @@ iD.data.presets = {
                 "relation"
             ]
         },
+        "roundabout": {
+            "geometry": [
+                "vertex",
+                "line"
+            ],
+            "tags": {
+                "junction": "roundabout"
+            },
+            "name": "Roundabout",
+            "searchable": false
+        },
         "route/ferry": {
             "icon": "ferry",
             "geometry": [
@@ -6842,7 +7027,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -8906,29 +9092,43 @@ iD.data.presets = {
             "icon": "campsite",
             "fields": [
                 "operator",
-                "address"
+                "address",
+                "capacity",
+                "fee"
             ],
             "geometry": [
                 "point",
                 "vertex",
                 "area"
             ],
+            "terms": [
+                "Tent"
+            ],
             "tags": {
                 "tourism": "camp_site"
             },
             "name": "Camp Site"
         },
         "tourism/caravan_site": {
+            "icon": "bus",
             "fields": [
                 "operator",
                 "address",
-                "smoking"
+                "capacity",
+                "fee",
+                "sanitary_dump_station",
+                "power_supply",
+                "internet_access"
             ],
             "geometry": [
                 "point",
                 "vertex",
                 "area"
             ],
+            "terms": [
+                "Motor Home",
+                "Camper"
+            ],
             "tags": {
                 "tourism": "caravan_site"
             },
@@ -9612,6 +9812,29 @@ iD.data.presets = {
             },
             "name": "Drain"
         },
+        "waterway/fuel": {
+            "icon": "fuel",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "petrol",
+                "gas",
+                "diesel",
+                "boat"
+            ],
+            "tags": {
+                "waterway": "fuel"
+            },
+            "name": "Marine Fuel Station"
+        },
         "waterway/river": {
             "icon": "waterway-river",
             "fields": [
@@ -9651,6 +9874,35 @@ iD.data.presets = {
             },
             "name": "Riverbank"
         },
+        "waterway/sanitary_dump_station": {
+            "fields": [
+                "operator",
+                "access_toilets",
+                "fee",
+                "water_point"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [
+                "Boat",
+                "Watercraft",
+                "Sanitary",
+                "Dump Station",
+                "Pumpout",
+                "Pump out",
+                "Elsan",
+                "CDP",
+                "CTDP",
+                "Chemical Toilet"
+            ],
+            "tags": {
+                "waterway": "sanitary_dump_station"
+            },
+            "name": "Marine Toilet Disposal"
+        },
         "waterway/stream": {
             "icon": "waterway-stream",
             "fields": [
@@ -12192,25 +12444,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "amenity/fuel/Stacja paliw": {
-            "tags": {
-                "name": "Stacja paliw",
-                "amenity": "fuel"
-            },
-            "name": "Stacja paliw",
-            "icon": "fuel",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "amenity/fuel/Bharat Petroleum": {
             "tags": {
                 "name": "Bharat Petroleum",
@@ -13808,6 +14041,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13832,6 +14066,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13856,6 +14091,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13880,6 +14116,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13903,6 +14140,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13927,6 +14165,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13950,6 +14189,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13974,6 +14214,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13998,6 +14239,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14021,6 +14263,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14044,6 +14287,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14067,6 +14311,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14090,6 +14335,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14114,6 +14360,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14137,6 +14384,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14160,6 +14408,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14184,6 +14433,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14207,6 +14457,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14230,6 +14481,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14253,6 +14505,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14276,6 +14529,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14299,6 +14553,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14322,6 +14577,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14345,6 +14601,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14368,6 +14625,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14391,6 +14649,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14415,6 +14674,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14438,6 +14698,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14461,6 +14722,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14484,6 +14746,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14507,6 +14770,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14530,6 +14794,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14554,6 +14819,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14578,6 +14844,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14601,6 +14868,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14625,6 +14893,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14632,6 +14901,7 @@ iD.data.presets = {
         "amenity/fast_food/Taco Bell": {
             "tags": {
                 "name": "Taco Bell",
+                "cuisine": "mexican",
                 "amenity": "fast_food"
             },
             "name": "Taco Bell",
@@ -14648,6 +14918,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14671,6 +14942,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14695,6 +14967,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14718,6 +14991,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14741,29 +15015,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
-                "smoking"
-            ],
-            "suggestion": true
-        },
-        "amenity/fast_food/Kebab": {
-            "tags": {
-                "name": "Kebab",
-                "amenity": "fast_food"
-            },
-            "name": "Kebab",
-            "icon": "fast-food",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "cuisine",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours",
-                "takeaway",
-                "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14788,6 +15040,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14811,29 +15064,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
-                "smoking"
-            ],
-            "suggestion": true
-        },
-        "amenity/fast_food/Imbiss": {
-            "tags": {
-                "name": "Imbiss",
-                "amenity": "fast_food"
-            },
-            "name": "Imbiss",
-            "icon": "fast-food",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "cuisine",
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours",
-                "takeaway",
-                "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14858,6 +15089,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14883,6 +15115,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14906,6 +15139,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14929,6 +15163,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14952,6 +15187,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14975,6 +15211,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14998,6 +15235,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15023,6 +15261,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15046,6 +15285,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15069,6 +15309,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15093,6 +15334,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15116,6 +15358,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15139,6 +15382,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15162,6 +15406,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15185,6 +15430,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15208,6 +15454,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15232,6 +15479,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15239,6 +15487,7 @@ iD.data.presets = {
         "amenity/fast_food/Panda Express": {
             "tags": {
                 "name": "Panda Express",
+                "cuisine": "chinese",
                 "amenity": "fast_food"
             },
             "name": "Panda Express",
@@ -15255,6 +15504,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15278,6 +15528,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15301,6 +15552,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15324,6 +15576,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15347,6 +15600,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15370,6 +15624,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15393,6 +15648,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15417,6 +15673,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15440,6 +15697,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15463,6 +15721,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15486,6 +15745,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15510,6 +15770,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15534,6 +15795,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15557,6 +15819,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15580,6 +15843,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15587,6 +15851,7 @@ iD.data.presets = {
         "amenity/restaurant/Pizza Hut": {
             "tags": {
                 "name": "Pizza Hut",
+                "cuisine": "pizza",
                 "amenity": "restaurant"
             },
             "name": "Pizza Hut",
@@ -18476,7 +18741,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18496,7 +18762,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18516,7 +18783,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18536,7 +18804,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18556,7 +18825,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18576,7 +18846,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18596,7 +18867,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18616,7 +18888,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18636,7 +18909,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18656,7 +18930,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18676,7 +18951,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18696,7 +18972,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18716,7 +18993,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18736,7 +19014,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18756,7 +19035,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18776,7 +19056,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18796,7 +19077,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18816,7 +19098,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18836,7 +19119,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18856,7 +19140,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18876,7 +19161,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18896,7 +19182,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18916,7 +19203,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18936,7 +19224,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18956,7 +19245,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18976,7 +19266,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18996,7 +19287,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19016,7 +19308,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19036,7 +19329,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19056,7 +19350,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19076,7 +19371,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19096,7 +19392,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19116,7 +19413,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19136,7 +19434,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19156,7 +19455,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19176,7 +19476,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19196,7 +19497,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19216,7 +19518,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19236,7 +19539,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19256,7 +19560,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19276,7 +19581,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19296,7 +19602,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19316,7 +19623,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19336,7 +19644,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19356,7 +19665,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19376,7 +19686,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19396,7 +19707,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19416,7 +19728,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19436,7 +19749,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19456,7 +19770,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19476,7 +19791,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19496,7 +19812,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19516,7 +19833,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19536,7 +19854,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19556,7 +19875,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19576,7 +19896,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19596,7 +19917,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19616,7 +19938,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19636,7 +19959,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19656,7 +19980,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19676,7 +20001,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19696,7 +20022,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19716,7 +20043,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19736,7 +20064,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19756,7 +20085,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19776,7 +20106,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19796,7 +20127,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19816,7 +20148,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19836,7 +20169,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19856,7 +20190,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19876,7 +20211,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19896,7 +20232,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19916,7 +20253,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19936,7 +20274,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19956,7 +20295,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19976,7 +20316,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19996,7 +20337,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20016,7 +20358,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20036,7 +20379,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20056,7 +20400,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20076,7 +20421,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20096,7 +20442,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20116,7 +20463,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20136,7 +20484,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20156,7 +20505,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20176,7 +20526,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20196,7 +20547,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20216,7 +20568,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20236,7 +20589,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20256,7 +20610,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20276,7 +20631,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20296,7 +20652,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20316,7 +20673,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20336,7 +20694,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20356,7 +20715,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20376,7 +20736,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20396,7 +20757,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20416,7 +20778,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20436,7 +20799,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20456,7 +20820,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20476,7 +20841,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20496,7 +20862,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20516,7 +20883,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20536,7 +20904,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20556,7 +20925,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20576,7 +20946,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20596,7 +20967,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20616,7 +20988,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20636,7 +21009,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20656,7 +21030,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20676,7 +21051,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20696,7 +21072,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20716,7 +21093,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20736,7 +21114,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20756,7 +21135,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20776,7 +21156,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20796,7 +21177,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20816,7 +21198,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20836,7 +21219,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20856,7 +21240,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20876,7 +21261,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20896,7 +21282,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20916,7 +21303,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20936,7 +21324,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20956,7 +21345,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20976,7 +21366,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20996,7 +21387,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21016,7 +21408,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21036,7 +21429,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21056,7 +21450,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21076,7 +21471,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21096,7 +21492,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21116,7 +21513,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21136,7 +21534,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21156,7 +21555,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21176,7 +21576,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21196,7 +21597,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21216,7 +21618,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21236,7 +21639,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21256,7 +21660,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21276,7 +21681,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21296,7 +21702,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21316,7 +21723,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21336,7 +21744,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21356,7 +21765,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21376,7 +21786,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21396,7 +21807,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21416,7 +21828,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21436,7 +21849,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21456,7 +21870,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21476,7 +21891,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21496,7 +21912,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21516,7 +21933,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21536,7 +21954,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21556,7 +21975,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21576,7 +21996,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21596,7 +22017,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21616,7 +22038,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21636,7 +22059,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21656,7 +22080,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21676,7 +22101,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21696,7 +22122,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21716,7 +22143,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21736,7 +22164,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21756,7 +22185,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21776,7 +22206,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21796,7 +22227,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21816,7 +22248,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21836,7 +22269,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21856,7 +22290,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21876,7 +22311,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21896,7 +22332,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21916,7 +22353,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21936,7 +22374,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21956,7 +22395,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21976,7 +22416,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21996,7 +22437,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22016,7 +22458,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22036,7 +22479,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22056,7 +22500,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22076,7 +22521,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22096,7 +22542,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22116,7 +22563,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22136,7 +22584,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22156,7 +22605,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22176,7 +22626,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22196,16 +22647,17 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
-        "amenity/bank/Millenium Bank": {
+        "amenity/bank/Millenium": {
             "tags": {
-                "name": "Millenium Bank",
+                "name": "Millenium",
                 "amenity": "bank"
             },
-            "name": "Millenium Bank",
+            "name": "Millenium",
             "icon": "bank",
             "geometry": [
                 "point",
@@ -22216,7 +22668,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22236,7 +22689,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22256,7 +22710,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22276,7 +22731,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22296,7 +22752,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22316,7 +22773,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22336,7 +22794,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22356,7 +22815,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22376,7 +22836,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22396,7 +22857,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22416,7 +22878,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22436,7 +22899,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22456,7 +22920,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22476,7 +22941,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22496,7 +22962,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22516,7 +22983,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22536,7 +23004,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22556,7 +23025,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22576,7 +23046,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22596,7 +23067,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22616,7 +23088,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22636,7 +23109,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22656,7 +23130,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22676,7 +23151,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22696,7 +23172,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22717,7 +23194,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22738,7 +23216,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22759,7 +23238,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22780,7 +23260,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22801,7 +23282,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22821,7 +23303,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22841,7 +23324,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22861,7 +23345,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22881,7 +23366,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22901,7 +23387,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22921,7 +23408,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22941,7 +23429,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22962,7 +23451,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22982,7 +23472,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23002,7 +23493,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23022,7 +23514,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23042,7 +23535,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23062,7 +23556,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23082,7 +23577,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23102,7 +23598,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23122,7 +23619,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23142,7 +23640,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23162,7 +23661,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23182,7 +23682,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23202,7 +23703,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23222,7 +23724,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23242,7 +23745,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23262,7 +23766,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23282,7 +23787,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23302,7 +23808,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23322,7 +23829,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23342,7 +23850,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23363,7 +23872,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23383,7 +23893,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23403,7 +23914,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23423,7 +23935,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23443,7 +23956,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23463,7 +23977,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23483,7 +23998,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23503,7 +24019,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23634,7 +24151,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23653,7 +24171,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23672,7 +24191,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23691,7 +24211,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23710,7 +24231,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23729,7 +24251,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23748,7 +24271,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23767,7 +24291,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23786,7 +24311,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23805,7 +24331,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23824,7 +24351,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23843,7 +24371,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23862,7 +24391,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23881,7 +24411,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23900,7 +24431,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23919,7 +24451,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23938,7 +24471,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23957,7 +24491,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23976,7 +24511,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23995,7 +24531,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24014,7 +24551,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24033,7 +24571,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24052,7 +24591,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24071,7 +24611,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24090,7 +24631,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24109,7 +24651,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24128,7 +24671,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24147,7 +24691,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24166,7 +24711,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24185,7 +24731,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24204,7 +24751,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24223,7 +24771,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24242,7 +24791,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24261,7 +24811,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24280,7 +24831,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24299,7 +24851,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24318,7 +24871,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24337,7 +24891,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24356,7 +24911,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24375,7 +24931,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24394,7 +24951,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24413,7 +24971,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24432,7 +24991,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24451,7 +25011,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24470,7 +25031,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24489,7 +25051,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24508,7 +25071,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24527,7 +25091,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24546,7 +25111,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24565,7 +25131,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24584,7 +25151,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24603,7 +25171,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24622,7 +25191,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24641,7 +25211,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24660,7 +25231,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24679,7 +25251,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24698,7 +25271,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24717,7 +25291,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24736,7 +25311,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24755,7 +25331,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24774,7 +25351,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24793,7 +25371,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24812,7 +25391,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24831,7 +25411,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24850,7 +25431,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24869,7 +25451,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24888,7 +25471,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24907,7 +25491,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24926,7 +25511,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24945,7 +25531,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24964,7 +25551,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24983,7 +25571,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25002,7 +25591,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25021,7 +25611,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25173,27 +25764,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "amenity/cafe/Eisdiele": {
-            "tags": {
-                "name": "Eisdiele",
-                "amenity": "cafe"
-            },
-            "name": "Eisdiele",
-            "icon": "cafe",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "cuisine",
-                "internet_access",
-                "address",
-                "building_area",
-                "opening_hours",
-                "smoking"
-            ],
-            "suggestion": true
-        },
         "amenity/cafe/Dunkin Donuts": {
             "tags": {
                 "name": "Dunkin Donuts",
@@ -25732,12 +26302,12 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/EDEKA": {
+        "shop/supermarket/Edeka": {
             "tags": {
-                "name": "EDEKA",
+                "name": "Edeka",
                 "shop": "supermarket"
             },
-            "name": "EDEKA",
+            "name": "Edeka",
             "icon": "grocery",
             "geometry": [
                 "point",
@@ -26093,25 +26663,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/REWE": {
-            "tags": {
-                "name": "REWE",
-                "shop": "supermarket"
-            },
-            "name": "REWE",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Rewe": {
             "tags": {
                 "name": "Rewe",
@@ -26207,25 +26758,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/Edeka": {
-            "tags": {
-                "name": "Edeka",
-                "shop": "supermarket"
-            },
-            "name": "Edeka",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Pick n Pay": {
             "tags": {
                 "name": "Pick n Pay",
@@ -26378,25 +26910,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/LIDL": {
-            "tags": {
-                "name": "LIDL",
-                "shop": "supermarket"
-            },
-            "name": "LIDL",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/tegut": {
             "tags": {
                 "name": "tegut",
@@ -26853,25 +27366,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/COOP": {
-            "tags": {
-                "name": "COOP",
-                "shop": "supermarket"
-            },
-            "name": "COOP",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Food Basics": {
             "tags": {
                 "name": "Food Basics",
@@ -28354,12 +28848,12 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/Co-operative Food": {
+        "shop/supermarket/The Co-operative Food": {
             "tags": {
-                "name": "Co-operative Food",
+                "name": "The Co-operative Food",
                 "shop": "supermarket"
             },
-            "name": "Co-operative Food",
+            "name": "The Co-operative Food",
             "icon": "grocery",
             "geometry": [
                 "point",
@@ -28867,25 +29361,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/SPAR": {
-            "tags": {
-                "name": "SPAR",
-                "shop": "supermarket"
-            },
-            "name": "SPAR",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/No Frills": {
             "tags": {
                 "name": "No Frills",
@@ -28981,25 +29456,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/supermarket/The Co-operative Food": {
-            "tags": {
-                "name": "The Co-operative Food",
-                "shop": "supermarket"
-            },
-            "name": "The Co-operative Food",
-            "icon": "grocery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/supermarket/Eurospin": {
             "tags": {
                 "name": "Eurospin",
@@ -31114,25 +31570,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/convenience/Sklep spożywczy": {
-            "tags": {
-                "name": "Sklep spożywczy",
-                "shop": "convenience"
-            },
-            "name": "Sklep spożywczy",
-            "icon": "shop",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/convenience/Centra": {
             "tags": {
                 "name": "Centra",
@@ -31438,6 +31875,25 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
+        "shop/convenience/Sklep spożywczy": {
+            "tags": {
+                "name": "Sklep spożywczy",
+                "shop": "convenience"
+            },
+            "name": "Sklep spożywczy",
+            "icon": "shop",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "suggestion": true
+        },
         "shop/convenience/24 часа": {
             "tags": {
                 "name": "24 часа",
@@ -31647,25 +32103,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/convenience/Spożywczy": {
-            "tags": {
-                "name": "Spożywczy",
-                "shop": "convenience"
-            },
-            "name": "Spożywczy",
-            "icon": "shop",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/convenience/Фортуна": {
             "tags": {
                 "name": "Фортуна",
@@ -32521,25 +32958,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/car_repair/Kwik-Fit": {
-            "tags": {
-                "name": "Kwik-Fit",
-                "shop": "car_repair"
-            },
-            "name": "Kwik-Fit",
-            "icon": "car",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/car_repair/Midas": {
             "tags": {
                 "name": "Midas",
@@ -32787,25 +33205,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/car_repair/AutoZone": {
-            "tags": {
-                "name": "AutoZone",
-                "shop": "car_repair"
-            },
-            "name": "AutoZone",
-            "icon": "car",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/car_repair/Автосервис": {
             "tags": {
                 "name": "Автосервис",
@@ -35975,7 +36374,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -35994,7 +36394,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36013,7 +36414,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36032,7 +36434,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36051,7 +36454,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36070,7 +36474,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36089,7 +36494,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36108,7 +36514,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36127,7 +36534,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36146,7 +36554,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36165,7 +36574,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36184,7 +36594,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36511,25 +36922,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/bakery/Bäcker": {
-            "tags": {
-                "name": "Bäcker",
-                "shop": "bakery"
-            },
-            "name": "Bäcker",
-            "icon": "bakery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/bakery/Schäfer's": {
             "tags": {
                 "name": "Schäfer's",
@@ -36663,25 +37055,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/bakery/Piekarnia": {
-            "tags": {
-                "name": "Piekarnia",
-                "shop": "bakery"
-            },
-            "name": "Piekarnia",
-            "icon": "bakery",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/bakery/Пекарня": {
             "tags": {
                 "name": "Пекарня",
@@ -38297,25 +38670,6 @@ iD.data.presets = {
             ],
             "suggestion": true
         },
-        "shop/hairdresser/Fryzjer": {
-            "tags": {
-                "name": "Fryzjer",
-                "shop": "hairdresser"
-            },
-            "name": "Fryzjer",
-            "icon": "hairdresser",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "fields": [
-                "operator",
-                "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "suggestion": true
-        },
         "shop/hairdresser/Franck Provost": {
             "tags": {
                 "name": "Franck Provost",
@@ -38498,7 +38852,7 @@ iD.data.presets = {
                 "landuse/industrial",
                 "landuse/commercial",
                 "landuse/retail",
-                "landuse/farm",
+                "landuse/farmland",
                 "landuse/farmyard",
                 "landuse/forest",
                 "landuse/meadow",
@@ -38843,7 +39197,7 @@ iD.data.presets = {
         },
         "building_area": {
             "key": "building",
-            "type": "defaultcheck",
+            "type": "combo",
             "default": "yes",
             "geometry": "area",
             "label": "Building"
@@ -38900,6 +39254,11 @@ iD.data.presets = {
             "type": "combo",
             "label": "Type"
         },
+        "content": {
+            "key": "content",
+            "type": "combo",
+            "label": "Contents"
+        },
         "country": {
             "key": "country",
             "type": "combo",
@@ -38950,6 +39309,11 @@ iD.data.presets = {
             "type": "textarea",
             "label": "Description"
         },
+        "drive_through": {
+            "key": "drive_through",
+            "type": "check",
+            "label": "Drive-Through"
+        },
         "electrified": {
             "key": "electrified",
             "type": "combo",
@@ -39145,6 +39509,17 @@ iD.data.presets = {
             "type": "combo",
             "label": "Incline"
         },
+        "incline_steps": {
+            "key": "incline",
+            "type": "combo",
+            "label": "Incline",
+            "strings": {
+                "options": {
+                    "up": "Up",
+                    "down": "Down"
+                }
+            }
+        },
         "information": {
             "key": "information",
             "type": "typeCombo",
@@ -39459,6 +39834,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
+        "power_supply": {
+            "key": "power_supply",
+            "type": "check",
+            "label": "Power Supply"
+        },
         "railway": {
             "key": "railway",
             "type": "typeCombo",
@@ -39539,6 +39919,11 @@ iD.data.presets = {
                 }
             }
         },
+        "sanitary_dump_station": {
+            "key": "sanitary_dump_station",
+            "type": "check",
+            "label": "Toilet Disposal"
+        },
         "seasonal": {
             "key": "seasonal",
             "type": "check",
@@ -39556,8 +39941,8 @@ iD.data.presets = {
                 "drive-through"
             ]
         },
-        "service/bicycle/chaintool": {
-            "key": "service:bicycle:chaintool",
+        "service/bicycle/chain_tool": {
+            "key": "service:bicycle:chain_tool",
             "type": "check",
             "label": "Chain Tool",
             "strings": {
@@ -39580,6 +39965,19 @@ iD.data.presets = {
                 }
             }
         },
+        "service_rail": {
+            "key": "service",
+            "type": "combo",
+            "label": "Service Type",
+            "strings": {
+                "options": {
+                    "spur": "Spur",
+                    "yard": "Yard",
+                    "siding": "Siding",
+                    "crossover": "Crossover"
+                }
+            }
+        },
         "shelter": {
             "key": "shelter",
             "type": "check",
@@ -39831,6 +40229,11 @@ iD.data.presets = {
             "type": "combo",
             "label": "Type"
         },
+        "water_point": {
+            "key": "water_point",
+            "type": "check",
+            "label": "Water Point"
+        },
         "waterway": {
             "key": "waterway",
             "type": "typeCombo",