]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en-GB.json
projects / rails.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update to iD v2.12.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 0a5dc286f058c8bff3e3cd1f98b7cf37a19e5258..d4404723cfff045defbef1e2c19948d14dc33c52 100644 (file)
--- a/vendor/assets/iD/iD/locales/en-GB.json
+++ b/vendor/assets/iD/iD/locales/en-GB.json
@@ -1,5 +1,10 @@
 {
     "en-GB": {
 {
     "en-GB": {
+        "icons": {
+            "information": "info",
+            "remove": "remove",
+            "undo": "undo"
+        },
         "modes": {
             "add_area": {
                 "title": "Area",
         "modes": {
             "add_area": {
                 "title": "Area",
@@ -25,6 +30,9 @@
             },
             "draw_line": {
                 "tail": "Click to add more nodes to the line. Click on other lines to connect to them, and double-click to end the line."
             },
             "draw_line": {
                 "tail": "Click to add more nodes to the line. Click on other lines to connect to them, and double-click to end the line."
+            },
+            "drag_node": {
+                "connected_to_hidden": "This can't be edited because it is connected to a hidden feature."
             }
         },
         "operations": {
             }
         },
         "operations": {
@@ -137,12 +145,8 @@
                 "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."
             },
             "disconnect": {
                 "title": "Disconnect",
             },
             "disconnect": {
                 "title": "Disconnect",
@@ -160,7 +164,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."
             },
@@ -282,18 +287,48 @@
                 "connected_to_hidden": "This can't be split because it is connected to a hidden feature."
             },
             "restriction": {
                 "connected_to_hidden": "This can't be split because it is connected to a hidden feature."
             },
             "restriction": {
-                "help": {
-                    "select": "Click to select a road segment.",
-                    "toggle": "Click to toggle turn restrictions.",
-                    "toggle_on": "Click to add a \"{restriction}\" restriction.",
-                    "toggle_off": "Click to remove the \"{restriction}\" restriction."
-                },
                 "annotation": {
                     "create": "Added a turn restriction",
                     "delete": "Deleted a turn restriction"
                 }
             }
         },
                 "annotation": {
                     "create": "Added a turn restriction",
                     "delete": "Deleted a turn restriction"
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Distance",
+                "distance_up_to": "Up to {distance}",
+                "via": "Via",
+                "via_node_only": "Node only",
+                "via_up_to_one": "Up to 1 way",
+                "via_up_to_two": "Up to 2 ways"
+            },
+            "help": {
+                "indirect": "(indirect)",
+                "turn": {
+                    "no_left_turn": "NO Left Turn {indirect}",
+                    "no_right_turn": "NO Right Turn {indirect}",
+                    "no_u_turn": "NO U-Turn {indirect}",
+                    "no_straight_on": "NO Straight On {indirect}",
+                    "only_left_turn": "ONLY Left Turn {indirect}",
+                    "only_right_turn": "ONLY Right Turn {indirect}",
+                    "only_u_turn": "ONLY U-Turn {indirect}",
+                    "only_straight_on": "ONLY Straight On {indirect}",
+                    "allowed_left_turn": "Left Turn Allowed {indirect}",
+                    "allowed_right_turn": "Right Turn Allowed {indirect}",
+                    "allowed_u_turn": "U-Turn Allowed {indirect}",
+                    "allowed_straight_on": "Straight On Allowed {indirect}"
+                },
+                "from": "FROM",
+                "via": "VIA",
+                "to": "TO",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Click to select a {from} segment",
+                "select_from_name": "Click to select {from} {fromName}",
+                "toggle": "Click for \"{turn}\""
+            }
+        },
         "undo": {
             "tooltip": "Undo: {action}",
             "nothing": "Nothing to undo."
         "undo": {
             "tooltip": "Undo: {action}",
             "nothing": "Nothing to undo."
@@ -306,13 +341,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",
@@ -369,6 +401,7 @@
                 "key": "H",
                 "title": "History",
                 "selected": "{n} selected",
                 "key": "H",
                 "title": "History",
                 "selected": "{n} selected",
+                "no_history": "No History (New Feature)",
                 "version": "Version",
                 "last_edit": "Last Edit",
                 "edited_by": "Edited By",
                 "version": "Version",
                 "last_edit": "Last Edit",
                 "edited_by": "Edited By",
@@ -386,6 +419,8 @@
                 "title": "Measurement",
                 "selected": "{n} selected",
                 "geometry": "Geometry",
                 "title": "Measurement",
                 "selected": "{n} selected",
                 "geometry": "Geometry",
+                "closed_line": "closed line",
+                "closed_area": "closed area",
                 "center": "Centre",
                 "perimeter": "Perimeter",
                 "length": "Length",
                 "center": "Centre",
                 "perimeter": "Perimeter",
                 "length": "Length",
@@ -393,7 +428,8 @@
                 "centroid": "Centroid",
                 "location": "Location",
                 "metric": "Metric",
                 "centroid": "Centroid",
                 "location": "Location",
                 "metric": "Metric",
-                "imperial": "Imperial"
+                "imperial": "Imperial",
+                "node_count": "Number of nodes"
             }
         },
         "geometry": {
             }
         },
         "geometry": {
@@ -459,13 +495,21 @@
             "title": "Background",
             "description": "Background settings",
             "key": "B",
             "title": "Background",
             "description": "Background settings",
             "key": "B",
+            "backgrounds": "Backgrounds",
             "none": "None",
             "best_imagery": "Best known imagery source for this location",
             "switch": "Switch back to this background",
             "custom": "Custom",
             "none": "None",
             "best_imagery": "Best known imagery source for this location",
             "switch": "Switch back to this background",
             "custom": "Custom",
-            "custom_button": "Edit custom background",
+            "overlays": "Overlays",
+            "imagery_source_faq": "Imagery Info / Report a Problem",
             "reset": "reset",
             "reset": "reset",
+            "display_options": "Display Options",
+            "brightness": "Brightness",
+            "contrast": "Contrast",
+            "saturation": "Saturation",
+            "sharpness": "Sharpness",
             "minimap": {
             "minimap": {
+                "description": "Show Minimap",
                 "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": "/"
             },
@@ -567,6 +611,7 @@
             "status_code": "Server returned status code {code}",
             "unknown_error_details": "Please ensure you are connected to the Internet.",
             "uploading": "Uploading changes to OpenStreetMap...",
             "status_code": "Server returned status code {code}",
             "unknown_error_details": "Please ensure you are connected to the Internet.",
             "uploading": "Uploading changes to OpenStreetMap...",
+            "conflict_progress": "Checking for conflicts: {num} of {total}",
             "unsaved_changes": "You have unsaved changes",
             "conflict": {
                 "header": "Resolve conflicting edits",
             "unsaved_changes": "You have unsaved changes",
             "conflict": {
                 "header": "Resolve conflicting edits",
@@ -592,15 +637,20 @@
             }
         },
         "success": {
             }
         },
         "success": {
-            "edited_osm": "Edited OSM!",
             "just_edited": "You just edited OpenStreetMap!",
             "just_edited": "You just edited OpenStreetMap!",
-            "view_on_osm": "View on OSM",
-            "facebook": "Share on Facebook",
-            "twitter": "Share on Twitter",
-            "google": "Share on Google+",
-            "help_html": "Your changes should appear in the \"Standard\" layer in a few minutes. Other layers, and certain features, may take longer.",
+            "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_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"
+            "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",
+            "changeset_id": "Your changeset #: {changeset_id}",
+            "like_osm": "Like OpenStreetMap? Connect with others:",
+            "more": "More",
+            "events": "Events",
+            "languages": "Languages: {languages}",
+            "missing": "Is something missing from this list?",
+            "tell_us": "Tell us!"
         },
         "confirm": {
             "okay": "OK",
         },
         "confirm": {
             "okay": "OK",
@@ -638,6 +688,7 @@
             "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.",
             "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}"
         },
             "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
             "deprecated_tags": "Deprecated tags: {tags}"
         },
@@ -647,11 +698,8 @@
         },
         "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": {
             "tooltip": "Street-level photos from Mapillary",
         },
         "mapillary_images": {
             "tooltip": "Street-level photos from Mapillary",
@@ -820,7 +868,6 @@
             },
             "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.",
