]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Extend https support to all three routing engines
[rails.git] / vendor / assets / iD / iD / locales / en.json
index 5c87e7a7fca2b45584841d38ab42b78d401b5d2e..feabccf9171808831c26fdce689951ad13b43ef5 100644 (file)
@@ -71,7 +71,8 @@
                 "line": "Made a line circular.",
                 "area": "Made an area circular."
             },
-            "not_closed": "This can't be made circular because it's not a loop."
+            "not_closed": "This can't be made circular because it's not a loop.",
+            "too_large": "This can't be made circular because not enough of it is currently visible."
         },
         "orthogonalize": {
             "title": "Square",
@@ -84,7 +85,8 @@
                 "line": "Squared the corners of a line.",
                 "area": "Squared the corners of an area."
             },
-            "not_squarish": "This can't be made square because it is not squarish."
+            "not_squarish": "This can't be made square because it is not squarish.",
+            "too_large": "This can't be made square because not enough of it is currently visible."
         },
         "straighten": {
             "title": "Straighten",
@@ -95,7 +97,7 @@
         },
         "delete": {
             "title": "Delete",
-            "description": "Remove this from the map.",
+            "description": "Delete object permanently.",
             "annotation": {
                 "point": "Deleted a point.",
                 "vertex": "Deleted a node from a way.",
             "annotation": "Merged {n} lines.",
             "not_eligible": "These features can't be merged.",
             "not_adjacent": "These lines can't be merged because they aren't connected.",
-            "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation."
+            "restriction": "These lines can't be merged because at least one is a member of a \"{relation}\" relation.",
+            "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."
         },
         "move": {
             "title": "Move",
                 "area": "Moved an area.",
                 "multiple": "Moved multiple objects."
             },
-            "incomplete_relation": "This feature can't be moved because it hasn't been fully downloaded."
+            "incomplete_relation": "This feature can't be moved because it hasn't been fully downloaded.",
+            "too_large": "This can't be moved because not enough of it is currently visible."
         },
         "rotate": {
             "title": "Rotate",
             "annotation": {
                 "line": "Rotated a line.",
                 "area": "Rotated an area."
-            }
+            },
+            "too_large": "This can't be rotated because not enough of it is currently visible."
         },
         "reverse": {
             "title": "Reverse",
             },
             "not_eligible": "Lines can't be split at their beginning or end.",
             "multiple_ways": "There are too many lines here to split."
+        },
+        "restriction": {
+            "help": {
+                "select": "Click to select a road segment.",
+                "toggle": "Click to toggle turn restrictions.",
+                "toggle_on": "Click to add a \"{restriction}\" restriction.",
+                "toggle_off": "Click to remove the \"{restriction}\" restriction."
+            },
+            "annotation": {
+                "create": "Added a turn restriction",
+                "delete": "Deleted a turn restriction"
+            }
         }
     },
     "undo": {
         "upload_explanation_with_user": "The changes you upload as {user} will be visible on all maps that use OpenStreetMap data.",
         "save": "Save",
         "cancel": "Cancel",
+        "changes": "{count} Changes",
         "warnings": "Warnings",
         "modified": "Modified",
         "deleted": "Deleted",
             "yes": "Yes",
             "no": "No"
         },
-        "none": "None"
+        "none": "None",
+        "node": "Node",
+        "way": "Way",
+        "relation": "Relation",
+        "location": "Location"
     },
     "background": {
         "title": "Background",
         "percent_brightness": "{opacity}% brightness",
         "none": "None",
         "custom": "Custom",
-        "custom_prompt": "Enter a tile template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
+        "custom_button": "Edit custom background",
+        "custom_prompt": "Enter a tile URL template. Valid tokens are {z}, {x}, {y} for Z/X/Y scheme and {u} for quadtile scheme.",
         "fix_misalignment": "Fix alignment",
         "reset": "reset"
     },
         "help": "Save changes to OpenStreetMap, making them visible to other users.",
         "no_changes": "No changes to save.",
         "error": "An error occurred while trying to save",
+        "unknown_error_details": "Please ensure you are connected to the internet.",
         "uploading": "Uploading changes to OpenStreetMap.",
         "unsaved_changes": "You have unsaved changes"
     },
         "untagged_area": "Untagged area",
         "many_deletions": "You're deleting {n} objects. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
         "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
+        "untagged_point_tooltip": "Select a feature type that describes what this point is.",
+        "untagged_line_tooltip": "Select a feature type that describes what this line is.",
+        "untagged_area_tooltip": "Select a feature type that describes what this area is.",
         "deprecated_tags": "Deprecated tags: {tags}"
     },
     "zoom": {
         "zoom": "Zoom to GPX track",
         "browse": "Browse for a .gpx file"
     },
+    "mapillary": {
+        "tooltip": "Street-level photos from Mapillary",
+        "title": "Photo Overlay (Mapillary)",
+        "view_on_mapillary": "View this image on Mapillary"
+    },
     "help": {
         "title": "Help",
-        "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/systemed/iD).\n",
+        "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need a\n[free OpenStreetMap account](https://www.openstreetmap.org/user/new).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
         "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click\non it on the map. This will highlight the selected feature, open a panel with\ndetails about it, and show a menu of things you can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a rectangle.\nThis will draw a box and select all the points within it.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Save' again to post the changes\nto [OpenStreetMap.org](http://www.openstreetmap.org/), where they are visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n",
         "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a small tools menu on the map and a sidebar showing more information\nabout the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also click the 'Move' tool or press the `M` shortcut key to move the entire road at\none time, and then click again to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n",
         "gps": "# GPS\n\nGPS data is the most trusted source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Surveying with a GPS](http://learnosm.org/en/beginner/using-gps/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright green\nline. Click on the 'Background Settings' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
         },
         "areas": {
             "title": "Areas",
-            "add": "Areas are a more detailed way to represent features. They provide information on the boundaries of the feature. Areas can be used for most feature types points can be used for, and are often preferred. **Click the Area button to add a new area.**",
+            "add": "Areas are used to show the boundaries of features like lakes, buildings, and residential areas. They can be also be used for more detailed mapping of many features you might normally map as points. **Click the Area button to add a new area.**",
             "corner": "Areas are drawn by placing nodes that mark the boundary of the area. **Place the starting node on one of the corners of the playground.**",
             "place": "Draw the area by placing more nodes. Finish the area by clicking on the starting node. **Draw an area for the playground.**",
             "search": "**Search for '{name}'.**",
             "category-building": {
                 "name": "Building"
             },
+            "category-golf": {
+                "name": "Golf"
+            },
             "category-landuse": {
                 "name": "Land Use"
             },
             "category-rail": {
                 "name": "Rail"
             },
+            "category-restriction": {
+                "name": "Restriction"
+            },
             "category-road": {
                 "name": "Road"
             },
                     }
                 }
             },
+            "access_simple": {
+                "label": "Access",
+                "placeholder": "yes"
+            },
             "access_toilets": {
                 "label": "Access"
             },
                 "label": "Address",
                 "placeholders": {
                     "housename": "Housename",
-                    "number": "123",
+                    "housenumber": "123",
                     "street": "Street",
                     "city": "City",
-                    "postcode": "Postal code"
+                    "postcode": "Postcode",
+                    "place": "Place",
+                    "hamlet": "Hamlet",
+                    "suburb": "Suburb",
+                    "subdistrict": "Subdistrict",
+                    "district": "District",
+                    "province": "Province",
+                    "state": "State",
+                    "country": "Country"
                 }
             },
             "admin_level": {
                 "label": "Admin Level"
             },
+            "aerialway": {
+                "label": "Type"
+            },
+            "aerialway/access": {
+                "label": "Access",
+                "options": {
+                    "entry": "Entry",
+                    "exit": "Exit",
+                    "both": "Both"
+                }
+            },
+            "aerialway/bubble": {
+                "label": "Bubble"
+            },
+            "aerialway/capacity": {
+                "label": "Capacity (per hour)",
+                "placeholder": "500, 2500, 5000..."
+            },
+            "aerialway/duration": {
+                "label": "Duration (minutes)",
+                "placeholder": "1, 2, 3..."
+            },
+            "aerialway/heating": {
+                "label": "Heated"
+            },
+            "aerialway/occupancy": {
+                "label": "Occupancy",
+                "placeholder": "2, 4, 8..."
+            },
+            "aerialway/summer/access": {
+                "label": "Access (summer)",
+                "options": {
+                    "entry": "Entry",
+                    "exit": "Exit",
+                    "both": "Both"
+                }
+            },
             "aeroway": {
                 "label": "Type"
             },
             "building_area": {
                 "label": "Building"
             },
