Merge remote-tracking branch 'upstream/pull/2601'

[rails.git] / vendor / assets / iD / iD / locales / en-GB.json
diff --git a/vendor/assets/iD/iD/locales/en-GB.json b/vendor/assets/iD/iD/locales/en-GB.json

index 551428de600703f346fa24aee4fc5cb305be67a6..d61c3f36873df2099e7ddf6374c45b01127c9ab6 100644 (file)
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -71,41 +71,15 @@
              },
              "circularize": {
                  "title": "Circularise",
              },
              "circularize": {
                  "title": "Circularise",
-                "description": {
-                    "line": "Make this line circular.",
-                    "area": "Make this area circular."
-                },
-                "key": "O",
-                "annotation": {
-                    "line": "Made a line circular.",
-                    "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.",
-                "connected_to_hidden": "This can't be made circular because it is connected to a hidden feature."
+                "key": "O"
              },
              "orthogonalize": {
              },
              "orthogonalize": {
-                "title": "Square",
-                "description": {
-                    "line": "Square the corners of this line.",
-                    "area": "Square the corners of this area."
-                },
-                "key": "S",
-                "annotation": {
-                    "line": "Squared the corners of a line.",
-                    "area": "Squared the corners of an area."
-                },
-                "not_squarish": "This can't be made square because it is not squarish.",
-                "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."
+                "title": "Square"
              },
              "straighten": {
                  "title": "Straighten",
              },
              "straighten": {
                  "title": "Straighten",
-                "description": "Straighten this line.",
                  "key": "S",
                  "key": "S",
-                "annotation": "Straightened a line.",
-                "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."
+                "too_bendy": "This can't be straightened because it bends too much."
              },
              "delete": {
                  "title": "Delete",
              },
              "delete": {
                  "title": "Delete",
@@ -145,12 +119,6 @@
                  "annotation": "Removed a member from a relation."
              },
              "connect": {
                  "annotation": "Removed a member from a relation."
              },
              "connect": {
-                "annotation": {
-                    "point": "Connected a way to a point.",
-                    "vertex": "Connected a way to another.",
-                    "line": "Connected a way to a line.",
-                    "area": "Connected a way to an area."
-                },
                  "relation": "These features can't be connected because they have conflicting relation roles.",
                  "restriction": "These features can't be connected because it would damage a \"{relation}\" relation."
              },
                  "relation": "These features can't be connected because they have conflicting relation roles.",
                  "restriction": "These features can't be connected because it would damage a \"{relation}\" relation."
              },
@@ -170,7 +138,8 @@
                  "annotation": "Merged {n} features.",
                  "not_eligible": "These features can't be merged.",
                  "not_adjacent": "These features can't be merged because their endpoints aren't connected.",
                  "annotation": "Merged {n} features.",
                  "not_eligible": "These features can't be merged.",
                  "not_adjacent": "These features can't be merged because their endpoints aren't connected.",
-                "restriction": "These features can't be merged because at least one is a member of a \"{relation}\" relation.",
+                "restriction": "These features can't be merged because it would damage a \"{relation}\" relation.",
+                "relation": "These features can't be merged because they have conflicting relation roles.",
                  "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."
              },
                  "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."
              },
@@ -270,9 +239,7 @@
              },
              "reverse": {
                  "title": "Reverse",
              },
              "reverse": {
                  "title": "Reverse",
-                "description": "Make this line go in the opposite direction.",
-                "key": "V",
-                "annotation": "Reversed a line."
+                "key": "V"
              },
              "split": {
                  "title": "Split",
              },
              "split": {
                  "title": "Split",
@@ -346,13 +313,10 @@
          "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",
          "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",
              "localized_translation_language": "Choose language",
              "localized_translation_name": "Name"
          },
          "zoom_in_edit": "Zoom in to edit",
              "localized_translation_language": "Choose language",
              "localized_translation_name": "Name"
          },
          "zoom_in_edit": "Zoom in to edit",
-        "login": "login",
-        "logout": "logout",
          "loading_auth": "Connecting to OpenStreetMap...",
          "report_a_bug": "Report a bug",
          "help_translate": "Help translate",
          "loading_auth": "Connecting to OpenStreetMap...",
          "report_a_bug": "Report a bug",
          "help_translate": "Help translate",
@@ -360,12 +324,6 @@
              "hidden_warning": "{count} hidden features",
              "hidden_details": "These features are currently hidden: {details}"
          },
              "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.",
-            "readonly": "The API is read-only. You will need to wait to save your changes.",
-            "rateLimit": "The API is limiting anonymous connections.  You can fix this by logging in."
-        },
          "commit": {
              "title": "Upload to OpenStreetMap",
              "upload_explanation": "The changes you upload will be visible on all maps that use OpenStreetMap data.",
          "commit": {
              "title": "Upload to OpenStreetMap",
              "upload_explanation": "The changes you upload will be visible on all maps that use OpenStreetMap data.",
@@ -373,7 +331,6 @@
              "request_review": "I would like someone to review my edits.",
              "save": "Upload",
              "cancel": "Cancel",
              "request_review": "I would like someone to review my edits.",
              "save": "Upload",
              "cancel": "Cancel",
-            "changes": "{count} Changes",
              "download_changes": "Download osmChange file",
              "warnings": "Warnings",
              "modified": "Modified",
              "download_changes": "Download osmChange file",
              "warnings": "Warnings",
              "modified": "Modified",
@@ -449,7 +406,6 @@
          },
          "geocoder": {
              "search": "Search worldwide...",
          },
          "geocoder": {
              "search": "Search worldwide...",
-            "no_results_visible": "No results in visible map area",
              "no_results_worldwide": "No results found"
          },
          "geolocate": {
              "no_results_worldwide": "No results found"
          },
          "geolocate": {
@@ -457,24 +413,14 @@
              "locating": "Locating, please wait..."
          },
          "inspector": {
              "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",
-            "documentation_redirect": "This documentation has been redirected to a new page",
              "show_more": "Show More",
              "view_on_osm": "View on openstreetmap.org",
              "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",
              "new_relation": "New relation...",
              "role": "Role",
              "choose": "Select feature type",
              "results": "{n} results for {search}",
              "new_relation": "New relation...",
              "role": "Role",
              "choose": "Select feature type",
              "results": "{n} results for {search}",
-            "reference": "View on OpenStreetMap Wiki",
-            "back_tooltip": "Change feature",
              "remove": "Remove",
              "search": "Search",
              "remove": "Remove",
              "search": "Search",
-            "multiselect": "Selected features",
              "unknown": "Unknown",
              "incomplete": "<not downloaded>",
              "feature_list": "Search features",
              "unknown": "Unknown",
              "incomplete": "<not downloaded>",
              "feature_list": "Search features",
@@ -508,10 +454,7 @@
              "best_imagery": "Best known imagery source for this location",
              "switch": "Switch back to this background",
              "custom": "Custom",
              "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:\n   - {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n   - {-y} or {ty} for flipped TMS-style Y coordinates\n   - {u} for quadtile scheme\n   - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}",
              "overlays": "Overlays",
              "overlays": "Overlays",
-            "imagery_source_faq": "Imagery Info / Report a Problem",
              "reset": "reset",
              "display_options": "Display Options",
              "brightness": "Brightness",
              "reset": "reset",
              "display_options": "Display Options",
              "brightness": "Brightness",
@@ -523,7 +466,6 @@
                  "tooltip": "Show a zoomed out map to help locate the area currently displayed.",
                  "key": "/"
              },
                  "tooltip": "Show a zoomed out map to help locate the area currently displayed.",
                  "key": "/"
              },
-            "fix_misalignment": "Adjust imagery offset",
              "offset": "Drag anywhere in the gray area below to adjust the imagery offset, or enter the offset values in meters."
          },
          "map_data": {
              "offset": "Drag anywhere in the gray area below to adjust the imagery offset, or enter the offset values in meters."
          },
          "map_data": {
@@ -537,7 +479,6 @@
                      "title": "OpenStreetMap data"
                  }
              },
                      "title": "OpenStreetMap data"
                  }
              },
-            "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.",
              "osmhidden": "These features have been automatically hidden because the OpenStreetMap layer is hidden."
              "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.",
              "osmhidden": "These features have been automatically hidden because the OpenStreetMap layer is hidden."
@@ -584,11 +525,9 @@
                  "tooltip": "Power Lines, Power Plants, Substations, etc."
              },
              "past_future": {
                  "tooltip": "Power Lines, Power Plants, Substations, etc."
              },
              "past_future": {
-                "description": "Past/Future",
                  "tooltip": "Proposed, Construction, Abandoned, Demolished, etc."
              },
              "others": {
                  "tooltip": "Proposed, Construction, Abandoned, Demolished, etc."
              },
              "others": {
-                "description": "Others",
                  "tooltip": "Everything Else"
              }
          },
                  "tooltip": "Everything Else"
              }
          },
@@ -607,12 +546,6 @@
                  "tooltip": "Areas are drawn fully filled."
              }
          },
                  "tooltip": "Areas are drawn fully filled."
              }
          },
-        "restore": {
-            "heading": "You have unsaved changes",
-            "description": "Do you wish to restore unsaved changes from a previous editing session?",
-            "restore": "Restore my changes",
-            "reset": "Discard my changes"
-        },
          "save": {
              "title": "Save",
              "help": "Review your changes and upload them to OpenStreetMap, making them visible to other users.",
          "save": {
              "title": "Save",
              "help": "Review your changes and upload them to OpenStreetMap, making them visible to other users.",
@@ -647,10 +580,6 @@
              }
          },
          "success": {
              }
          },
          "success": {
-            "just_edited": "You just edited OpenStreetMap!",
-            "thank_you": "Thank you for improving the map.",
-            "thank_you_location": "Thank you for improving the map around {where}.",
-            "help_html": "Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.",
              "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",
              "view_on_osm": "View Changes on OSM",
              "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",
              "view_on_osm": "View Changes on OSM",
@@ -666,12 +595,6 @@
              "okay": "OK",
              "cancel": "Cancel"
          },
              "okay": "OK",
              "cancel": "Cancel"
          },
-        "splash": {
-            "welcome": "Welcome to the iD OpenStreetMap editor",
-            "text": "iD is a friendly but powerful tool for contributing to the World's best free World map. This is version {version}. For more information see {website} and report bugs at {github}.",
-            "walkthrough": "Start the Walkthrough",
-            "start": "Edit now"
-        },
          "source_switch": {
              "live": "live",
              "lose_changes": "You have unsaved changes. Switching the map server will discard them. Are you sure you want to switch servers?",
          "source_switch": {
              "live": "live",
              "lose_changes": "You have unsaved changes. Switching the map server will discard them. Are you sure you want to switch servers?",
@@ -685,49 +608,19 @@
              "on_wiki": "{tag} on wiki.osm.org",
              "used_with": "used with {type}"
          },
              "on_wiki": "{tag} on wiki.osm.org",
              "used_with": "used with {type}"
          },
-        "validations": {
-            "disconnected_highway": "Disconnected highway",
-            "disconnected_highway_tooltip": "Roads should be connected to other roads or building entrances.",
-            "old_multipolygon": "Multipolygon tags on outer way",
-            "old_multipolygon_tooltip": "This style of multipolygon is deprecated. Please assign the tags to the parent multipolygon instead of the outer way.",
-            "untagged_point": "Untagged point",
-            "untagged_point_tooltip": "Select a feature type that describes what this point is.",
-            "untagged_line": "Untagged line",
-            "untagged_line_tooltip": "Select a feature type that describes what this line is.",
-            "untagged_area": "Untagged area",
-            "untagged_area_tooltip": "Select a feature type that describes what this area is.",
-            "untagged_relation": "Untagged relation",
-            "untagged_relation_tooltip": "Select a feature type that describes what this relation is.",
-            "many_deletions": "You're deleting {n} features: {p} nodes, {l} lines, {a} areas, {r} relations. 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",
-            "deprecated_tags": "Deprecated tags: {tags}"
-        },
-        "zoom": {
-            "in": "Zoom in",
-            "out": "Zoom out"
-        },
          "cannot_zoom": "Cannot zoom out further in current mode.",
          "full_screen": "Toggle Full Screen",
          "cannot_zoom": "Cannot zoom out further in current mode.",
          "full_screen": "Toggle Full Screen",