@@ -834,6 +881,44 @@
                 "using": "To use a GPS trace for mapping, drag and drop the data file onto the map editor. If it's recognized, it will be drawn on the map as a bright purple line. Click the {data} **Map data** panel on the side of the map to enable, disable, or zoom to your GPS data.",
                 "tracing": "The GPS track isn't sent to OpenStreetMap - the best way to use it is to draw on the map, using it as a guide for the new features that you add.",
                 "upload": "You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use."
                 "using": "To use a GPS trace for mapping, drag and drop the data file onto the map editor. If it's recognized, it will be drawn on the map as a bright purple line. Click the {data} **Map data** panel on the side of the map to enable, disable, or zoom to your GPS data.",
                 "tracing": "The GPS track isn't sent to OpenStreetMap - the best way to use it is to draw on the map, using it as a guide for the new features that you add.",
                 "upload": "You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use."
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Turn Restrictions Help",
+                    "about": {
+                        "title": "About",
+                        "about": "This field allows you to inspect and modify turn restrictions. It displays a model of the selected intersection including other nearby connected roads.",
+                        "from_via_to": "A turn restriction always contains: one **FROM way**, one **TO way**, and either one **VIA node** or one or more **VIA ways**.",
+                        "maxdist": "The \"{distField}\" slider controls how far to search for additional connected roads.",
+                        "maxvia": "The \"{viaField}\" slider adjusts how many via ways may be included in the search. (Tip: simple is better)"
+                    },
+                    "inspecting": {
+                        "title": "Inspecting",
+                        "about": "Hover over any **FROM** segment to see whether it has any turn restrictions. Each possible **TO** destination will be drawn with a colored shadow showing whether a restriction exists.",
+                        "from_shadow": "{fromShadow} **FROM segment**",
+                        "allow_shadow": "{allowShadow} **TO Allowed**",
+                        "restrict_shadow": "{restrictShadow} **TO Restricted**",
+                        "only_shadow": "{onlyShadow} **TO Only**",
+                        "restricted": "\"Restricted\" means that there is a turn restriction, for example \"No Left Turn\".",
+                        "only": "\"Only\" means that a vehicle taking that path may only make that choice, for example \"Only Straight On\"."
+                    },
+                    "modifying": {
+                        "title": "Modifying",
+                        "about": "To modify turn restrictions, first click on any starting **FROM** segment to select it. The selected segment will pulse, and all possible **TO** destinations will appear as turn symbols.",
+                        "indicators": "Then, click on a turn symbol to toggle it between \"Allowed\", \"Restricted\", and \"Only\".",
+                        "allow_turn": "{allowTurn} **TO Allowed**",
+                        "restrict_turn": "{restrictTurn} **TO Restricted**",
+                        "only_turn": "{onlyTurn} **TO Only**"
+                    },
+                    "tips": {
+                        "title": "Tips",
+                        "simple": "**Prefer simple restrictions over complex ones.**",
+                        "simple_example": "For example, avoid creating a via-way restriction if a simpler via-node turn restriction will do.",
+                        "indirect": "**Some restrictions display the text \"(indirect)\" and are drawn lighter.**",
+                        "indirect_example": "These restrictions exist because of another nearby restriction. For example, an \"Only Straight On\" restriction will indirectly create \"No Turn\" restrictions for all other paths through the intersection.",
+                        "indirect_noedit": "You may not edit indirect restrictions. Instead, edit the nearby direct restriction."
+                    }
+                }
             }
         },
         "intro": {
             }
         },
         "intro": {
@@ -1141,7 +1226,8 @@
                     "title": "Selecting features",
                     "select_one": "Select a single feature",
                     "select_multi": "Select multiple features",
                     "title": "Selecting features",
                     "select_one": "Select a single feature",
                     "select_multi": "Select multiple features",
-                    "lasso": "Draw a selection lasso around features"
+                    "lasso": "Draw a selection lasso around features",
+                    "search": "Find features matching search text"
                 },
                 "with_selected": {
                     "title": "With feature selected",
                 },
                 "with_selected": {
                     "title": "With feature selected",
@@ -1163,7 +1249,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"
                 },
