]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/presets.js
Update to iD v1.8.3
[rails.git] / vendor / assets / iD / presets.js
index 0a09d502d224d31626e03d8691c79e4797e7987c..f7b832367d96b608bd54d6a45375fec33827621b 100644 (file)
@@ -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": {
@@ -525,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"
@@ -639,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": [
@@ -802,7 +850,7 @@ iD.data.presets = {
             "name": "Courthouse"
         },
         "amenity/dentist": {
-            "icon": "hospital",
+            "icon": "dentist",
             "fields": [
                 "address",
                 "building_area",
@@ -948,7 +996,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "geometry": [
@@ -1087,6 +1134,24 @@ iD.data.presets = {
             },
             "name": "Marketplace"
         },
+        "amenity/motorcycle_parking": {
+            "icon": "scooter",
+            "fields": [
+                "capacity",
+                "operator",
+                "covered",
+                "access_simple"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "amenity": "motorcycle_parking"
+            },
+            "name": "Motorcycle Parking"
+        },
         "amenity/nightclub": {
             "icon": "bar",
             "fields": [
@@ -1121,6 +1186,8 @@ iD.data.presets = {
                 "access_simple",
                 "supervised",
                 "park_ride",
+                "surface",
+                "maxstay",
                 "address"
             ],
             "geometry": [
@@ -1457,13 +1524,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": [
@@ -1537,6 +1607,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": [
@@ -1761,7 +1858,8 @@ iD.data.presets = {
                 "operator",
                 "building_area",
                 "access_toilets",
-                "gender"
+                "gender",
+                "fee"
             ],
             "geometry": [
                 "point",
@@ -1826,19 +1924,179 @@ iD.data.presets = {
             },
             "name": "University Grounds"
         },
-        "amenity/vending_machine": {
+        "amenity/vending_machine/cigarettes": {
             "fields": [
-                "vending",
                 "operator"
             ],
             "geometry": [
                 "point"
             ],
             "terms": [
-                "snack",
+                "cigarette"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "cigarettes"
+            },
+            "name": "Cigarette Vending Machine"
+        },
+        "amenity/vending_machine/condoms": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "condom"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "condoms"
+            },
+            "name": "Condom Vending Machine"
+        },
+        "amenity/vending_machine/drinks": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "drink",
                 "soda",
+                "beverage",
+                "juice",
+                "pop"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "drinks"
+            },
+            "name": "Drink Vending Machine"
+        },
+        "amenity/vending_machine/excrement_bags": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "excrement bags",
+                "poop",
+                "dog",
+                "animal"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "excrement_bags"
+            },
+            "name": "Excrement Bag Vending Machine"
+        },
+        "amenity/vending_machine/news_papers": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "newspaper"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "news_papers"
+            },
+            "name": "Newspaper Vending Machine"
+        },
+        "amenity/vending_machine/parcel_pickup_dropoff": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "parcel",
+                "mail",
+                "pickup"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "parcel_pickup;parcel_mail_in"
+            },
+            "name": "Parcel Pickup/Dropoff Vending Machine"
+        },
+        "amenity/vending_machine/parking_tickets": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "parking",
                 "ticket"
             ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "parking_tickets"
+            },
+            "name": "Parking Ticket Vending Machine"
+        },
+        "amenity/vending_machine/public_transport_tickets": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "bus",
+                "train",
+                "ferry",
+                "rail",
+                "ticket",
+                "transportation"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "public_transport_tickets"
+            },
+            "name": "Transit Ticket Vending Machine"
+        },
+        "amenity/vending_machine/sweets": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "candy",
+                "gum",
+                "chip",
+                "pretzel",
+                "cookie",
+                "cracker"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "sweets"
+            },
+            "name": "Snack Vending Machine"
+        },
+        "amenity/vending_machine/vending_machine": {
+            "fields": [
+                "vending",
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [],
             "tags": {
                 "amenity": "vending_machine"
             },
@@ -1894,6 +2152,18 @@ iD.data.presets = {
             ],
             "matchScore": 0.1
         },
+        "area/highway": {
+            "fields": [
+                "area/highway"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "area:highway": "*"
+            },
+            "name": "Road Surface"
+        },
         "barrier": {
             "geometry": [
                 "point",
@@ -2111,11 +2381,13 @@ iD.data.presets = {
                 "address"
             ],
             "geometry": [
+                "point",
                 "area"
             ],
             "tags": {
                 "building": "*"
             },
+            "matchScore": 0.4,
             "terms": [],
             "name": "Building"
         },
@@ -2126,12 +2398,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "apartments"
             },
+            "matchScore": 0.5,
             "name": "Apartments"
         },
         "building/barn": {
@@ -2141,12 +2413,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "barn"
             },
