Update to iD v1.8.5

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

diff --git a/vendor/assets/iD/presets.js b/vendor/assets/iD/presets.js
index fbc24cccf27bfc66a77e45cfc7e00664cfe338b0..df4344c3ffec6dd3efbbe5fcf0f91d149e99488d 100644 (file)
--- a/vendor/assets/iD/presets.js
+++ b/vendor/assets/iD/presets.js
@@ -457,6 +457,9 @@ iD.data.presets = {
                 "vertex",
                 "line"
             ],
+            "terms": [
+                "seat"
+            ],
             "tags": {
                 "amenity": "bench"
             },
@@ -520,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",
@@ -610,6 +616,7 @@ iD.data.presets = {
                 "area"
             ],
             "terms": [
+                "bistro",
                 "coffee",
                 "tea"
             ],
@@ -850,7 +857,7 @@ iD.data.presets = {
             "name": "Courthouse"
         },
         "amenity/dentist": {
-            "icon": "hospital",
+            "icon": "dentist",
             "fields": [
                 "address",
                 "building_area",
@@ -869,7 +876,7 @@ iD.data.presets = {
             },
             "name": "Dentist"
         },
-        "amenity/doctor": {
+        "amenity/doctors": {
             "icon": "hospital",
             "fields": [
                 "address",
@@ -964,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": [
@@ -996,7 +1022,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "geometry": [
@@ -1006,6 +1031,7 @@ iD.data.presets = {
             "terms": [
                 "petrol",
                 "fuel",
+                "gasoline",
                 "propane",
                 "diesel",
                 "lng",
@@ -1080,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": [
@@ -1135,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": [
@@ -1169,6 +1225,8 @@ iD.data.presets = {
                 "access_simple",
                 "supervised",
                 "park_ride",
+                "surface",
+                "maxstay",
                 "address"
             ],
             "geometry": [
@@ -1196,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": [
@@ -1840,7 +1913,8 @@ iD.data.presets = {
                 "building_area",
                 "access_toilets",
                 "gender",
-                "fee"
+                "fee",
+                "diaper"
             ],
             "geometry": [
                 "point",
@@ -1905,19 +1979,179 @@ iD.data.presets = {
             },
             "name": "University Grounds"
         },
-        "amenity/vending_machine": {
+        "amenity/vending_machine/cigarettes": {
+            "fields": [
+                "operator"
+            ],
+            "geometry": [
+                "point"
+            ],
+            "terms": [
+                "cigarette"
+            ],
+            "tags": {
+                "amenity": "vending_machine",
+                "vending": "cigarettes"
+            },
+            "name": "Cigarette Vending Machine"
+        },
+        "amenity/vending_machine/condoms": {
             "fields": [
-                "vending",
                 "operator"
             ],
             "geometry": [
                 "point"
             ],
             "terms": [
-                "snack",
+                "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"
             },
@@ -1956,6 +2190,7 @@ iD.data.presets = {
                 "amenity": "waste_basket"
             },
             "terms": [
+                "bin",
                 "rubbish",
                 "litter",
                 "trash",
@@ -1963,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": {
@@ -2202,11 +2465,13 @@ iD.data.presets = {
                 "address"
             ],
             "geometry": [
+                "point",
                 "area"
             ],
             "tags": {
                 "building": "*"
             },
+            "matchScore": 0.4,
             "terms": [],
             "name": "Building"
         },
@@ -2217,12 +2482,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "apartments"
             },
+            "matchScore": 0.5,
             "name": "Apartments"
         },
         "building/barn": {
@@ -2232,12 +2497,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "barn"
             },
+            "matchScore": 0.5,
             "name": "Barn"
         },
         "building/bunker": {
@@ -2246,12 +2511,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "bunker"
             },
+            "matchScore": 0.5,
             "name": "Bunker",
             "searchable": false
         },
@@ -2262,12 +2527,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "cabin"
             },
+            "matchScore": 0.5,
             "name": "Cabin"
         },
         "building/cathedral": {
@@ -2277,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",
@@ -2292,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",
@@ -2307,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",
@@ -2322,7 +2587,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2331,6 +2595,7 @@ iD.data.presets = {
             "tags": {
                 "building": "college"
             },
+            "matchScore": 0.5,
             "name": "College Building"
         },
         "building/commercial": {
@@ -2341,12 +2606,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "commercial"
             },
+            "matchScore": 0.5,
             "name": "Commercial Building"
         },
         "building/construction": {
@@ -2356,12 +2621,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "construction"
             },
+            "matchScore": 0.5,
             "name": "Building Under Construction"
         },
         "building/detached": {
@@ -2371,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",
@@ -2387,12 +2659,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "dormitory"
             },
+            "matchScore": 0.5,
             "name": "Dormitory"
         },
         "building/entrance": {
@@ -2407,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",
@@ -2426,12 +2698,12 @@ iD.data.presets = {
                 "capacity"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "garages"
             },
+            "matchScore": 0.5,
             "name": "Garages"
         },
         "building/greenhouse": {
@@ -2441,12 +2713,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "greenhouse"
             },
+            "matchScore": 0.5,
             "name": "Greenhouse"
         },
         "building/hospital": {
@@ -2456,12 +2728,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hospital"
             },
+            "matchScore": 0.5,
             "name": "Hospital Building"
         },
         "building/hotel": {
@@ -2472,12 +2744,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "hotel"
             },
