Update to iD v2.17.0

[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 b0107b5dacae9b0b38ae2928bc2b2fbfbc545212..add7470a8a8efea3084884d12c0ea8168face25a 100644 (file)
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -85,27 +85,12 @@
                 "connected_to_hidden": "This can't be made circular because it is connected to a hidden feature."
             },
             "orthogonalize": {
                 "connected_to_hidden": "This can't be made circular because it is connected to a hidden feature."
             },
             "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 +130,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."
             },


@@ -271,9 +250,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",


@@ -347,7 +324,6 @@
         "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"
         },
             "localized_translation_language": "Choose language",
             "localized_translation_name": "Name"
         },


@@ -359,12 +335,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.",


@@ -448,7 +418,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": {


@@ -456,9 +425,6 @@
             "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",
             "all_fields": "All fields",
             "show_more": "Show More",
             "view_on_osm": "View on openstreetmap.org",
             "all_fields": "All fields",


@@ -469,7 +435,6 @@
             "role": "Role",
             "choose": "Select feature type",
             "results": "{n} results for {search}",
             "role": "Role",
             "choose": "Select feature type",
             "results": "{n} results for {search}",

-            "reference": "View on OpenStreetMap Wiki",

             "back_tooltip": "Change feature",
             "remove": "Remove",
             "search": "Search",
             "back_tooltip": "Change feature",
             "remove": "Remove",
             "search": "Search",


@@ -508,7 +473,6 @@
             "switch": "Switch back to this background",
             "custom": "Custom",
             "overlays": "Overlays",
             "switch": "Switch back to this background",
             "custom": "Custom",
             "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",


@@ -534,7 +498,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."


@@ -581,11 +544,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"
             }
         },


@@ -604,12 +565,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.",


@@ -644,10 +599,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",


@@ -663,12 +614,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?",


@@ -682,23 +627,6 @@
             "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"
         "zoom": {
             "in": "Zoom in",
             "out": "Zoom out"


@@ -709,19 +637,13 @@
             "report": "Report a privacy concern with this image"
         },
         "mapillary_images": {
             "report": "Report a privacy concern with this image"
         },
         "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"


@@ -746,8 +668,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",


@@ -870,8 +791,7 @@
                 "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",


@@ -1222,9 +1142,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"


@@ -1237,7 +1155,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": {


@@ -1265,10 +1182,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",


@@ -1325,41 +1240,17 @@
                 "category-building": {
                     "name": "Building Features"
                 },
                 "category-building": {
                     "name": "Building Features"
                 },

-                "category-golf": {
-                    "name": "Golf Features"
-                },

                 "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": {
-                    "name": "Natural Features"
-                },
-                "category-path": {
-                    "name": "Path Features"
-                },
-                "category-rail": {
-                    "name": "Rail Features"
-                },

                 "category-restriction": {
                     "name": "Restriction Features"
                 },
                 "category-restriction": {
                     "name": "Restriction Features"
                 },

-                "category-road": {
-                    "name": "Road Features"
-                },

                 "category-route": {
                     "name": "Route Features"
                 },
                 "category-route": {
                     "name": "Route Features"
                 },

-                "category-water-area": {
-                    "name": "Water Features"
-                },
-                "category-water-line": {
-                    "name": "Water Features"
+                "category-utility": {
+                    "name": "Utility Features"

                 }
             },
             "fields": {
                 }
             },
             "fields": {


@@ -1367,20 +1258,29 @@
                     "label": "Allowed Access",
                     "options": {
                         "designated": {
                     "label": "Allowed Access",
                     "options": {
                         "designated": {

+                            "description": "Access allowed according to signs or specific local laws",

                             "title": "Designated"
                         },
                         "destination": {
                             "title": "Designated"
                         },
                         "destination": {

+                            "description": "Access allowed only to reach a destination",

                             "title": "Destination"
                         },
                         "dismount": {
                             "title": "Destination"
                         },
                         "dismount": {

+                            "description": "Access allowed but rider must dismount",

                             "title": "Dismount"
                         },
                         "no": {
                             "title": "Dismount"
                         },
                         "no": {

+                            "description": "Access not allowed to the general public",

                             "title": "Prohibited"
                         },
                         "permissive": {
                             "title": "Prohibited"
                         },
                         "permissive": {

+                            "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": {
                             "title": "Private"
                         },
                         "private": {
                             "title": "Private"
                         },


@@ -1526,9 +1426,6 @@
                         "onsen": "Japanese Onsen"
                     }
                 },
                         "onsen": "Japanese Onsen"
                     }
                 },

-                "beauty": {
-                    "label": "Shop Type"
-                },

                 "bench": {
                     "label": "Bench"
                 },
                 "bench": {
                     "label": "Bench"
                 },


@@ -1610,6 +1507,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)"


