]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/presets.js
Update to iD v1.8.5
[rails.git] / vendor / assets / iD / presets.js
index 507c415ff2947f2becbd7fcbe418ea7f543f7c5d..df4344c3ffec6dd3efbbe5fcf0f91d149e99488d 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": {
@@ -455,6 +457,9 @@ iD.data.presets = {
                 "vertex",
                 "line"
             ],
+            "terms": [
+                "seat"
+            ],
             "tags": {
                 "amenity": "bench"
             },
@@ -518,12 +523,15 @@ iD.data.presets = {
                 "area"
             ],
             "terms": [
-                "bike"
+                "bike",
+                "repair",
+                "chain",
+                "pump"
             ],
             "tags": {
                 "amenity": "bicycle_repair_station"
             },
-            "name": "Bicycle Repair Station"
+            "name": "Bicycle Repair Tool Stand"
         },
         "amenity/biergarten": {
             "icon": "beer",
@@ -608,6 +616,7 @@ iD.data.presets = {
                 "area"
             ],
             "terms": [
+                "bistro",
                 "coffee",
                 "tea"
             ],
@@ -661,6 +670,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": [
@@ -824,7 +857,7 @@ iD.data.presets = {
             "name": "Courthouse"
         },
         "amenity/dentist": {
-            "icon": "hospital",
+            "icon": "dentist",
             "fields": [
                 "address",
                 "building_area",
@@ -843,7 +876,7 @@ iD.data.presets = {
             },
             "name": "Dentist"
         },
-        "amenity/doctor": {
+        "amenity/doctors": {
             "icon": "hospital",
             "fields": [
                 "address",
@@ -938,6 +971,25 @@ iD.data.presets = {
             ],
             "name": "Fast Food"
         },
+        "amenity/ferry_terminal": {
+            "icon": "ferry",
+            "fields": [
+                "network",
+                "operator",
+                "address",
+                "building_area"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "ferry_terminal"
+            },
+            "name": "Ferry Terminal"
+        },
         "amenity/fire_station": {
             "icon": "fire-station",
             "fields": [
@@ -970,7 +1022,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "geometry": [
@@ -980,6 +1031,7 @@ iD.data.presets = {
             "terms": [
                 "petrol",
                 "fuel",
+                "gasoline",
                 "propane",
                 "diesel",
                 "lng",
@@ -1054,6 +1106,18 @@ iD.data.presets = {
             },
             "name": "Hospital Grounds"
         },
+        "amenity/hunting_stand": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "hunting_stand"
+            },
+            "name": "Hunting Stand"
+        },
         "amenity/kindergarten": {
             "icon": "school",
             "fields": [
@@ -1109,6 +1173,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": [
@@ -1143,6 +1225,8 @@ iD.data.presets = {
                 "access_simple",
                 "supervised",
                 "park_ride",
+                "surface",
+                "maxstay",
                 "address"
             ],
             "geometry": [
@@ -1170,6 +1254,21 @@ iD.data.presets = {
             },
             "name": "Parking Garage Entrance/Exit"
         },
+        "amenity/parking_space": {
+            "fields": [
+                "capacity"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "parking_space"
+            },
+            "name": "Parking Space"
+        },
         "amenity/pharmacy": {
             "icon": "pharmacy",
             "fields": [
@@ -1479,13 +1578,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": [
@@ -1811,7 +1913,8 @@ iD.data.presets = {
                 "building_area",
                 "access_toilets",
                 "gender",
-                "fee"
+                "fee",
+                "diaper"
             ],
             "geometry": [
                 "point",
@@ -1876,19 +1979,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"
             },
@@ -1927,6 +2190,7 @@ iD.data.presets = {
                 "amenity": "waste_basket"
             },
             "terms": [
+                "bin",
                 "rubbish",
                 "litter",
                 "trash",
@@ -1934,6 +2198,34 @@ iD.data.presets = {
             ],
             "name": "Waste Basket"
         },
+        "amenity/waste_disposal": {
+            "icon": "waste-basket",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "amenity": "waste_disposal"
+            },
+            "terms": [
+                "rubbish",
+                "litter",
+                "trash"
+            ],
+            "name": "Garbage Dumpster"
+        },
+        "amenity/water_point": {
+            "icon": "water",
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "amenity": "water_point"
+            },
+            "name": "RV Drinking Water"
+        },
         "area": {
             "name": "Area",
             "tags": {
@@ -1944,6 +2236,18 @@ iD.data.presets = {
             ],
             "matchScore": 0.1
         },
+        "area/highway": {
+            "fields": [
+                "area/highway"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "area:highway": "*"
+            },
+            "name": "Road Surface"
+        },
         "barrier": {
             "geometry": [
                 "point",
@@ -2161,11 +2465,13 @@ iD.data.presets = {
                 "address"
             ],
             "geometry": [
+                "point",
                 "area"
             ],
             "tags": {
                 "building": "*"
             },
+            "matchScore": 0.4,
             "terms": [],
             "name": "Building"
         },
@@ -2176,12 +2482,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "apartments"
             },
+            "matchScore": 0.5,
             "name": "Apartments"
         },
         "building/barn": {
@@ -2191,12 +2497,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "barn"
             },
+            "matchScore": 0.5,
             "name": "Barn"
         },
         "building/bunker": {
@@ -2205,12 +2511,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "bunker"
             },
+            "matchScore": 0.5,
             "name": "Bunker",
             "searchable": false
         },
@@ -2221,12 +2527,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "cabin"
             },
+            "matchScore": 0.5,
             "name": "Cabin"
         },
         "building/cathedral": {
@@ -2236,13 +2542,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",
@@ -2251,13 +2557,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",
@@ -2266,13 +2572,13 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "church"
             },
-            "name": "Church"
+            "matchScore": 0.5,
+            "name": "Church Building"
         },
         "building/college": {
             "icon": "building",
@@ -2281,7 +2587,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2290,6 +2595,7 @@ iD.data.presets = {
             "tags": {
                 "building": "college"
             },
+            "matchScore": 0.5,
             "name": "College Building"
         },
         "building/commercial": {
@@ -2300,12 +2606,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "commercial"
             },
+            "matchScore": 0.5,
             "name": "Commercial Building"
         },
         "building/construction": {
@@ -2315,12 +2621,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "construction"
             },
+            "matchScore": 0.5,
             "name": "Building Under Construction"
         },
         "building/detached": {
@@ -2330,13 +2636,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",
@@ -2346,12 +2659,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "dormitory"
             },
+            "matchScore": 0.5,
             "name": "Dormitory"
         },
         "building/entrance": {
@@ -2366,18 +2679,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",
@@ -2385,12 +2698,12 @@ iD.data.presets = {
                 "capacity"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "garages"
             },
+            "matchScore": 0.5,
             "name": "Garages"
         },
         "building/greenhouse": {
@@ -2400,12 +2713,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "greenhouse"
             },
+            "matchScore": 0.5,
             "name": "Greenhouse"
         },
         "building/hospital": {
@@ -2415,12 +2728,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hospital"
             },