@@ -1203,6 +1288,28 @@
                 }
             }
         },
                 }
             }
         },
+        "units": {
+            "feet": "{quantity} ft",
+            "miles": "{quantity} mi",
+            "square_feet": "{quantity} sq ft",
+            "square_miles": "{quantity} sq mi",
+            "acres": "{quantity} ac",
+            "meters": "{quantity} m",
+            "kilometers": "{quantity} km",
+            "square_meters": "{quantity} m²",
+            "square_kilometers": "{quantity} km²",
+            "hectares": "{quantity} ha",
+            "area_pair": "{area1} ({area2})",
+            "arcdegrees": "{quantity}°",
+            "arcminutes": "{quantity}′",
+            "arcseconds": "{quantity}″",
+            "north": "N",
+            "south": "S",
+            "east": "E",
+            "west": "W",
+            "coordinate": "{coordinate}{direction}",
+            "coordinate_pair": "{latitude}, {longitude}"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
         "presets": {
             "categories": {
                 "category-barrier": {
@@ -1253,31 +1360,24 @@
                     "label": "Allowed Access",
                     "options": {
                         "designated": {
                     "label": "Allowed Access",
                     "options": {
                         "designated": {
-                            "description": "Access permitted according to signs or specific local laws",
                             "title": "Designated"
                         },
                         "destination": {
                             "title": "Designated"
                         },
                         "destination": {
-                            "description": "Access permitted only to reach a destination",
                             "title": "Destination"
                         },
                         "dismount": {
                             "title": "Destination"
                         },
                         "dismount": {
-                            "description": "Access permitted but rider must dismount",
                             "title": "Dismount"
                         },
                         "no": {
                             "title": "Dismount"
                         },
                         "no": {
-                            "description": "Access not permitted to the general public",
                             "title": "Prohibited"
                         },
                         "permissive": {
                             "title": "Prohibited"
                         },
                         "permissive": {
-                            "description": "Access permitted until such time as the owner revokes the permission",
                             "title": "Permissive"
                         },
                         "private": {
                             "title": "Permissive"
                         },
                         "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"
                         }
                     },
@@ -1452,6 +1552,9 @@
                 "brand": {
                     "label": "Brand"
                 },
                 "brand": {
                     "label": "Brand"
                 },
+                "brewery": {
+                    "label": "Draught Beers"
+                },
                 "bridge": {
                     "label": "Type",
                     "placeholder": "Default"
                 "bridge": {
                     "label": "Type",
                     "placeholder": "Default"
@@ -1591,6 +1694,9 @@
                         "cycleway:right": "Right side"
                     }
                 },
                         "cycleway:right": "Right side"
                     }
                 },
+                "dance/style": {
+                    "label": "Dance Styles"
+                },
                 "date": {
                     "label": "Date"
                 },
                 "date": {
                     "label": "Date"
                 },
@@ -1613,6 +1719,49 @@
                 "diaper": {
                     "label": "Baby Changing Available"
                 },
                 "diaper": {
                     "label": "Baby Changing Available"
                 },
+                "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": {
+                    "label": "Direction",
+                    "options": {
+                        "backward": "Backward",
+                        "both": "Both / All",
+                        "forward": "Forward"
+                    }
+                },
+                "dispensing": {
+                    "label": "Dispenses Prescriptions"
+                },
                 "display": {
                     "label": "Display"
                 },
                 "display": {
                     "label": "Display"
                 },
@@ -1656,6 +1805,9 @@
                 "except": {
                     "label": "Exceptions"
                 },
                 "except": {
                     "label": "Exceptions"
                 },
+                "faces": {
+                    "label": "Faces"
+                },
                 "fax": {
                     "label": "Fax",
                     "placeholder": "+44 1632 961234"
                 "fax": {
                     "label": "Fax",
                     "placeholder": "+44 1632 961234"
@@ -1767,6 +1919,39 @@
                     "label": "Hoops",
                     "placeholder": "1, 2, 4..."
                 },
                     "label": "Hoops",
                     "placeholder": "1, 2, 4..."
                 },
+                "horse_dressage": {
+                    "label": "Dressage Riding",
+                    "options": {
+                        "equestrian": "Yes",
+                        "undefined": "No"
+                    }
+                },
+                "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"
+                    }
+                },
                 "iata": {
                     "label": "IATA"
                 },
                 "iata": {
                     "label": "IATA"
                 },
@@ -1786,6 +1971,9 @@
                 "indoor": {
                     "label": "Indoor"
                 },
                 "indoor": {
                     "label": "Indoor"
                 },
+                "industrial": {
+                    "label": "Type"
+                },
                 "information": {
                     "label": "Type"
                 },
                 "information": {
                     "label": "Type"
                 },
@@ -1906,6 +2094,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"
                 },
