]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Remove require_terms_agreed configuration option
[rails.git] / vendor / assets / iD / iD / locales / en.json
index c0ba6ad9d453d91cf21b1fa42694952d60d1f78e..f7b55af3a89a3ba90031a9d82fda9a3e33b23cda 100644 (file)
@@ -1,9 +1,13 @@
 {
     "en": {
         "icons": {
+            "download": "download",
             "information": "info",
             "remove": "remove",
-            "undo": "undo"
+            "undo": "undo",
+            "zoom_to": "zoom to",
+            "copy": "copy",
+            "open_wikidata": "open on wikidata.org"
         },
         "modes": {
             "add_area": {
                 "description": "Add restaurants, monuments, postal boxes or other points to the map.",
                 "tail": "Click on the map to add a point."
             },
+            "add_note": {
+                "title": "Note",
+                "description": "Spotted an issue? Let other mappers know.",
+                "tail": "Click on the map to add a note."
+            },
             "browse": {
                 "title": "Browse",
                 "description": "Pan and zoom the map."
@@ -40,7 +49,8 @@
                 "annotation": {
                     "point": "Added a point.",
                     "vertex": "Added a node to a way.",
-                    "relation": "Added a relation."
+                    "relation": "Added a relation.",
+                    "note": "Added a note."
                 }
             },
             "start": {
             },
             "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."
+                    "from_vertex": {
+                        "to_point": "Connected a way to a point.",
+                        "to_vertex": "Connected a way to another.",
+                        "to_line": "Connected a way to a line.",
+                        "to_area": "Connected a way to an area.",
+                        "to_adjacent_vertex": "Merged adjacent points in a way.",
+                        "to_sibling_vertex": "Connected a way to itself."
+                    },
+                    "from_point": {
+                        "to_point": "Merged a point with another.",
+                        "to_vertex": "Merged a point with a point in a way.",
+                        "to_line": "Moved a point to a line.",
+                        "to_area": "Moved a point 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."
                     "create": "Added a turn restriction",
                     "delete": "Deleted a turn restriction"
                 }
+            },
+            "detach_node": {
+                "title": "Detach",
+                "key": "E",
+                "description": "Detach this node from these lines/areas.",
+                "annotation": "Detached a node from parent lines/areas.",
+                "restriction": "This node can't be detached because it would damage a \"{relation}\" relation.",
+                "connected_to_hidden": "This node can't be detached because it is connected to a hidden feature."
             }
         },
         "restriction": {
         "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_label": "Multilingual Name",
             "localized_translation_language": "Choose language",
             "localized_translation_name": "Name"
         },
         "zoom_in_edit": "Zoom in to edit",
-        "login": "login",
-        "logout": "logout",
+        "login": "Log In",
+        "logout": "Log Out",
         "loading_auth": "Connecting to OpenStreetMap...",
         "report_a_bug": "Report a bug",
         "help_translate": "Help translate",
+        "sidebar": {
+            "key": "`",
+            "tooltip": "Toggle the sidebar."
+        },
         "feature_info": {
             "hidden_warning": "{count} hidden features",
             "hidden_details": "These features are currently hidden: {details}"
             "cancel": "Cancel",
             "changes": "{count} Changes",
             "download_changes": "Download osmChange file",
+            "errors": "Errors",
             "warnings": "Warnings",
             "modified": "Modified",
             "deleted": "Deleted",
                 "edited_by": "Edited By",
                 "changeset": "Changeset",
                 "unknown": "Unknown",
-                "link_text": "History on openstreetmap.org"
+                "link_text": "History on openstreetmap.org",
+                "note_no_history": "No History (New Note)",
+                "note_comments": "Comments",
+                "note_created_date": "Created Date",
+                "note_created_user": "Created By",
+                "note_link_text": "Note on openstreetmap.org"
             },
             "location": {
                 "key": "L",
             "vertex": "vertex",
             "line": "line",
             "area": "area",
-            "relation": "relation"
+            "relation": "relation",
+            "note": "note"
         },
         "geocoder": {
             "search": "Search worldwide...",
             "locating": "Locating, please wait..."
         },
         "inspector": {
+            "zoom_to": {
+                "key": "Z",
+                "title": "Zoom to this",
+                "tooltip_feature": "Center and zoom the map to focus on this feature.",
+                "tooltip_note": "Center and zoom the map to focus on this note.",
+                "tooltip_data": "Center and zoom the map to focus on this data.",
+                "tooltip_issue": "Center and zoom the map to focus on this issue."
+            },
             "no_documentation_combination": "There is no documentation available for this tag combination",
             "no_documentation_key": "There is no documentation available for this key",
-            "documentation_redirect": "This documentation has been redirected to a new page",
             "show_more": "Show More",
             "view_on_osm": "View on openstreetmap.org",
+            "view_on_keepRight": "View on keepright.at",
             "all_fields": "All fields",
             "all_tags": "All tags",
             "all_members": "All members",
             "all_relations": "All relations",
             "new_relation": "New relation...",
+            "choose_relation": "Choose a parent relation",
             "role": "Role",
             "choose": "Select feature type",
             "results": "{n} results for {search}",
             "reference": "View on OpenStreetMap Wiki",
+            "edit_reference": "Edit or translate description",
+            "wiki_reference": "View documentation",
+            "wiki_en_reference": "View documentation in English",
             "back_tooltip": "Change feature",
             "remove": "Remove",
             "search": "Search",
             "way": "Way",
             "relation": "Relation",
             "location": "Location",
-            "add_fields": "Add field:"
+            "add_fields": "Add field:",
+            "lock": {
+                "suggestion": "The \"{label}\" field is locked because there is a Wikidata tag. You can delete it or edit the tags in the \"All tags\" section."
+            }
         },
         "background": {
             "title": "Background",
             "best_imagery": "Best known imagery source for this location",
             "switch": "Switch back to this background",
             "custom": "Custom",
-            "custom_button": "Edit custom background",
-            "custom_prompt": "Enter a tile URL template. Valid tokens are:\n   - {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n   - {-y} or {ty} for flipped TMS-style Y coordinates\n   - {u} for quadtile scheme\n   - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}",
             "overlays": "Overlays",
             "imagery_source_faq": "Imagery Info / Report a Problem",
             "reset": "reset",
                 "osm": {
                     "tooltip": "Map data from OpenStreetMap",
                     "title": "OpenStreetMap data"
+                },
+                "notes": {
+                    "tooltip": "Note data from OpenStreetMap",
+                    "title": "OpenStreetMap notes"
+                },
+                "keepRight": {
+                    "tooltip": "Automatically detected map issues from keepright.at",
+                    "title": "KeepRight Issues"
+                },
+                "custom": {
+                    "tooltip": "Drag and drop a data file onto the page, or click the button to setup",
+                    "title": "Custom Map Data",
+                    "zoom": "Zoom to data"
                 }
             },
             "fill_area": "Fill Areas",
                 "tooltip": "Areas are drawn fully filled."
             }
         },