@@ -1723,9 +1623,6 @@
                     "label": "Devices",
                     "placeholder": "1, 2, 3..."
                 },
                     "label": "Devices",
                     "placeholder": "1, 2, 3..."
                 },

-                "diaper": {
-                    "label": "Baby Changing Available"
-                },

                 "direction": {
                     "label": "Direction (Degrees Clockwise)",
                     "placeholder": "45, 90, 180, 270"
                 "direction": {
                     "label": "Direction (Degrees Clockwise)",
                     "placeholder": "45, 90, 180, 270"


@@ -1759,7 +1656,6 @@
                     }
                 },
                 "direction_vertex": {
                     }
                 },
                 "direction_vertex": {

-                    "label": "Direction",

                     "options": {
                         "backward": "Backward",
                         "both": "Both / All",
                     "options": {
                         "backward": "Backward",
                         "both": "Both / All",


@@ -1772,9 +1668,6 @@
                 "display": {
                     "label": "Display"
                 },
                 "display": {
                     "label": "Display"
                 },

-                "distance": {
-                    "label": "Total Distance"
-                },

                 "dock": {
                     "label": "Type"
                 },
                 "dock": {
                     "label": "Type"
                 },


@@ -1828,20 +1721,9 @@
                 "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",

                     "options": {
                         "pillar": "Pillar/Aboveground",
                     "options": {
                         "pillar": "Pillar/Aboveground",

-                        "pond": "Pond",

                         "underground": "Underground",
                         "wall": "Wall"
                     }
                         "underground": "Underground",
                         "wall": "Wall"
                     }


@@ -1904,7 +1786,6 @@
                     "label": "Handrail"
                 },
                 "hashtags": {
                     "label": "Handrail"
                 },
                 "hashtags": {

-                    "label": "Suggested Hashtags",

                     "placeholder": "#example"
                 },
                 "healthcare": {
                     "placeholder": "#example"
                 },
                 "healthcare": {


@@ -1962,12 +1843,6 @@
                         "undefined": "No"
                     }
                 },
                         "undefined": "No"
                     }
                 },

-                "iata": {
-                    "label": "IATA"
-                },
-                "icao": {
-                    "label": "ICAO"
-                },

                 "incline": {
                     "label": "Incline"
                 },
                 "incline": {
                     "label": "Incline"
                 },


@@ -2006,9 +1881,6 @@
                 "internet_access/fee": {
                     "label": "Internet Access Fee"
                 },
                 "internet_access/fee": {
                     "label": "Internet Access Fee"
                 },

-                "internet_access/ssid": {
-                    "label": "SSID (Network Name)"
-                },

                 "kerb": {
                     "label": "Kerb"
                 },
                 "kerb": {
                     "label": "Kerb"
                 },