-        "gpx": {
-            "local_layer": "Local file",
-            "drag_drop": "Drag and drop a .gpx, .geojson or .kml file on the page, or click the button to the right to browse",
-            "zoom": "Zoom to layer",
-            "browse": "Browse for a file"
+        "streetside": {
+            "report": "Report a privacy concern with this image"
          },
          "mapillary_images": {
          },
          "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)"
+            "tooltip": "Street-level photos from Mapillary"
          },
          "mapillary": {
              "view_on_mapillary": "View this image on Mapillary"
          },
          "openstreetcam_images": {
          },
          "mapillary": {
              "view_on_mapillary": "View this image on Mapillary"
          },
          "openstreetcam_images": {
-            "tooltip": "Street-level photos from OpenStreetCam",
-            "title": "Photo Overlay (OpenStreetCam)"
+            "tooltip": "Street-level photos from OpenStreetCam"
          },
          "openstreetcam": {
              "view_on_openstreetcam": "View this image on OpenStreetCam"
          },
          "openstreetcam": {
              "view_on_openstreetcam": "View this image on OpenStreetCam"
@@ -743,8 +636,7 @@
                  "before_start_h": "Before you start",
                  "before_start": "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Click \"Start the Walkthrough\" on this screen to take the tutorial - it takes only about 15 minutes.",
                  "open_source_h": "Open Source",
                  "before_start_h": "Before you start",
                  "before_start": "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Click \"Start the Walkthrough\" on this screen to take the tutorial - it takes only about 15 minutes.",
                  "open_source_h": "Open Source",
-                "open_source": "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD).",
-                "open_source_help": "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
+                "open_source": "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD)."
              },
              "overview": {
                  "title": "Overview",
              },
              "overview": {
                  "title": "Overview",
@@ -752,8 +644,7 @@
                  "navigation_drag": "You can drag the map by pressing and holding down the {leftclick} left mouse button and moving the mouse around. You can also use the `↓`, `↑`, `←`, `→` arrow keys on your keyboard.",
                  "navigation_zoom": "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons along the side of the map. You can also use the `+`, `-` keys on your keyboard.",
                  "features_h": "Map Features",
                  "navigation_drag": "You can drag the map by pressing and holding down the {leftclick} left mouse button and moving the mouse around. You can also use the `↓`, `↑`, `←`, `→` arrow keys on your keyboard.",
                  "navigation_zoom": "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons along the side of the map. You can also use the `+`, `-` keys on your keyboard.",
                  "features_h": "Map Features",
-                "features": "We use the word *features* to describe things that appear on the map, such as roads, buildings, or points of interest. Anything in the real world can be mapped as a feature on OpenStreetMap. Map features are represented on the map using *points*, *lines*, or *areas*.",
-                "nodes_ways": "In OpenStreetmap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
+                "features": "We use the word *features* to describe things that appear on the map, such as roads, buildings, or points of interest. Anything in the real world can be mapped as a feature on OpenStreetMap. Map features are represented on the map using *points*, *lines*, or *areas*."
              },
              "editing": {
                  "title": "Editing & Saving",
              },
              "editing": {
                  "title": "Editing & Saving",
@@ -783,11 +674,9 @@
                  "type": "You can click on the feature type to change the feature to a different type. Everything that exists in the real world can be added to OpenStreetMap, so there are thousands of feature types to choose from.",
                  "type_picker": "The type picker displays the most common feature types, such as parks, hospitals, restaurants, roads, and buildings. You can search for anything by typing what you're looking for in the search box. You can also click the {inspect} **Info** icon next to the feature type to learn more about it.",
                  "fields_h": "Fields",
                  "type": "You can click on the feature type to change the feature to a different type. Everything that exists in the real world can be added to OpenStreetMap, so there are thousands of feature types to choose from.",
                  "type_picker": "The type picker displays the most common feature types, such as parks, hospitals, restaurants, roads, and buildings. You can search for anything by typing what you're looking for in the search box. You can also click the {inspect} **Info** icon next to the feature type to learn more about it.",
                  "fields_h": "Fields",
-                "fields_all_fields": "The \"All fields\" section contains all of the feature's details that you may edit. In OpenStreetMap, all of the fields are optional, and it's OK to leave a field blank if you are unsure.",
                  "fields_example": "Each feature type will display different fields. For example, a road may display fields for its surface and speed limit, but a restaurant may display fields for the type of food it serves and the hours it is open.",
                  "fields_add_field": "You can also click the \"Add field\" dropdown to add more fields, such as a description, Wikipedia link, wheelchair access, and more.",
                  "tags_h": "Tags",
                  "fields_example": "Each feature type will display different fields. For example, a road may display fields for its surface and speed limit, but a restaurant may display fields for the type of food it serves and the hours it is open.",
                  "fields_add_field": "You can also click the \"Add field\" dropdown to add more fields, such as a description, Wikipedia link, wheelchair access, and more.",
                  "tags_h": "Tags",
-                "tags_all_tags": "Below the fields section, you can expand the \"All tags\" section to edit any of the OpenStreetMap *tags* for the selected feature. Each tag consists of a *key* and *value*, data elements that define all of the features stored in OpenStreetMap.",
                  "tags_resources": "Editing a feature's tags requires intermediate knowledge about OpenStreetMap. You should consult resources like the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page) or [Taginfo](https://taginfo.openstreetmap.org/) to learn more about accepted OpenStreetMap tagging practices."
              },
              "points": {
                  "tags_resources": "Editing a feature's tags requires intermediate knowledge about OpenStreetMap. You should consult resources like the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page) or [Taginfo](https://taginfo.openstreetmap.org/) to learn more about accepted OpenStreetMap tagging practices."
              },
              "points": {
@@ -848,8 +737,6 @@
                  "title": "Relations",
                  "intro": "A *relation* is a special type of feature in OpenStreetMap that groups together other features. The features that belong to a relation are called *members*, and each member can have a *role* in the relation.",
                  "edit_relation_h": "Editing Relations",
                  "title": "Relations",
                  "intro": "A *relation* is a special type of feature in OpenStreetMap that groups together other features. The features that belong to a relation are called *members*, and each member can have a *role* in the relation.",
                  "edit_relation_h": "Editing Relations",
-                "edit_relation": "At the bottom of the feature editor, you can expand the \"All relations\" section to see if the selected feature is a member of any relations. You can then click on the relation to select and edit it.",
-                "edit_relation_add": "To add a feature to a relation, select the feature, then click the {plus} add button in the \"All relations\" section of the feature editor. You can choose from a list of nearby relations, or choose the \"New relation...\" option.",
                  "edit_relation_delete": "You can also click the {delete} **Delete** button to remove the selected feature from the relation. If you remove all of the members from a relation, the relation will be deleted automatically.",
                  "maintain_relation_h": "Maintaining Relations",
                  "maintain_relation": "For the most part, iD will maintain relations automatically as you edit. You should take care when replacing features that might be members of relations. For example if you delete a section of road and draw a new section of road to replace it, you should add the new section to the same relations (routes, turn restrictions, etc.) as the original.",
                  "edit_relation_delete": "You can also click the {delete} **Delete** button to remove the selected feature from the relation. If you remove all of the members from a relation, the relation will be deleted automatically.",
                  "maintain_relation_h": "Maintaining Relations",
                  "maintain_relation": "For the most part, iD will maintain relations automatically as you edit. You should take care when replacing features that might be members of relations. For example if you delete a section of road and draw a new section of road to replace it, you should add the new section to the same relations (routes, turn restrictions, etc.) as the original.",
@@ -864,10 +751,8 @@
                  "turn_restriction_editing": "In the \"Turn Restrictions\" field, click to select a \"from\" road, and see whether turns are allowed or restricted to any of the \"to\" roads. You can click on the turn icons to toggle them between allowed and restricted. iD will create relations automatically and set the from, via, and to roles based on your choices.",
                  "route_h": "Routes",
                  "route": "A *route* relation is a group of one or more line features that together form a route network, like a bus route, train route, or highway route.",
                  "turn_restriction_editing": "In the \"Turn Restrictions\" field, click to select a \"from\" road, and see whether turns are allowed or restricted to any of the \"to\" roads. You can click on the turn icons to toggle them between allowed and restricted. iD will create relations automatically and set the from, via, and to roles based on your choices.",
                  "route_h": "Routes",
                  "route": "A *route* relation is a group of one or more line features that together form a route network, like a bus route, train route, or highway route.",
-                "route_add": "To add a feature to a route relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation.",
                  "boundary_h": "Boundaries",
                  "boundary_h": "Boundaries",
-                "boundary": "A *boundary* relation is a group of one or more line features that together form an administrative boundary.",
-                "boundary_add": "To add a feature to a boundary relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
+                "boundary": "A *boundary* relation is a group of one or more line features that together form an administrative boundary."
              },
              "imagery": {
                  "title": "Background Imagery",
              },
              "imagery": {
                  "title": "Background Imagery",
@@ -876,12 +761,10 @@
                  "choosing": "To see which imagery sources are available for editing, click the {layers} **Background settings** button on the side of the map.",
                  "sources": "By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is chosen as the background image. Depending on where you are editing, other imagery sources will be available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference.",
                  "offsets_h": "Adjusting Imagery Offset",
                  "choosing": "To see which imagery sources are available for editing, click the {layers} **Background settings** button on the side of the map.",
                  "sources": "By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is chosen as the background image. Depending on where you are editing, other imagery sources will be available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference.",
                  "offsets_h": "Adjusting Imagery Offset",
-                "offset": "Imagery is sometimes offset slightly from accurate map data. If you see a lot of roads or buildings shifted from the background imagery, it may be the imagery that's incorrect, so don't move them all to match the background. Instead, you can adjust the background so that it matches the existing data by expanding the \"Adjust Imagery Offset\" section at the bottom of the Background Settings pane.",
-                "offset_change": "Click on the small triangles to adjust the imagery offset in small steps, or hold the left mouse button and drag within the gray square to slide the imagery into alignment."
+                "offset": "Imagery is sometimes offset slightly from accurate map data. If you see a lot of roads or buildings shifted from the background imagery, it may be the imagery that's incorrect, so don't move them all to match the background. Instead, you can adjust the background so that it matches the existing data by expanding the \"Adjust Imagery Offset\" section at the bottom of the Background Settings pane."
              },
              "streetlevel": {
                  "title": "Street Level Photos",
              },
              "streetlevel": {
                  "title": "Street Level Photos",
-                "intro": "Street level photos are useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).",
                  "using_h": "Using Street Level Photos",
                  "using": "To use street level photos for mapping, click the {data} **Map data** panel on the side of the map to enable or disable the available photo layers.",
                  "photos": "When enabled, the photo layer displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken.",
                  "using_h": "Using Street Level Photos",
                  "using": "To use street level photos for mapping, click the {data} **Map data** panel on the side of the map to enable or disable the available photo layers.",
                  "photos": "When enabled, the photo layer displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken.",
@@ -1229,9 +1112,7 @@
                  },
                  "display_options": {
                      "title": "Display options",
                  },
                  "display_options": {
                      "title": "Display options",
-                    "background": "Show background options",
                      "background_switch": "Switch back to last background",
                      "background_switch": "Switch back to last background",
-                    "map_data": "Show map data options",
                      "fullscreen": "Enter full screen mode",
                      "wireframe": "Toggle wireframe mode",
                      "minimap": "Toggle minimap"
                      "fullscreen": "Enter full screen mode",
                      "wireframe": "Toggle wireframe mode",
                      "minimap": "Toggle minimap"
@@ -1244,7 +1125,6 @@
                      "search": "Find features matching search text"
                  },
                  "with_selected": {
                      "search": "Find features matching search text"
                  },
                  "with_selected": {
-                    "title": "With feature selected",
                      "edit_menu": "Toggle edit menu"
                  },
                  "vertex_selected": {
                      "edit_menu": "Toggle edit menu"
                  },
                  "vertex_selected": {
@@ -1263,7 +1143,6 @@
                      "add_point": "'Add point' mode",
                      "add_line": "'Add line' mode",
                      "add_area": "'Add area' mode",
                      "add_point": "'Add point' mode",
                      "add_line": "'Add line' mode",
                      "add_area": "'Add area' mode",
-                    "place_point": "Place a point",
                      "disable_snap": "Hold to disable point snapping",
                      "stop_line": "Finish drawing a line or area"
                  },
                      "disable_snap": "Hold to disable point snapping",
                      "stop_line": "Finish drawing a line or area"
                  },
@@ -1273,10 +1152,8 @@
                      "merge": "Combine (merge) selected features",
                      "disconnect": "Disconnect features at the selected node",
                      "split": "Split a line into two at the selected node",
                      "merge": "Combine (merge) selected features",
                      "disconnect": "Disconnect features at the selected node",
                      "split": "Split a line into two at the selected node",
-                    "reverse": "Reverse a line",
                      "move": "Move selected features",
                      "rotate": "Rotate selected features",
                      "move": "Move selected features",
                      "rotate": "Rotate selected features",
-                    "orthogonalize": "Straighten line / Square area corners",
                      "circularize": "Circularise a closed line or area",
                      "reflect_long": "Reflect features across the longer axis",
                      "reflect_short": "Reflect features across the shorter axis",
                      "circularize": "Circularise a closed line or area",
                      "reflect_long": "Reflect features across the longer axis",
                      "reflect_short": "Reflect features across the shorter axis",
@@ -1339,35 +1216,26 @@
                  "category-landuse": {
                      "name": "Land Use Features"
                  },
                  "category-landuse": {
                      "name": "Land Use Features"
                  },
-                "category-natural-area": {
-                    "name": "Natural Features"
-                },
-                "category-natural-line": {
-                    "name": "Natural Features"
-                },
-                "category-natural-point": {
+                "category-natural": {
                      "name": "Natural Features"
                  },
                  "category-path": {
                      "name": "Natural Features"
                  },
                  "category-path": {
-                    "name": "Path Features"
-                },
-                "category-rail": {
-                    "name": "Rail Features"
+                    "name": "Paths"
                  },
                  "category-restriction": {
                      "name": "Restriction Features"
                  },
                  },
                  "category-restriction": {
                      "name": "Restriction Features"
                  },
-                "category-road": {
-                    "name": "Road Features"
+                "category-road_service": {
+                    "name": "Service Roads"
                  },
                  "category-route": {
                      "name": "Route Features"
                  },
                  },
                  "category-route": {
                      "name": "Route Features"
                  },
-                "category-water-area": {
-                    "name": "Water Features"
+                "category-utility": {
+                    "name": "Utility Features"
                  },
                  },
