]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Update to iD v1.9.7
[rails.git] / vendor / assets / iD / iD / locales / en.json
index 04b1b3571f11ed89213dfc413e7934faa87a21ed..0c776b4dbe7663d3737a4499b64bc3033bd6172e 100644 (file)
@@ -72,7 +72,8 @@
                 "area": "Made an area circular."
             },
             "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."
+            "too_large": "This can't be made circular because not enough of it is currently visible.",
+            "connected_to_hidden": "This can't be made circular because it is connected to a hidden feature."
         },
         "orthogonalize": {
             "title": "Square",
                 "area": "Squared the corners of an area."
             },
             "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."
+            "too_large": "This can't be made square because not enough of it is currently visible.",
+            "connected_to_hidden": "This can't be made square because it is connected to a hidden feature."
         },
         "straighten": {
             "title": "Straighten",
             "description": "Straighten this line.",
             "key": "S",
             "annotation": "Straightened a line.",
-            "too_bendy": "This can't be straightened because it bends too much."
+            "too_bendy": "This can't be straightened because it bends too much.",
+            "connected_to_hidden": "This line can't be straightened because it is connected to a hidden feature."
         },
         "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.",
                 "relation": "Deleted a relation.",
                 "multiple": "Deleted {n} objects."
             },
-            "incomplete_relation": "This feature can't be deleted because it hasn't been fully downloaded."
+            "incomplete_relation": "This feature can't be deleted because it hasn't been fully downloaded.",
+            "part_of_relation": "This feature can't be deleted because it's part of a larger relation. You must remove it from the relation first.",
+            "connected_to_hidden": "This can't be deleted because it is connected to a hidden feature."
         },
         "add_member": {
             "annotation": "Added a member to a relation."
             "description": "Disconnect these lines/areas from each other.",
             "key": "D",
             "annotation": "Disconnected lines/areas.",
-            "not_connected": "There aren't enough lines/areas here to disconnect."
+            "not_connected": "There aren't enough lines/areas here to disconnect.",
+            "connected_to_hidden": "This can't be disconnected because it is connected to a hidden feature.",
+            "relation": "This can't be disconnected because it connects members of a relation."
         },
         "merge": {
             "title": "Merge",
-            "description": "Merge these lines.",
+            "description": "Merge these features.",
             "key": "C",
-            "annotation": "Merged {n} lines.",
+            "annotation": "Merged {n} features.",
             "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.",
-            "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded."
+            "not_adjacent": "These features can't be merged because they aren't connected.",
+            "restriction": "These features 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.",
+            "conflicting_tags": "These features can't be merged because some of their tags have conflicting values."
         },
         "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.",
+            "connected_to_hidden": "This can't be moved because it is connected to a hidden feature."
         },
         "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.",
+            "connected_to_hidden": "This can't be rotated because it is connected to a hidden feature."
         },
         "reverse": {
             "title": "Reverse",
                 "multiple": "Split {n} lines/area boundaries."
             },
             "not_eligible": "Lines can't be split at their beginning or end.",
-            "multiple_ways": "There are too many lines here to split."
+            "multiple_ways": "There are too many lines here to split.",
+            "connected_to_hidden": "This can't be split because it is connected to a hidden feature."
+        },
+        "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": {
         "nothing": "Nothing to redo."
     },
     "tooltip_keyhint": "Shortcut:",