+            "matchScore": 0.5,
             "name": "Hospital Building"
         },
         "building/hotel": {
@@ -2431,12 +2744,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hotel"
             },
+            "matchScore": 0.5,
             "name": "Hotel Building"
         },
         "building/house": {
@@ -2446,22 +2759,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": {
@@ -2471,12 +2790,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "industrial"
             },
+            "matchScore": 0.5,
             "name": "Industrial Building"
         },
         "building/kindergarten": {
@@ -2486,7 +2805,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2496,6 +2814,7 @@ iD.data.presets = {
             "tags": {
                 "building": "kindergarten"
             },
+            "matchScore": 0.5,
             "name": "Preschool/Kindergarten Building"
         },
         "building/public": {
@@ -2506,12 +2825,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "public"
             },
+            "matchScore": 0.5,
             "name": "Public Building"
         },
         "building/residential": {
@@ -2521,12 +2840,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "residential"
             },
+            "matchScore": 0.5,
             "name": "Residential Building"
         },
         "building/retail": {
@@ -2537,12 +2856,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "retail"
             },
+            "matchScore": 0.5,
             "name": "Retail Building"
         },
         "building/roof": {
@@ -2551,12 +2870,12 @@ iD.data.presets = {
                 "address"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "roof"
             },
+            "matchScore": 0.5,
             "name": "Roof"
         },
         "building/school": {
@@ -2566,7 +2885,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2578,8 +2896,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": [
@@ -2587,12 +2930,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "shed"
             },