-            "building_yes": {
-                "label": "Building"
-            },
             "capacity": {
                 "label": "Capacity",
                 "placeholder": "50, 100, 200..."
             },
             "cardinal_direction": {
-                "label": "Direction"
+                "label": "Direction",
+                "options": {
+                    "N": "North",
+                    "E": "East",
+                    "S": "South",
+                    "W": "West",
+                    "NE": "Northeast",
+                    "SE": "Southeast",
+                    "SW": "Southwest",
+                    "NW": "Northwest",
+                    "NNE": "North-northeast",
+                    "ENE": "East-northeast",
+                    "ESE": "East-southeast",
+                    "SSE": "South-southeast",
+                    "SSW": "South-southwest",
+                    "WSW": "West-southwest",
+                    "WNW": "West-northwest",
+                    "NNW": "North-northwest"
+                }
             },
             "clock_direction": {
                 "label": "Direction",
             "country": {
                 "label": "Country"
             },
+            "covered": {
+                "label": "Covered"
+            },
+            "craft": {
+                "label": "Type"
+            },
+            "crop": {
+                "label": "Crop"
+            },
             "crossing": {
                 "label": "Type"
             },
             "description": {
                 "label": "Description"
             },
+            "electrified": {
+                "label": "Electrification",
+                "placeholder": "Contact Line, Electrified Rail...",
+                "options": {
+                    "contact_line": "Contact Line",
+                    "rail": "Electrified Rail",
+                    "yes": "Yes (unspecified)",
+                    "no": "No"
+                }
+            },
             "elevation": {
                 "label": "Elevation"
             },
             "entrance": {
                 "label": "Type"
             },
+            "except": {
+                "label": "Exceptions"
+            },
             "fax": {
                 "label": "Fax",
                 "placeholder": "+31 42 123 4567"
                 "label": "Fee"
             },
             "fire_hydrant/type": {
-                "label": "Type"
+                "label": "Type",
+                "options": {
+                    "pillar": "Pillar/Aboveground",
+                    "underground": "Underground",
+                    "wall": "Wall",
+                    "pond": "Pond"
+                }
             },
             "fixme": {
                 "label": "Fix Me"
             },
+            "fuel": {
+                "label": "Fuel"
+            },
+            "fuel/biodiesel": {
+                "label": "Sells Biodiesel"
+            },
+            "fuel/diesel": {
+                "label": "Sells Diesel"
+            },
+            "fuel/e10": {
+                "label": "Sells E10"
+            },
+            "fuel/e85": {
+                "label": "Sells E85"
+            },
+            "fuel/lpg": {
+                "label": "Sells Propane"
+            },
+            "fuel/octane_100": {
+                "label": "Sells Racing Gasoline"
+            },
+            "fuel/octane_91": {
+                "label": "Sells Regular Gasoline"
+            },
+            "fuel/octane_95": {
+                "label": "Sells Midgrade Gasoline"
+            },
+            "fuel/octane_98": {
+                "label": "Sells Premium Gasoline"
+            },
+            "gauge": {
+                "label": "Gauge"
+            },
             "generator/method": {
                 "label": "Method"
             },
             "generator/type": {
                 "label": "Type"
             },
+            "golf_hole": {
+                "label": "Reference",
+                "placeholder": "Hole number (1-18)"
+            },
+            "handicap": {
+                "label": "Handicap",
+                "placeholder": "1-18"
+            },
             "highway": {
                 "label": "Type"
             },
             "historic": {
                 "label": "Type"
             },
+            "hoops": {
+                "label": "Hoops",
+                "placeholder": "1, 2, 4..."
+            },
             "iata": {
                 "label": "IATA"
             },
             "incline": {
                 "label": "Incline"
             },
+            "information": {
+                "label": "Type"
+            },
             "internet_access": {
                 "label": "Internet Access",
                 "options": {
                     "terminal": "Terminal"
                 }
             },
+            "lamp_type": {
+                "label": "Type"
+            },
             "landuse": {
                 "label": "Type"
             },
             "leisure": {
                 "label": "Type"
             },
+            "length": {
+                "label": "Length (Meters)"
+            },
             "levels": {
                 "label": "Levels",
                 "placeholder": "2, 4, 6..."
                 "label": "Speed Limit",
                 "placeholder": "40, 50, 60..."
             },
+            "mtb/scale": {
+                "label": "Mountain Biking Difficulty",
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "0": "0: Solid gravel/packed earth, no obstacles, wide curves",
+                    "1": "1: Some loose surface, small obstacles, wide curves",
+                    "2": "2: Much loose surface, large obstacles, easy hairpins",
+                    "3": "3: Slippery surface, large obstacles, tight hairpins",
+                    "4": "4: Loose surface or boulders, dangerous hairpins",
+                    "5": "5: Maximum difficulty, boulder fields, landslides",
+                    "6": "6: Not rideable except by the very best mountain bikers"
+                }
+            },
+            "mtb/scale/imba": {
+                "label": "IMBA Trail Difficulty",
+                "placeholder": "Easy, Medium, Difficult...",
+                "options": {
+                    "0": "Easiest (white circle)",
+                    "1": "Easy (green circle)",
+                    "2": "Medium (blue square)",
+                    "3": "Difficult (black diamond)",
+                    "4": "Extremely Difficult (double black diamond)"
+                }
+            },
+            "mtb/scale/uphill": {
+                "label": "Mountain Biking Uphill Difficulty",
+                "placeholder": "0, 1, 2, 3...",
+                "options": {
+                    "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles",
+                    "1": "1: Avg. incline <15%, gravel/packed earth, few small objects",
+                    "2": "2: Avg. incline <20%, stable surface, fistsize rocks/roots",
+                    "3": "3: Avg. incline <25%, variable surface, fistsize rocks/branches",
+                    "4": "4: Avg. incline <30%, poor condition, big rocks/branches",
+                    "5": "5: Very steep, bike generally needs to be pushed or carried"
+                }
+            },
             "name": {
                 "label": "Name",
                 "placeholder": "Common name (if any)"
                 "label": "Type"
             },
             "oneway": {
-                "label": "One Way"
+                "label": "One Way",
+                "options": {
+                    "undefined": "Assumed to be No",
+                    "yes": "Yes",
+                    "no": "No"
+                }
             },
             "oneway_yes": {
-                "label": "One Way"
+                "label": "One Way",
+                "options": {
+                    "undefined": "Assumed to be Yes",
+                    "yes": "Yes",
+                    "no": "No"
+                }
             },
             "opening_hours": {
                 "label": "Hours"
             "operator": {
                 "label": "Operator"
             },
+            "par": {
+                "label": "Par",
+                "placeholder": "3, 4, 5..."
+            },
             "park_ride": {
                 "label": "Park and Ride"
             },
             "parking": {
-                "label": "Type"
+                "label": "Type",
+                "options": {
+                    "surface": "Surface",
+                    "multi-storey": "Multilevel",
+                    "underground": "Underground",
+                    "sheds": "Sheds",
+                    "carports": "Carports",
+                    "garage_boxes": "Garage Boxes",
+                    "lane": "Roadside Lane"
+                }
             },
             "phone": {
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
             },
+            "piste/difficulty": {
+                "label": "Difficulty",
+                "placeholder": "Easy, Intermediate, Advanced...",
+                "options": {
+                    "novice": "Novice (instructional)",
+                    "easy": "Easy (green circle)",
+                    "intermediate": "Intermediate (blue square)",
+                    "advanced": "Advanced (black diamond)",
+                    "expert": "Expert (double black diamond)",
+                    "freeride": "Freeride (off-piste)",
+                    "extreme": "Extreme (climbing equipment required)"
+                }
+            },
+            "piste/grooming": {
+                "label": "Grooming",
+                "options": {
+                    "classic": "Classic",
+                    "mogul": "Mogul",
+                    "backcountry": "Backcountry",
+                    "classic+skating": "Classic and Skating",
+                    "scooter": "Scooter/Snowmobile",
+                    "skating": "Skating"
+                }
+            },
+            "piste/type": {
+                "label": "Type",
+                "options": {
+                    "downhill": "Downhill",
+                    "nordic": "Nordic",
+                    "skitour": "Skitour",
+                    "sled": "Sled",
+                    "hike": "Hike",
+                    "sleigh": "Sleigh",
+                    "ice_skate": "Ice Skate",
+                    "snow_park": "Snow Park",
+                    "playground": "Playground"
+                }
+            },
             "place": {
                 "label": "Type"
             },
+            "population": {
+                "label": "Population"
+            },
             "power": {
                 "label": "Type"
             },
             "railway": {
                 "label": "Type"
             },
+            "recycling/cans": {
+                "label": "Accepts Cans"
+            },
+            "recycling/clothes": {
+                "label": "Accepts Clothes"
+            },
+            "recycling/glass": {
+                "label": "Accepts Glass"
+            },
+            "recycling/paper": {
+                "label": "Accepts Paper"
+            },
             "ref": {
                 "label": "Reference"
             },
                 "label": "Type"
             },
             "religion": {
-                "label": "Religion",
-                "options": {
-                    "christian": "Christian",
-                    "muslim": "Muslim",
-                    "buddhist": "Buddhist",
-                    "jewish": "Jewish",
-                    "hindu": "Hindu",
-                    "shinto": "Shinto",
-                    "taoist": "Taoist"
-                }
+                "label": "Religion"
             },
             "restriction": {
                 "label": "Type"
             },