-    "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 9 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
+    "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
     "translate": {
         "translate": "Translate",
         "localized_translation_label": "Multilingual name",
     "zoom_in_edit": "Zoom in to Edit",
     "logout": "logout",
     "loading_auth": "Connecting to OpenStreetMap...",
-    "report_a_bug": "report a bug",
+    "report_a_bug": "Report a bug",
+    "help_translate": "Help translate",
+    "feature_info": {
+        "hidden_warning": "{count} hidden features",
+        "hidden_details": "These features are currently hidden: {details}"
+    },
     "status": {
         "error": "Unable to connect to API.",
         "offline": "The API is offline. Please try editing later.",
     },
     "commit": {
         "title": "Save Changes",
-        "description_placeholder": "Brief description of your contributions",
-        "message_label": "Commit message",
+        "description_placeholder": "Brief description of your contributions (required)",
+        "message_label": "Changeset comment",
         "upload_explanation": "The changes you upload will be visible on all maps that use OpenStreetMap data.",
         "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",
-        "created": "Created"
+        "created": "Created",
+        "about_changeset_comments": "About changeset comments",
+        "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
+        "google_warning": "You mentioned Google in this comment: remember that copying from Google Maps is strictly forbidden.",
+        "google_warning_link": "http://www.openstreetmap.org/copyright"
     },
     "contributors": {
         "list": "Edits by {users}",
         "truncated_list": "Edits by {users} and {count} others"
     },
+    "infobox": {
+        "selected": "{n} selected",
+        "geometry": "Geometry",
+        "closed": "closed",
+        "center": "Center",
+        "perimeter": "Perimeter",
+        "length": "Length",
+        "area": "Area",
+        "centroid": "Centroid",
+        "location": "Location",
+        "metric": "Metric",
+        "imperial": "Imperial"
+    },
+    "geometry": {
+        "point": "point",
+        "vertex": "vertex",
+        "line": "line",
+        "area": "area",
+        "relation": "relation"
+    },
     "geocoder": {
         "search": "Search worldwide...",
         "no_results_visible": "No results in visible map area",
         "no_results_worldwide": "No results found"
     },
     "geolocate": {
-        "title": "Show My Location"
+        "title": "Show My Location",
+        "locating": "Locating, please wait..."
     },
     "inspector": {
         "no_documentation_combination": "There is no documentation available for this tag combination",
         "no_documentation_key": "There is no documentation available for this key",
         "show_more": "Show More",
         "view_on_osm": "View on openstreetmap.org",
+        "all_fields": "All fields",
         "all_tags": "All tags",
         "all_members": "All members",
         "all_relations": "All relations",
             "yes": "Yes",
             "no": "No"
         },
+        "add": "Add",
         "none": "None",
         "node": "Node",
         "way": "Way",
         "relation": "Relation",
-        "location": "Location"
+        "location": "Location",
+        "add_fields": "Add field:"
     },
     "background": {
         "title": "Background",
         "description": "Background settings",
         "percent_brightness": "{opacity}% brightness",
         "none": "None",
+        "best_imagery": "Best known imagery source for this location",
+        "switch": "Switch back to this background",
         "custom": "Custom",
         "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"
+        "fix_misalignment": "Adjust imagery offset",
+        "imagery_source_faq": "Where does this imagery come from?",
+        "reset": "reset",
+        "offset": "Drag anywhere in the gray area below to adjust the imagery offset, or enter the offset values in meters.",
+        "minimap": {
+            "description": "Minimap",
+            "tooltip": "Show a zoomed out map to help locate the area currently displayed."
+        }
+    },
+    "map_data": {
+        "title": "Map Data",
+        "description": "Map Data",
+        "data_layers": "Data Layers",
+        "fill_area": "Fill Areas",
+        "map_features": "Map Features",
+        "autohidden": "These features have been automatically hidden because too many would be shown on the screen.  You can zoom in to edit them."
+    },
+    "feature": {
+        "points": {
+            "description": "Points",
+            "tooltip": "Points of Interest"
+        },
+        "traffic_roads": {
+            "description": "Traffic Roads",
+            "tooltip": "Highways, Streets, etc."
+        },
+        "service_roads": {
+            "description": "Service Roads",
+            "tooltip": "Service Roads, Parking Aisles, Tracks, etc."
+        },
+        "paths": {
+            "description": "Paths",
+            "tooltip": "Sidewalks, Foot Paths, Cycle Paths, etc."
+        },
+        "buildings": {
+            "description": "Buildings",
+            "tooltip": "Buildings, Shelters, Garages, etc."
+        },
+        "landuse": {
+            "description": "Landuse Features",
+            "tooltip": "Forests, Farmland, Parks, Residential, Commercial, etc."
+        },
+        "boundaries": {
+            "description": "Boundaries",
+            "tooltip": "Administrative Boundaries"
+        },
+        "water": {
+            "description": "Water Features",
+            "tooltip": "Rivers, Lakes, Ponds, Basins, etc."
+        },
+        "rail": {
+            "description": "Rail Features",
+            "tooltip": "Railways"
+        },
+        "power": {
+            "description": "Power Features",
+            "tooltip": "Power Lines, Power Plants, Substations, etc."
+        },
+        "past_future": {
+            "description": "Past/Future",
+            "tooltip": "Proposed, Construction, Abandoned, Demolished, etc."
+        },
+        "others": {
+            "description": "Others",
+            "tooltip": "Everything Else"
+        }
+    },
+    "area_fill": {
+        "wireframe": {
+            "description": "No Fill (Wireframe)",
+            "tooltip": "Enabling wireframe mode makes it easy to see the background imagery."
+        },
+        "partial": {
+            "description": "Partial Fill",
+            "tooltip": "Areas are drawn with fill only around their inner edges. (Recommended for beginner mappers)"
+        },
+        "full": {
+            "description": "Full Fill",
+            "tooltip": "Areas are drawn fully filled."
+        }
     },
     "restore": {
         "heading": "You have unsaved changes",
         "title": "Save",
         "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",
+        "error": "Errors occurred while trying to save",
+        "status_code": "Server returned status code {code}",
+        "unknown_error_details": "Please ensure you are connected to the internet.",
         "uploading": "Uploading changes to OpenStreetMap.",
-        "unsaved_changes": "You have unsaved changes"
+        "unsaved_changes": "You have unsaved changes",
+        "conflict": {
+            "header": "Resolve conflicting edits",
+            "count": "Conflict {num} of {total}",
+            "previous": "< Previous",
+            "next": "Next >",
+            "keep_local": "Keep mine",
+            "keep_remote": "Use theirs",
+            "restore": "Restore",
+            "delete": "Leave Deleted",
+            "download_changes": "Or download your changes.",
+            "done": "All conflicts resolved!",
+            "help": "Another user changed some of the same map features you changed.\nClick on each item below for more details about the conflict, and choose whether to keep\nyour changes or the other user's changes.\n"
+        }
+    },
+    "merge_remote_changes": {
+        "conflict": {
+            "deleted": "This object has been deleted by {user}.",
+            "location": "This object was moved by both you and {user}.",
+            "nodelist": "Nodes were changed by both you and {user}.",
+            "memberlist": "Relation members were changed by both you and {user}.",
+            "tags": "You changed the <b>{tag}</b> tag to \"{local}\" and {user} changed it to \"{remote}\"."
+        }
     },
     "success": {
         "edited_osm": "Edited OSM!",
         "facebook": "Share on Facebook",
         "twitter": "Share on Twitter",
         "google": "Share on Google+",
-        "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer\n(<a href='https://help.openstreetmap.org/questions/4705/why-havent-my-changes-appeared-on-the-map' target='_blank'>details</a>).\n"
+        "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer.",
+        "help_link_text": "Details",
+        "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F"
     },
     "confirm": {
-        "okay": "Okay"
+        "okay": "Okay",
+        "cancel": "Cancel"
     },
     "splash": {
         "welcome": "Welcome to the iD OpenStreetMap editor",
         "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_tooltip": "Select a feature type that describes what this {geometry} is.",
+        "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": {
         "out": "Zoom Out"
     },
     "cannot_zoom": "Cannot zoom out further in current mode.",
+    "full_screen": "Toggle Full Screen",
     "gpx": {
         "local_layer": "Local GPX file",
         "drag_drop": "Drag and drop a .gpx file on the page, or click the button to the right to browse",
         "zoom": "Zoom to GPX track",
         "browse": "Browse for a .gpx file"
     },
+    "mapillary_images": {
+        "tooltip": "Street-level photos from Mapillary",
+        "title": "Photo Overlay (Mapillary)"
+    },
+    "mapillary_signs": {
+        "tooltip": "Traffic signs from Mapillary (must enable Photo Overlay)",
+        "title": "Traffic Sign Overlay (Mapillary)"
+    },
+    "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/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",
+        "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 to\n[log in](https://www.openstreetmap.org/login).\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\n### Using the editor\n\nA list of available keyboard shortcuts can be found [here](http://wiki.openstreetmap.org/wiki/ID/Shortcuts).\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",
+        "gps": "# GPS\n\nCollected GPS traces are one valuable 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[Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\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 purple\nline. Click on the 'Map Data' 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",
         "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the right.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n",
         "addresses": "# Addresses\n\nAddresses are some of the most useful information for the map.\n\nAlthough addresses are often represented as parts of streets, in OpenStreetMap\nthey're recorded as attributes of buildings and places along streets.\n\nYou can add address information to places mapped as building outlines\nas well as those mapped as single points. The optimal source of address\ndata is from an on-the-ground survey or personal knowledge - as with any\nother feature, copying from commercial sources like Google Maps is strictly\nforbidden.\n",
-        "inspector": "# Using the Inspector\n\nThe inspector is the section on the left side of the page that allows you to\nedit the details of the selected feature.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click icons to add other details,\nlike [Wikipedia](http://www.wikipedia.org/) information, wheelchair\naccess, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n",
+        "inspector": "# Using the Inspector\n\nThe inspector is the section on the left side of the page that allows you to\nedit the details of the selected feature.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click the 'Add field' dropdown to add\nother details, like a Wikipedia link, wheelchair access, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n",
         "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and open a small tools menu and a sidebar showing more information\nabout the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it, then click the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building 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 building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then clicking the\ntrash can icon or pressing the 'Delete' key.\n",
         "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the sidebar, you can\nsee which relations a feature is a member of, and click on a relation there\nto select the it. When the relation is selected, you can see all of its\nmembers listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\nclick the \"Merge\" (+) button.\n"
     },
     "intro": {
+        "graph": {
+            "city_hall": "Three Rivers City Hall",
+            "fire_department": "Three Rivers Fire Department",
+            "memory_isle_park": "Memory Isle Park",
+            "riverwalk_trail": "Riverwalk Trail",
+            "w_michigan_ave": "West Michigan Avenue",
+            "e_michigan_ave": "East Michigan Avenue",
+            "spring_st": "Spring Street",
+            "scidmore_park": "Scidmore Park",
+            "petting_zoo": "Scidmore Park Petting Zoo",
+            "n_andrews_st": "North Andrews Street",
+            "s_andrews_st": "South Andrews Street",
+            "n_constantine_st": "North Constantine Street",
+            "s_constantine_st": "South Constantine Street",
+            "rocky_river": "Rocky River",
+            "railroad_dr": "Railroad Drive",
+            "conrail_rr": "Conrail Railroad",
+            "st_joseph_river": "Saint Joseph River",
+            "n_main_st": "North Main Street",
+            "s_main_st": "South Main Street",
+            "water_st": "Water Street",
+            "foster_st": "Foster Street",
+            "portage_river": "Portage River",
+            "flower_st": "Flower Street",
+            "elm_st": "Elm Street",
+            "walnut_st": "Walnut Street",
+            "morris_ave": "Morris Avenue",
+            "east_st": "East Street",
+            "portage_ave": "Portage Avenue"
+        },
         "navigation": {
             "title": "Navigation",
             "drag": "The main map area shows OpenStreetMap data on top of a background. You can navigate by dragging and scrolling, just like any web map. **Drag the map!**",
             "select": "Map features are represented three ways: using points, lines or areas. All features can be selected by clicking on them. **Click on the point to select it.**",
-            "header": "The header shows us the feature type.",
-            "pane": "When a feature is selected, the feature editor is displayed. The header shows us the feature type and the main pane shows the feature's attributes, such as its name and address. **Close the feature editor with the close button in the top right.**"
+            "pane": "When a feature is selected, the feature editor is displayed. The header shows us the feature type and the main pane shows the feature's attributes, such as its name and address. **Close the feature editor by pressing the {button} button in the top right.**",
+            "search": "You can also search for features in the current view, or worldwide. **Search for '{name}'**",
+            "choose": "**Choose {name} from the list to select it.**",
+            "chosen": "Great! {name} is now selected. **Close the feature editor by pressing the {button} button.**"
         },
         "points": {
             "title": "Points",
-            "add": "Points can be used to represent features such as shops, restaurants and monuments. They mark a specific location, and describe what's there. **Click the Point button to add a new point.**",
-            "place": "The point can be placed by clicking on the map. **Place the point on top of the building.**",
+            "add": "Points can be used to represent features such as shops, restaurants, and monuments. They mark a specific location, and describe what's there. **Click the {button} Point button to add a new point.**",
+            "place": "The point can be placed by clicking on the map. **Click the map to place the new point on top of the building.**",
             "search": "There are many different features that can be represented by points. The point you just added is a Cafe. **Search for '{name}'**",
             "choose": "**Choose Cafe from the list.**",
             "describe": "The point is now marked as a cafe. Using the feature editor, we can add more information about the feature. **Add a name**",
-            "close": "The feature editor can be closed by clicking on the close button. **Close the feature editor**",
-            "reselect": "Often points will already exist, but have mistakes or be incomplete. We can edit existing points. **Select the point you just created.**",
-            "fixname": "**Change the name and close the feature editor.**",
-            "reselect_delete": "All features on the map can be deleted. **Click on the point you created.**",
-            "delete": "The menu around the point contains operations that can be performed on it, including delete. **Delete the point.**"
+            "close": "The feature editor will remember all of your changes automatically.  When you change a feature, the close button will change to a checkmark. **Click the {button} button to close the feature editor**",
+            "reselect": "Often points will already exist, but have mistakes or be incomplete. We can edit existing points. **Click to select the point you just created.**",
+            "fixname": "**Change the name, then click the {button} button to close the feature editor.**",
+            "reselect_delete": "All features on the map can be deleted. **Click to select the point you created.**",
+            "delete": "The menu around the point contains operations that can be performed on it, including delete. **Click on the {button} button to delete the point.**"
         },
         "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.**",
-            "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.**",
+            "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 {button} Area button to add a new area.**",
+            "corner": "Areas are drawn by placing nodes that mark the boundary of the area. **Click to place a 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}'.**",
             "choose": "**Choose Playground from the list.**",
-            "describe": "**Add a name, and close the feature editor**"
+            "describe": "**Add a name, then click the {button} button to close the feature editor**"
         },
         "lines": {
             "title": "Lines",
-            "add": "Lines are used to represent features such as roads, railroads and rivers. **Click the Line button to add a new line.**",
+            "add": "Lines are used to represent features such as roads, railroads, and rivers. **Click the {button} Line button to add a new line.**",
             "start": "**Start the line by clicking on the end of the road.**",
-            "intersect": "Click to add more nodes to the line. You can drag the map while drawing if necessary. Roads, and many other types of lines, are part of a larger network. It is important for these lines to be connected properly in order for routing applications to work. **Click on Flower Street, to create an intersection connecting the two lines.**",
+            "intersect": "Click to add more nodes to the line. You can drag the map while drawing if necessary. Roads, and many other types of lines, are part of a larger network. It is important for these lines to be connected properly in order for routing applications to work. **Click on {name} to create an intersection connecting the two lines.**",
             "finish": "Lines can be finished by clicking on the last node again. **Finish drawing the road.**",
             "road": "**Select Road from the list**",
             "residential": "There are different types of roads, the most common of which is Residential. **Choose the Residential road type**",
-            "describe": "**Name the road and close the feature editor.**",
-            "restart": "The road needs to intersect Flower Street.",
+            "describe": "**Name the road, then click the {button} button to close the feature editor.**",
+            "restart": "The road needs to intersect {name}.",
             "wrong_preset": "You didn't select the Residential road type. **Click here to choose again**"
         },
         "startediting": {
             "title": "Start Editing",
-            "help": "More documentation and this walkthrough are available here.",
+            "help": "You can replay this walkthrough or view more documentation by clicking the {button} Help button.",
             "save": "Don't forget to regularly save your changes!",
             "start": "Start mapping!"
         }
     },
     "presets": {
         "categories": {
+            "category-barrier": {
+                "name": "Barrier Features"
+            },
             "category-building": {
-                "name": "Building"
+                "name": "Building Features"
             },
             "category-golf": {
-                "name": "Golf"
+                "name": "Golf Features"
             },
             "category-landuse": {
-                "name": "Land Use"
+                "name": "Land Use Features"
             },
             "category-path": {
-                "name": "Path"
+                "name": "Path Features"
             },
             "category-rail": {
-                "name": "Rail"
+                "name": "Rail Features"
+            },
+            "category-restriction": {
+                "name": "Restriction Features"
             },
             "category-road": {
-                "name": "Road"
+                "name": "Road Features"
             },
             "category-route": {
-                "name": "Route"
+                "name": "Route Features"
             },
             "category-water-area": {
-                "name": "Water"
+                "name": "Water Features"
             },
             "category-water-line": {
-                "name": "Water"
+                "name": "Water Features"
             }
         },
         "fields": {
             "access": {
-                "label": "Access",
-                "placeholder": "Unknown",
+                "label": "Allowed Access",
+                "placeholder": "Not Specified",
                 "types": {
-                    "access": "General",
+                    "access": "All",
                     "foot": "Foot",
                     "motor_vehicle": "Motor Vehicles",
                     "bicycle": "Bicycles",
                     "destination": {
                         "title": "Destination",
                         "description": "Access permitted only to reach a destination"
+                    },
+                    "dismount": {
+                        "title": "Dismount",
+                        "description": "Access permitted but rider must dismount"
                     }
                 }
             },
             "access_simple": {
+                "label": "Allowed Access",
+                "placeholder": "yes"
+            },
+            "access_toilets": {
                 "label": "Access"
             },
             "address": {
                 "label": "Address",
                 "placeholders": {
-                    "number": "123",
+                    "housename": "Housename",
+                    "housenumber": "123",
+                    "conscriptionnumber": "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": "Type"
             },
             "aerialway/access": {
-                "label": "Access"
+                "label": "Access",
+                "options": {
+                    "entry": "Entry",
+                    "exit": "Exit",
+                    "both": "Both"
+                }
             },
             "aerialway/bubble": {
                 "label": "Bubble"
                 "placeholder": "2, 4, 8..."
             },
             "aerialway/summer/access": {
-                "label": "Access (summer)"
+                "label": "Access (summer)",
+                "options": {
+                    "entry": "Entry",
+                    "exit": "Exit",
+                    "both": "Both"
+                }
             },
             "aeroway": {
                 "label": "Type"
             "amenity": {
                 "label": "Type"
             },
+            "area/highway": {
+                "label": "Type"
+            },
             "artist": {
                 "label": "Artist"
             },
             "barrier": {
                 "label": "Type"
             },
+            "bench": {
+                "label": "Bench"
+            },
             "bicycle_parking": {
                 "label": "Type"
             },
+            "bin": {
+                "label": "Waste Bin"
+            },
             "boundary": {
                 "label": "Type"
             },
+            "brand": {
+                "label": "Brand"
+            },
             "building": {
                 "label": "Building"
             },
                 "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",
             "construction": {
                 "label": "Type"
             },
+            "content": {
+                "label": "Contents"
+            },
             "country": {
                 "label": "Country"
             },
             "covered": {
                 "label": "Covered"
             },
+            "craft": {
+                "label": "Type"
+            },
             "crop": {
                 "label": "Crop"
             },
             "cuisine": {
                 "label": "Cuisine"
             },
+            "currency_multi": {
+                "label": "Currency Types"
+            },
+            "cycleway": {
+                "label": "Bike Lanes",
+                "placeholder": "none",
+                "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": {
+                "label": "Delivery"
+            },
             "denomination": {
                 "label": "Denomination"
             },
             "description": {
                 "label": "Description"
             },
+            "diaper": {
+                "label": "Diaper Changing Available"
+            },
+            "dock": {
+                "label": "Type"
+            },
+            "drive_through": {
+                "label": "Drive-Through"
+            },
             "electrified": {
-                "label": "Electrification"
+                "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"
+            "fuel_multi": {
+                "label": "Fuel Types"
             },
             "gauge": {
                 "label": "Gauge"
             },
+            "gender": {
+                "label": "Gender",
+                "placeholder": "Unknown",
+                "options": {
+                    "male": "Male",
+                    "female": "Female",
+                    "unisex": "Unisex"
+                }
+            },
             "generator/method": {
                 "label": "Method"
             },
                 "label": "Handicap",
                 "placeholder": "1-18"
             },
+            "handrail": {
+                "label": "Handrail"
+            },
             "highway": {
                 "label": "Type"
             },
             "incline": {
                 "label": "Incline"
             },
+            "incline_steps": {
+                "label": "Incline",
+                "options": {
+                    "up": "Up",
+                    "down": "Down"
+                }
+            },
             "information": {
                 "label": "Type"
             },
                     "terminal": "Terminal"
                 }
             },
+            "internet_access/fee": {
+                "label": "Internet Access Fee"
+            },
+            "kerb": {
+                "label": "Curb Ramp"
+            },
+            "lamp_type": {
+                "label": "Type"
+            },
             "landuse": {
                 "label": "Type"
             },
             "layer": {
                 "label": "Layer"
             },
+            "leaf_cycle": {
+                "label": "Leaf Cycle",
+                "options": {
+                    "evergreen": "Evergreen",
+                    "deciduous": "Deciduous",
+                    "semi_evergreen": "Semi-Evergreen",
+                    "semi_deciduous": "Semi-Deciduous",
+                    "mixed": "Mixed"
+                }
+            },
+            "leaf_cycle_singular": {
+                "label": "Leaf Cycle",
+                "options": {
+                    "evergreen": "Evergreen",
+                    "deciduous": "Deciduous",
+                    "semi_evergreen": "Semi-Evergreen",
+                    "semi_deciduous": "Semi-Deciduous"
+                }
+            },
+            "leaf_type": {
+                "label": "Leaf Type",
+                "options": {
+                    "broadleaved": "Broadleaved",
+                    "needleleaved": "Needleleaved",
+                    "mixed": "Mixed",
+                    "leafless": "Leafless"
+                }
+            },
+            "leaf_type_singular": {
+                "label": "Leaf Type",
+                "options": {
+                    "broadleaved": "Broadleaved",
+                    "needleleaved": "Needleleaved",
+                    "leafless": "Leafless"
+                }
+            },
             "leisure": {
                 "label": "Type"
             },
             "length": {
                 "label": "Length (Meters)"
             },
+            "level": {
+                "label": "Level"
+            },
             "levels": {
                 "label": "Levels",
                 "placeholder": "2, 4, 6..."
                 "label": "Speed Limit",
                 "placeholder": "40, 50, 60..."
             },
+            "maxstay": {
+                "label": "Max Stay"
+            },
+            "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"
                 "label": "Par",
                 "placeholder": "3, 4, 5..."
             },
+            "parallel_direction": {
+                "label": "Direction",
+                "options": {
+                    "forward": "Forward",
+                    "backward": "Backward"
+                }
+            },
             "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"
+                }
+            },
+            "payment_multi": {
+                "label": "Payment Types"
             },
             "phone": {
                 "label": "Phone",
                 "placeholder": "+31 42 123 4567"
             },
             "piste/difficulty": {
-                "label": "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"
+                "label": "Grooming",
+                "options": {
+                    "classic": "Classic",
+                    "mogul": "Mogul",
+                    "backcountry": "Backcountry",
+                    "classic+skating": "Classic and Skating",
+                    "scooter": "Scooter/Snowmobile",
+                    "skating": "Skating"
+                }
             },
             "piste/type": {
-                "label": "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"
             "power": {
                 "label": "Type"
             },
+            "power_supply": {
+                "label": "Power Supply"
+            },
             "railway": {
                 "label": "Type"
             },
-            "recycling/cans": {
-                "label": "Accepts Cans"
-            },
-            "recycling/clothes": {
-                "label": "Accepts Clothes"
-            },
-            "recycling/glass": {
-                "label": "Accepts Glass"
-            },
-            "recycling/paper": {
-                "label": "Accepts Paper"
+            "recycling_accepts": {
+                "label": "Accepts"
             },
             "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"
+            },
+            "rooms": {
+                "label": "Rooms"
+            },
             "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"
+                }
+            },
+            "sanitary_dump_station": {
+                "label": "Toilet Disposal"
             },
             "seasonal": {
                 "label": "Seasonal"
             "service": {
                 "label": "Type"
             },
+            "service/bicycle/chain_tool": {
+                "label": "Chain Tool",
+                "options": {
+                    "undefined": "Assumed to be No",
+                    "yes": "Yes",
+                    "no": "No"
+                }
+            },
+            "service/bicycle/pump": {
+                "label": "Air Pump",
+                "options": {
+                    "undefined": "Assumed to be No",
+                    "yes": "Yes",
+                    "no": "No"
+                }
+            },
+            "service_rail": {
+                "label": "Service Type",
+                "options": {
+                    "spur": "Spur",
+                    "yard": "Yard",
+                    "siding": "Siding",
+                    "crossover": "Crossover"
+                }
+            },
             "shelter": {
                 "label": "Shelter"
             },
             "shop": {
                 "label": "Type"
             },
-            "sloped_curb": {
-                "label": "Sloped Curb"
+            "site": {
+                "label": "Type"
             },
             "smoking": {
-                "label": "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",
+                    "impassable": "Impassable / No wheeled vehicle"
+                }
             },
             "social_facility_for": {
                 "label": "People served",
             "sport_ice": {
                 "label": "Sport"
             },
+            "sport_racing": {
+                "label": "Sport"
+            },
+            "stars": {
+                "label": "Stars"
+            },
+            "stop": {
+                "label": "Stop Type",
+                "options": {
+                    "all": "All Ways",
+                    "minor": "Minor Road"
+                }
+            },
             "structure": {
                 "label": "Structure",
                 "placeholder": "Unknown",
                     "ford": "Ford"
                 }
             },
-            "studio_type": {
+            "studio": {
+                "label": "Type"
+            },
+            "substation": {
                 "label": "Type"
             },
             "supervised": {
             "tactile_paving": {
                 "label": "Tactile Paving"
             },
+            "takeaway": {
+                "label": "Takeaway",
+                "placeholder": "Yes, No, Takeaway Only...",
+                "options": {
+                    "yes": "Yes",
+                    "no": "No",
+                    "only": "Takeaway Only"
+                }
+            },
             "toilets/disposal": {
-                "label": "Disposal"
+                "label": "Disposal",
+                "options": {
+                    "flush": "Flush",
+                    "pitlatrine": "Pit/Latrine",
+                    "chemical": "Chemical",
+                    "bucket": "Bucket"
+                }
             },
             "tourism": {
                 "label": "Type"
                 "label": "Tower type"
             },
             "tracktype": {
+                "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"
+                }
+            },
+            "traffic_signals": {
                 "label": "Type"
             },
             "trail_visibility": {
-                "label": "Trail Visibility"
-            },
-            "tree_type": {
-                "label": "Type"
+                "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"
+                }
             },
             "trees": {
                 "label": "Trees"
             "water": {
                 "label": "Type"
             },
+            "water_point": {
+                "label": "Water Point"
+            },
             "waterway": {
                 "label": "Type"
             },
             },
             "wikipedia": {
                 "label": "Wikipedia"
-            },
-            "wood": {
-                "label": "Type"
             }
         },
         "presets": {
             },
             "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": "barbecue,bbq,grill"