+            "matchScore": 0.5,
             "name": "Barn"
         },
         "building/bunker": {
@@ -2155,12 +2427,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "bunker"
             },
+            "matchScore": 0.5,
             "name": "Bunker",
             "searchable": false
         },
@@ -2171,12 +2443,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "cabin"
             },
+            "matchScore": 0.5,
             "name": "Cabin"
         },
         "building/cathedral": {
@@ -2186,13 +2458,13 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "cathedral"
             },
-            "name": "Cathedral"
+            "matchScore": 0.5,
+            "name": "Cathedral Building"
         },
         "building/chapel": {
             "icon": "place-of-worship",
@@ -2201,13 +2473,13 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "chapel"
             },
-            "name": "Chapel"
+            "matchScore": 0.5,
+            "name": "Chapel Building"
         },
         "building/church": {
             "icon": "place-of-worship",
@@ -2216,13 +2488,13 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "church"
             },
-            "name": "Church"
+            "matchScore": 0.5,
+            "name": "Church Building"
         },
         "building/college": {
             "icon": "building",
@@ -2231,7 +2503,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2240,6 +2511,7 @@ iD.data.presets = {
             "tags": {
                 "building": "college"
             },
+            "matchScore": 0.5,
             "name": "College Building"
         },
         "building/commercial": {
@@ -2250,12 +2522,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "commercial"
             },
+            "matchScore": 0.5,
             "name": "Commercial Building"
         },
         "building/construction": {
@@ -2265,12 +2537,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "construction"
             },
+            "matchScore": 0.5,
             "name": "Building Under Construction"
         },
         "building/detached": {
@@ -2280,13 +2552,20 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "detached"
             },
-            "name": "Detached Home"
+            "terms": [
+                "home",
+                "single",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "matchScore": 0.5,
+            "name": "Detached House"
         },
         "building/dormitory": {
             "icon": "building",
@@ -2296,12 +2575,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "dormitory"
             },
+            "matchScore": 0.5,
             "name": "Dormitory"
         },
         "building/entrance": {
@@ -2316,18 +2595,18 @@ iD.data.presets = {
             "searchable": false
         },
         "building/garage": {
+            "icon": "warehouse",
             "fields": [
                 "capacity"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "garage"
             },
-            "name": "Garage",
-            "icon": "warehouse"
+            "matchScore": 0.5,
+            "name": "Garage"
         },
         "building/garages": {
             "icon": "warehouse",
@@ -2335,12 +2614,12 @@ iD.data.presets = {
                 "capacity"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "garages"
             },
+            "matchScore": 0.5,
             "name": "Garages"
         },
         "building/greenhouse": {
@@ -2350,12 +2629,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "greenhouse"
             },
+            "matchScore": 0.5,
             "name": "Greenhouse"
         },
         "building/hospital": {
@@ -2365,12 +2644,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hospital"
             },
+            "matchScore": 0.5,
             "name": "Hospital Building"
         },
         "building/hotel": {
@@ -2381,12 +2660,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hotel"
             },
+            "matchScore": 0.5,
             "name": "Hotel Building"
         },
         "building/house": {
@@ -2396,22 +2675,28 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "house"
             },
+            "terms": [
+                "home",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "matchScore": 0.5,
             "name": "House"
         },
         "building/hut": {
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hut"
             },
+            "matchScore": 0.5,
             "name": "Hut"
         },
         "building/industrial": {
@@ -2421,12 +2706,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "industrial"
             },
+            "matchScore": 0.5,
             "name": "Industrial Building"
         },
         "building/kindergarten": {
@@ -2436,7 +2721,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2446,6 +2730,7 @@ iD.data.presets = {
             "tags": {
                 "building": "kindergarten"
             },
+            "matchScore": 0.5,
             "name": "Preschool/Kindergarten Building"
         },
         "building/public": {
@@ -2456,12 +2741,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "public"
             },
+            "matchScore": 0.5,
             "name": "Public Building"
         },
         "building/residential": {
@@ -2471,12 +2756,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "residential"
             },