+            "restrictions": {
+                "label": "Turn Restrictions"
+            },
             "route": {
                 "label": "Type"
             },
                 "label": "Type"
             },
             "sac_scale": {
-                "label": "Path Difficulty"
+                "label": "Hiking Difficulty",
+                "placeholder": "Mountain Hiking, Alpine Hiking...",
+                "options": {
+                    "hiking": "T1: Hiking",
+                    "mountain_hiking": "T2: Mountain Hiking",
+                    "demanding_mountain_hiking": "T3: Demanding Mountain Hiking",
+                    "alpine_hiking": "T4: Alpine Hiking",
+                    "demanding_alpine_hiking": "T5: Demanding Alpine Hiking",
+                    "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"
+                }
+            },
+            "seasonal": {
+                "label": "Seasonal"
             },
             "service": {
                 "label": "Type"
             "shop": {
                 "label": "Type"
             },
+            "sloped_curb": {
+                "label": "Sloped Curb"
+            },
+            "smoking": {
+                "label": "Smoking",
+                "placeholder": "No, Separated, Yes...",
+                "options": {
+                    "no": "No smoking anywhere",
+                    "separated": "In smoking areas, not physically isolated",
+                    "isolated": "In smoking areas, physically isolated",
+                    "outside": "Allowed outside",
+                    "yes": "Allowed everywhere",
+                    "dedicated": "Dedicated to smokers (e.g. smokers' club)"
+                }
+            },
+            "smoothness": {
+                "label": "Smoothness",
+                "placeholder": "Thin Rollers, Wheels, Off-Road...",
+                "options": {
+                    "excellent": "Thin Rollers: rollerblade, skateboard",
+                    "good": "Thin Wheels: racing bike",
+                    "intermediate": "Wheels: city bike, wheelchair, scooter",
+                    "bad": "Robust Wheels: trekking bike, car, rickshaw",
+                    "very_bad": "High Clearance: light duty off-road vehicle",
+                    "horrible": "Off-Road: heavy duty off-road vehicle",
+                    "very_horrible": "Specialized off-road: tractor, ATV",
+                    "impassible": "Impassible / No wheeled vehicle"
+                }
+            },
+            "social_facility_for": {
+                "label": "People served",
+                "placeholder": "Homeless, Disabled, Child, etc"
+            },
             "source": {
                 "label": "Source"
             },
             "sport": {
                 "label": "Sport"
             },
+            "sport_ice": {
+                "label": "Sport"
+            },
+            "sport_racing": {
+                "label": "Sport"
+            },
             "structure": {
                 "label": "Structure",
                 "placeholder": "Unknown",
                     "bridge": "Bridge",
                     "tunnel": "Tunnel",
                     "embankment": "Embankment",
-                    "cutting": "Cutting"
+                    "cutting": "Cutting",
+                    "ford": "Ford"
                 }
             },
+            "studio_type": {
+                "label": "Type"
+            },
             "supervised": {
                 "label": "Supervised"
             },
             "surface": {
                 "label": "Surface"
             },
+            "tactile_paving": {
+                "label": "Tactile Paving"
+            },
             "toilets/disposal": {
-                "label": "Disposal"
+                "label": "Disposal",
+                "options": {
+                    "flush": "Flush",
+                    "pitlatrine": "Pit/Latrine",
+                    "chemical": "Chemical",
+                    "bucket": "Bucket"
+                }
             },
             "tourism": {
                 "label": "Type"
                 "label": "Tower type"
             },
             "tracktype": {
-                "label": "Type"
+                "label": "Track Type",
+                "placeholder": "Solid, Mostly Solid, Soft...",
+                "options": {
+                    "grade1": "Solid: paved or heavily compacted hardcore surface",
+                    "grade2": "Mostly Solid: gravel/rock with some soft material mixed in",
+                    "grade3": "Even mixture of hard and soft materials",
+                    "grade4": "Mostly Soft: soil/sand/grass with some hard material mixed in",
+                    "grade5": "Soft: soil/sand/grass"
+                }
             },
             "trail_visibility": {
-                "label": "Trail Visibility"
+                "label": "Trail Visibility",
+                "placeholder": "Excellent, Good, Bad...",
+                "options": {
+                    "excellent": "Excellent: unambiguous path or markers everywhere",
+                    "good": "Good: markers visible, sometimes require searching",
+                    "intermediate": "Intermediate: few markers, path mostly visible",
+                    "bad": "Bad: no markers, path sometimes invisible/pathless",
+                    "horrible": "Horrible: often pathless, some orientation skills required",
+                    "no": "No: pathless, excellent orientation skills required"
+                }
             },
             "tree_type": {
                 "label": "Type"
             },
+            "trees": {
+                "label": "Trees"
+            },
+            "tunnel": {
+                "label": "Tunnel"
+            },
             "vending": {
                 "label": "Type of Goods"
             },
             "wheelchair": {
                 "label": "Wheelchair Access"
             },
+            "width": {
+                "label": "Width (Meters)"
+            },
             "wikipedia": {
                 "label": "Wikipedia"
             },
                 "name": "Address",
                 "terms": ""
             },
+            "aerialway": {
+                "name": "Aerialway",
+                "terms": "ski lift,funifor,funitel"
+            },
+            "aerialway/cable_car": {
+                "name": "Cable Car",
+                "terms": "tramway,ropeway"
+            },
+            "aerialway/chair_lift": {
+                "name": "Chair Lift",
+                "terms": ""
+            },
+            "aerialway/gondola": {
+                "name": "Gondola",
+                "terms": ""
+            },
+            "aerialway/magic_carpet": {
+                "name": "Magic Carpet Lift",
+                "terms": ""
+            },
+            "aerialway/platter": {
+                "name": "Platter Lift",
+                "terms": "button lift,poma lift"
+            },
+            "aerialway/pylon": {
+                "name": "Aerialway Pylon",
+                "terms": ""
+            },
+            "aerialway/rope_tow": {
+                "name": "Rope Tow Lift",
+                "terms": "handle tow,bugel lift"
+            },
+            "aerialway/station": {
+                "name": "Aerialway Station",
+                "terms": ""
+            },
+            "aerialway/t-bar": {
+                "name": "T-bar Lift",
+                "terms": ""
+            },
             "aeroway": {
                 "name": "Aeroway",
                 "terms": ""
             },
             "amenity/arts_centre": {
                 "name": "Arts Center",
-                "terms": "arts,arts centre"
+                "terms": ""
             },
             "amenity/atm": {
                 "name": "ATM",
-                "terms": ""
+                "terms": "money,cash,machine"
             },
             "amenity/bank": {
                 "name": "Bank",
-                "terms": "coffer,countinghouse,credit union,depository,exchequer,fund,hoard,investment firm,repository,reserve,reservoir,safe,savings,stock,stockpile,store,storehouse,thrift,treasury,trust company,vault"
+                "terms": "credit union,check,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault"
             },
             "amenity/bar": {
                 "name": "Bar",
-                "terms": ""
+                "terms": "dive,beer,bier,booze"
+            },
+            "amenity/bbq": {
+                "name": "Barbecue/Grill",
+                "terms": "bbq"
             },
             "amenity/bench": {
                 "name": "Bench",
             },
             "amenity/bicycle_parking": {
                 "name": "Bicycle Parking",
-                "terms": ""
+                "terms": "bike"
             },
             "amenity/bicycle_rental": {
                 "name": "Bicycle Rental",
-                "terms": ""
+                "terms": "bike"
             },
             "amenity/boat_rental": {
                 "name": "Boat Rental",
                 "terms": ""
             },