@@ -2167,7 +2039,6 @@
                     "label": "Network"
                 },
                 "network_bicycle": {
                     "label": "Network"
                 },
                 "network_bicycle": {

-                    "label": "Network Type",

                     "options": {
                         "icn": "International",
                         "lcn": "Local",
                     "options": {
                         "icn": "International",
                         "lcn": "Local",


@@ -2177,7 +2048,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",


@@ -2187,7 +2057,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",


@@ -2266,15 +2135,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": {


@@ -2312,15 +2172,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"
                 },


@@ -2344,7 +2195,6 @@
                     "placeholder": "Distance to one decimal (123.4)"
                 },
                 "railway/signal/direction": {
                     "placeholder": "Distance to one decimal (123.4)"
                 },
                 "railway/signal/direction": {

-                    "label": "Direction",

                     "options": {
                         "backward": "Backward",
                         "both": "Both / All",
                     "options": {
                         "backward": "Backward",
                         "both": "Both / All",


@@ -2357,6 +2207,12 @@
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
                 "recycling_accepts": {
                     "label": "Accepts"
                 },

+                "recycling_type": {
+                    "options": {
+                        "centre": "Centre"
+                    },
+                    "placeholder": "Container, Centre"
+                },

                 "ref": {
                     "label": "Reference Code"
                 },
                 "ref": {
                     "label": "Reference Code"
                 },


@@ -2429,6 +2285,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"
                 },


@@ -2613,8 +2475,7 @@
                     "options": {
                         "bucket": "Bucket",
                         "chemical": "Chemical",
                     "options": {
                         "bucket": "Bucket",
                         "chemical": "Chemical",

-                        "flush": "Flush",
-                        "pitlatrine": "Pit/Latrine"
+                        "flush": "Flush"

                     }
                 },
                 "toll": {
                     }
                 },
                 "toll": {


@@ -2626,9 +2487,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, ..."


@@ -2657,7 +2515,6 @@
                     "label": "Type"
                 },
                 "traffic_signals/direction": {
                     "label": "Type"
                 },
                 "traffic_signals/direction": {

-                    "label": "Direction",

                     "options": {
                         "backward": "Backward",
                         "both": "Both / All",
                     "options": {
                         "backward": "Backward",
                         "both": "Both / All",


@@ -2759,8 +2616,7 @@
                     "label": "Type"
                 },
                 "website": {
                     "label": "Type"
                 },
                 "website": {

-                    "label": "Website",
-                    "placeholder": "http://example.com/"
+                    "label": "Website"

                 },
                 "wetland": {
                     "label": "Type"
                 },
                 "wetland": {
                     "label": "Type"


@@ -2838,12 +2694,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": {
                     "name": "Aeroway"
                 },


@@ -2925,15 +2775,9 @@
                 "amenity/cafe": {
                     "name": "Cafe"
                 },
                 "amenity/cafe": {
                     "name": "Cafe"
                 },

-                "amenity/car_pooling": {
-                    "name": "Car Pooling"
-                },

                 "amenity/car_rental": {
                     "name": "Car Rental"
                 },
                 "amenity/car_rental": {
                     "name": "Car Rental"
                 },

-                "amenity/car_sharing": {
-                    "name": "Car Sharing"
-                },

                 "amenity/car_wash": {
                     "name": "Car Wash"
                 },
                 "amenity/car_wash": {
                     "name": "Car Wash"
                 },


@@ -2982,6 +2826,9 @@
                 "amenity/dentist": {
                     "name": "Dentist"
                 },
                 "amenity/dentist": {
                     "name": "Dentist"
                 },

+                "amenity/dive_centre": {
+                    "name": "Dive Centre"
+                },

                 "amenity/doctors": {
                     "name": "Doctor"
                 },
                 "amenity/doctors": {
                     "name": "Doctor"
                 },


@@ -3062,7 +2909,10 @@
                     "name": "Nursing Home"
                 },
                 "amenity/parking": {
                     "name": "Nursing Home"
                 },
                 "amenity/parking": {

-                    "name": "Car Parking"
+                    "name": "Car Park"
+                },
+                "amenity/parking/multi-storey": {
+                    "name": "Multistory Car Park"

                 },
                 "amenity/parking_entrance": {
                     "name": "Parking Garage Entrance/Exit"
                 },
                 "amenity/parking_entrance": {
                     "name": "Parking Garage Entrance/Exit"


@@ -3070,11 +2920,8 @@
                 "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"


@@ -3082,18 +2929,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"
                 },


@@ -3109,10 +2947,6 @@
                 "amenity/police": {
                     "name": "Police"
                 },
                 "amenity/police": {
                     "name": "Police"
                 },

-                "amenity/post_box": {
-                    "name": "Post Box",
-                    "terms": "Mailbox"
-                },

                 "amenity/post_office": {
                     "name": "Post Office"
                 },
                 "amenity/post_office": {
                     "name": "Post Office"
                 },


@@ -3131,9 +2965,6 @@
                 "amenity/ranger_station": {
                     "name": "Warden Station"
                 },
                 "amenity/ranger_station": {
                     "name": "Warden Station"
                 },

-                "amenity/recycling": {
-                    "name": "Recycling Container"
-                },

                 "amenity/recycling_centre": {
                     "name": "Recycling Centre"
                 },
                 "amenity/recycling_centre": {
                     "name": "Recycling Centre"
                 },


@@ -3221,9 +3052,6 @@
                 "amenity/vending_machine/elongated_coin": {
                     "name": "Elongated Coin Vending Machine"
                 },
                 "amenity/vending_machine/elongated_coin": {
                     "name": "Elongated Coin Vending Machine"
                 },

-                "amenity/vending_machine/excrement_bags": {
-                    "name": "Excrement Bag Vending Machine"
-                },

                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "Feminine Hygiene Vending Machine"
                 },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "Feminine Hygiene Vending Machine"
                 },


@@ -3236,15 +3064,9 @@
                 "amenity/vending_machine/ice_cream": {
                     "name": "Ice Cream Vending Machine"
                 },
                 "amenity/vending_machine/ice_cream": {
                     "name": "Ice Cream Vending Machine"
                 },

-                "amenity/vending_machine/news_papers": {
-                    "name": "Newspaper 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/parking_tickets": {
                     "name": "Parking Ticket Vending Machine"
                 },


@@ -3281,21 +3103,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"
                 },


@@ -3305,18 +3118,9 @@
                 "attraction/dark_ride": {
                     "name": "Ghost Train"
                 },
                 "attraction/dark_ride": {
                     "name": "Ghost Train"
                 },

-                "attraction/drop_tower": {
-                    "name": "Drop Tower"
-                },

                 "attraction/maze": {
                     "name": "Maze"
                 },
                 "attraction/maze": {
                     "name": "Maze"
                 },

-                "attraction/pirate_ship": {
-                    "name": "Pirate Ship"
-                },
-                "attraction/river_rafting": {
-                    "name": "River Rafting"
-                },

                 "attraction/roller_coaster": {
                     "name": "Roller Coaster"
                 },
                 "attraction/roller_coaster": {
                     "name": "Roller Coaster"
                 },


@@ -3365,6 +3169,12 @@
                 "barrier/kerb": {
                     "name": "Kerb"
                 },
                 "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"
                 },