@@ -2006,7 +2198,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"
                     }
@@ -2014,7 +2208,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"
                     }
@@ -2060,15 +2256,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": {
@@ -2133,6 +2320,18 @@
                 "railway": {
                     "label": "Type"
                 },
                 "railway": {
                     "label": "Type"
                 },
+                "railway/position": {
+                    "label": "Milestone Position",
+                    "placeholder": "Distance to one decimal (123.4)"
+                },
+                "railway/signal/direction": {
+                    "label": "Direction",
+                    "options": {
+                        "backward": "Backward",
+                        "both": "Both / All",
+                        "forward": "Forward"
+                    }
+                },
                 "rating": {
                     "label": "Power Rating"
                 },
                 "rating": {
                     "label": "Power Rating"
                 },
@@ -2142,6 +2341,9 @@
                 "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"
                 },
@@ -2435,6 +2637,14 @@
                 "traffic_signals": {
                     "label": "Type"
                 },
                 "traffic_signals": {
                     "label": "Type"
                 },
+                "traffic_signals/direction": {
+                    "label": "Direction",
+                    "options": {
+                        "backward": "Backward",
+                        "both": "Both / All",
+                        "forward": "Forward"
+                    }
+                },
                 "trail_visibility": {
                     "label": "Trail Visibility",
                     "options": {
                 "trail_visibility": {
                     "label": "Trail Visibility",
                     "options": {
@@ -2467,8 +2677,19 @@
                     "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": {
                 "vending": {
-                    "label": "Type of Goods"
+                    "label": "Types of Goods"
                 },
                 "visibility": {
                     "label": "Visibility",
                 },
                 "visibility": {
                     "label": "Visibility",
@@ -2528,6 +2749,9 @@
                 "wheelchair": {
                     "label": "Wheelchair Access"
                 },
                 "wheelchair": {
                     "label": "Wheelchair Access"
                 },
+                "wholesale": {
+                    "label": "Wholesale"
+                },
                 "width": {
                     "label": "Width (Metres)"
                 },
                 "width": {
                     "label": "Width (Metres)"
                 },
@@ -2558,6 +2782,9 @@
                 "advertising/billboard": {
                     "name": "Billboard"
                 },
                 "advertising/billboard": {
                     "name": "Billboard"
                 },
+                "advertising/column": {
+                    "name": "Advertising Column"
+                },
                 "aerialway": {
                     "name": "Aerialway"
                 },
                 "aerialway": {
                     "name": "Aerialway"
                 },
@@ -2625,6 +2852,9 @@
                 "aeroway/terminal": {
                     "name": "Airport Terminal"
                 },
                 "aeroway/terminal": {
                     "name": "Airport Terminal"
                 },
+                "allotments/plot": {
+                    "name": "Allotments Plot"
+                },
                 "amenity": {
                     "name": "Amenity"
                 },
                 "amenity": {
                     "name": "Amenity"
                 },
@@ -2664,18 +2894,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/cafe": {
                     "name": "Cafe"
                 },
+                "amenity/car_pooling": {
+                    "name": "Car Pooling"
+                },
                 "amenity/car_rental": {
                     "name": "Car Rental"
                 },
                 "amenity/car_rental": {
                     "name": "Car Rental"
                 },
@@ -2748,6 +2981,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"
                 },
@@ -2785,9 +3021,15 @@
                 "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"
                 },
@@ -2800,18 +3042,12 @@
                 "amenity/nursing_home": {
                     "name": "Nursing Home"
                 },
                 "amenity/nursing_home": {
                     "name": "Nursing Home"
                 },
-                "amenity/parking": {
-                    "name": "Car Parking"
-                },
                 "amenity/parking_entrance": {
                     "name": "Parking Garage Entrance/Exit"
                 },
                 "amenity/parking_space": {
                     "name": "Parking Space"
                 },
                 "amenity/parking_entrance": {
                     "name": "Parking Garage Entrance/Exit"
                 },
                 "amenity/parking_space": {
                     "name": "Parking Space"
                 },
-                "amenity/pavilion": {
-                    "name": "Pavilion"
-                },
                 "amenity/pharmacy": {
                     "name": "Pharmacy"
                 },
                 "amenity/pharmacy": {
                     "name": "Pharmacy"
                 },
@@ -2894,6 +3130,9 @@
                 "amenity/shower": {
                     "name": "Shower"
                 },
                 "amenity/shower": {
                     "name": "Shower"
                 },
+                "amenity/smoking_area": {
+                    "name": "Smoking Area"
+                },
                 "amenity/social_facility": {
                     "name": "Social Facility"
                 },
                 "amenity/social_facility": {
                     "name": "Social Facility"
                 },
@@ -2939,33 +3178,51 @@
                 "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/electronics": {
+                    "name": "Electronics 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/excrement_bags": {
                     "name": "Excrement Bag Vending Machine"
                 },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "Feminine Hygiene 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/news_papers": {
                     "name": "Newspaper Vending Machine"
                 },
                 "amenity/vending_machine/newspapers": {
                     "name": "Newspaper Vending Machine"
                 },
                 "amenity/vending_machine/news_papers": {
                     "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"
                 },
@@ -3020,6 +3277,9 @@
                 "attraction/drop_tower": {
                     "name": "Drop Tower"
                 },
                 "attraction/drop_tower": {
                     "name": "Drop Tower"
                 },
+                "attraction/maze": {
+                    "name": "Maze"
+                },
                 "attraction/pirate_ship": {
                     "name": "Pirate Ship"
                 },
                 "attraction/pirate_ship": {
                     "name": "Pirate Ship"
                 },
@@ -3101,6 +3361,12 @@
                 "building/barn": {
                     "name": "Barn"
                 },
                 "building/barn": {
                     "name": "Barn"
                 },
+                "building/boathouse": {
+                    "name": "Boathouse"
+                },
+                "building/bungalow": {
+                    "name": "Bungalow"
+                },
                 "building/bunker": {
                     "name": "Bunker"
                 },
                 "building/bunker": {
                     "name": "Bunker"
                 },
@@ -3116,6 +3382,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"
                 },
@@ -3134,12 +3403,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"
                 },
@@ -3161,6 +3439,9 @@
                 "building/kindergarten": {
                     "name": "Preschool/Kindergarten Building"
                 },
                 "building/kindergarten": {
                     "name": "Preschool/Kindergarten Building"
                 },
+                "building/mosque": {
+                    "name": "Mosque Building"
+                },
                 "building/public": {
                     "name": "Public Building"
                 },
                 "building/public": {
                     "name": "Public Building"
                 },
@@ -3173,27 +3454,42 @@
                 "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/train_station": {
                     "name": "Train Station"
                 },
                 "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"
                 },
@@ -3203,6 +3499,9 @@
                 "camp_site/camp_pitch": {
                     "name": "Camp Pitch"
                 },
                 "camp_site/camp_pitch": {
                     "name": "Camp Pitch"
                 },
+                "circular": {
+                    "name": "Traffic Circle"
+                },
                 "club": {
                     "name": "Club"
                 },
                 "club": {
                     "name": "Club"
                 },
@@ -3386,28 +3685,15 @@
                 "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"
                 },
                 "entrance": {
                     "name": "Entrance/Exit"
                 },
                 "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"
                 },
                 "ford": {
                     "name": "Ford"
                 },