+            "amenity/bureau_de_change": {
+                "name": "Currency Exchange",
+                "terms": "bureau de change,money changer"
+            },
+            "amenity/bus_station": {
+                "name": "Bus Station",
+                "terms": ""
+            },
             "amenity/cafe": {
                 "name": "Cafe",
-                "terms": "coffee,tea,coffee shop"
+                "terms": "coffee,tea"
             },
             "amenity/car_rental": {
                 "name": "Car Rental",
                 "name": "Car Wash",
                 "terms": ""
             },
+            "amenity/charging_station": {
+                "name": "Charging Station",
+                "terms": "EV,Electric Vehicle,Supercharger"
+            },
             "amenity/childcare": {
-                "name": "Childcare",
-                "terms": "nursery,orphanage,playgroup"
+                "name": "Nursery/Childcare",
+                "terms": "daycare,orphanage,playgroup"
             },
             "amenity/cinema": {
                 "name": "Cinema",
-                "terms": "big screen,bijou,cine,drive-in,film,flicks,motion pictures,movie house,movie theater,moving pictures,nabes,photoplay,picture show,pictures,playhouse,show,silver screen"
+                "terms": "drive-in,film,flick,movie,theater,picture,show,screen"
+            },
+            "amenity/clinic": {
+                "name": "Clinic",
+                "terms": "medical,urgentcare"
+            },
+            "amenity/clock": {
+                "name": "Clock",
+                "terms": ""
             },
             "amenity/college": {
-                "name": "College",
+                "name": "College Grounds",
+                "terms": "university"
+            },
+            "amenity/community_centre": {
+                "name": "Community Center",
+                "terms": "event,hall"
+            },
+            "amenity/compressed_air": {
+                "name": "Compressed Air",
                 "terms": ""
             },
             "amenity/courthouse": {
                 "name": "Courthouse",
                 "terms": ""
             },
+            "amenity/dentist": {
+                "name": "Dentist",
+                "terms": "tooth,teeth"
+            },
+            "amenity/doctor": {
+                "name": "Doctor",
+                "terms": "medic*"
+            },
+            "amenity/dojo": {
+                "name": "Dojo / Martial Arts Academy",
+                "terms": "martial arts,dojang"
+            },
             "amenity/drinking_water": {
                 "name": "Drinking Water",
-                "terms": "water fountain,potable water"
+                "terms": "fountain,potable"
             },
             "amenity/embassy": {
                 "name": "Embassy",
             },
             "amenity/fast_food": {
                 "name": "Fast Food",
-                "terms": ""
+                "terms": "restaurant"
             },
             "amenity/fire_station": {
                 "name": "Fire Station",
                 "terms": ""
             },
             "amenity/hospital": {
-                "name": "Hospital",
-                "terms": "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
+                "name": "Hospital Grounds",
+                "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
             },
             "amenity/kindergarten": {
-                "name": "Kindergarten",
-                "terms": "nursery,preschool"
+                "name": "Preschool/Kindergarten Grounds",
+                "terms": "kindergarden,pre-school"
             },
             "amenity/library": {
                 "name": "Library",
-                "terms": ""
+                "terms": "book"
             },
             "amenity/marketplace": {
                 "name": "Marketplace",
                 "terms": ""
             },
+            "amenity/nightclub": {
+                "name": "Nightclub",
+                "terms": "disco*,night club,dancing,dance club"
+            },
             "amenity/parking": {
                 "name": "Car Parking",
                 "terms": ""
             },
+            "amenity/parking_entrance": {
+                "name": "Parking Garage Entrance/Exit",
+                "terms": ""
+            },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
-                "terms": ""
+                "terms": "drug,medicine"
             },
             "amenity/place_of_worship": {
                 "name": "Place of Worship",
             },
             "amenity/place_of_worship/christian": {
                 "name": "Church",
-                "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
+                "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
             },
             "amenity/place_of_worship/jewish": {
                 "name": "Synagogue",
-                "terms": "jewish,synagogue"
+                "terms": "jewish"
             },
             "amenity/place_of_worship/muslim": {
                 "name": "Mosque",
-                "terms": "muslim,mosque"
+                "terms": "muslim"
             },
             "amenity/police": {
                 "name": "Police",
-                "terms": "badge,bear,blue,bluecoat,bobby,boy scout,bull,constable,constabulary,cop,copper,corps,county mounty,detective,fed,flatfoot,force,fuzz,gendarme,gumshoe,heat,law,law enforcement,man,narc,officers,patrolman,police"
+                "terms": "badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol"
             },
             "amenity/post_box": {
                 "name": "Mailbox",
-                "terms": "letter drop,letterbox,mail drop,mailbox,pillar box,postbox"
+                "terms": "letter,post"
             },
             "amenity/post_office": {
                 "name": "Post Office",
-                "terms": ""
+                "terms": "letter,mail"
             },
             "amenity/pub": {
                 "name": "Pub",
-                "terms": ""
+                "terms": "dive,beer,bier,booze"
             },
             "amenity/ranger_station": {
                 "name": "Ranger Station",
                 "terms": "visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center"
             },
+            "amenity/recycling": {
+                "name": "Recycling",
+                "terms": "can,bottle,garbage,scrap,trash"
+            },
             "amenity/restaurant": {
                 "name": "Restaurant",
-                "terms": "bar,cafeteria,café,canteen,chophouse,coffee shop,diner,dining room,dive*,doughtnut shop,drive-in,eatery,eating house,eating place,fast-food place,fish and chips,greasy spoon,grill,hamburger stand,hashery,hideaway,hotdog stand,inn,joint*,luncheonette,lunchroom,night club,outlet*,pizzeria,saloon,soda fountain,watering hole"
+                "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
             },
             "amenity/school": {
-                "name": "School",
-                "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university"
+                "name": "School Grounds",
+                "terms": "academy,elementary school,middle school,high school"
             },
             "amenity/shelter": {
                 "name": "Shelter",
-                "terms": "lean-to"
+                "terms": "lean-to,gazebo,picnic"
+            },
+            "amenity/social_facility": {
+                "name": "Social Facility",
+                "terms": ""
+            },
+            "amenity/social_facility/food_bank": {
+                "name": "Food Bank",
+                "terms": ""
+            },
+            "amenity/social_facility/group_home": {
+                "name": "Elderly Group Home",
+                "terms": "old,senior,living"
+            },
+            "amenity/social_facility/homeless_shelter": {
+                "name": "Homeless Shelter",
+                "terms": "houseless,unhoused,displaced"
+            },
+            "amenity/studio": {
+                "name": "Studio",
+                "terms": "recording,radio,television"
             },
             "amenity/swimming_pool": {
                 "name": "Swimming Pool",
             },
             "amenity/telephone": {
                 "name": "Telephone",
-                "terms": ""
+                "terms": "phone"
             },
             "amenity/theatre": {
                 "name": "Theater",
             },
             "amenity/townhall": {
                 "name": "Town Hall",
-                "terms": "village hall,city government,courthouse,municipal building,municipal center,municipal centre"
+                "terms": "village,city,government,courthouse,municipal"
             },
             "amenity/university": {
-                "name": "University",
+                "name": "University Grounds",
                 "terms": "college"
             },
             "amenity/vending_machine": {
                 "name": "Vending Machine",
-                "terms": ""
+                "terms": "snack,soda,ticket"
+            },
+            "amenity/veterinary": {
+                "name": "Veterinary",
+                "terms": "pet clinic,veterinarian,animal hospital,pet doctor"
             },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