@@ -3389,9 +3199,6 @@
                 "building": {
                     "name": "Building"
                 },
                 "building": {
                     "name": "Building"
                 },

-                "building/apartments": {
-                    "name": "Apartments"
-                },

                 "building/barn": {
                     "name": "Barn"
                 },
                 "building/barn": {
                     "name": "Barn"
                 },


@@ -3518,9 +3325,6 @@
                 "building/terrace": {
                     "name": "Terraced houses"
                 },
                 "building/terrace": {
                     "name": "Terraced houses"
                 },

-                "building/train_station": {
-                    "name": "Train Station"
-                },

                 "building/transportation": {
                     "name": "Transportation Building"
                 },
                 "building/transportation": {
                     "name": "Transportation Building"
                 },


@@ -3530,12 +3334,6 @@
                 "building/warehouse": {
                     "name": "Warehouse"
                 },
                 "building/warehouse": {
                     "name": "Warehouse"
                 },

-                "camp_site/camp_pitch": {
-                    "name": "Camp Pitch"
-                },
-                "circular": {
-                    "name": "Traffic Circle"
-                },

                 "club": {
                     "name": "Club"
                 },
                 "club": {
                     "name": "Club"
                 },


@@ -3605,9 +3403,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"
                 },


@@ -3617,9 +3412,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"
                 },


@@ -3635,9 +3427,6 @@
                 "craft/plumber": {
                     "name": "Plumber"
                 },
                 "craft/plumber": {
                     "name": "Plumber"
                 },