+                "terms": "bbq,grill"
             },
             "amenity/bench": {
                 "name": "Bench",
-                "terms": ""
+                "terms": "seat"
             },
             "amenity/bicycle_parking": {
                 "name": "Bicycle Parking",
-                "terms": ""
+                "terms": "bike"
             },
             "amenity/bicycle_rental": {
                 "name": "Bicycle Rental",
-                "terms": ""
+                "terms": "bike"
+            },
+            "amenity/bicycle_repair_station": {
+                "name": "Bicycle Repair Tool Stand",
+                "terms": "bike,repair,chain,pump"
+            },
+            "amenity/biergarten": {
+                "name": "Beer Garden",
+                "terms": "beer,bier,booze"
             },
             "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": "bistro,coffee,tea"
             },
             "amenity/car_rental": {
                 "name": "Car Rental",
                 "name": "Car Wash",
                 "terms": ""
             },
+            "amenity/casino": {
+                "name": "Casino",
+                "terms": "gambling,roulette,craps,poker,blackjack"
+            },
             "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": "clinic,medical clinic"
+                "terms": "medical,urgentcare"
             },
             "amenity/clock": {
                 "name": "Clock",
                 "terms": ""
             },
             "amenity/college": {
-                "name": "College",
-                "terms": ""
+                "name": "College Grounds",
+                "terms": "university"
+            },
+            "amenity/community_centre": {
+                "name": "Community Center",
+                "terms": "event,hall"
             },
             "amenity/compressed_air": {
                 "name": "Compressed Air",
             },
             "amenity/dentist": {
                 "name": "Dentist",
-                "terms": "dentist,dentist's office"
+                "terms": "tooth,teeth"
             },