+        "settings": {
+            "custom_background": {
+                "tooltip": "Edit custom background",
+                "header": "Custom Background Settings",
+                "instructions": "Enter a tile URL template. Valid tokens are:\n   {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n   {-y} or {ty} for flipped TMS-style Y coordinates\n   {u} for quadtile scheme\n   {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}",
+                "template": {
+                    "placeholder": "Enter a url template"
+                }
+            },
+            "custom_data": {
+                "tooltip": "Edit custom data layer",
+                "header": "Custom Map Data Settings",
+                "file": {
+                    "instructions": "Choose a local data file. Supported types are:\n   .gpx, .kml, .geojson, .json",
+                    "label": "Browse files"
+                },
+                "or": "Or",
+                "url": {
+                    "instructions": "Enter a data file URL or vector tile URL template. Valid tokens are:\n   {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme",
+                    "placeholder": "Enter a url"
+                }
+            }
+        },
         "restore": {
             "heading": "You have unsaved changes",
             "description": "Do you wish to restore unsaved changes from a previous editing session?",
         "validations": {
             "disconnected_highway": "Disconnected highway",
             "disconnected_highway_tooltip": "Roads should be connected to other roads or building entrances.",
+            "generic_name": "Possible generic name",
+            "generic_name_tooltip": "This feature seems to have a generic name \"{name}\". Please only use the name field to record the official name of a feature.",
             "old_multipolygon": "Multipolygon tags on outer way",
             "old_multipolygon_tooltip": "This style of multipolygon is deprecated. Please assign the tags to the parent multipolygon instead of the outer way.",
             "untagged_point": "Untagged point",
         },
         "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"
+        "QA": {
+            "keepRight": {
+                "title": "KeepRight Error",
+                "detail_title": "Error",
+                "detail_description": "Description",
+                "comment": "Comment",
+                "comment_placeholder": "Enter a comment to share with other users.",
+                "close": "Close (Error Fixed)",
+                "ignore": "Ignore (Not an Error)",
+                "save_comment": "Save Comment",
+                "close_comment": "Close and Comment",
+                "ignore_comment": "Ignore and Comment",
+                "error_parts": {
+                    "this_node": "this node",
+                    "this_way": "this way",
+                    "this_relation": "this relation",
+                    "this_oneway": "this oneway",
+                    "this_highway": "this highway",
+                    "this_railway": "this railway",
+                    "this_waterway": "this waterway",
+                    "this_cycleway": "this cycleway",
+                    "this_cycleway_footpath": "this cycleway/footpath",
+                    "this_riverbank": "this riverbank",
+                    "this_crossing": "this crossing",
+                    "this_railway_crossing": "this railway crossing",
+                    "this_bridge": "this bridge",
+                    "this_tunnel": "this tunnel",
+                    "this_boundary": "this boundary",
+                    "this_turn_restriction": "this turn restriction",
+                    "this_roundabout": "this roundabout",
+                    "this_mini_roundabout": "this mini-roundabout",
+                    "this_track": "this track",
+                    "this_feature": "this feature",
+                    "highway": "highway",
+                    "railway": "railway",
+                    "waterway": "waterway",
+                    "cycleway": "cycleway",
+                    "cycleway_footpath": "cycleway/footpath",
+                    "riverbank": "riverbank",
+                    "place_of_worship": "place of worship",
+                    "pub": "pub",
+                    "restaurant": "restaurant",
+                    "school": "school",
+                    "university": "university",
+                    "hospital": "hospital",
+                    "library": "library",
+                    "theatre": "theatre",
+                    "courthouse": "courthouse",
+                    "bank": "bank",
+                    "cinema": "cinema",
+                    "pharmacy": "pharmacy",
+                    "cafe": "cafe",
+                    "fast_food": "fast food",
+                    "fuel": "fuel",
+                    "from": "from",
+                    "to": "to",
+                    "left_hand": "left-hand",
+                    "right_hand": "right-hand"
+                },
+                "errorTypes": {
+                    "20": {
+                        "title": "Multiple nodes on the same spot",
+                        "description": "There is more than one node in this spot. Node IDs: {var1}."
+                    },
+                    "30": {
+                        "title": "Non-closed area",
+                        "description": "{var1} is tagged with \"{var2}\" and should be a closed loop."
+                    },
+                    "40": {
+                        "title": "Impossible oneway",
+                        "description": "The first node {var1} of {var2} is not connected to any other way."
+                    },
+                    "41": {
+                        "description": "The last node {var1} of {var2} is not connected to any other way."
+                    },
+                    "42": {
+                        "description": "You cannot reach {var1} because all ways leading from it are oneway."
+                    },
+                    "43": {
+                        "description": "You cannot escape from {var1} because all ways leading to it are oneway."
+                    },
+                    "50": {
+                        "title": "Almost junction",
+                        "description": "{var1} is very close but not connected to way {var2}."
+                    },
+                    "60": {
+                        "title": "Deprecated tag",
+                        "description": "{var1} uses deprecated tag \"{var2}\". Please use \"{var3}\" instead."
+                    },
+                    "70": {
+                        "title": "Missing tag",
+                        "description": "{var1} has an empty tag: \"{var2}\"."
+                    },
+                    "71": {
+                        "description": "{var1} has no tags."
+                    },
+                    "72": {
+                        "description": "{var1} is not member of any way and doesn't have any tags."
+                    },
+                    "73": {
+                        "description": "{var1} has a \"{var2}\" tag but no \"highway\" tag."
+                    },
+                    "74": {
+                        "description": "{var1} has an empty tag: \"{var2}\"."
+                    },
+                    "75": {
+                        "description": "{var1} has a name \"{var2}\" but no other tags."
+                    },
+                    "90": {
+                        "title": "Motorway without ref tag",
+                        "description": "{var1} is tagged as a motorway and therefore needs a \"ref\", \"nat_ref\", or \"int_ref\" tag."
+                    },
+                    "100": {
+                        "title": "Place of worship without religion",
+                        "description": "{var1} is tagged as a place of worship and therefore needs a religion tag."
+                    },
+                    "110": {
+                        "title": "Point of interest without name",
+                        "description": "{var1} is tagged as a \"{var2}\" and therefore needs a name tag."
+                    },
+                    "120": {
+                        "title": "Way without nodes",
+                        "description": "{var1} has just one single node."
+                    },
+                    "130": {
+                        "title": "Disconnected way",
+                        "description": "{var1} is not connected to the rest of the map."
+                    },
+                    "150": {
+                        "title": "Railway crossing without tag",
+                        "description": "{var1} of a highway and a railway needs to be tagged as \"railway=crossing\" or \"railway=level_crossing\"."
+                    },
+                    "160": {
+                        "title": "Railway layer conflict",
+                        "description": "There are ways in different layers (e.g. tunnel or bridge) meeting at {var1}."
+                    },
+                    "170": {
+                        "title": "FIXME tagged item",
+                        "description": "{var1} has a FIXME tag: {var2}"
+                    },
+                    "180": {
+                        "title": "Relation without type",
+                        "description": "{var1} is missing a \"type\" tag."
+                    },
+                    "190": {
+                        "title": "Intersection without junction",
+                        "description": "{var1} intersects the {var2} {var3} but there is no junction node, bridge, or tunnel."
+                    },
+                    "200": {
+                        "title": "Overlapping ways",
+                        "description": "{var1} overlaps the {var2} {var3}."
+                    },
+                    "210": {
+                        "title": "Self-intersecting way",
+                        "description": "There is an unspecified issue with self intersecting ways."
+                    },
+                    "211": {
+                        "description": "{var1} contains more than one node multiple times. Nodes are {var2}. This may or may not be an error."
+                    },
+                    "212": {
+                        "description": "{var1} has only two different nodes and contains one of them more than once."
+                    },
+                    "220": {
+                        "title": "Misspelled tag",
+                        "description": "{var1} is tagged \"{var2}\" where \"{var3}\" looks like \"{var4}\"."
+                    },
+                    "221": {
+                        "description": "{var1} has a suspicious tag \"{var2}\"."
+                    },
+                    "230": {
+                        "title": "Layer conflict",
+                        "description": "{var1} is a junction of ways on different layers."
+                    },
+                    "231": {
+                        "description": "{var1} is a junction of ways on different layers: {var2}.",
+                        "layer": "(layer: {layer})"
+                    },
+                    "232": {
+                        "description": "{var1} is tagged with \"layer={var2}\". This need not be an error but it looks strange."
+                    },
+                    "270": {
+                        "title": "Unusual motorway connection",
+                        "description": "{var1} is a junction of a motorway and a highway other than \"motorway\", \"motorway_link\", \"trunk\", \"rest_area\", or \"construction\". Connection to \"service\" or \"unclassified\" is only valid if it has \"access=no/private\", or it leads to a motorway service area, or if it is a \"service=parking_aisle\"."
+                    },
+                    "280": {
+                        "title": "Boundary issue",
+                        "description": "There is an unspecified issue with this boundary."
+                    },
+                    "281": {
+                        "title": "Boundary missing name",
+                        "description": "{var1} has no name."
+                    },
+                    "282": {
+                        "title": "Boundary missing admin level",
+                        "description": "The boundary of {var1} has no valid numeric admin_level. Please do not mix admin levels (e.g. \"6;7\"). Always tag the lowest admin_level of all boundaries."
+                    },
+                    "283": {
+                        "title": "Boundary not a closed loop",
+                        "description": "The boundary of {var1} is not a closed loop."
+                    },
+                    "284": {
+                        "title": "Boundary is split",
+                        "description": "The boundary of {var1} splits here."
+                    },
+                    "285": {
+                        "title": "Boundary admin_level too high",
+                        "description": "{var1} has \"admin_level={var2}\" but belongs to a relation with lower \"admin_level\" (e.g. higher priority); it should have the lowest \"admin_level\" of all relations."
+                    },
+                    "290": {
+                        "title": "Restriction issue",
+                        "description": "There is an unspecified issue with this restriction."
+                    },
+                    "291": {
+                        "title": "Restriction missing type",
+                        "description": "{var1} has an unrecognized restriction type."
+                    },
+                    "292": {
+                        "title": "Restriction missing \"from\" way",
+                        "description": "{var1} has {var2} \"from\" members, but it should have 1."
+                    },
+                    "293": {
+                        "title": "Restriction missing \"to\" way",
+                        "description": "{var1} has {var2} \"to\" members, but it should have 1."
+                    },
+                    "294": {
+                        "title": "Restriction \"from\" or \"to\" is not a way",
+                        "description": "{var1} has \"from\" or \"to\" members which should be ways. {var2}."
+                    },
+                    "295": {
+                        "title": "Restriction \"via\" is not an endpoint",
+                        "description": "{var1} has a \"via\" (node {var2}) which is not the first or the last member of \"{var3}\" (way {var4})."
+                    },
+                    "296": {
+                        "title": "Unusual restriction angle",
+                        "description": "{var1} has a restriction type \"{var2}\" but the angle is {var3} degrees. Maybe the restriction type is not appropriate?"
+                    },
+                    "297": {
+                        "title": "Wrong direction of \"to\" way",
+                        "description": "{var1} does not match the direction of \"to\" way {var2}."
+                    },
+                    "298": {
+                        "title": "Redundant restriction - oneway",
+                        "description": "{var1} may be redundant. Entry already prohibited by \"oneway\" tag on {var2}."
+                    },
+                    "300": {
+                        "title": "Missing maxspeed",
+                        "description": "{var1} is missing a \"maxspeed\" tag and is tagged as motorway, trunk, primary, or secondary."
+                    },
+                    "310": {
+                        "title": "Roundabout issue",
+                        "description": "There is an unspecified issue with this roundabout."
+                    },
+                    "311": {
+                        "title": "Roundabout not closed loop",
+                        "description": "{var1} is part of a roundabout but is not closed-loop. (Split carriageways approaching a roundabout should not be tagged as roundabout)."
+                    },
+                    "312": {
+                        "title": "Roundabout wrong direction",
+                        "description": "If {var1} is in a country with {var2} traffic then its orientation goes the wrong way around."
+                    },
+                    "313": {
+                        "title": "Roundabout weakly connected",
+                        "description": "{var1} has only {var2} other road(s) connected. Roundabouts typically have 3 or more."
+                    },
+                    "320": {
+                        "title": "Improper link connection",
+                        "description": "{var1} is tagged as \"{var2}\" but doesn't have a connection to any other \"{var3}\" or \"{var4}\"."
+                    },
+                    "350": {
+                        "title": "Improper bridge tag",
+                        "description": "{var1} doesn't have a tag in common with its surrounding ways that shows the purpose of this bridge. There should be one of these tags: {var2}."
+                    },
+                    "360": {
+                        "title": "Missing local name tag",
+                        "description": "It would be nice if {var1} had a local name tag \"name:XX={var2}\" where XX shows the language of its common name \"{var2}\"."
+                    },
+                    "370": {
+                        "title": "Doubled places",
+                        "description": "{var1} has tags in common with the surrounding way {var2} {var3} and seems to be redundant.",
+                        "including_the_name": "(including the name {name})"
+                    },
+                    "380": {
+                        "title": "Non-physical use of sport tag",
+                        "description": "{var1} is tagged \"{var2}\" but has no physical tag (e.g. \"leisure\", \"building\", \"amenity\", or \"highway\")."
+                    },
+                    "390": {
+                        "title": "Missing tracktype",
+                        "description": "{var1} doesn't have a \"tracktype\" tag."
+                    },
+                    "400": {
+                        "title": "Geometry issue",
+                        "description": "There is an unspecified issue with the geometry here."
+                    },
+                    "401": {
+                        "title": "Missing turn restriction",
+                        "description": "Ways {var1} and {var2} join in a very sharp angle here and there is no oneway tag or turn restriction that prevents turning."
+                    },
+                    "402": {
+                        "title": "Impossible angle",
+                        "description": "{var1} bends in a very sharp angle here."
+                    },
+                    "410": {
+                        "title": "Website issue",
+                        "description": "There is an unspecified issue with a contact website or URL."
+                    },
+                    "411": {
+                        "description": "{var1} may have an outdated URL: {var2} returned HTTP status code {var3}."
+                    },
+                    "412": {
+                        "description": "{var1} may have an outdated URL: {var2} contained suspicious text \"{var3}\"."
+                    },
+                    "413": {
+                        "description": "{var1} may have an outdated URL: {var2} did not contain keywords \"{var3}\"."
+                    }
+                }
+            }
         },
         "streetside": {
             "tooltip": "Streetside photos from Microsoft",
             "title": "Photo Overlay (Bing Streetside)",
-            "report": "Report a privacy concern with this image"
+            "report": "Report a privacy concern with this image",
+            "view_on_bing": "View on Bing Maps",
+            "hires": "High resolution"
         },
         "mapillary_images": {
             "tooltip": "Street-level photos from Mapillary",
         "openstreetcam": {
             "view_on_openstreetcam": "View this image on OpenStreetCam"
         },
+        "note": {
+            "note": "Note",
+            "title": "Edit note",
+            "anonymous": "anonymous",
+            "closed": "(Closed)",
+            "commentTitle": "Comments",
+            "status": {
+                "opened": "opened {when}",
+                "reopened": "reopened {when}",
+                "commented": "commented {when}",
+                "closed": "closed {when}"
+            },
+            "newComment": "New Comment",
+            "inputPlaceholder": "Enter a comment to share with other users.",
+            "close": "Close Note",
+            "open": "Reopen Note",
+            "comment": "Comment",
+            "close_comment": "Close and Comment",
+            "open_comment": "Reopen and Comment",
+            "report": "Report",
+            "new": "New Note",
+            "newDescription": "Describe the issue.",
+            "save": "Save Note",
+            "login": "You must log in to change or comment on this note.",
+            "upload_explanation": "Your comments will be publicly visible to all OpenStreetMap users.",
+            "upload_explanation_with_user": "Your comments as {user} will be publicly visible to all OpenStreetMap users."
+        },
         "help": {
             "title": "Help",
             "key": "H",
                 "navigation_zoom": "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons along the side of the map. You can also use the `+`, `-` keys on your keyboard.",
                 "features_h": "Map Features",
                 "features": "We use the word *features* to describe things that appear on the map, such as roads, buildings, or points of interest. Anything in the real world can be mapped as a feature on OpenStreetMap. Map features are represented on the map using *points*, *lines*, or *areas*.",
-                "nodes_ways": "In OpenStreetmap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
+                "nodes_ways": "In OpenStreetMap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
             },
             "editing": {
                 "title": "Editing & Saving",
                 "boundary": "A *boundary* relation is a group of one or more line features that together form an administrative boundary.",
                 "boundary_add": "To add a feature to a boundary relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
             },
+            "notes": {
+                "title": "Notes",
+                "intro": "*Notes* are used to alert other users that a feature requires fixing or attention. Notes mark a specific location on the map. To view existing notes or add new ones, click the {data} **Map data** panel to enable the OpenStreetMap notes layer.",
+                "add_note_h": "Adding Notes",
+                "add_note": "To add a new note, click the {note} **Note** button on the toolbar above the map, or press the shortcut key `4`. This will change the mouse cursor to a cross symbol. To place the new note on the map, position the mouse cursor where the note should go, then {leftclick} left-click or press `Space`.",
+                "move_note": "Only new notes can be moved. To move a note, place the mouse cursor over the new note, then press and hold the {leftclick} left mouse button while dragging the note to its new location.",
+                "update_note_h": "Closing, Reopening, and Commenting",
+                "update_note": "An existing note can be updated by closing it, reopening it, or adding a comment to it. Closing a note indicates that the problem has been resolved. Reopening a note indicates that the original issue is not resolved.",
+                "save_note_h": "Saving Notes",
+                "save_note": "You must save any note edits individually by clicking the buttons below the note comments. Note edits are **not** included in changesets that you upload to OpenStreetMap."
+            },
             "imagery": {
                 "title": "Background Imagery",
                 "intro": "The background imagery that appears beneath the map data is an important resource for mapping. This imagery can be aerial photos collected from satellites, airplanes, and drones, or it can be scanned historical maps or other freely available source data.",
                 "sources": "By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is chosen as the background image. Depending on where you are editing, other imagery sources will be available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference.",
                 "offsets_h": "Adjusting Imagery Offset",
                 "offset": "Imagery is sometimes offset slightly from accurate map data. If you see a lot of roads or buildings shifted from the background imagery, it may be the imagery that's incorrect, so don't move them all to match the background. Instead, you can adjust the background so that it matches the existing data by expanding the \"Adjust Imagery Offset\" section at the bottom of the Background Settings pane.",
-                "offset_change": "Click on the small triangles to adjust the imagery offset in small steps, or hold the left mouse button and drag within the gray square to slide the imagery into alignment."
+                "offset_change": "Click on the small triangles to adjust the imagery offset in small steps, or hold the {leftclick} left mouse button and drag within the gray square to slide the imagery into alignment."
             },
             "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).",
+                "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 [Bing Streetside](https://www.microsoft.com/en-us/maps/streetside), [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.",
                 "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."
             },
+            "qa": {
+                "title": "Quality Assurance",
+                "intro": "*Quality Assurance* (Q/A) tools can find improper tags, disconnected roads, and other issues with OpenStreetMap, which mappers can then fix. To view existing Q/A issues, click the {data} **Map data** panel to enable a specific Q/A layer.",
+                "tools_h": "Tools",
+                "tools": "The following tools are currently supported: [KeepRight](https://www.keepright.at/). Expect iD to support [Osmose](https://osmose.openstreetmap.fr/), [ImproveOSM](https://improveosm.org/en/), and more Q/A tools in the future.",
+                "issues_h": "Handling Issues",
+                "issues": "Handling Q/A issues is similar to handling notes. Click on a marker to view the issue details in the sidebar. Each tool has its own capabilities, but generally you can comment and/or close an issue."
+            },
             "field": {
                 "restrictions": {
                     "title": "Turn Restrictions Help",
                     "background_switch": "Switch back to last background",
                     "map_data": "Show map data options",
                     "fullscreen": "Enter full screen mode",
+                    "sidebar": "Toggle sidebar",
                     "wireframe": "Toggle wireframe mode",
                     "minimap": "Toggle minimap"
                 },
                 },
                 "with_selected": {
                     "title": "With feature selected",
-                    "edit_menu": "Toggle edit menu"
+                    "edit_menu": "Toggle edit menu",
+                    "zoom_to": "Zoom to selected feature"
                 },
                 "vertex_selected": {
                     "title": "With node selected",
                     "add_point": "'Add point' mode",
                     "add_line": "'Add line' mode",
                     "add_area": "'Add area' mode",
-                    "place_point": "Place a point",
+                    "add_note": "'Add note' mode",
+                    "place_point": "Place a point or note",
                     "disable_snap": "Hold to disable point snapping",
                     "stop_line": "Finish drawing a line or area"
                 },
                     "continue_line": "Continue a line at the selected node",
                     "merge": "Combine (merge) selected features",
                     "disconnect": "Disconnect features at the selected node",
+                    "detach_node": "Detach selected node from parent lines/areas",
                     "split": "Split a line into two at the selected node",
                     "reverse": "Reverse a line",
                     "move": "Move selected features",
             "coordinate": "{coordinate}{direction}",
             "coordinate_pair": "{latitude}, {longitude}"
         },