@@ -3462,6 +3748,9 @@
                 "healthcare/hospice": {
                     "name": "Hospice"
                 },
                 "healthcare/hospice": {
                     "name": "Hospice"
                 },
+                "healthcare/laboratory": {
+                    "name": "Medical Laboratory"
+                },
                 "healthcare/midwife": {
                     "name": "Midwife"
                 },
                 "healthcare/midwife": {
                     "name": "Midwife"
                 },
@@ -3492,20 +3781,14 @@
                 "highway/bridleway": {
                     "name": "Bridleway"
                 },
                 "highway/bridleway": {
                     "name": "Bridleway"
                 },
-                "highway/corridor": {
-                    "name": "Indoor Corridor"
-                },
-                "highway/crossing": {
-                    "name": "Street Crossing"
-                },
-                "highway/crossing-raised": {
-                    "name": "Raised Street Crossing"
+                "highway/bus_guideway": {
+                    "name": "Bus Guideway"
                 },
                 },
-                "highway/crosswalk": {
-                    "name": "Zebra Crossing"
+                "highway/bus_stop": {
+                    "name": "Bus Stop / Platform"
                 },
                 },
-                "highway/crosswalk-raised": {
-                    "name": "Raised Zebra Crossing"
+                "highway/corridor": {
+                    "name": "Indoor Corridor"
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path"
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path"
@@ -3534,6 +3817,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"
                 },
@@ -3702,12 +3988,18 @@
                 "landuse/forest": {
                     "name": "Forest"
                 },
                 "landuse/forest": {
                     "name": "Forest"
                 },
+                "landuse/garages": {
+                    "name": "Garage Landuse"
+                },
                 "landuse/grass": {
                     "name": "Grass"
                 },
                 "landuse/greenfield": {
                     "name": "Greenfield"
                 },
                 "landuse/grass": {
                     "name": "Grass"
                 },
                 "landuse/greenfield": {
                     "name": "Greenfield"
                 },
+                "landuse/greenhouse_horticulture": {
+                    "name": "Greenhouse Horticulture"
+                },
                 "landuse/harbour": {
                     "name": "Harbor"
                 },
                 "landuse/harbour": {
                     "name": "Harbor"
                 },
@@ -3795,6 +4087,12 @@
                 "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"
                 },