+            "matchScore": 0.5,
             "name": "Hotel Building"
         },
         "building/house": {
@@ -2487,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": {
@@ -2512,12 +2790,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "industrial"
             },
+            "matchScore": 0.5,
             "name": "Industrial Building"
         },
         "building/kindergarten": {
@@ -2527,7 +2805,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2537,6 +2814,7 @@ iD.data.presets = {
             "tags": {
                 "building": "kindergarten"
             },
+            "matchScore": 0.5,
             "name": "Preschool/Kindergarten Building"
         },
         "building/public": {
@@ -2547,12 +2825,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "public"
             },
+            "matchScore": 0.5,
             "name": "Public Building"
         },
         "building/residential": {
@@ -2562,12 +2840,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "residential"
             },
+            "matchScore": 0.5,
             "name": "Residential Building"
         },
         "building/retail": {
@@ -2578,12 +2856,12 @@ iD.data.presets = {
                 "smoking"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "retail"
             },
+            "matchScore": 0.5,
             "name": "Retail Building"
         },
         "building/roof": {
@@ -2592,12 +2870,12 @@ iD.data.presets = {
                 "address"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "roof"
             },
+            "matchScore": 0.5,
             "name": "Roof"
         },
         "building/school": {
@@ -2607,7 +2885,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2619,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": [
@@ -2628,12 +2930,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "shed"
             },
+            "matchScore": 0.5,
             "name": "Shed"
         },
         "building/stable": {
@@ -2643,12 +2945,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "stable"
             },
+            "matchScore": 0.5,
             "name": "Stable"
         },
         "building/static_caravan": {
@@ -2658,12 +2960,12 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "building": "static_caravan"
             },