+        "wikidata": {
+            "identifier": "Identifier",
+            "label": "Label",
+            "description": "Description"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
                 "category-route": {
                     "name": "Route Features"
                 },
+                "category-utility": {
+                    "name": "Utility Features"
+                },
                 "category-water-area": {
                     "name": "Water Features"
                 },
                     "options": {
                         "yes": {
                             "title": "Allowed",
-                            "description": "Access permitted by law; a right of way"
+                            "description": "Access allowed by law; a right of way"
                         },
                         "no": {
                             "title": "Prohibited",
-                            "description": "Access not permitted to the general public"
+                            "description": "Access not allowed to the general public"
                         },
                         "permissive": {
                             "title": "Permissive",
-                            "description": "Access permitted until such time as the owner revokes the permission"
+                            "description": "Access allowed until such time as the owner revokes the permission"
                         },
                         "private": {
                             "title": "Private",
-                            "description": "Access permitted only with permission of the owner on an individual basis"
+                            "description": "Access allowed only with permission of the owner on an individual basis"
                         },
                         "designated": {
                             "title": "Designated",
-                            "description": "Access permitted according to signs or specific local laws"
+                            "description": "Access allowed according to signs or specific local laws"
                         },
                         "destination": {
                             "title": "Destination",
-                            "description": "Access permitted only to reach a destination"
+                            "description": "Access allowed only to reach a destination"
                         },
                         "dismount": {
                             "title": "Dismount",
-                            "description": "Access permitted but rider must dismount"
+                            "description": "Access allowed but rider must dismount"
+                        },
+                        "permit": {
+                            "title": "Permit",
+                            "description": "Access allowed only with a valid permit or license"
                         }
                     }
                 },
                 "animal_shelter": {
                     "label": "For Animals"
                 },
+                "architect": {
+                    "label": "Architect"
+                },
                 "area/highway": {
                     "label": "Type"
                 },
                 "atm": {
                     "label": "ATM"
                 },
+                "attraction": {
+                    "label": "Type"
+                },
                 "backrest": {
                     "label": "Backrest"
                 },
                 "barrier": {
                     "label": "Type"
                 },
+                "basin": {
+                    "label": "Type"
+                },
                 "bath/open_air": {
                     "label": "Open Air"
                 },
                     }
                 },
                 "beauty": {
-                    "label": "Shop Type"
+                    "label": "Beauty Specialty"
                 },
                 "bench": {
                     "label": "Bench"
                 "board_type": {
                     "label": "Type"
                 },
+                "booth": {
+                    "label": "Booth"
+                },
                 "boules": {
                     "label": "Type"
                 },
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "bridge/support": {
+                    "label": "Type"
+                },
                 "building_area": {
                     "label": "Building"
                 },
                 "building": {
                     "label": "Building"
                 },
+                "building/material": {
+                    "label": "Material"
+                },
                 "bunker_type": {
                     "label": "Type"
                 },
                     "label": "Capacity",
                     "placeholder": "50, 100, 200..."
                 },
+                "cash_in": {
+                    "label": "Cash In"
+                },
                 "castle_type": {
                     "label": "Type"
                 },
+                "check_date": {
+                    "label": "Last Checked Date"
+                },
                 "clothes": {
                     "label": "Clothes"
                 },
                 "collection_times": {
                     "label": "Collection Times"
                 },
+                "colour": {
+                    "label": "Color"
+                },
                 "comment": {
                     "label": "Changeset Comment",
                     "placeholder": "Brief description of your contributions (required)"
                 "content": {
                     "label": "Content"
                 },
+                "conveying": {
+                    "label": "Movement Direction",
+                    "options": {
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "reversible": "Reversible"
+                    }
+                },
                 "country": {
                     "label": "Country"
                 },
+                "couplings": {
+                    "label": "Couplings",
+                    "placeholder": "1, 2, 3..."
+                },
                 "covered": {
                     "label": "Covered"
                 },
                 "description": {
                     "label": "Description"
                 },
+                "design": {
+                    "label": "Design"
+                },
+                "destination_oneway": {
+                    "label": "Destinations"
+                },
+                "destination/ref_oneway": {
+                    "label": "Destination Road Numbers"
+                },
+                "destination/symbol_oneway": {
+                    "label": "Destination Symbols"
+                },
                 "devices": {
                     "label": "Devices",
                     "placeholder": "1, 2, 3..."
                 "diaper": {
                     "label": "Diaper Changing Available"
                 },
+                "diet_multi": {
+                    "label": "Diet Types"
+                },
                 "direction_cardinal": {
                     "label": "Direction",
                     "options": {
                     "label": "Display"
                 },
                 "distance": {
-                    "label": "Total Distance"
+                    "label": "Distance"
                 },
                 "dock": {
                     "label": "Type"
                 },
+                "dog": {
+                    "label": "Dogs",
+                    "options": {
+                        "yes": "Allowed",
+                        "leashed": "Leashed Only",
+                        "no": "Not Allowed"
+                    }
+                },
                 "drive_through": {
                     "label": "Drive-Through"
                 },
                 "emergency": {
                     "label": "Emergency"
                 },
+                "enforcement": {
+                    "label": "Type"
+                },
                 "entrance": {
                     "label": "Type"
                 },
                 "fence_type": {
                     "label": "Type"
                 },
-                "fire_hydrant/position": {
-                    "label": "Position",
-                    "options": {
-                        "lane": "Lane",
-                        "parking_lot": "Parking Lot",
-                        "sidewalk": "Sidewalk",
-                        "green": "Green"
-                    }
+                "fire_hydrant/diameter": {
+                    "label": "Diameter (mm, in, or letters)"
+                },
+                "fire_hydrant/pressure": {
+                    "label": "Pressure (bar)"
                 },
                 "fire_hydrant/type": {
-                    "label": "Type",
+                    "label": "Shape",
                     "options": {
                         "pillar": "Pillar/Aboveground",
                         "underground": "Underground",
                         "wall": "Wall",
-                        "pond": "Pond"
+                        "pipe": "Capped Pipe"
                     }
                 },
+                "fireplace": {
+                    "label": "Fireplace"
+                },
                 "fitness_station": {
                     "label": "Equipment Type"
                 },
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "flag/type": {
+                    "label": "Flag Type"
+                },
                 "ford": {
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "frequency_electrified": {
+                    "label": "Operating Frequency"
+                },
                 "frequency": {
                     "label": "Operating Frequency"
                 },
+                "from": {
+                    "label": "From"
+                },
                 "fuel_multi": {
                     "label": "Fuel Types"
                 },
                 "historic/civilization": {
                     "label": "Historic Civilization"
                 },
+                "historic/wreck/date_sunk": {
+                    "label": "Date Sunk"
+                },
+                "historic/wreck/visible_at_high_tide": {
+                    "label": "Visible At High Tide"
+                },
+                "historic/wreck/visible_at_low_tide": {
+                    "label": "Visible At Low Tide"
+                },
                 "hoops": {
                     "label": "Hoops",
                     "placeholder": "1, 2, 4..."
                 "inscription": {
                     "label": "Inscription"
                 },
+                "intermittent_yes": {
+                    "label": "Intermittent"
+                },
                 "intermittent": {
                     "label": "Intermittent"
                 },
                 "internet_access/ssid": {
                     "label": "SSID (Network Name)"
                 },
+                "junction/ref_oneway": {
+                    "label": "Junction Number"
+                },
                 "kerb": {
                     "label": "Curb"
                 },
                     "label": "Lanes",
                     "placeholder": "1, 2, 3..."
                 },
+                "language_multi": {
+                    "label": "Languages"
+                },
                 "layer": {
                     "label": "Layer",
                     "placeholder": "0"
                 "lit": {
                     "label": "Lit"
                 },
+                "location_pool": {
+                    "label": "Location",
+                    "options": {
+                        "outdoor": "Outdoor",
+                        "indoor": "Indoor",
+                        "roof": "Rooftop"
+                    }
+                },
                 "location": {
                     "label": "Location"
                 },
                 "map_type": {
                     "label": "Type"
                 },
+                "material": {
+                    "label": "Material"
+                },
                 "maxheight": {
                     "label": "Max Height",
                     "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
                 "memorial": {
                     "label": "Type"
                 },
+                "minspeed": {
+                    "label": "Minimum Speed Limit",
+                    "placeholder": "20, 30, 40..."
+                },
                 "monitoring_multi": {
                     "label": "Monitoring"
                 },
                         "alternating": "Alternating"
                     }
                 },
+                "oneway/bicycle": {
+                    "label": "One Way (Bicycles)"
+                },
+                "opening_date": {
+                    "label": "Expected Opening Date"
+                },
                 "opening_hours": {
                     "label": "Hours"
                 },
                         "lane": "Roadside Lane"
                     }
                 },
+                "passenger_information_display": {
+                    "label": "Passenger information display"
+                },
                 "payment_multi": {
                     "label": "Payment Types"
                 },
                     "label": "Telephone",
                     "placeholder": "+31 42 123 4567"
                 },
-                "piste/difficulty": {
+                "piste/difficulty_downhill": {
                     "label": "Difficulty",
                     "placeholder": "Easy, Intermediate, Advanced...",
                     "options": {
                         "extreme": "Extreme (climbing equipment required)"
                     }
                 },
+                "piste/difficulty_nordic": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice - Flat, no effort needed",
+                        "easy": "Easy - Soft hills, short steep section",
+                        "intermediate": "Intermediate - Steep section",
+                        "advanced": "Advanced - Narrow, steep or icy section, sharp turn",
+                        "expert": "Expert - Dangerous terrain around"
+                    }
+                },
+                "piste/difficulty_skitour": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice - L: <30° incline",
+                        "easy": "Easy - WS: 30-35° incline",
+                        "intermediate": "Intermediate - ZS: 35-40° incline",
+                        "advanced": "Advanced - S: 40-45° incline",
+                        "expert": "Expert - SS: 45–50° incline",
+                        "freeride": "Freeride - AS: 50–55° incline",
+                        "extreme": "Extreme - EX: >55° incline"
+                    }
+                },
+                "piste/difficulty": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice",
+                        "easy": "Easy",
+                        "intermediate": "Intermediate",
+                        "advanced": "Advanced",
+                        "expert": "Expert",
+                        "freeride": "Freeride",
+                        "extreme": "Extreme"
+                    }
+                },
+                "piste/grooming_downhill": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "mogul": "Mogul",
+                        "backcountry": "Backcountry - no grooming"
+                    }
+                },
+                "piste/grooming_hike": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic - Winter Hiking",
+                        "backcountry": "Backcountry - Snowshoeing"
+                    }
+                },
+                "piste/grooming_nordic": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "backcountry": "Backcountry, no grooming",
+                        "classic+skating": "Classic and Skating",
+                        "scooter": "Scooter/Snowmobile",
+                        "skating": "Skating"
+                    }
+                },
                 "piste/grooming": {
                     "label": "Grooming",
                     "options": {
                         "sleigh": "Sleigh",
                         "ice_skate": "Ice Skate",
                         "snow_park": "Snow Park",
-                        "playground": "Playground"
+                        "playground": "Playground",
+                        "connection": "Connection"
                     }
                 },
                 "place": {
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
+                "recycling_type": {
+                    "label": "Type",
+                    "placeholder": "Container, Center",
+                    "options": {
+                        "container": "Container",
+                        "centre": "Center"
+                    }
+                },
                 "ref_aeroway_gate": {
                     "label": "Gate Number"
                 },
                 "restrictions": {
                     "label": "Turn Restrictions"
                 },
+                "roof/colour": {
+                    "label": "Roof Color"
+                },
                 "rooms": {
                     "label": "Rooms"
                 },
                 "sanitary_dump_station": {
                     "label": "Toilet Disposal"
                 },
+                "scuba_diving": {
+                    "label": "Services"
+                },
+                "seamark/beacon_isolated_danger/shape": {
+                    "label": "Shape"
+                },
+                "seamark/beacon_lateral/category": {
+                    "label": "Category",
+                    "options": {
+                        "port": "Port",
+                        "starboard": "Starboard",
+                        "waterway_left": "Waterway Left",
+                        "waterway_right": "Waterway Right",
+                        "danger_left": "Danger Left",
+                        "danger_right": "Danger Right"
+                    }
+                },
+                "seamark/beacon_lateral/colour": {
+                    "label": "Color",
+                    "options": {
+                        "red": "Red",
+                        "green": "Green",
+                        "grey": "Grey"
+                    }
+                },
+                "seamark/beacon_lateral/shape": {
+                    "label": "Shape"
+                },
+                "seamark/beacon_lateral/system": {
+                    "label": "System",
+                    "options": {
+                        "iala-a": "IALA A",
+                        "iala-b": "IALA B",
+                        "cevni": "CEVNI",
+                        "other": "Other"
+                    }
+                },
+                "seamark/buoy_lateral/category": {
+                    "label": "Category",
+                    "options": {
+                        "port": "Port",
+                        "starboard": "Starboard",
+                        "channel_left": "Channel Left",
+                        "channel_right": "Channel Right",
+                        "waterway_left": "Waterway Left",
+                        "waterway_right": "Waterway Right",
+                        "danger_left": "Danger Left",
+                        "danger_right": "Danger Right",
+                        "preferred_channel_port": "Preferred Channel Port",
+                        "preferred_channel_starboard": "Preferred Channel Starboard"
+                    }
+                },
+                "seamark/buoy_lateral/colour": {
+                    "label": "Color",
+                    "options": {
+                        "red": "Red",
+                        "green": "Green",
+                        "red;white;red;white": "Red-White-Red-White",
+                        "green;white;green;white": "Green-White-Green-White",
+                        "red;green;red": "Red-Green-Red",
+                        "green;red;green": "Green-Red-Green",
+                        "white": "White",
+                        "yellow": "Yellow"
+                    }
+                },
+                "seamark/buoy_lateral/shape": {
+                    "label": "Shape"
+                },
+                "seamark/buoy_lateral/system": {
+                    "label": "System",
+                    "options": {
+                        "iala-a": "IALA A",
+                        "iala-b": "IALA B",
+                        "cevni": "CEVNI",
+                        "other": "Other"
+                    }
+                },
+                "seamark/mooring/category": {
+                    "label": "Category"
+                },
+                "seamark/type": {
+                    "label": "Seamark"
+                },
+                "seamark/wreck/category": {
+                    "label": "Category"
+                },
                 "seasonal": {
                     "label": "Seasonal"
                 },
+                "seats": {
+                    "label": "Seats",
+                    "placeholder": "2, 4, 6..."
+                },
                 "second_hand": {
                     "label": "Sells Used",
                     "placeholder": "Yes, No, Only",
                 "shop": {
                     "label": "Type"
                 },
+                "siren/purpose": {
+                    "label": "Purpose"
+                },
+                "siren/type": {
+                    "label": "Type",
+                    "options": {
+                        "pneumatic": "Pneumatic",
+                        "electronic": "Electronic",
+                        "other": "Other"
+                    }
+                },
+                "site_type": {
+                    "label": "Site Type"
+                },
                 "site": {
                     "label": "Type"
                 },
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "survey/date": {
+                    "label": "Last Survey Date"
+                },
+                "swimming_pool": {
+                    "label": "Type"
+                },
                 "switch": {
                     "label": "Type",
                     "options": {
                         "only": "Takeaway Only"
                     }
                 },
+                "to": {
+                    "label": "To"
+                },
                 "toilets/disposal": {
                     "label": "Disposal",
                     "options": {
                 "tomb": {
                     "label": "Type"
                 },
-                "tourism_attraction": {
-                    "label": "Tourism"
-                },
                 "tourism": {
                     "label": "Type"
                 },
                 "traffic_calming": {
                     "label": "Type"
                 },
+                "traffic_sign": {
+                    "label": "Traffic Sign"
+                },
+                "traffic_sign/direction": {
+                    "label": "Direction",
+                    "options": {
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "both": "Both / All"
+                    }
+                },
                 "traffic_signals": {
                     "label": "Type"
                 },
                         "scoria": "Scoria"
                     }
                 },
+                "voltage_electrified": {
+                    "label": "Voltage"
+                },
                 "voltage": {
                     "label": "Voltage"
                 },
                 "water_point": {
                     "label": "Water Point"
                 },
+                "water_source": {
+                    "label": "Water Source"
+                },
+                "water_volume": {
+                    "label": "Water Reserve Volume (m³)"
+                },
                 "water": {
                     "label": "Type"
                 },
                 "width": {
                     "label": "Width (Meters)"
                 },
+                "wikidata": {
+                    "label": "Wikidata"
+                },
                 "wikipedia": {
                     "label": "Wikipedia"
                 },
                     "name": "Amenity",
                     "terms": ""
                 },
+                "attraction": {
+                    "name": "Attraction",
+                    "terms": ""
+                },
                 "circular": {
                     "name": "Traffic Circle",
                     "terms": ""
                 },
+                "embankment": {
+                    "name": "Embankment",
+                    "terms": ""
+                },
                 "highway": {
                     "name": "Highway",
                     "terms": ""
                     "name": "Roundabout",
                     "terms": ""
                 },
+                "seamark": {
+                    "name": "Seamark",
+                    "terms": ""
+                },
                 "waterway": {
                     "name": "Waterway",
                     "terms": ""
                 },
                 "aeroway/aerodrome": {
                     "name": "Airport",
-                    "terms": "airplane,airport,aerodrome"
+                    "terms": "aerodrome,aeroway,airplane,airport,jet,plane"
                 },
                 "aeroway/apron": {
                     "name": "Apron",
                     "name": "Nursing Home",
                     "terms": ""
                 },
+                "amenity/recycling": {
+                    "name": "Recycling",
+                    "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
+                },
                 "amenity/register_office": {
                     "name": "Register Office",
                     "terms": ""
                     "terms": "bike,repair,chain,pump"
                 },
                 "amenity/biergarten": {
-                    "name": "Beer Garden",
+                    "name": "Biergarten",
                     "terms": "beer,bier,booze"
                 },
                 "amenity/boat_rental": {
                 },
                 "amenity/college": {
                     "name": "College Grounds",
-                    "terms": "university"
+                    "terms": "university,undergraduate school"
                 },
                 "amenity/community_centre": {
                     "name": "Community Center",
                     "name": "Dentist",
                     "terms": "tooth,teeth"
                 },
+                "amenity/dive_centre": {
+                    "name": "Dive Center",
+                    "terms": "diving,scuba"
+                },
                 "amenity/doctors": {
                     "name": "Doctor",
                     "terms": "medic*,physician"
                 },
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
-                    "terms": "fountain,potable"
+                    "terms": "potable water source,water fountain,drinking fountain,bubbler,water tap"
                 },
                 "amenity/driving_school": {
                     "name": "Driving School",
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
                 },