@@ -3807,6 +4105,9 @@
                 "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"
                 },
@@ -3879,6 +4180,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"
                 },
@@ -3891,9 +4195,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"
                 },
@@ -3975,6 +4276,9 @@
                 "man_made/adit": {
                     "name": "Adit"
                 },
                 "man_made/adit": {
                     "name": "Adit"
                 },
+                "man_made/antenna": {
+                    "name": "Antenna"
+                },
                 "man_made/breakwater": {
                     "name": "Breakwater"
                 },
                 "man_made/breakwater": {
                     "name": "Breakwater"
                 },
@@ -3984,6 +4288,9 @@
                 "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"
                 },
@@ -4008,9 +4315,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"
                 },
@@ -4032,9 +4336,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"
                 },
@@ -4104,9 +4405,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"
                 },
@@ -4128,9 +4435,6 @@
                 "natural/tree": {
                     "name": "Tree"
                 },
                 "natural/tree": {
                     "name": "Tree"
                 },
-                "natural/tree_row": {
-                    "name": "Tree row"
-                },
                 "natural/volcano": {
                     "name": "Volcano"
                 },
                 "natural/volcano": {
                     "name": "Volcano"
                 },
@@ -4179,6 +4483,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"
                 },
@@ -4272,9 +4579,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"
                 },
@@ -4371,12 +4675,6 @@
                 "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"
                 },
@@ -4404,6 +4702,132 @@
                 "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_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": {
                     "name": "Railway"
                 },
                 "railway": {
                     "name": "Railway"
                 },
@@ -4425,24 +4849,39 @@
                 "railway/funicular": {
                     "name": "Funicular"
                 },
                 "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)"
                 },
+                "railway/light_rail": {
+                    "name": "Light Rail"
+                },
                 "railway/milestone": {
                     "name": "Railway Milestone"
                 },
                 "railway/milestone": {
                     "name": "Railway Milestone"
                 },
+                "railway/miniature": {
+                    "name": "Miniature Railway"
+                },
                 "railway/monorail": {
                     "name": "Monorail"
                 },
                 "railway/narrow_gauge": {
                     "name": "Narrow Gauge Rail"
                 },
                 "railway/monorail": {
                     "name": "Monorail"
                 },
                 "railway/narrow_gauge": {
                     "name": "Narrow Gauge Rail"
                 },
+                "railway/platform": {
+                    "name": "Train Stop / Platform"
+                },
                 "railway/rail": {
                     "name": "Rail"
                 },
                 "railway/signal": {
                     "name": "Railway Signal"
                 },
                 "railway/rail": {
                     "name": "Rail"
                 },
                 "railway/signal": {
                     "name": "Railway Signal"
                 },
+                "railway/station": {
+                    "name": "Train Station"
+                },
                 "railway/subway": {
                     "name": "Subway"
                 },
                 "railway/subway": {
                     "name": "Subway"
                 },
@@ -4458,6 +4897,9 @@
                 "railway/tram": {
                     "name": "Tram"
                 },
                 "railway/tram": {
                     "name": "Tram"
                 },
+                "railway/tram_stop": {
+                    "name": "Tram Stopping Position"
+                },
                 "relation": {
                     "name": "Relation"
                 },
                 "relation": {
                     "name": "Relation"
                 },