+            "matchScore": 0.5,
             "name": "Shed"
         },
         "building/stable": {
@@ -2602,12 +2945,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "stable"
             },
+            "matchScore": 0.5,
             "name": "Stable"
         },
         "building/static_caravan": {
@@ -2617,12 +2960,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "static_caravan"
             },
+            "matchScore": 0.5,
             "name": "Static Mobile Home"
         },
         "building/terrace": {
@@ -2632,12 +2975,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": {
@@ -2654,6 +3005,7 @@ iD.data.presets = {
             "tags": {
                 "building": "train_station"
             },
+            "matchScore": 0.5,
             "name": "Train Station",
             "searchable": false
         },
@@ -2664,7 +3016,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2673,21 +3024,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": {
@@ -3645,9 +3997,10 @@ iD.data.presets = {
                 "footway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "footway/crosswalk": {
+            "icon": "highway-footway",
             "fields": [
                 "crossing",
                 "access",
@@ -3666,9 +4019,10 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "footway/sidewalk": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
@@ -3811,6 +4165,7 @@ iD.data.presets = {
             "tags": {
                 "highway": "*"
             },
+            "searchable": false,
             "name": "Highway"
         },
         "highway/bridleway": {
@@ -3853,6 +4208,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",
@@ -3866,7 +4244,7 @@ iD.data.presets = {
                 "highway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "highway/crosswalk": {
             "fields": [
@@ -3884,7 +4262,7 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "highway/cycleway": {
             "icon": "highway-cycleway",
@@ -3939,7 +4317,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4055,6 +4434,7 @@ iD.data.presets = {
             "name": "Path"
         },
         "highway/pedestrian": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
@@ -4071,7 +4451,7 @@ iD.data.presets = {
                 "highway": "pedestrian"
             },
             "terms": [],
-            "name": "Pedestrian"
+            "name": "Pedestrian Street"
         },
         "highway/primary": {
             "icon": "highway-primary",
@@ -4082,7 +4462,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4101,7 +4482,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4148,7 +4530,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4200,7 +4583,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4219,7 +4603,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4242,7 +4627,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4355,7 +4741,7 @@ iD.data.presets = {
                 "lit",
                 "width",
                 "incline_steps",
-                "access"
+                "handrail"
             ],
             "icon": "highway-steps",
             "geometry": [
@@ -4412,7 +4798,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4431,7 +4818,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4479,6 +4867,9 @@ iD.data.presets = {
             "tags": {
                 "highway": "traffic_signals"
             },
+            "fields": [
+                "traffic_signals"
+            ],
             "terms": [
                 "light",
                 "stoplight",
@@ -4549,7 +4940,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
@@ -4682,7 +5074,7 @@ iD.data.presets = {
             "tags": {
                 "landuse": "*"
             },
-            "name": "Landuse"
+            "name": "Land Use"
         },
         "landuse/allotments": {
             "geometry": [
@@ -4691,8 +5083,11 @@ iD.data.presets = {
             "tags": {
                 "landuse": "allotments"
             },
-            "terms": [],
-            "name": "Allotments"
+            "terms": [
+                "allotment",
+                "garden"
+            ],
+            "name": "Community Garden"
         },
         "landuse/basin": {
             "geometry": [
@@ -4896,6 +5291,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"
@@ -4951,6 +5363,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",
@@ -5199,6 +5650,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": [
@@ -5408,6 +5893,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",
@@ -5418,6 +5922,16 @@ iD.data.presets = {
             },
             "name": "Breakwater"
         },
+        "man_made/chimney": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "man_made": "chimney"
+            },
+            "name": "Chimney"
+        },
         "man_made/cutline": {
             "geometry": [
                 "line"
@@ -5447,6 +5961,29 @@ iD.data.presets = {
             "name": "Flagpole",
             "icon": "embassy"
         },
+        "man_made/gasometer": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "gas holder"
+            ],
+            "tags": {
+                "man_made": "gasometer"
+            },
+            "name": "Gasometer"
+        },
+        "man_made/groyne": {
+            "geometry": [
+                "line",
+                "area"
+            ],
+            "tags": {
+                "man_made": "groyne"
+            },
+            "name": "Groyne"
+        },
         "man_made/lighthouse": {
             "icon": "lighthouse",
             "fields": [
@@ -5527,7 +6064,7 @@ iD.data.presets = {
             "name": "Pier"
         },
         "man_made/pipeline": {
-            "icon": "pipeline",
+            "icon": "pipeline-line",
             "fields": [
                 "location",
                 "operator"
@@ -5579,6 +6116,16 @@ iD.data.presets = {
             },
             "name": "Storage Tank"
         },
+        "man_made/surveillance": {
+            "icon": "camera",
+            "geometry": [
+                "point"
+            ],
+            "tags": {
+                "man_made": "surveillance"
+            },
+            "name": "Surveillance"
+        },
         "man_made/survey_point": {
             "icon": "monument",
             "fields": [
@@ -5668,6 +6215,24 @@ iD.data.presets = {
             },
             "name": "Water Works"
         },
+        "man_made/works": {
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "car assembly plant",
+                "aluminium processing plant",
+                "brewery",
+                "furniture manufacture factory",
+                "oil refinery",
+                "platic recycling"
+            ],
+            "tags": {
+                "man_made": "works"
+            },
+            "name": "Works"
+        },
         "military/airfield": {
             "icon": "airfield",
             "geometry": [
@@ -5705,6 +6270,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",
@@ -5717,6 +6330,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"
@@ -5765,7 +6390,13 @@ iD.data.presets = {
                 "fee",
                 "access_simple"
             ],
-            "terms": [],
+            "terms": [
+                "cavern",
+                "hollow",
+                "grotto",
+                "shelter",
+                "cavity"
+            ],
             "tags": {
                 "natural": "cave_entrance"
             },
@@ -5866,6 +6497,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"
@@ -5885,7 +6535,10 @@ iD.data.presets = {
             "tags": {
                 "natural": "scrub"
             },
-            "terms": [],
+            "terms": [
+                "bush",
+                "shrubs"
+            ],
             "name": "Scrub"
         },
         "natural/spring": {
@@ -5901,8 +6554,8 @@ iD.data.presets = {
         },
         "natural/tree": {
             "fields": [
-                "leaf_type",
-                "leaf_cycle",
+                "leaf_type_singular",
+                "leaf_cycle_singular",
                 "denotation"
             ],
             "icon": "park",
@@ -5916,6 +6569,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"
@@ -6432,6 +7119,7 @@ iD.data.presets = {
             "tags": {
                 "place": "*"
             },
+            "searchable": false,
             "name": "Place"
         },
         "place/city": {
@@ -6601,6 +7289,7 @@ iD.data.presets = {
             "fields": [
                 "power"
             ],
+            "searchable": false,
             "name": "Power"
         },
         "power/generator": {
@@ -6746,6 +7435,7 @@ iD.data.presets = {
             "tags": {
                 "railway": "*"
             },
+            "searchable": false,
             "name": "Railway"
         },
         "railway/abandoned": {
@@ -6829,12 +7519,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",
@@ -6993,7 +7683,7 @@ iD.data.presets = {
             "searchable": false
         },
         "route/ferry": {
-            "icon": "ferry",
+            "icon": "ferry-line",
             "geometry": [
                 "line"
             ],
@@ -7237,6 +7927,10 @@ iD.data.presets = {
                 "point",
                 "area"
             ],
+            "terms": [
+                "bike",
+                "repair"
+            ],
             "tags": {
                 "shop": "bicycle"
             },
@@ -9758,8 +10452,24 @@ iD.data.presets = {
             "tags": {
                 "waterway": "*"
             },
+            "searchable": false,
             "name": "Waterway"
         },
+        "waterway/boatyard": {
+            "icon": "harbor",
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "waterway": "boatyard"
+            },
+            "name": "Boatyard"
+        },
         "waterway/canal": {
             "icon": "waterway-canal",
             "fields": [
@@ -9799,6 +10509,22 @@ iD.data.presets = {
             },
             "name": "Ditch"
         },
+        "waterway/dock": {
+            "icon": "harbor",
+            "fields": [
+                "dock",
+                "operator"
+            ],
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "waterway": "dock"
+            },
+            "name": "Dock"
+        },
         "waterway/drain": {
             "icon": "waterway-stream",
             "fields": [
@@ -9817,7 +10543,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "geometry": [
@@ -9944,6 +10669,18 @@ iD.data.presets = {
             },
             "name": "Stream"
         },
+        "waterway/water_point": {
+            "icon": "water",
+            "geometry": [
+                "area",
+                "vertex",
+                "point"
+            ],
+            "tags": {
+                "waterway": "water_point"
+            },
+            "name": "Marine Drinking Water"
+        },
         "waterway/weir": {
             "icon": "dam",
             "geometry": [
@@ -9969,7 +10706,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -9988,7 +10724,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10007,7 +10742,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10026,7 +10760,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10045,7 +10778,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10064,7 +10796,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10083,7 +10814,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10102,7 +10832,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10121,7 +10850,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10140,7 +10868,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10159,7 +10886,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10178,7 +10904,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10197,7 +10922,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10216,7 +10940,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10235,7 +10958,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10254,7 +10976,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10273,7 +10994,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10292,7 +11012,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10311,7 +11030,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10330,7 +11048,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10349,7 +11066,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10368,7 +11084,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10387,7 +11102,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10406,7 +11120,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10425,7 +11138,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10444,7 +11156,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10463,7 +11174,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10482,7 +11192,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10501,7 +11210,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10520,7 +11228,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10539,7 +11246,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10558,7 +11264,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10577,7 +11282,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10596,7 +11300,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10615,7 +11318,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10634,7 +11336,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10653,7 +11354,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10672,7 +11372,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10691,7 +11390,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10710,7 +11408,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10729,7 +11426,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10748,7 +11444,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10767,7 +11462,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10786,7 +11480,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10805,7 +11498,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10824,7 +11516,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10843,7 +11534,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10862,7 +11552,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10881,7 +11570,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10900,7 +11588,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10919,7 +11606,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10938,7 +11624,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10957,7 +11642,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10976,7 +11660,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10995,7 +11678,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11014,7 +11696,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11033,7 +11714,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11052,7 +11732,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11071,7 +11750,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11090,7 +11768,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11109,7 +11786,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11128,7 +11804,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11147,7 +11822,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11166,7 +11840,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11185,7 +11858,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11204,7 +11876,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11223,7 +11894,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11242,7 +11912,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11261,7 +11930,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11280,7 +11948,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11299,7 +11966,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11318,7 +11984,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11337,7 +12002,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11356,7 +12020,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11375,7 +12038,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11394,7 +12056,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11413,7 +12074,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11432,7 +12092,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11451,7 +12110,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11470,7 +12128,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11489,7 +12146,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11508,7 +12164,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11527,7 +12182,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11546,7 +12200,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11565,7 +12218,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11584,7 +12236,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11603,7 +12254,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11622,7 +12272,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11641,7 +12290,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11660,7 +12308,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11679,7 +12326,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11698,7 +12344,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11717,7 +12362,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11736,7 +12380,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11755,7 +12398,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11774,7 +12416,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11793,7 +12434,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11812,7 +12452,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11831,7 +12470,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11850,7 +12488,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11869,7 +12506,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11888,7 +12524,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11907,7 +12542,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11926,7 +12560,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11945,7 +12578,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11964,7 +12596,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11983,7 +12614,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12002,7 +12632,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12021,7 +12650,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12040,7 +12668,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12059,7 +12686,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12078,7 +12704,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12097,7 +12722,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12116,7 +12740,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12135,7 +12758,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12154,7 +12776,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12173,7 +12794,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12192,7 +12812,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12211,7 +12830,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12230,7 +12848,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12249,7 +12866,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12268,7 +12884,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12287,7 +12902,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12306,7 +12920,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12325,7 +12938,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12344,7 +12956,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12363,7 +12974,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12382,7 +12992,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12401,7 +13010,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12420,7 +13028,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12439,7 +13046,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12458,7 +13064,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12477,7 +13082,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12496,7 +13100,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12515,7 +13118,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12534,7 +13136,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12553,7 +13154,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12572,7 +13172,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12591,7 +13190,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12611,7 +13209,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12630,7 +13227,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12649,7 +13245,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12668,7 +13263,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12687,7 +13281,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12706,7 +13299,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12725,7 +13317,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12744,7 +13335,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12763,7 +13353,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12782,7 +13371,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12801,7 +13389,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12820,7 +13407,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12839,7 +13425,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12858,7 +13443,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12877,7 +13461,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12896,7 +13479,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12915,7 +13497,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12934,7 +13515,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12953,7 +13533,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12972,7 +13551,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12991,7 +13569,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13010,7 +13587,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13029,7 +13605,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13048,7 +13623,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13067,7 +13641,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13086,7 +13659,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13105,7 +13677,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13124,7 +13695,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13143,7 +13713,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13162,7 +13731,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -38800,6 +39368,7 @@ iD.data.presets = {
         ],
         "vertex": [
             "highway/crosswalk",
+            "highway/crossing",
             "railway/level_crossing",
             "highway/traffic_signals",
             "highway/turning_circle",
@@ -38865,6 +39434,7 @@ iD.data.presets = {
             "name": "Path",
             "icon": "category-path",
             "members": [
+                "highway/pedestrian",
                 "highway/footway",
                 "highway/cycleway",
                 "highway/bridleway",
@@ -38979,11 +39549,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",
@@ -39013,6 +39583,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"
                     }
                 }
             }
@@ -39020,7 +39594,7 @@ iD.data.presets = {
         "access_simple": {
             "key": "access",
             "type": "combo",
-            "label": "Access",
+            "label": "Allowed Access",
             "placeholder": "yes",
             "options": [
                 "permissive",
@@ -39045,9 +39619,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"
@@ -39059,6 +39642,7 @@ iD.data.presets = {
                 "placeholders": {
                     "housename": "Housename",
                     "housenumber": "123",
+                    "conscriptionnumber": "123",
                     "street": "Street",
                     "city": "City",
                     "postcode": "Postcode",
@@ -39145,6 +39729,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
+        "area/highway": {
+            "key": "area:highway",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "artist": {
             "key": "artist_name",
             "type": "text",
@@ -39289,6 +39878,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",
@@ -39309,6 +39946,26 @@ iD.data.presets = {
             "type": "textarea",
             "label": "Description"
         },
+        "diaper": {
+            "key": "diaper",
+            "type": "combo",
+            "label": "Diaper Changing Available",
+            "options": [
+                "yes",
+                "no",
+                "room",
+                "1",
+                "2",
+                "3",
+                "4",
+                "5"
+            ]
+        },
+        "dock": {
+            "key": "dock",
+            "type": "combo",
+            "label": "Type"
+        },
         "drive_through": {
             "key": "drive_through",
             "type": "check",
@@ -39478,6 +40135,11 @@ iD.data.presets = {
             "label": "Handicap",
             "placeholder": "1-18"
         },
+        "handrail": {
+            "key": "handrail",
+            "type": "check",
+            "label": "Handrail"
+        },
         "highway": {
             "key": "highway",
             "type": "typeCombo",
@@ -39574,6 +40236,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",
@@ -39587,6 +40262,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",
@@ -39597,6 +40284,12 @@ iD.data.presets = {
             "type": "number",
             "label": "Length (Meters)"
         },
+        "level": {
+            "key": "level",
+            "type": "combo",
+            "label": "Level",
+            "universal": true
+        },
         "levels": {
             "key": "building:levels",
             "type": "number",
@@ -39624,6 +40317,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",
@@ -39859,11 +40571,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",
@@ -40193,6 +40926,12 @@ iD.data.presets = {
                 }
             }
         },
+        "traffic_signals": {
+            "key": "traffic_signals",
+            "type": "combo",
+            "label": "Type",
+            "default": "signal"
+        },
         "trail_visibility": {
             "key": "trail_visibility",
             "type": "combo",