+                "amenity/fast_food/burger": {
+                    "name": "Burger Fast Food",
+                    "terms": "breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/chicken": {
+                    "name": "Chicken Fast Food",
+                    "terms": "breakfast,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/fish_and_chips": {
+                    "name": "Fish & Chips Fast Food",
+                    "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries"
+                },
+                "amenity/fast_food/kebab": {
+                    "name": "Kebab Fast Food",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/pizza": {
+                    "name": "Pizza Fast Food",
+                    "terms": "dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice"
+                },
+                "amenity/fast_food/sandwich": {
+                    "name": "Sandwich Fast Food",
+                    "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
                 "amenity/fire_station": {
                     "name": "Fire Station",
                     "terms": ""
                     "name": "Preschool/Kindergarten Grounds",
                     "terms": "kindergarden,pre-school"
                 },
+                "amenity/language_school": {
+                    "name": "Language School",
+                    "terms": "esl"
+                },
                 "amenity/library": {
                     "name": "Library",
                     "terms": "book"
                     "name": "Monastery Grounds",
                     "terms": "abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house of God,house of prayer,house of worship,minster,mission,monastery,mosque,oratory,parish,sacellum,sanctuary,shrine,synagogue,tabernacle,temple"
                 },
+                "amenity/money_transfer": {
+                    "name": "Money Transfer Station",
+                    "terms": "money order,check,bill,currency,finance,wire transfer,cable,person to person,cash to cash,exchange"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Motorcycle Parking",
                     "terms": ""
                     "terms": ""
                 },
                 "amenity/parking": {
-                    "name": "Car Parking",
-                    "terms": ""
+                    "name": "Parking Lot",
+                    "terms": "automobile parking,car lot,car parking,rv parking,truck parking,vehicle parking"
                 },
-                "amenity/pavilion": {
-                    "name": "Pavilion",
-                    "terms": ""
+                "amenity/parking/multi-storey": {
+                    "name": "Multilevel Parking Garage",
+                    "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
+                },
+                "amenity/payment_centre": {
+                    "name": "Payment Center",
+                    "terms": "check,tax pay,bill pay,currency,finance,cash,money"
+                },
+                "amenity/payment_terminal": {
+                    "name": "Payment Terminal",
+                    "terms": "interactive kiosk,ekiosk,atm,bill pay,tax pay,phone pay,finance,cash,money transfer,card"
                 },
                 "amenity/pharmacy": {
-                    "name": "Pharmacy",
-                    "terms": "drug*,med*,prescription"
+                    "name": "Pharmacy Counter",
+                    "terms": "apothecary,drug store,drugstore,med*,prescription"
                 },
                 "amenity/place_of_worship": {
                     "name": "Place of Worship",
                     "terms": "stupa,vihara,monastery,temple,pagoda,zendo,dojo"
                 },
                 "amenity/place_of_worship/christian": {
-                    "name": "Church",
+                    "name": "Christian Church",
                     "terms": "christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple"
                 },
                 "amenity/place_of_worship/hindu": {
                     "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple"
                 },
                 "amenity/place_of_worship/jewish": {
-                    "name": "Synagogue",
+                    "name": "Jewish Synagogue",
                     "terms": "jewish"
                 },
                 "amenity/place_of_worship/muslim": {
-                    "name": "Mosque",
+                    "name": "Muslim Mosque",
                     "terms": "muslim"
                 },
                 "amenity/place_of_worship/shinto": {
                     "name": "Recycling Center",
                     "terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
                 },
-                "amenity/recycling": {
+                "amenity/recycling_container": {
                     "name": "Recycling Container",
                     "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                 },
                     "name": "Restaurant",
                     "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                 },
+                "amenity/restaurant/american": {
+                    "name": "American Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/asian": {
+                    "name": "Asian Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/chinese": {
+                    "name": "Chinese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/french": {
+                    "name": "French Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/german": {
+                    "name": "German Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/greek": {
+                    "name": "Greek Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,gyros,pitas,olives"
+                },
+                "amenity/restaurant/indian": {
+                    "name": "Indian Restaurant",
+                    "terms": "bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,curry"
+                },
+                "amenity/restaurant/italian": {
+                    "name": "Italian Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,pasta,pizza"
+                },
+                "amenity/restaurant/japanese": {
+                    "name": "Japanese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/mexican": {
+                    "name": "Mexican Restaurant",
+                    "terms": "bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas"
+                },
+                "amenity/restaurant/noodle": {
+                    "name": "Noodle Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,ramen noodles,soup,soba noodles,cellophane noodles,rice noodles"
+                },
+                "amenity/restaurant/pizza": {
+                    "name": "Pizza Restaurant",
+                    "terms": "bar,dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice"
+                },
+                "amenity/restaurant/seafood": {
+                    "name": "Seafood Restaurant",
+                    "terms": "bar,breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,fish,shellfish,molluscs,crustaceans,clams,oysters,lobsters,crab,shrimp,squid,octopus"
+                },
+                "amenity/restaurant/steakhouse": {
+                    "name": "Steakhouse",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,steak house,chop house,beef"
+                },
+                "amenity/restaurant/sushi": {
+                    "name": "Sushi Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/thai": {
+                    "name": "Thai Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/turkish": {
+                    "name": "Turkish Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/vietnamese": {
+                    "name": "Vietnamese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
                 "amenity/sanitary_dump_station": {
                     "name": "RV Toilet Disposal",
                     "terms": "Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet"
                     "name": "Shelter",
                     "terms": "lean-to,gazebo,picnic"
                 },
+                "amenity/shelter/gazebo": {
+                    "name": "Gazebo",
+                    "terms": ""
+                },
+                "amenity/shelter/lean_to": {
+                    "name": "Lean-To",
+                    "terms": ""
+                },
+                "amenity/shelter/picnic_shelter": {
+                    "name": "Picnic Shelter",
+                    "terms": "pavilion"
+                },
+                "amenity/shelter/public_transport": {
+                    "name": "Transit Shelter",
+                    "terms": "bus stop,metro stop,waiting"
+                },
                 "amenity/shower": {
                     "name": "Shower",
                     "terms": "rain closet"
                     "name": "Theater",
                     "terms": "theatre,performance,play,musical"
                 },
+                "amenity/theatre/type/amphi": {
+                    "name": "Amphitheatre",
+                    "terms": "open air,outdoor,greek,ampi"
+                },
                 "amenity/toilets": {
                     "name": "Toilets",
                     "terms": "bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C."
                 },
                 "amenity/university": {
                     "name": "University Grounds",
-                    "terms": "college"
+                    "terms": "college,graduate school,PhD program,master's degree program"
+                },
+                "amenity/vehicle_inspection": {
+                    "name": "Vehicle Inspection",
+                    "terms": "car inspection"
                 },
                 "amenity/vending_machine": {
                     "name": "Vending Machine",
                     "terms": "newspaper"
                 },
                 "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "Parcel Pickup/Dropoff Vending Machine",
-                    "terms": "parcel,mail,pickup"
+                    "name": "Parcel Pickup/Dropoff Locker",
+                    "terms": "mail,parcel,pickup"
+                },
+                "amenity/vending_machine/parcel_pickup": {
+                    "name": "Parcel Pickup Locker",
+                    "terms": "amazon,locker,mail,parcel,pickup"
                 },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "Parking Ticket Vending Machine",
                     "name": "Roller Coaster",
                     "terms": "theme park,amusement ride"
                 },
+                "attraction/summer_toboggan": {
+                    "name": "Summer Toboggan",
+                    "terms": "alpine slide,mountain coaster"
+                },
                 "attraction/train": {
                     "name": "Tourist Train",
                     "terms": "theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train"
                     "name": "Fence",
                     "terms": ""
                 },
+                "barrier/fence/railing": {
+                    "name": "Railing",
+                    "terms": "railing,handrail,guard rail"
+                },
                 "barrier/gate": {
                     "name": "Gate",
                     "terms": ""
                 },
+                "barrier/guard_rail": {
+                    "name": "Guard Rail",
+                    "terms": "guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier"
+                },
                 "barrier/hedge": {
                     "name": "Hedge",
                     "terms": ""
                 },
                 "barrier/kerb": {
-                    "name": "Kerb",
+                    "name": "Curb",
                     "terms": ""
                 },
+                "barrier/kerb/flush": {
+                    "name": "Flush Curb",
+                    "terms": "even curb,level curb,tactile curb"
+                },
+                "barrier/kerb/lowered": {
+                    "name": "Lowered Curb",
+                    "terms": "curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp"
+                },
                 "barrier/kissing_gate": {
                     "name": "Kissing Gate",
                     "terms": ""
                     "name": "Administrative Boundary",
                     "terms": ""
                 },
+                "bridge/support": {
+                    "name": "Bridge Support",
+                    "terms": ""
+                },
+                "bridge/support/pier": {
+                    "name": "Bridge Pier",
+                    "terms": ""
+                },
                 "building": {
                     "name": "Building",
                     "terms": ""
                     "terms": ""
                 },
                 "building/apartments": {
-                    "name": "Apartments",
+                    "name": "Apartment Building",
                     "terms": ""
                 },
                 "building/barn": {
                     "name": "Cabin",
                     "terms": ""
                 },
+                "building/carport": {
+                    "name": "Carport",
+                    "terms": "covered parking space,garage,car,porch"
+                },
                 "building/cathedral": {
                     "name": "Cathedral Building",
                     "terms": ""
                     "name": "Mosque Building",
                     "terms": ""
                 },
+                "building/pavilion": {
+                    "name": "Pavilion Building",
+                    "terms": "sports"
+                },
                 "building/public": {
                     "name": "Public Building",
                     "terms": ""
                     "name": "Club",
                     "terms": "social"
                 },
+                "club/sport": {
+                    "name": "Sports Club",
+                    "terms": "athletics club,sporting club,sports association,sports society"
+                },
                 "craft": {
                     "name": "Craft",
                     "terms": ""
                     "name": "Winery",
                     "terms": ""
                 },
-                "embankment": {
-                    "name": "Embankment",
-                    "terms": ""
-                },
                 "emergency/designated": {
                     "name": "Emergency Access Designated",
                     "terms": ""
                     "name": "Defibrillator",
                     "terms": "AED"
                 },
+                "emergency/fire_alarm": {
+                    "name": "Fire Alarm Call Box",
+                    "terms": ""
+                },
                 "emergency/fire_extinguisher": {
                     "name": "Fire Extinguisher",
                     "terms": ""
                 },
                 "emergency/fire_hydrant": {
                     "name": "Fire Hydrant",
-                    "terms": "fire plug"
+                    "terms": "fire plug,fire water well,hydrant"
+                },
+                "emergency/first_aid_kit": {
+                    "name": "First Aid Kit",
+                    "terms": "bandage,first aid,med,med kit,medic*,medkit"
                 },
                 "emergency/life_ring": {
                     "name": "Life Ring",
                     "terms": "life buoy,kisby ring,kisbie ring,perry buoy"
                 },
+                "emergency/lifeguard": {
+                    "name": "Lifeguard",
+                    "terms": "CPR,rescue"
+                },
                 "emergency/phone": {
                     "name": "Emergency Phone",
                     "terms": ""
                 },
+                "emergency/siren": {
+                    "name": "Siren",
+                    "terms": "air raid,loud,noise,storm,tornado,warning"
+                },
                 "emergency/water_tank": {
                     "name": "Emergency Water Tank",
                     "terms": "water tank,cistern,reservoir"
                 },
                 "entrance": {
                     "name": "Entrance/Exit",
-                    "terms": ""
-                },
-                "footway/crossing-raised": {
-                    "name": "Raised Street Crossing",
-                    "terms": "flat top,hump,speed,slow"
-                },
-                "footway/crossing": {
-                    "name": "Street Crossing",
-                    "terms": ""
-                },
-                "footway/crosswalk-raised": {
-                    "name": "Raised Pedestrian Crosswalk",
-                    "terms": "zebra crossing,flat top,hump,speed,slow"
-                },
-                "footway/crosswalk": {
-                    "name": "Pedestrian Crosswalk",
-                    "terms": "zebra crossing"
-                },
-                "footway/sidewalk": {
-                    "name": "Sidewalk",
-                    "terms": ""
+                    "terms": "entrance,exit,door"
                 },
                 "ford": {
                     "name": "Ford",
                 },
                 "highway/bridleway": {
                     "name": "Bridle Path",
-                    "terms": "bridleway,equestrian,horse"
+                    "terms": "bridleway,equestrian,horse,trail"
                 },
                 "highway/bus_guideway": {
                     "name": "Bus Guideway",
                     "terms": ""
                 },
+                "highway/construction": {
+                    "name": "Road Closed",
+                    "terms": "closed,closure,construction"
+                },
                 "highway/corridor": {
                     "name": "Indoor Corridor",
                     "terms": "gallery,hall,hallway,indoor,passage,passageway"
                 },
-                "highway/crossing-raised": {
-                    "name": "Raised Street Crossing",
-                    "terms": "flat top,hump,speed,slow"
+                "highway/crossing/zebra-raised": {
+                    "name": "Marked Crosswalk (Raised)",
+                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
                 },
-                "highway/crossing": {
-                    "name": "Street Crossing",
-                    "terms": ""
+                "highway/crossing/zebra": {
+                    "name": "Marked Crosswalk",
+                    "terms": "zebra crossing,marked crossing,crosswalk"
+                },
+                "highway/crossing/marked-raised": {
+                    "name": "Marked Crosswalk (Raised)",
+                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
                 },
-                "highway/crosswalk-raised": {
-                    "name": "Raised Pedestrian Crosswalk",
-                    "terms": "zebra crossing,flat top,hump,speed,slow"
+                "highway/crossing/marked": {
+                    "name": "Marked Crosswalk",
+                    "terms": "zebra crossing,marked crossing,crosswalk"
                 },
-                "highway/crosswalk": {
-                    "name": "Pedestrian Crosswalk",
-                    "terms": "zebra crossing"
+                "highway/crossing/unmarked-raised": {
+                    "name": "Unmarked Crossing (Raised)",
+                    "terms": "flat top,hump,speed,slow"
+                },
+                "highway/crossing/unmarked": {
+                    "name": "Unmarked Crossing",
+                    "terms": ""
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path",
                     "name": "Foot Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
+                "highway/footway/zebra-raised": {
+                    "name": "Marked Crosswalk (Raised)",
+                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
+                },
+                "highway/footway/zebra": {
+                    "name": "Marked Crosswalk",
+                    "terms": "zebra crossing,marked crossing,crosswalk"
+                },
+                "highway/footway/conveying": {
+                    "name": "Moving Walkway",
+                    "terms": "moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor"
+                },
+                "highway/footway/marked-raised": {
+                    "name": "Marked Crosswalk (Raised)",
+                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
+                },
+                "highway/footway/marked": {
+                    "name": "Marked Crosswalk",
+                    "terms": "zebra crossing,marked crossing,crosswalk"
+                },
+                "highway/footway/sidewalk": {
+                    "name": "Sidewalk",
+                    "terms": "pavement,sidepath"
+                },
+                "highway/footway/unmarked-raised": {
+                    "name": "Unmarked Crossing (Raised)",
+                    "terms": "flat top,hump,speed,slow"
+                },
+                "highway/footway/unmarked": {
+                    "name": "Unmarked Crossing",
+                    "terms": ""
+                },
                 "highway/give_way": {
                     "name": "Yield Sign",
                     "terms": "give way,yield,sign"
                     "name": "Living Street",
                     "terms": ""
                 },
+                "highway/milestone": {
+                    "name": "Highway Milestone",
+                    "terms": "milestone,marker"
+                },
                 "highway/mini_roundabout": {
                     "name": "Mini-Roundabout",
                     "terms": ""
                 },
                 "highway/motorway_junction": {
                     "name": "Motorway Junction / Exit",
-                    "terms": ""
+                    "terms": "exit"
                 },
                 "highway/motorway_link": {
                     "name": "Motorway Link",
-                    "terms": "ramp,on ramp,off ramp"
+                    "terms": "exit,ramp,road,street,on ramp,off ramp"
                 },
                 "highway/motorway": {
                     "name": "Motorway",
-                    "terms": "autobahn,expressway,freeway,highway,interstate,parkway,thruway,turnpike"
+                    "terms": "autobahn,expressway,freeway,highway,interstate,parkway,road,street,thruway,turnpike"
                 },
                 "highway/passing_place": {
                     "name": "Passing Place",
                 },
                 "highway/primary_link": {
                     "name": "Primary Link",
-                    "terms": "ramp,on ramp,off ramp"
+                    "terms": "on ramp,off ramp,ramp,road,street"
                 },
                 "highway/primary": {
                     "name": "Primary Road",
-                    "terms": ""
+                    "terms": "road,street"
                 },
                 "highway/raceway": {
                     "name": "Racetrack (Motorsport)",
                 },
                 "highway/residential": {
                     "name": "Residential Road",
-                    "terms": ""
+                    "terms": "road,street"
                 },
                 "highway/rest_area": {
                     "name": "Rest Area",
                 },
                 "highway/road": {
                     "name": "Unknown Road",
-                    "terms": ""
+                    "terms": "road,street"
                 },
                 "highway/secondary_link": {
                     "name": "Secondary Link",
-                    "terms": "ramp,on ramp,off ramp"
+                    "terms": "on ramp,off ramp,ramp,road,street"
                 },
                 "highway/secondary": {
                     "name": "Secondary Road",
-                    "terms": ""
+                    "terms": "road,street"
                 },
                 "highway/service": {
                     "name": "Service Road",
-                    "terms": ""
+                    "terms": "road,street"
                 },
                 "highway/service/alley": {
                     "name": "Alley",
                     "name": "Steps",
                     "terms": "stairs,staircase"
                 },
+                "highway/steps/conveying": {
+                    "name": "Escalator",
+                    "terms": "moving staircase,moving stairway,people mover"
+                },
                 "highway/stop": {
                     "name": "Stop Sign",
                     "terms": "stop,halt,sign"
                 },
                 "highway/tertiary_link": {
                     "name": "Tertiary Link",
-                    "terms": "ramp,on ramp,off ramp"
+                    "terms": "on ramp,off ramp,ramp,road,street"
                 },
                 "highway/tertiary": {
                     "name": "Tertiary Road",
-                    "terms": ""
+                    "terms": "road,street"
                 },
                 "highway/track": {
                     "name": "Unmaintained Track Road",
                 },
                 "highway/trunk_link": {
                     "name": "Trunk Link",
-                    "terms": "ramp,on ramp,off ramp"
+                    "terms": "on ramp,off ramp,ramp,road,street"
                 },
                 "highway/trunk": {
                     "name": "Trunk Road",
-                    "terms": ""
+                    "terms": "road,street"
                 },
                 "highway/turning_circle": {
                     "name": "Turning Circle",
                 },
                 "highway/unclassified": {
                     "name": "Minor/Unclassified Road",
-                    "terms": ""
+                    "terms": "road,street"
                 },
                 "historic": {
                     "name": "Historic Site",
                     "name": "Wayside Shrine",
                     "terms": ""
                 },
+                "historic/wreck": {
+                    "name": "Shipwreck",
+                    "terms": "hull,mast,maritime,remains,ship,boat"
+                },
+                "internet_access/wlan": {
+                    "name": "Wi-Fi Hotspot",
+                    "terms": "wi-fi,wifi,hotspot"
+                },
                 "junction": {
                     "name": "Junction",
                     "terms": ""
                     "name": "Land Use",
                     "terms": ""
                 },
+                "landuse/basin": {
+                    "name": "Basin",
+                    "terms": ""
+                },
                 "landuse/farm": {
                     "name": "Farmland",
                     "terms": ""
                 },
+                "landuse/pond": {
+                    "name": "Pond",
+                    "terms": ""
+                },
+                "landuse/reservoir": {
+                    "name": "Reservoir",
+                    "terms": ""
+                },
                 "landuse/allotments": {
                     "name": "Community Garden",
                     "terms": "allotment,garden"
                     "name": "Aquaculture",
                     "terms": "fish farm,crustacean,algae,aquafarming,shrimp farm,oyster farm,mariculture,algaculture"
                 },
-                "landuse/basin": {
-                    "name": "Basin",
-                    "terms": ""
-                },
                 "landuse/brownfield": {
                     "name": "Brownfield",
                     "terms": ""
                     "terms": "crop,grow,plant"
                 },
                 "landuse/forest": {
-                    "name": "Forest",
-                    "terms": "cut,forest,lumber,tree"
+                    "name": "Managed Forest",
+                    "terms": "cut,forest,forestry,lumber,silviculture,tree"
                 },
                 "landuse/garages": {
                     "name": "Garage Landuse",
                 },
                 "landuse/military/airfield": {
                     "name": "Military Airfield",
-                    "terms": "air force,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war"
+                    "terms": "aerodrome,aeroway,air force,airplane,airport,army,base,bomb,fight,force,guard,heli*,jet,marine,navy,plane,troop,war"
                 },
                 "landuse/military/barracks": {
                     "name": "Barracks",
                     "name": "Residential Area",
                     "terms": ""
                 },
+                "landuse/residential/apartments": {
+                    "name": "Apartment Complex",
+                    "terms": "flat,residence,tenement"
+                },
                 "landuse/retail": {
                     "name": "Retail Area",
                     "terms": ""
                     "name": "Amusement Arcade",
                     "terms": "pay-to-play games,video games,driving simulators,pinball machines"
                 },
+                "leisure/bandstand": {
+                    "name": "Bandstand",
+                    "terms": ""
+                },
                 "leisure/beach_resort": {
                     "name": "Beach Resort",
                     "terms": ""
                     "name": "Firepit",
                     "terms": "fireplace,campfire"
                 },
+                "leisure/fishing": {
+                    "name": "Fishing Spot",
+                    "terms": "angler"
+                },
                 "leisure/fitness_centre": {
                     "name": "Gym / Fitness Center",
                     "terms": "health,gym,leisure,studio"
                 },
                 "leisure/fitness_centre/yoga": {
                     "name": "Yoga Studio",
-                    "terms": "studio"
+                    "terms": "studio,asanas,modern yoga,meditation"
                 },
                 "leisure/fitness_station": {
                     "name": "Outdoor Fitness Station",
                 },
                 "leisure/pitch/american_football": {
                     "name": "American Football Field",
+                    "terms": "football,gridiron"
+                },
+                "leisure/pitch/australian_football": {
+                    "name": "Australian Football Field",
+                    "terms": "Aussie,AFL,football"
+                },
+                "leisure/pitch/badminton": {
+                    "name": "Badminton Court",
                     "terms": ""
                 },
                 "leisure/pitch/baseball": {
-                    "name": "Baseball Diamond",
+                    "name": "Baseball Field",
                     "terms": ""
                 },
                 "leisure/pitch/basketball": {
                     "name": "Riding Arena",
                     "terms": "dressage,equestrian,horse,horseback,riding"
                 },
+                "leisure/pitch/netball": {
+                    "name": "Netball Court",
+                    "terms": ""
+                },
                 "leisure/pitch/rugby_league": {
                     "name": "Rugby League Field",
                     "terms": ""
                     "name": "Soccer Field",
                     "terms": "football"
                 },
+                "leisure/pitch/softball": {
+                    "name": "Softball Field",
+                    "terms": "softball,diamond"
+                },
                 "leisure/pitch/table_tennis": {
                     "name": "Ping Pong Table",
                     "terms": "table tennis,ping pong"
                     "name": "Resort",
                     "terms": ""
                 },
-                "leisure/running_track": {
-                    "name": "Racetrack (Running)",
-                    "terms": "race*,running,sprint,track"
-                },
                 "leisure/sauna": {
                     "name": "Sauna",
                     "terms": ""
                 },
                 "leisure/slipway": {
                     "name": "Slipway",
-                    "terms": "boat launch,boat ramp"
+                    "terms": "boat launch,boat ramp,boat landing"
                 },
                 "leisure/sports_centre": {
                     "name": "Sports Center / Complex",
                 },
                 "leisure/swimming_pool": {
                     "name": "Swimming Pool",
-                    "terms": "dive,water"
+                    "terms": "dive,water,aquatics"
                 },
                 "leisure/track": {
                     "name": "Racetrack (Non-Motorsport)",
                     "terms": "cycle,dog,greyhound,horse,race*,track"
                 },
+                "leisure/track/horse_racing": {
+                    "name": "Racetrack (Horse Racing)",
+                    "terms": "race*,horse,track"
+                },
+                "leisure/track/running": {
+                    "name": "Racetrack (Running)",
+                    "terms": "race*,running,sprint,track"
+                },
                 "leisure/water_park": {
                     "name": "Water Park",
                     "terms": "swim,pool,dive"
                     "name": "Man Made",
                     "terms": ""
                 },
-                "man_made/embankment": {
-                    "name": "Embankment",
-                    "terms": ""
-                },
                 "man_made/adit": {
                     "name": "Adit",
                     "terms": "entrance,underground,mine,cave"
                     "name": "Bridge",
                     "terms": ""
                 },
+                "man_made/bunker_silo": {
+                    "name": "Bunker Silo",
+                    "terms": "Silage,Storage"
+                },
                 "man_made/chimney": {
                     "name": "Chimney",
                     "terms": ""
                     "name": "Cut line",
                     "terms": ""
                 },
+                "man_made/embankment": {
+                    "name": "Embankment",
+                    "terms": ""
+                },
                 "man_made/flagpole": {
                     "name": "Flagpole",
                     "terms": ""
                     "name": "Mast",
                     "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
                 },
+                "man_made/mast/communication": {
+                    "name": "Communication Mast",
+                    "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
+                },
+                "man_made/mast/communication/mobile_phone": {
+                    "name": "Mobile Phone Mast",
+                    "terms": "antenna,cell mast,cell phone mast,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,transmission mast,transmission tower"
+                },
+                "man_made/mast/communication/radio": {
+                    "name": "Radio Broadcast Mast",
+                    "terms": "antenna,broadcast tower,communication mast,communication tower,guyed tower,radio mast,radio tower,transmission mast,transmission tower"
+                },
+                "man_made/mast/communication/television": {
+                    "name": "Television Broadcast Mast",
+                    "terms": "antenna,broadcast tower,communication mast,communication tower,guyed tower,television mast,television tower,transmission mast,transmission tower,tv mast,tv tower"
+                },
                 "man_made/monitoring_station": {
                     "name": "Monitoring Station",
                     "terms": "weather,earthquake,seismology,air,gps"
                 },
-                "man_made/observation": {
-                    "name": "Observation Tower",
-                    "terms": "lookout tower,fire tower"
-                },
                 "man_made/observatory": {
                     "name": "Observatory",
                     "terms": "astronomical,meteorological"
                 },
                 "man_made/pipeline": {
                     "name": "Pipeline",
-                    "terms": ""
+                    "terms": "oil,natural gas,water,sewer,sewage"
                 },
                 "man_made/pumping_station": {
                     "name": "Pumping Station",
                     "name": "Storage Tank",
                     "terms": "water,oil,gas,petrol"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "Surveillance Camera",
-                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
-                },
                 "man_made/surveillance": {
                     "name": "Surveillance",
                     "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
                 },
+                "man_made/surveillance/camera": {
+                    "name": "Surveillance Camera",
+                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
+                },
                 "man_made/survey_point": {
                     "name": "Survey Point",
                     "terms": "trig point,triangulation pillar,trigonometrical station"
                     "name": "Tower",
                     "terms": ""
                 },
+                "man_made/tower/communication": {
+                    "name": "Communication Tower",
+                    "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
+                },
+                "man_made/tower/observation": {
+                    "name": "Observation Tower",
+                    "terms": "lookout tower,fire tower"
+                },
                 "man_made/wastewater_plant": {
                     "name": "Wastewater Plant",
                     "terms": "sewage*,water treatment plant,reclamation plant"
                 },
                 "natural/cliff": {
                     "name": "Cliff",
-                    "terms": "escarpment"
+                    "terms": "crag,escarpment,rock face,scarp"
                 },
                 "natural/coastline": {
                     "name": "Coastline",
                     "terms": ""
                 },
                 "natural/tree_row": {
-                    "name": "Tree row",
+                    "name": "Tree Row",
                     "terms": ""
                 },
                 "natural/tree": {
                     "name": "Water",
                     "terms": ""
                 },
+                "natural/water/basin": {
+                    "name": "Basin",
+                    "terms": "detention,drain,overflow,rain,retention"
+                },
+                "natural/water/canal": {
+                    "name": "Canal",
+                    "terms": ""
+                },
                 "natural/water/lake": {
                     "name": "Lake",
                     "terms": "lakelet,loch,mere"
                     "name": "Reservoir",
                     "terms": ""
                 },
+                "natural/water/river": {
+                    "name": "River",
+                    "terms": "beck,branch,brook,course,creek,estuary,rill,riverbank,rivulet,run,runnel,stream,tributary,watercourse"
+                },
+                "natural/water/stream": {
+                    "name": "Stream",
+                    "terms": "beck,branch,brook,burn,course,creek,current,drift,flood,flow,freshet,race,rill,rindle,rivulet,run,runnel,rush,spate,spritz,surge,tide,torrent,tributary,watercourse"
+                },
                 "natural/wetland": {
                     "name": "Wetland",
                     "terms": "bog,marsh,reedbed,swamp,tidalflat"
                 },
                 "office/estate_agent": {
                     "name": "Real Estate Office",
-                    "terms": ""
+                    "terms": "real estate"
                 },
                 "office/financial": {
                     "name": "Financial Office",
                     "name": "Quasi-NGO Office",
                     "terms": "ngo,non government,non-government,organization,organisation,quasi autonomous,quasi-autonomous"
                 },
+                "office/religion": {
+                    "name": "Religious Office",
+                    "terms": ""
+                },
                 "office/research": {
                     "name": "Research Office",
                     "terms": ""
                     "name": "Water Utility Office",
                     "terms": "water board,utility"
                 },
-                "piste": {
-                    "name": "Piste/Ski Trail",
-                    "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+                "piste/downhill": {
+                    "name": "Downhill Piste/Ski Run",
+                    "terms": "ski,alpine,snowboard,downhill,piste"
+                },
+                "piste/downhill/halfpipe": {
+                    "name": "Halfpipe",
+                    "terms": "ski,alpine,halfpipe,half pipe,snowboard,downhill,piste"
+                },
+                "piste/hike": {
+                    "name": "Snowshoeing or Winter Hiking Trail",
+                    "terms": "hike,winter hiking,snowshoe,snowshoeing,piste,ski"
+                },
+                "piste/ice_skate": {
+                    "name": "Ice Skating Piste",
+                    "terms": "ice,skating,ski,piste"
+                },
+                "piste/nordic": {
+                    "name": "Nordic or Crosscountry Piste/Ski Trail",
+                    "terms": "ski,nordic,crosscountry,skating,piste"
+                },
+                "piste/piste": {
+                    "name": "Winter Sport Trails",
+                    "terms": "ski,nordic,crosscountry,downhill,alpine,snowboard,skitour,ski touring,sled,luge,sleigh,sledge,ski-joring,husky,horse,winter hiking,snowshoe,snowshoeing,ice,skating"
+                },
+                "piste/skitour": {
+                    "name": "Ski Touring Trail",
+                    "terms": "ski,skitour,crosscountry,ski touring,piste"
+                },
+                "piste/sled": {
+                    "name": "Sled Piste",
+                    "terms": "ski,sled,luge,sleigh,sledge,piste"
+                },
+                "piste/sleigh": {
+                    "name": "Sleigh Piste",
+                    "terms": "ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse"
                 },
                 "place/farm": {
                     "name": "Farm",
                     "terms": ""
                 },
+                "place/city_block": {
+                    "name": "City Block",
+                    "terms": ""
+                },
                 "place/city": {
                     "name": "City",
                     "terms": ""
                     "name": "Substation",
                     "terms": ""
                 },
+                "power/cable/underground": {
+                    "name": "Underground Power Cable",
+                    "terms": ""
+                },
                 "power/generator": {
                     "name": "Power Generator",
                     "terms": "hydro,solar,turbine,wind"
                 },
-                "power/generator/source_nuclear": {
+                "power/generator/method/photovoltaic": {
+                    "name": "Solar Panel",
+                    "terms": "photovoltaic module,PV module,sunlight"
+                },
+                "power/generator/source/nuclear": {
                     "name": "Nuclear Reactor",
                     "terms": "fission,generator,nuclear,nuke,reactor"
                 },
-                "power/generator/source_wind": {
+                "power/generator/source/wind": {
                     "name": "Wind Turbine",
                     "terms": "generator,turbine,windmill,wind"
                 },
                 },
                 "power/tower": {
                     "name": "High-Voltage Tower",
-                    "terms": ""
+                    "terms": "power"
                 },
                 "power/transformer": {
                     "name": "Transformer",
                     "name": "Ferry Route",
                     "terms": ""
                 },
+                "seamark/beacon_isolated_danger": {
+                    "name": "Danger Beacon",
+                    "terms": "beacon isolated danger,isolated danger beacon,iala"
+                },
+                "seamark/beacon_lateral": {
+                    "name": "Channel Beacon",
+                    "terms": "lateral beacon,beacon lateral,cevni,channel marker,iala,lateral mark"
+                },
+                "seamark/buoy_lateral": {
+                    "name": "Channel Buoy",
+                    "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark"
+                },
+                "seamark/buoy_lateral/green": {
+                    "name": "Green Buoy",
+                    "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark"
+                },
+                "seamark/buoy_lateral/red": {
+                    "name": "Red Buoy",
+                    "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark"
+                },
+                "seamark/mooring": {
+                    "name": "Mooring",
+                    "terms": "dolphin,pile,bollard,buoy,post"
+                },
                 "shop": {
                     "name": "Shop",
                     "terms": ""
                     "name": "Car Dealership",
                     "terms": "auto"
                 },
+                "shop/caravan": {
+                    "name": "RV Dealership",
+                    "terms": "auto"
+                },
                 "shop/carpet": {
                     "name": "Carpet Store",
                     "terms": "rug"
                 },
+                "shop/catalogue": {
+                    "name": "Catalog Shop",
+                    "terms": ""
+                },
                 "shop/charity": {
                     "name": "Charity Store",
                     "terms": "thrift,op shop,nonprofit"
                 },
                 "shop/chemist": {
                     "name": "Drugstore",
-                    "terms": "med*,drug*,gift"
+                    "terms": "apothecary,beauty,drug store,drugstore,gift,hair,med*,pharmacy,prescription,tooth"
                 },
                 "shop/chocolate": {
                     "name": "Chocolate Store",
                     "name": "Cosmetics Store",
                     "terms": ""
                 },
+                "shop/country_store": {
+                    "name": "Country Store",
+                    "terms": ""
+                },
                 "shop/craft": {
                     "name": "Arts and Crafts Store",
                     "terms": "art*,paint*,frame"
                     "name": "Fashion Store",
                     "terms": ""
                 },
+                "shop/fireplace": {
+                    "name": "Fireplace Store",
+                    "terms": "fireplace,stove,masonry heater"
+                },
+                "shop/fishing": {
+                    "name": "Fishing Shop",
+                    "terms": ""
+                },
                 "shop/florist": {
                     "name": "Florist",
                     "terms": "flower"
                     "name": "Framing Shop",
                     "terms": "art*,paint*,photo*,frame"
                 },
+                "shop/frozen_food": {
+                    "name": "Frozen Food",
+                    "terms": ""
+                },
+                "shop/fuel": {
+                    "name": "Fuel Shop",
+                    "terms": ""
+                },
                 "shop/funeral_directors": {
                     "name": "Funeral Home",
                     "terms": "undertaker,memorial home"
                     "name": "Greengrocer",
                     "terms": "fruit,vegetable"
                 },
+                "shop/hairdresser_supply": {
+                    "name": "Hairdresser Supply Store",
+                    "terms": "barber,shampoo,conditioner"
+                },
                 "shop/hairdresser": {
                     "name": "Hairdresser",
                     "terms": "barber"
                     "name": "Houseware Store",
                     "terms": "home,household"
                 },
+                "shop/hunting": {
+                    "name": "Hunting Shop",
+                    "terms": ""
+                },
                 "shop/interior_decoration": {
                     "name": "Interior Decoration Store",
                     "terms": ""
                 },
                 "shop/outdoor": {
                     "name": "Outdoors Store",
-                    "terms": "camping,climbing,hiking"
+                    "terms": "camping,climbing,hiking,outfitter,outdoor equipment,outdoor supplies"
                 },
                 "shop/paint": {
                     "name": "Paint Store",
                     "terms": ""
                 },
+                "shop/party": {
+                    "name": "Party Supply Store",
+                    "terms": "balloons,costumes,decorations,invitations"
+                },
                 "shop/pastry": {
                     "name": "Pastry Shop",
                     "terms": "patisserie,cake shop,cakery"
                 },
                 "shop/scuba_diving": {
                     "name": "Scuba Diving Shop",
-                    "terms": ""
+                    "terms": "diving,scuba"
                 },
                 "shop/seafood": {
                     "name": "Seafood Shop",
                     "name": "Consignment/Thrift Store",
                     "terms": "secondhand,second hand,resale,thrift,used"
                 },
+                "shop/sewing": {
+                    "name": "Sewing Supply Shop",
+                    "terms": "haberdashery"
+                },
                 "shop/shoes": {
                     "name": "Shoe Store",
                     "terms": ""
                     "name": "Watersport/Swim Shop",
                     "terms": ""
                 },
+                "shop/water": {
+                    "name": "Drinking Water Shop",
+                    "terms": ""
+                },
                 "shop/weapons": {
                     "name": "Weapon Shop",
                     "terms": "ammo,gun,knife,knives"
                     "name": "Artwork",
                     "terms": "mural,sculpture,statue"
                 },
+                "tourism/artwork/mural": {
+                    "name": "Mural",
+                    "terms": "fresco,wall painting"
+                },
+                "tourism/artwork/sculpture": {
+                    "name": "Sculpture",
+                    "terms": "statue,figure,carving"
+                },
+                "tourism/artwork/statue": {
+                    "name": "Statue",
+                    "terms": "sculpture,figure,carving"
+                },
                 "tourism/attraction": {
                     "name": "Tourist Attraction",
                     "terms": ""
                     "name": "Speed Table",
                     "terms": "flat top,hump,speed,slow"
                 },
+                "traffic_sign_vertex": {
+                    "name": "Traffic Sign",
+                    "terms": "road,highway"
+                },
+                "traffic_sign": {
+                    "name": "Traffic Sign",
+                    "terms": "road,highway"
+                },
+                "traffic_sign/city_limit_vertex": {
+                    "name": "City Limit Sign",
+                    "terms": "town,village,hamlet,boundary,edge,border,road,highway"
+                },
+                "traffic_sign/city_limit": {
+                    "name": "City Limit Sign",
+                    "terms": "town,village,hamlet,boundary,edge,border,road,highway"
+                },
+                "traffic_sign/maxspeed_vertex": {
+                    "name": "Speed Limit Sign",
+                    "terms": "max speed,maximum speed,road,highway"
+                },
+                "traffic_sign/maxspeed": {
+                    "name": "Speed Limit Sign",
+                    "terms": "max speed,maximum speed,road,highway"
+                },
                 "type/multipolygon": {
                     "name": "Multipolygon",
                     "terms": ""
                     "name": "Administrative Boundary",
                     "terms": ""
                 },
+                "type/enforcement": {
+                    "name": "Enforcement",
+                    "terms": ""
+                },
                 "type/restriction": {
                     "name": "Restriction",
                     "terms": ""
                     "name": "Other",
                     "terms": ""
                 },
+                "waterway/riverbank": {
+                    "name": "Riverbank",
+                    "terms": ""
+                },
                 "waterway/boatyard": {
                     "name": "Boatyard",
                     "terms": ""
                     "name": "Marine Fuel Station",
                     "terms": "petrol,gas,diesel,boat"
                 },
+                "waterway/milestone": {
+                    "name": "Waterway Milestone",
+                    "terms": "milestone,marker"
+                },
                 "waterway/river": {
                     "name": "River",
                     "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
                 },
-                "waterway/riverbank": {
-                    "name": "Riverbank",
-                    "terms": ""
-                },
                 "waterway/sanitary_dump_station": {
                     "name": "Marine Toilet Disposal",
                     "terms": "Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet"
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
-                "description": "Premium DigitalGlobe satellite imagery.",
+                "description": "DigitalGlobe-Premium is a mosaic composed of DigitalGlobe basemap with select regions filled with +Vivid or custom area of interest imagery, 50cm resolution or better, and refreshed more frequently with ongoing updates.",
                 "name": "DigitalGlobe Premium Imagery"
             },
             "DigitalGlobe-Premium-vintage": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 },
-                "description": "Standard DigitalGlobe satellite imagery.",
+                "description": "DigitalGlobe-Standard is a curated set of imagery covering 86% of the earth’s landmass, with 30-60cm resolution where available, backfilled by Landsat. Average age is 2.31 years, with some areas updated 2x per year.",
                 "name": "DigitalGlobe Standard Imagery"
             },
             "DigitalGlobe-Standard-vintage": {
             "SPW_PICC": {
                 "name": "SPW(allonie) PICC numerical imagery"
             },
-            "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"
                 "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
                 "name": "TIGER Roads 2017"
             },
+            "US-TIGER-Roads-2018": {
+                "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
+                "name": "TIGER Roads 2018"
+            },
             "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"
                 },
                 "name": "UrbIS-Ortho 2017"
             },
+            "UrbISOrtho2018": {
+                "attribution": {
+                    "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
+                },
+                "name": "UrbIS-Ortho 2018"
+            },
             "UrbisAdmFR": {
                 "attribution": {
                     "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
                 "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
                 "name": "basemap.at Orthofoto"
             },
-            "hike_n_bike": {
+            "eufar-balaton": {
                 "attribution": {
-                    "text": "© OpenStreetMap contributors"
+                    "text": "EUFAR Balaton ortofotó 2010"
+                },
+                "description": "1940 geo-tagged photography from Balaton Limnological Institute.",
+                "name": "EUFAR Balaton orthophotos"
+            },
+            "finds.jp_KBN_2500": {
+                "attribution": {
+                    "text": "GSI KIBAN 2500"
+                },
+                "description": "GSI Kiban 2500 via finds.jp. Good for tracing, but a bit older.",
+                "name": "Japan GSI KIBAN 2500"
+            },
+            "gsi.go.jp": {
+                "attribution": {
+                    "text": "GSI Japan"
+                },
+                "description": "Japan GSI ortho Imagery. Usually better than bing, but a bit older.",
+                "name": "Japan GSI ortho Imagery"
+            },
+            "gsi.go.jp_airphoto": {
+                "attribution": {
+                    "text": "GSI Japan"
+                },
+                "description": "Japan GSI airphoto Imagery. Not fully orthorectified, but a bit newer and/or differently covered than GSI ortho Imagery.",
+                "name": "Japan GSI airphoto Imagery"
+            },
+            "gsi.go.jp_std_map": {
+                "attribution": {
+                    "text": "GSI Japan"
+                },
+                "description": "Japan GSI Standard Map. Widely covered.",
+                "name": "Japan GSI Standard Map"
+            },
+            "helsingborg-orto": {
+                "attribution": {
+                    "text": "© Helsingborg municipality"
                 },
-                "name": "Hike & Bike"
+                "description": "Orthophotos from the municipality of Helsingborg 2016, public domain",
+                "name": "Helsingborg Orthophoto"
+            },
+            "kalmar-orto-2014": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                },
+                "description": "Orthophotos for the north coast of the municipality of Kalmar 2014",
+                "name": "Kalmar North Orthophoto 2014"
+            },
+            "kalmar-orto-2016": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                },
+                "description": "Orthophotos for the south coast of the municipality of Kalmar 2016",
+                "name": "Kalmar South Orthophoto 2016"
+            },
+            "kalmar-orto-2018": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                },
+                "description": "Orthophotos for urban areas of the municipality of Kalmar 2018",
+                "name": "Kalmar Urban Orthophoto 2018"
+            },
+            "kelkkareitit": {
+                "attribution": {
+                    "text": "© Kelkkareitit.fi"
+                },
+                "description": "Kelkkareitit.fi snowmobile trails from OSM (Nordic coverage)",
+                "name": "Nordic snowmobile overlay"
+            },
+            "lantmateriet-orto1960": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                },
+                "description": "Mosaic of Swedish orthophotos from the period 1955–1965. Older and younger pictures may occur.",
+                "name": "Lantmäteriet Historic Orthophoto 1960"
+            },
+            "lantmateriet-orto1975": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                },
+                "description": "Mosaic of Swedish orthophotos from the period 1970–1980. Is under construction.",
+                "name": "Lantmäteriet Historic Orthophoto 1975"
+            },
+            "lantmateriet-topowebb": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                },
+                "description": "Topographic map of Sweden 1:50 000",
+                "name": "Lantmäteriet Topographic Map"
+            },
+            "linkoping-orto": {
+                "attribution": {
+                    "text": "© Linköping municipality"
+                },
+                "description": "Orthophotos from the municipality of Linköping 2010, open data",
+                "name": "Linköping Orthophoto"
             },
             "mapbox_locator_overlay": {
                 "attribution": {
                 },
                 "name": "OpenStreetMap (German Style)"
             },
+            "osmse-ekonomiska": {
+                "attribution": {
+                    "text": "© Lantmäteriet"
+                },
+                "description": "Scan of \"Economic maps\" ca. 1950–1980",
+                "name": "Lantmäteriet Economic Map 1950–1980"
+            },
             "qa_no_address": {
                 "attribution": {
                     "text": "Simon Poole, Data ©OpenStreetMap contributors"
                 },
                 "name": "skobbler"
             },
+            "skoterleder": {
+                "attribution": {
+                    "text": "© Skoterleder.org"
+                },
+                "description": "Snowmobile trails",
+                "name": "Snowmobile map Sweden"
+            },
             "stamen-terrain-background": {
                 "attribution": {
                     "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL"
                 },
                 "name": "Stamen Terrain"
             },
+            "stockholm-orto": {
+                "attribution": {
+                    "text": "© Stockholm municipality, CC0"
+                },
+                "description": "Orthophotos from the municipality of Stockholm 2015, CC0 license",
+                "name": "Stockholm Orthophoto"
+            },
             "tf-cycle": {
                 "attribution": {
                     "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
                     "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
                 },
                 "name": "Thunderforest Landscape"
+            },
+            "trafikverket-baninfo": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "Swedish railway network, including sidings",
+                "name": "Trafikverket Railway Network"
+            },
+            "trafikverket-baninfo-option": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "Swedish railway network with several options for map layers",
+                "name": "Trafikverket Railway Network options"
+            },
+            "trafikverket-vagnat": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "Swedish NVDB road network",
+                "name": "Trafikverket Road Network"
+            },
+            "trafikverket-vagnat-extra": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "Swedish NVDB extra details: Highway reference, traffic calming, rest area, bus stop, bridge, tunnel, speed camera",
+                "name": "Trafikverket Road Network extra"
+            },
+            "trafikverket-vagnat-navn": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "Swedish NVDB street names",
+                "name": "Trafikverket Street Names"
+            },
+            "trafikverket-vagnat-option": {
+                "attribution": {
+                    "text": "© Trafikverket, CC0"
+                },
+                "description": "Swedish NVDB road network with several options for map layers",
+                "name": "Trafikverket Road Network options"
             }
         },
         "community": {
+            "bw-facebook": {
+                "name": "Mapping Botswana on Facebook",
+                "description": "Page of OpenStreetMap in Botswana"
+            },
+            "bw-twitter": {
+                "name": "Mapping Botswana on Twitter",
+                "description": "Twitter of OpenStreetMap in Botswana"
+            },
             "cape-coast-youthmappers": {
                 "name": "University of Cape Coast YouthMappers",
                 "description": "Follow us on Twitter: {url}",
                     }
                 }
             },