@@ -4470,9 +4912,6 @@
                 "shop": {
                     "name": "Shop"
                 },
                 "shop": {
                     "name": "Shop"
                 },
-                "shop/agrarian": {
-                    "name": "Agriculture Shop"
-                },
                 "shop/alcohol": {
                     "name": "Off licence (Alcohol shop)"
                 },
                 "shop/alcohol": {
                     "name": "Off licence (Alcohol shop)"
                 },
@@ -4483,22 +4922,22 @@
                     "name": "Antiques Shop"
                 },
                 "shop/appliance": {
                     "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"
@@ -4510,10 +4949,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"
@@ -4522,7 +4961,7 @@
                     "name": "Bookmaker"
                 },
                 "shop/books": {
                     "name": "Bookmaker"
                 },
                 "shop/books": {
-                    "name": "Book Store"
+                    "name": "Book Shop"
                 },
                 "shop/boutique": {
                     "name": "Boutique"
                 },
                 "shop/boutique": {
                     "name": "Boutique"
@@ -4537,55 +4976,55 @@
                     "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"
+                    "name": "Cosmetics Shop"
                 },
                 "shop/craft": {
                 },
                 "shop/craft": {
-                    "name": "Arts and Crafts Store"
+                    "name": "Art and Craft Supplies 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"
@@ -4594,7 +5033,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"
@@ -4603,19 +5042,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"
+                    "name": "Fashion Shop"
                 },
                 "shop/fishmonger": {
                     "name": "Fishmonger"
                 },
                 "shop/fishmonger": {
                     "name": "Fishmonger"
@@ -4630,10 +5069,10 @@
                     "name": "Funeral Home"
                 },
                 "shop/furnace": {
                     "name": "Funeral Home"
                 },
                 "shop/furnace": {
-                    "name": "Furnace Store"
+                    "name": "Furnace Shop"
                 },
                 "shop/furniture": {
                 },
                 "shop/furniture": {
-                    "name": "Furniture Store"
+                    "name": "Furniture Shop"
                 },
                 "shop/garden_centre": {
                     "name": "Garden Centre"
                 },
                 "shop/garden_centre": {
                     "name": "Garden Centre"
@@ -4651,34 +5090,38 @@
                     "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"
+                    "name": "Interior Decoration Shop"
                 },
                 "shop/jewelry": {
                     "name": "Jeweller"
                 },
                 "shop/kitchen": {
                 },
                 "shop/jewelry": {
                     "name": "Jeweller"
                 },
                 "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"
@@ -4693,10 +5136,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"
@@ -4704,17 +5147,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"
@@ -4723,10 +5169,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"
@@ -4735,22 +5181,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"
@@ -4759,16 +5208,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"
@@ -4783,7 +5232,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"
@@ -4795,7 +5244,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"
@@ -4804,22 +5253,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"
@@ -4830,8 +5279,11 @@
                 "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"
@@ -4902,6 +5354,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"
                 },
@@ -4966,13 +5421,16 @@
                     "name": "No U-turn"
                 },
                 "type/restriction/only_left_turn": {
                     "name": "No U-turn"
                 },
                 "type/restriction/only_left_turn": {
-                    "name": "Left Turn Only"
+                    "name": "Only Left Turn"
                 },
                 "type/restriction/only_right_turn": {
                 },
                 "type/restriction/only_right_turn": {
-                    "name": "Right Turn Only"
+                    "name": "Only Right Turn"
                 },
                 "type/restriction/only_straight_on": {
                 },
                 "type/restriction/only_straight_on": {
-                    "name": "No Turns"
+                    "name": "Only Straight On"
+                },
+                "type/restriction/only_u_turn": {
+                    "name": "Only U-turn"
                 },
                 "type/route": {
                     "name": "Route"
                 },
                 "type/route": {
                     "name": "Route"
@@ -4998,15 +5456,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"
                 },
@@ -5084,28 +5551,26 @@
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
-                "description": "Premium DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Premium Imagery"
             },
             "DigitalGlobe-Premium-vintage": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
                 "name": "DigitalGlobe Premium Imagery"
             },
             "DigitalGlobe-Premium-vintage": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
-                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.",
                 "name": "DigitalGlobe Premium Imagery Vintage"
             },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
                 "name": "DigitalGlobe Premium Imagery Vintage"
             },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
-                "description": "Standard DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Standard Imagery"
             },
             "DigitalGlobe-Standard-vintage": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
                 "name": "DigitalGlobe Standard Imagery"
             },
             "DigitalGlobe-Standard-vintage": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
-                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.",
                 "name": "DigitalGlobe Standard Imagery Vintage"
             },
             "EsriWorldImagery": {
                 "name": "DigitalGlobe Standard Imagery Vintage"
             },
             "EsriWorldImagery": {
@@ -5115,6 +5580,13 @@
                 "description": "Esri world imagery.",
                 "name": "Esri World Imagery"
             },
                 "description": "Esri world imagery.",
                 "name": "Esri World Imagery"
             },