+            "matchScore": 0.5,
             "name": "Static Mobile Home"
         },
         "building/terrace": {
@@ -2673,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": {
@@ -2695,6 +3005,7 @@ iD.data.presets = {
             "tags": {
                 "building": "train_station"
             },
+            "matchScore": 0.5,
             "name": "Train Station",
             "searchable": false
         },
@@ -2705,7 +3016,6 @@ iD.data.presets = {
                 "levels"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "terms": [
@@ -2714,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": {
@@ -3711,6 +4022,7 @@ iD.data.presets = {
             "name": "Pedestrian Crosswalk"
         },
         "footway/sidewalk": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
@@ -4429,7 +4741,7 @@ iD.data.presets = {
                 "lit",
                 "width",
                 "incline_steps",
-                "access"
+                "handrail"
             ],
             "icon": "highway-steps",
             "geometry": [
@@ -4555,6 +4867,9 @@ iD.data.presets = {
             "tags": {
                 "highway": "traffic_signals"
             },
+            "fields": [
+                "traffic_signals"
+            ],
             "terms": [
                 "light",
                 "stoplight",
@@ -4768,8 +5083,11 @@ iD.data.presets = {
             "tags": {
                 "landuse": "allotments"
             },
-            "terms": [],
-            "name": "Allotments"
+            "terms": [
+                "allotment",
+                "garden"
+            ],
+            "name": "Community Garden"
         },
         "landuse/basin": {
             "geometry": [
@@ -5332,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": [
@@ -5570,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"
@@ -5599,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": [
@@ -5679,7 +6064,7 @@ iD.data.presets = {
             "name": "Pier"
         },
         "man_made/pipeline": {
-            "icon": "pipeline",
+            "icon": "pipeline-line",
             "fields": [
                 "location",
                 "operator"
@@ -5731,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": [
@@ -5820,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": [
@@ -5857,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",
@@ -5869,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"
@@ -7210,7 +7683,7 @@ iD.data.presets = {
             "searchable": false
         },
         "route/ferry": {
-            "icon": "ferry",
+            "icon": "ferry-line",
             "geometry": [
                 "line"
             ],
@@ -7454,6 +7927,10 @@ iD.data.presets = {
                 "point",
                 "area"
             ],
+            "terms": [
+                "bike",
+                "repair"
+            ],
             "tags": {
                 "shop": "bicycle"
             },
@@ -9978,6 +10455,21 @@ iD.data.presets = {
             "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": [
@@ -10017,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": [
@@ -10035,7 +10543,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "geometry": [
@@ -10162,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": [
@@ -10187,7 +10706,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10206,7 +10724,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10225,7 +10742,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10244,7 +10760,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10263,7 +10778,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10282,7 +10796,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10301,7 +10814,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10320,7 +10832,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10339,7 +10850,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10358,7 +10868,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10377,7 +10886,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10396,7 +10904,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10415,7 +10922,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10434,7 +10940,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10453,7 +10958,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10472,7 +10976,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10491,7 +10994,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10510,7 +11012,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10529,7 +11030,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10548,7 +11048,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10567,7 +11066,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10586,7 +11084,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10605,7 +11102,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10624,7 +11120,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10643,7 +11138,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10662,7 +11156,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10681,7 +11174,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10700,7 +11192,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10719,7 +11210,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10738,7 +11228,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10757,7 +11246,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10776,7 +11264,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10795,7 +11282,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10814,7 +11300,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10833,7 +11318,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10852,7 +11336,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10871,7 +11354,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10890,7 +11372,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10909,7 +11390,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10928,7 +11408,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10947,7 +11426,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10966,7 +11444,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -10985,7 +11462,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11004,7 +11480,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11023,7 +11498,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11042,7 +11516,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11061,7 +11534,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11080,7 +11552,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11099,7 +11570,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11118,7 +11588,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11137,7 +11606,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11156,7 +11624,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11175,7 +11642,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11194,7 +11660,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11213,7 +11678,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11232,7 +11696,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11251,7 +11714,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11270,7 +11732,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11289,7 +11750,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11308,7 +11768,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11327,7 +11786,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11346,7 +11804,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11365,7 +11822,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11384,7 +11840,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11403,7 +11858,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11422,7 +11876,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11441,7 +11894,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11460,7 +11912,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11479,7 +11930,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11498,7 +11948,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11517,7 +11966,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11536,7 +11984,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11555,7 +12002,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11574,7 +12020,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11593,7 +12038,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11612,7 +12056,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11631,7 +12074,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11650,7 +12092,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11669,7 +12110,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11688,7 +12128,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11707,7 +12146,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11726,7 +12164,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11745,7 +12182,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11764,7 +12200,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11783,7 +12218,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11802,7 +12236,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11821,7 +12254,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11840,7 +12272,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11859,7 +12290,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11878,7 +12308,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11897,7 +12326,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11916,7 +12344,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11935,7 +12362,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11954,7 +12380,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11973,7 +12398,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -11992,7 +12416,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12011,7 +12434,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12030,7 +12452,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12049,7 +12470,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12068,7 +12488,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12087,7 +12506,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12106,7 +12524,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12125,7 +12542,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12144,7 +12560,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12163,7 +12578,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12182,7 +12596,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12201,7 +12614,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12220,7 +12632,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12239,7 +12650,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12258,7 +12668,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12277,7 +12686,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12296,7 +12704,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12315,7 +12722,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12334,7 +12740,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12353,7 +12758,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12372,7 +12776,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12391,7 +12794,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12410,7 +12812,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12429,7 +12830,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12448,7 +12848,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12467,7 +12866,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12486,7 +12884,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12505,7 +12902,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12524,7 +12920,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12543,7 +12938,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12562,7 +12956,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12581,7 +12974,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12600,7 +12992,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12619,7 +13010,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12638,7 +13028,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12657,7 +13046,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12676,7 +13064,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12695,7 +13082,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12714,7 +13100,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12733,7 +13118,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12752,7 +13136,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12771,7 +13154,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12790,7 +13172,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12809,7 +13190,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12829,7 +13209,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12848,7 +13227,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12867,7 +13245,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12886,7 +13263,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12905,7 +13281,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12924,7 +13299,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12943,7 +13317,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12962,7 +13335,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -12981,7 +13353,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13000,7 +13371,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13019,7 +13389,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13038,7 +13407,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13057,7 +13425,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13076,7 +13443,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13095,7 +13461,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13114,7 +13479,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13133,7 +13497,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13152,7 +13515,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13171,7 +13533,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13190,7 +13551,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13209,7 +13569,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13228,7 +13587,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13247,7 +13605,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13266,7 +13623,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13285,7 +13641,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13304,7 +13659,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13323,7 +13677,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13342,7 +13695,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13361,7 +13713,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -13380,7 +13731,6 @@ iD.data.presets = {
             "fields": [
                 "operator",
                 "address",
-                "building_area",
                 "opening_hours"
             ],
             "suggestion": true
@@ -39596,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",
@@ -39765,6 +40135,11 @@ iD.data.presets = {
             "label": "Handicap",
             "placeholder": "1-18"
         },
+        "handrail": {
+            "key": "handrail",
+            "type": "check",
+            "label": "Handrail"
+        },
         "highway": {
             "key": "highway",
             "type": "typeCombo",
@@ -39942,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",
@@ -40532,6 +40926,12 @@ iD.data.presets = {
                 }
             }
         },
+        "traffic_signals": {
+            "key": "traffic_signals",
+            "type": "combo",
+            "label": "Type",
+            "default": "signal"
+        },
         "trail_visibility": {
             "key": "trail_visibility",
             "type": "combo",