]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/presets.js
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge remote-tracking branch 'openstreetmap/pull/1085'
[rails.git] / vendor / assets / iD / presets.js
diff --git a/vendor/assets/iD/presets.js b/vendor/assets/iD/presets.js
index 507c415ff2947f2becbd7fcbe418ea7f543f7c5d..0631c4fa34f0b229178c2484537d4e88792debd4 100644 (file)
--- a/vendor/assets/iD/presets.js
+++ b/vendor/assets/iD/presets.js
@@ -32,6 +32,7 @@ iD.data.presets = {
                 "funifor",
                 "funitel"
             ],
                 "funifor",
                 "funitel"
             ],
+            "searchable": false,
             "name": "Aerialway"
         },
         "aerialway/cable_car": {
             "name": "Aerialway"
         },
         "aerialway/cable_car": {
@@ -188,6 +189,7 @@ iD.data.presets = {
             "tags": {
                 "aeroway": "*"
             },
             "tags": {
                 "aeroway": "*"
             },
+            "searchable": false,
             "name": "Aeroway"
         },
         "aeroway/aerodrome": {
             "name": "Aeroway"
         },
         "aeroway/aerodrome": {
@@ -661,6 +663,30 @@ iD.data.presets = {
             },
             "name": "Car Wash"
         },
             },
             "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": [
         "amenity/charging_station": {
             "icon": "car",
             "fields": [
@@ -1109,6 +1135,24 @@ iD.data.presets = {
             },
             "name": "Marketplace"
         },
             },
             "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": [
         "amenity/nightclub": {
             "icon": "bar",
             "fields": [
@@ -1143,6 +1187,7 @@ iD.data.presets = {
                 "access_simple",
                 "supervised",
                 "park_ride",
                 "access_simple",
                 "supervised",
                 "park_ride",
+                "surface",
                 "address"
             ],
             "geometry": [
                 "address"
             ],
             "geometry": [
@@ -1479,13 +1524,16 @@ iD.data.presets = {
             "name": "Ranger Station"
         },
         "amenity/recycling": {
             "name": "Ranger Station"
         },
         "amenity/recycling": {
-            "icon": "recycling",
+            "icon": "waste-basket",
             "fields": [
                 "operator",
                 "address",
             "fields": [
                 "operator",
                 "address",
+                "recycling/type",
                 "recycling/cans",
                 "recycling/cans",
-                "recycling/glass",
+                "recycling/glass_bottles",
                 "recycling/paper",
                 "recycling/paper",
+                "recycling/glass",
+                "recycling/plastic",
                 "recycling/clothes"
             ],
             "geometry": [
                 "recycling/clothes"
             ],
             "geometry": [
@@ -1944,6 +1992,18 @@ iD.data.presets = {
             ],
             "matchScore": 0.1
         },
             ],
             "matchScore": 0.1
         },
+        "area/highway": {
+            "fields": [
+                "area/highway"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "area:highway": "*"
+            },
+            "name": "Road Surface"
+        },
         "barrier": {
             "geometry": [
                 "point",
         "barrier": {
             "geometry": [
                 "point",
@@ -2336,7 +2396,14 @@ iD.data.presets = {
             "tags": {
                 "building": "detached"
             },
             "tags": {
                 "building": "detached"
             },
-            "name": "Detached Home"
+            "terms": [
+                "home",
+                "single",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "name": "Detached House"
         },
         "building/dormitory": {
             "icon": "building",
         },
         "building/dormitory": {
             "icon": "building",
@@ -2452,6 +2519,12 @@ iD.data.presets = {
             "tags": {
                 "building": "house"
             },
             "tags": {
                 "building": "house"
             },
+            "terms": [
+                "home",
+                "family",
+                "residence",
+                "dwelling"
+            ],
             "name": "House"
         },
         "building/hut": {
             "name": "House"
         },
         "building/hut": {
@@ -2580,6 +2653,30 @@ iD.data.presets = {
             },
             "name": "School Building"
         },
             },
             "name": "School Building"
         },
+        "building/semidetached_house": {
+            "icon": "building",
+            "fields": [
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "building": "semidetached_house"
+            },
+            "terms": [
+                "home",
+                "double",
+                "duplex",
+                "twin",
+                "family",
+                "residence",
+                "dwelling"
+            ],
+            "name": "Semi-Detached House"
+        },
         "building/shed": {
             "icon": "building",
             "fields": [
         "building/shed": {
             "icon": "building",
             "fields": [
@@ -2638,6 +2735,14 @@ iD.data.presets = {
             "tags": {
                 "building": "terrace"
             },
             "tags": {
                 "building": "terrace"
             },
+            "terms": [
+                "home",
+                "terrace",
+                "brownstone",
+                "family",
+                "residence",
+                "dwelling"
+            ],
             "name": "Row Houses"
         },
         "building/train_station": {
             "name": "Row Houses"
         },
         "building/train_station": {
@@ -3645,9 +3750,10 @@ iD.data.presets = {
                 "footway": "crossing"
             },
             "terms": [],
                 "footway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "footway/crosswalk": {
         },
         "footway/crosswalk": {
+            "icon": "highway-footway",
             "fields": [
                 "crossing",
                 "access",
             "fields": [
                 "crossing",
                 "access",
@@ -3666,9 +3772,10 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "footway/sidewalk": {
         },
         "footway/sidewalk": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
             "fields": [
                 "surface",
                 "lit",
@@ -3811,6 +3918,7 @@ iD.data.presets = {
             "tags": {
                 "highway": "*"
             },
             "tags": {
                 "highway": "*"
             },
+            "searchable": false,
             "name": "Highway"
         },
         "highway/bridleway": {
             "name": "Highway"
         },
         "highway/bridleway": {
@@ -3853,6 +3961,29 @@ iD.data.presets = {
             "terms": [],
             "name": "Bus Stop"
         },
             "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",
         "highway/crossing": {
             "fields": [
                 "crossing",
@@ -3866,7 +3997,7 @@ iD.data.presets = {
                 "highway": "crossing"
             },
             "terms": [],
                 "highway": "crossing"
             },
             "terms": [],
-            "name": "Crossing"
+            "name": "Street Crossing"
         },
         "highway/crosswalk": {
             "fields": [
         },
         "highway/crosswalk": {
             "fields": [
@@ -3884,7 +4015,7 @@ iD.data.presets = {
             "terms": [
                 "zebra crossing"
             ],
             "terms": [
                 "zebra crossing"
             ],
-            "name": "Crosswalk"
+            "name": "Pedestrian Crosswalk"
         },
         "highway/cycleway": {
             "icon": "highway-cycleway",
         },
         "highway/cycleway": {
             "icon": "highway-cycleway",
@@ -3939,7 +4070,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4055,6 +4187,7 @@ iD.data.presets = {
             "name": "Path"
         },
         "highway/pedestrian": {
             "name": "Path"
         },
         "highway/pedestrian": {
+            "icon": "highway-footway",
             "fields": [
                 "surface",
                 "lit",
             "fields": [
                 "surface",
                 "lit",
@@ -4071,7 +4204,7 @@ iD.data.presets = {
                 "highway": "pedestrian"
             },
             "terms": [],
                 "highway": "pedestrian"
             },
             "terms": [],
-            "name": "Pedestrian"
+            "name": "Pedestrian Street"
         },
         "highway/primary": {
             "icon": "highway-primary",
         },
         "highway/primary": {
             "icon": "highway-primary",
@@ -4082,7 +4215,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4101,7 +4235,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4148,7 +4283,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4200,7 +4336,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4219,7 +4356,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4242,7 +4380,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4412,7 +4551,8 @@ iD.data.presets = {
                 "access",
                 "lanes",
                 "surface",
                 "access",
                 "lanes",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4431,7 +4571,8 @@ iD.data.presets = {
                 "structure",
                 "access",
                 "surface",
                 "structure",
                 "access",
                 "surface",
-                "ref"
+                "ref",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4479,6 +4620,9 @@ iD.data.presets = {
             "tags": {
                 "highway": "traffic_signals"
             },
             "tags": {
                 "highway": "traffic_signals"
             },
+            "fields": [
+                "traffic_signals"
+            ],
             "terms": [
                 "light",
                 "stoplight",
             "terms": [
                 "light",
                 "stoplight",
@@ -4549,7 +4693,8 @@ iD.data.presets = {
                 "maxspeed",
                 "structure",
                 "access",
                 "maxspeed",
                 "structure",
                 "access",
-                "surface"
+                "surface",
+                "cycleway"
             ],
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
@@ -4682,7 +4827,7 @@ iD.data.presets = {
             "tags": {
                 "landuse": "*"
             },
             "tags": {
                 "landuse": "*"
             },
-            "name": "Landuse"
+            "name": "Land Use"
         },
         "landuse/allotments": {
             "geometry": [
         },
         "landuse/allotments": {
             "geometry": [
@@ -4691,8 +4836,11 @@ iD.data.presets = {
             "tags": {
                 "landuse": "allotments"
             },
             "tags": {
                 "landuse": "allotments"
             },
-            "terms": [],
-            "name": "Allotments"
+            "terms": [
+                "allotment",
+                "garden"
+            ],
+            "name": "Community Garden"
         },
         "landuse/basin": {
             "geometry": [
         },
         "landuse/basin": {
             "geometry": [
@@ -4896,6 +5044,23 @@ iD.data.presets = {
             "terms": [],
             "name": "Orchard"
         },
             "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"
         "landuse/quarry": {
             "geometry": [
                 "area"
@@ -4951,6 +5116,45 @@ iD.data.presets = {
             },
             "name": "Leisure"
         },
             },
             "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",
         "leisure/common": {
             "geometry": [
                 "point",
@@ -5199,6 +5403,40 @@ iD.data.presets = {
             "terms": [],
             "name": "Basketball Court"
         },
             "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": [
         "leisure/pitch/skateboard": {
             "icon": "pitch",
             "fields": [
@@ -5408,6 +5646,25 @@ iD.data.presets = {
             },
             "name": "Man Made"
         },
             },
             "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",
         "man_made/breakwater": {
             "geometry": [
                 "line",
@@ -5527,7 +5784,7 @@ iD.data.presets = {
             "name": "Pier"
         },
         "man_made/pipeline": {
             "name": "Pier"
         },
         "man_made/pipeline": {
-            "icon": "pipeline",
+            "icon": "pipeline-line",
             "fields": [
                 "location",
                 "operator"
             "fields": [
                 "location",
                 "operator"
@@ -5705,6 +5962,54 @@ iD.data.presets = {
             },
             "name": "Bunker"
         },
             },
             "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",
         "military/range": {
             "geometry": [
                 "point",
@@ -5717,6 +6022,18 @@ iD.data.presets = {
             },
             "name": "Military Range"
         },
             },
             "name": "Military Range"
         },
+        "military/training_area": {
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "military": "training_area"
+            },
+            "name": "Training area"
+        },
         "natural": {
             "fields": [
                 "natural"
         "natural": {
             "fields": [
                 "natural"
@@ -5765,7 +6082,13 @@ iD.data.presets = {
                 "fee",
                 "access_simple"
             ],
                 "fee",
                 "access_simple"
             ],
-            "terms": [],
+            "terms": [
+                "cavern",
+                "hollow",
+                "grotto",
+                "shelter",
+                "cavity"
+            ],
             "tags": {
                 "natural": "cave_entrance"
             },
             "tags": {
                 "natural": "cave_entrance"
             },
@@ -5866,6 +6189,25 @@ iD.data.presets = {
             ],
             "name": "Peak"
         },
             ],
             "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"
         "natural/scree": {
             "geometry": [
                 "area"
@@ -5885,7 +6227,10 @@ iD.data.presets = {
             "tags": {
                 "natural": "scrub"
             },
             "tags": {
                 "natural": "scrub"
             },
-            "terms": [],
+            "terms": [
+                "bush",
+                "shrubs"
+            ],
             "name": "Scrub"
         },
         "natural/spring": {
             "name": "Scrub"
         },
         "natural/spring": {
@@ -5901,8 +6246,8 @@ iD.data.presets = {
         },
         "natural/tree": {
             "fields": [
         },
         "natural/tree": {
             "fields": [
-                "leaf_type",
-                "leaf_cycle",
+                "leaf_type_singular",
+                "leaf_cycle_singular",
                 "denotation"
             ],
             "icon": "park",
                 "denotation"
             ],
             "icon": "park",
@@ -5916,6 +6261,40 @@ iD.data.presets = {
             },
             "name": "Tree"
         },
             },
             "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"
         "natural/water": {
             "fields": [
                 "water"
@@ -6432,6 +6811,7 @@ iD.data.presets = {
             "tags": {
                 "place": "*"
             },
             "tags": {
                 "place": "*"
             },
+            "searchable": false,
             "name": "Place"
         },
         "place/city": {
             "name": "Place"
         },
         "place/city": {
@@ -6601,6 +6981,7 @@ iD.data.presets = {
             "fields": [
                 "power"
             ],
             "fields": [
                 "power"
             ],
+            "searchable": false,
             "name": "Power"
         },
         "power/generator": {
             "name": "Power"
         },
         "power/generator": {
@@ -6746,6 +7127,7 @@ iD.data.presets = {
             "tags": {
                 "railway": "*"
             },
             "tags": {
                 "railway": "*"
             },
+            "searchable": false,
             "name": "Railway"
         },
         "railway/abandoned": {
             "name": "Railway"
         },
         "railway/abandoned": {
@@ -6829,12 +7211,12 @@ iD.data.presets = {
             "terms": [
                 "crossing",
                 "railroad crossing",
             "terms": [
                 "crossing",
                 "railroad crossing",
-                "railway crossing",
+                "level crossing",
                 "grade crossing",
                 "road through railroad",
                 "train crossing"
             ],
                 "grade crossing",
                 "road through railroad",
                 "train crossing"
             ],
-            "name": "Level Crossing"
+            "name": "Railway Crossing"
         },
         "railway/monorail": {
             "icon": "railway-monorail",
         },
         "railway/monorail": {
             "icon": "railway-monorail",
@@ -6993,7 +7375,7 @@ iD.data.presets = {
             "searchable": false
         },
         "route/ferry": {
             "searchable": false
         },
         "route/ferry": {
-            "icon": "ferry",
+            "icon": "ferry-line",
             "geometry": [
                 "line"
             ],
             "geometry": [
                 "line"
             ],
@@ -9758,6 +10140,7 @@ iD.data.presets = {
             "tags": {
                 "waterway": "*"
             },
             "tags": {
                 "waterway": "*"
             },
+            "searchable": false,
             "name": "Waterway"
         },
         "waterway/canal": {
             "name": "Waterway"
         },
         "waterway/canal": {
@@ -38800,6 +39183,7 @@ iD.data.presets = {
         ],
         "vertex": [
             "highway/crosswalk",
         ],
         "vertex": [
             "highway/crosswalk",
+            "highway/crossing",
             "railway/level_crossing",
             "highway/traffic_signals",
             "highway/turning_circle",
             "railway/level_crossing",
             "highway/traffic_signals",
             "highway/turning_circle",
@@ -38865,6 +39249,7 @@ iD.data.presets = {
             "name": "Path",
             "icon": "category-path",
             "members": [
             "name": "Path",
             "icon": "category-path",
             "members": [
+                "highway/pedestrian",
                 "highway/footway",
                 "highway/cycleway",
                 "highway/bridleway",
                 "highway/footway",
                 "highway/cycleway",
                 "highway/bridleway",
@@ -38979,11 +39364,11 @@ iD.data.presets = {
                 "key": "access"
             },
             "type": "access",
                 "key": "access"
             },
             "type": "access",
-            "label": "Access",
-            "placeholder": "Unknown",
+            "label": "Allowed Access",
+            "placeholder": "Not Specified",
             "strings": {
                 "types": {
             "strings": {
                 "types": {
-                    "access": "General",
+                    "access": "All",
                     "foot": "Foot",
                     "motor_vehicle": "Motor Vehicles",
                     "bicycle": "Bicycles",
                     "foot": "Foot",
                     "motor_vehicle": "Motor Vehicles",
                     "bicycle": "Bicycles",
@@ -39013,6 +39398,10 @@ iD.data.presets = {
                     "destination": {
                         "title": "Destination",
                         "description": "Access permitted only to reach a destination"
                     "destination": {
                         "title": "Destination",
                         "description": "Access permitted only to reach a destination"
+                    },
+                    "dismount": {
+                        "title": "Dismount",
+                        "description": "Access permitted but rider must dismount"
                     }
                 }
             }
                     }
                 }
             }
@@ -39020,7 +39409,7 @@ iD.data.presets = {
         "access_simple": {
             "key": "access",
             "type": "combo",
         "access_simple": {
             "key": "access",
             "type": "combo",
-            "label": "Access",
+            "label": "Allowed Access",
             "placeholder": "yes",
             "options": [
                 "permissive",
             "placeholder": "yes",
             "options": [
                 "permissive",
@@ -39045,9 +39434,18 @@ iD.data.presets = {
             "keys": [
                 "addr:housename",
                 "addr:housenumber",
             "keys": [
                 "addr:housename",
                 "addr:housenumber",
+                "addr:conscriptionnumber",
                 "addr:street",
                 "addr:city",
                 "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"
             ],
             "reference": {
                 "key": "addr"
@@ -39059,6 +39457,7 @@ iD.data.presets = {
                 "placeholders": {
                     "housename": "Housename",
                     "housenumber": "123",
                 "placeholders": {
                     "housename": "Housename",
                     "housenumber": "123",
+                    "conscriptionnumber": "123",
                     "street": "Street",
                     "city": "City",
                     "postcode": "Postcode",
                     "street": "Street",
                     "city": "City",
                     "postcode": "Postcode",
@@ -39145,6 +39544,11 @@ iD.data.presets = {
             "type": "typeCombo",
             "label": "Type"
         },
             "type": "typeCombo",
             "label": "Type"
         },
+        "area/highway": {
+            "key": "area:highway",
+            "type": "typeCombo",
+            "label": "Type"
+        },
         "artist": {
             "key": "artist_name",
             "type": "text",
         "artist": {
             "key": "artist_name",
             "type": "text",
@@ -39289,6 +39693,54 @@ iD.data.presets = {
             "type": "combo",
             "label": "Cuisine"
         },
             "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",
         "delivery": {
             "key": "delivery",
             "type": "check",
@@ -39574,6 +40026,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",
         "leaf_type": {
             "key": "leaf_type",
             "type": "combo",
@@ -39587,6 +40052,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",
         "leisure": {
             "key": "leisure",
             "type": "typeCombo",
@@ -39597,6 +40074,12 @@ iD.data.presets = {
             "type": "number",
             "label": "Length (Meters)"
         },
             "type": "number",
             "label": "Length (Meters)"
         },
+        "level": {
+            "key": "level",
+            "type": "combo",
+            "label": "Level",
+            "universal": true
+        },
         "levels": {
             "key": "building:levels",
             "type": "number",
         "levels": {
             "key": "building:levels",
             "type": "number",
@@ -39859,11 +40342,32 @@ iD.data.presets = {
             "type": "check",
             "label": "Accepts Glass"
         },
             "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/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",
         "ref": {
             "key": "ref",
             "type": "text",
@@ -40193,6 +40697,12 @@ iD.data.presets = {
                 }
             }
         },
                 }
             }
         },
+        "traffic_signals": {
+            "key": "traffic_signals",
+            "type": "combo",
+            "label": "Type",
+            "default": "signal"
+        },
         "trail_visibility": {
             "key": "trail_visibility",
             "type": "combo",
         "trail_visibility": {
             "key": "trail_visibility",
             "type": "combo",
The OpenStreetMap web site