-                "category-water-line": {
-                    "name": "Water Features"
+                "category-waterway": {
+                    "name": "Waterways"
                  }
              },
              "fields": {
                  }
              },
              "fields": {
@@ -1375,31 +1243,33 @@
                      "label": "Allowed Access",
                      "options": {
                          "designated": {
                      "label": "Allowed Access",
                      "options": {
                          "designated": {
-                            "description": "Access permitted according to signs or specific local laws",
+                            "description": "Access allowed according to signs or specific local laws",
                              "title": "Designated"
                          },
                          "destination": {
                              "title": "Designated"
                          },
                          "destination": {
-                            "description": "Access permitted only to reach a destination",
+                            "description": "Access allowed only to reach a destination",
                              "title": "Destination"
                          },
                          "dismount": {
                              "title": "Destination"
                          },
                          "dismount": {
-                            "description": "Access permitted but rider must dismount",
+                            "description": "Access allowed but rider must dismount",
                              "title": "Dismount"
                          },
                          "no": {
                              "title": "Dismount"
                          },
                          "no": {
-                            "description": "Access not permitted to the general public",
+                            "description": "Access not allowed to the general public",
                              "title": "Prohibited"
                          },
                          "permissive": {
                              "title": "Prohibited"
                          },
                          "permissive": {
-                            "description": "Access permitted until such time as the owner revokes the permission",
+                            "description": "Access allowed until such time as the owner revokes the permission",
                              "title": "Permissive"
                          },
                              "title": "Permissive"
                          },
+                        "permit": {
+                            "description": "Access allowed only with a valid permit or license",
+                            "title": "Permit"
+                        },
                          "private": {
                          "private": {
-                            "description": "Access permitted only with permission of the owner on an individual basis",
                              "title": "Private"
                          },
                          "yes": {
                              "title": "Private"
                          },
                          "yes": {
-                            "description": "Access permitted by law; a right of way",
                              "title": "Allowed"
                          }
                      },
                              "title": "Allowed"
                          }
                      },
@@ -1415,6 +1285,14 @@
                  "access_simple": {
                      "label": "Allowed Access"
                  },
                  "access_simple": {
                      "label": "Allowed Access"
                  },
+                "addr/interpolation": {
+                    "options": {
+                        "all": "All",
+                        "alphabetic": "Alphabetic",
+                        "even": "Even",
+                        "odd": "Odd"
+                    }
+                },
                  "address": {
                      "label": "Address",
                      "placeholders": {
                  "address": {
                      "label": "Address",
                      "placeholders": {
@@ -1497,6 +1375,9 @@
                  "agrarian": {
                      "label": "Products"
                  },
                  "agrarian": {
                      "label": "Products"
                  },
+                "air_conditioning": {
+                    "label": "Air Conditioning"
+                },
                  "amenity": {
                      "label": "Type"
                  },
                  "amenity": {
                      "label": "Type"
                  },
@@ -1509,6 +1390,9 @@
                  "animal_shelter": {
                      "label": "For Animals"
                  },
                  "animal_shelter": {
                      "label": "For Animals"
                  },
+                "architect": {
+                    "label": "Architect"
+                },
                  "area/highway": {
                      "label": "Type"
                  },
                  "area/highway": {
                      "label": "Type"
                  },
@@ -1521,6 +1405,9 @@
                  "atm": {
                      "label": "Cash Machine"
                  },
                  "atm": {
                      "label": "Cash Machine"
                  },
+                "baby_seat": {
+                    "label": "Baby Seat"
+                },
                  "backrest": {
                      "label": "Backrest"
                  },
                  "backrest": {
                      "label": "Backrest"
                  },
@@ -1542,7 +1429,7 @@
                      }
                  },
                  "beauty": {
                      }
                  },
                  "beauty": {
-                    "label": "Shop Type"
+                    "label": "Services"
                  },
                  "bench": {
                      "label": "Bench"
                  },
                  "bench": {
                      "label": "Bench"
@@ -1553,6 +1440,13 @@
                  "bin": {
                      "label": "Rubbish Bin"
                  },
                  "bin": {
                      "label": "Rubbish Bin"
                  },
+                "blind": {
+                    "options": {
+                        "limited": "Limited",
+                        "no": "No",
+                        "yes": "Yes"
+                    }
+                },
                  "blood_components": {
                      "label": "Blood Components",
                      "options": {
                  "blood_components": {
                      "label": "Blood Components",
                      "options": {
@@ -1574,6 +1468,9 @@
                  "brand": {
                      "label": "Brand"
                  },
                  "brand": {
                      "label": "Brand"
                  },
+                "brewery": {
+                    "label": "Draught Beers"
+                },
                  "bridge": {
                      "label": "Type",
                      "placeholder": "Default"
                  "bridge": {
                      "label": "Type",
                      "placeholder": "Default"
@@ -1581,6 +1478,12 @@
                  "building": {
                      "label": "Building"
                  },
                  "building": {
                      "label": "Building"
                  },
+                "building/levels/underground": {
+                    "placeholder": "2, 4, 6..."
+                },
+                "building/levels_building": {
+                    "placeholder": "2, 4, 6..."
+                },
                  "building_area": {
                      "label": "Building"
                  },
                  "building_area": {
                      "label": "Building"
                  },
@@ -1610,9 +1513,25 @@
                      "label": "Capacity",
                      "placeholder": "50, 100, 200..."
                  },
                      "label": "Capacity",
                      "placeholder": "50, 100, 200..."
                  },
+                "capacity/disabled_parking": {
+                    "placeholder": "1, 2, 3..."
+                },
+                "capacity_parking": {
+                    "placeholder": "10, 20, 30..."
+                },
                  "castle_type": {
                      "label": "Type"
                  },
                  "castle_type": {
                      "label": "Type"
                  },
+                "charge_fee": {
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
+                },
+                "charge_toll": {
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
+                },
+                "circumference": {
+                    "label": "Circumference",
+                    "placeholder": "1 m, 20 cm, 30 in…"
+                },
                  "clothes": {
                      "label": "Clothes"
                  },
                  "clothes": {
                      "label": "Clothes"
                  },
@@ -1622,6 +1541,9 @@
                  "collection_times": {
                      "label": "Collection Times"
                  },
                  "collection_times": {
                      "label": "Collection Times"
                  },
+                "colour": {
+                    "label": "Colour"
+                },
                  "comment": {
                      "label": "Changeset Comment",
                      "placeholder": "Brief description of your contributions (required)"
                  "comment": {
                      "label": "Changeset Comment",
                      "placeholder": "Brief description of your contributions (required)"
@@ -1642,6 +1564,9 @@
                  "country": {
                      "label": "Country"
                  },
                  "country": {
                      "label": "Country"
                  },
+                "couplings": {
+                    "placeholder": "1, 2, 3..."
+                },
                  "covered": {
                      "label": "Covered"
                  },
                  "covered": {
                      "label": "Covered"
                  },
@@ -1713,6 +1638,9 @@
                          "cycleway:right": "Right side"
                      }
                  },
                          "cycleway:right": "Right side"
                      }
                  },
+                "dance/style": {
+                    "label": "Dance Styles"
+                },
                  "date": {
                      "label": "Date"
                  },
                  "date": {
                      "label": "Date"
                  },
@@ -1725,6 +1653,14 @@
                  "denotation": {
                      "label": "Denotation"
                  },
                  "denotation": {
                      "label": "Denotation"
                  },
+                "departures_board": {
+                    "options": {
+                        "no": "None",
+                        "realtime": "Realtime",
+                        "timetable": "Timetable",
+                        "yes": "Yes"
+                    }
+                },
                  "description": {
                      "label": "Description"
                  },
                  "description": {
                      "label": "Description"
                  },
@@ -1732,8 +1668,50 @@
                      "label": "Devices",
                      "placeholder": "1, 2, 3..."
                  },
                      "label": "Devices",
                      "placeholder": "1, 2, 3..."
                  },
-                "diaper": {
-                    "label": "Baby Changing Available"
+                "diameter": {
+                    "placeholder": "5 mm, 10 cm, 15 in…"
+                },
+                "direction": {
+                    "label": "Direction (Degrees Clockwise)",
+                    "placeholder": "45, 90, 180, 270"
+                },
+                "direction_cardinal": {
+                    "label": "Direction",
+                    "options": {
+                        "E": "East",
+                        "ENE": "East-northeast",
+                        "ESE": "East-southeast",
+                        "N": "North",
+                        "NE": "Northeast",
+                        "NNE": "North-northeast",
+                        "NNW": "North-northwest",
+                        "NW": "Northwest",
+                        "S": "South",
+                        "SE": "Southeast",
+                        "SSE": "South-southeast",
+                        "SSW": "South-southwest",
+                        "SW": "Southwest",
+                        "W": "West",
+                        "WNW": "West-northwest",
+                        "WSW": "West-southwest"
+                    }
+                },
+                "direction_clock": {
+                    "label": "Direction",
+                    "options": {
+                        "anticlockwise": "Counterclockwise",
+                        "clockwise": "Clockwise"
+                    }
+                },
+                "direction_vertex": {
+                    "options": {
+                        "backward": "Backward",
+                        "both": "Both / All",
+                        "forward": "Forward"
+                    }
+                },
+                "dispensing": {
+                    "label": "Dispenses Prescriptions"
                  },
                  "display": {
                      "label": "Display"
                  },
                  "display": {
                      "label": "Display"
@@ -1741,6 +1719,15 @@
                  "dock": {
                      "label": "Type"
                  },
                  "dock": {
                      "label": "Type"
                  },
+                "dog": {
+                    "label": "Dogs"
+                },
+                "door": {
+                    "label": "Door"
+                },
+                "drink_multi": {
+                    "label": "Drinks"
+                },
                  "drive_through": {
                      "label": "Drive-Through"
                  },
                  "drive_through": {
                      "label": "Drive-Through"
                  },
@@ -1758,9 +1745,6 @@
                      },
                      "placeholder": "Contact Line, Electrified Rail..."
                  },
                      },
                      "placeholder": "Contact Line, Electrified Rail..."
                  },
-                "elevation": {
-                    "label": "Elevation"
-                },
                  "email": {
                      "label": "Email",
                      "placeholder": "example@example.com"
                  "email": {
                      "label": "Email",
                      "placeholder": "example@example.com"
@@ -1778,6 +1762,9 @@
                  "except": {
                      "label": "Exceptions"
                  },
                  "except": {
                      "label": "Exceptions"
                  },
+                "faces": {
+                    "label": "Faces"
+                },
                  "fax": {
                      "label": "Fax",
                      "placeholder": "+44 1632 961234"
                  "fax": {
                      "label": "Fax",
                      "placeholder": "+44 1632 961234"
@@ -1788,30 +1775,26 @@
                  "fence_type": {
                      "label": "Type"
                  },
                  "fence_type": {
                      "label": "Type"
                  },
-                "fire_hydrant/position": {
-                    "label": "Position",
-                    "options": {
-                        "green": "Green",
-                        "lane": "Lane",
-                        "parking_lot": "Car Park",
-                        "sidewalk": "Pavement"
-                    }
-                },
                  "fire_hydrant/type": {
                  "fire_hydrant/type": {
-                    "label": "Type",
+                    "label": "Shape",
                      "options": {
                          "pillar": "Pillar/Aboveground",
                      "options": {
                          "pillar": "Pillar/Aboveground",
-                        "pond": "Pond",
                          "underground": "Underground",
                          "wall": "Wall"
                      }
                  },
                          "underground": "Underground",
                          "wall": "Wall"
                      }
                  },
+                "fireplace": {
+                    "label": "Fireplace"
+                },
                  "fitness_station": {
                      "label": "Equipment Type"
                  },
                  "fixme": {
                      "label": "Fix Me"
                  },
                  "fitness_station": {
                      "label": "Equipment Type"
                  },
                  "fixme": {
                      "label": "Fix Me"
                  },
+                "floating": {
+                    "label": "Floating"
+                },
                  "ford": {
                      "label": "Type",
                      "placeholder": "Default"
                  "ford": {
                      "label": "Type",
                      "placeholder": "Default"
@@ -1825,6 +1808,9 @@
                  "fuel_multi": {
                      "label": "Fuel Types"
                  },
                  "fuel_multi": {
                      "label": "Fuel Types"
                  },
+                "gambling": {
+                    "label": "Games"
+                },
                  "gauge": {
                      "label": "Gauge"
                  },
                  "gauge": {
                      "label": "Gauge"
                  },
@@ -1864,7 +1850,7 @@
                      "label": "Handrail"
                  },
                  "hashtags": {
                      "label": "Handrail"
                  },
                  "hashtags": {
-                    "label": "Suggested Hashtags",
+                    "label": "Hashtags",
                      "placeholder": "#example"
                  },
                  "healthcare": {
                      "placeholder": "#example"
                  },
                  "healthcare": {
@@ -1889,11 +1875,38 @@
                      "label": "Hoops",
                      "placeholder": "1, 2, 4..."
                  },
                      "label": "Hoops",
                      "placeholder": "1, 2, 4..."
                  },
-                "iata": {
-                    "label": "IATA"
+                "horse_dressage": {
+                    "label": "Dressage Riding",
+                    "options": {
+                        "equestrian": "Yes",
+                        "undefined": "No"
+                    }
                  },
                  },
-                "icao": {
-                    "label": "ICAO"
+                "horse_riding": {
+                    "label": "Horseback Riding",
+                    "options": {
+                        "horse_riding": "Yes",
+                        "undefined": "No"
+                    }
+                },
+                "horse_scale": {
+                    "label": "Horseback Riding Difficulty",
+                    "options": {
+                        "common": "Easy: No problems or difficulties. (default)",
+                        "critical": "Borderline: Passable only for experienced riders and horses. Major obstacles. Bridges should be examined carefully.",
+                        "dangerous": "Dangerous: Passable only for very experienced riders and horses and only in good weather. Dismount.",
+                        "demanding": "Use with caution: Uneven way, occasional difficult passages.",
+                        "difficult": "Difficult: Way narrow and exposed. May contain obstacles to step over and narrow passages.",
+                        "impossible": "Impassable: Way or bridge not passable for horses. Too narrow, insuffient support, obstacles like ladders. Danger of life."
+                    },
+                    "placeholder": "Difficult, Dangerous..."
+                },
+                "horse_stables": {
+                    "label": "Riding Stable",
+                    "options": {
+                        "stables": "Yes",
+                        "undefined": "No"
+                    }
                  },
                  "incline": {
                      "label": "Incline"
                  },
                  "incline": {
                      "label": "Incline"
@@ -1908,6 +1921,9 @@
                  "indoor": {
                      "label": "Indoor"
                  },
                  "indoor": {
                      "label": "Indoor"
                  },
+                "industrial": {
+                    "label": "Type"
+                },
                  "information": {
                      "label": "Type"
                  },
                  "information": {
                      "label": "Type"
                  },
@@ -1918,7 +1934,7 @@
                      "label": "Intermittent"
                  },
                  "internet_access": {
                      "label": "Intermittent"
                  },
                  "internet_access": {
-                    "label": "Internet Access",
+                    "label": "Internet Connection",
                      "options": {
                          "no": "No",
                          "terminal": "Terminal",
                      "options": {
                          "no": "No",
                          "terminal": "Terminal",
@@ -1928,10 +1944,16 @@
                      }
                  },
                  "internet_access/fee": {
                      }
                  },
                  "internet_access/fee": {
-                    "label": "Internet Access Fee"
+                    "label": "Internet Access",
+                    "options": {
+                        "no": "Free",
+                        "yes": "Paid"
+                    }
                  },
                  },
-                "internet_access/ssid": {
-                    "label": "SSID (Network Name)"
+                "junction_line": {
+                    "options": {
+                        "roundabout": "Roundabout"
+                    }
                  },
                  "kerb": {
                      "label": "Kerb"
                  },
                  "kerb": {
                      "label": "Kerb"
@@ -1998,16 +2020,20 @@
                  "level": {
                      "label": "Level"
                  },
                  "level": {
                      "label": "Level"
                  },
-                "levels": {
-                    "label": "Levels",
-                    "placeholder": "2, 4, 6..."
-                },
                  "lit": {
                      "label": "Lit"
                  },
                  "location": {
                      "label": "Location"
                  },
                  "lit": {
                      "label": "Lit"
                  },
                  "location": {
                      "label": "Location"
                  },
+                "location_pool": {
+                    "label": "Location",
+                    "options": {
+                        "indoor": "Indoor",
+                        "outdoor": "Outdoor",
+                        "roof": "Rooftop"
+                    }
+                },
                  "man_made": {
                      "label": "Type"
                  },
                  "man_made": {
                      "label": "Type"
                  },
@@ -2028,6 +2054,10 @@
                      "label": "Speed Limit",
                      "placeholder": "40, 50, 60..."
                  },
                      "label": "Speed Limit",
                      "placeholder": "40, 50, 60..."
                  },
+                "maxspeed/advisory": {
+                    "label": "Advisory Speed Limit",
+                    "placeholder": "40, 50, 60..."
+                },
                  "maxstay": {
                      "label": "Max Stay"
                  },
                  "maxstay": {
                      "label": "Max Stay"
                  },
@@ -2087,7 +2117,6 @@
                      "label": "Network"
                  },
                  "network_bicycle": {
                      "label": "Network"
                  },
                  "network_bicycle": {
-                    "label": "Network Type",
                      "options": {
                          "icn": "International",
                          "lcn": "Local",
                      "options": {
                          "icn": "International",
                          "lcn": "Local",
@@ -2097,7 +2126,6 @@
                      "placeholder": "Local, Regional, National, International"
                  },
                  "network_foot": {
                      "placeholder": "Local, Regional, National, International"
                  },
                  "network_foot": {
-                    "label": "Network Type",
                      "options": {
                          "iwn": "International",
                          "lwn": "Local",
                      "options": {
                          "iwn": "International",
                          "lwn": "Local",
@@ -2107,7 +2135,6 @@
                      "placeholder": "Local, Regional, National, International"
                  },
                  "network_horse": {
                      "placeholder": "Local, Regional, National, International"
                  },
                  "network_horse": {
-                    "label": "Network Type",
                      "options": {
                          "ihn": "International",
                          "lhn": "Local",
                      "options": {
                          "ihn": "International",
                          "lhn": "Local",
@@ -2128,7 +2155,9 @@
                  "oneway": {
                      "label": "One Way",
                      "options": {
                  "oneway": {
                      "label": "One Way",
                      "options": {
+                        "alternating": "Alternating",
                          "no": "No",
                          "no": "No",
+                        "reversible": "Reversible",
                          "undefined": "Assumed to be No",
                          "yes": "Yes"
                      }
                          "undefined": "Assumed to be No",
                          "yes": "Yes"
                      }
@@ -2136,7 +2165,9 @@
                  "oneway_yes": {
                      "label": "One Way",
                      "options": {
                  "oneway_yes": {
                      "label": "One Way",
                      "options": {
+                        "alternating": "Alternating",
                          "no": "No",
                          "no": "No",
+                        "reversible": "Reversible",
                          "undefined": "Assumed to be Yes",
                          "yes": "Yes"
                      }
                          "undefined": "Assumed to be Yes",
                          "yes": "Yes"
                      }
@@ -2182,15 +2213,6 @@
                  },
                  "piste/difficulty": {
                      "label": "Difficulty",
                  },
                  "piste/difficulty": {
                      "label": "Difficulty",
-                    "options": {
-                        "advanced": "Advanced (black diamond)",
-                        "easy": "Easy (green circle)",
-                        "expert": "Expert (double black diamond)",
-                        "extreme": "Extreme (climbing equipment required)",
-                        "freeride": "Freeride (off-piste)",
-                        "intermediate": "Intermediate (blue square)",
-                        "novice": "Novice (instructional)"
-                    },
                      "placeholder": "Easy, Intermediate, Advanced..."
                  },
                  "piste/grooming": {
                      "placeholder": "Easy, Intermediate, Advanced..."
                  },
                  "piste/grooming": {
@@ -2228,15 +2250,6 @@
                      "label": "Power Output",
                      "placeholder": "500 MW, 1000 MW, 2000 MW..."
                  },
                      "label": "Power Output",
                      "placeholder": "500 MW, 1000 MW, 2000 MW..."
                  },
-                "playground/baby": {
-                    "label": "Baby Seat"
-                },
-                "playground/max_age": {
-                    "label": "Maximum Age"
-                },
-                "playground/min_age": {
-                    "label": "Minimum Age"
-                },
                  "population": {
                      "label": "Population"
                  },
                  "population": {
                      "label": "Population"
                  },
@@ -2255,15 +2268,35 @@
                  "railway": {
                      "label": "Type"
                  },
                  "railway": {
                      "label": "Type"
                  },
+                "railway/position": {
+                    "label": "Milestone Position",
+                    "placeholder": "Distance to one decimal (123.4)"
+                },
+                "railway/signal/direction": {
+                    "options": {
+                        "backward": "Backward",
+                        "both": "Both / All",
+                        "forward": "Forward"
+                    }
+                },
                  "rating": {
                      "label": "Power Rating"
                  },
                  "recycling_accepts": {
                      "label": "Accepts"
                  },
                  "rating": {
                      "label": "Power Rating"
                  },
                  "recycling_accepts": {
                      "label": "Accepts"
                  },
+                "recycling_type": {
+                    "options": {
+                        "centre": "Centre"
+                    },
+                    "placeholder": "Container, Centre"
+                },
                  "ref": {
                      "label": "Reference Code"
                  },
                  "ref": {
                      "label": "Reference Code"
                  },
+                "ref/isil": {
+                    "label": "ISIL Code"
+                },
                  "ref_aeroway_gate": {
                      "label": "Gate Number"
                  },
                  "ref_aeroway_gate": {
                      "label": "Gate Number"
                  },
@@ -2330,6 +2363,12 @@
                  "sanitary_dump_station": {
                      "label": "Toilet Disposal"
                  },
                  "sanitary_dump_station": {
                      "label": "Toilet Disposal"
                  },
+                "seamark/beacon_lateral/colour": {
+                    "label": "Colour"
+                },
+                "seamark/buoy_lateral/colour": {
+                    "label": "Colour"
+                },
                  "seasonal": {
                      "label": "Seasonal"
                  },
                  "seasonal": {
                      "label": "Seasonal"
                  },
@@ -2514,8 +2553,7 @@
                      "options": {
                          "bucket": "Bucket",
                          "chemical": "Chemical",
                      "options": {
                          "bucket": "Bucket",
                          "chemical": "Chemical",
-                        "flush": "Flush",
-                        "pitlatrine": "Pit/Latrine"
+                        "flush": "Flush"
                      }
                  },
                  "toll": {
                      }
                  },
                  "toll": {
@@ -2527,9 +2565,6 @@
                  "tourism": {
                      "label": "Type"
                  },
                  "tourism": {
                      "label": "Type"
                  },
-                "tourism_attraction": {
-                    "label": "Tourism"
-                },
                  "tower/construction": {
                      "label": "Construction",
                      "placeholder": "Guyed, Lattice, Concealed, ..."
                  "tower/construction": {
                      "label": "Construction",
                      "placeholder": "Guyed, Lattice, Concealed, ..."
@@ -2557,6 +2592,13 @@
                  "traffic_signals": {
                      "label": "Type"
                  },
                  "traffic_signals": {
                      "label": "Type"
                  },
+                "traffic_signals/direction": {
+                    "options": {
+                        "backward": "Backward",
+                        "both": "Both / All",
+                        "forward": "Forward"
+                    }
+                },
                  "trail_visibility": {
                      "label": "Trail Visibility",
                      "options": {
                  "trail_visibility": {
                      "label": "Trail Visibility",
                      "options": {
@@ -2589,6 +2631,20 @@
                      "label": "Type",
                      "placeholder": "Default"
                  },
                      "label": "Type",
                      "placeholder": "Default"
                  },
+                "usage_rail": {
+                    "label": "Usage Type",
+                    "options": {
+                        "branch": "Branch",
+                        "industrial": "Industrial",
+                        "main": "Main",
+                        "military": "Military",
+                        "test": "Test",
+                        "tourism": "Tourism"
+                    }
+                },
+                "vending": {
+                    "label": "Types of Goods"
+                },
                  "visibility": {
                      "label": "Visibility",
                      "options": {
                  "visibility": {
                      "label": "Visibility",
                      "options": {
@@ -2638,8 +2694,7 @@
                      "label": "Type"
                  },
                  "website": {
                      "label": "Type"
                  },
                  "website": {
-                    "label": "Website",
-                    "placeholder": "http://example.com/"
+                    "label": "Website"
                  },
                  "wetland": {
                      "label": "Type"
                  },
                  "wetland": {
                      "label": "Type"
@@ -2647,6 +2702,9 @@
                  "wheelchair": {
                      "label": "Wheelchair Access"
                  },
                  "wheelchair": {
                      "label": "Wheelchair Access"
                  },
+                "wholesale": {
+                    "label": "Wholesale"
+                },
                  "width": {
                      "label": "Width (Metres)"
                  },
                  "width": {
                      "label": "Width (Metres)"
                  },
@@ -2677,8 +2735,8 @@
                  "advertising/billboard": {
                      "name": "Billboard"
                  },
                  "advertising/billboard": {
                      "name": "Billboard"
                  },
-                "aerialway": {
-                    "name": "Aerialway"
+                "advertising/column": {
+                    "name": "Advertising Column"
                  },
                  "aerialway/cable_car": {
                      "name": "Cable Car"
                  },
                  "aerialway/cable_car": {
                      "name": "Cable Car"
@@ -2689,10 +2747,6 @@
                  "aerialway/drag_lift": {
                      "name": "Drag Lift"
                  },
                  "aerialway/drag_lift": {
                      "name": "Drag Lift"
                  },
-                "aerialway/gondola": {
-                    "name": "Gondola",
-                    "terms": "Dangleway"
-                },
                  "aerialway/goods": {
                      "name": "Goods Aerialway"
                  },
                  "aerialway/goods": {
                      "name": "Goods Aerialway"
                  },
@@ -2711,15 +2765,6 @@
                  "aerialway/rope_tow": {
                      "name": "Rope Tow Lift"
                  },
                  "aerialway/rope_tow": {
                      "name": "Rope Tow Lift"
                  },
-                "aerialway/station": {
-                    "name": "Aerialway Station"
-                },
-                "aerialway/t-bar": {
-                    "name": "T-bar Lift"
-                },
-                "aeroway": {
-                    "name": "Aeroway"
-                },
                  "aeroway/aerodrome": {
                      "name": "Airport"
                  },
                  "aeroway/aerodrome": {
                      "name": "Airport"
                  },
@@ -2744,6 +2789,9 @@
                  "aeroway/terminal": {
                      "name": "Airport Terminal"
                  },
                  "aeroway/terminal": {
                      "name": "Airport Terminal"
                  },
+                "allotments/plot": {
+                    "name": "Allotments Plot"
+                },
                  "amenity": {
                      "name": "Amenity"
                  },
                  "amenity": {
                      "name": "Amenity"
                  },
@@ -2783,24 +2831,21 @@
                  "amenity/bicycle_repair_station": {
                      "name": "Bicycle Repair Tool Stand"
                  },
                  "amenity/bicycle_repair_station": {
                      "name": "Bicycle Repair Tool Stand"
                  },
-                "amenity/biergarten": {
-                    "name": "Beer Garden"
-                },
                  "amenity/boat_rental": {
                      "name": "Boat Rental"
                  },
                  "amenity/bureau_de_change": {
                      "name": "Currency Exchange"
                  },
                  "amenity/boat_rental": {
                      "name": "Boat Rental"
                  },
                  "amenity/bureau_de_change": {
                      "name": "Currency Exchange"
                  },
+                "amenity/bus_station": {
+                    "name": "Bus Station / Terminal"
+                },
                  "amenity/cafe": {
                      "name": "Cafe"
                  },
                  "amenity/car_rental": {
                      "name": "Car Rental"
                  },
                  "amenity/cafe": {
                      "name": "Cafe"
                  },
                  "amenity/car_rental": {
                      "name": "Car Rental"
                  },
-                "amenity/car_sharing": {
-                    "name": "Car Sharing"
-                },
                  "amenity/car_wash": {
                      "name": "Car Wash"
                  },
                  "amenity/car_wash": {
                      "name": "Car Wash"
                  },
@@ -2849,6 +2894,9 @@
                  "amenity/dentist": {
                      "name": "Dentist"
                  },
                  "amenity/dentist": {
                      "name": "Dentist"
                  },
+                "amenity/dive_centre": {
+                    "name": "Dive Centre"
+                },
                  "amenity/doctors": {
                      "name": "Doctor"
                  },
                  "amenity/doctors": {
                      "name": "Doctor"
                  },
@@ -2867,6 +2915,9 @@
                  "amenity/fast_food": {
                      "name": "Fast Food"
                  },
                  "amenity/fast_food": {
                      "name": "Fast Food"
                  },
+                "amenity/ferry_terminal": {
+                    "name": "Ferry Station / Terminal"
+                },
                  "amenity/fire_station": {
                      "name": "Fire Station"
                  },
                  "amenity/fire_station": {
                      "name": "Fire Station"
                  },
@@ -2898,15 +2949,18 @@
                  "amenity/internet_cafe": {
                      "name": "Internet Cafe"
                  },
                  "amenity/internet_cafe": {
                      "name": "Internet Cafe"
                  },
-                "amenity/kindergarten": {
-                    "name": "Preschool/Kindergarten Grounds"
-                },
                  "amenity/library": {
                      "name": "Library"
                  },
                  "amenity/library": {
                      "name": "Library"
                  },
+                "amenity/love_hotel": {
+                    "name": "Love Hotel"
+                },
                  "amenity/marketplace": {
                      "name": "Marketplace"
                  },
                  "amenity/marketplace": {
                      "name": "Marketplace"
                  },
+                "amenity/monastery": {
+                    "name": "Monastery Grounds"
+                },
                  "amenity/motorcycle_parking": {
                      "name": "Motorcycle Parking"
                  },
                  "amenity/motorcycle_parking": {
                      "name": "Motorcycle Parking"
                  },
@@ -2920,19 +2974,16 @@
                      "name": "Nursing Home"
                  },
                  "amenity/parking": {
                      "name": "Nursing Home"
                  },
                  "amenity/parking": {
-                    "name": "Car Parking"
+                    "name": "Car Park"
                  },
                  },
-                "amenity/parking_entrance": {
-                    "name": "Parking Garage Entrance/Exit"
+                "amenity/parking/multi-storey": {
+                    "name": "Multistory Car Park"
                  },
                  "amenity/parking_space": {
                      "name": "Parking Space"
                  },
                  },
                  "amenity/parking_space": {
                      "name": "Parking Space"
                  },
-                "amenity/pavilion": {
-                    "name": "Pavilion"
-                },
-                "amenity/pharmacy": {
-                    "name": "Pharmacy"
+                "amenity/payment_centre": {
+                    "name": "Payment Centre"
                  },
                  "amenity/place_of_worship": {
                      "name": "Place of Worship"
                  },
                  "amenity/place_of_worship": {
                      "name": "Place of Worship"
@@ -2940,18 +2991,9 @@
                  "amenity/place_of_worship/buddhist": {
                      "name": "Buddhist Temple"
                  },
                  "amenity/place_of_worship/buddhist": {
                      "name": "Buddhist Temple"
                  },
-                "amenity/place_of_worship/christian": {
-                    "name": "Church"
-                },
                  "amenity/place_of_worship/hindu": {
                      "name": "Hindu Temple"
                  },
                  "amenity/place_of_worship/hindu": {
                      "name": "Hindu Temple"
                  },
-                "amenity/place_of_worship/jewish": {
-                    "name": "Synagogue"
-                },
-                "amenity/place_of_worship/muslim": {
-                    "name": "Mosque"
-                },
                  "amenity/place_of_worship/shinto": {
                      "name": "Shinto Shrine"
                  },
                  "amenity/place_of_worship/shinto": {
                      "name": "Shinto Shrine"
                  },
@@ -2968,8 +3010,7 @@
                      "name": "Police"
                  },
                  "amenity/post_box": {
                      "name": "Police"
                  },
                  "amenity/post_box": {
-                    "name": "Post Box",
-                    "terms": "Mailbox"
+                    "name": "Post Box"
                  },
                  "amenity/post_office": {
                      "name": "Post Office"
                  },
                  "amenity/post_office": {
                      "name": "Post Office"
@@ -2992,9 +3033,6 @@
                  "amenity/recycling_centre": {
                      "name": "Recycling Centre"
                  },
                  "amenity/recycling_centre": {
                      "name": "Recycling Centre"
                  },
-                "amenity/register_office": {
-                    "name": "Register Office"
-                },
                  "amenity/restaurant": {
                      "name": "Restaurant"
                  },
                  "amenity/restaurant": {
                      "name": "Restaurant"
                  },
@@ -3004,15 +3042,15 @@
                  "amenity/school": {
                      "name": "School Grounds"
                  },
                  "amenity/school": {
                      "name": "School Grounds"
                  },
-                "amenity/scrapyard": {
-                    "name": "Scrap Yard"
-                },
                  "amenity/shelter": {
                      "name": "Shelter"
                  },
                  "amenity/shower": {
                      "name": "Shower"
                  },
                  "amenity/shelter": {
                      "name": "Shelter"
                  },
                  "amenity/shower": {
                      "name": "Shower"
                  },
+                "amenity/smoking_area": {
+                    "name": "Smoking Area"
+                },
                  "amenity/social_facility": {
                      "name": "Social Facility"
                  },
                  "amenity/social_facility": {
                      "name": "Social Facility"
                  },
@@ -3031,9 +3069,6 @@
                  "amenity/studio": {
                      "name": "Studio"
                  },
                  "amenity/studio": {
                      "name": "Studio"
                  },
-                "amenity/swimming_pool": {
-                    "name": "Swimming Pool"
-                },
                  "amenity/taxi": {
                      "name": "Taxi Stand"
                  },
                  "amenity/taxi": {
                      "name": "Taxi Stand"
                  },
@@ -3058,33 +3093,45 @@
                  "amenity/vending_machine/cigarettes": {
                      "name": "Cigarette Vending Machine"
                  },
                  "amenity/vending_machine/cigarettes": {
                      "name": "Cigarette Vending Machine"
                  },
+                "amenity/vending_machine/coffee": {
+                    "name": "Coffee Vending Machine"
+                },
                  "amenity/vending_machine/condoms": {
                      "name": "Condom Vending Machine"
                  },
                  "amenity/vending_machine/drinks": {
                      "name": "Drink Vending Machine"
                  },
                  "amenity/vending_machine/condoms": {
                      "name": "Condom Vending Machine"
                  },
                  "amenity/vending_machine/drinks": {
                      "name": "Drink Vending Machine"
                  },
-                "amenity/vending_machine/excrement_bags": {
-                    "name": "Excrement Bag Vending Machine"
+                "amenity/vending_machine/electronics": {
+                    "name": "Electronics Vending Machine"
+                },
+                "amenity/vending_machine/elongated_coin": {
+                    "name": "Elongated Coin Vending Machine"
                  },
                  "amenity/vending_machine/feminine_hygiene": {
                      "name": "Feminine Hygiene Vending Machine"
                  },
                  },
                  "amenity/vending_machine/feminine_hygiene": {
                      "name": "Feminine Hygiene Vending Machine"
                  },
-                "amenity/vending_machine/news_papers": {
-                    "name": "Newspaper Vending Machine"
+                "amenity/vending_machine/food": {
+                    "name": "Food Vending Machine"
+                },
+                "amenity/vending_machine/fuel": {
+                    "name": "Fuel Pump"
+                },
+                "amenity/vending_machine/ice_cream": {
+                    "name": "Ice Cream Vending Machine"
                  },
                  "amenity/vending_machine/newspapers": {
                      "name": "Newspaper Vending Machine"
                  },
                  },
                  "amenity/vending_machine/newspapers": {
                      "name": "Newspaper Vending Machine"
                  },
-                "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "Parcel Pickup/Dropoff Vending Machine"
-                },
                  "amenity/vending_machine/parking_tickets": {
                      "name": "Parking Ticket Vending Machine"
                  },
                  "amenity/vending_machine/public_transport_tickets": {
                      "name": "Transit Ticket Vending Machine"
                  },
                  "amenity/vending_machine/parking_tickets": {
                      "name": "Parking Ticket Vending Machine"
                  },
                  "amenity/vending_machine/public_transport_tickets": {
                      "name": "Transit Ticket Vending Machine"
                  },
+                "amenity/vending_machine/stamps": {
+                    "name": "Postage Vending Machine"
+                },
                  "amenity/vending_machine/sweets": {
                      "name": "Snack Vending Machine"
                  },
                  "amenity/vending_machine/sweets": {
                      "name": "Snack Vending Machine"
                  },
@@ -3112,21 +3159,12 @@
                  "area": {
                      "name": "Area"
                  },
                  "area": {
                      "name": "Area"
                  },
-                "area/highway": {
-                    "name": "Road Surface"
-                },
                  "attraction/amusement_ride": {
                      "name": "Amusement Ride"
                  },
                  "attraction/amusement_ride": {
                      "name": "Amusement Ride"
                  },
-                "attraction/animal": {
-                    "name": "Animal"
-                },
                  "attraction/big_wheel": {
                      "name": "Big Wheel"
                  },
                  "attraction/big_wheel": {
                      "name": "Big Wheel"
                  },
-                "attraction/bumper_car": {
-                    "name": "Bumper Car"
-                },
                  "attraction/bungee_jumping": {
                      "name": "Bungee Jumping"
                  },
                  "attraction/bungee_jumping": {
                      "name": "Bungee Jumping"
                  },
@@ -3136,14 +3174,8 @@
                  "attraction/dark_ride": {
                      "name": "Ghost Train"
                  },
                  "attraction/dark_ride": {
                      "name": "Ghost Train"
                  },
-                "attraction/drop_tower": {
-                    "name": "Drop Tower"
-                },
-                "attraction/pirate_ship": {
-                    "name": "Pirate Ship"
-                },
-                "attraction/river_rafting": {
-                    "name": "River Rafting"
+                "attraction/maze": {
+                    "name": "Maze"
                  },
                  "attraction/roller_coaster": {
                      "name": "Roller Coaster"
                  },
                  "attraction/roller_coaster": {
                      "name": "Roller Coaster"
@@ -3190,6 +3222,15 @@
                  "barrier/hedge": {
                      "name": "Hedge"
                  },
                  "barrier/hedge": {
                      "name": "Hedge"
                  },
+                "barrier/kerb": {
+                    "name": "Kerb"
+                },
+                "barrier/kerb/flush": {
+                    "name": "Flush Kerb"
+                },
+                "barrier/kerb/lowered": {
+                    "name": "Lowered Kerb"
+                },
                  "barrier/kissing_gate": {
                      "name": "Kissing Gate"
                  },
                  "barrier/kissing_gate": {
                      "name": "Kissing Gate"
                  },
@@ -3214,12 +3255,15 @@
                  "building": {
                      "name": "Building"
                  },
                  "building": {
                      "name": "Building"
                  },
-                "building/apartments": {
-                    "name": "Apartments"
-                },
                  "building/barn": {
                      "name": "Barn"
                  },
                  "building/barn": {
                      "name": "Barn"
                  },
+                "building/boathouse": {
+                    "name": "Boathouse"
+                },
+                "building/bungalow": {
+                    "name": "Bungalow"
+                },
                  "building/bunker": {
                      "name": "Bunker"
                  },
                  "building/bunker": {
                      "name": "Bunker"
                  },
@@ -3235,6 +3279,9 @@
                  "building/church": {
                      "name": "Church Building"
                  },
                  "building/church": {
                      "name": "Church Building"
                  },
+                "building/civic": {
+                    "name": "Civic Building"
+                },
                  "building/college": {
                      "name": "College Building"
                  },
                  "building/college": {
                      "name": "College Building"
                  },
@@ -3253,12 +3300,21 @@
                  "building/entrance": {
                      "name": "Entrance/Exit"
                  },
                  "building/entrance": {
                      "name": "Entrance/Exit"
                  },
+                "building/farm": {
+                    "name": "Farm House"
+                },
+                "building/farm_auxiliary": {
+                    "name": "Farm Building"
+                },
                  "building/garage": {
                      "name": "Garage"
                  },
                  "building/garages": {
                      "name": "Garages"
                  },
                  "building/garage": {
                      "name": "Garage"
                  },
                  "building/garages": {
                      "name": "Garages"
                  },
+                "building/grandstand": {
+                    "name": "Grandstand"
+                },
                  "building/greenhouse": {
                      "name": "Greenhouse"
                  },
                  "building/greenhouse": {
                      "name": "Greenhouse"
                  },
@@ -3277,8 +3333,8 @@
                  "building/industrial": {
                      "name": "Industrial Building"
                  },
                  "building/industrial": {
                      "name": "Industrial Building"
                  },
-                "building/kindergarten": {
-                    "name": "Preschool/Kindergarten Building"
+                "building/mosque": {
+                    "name": "Mosque Building"
                  },
                  "building/public": {
                      "name": "Public Building"
                  },
                  "building/public": {
                      "name": "Public Building"
@@ -3292,26 +3348,38 @@
                  "building/roof": {
                      "name": "Roof"
                  },
                  "building/roof": {
                      "name": "Roof"
                  },
+                "building/ruins": {
+                    "name": "Building Ruins"
+                },
                  "building/school": {
                      "name": "School Building"
                  },
                  "building/semidetached_house": {
                      "name": "Semi-Detached House"
                  },
                  "building/school": {
                      "name": "School Building"
                  },
                  "building/semidetached_house": {
                      "name": "Semi-Detached House"
                  },
+                "building/service": {
+                    "name": "Service Building"
+                },
                  "building/shed": {
                      "name": "Shed"
                  },
                  "building/stable": {
                      "name": "Stable"
                  },
                  "building/shed": {
                      "name": "Shed"
                  },
                  "building/stable": {
                      "name": "Stable"
                  },
+                "building/stadium": {
+                    "name": "Stadium Building"
+                },
                  "building/static_caravan": {
                      "name": "Static Caravan"
                  },
                  "building/static_caravan": {
                      "name": "Static Caravan"
                  },
+                "building/temple": {
+                    "name": "Temple Building"
+                },
                  "building/terrace": {
                      "name": "Terraced houses"
                  },
                  "building/terrace": {
                      "name": "Terraced houses"
                  },
-                "building/train_station": {
-                    "name": "Train Station"
+                "building/transportation": {
+                    "name": "Transportation Building"
                  },
                  "building/university": {
                      "name": "University Building"
                  },
                  "building/university": {
                      "name": "University Building"
@@ -3319,9 +3387,6 @@
                  "building/warehouse": {
                      "name": "Warehouse"
                  },
                  "building/warehouse": {
                      "name": "Warehouse"
                  },
-                "camp_site/camp_pitch": {
-                    "name": "Camp Pitch"
-                },
                  "club": {
                      "name": "Club"
                  },
                  "club": {
                      "name": "Club"
                  },
@@ -3391,9 +3456,6 @@
                  "craft/insulator": {
                      "name": "Insulator"
                  },
                  "craft/insulator": {
                      "name": "Insulator"
                  },
-                "craft/jeweler": {
-                    "name": "Jeweler"
-                },
                  "craft/key_cutter": {
                      "name": "Key Cutter"
                  },
                  "craft/key_cutter": {
                      "name": "Key Cutter"
                  },
@@ -3403,9 +3465,6 @@
                  "craft/metal_construction": {
                      "name": "Metal Construction"
                  },
                  "craft/metal_construction": {
                      "name": "Metal Construction"
                  },
-                "craft/optician": {
-                    "name": "Optician"
-                },
                  "craft/painter": {
                      "name": "Painter"
                  },
                  "craft/painter": {
                      "name": "Painter"
                  },
@@ -3421,9 +3480,6 @@
                  "craft/plumber": {
                      "name": "Plumber"
                  },
                  "craft/plumber": {
                      "name": "Plumber"
                  },
-                "craft/pottery": {
-                    "name": "Pottery"
-                },
                  "craft/rigger": {
                      "name": "Rigger"
                  },
                  "craft/rigger": {
                      "name": "Rigger"
                  },
@@ -3505,33 +3561,17 @@
                  "emergency/private": {
                      "name": "Emergency Access Private"
                  },
                  "emergency/private": {
                      "name": "Emergency Access Private"
                  },
+                "emergency/water_tank": {
+                    "name": "Emergency Water Tank"
+                },
                  "emergency/yes": {
                      "name": "Emergency Access Yes"
                  },
                  "emergency/yes": {
                      "name": "Emergency Access Yes"
                  },
-                "entrance": {
-                    "name": "Entrance/Exit"
-                },
-                "footway/crossing": {
-                    "name": "Street Crossing"
-                },
-                "footway/crossing-raised": {
-                    "name": "Raised Street Crossing"
-                },
-                "footway/crosswalk": {
-                    "name": "Zebra Crossing"
-                },
-                "footway/crosswalk-raised": {
-                    "name": "Raised Zebra Crossing"
-                },
-                "footway/sidewalk": {
-                    "name": "Pavement",
-                    "terms": "sidewalk, pavement, footway, footpath"
-                },
                  "ford": {
                      "name": "Ford"
                  },
                  "golf/bunker": {
                  "ford": {
                      "name": "Ford"
                  },
                  "golf/bunker": {
-                    "name": "Bunker"
+                    "name": "Golf Bunker"
                  },
                  "golf/fairway": {
                      "name": "Fairway"
                  },
                  "golf/fairway": {
                      "name": "Fairway"
@@ -3542,24 +3582,12 @@
                  "golf/hole": {
                      "name": "Golf Hole"
                  },
                  "golf/hole": {
                      "name": "Golf Hole"
                  },
-                "golf/lateral_water_hazard_area": {
-                    "name": "Lateral Water Hazard"
-                },
-                "golf/lateral_water_hazard_line": {
-                    "name": "Lateral Water Hazard"
-                },
                  "golf/rough": {
                      "name": "Rough"
                  },
                  "golf/tee": {
                      "name": "Tee Box"
                  },
                  "golf/rough": {
                      "name": "Rough"
                  },
                  "golf/tee": {
                      "name": "Tee Box"
                  },
-                "golf/water_hazard_area": {
-                    "name": "Water Hazard"
-                },
-                "golf/water_hazard_line": {
-                    "name": "Water Hazard"
-                },
                  "healthcare": {
                      "name": "Healthcare Facility"
                  },
                  "healthcare": {
                      "name": "Healthcare Facility"
                  },
@@ -3581,6 +3609,9 @@
                  "healthcare/hospice": {
                      "name": "Hospice"
                  },
                  "healthcare/hospice": {
                      "name": "Hospice"
                  },
+                "healthcare/laboratory": {
+                    "name": "Medical Laboratory"
+                },
                  "healthcare/midwife": {
                      "name": "Midwife"
                  },
                  "healthcare/midwife": {
                      "name": "Midwife"
                  },
@@ -3605,26 +3636,26 @@
                  "healthcare/speech_therapist": {
                      "name": "Speech Therapist"
                  },
                  "healthcare/speech_therapist": {
                      "name": "Speech Therapist"
                  },
-                "highway": {
-                    "name": "Highway"
-                },
                  "highway/bridleway": {
                      "name": "Bridleway"
                  },
                  "highway/bridleway": {
                      "name": "Bridleway"
                  },
+                "highway/bus_guideway": {
+                    "name": "Bus Guideway"
+                },
                  "highway/corridor": {
                      "name": "Indoor Corridor"
                  },
                  "highway/corridor": {
                      "name": "Indoor Corridor"
                  },
-                "highway/crossing": {
-                    "name": "Street Crossing"
+                "highway/crossing/marked": {
+                    "name": "Marked Crossing"
                  },
                  },
-                "highway/crossing-raised": {
-                    "name": "Raised Street Crossing"
+                "highway/crossing/marked-raised": {
+                    "name": "Marked Crossing (Raised)"
                  },
                  },
-                "highway/crosswalk": {
-                    "name": "Zebra Crossing"
+                "highway/crossing/zebra": {
+                    "name": "Marked Crossing"
                  },
                  },
-                "highway/crosswalk-raised": {
-                    "name": "Raised Zebra Crossing"
+                "highway/crossing/zebra-raised": {
+                    "name": "Marked Crossing (Raised)"
                  },
                  "highway/cycleway": {
                      "name": "Cycle Path"
                  },
                  "highway/cycleway": {
                      "name": "Cycle Path"
@@ -3635,6 +3666,21 @@
                  "highway/footway": {
                      "name": "Foot Path"
                  },
                  "highway/footway": {
                      "name": "Foot Path"
                  },
+                "highway/footway/marked": {
+                    "name": "Marked Crossing"
+                },
+                "highway/footway/marked-raised": {
+                    "name": "Marked Crossing (Raised)"
+                },
+                "highway/footway/sidewalk": {
+                    "name": "Pavement"
+                },
+                "highway/footway/zebra": {
+                    "name": "Marked Crossing"
+                },
+                "highway/footway/zebra-raised": {
+                    "name": "Marked Crossing (Raised)"
+                },
                  "highway/give_way": {
                      "name": "Give Way Sign"
                  },
                  "highway/give_way": {
                      "name": "Give Way Sign"
                  },
@@ -3653,6 +3699,9 @@
                  "highway/motorway_link": {
                      "name": "Motorway Link"
                  },
                  "highway/motorway_link": {
                      "name": "Motorway Link"
                  },
+                "highway/passing_place": {
+                    "name": "Passing Place"
+                },
                  "highway/path": {
                      "name": "Path"
                  },
                  "highway/path": {
                      "name": "Path"
                  },
@@ -3668,9 +3717,6 @@
                  "highway/primary_link": {
                      "name": "Primary Link"
                  },
                  "highway/primary_link": {
                      "name": "Primary Link"
                  },
-                "highway/raceway": {
-                    "name": "Racetrack (Motorsport)"
-                },
                  "highway/residential": {
                      "name": "Residential Road"
                  },
                  "highway/residential": {
                      "name": "Residential Road"
                  },
@@ -3782,12 +3828,6 @@
                  "junction": {
                      "name": "Junction"
                  },
                  "junction": {
                      "name": "Junction"
                  },
-                "landuse": {
-                    "name": "Land Use"
-                },
-                "landuse/allotments": {
-                    "name": "Allotments"
-                },
                  "landuse/aquaculture": {
                      "name": "Aquaculture"
                  },
                  "landuse/aquaculture": {
                      "name": "Aquaculture"
                  },
@@ -3806,9 +3846,6 @@
                  "landuse/commercial": {
                      "name": "Commercial Area"
                  },
                  "landuse/commercial": {
                      "name": "Commercial Area"
                  },
-                "landuse/construction": {
-                    "name": "Construction"
-                },
                  "landuse/farm": {
                      "name": "Farmland"
                  },
                  "landuse/farm": {
                      "name": "Farmland"
                  },
@@ -3818,8 +3855,8 @@
                  "landuse/farmyard": {
                      "name": "Farmyard"
                  },
                  "landuse/farmyard": {
                      "name": "Farmyard"
                  },
-                "landuse/forest": {
-                    "name": "Forest"
+                "landuse/garages": {
+                    "name": "Garage Landuse"
                  },
                  "landuse/grass": {
                      "name": "Grass"
                  },
                  "landuse/grass": {
                      "name": "Grass"
@@ -3827,6 +3864,9 @@
                  "landuse/greenfield": {
                      "name": "Greenfield"
                  },
                  "landuse/greenfield": {
                      "name": "Greenfield"
                  },
+                "landuse/greenhouse_horticulture": {
+                    "name": "Greenhouse Horticulture"
+                },
                  "landuse/harbour": {
                      "name": "Harbor"
                  },
                  "landuse/harbour": {
                      "name": "Harbor"
                  },
@@ -3854,39 +3894,24 @@
                  "landuse/military/barracks": {
                      "name": "Barracks"
                  },
                  "landuse/military/barracks": {
                      "name": "Barracks"
                  },
-                "landuse/military/bunker": {
-                    "name": "Military Bunker"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "Checkpoint"
-                },
                  "landuse/military/danger_area": {
                      "name": "Danger Area"
                  },
                  "landuse/military/naval_base": {
                      "name": "Naval Base"
                  },
                  "landuse/military/danger_area": {
                      "name": "Danger Area"
                  },
                  "landuse/military/naval_base": {
                      "name": "Naval Base"
                  },
-                "landuse/military/nuclear_explosion_site": {
-                    "name": "Nuclear Explosion Site"
-                },
-                "landuse/military/obstacle_course": {
-                    "name": "Obstacle Course"
-                },
-                "landuse/military/office": {
-                    "name": "Military Office"
-                },
                  "landuse/military/range": {
                      "name": "Military Range"
                  },
                  "landuse/military/range": {
                      "name": "Military Range"
                  },
-                "landuse/military/training_area": {
-                    "name": "Training Area"
-                },
                  "landuse/orchard": {
                      "name": "Orchard"
                  },
                  "landuse/plant_nursery": {
                      "name": "Plant Nursery"
                  },
                  "landuse/orchard": {
                      "name": "Orchard"
                  },
                  "landuse/plant_nursery": {
                      "name": "Plant Nursery"
                  },
+                "landuse/pond": {
+                    "name": "Pond"
+                },
                  "landuse/quarry": {
                      "name": "Quarry"
                  },
                  "landuse/quarry": {
                      "name": "Quarry"
                  },
@@ -3899,6 +3924,9 @@
                  "landuse/religious": {
                      "name": "Religious Area"
                  },
                  "landuse/religious": {
                      "name": "Religious Area"
                  },
+                "landuse/reservoir": {
+                    "name": "Reservoir"
+                },
                  "landuse/residential": {
                      "name": "Residential Area"
                  },
                  "landuse/residential": {
                      "name": "Residential Area"
                  },
@@ -3908,12 +3936,15 @@
                  "landuse/vineyard": {
                      "name": "Vineyard"
                  },
                  "landuse/vineyard": {
                      "name": "Vineyard"
                  },
-                "leisure": {
-                    "name": "Leisure"
-                },
                  "leisure/adult_gaming_centre": {
                      "name": "Adult Gaming Centre"
                  },
                  "leisure/adult_gaming_centre": {
                      "name": "Adult Gaming Centre"
                  },
+                "leisure/amusement_arcade": {
+                    "name": "Amusement Arcade"
+                },
+                "leisure/beach_resort": {
+                    "name": "Beach Resort"
+                },
                  "leisure/bird_hide": {
                      "name": "Bird Hide"
                  },
                  "leisure/bird_hide": {
                      "name": "Bird Hide"
                  },
@@ -3926,11 +3957,20 @@
                  "leisure/dance": {
                      "name": "Dance Hall"
                  },
                  "leisure/dance": {
                      "name": "Dance Hall"
                  },
+                "leisure/dancing_school": {
+                    "name": "Dance School"
+                },
                  "leisure/dog_park": {
                      "name": "Dog Park"
                  },
                  "leisure/dog_park": {
                      "name": "Dog Park"
                  },
+                "leisure/escape_game": {
+                    "name": "Escape Room"
+                },
                  "leisure/firepit": {
                  "leisure/firepit": {
-                    "name": "Firepit"
+                    "name": "Fire Pit"
+                },
+                "leisure/fishing": {
+                    "name": "Fishing Spot"
                  },
                  "leisure/fitness_centre": {
                      "name": "Gym / Fitness Centre"
                  },
                  "leisure/fitness_centre": {
                      "name": "Gym / Fitness Centre"
@@ -3998,6 +4038,9 @@
                  "leisure/nature_reserve": {
                      "name": "Nature Reserve"
                  },
                  "leisure/nature_reserve": {
                      "name": "Nature Reserve"
                  },
+                "leisure/outdoor_seating": {
+                    "name": "Outdoor Seating Area"
+                },
                  "leisure/park": {
                      "name": "Park"
                  },
                  "leisure/park": {
                      "name": "Park"
                  },
@@ -4010,8 +4053,8 @@
                  "leisure/pitch/american_football": {
                      "name": "American Football Field"
                  },
                  "leisure/pitch/american_football": {
                      "name": "American Football Field"
                  },
-                "leisure/pitch/baseball": {
-                    "name": "Baseball Diamond"
+                "leisure/pitch/badminton": {
+                    "name": "Badminton Court"
                  },
                  "leisure/pitch/basketball": {
                      "name": "Basketball Court"
                  },
                  "leisure/pitch/basketball": {
                      "name": "Basketball Court"
@@ -4025,12 +4068,18 @@
                  "leisure/pitch/bowls": {
                      "name": "Bowling Green"
                  },
                  "leisure/pitch/bowls": {
                      "name": "Bowling Green"
                  },
+                "leisure/pitch/chess": {
+                    "name": "Giant Chess Board"
+                },
                  "leisure/pitch/cricket": {
                      "name": "Cricket Field"
                  },
                  "leisure/pitch/equestrian": {
                      "name": "Riding Arena"
                  },
                  "leisure/pitch/cricket": {
                      "name": "Cricket Field"
                  },
                  "leisure/pitch/equestrian": {
                      "name": "Riding Arena"
                  },
+                "leisure/pitch/netball": {
+                    "name": "Netball Court"
+                },
                  "leisure/pitch/rugby_league": {
                      "name": "Rugby League Pitch"
                  },
                  "leisure/pitch/rugby_league": {
                      "name": "Rugby League Pitch"
                  },
@@ -4058,15 +4107,15 @@
                  "leisure/resort": {
                      "name": "Resort"
                  },
                  "leisure/resort": {
                      "name": "Resort"
                  },
-                "leisure/running_track": {
-                    "name": "Racetrack (Running)"
-                },
                  "leisure/sauna": {
                      "name": "Sauna"
                  },
                  "leisure/slipway": {
                      "name": "Slipway"
                  },
                  "leisure/sauna": {
                      "name": "Sauna"
                  },
                  "leisure/slipway": {
                      "name": "Slipway"
                  },
+                "leisure/slipway_point": {
+                    "name": "Slipway"
+                },
                  "leisure/sports_centre": {
                      "name": "Sports Centre / Complex"
                  },
                  "leisure/sports_centre": {
                      "name": "Sports Centre / Complex"
                  },
@@ -4088,21 +4137,27 @@
                  "line": {
                      "name": "Line"
                  },
                  "line": {
                      "name": "Line"
                  },
-                "man_made": {
-                    "name": "Man Made"
-                },
                  "man_made/adit": {
                      "name": "Adit"
                  },
                  "man_made/adit": {
                      "name": "Adit"
                  },
+                "man_made/antenna": {
+                    "name": "Antenna"
+                },
+                "man_made/beehive": {
+                    "name": "Beehive"
+                },
                  "man_made/breakwater": {
                      "name": "Breakwater"
                  },
                  "man_made/breakwater": {
                      "name": "Breakwater"
                  },
-                "man_made/bridge": {
-                    "name": "Bridge"
+                "man_made/cairn": {
+                    "name": "Cairn"
                  },
                  "man_made/chimney": {
                      "name": "Chimney"
                  },
                  },
                  "man_made/chimney": {
                      "name": "Chimney"
                  },
+                "man_made/clearcut": {
+                    "name": "Clearcut Forest"
+                },
                  "man_made/crane": {
                      "name": "Crane"
                  },
                  "man_made/crane": {
                      "name": "Crane"
                  },
@@ -4124,11 +4179,26 @@
                  "man_made/lighthouse": {
                      "name": "Lighthouse"
                  },
                  "man_made/lighthouse": {
                      "name": "Lighthouse"
                  },
+                "man_made/manhole": {
+                    "name": "Manhole"
+                },
                  "man_made/mast": {
                      "name": "Mast"
                  },
                  "man_made/mast": {
                      "name": "Mast"
                  },
-                "man_made/observation": {
-                    "name": "Observation Tower"
+                "man_made/mast/communication/mobile_phone": {
+                    "name": "Mobile Phone Mast"
+                },
+                "man_made/mast/communication/radio": {
+                    "name": "Radio Broadcast Mast"
+                },
+                "man_made/mast/communication/television": {
+                    "name": "Television Broadcast Mast"
+                },
+                "man_made/mineshaft": {
+                    "name": "Mineshaft"
+                },
+                "man_made/obelisk": {
+                    "name": "Obelisk"
                  },
                  "man_made/petroleum_well": {
                      "name": "Oil Well"
                  },
                  "man_made/petroleum_well": {
                      "name": "Oil Well"
@@ -4151,15 +4221,21 @@
                  "man_made/surveillance": {
                      "name": "Surveillance"
                  },
                  "man_made/surveillance": {
                      "name": "Surveillance"
                  },
-                "man_made/surveillance_camera": {
-                    "name": "Surveillance Camera"
-                },
                  "man_made/survey_point": {
                      "name": "Survey Point"
                  },
                  "man_made/tower": {
                      "name": "Tower"
                  },
                  "man_made/survey_point": {
                      "name": "Survey Point"
                  },
                  "man_made/tower": {
                      "name": "Tower"
                  },
+                "man_made/tower/minaret": {
+                    "name": "Minaret"
+                },
+                "man_made/tower/observation": {
+                    "name": "Observation Tower"
+                },
+                "man_made/tunnel": {
+                    "name": "Tunnel Area"
+                },
                  "man_made/wastewater_plant": {
                      "name": "Wastewater Plant"
                  },
                  "man_made/wastewater_plant": {
                      "name": "Wastewater Plant"
                  },
@@ -4181,17 +4257,17 @@
                  "man_made/works": {
                      "name": "Factory"
                  },
                  "man_made/works": {
                      "name": "Factory"
                  },
-                "manhole": {
-                    "name": "Manhole"
+                "military/bunker": {
+                    "name": "Military Bunker"
                  },
                  },
-                "manhole/drain": {
-                    "name": "Storm Drain"
+                "military/checkpoint": {
+                    "name": "Military Checkpoint"
                  },
                  },
-                "manhole/telecom": {
-                    "name": "Telecom Manhole"
+                "military/nuclear_explosion_site": {
+                    "name": "Nuclear Explosion Site"
                  },
                  },
-                "natural": {
-                    "name": "Natural"
+                "military/office": {
+                    "name": "Military Office"
                  },
                  "natural/bare_rock": {
                      "name": "Bare Rock"
                  },
                  "natural/bare_rock": {
                      "name": "Bare Rock"
@@ -4223,9 +4299,15 @@
                  "natural/heath": {
                      "name": "Heath"
                  },
                  "natural/heath": {
                      "name": "Heath"
                  },
+                "natural/mud": {
+                    "name": "Mud"
+                },
                  "natural/peak": {
                      "name": "Peak"
                  },
                  "natural/peak": {
                      "name": "Peak"
                  },
+                "natural/reef": {
+                    "name": "Reef"
+                },
                  "natural/ridge": {
                      "name": "Ridge"
                  },
                  "natural/ridge": {
                      "name": "Ridge"
                  },
@@ -4241,14 +4323,20 @@
                  "natural/scrub": {
                      "name": "Scrub"
                  },
                  "natural/scrub": {
                      "name": "Scrub"
                  },
+                "natural/shrub": {
+                    "name": "Shrub"
+                },
                  "natural/spring": {
                      "name": "Spring"
                  },
                  "natural/spring": {
                      "name": "Spring"
                  },
+                "natural/stone": {
+                    "name": "Unattached Stone / Boulder"
+                },
                  "natural/tree": {
                      "name": "Tree"
                  },
                  "natural/tree": {
                      "name": "Tree"
                  },
-                "natural/tree_row": {
-                    "name": "Tree row"
+                "natural/valley": {
+                    "name": "Valley"
                  },
                  "natural/volcano": {
                      "name": "Volcano"
                  },
                  "natural/volcano": {
                      "name": "Volcano"
@@ -4256,6 +4344,9 @@
                  "natural/water": {
                      "name": "Water"
                  },
                  "natural/water": {
                      "name": "Water"
                  },
+                "natural/water/basin": {
+                    "name": "Basin"
+                },
                  "natural/water/lake": {
                      "name": "Lake"
                  },
                  "natural/water/lake": {
                      "name": "Lake"
                  },
@@ -4268,9 +4359,6 @@
                  "natural/wetland": {
                      "name": "Wetland"
                  },
                  "natural/wetland": {
                      "name": "Wetland"
                  },
-                "natural/wood": {
-                    "name": "Wood"
-                },
                  "noexit/yes": {
                      "name": "No Exit"
                  },
                  "noexit/yes": {
                      "name": "No Exit"
                  },
@@ -4298,6 +4386,9 @@
                  "office/charity": {
                      "name": "Charity Office"
                  },
                  "office/charity": {
                      "name": "Charity Office"
                  },
+                "office/company": {
+                    "name": "Corporate Office"
+                },
                  "office/coworking": {
                      "name": "Coworking Space"
                  },
                  "office/coworking": {
                      "name": "Coworking Space"
                  },
@@ -4361,9 +4452,6 @@
                  "office/physician": {
                      "name": "Physician"
                  },
                  "office/physician": {
                      "name": "Physician"
                  },
-                "office/political_party": {
-                    "name": "Political Party"
-                },
                  "office/private_investigator": {
                      "name": "Private Investigator Office"
                  },
                  "office/private_investigator": {
                      "name": "Private Investigator Office"
                  },
@@ -4391,9 +4479,6 @@
                  "office/water_utility": {
                      "name": "Water Utility Office"
                  },
                  "office/water_utility": {
                      "name": "Water Utility Office"
                  },
-                "piste": {
-                    "name": "Piste/Ski Trail"
-                },
                  "place": {
                      "name": "Place"
                  },
                  "place": {
                      "name": "Place"
                  },
@@ -4484,18 +4569,9 @@
                  "point": {
                      "name": "Point"
                  },
                  "point": {
                      "name": "Point"
                  },
-                "power": {
-                    "name": "Power"
-                },
                  "power/generator": {
                      "name": "Power Generator"
                  },
                  "power/generator": {
                      "name": "Power Generator"
                  },
-                "power/generator/source_nuclear": {
-                    "name": "Nuclear Reactor"
-                },
-                "power/generator/source_wind": {
-                    "name": "Wind Turbine"
-                },
                  "power/line": {
                      "name": "Power Line"
                  },
                  "power/line": {
                      "name": "Power Line"
                  },
@@ -4508,9 +4584,6 @@
                  "power/pole": {
                      "name": "Power Pole"
                  },
                  "power/pole": {
                      "name": "Power Pole"
                  },
-                "power/sub_station": {
-                    "name": "Substation"
-                },
                  "power/substation": {
                      "name": "Substation"
                  },
                  "power/substation": {
                      "name": "Substation"
                  },
@@ -4523,8 +4596,71 @@
                  "power/transformer": {
                      "name": "Transformer"
                  },
                  "power/transformer": {
                      "name": "Transformer"
                  },
-                "railway": {
-                    "name": "Railway"
+                "public_transport/station": {
+                    "name": "Transit Station"
+                },
+                "public_transport/station_aerialway": {
+                    "name": "Aerialway Station"
+                },
+                "public_transport/station_bus": {
+                    "name": "Bus Station / Terminal"
+                },
+                "public_transport/station_ferry": {
+                    "name": "Ferry Station / Terminal"
+                },
+                "public_transport/station_light_rail": {
+                    "name": "Light Rail Station"
+                },
+                "public_transport/station_monorail": {
+                    "name": "Monorail Station"
+                },
+                "public_transport/station_subway": {
+                    "name": "Subway Station"
+                },
+                "public_transport/station_train": {
+                    "name": "Train Station"
+                },
+                "public_transport/station_train_halt": {
+                    "name": "Train Station (Halt / Request)"
+                },
+                "public_transport/station_tram": {
+                    "name": "Tram Station"
+                },
+                "public_transport/station_trolleybus": {
+                    "name": "Trolleybus Station / Terminal"
+                },
+                "public_transport/stop_area": {
+                    "name": "Transit Stop Area"
+                },
+                "public_transport/stop_position": {
+                    "name": "Transit Stopping Location"
+                },
+                "public_transport/stop_position_aerialway": {
+                    "name": "Aerialway Stopping Location"
+                },
+                "public_transport/stop_position_bus": {
+                    "name": "Bus Stopping Location"
+                },
+                "public_transport/stop_position_ferry": {
+                    "name": "Ferry Stopping Location"
+                },
+                "public_transport/stop_position_light_rail": {
+                    "name": "Light Rail Stopping Location"
+                },
+                "public_transport/stop_position_monorail": {
+                    "name": "Monorail Stopping Location"
+                },
+                "public_transport/stop_position_subway": {
+                    "name": "Subway Stopping Location"
+                },
+                "public_transport/stop_position_train": {
+                    "name": "Train Stopping Location"
+                },
+                "public_transport/stop_position_tram": {
+                    "name": "Tram Stopping Location"
+                },
+                "public_transport/stop_position_trolleybus": {
+                    "name": "Trolleybus Stopping Location"
                  },
                  "railway/abandoned": {
                      "name": "Abandoned Railway"
                  },
                  "railway/abandoned": {
                      "name": "Abandoned Railway"
@@ -4541,8 +4677,8 @@
                  "railway/disused": {
                      "name": "Disused Railway"
                  },
                  "railway/disused": {
                      "name": "Disused Railway"
                  },
-                "railway/funicular": {
-                    "name": "Funicular"
+                "railway/halt": {
+                    "name": "Train Station (Halt / Request)"
                  },
                  "railway/level_crossing": {
                      "name": "Level Crossing (Road)"
                  },
                  "railway/level_crossing": {
                      "name": "Level Crossing (Road)"
@@ -4550,20 +4686,11 @@
                  "railway/milestone": {
                      "name": "Railway Milestone"
                  },
                  "railway/milestone": {
                      "name": "Railway Milestone"
                  },
-                "railway/monorail": {
-                    "name": "Monorail"
-                },
-                "railway/narrow_gauge": {
-                    "name": "Narrow Gauge Rail"
-                },
-                "railway/rail": {
-                    "name": "Rail"
-                },
                  "railway/signal": {
                      "name": "Railway Signal"
                  },
                  "railway/signal": {
                      "name": "Railway Signal"
                  },
-                "railway/subway": {
-                    "name": "Subway"
+                "railway/station": {
+                    "name": "Train Station"
                  },
                  "railway/subway_entrance": {
                      "name": "Subway Entrance"
                  },
                  "railway/subway_entrance": {
                      "name": "Subway Entrance"
@@ -4574,15 +4701,12 @@
                  "railway/train_wash": {
                      "name": "Train Wash"
                  },
                  "railway/train_wash": {
                      "name": "Train Wash"
                  },
-                "railway/tram": {
-                    "name": "Tram"
+                "railway/tram_stop": {
+                    "name": "Tram Stopping Position"
                  },
                  "relation": {
                      "name": "Relation"
                  },
                  },
                  "relation": {
                      "name": "Relation"
                  },
-                "roundabout": {
-                    "name": "Roundabout"
-                },
                  "route/ferry": {
                      "name": "Ferry Route"
                  },
                  "route/ferry": {
                      "name": "Ferry Route"
                  },
@@ -4592,29 +4716,26 @@
                  "shop/alcohol": {
                      "name": "Off licence (Alcohol shop)"
                  },
                  "shop/alcohol": {
                      "name": "Off licence (Alcohol shop)"
                  },
-                "shop/anime": {
-                    "name": "Anime Shop"
-                },
                  "shop/antiques": {
                      "name": "Antiques Shop"
                  },
                  "shop/appliance": {
                  "shop/antiques": {
                      "name": "Antiques Shop"
                  },
                  "shop/appliance": {
-                    "name": "Appliance Store"
+                    "name": "Appliance Shop"
                  },
                  "shop/art": {
                  },
                  "shop/art": {
-                    "name": "Art Store"
+                    "name": "Art Shop"
                  },
                  "shop/baby_goods": {
                  },
                  "shop/baby_goods": {
-                    "name": "Baby Goods Store"
+                    "name": "Baby Goods Shop"
                  },
                  "shop/bag": {
                  },
                  "shop/bag": {
-                    "name": "Bag/Luggage Store"
+                    "name": "Bag/Luggage Shop"
                  },
                  "shop/bakery": {
                      "name": "Bakery"
                  },
                  "shop/bathroom_furnishing": {
                  },
                  "shop/bakery": {
                      "name": "Bakery"
                  },
                  "shop/bathroom_furnishing": {
-                    "name": "Bathroom Furnishing Store"
+                    "name": "Bathroom Furnishing Shop"
                  },
                  "shop/beauty": {
                      "name": "Beauty Shop"
                  },
                  "shop/beauty": {
                      "name": "Beauty Shop"
@@ -4626,10 +4747,10 @@
                      "name": "Tanning Salon"
                  },
                  "shop/bed": {
                      "name": "Tanning Salon"
                  },
                  "shop/bed": {
-                    "name": "Bedding/Mattress Store"
+                    "name": "Bed Shop"
                  },
                  "shop/beverages": {
                  },
                  "shop/beverages": {
-                    "name": "Beverage Store"
+                    "name": "Beverages Shop"
                  },
                  "shop/bicycle": {
                      "name": "Bicycle Shop"
                  },
                  "shop/bicycle": {
                      "name": "Bicycle Shop"
@@ -4638,7 +4759,7 @@
                      "name": "Bookmaker"
                  },
                  "shop/books": {
                      "name": "Bookmaker"
                  },
                  "shop/books": {
-                    "name": "Book Store"
+                    "name": "Book Shop"
                  },
                  "shop/boutique": {
                      "name": "Boutique"
                  },
                  "shop/boutique": {
                      "name": "Boutique"
@@ -4653,55 +4774,52 @@
                      "name": "Car Dealership"
                  },
                  "shop/car_parts": {
                      "name": "Car Dealership"
                  },
                  "shop/car_parts": {
-                    "name": "Car Parts Store"
+                    "name": "Car Parts Shop"
                  },
                  "shop/car_repair": {
                      "name": "Car Repair Shop"
                  },
                  "shop/carpet": {
                  },
                  "shop/car_repair": {
                      "name": "Car Repair Shop"
                  },
                  "shop/carpet": {
-                    "name": "Carpet Store"
+                    "name": "Carpet Shop"
                  },
                  "shop/charity": {
                      "name": "Charity Shop"
                  },
                  "shop/cheese": {
                  },
                  "shop/charity": {
                      "name": "Charity Shop"
                  },
                  "shop/cheese": {
-                    "name": "Cheese Store"
+                    "name": "Cheese Shop"
                  },
                  "shop/chemist": {
                      "name": "Chemist"
                  },
                  "shop/chocolate": {
                  },
                  "shop/chemist": {
                      "name": "Chemist"
                  },
                  "shop/chocolate": {
-                    "name": "Chocolate Store"
+                    "name": "Chocolate Shop"
                  },
                  "shop/clothes": {
                  },
                  "shop/clothes": {
-                    "name": "Clothing Store"
+                    "name": "Clothing Shop"
                  },
                  "shop/coffee": {
                  },
                  "shop/coffee": {
-                    "name": "Coffee Store"
+                    "name": "Coffee Shop (Retail)"
                  },
                  "shop/computer": {
                  },
                  "shop/computer": {
-                    "name": "Computer Store"
+                    "name": "Computer Shop"
                  },
                  "shop/confectionery": {
                  },
                  "shop/confectionery": {
-                    "name": "Candy Store"
+                    "name": "Sweet Shop"
                  },
                  "shop/convenience": {
                      "name": "Convenience Store"
                  },
                  "shop/copyshop": {
                  },
                  "shop/convenience": {
                      "name": "Convenience Store"
                  },
                  "shop/copyshop": {
-                    "name": "Copy Store"
+                    "name": "Copyshop"
                  },
                  "shop/cosmetics": {
                  },
                  "shop/cosmetics": {
-                    "name": "Cosmetics Store"
-                },
-                "shop/craft": {
-                    "name": "Arts and Crafts Store"
+                    "name": "Cosmetics Shop"
                  },
                  "shop/curtain": {
                  },
                  "shop/curtain": {
-                    "name": "Curtain Store"
+                    "name": "Curtain Shop"
                  },
                  "shop/dairy": {
                  },
                  "shop/dairy": {
-                    "name": "Dairy Store"
+                    "name": "Dairy Shop"
                  },
                  "shop/deli": {
                      "name": "Deli"
                  },
                  "shop/deli": {
                      "name": "Deli"
@@ -4710,7 +4828,7 @@
                      "name": "Department Store"
                  },
                  "shop/doityourself": {
                      "name": "Department Store"
                  },
                  "shop/doityourself": {
-                    "name": "DIY Store"
+                    "name": "DIY Shop"
                  },
                  "shop/dry_cleaning": {
                      "name": "Dry Cleaner"
                  },
                  "shop/dry_cleaning": {
                      "name": "Dry Cleaner"
@@ -4719,22 +4837,19 @@
                      "name": "E-Cigarette Shop"
                  },
                  "shop/electronics": {
                      "name": "E-Cigarette Shop"
                  },
                  "shop/electronics": {
-                    "name": "Electronics Store"
+                    "name": "Electronics Shop"
                  },
                  "shop/erotic": {
                  },
                  "shop/erotic": {
-                    "name": "Erotic Store"
+                    "name": "Erotic Shop"
                  },
                  "shop/fabric": {
                  },
                  "shop/fabric": {
-                    "name": "Fabric Store"
+                    "name": "Fabric Shop"
                  },
                  "shop/farm": {
                      "name": "Farm Shop"
                  },
                  "shop/fashion": {
                  },
                  "shop/farm": {
                      "name": "Farm Shop"
                  },
                  "shop/fashion": {
-                    "name": "Fashion Store"
-                },
-                "shop/fishmonger": {
-                    "name": "Fishmonger"
+                    "name": "Fashion Shop"
                  },
                  "shop/florist": {
                      "name": "Florist"
                  },
                  "shop/florist": {
                      "name": "Florist"
@@ -4745,11 +4860,8 @@
                  "shop/funeral_directors": {
                      "name": "Funeral Home"
                  },
                  "shop/funeral_directors": {
                      "name": "Funeral Home"
                  },
-                "shop/furnace": {
-                    "name": "Furnace Store"
-                },
                  "shop/furniture": {
                  "shop/furniture": {
-                    "name": "Furniture Store"
+                    "name": "Furniture Shop"
                  },
                  "shop/garden_centre": {
                      "name": "Garden Centre"
                  },
                  "shop/garden_centre": {
                      "name": "Garden Centre"
@@ -4767,34 +4879,35 @@
                      "name": "Hairdresser"
                  },
                  "shop/hardware": {
                      "name": "Hairdresser"
                  },
                  "shop/hardware": {
-                    "name": "Hardware Store"
+                    "name": "Hardware Shop"
+                },
+                "shop/health_food": {
+                    "name": "Health Food Shop"
                  },
                  "shop/hearing_aids": {
                  },
                  "shop/hearing_aids": {
-                    "name": "Hearing Aids Store"
+                    "name": "Hearing Aids Shop"
                  },
                  "shop/herbalist": {
                      "name": "Herbalist"
                  },
                  "shop/hifi": {
                  },
                  "shop/herbalist": {
                      "name": "Herbalist"
                  },
                  "shop/hifi": {
-                    "name": "Hifi Store"
+                    "name": "Hifi Shop"
                  },
                  "shop/houseware": {
                  },
                  "shop/houseware": {
-                    "name": "Houseware Store"
+                    "name": "Houseware Store",
+                    "terms": "homeware, kitchenware, linen, crockery"
                  },
                  "shop/interior_decoration": {
                  },
                  "shop/interior_decoration": {
-                    "name": "Interior Decoration Store"
-                },
-                "shop/jewelry": {
-                    "name": "Jeweller"
+                    "name": "Interior Decoration Shop"
                  },
                  "shop/kitchen": {
                  },
                  "shop/kitchen": {
-                    "name": "Kitchen Design Store"
+                    "name": "Kitchen Design Shop"
                  },
                  "shop/laundry": {
                      "name": "Laundry"
                  },
                  "shop/leather": {
                  },
                  "shop/laundry": {
                      "name": "Laundry"
                  },
                  "shop/leather": {
-                    "name": "Leather Store"
+                    "name": "Leather Shop"
                  },
                  "shop/locksmith": {
                      "name": "Locksmith"
                  },
                  "shop/locksmith": {
                      "name": "Locksmith"
@@ -4809,10 +4922,10 @@
                      "name": "Massage Shop"
                  },
                  "shop/medical_supply": {
                      "name": "Massage Shop"
                  },
                  "shop/medical_supply": {
-                    "name": "Medical Supply Store"
+                    "name": "Medical Supply Shop"
                  },
                  "shop/mobile_phone": {
                  },
                  "shop/mobile_phone": {
-                    "name": "Mobile Phone Store"
+                    "name": "Mobile Phone Shop"
                  },
                  "shop/money_lender": {
                      "name": "Money Lender"
                  },
                  "shop/money_lender": {
                      "name": "Money Lender"
@@ -4820,17 +4933,20 @@
                  "shop/motorcycle": {
                      "name": "Motorcycle Dealership"
                  },
                  "shop/motorcycle": {
                      "name": "Motorcycle Dealership"
                  },
+                "shop/motorcycle_repair": {
+                    "name": "Motorcycle Repair Shop"
+                },
                  "shop/music": {
                  "shop/music": {
-                    "name": "Music Store"
+                    "name": "Music Shop"
                  },
                  "shop/musical_instrument": {
                  },
                  "shop/musical_instrument": {
-                    "name": "Musical Instrument Store"
+                    "name": "Musical Instrument Shop"
                  },
                  "shop/newsagent": {
                      "name": "Newspaper/Magazine Shop"
                  },
                  "shop/nutrition_supplements": {
                  },
                  "shop/newsagent": {
                      "name": "Newspaper/Magazine Shop"
                  },
                  "shop/nutrition_supplements": {
-                    "name": "Nutrition Supplements Store"
+                    "name": "Nutrition Supplements Shop"
                  },
                  "shop/optician": {
                      "name": "Optician"
                  },
                  "shop/optician": {
                      "name": "Optician"
@@ -4839,10 +4955,10 @@
                      "name": "Organic Goods Store"
                  },
                  "shop/outdoor": {
                      "name": "Organic Goods Store"
                  },
                  "shop/outdoor": {
-                    "name": "Outdoors Store"
+                    "name": "Outdoors Shop"
                  },
                  "shop/paint": {
                  },
                  "shop/paint": {
-                    "name": "Paint Store"
+                    "name": "Paint Shop"
                  },
                  "shop/pastry": {
                      "name": "Pastry Shop"
                  },
                  "shop/pastry": {
                      "name": "Pastry Shop"
@@ -4851,22 +4967,25 @@
                      "name": "Pawn Shop"
                  },
                  "shop/perfumery": {
                      "name": "Pawn Shop"
                  },
                  "shop/perfumery": {
-                    "name": "Perfume Store"
+                    "name": "Perfume Shop"
                  },
                  "shop/pet": {
                  },
                  "shop/pet": {
-                    "name": "Pet Store"
+                    "name": "Pet Shop"
+                },
+                "shop/pet_grooming": {
+                    "name": "Pet Grooming Shop"
                  },
                  "shop/photo": {
                  },
                  "shop/photo": {
-                    "name": "Photography Store"
+                    "name": "Photography Shop"
                  },
                  "shop/pyrotechnics": {
                  },
                  "shop/pyrotechnics": {
-                    "name": "Fireworks Store"
+                    "name": "Fireworks Shop"
                  },
                  "shop/radiotechnics": {
                  },
                  "shop/radiotechnics": {
-                    "name": "Radio/Electronic Component Store"
+                    "name": "Radio/Electronic Component Shop"
                  },
                  "shop/religion": {
                  },
                  "shop/religion": {
-                    "name": "Religious Store"
+                    "name": "Religious Shop"
                  },
                  "shop/scuba_diving": {
                      "name": "Scuba Diving Shop"
                  },
                  "shop/scuba_diving": {
                      "name": "Scuba Diving Shop"
@@ -4875,16 +4994,16 @@
                      "name": "Seafood Shop"
                  },
                  "shop/second_hand": {
                      "name": "Seafood Shop"
                  },
                  "shop/second_hand": {
-                    "name": "Consignment/Thrift Store"
+                    "name": "Second Hand Shop"
                  },
                  "shop/shoes": {
                      "name": "Shoe Shop"
                  },
                  "shop/sports": {
                  },
                  "shop/shoes": {
                      "name": "Shoe Shop"
                  },
                  "shop/sports": {
-                    "name": "Sporting Goods Store"
+                    "name": "Sporting Goods Shop"
                  },
                  "shop/stationery": {
                  },
                  "shop/stationery": {
-                    "name": "Stationery Store"
+                    "name": "Stationery Shop"
                  },
                  "shop/storage_rental": {
                      "name": "Storage Rental"
                  },
                  "shop/storage_rental": {
                      "name": "Storage Rental"
@@ -4899,7 +5018,7 @@
                      "name": "Tattoo Parlor"
                  },
                  "shop/tea": {
                      "name": "Tattoo Parlor"
                  },
                  "shop/tea": {
-                    "name": "Tea Store"
+                    "name": "Tea Shop (Retail)"
                  },
                  "shop/ticket": {
                      "name": "Ticket Seller"
                  },
                  "shop/ticket": {
                      "name": "Ticket Seller"
@@ -4911,7 +5030,7 @@
                      "name": "Tobacco Shop"
                  },
                  "shop/toys": {
                      "name": "Tobacco Shop"
                  },
                  "shop/toys": {
-                    "name": "Toy Store"
+                    "name": "Toy Shop"
                  },
                  "shop/trade": {
                      "name": "Trade Shop"
                  },
                  "shop/trade": {
                      "name": "Trade Shop"
@@ -4920,22 +5039,22 @@
                      "name": "Travel Agency"
                  },
                  "shop/tyres": {
                      "name": "Travel Agency"
                  },
                  "shop/tyres": {
-                    "name": "Tire Store"
+                    "name": "Tyre Shop"
                  },
                  "shop/vacant": {
                      "name": "Vacant Shop"
                  },
                  "shop/vacuum_cleaner": {
                  },
                  "shop/vacant": {
                      "name": "Vacant Shop"
                  },
                  "shop/vacuum_cleaner": {
-                    "name": "Vacuum Cleaner Store"
+                    "name": "Vacuum Cleaner Shop"
                  },
                  "shop/variety_store": {
                      "name": "Variety Store"
                  },
                  "shop/video": {
                  },
                  "shop/variety_store": {
                      "name": "Variety Store"
                  },
                  "shop/video": {
-                    "name": "Video Store"
+                    "name": "Video/DVD Shop"
                  },
                  "shop/video_games": {
                  },
                  "shop/video_games": {
-                    "name": "Video Game Store"
+                    "name": "Video Games Shop"
                  },
                  "shop/watches": {
                      "name": "Watches Shop"
                  },
                  "shop/watches": {
                      "name": "Watches Shop"
@@ -4946,15 +5065,15 @@
                  "shop/weapons": {
                      "name": "Weapon Shop"
                  },
                  "shop/weapons": {
                      "name": "Weapon Shop"
                  },
+                "shop/wholesale": {
+                    "name": "Wholesale Shop / Cash & Carry "
+                },
                  "shop/window_blind": {
                  "shop/window_blind": {
-                    "name": "Window Blind Store"
+                    "name": "Window Blind Shop"
                  },
                  "shop/wine": {
                      "name": "Wine Shop"
                  },
                  },
                  "shop/wine": {
                      "name": "Wine Shop"
                  },
-                "tourism": {
-                    "name": "Tourism"
-                },
                  "tourism/alpine_hut": {
                      "name": "Alpine Hut"
                  },
                  "tourism/alpine_hut": {
                      "name": "Alpine Hut"
                  },
@@ -5018,6 +5137,9 @@
                  "tourism/theme_park": {
                      "name": "Theme Park"
                  },
                  "tourism/theme_park": {
                      "name": "Theme Park"
                  },
+                "tourism/trail_riding_station": {
+                    "name": "Trail Riding Station"
+                },
                  "tourism/viewpoint": {
                      "name": "Viewpoint"
                  },
                  "tourism/viewpoint": {
                      "name": "Viewpoint"
                  },
@@ -5081,6 +5203,18 @@
                  "type/restriction/no_u_turn": {
                      "name": "No U-turn"
                  },
                  "type/restriction/no_u_turn": {
                      "name": "No U-turn"
                  },
+                "type/restriction/only_left_turn": {
+                    "name": "Only Left Turn"
+                },
+                "type/restriction/only_right_turn": {
+                    "name": "Only Right Turn"
+                },
+                "type/restriction/only_straight_on": {
+                    "name": "Only Straight On"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Only U-turn"
+                },
                  "type/route": {
                      "name": "Route"
                  },
                  "type/route": {
                      "name": "Route"
                  },
@@ -5105,15 +5239,24 @@
                  "type/route/horse": {
                      "name": "Riding Route"
                  },
                  "type/route/horse": {
                      "name": "Riding Route"
                  },
+                "type/route/light_rail": {
+                    "name": "Light Rail Route"
+                },
                  "type/route/pipeline": {
                      "name": "Pipeline Route"
                  },
                  "type/route/pipeline": {
                      "name": "Pipeline Route"
                  },
+                "type/route/piste": {
+                    "name": "Piste/Ski Route"
+                },
                  "type/route/power": {
                      "name": "Power Route"
                  },
                  "type/route/road": {
                      "name": "Road Route"
                  },
                  "type/route/power": {
                      "name": "Power Route"
                  },
                  "type/route/road": {
                      "name": "Road Route"
                  },
+                "type/route/subway": {
+                    "name": "Subway Route"
+                },
                  "type/route/train": {
                      "name": "Train Route"
                  },
                  "type/route/train": {
                      "name": "Train Route"
                  },
@@ -5129,18 +5272,15 @@
                  "type/waterway": {
                      "name": "Waterway"
                  },
                  "type/waterway": {
                      "name": "Waterway"
                  },
-                "vertex": {
-                    "name": "Other"
-                },
-                "waterway": {
-                    "name": "Waterway"
-                },
                  "waterway/boatyard": {
                      "name": "Boatyard"
                  },
                  "waterway/canal": {
                      "name": "Canal"
                  },
                  "waterway/boatyard": {
                      "name": "Boatyard"
                  },
                  "waterway/canal": {
                      "name": "Canal"
                  },
+                "waterway/canal/lock": {
+                    "name": "Canal Lock"
+                },
                  "waterway/dam": {
                      "name": "Dam"
                  },
                  "waterway/dam": {
                      "name": "Dam"
                  },
@@ -5156,6 +5296,12 @@
                  "waterway/fuel": {
                      "name": "Marine Fuel Station"
                  },
                  "waterway/fuel": {
                      "name": "Marine Fuel Station"
                  },
+                "waterway/lock_gate": {
+                    "name": "Lock Gate"
+                },
+                "waterway/milestone": {
+                    "name": "Waterway Milestone"
+                },
                  "waterway/river": {
                      "name": "River"
                  },
                  "waterway/river": {
                      "name": "River"
                  },
@@ -5183,37 +5329,43 @@
              }
          },
          "imagery": {
              }
          },
          "imagery": {
-            "Bing": {
-                "description": "Satellite and aerial imagery.",
-                "name": "Bing aerial imagery"
+            "AGIV": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Flanders most recent aerial imagery"
              },
              },
-            "DigitalGlobe-Premium": {
+            "AGIV10cm": {
                  "attribution": {
                  "attribution": {
-                    "text": "Terms & Feedback"
+                    "text": "© agentschap Informatie Vlaanderen"
                  },
                  },
-                "description": "Premium DigitalGlobe satellite imagery.",
-                "name": "DigitalGlobe Premium Imagery"
+                "name": "AIV Flanders 2013-2015 aerial imagery 10cm"
              },
              },
-            "DigitalGlobe-Premium-vintage": {
+            "AGIVFlandersGRB": {
                  "attribution": {
                  "attribution": {
-                    "text": "Terms & Feedback"
+                    "text": "© agentschap Informatie Vlaanderen"
                  },
                  },
-                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.",
-                "name": "DigitalGlobe Premium Imagery Vintage"
+                "name": "AIV Flanders GRB"
              },
              },
-            "DigitalGlobe-Standard": {
+            "AIV_DHMV_II_HILL_25cm": {
                  "attribution": {
                  "attribution": {
-                    "text": "Terms & Feedback"
+                    "text": "© agentschap Informatie Vlaanderen"
                  },
                  },
-                "description": "Standard DigitalGlobe satellite imagery.",
-                "name": "DigitalGlobe Standard Imagery"
+                "name": "AIV Digitaal Hoogtemodel Vlaanderen II, multidirectionale hillshade 0,25 m"
+            },
+            "AIV_DHMV_II_SVF_25cm": {
+                "name": "AIV Digitaal Hoogtemodel Vlaanderen II, Skyview factor 0,25 m"
              },
              },
-            "DigitalGlobe-Standard-vintage": {
+            "Bing": {
+                "description": "Satellite and aerial imagery.",
+                "name": "Bing aerial imagery"
+            },
+            "EOXAT2018CLOUDLESS": {
                  "attribution": {
                  "attribution": {
-                    "text": "Terms & Feedback"
+                    "text": "Sentinel-2 cloudless - https://s2maps.eu by EOX IT Services GmbH (Contains modified Copernicus Sentinel data 2017 & 2018)"
                  },
                  },
-                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.",
-                "name": "DigitalGlobe Standard Imagery Vintage"
+                "description": "Post-processed Sentinel Satellite imagery.",
+                "name": "eox.at 2018 cloudless"
              },
              "EsriWorldImagery": {
                  "attribution": {
              },
              "EsriWorldImagery": {
                  "attribution": {
@@ -5230,9 +5382,6 @@
                  "name": "Esri World Imagery (Clarity) Beta"
              },
              "MAPNIK": {
                  "name": "Esri World Imagery (Clarity) Beta"
              },
              "MAPNIK": {
-                "attribution": {
-                    "text": "© OpenStreetMap contributors, CC-BY-SA"
-                },
                  "description": "The default OpenStreetMap layer.",
                  "name": "OpenStreetMap (Standard)"
              },
                  "description": "The default OpenStreetMap layer.",
                  "name": "OpenStreetMap (Standard)"
              },
@@ -5285,8 +5434,11 @@
                  },
                  "name": "OSM Inspector: Tagging"
              },
                  },
                  "name": "OSM Inspector: Tagging"
              },
-            "US-TIGER-Roads-2012": {
-                "name": "TIGER Roads 2012"
+            "SPW_ORTHO_LAST": {
+                "name": "SPW(allonie) most recent aerial imagery"
+            },
+            "SPW_PICC": {
+                "name": "SPW(allonie) PICC numerical imagery"
              },
              "US-TIGER-Roads-2014": {
                  "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
              },
              "US-TIGER-Roads-2014": {
                  "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
@@ -5297,6 +5449,7 @@
                  "name": "TIGER Roads 2017"
              },
              "US_Forest_Service_roads_overlay": {
                  "name": "TIGER Roads 2017"
              },
              "US_Forest_Service_roads_overlay": {
+                "description": "Highway: Green casing = unclassified. Brown casing = track. Surface: gravel = light brown fill, Asphalt = black, paved = gray, ground =white, concrete = blue, grass = green. Seasonal = white bars",
                  "name": "U.S. Forest Roads Overlay"
              },
              "Waymarked_Trails-Cycling": {
                  "name": "U.S. Forest Roads Overlay"
              },
              "Waymarked_Trails-Cycling": {
@@ -5343,12 +5496,6 @@
                  "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
                  "name": "basemap.at Orthofoto"
              },
                  "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
                  "name": "basemap.at Orthofoto"
              },
-            "hike_n_bike": {
-                "attribution": {
-                    "text": "© OpenStreetMap contributors"
-                },
-                "name": "Hike & Bike"
-            },
              "mapbox_locator_overlay": {
                  "attribution": {
                      "text": "Terms & Feedback"
              "mapbox_locator_overlay": {
                  "attribution": {
                      "text": "Terms & Feedback"
@@ -5441,26 +5588,18 @@
                  "name": "OSM Chattanooga",
                  "description": "The OpenStreetMap user group for Chattanooga"
              },
                  "name": "OSM Chattanooga",
                  "description": "The OpenStreetMap user group for Chattanooga"
              },
-            "OSM-NYC": {
-                "name": "OpenStreetMap NYC",
-                "description": "Mappers and OpenStreetMap users, developers and enthusiasts in the New York Metropolitan area"
-            },
              "OSM-Portland": {
                  "name": "OpenStreetMap Portland",
                  "description": "Mappers and OpenStreetMap users in the Portland area",
                  "extendedDescription": "OpenStreetMap (OSM) is a map of the world made by people like you. It's a map that you build, that's given away for free like wikipedia. Check out osm.org for more, and come join us at a meetup to talk maps, contribute to OSM, and have fun!"
              },
              "OSM-Portland": {
                  "name": "OpenStreetMap Portland",
                  "description": "Mappers and OpenStreetMap users in the Portland area",
                  "extendedDescription": "OpenStreetMap (OSM) is a map of the world made by people like you. It's a map that you build, that's given away for free like wikipedia. Check out osm.org for more, and come join us at a meetup to talk maps, contribute to OSM, and have fun!"
              },
-            "OSM-US-Slack": {
-                "name": "OpenStreetMap US Slack",
-                "description": "All are welcome! Sign up at {signupUrl}"
-            },
-            "Maptime-Australia-Slack": {
-                "name": "Maptime Australia Slack",
-                "description": "Sign up at {signupUrl}"
-            },
              "OSM-Reddit": {
                  "name": "OpenStreetMap on Reddit",
                  "description": "/r/openstreetmap/ is a great place to learn more about OpenStreetMap.  Ask us anything!"
              "OSM-Reddit": {
                  "name": "OpenStreetMap on Reddit",
                  "description": "/r/openstreetmap/ is a great place to learn more about OpenStreetMap.  Ask us anything!"
+            },
+            "OSM-US-Slack": {
+                "name": "OpenStreetMap US Slack",
+                "description": "All are welcome! Sign up at {signupUrl}"
              }
          }
      }
              }
          }
      }