-                "terms": "rubbish bin,litter bin,trash can,garbage can"
+                "terms": "rubbish,litter,trash,garbage"
             },
             "area": {
                 "name": "Area",
                 "name": "Apartments",
                 "terms": ""
             },
+            "building/barn": {
+                "name": "Barn",
+                "terms": ""
+            },
+            "building/bunker": {
+                "name": "Bunker",
+                "terms": ""
+            },
+            "building/cabin": {
+                "name": "Cabin",
+                "terms": ""
+            },
+            "building/cathedral": {
+                "name": "Cathedral",
+                "terms": ""
+            },
+            "building/chapel": {
+                "name": "Chapel",
+                "terms": ""
+            },
+            "building/church": {
+                "name": "Church",
+                "terms": ""
+            },
+            "building/college": {
+                "name": "College Building",
+                "terms": "university"
+            },
             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
             },
+            "building/construction": {
+                "name": "Building Under Construction",
+                "terms": ""
+            },
+            "building/detached": {
+                "name": "Detached Home",
+                "terms": ""
+            },
+            "building/dormitory": {
+                "name": "Dormitory",
+                "terms": ""
+            },
             "building/entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "building/garage": {
                 "name": "Garage",
                 "terms": ""
             },
+            "building/garages": {
+                "name": "Garages",
+                "terms": ""
+            },
+            "building/greenhouse": {
+                "name": "Greenhouse",
+                "terms": ""
+            },
+            "building/hospital": {
+                "name": "Hospital Building",
+                "terms": ""
+            },
+            "building/hotel": {
+                "name": "Hotel Building",
+                "terms": ""
+            },
             "building/house": {
                 "name": "House",
                 "terms": ""
                 "name": "Industrial Building",
                 "terms": ""
             },
+            "building/kindergarten": {
+                "name": "Preschool/Kindergarten Building",
+                "terms": "kindergarden,pre-school"
+            },
+            "building/public": {
+                "name": "Public Building",
+                "terms": ""
+            },
             "building/residential": {
                 "name": "Residential Building",
                 "terms": ""
             },
+            "building/retail": {
+                "name": "Retail Building",
+                "terms": ""
+            },
+            "building/roof": {
+                "name": "Roof",
+                "terms": ""
+            },
+            "building/school": {
+                "name": "School Building",
+                "terms": "academy,elementary school,middle school,high school"
+            },
+            "building/shed": {
+                "name": "Shed",
+                "terms": ""
+            },
+            "building/stable": {
+                "name": "Stable",
+                "terms": ""
+            },
+            "building/static_caravan": {
+                "name": "Static Mobile Home",
+                "terms": ""
+            },
+            "building/terrace": {
+                "name": "Row Houses",
+                "terms": ""
+            },
+            "building/train_station": {
+                "name": "Train Station",
+                "terms": ""
+            },
+            "building/university": {
+                "name": "University Building",
+                "terms": "college"
+            },
+            "building/warehouse": {
+                "name": "Warehouse",
+                "terms": ""
+            },
+            "craft": {
+                "name": "Craft",
+                "terms": ""
+            },
+            "craft/basket_maker": {
+                "name": "Basket Maker",
+                "terms": ""
+            },
+            "craft/beekeeper": {
+                "name": "Beekeeper",
+                "terms": ""
+            },
+            "craft/blacksmith": {
+                "name": "Blacksmith",
+                "terms": ""
+            },
+            "craft/boatbuilder": {
+                "name": "Boat Builder",
+                "terms": ""
+            },
+            "craft/bookbinder": {
+                "name": "Bookbinder",
+                "terms": "book repair"
+            },
+            "craft/brewery": {
+                "name": "Brewery",
+                "terms": "beer,bier"
+            },
+            "craft/carpenter": {
+                "name": "Carpenter",
+                "terms": "woodworker"
+            },
+            "craft/carpet_layer": {
+                "name": "Carpet Layer",
+                "terms": ""
+            },
+            "craft/caterer": {
+                "name": "Caterer",
+                "terms": ""
+            },
+            "craft/clockmaker": {
+                "name": "Clockmaker",
+                "terms": ""
+            },
+            "craft/confectionary": {
+                "name": "Confectionary",
+                "terms": "sweets,candy"
+            },
+            "craft/dressmaker": {
+                "name": "Dressmaker",
+                "terms": "seamstress"
+            },
+            "craft/electrician": {
+                "name": "Electrician",
+                "terms": "power,wire"
+            },
+            "craft/gardener": {
+                "name": "Gardener",
+                "terms": "landscaper,grounds keeper"
+            },
+            "craft/glaziery": {
+                "name": "Glaziery",
+                "terms": "glass,stained-glass,window"
+            },
+            "craft/handicraft": {
+                "name": "Handicraft",
+                "terms": ""
+            },
+            "craft/hvac": {
+                "name": "HVAC",
+                "terms": "heat*,vent*,air conditioning"
+            },
+            "craft/insulator": {
+                "name": "Insulator",
+                "terms": ""
+            },
+            "craft/jeweler": {
+                "name": "Jeweler",
+                "terms": ""
+            },
+            "craft/key_cutter": {
+                "name": "Key Cutter",
+                "terms": ""
+            },
+            "craft/locksmith": {
+                "name": "Locksmith",
+                "terms": ""
+            },
+            "craft/metal_construction": {
+                "name": "Metal Construction",
+                "terms": ""
+            },
+            "craft/optician": {
+                "name": "Optician",
+                "terms": ""
+            },
+            "craft/painter": {
+                "name": "Painter",
+                "terms": ""
+            },
+            "craft/photographer": {
+                "name": "Photographer",
+                "terms": ""
+            },
+            "craft/photographic_laboratory": {
+                "name": "Photographic Laboratory",
+                "terms": "film"
+            },
+            "craft/plasterer": {
+                "name": "Plasterer",
+                "terms": ""
+            },
+            "craft/plumber": {
+                "name": "Plumber",
+                "terms": "pipe"
+            },
+            "craft/pottery": {
+                "name": "Pottery",
+                "terms": "ceramic"
+            },
+            "craft/rigger": {
+                "name": "Rigger",
+                "terms": ""
+            },
+            "craft/roofer": {
+                "name": "Roofer",
+                "terms": ""
+            },
+            "craft/saddler": {
+                "name": "Saddler",
+                "terms": ""
+            },
+            "craft/sailmaker": {
+                "name": "Sailmaker",
+                "terms": ""
+            },
+            "craft/sawmill": {
+                "name": "Sawmill",
+                "terms": "lumber"
+            },
+            "craft/scaffolder": {
+                "name": "Scaffolder",
+                "terms": ""
+            },
+            "craft/sculpter": {
+                "name": "Sculpter",
+                "terms": ""
+            },
+            "craft/shoemaker": {
+                "name": "Shoemaker",
+                "terms": "cobbler"
+            },
+            "craft/stonemason": {
+                "name": "Stonemason",
+                "terms": "masonry"
+            },
+            "craft/sweep": {
+                "name": "Chimney Sweep",
+                "terms": ""
+            },
+            "craft/tailor": {
+                "name": "Tailor",
+                "terms": "clothes,suit"
+            },
+            "craft/tiler": {
+                "name": "Tiler",
+                "terms": ""
+            },
+            "craft/tinsmith": {
+                "name": "Tinsmith",
+                "terms": ""
+            },
+            "craft/upholsterer": {
+                "name": "Upholsterer",
+                "terms": ""
+            },
+            "craft/watchmaker": {
+                "name": "Watchmaker",
+                "terms": ""
+            },
+            "craft/window_construction": {
+                "name": "Window Construction",
+                "terms": "glass"
+            },
+            "craft/winery": {
+                "name": "Winery",
+                "terms": ""
+            },
+            "embankment": {
+                "name": "Embankment",
+                "terms": ""
+            },
             "emergency/ambulance_station": {
                 "name": "Ambulance Station",
-                "terms": ""
+                "terms": "EMS,EMT,rescue"
             },
             "emergency/fire_hydrant": {
                 "name": "Fire Hydrant",
                 "terms": ""
             },
             "entrance": {
-                "name": "Entrance",
+                "name": "Entrance/Exit",
                 "terms": ""
             },
             "footway/crossing": {
                 "name": "Crossing",
-                "terms": "crosswalk,zebra crossing"
+                "terms": ""
+            },
+            "footway/crosswalk": {
+                "name": "Crosswalk",
+                "terms": "zebra crossing"
             },
             "footway/sidewalk": {
                 "name": "Sidewalk",
                 "terms": ""
             },