-            "amenity/doctor": {
+            "amenity/doctors": {
                 "name": "Doctor",
-                "terms": "doctor,doctor's office"
+                "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": "restaurant"
+            },
+            "amenity/ferry_terminal": {
+                "name": "Ferry Terminal",
                 "terms": ""
             },
             "amenity/fire_station": {
             },
             "amenity/fuel": {
                 "name": "Gas Station",
-                "terms": "petrol,fuel,propane,diesel,lng,cng,biodiesel"
+                "terms": "petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel"
             },
             "amenity/grave_yard": {
                 "name": "Graveyard",
                 "terms": ""
             },
+            "amenity/grit_bin": {
+                "name": "Grit Bin",
+                "terms": "salt,sand"
+            },
             "amenity/hospital": {
                 "name": "Hospital Grounds",
-                "terms": "clinic,emergency room,health service,hospice,infirmary,institution,nursing home,rest home,sanatorium,sanitarium,sick bay,surgery,ward"
+                "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
+            },
+            "amenity/hunting_stand": {
+                "name": "Hunting Stand",
+                "terms": ""
             },
             "amenity/kindergarten": {
-                "name": "Kindergarten Grounds",
-                "terms": "nursery,preschool"
+                "name": "Preschool/Kindergarten Grounds",
+                "terms": "kindergarden,pre-school"
             },
             "amenity/library": {
                 "name": "Library",
-                "terms": ""
+                "terms": "book"
             },
             "amenity/marketplace": {
                 "name": "Marketplace",
                 "terms": ""
             },
+            "amenity/motorcycle_parking": {
+                "name": "Motorcycle Parking",
+                "terms": ""
+            },
             "amenity/nightclub": {
                 "name": "Nightclub",
                 "terms": "disco*,night club,dancing,dance club"
                 "name": "Parking Garage Entrance/Exit",
                 "terms": ""
             },
+            "amenity/parking_space": {
+                "name": "Parking Space",
+                "terms": ""
+            },
             "amenity/pharmacy": {
                 "name": "Pharmacy",
-                "terms": ""
+                "terms": "drug*,med*,prescription"
             },
             "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/prison": {
+                "name": "Prison Grounds",
+                "terms": "cell,jail"
             },
             "amenity/pub": {
                 "name": "Pub",
-                "terms": ""
+                "terms": "dive,beer,bier,booze"
+            },
+            "amenity/public_bookcase": {
+                "name": "Public Bookcase",
+                "terms": "library,bookcrossing"
             },
             "amenity/ranger_station": {
                 "name": "Ranger Station",
             },
             "amenity/recycling": {
                 "name": "Recycling",
+                "terms": "can,bottle,garbage,scrap,trash"
+            },
+            "amenity/register_office": {
+                "name": "Register Office",
                 "terms": ""
             },
             "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/sanitary_dump_station": {
+                "name": "RV Toilet Disposal",
+                "terms": "Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet"
             },
             "amenity/school": {
                 "name": "School Grounds",
-                "terms": "academy,alma mater,blackboard,college,department,discipline,establishment,faculty,hall,halls of ivy,institute,institution,jail*,schoolhouse,seminary,university"
+                "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/group_home": {
-                "name": "Group Home",
-                "terms": "elderly,old,senior living"
+                "name": "Elderly Group Home",
+                "terms": "old,senior,living"
             },
             "amenity/social_facility/homeless_shelter": {
                 "name": "Homeless Shelter",
             },
             "amenity/studio": {
                 "name": "Studio",
-                "terms": "recording studio,studio,radio,radio studio,television,television studio"
+                "terms": "recording,radio,television"
             },
             "amenity/swimming_pool": {
                 "name": "Swimming Pool",
             },
             "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": {
+            "amenity/vending_machine/cigarettes": {
+                "name": "Cigarette Vending Machine",
+                "terms": "cigarette"
+            },
+            "amenity/vending_machine/condoms": {
+                "name": "Condom Vending Machine",
+                "terms": "condom"
+            },
+            "amenity/vending_machine/drinks": {
+                "name": "Drink Vending Machine",
+                "terms": "drink,soda,beverage,juice,pop"
+            },
+            "amenity/vending_machine/excrement_bags": {
+                "name": "Excrement Bag Vending Machine",
+                "terms": "excrement bags,poop,dog,animal"
+            },
+            "amenity/vending_machine/news_papers": {
+                "name": "Newspaper Vending Machine",
+                "terms": "newspaper"
+            },
+            "amenity/vending_machine/parcel_pickup_dropoff": {
+                "name": "Parcel Pickup/Dropoff Vending Machine",
+                "terms": "parcel,mail,pickup"
+            },
+            "amenity/vending_machine/parking_tickets": {
+                "name": "Parking Ticket Vending Machine",
+                "terms": "parking,ticket"
+            },
+            "amenity/vending_machine/public_transport_tickets": {
+                "name": "Transit Ticket Vending Machine",
+                "terms": "bus,train,ferry,rail,ticket,transportation"
+            },
+            "amenity/vending_machine/sweets": {
+                "name": "Snack Vending Machine",
+                "terms": "candy,gum,chip,pretzel,cookie,cracker"
+            },
+            "amenity/vending_machine/vending_machine": {
                 "name": "Vending Machine",
                 "terms": ""
             },
             },
             "amenity/waste_basket": {
                 "name": "Waste Basket",
-                "terms": "rubbish bin,litter bin,trash can,garbage can"
+                "terms": "bin,rubbish,litter,trash,garbage"
+            },
+            "amenity/waste_disposal": {
+                "name": "Garbage Dumpster",
+                "terms": "rubbish,litter,trash"
+            },
+            "amenity/water_point": {
+                "name": "RV Drinking Water",
+                "terms": ""
             },
             "area": {
                 "name": "Area",
                 "terms": ""
             },
+            "area/highway": {
+                "name": "Road Surface",
+                "terms": ""
+            },
             "barrier": {
                 "name": "Barrier",
                 "terms": ""
                 "terms": ""
             },
             "barrier/ditch": {
-                "name": "Ditch",
+                "name": "Trench",
                 "terms": ""
             },
             "barrier/entrance": {
                 "terms": ""
             },
             "building/cathedral": {
-                "name": "Cathedral",
+                "name": "Cathedral Building",
                 "terms": ""
             },
             "building/chapel": {
-                "name": "Chapel",
+                "name": "Chapel Building",
                 "terms": ""
             },
             "building/church": {
-                "name": "Church",
+                "name": "Church Building",
                 "terms": ""
             },
+            "building/college": {
+                "name": "College Building",
+                "terms": "university"
+            },
             "building/commercial": {
                 "name": "Commercial Building",
                 "terms": ""
                 "terms": ""
             },
             "building/detached": {
-                "name": "Detached Home",
-                "terms": ""
+                "name": "Detached House",
+                "terms": "home,single,family,residence,dwelling"
             },
             "building/dormitory": {
                 "name": "Dormitory",
             },
             "building/house": {
                 "name": "House",
-                "terms": ""
+                "terms": "home,family,residence,dwelling"
             },
             "building/hut": {
                 "name": "Hut",
                 "name": "Industrial Building",
                 "terms": ""
             },
+            "building/kindergarten": {
+                "name": "Preschool/Kindergarten Building",
+                "terms": "kindergarden,pre-school"
+            },
             "building/public": {
                 "name": "Public Building",
                 "terms": ""
             },
             "building/school": {
                 "name": "School Building",
-                "terms": ""
+                "terms": "academy,elementary school,middle school,high school"
+            },
+            "building/semidetached_house": {
+                "name": "Semi-Detached House",
+                "terms": "home,double,duplex,twin,family,residence,dwelling"
             },
             "building/shed": {
                 "name": "Shed",
             },
             "building/terrace": {
                 "name": "Row Houses",
-                "terms": ""
+                "terms": "home,terrace,brownstone,family,residence,dwelling"
             },
             "building/train_station": {
                 "name": "Train Station",
             },
             "building/university": {
                 "name": "University Building",
-                "terms": ""
+                "terms": "college"
             },
             "building/warehouse": {
                 "name": "Warehouse",
                 "terms": ""
             },
+            "craft": {
+                "name": "Craft",
+                "terms": ""
+            },
             "craft/basket_maker": {
                 "name": "Basket Maker",
-                "terms": "basket,basketry,basket maker,basket weaver"
+                "terms": ""
             },
             "craft/beekeeper": {
                 "name": "Beekeeper",
-                "terms": "bees,beekeeper,bee box"
+                "terms": ""
             },
             "craft/blacksmith": {
                 "name": "Blacksmith",
-                "terms": "blacksmith"
+                "terms": ""
             },
             "craft/boatbuilder": {
                 "name": "Boat Builder",
-                "terms": "boat builder"
+                "terms": ""
             },
             "craft/bookbinder": {
                 "name": "Bookbinder",
-                "terms": "bookbinder,book repair"
+                "terms": "book repair"
             },
             "craft/brewery": {
                 "name": "Brewery",
-                "terms": "brewery"
+                "terms": "beer,bier"
             },
             "craft/carpenter": {
                 "name": "Carpenter",
-                "terms": "carpenter,woodworker"
+                "terms": "woodworker"
             },
             "craft/carpet_layer": {
                 "name": "Carpet Layer",
-                "terms": "carpet layer"
+                "terms": ""
             },
             "craft/caterer": {
                 "name": "Caterer",
-                "terms": "Caterer,Catering"
+                "terms": ""
             },
             "craft/clockmaker": {
                 "name": "Clockmaker",
-                "terms": "clock,clockmaker,clock repair"
+                "terms": ""
             },
-            "craft/confectionary": {
-                "name": "Confectionary",
-                "terms": "confectionary,sweets,candy"
+            "craft/confectionery": {
+                "name": "Confectionery",
+                "terms": "sweets,candy"
             },
             "craft/dressmaker": {
                 "name": "Dressmaker",
-                "terms": "dress,dressmaker"
+                "terms": "seamstress"
             },
             "craft/electrician": {
                 "name": "Electrician",
-                "terms": "electrician"
+                "terms": "power,wire"
             },
             "craft/gardener": {
                 "name": "Gardener",
-                "terms": "gardener,landscaper,grounds keeper"
+                "terms": "landscaper,grounds keeper"
             },
             "craft/glaziery": {
                 "name": "Glaziery",
-                "terms": "glass,glass foundry,stained-glass,window"
+                "terms": "glass,stained-glass,window"
             },
             "craft/handicraft": {
                 "name": "Handicraft",
-                "terms": "handicraft"
+                "terms": ""
             },
             "craft/hvac": {
                 "name": "HVAC",
-                "terms": "heating,ventilating,air-conditioning,air conditioning"
+                "terms": "heat*,vent*,air conditioning"
             },
             "craft/insulator": {
                 "name": "Insulator",
-                "terms": "insulation,insulator"
+                "terms": ""
             },
             "craft/jeweler": {
                 "name": "Jeweler",
-                "terms": "jeweler,gem,diamond"
+                "terms": ""
             },
             "craft/key_cutter": {
                 "name": "Key Cutter",
-                "terms": "key,key cutter"
+                "terms": ""
             },
             "craft/locksmith": {
                 "name": "Locksmith",
-                "terms": "locksmith,lock"
+                "terms": ""
             },
             "craft/metal_construction": {
                 "name": "Metal Construction",
-                "terms": "metal construction"
+                "terms": ""
             },
             "craft/optician": {
                 "name": "Optician",
-                "terms": "glasses,optician"
+                "terms": ""
             },
             "craft/painter": {
                 "name": "Painter",
-                "terms": "painter"
+                "terms": ""
             },
             "craft/photographer": {
                 "name": "Photographer",
-                "terms": "photographer"
+                "terms": ""
             },
             "craft/photographic_laboratory": {
                 "name": "Photographic Laboratory",
-                "terms": "photographic laboratory,film developer"
+                "terms": "film"
             },
             "craft/plasterer": {
                 "name": "Plasterer",
-                "terms": "plasterer"
+                "terms": ""
             },
             "craft/plumber": {
                 "name": "Plumber",
-                "terms": "pumber"
+                "terms": "pipe"
             },
             "craft/pottery": {
                 "name": "Pottery",
-                "terms": "pottery,potter"
+                "terms": "ceramic"
             },
             "craft/rigger": {
                 "name": "Rigger",
-                "terms": "rigger"
+                "terms": ""
             },
             "craft/roofer": {
                 "name": "Roofer",
-                "terms": "roofer"
+                "terms": ""
             },
             "craft/saddler": {
                 "name": "Saddler",
-                "terms": "saddler"
+                "terms": ""
             },
             "craft/sailmaker": {
                 "name": "Sailmaker",
-                "terms": "sailmaker"
+                "terms": ""
             },
             "craft/sawmill": {
                 "name": "Sawmill",
-                "terms": "sawmill,lumber"
+                "terms": "lumber"
             },
             "craft/scaffolder": {
                 "name": "Scaffolder",
-                "terms": "scaffolder"
+                "terms": ""
             },
             "craft/sculpter": {
                 "name": "Sculpter",
-                "terms": "sculpter"
+                "terms": ""
             },
             "craft/shoemaker": {
                 "name": "Shoemaker",
-                "terms": "shoe repair,shoemaker"
+                "terms": "cobbler"
             },
             "craft/stonemason": {
                 "name": "Stonemason",
-                "terms": "stonemason,masonry"
+                "terms": "masonry"
             },
             "craft/sweep": {
                 "name": "Chimney Sweep",
-                "terms": "sweep,chimney sweep"
+                "terms": ""
             },
             "craft/tailor": {
                 "name": "Tailor",
-                "terms": "tailor,clothes"
+                "terms": "clothes,suit"
             },
             "craft/tiler": {
                 "name": "Tiler",
-                "terms": "tiler"
+                "terms": ""
             },
             "craft/tinsmith": {
                 "name": "Tinsmith",
-                "terms": "tinsmith"
+                "terms": ""
             },
             "craft/upholsterer": {
                 "name": "Upholsterer",
-                "terms": "upholsterer"
+                "terms": ""
             },
             "craft/watchmaker": {
                 "name": "Watchmaker",
-                "terms": "watch,watchmaker,watch repair"
+                "terms": ""
             },
             "craft/window_construction": {
                 "name": "Window Construction",
-                "terms": "window,window maker,window construction"
+                "terms": "glass"
+            },
+            "craft/winery": {
+                "name": "Winery",
+                "terms": ""
             },
             "embankment": {
                 "name": "Embankment",
             },
             "emergency/ambulance_station": {
                 "name": "Ambulance Station",
+                "terms": "EMS,EMT,rescue"
+            },
+            "emergency/defibrillator": {
+                "name": "Defibrillator",
                 "terms": ""
             },
             "emergency/fire_hydrant": {
                 "terms": ""
             },
             "footway/crossing": {
-                "name": "Crossing",
-                "terms": "crosswalk,zebra crossing"
+                "name": "Street Crossing",
+                "terms": ""
+            },
+            "footway/crosswalk": {
+                "name": "Pedestrian Crosswalk",
+                "terms": "zebra crossing"
             },
             "footway/sidewalk": {
                 "name": "Sidewalk",
             },
             "golf/green": {
                 "name": "Putting Green",
-                "terms": "putting green"
+                "terms": ""
             },
             "golf/hole": {
                 "name": "Golf Hole",
             },
             "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",
                 "terms": ""
             },
+            "highway/corridor": {
+                "name": "Indoor Corridor",
+                "terms": "gallery,hall,hallway,indoor,passage,passageway"
+            },
             "highway/crossing": {
-                "name": "Crossing",
-                "terms": "crosswalk,zebra crossing"
+                "name": "Street Crossing",
+                "terms": ""
+            },
+            "highway/crosswalk": {
+                "name": "Pedestrian 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/give_way": {
+                "name": "Yield Sign",
+                "terms": "give way,yield,sign"
             },
             "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": "Pedestrian Street",
                 "terms": ""
             },
             "highway/primary": {
                 "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,turnout,lay-by"
+                "terms": "rest stop"
             },
             "highway/road": {
                 "name": "Unknown Road",
             },
             "highway/stop": {
                 "name": "Stop Sign",
-                "terms": "stop sign"
+                "terms": "stop,halt,sign"
+            },
+            "highway/street_lamp": {
+                "name": "Street Lamp",
+                "terms": "streetlight,street light,lamp,light,gaslight"
             },
             "highway/tertiary": {
                 "name": "Tertiary Road",
                 "terms": "ramp,on ramp,off ramp"
             },
             "highway/track": {
-                "name": "Track",
-                "terms": ""
+                "name": "Unmaintained Track Road",
+                "terms": "woods road,forest road,logging road,fire road,farm road,agricultural road,ranch road,carriage road,primitive,unmaintained,rut,offroad,4wd,4x4,four wheel drive,atv,quad,jeep,double track,two track"
             },
             "highway/traffic_signals": {
                 "name": "Traffic Signals",
             },
             "highway/turning_circle": {
                 "name": "Turning Circle",
-                "terms": ""
+                "terms": "cul-de-sac"
             },
             "highway/unclassified": {
-                "name": "Unclassified Road",
+                "name": "Minor/Unclassified Road",
                 "terms": ""
             },
             "historic": {
                 "name": "Wayside Shrine",
                 "terms": ""
             },
+            "junction": {
+                "name": "Junction",
+                "terms": ""
+            },
             "landuse": {
-                "name": "Landuse",
+                "name": "Land Use",
                 "terms": ""
             },
             "landuse/allotments": {
-                "name": "Allotments",
-                "terms": ""
+                "name": "Community Garden",
+                "terms": "allotment,garden"
             },
             "landuse/basin": {
                 "name": "Basin",
                 "terms": ""
             },
             "landuse/commercial": {
-                "name": "Commercial",
+                "name": "Commercial Area",
                 "terms": ""
             },
             "landuse/construction": {
                 "terms": ""
             },
             "landuse/farm": {
-                "name": "Farm",
+                "name": "Farmland",
                 "terms": ""
             },
             "landuse/farmland": {
             },
             "landuse/forest": {
                 "name": "Forest",
+                "terms": "tree"
+            },
+            "landuse/garages": {
+                "name": "Garages",
                 "terms": ""
             },
             "landuse/grass": {
                 "terms": ""
             },
             "landuse/industrial": {
-                "name": "Industrial",
+                "name": "Industrial Area",
                 "terms": ""
             },
             "landuse/landfill": {
                 "terms": ""
             },
             "landuse/military": {
-                "name": "Military",
+                "name": "Military Area",
                 "terms": ""
             },
             "landuse/orchard": {
                 "name": "Orchard",
                 "terms": ""
             },
+            "landuse/plant_nursery": {
+                "name": "Plant Nursery",
+                "terms": "vivero"
+            },
             "landuse/quarry": {
                 "name": "Quarry",
                 "terms": ""
             },
             "landuse/residential": {
-                "name": "Residential",
+                "name": "Residential Area",
                 "terms": ""
             },
             "landuse/retail": {
-                "name": "Retail",
+                "name": "Retail Area",
                 "terms": ""
             },
             "landuse/vineyard": {
                 "name": "Leisure",
                 "terms": ""
             },
+            "leisure/adult_gaming_centre": {
+                "name": "Adult Gaming Center",
+                "terms": "gambling,slot machine"
+            },
+            "leisure/bird_hide": {
+                "name": "Bird Hide",
+                "terms": "machan,ornithology"
+            },
+            "leisure/bowling_alley": {
+                "name": "Bowling Alley",
+                "terms": ""
+            },
             "leisure/common": {
                 "name": "Common",
                 "terms": "open space"
             },
             "leisure/marina": {
                 "name": "Marina",
-                "terms": ""
+                "terms": "boat"
+            },
+            "leisure/nature_reserve": {
+                "name": "Nature Reserve",
+                "terms": "protected,wildlife"
             },
             "leisure/park": {
                 "name": "Park",
             },
             "leisure/picnic_table": {
                 "name": "Picnic Table",
-                "terms": "bench,table"
+                "terms": "bench"
             },
             "leisure/pitch": {
                 "name": "Sport Pitch",
-                "terms": ""
+                "terms": "field"
             },
             "leisure/pitch/american_football": {
                 "name": "American Football Field",
                 "name": "Basketball Court",
                 "terms": ""
             },
+            "leisure/pitch/rugby_league": {
+                "name": "Rugby League Field",
+                "terms": ""
+            },
+            "leisure/pitch/rugby_union": {
+                "name": "Rugby Union Field",
+                "terms": ""
+            },
             "leisure/pitch/skateboard": {
                 "name": "Skate Park",
                 "terms": ""
                 "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",
+            "leisure/sports_centre": {
+                "name": "Sports Center / Gym",
                 "terms": "gym"
             },
+            "leisure/sports_centre/swimming": {
+                "name": "Swimming Pool Facility",
+                "terms": "dive,water"
+            },
             "leisure/stadium": {
                 "name": "Stadium",
                 "terms": ""
             },
             "leisure/swimming_pool": {
                 "name": "Swimming Pool",
-                "terms": ""
+                "terms": "dive,water"
             },
             "leisure/track": {
-                "name": "Race Track",
+                "name": "Racetrack (non-Motorsport)",
                 "terms": ""
             },
+            "leisure/water_park": {
+                "name": "Water Park",
+                "terms": "swim,pool,dive"
+            },
             "line": {
                 "name": "Line",
                 "terms": ""
                 "name": "Man Made",
                 "terms": ""
             },
+            "man_made/adit": {
+                "name": "Adit",
+                "terms": "entrance,underground,mine,cave"
+            },
             "man_made/breakwater": {
                 "name": "Breakwater",
                 "terms": ""
             },
+            "man_made/bridge": {
+                "name": "Bridge",
+                "terms": ""
+            },
+            "man_made/chimney": {
+                "name": "Chimney",
+                "terms": ""
+            },
             "man_made/cutline": {
                 "name": "Cut line",
                 "terms": ""
                 "name": "Flagpole",
                 "terms": ""
             },
+            "man_made/gasometer": {
+                "name": "Gasometer",
+                "terms": "gas holder"
+            },
+            "man_made/groyne": {
+                "name": "Groyne",
+                "terms": ""
+            },
             "man_made/lighthouse": {
                 "name": "Lighthouse",
                 "terms": ""
             },
+            "man_made/mast": {
+                "name": "Radio Mast",
+                "terms": "broadcast tower,cell phone tower,cell tower,guyed tower,mobile phone tower,radio tower,television tower,transmission mast,transmission tower,tv tower"
+            },
             "man_made/observation": {
                 "name": "Observation Tower",
                 "terms": "lookout tower,fire tower"
             },
+            "man_made/petroleum_well": {
+                "name": "Oil Well",
+                "terms": "drilling rig,oil derrick,oil drill,oil horse,oil rig,oil pump,petroleum well,pumpjack"
+            },
             "man_made/pier": {
                 "name": "Pier",
-                "terms": ""
+                "terms": "dock"
             },
             "man_made/pipeline": {
                 "name": "Pipeline",
                 "terms": ""
             },
+            "man_made/silo": {
+                "name": "Silo",
+                "terms": "grain,corn,wheat"
+            },
+            "man_made/storage_tank": {
+                "name": "Storage Tank",
+                "terms": "water,oil,gas,petrol"
+            },
+            "man_made/surveillance": {
+                "name": "Surveillance",
+                "terms": ""
+            },
             "man_made/survey_point": {
                 "name": "Survey Point",
                 "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": ""
             },
+            "man_made/works": {
+                "name": "Works",
+                "terms": "car assembly plant,aluminium processing plant,brewery,furniture manufacture factory,oil refinery,plastic recycling"
+            },
             "military/airfield": {
                 "name": "Airfield",
                 "terms": ""
                 "name": "Bunker",
                 "terms": ""
             },
+            "military/checkpoint": {
+                "name": "Checkpoint",
+                "terms": ""
+            },
+            "military/danger_area": {
+                "name": "Danger Area",
+                "terms": ""
+            },
+            "military/naval_base": {
+                "name": "Naval Base",
+                "terms": ""
+            },
+            "military/obstacle_course": {
+                "name": "Obstacle Course",
+                "terms": ""
+            },
             "military/range": {
                 "name": "Military Range",
                 "terms": ""
             },
+            "military/training_area": {
+                "name": "Training area",
+                "terms": ""
+            },
             "natural": {
                 "name": "Natural",
                 "terms": ""
                 "name": "Beach",
                 "terms": ""
             },
+            "natural/cave_entrance": {
+                "name": "Cave Entrance",
+                "terms": "cavern,hollow,grotto,shelter,cavity"
+            },
             "natural/cliff": {
                 "name": "Cliff",
                 "terms": ""
                 "name": "Peak",
                 "terms": "acme,aiguille,alp,climax,crest,crown,hill,mount,mountain,pinnacle,summit,tip,top"
             },
+            "natural/saddle": {
+                "name": "Saddle",
+                "terms": "pass,mountain pass,top"
+            },
             "natural/scree": {
                 "name": "Scree",
                 "terms": "loose rocks"
             },
             "natural/scrub": {
                 "name": "Scrub",
-                "terms": ""
+                "terms": "bush,shrubs"
             },
             "natural/spring": {
                 "name": "Spring",
                 "name": "Tree",
                 "terms": ""
             },
+            "natural/tree_row": {
+                "name": "Tree row",
+                "terms": ""
+            },
+            "natural/volcano": {
+                "name": "Volcano",
+                "terms": "mountain,crater"
+            },
             "natural/water": {
                 "name": "Water",
                 "terms": ""
             },
             "natural/wood": {
                 "name": "Wood",
-                "terms": ""
+                "terms": "tree"
             },
             "office": {
                 "name": "Office",
             },
             "office/employment_agency": {
                 "name": "Employment Agency",
-                "terms": ""
+                "terms": "job"
             },
             "office/estate_agent": {
                 "name": "Real Estate Office",
                 "name": "City",
                 "terms": ""
             },
+            "place/farm": {
+                "name": "Farm",
+                "terms": ""
+            },
             "place/hamlet": {
                 "name": "Hamlet",
                 "terms": ""
                 "name": "Substation",
                 "terms": ""
             },
+            "power/substation": {
+                "name": "Substation",
+                "terms": ""
+            },
             "power/tower": {
                 "name": "High-Voltage Tower",
                 "terms": ""
                 "terms": "break,interrupt,rest,wait,interruption"
             },
             "railway/level_crossing": {
-                "name": "Level Crossing",
-                "terms": "crossing,railroad crossing,railway crossing,grade crossing,road through railroad,train crossing"
+                "name": "Railway Crossing",
+                "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
             },
             "railway/monorail": {
                 "name": "Monorail",
                 "name": "Relation",
                 "terms": ""
             },
+            "roundabout": {
+                "name": "Roundabout",
+                "terms": ""
+            },
             "route/ferry": {
                 "name": "Ferry Route",
                 "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 Shop",
-                "terms": "art store,art gallery"
+                "name": "Art Store",
+                "terms": "art*,exhibit*,gallery"
+            },
+            "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": ""
             },
             "shop/bicycle": {
                 "name": "Bicycle Shop",
-                "terms": ""
+                "terms": "bike,repair"
             },
             "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",
+                "name": "Drugstore",
+                "terms": "med*,drug*,gift"
+            },
+            "shop/chocolate": {
+                "name": "Chocolate Store",
                 "terms": ""
             },
             "shop/clothes": {
                 "name": "Clothing Store",
                 "terms": ""
             },
+            "shop/coffee": {
+                "name": "Coffee Store",
+                "terms": ""
+            },
             "shop/computer": {
                 "name": "Computer Store",
                 "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": "art*,paint*,frame"
+            },
+            "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": ""
+                "terms": "flower"
+            },
+            "shop/frame": {
+                "name": "Framing Shop",
+                "terms": "art*,paint*,photo*,frame"
             },
             "shop/funeral_directors": {
                 "name": "Funeral Home",
-                "terms": "undertaker,funeral parlour,funeral parlor,memorial 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/houseware": {
+                "name": "Houseware Store",
+                "terms": "home,household"
+            },
+            "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",
                 "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/nutrition_supplements": {
+                "name": "Nutrition Supplements Store",
                 "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": "card,paper"
+            },
+            "shop/storage_rental": {
+                "name": "Storage Rental",
                 "terms": ""
             },
             "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": "winery"
+                "terms": ""
             },
             "tourism": {
                 "name": "Tourism",
             },
             "tourism/camp_site": {
                 "name": "Camp Site",
-                "terms": "camping"
+                "terms": "Tent"
             },
             "tourism/caravan_site": {
                 "name": "RV Park",
-                "terms": ""
+                "terms": "Motor Home,Camper"
             },
             "tourism/chalet": {
                 "name": "Chalet",
                 "terms": ""
             },