+            "osm-india-forum": {
+                "name": "OpenStreetMap India forum",
+                "description": "OpenStreetMap India web forum"
+            },
+            "osm-india-github": {
+                "name": "OpenStreetMap India GitHub",
+                "description": "Code with us: {url}"
+            },
             "OSM-india-mailinglist": {
                 "name": "OpenStreetMap India Mailinglist",
                 "description": "Talk-in is the official Mailinglist for Indian Community"
             },
+            "osm-india-telegram": {
+                "name": "OpenStreetMap India Telegram",
+                "description": "Join our family: {url}"
+            },
             "OSM-india-twitter": {
                 "name": "OpenStreetMap India Twitter",
                 "description": "We are just a tweet away: {url}"
             },
+            "osm-india-website": {
+                "name": "OpenStreetMap India",
+                "description": "Mappers and OpenStreetMap users in India"
+            },
+            "osm-india-wiki": {
+                "name": "OpenStreetMap Wikiproject India",
+                "description": "Everything you need to know about mapping in India: {url}"
+            },
+            "osm-india-youtube": {
+                "name": "OpenStreetMap India Youtube",
+                "description": "Subscribe to our channel: {url}"
+            },
             "OSM-India-Puducherry-Facebook": {
                 "name": "Free Software Hardware Movement - Facebook",
                 "description": "FSHM Facebook page to know about community events, activities",
                 "extendedDescription": "FSHM organizes events relating to free software/hardware, technology, activism and OpenStreetMap. Its FB page is the best way to keep in contact with its events."
             },