+            "matchScore": 0.5,
             "name": "Residential Building"
         },
         "building/retail": {
@@ -2487,12 +2772,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "retail"
             },
+            "matchScore": 0.5,
             "name": "Retail Building"
         },
         "building/roof": {
@@ -2501,12 +2786,12 @@ iD.data.presets = {
                 "address"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "roof"
             },
+            "matchScore": 0.5,
             "name": "Roof"
         },
         "building/school": {
@@ -2516,7 +2801,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2528,8 +2812,33 @@ iD.data.presets = {
             "tags": {
                 "building": "school"
             },
+            "matchScore": 0.5,
             "name": "School Building"
         },
+        "building/semidetached_house": {
+            "icon": "building",
+            "fields": [
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "semidetached_house"
+            },
+            "terms": [
+                "home",
+                "double",
+                "duplex",
+                "twin",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "matchScore": 0.5,
+            "name": "Semi-Detached House"
+        },
         "building/shed": {
             "icon": "building",
             "fields": [
@@ -2537,12 +2846,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "shed"
             },
+            "matchScore": 0.5,
             "name": "Shed"
         },
         "building/stable": {
@@ -2552,12 +2861,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "stable"
             },
+            "matchScore": 0.5,
             "name": "Stable"
         },
         "building/static_caravan": {
@@ -2567,12 +2876,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "static_caravan"
             },
+            "matchScore": 0.5,
             "name": "Static Mobile Home"
         },
         "building/terrace": {
@@ -2582,12 +2891,20 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "terrace"
             },