+            "tourism/gallery": {
+                "name": "Art Gallery",
+                "terms": "art*,exhibit*,paint*,photo*,sculpt*"
+            },
             "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": "art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*"
             },
             "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": ""
                 "name": "Hiking Route",
                 "terms": ""
             },
+            "type/route/horse": {
+                "name": "Riding Route",
+                "terms": ""
+            },
             "type/route/pipeline": {
                 "name": "Pipeline Route",
                 "terms": ""
                 "name": "Route Master",
                 "terms": ""
             },
+            "type/site": {
+                "name": "Site",
+                "terms": ""
+            },
             "vertex": {
                 "name": "Other",
                 "terms": ""
                 "name": "Waterway",
                 "terms": ""
             },
+            "waterway/boatyard": {
+                "name": "Boatyard",
+                "terms": ""
+            },
             "waterway/canal": {
                 "name": "Canal",
                 "terms": ""
                 "name": "Ditch",
                 "terms": ""
             },
+            "waterway/dock": {
+                "name": "Wet Dock / Dry Dock",
+                "terms": "boat,ship,vessel,marine"
+            },
             "waterway/drain": {
                 "name": "Drain",
                 "terms": ""
             },
+            "waterway/fuel": {
+                "name": "Marine Fuel Station",
+                "terms": "petrol,gas,diesel,boat"
+            },
             "waterway/river": {
                 "name": "River",
                 "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
                 "name": "Riverbank",
                 "terms": ""
             },
+            "waterway/sanitary_dump_station": {
+                "name": "Marine Toilet Disposal",
+                "terms": "Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet"
+            },
             "waterway/stream": {
                 "name": "Stream",
                 "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"
             },
+            "waterway/water_point": {
+                "name": "Marine Drinking Water",
+                "terms": ""
+            },
             "waterway/weir": {
                 "name": "Weir",
                 "terms": ""