+            "OSM-Puducherry-Mailing-List": {
+                "name": "Free Software Hardware Movement - Mailing List",
+                "description": "FSHM Puducherry mailing list to discuss mapping in Puducherry and other things.",
+                "extendedDescription": "FSHM organizes events relating to free software/hardware, technology, activism and OpenStreetMap."
+            },
             "OSM-India-Puducherry-Matrix": {
                 "name": "Free Software Hardware Movement - Matrix",
                 "description": "FSHM Riot group to discuss, share and update mapping activities, events in and around Puducherry",
                 "description": "Improve OpenStreetMap in Indonesia",
                 "extendedDescription": "Mapping in Indonesia? Have questions, want to connect with the community here? Join us at {Url}. All are welcome!"
             },
+            "osm-iran-aparat": {
+                "name": "OpenStreetMap Iran Aparat",
+                "description": "Subscribe to our channel at {url}",
+                "extendedDescription": "A good resource of videos about anything related to OpenStreetMap. Mainly in Persian."
+            },
+            "osm-iran-forum": {
+                "name": "OpenStreetMap Iran web forum",
+                "description": "OpenStreetMap Iran web forum",
+                "extendedDescription": "A web forum for OpenStreetMap users in Iran. Feel free to ask questions and discuss with others!"
+            },
+            "osm-iran-telegram": {
+                "name": "OpenStreetMap Iran Telegram",
+                "description": "You're welcome to join our Telegram channel at {url}. We also have a supergroup of many OSMers interested in Iran. Find its link in bio of channel."
+            },
             "OSM-japan-facebook": {
                 "name": "OpenStreetMap Japan Community",
                 "description": "Mappers and OpenStreetMap users in Japan"
                 "name": "OpenStreetMap Japan",
                 "description": "Mappers and OpenStreetMap users in Japan"
             },