-                "craft/pottery": {
-                    "name": "Pottery"
-                },

                 "craft/rigger": {
                     "name": "Rigger"
                 },
                 "craft/rigger": {
                     "name": "Rigger"
                 },


@@ -3728,27 +3517,11 @@
                 "entrance": {
                     "name": "Entrance/Exit"
                 },
                 "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"


@@ -3759,24 +3532,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"
                 },


@@ -3825,32 +3586,26 @@
                 "healthcare/speech_therapist": {
                     "name": "Speech Therapist"
                 },
                 "healthcare/speech_therapist": {
                     "name": "Speech Therapist"
                 },

-                "highway": {
-                    "name": "Highway"
-                },

                 "highway/bridleway": {
                     "name": "Bridleway"
                 },
                 "highway/bus_guideway": {
                     "name": "Bus Guideway"
                 },
                 "highway/bridleway": {
                     "name": "Bridleway"
                 },
                 "highway/bus_guideway": {
                     "name": "Bus Guideway"
                 },

-                "highway/bus_stop": {
-                    "name": "Bus Stop / Platform"
-                },

                 "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"


@@ -3861,6 +3616,18 @@
                 "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/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"
                 },


@@ -3897,9 +3664,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"
                 },


@@ -4011,9 +3775,6 @@
                 "junction": {
                     "name": "Junction"
                 },
                 "junction": {
                     "name": "Junction"
                 },

-                "landuse": {
-                    "name": "Land Use"
-                },

                 "landuse/allotments": {
                     "name": "Allotments"
                 },
                 "landuse/allotments": {
                     "name": "Allotments"
                 },


@@ -4035,9 +3796,6 @@
                 "landuse/commercial": {
                     "name": "Commercial Area"
                 },
                 "landuse/commercial": {
                     "name": "Commercial Area"
                 },

-                "landuse/construction": {
-                    "name": "Construction"
-                },

                 "landuse/farm": {
                     "name": "Farmland"
                 },
                 "landuse/farm": {
                     "name": "Farmland"
                 },


@@ -4047,9 +3805,6 @@
                 "landuse/farmyard": {
                     "name": "Farmyard"
                 },
                 "landuse/farmyard": {
                     "name": "Farmyard"
                 },

-                "landuse/forest": {
-                    "name": "Forest"
-                },

                 "landuse/garages": {
                     "name": "Garage Landuse"
                 },
                 "landuse/garages": {
                     "name": "Garage Landuse"
                 },


@@ -4089,27 +3844,15 @@
                 "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/obstacle_course": {
                     "name": "Obstacle Course"
                 },

-                "landuse/military/office": {
-                    "name": "Military Office"
-                },

                 "landuse/military/range": {
                     "name": "Military Range"
                 },
                 "landuse/military/range": {
                     "name": "Military Range"
                 },


@@ -4143,9 +3886,6 @@
                 "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"
                 },


@@ -4173,9 +3913,6 @@
                 "leisure/dog_park": {
                     "name": "Dog Park"
                 },
                 "leisure/dog_park": {
                     "name": "Dog Park"
                 },

-                "leisure/firepit": {
-                    "name": "Firepit"
-                },

                 "leisure/fitness_centre": {
                     "name": "Gym / Fitness Centre"
                 },
                 "leisure/fitness_centre": {
                     "name": "Gym / Fitness Centre"
                 },


@@ -4257,9 +3994,6 @@
                 "leisure/pitch/american_football": {
                     "name": "American Football Field"
                 },
                 "leisure/pitch/american_football": {
                     "name": "American Football Field"
                 },

-                "leisure/pitch/baseball": {
-                    "name": "Baseball Diamond"
-                },

                 "leisure/pitch/basketball": {
                     "name": "Basketball Court"
                 },
                 "leisure/pitch/basketball": {
                     "name": "Basketball Court"
                 },


@@ -4305,9 +4039,6 @@
                 "leisure/resort": {
                     "name": "Resort"
                 },
                 "leisure/resort": {
                     "name": "Resort"
                 },

-                "leisure/running_track": {
-                    "name": "Racetrack (Running)"
-                },

                 "leisure/sauna": {
                     "name": "Sauna"
                 },
                 "leisure/sauna": {
                     "name": "Sauna"
                 },