+            "ford": {
+                "name": "Ford",
+                "terms": ""
+            },
+            "golf/bunker": {
+                "name": "Sand Trap",
+                "terms": "hazard,bunker"
+            },
+            "golf/fairway": {
+                "name": "Fairway",
+                "terms": ""
+            },
+            "golf/green": {
+                "name": "Putting Green",
+                "terms": ""
+            },
+            "golf/hole": {
+                "name": "Golf Hole",
+                "terms": ""
+            },
+            "golf/lateral_water_hazard": {
+                "name": "Lateral Water Hazard",
+                "terms": ""
+            },
+            "golf/rough": {
+                "name": "Rough",
+                "terms": ""
+            },
+            "golf/tee": {
+                "name": "Tee Box",
+                "terms": "teeing ground"
+            },
+            "golf/water_hazard": {
+                "name": "Water Hazard",
+                "terms": ""
+            },
             "highway": {
                 "name": "Highway",
                 "terms": ""
             },
             "highway/bridleway": {
                 "name": "Bridle Path",
-                "terms": "bridleway,equestrian trail,horse riding path,bridle road,horse trail"
+                "terms": "bridleway,equestrian,horse"
             },
             "highway/bus_stop": {
                 "name": "Bus Stop",
             },
             "highway/crossing": {
                 "name": "Crossing",
-                "terms": "crosswalk,zebra crossing"
+                "terms": ""
+            },
+            "highway/crosswalk": {
+                "name": "Crosswalk",
+                "terms": "zebra crossing"
             },
             "highway/cycleway": {
                 "name": "Cycle Path",
-                "terms": ""
+                "terms": "bike"
             },
             "highway/footway": {
                 "name": "Foot Path",
-                "terms": "beaten path,boulevard,clearing,course,cut*,drag*,footpath,highway,lane,line,orbit,passage,pathway,rail,rails,road,roadway,route,street,thoroughfare,trackway,trail,trajectory,walk"
+                "terms": "hike,hiking,trackway,trail,walk"
             },
             "highway/living_street": {
                 "name": "Living Street",
                 "terms": ""
             },
             "highway/motorway_junction": {
-                "name": "Motorway Junction",
+                "name": "Motorway Junction / Exit",
                 "terms": ""
             },
             "highway/motorway_link": {
             },
             "highway/path": {
                 "name": "Path",
-                "terms": ""
+                "terms": "hike,hiking,trackway,trail,walk"
             },
             "highway/pedestrian": {
                 "name": "Pedestrian",
                 "name": "Primary Link",
                 "terms": "ramp,on ramp,off ramp"
             },
+            "highway/raceway": {
+                "name": "Motor Raceway",
+                "terms": "auto*,race*,nascar"
+            },
             "highway/residential": {
                 "name": "Residential Road",
                 "terms": ""
             },
+            "highway/rest_area": {
+                "name": "Rest Area",
+                "terms": "rest stop"
+            },
             "highway/road": {
                 "name": "Unknown Road",
                 "terms": ""
                 "name": "Parking Aisle",
                 "terms": ""
             },
+            "highway/services": {
+                "name": "Service Area",
+                "terms": "services,travel plaza,service station"
+            },
             "highway/steps": {
                 "name": "Steps",
                 "terms": "stairs,staircase"
                 "name": "Stop Sign",
                 "terms": "stop sign"
             },
+            "highway/street_lamp": {
+                "name": "Street Lamp",
+                "terms": "streetlight,street light,lamp,light,gaslight"
+            },
             "highway/tertiary": {
                 "name": "Tertiary Road",
                 "terms": ""
             },
             "highway/track": {
                 "name": "Track",
-                "terms": ""
+                "terms": "woods road,fire road"
             },
             "highway/traffic_signals": {
                 "name": "Traffic Signals",
             },
             "highway/turning_circle": {
                 "name": "Turning Circle",
-                "terms": ""
+                "terms": "cul-de-sac"
             },
             "highway/unclassified": {
                 "name": "Unclassified Road",
                 "name": "Cemetery",
                 "terms": ""
             },
+            "landuse/churchyard": {
+                "name": "Churchyard",
+                "terms": ""
+            },
             "landuse/commercial": {
                 "name": "Commercial",
                 "terms": ""
                 "name": "Farm",
                 "terms": ""
             },
+            "landuse/farmland": {
+                "name": "Farmland",
+                "terms": ""
+            },
             "landuse/farmyard": {
                 "name": "Farmyard",
                 "terms": ""
                 "name": "Industrial",
                 "terms": ""
             },
+            "landuse/landfill": {
+                "name": "Landfill",
+                "terms": "dump"
+            },
             "landuse/meadow": {
                 "name": "Meadow",
                 "terms": ""
             },
+            "landuse/military": {
+                "name": "Military",
+                "terms": ""
+            },
             "landuse/orchard": {
                 "name": "Orchard",
                 "terms": ""
                 "name": "Dog Park",
                 "terms": ""
             },
+            "leisure/firepit": {
+                "name": "Firepit",
+                "terms": "fireplace,campfire"
+            },
             "leisure/garden": {
                 "name": "Garden",
                 "terms": ""
             },
             "leisure/golf_course": {
                 "name": "Golf Course",
-                "terms": ""
+                "terms": "links"
+            },
+            "leisure/ice_rink": {
+                "name": "Ice Rink",
+                "terms": "hockey,skating,curling"
             },
             "leisure/marina": {
                 "name": "Marina",
-                "terms": ""
+                "terms": "boat"
             },
             "leisure/park": {
                 "name": "Park",
                 "terms": "esplanade,estate,forest,garden,grass,green,grounds,lawn,lot,meadow,parkland,place,playground,plaza,pleasure garden,recreation area,square,tract,village green,woodland"
             },
+            "leisure/picnic_table": {
+                "name": "Picnic Table",
+                "terms": "bench"
+            },
             "leisure/pitch": {
                 "name": "Sport Pitch",
-                "terms": ""
+                "terms": "field"
             },
             "leisure/pitch/american_football": {
                 "name": "American Football Field",
                 "name": "Playground",
                 "terms": "jungle gym,play area"
             },
+            "leisure/running_track": {
+                "name": "Running Track",
+                "terms": ""
+            },
             "leisure/slipway": {
                 "name": "Slipway",
-                "terms": ""
+                "terms": "boat launch,boat ramp"
             },
             "leisure/sports_center": {
-                "name": "Sports Center",
+                "name": "Sports Center / Gym",
                 "terms": "gym"
             },
             "leisure/stadium": {
                 "terms": ""
             },
             "leisure/track": {
-                "name": "Race Track",
+                "name": "Racetrack (non-Motorsport)",
                 "terms": ""
             },
             "line": {
                 "name": "Cut line",
                 "terms": ""
             },
+            "man_made/embankment": {
+                "name": "Embankment",
+                "terms": ""
+            },
+            "man_made/flagpole": {
+                "name": "Flagpole",
+                "terms": ""
+            },
             "man_made/lighthouse": {
                 "name": "Lighthouse",
                 "terms": ""
             },
             "man_made/wastewater_plant": {
                 "name": "Wastewater Plant",
-                "terms": "sewage works,sewage treatment plant,water treatment plant,reclamation plant"
+                "terms": "sewage*,water treatment plant,reclamation plant"
             },
             "man_made/water_tower": {
                 "name": "Water Tower",
                 "terms": ""
             },
             "man_made/water_well": {
-                "name": "Water well",
+                "name": "Water Well",
                 "terms": ""
             },
             "man_made/water_works": {
                 "name": "Water Works",
                 "terms": ""
             },