+            "terms": [
+                "home",
+                "terrace",
+                "brownstone",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "matchScore": 0.5,
             "name": "Row Houses"
         },
         "building/train_station": {
@@ -2604,6 +2921,7 @@ iD.data.presets = {
             "tags": {
                 "building": "train_station"
             },
+            "matchScore": 0.5,
             "name": "Train Station",
             "searchable": false
         },
@@ -2614,7 +2932,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2623,21 +2940,22 @@ iD.data.presets = {
             "tags": {
                 "building": "university"
             },
+            "matchScore": 0.5,
             "name": "University Building"
         },
         "building/warehouse": {
-            "icon": "building",
+            "icon": "warehouse",
             "fields": [
                 "address",
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "warehouse"
             },
+            "matchScore": 0.5,
             "name": "Warehouse"
         },
         "craft": {
@@ -3595,9 +3913,10 @@ iD.data.presets = {
                 "footway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "footway/crosswalk": {
+            "icon": "highway-footway",
             "fields": [
                 "crossing",
                 "access",
@@ -3616,9 +3935,10 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "footway/sidewalk": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
@@ -3761,6 +4081,7 @@ iD.data.presets = {
             "tags": {
                 "highway": "*"
             },
+            "searchable": false,
             "name": "Highway"
         },
         "highway/bridleway": {
@@ -3803,6 +4124,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",
@@ -3816,7 +4160,7 @@ iD.data.presets = {
                 "highway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "highway/crosswalk": {
             "fields": [
@@ -3834,7 +4178,7 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "highway/cycleway": {
             "icon": "highway-cycleway",
@@ -3889,7 +4233,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4005,6 +4350,7 @@ iD.data.presets = {
             "name": "Path"
         },
         "highway/pedestrian": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
@@ -4021,7 +4367,7 @@ iD.data.presets = {
                 "highway": "pedestrian"
             },
             "terms": [],
-            "name": "Pedestrian"
+            "name": "Pedestrian Street"
         },
         "highway/primary": {
             "icon": "highway-primary",
@@ -4032,7 +4378,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4051,7 +4398,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4098,7 +4446,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4150,7 +4499,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4169,7 +4519,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4192,7 +4543,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4305,7 +4657,7 @@ iD.data.presets = {
                 "lit",
                 "width",
                 "incline_steps",
-                "access"
+                "handrail"
             ],
             "icon": "highway-steps",
             "geometry": [
@@ -4362,7 +4714,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4381,7 +4734,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4429,6 +4783,9 @@ iD.data.presets = {
             "tags": {
                 "highway": "traffic_signals"
             },
+            "fields": [
+                "traffic_signals"
+            ],
             "terms": [
                 "light",
                 "stoplight",
@@ -4499,7 +4856,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4632,7 +4990,7 @@ iD.data.presets = {
             "tags": {
                 "landuse": "*"
             },
-            "name": "Landuse"
+            "name": "Land Use"
         },
         "landuse/allotments": {
             "geometry": [
@@ -4641,8 +4999,11 @@ iD.data.presets = {
             "tags": {
                 "landuse": "allotments"
             },
-            "terms": [],
-            "name": "Allotments"
+            "terms": [
+                "allotment",
+                "garden"
+            ],
+            "name": "Community Garden"
         },
         "landuse/basin": {
             "geometry": [
@@ -4846,6 +5207,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"
@@ -4901,6 +5279,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",
@@ -4997,6 +5414,15 @@ iD.data.presets = {
         },
         "leisure/marina": {
             "icon": "harbor",
+            "fields": [
+                "operator",
+                "address",
+                "capacity",
+                "fee",
+                "sanitary_dump_station",
+                "power_supply",
+                "internet_access"
+            ],
             "geometry": [
                 "point",
                 "vertex",
@@ -5140,6 +5566,40 @@ iD.data.presets = {
             "terms": [],
             "name": "Basketball Court"
         },
+        "leisure/pitch/rugby_league": {
+            "icon": "america-football",
+            "fields": [
+                "surface",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "leisure": "pitch",
+                "sport": "rugby_league"
+            },
+            "terms": [],
+            "name": "Rugby League Field"
+        },
+        "leisure/pitch/rugby_union": {
+            "icon": "america-football",
+            "fields": [
+                "surface",
+                "lit"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "leisure": "pitch",
+                "sport": "rugby_union"
+            },
+            "terms": [],
+            "name": "Rugby Union Field"
+        },
         "leisure/pitch/skateboard": {
             "icon": "pitch",
             "fields": [
@@ -5349,6 +5809,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",
@@ -5390,6 +5869,9 @@ iD.data.presets = {
         },
         "man_made/lighthouse": {
             "icon": "lighthouse",
+            "fields": [
+                "building_area"
+            ],
             "geometry": [
                 "point",
                 "area"
@@ -5450,7 +5932,7 @@ iD.data.presets = {
                 "pumpjack"
             ],
             "tags": {
-                "man_made": "mast"
+                "man_made": "petroleum_well"
             },
             "name": "Oil Well"
         },
@@ -5465,7 +5947,7 @@ iD.data.presets = {
             "name": "Pier"
         },
         "man_made/pipeline": {
-            "icon": "pipeline",
+            "icon": "pipeline-line",
             "fields": [
                 "location",
                 "operator"
@@ -5478,6 +5960,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": [
@@ -5604,6 +6125,54 @@ iD.data.presets = {
             },
             "name": "Bunker"
         },
+        "military/checkpoint": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "checkpoint"
+            },
+            "name": "Checkpoint"
+        },
+        "military/danger_area": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "danger_area"
+            },
+            "name": "Danger Area"
+        },
+        "military/naval_base": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "naval_base"
+            },
+            "name": "Naval Base"
+        },
+        "military/obstacle_course": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "obstacle_course"
+            },
+            "name": "Obstacle Course"
+        },
         "military/range": {
             "geometry": [
                 "point",
@@ -5616,6 +6185,18 @@ iD.data.presets = {
             },
             "name": "Military Range"
         },
+        "military/training_area": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "training_area"
+            },
+            "name": "Training area"
+        },
         "natural": {
             "fields": [
                 "natural"
@@ -5664,7 +6245,13 @@ iD.data.presets = {
                 "fee",
                 "access_simple"
             ],
-            "terms": [],
+            "terms": [
+                "cavern",
+                "hollow",
+                "grotto",
+                "shelter",
+                "cavity"
+            ],
             "tags": {
                 "natural": "cave_entrance"
             },
@@ -5765,6 +6352,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"
@@ -5784,7 +6390,10 @@ iD.data.presets = {
             "tags": {
                 "natural": "scrub"
             },
-            "terms": [],
+            "terms": [
+                "bush",
+                "shrubs"
+            ],
             "name": "Scrub"
         },
         "natural/spring": {
@@ -5800,8 +6409,8 @@ iD.data.presets = {
         },
         "natural/tree": {
             "fields": [
-                "leaf_type",
-                "leaf_cycle",
+                "leaf_type_singular",
+                "leaf_cycle_singular",
                 "denotation"
             ],
             "icon": "park",
@@ -5815,6 +6424,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"
@@ -6331,6 +6974,7 @@ iD.data.presets = {
             "tags": {
                 "place": "*"
             },
+            "searchable": false,
             "name": "Place"
         },
         "place/city": {
@@ -6500,6 +7144,7 @@ iD.data.presets = {
             "fields": [
                 "power"
             ],
+            "searchable": false,
             "name": "Power"
         },
         "power/generator": {
@@ -6645,6 +7290,7 @@ iD.data.presets = {
             "tags": {
                 "railway": "*"
             },
+            "searchable": false,
             "name": "Railway"
         },
         "railway/abandoned": {
@@ -6728,12 +7374,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",
@@ -6892,7 +7538,7 @@ iD.data.presets = {
             "searchable": false
         },
         "route/ferry": {
-            "icon": "ferry",
+            "icon": "ferry-line",
             "geometry": [
                 "line"
             ],
@@ -8991,29 +9637,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"
             },
@@ -9643,6 +10303,7 @@ iD.data.presets = {
             "tags": {
                 "waterway": "*"
             },
+            "searchable": false,
             "name": "Waterway"
         },
         "waterway/canal": {
@@ -9697,6 +10358,28 @@ iD.data.presets = {
             },
             "name": "Drain"
         },
+        "waterway/fuel": {
+            "icon": "fuel",
+            "fields": [
+                "operator",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "petrol",
+                "gas",
+                "diesel",
+                "boat"
+            ],
+            "tags": {
+                "waterway": "fuel"
+            },
+            "name": "Marine Fuel Station"
+        },
         "waterway/river": {
             "icon": "waterway-river",
             "fields": [
@@ -9736,6 +10419,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": [
@@ -9802,7 +10514,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9821,7 +10532,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9840,7 +10550,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9859,7 +10568,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9878,7 +10586,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9897,7 +10604,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9916,7 +10622,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9935,7 +10640,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9954,7 +10658,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9973,7 +10676,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9992,7 +10694,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10011,7 +10712,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10030,7 +10730,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10049,7 +10748,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10068,7 +10766,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10087,7 +10784,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10106,7 +10802,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10125,7 +10820,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10144,7 +10838,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10163,7 +10856,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10182,7 +10874,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10201,7 +10892,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10220,7 +10910,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10239,7 +10928,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10258,7 +10946,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10277,7 +10964,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10296,7 +10982,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10315,7 +11000,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10334,7 +11018,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10353,7 +11036,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10372,7 +11054,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10391,7 +11072,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10410,7 +11090,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10429,7 +11108,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10448,7 +11126,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10467,7 +11144,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10486,7 +11162,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10505,7 +11180,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10524,7 +11198,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10543,7 +11216,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10562,7 +11234,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10581,7 +11252,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10600,7 +11270,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10619,7 +11288,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10638,7 +11306,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10657,7 +11324,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10676,7 +11342,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10695,7 +11360,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10714,7 +11378,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10733,7 +11396,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10752,7 +11414,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10771,7 +11432,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10790,7 +11450,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10809,7 +11468,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10828,7 +11486,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10847,7 +11504,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10866,7 +11522,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10885,7 +11540,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10904,7 +11558,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10923,7 +11576,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10942,7 +11594,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10961,7 +11612,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10980,7 +11630,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10999,7 +11648,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11018,7 +11666,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11037,7 +11684,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11056,7 +11702,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11075,7 +11720,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11094,7 +11738,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11113,7 +11756,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11132,7 +11774,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11151,7 +11792,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11170,7 +11810,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11189,7 +11828,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11208,7 +11846,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11227,7 +11864,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11246,7 +11882,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11265,7 +11900,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11284,7 +11918,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11303,7 +11936,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11322,7 +11954,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11341,7 +11972,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11360,7 +11990,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11379,7 +12008,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11398,7 +12026,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11417,7 +12044,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11436,7 +12062,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11455,7 +12080,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11474,7 +12098,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11493,7 +12116,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11512,7 +12134,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11531,7 +12152,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11550,7 +12170,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11569,7 +12188,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11588,7 +12206,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11607,7 +12224,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11626,7 +12242,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11645,7 +12260,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11664,7 +12278,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11683,7 +12296,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11702,7 +12314,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11721,7 +12332,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11740,7 +12350,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11759,7 +12368,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11778,7 +12386,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11797,7 +12404,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11816,7 +12422,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11835,7 +12440,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11854,7 +12458,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11873,7 +12476,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11892,7 +12494,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11911,7 +12512,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11930,7 +12530,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11949,7 +12548,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11968,7 +12566,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11987,7 +12584,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12006,7 +12602,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12025,7 +12620,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12044,7 +12638,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12063,7 +12656,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12082,7 +12674,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12101,7 +12692,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12120,7 +12710,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12139,7 +12728,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12158,7 +12746,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12177,7 +12764,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12196,7 +12782,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12215,7 +12800,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12234,7 +12818,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12253,7 +12836,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12272,26 +12854,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
-                "opening_hours"
-            ],
-            "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
@@ -12310,7 +12872,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12329,7 +12890,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12348,7 +12908,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12367,7 +12926,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12386,7 +12944,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12405,7 +12962,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12424,7 +12980,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12443,7 +12998,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12463,7 +13017,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12482,7 +13035,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12501,7 +13053,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12520,7 +13071,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12539,7 +13089,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12558,7 +13107,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12577,7 +13125,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12596,7 +13143,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12615,7 +13161,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12634,7 +13179,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12653,7 +13197,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12672,7 +13215,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12691,7 +13233,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12710,7 +13251,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12729,7 +13269,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12748,7 +13287,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12767,7 +13305,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12786,7 +13323,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12805,7 +13341,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12824,7 +13359,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12843,7 +13377,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12862,7 +13395,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12881,7 +13413,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12900,7 +13431,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12919,7 +13449,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12938,7 +13467,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12957,7 +13485,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12976,7 +13503,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12995,7 +13521,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13014,7 +13539,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -14753,6 +15277,7 @@ iD.data.presets = {
         "amenity/fast_food/Taco Bell": {
             "tags": {
                 "name": "Taco Bell",
+                "cuisine": "mexican",
                 "amenity": "fast_food"
             },
             "name": "Taco Bell",
@@ -14871,30 +15396,6 @@ iD.data.presets = {
             ],
             "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
-        },
         "amenity/fast_food/Макдоналдс": {
             "tags": {
                 "name": "Макдоналдс",
@@ -14944,30 +15445,6 @@ iD.data.presets = {
             ],
             "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
-        },
         "amenity/fast_food/Chipotle": {
             "tags": {
                 "name": "Chipotle",
@@ -15386,6 +15863,7 @@ iD.data.presets = {
         "amenity/fast_food/Panda Express": {
             "tags": {
                 "name": "Panda Express",
+                "cuisine": "chinese",
                 "amenity": "fast_food"
             },
             "name": "Panda Express",
@@ -15749,6 +16227,7 @@ iD.data.presets = {
         "amenity/restaurant/Pizza Hut": {
             "tags": {
                 "name": "Pizza Hut",
+                "cuisine": "pizza",
                 "amenity": "restaurant"
             },
             "name": "Pizza Hut",
@@ -22549,12 +23028,12 @@ iD.data.presets = {
             ],
             "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",
@@ -25661,27 +26140,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",
@@ -26220,12 +26678,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",
@@ -26581,25 +27039,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",
@@ -26695,25 +27134,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",
@@ -26866,25 +27286,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",
@@ -27341,25 +27742,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",
@@ -28842,12 +29224,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",
@@ -29355,25 +29737,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",
@@ -29469,25 +29832,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",
@@ -31602,25 +31946,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",
@@ -31926,6 +32251,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 часа",
@@ -32135,25 +32479,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": "Фортуна",
@@ -33009,25 +33334,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",
@@ -33275,25 +33581,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": "Автосервис",
@@ -37011,25 +37298,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",
@@ -37163,25 +37431,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": "Пекарня",
@@ -38797,25 +39046,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",
@@ -38946,6 +39176,7 @@ iD.data.presets = {
         ],
         "vertex": [
             "highway/crosswalk",
+            "highway/crossing",
             "railway/level_crossing",
             "highway/traffic_signals",
             "highway/turning_circle",
@@ -39011,6 +39242,7 @@ iD.data.presets = {
             "name": "Path",
             "icon": "category-path",
             "members": [
+                "highway/pedestrian",
                 "highway/footway",
                 "highway/cycleway",
                 "highway/bridleway",
@@ -39125,11 +39357,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",
@@ -39159,6 +39391,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"
                     }
                 }
             }
@@ -39166,7 +39402,7 @@ iD.data.presets = {
         "access_simple": {
             "key": "access",
             "type": "combo",
-            "label": "Access",
+            "label": "Allowed Access",
             "placeholder": "yes",
             "options": [
                 "permissive",
@@ -39191,9 +39427,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"
@@ -39205,6 +39450,7 @@ iD.data.presets = {
                 "placeholders": {
                     "housename": "Housename",
                     "housenumber": "123",
+                    "conscriptionnumber": "123",
                     "street": "Street",
                     "city": "City",
                     "postcode": "Postcode",
@@ -39291,6 +39537,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
+        "area/highway": {
+            "key": "area:highway",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "artist": {
             "key": "artist_name",
             "type": "text",
@@ -39400,6 +39651,11 @@ iD.data.presets = {
             "type": "combo",
             "label": "Type"
         },
+        "content": {
+            "key": "content",
+            "type": "combo",
+            "label": "Contents"
+        },
         "country": {
             "key": "country",
             "type": "combo",
@@ -39430,6 +39686,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",
@@ -39619,6 +39923,11 @@ iD.data.presets = {
             "label": "Handicap",
             "placeholder": "1-18"
         },
+        "handrail": {
+            "key": "handrail",
+            "type": "check",
+            "label": "Handrail"
+        },
         "highway": {
             "key": "highway",
             "type": "typeCombo",
@@ -39715,6 +40024,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",
@@ -39728,6 +40050,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",
@@ -39738,6 +40072,12 @@ iD.data.presets = {
             "type": "number",
             "label": "Length (Meters)"
         },
+        "level": {
+            "key": "level",
+            "type": "combo",
+            "label": "Level",
+            "universal": true
+        },
         "levels": {
             "key": "building:levels",
             "type": "number",
@@ -39765,6 +40105,25 @@ iD.data.presets = {
             "label": "Speed Limit",
             "placeholder": "40, 50, 60..."
         },
+        "maxstay": {
+            "key": "maxstay",
+            "type": "combo",
+            "label": "Max Stay",
+            "options": [
+                "15 min",
+                "30 min",
+                "45 min",
+                "1 hr",
+                "1.5 hr",
+                "2 hr",
+                "2.5 hr",
+                "3 hr",
+                "4 hr",
+                "1 day",
+                "2 day"
+            ],
+            "snake_case": false
+        },
         "mtb/scale": {
             "key": "mtb:scale",
             "type": "combo",
@@ -39975,6 +40334,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
+        "power_supply": {
+            "key": "power_supply",
+            "type": "check",
+            "label": "Power Supply"
+        },
         "railway": {
             "key": "railway",
             "type": "typeCombo",
@@ -39995,11 +40359,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",
@@ -40055,6 +40440,11 @@ iD.data.presets = {
                 }
             }
         },
+        "sanitary_dump_station": {
+            "key": "sanitary_dump_station",
+            "type": "check",
+            "label": "Toilet Disposal"
+        },
         "seasonal": {
             "key": "seasonal",
             "type": "check",
@@ -40324,6 +40714,12 @@ iD.data.presets = {
                 }
             }
         },
+        "traffic_signals": {
+            "key": "traffic_signals",
+            "type": "combo",
+            "label": "Type",
+            "default": "signal"
+        },
         "trail_visibility": {
             "key": "trail_visibility",
             "type": "combo",
@@ -40360,6 +40756,11 @@ iD.data.presets = {
             "type": "combo",
             "label": "Type"
         },
+        "water_point": {
+            "key": "water_point",
+            "type": "check",
+            "label": "Water Point"
+        },
         "waterway": {
             "key": "waterway",
             "type": "typeCombo",