@@ -4335,9 +4066,6 @@
                 "line": {
                     "name": "Line"
                 },
                 "line": {
                     "name": "Line"
                 },

-                "man_made": {
-                    "name": "Man Made"
-                },

                 "man_made/adit": {
                     "name": "Adit"
                 },
                 "man_made/adit": {
                     "name": "Adit"
                 },


@@ -4347,9 +4075,6 @@
                 "man_made/breakwater": {
                     "name": "Breakwater"
                 },
                 "man_made/breakwater": {
                     "name": "Breakwater"
                 },

-                "man_made/bridge": {
-                    "name": "Bridge"
-                },

                 "man_made/chimney": {
                     "name": "Chimney"
                 },
                 "man_made/chimney": {
                     "name": "Chimney"
                 },


@@ -4380,9 +4105,6 @@
                 "man_made/mast": {
                     "name": "Mast"
                 },
                 "man_made/mast": {
                     "name": "Mast"
                 },

-                "man_made/observation": {
-                    "name": "Observation Tower"
-                },

                 "man_made/petroleum_well": {
                     "name": "Oil Well"
                 },
                 "man_made/petroleum_well": {
                     "name": "Oil Well"
                 },


@@ -4404,9 +4126,6 @@
                 "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/survey_point": {
                     "name": "Survey Point"
                 },


@@ -4434,18 +4153,6 @@
                 "man_made/works": {
                     "name": "Factory"
                 },
                 "man_made/works": {
                     "name": "Factory"
                 },

-                "manhole": {
-                    "name": "Manhole"
-                },
-                "manhole/drain": {
-                    "name": "Storm Drain"
-                },
-                "manhole/telecom": {
-                    "name": "Telecom Manhole"
-                },
-                "natural": {
-                    "name": "Natural"
-                },

                 "natural/bare_rock": {
                     "name": "Bare Rock"
                 },
                 "natural/bare_rock": {
                     "name": "Bare Rock"
                 },


@@ -4506,9 +4213,6 @@
                 "natural/tree": {
                     "name": "Tree"
                 },
                 "natural/tree": {
                     "name": "Tree"
                 },

-                "natural/tree_row": {
-                    "name": "Tree row"
-                },

                 "natural/volcano": {
                     "name": "Volcano"
                 },
                 "natural/volcano": {
                     "name": "Volcano"
                 },


@@ -4527,9 +4231,6 @@
                 "natural/wetland": {
                     "name": "Wetland"
                 },
                 "natural/wetland": {
                     "name": "Wetland"
                 },

-                "natural/wood": {
-                    "name": "Wood"
-                },

                 "noexit/yes": {
                     "name": "No Exit"
                 },
                 "noexit/yes": {
                     "name": "No Exit"
                 },


@@ -4623,9 +4324,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"
                 },


@@ -4653,9 +4351,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"
                 },


@@ -4746,18 +4441,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"
                 },


@@ -4785,66 +4471,6 @@
                 "power/transformer": {
                     "name": "Transformer"
                 },
                 "power/transformer": {
                     "name": "Transformer"
                 },