-            "OSM-korea-telegram": {
-                "name": "OSM Korea Telegram Channel",
-                "description": "Unofficial Channnel for OpenStreetMap contributors, communities and users in Korea to share and discuss."
-            },
             "OSM-MY-facebook": {
                 "name": "OpenStreetMap Malaysia on Facebook",
                 "description": "For chat about anything related to OpenStreetMap!"
                 "description": "Improve OpenStreetMap in Nepal",
                 "extendedDescription": "Mapping in Nepal? Have questions, want to connect with the community here? Join us at {Url}. All are welcome!"
             },
+            "OSM-Asia-mailinglist": {
+                "name": "OpenStreetMap Asia Mailinglist",
+                "description": "Talk-asia is the official Mailinglist for Asian Community"
+            },
+            "osm-asia-telegram": {
+                "name": "OpenStreetMap Asia Telegram",
+                "description": "Join our family: {url}"
+            },
             "OSM-PH-facebook": {
                 "name": "OpenStreetMap PH Facebook",
                 "description": "Welcome to OpenStreetMap Philippines, where we encourage all fellow Filipinos to contribute to the OpenStreetMap project."
                 "name": "OpenStreetMap RU telegram",
                 "description": "OpenStreetMap Russia telegram chat"
             },
-            "OSM-LKA-facebook": {
+            "OSM-south-korea-telegram": {
+                "name": "OSM South Korea Telegram",
+                "description": "Unofficial Channnel for OpenStreetMap contributors, communities, and users in South Korea to share and discuss."
+            },
+            "OSM-sri-lanka-facebook": {
                 "name": "OpenStreetMap Sri Lanka",
                 "description": "Improve OpenStreetMap in Sri Lanka",
                 "extendedDescription": "Mapping in Sri Lanka? Have questions, want to connect with the community here? Join us at {Url}. All are welcome!"
                 "name": "Talk-be Mailing List",
                 "description": "Talk-be is the official mailing list for the Belgian OSM community"
             },
-            "be-maptime": {
-                "name": "Maptime Belgium",
-                "description": "Social events organized around mapping - beginners most welcome!",
-                "extendedDescription": "Maptime is an open learning environment for all levels and degrees of knowledge, offering intentional educational support for the beginner. Maptime is simultaneously flexible and structured, creating space for mapping tutorials, workshops, ongoing projects with a shared goal, and independent/collaborative work time."
-            },
             "be-matrix": {
                 "name": "OpenStreetMap BE Matrix channel",
                 "description": "All mappers are welcome!",
                 "name": "OpenStreetMap Belgium Twitter",
                 "description": "OSM Belgium on Twitter: @osm_be"
             },
+            "hr-facebook": {
+                "name": "OpenStreetMap Croatia Facebook group",
+                "description": "OpenStreetMap Croatia Facebook group"
+            },
+            "hr-irc": {
+                "name": "OpenStreetMap Croatia on IRC",
+                "description": "Join #osm-hr on irc.freenode.org (port 6667)"
+            },
+            "hr-mailinglist": {
+                "name": "Talk-hr Mailing List",
+                "description": "Talk-hr mailing list"
+            },
             "czech-community": {
                 "name": "Czech OSM community",
                 "description": "Map portal, website and contacts on OSM members in Czechia"
                 "name": "OpenStreetMap Hungary Meetup",
                 "description": "The platform for organizing meetups in Hungary"
             },
+            "is-facebook": {
+                "name": "OSM Iceland on Facebook",
+                "description": "Page of OpenStreetMap in Iceland"
+            },
+            "is-mailinglist": {
+                "name": "Talk-is Mailing List",
+                "description": "Talk-is is the official mailing list for the Icelandic OSM community"
+            },
+            "is-twitter": {
+                "name": "OSM Iceland on Twittter",
+                "description": "Twitter of OpenStreetMap in Iceland"
+            },
             "it-facebook": {
                 "name": "OpenStreetMap Italy Facebook",
                 "description": "Join the OpenStreetMap Italy community on Facebook"
                 "name": "OpenStreetMap mailing list for Trentino",
                 "description": "OpenStreetMap Italy regional talk list for Trentino"
             },
+            "kosovo-telegram": {
+                "name": "OpenStreetMap Kosovo on Telegram",
+                "description": "Semi-official all-Kosovo Telegram public group. We welcome all mappers from anywhere in any language."
+            },
             "no-forum": {
                 "name": "OpenStreetMap Norway Web Forum",
                 "description": "OpenStreetMap Norway web forum"
                 "name": "OpenStreetMap Norway mailing list",
                 "description": "Mailing list for mappers and OpenStreetMap users, developers and enthusiasts in Norway"
             },
+            "no-telegram": {
+                "name": "@OSM_no on Telegram",
+                "description": "OpenStreetMap Norway Telegram chat"
+            },
             "OSM-PL-facebook-group": {
                 "name": "OpenStreetMap Poland Facebook group",
                 "description": "Group for mappers and users of OpenStreetMap in Poland"
                 "name": "OpenStreetMap Poland Forum",
                 "description": "Forum of Polish OpenStreetMap community"
             },
+            "si-forum": {
+                "name": "OpenStreetMap Slovenia Forum",
+                "description": "Forum of OpenStreetMap community in Slovenia"
+            },
+            "si-mailinglist": {
+                "name": "OpenStreetMap Slovenia mailing list",
+                "description": "Mailing list of OpenStreetMap community in Slovenia"
+            },
             "OSM-ES-mailinglist": {
                 "name": "Talk-es mailing list",
                 "description": "A mailing list to discuss OpenStreetMap in Spain"
                 "description": "Mappers and OpenStreetMap users, around Portland, ME",
                 "extendedDescription": "Maptime is, rather literally, time for mapmaking.  Our mission is to open the doors of cartographic possibility to anyone interested by creating a time and space for collaborative learning, exploration, and map creation using mapping tools and technologies."
             },
+            "MaptimeHRVA-twitter": {
+                "name": "MaptimeHRVA Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
+            "us-ma-mailinglist": {
+                "name": "Talk-us-massachusetts Mailing List",
+                "description": "Email mailing list for the Massachusetts OSM community"
+            },
             "OpenCleveland-meetup": {
                 "name": "Open Cleveland",
                 "description": "Improve OpenStreetMap in the Cleveland area",
                 "name": "OpenStreetMap NYC",
                 "description": "Mappers and OpenStreetMap users, developers and enthusiasts in the New York Metropolitan area"
             },
+            "OSM-Portland-forum": {
+                "name": "OpenStreetMap PDX Google Group",
+                "description": "Forum and mailing list for OpenStreetMap users in the Portland area",
+                "extendedDescription": "This group is to facilitate improvements to OpenStreetMap in the Portland, Oregon area to support applications such as the Open Trip Planner."
+            },
             "OSM-Portland": {
                 "name": "OpenStreetMap Portland",
                 "description": "Mappers and OpenStreetMap users in the Portland area",
             "OSM-US": {
                 "name": "OpenStreetMap US",
                 "description": "We help grow and improve OpenStreetMap in the United States.",
-                "extendedDescription": "We support OpenStreetMap by holding annual conferences, providing community resources, building partnerships, and by spreading the word. Join OpenStreetMap US here: {signupUrl}"
+                "extendedDescription": "We support OpenStreetMap by holding annual conferences, providing community resources, building partnerships, and by spreading the word. Join OpenStreetMap US here: {signupUrl}",
+                "events": {
+                    "sotmus2018": {
+                        "name": "State of the Map US 2018",
+                        "description": "Join the OpenStreetMap community at State of the Map US in Detroit, Michigan. Connect with other mappers, businesses, government agencies, and non profits, all collaborating around the free and editable map of the world.",
+                        "where": "Detroit, Michigan"
+                    }
+                }
             },
             "OSM-Utah": {
                 "name": "OpenStreetMap Utah",
                 "name": "OpenStreetMap Brasil Twitter",
                 "description": "Follow us on Twitter at {url}"
             },
+            "RS-telegram": {
+                "name": "OpenStreetMap Rio Grande do Sul Telegram Group",
+                "description": "Join the OpenStreetMap Rio Grande do Sul community on Telegram",
+                "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
+            },
             "OSM-CL-facebook": {
                 "name": "OpenStreetMap Chile Facebook",
                 "description": "Join the OpenStreetMap Chile community on Facebook",
                 "name": "OpenStreetMap Peru",
                 "description": "News and resources for the OpenStreetMap Peru community"
             },
+            "LATAM-Facebook": {
+                "name": "OpenStreetMap Latam Facebook",
+                "description": "OpenStreetMap Latam on Facebook"
+            },
+            "LATAM-Telegram": {
+                "name": "OpenStreetMap Latam Telegram",
+                "description": "OpenStreetMap Telegram for Latin America"
+            },
+            "LATAM-Twitter": {
+                "name": "OpenStreetMap Latam Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
+            "osm-latam": {
+                "name": "OpenStreetMap Latam",
+                "description": "Supporting OpenStreetMap in Latin America",
+                "events": {
+                    "sotm-latam-2018": {
+                        "name": "State of the Map Latam 2018",
+                        "description": "State of the Map Latam is the annual conference for all mappers and users of OpenStreetMap in Latin America. The program includes talks, panels, workshops, and mapathons related to OpenStreetMap.",
+                        "where": "Buenos Aires, Argentina"
+                    }
+                }
+            },
+            "OSM-Discord": {
+                "name": "OpenStreetMap Discord",
+                "description": "Get in touch with other mappers via Discord"
+            },
             "OSM-Facebook": {
                 "name": "OpenStreetMap on Facebook",
                 "description": "Like us on Facebook for news and updates about OpenStreetMap."
                 "description": "Ask a question and get answers on OSM's community-driven question and answer site.",
                 "extendedDescription": "{url} is for everyone who needs help with OpenStreetMap.  Whether you are a beginner mapper or have a technical question, we're here to help!"
             },
+            "OSM-IRC": {
+                "name": "OpenStreetMap IRC",
+                "description": "Join #osm on irc.oftc.net (port 6667)"
+            },
             "OSM-Reddit": {
                 "name": "OpenStreetMap on Reddit",
                 "description": "/r/openstreetmap/ is a great place to learn more about OpenStreetMap.  Ask us anything!"