+            "military/airfield": {
+                "name": "Airfield",
+                "terms": ""
+            },
+            "military/barracks": {
+                "name": "Barracks",
+                "terms": ""
+            },
+            "military/bunker": {
+                "name": "Bunker",
+                "terms": ""
+            },
+            "military/range": {
+                "name": "Military Range",
+                "terms": ""
+            },
             "natural": {
                 "name": "Natural",
                 "terms": ""
             },
             "office/employment_agency": {
                 "name": "Employment Agency",
-                "terms": ""
+                "terms": "job"
             },
             "office/estate_agent": {
                 "name": "Real Estate Office",
                 "name": "Travel Agency",
                 "terms": ""
             },
+            "piste": {
+                "name": "Piste/Ski Trail",
+                "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+            },
             "place": {
                 "name": "Place",
                 "terms": ""
                 "name": "Locality",
                 "terms": ""
             },
+            "place/neighbourhood": {
+                "name": "Neighborhood",
+                "terms": "neighbourhood"
+            },
+            "place/suburb": {
+                "name": "Borough",
+                "terms": "Boro,Quarter"
+            },
             "place/town": {
                 "name": "Town",
                 "terms": ""
                 "name": "Substation",
                 "terms": ""
             },
+            "power/substation": {
+                "name": "Substation",
+                "terms": ""
+            },
             "power/tower": {
                 "name": "High-Voltage Tower",
                 "terms": ""
                 "name": "Transformer",
                 "terms": ""
             },
+            "public_transport/platform": {
+                "name": "Platform",
+                "terms": ""
+            },
+            "public_transport/stop_position": {
+                "name": "Stop Position",
+                "terms": ""
+            },
             "railway": {
                 "name": "Railway",
                 "terms": ""
                 "name": "Disused Railway",
                 "terms": ""
             },
+            "railway/funicular": {
+                "name": "Funicular",
+                "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
+            },
             "railway/halt": {
                 "name": "Railway Halt",
                 "terms": "break,interrupt,rest,wait,interruption"
                 "name": "Monorail",
                 "terms": ""
             },
+            "railway/narrow_gauge": {
+                "name": "Narrow Gauge Rail",
+                "terms": "narrow gauge railway,narrow gauge railroad"
+            },
             "railway/platform": {
                 "name": "Railway Platform",
                 "terms": ""
             },
             "shop/alcohol": {
                 "name": "Liquor Store",
-                "terms": "alcohol"
+                "terms": "alcohol,beer,booze,wine"
+            },
+            "shop/anime": {
+                "name": "Anime Shop",
+                "terms": ""
+            },
+            "shop/antiques": {
+                "name": "Antiques Shop",
+                "terms": ""
+            },
+            "shop/art": {
+                "name": "Art Gallery",
+                "terms": ""
+            },
+            "shop/baby_goods": {
+                "name": "Baby Goods Store",
+                "terms": ""
+            },
+            "shop/bag": {
+                "name": "Bag/Luggage Store",
+                "terms": "handbag,purse"
             },
             "shop/bakery": {
                 "name": "Bakery",
                 "terms": ""
             },
+            "shop/bathroom_furnishing": {
+                "name": "Bathroom Furnishing Store",
+                "terms": ""
+            },
             "shop/beauty": {
                 "name": "Beauty Shop",
                 "terms": "nail spa,spa,salon,tanning"
             },
+            "shop/bed": {
+                "name": "Bedding/Mattress Store",
+                "terms": ""
+            },
             "shop/beverages": {
                 "name": "Beverage Store",
                 "terms": ""
                 "name": "Bicycle Shop",
                 "terms": ""
             },
+            "shop/bookmaker": {
+                "name": "Bookmaker",
+                "terms": ""
+            },
             "shop/books": {
-                "name": "Bookstore",
+                "name": "Book Store",
                 "terms": ""
             },
             "shop/boutique": {
             },
             "shop/butcher": {
                 "name": "Butcher",
+                "terms": "meat"
+            },
+            "shop/candles": {
+                "name": "Candle Shop",
                 "terms": ""
             },
             "shop/car": {
                 "name": "Car Dealership",
-                "terms": ""
+                "terms": "auto"
             },
             "shop/car_parts": {
                 "name": "Car Parts Store",
-                "terms": ""
+                "terms": "auto"
             },
             "shop/car_repair": {
                 "name": "Car Repair Shop",
+                "terms": "auto"
+            },
+            "shop/carpet": {
+                "name": "Carpet Store",
+                "terms": "rug"
+            },
+            "shop/cheese": {
+                "name": "Cheese Store",
                 "terms": ""
             },
             "shop/chemist": {
                 "name": "Chemist",
                 "terms": ""
             },
+            "shop/chocolate": {
+                "name": "Chocolate Store",
+                "terms": ""
+            },
             "shop/clothes": {
                 "name": "Clothing Store",
                 "terms": ""
                 "terms": ""
             },
             "shop/confectionery": {
-                "name": "Confectionery",
+                "name": "Candy Store",
                 "terms": ""
             },
             "shop/convenience": {
                 "name": "Convenience Store",
                 "terms": ""
             },
+            "shop/copyshop": {
+                "name": "Copy Store",
+                "terms": ""
+            },
+            "shop/cosmetics": {
+                "name": "Cosmetics Store",
+                "terms": ""
+            },
+            "shop/craft": {
+                "name": "Arts and Crafts Store",
+                "terms": ""
+            },
+            "shop/curtain": {
+                "name": "Curtain Store",
+                "terms": "drape*,window"
+            },
+            "shop/dairy": {
+                "name": "Dairy Store",
+                "terms": "milk,egg,cheese"
+            },
             "shop/deli": {
                 "name": "Deli",
-                "terms": ""
+                "terms": "lunch,meat,sandwich"
             },
             "shop/department_store": {
                 "name": "Department Store",
                 "terms": ""
             },
             "shop/dry_cleaning": {
-                "name": "Dry Cleaners",
+                "name": "Dry Cleaner",
                 "terms": ""
             },
             "shop/electronics": {
                 "name": "Electronics Store",
-                "terms": ""
+                "terms": "appliance,audio,computer,tv"
+            },
+            "shop/erotic": {
+                "name": "Erotic Store",
+                "terms": "sex,porn"
+            },
+            "shop/fabric": {
+                "name": "Fabric Store",
+                "terms": "sew"
             },
             "shop/farm": {
                 "name": "Produce Stand",
                 "terms": "farm shop,farm stand"
             },
+            "shop/fashion": {
+                "name": "Fashion Store",
+                "terms": ""
+            },
             "shop/fishmonger": {
                 "name": "Fishmonger",
                 "terms": ""
             },
             "shop/florist": {
                 "name": "Florist",
+                "terms": "flower"
+            },
+            "shop/frame": {
+                "name": "Framing Shop",
                 "terms": ""
             },
+            "shop/funeral_directors": {
+                "name": "Funeral Home",
+                "terms": "undertaker,memorial home"
+            },
+            "shop/furnace": {
+                "name": "Furnace Store",
+                "terms": "oven,stove"
+            },
             "shop/furniture": {
                 "name": "Furniture Store",
-                "terms": ""
+                "terms": "chair,sofa,table"
             },
             "shop/garden_centre": {
                 "name": "Garden Center",
-                "terms": "garden centre"
+                "terms": "landscape,mulch,shrub,tree"
             },
             "shop/gift": {
                 "name": "Gift Shop",
             },
             "shop/greengrocer": {
                 "name": "Greengrocer",
-                "terms": ""
+                "terms": "fruit,vegetable"
             },
             "shop/hairdresser": {
                 "name": "Hairdresser",
                 "name": "Hardware Store",
                 "terms": ""
             },
+            "shop/hearing_aids": {
+                "name": "Hearing Aids Store",
+                "terms": ""
+            },
+            "shop/herbalist": {
+                "name": "Herbalist",
+                "terms": ""
+            },
             "shop/hifi": {
                 "name": "Hifi Store",
+                "terms": "stereo,video"
+            },
+            "shop/interior_decoration": {
+                "name": "Interior Decoration Store",
                 "terms": ""
             },
             "shop/jewelry": {
                 "name": "Jeweler",
-                "terms": ""
+                "terms": "diamond,gem,ring"
             },
             "shop/kiosk": {
-                "name": "Kiosk",
+                "name": "News Kiosk",
+                "terms": ""
+            },
+            "shop/kitchen": {
+                "name": "Kitchen Design Store",
                 "terms": ""
             },
             "shop/laundry": {
                 "name": "Laundry",
                 "terms": ""
             },
+            "shop/leather": {
+                "name": "Leather Store",
+                "terms": ""
+            },
             "shop/locksmith": {
                 "name": "Locksmith",
-                "terms": "keys"
+                "terms": "key,lockpick"
+            },
+            "shop/lottery": {
+                "name": "Lottery Shop",
+                "terms": ""
             },
             "shop/mall": {
                 "name": "Mall",
                 "terms": ""
             },
+            "shop/massage": {
+                "name": "Massage Shop",
+                "terms": ""
+            },
+            "shop/medical_supply": {
+                "name": "Medical Supply Store",
+                "terms": ""
+            },
             "shop/mobile_phone": {
                 "name": "Mobile Phone Store",
                 "terms": ""
             },
+            "shop/money_lender": {
+                "name": "Money Lender",
+                "terms": ""
+            },
             "shop/motorcycle": {
                 "name": "Motorcycle Dealership",
                 "terms": ""
             },
             "shop/music": {
                 "name": "Music Store",
+                "terms": "CD,vinyl"
+            },
+            "shop/musical_instrument": {
+                "name": "Musical Instrument Store",
                 "terms": ""
             },
             "shop/newsagent": {
-                "name": "Newsagent",
+                "name": "Newspaper/Magazine Shop",
                 "terms": ""
             },
             "shop/optician": {
                 "name": "Optician",
+                "terms": "eye,glasses"
+            },
+            "shop/organic": {
+                "name": "Organic Goods Store",
                 "terms": ""
             },
             "shop/outdoor": {
-                "name": "Outdoor Store",
+                "name": "Outdoors Store",
+                "terms": "camping,climbing,hiking"
+            },
+            "shop/paint": {
+                "name": "Paint Store",
+                "terms": ""
+            },
+            "shop/pawnbroker": {
+                "name": "Pawn Shop",
                 "terms": ""
             },
             "shop/pet": {
                 "name": "Pet Store",
-                "terms": ""
+                "terms": "cat,dog,fish"
             },
             "shop/photo": {
                 "name": "Photography Store",
+                "terms": "camera,film"
+            },
+            "shop/pyrotechnics": {
+                "name": "Fireworks Store",
+                "terms": ""
+            },
+            "shop/radiotechnics": {
+                "name": "Radio/Electronic Component Store",
                 "terms": ""
             },
+            "shop/religion": {
+                "name": "Religious Store",
+                "terms": ""
+            },
+            "shop/scuba_diving": {
+                "name": "Scuba Diving Shop",
+                "terms": ""
+            },
+            "shop/seafood": {
+                "name": "Seafood Shop",
+                "terms": "fishmonger"
+            },
+            "shop/second_hand": {
+                "name": "Consignment/Thrift Store",
+                "terms": "secondhand,second hand,resale,thrift,used"
+            },
             "shop/shoes": {
                 "name": "Shoe Store",
                 "terms": ""
             },
             "shop/stationery": {
                 "name": "Stationery Store",
-                "terms": ""
+                "terms": "card,paper"
             },
             "shop/supermarket": {
                 "name": "Supermarket",
-                "terms": "bazaar,boutique,chain,co-op,cut-rate store,discount store,five-and-dime,flea market,galleria,grocery store,mall,mart,outlet,outlet store,shop,shopping center,shopping centre,shopping plaza,stand,store,supermarket,thrift shop"
+                "terms": "grocery,store,shop"
+            },
+            "shop/tailor": {
+                "name": "Tailor",
+                "terms": "clothes,suit"
+            },
+            "shop/tattoo": {
+                "name": "Tattoo Parlor",
+                "terms": ""
+            },
+            "shop/tea": {
+                "name": "Tea Store",
+                "terms": ""
+            },
+            "shop/ticket": {
+                "name": "Ticket Seller",
+                "terms": ""
+            },
+            "shop/tobacco": {
+                "name": "Tobacco Shop",
+                "terms": ""
             },
             "shop/toys": {
                 "name": "Toy Store",
                 "name": "Vacant Shop",
                 "terms": ""
             },
+            "shop/vacuum_cleaner": {
+                "name": "Vacuum Cleaner Store",
+                "terms": ""
+            },
             "shop/variety_store": {
                 "name": "Variety Store",
                 "terms": ""
             },
             "shop/video": {
                 "name": "Video Store",
+                "terms": "DVD"
+            },
+            "shop/video_games": {
+                "name": "Video Game Store",
+                "terms": ""
+            },
+            "shop/water_sports": {
+                "name": "Watersport/Swim Shop",
+                "terms": ""
+            },
+            "shop/weapons": {
+                "name": "Weapon Shop",
+                "terms": "ammo,gun,knife,knives"
+            },
+            "shop/window_blind": {
+                "name": "Window Blind Store",
+                "terms": ""
+            },
+            "shop/wine": {
+                "name": "Wine Shop",
                 "terms": ""
             },
             "tourism": {
             },
             "tourism/camp_site": {
                 "name": "Camp Site",
-                "terms": "camping"
+                "terms": ""
             },
             "tourism/caravan_site": {
                 "name": "RV Park",
             },
             "tourism/guest_house": {
                 "name": "Guest House",
-                "terms": "B&B,Bed & Breakfast,Bed and Breakfast"
+                "terms": "B&B,Bed and Breakfast"
             },
             "tourism/hostel": {
                 "name": "Hostel",
             },
             "tourism/museum": {
                 "name": "Museum",
-                "terms": "exhibition,exhibits archive,foundation,gallery,hall,institution,library,menagerie,repository,salon,storehouse,treasury,vault"
+                "terms": "exhibition,foundation,gallery,hall,institution"
             },
             "tourism/picnic_site": {
                 "name": "Picnic Site",
-                "terms": ""
+                "terms": "camp"
             },
             "tourism/theme_park": {
                 "name": "Theme Park",
                 "name": "Zoo",
                 "terms": ""
             },
+            "traffic_calming/bump": {
+                "name": "Speed Bump",
+                "terms": "speed hump"
+            },
+            "traffic_calming/hump": {
+                "name": "Speed Hump",
+                "terms": "speed bump"
+            },
+            "traffic_calming/rumble_strip": {
+                "name": "Rumble Strip",
+                "terms": "sleeper lines,audible lines,growlers"
+            },
+            "traffic_calming/table": {
+                "name": "Raised Pedestrian Crossing",
+                "terms": "speed table,flat top hump"
+            },
             "type/boundary": {
                 "name": "Boundary",
                 "terms": ""
                 "name": "Restriction",
                 "terms": ""
             },
+            "type/restriction/no_left_turn": {
+                "name": "No Left Turn",
+                "terms": ""
+            },
+            "type/restriction/no_right_turn": {
+                "name": "No Right Turn",
+                "terms": ""
+            },
+            "type/restriction/no_straight_on": {
+                "name": "No Straight On",
+                "terms": ""
+            },
+            "type/restriction/no_u_turn": {
+                "name": "No U-turn",
+                "terms": ""
+            },
+            "type/restriction/only_left_turn": {
+                "name": "Left Turn Only",
+                "terms": ""
+            },
+            "type/restriction/only_right_turn": {
+                "name": "Right Turn Only",
+                "terms": ""
+            },
+            "type/restriction/only_straight_on": {
+                "name": "No Turns",
+                "terms": ""
+            },
             "type/route": {
                 "name": "Route",
                 "terms": ""