-                "public_transport/linear_platform": {
-                    "name": "Transit Stop / Platform"
-                },
-                "public_transport/linear_platform_aerialway": {
-                    "name": "Aerialway Stop / Platform"
-                },
-                "public_transport/linear_platform_bus": {
-                    "name": "Bus Stop / Platform"
-                },
-                "public_transport/linear_platform_ferry": {
-                    "name": "Ferry Stop / Platform"
-                },
-                "public_transport/linear_platform_light_rail": {
-                    "name": "Light Rail Stop / Platform"
-                },
-                "public_transport/linear_platform_monorail": {
-                    "name": "Monorail Stop / Platform"
-                },
-                "public_transport/linear_platform_subway": {
-                    "name": "Subway Stop / Platform"
-                },
-                "public_transport/linear_platform_train": {
-                    "name": "Train Stop / Platform"
-                },
-                "public_transport/linear_platform_tram": {
-                    "name": "Tram Stop / Platform"
-                },
-                "public_transport/linear_platform_trolleybus": {
-                    "name": "Trolleybus Stop / Platform"
-                },
-                "public_transport/platform": {
-                    "name": "Transit Stop / Platform"
-                },
-                "public_transport/platform_aerialway": {
-                    "name": "Aerialway Stop / Platform"
-                },
-                "public_transport/platform_bus": {
-                    "name": "Bus Stop / Platform"
-                },
-                "public_transport/platform_ferry": {
-                    "name": "Ferry Stop / Platform"
-                },
-                "public_transport/platform_light_rail": {
-                    "name": "Light Rail Stop / Platform"
-                },
-                "public_transport/platform_monorail": {
-                    "name": "Monorail Stop / Platform"
-                },
-                "public_transport/platform_subway": {
-                    "name": "Subway Stop / Platform"
-                },
-                "public_transport/platform_train": {
-                    "name": "Train Stop / Platform"
-                },
-                "public_transport/platform_tram": {
-                    "name": "Tram Stop / Platform"
-                },
-                "public_transport/platform_trolleybus": {
-                    "name": "Trolleybus Stop / Platform"
-                },

                 "public_transport/station": {
                     "name": "Transit Station"
                 },
                 "public_transport/station": {
                     "name": "Transit Station"
                 },


@@ -4911,9 +4537,6 @@
                 "public_transport/stop_position_trolleybus": {
                     "name": "Trolleybus Stopping Location"
                 },
                 "public_transport/stop_position_trolleybus": {
                     "name": "Trolleybus Stopping Location"
                 },

-                "railway": {
-                    "name": "Railway"
-                },

                 "railway/abandoned": {
                     "name": "Abandoned Railway"
                 },
                 "railway/abandoned": {
                     "name": "Abandoned Railway"
                 },


@@ -4953,9 +4576,6 @@
                 "railway/narrow_gauge": {
                     "name": "Narrow Gauge Rail"
                 },
                 "railway/narrow_gauge": {
                     "name": "Narrow Gauge Rail"
                 },

-                "railway/platform": {
-                    "name": "Train Stop / Platform"
-                },

                 "railway/rail": {
                     "name": "Rail"
                 },
                 "railway/rail": {
                     "name": "Rail"
                 },


@@ -4986,9 +4606,6 @@
                 "relation": {
                     "name": "Relation"
                 },
                 "relation": {
                     "name": "Relation"
                 },

-                "roundabout": {
-                    "name": "Roundabout"
-                },

                 "route/ferry": {
                     "name": "Ferry Route"
                 },
                 "route/ferry": {
                     "name": "Ferry Route"
                 },


@@ -5194,9 +4811,6 @@
                 "shop/interior_decoration": {
                     "name": "Interior Decoration Shop"
                 },
                 "shop/interior_decoration": {
                     "name": "Interior Decoration Shop"
                 },

-                "shop/jewelry": {
-                    "name": "Jeweller"
-                },

                 "shop/kitchen": {
                     "name": "Kitchen Design Shop"
                 },
                 "shop/kitchen": {
                     "name": "Kitchen Design Shop"
                 },


@@ -5371,9 +4985,6 @@
                 "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"
                 },


@@ -5572,12 +5183,6 @@
                 "type/waterway": {
                     "name": "Waterway"
                 },
                 "type/waterway": {
                     "name": "Waterway"
                 },

-                "vertex": {
-                    "name": "Other"
-                },
-                "waterway": {
-                    "name": "Waterway"
-                },

                 "waterway/boatyard": {
                     "name": "Boatyard"
                 },
                 "waterway/boatyard": {
                     "name": "Boatyard"
                 },


@@ -5626,35 +5231,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"

                 },
                 },

-                "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"

                 },
                 },

-                "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"
+            },
+            "Bing": {
+                "description": "Satellite and aerial imagery.",
+                "name": "Bing aerial imagery"

             },
             },

-            "DigitalGlobe-Standard-vintage": {
+            "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": {


@@ -5726,8 +5339,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",


@@ -5785,12 +5401,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"


@@ -5883,26 +5493,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}"

             }
         }
     }
             }
         }
     }