Use jsonp for MapQuest as CORS doesn't seem to be working

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

diff --git a/vendor/assets/iD/presets.js b/vendor/assets/iD/presets.js
index 5b3c02589e4b5cc5ec66e01aba1c44eb8c6c2a82..fbc24cccf27bfc66a77e45cfc7e00664cfe338b0 100644 (file)
--- a/vendor/assets/iD/presets.js
+++ b/vendor/assets/iD/presets.js
@@ -32,6 +32,7 @@ iD.data.presets = {
                 "funifor",
                 "funitel"
             ],
+            "searchable": false,
             "name": "Aerialway"
         },
         "aerialway/cable_car": {
@@ -188,6 +189,7 @@ iD.data.presets = {
             "tags": {
                 "aeroway": "*"
             },
+            "searchable": false,
             "name": "Aeroway"
         },
         "aeroway/aerodrome": {
@@ -355,7 +357,8 @@ iD.data.presets = {
         "amenity/atm": {
             "icon": "bank",
             "fields": [
-                "operator"
+                "operator",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -378,7 +381,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -507,7 +511,7 @@ iD.data.presets = {
                 "brand",
                 "opening_hours",
                 "fee",
-                "service/bicycle/chaintool",
+                "service/bicycle/chain_tool",
                 "service/bicycle/pump"
             ],
             "geometry": [
@@ -523,6 +527,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"
@@ -637,6 +663,30 @@ iD.data.presets = {
             },
             "name": "Car Wash"
         },
+        "amenity/casino": {
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours",
+                "smoking"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "gambling",
+                "roulette",
+                "craps",
+                "poker",
+                "blackjack"
+            ],
+            "tags": {
+                "amenity": "casino"
+            },
+            "name": "Casino"
+        },
         "amenity/charging_station": {
             "icon": "car",
             "fields": [
@@ -899,6 +949,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "geometry": [
@@ -1151,7 +1202,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -1346,7 +1398,8 @@ iD.data.presets = {
             "icon": "post",
             "fields": [
                 "operator",
-                "collection_times"
+                "collection_times",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -1452,13 +1505,16 @@ iD.data.presets = {
             "name": "Ranger Station"
         },
         "amenity/recycling": {
-            "icon": "recycling",
+            "icon": "waste-basket",
             "fields": [
                 "operator",
                 "address",
+                "recycling/type",
                 "recycling/cans",
-                "recycling/glass",
+                "recycling/glass_bottles",
                 "recycling/paper",
+                "recycling/glass",
+                "recycling/plastic",
                 "recycling/clothes"
             ],
             "geometry": [
@@ -1532,6 +1588,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 +1839,8 @@ iD.data.presets = {
                 "operator",
                 "building_area",
                 "access_toilets",
-                "gender"
+                "gender",
+                "fee"
             ],
             "geometry": [
                 "point",
@@ -1889,6 +1973,18 @@ iD.data.presets = {
             ],
             "matchScore": 0.1
         },
+        "area/highway": {
+            "fields": [
+                "area/highway"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "area:highway": "*"
+            },
+            "name": "Road Surface"
+        },
         "barrier": {
             "geometry": [
                 "point",
@@ -3590,9 +3686,10 @@ iD.data.presets = {
                 "footway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "footway/crosswalk": {
+            "icon": "highway-footway",
             "fields": [
                 "crossing",
                 "access",
@@ -3611,7 +3708,7 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "footway/sidewalk": {
             "fields": [
@@ -3756,6 +3853,7 @@ iD.data.presets = {
             "tags": {
                 "highway": "*"
             },
+            "searchable": false,
             "name": "Highway"
         },
         "highway/bridleway": {
@@ -3782,6 +3880,7 @@ iD.data.presets = {
         "highway/bus_stop": {
             "icon": "bus",
             "fields": [
+                "network",
                 "operator",
                 "bench",
                 "shelter",
@@ -3797,6 +3896,29 @@ iD.data.presets = {
             "terms": [],
             "name": "Bus Stop"
         },
+        "highway/corridor": {
+            "icon": "highway-footway",
+            "fields": [
+                "width",
+                "level",
+                "access_simple"
+            ],
+            "geometry": [
+                "line"
+            ],
+            "tags": {
+                "highway": "corridor"
+            },
+            "terms": [
+                "gallery",
+                "hall",
+                "hallway",
+                "indoor",
+                "passage",
+                "passageway"
+            ],
+            "name": "Indoor Corridor"
+        },
         "highway/crossing": {
             "fields": [
                 "crossing",
@@ -3810,7 +3932,7 @@ iD.data.presets = {
                 "highway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "highway/crosswalk": {
             "fields": [
@@ -3828,7 +3950,7 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "highway/cycleway": {
             "icon": "highway-cycleway",
@@ -3883,7 +4005,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -3953,6 +4076,14 @@ iD.data.presets = {
             "tags": {
                 "highway": "motorway_link"
             },
+            "addTags": {
+                "highway": "motorway_link",
+                "oneway": "yes"
+            },
+            "removeTags": {
+                "highway": "motorway_link",
+                "oneway": "yes"
+            },
             "terms": [
                 "ramp",
                 "on ramp",
@@ -3991,6 +4122,7 @@ iD.data.presets = {
             "name": "Path"
         },
         "highway/pedestrian": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
@@ -4007,7 +4139,7 @@ iD.data.presets = {
                 "highway": "pedestrian"
             },
             "terms": [],
-            "name": "Pedestrian"
+            "name": "Pedestrian Street"
         },
         "highway/primary": {
             "icon": "highway-primary",
@@ -4018,7 +4150,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4037,7 +4170,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4084,7 +4218,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4136,7 +4271,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4155,7 +4291,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4178,7 +4315,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4290,6 +4428,7 @@ iD.data.presets = {
                 "surface",
                 "lit",
                 "width",
+                "incline_steps",
                 "access"
             ],
             "icon": "highway-steps",
@@ -4347,7 +4486,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4366,7 +4506,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4484,7 +4625,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4612,14 +4754,12 @@ iD.data.presets = {
                 "landuse"
             ],
             "geometry": [
-                "point",
-                "vertex",
                 "area"
             ],
             "tags": {
                 "landuse": "*"
             },
-            "name": "Landuse"
+            "name": "Land Use"
         },
         "landuse/allotments": {
             "geometry": [
@@ -4833,6 +4973,23 @@ iD.data.presets = {
             "terms": [],
             "name": "Orchard"
         },
+        "landuse/plant_nursery": {
+            "icon": "garden",
+            "fields": [
+                "name"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "landuse": "plant_nursery"
+            },
+            "terms": [
+                "vivero"
+            ],
+            "name": "Plant Nursery"
+        },
         "landuse/quarry": {
             "geometry": [
                 "area"
@@ -4888,6 +5045,45 @@ iD.data.presets = {
             },
             "name": "Leisure"
         },
+        "leisure/adult_gaming_centre": {
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours",
+                "smoking"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "gambling",
+                "slot machine"
+            ],
+            "tags": {
+                "leisure": "adult_gaming_centre"
+            },
+            "name": "Adult Gaming Center"
+        },
+        "leisure/bowling_alley": {
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "opening_hours",
+                "smoking"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "leisure": "bowling_alley"
+            },
+            "name": "Bowling Alley"
+        },
         "leisure/common": {
             "geometry": [
                 "point",
@@ -4984,6 +5180,15 @@ iD.data.presets = {
         },
         "leisure/marina": {
             "icon": "harbor",
+            "fields": [
+                "operator",
+                "address",
+                "capacity",
+                "fee",
+                "sanitary_dump_station",
+                "power_supply",
+                "internet_access"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -5336,6 +5541,25 @@ iD.data.presets = {
             },
             "name": "Man Made"
         },
+        "man_made/adit": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "fields": [
+                "operator"
+            ],
+            "terms": [
+                "entrance",
+                "underground",
+                "mine",
+                "cave"
+            ],
+            "tags": {
+                "man_made": "adit"
+            },
+            "name": "Adit"
+        },
         "man_made/breakwater": {
             "geometry": [
                 "line",
@@ -5377,6 +5601,9 @@ iD.data.presets = {
         },
         "man_made/lighthouse": {
             "icon": "lighthouse",
+            "fields": [
+                "building_area"
+            ],
             "geometry": [
                 "point",
                 "area"
@@ -5386,6 +5613,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 +5649,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 +5692,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": [
@@ -5611,7 +5917,13 @@ iD.data.presets = {
                 "fee",
                 "access_simple"
             ],
-            "terms": [],
+            "terms": [
+                "cavern",
+                "hollow",
+                "grotto",
+                "shelter",
+                "cavity"
+            ],
             "tags": {
                 "natural": "cave_entrance"
             },
@@ -5712,6 +6024,25 @@ iD.data.presets = {
             ],
             "name": "Peak"
         },
+        "natural/saddle": {
+            "icon": "triangle-stroked",
+            "fields": [
+                "elevation"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "natural": "saddle"
+            },
+            "terms": [
+                "pass",
+                "mountain pass",
+                "top"
+            ],
+            "name": "Saddle"
+        },
         "natural/scree": {
             "geometry": [
                 "area"
@@ -5731,7 +6062,10 @@ iD.data.presets = {
             "tags": {
                 "natural": "scrub"
             },
-            "terms": [],
+            "terms": [
+                "bush",
+                "shrubs"
+            ],
             "name": "Scrub"
         },
         "natural/spring": {
@@ -5747,8 +6081,8 @@ iD.data.presets = {
         },
         "natural/tree": {
             "fields": [
-                "leaf_type",
-                "leaf_cycle",
+                "leaf_type_singular",
+                "leaf_cycle_singular",
                 "denotation"
             ],
             "icon": "park",
@@ -5762,6 +6096,40 @@ iD.data.presets = {
             },
             "name": "Tree"
         },
+        "natural/tree_row": {
+            "fields": [
+                "leaf_type",
+                "leaf_cycle",
+                "denotation"
+            ],
+            "icon": "park",
+            "geometry": [
+                "line"
+            ],
+            "terms": [],
+            "tags": {
+                "natural": "tree_row"
+            },
+            "name": "Tree row"
+        },
+        "natural/volcano": {
+            "icon": "triangle",
+            "fields": [
+                "elevation"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "natural": "volcano"
+            },
+            "terms": [
+                "mountain",
+                "crater"
+            ],
+            "name": "Volcano"
+        },
         "natural/water": {
             "fields": [
                 "water"
@@ -6278,6 +6646,7 @@ iD.data.presets = {
             "tags": {
                 "place": "*"
             },
+            "searchable": false,
             "name": "Place"
         },
         "place/city": {
@@ -6294,6 +6663,17 @@ iD.data.presets = {
             },
             "name": "City"
         },
+        "place/farm": {
+            "icon": "farm",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "place": "farm"
+            },
+            "name": "Farm"
+        },
         "place/hamlet": {
             "icon": "triangle-stroked",
             "fields": [
@@ -6436,6 +6816,7 @@ iD.data.presets = {
             "fields": [
                 "power"
             ],
+            "searchable": false,
             "name": "Power"
         },
         "power/generator": {
@@ -6538,8 +6919,8 @@ iD.data.presets = {
         "public_transport/platform": {
             "fields": [
                 "ref",
-                "operator",
                 "network",
+                "operator",
                 "shelter"
             ],
             "geometry": [
@@ -6557,8 +6938,8 @@ iD.data.presets = {
             "icon": "bus",
             "fields": [
                 "ref",
-                "operator",
-                "network"
+                "network",
+                "operator"
             ],
             "geometry": [
                 "vertex"
@@ -6581,6 +6962,7 @@ iD.data.presets = {
             "tags": {
                 "railway": "*"
             },
+            "searchable": false,
             "name": "Railway"
         },
         "railway/abandoned": {
@@ -6592,7 +6974,8 @@ iD.data.presets = {
                 "railway": "abandoned"
             },
             "fields": [
-                "structure"
+                "structure",
+                "service_rail"
             ],
             "terms": [],
             "name": "Abandoned Railway"
@@ -6606,7 +6989,8 @@ iD.data.presets = {
                 "railway": "disused"
             },
             "fields": [
-                "structure"
+                "structure",
+                "service_rail"
             ],
             "terms": [],
             "name": "Disused Railway"
@@ -6624,7 +7008,8 @@ iD.data.presets = {
             ],
             "fields": [
                 "structure",
-                "gauge"
+                "gauge",
+                "service_rail"
             ],
             "tags": {
                 "railway": "funicular"
@@ -6661,12 +7046,12 @@ iD.data.presets = {
             "terms": [
                 "crossing",
                 "railroad crossing",
-                "railway crossing",
+                "level crossing",
                 "grade crossing",
                 "road through railroad",
                 "train crossing"
             ],
-            "name": "Level Crossing"
+            "name": "Railway Crossing"
         },
         "railway/monorail": {
             "icon": "railway-monorail",
@@ -6678,7 +7063,8 @@ iD.data.presets = {
             },
             "fields": [
                 "structure",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [],
             "name": "Monorail"
@@ -6694,7 +7080,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [
                 "narrow gauge railway",
@@ -6725,7 +7112,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [],
             "name": "Rail"
@@ -6733,6 +7121,7 @@ iD.data.presets = {
         "railway/station": {
             "icon": "rail",
             "fields": [
+                "network",
                 "operator",
                 "address",
                 "building_area"
@@ -6753,17 +7142,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 +7179,8 @@ iD.data.presets = {
             "fields": [
                 "structure",
                 "gauge",
-                "electrified"
+                "electrified",
+                "service_rail"
             ],
             "terms": [
                 "streetcar"
@@ -6807,6 +7198,17 @@ iD.data.presets = {
                 "relation"
             ]
         },
+        "roundabout": {
+            "geometry": [
+                "vertex",
+                "line"
+            ],
+            "tags": {
+                "junction": "roundabout"
+            },
+            "name": "Roundabout",
+            "searchable": false
+        },
         "route/ferry": {
             "icon": "ferry",
             "geometry": [
@@ -6842,7 +7244,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "geometry": [
                 "point",
@@ -8906,29 +9309,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"
             },
@@ -9558,6 +9975,7 @@ iD.data.presets = {
             "tags": {
                 "waterway": "*"
             },
+            "searchable": false,
             "name": "Waterway"
         },
         "waterway/canal": {
@@ -9612,6 +10030,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 +10092,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 +12662,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 +14259,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13832,6 +14284,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13856,6 +14309,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13880,6 +14334,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13903,6 +14358,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13927,6 +14383,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13950,6 +14407,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13974,6 +14432,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -13998,6 +14457,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14021,6 +14481,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14044,6 +14505,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14067,6 +14529,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14090,6 +14553,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14114,6 +14578,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14137,6 +14602,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14160,6 +14626,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14184,6 +14651,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14207,6 +14675,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14230,6 +14699,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14253,6 +14723,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14276,6 +14747,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14299,6 +14771,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14322,6 +14795,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14345,6 +14819,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14368,6 +14843,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14391,6 +14867,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14415,6 +14892,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14438,6 +14916,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14461,6 +14940,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14484,6 +14964,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14507,6 +14988,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14530,6 +15012,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14554,6 +15037,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14578,6 +15062,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14601,6 +15086,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14625,6 +15111,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14632,6 +15119,7 @@ iD.data.presets = {
         "amenity/fast_food/Taco Bell": {
             "tags": {
                 "name": "Taco Bell",
+                "cuisine": "mexican",
                 "amenity": "fast_food"
             },
             "name": "Taco Bell",
@@ -14648,6 +15136,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14671,6 +15160,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14695,6 +15185,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14718,6 +15209,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14741,29 +15233,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 +15258,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14811,29 +15282,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 +15307,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14883,6 +15333,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14906,6 +15357,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14929,6 +15381,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14952,6 +15405,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14975,6 +15429,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -14998,6 +15453,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15023,6 +15479,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15046,6 +15503,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15069,6 +15527,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15093,6 +15552,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15116,6 +15576,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15139,6 +15600,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15162,6 +15624,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15185,6 +15648,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15208,6 +15672,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15232,6 +15697,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15239,6 +15705,7 @@ iD.data.presets = {
         "amenity/fast_food/Panda Express": {
             "tags": {
                 "name": "Panda Express",
+                "cuisine": "chinese",
                 "amenity": "fast_food"
             },
             "name": "Panda Express",
@@ -15255,6 +15722,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15278,6 +15746,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15301,6 +15770,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15324,6 +15794,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15347,6 +15818,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15370,6 +15842,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15393,6 +15866,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15417,6 +15891,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15440,6 +15915,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15463,6 +15939,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15486,6 +15963,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15510,6 +15988,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15534,6 +16013,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15557,6 +16037,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15580,6 +16061,7 @@ iD.data.presets = {
                 "opening_hours",
                 "takeaway",
                 "delivery",
+                "drive_through",
                 "smoking"
             ],
             "suggestion": true
@@ -15587,6 +16069,7 @@ iD.data.presets = {
         "amenity/restaurant/Pizza Hut": {
             "tags": {
                 "name": "Pizza Hut",
+                "cuisine": "pizza",
                 "amenity": "restaurant"
             },
             "name": "Pizza Hut",
@@ -18476,7 +18959,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18496,7 +18980,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18516,7 +19001,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18536,7 +19022,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18556,7 +19043,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18576,7 +19064,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18596,7 +19085,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18616,7 +19106,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18636,7 +19127,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18656,7 +19148,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18676,7 +19169,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18696,7 +19190,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18716,7 +19211,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18736,7 +19232,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18756,7 +19253,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18776,7 +19274,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18796,7 +19295,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18816,7 +19316,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18836,7 +19337,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18856,7 +19358,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18876,7 +19379,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18896,7 +19400,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18916,7 +19421,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18936,7 +19442,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18956,7 +19463,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18976,7 +19484,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -18996,7 +19505,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19016,7 +19526,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19036,7 +19547,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19056,7 +19568,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19076,7 +19589,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19096,7 +19610,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19116,7 +19631,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19136,7 +19652,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19156,7 +19673,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19176,7 +19694,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19196,7 +19715,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19216,7 +19736,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19236,7 +19757,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19256,7 +19778,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19276,7 +19799,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19296,7 +19820,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19316,7 +19841,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19336,7 +19862,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19356,7 +19883,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19376,7 +19904,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19396,7 +19925,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19416,7 +19946,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19436,7 +19967,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19456,7 +19988,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19476,7 +20009,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19496,7 +20030,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19516,7 +20051,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19536,7 +20072,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19556,7 +20093,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19576,7 +20114,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19596,7 +20135,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19616,7 +20156,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19636,7 +20177,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19656,7 +20198,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19676,7 +20219,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19696,7 +20240,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19716,7 +20261,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19736,7 +20282,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19756,7 +20303,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19776,7 +20324,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19796,7 +20345,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19816,7 +20366,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19836,7 +20387,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19856,7 +20408,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19876,7 +20429,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19896,7 +20450,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19916,7 +20471,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19936,7 +20492,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19956,7 +20513,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19976,7 +20534,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -19996,7 +20555,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20016,7 +20576,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20036,7 +20597,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20056,7 +20618,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20076,7 +20639,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20096,7 +20660,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20116,7 +20681,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20136,7 +20702,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20156,7 +20723,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20176,7 +20744,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20196,7 +20765,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20216,7 +20786,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20236,7 +20807,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20256,7 +20828,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20276,7 +20849,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20296,7 +20870,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20316,7 +20891,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20336,7 +20912,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20356,7 +20933,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20376,7 +20954,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20396,7 +20975,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20416,7 +20996,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20436,7 +21017,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20456,7 +21038,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20476,7 +21059,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20496,7 +21080,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20516,7 +21101,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20536,7 +21122,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20556,7 +21143,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20576,7 +21164,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20596,7 +21185,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20616,7 +21206,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20636,7 +21227,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20656,7 +21248,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20676,7 +21269,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20696,7 +21290,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20716,7 +21311,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20736,7 +21332,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20756,7 +21353,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20776,7 +21374,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20796,7 +21395,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20816,7 +21416,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20836,7 +21437,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20856,7 +21458,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20876,7 +21479,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20896,7 +21500,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20916,7 +21521,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20936,7 +21542,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20956,7 +21563,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20976,7 +21584,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -20996,7 +21605,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21016,7 +21626,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21036,7 +21647,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21056,7 +21668,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21076,7 +21689,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21096,7 +21710,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21116,7 +21731,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21136,7 +21752,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21156,7 +21773,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21176,7 +21794,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21196,7 +21815,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21216,7 +21836,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21236,7 +21857,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21256,7 +21878,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21276,7 +21899,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21296,7 +21920,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21316,7 +21941,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21336,7 +21962,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21356,7 +21983,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21376,7 +22004,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21396,7 +22025,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21416,7 +22046,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21436,7 +22067,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21456,7 +22088,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21476,7 +22109,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21496,7 +22130,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21516,7 +22151,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21536,7 +22172,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21556,7 +22193,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21576,7 +22214,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21596,7 +22235,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21616,7 +22256,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21636,7 +22277,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21656,7 +22298,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21676,7 +22319,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21696,7 +22340,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21716,7 +22361,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21736,7 +22382,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21756,7 +22403,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21776,7 +22424,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21796,7 +22445,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21816,7 +22466,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21836,7 +22487,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21856,7 +22508,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21876,7 +22529,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21896,7 +22550,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21916,7 +22571,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21936,7 +22592,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21956,7 +22613,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21976,7 +22634,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -21996,7 +22655,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22016,7 +22676,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22036,7 +22697,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22056,7 +22718,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22076,7 +22739,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22096,7 +22760,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22116,7 +22781,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22136,7 +22802,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22156,7 +22823,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22176,7 +22844,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22196,16 +22865,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 +22886,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22236,7 +22907,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22256,7 +22928,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22276,7 +22949,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22296,7 +22970,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22316,7 +22991,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22336,7 +23012,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22356,7 +23033,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22376,7 +23054,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22396,7 +23075,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22416,7 +23096,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22436,7 +23117,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22456,7 +23138,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22476,7 +23159,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22496,7 +23180,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22516,7 +23201,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22536,7 +23222,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22556,7 +23243,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22576,7 +23264,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22596,7 +23285,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22616,7 +23306,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22636,7 +23327,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22656,7 +23348,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22676,7 +23369,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22696,7 +23390,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22717,7 +23412,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22738,7 +23434,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22759,7 +23456,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22780,7 +23478,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22801,7 +23500,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22821,7 +23521,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22841,7 +23542,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22861,7 +23563,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22881,7 +23584,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22901,7 +23605,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22921,7 +23626,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22941,7 +23647,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22962,7 +23669,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -22982,7 +23690,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23002,7 +23711,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23022,7 +23732,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23042,7 +23753,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23062,7 +23774,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23082,7 +23795,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23102,7 +23816,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23122,7 +23837,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23142,7 +23858,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23162,7 +23879,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23182,7 +23900,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23202,7 +23921,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23222,7 +23942,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23242,7 +23963,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23262,7 +23984,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23282,7 +24005,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23302,7 +24026,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23322,7 +24047,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23342,7 +24068,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23363,7 +24090,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23383,7 +24111,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23403,7 +24132,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23423,7 +24153,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23443,7 +24174,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23463,7 +24195,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23483,7 +24216,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23503,7 +24237,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23634,7 +24369,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23653,7 +24389,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23672,7 +24409,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23691,7 +24429,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23710,7 +24449,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23729,7 +24469,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23748,7 +24489,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23767,7 +24509,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23786,7 +24529,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23805,7 +24549,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23824,7 +24569,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23843,7 +24589,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23862,7 +24609,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23881,7 +24629,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23900,7 +24649,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23919,7 +24669,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23938,7 +24689,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23957,7 +24709,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23976,7 +24729,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -23995,7 +24749,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24014,7 +24769,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24033,7 +24789,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24052,7 +24809,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24071,7 +24829,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24090,7 +24849,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24109,7 +24869,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24128,7 +24889,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24147,7 +24909,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24166,7 +24929,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24185,7 +24949,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24204,7 +24969,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24223,7 +24989,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24242,7 +25009,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24261,7 +25029,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24280,7 +25049,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24299,7 +25069,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24318,7 +25089,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24337,7 +25109,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24356,7 +25129,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24375,7 +25149,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24394,7 +25169,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24413,7 +25189,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24432,7 +25209,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24451,7 +25229,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24470,7 +25249,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24489,7 +25269,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24508,7 +25289,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24527,7 +25309,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24546,7 +25329,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24565,7 +25349,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24584,7 +25369,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24603,7 +25389,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24622,7 +25409,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24641,7 +25429,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24660,7 +25449,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24679,7 +25469,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24698,7 +25489,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24717,7 +25509,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24736,7 +25529,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24755,7 +25549,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24774,7 +25569,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24793,7 +25589,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24812,7 +25609,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24831,7 +25629,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24850,7 +25649,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24869,7 +25669,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24888,7 +25689,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24907,7 +25709,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24926,7 +25729,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24945,7 +25749,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24964,7 +25769,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -24983,7 +25789,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25002,7 +25809,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25021,7 +25829,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -25173,27 +25982,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 +26520,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 +26881,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 +26976,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 +27128,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 +27584,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 +29066,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 +29579,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 +29674,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 +31788,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 +32093,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 +32321,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 +33176,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 +33423,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 +36592,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -35994,7 +36612,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36013,7 +36632,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36032,7 +36652,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36051,7 +36672,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36070,7 +36692,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36089,7 +36712,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36108,7 +36732,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36127,7 +36752,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36146,7 +36772,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36165,7 +36792,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36184,7 +36812,8 @@ iD.data.presets = {
                 "operator",
                 "address",
                 "building_area",
-                "opening_hours"
+                "opening_hours",
+                "drive_through"
             ],
             "suggestion": true
         },
@@ -36511,25 +37140,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 +37273,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 +38888,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",
@@ -38446,6 +39018,7 @@ iD.data.presets = {
         ],
         "vertex": [
             "highway/crosswalk",
+            "highway/crossing",
             "railway/level_crossing",
             "highway/traffic_signals",
             "highway/turning_circle",
@@ -38498,7 +39071,7 @@ iD.data.presets = {
                 "landuse/industrial",
                 "landuse/commercial",
                 "landuse/retail",
-                "landuse/farm",
+                "landuse/farmland",
                 "landuse/farmyard",
                 "landuse/forest",
                 "landuse/meadow",
@@ -38511,6 +39084,7 @@ iD.data.presets = {
             "name": "Path",
             "icon": "category-path",
             "members": [
+                "highway/pedestrian",
                 "highway/footway",
                 "highway/cycleway",
                 "highway/bridleway",
@@ -38625,11 +39199,11 @@ iD.data.presets = {
                 "key": "access"
             },
             "type": "access",
-            "label": "Access",
-            "placeholder": "Unknown",
+            "label": "Allowed Access",
+            "placeholder": "Not Specified",
             "strings": {
                 "types": {
-                    "access": "General",
+                    "access": "All",
                     "foot": "Foot",
                     "motor_vehicle": "Motor Vehicles",
                     "bicycle": "Bicycles",
@@ -38659,6 +39233,10 @@ iD.data.presets = {
                     "destination": {
                         "title": "Destination",
                         "description": "Access permitted only to reach a destination"
+                    },
+                    "dismount": {
+                        "title": "Dismount",
+                        "description": "Access permitted but rider must dismount"
                     }
                 }
             }
@@ -38666,7 +39244,7 @@ iD.data.presets = {
         "access_simple": {
             "key": "access",
             "type": "combo",
-            "label": "Access",
+            "label": "Allowed Access",
             "placeholder": "yes",
             "options": [
                 "permissive",
@@ -38691,9 +39269,18 @@ iD.data.presets = {
             "keys": [
                 "addr:housename",
                 "addr:housenumber",
+                "addr:conscriptionnumber",
                 "addr:street",
                 "addr:city",
-                "addr:postcode"
+                "addr:postcode",
+                "addr:place",
+                "addr:hamlet",
+                "addr:suburb",
+                "addr:subdistrict",
+                "addr:district",
+                "addr:province",
+                "addr:state",
+                "addr:country"
             ],
             "reference": {
                 "key": "addr"
@@ -38705,6 +39292,7 @@ iD.data.presets = {
                 "placeholders": {
                     "housename": "Housename",
                     "housenumber": "123",
+                    "conscriptionnumber": "123",
                     "street": "Street",
                     "city": "City",
                     "postcode": "Postcode",
@@ -38791,6 +39379,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
+        "area/highway": {
+            "key": "area:highway",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "artist": {
             "key": "artist_name",
             "type": "text",
@@ -38843,7 +39436,7 @@ iD.data.presets = {
         },
         "building_area": {
             "key": "building",
-            "type": "defaultcheck",
+            "type": "combo",
             "default": "yes",
             "geometry": "area",
             "label": "Building"
@@ -38900,6 +39493,11 @@ iD.data.presets = {
             "type": "combo",
             "label": "Type"
         },
+        "content": {
+            "key": "content",
+            "type": "combo",
+            "label": "Contents"
+        },
         "country": {
             "key": "country",
             "type": "combo",
@@ -38930,6 +39528,54 @@ iD.data.presets = {
             "type": "combo",
             "label": "Cuisine"
         },
+        "cycleway": {
+            "keys": [
+                "cycleway:left",
+                "cycleway:right"
+            ],
+            "reference": {
+                "key": "cycleway"
+            },
+            "type": "cycleway",
+            "label": "Bike Lanes",
+            "placeholder": "none",
+            "strings": {
+                "types": {
+                    "cycleway:left": "Left side",
+                    "cycleway:right": "Right side"
+                },
+                "options": {
+                    "none": {
+                        "title": "None",
+                        "description": "No bike lane"
+                    },
+                    "lane": {
+                        "title": "Standard bike lane",
+                        "description": "A bike lane separated from auto traffic by a painted line"
+                    },
+                    "shared_lane": {
+                        "title": "Shared bike lane",
+                        "description": "A bike lane with no separation from auto traffic"
+                    },
+                    "track": {
+                        "title": "Bike track",
+                        "description": "A bike lane separated from traffic by a physical barrier"
+                    },
+                    "share_busway": {
+                        "title": "Bike lane shared with bus",
+                        "description": "A bike lane shared with a bus lane"
+                    },
+                    "opposite_lane": {
+                        "title": "Opposite bike lane",
+                        "description": "A bike lane that travels in the opposite direction of traffic"
+                    },
+                    "opposite": {
+                        "title": "Contraflow bike lane",
+                        "description": "A bike lane that travels in both directions on a one-way street"
+                    }
+                }
+            }
+        },
         "delivery": {
             "key": "delivery",
             "type": "check",
@@ -38950,6 +39596,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 +39796,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",
@@ -39199,6 +39861,19 @@ iD.data.presets = {
                 }
             }
         },
+        "leaf_cycle_singular": {
+            "key": "leaf_cycle",
+            "type": "combo",
+            "label": "Leaf Cycle",
+            "strings": {
+                "options": {
+                    "evergreen": "Evergreen",
+                    "deciduous": "Deciduous",
+                    "semi_evergreen": "Semi-Evergreen",
+                    "semi_deciduous": "Semi-Deciduous"
+                }
+            }
+        },
         "leaf_type": {
             "key": "leaf_type",
             "type": "combo",
@@ -39212,6 +39887,18 @@ iD.data.presets = {
                 }
             }
         },
+        "leaf_type_singular": {
+            "key": "leaf_type",
+            "type": "combo",
+            "label": "Leaf Type",
+            "strings": {
+                "options": {
+                    "broadleaved": "Broadleaved",
+                    "needleleaved": "Needleleaved",
+                    "leafless": "Leafless"
+                }
+            }
+        },
         "leisure": {
             "key": "leisure",
             "type": "typeCombo",
@@ -39222,6 +39909,12 @@ iD.data.presets = {
             "type": "number",
             "label": "Length (Meters)"
         },
+        "level": {
+            "key": "level",
+            "type": "combo",
+            "label": "Level",
+            "universal": true
+        },
         "levels": {
             "key": "building:levels",
             "type": "number",
@@ -39459,6 +40152,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
+        "power_supply": {
+            "key": "power_supply",
+            "type": "check",
+            "label": "Power Supply"
+        },
         "railway": {
             "key": "railway",
             "type": "typeCombo",
@@ -39479,11 +40177,32 @@ iD.data.presets = {
             "type": "check",
             "label": "Accepts Glass"
         },
+        "recycling/glass_bottles": {
+            "key": "recycling:glass_bottles",
+            "type": "check",
+            "label": "Accepts Glass Bottles"
+        },
         "recycling/paper": {
             "key": "recycling:paper",
             "type": "check",
             "label": "Accepts Paper"
         },
+        "recycling/plastic": {
+            "key": "recycling:plastic",
+            "type": "check",
+            "label": "Accepts Plastic"
+        },
+        "recycling/type": {
+            "key": "recycling_type",
+            "type": "combo",
+            "label": "Recycling Type",
+            "strings": {
+                "options": {
+                    "container": "Container",
+                    "centre": "Recycling Center"
+                }
+            }
+        },
         "ref": {
             "key": "ref",
             "type": "text",
@@ -39539,6 +40258,11 @@ iD.data.presets = {
                 }
             }
         },
+        "sanitary_dump_station": {
+            "key": "sanitary_dump_station",
+            "type": "check",
+            "label": "Toilet Disposal"
+        },
         "seasonal": {
             "key": "seasonal",
             "type": "check",
@@ -39556,8 +40280,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 +40304,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 +40568,11 @@ iD.data.presets = {
             "type": "combo",
             "label": "Type"
         },
+        "water_point": {
+            "key": "water_point",
+            "type": "check",
+            "label": "Water Point"
+        },
         "waterway": {
             "key": "waterway",
             "type": "typeCombo",