+            "EsriWorldImageryClarity": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Esri archive imagery that may be clearer and more accurate than the default layer.",
+                "name": "Esri World Imagery (Clarity) Beta"
+            },
             "MAPNIK": {
                 "attribution": {
                     "text": "© OpenStreetMap contributors, CC-BY-SA"
             "MAPNIK": {
                 "attribution": {
                     "text": "© OpenStreetMap contributors, CC-BY-SA"
@@ -5171,9 +5643,6 @@
                 },
                 "name": "OSM Inspector: Tagging"
             },
                 },
                 "name": "OSM Inspector: Tagging"
             },
-            "US-TIGER-Roads-2012": {
-                "name": "TIGER Roads 2012"
-            },
             "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",
                 "name": "TIGER Roads 2014"
             "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",
                 "name": "TIGER Roads 2014"
@@ -5182,26 +5651,45 @@
                 "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
                 "name": "TIGER Roads 2017"
             },
                 "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
                 "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": {
             "Waymarked_Trails-Cycling": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Cycling"
             },
             "Waymarked_Trails-Hiking": {
                 "name": "Waymarked Trails: Cycling"
             },
             "Waymarked_Trails-Hiking": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Hiking"
             },
             "Waymarked_Trails-MTB": {
                 "name": "Waymarked Trails: Hiking"
             },
             "Waymarked_Trails-MTB": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: MTB"
             },
             "Waymarked_Trails-Skating": {
                 "name": "Waymarked Trails: MTB"
             },
             "Waymarked_Trails-Skating": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Skating"
             },
             "Waymarked_Trails-Winter_Sports": {
                 "name": "Waymarked Trails: Skating"
             },
             "Waymarked_Trails-Winter_Sports": {
+                "attribution": {
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
+                },
                 "name": "Waymarked Trails: Winter Sports"
             },
             "basemap.at": {
                 "attribution": {
                     "text": "basemap.at"
                 },
                 "name": "Waymarked Trails: Winter Sports"
             },
             "basemap.at": {
                 "attribution": {
                     "text": "basemap.at"
                 },
-                "description": "Basemap of Austria, based on goverment data.",
+                "description": "Basemap of Austria, based on government data.",
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
                 "name": "basemap.at"
             },
             "basemap.at-orthofoto": {
@@ -5211,12 +5699,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"
@@ -5263,7 +5745,7 @@
             },
             "stamen-terrain-background": {
                 "attribution": {
             },
             "stamen-terrain-background": {
                 "attribution": {
-                    "text": "Map tiles by Stamen Design, under CC BY 3.0"
+                    "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL"
                 },
                 "name": "Stamen Terrain"
             },
                 },
                 "name": "Stamen Terrain"
             },
@@ -5279,6 +5761,57 @@
                 },
                 "name": "Thunderforest Landscape"
             }
                 },
                 "name": "Thunderforest Landscape"
             }
+        },
+        "community": {
+            "Bay-Area-OpenStreetMappers": {
+                "name": "Bay Area OpenStreetMappers",
+                "description": "Improve OpenStreetMap in the Bay Area",
+                "extendedDescription": "This group is about growing the OpenStreetMap community here in the Bay Area. Our events are open to everyone, from open source enthusiasts, cyclists, GIS professionals, geocachers, and beyond. Anyone and everyone who is interested in maps, map making and free map data is welcome to join our group as well as attend our events."
+            },
+            "Central-Pennsylvania-OSM": {
+                "name": "Central Pennsylvania OSM",
+                "description": "Online mapping community based out of State College, PA"
+            },
+            "Dallas-Fort-Worth-OSM": {
+                "name": "Dallas-Fort Worth OSM",
+                "description": "The OpenStreetMap user group for Dallas-Fort Worth",
+                "extendedDescription": "Dallas, Fort Worth, and all the cities in between are abounding with creative and tech-savvy people. The vision for this usergroup is to find new ways to use the amazing resource of OSM."
+            },
+            "GeoPhilly": {
+                "name": "GeoPhilly",
+                "description": "Meetup for map enthusiasts in the Philadelphia area",
+                "extendedDescription": "GeoPhilly unites developers, geographers, data geeks, open source enthusiasts, civic hackers and map addicts in our shared love of maps and the stories they tell. If you use maps as part of your work or just want to learn more, this is the meetup for you!  Our events aim to be open, friendly, educational and social and range from happy hours to lightning talks or even workshops. Come create a diverse, inspiring geospatial community in the Philadelphia with us!"
+            },
+            "Mapping-DC-meetup": {
+                "name": "Mapping DC",
+                "description": "Improve OpenStreetMap in the DC area",
+                "extendedDescription": "We are a group of volunteer mappers who aim to improve the OpenStreetMap in the DC area. We also aim to teach others about the OSM ecosystem, data analytics, cartography, and GIS. We gather every other month at meetups to focus on one area of our city."
+            },
+            "OSM-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-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!"
+            }
         }
     }
 }
\ No newline at end of file
         }
     }
 }
\ No newline at end of file
The OpenStreetMap web site