]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Merge remote-tracking branch 'upstream/pull/2267'
[rails.git] / vendor / assets / iD / iD / locales / en.json
index 21f290b379f9352544b6e242dac8aa5a91b6e62a..a3c0fd810493b67413d6c5125836d0138664dc63 100644 (file)
@@ -1,25 +1,69 @@
 {
     "en": {
         "icons": {
+            "download": "download",
             "information": "info",
             "remove": "remove",
-            "undo": "undo"
+            "undo": "undo",
+            "zoom_to": "zoom to",
+            "copy": "copy",
+            "open_wikidata": "open on wikidata.org",
+            "favorite": "favorite"
+        },
+        "toolbar": {
+            "inspect": "Inspect",
+            "undo_redo": "Undo / Redo",
+            "recent": "Recent",
+            "favorites": "Favorites",
+            "add_feature": "Add Feature"
         },
         "modes": {
+            "add_feature": {
+                "title": "Add a feature",
+                "description": "Search for features to add to the map.",
+                "key": "Tab",
+                "result": "{count} result",
+                "results": "{count} results"
+            },
             "add_area": {
                 "title": "Area",
                 "description": "Add parks, buildings, lakes or other areas to the map.",
-                "tail": "Click on the map to start drawing an area, like a park, lake, or building."
+                "tail": "Click on the map to start drawing an area, like a park, lake, or building.",
+                "filter_tooltip": "areas"
             },
             "add_line": {
                 "title": "Line",
                 "description": "Add highways, streets, pedestrian paths, canals or other lines to the map.",
-                "tail": "Click on the map to start drawing a road, path, or route."
+                "tail": "Click on the map to start drawing a road, path, or route.",
+                "filter_tooltip": "lines"
             },
             "add_point": {
                 "title": "Point",
                 "description": "Add restaurants, monuments, postal boxes or other points to the map.",
-                "tail": "Click on the map to add a point."
+                "tail": "Click on the map to add a point.",
+                "filter_tooltip": "points"
+            },
+            "add_note": {
+                "title": "Note",
+                "label": "Add Note",
+                "description": "Spotted an issue? Let other mappers know.",
+                "tail": "Click on the map to add a note.",
+                "key": "N"
+            },
+            "add_preset": {
+                "title": "Add {feature}",
+                "point": {
+                    "title": "Add {feature} as a point"
+                },
+                "line": {
+                    "title": "Add {feature} as a line"
+                },
+                "area": {
+                    "title": "Add {feature} as an area"
+                },
+                "building": {
+                    "title": "Add {feature} as a building"
+                }
             },
             "browse": {
                 "title": "Browse",
@@ -40,7 +84,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": {
                 },
                 "not_closed": "This can't be made circular because it's not a loop.",
                 "too_large": "This can't be made circular because not enough of it is currently visible.",
-                "connected_to_hidden": "This can't be made circular because it is connected to a hidden feature."
+                "connected_to_hidden": "This can't be made circular because it is connected to a hidden feature.",
+                "not_downloaded": "This can't be made circular because parts of it have not yet been downloaded."
             },
             "orthogonalize": {
                 "title": "Square",
                 "description": {
+                    "vertex": "Square this corner.",
                     "line": "Square the corners of this line.",
                     "area": "Square the corners of this area."
                 },
-                "key": "S",
+                "key": "Q",
                 "annotation": {
+                    "vertex": "Squared a single corner.",
                     "line": "Squared the corners of a line.",
                     "area": "Squared the corners of an area."
                 },
+                "end_vertex": "This can't be squared because it is an end node.",
+                "square_enough": "This can't be made more square than it already is.",
                 "not_squarish": "This can't be made square because it is not squarish.",
                 "too_large": "This can't be made square because not enough of it is currently visible.",
-                "connected_to_hidden": "This can't be made square because it is connected to a hidden feature."
+                "connected_to_hidden": "This can't be made square because it is connected to a hidden feature.",
+                "not_downloaded": "This can't be made square because parts of it have not yet been downloaded."
             },
             "straighten": {
                 "title": "Straighten",
-                "description": "Straighten this line.",
+                "description": {
+                    "points": "Straighten these points.",
+                    "line": "Straighten this line."
+                },
                 "key": "S",
-                "annotation": "Straightened a line.",
+                "annotation": {
+                    "points": "Straightened several points.",
+                    "line": "Straightened a line."
+                },
                 "too_bendy": "This can't be straightened because it bends too much.",
-                "connected_to_hidden": "This line can't be straightened because it is connected to a hidden feature."
+                "connected_to_hidden": "This can't be straightened because it is connected to a hidden feature.",
+                "not_downloaded": "This can't be straightened because parts of it have not yet been downloaded."
             },
             "delete": {
                 "title": "Delete",
                 "connected_to_hidden": {
                     "single": "This feature can't be deleted because it is connected to a hidden feature.",
                     "multiple": "These features can't be deleted because some are connected to hidden features."
+                },
+                "not_downloaded": {
+                    "single": "This feature can't be deleted because parts of it have not yet been downloaded.",
+                    "multiple": "These features can't be deleted because parts of them have not yet been downloaded."
+                },
+                "has_wikidata_tag": {
+                    "single": "This feature can't be deleted because it has a Wikidata tag.",
+                    "multiple": "These features can't be deleted because some have Wikidata tags."
+                }
+            },
+            "downgrade": {
+                "title": "Downgrade",
+                "description": {
+                    "building_address": "Remove all non-address and non-building tags.",
+                    "building": "Remove all non-building tags.",
+                    "address": "Remove all non-address tags."
+                },
+                "annotation": {
+                    "building": {
+                        "single": "Downgraded a feature to a basic building.",
+                        "multiple": "Downgraded {n} features to basic buildings."
+                    },
+                    "address": {
+                        "single": "Downgraded a feature to an address.",
+                        "multiple": "Downgraded {n} features to addresses."
+                    },
+                    "multiple": "Downgraded {n} features."
+                },
+                "has_wikidata_tag": {
+                    "single": "This feature can't be downgraded because it has a Wikidata tag.",
+                    "multiple": "These features can't be downgraded because some have Wikidata tags."
                 }
             },
             "add_member": {
             "delete_member": {
                 "annotation": "Removed a member from a relation."
             },
+            "reorder_members": {
+                "annotation": "Reordered a relation's members."
+            },
             "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."
             "disconnect": {
                 "title": "Disconnect",
                 "description": "Disconnect these lines/areas from each other.",
+                "line": {
+                    "description": "Disconnect this line from other features."
+                },
+                "area": {
+                    "description": "Disconnect this area from other features."
+                },
                 "key": "D",
                 "annotation": "Disconnected lines/areas.",
+                "too_large": {
+                    "single": "This can't be disconnected because not enough of it is currently visible."
+                },
                 "not_connected": "There aren't enough lines/areas here to disconnect.",
+                "not_downloaded": "This can't be disconnected because parts of it have not yet been downloaded.",
                 "connected_to_hidden": "This can't be disconnected because it is connected to a hidden feature.",
                 "relation": "This can't be disconnected because it connects members of a relation."
             },
                 "restriction": "These features can't be merged because it would damage a \"{relation}\" relation.",
                 "relation": "These features can't be merged because they have conflicting relation roles.",
                 "incomplete_relation": "These features can't be merged because at least one hasn't been fully downloaded.",
-                "conflicting_tags": "These features can't be merged because some of their tags have conflicting values."
+                "conflicting_tags": "These features can't be merged because some of their tags have conflicting values.",
+                "paths_intersect": "These features can't be merged because the resulting path would intersect itself."
             },
             "move": {
                 "title": "Move",
                 "connected_to_hidden": {
                     "single": "This feature can't be moved because it is connected to a hidden feature.",
                     "multiple": "These features can't be moved because some are connected to hidden features."
+                },
+                "not_downloaded": {
+                    "single": "This feature can't be moved because parts of it have not yet been downloaded.",
+                    "multiple": "These features can't be moved because parts of them have not yet been downloaded."
                 }
             },
             "reflect": {
                 "connected_to_hidden": {
                     "single": "This feature can't be reflected because it is connected to a hidden feature.",
                     "multiple": "These features can't be reflected because some are connected to hidden features."
+                },
+                "not_downloaded": {
+                    "single": "This feature can't be reflected because parts of it have not yet been downloaded.",
+                    "multiple": "These features can't be reflected because parts of them have not yet been downloaded."
                 }
             },
             "rotate": {
                 "connected_to_hidden": {
                     "single": "This feature can't be rotated because it is connected to a hidden feature.",
                     "multiple": "These features can't be rotated because some are connected to hidden features."
+                },
+                "not_downloaded": {
+                    "single": "This feature can't be rotated because parts of it have not yet been downloaded.",
+                    "multiple": "These features can't be rotated because parts of them have not yet been downloaded."
                 }
             },
             "reverse": {
                     "create": "Added a turn restriction",
                     "delete": "Deleted a turn restriction"
                 }
+            },
+            "extract": {
+                "title": "Extract",
+                "key": "E",
+                "description": {
+                    "vertex": {
+                        "single": "Extract this point from its parent lines/areas."
+                    },
+                    "area": {
+                        "single": "Extract a point from this area."
+                    }
+                },
+                "annotation": {
+                    "single": "Extracted a point."
+                },
+                "too_large": {
+                    "area": {
+                        "single": "A point can't be extracted from this area because not enough of it is currently visible."
+                    }
+                },
+                "restriction": {
+                    "vertex": {
+                        "single": "This point can't be extracted because it would damage a \"{relation}\" relation."
+                    }
+                },
+                "connected_to_hidden": {
+                    "vertex": {
+                        "single": "This point can't be extracted 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",
             "created": "Created",
+            "outstanding_errors_message": "Please resolve all errors first. {count} remaining.",
+            "comment_needed_message": "Please add a changeset comment first.",
             "about_changeset_comments": "About changeset comments",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
             "google_warning": "You mentioned Google in this comment: remember that copying from Google Maps is strictly forbidden.",
                 "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": {
-            "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",
+            "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."
+            },
             "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",
+            "add_to_relation": "Add to a relation",
             "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",
+            "no_documentation_key": "There is no documentation available.",
+            "edit_reference": "edit/translate",
+            "wiki_reference": "View documentation",
+            "wiki_en_reference": "View documentation in English",
+            "hidden_preset": {
+                "manual": "{features} are hidden. Enable them in the Map Data pane.",
+                "zoom": "{features} are hidden. Zoom in to enable them."
+            },
             "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",
+            "reset_all": "Reset All",
             "display_options": "Display Options",
             "brightness": "Brightness",
             "contrast": "Contrast",
                 "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"
+                },
+                "improveOSM": {
+                    "tooltip": "Missing data automatically detected by improveosm.org",
+                    "title": "ImproveOSM 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",
             "autohidden": "These features have been automatically hidden because too many would be shown on the screen.  You can zoom in to edit them.",
             "osmhidden": "These features have been automatically hidden because the OpenStreetMap layer is hidden."
         },
+        "photo_overlays": {
+            "title": "Photo Overlays",
+            "traffic_signs": {
+                "title": "Traffic Signs"
+            },
+            "photo_type": {
+                "flat": {
+                    "title": "Flat Photos",
+                    "tooltip": "Traditional photos"
+                },
+                "panoramic": {
+                    "title": "Panoramic Photos",
+                    "tooltip": "360° photos"
+                }
+            }
+        },
         "feature": {
             "points": {
                 "description": "Points",
                 "description": "Buildings",
                 "tooltip": "Buildings, Shelters, Garages, etc."
             },
+            "building_parts": {
+                "description": "Building Parts",
+                "tooltip": "3D Building and Roof Components"
+            },
+            "indoor": {
+                "description": "Indoor Features",
+                "tooltip": "Rooms, Corridors, Stairwells, etc."
+            },
             "landuse": {
                 "description": "Landuse Features",
                 "tooltip": "Forests, Farmland, Parks, Residential, Commercial, etc."
                 "description": "Rail Features",
                 "tooltip": "Railways"
             },
+            "pistes": {
+                "description": "Pistes",
+                "tooltip": "Ski Slopes, Sled Runs, Ice Skating Trails, etc."
+            },
+            "aerialways": {
+                "description": "Aerial Features",
+                "tooltip": "Chair Lifts, Gondolas, Zip Lines, etc."
+            },
             "power": {
                 "description": "Power Features",
                 "tooltip": "Power Lines, Power Plants, Substations, etc."
             },
             "past_future": {
-                "description": "Past/Future",
+                "description": "Past/Future Features",
                 "tooltip": "Proposed, Construction, Abandoned, Demolished, etc."
             },
             "others": {
-                "description": "Others",
+                "description": "Other Features",
                 "tooltip": "Everything Else"
             }
         },
                 "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?",
             "just_edited": "You just edited OpenStreetMap!",
             "thank_you": "Thank you for improving the map.",
             "thank_you_location": "Thank you for improving the map around {where}.",
+            "thank_you_where": {
+                "format": "{place}{separator}{region}",
+                "separator": ", "
+            },
             "help_html": "Your changes should appear on OpenStreetMap within a few minutes. It may take longer for maps elsewhere to receive updates.",
             "help_link_text": "Details",
             "help_link_url": "https://wiki.openstreetmap.org/wiki/FAQ#I_have_just_made_some_changes_to_the_map._How_do_I_get_to_see_my_changes.3F",
             "on_wiki": "{tag} on wiki.osm.org",
             "used_with": "used with {type}"
         },
-        "validations": {
-            "disconnected_highway": "Disconnected highway",
-            "disconnected_highway_tooltip": "Roads should be connected to other roads or building entrances.",
-            "old_multipolygon": "Multipolygon tags on outer way",
-            "old_multipolygon_tooltip": "This style of multipolygon is deprecated. Please assign the tags to the parent multipolygon instead of the outer way.",
-            "untagged_point": "Untagged point",
-            "untagged_point_tooltip": "Select a feature type that describes what this point is.",
-            "untagged_line": "Untagged line",
-            "untagged_line_tooltip": "Select a feature type that describes what this line is.",
-            "untagged_area": "Untagged area",
-            "untagged_area_tooltip": "Select a feature type that describes what this area is.",
-            "untagged_relation": "Untagged relation",
-            "untagged_relation_tooltip": "Select a feature type that describes what this relation is.",
-            "many_deletions": "You're deleting {n} features: {p} nodes, {l} lines, {a} areas, {r} relations. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
-            "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
-            "deprecated_tags": "Deprecated tags: {tags}"
-        },
         "zoom": {
             "in": "Zoom in",
             "out": "Zoom out"
         },
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
-        "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": {
+            "improveOSM": {
+                "title": "ImproveOSM Detection",
+                "geometry_types": {
+                    "path": "paths",
+                    "parking": "parking",
+                    "road": "roads",
+                    "both": "roads and parking"
+                },
+                "directions": {
+                    "east": "east",
+                    "north": "north",
+                    "northeast": "northeast",
+                    "northwest": "northwest",
+                    "south": "south",
+                    "southeast": "southeast",
+                    "southwest": "southwest",
+                    "west": "west"
+                },
+                "error_types": {
+                    "ow": {
+                        "title": "Missing One-way",
+                        "description": "Along this section of {highway}, {percentage}% of {num_trips} recorded trips travel from {from_node} to {to_node}. There may be missing a \"oneway\" tag."
+                    },
+                    "mr": {
+                        "title": "Missing Geometry",
+                        "description": "{num_trips} recorded trips in this area suggest there may be unmapped {geometry_type} here.",
+                        "description_alt": "Data from a 3rd party suggests there may be unmapped {geometry_type} here."
+                    },
+                    "tr": {
+                        "title": "Missing Turn Restriction",
+                        "description": "{num_passed} of {num_trips} recorded trips (travelling {travel_direction}) make a turn from {from_way} to {to_way} at {junction}. There may be a missing \"{turn_restriction}\" restriction."
+                    }
+                }
+            },
+            "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}\"."
+                    }
+                }
+            }
         },
-        "mapillary_images": {
-            "tooltip": "Street-level photos from Mapillary",
-            "title": "Photo Overlay (Mapillary)"
+        "streetside": {
+            "tooltip": "Streetside photos from Microsoft",
+            "title": "Bing Streetside",
+            "report": "Report a privacy concern with this image",
+            "view_on_bing": "View on Bing Maps",
+            "hires": "High resolution"
         },
-        "mapillary_signs": {
-            "tooltip": "Traffic signs from Mapillary (must enable Photo Overlay)",
-            "title": "Traffic Sign Overlay (Mapillary)"
+        "mapillary_images": {
+            "tooltip": "Street-level photos from Mapillary"
         },
         "mapillary": {
+            "title": "Mapillary",
+            "signs": {
+                "tooltip": "Traffic signs from Mapillary"
+            },
             "view_on_mapillary": "View this image on Mapillary"
         },
         "openstreetcam_images": {
-            "tooltip": "Street-level photos from OpenStreetCam",
-            "title": "Photo Overlay (OpenStreetCam)"
+            "tooltip": "Street-level photos from OpenStreetCam"
         },
         "openstreetcam": {
+            "title": "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/) and [ImproveOSM](https://improveosm.org/en/). Expect iD to support [Osmose](https://osmose.openstreetmap.fr/) 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",
                 }
             }
         },
+        "issues": {
+            "title": "Issues",
+            "key": "I",
+            "list_title": "Issues ({count})",
+            "errors": {
+                "list_title": "Errors ({count})"
+            },
+            "warnings": {
+                "list_title": "Warnings ({count})"
+            },
+            "rules": {
+                "title": "Rules"
+            },
+            "no_issues": {
+                "message": {
+                    "everything": "Everything looks fine",
+                    "everything_in_view": "Everything in view looks fine",
+                    "edits": "Your edits look fine",
+                    "edits_in_view": "Your edits in view look fine"
+                },
+                "hidden_issues": {
+                    "none": "Detected issues will appear here",
+                    "elsewhere": "Issues elsewhere: {count}",
+                    "other_features": "Issues with other features: {count}",
+                    "other_features_elsewhere": "Issues elsewhere with other features: {count}",
+                    "disabled_rules": "Issues with disabled rules: {count}",
+                    "disabled_rules_elsewhere": "Issues elsewhere with disabled rules: {count}",
+                    "ignored_issues": "Ignored issues: {count}",
+                    "ignored_issues_elsewhere": "Ignored issues elsewhere: {count}"
+                }
+            },
+            "options": {
+                "what": {
+                    "title": "Check:",
+                    "edited": "My Edits",
+                    "all": "Everything"
+                },
+                "where": {
+                    "title": "Where:",
+                    "visible": "In View",
+                    "all": "Everywhere"
+                }
+            },
+            "suggested": "Suggested updates:",
+            "enable_all": "Enable All",
+            "disable_all": "Disable All",
+            "reset_ignored": "Reset Ignored ({count})",
+            "fix_one": {
+                "title": "fix"
+            },
+            "fix_all": {
+                "title": "Fix All",
+                "annotation": "Fixed several validation issues."
+            },
+            "almost_junction": {
+                "title": "Almost Junctions",
+                "message": "{feature} is very close but not connected to {feature2}",
+                "tip": "Find features that should possibly be connected to other nearby features",
+                "self": {
+                    "message": "{feature} ends very close to itself but does not reconnect"
+                },
+                "highway-highway": {
+                    "reference": "Intersecting highways should share a junction vertex."
+                }
+            },
+            "close_nodes": {
+                "title": "Very Close Points",
+                "tip": "Find redundant and crowded points",
+                "message": "Two points in {way} are very close together",
+                "reference": "Redundant points in a way should be merged or moved apart.",
+                "detached": {
+                    "message": "{feature} is too close to {feature2}",
+                    "reference": "Separate points should not share a location."
+                }
+            },
+            "crossing_ways": {
+                "title": "Crossings Ways",
+                "message": "{feature} crosses {feature2}",
+                "tip": "Find features that incorrectly cross over one another",
+                "building-building": {
+                    "reference": "Buildings should not intersect except on different layers."
+                },
+                "building-highway": {
+                    "reference": "Highways crossing buildings should use bridges, tunnels, coverings, or entrances."
+                },
+                "building-railway": {
+                    "reference": "Railways crossing buildings should use bridges or tunnels."
+                },
+                "building-waterway": {
+                    "reference": "Waterways crossing buildings should use tunnels or different layers."
+                },
+                "highway-highway": {
+                    "reference": "Crossing highways should use bridges, tunnels, or intersections."
+                },
+                "highway-railway": {
+                    "reference": "Highways crossing railways should use bridges, tunnels, or level crossings."
+                },
+                "highway-waterway": {
+                    "reference": "Highways crossing waterways should use bridges, tunnels, or fords."
+                },
+                "railway-railway": {
+                    "reference": "Crossing railways should be connected or use bridges or tunnels."
+                },
+                "railway-waterway": {
+                    "reference": "Railways crossing waterways should use bridges or tunnels."
+                },
+                "waterway-waterway": {
+                    "reference": "Crossing waterways should be connected or use tunnels."
+                },
+                "tunnel-tunnel": {
+                    "reference": "Crossing tunnels should use different layers."
+                },
+                "tunnel-tunnel_connectable": {
+                    "reference": "Crossing tunnels should be connected or use different layers."
+                },
+                "bridge-bridge": {
+                    "reference": "Crossing bridges should use different layers."
+                },
+                "bridge-bridge_connectable": {
+                    "reference": "Crossing bridges should be connected or use different layers."
+                },
+                "indoor-indoor": {
+                    "reference": "Crossing indoor features should use different levels."
+                },
+                "indoor-indoor_connectable": {
+                    "reference": "Crossing indoor features should be connected or use different levels."
+                }
+            },
+            "disconnected_way": {
+                "title": "Disconnected Ways",
+                "tip": "Find unroutable roads, paths, and ferry routes",
+                "routable": {
+                    "message": {
+                        "multiple": "{count} routable features are connected only to each other."
+                    },
+                    "reference": "All roads, paths, and ferry routes should connect to form a single routing network."
+                },
+                "highway": {
+                    "message": "{highway} is disconnected from other roads and paths"
+                }
+            },
+            "fixme_tag": {
+                "title": "\"Fix Me\" Requests",
+                "message": "{feature} has a \"Fix Me\" request",
+                "tip": "Find features with \"fixme\" tags",
+                "reference": "A \"fixme\" tag indicates that a mapper has requested help with a feature."
+            },
+            "generic_name": {
+                "title": "Suspicious Names",
+                "message": "{feature} has the suspicious name \"{name}\"",
+                "tip": "Find features with generic or suspicious names",
+                "reference": "Names should be the actual, on-the-ground names of features."
+            },
+            "incompatible_source": {
+                "title": "Suspicious Sources",
+                "tip": "Find features with suspicious source tags",
+                "google": {
+                    "feature": {
+                        "message": "{feature} lists Google as a data source"
+                    },
+                    "reference": "Google products are proprietary and must not be used as references."
+                }
+            },
+            "invalid_format": {
+                "title": "Invalid Formatting",
+                "tip": "Find tags with unexpected formats",
+                "email": {
+                    "message": "{feature} has an invalid email address.",
+                    "message_multi": "{feature} has multiple invalid email addresses.",
+                    "reference": "Email addresses must look like \"user@example.com\"."
+                },
+                "website": {
+                    "message": "{feature} has an invalid website.",
+                    "message_multi": "{feature} has multiple invalid websites.",
+                    "reference": "Websites should start with \"http\" or \"https\"."
+                }
+            },
+            "missing_role": {
+                "title": "Missing Roles",
+                "message": "{member} has no role within {relation}",
+                "tip": "Find relations with missing or incorrect member roles",
+                "multipolygon": {
+                    "reference": "Multipolygon members must have an inner or outer role."
+                }
+            },
+            "missing_tag": {
+                "title": "Missing Tags",
+                "tip": "Find features that are missing descriptive tags",
+                "reference": "Features must have tags that define what they are.",
+                "any": {
+                    "message": "{feature} has no tags"
+                },
+                "descriptive": {
+                    "message": "{feature} has no descriptive tags"
+                },
+                "relation_type": {
+                    "message": "{feature} is a relation without a type"
+                }
+            },
+            "old_multipolygon": {
+                "message": "{multipolygon} has misplaced tags",
+                "reference": "Multipolygons should be tagged on their relation, not their outer way."
+            },
+            "outdated_tags": {
+                "title": "Outdated Tags",
+                "message": "{feature} has outdated tags",
+                "tip": "Find features with deprecated tags that can be updated",
+                "reference": "Some tags change over time and should be updated.",
+                "incomplete": {
+                    "message": "{feature} has incomplete tags",
+                    "reference": "Some features should have additional tags."
+                },
+                "noncanonical_brand": {
+                    "message": "{feature} looks like a brand with nonstandard tags",
+                    "reference": "All features of the same brand should be tagged the same way."
+                }
+            },
+            "private_data": {
+                "title": "Private Information",
+                "tip": "Find features that may contain private information",
+                "reference": "Sensitive data like personal phone numbers should not be tagged.",
+                "contact": {
+                    "message": "{feature} might be tagged with private contact information"
+                }
+            },
+            "tag_suggests_area": {
+                "title": "Lines Tagged as Areas",
+                "message": "{feature} should be a closed area based on the tag \"{tag}\"",
+                "tip": "Find features that are tagged as lines and should possibly be tagged as areas",
+                "reference": "Areas must have connected endpoints."
+            },
+            "unknown_road": {
+                "message": "{feature} has no classification",
+                "reference": "Roads without a specific type may not appear in maps or routing."
+            },
+            "impossible_oneway": {
+                "title": "Impossible One-Ways",
+                "tip": "Find route issues with one-way features",
+                "waterway": {
+                    "connected": {
+                        "start": {
+                            "message": "{feature} flows away from a connected waterway"
+                        },
+                        "end": {
+                            "message": "{feature} flows against a connected waterway"
+                        },
+                        "reference": "Waterway segments should all flow in the same direction."
+                    }
+                },
+                "highway": {
+                    "start": {
+                        "message": "{feature} is unreachable",
+                        "reference": "One-way roads must be accessible via other roads."
+                    },
+                    "end": {
+                        "message": "{feature} has no outlet",
+                        "reference": "One-way roads must lead to other roads."
+                    }
+                }
+            },
+            "unsquare_way": {
+                "title": "Unsquare Corners (up to {val}°)",
+                "message": "{feature} has unsquare corners",
+                "tip": "Find features with unsquare corners that can be drawn better",
+                "buildings": {
+                    "reference": "Buildings with unsquare corners can often be drawn more accurately."
+                }
+            },
+            "fix": {
+                "connect_almost_junction": {
+                    "annotation": "Connected very close features."
+                },
+                "connect_crossing_features": {
+                    "annotation": "Connected crossing features."
+                },
+                "connect_endpoints": {
+                    "title": "Connect the ends",
+                    "annotation": "Connected the endpoints of a way."
+                },
+                "connect_feature": {
+                    "title": "Connect this feature"
+                },
+                "connect_features": {
+                    "title": "Connect the features"
+                },
+                "continue_from_start": {
+                    "title": "Continue drawing from start"
+                },
+                "continue_from_end": {
+                    "title": "Continue drawing from end"
+                },
+                "delete_feature": {
+                    "title": "Delete this feature"
+                },
+                "ignore_issue": {
+                    "title": "Ignore this issue"
+                },
+                "merge_close_vertices": {
+                    "annotation": "Merged very close points in a way."
+                },
+                "merge_points": {
+                    "title": "Merge these points"
+                },
+                "move_points_apart": {
+                    "title": "Move these points apart"
+                },
+                "move_tags": {
+                    "title": "Move the tags",
+                    "annotation": "Moved tags."
+                },
+                "remove_from_relation": {
+                    "title": "Remove from relation"
+                },
+                "remove_generic_name": {
+                    "title": "Remove the name",
+                    "annotation": "Removed a generic name."
+                },
+                "remove_private_info": {
+                    "annotation": "Removed private information."
+                },
+                "remove_proprietary_data": {
+                    "title": "Remove any proprietary data"
+                },
+                "remove_tag": {
+                    "title": "Remove the tag",
+                    "annotation": "Removed tag."
+                },
+                "remove_tags": {
+                    "title": "Remove the tags"
+                },
+                "reposition_features": {
+                    "title": "Reposition the features"
+                },
+                "reverse_feature": {
+                    "title": "Reverse this feature"
+                },
+                "select_preset": {
+                    "title": "Select a feature type"
+                },
+                "select_road_type": {
+                    "title": "Select a road type"
+                },
+                "set_as_inner": {
+                    "title": "Set as inner"
+                },
+                "set_as_outer": {
+                    "title": "Set as outer"
+                },
+                "square_feature": {
+                    "title": "Square this feature"
+                },
+                "tag_as_disconnected": {
+                    "title": "Tag as disconnected",
+                    "annotation": "Tagged very close features as disconnected."
+                },
+                "tag_as_unsquare": {
+                    "title": "Tag as physically unsquare",
+                    "annotation": "Tagged a way as having unsquare corners."
+                },
+                "tag_this_as_higher": {
+                    "title": "Tag this as higher"
+                },
+                "tag_this_as_lower": {
+                    "title": "Tag this as lower"
+                },
+                "upgrade_tags": {
+                    "title": "Upgrade the tags",
+                    "annotation": "Upgraded old tags."
+                },
+                "use_bridge_or_tunnel": {
+                    "title": "Use a bridge or tunnel"
+                },
+                "use_different_layers": {
+                    "title": "Use different layers"
+                },
+                "use_different_levels": {
+                    "title": "Use different levels"
+                },
+                "use_tunnel": {
+                    "title": "Use a tunnel"
+                }
+            }
+        },
         "intro": {
             "done": "done",
             "ok": "OK",
                     "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",
+                    "osm_data": "Toggle OpenStreetMap data",
                     "minimap": "Toggle minimap"
                 },
                 "selecting": {
                 },
                 "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",
                 "title": "Editing",
                 "drawing": {
                     "title": "Drawing",
+                    "focus_add_feature": "Focus the feature search field",
                     "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",
+                    "add_favorite": "Add a favorite feature",
+                    "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",
+                    "extract": "Extract a point from a feature",
                     "split": "Split a line into two at the selected node",
                     "reverse": "Reverse a line",
                     "move": "Move selected features",
                     "rotate": "Rotate selected features",
-                    "orthogonalize": "Straighten line / Square area corners",
+                    "orthogonalize": "Square corners of a line or area",
+                    "straighten": "Straighten a line or points",
                     "circularize": "Circularize a closed line or area",
                     "reflect_long": "Reflect features across the longer axis",
                     "reflect_short": "Reflect features across the shorter axis",
             "coordinate": "{coordinate}{direction}",
             "coordinate_pair": "{latitude}, {longitude}"
         },
+        "wikidata": {
+            "identifier": "Identifier",
+            "label": "Label",
+            "description": "Description"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
                 "category-landuse": {
                     "name": "Land Use Features"
                 },
-                "category-natural-area": {
-                    "name": "Natural Features"
-                },
-                "category-natural-line": {
-                    "name": "Natural Features"
-                },
-                "category-natural-point": {
+                "category-natural": {
                     "name": "Natural Features"
                 },
                 "category-path": {
-                    "name": "Path Features"
+                    "name": "Paths"
                 },
                 "category-rail": {
-                    "name": "Rail Features"
+                    "name": "Rails"
                 },
                 "category-restriction": {
                     "name": "Restriction Features"
                 },
-                "category-road": {
-                    "name": "Road Features"
+                "category-road_major": {
+                    "name": "Major Roads"
+                },
+                "category-road_minor": {
+                    "name": "Minor Roads"
+                },
+                "category-road_service": {
+                    "name": "Service Roads"
                 },
                 "category-route": {
                     "name": "Route Features"
                 },
-                "category-water-area": {
-                    "name": "Water Features"
+                "category-utility": {
+                    "name": "Utility Features"
+                },
+                "category-water": {
+                    "name": "Water Bodies"
                 },
-                "category-water-line": {
-                    "name": "Water Features"
+                "category-waterway": {
+                    "name": "Waterways"
                 }
             },
             "fields": {
                     "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"
                         }
                     }
                 },
                 "agrarian": {
                     "label": "Products"
                 },
+                "air_conditioning": {
+                    "label": "Air Conditioning"
+                },
                 "amenity": {
                     "label": "Type"
                 },
                 "animal_shelter": {
                     "label": "For Animals"
                 },
+                "architect": {
+                    "label": "Architect"
+                },
                 "area/highway": {
                     "label": "Type"
                 },
                 "atm": {
                     "label": "ATM"
                 },
+                "attraction": {
+                    "label": "Type"
+                },
                 "backrest": {
                     "label": "Backrest"
                 },
+                "bar": {
+                    "label": "Bar"
+                },
                 "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/levels_building": {
+                    "label": "Building Levels",
+                    "placeholder": "2, 4, 6..."
+                },
+                "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)"
                 "construction": {
                     "label": "Type"
                 },
+                "consulate": {
+                    "label": "Type"
+                },
                 "contact/webcam": {
                     "label": "Webcam URL",
                     "placeholder": "http://example.com/"
                 "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"
                 },
                 "denotation": {
                     "label": "Denotation"
                 },
+                "departures_board": {
+                    "label": "Departures Board",
+                    "options": {
+                        "yes": "Yes",
+                        "timetable": "Timetable",
+                        "realtime": "Realtime",
+                        "no": "None"
+                    }
+                },
                 "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..."
                 },
+                "diameter": {
+                    "label": "Diameter",
+                    "placeholder": "5 mm, 10 cm, 15 in…"
+                },
                 "diaper": {
                     "label": "Diaper Changing Available"
                 },
+                "diet_multi": {
+                    "label": "Diet Types"
+                },
+                "diplomatic": {
+                    "label": "Type"
+                },
+                "diplomatic/services": {
+                    "label": "Services"
+                },
                 "direction_cardinal": {
                     "label": "Direction",
                     "options": {
                     }
                 },
                 "direction_vertex": {
-                    "label": "Direction",
+                    "label": "Direction Affected",
                     "options": {
                         "forward": "Forward",
                         "backward": "Backward",
                     "label": "Display"
                 },
                 "distance": {
-                    "label": "Total Distance"
+                    "label": "Distance"
                 },
                 "dock": {
                     "label": "Type"
                 },
+                "dog": {
+                    "label": "Dogs",
+                    "options": {
+                        "yes": "Allowed",
+                        "leashed": "Leashed Only",
+                        "no": "Not Allowed"
+                    }
+                },
+                "door_type": {
+                    "label": "Type"
+                },
+                "door": {
+                    "label": "Door"
+                },
                 "drive_through": {
                     "label": "Drive-Through"
                 },
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "embassy": {
+                    "label": "Type"
+                },
+                "emergency_combo": {
+                    "label": "Type"
+                },
                 "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"
+                },
+                "fishing": {
+                    "label": "Fishing"
+                },
                 "fitness_station": {
                     "label": "Equipment Type"
                 },
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "flag/type": {
+                    "label": "Flag Type"
+                },
+                "floating": {
+                    "label": "Floating"
+                },
+                "flood_prone": {
+                    "label": "Flood Prone"
+                },
                 "ford": {
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "frequency_electrified": {
+                    "label": "Operating Frequency"
+                },
                 "frequency": {
                     "label": "Operating Frequency"
                 },
+                "from": {
+                    "label": "From"
+                },
                 "fuel_multi": {
                     "label": "Fuel Types"
                 },
                 "grape_variety": {
                     "label": "Grape Varieties"
                 },
+                "guest_house": {
+                    "label": "Type"
+                },
                 "handicap": {
                     "label": "Handicap",
                     "placeholder": "1-18"
                 "healthcare/speciality": {
                     "label": "Specialties"
                 },
+                "height_building": {
+                    "label": "Building Height (Meters)"
+                },
                 "height": {
                     "label": "Height (Meters)"
                 },
+                "highspeed": {
+                    "label": "High-Speed"
+                },
                 "highway": {
                     "label": "Type"
                 },
                 "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..."
                 "incline": {
                     "label": "Incline"
                 },
+                "indoor_type": {
+                    "label": "Type"
+                },
                 "indoor": {
                     "label": "Indoor"
                 },
                 "inscription": {
                     "label": "Inscription"
                 },
+                "intermittent_yes": {
+                    "label": "Intermittent"
+                },
                 "intermittent": {
                     "label": "Intermittent"
                 },
                     "label": "Internet Access Fee"
                 },
                 "internet_access/ssid": {
-                    "label": "SSID (Network Name)"
+                    "label": "Wifi Network Name"
+                },
+                "interval": {
+                    "label": "Interval"
+                },
+                "junction_line": {
+                    "label": "Junction",
+                    "options": {
+                        "roundabout": "Roundabout",
+                        "circular": "Traffic Circle",
+                        "jughandle": "Jughandle"
+                    }
+                },
+                "junction/ref_oneway": {
+                    "label": "Junction Number"
                 },
                 "kerb": {
                     "label": "Curb"
                 },
+                "kerb/height": {
+                    "label": "Height"
+                },
                 "label": {
                     "label": "Label"
                 },
                     "label": "Lanes",
                     "placeholder": "1, 2, 3..."
                 },
+                "language_multi": {
+                    "label": "Languages"
+                },
                 "layer": {
                     "label": "Layer",
                     "placeholder": "0"
                     "label": "Levels",
                     "placeholder": "2, 4, 6..."
                 },
+                "liaison": {
+                    "label": "Type"
+                },
                 "lit": {
                     "label": "Lit"
                 },
+                "location_pool": {
+                    "label": "Location",
+                    "options": {
+                        "outdoor": "Outdoor",
+                        "indoor": "Indoor",
+                        "roof": "Rooftop"
+                    }
+                },
                 "location": {
                     "label": "Location"
                 },
+                "lock": {
+                    "label": "Lock"
+                },
                 "man_made": {
                     "label": "Type"
                 },
                 "manhole": {
                     "label": "Type"
                 },
+                "manufacturer": {
+                    "label": "Manufacturer"
+                },
                 "map_size": {
                     "label": "Coverage"
                 },
                 "map_type": {
                     "label": "Type"
                 },
+                "material": {
+                    "label": "Material"
+                },
                 "maxheight": {
                     "label": "Max Height",
                     "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
                 "maxstay": {
                     "label": "Max Stay"
                 },
+                "maxweight_bridge": {
+                    "label": "Max Weight"
+                },
                 "maxweight": {
                     "label": "Max Weight"
                 },
                 "memorial": {
                     "label": "Type"
                 },
+                "microbrewery": {
+                    "label": "Microbrewery"
+                },
+                "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"
+                    "label": "Hours",
+                    "placeholder": "Unknown"
                 },
                 "operator": {
                     "label": "Operator"
                         "lane": "Roadside Lane"
                     }
                 },
+                "payment_multi_fee": {
+                    "label": "Payment Types"
+                },
                 "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": {
                     "label": "Power Output",
                     "placeholder": "500 MW, 1000 MW, 2000 MW..."
                 },
+                "playground": {
+                    "label": "Type"
+                },
                 "playground/baby": {
                     "label": "Baby Seat"
                 },
                     "placeholder": "Distance to one decimal (123.4)"
                 },
                 "railway/signal/direction": {
-                    "label": "Direction",
+                    "label": "Direction Affected",
                     "options": {
                         "forward": "Forward",
                         "backward": "Backward",
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
+                "recycling_type": {
+                    "label": "Type",
+                    "placeholder": "Container, Center",
+                    "options": {
+                        "container": "Container",
+                        "centre": "Center"
+                    }
+                },
                 "ref_aeroway_gate": {
                     "label": "Gate Number"
                 },
                 "ref_road_number": {
                     "label": "Road Number"
                 },
+                "ref_room_number": {
+                    "label": "Room Number"
+                },
                 "ref_route": {
                     "label": "Route Number"
                 },
                 "religion": {
                     "label": "Religion"
                 },
+                "reservation": {
+                    "label": "Reservations",
+                    "options": {
+                        "yes": "Accepted",
+                        "no": "Not Accepted",
+                        "required": "Required",
+                        "recommended": "Recommended"
+                    }
+                },
+                "resort": {
+                    "label": "Type"
+                },
+                "resource": {
+                    "label": "Resources"
+                },
                 "restriction": {
                     "label": "Type"
                 },
                 "restrictions": {
                     "label": "Turn Restrictions"
                 },
+                "roof/colour": {
+                    "label": "Roof Color"
+                },
+                "room": {
+                    "label": "Type"
+                },
                 "rooms": {
                     "label": "Rooms"
                 },
                         "difficult_alpine_hiking": "T6: Difficult Alpine Hiking"
                     }
                 },
+                "salt": {
+                    "label": "Salt"
+                },
                 "sanitary_dump_station": {
                     "label": "Toilet Disposal"
                 },
+                "screen": {
+                    "label": "Screens",
+                    "placeholder": "1, 4, 8…"
+                },
+                "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",
                         "only": "Only"
                     }
                 },
+                "self_service": {
+                    "label": "Self-Service"
+                },
                 "service_rail": {
                     "label": "Service Type",
                     "options": {
                 "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"
                 },
                         "minor": "Minor Road"
                     }
                 },
+                "street_cabinet": {
+                    "label": "Type"
+                },
                 "structure_waterway": {
                     "label": "Structure",
                     "placeholder": "Unknown",
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "survey/date": {
+                    "label": "Last Survey Date"
+                },
+                "swimming_pool": {
+                    "label": "Type"
+                },
                 "switch": {
                     "label": "Type",
                     "options": {
                         "only": "Takeaway Only"
                     }
                 },
+                "target": {
+                    "label": "Target"
+                },
+                "tidal": {
+                    "label": "Tidal"
+                },
+                "to": {
+                    "label": "To"
+                },
                 "toilets/disposal": {
                     "label": "Disposal",
                     "options": {
                         "flush": "Flush",
-                        "pitlatrine": "Pit/Latrine",
+                        "pitlatrine": "Pit Latrine",
                         "chemical": "Chemical",
                         "bucket": "Bucket"
                     }
                 },
+                "toilets/handwashing": {
+                    "label": "Handwashing"
+                },
+                "toilets/position": {
+                    "label": "Positions"
+                },
                 "toll": {
                     "label": "Toll"
                 },
                 "tomb": {
                     "label": "Type"
                 },
-                "tourism_attraction": {
-                    "label": "Tourism"
-                },
                 "tourism": {
                     "label": "Type"
                 },
                 "traffic_calming": {
                     "label": "Type"
                 },
+                "traffic_sign": {
+                    "label": "Traffic Sign"
+                },
+                "traffic_sign/direction": {
+                    "label": "Direction Affected",
+                    "options": {
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "both": "Both / All"
+                    }
+                },
                 "traffic_signals": {
                     "label": "Type"
                 },
                 "traffic_signals/direction": {
-                    "label": "Direction",
+                    "label": "Direction Affected",
                     "options": {
                         "forward": "Forward",
                         "backward": "Backward",
                 "trees": {
                     "label": "Trees"
                 },
+                "trench": {
+                    "label": "Type"
+                },
+                "trolley_wire": {
+                    "label": "Overhead Trolley Wires"
+                },
                 "tunnel": {
                     "label": "Type",
                     "placeholder": "Default"
                         "tourism": "Tourism"
                     }
                 },
+                "valve": {
+                    "label": "Type"
+                },
                 "vending": {
                     "label": "Types of Goods"
                 },
                         "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"
                 },
                 },
                 "website": {
                     "label": "Website",
-                    "placeholder": "http://example.com/"
+                    "placeholder": "https://example.com"
                 },
                 "wetland": {
                     "label": "Type"
                 "width": {
                     "label": "Width (Meters)"
                 },
+                "wikidata": {
+                    "label": "Wikidata"
+                },
                 "wikipedia": {
                     "label": "Wikipedia"
                 },
             "presets": {
                 "aerialway": {
                     "name": "Aerialway",
-                    "terms": "ski lift,funifor,funitel"
+                    "terms": ""
                 },
                 "aeroway": {
                     "name": "Aeroway",
                     "name": "Amenity",
                     "terms": ""
                 },
-                "circular": {
-                    "name": "Traffic Circle",
+                "attraction": {
+                    "name": "Attraction",
+                    "terms": ""
+                },
+                "boundary": {
+                    "name": "Boundary",
+                    "terms": ""
+                },
+                "building_point": {
+                    "name": "Building",
+                    "terms": ""
+                },
+                "embankment": {
+                    "name": "Embankment",
+                    "terms": ""
+                },
+                "emergency": {
+                    "name": "Emergency Feature",
                     "terms": ""
                 },
                 "highway": {
                     "name": "Highway",
                     "terms": ""
                 },
+                "indoor": {
+                    "name": "Indoor Feature",
+                    "terms": ""
+                },
+                "landuse": {
+                    "name": "Land Use",
+                    "terms": ""
+                },
+                "leisure": {
+                    "name": "Leisure",
+                    "terms": ""
+                },
+                "man_made": {
+                    "name": "Man Made",
+                    "terms": ""
+                },
+                "natural": {
+                    "name": "Natural",
+                    "terms": ""
+                },
                 "place": {
                     "name": "Place",
                     "terms": ""
                 },
+                "playground": {
+                    "name": "Playground Equipment",
+                    "terms": ""
+                },
                 "power": {
                     "name": "Power",
                     "terms": ""
                     "name": "Railway",
                     "terms": ""
                 },
-                "roundabout": {
-                    "name": "Roundabout",
+                "seamark": {
+                    "name": "Seamark",
+                    "terms": ""
+                },
+                "tourism": {
+                    "name": "Tourism",
                     "terms": ""
                 },
                 "waterway": {
                     "name": "Goods Aerialway",
                     "terms": ""
                 },
+                "aerialway/j-bar": {
+                    "name": "J-bar Lift",
+                    "terms": "jbar"
+                },
                 "aerialway/magic_carpet": {
                     "name": "Magic Carpet Lift",
                     "terms": ""
                     "name": "T-bar Lift",
                     "terms": "tbar"
                 },
+                "aerialway/zip_line": {
+                    "name": "Zip Line",
+                    "terms": "aerial runway,canopy,flying fox,foefie slide,gravity propelled aerial ropeslide,Tyrolean traverse,zip wire,zip-line,zipline,zipwire"
+                },
                 "aeroway/aerodrome": {
                     "name": "Airport",
-                    "terms": "airplane,airport,aerodrome"
+                    "terms": "aerodrome,aeroway,airplane,airport,jet,plane"
                 },
                 "aeroway/apron": {
                     "name": "Apron",
                     "name": "Helipad",
                     "terms": "helicopter,helipad,heliport"
                 },
+                "aeroway/jet_bridge": {
+                    "name": "Jet Bridge",
+                    "terms": "aerobridge,air jetty,airbridge,finger,gangway,jet way,jetway,passenger boarding bridge,PBB,portal,skybridge,terminal gate connector"
+                },
                 "aeroway/runway": {
                     "name": "Runway",
                     "terms": "landing strip"
                     "name": "Airport Terminal",
                     "terms": "airport,aerodrome"
                 },
+                "aeroway/windsock": {
+                    "name": "Windsock",
+                    "terms": ""
+                },
                 "allotments/plot": {
                     "name": "Community Garden Plot",
                     "terms": ""
                     "name": "Coworking Space",
                     "terms": ""
                 },
+                "amenity/embassy": {
+                    "name": "Embassy",
+                    "terms": ""
+                },
                 "amenity/ferry_terminal": {
                     "name": "Ferry Station / Terminal",
                     "terms": ""
                     "name": "Nursing Home",
                     "terms": ""
                 },
+                "amenity/recycling": {
+                    "name": "Recycling",
+                    "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
+                },
                 "amenity/register_office": {
                     "name": "Register Office",
                     "terms": ""
                 },
                 "amenity/animal_shelter": {
                     "name": "Animal Shelter",
-                    "terms": "adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca"
+                    "terms": "adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca,pound"
                 },
                 "amenity/arts_centre": {
                     "name": "Arts Center",
                     "name": "Bar",
                     "terms": "dive,beer,bier,booze"
                 },
+                "amenity/bar/lgbtq": {
+                    "name": "LGBTQ+ Bar",
+                    "terms": "gay bar,lesbian bar,lgbtq bar,lgbt bar,lgb bar"
+                },
                 "amenity/bbq": {
                     "name": "Barbecue/Grill",
                     "terms": "bbq,grill"
                 },
                 "amenity/bench": {
                     "name": "Bench",
-                    "terms": "seat"
+                    "terms": "seat,chair"
                 },
                 "amenity/bicycle_parking": {
                     "name": "Bicycle Parking",
                     "terms": "bike"
                 },
+                "amenity/bicycle_parking/building": {
+                    "name": "Bicycle Parking Garage",
+                    "terms": "Multi-Storey Bicycle Park,Multi-Storey Bike Park,Bike Parking Station"
+                },
+                "amenity/bicycle_parking/lockers": {
+                    "name": "Bicycle Lockers",
+                    "terms": "Bike Lockers"
+                },
+                "amenity/bicycle_parking/shed": {
+                    "name": "Bicycle Shed",
+                    "terms": "Bike Shed"
+                },
                 "amenity/bicycle_rental": {
                     "name": "Bicycle Rental",
-                    "terms": "bike"
+                    "terms": "bike,bicycle,bikeshare,bike share,bicycle share,hub,dock"
                 },
                 "amenity/bicycle_repair_station": {
                     "name": "Bicycle Repair Tool Stand",
-                    "terms": "bike,repair,chain,pump"
+                    "terms": "bike,repair,chain,pump,tools,stand,multitool"
                 },
                 "amenity/biergarten": {
-                    "name": "Beer Garden",
+                    "name": "Biergarten",
                     "terms": "beer,bier,booze"
                 },
                 "amenity/boat_rental": {
                 },
                 "amenity/clock": {
                     "name": "Clock",
-                    "terms": ""
+                    "terms": "time"
+                },
+                "amenity/clock/sundial": {
+                    "name": "Sundial",
+                    "terms": "gnomon,shadow"
                 },
                 "amenity/college": {
                     "name": "College Grounds",
-                    "terms": "university"
+                    "terms": "university,undergraduate school"
                 },
                 "amenity/community_centre": {
                     "name": "Community Center",
                     "terms": "event,hall"
                 },
+                "amenity/community_centre/lgbtq": {
+                    "name": "LGBTQ+ Community Center",
+                    "terms": "lgbtq event,lgbtq hall,lgbt event,lgbt hall,lgb event,lgb hall"
+                },
                 "amenity/compressed_air": {
                     "name": "Compressed Air",
                     "terms": ""
                 },
+                "amenity/conference_centre": {
+                    "name": "Convention Center",
+                    "terms": "auditorium,conference,exhibition,exposition,lecture"
+                },
                 "amenity/courthouse": {
                     "name": "Courthouse",
                     "terms": ""
                     "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",
                     "terms": ""
                 },
-                "amenity/embassy": {
-                    "name": "Embassy",
-                    "terms": ""
+                "amenity/events_venue": {
+                    "name": "Events Venue",
+                    "terms": "banquet hall,baptism,Bar Mitzvah,Bat Mitzvah,birthdays,celebrations,conferences,confirmation,meetings,parties,party,quinceañera,reunions,weddings"
                 },
                 "amenity/fast_food": {
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
                 },
+                "amenity/fast_food/ice_cream": {
+                    "name": "Ice Cream Fast Food",
+                    "terms": ""
+                },
+                "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/donut": {
+                    "name": "Donut Fast Food",
+                    "terms": "breakfast,brunch,cafe,canteen,coffee,dine,diner,donut,doughnut,dining,eat,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/mexican": {
+                    "name": "Mexican Fast Food",
+                    "terms": "breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas"
+                },
+                "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": ""
                     "name": "Nightclub",
                     "terms": "disco*,night club,dancing,dance club"
                 },
+                "amenity/nightclub/lgbtq": {
+                    "name": "LGBTQ+ Nightclub",
+                    "terms": "gay nightclub,lesbian nightclub,lgbtq nightclub,lgbt nightclub,lgb nightclub"
+                },
                 "amenity/parking_entrance": {
                     "name": "Parking Garage Entrance/Exit",
                     "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/parking/underground": {
+                    "name": "Underground Parking",
+                    "terms": "automobile parking,car lot,car parking,rv parking,subsurface parking,truck parking,vehicle parking"
+                },
+                "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/photo_booth": {
+                    "name": "Photo Booth",
+                    "terms": "photobooth,photo,booth,kiosk,camera"
                 },
                 "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/christian/jehovahs_witness": {
+                    "name": "Kingdom Hall of Jehovah's Witnesses",
+                    "terms": "christian,church,house of God,house of prayer,house of worship"
+                },
+                "amenity/place_of_worship/christian/la_luz_del_mundo": {
+                    "name": "La Luz del Mundo Temple",
+                    "terms": "christian,church,house of God,house of prayer,house of worship,the light of the world church"
+                },
+                "amenity/place_of_worship/christian/quaker": {
+                    "name": "Quaker Friends Meeting House",
+                    "terms": "christian,church,house of God,house of prayer,house of worship"
+                },
                 "amenity/place_of_worship/hindu": {
                     "name": "Hindu Temple",
                     "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",
-                    "terms": "muslim"
+                    "name": "Muslim Mosque",
+                    "terms": "islam,islamic center,muslim"
                 },
                 "amenity/place_of_worship/shinto": {
                     "name": "Shinto Shrine",
                 },
                 "amenity/post_box": {
                     "name": "Mailbox",
-                    "terms": "letter,post"
+                    "terms": "letter drop,mail box,package drop,post box,postal box"
                 },
                 "amenity/post_office": {
                     "name": "Post Office",
                     "terms": "letter,mail"
                 },
+                "amenity/prep_school": {
+                    "name": "Test Prep / Tutoring School",
+                    "terms": "academic,ACT,SAT,homework,math,reading,test prep,tutoring,writing"
+                },
                 "amenity/prison": {
                     "name": "Prison Grounds",
-                    "terms": "cell,jail"
+                    "terms": "cell,jail,correction"
                 },
                 "amenity/pub": {
                     "name": "Pub",
                     "terms": "alcohol,drink,dive,beer,bier,booze"
                 },
+                "amenity/pub/lgbtq": {
+                    "name": "LGBTQ+ Pub",
+                    "terms": "gay pub,lesbian pub,lgbtq pub,lgbt pub,lgb pub"
+                },
+                "amenity/pub/microbrewery": {
+                    "name": "Brewpub",
+                    "terms": "alcohol,drink,dive,beer,bier,booze,craft brewery,microbrewery,small batch brewery"
+                },
                 "amenity/public_bath": {
                     "name": "Public Bath",
                     "terms": "onsen,foot bath,hot springs"
                     "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,public transit shelter,public transport shelter,tram stop shelter,waiting"
+                },
                 "amenity/shower": {
                     "name": "Shower",
                     "terms": "rain closet"
                     "name": "Smoking Area",
                     "terms": ""
                 },
+                "amenity/social_centre": {
+                    "name": "Social Center",
+                    "terms": "event,fraternal,fraternity,hall,organization,professional,society,sorority,union,vetern"
+                },
                 "amenity/social_facility": {
                     "name": "Social Facility",
                     "terms": ""
                 },
+                "amenity/social_facility/ambulatory_care": {
+                    "name": "Ambulatory Care",
+                    "terms": ""
+                },
                 "amenity/social_facility/food_bank": {
                     "name": "Food Bank",
                     "terms": ""
                     "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/toilets/disposal/flush": {
+                    "name": "Flush Toilets",
+                    "terms": "bathroom,head,lavatory,privy,restroom,water closet,WC,W.C."
+                },
+                "amenity/toilets/disposal/pitlatrine": {
+                    "name": "Pit Latrine",
+                    "terms": "head,lavatory,long drop,outhouse,pit toilet,privy"
+                },
                 "amenity/townhall": {
                     "name": "Town Hall",
                     "terms": "village,city,government,courthouse,municipal"
                 },
+                "amenity/toy_library": {
+                    "name": "Toy Library",
+                    "terms": "game,toy"
+                },
                 "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": ""
                 },
-                "amenity/vending_machine/news_papers": {
-                    "name": "Newspaper Vending Machine",
-                    "terms": "newspaper"
-                },
                 "amenity/vending_machine/cigarettes": {
                     "name": "Cigarette Vending Machine",
                     "terms": "cigarette"
                     "terms": "coin,crush,elongated,flatten,penny,souvenir"
                 },
                 "amenity/vending_machine/excrement_bags": {
-                    "name": "Excrement Bag Vending Machine",
-                    "terms": "excrement bags,poop,dog,animal"
+                    "name": "Excrement Bag Dispenser",
+                    "terms": "excrement bags,poop,waste,dog,animal"
                 },
                 "amenity/vending_machine/feminine_hygiene": {
                     "name": "Feminine Hygiene 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",
                 },
                 "area": {
                     "name": "Area",
-                    "terms": ""
+                    "terms": "polygon"
                 },
                 "area/highway": {
                     "name": "Road Surface",
-                    "terms": ""
+                    "terms": "area:highway,edge of pavement,highway area,highway shape,pavement,road shape,street area"
                 },
                 "attraction/amusement_ride": {
                     "name": "Amusement Ride",
                     "terms": "theme park,carnival ride"
                 },
                 "attraction/animal": {
-                    "name": "Animal",
-                    "terms": "zoo,theme park,animal park,lion,tiger,bear"
+                    "name": "Animal Enclosure",
+                    "terms": "amphibian,animal park,aquarium,bear,bird,fish,insect,lion,mammal,monkey,penguin,reptile,safari,theme park,tiger,zoo"
                 },
                 "attraction/big_wheel": {
                     "name": "Big Wheel",
                     "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": "Cattle Grid",
                     "terms": ""
                 },
+                "barrier/chain": {
+                    "name": "Chain",
+                    "terms": ""
+                },
                 "barrier/city_wall": {
                     "name": "City Wall",
                     "terms": ""
                     "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/height_restrictor": {
+                    "name": "Height Restrictor",
+                    "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/kerb/raised": {
+                    "name": "Raised Curb",
+                    "terms": ""
+                },
+                "barrier/kerb/rolled": {
+                    "name": "Rolled Curb",
+                    "terms": "gutter"
+                },
                 "barrier/kissing_gate": {
                     "name": "Kissing Gate",
                     "terms": ""
                     "name": "Retaining Wall",
                     "terms": ""
                 },
+                "barrier/sally_port": {
+                    "name": "Sally Port",
+                    "terms": "Postern,castle side gate"
+                },
                 "barrier/stile": {
                     "name": "Stile",
                     "terms": ""
                     "name": "Toll Booth",
                     "terms": ""
                 },
+                "barrier/turnstile": {
+                    "name": "Turnstile",
+                    "terms": "baffle gate,turnstyle"
+                },
                 "barrier/wall": {
                     "name": "Wall",
                     "terms": ""
                     "name": "Administrative Boundary",
                     "terms": ""
                 },
+                "bridge/support": {
+                    "name": "Bridge Support",
+                    "terms": ""
+                },
+                "bridge/support/pier": {
+                    "name": "Bridge Pier",
+                    "terms": ""
+                },
+                "building_part": {
+                    "name": "Building Part",
+                    "terms": "roof,simple 3D buildings"
+                },
                 "building": {
                     "name": "Building",
                     "terms": ""
                     "terms": ""
                 },
                 "building/train_station": {
-                    "name": "Train Station",
+                    "name": "Train Station Building",
                     "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": "Greenhouse",
                     "terms": ""
                 },
+                "building/hangar": {
+                    "name": "Hangar Building",
+                    "terms": ""
+                },
                 "building/hospital": {
                     "name": "Hospital Building",
                     "terms": ""
                     "name": "House",
                     "terms": "home,family,residence,dwelling"
                 },
+                "building/houseboat": {
+                    "name": "Houseboat",
+                    "terms": "home,family,residence,dwelling"
+                },
                 "building/hut": {
                     "name": "Hut",
                     "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": "Tailor",
                     "terms": "clothes,suit"
                 },
+                "craft/agricultural_engines": {
+                    "name": "Argricultural Engines Mechanic",
+                    "terms": ""
+                },
                 "craft/basket_maker": {
                     "name": "Basket Maker",
                     "terms": ""
                     "name": "Electronics Repair Shop",
                     "terms": ""
                 },
+                "craft/floorer": {
+                    "name": "Floorer",
+                    "terms": ""
+                },
                 "craft/gardener": {
                     "name": "Gardener",
                     "terms": "landscaper,grounds keeper"
                     "name": "Insulator",
                     "terms": ""
                 },
+                "craft/joiner": {
+                    "name": "Joiner",
+                    "terms": "furniture"
+                },
                 "craft/key_cutter": {
                     "name": "Key Cutter",
                     "terms": ""
                     "name": "Painter",
                     "terms": ""
                 },
+                "craft/parquet_layer": {
+                    "name": "Parquet Layer",
+                    "terms": ""
+                },
                 "craft/photographer": {
                     "name": "Photographer",
                     "terms": ""
                     "name": "Shoemaker",
                     "terms": "cobbler"
                 },
+                "craft/signmaker": {
+                    "name": "Signmaker",
+                    "terms": ""
+                },
                 "craft/stonemason": {
                     "name": "Stonemason",
                     "terms": "masonry"
                     "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_hose": {
+                    "name": "Fire Hose",
+                    "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",
                     "name": "Sand Trap",
                     "terms": "hazard,bunker"
                 },
+                "golf/cartpath": {
+                    "name": "Golf Cartpath",
+                    "terms": ""
+                },
+                "golf/driving_range": {
+                    "name": "Driving Range",
+                    "terms": ""
+                },
                 "golf/fairway": {
                     "name": "Fairway",
                     "terms": ""
                     "name": "Golf Hole",
                     "terms": ""
                 },
-                "golf/lateral_water_hazard_area": {
+                "golf/lateral_water_hazard": {
                     "name": "Lateral Water Hazard",
                     "terms": ""
                 },
-                "golf/lateral_water_hazard_line": {
-                    "name": "Lateral Water Hazard",
+                "golf/path": {
+                    "name": "Golf Walking Path",
                     "terms": ""
                 },
                 "golf/rough": {
                     "name": "Tee Box",
                     "terms": "teeing ground"
                 },
-                "golf/water_hazard_area": {
-                    "name": "Water Hazard",
-                    "terms": ""
-                },
-                "golf/water_hazard_line": {
+                "golf/water_hazard": {
                     "name": "Water Hazard",
                     "terms": ""
                 },
                     "name": "Blood Donor Center",
                     "terms": "blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation"
                 },
+                "healthcare/counselling": {
+                    "name": "Counselling Center",
+                    "terms": ""
+                },
                 "healthcare/hospice": {
                     "name": "Hospice",
                     "terms": "terminal,illness"
                     "terms": "speech,therapist,therapy,voice"
                 },
                 "highway/bus_stop": {
-                    "name": "Bus Stop / Platform",
+                    "name": "Bus Stop",
+                    "terms": ""
+                },
+                "highway/crossing": {
+                    "name": "Crossing",
                     "terms": ""
                 },
                 "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/crossing/unmarked-raised": {
+                    "name": "Unmarked Crossing (Raised)",
+                    "terms": "flat top,hump,speed,slow"
                 },
-                "highway/crosswalk": {
-                    "name": "Pedestrian Crosswalk",
-                    "terms": "zebra crossing"
+                "highway/crossing/unmarked": {
+                    "name": "Unmarked Crossing",
+                    "terms": ""
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path",
-                    "terms": "bike"
+                    "terms": "bike path,bicyle path"
+                },
+                "highway/cycleway/crossing": {
+                    "name": "Cycle Crossing",
+                    "terms": ""
+                },
+                "highway/cycleway/bicycle_foot": {
+                    "name": "Cycle & Foot Path",
+                    "terms": "bicycle and foot path,bike and pedestrian path,green way,greenway,mixed-use trail,multi-use trail,segregated trail,rail trail"
+                },
+                "highway/cycleway/crossing/marked": {
+                    "name": "Marked Cycle Crossing",
+                    "terms": "cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing"
+                },
+                "highway/cycleway/crossing/unmarked": {
+                    "name": "Unmarked Cycle Crossing",
+                    "terms": "cycle path crossing,cycleway crossing,bicycle crossing,bike crossing"
                 },
                 "highway/elevator": {
                     "name": "Elevator",
                     "terms": "lift"
                 },
+                "highway/emergency_bay": {
+                    "name": "Emergency Stopping Place",
+                    "terms": "Highway Emergency Bay"
+                },
                 "highway/footway": {
                     "name": "Foot Path",
-                    "terms": "hike,hiking,trackway,trail,walk"
+                    "terms": "hike,hiking,promenade,trackway,trail,walk"
+                },
+                "highway/footway/crossing": {
+                    "name": "Pedestrian Crossing",
+                    "terms": ""
+                },
+                "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": "marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing"
+                },
+                "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": "unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing"
                 },
                 "highway/give_way": {
                     "name": "Yield Sign",
                     "name": "Living Street",
                     "terms": ""
                 },
+                "highway/milestone": {
+                    "name": "Highway Milestone",
+                    "terms": "mile marker,mile post,mile stone,mileage marker,milemarker,milepost"
+                },
                 "highway/mini_roundabout": {
                     "name": "Mini-Roundabout",
-                    "terms": ""
+                    "terms": "traffic circle"
                 },
                 "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",
                 },
                 "highway/steps": {
                     "name": "Steps",
-                    "terms": "stairs,staircase"
+                    "terms": "stairs,staircase,stairway"
+                },
+                "highway/steps/conveying": {
+                    "name": "Escalator",
+                    "terms": "moving staircase,moving stairway,people mover"
                 },
                 "highway/stop": {
                     "name": "Stop 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",
                     "name": "Traffic Signals",
                     "terms": "light,stoplight,traffic light"
                 },
+                "highway/trailhead": {
+                    "name": "Trailhead",
+                    "terms": "hiking,mile zero,mountain biking,mountaineering,trail endpoint,trail start,staging area,trekking"
+                },
                 "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": "Castle",
                     "terms": ""
                 },
+                "historic/castle/fortress": {
+                    "name": "Historic Fortress",
+                    "terms": "citadel,military"
+                },
+                "historic/castle/palace": {
+                    "name": "Palace",
+                    "terms": "Royal Residence,royal,king,queen"
+                },
+                "historic/castle/stately": {
+                    "name": "Château",
+                    "terms": "Historic Country House,Stately Home,nobility,gentry,representative"
+                },
+                "historic/city_gate": {
+                    "name": "City Gate",
+                    "terms": "Town Gate"
+                },
+                "historic/fort": {
+                    "name": "Historic Fort",
+                    "terms": "military"
+                },
+                "historic/manor": {
+                    "name": "Manor House",
+                    "terms": "Mansion,gentry,nobility,estate"
+                },
                 "historic/memorial": {
                     "name": "Memorial",
                     "terms": "dedicatory,epitaph,remember,remembrance,memory,monument,stolperstein"
                 },
+                "historic/memorial/plaque": {
+                    "name": "Commemorative Plaque",
+                    "terms": "dedicatory,epitaph,historical marker,remember,remembrance,memory"
+                },
                 "historic/monument": {
                     "name": "Monument",
                     "terms": ""
                     "name": "Wayside Shrine",
                     "terms": ""
                 },
+                "historic/wreck": {
+                    "name": "Shipwreck",
+                    "terms": "hull,mast,maritime,remains,ship,boat"
+                },
+                "indoor/corridor_line": {
+                    "name": "Indoor Corridor",
+                    "terms": ""
+                },
+                "indoor/area": {
+                    "name": "Indoor Area",
+                    "terms": "indoor space"
+                },
+                "indoor/corridor": {
+                    "name": "Indoor Corridor",
+                    "terms": "concourse,foyer,hallway,passageway"
+                },
+                "indoor/door": {
+                    "name": "Indoor Door",
+                    "terms": "doorframe,doorway,portal,room access,threshold"
+                },
+                "indoor/room": {
+                    "name": "Room",
+                    "terms": "antechamber,anteroom,atrium,cell,chamber,concourse,foyer,indoor room,lobby,vestibule"
+                },
+                "indoor/wall": {
+                    "name": "Indoor Wall",
+                    "terms": "indoor barrier,room divider,room partition"
+                },
+                "internet_access/wlan": {
+                    "name": "Wi-Fi Hotspot",
+                    "terms": "wi-fi,wifi,hotspot"
+                },
                 "junction": {
                     "name": "Junction",
                     "terms": ""
                 },
-                "landuse": {
-                    "name": "Land Use",
+                "junction/circular": {
+                    "name": "Traffic Circle",
+                    "terms": ""
+                },
+                "junction/jughandle": {
+                    "name": "Jughandle",
+                    "terms": ""
+                },
+                "junction/roundabout": {
+                    "name": "Roundabout",
+                    "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/meadow": {
                     "name": "Meadow",
-                    "terms": ""
+                    "terms": "grazing,hay field,pasture"
                 },
                 "landuse/military": {
                     "name": "Military Area",
                 },
                 "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",
                     "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
                 },
-                "landuse/military/bunker": {
-                    "name": "Military Bunker",
-                    "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
-                },
-                "landuse/military/checkpoint": {
-                    "name": "Checkpoint",
-                    "terms": "air force,army,base,force,guard,marine,navy,troop,war"
-                },
                 "landuse/military/danger_area": {
                     "name": "Danger Area",
                     "terms": "air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war"
                     "name": "Naval Base",
                     "terms": "base,fight,force,guard,marine,navy,ship,sub,troop,war"
                 },
-                "landuse/military/nuclear_explosion_site": {
-                    "name": "Nuclear Explosion Site",
-                    "terms": "atom,blast,bomb,detonat*,nuke,site,test"
-                },
                 "landuse/military/obstacle_course": {
                     "name": "Obstacle Course",
-                    "terms": "army,base,force,guard,marine,navy,troop,war"
-                },
-                "landuse/military/office": {
-                    "name": "Military Office",
-                    "terms": "air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war"
+                    "terms": "army,base,force,guard,marine,navy,troop,war"
                 },
                 "landuse/military/range": {
                     "name": "Military Range",
                     "name": "Residential Area",
                     "terms": ""
                 },
+                "landuse/residential/apartments": {
+                    "name": "Apartment Complex",
+                    "terms": "flat,residence,tenement"
+                },
                 "landuse/retail": {
                     "name": "Retail Area",
                     "terms": ""
                     "name": "Vineyard",
                     "terms": "grape,wine"
                 },
-                "leisure": {
-                    "name": "Leisure",
-                    "terms": ""
+                "landuse/winter_sports": {
+                    "name": "Winter Sports Area",
+                    "terms": "piste area,ski area,ski hill,ski mountain,ski resort,snow board area,snowboard area"
                 },
                 "leisure/adult_gaming_centre": {
                     "name": "Adult Gaming Center",
                     "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": "Bird Hide",
                     "terms": "machan,ornithology"
                 },
+                "leisure/bleachers": {
+                    "name": "Bleachers",
+                    "terms": "crowd,bench,sports,stand,stands,seat,seating"
+                },
                 "leisure/bowling_alley": {
                     "name": "Bowling Alley",
                     "terms": "bowling center"
                     "name": "Dance School",
                     "terms": "jive,swing,tango,waltz,dance teaching"
                 },
+                "leisure/disc_golf_course": {
+                    "name": "Disc Golf Course",
+                    "terms": "disk golf,frisbee golf,flying disc golf,frolf,ultimate"
+                },
                 "leisure/dog_park": {
                     "name": "Dog Park",
                     "terms": ""
                 },
+                "leisure/escape_game": {
+                    "name": "Escape Room",
+                    "terms": "escape game,escape the room,puzzle room,quest room"
+                },
                 "leisure/firepit": {
                     "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",
                     "name": "Picnic Table",
                     "terms": "bench"
                 },
+                "leisure/picnic_table/chess": {
+                    "name": "Chess Table",
+                    "terms": "bench,chess board,checkerboard,checkers,chequerboard,game table"
+                },
                 "leisure/pitch": {
                     "name": "Sport Pitch",
                     "terms": "field"
                 },
                 "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/field_hockey": {
+                    "name": "Field Hockey Pitch",
+                    "terms": "landhockey"
+                },
+                "leisure/pitch/horseshoes": {
+                    "name": "Horseshoes Pit",
+                    "terms": "horse shoes"
+                },
+                "leisure/pitch/netball": {
+                    "name": "Netball Court",
+                    "terms": ""
+                },
                 "leisure/pitch/rugby_league": {
                     "name": "Rugby League Field",
                     "terms": ""
                     "name": "Rugby Union Field",
                     "terms": ""
                 },
+                "leisure/pitch/shuffleboard": {
+                    "name": "Shuffleboard Court",
+                    "terms": "deck shuffleboard,floor shuffleboard"
+                },
                 "leisure/pitch/skateboard": {
                     "name": "Skate Park",
                     "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"
                 },
                 "leisure/resort": {
                     "name": "Resort",
-                    "terms": ""
-                },
-                "leisure/running_track": {
-                    "name": "Racetrack (Running)",
-                    "terms": "race*,running,sprint,track"
+                    "terms": "recreation center,sanatorium,ski and snowboard resort,vacation resort,winter sports resort"
                 },
                 "leisure/sauna": {
                     "name": "Sauna",
                     "terms": ""
                 },
+                "leisure/slipway_point": {
+                    "name": "Slipway",
+                    "terms": "boat launch,boat ramp,boat landing"
+                },
                 "leisure/slipway": {
                     "name": "Slipway",
-                    "terms": "boat launch,boat ramp"
+                    "terms": "boat launch,boat ramp,boat landing"
                 },
                 "leisure/sports_centre": {
                     "name": "Sports Center / Complex",
                     "terms": ""
                 },
+                "leisure/sports_centre/climbing": {
+                    "name": "Climbing Gym",
+                    "terms": "abseiling,artificial climbing wall,belaying,bouldering,rock climbing facility,indoor rock wall,rappeling,rock gym,ropes"
+                },
                 "leisure/sports_centre/swimming": {
                     "name": "Swimming Pool Facility",
                     "terms": "dive,water"
                     "name": "Stadium",
                     "terms": ""
                 },
+                "leisure/swimming_area": {
+                    "name": "Natural Swimming Area",
+                    "terms": "dive,water,aquatics"
+                },
                 "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/cycling_point": {
+                    "name": "Cycling Track",
+                    "terms": "bicycle track,bicycling track,cycle racetrack,velodrome"
+                },
+                "leisure/track/cycling": {
+                    "name": "Cycling Track",
+                    "terms": "bicycle track,bicycling track,cycle racetrack,velodrome"
+                },
+                "leisure/track/horse_racing_point": {
+                    "name": "Horse Racing Track",
+                    "terms": "equestrian race track,horse race betting,horseracing,horsetrack,horse racetrack"
+                },
+                "leisure/track/horse_racing": {
+                    "name": "Horse Racing Track",
+                    "terms": "equestrian race track,horse race betting,horseracing,horsetrack,horse racetrack"
+                },
+                "leisure/track/running_point": {
+                    "name": "Running Track",
+                    "terms": "athletics track,decathlon,foot race,long distance running,marathon,middle distance running,racetrack,running,sprint,track,walking"
+                },
+                "leisure/track/running": {
+                    "name": "Running Track",
+                    "terms": "athletics track,decathlon,foot race,long distance running,marathon,middle distance running,racetrack,running,sprint,track,walking"
+                },
                 "leisure/water_park": {
                     "name": "Water Park",
                     "terms": "swim,pool,dive"
                 },
                 "line": {
                     "name": "Line",
-                    "terms": ""
-                },
-                "man_made": {
-                    "name": "Man Made",
-                    "terms": ""
-                },
-                "man_made/embankment": {
-                    "name": "Embankment",
-                    "terms": ""
+                    "terms": "polyline"
                 },
                 "man_made/adit": {
                     "name": "Adit",
-                    "terms": "entrance,underground,mine,cave"
+                    "terms": "cave,horizontal mine entrance,tunnel,underground"
                 },
                 "man_made/antenna": {
                     "name": "Antenna",
                     "terms": "broadcast,cell phone,cell,communication,mobile phone,radio,television,transmission,tv"
                 },
+                "man_made/beacon": {
+                    "name": "Beacon",
+                    "terms": ""
+                },
+                "man_made/beehive": {
+                    "name": "Beehive",
+                    "terms": "apiary,beekeeper,farm,honey,pollination"
+                },
                 "man_made/breakwater": {
                     "name": "Breakwater",
                     "terms": ""
                     "name": "Bridge",
                     "terms": ""
                 },
+                "man_made/bunker_silo": {
+                    "name": "Bunker Silo",
+                    "terms": "Silage,Storage"
+                },
                 "man_made/chimney": {
                     "name": "Chimney",
                     "terms": ""
                     "name": "Crane",
                     "terms": ""
                 },
+                "man_made/cross": {
+                    "name": "Summit Cross",
+                    "terms": ""
+                },
                 "man_made/cutline": {
                     "name": "Cut line",
                     "terms": ""
                 },
+                "man_made/dyke": {
+                    "name": "Levee",
+                    "terms": "Dike,Dyke,Floodbank,Stopbank"
+                },
+                "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/mineshaft": {
+                    "name": "Mineshaft",
+                    "terms": "cave,mine shaft,tunnel,underground,vertical mine entrance"
+                },
                 "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/pier": {
                     "name": "Pier",
-                    "terms": "dock,jetty"
+                    "terms": "berth,dock,jetty,landing,promenade,wharf"
+                },
+                "man_made/pier/floating": {
+                    "name": "Floating Pier",
+                    "terms": "berth,dock,jetty,landing,promenade,wharf"
                 },
                 "man_made/pipeline": {
                     "name": "Pipeline",
-                    "terms": ""
+                    "terms": "oil,natural gas,water,sewer,sewage"
+                },
+                "man_made/pipeline/underground": {
+                    "name": "Underground Pipeline",
+                    "terms": "oil,natural gas,water,sewer,sewage"
+                },
+                "man_made/pipeline/valve": {
+                    "name": "Pipeline Valve",
+                    "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/storage_tank/water": {
+                    "name": "Water Tank",
+                    "terms": "cistern,water tower"
+                },
+                "man_made/street_cabinet": {
+                    "name": "Street Cabinet",
+                    "terms": "cable tv,monitoring box,technical box,telecommunications,traffic signal controls"
                 },
                 "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/bell_tower": {
+                    "name": "Bell Tower",
+                    "terms": "belfry,bell gable,campanile,church tower,klockstapel"
+                },
+                "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/defensive": {
+                    "name": "Fortified Tower",
+                    "terms": "Defensive Tower,Castle Tower"
+                },
+                "man_made/tower/minaret": {
+                    "name": "Minaret",
+                    "terms": "Islam,mosque,Muezzin,Muslim"
+                },
+                "man_made/tower/observation": {
+                    "name": "Observation Tower",
+                    "terms": "lookout tower,fire tower"
+                },
+                "man_made/tunnel": {
+                    "name": "Tunnel",
+                    "terms": "bore,dig,shaft,underground passage,underpass"
+                },
                 "man_made/wastewater_plant": {
                     "name": "Wastewater Plant",
                     "terms": "sewage*,water treatment plant,reclamation plant"
                     "name": "Telecom Manhole",
                     "terms": "cover,phone,hole,telecom,telephone,bt"
                 },
-                "natural": {
-                    "name": "Natural",
-                    "terms": ""
+                "military/bunker": {
+                    "name": "Military Bunker",
+                    "terms": "air force,army,base,fight,force,guard,marine,navy,troop,war"
+                },
+                "military/checkpoint": {
+                    "name": "Checkpoint",
+                    "terms": "air force,army,base,force,guard,marine,navy,troop,war"
+                },
+                "military/nuclear_explosion_site": {
+                    "name": "Nuclear Explosion Site",
+                    "terms": "atom,blast,bomb,detonat*,nuke,site,test"
+                },
+                "military/office": {
+                    "name": "Military Office",
+                    "terms": "air force,army,base,enlist,fight,force,guard,marine,navy,recruit,troop,war"
+                },
+                "military/trench": {
+                    "name": "Military Trench",
+                    "terms": "dugout,firestep,fox hole,infantry trench,war trench"
                 },
                 "natural/bare_rock": {
                     "name": "Bare Rock",
                     "name": "Beach",
                     "terms": "shore"
                 },
+                "natural/cape": {
+                    "name": "Cape",
+                    "terms": "bay,coastline,erosion,headland,promontory"
+                },
                 "natural/cave_entrance": {
                     "name": "Cave Entrance",
                     "terms": "cavern,hollow,grotto,shelter,cavity"
                 },
                 "natural/cliff": {
                     "name": "Cliff",
-                    "terms": "escarpment"
+                    "terms": "crag,escarpment,rock face,scarp"
                 },
                 "natural/coastline": {
                     "name": "Coastline",
                 },
                 "natural/glacier": {
                     "name": "Glacier",
-                    "terms": ""
+                    "terms": "ice,snow"
                 },
                 "natural/grassland": {
                     "name": "Grassland",
                     "name": "Ridge",
                     "terms": "crest"
                 },
+                "natural/rock": {
+                    "name": "Attached Rock / Boulder",
+                    "terms": "boulder,stone,rock"
+                },
                 "natural/saddle": {
                     "name": "Saddle",
                     "terms": "pass,mountain pass,top"
                     "name": "Scrub",
                     "terms": "bush,shrubs"
                 },
+                "natural/shingle": {
+                    "name": "Shingle",
+                    "terms": "beach,gravel,pebbles,riverbed,rounded rock fragments"
+                },
                 "natural/spring": {
                     "name": "Spring",
                     "terms": ""
                 },
+                "natural/stone": {
+                    "name": "Unattached Stone / Boulder",
+                    "terms": "boulder,stone,rock"
+                },
                 "natural/tree_row": {
-                    "name": "Tree row",
+                    "name": "Tree Row",
                     "terms": ""
                 },
                 "natural/tree": {
                     "name": "Tree",
                     "terms": ""
                 },
+                "natural/valley": {
+                    "name": "Valley",
+                    "terms": "canyon,dale,dell,dene,depression,glen,gorge,gully,gulley,gultch,hollow,ravine,rift,vale"
+                },
                 "natural/volcano": {
                     "name": "Volcano",
                     "terms": "mountain,crater"
                     "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"
                 },
+                "natural/water/moat": {
+                    "name": "Moat",
+                    "terms": ""
+                },
                 "natural/water/pond": {
                     "name": "Pond",
                     "terms": "lakelet,millpond,tarn,pool,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/water/wastewater": {
+                    "name": "Wastewater Basin",
+                    "terms": "excrement,shit,sewage,wastewater,Settling Basin,Clarifier Basin"
+                },
                 "natural/wetland": {
                     "name": "Wetland",
-                    "terms": "bog,marsh,reedbed,swamp,tidalflat"
+                    "terms": "bog,fen,marsh,mire,moor,muskeg,peatland,quagmire,reedbed,saltmarsh,swamp,tidalflat,wet meadow"
                 },
                 "natural/wood": {
                     "name": "Wood",
                     "name": "Nonprofit Organization Office",
                     "terms": "association,non-profit,nonprofit,organization,society"
                 },
+                "office/bail_bond_agent": {
+                    "name": "Bail Bond Agent",
+                    "terms": "bail bond dealer,bail bond man,bail bondsman,bail bondsperson"
+                },
                 "office/charity": {
                     "name": "Charity Office",
                     "terms": "charitable organization"
                     "name": "Coworking Space",
                     "terms": "coworking,office"
                 },
+                "office/diplomatic": {
+                    "name": "Diplomatic Office",
+                    "terms": ""
+                },
+                "office/diplomatic/consulate": {
+                    "name": "Consulate",
+                    "terms": ""
+                },
+                "office/diplomatic/embassy": {
+                    "name": "Embassy",
+                    "terms": ""
+                },
+                "office/diplomatic/liaison": {
+                    "name": "Liaison Office",
+                    "terms": ""
+                },
                 "office/educational_institution": {
                     "name": "Educational Institution",
                     "terms": ""
                 },
                 "office/estate_agent": {
                     "name": "Real Estate Office",
-                    "terms": ""
+                    "terms": "real estate"
+                },
+                "office/financial_advisor": {
+                    "name": "Financial Advisor",
+                    "terms": "401k,inheritance,savings,stocks,retirement,wealth management"
                 },
                 "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": ""
                 },
                 "point": {
                     "name": "Point",
-                    "terms": ""
+                    "terms": "node,other,vertex,vertices"
                 },
                 "power/sub_station": {
                     "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/hydro": {
+                    "name": "Water Turbine",
+                    "terms": "dam,generator,francis turbine,hydroelectricity,kaplan turbine,pelton turbine"
+                },
+                "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",
                     "terms": ""
                 },
-                "public_transport/linear_platform_aerialway": {
+                "public_transport/platform_point": {
+                    "name": "Transit Stop / Platform",
+                    "terms": "platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform": {
+                    "name": "Transit Platform",
+                    "terms": "platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform/aerialway_point": {
                     "name": "Aerialway Stop / Platform",
                     "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
                 },
-                "public_transport/linear_platform_bus": {
-                    "name": "Bus Stop / Platform",
-                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
-                },
-                "public_transport/linear_platform_ferry": {
+                "public_transport/platform/ferry_point": {
                     "name": "Ferry Stop / Platform",
                     "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
                 },
-                "public_transport/linear_platform_light_rail": {
+                "public_transport/platform/light_rail_point": {
                     "name": "Light Rail Stop / Platform",
                     "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
                 },
-                "public_transport/linear_platform_monorail": {
+                "public_transport/platform/monorail_point": {
                     "name": "Monorail Stop / Platform",
                     "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
                 },
-                "public_transport/linear_platform_subway": {
+                "public_transport/platform/subway_point": {
                     "name": "Subway Stop / Platform",
                     "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
                 },
-                "public_transport/linear_platform_train": {
+                "public_transport/platform/train_point": {
                     "name": "Train Stop / Platform",
                     "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
                 },
-                "public_transport/linear_platform_tram": {
+                "public_transport/platform/tram_point": {
                     "name": "Tram Stop / Platform",
                     "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
                 },
-                "public_transport/linear_platform_trolleybus": {
-                    "name": "Trolleybus Stop / Platform",
-                    "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
-                },
-                "public_transport/linear_platform": {
-                    "name": "Transit Stop / Platform",
-                    "terms": "platform,public transit,public transportation,transit,transportation"
-                },
-                "public_transport/platform_aerialway": {
-                    "name": "Aerialway Stop / Platform",
+                "public_transport/platform/aerialway": {
+                    "name": "Aerialway Platform",
                     "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
                 },
-                "public_transport/platform_bus": {
-                    "name": "Bus Stop / Platform",
+                "public_transport/platform/bus_point": {
+                    "name": "Bus Stop",
                     "terms": "bus,platform,public transit,public transportation,transit,transportation"
                 },
-                "public_transport/platform_ferry": {
-                    "name": "Ferry Stop / Platform",
+                "public_transport/platform/bus": {
+                    "name": "Bus Platform",
+                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform/ferry": {
+                    "name": "Ferry Platform",
                     "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
                 },
-                "public_transport/platform_light_rail": {
-                    "name": "Light Rail Stop / Platform",
+                "public_transport/platform/light_rail": {
+                    "name": "Light Rail Platform",
                     "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
                 },
-                "public_transport/platform_monorail": {
-                    "name": "Monorail Stop / Platform",
+                "public_transport/platform/monorail": {
+                    "name": "Monorail Platform",
                     "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
                 },
-                "public_transport/platform_subway": {
-                    "name": "Subway Stop / Platform",
+                "public_transport/platform/subway": {
+                    "name": "Subway Platform",
                     "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
                 },
-                "public_transport/platform_train": {
-                    "name": "Train Stop / Platform",
+                "public_transport/platform/train": {
+                    "name": "Train Platform",
                     "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
                 },
-                "public_transport/platform_tram": {
-                    "name": "Tram Stop / Platform",
+                "public_transport/platform/tram": {
+                    "name": "Tram Platform",
                     "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
                 },
-                "public_transport/platform_trolleybus": {
-                    "name": "Trolleybus Stop / Platform",
+                "public_transport/platform/trolleybus_point": {
+                    "name": "Trolleybus Stop",
                     "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
                 },
-                "public_transport/platform": {
-                    "name": "Transit Stop / Platform",
-                    "terms": "platform,public transit,public transportation,transit,transportation"
+                "public_transport/platform/trolleybus": {
+                    "name": "Trolleybus Platform",
+                    "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
                 },
                 "public_transport/station_aerialway": {
                     "name": "Aerialway Station",
                     "terms": "break,interrupt,rest,wait,interruption"
                 },
                 "railway/platform": {
-                    "name": "Train Stop / Platform",
+                    "name": "Train Platform",
                     "terms": ""
                 },
                 "railway/station": {
                     "name": "Buffer Stop",
                     "terms": "stop,halt,buffer"
                 },
+                "railway/construction": {
+                    "name": "Railway Under Construction",
+                    "terms": ""
+                },
                 "railway/crossing": {
                     "name": "Railway Crossing (Path)",
                     "terms": "crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing"
                 },
                 "railway/rail": {
                     "name": "Rail",
-                    "terms": ""
+                    "terms": "rail line,railroad track,train track"
+                },
+                "railway/rail/highspeed": {
+                    "name": "High-Speed Rail",
+                    "terms": "bullet train,fast rail,high speed rail,highspeed rail,HSR"
                 },
                 "railway/signal": {
                     "name": "Railway Signal",
                     "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": ""
                 },
+                "shop/boutique": {
+                    "name": "Boutique",
+                    "terms": ""
+                },
+                "shop/fashion": {
+                    "name": "Fashion Store",
+                    "terms": ""
+                },
                 "shop/fishmonger": {
                     "name": "Fishmonger",
                     "terms": ""
                 },
                 "shop/bakery": {
                     "name": "Bakery",
-                    "terms": ""
+                    "terms": "bread,cakes,rolls"
                 },
                 "shop/bathroom_furnishing": {
                     "name": "Bathroom Furnishing Store",
                 },
                 "shop/beverages": {
                     "name": "Beverage Store",
-                    "terms": ""
+                    "terms": "drinks"
                 },
                 "shop/bicycle": {
                     "name": "Bicycle Shop",
-                    "terms": "bike,repair"
+                    "terms": "bike,repair,tricycle,unicycle"
+                },
+                "shop/boat": {
+                    "name": "Boat Store",
+                    "terms": "fishing boat,jetski,motorboat,rowboat,sailboat,vessel,watercraft"
                 },
                 "shop/bookmaker": {
                     "name": "Bookmaker",
-                    "terms": "betting"
+                    "terms": "betting,bookie"
                 },
                 "shop/books": {
                     "name": "Book Store",
                     "terms": ""
                 },
-                "shop/boutique": {
-                    "name": "Boutique",
-                    "terms": ""
-                },
                 "shop/butcher": {
                     "name": "Butcher",
-                    "terms": "meat"
+                    "terms": "chicken,beef,lamb,meat,pork"
                 },
                 "shop/candles": {
                     "name": "Candle Shop",
-                    "terms": ""
+                    "terms": "wax"
+                },
+                "shop/cannabis": {
+                    "name": "Cannabis Shop",
+                    "terms": "420,marijuana,pot,reefer,weed"
                 },
                 "shop/car_parts": {
                     "name": "Car Parts Store",
-                    "terms": "auto"
+                    "terms": "automobile,automotive"
                 },
                 "shop/car_repair": {
                     "name": "Car Repair Shop",
-                    "terms": "auto,garage,service"
+                    "terms": "automobile,automotive,garage,service"
                 },
                 "shop/car": {
                     "name": "Car Dealership",
-                    "terms": "auto"
+                    "terms": "automobile,automotive"
+                },
+                "shop/caravan": {
+                    "name": "RV Dealership",
+                    "terms": "auto,camper,recreational vehicle"
                 },
                 "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",
-                    "terms": ""
+                    "terms": "cocoa"
                 },
                 "shop/clothes": {
                     "name": "Clothing Store",
-                    "terms": ""
+                    "terms": "blouses,boutique,bras,clothes,dresses,fashion,pants,shirts,shorts,skirts,slacks,socks,suits,underwear"
+                },
+                "shop/clothes/underwear": {
+                    "name": "Underwear Store",
+                    "terms": "boutique,bras,brassieres,briefs,boxers,fashion,lingerie,panties,slips,socks,stockings,underclothes,undergarments,underpants,undies"
                 },
                 "shop/coffee": {
                     "name": "Coffee Store",
                 },
                 "shop/computer": {
                     "name": "Computer Store",
-                    "terms": ""
+                    "terms": "desktop,laptop,hardware,operating system,software"
                 },
                 "shop/confectionery": {
                     "name": "Candy Store",
                 },
                 "shop/copyshop": {
                     "name": "Copy Store",
-                    "terms": ""
+                    "terms": "print,scan"
                 },
                 "shop/cosmetics": {
                     "name": "Cosmetics Store",
+                    "terms": "make-up,makeup"
+                },
+                "shop/country_store": {
+                    "name": "Country Store",
                     "terms": ""
                 },
                 "shop/craft": {
                 },
                 "shop/e-cigarette": {
                     "name": "E-Cigarette Shop",
-                    "terms": "electronic,vapor"
+                    "terms": "electronic,vape,vaping,vapor"
                 },
                 "shop/electronics": {
                     "name": "Electronics Store",
                     "name": "Erotic Store",
                     "terms": "sex,porn"
                 },
+                "shop/erotic/lgbtq": {
+                    "name": "LGBTQ+ Erotic Store",
+                    "terms": "sex,porn"
+                },
                 "shop/fabric": {
                     "name": "Fabric Store",
                     "terms": "sew"
                     "name": "Produce Stand",
                     "terms": "farm shop,farm stand"
                 },
-                "shop/fashion": {
-                    "name": "Fashion Store",
-                    "terms": ""
+                "shop/fashion_accessories": {
+                    "name": "Fashion Accessories Store",
+                    "terms": "bag,cologne,fragrance,hat,jewellery,purfume,purse,scarf,sunglasses,umbrella,wallet,watch"
+                },
+                "shop/fireplace": {
+                    "name": "Fireplace Store",
+                    "terms": "fireplace,stove,masonry heater"
+                },
+                "shop/fishing": {
+                    "name": "Fishing Shop",
+                    "terms": "bait,fishing line,flies,fly,lure,reel,rod,tackle"
                 },
                 "shop/florist": {
                     "name": "Florist",
                     "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": "Furniture Store",
                     "terms": "chair,sofa,table"
                 },
+                "shop/games": {
+                    "name": "Tabletop Game Store",
+                    "terms": "board game,card game,dice game,game shop,live action role-playing game,miniatures wargame,strategy game"
+                },
                 "shop/garden_centre": {
                     "name": "Garden Center",
                     "terms": "landscape,mulch,shrub,tree"
                     "name": "Bottled Gas Shop",
                     "terms": "cng,lpg,natural gas,propane,refill,tank"
                 },
+                "shop/general": {
+                    "name": "General Store",
+                    "terms": "Village Shop"
+                },
                 "shop/gift": {
                     "name": "Gift Shop",
                     "terms": "souvenir"
                 },
                 "shop/greengrocer": {
                     "name": "Greengrocer",
-                    "terms": "fruit,vegetable"
+                    "terms": "fruit,produce,vegetable"
+                },
+                "shop/hairdresser_supply": {
+                    "name": "Hairdresser Supply Store",
+                    "terms": "barber,shampoo,conditioner"
                 },
                 "shop/hairdresser": {
                     "name": "Hairdresser",
                 },
                 "shop/hifi": {
                     "name": "Hifi Store",
-                    "terms": "stereo,video"
+                    "terms": "audio,hi-fi,high fidelity,stereo,video"
                 },
                 "shop/houseware": {
                     "name": "Houseware Store",
-                    "terms": "home,household"
+                    "terms": "home,household,kitchenware"
+                },
+                "shop/hunting": {
+                    "name": "Hunting Shop",
+                    "terms": "arrows,bows,bullets,crossbows,rifles,traps"
                 },
                 "shop/interior_decoration": {
                     "name": "Interior Decoration Store",
                     "terms": ""
                 },
                 "shop/jewelry": {
-                    "name": "Jeweler",
-                    "terms": "diamond,gem,ring"
+                    "name": "Jewelry Store",
+                    "terms": "bracelet,diamond,earrings,gem,gold,jeweler,jewellery,jeweller,necklace,pins,ring,silver"
                 },
                 "shop/kiosk": {
                     "name": "Kiosk",
                 },
                 "shop/kitchen": {
                     "name": "Kitchen Design Store",
-                    "terms": ""
+                    "terms": "cabinets,countertops,sinks"
                 },
                 "shop/laundry": {
                     "name": "Laundry",
                     "terms": ""
                 },
+                "shop/laundry/self_service": {
+                    "name": "Self-Service Laundry",
+                    "terms": "Coin Laundry,Laundromat,Coin Wash,Launderette,Washateria"
+                },
                 "shop/leather": {
                     "name": "Leather Store",
                     "terms": ""
                 },
+                "shop/lighting": {
+                    "name": "Lighting Store",
+                    "terms": "fluorescent lighting,lamps,LEDs,light fixtures,lightbulbs"
+                },
                 "shop/locksmith": {
                     "name": "Locksmith",
                     "terms": "key,lockpick"
                     "name": "Medical Supply Store",
                     "terms": ""
                 },
+                "shop/military_surplus": {
+                    "name": "Military Surplus Store",
+                    "terms": "armor,army-navy store,army surplus,navy surplus,tactical gear,war surplus shop,weapons"
+                },
                 "shop/mobile_phone": {
                     "name": "Mobile Phone Store",
                     "terms": ""
                     "name": "Money Lender",
                     "terms": ""
                 },
+                "shop/motorcycle_repair": {
+                    "name": "Motorcycle Repair Shop",
+                    "terms": "auto,bike,garage,motorcycle,repair,service"
+                },
                 "shop/motorcycle": {
                     "name": "Motorcycle Dealership",
                     "terms": "bike"
                 },
                 "shop/music": {
                     "name": "Music Store",
-                    "terms": "CD,vinyl"
+                    "terms": "tape casettes,CDs,compact discs,vinyl records"
                 },
                 "shop/musical_instrument": {
                     "name": "Musical Instrument Store",
                 },
                 "shop/nutrition_supplements": {
                     "name": "Nutrition Supplements Store",
-                    "terms": ""
+                    "terms": "health,supplement,vitamin"
                 },
                 "shop/optician": {
                     "name": "Optician",
                 },
                 "shop/outdoor": {
                     "name": "Outdoors Store",
-                    "terms": "camping,climbing,hiking"
+                    "terms": "camping,climbing,hiking,outfitter,outdoor equipment,outdoor supplies"
+                },
+                "shop/outpost": {
+                    "name": "Online Retailer Outpost",
+                    "terms": "online,pick up,pickup"
                 },
                 "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/perfumery": {
                     "name": "Perfume Store",
-                    "terms": ""
+                    "terms": "cologne,fragrance,purfume"
                 },
                 "shop/pet_grooming": {
                     "name": "Pet Grooming Store",
-                    "terms": "dog"
+                    "terms": "cat,dog"
                 },
                 "shop/pet": {
                     "name": "Pet Store",
                 },
                 "shop/pyrotechnics": {
                     "name": "Fireworks Store",
-                    "terms": ""
+                    "terms": "fireworks"
                 },
                 "shop/radiotechnics": {
                     "name": "Radio/Electronic Component Store",
-                    "terms": ""
+                    "terms": "antenna,transistor"
                 },
                 "shop/religion": {
                     "name": "Religious Store",
                 },
                 "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": ""
+                    "terms": "boots,cleats,clogs,heels,loafers,oxfords,sneakers"
                 },
                 "shop/sports": {
                     "name": "Sporting Goods Store",
-                    "terms": ""
+                    "terms": "athletics"
                 },
                 "shop/stationery": {
                     "name": "Stationery Store",
                 },
                 "shop/storage_rental": {
                     "name": "Storage Rental",
-                    "terms": ""
+                    "terms": "garages"
                 },
                 "shop/supermarket": {
                     "name": "Supermarket",
                 },
                 "shop/tattoo": {
                     "name": "Tattoo Parlor",
-                    "terms": ""
+                    "terms": "ink"
                 },
                 "shop/tea": {
                     "name": "Tea Store",
                 },
                 "shop/ticket": {
                     "name": "Ticket Seller",
-                    "terms": ""
+                    "terms": "box office"
                 },
                 "shop/tiles": {
                     "name": "Tile Shop",
                 },
                 "shop/tobacco": {
                     "name": "Tobacco Shop",
-                    "terms": ""
+                    "terms": "cigarettes,cigars"
                 },
                 "shop/toys": {
                     "name": "Toy Store",
-                    "terms": ""
+                    "terms": "games"
                 },
                 "shop/trade": {
                     "name": "Trade Shop",
                 },
                 "shop/video": {
                     "name": "Video Store",
-                    "terms": "DVD"
+                    "terms": "DVD,VHS,video casette"
                 },
                 "shop/watches": {
                     "name": "Watches Shop",
                     "name": "Watersport/Swim Shop",
                     "terms": ""
                 },
+                "shop/water": {
+                    "name": "Drinking Water Shop",
+                    "terms": ""
+                },
                 "shop/weapons": {
                     "name": "Weapon Shop",
                     "terms": "ammo,gun,knife,knives"
                     "name": "Wine Shop",
                     "terms": ""
                 },
-                "tourism": {
-                    "name": "Tourism",
-                    "terms": ""
+                "tactile_paving": {
+                    "name": "Tactile Paving",
+                    "terms": "blind path,detectable warning surfaces,tactile ground surface indicators,tactile walking surface indicators,truncated domes,visually impaired path"
+                },
+                "telecom/data_center": {
+                    "name": "Data Center",
+                    "terms": "computer systems storage,information technology,server farm,the cloud,telecommunications"
                 },
                 "tourism/alpine_hut": {
                     "name": "Alpine Hut",
                     "name": "Artwork",
                     "terms": "mural,sculpture,statue"
                 },
+                "tourism/artwork/bust": {
+                    "name": "Bust",
+                    "terms": "figure"
+                },
+                "tourism/artwork/graffiti": {
+                    "name": "Graffiti",
+                    "terms": "Street Artwork,Guerilla Artwork,Graffiti Artwork"
+                },
+                "tourism/artwork/installation": {
+                    "name": "Art Installation",
+                    "terms": "interactive art,intervention art,modern art"
+                },
+                "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": "Tourist Information Office",
                     "terms": ""
                 },
+                "tourism/information/route_marker": {
+                    "name": "Trail Marker",
+                    "terms": "cairn,painted blaze,route flag,route marker,stone pile,trail blaze,trail post,way marker"
+                },
+                "tourism/information/terminal": {
+                    "name": "Information Terminal",
+                    "terms": ""
+                },
                 "tourism/motel": {
                     "name": "Motel",
                     "terms": ""
                     "name": "Zoo",
                     "terms": "animal"
                 },
+                "tourism/zoo/petting": {
+                    "name": "Petting Zoo",
+                    "terms": "Children's Zoo,Children's Farm,Petting Farm,farm animals"
+                },
+                "tourism/zoo/safari": {
+                    "name": "Safari Park",
+                    "terms": "Drive-Through Zoo,Drive-In Zoo"
+                },
+                "tourism/zoo/wildlife": {
+                    "name": "Wildlife Park",
+                    "terms": "indigenous animals"
+                },
                 "traffic_calming": {
                     "name": "Traffic Calming",
                     "terms": "bump,hump,slow,speed"
                     "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/public_transport/stop_area_group": {
+                    "name": "Transit Stop Area Group",
+                    "terms": ""
+                },
                 "type/restriction": {
                     "name": "Restriction",
                     "terms": ""
                     "name": "Light Rail Route",
                     "terms": ""
                 },
+                "type/route/monorail": {
+                    "name": "Monorail Route",
+                    "terms": ""
+                },
                 "type/route/pipeline": {
                     "name": "Pipeline Route",
                     "terms": ""
                     "name": "Waterway",
                     "terms": ""
                 },
-                "vertex": {
-                    "name": "Other",
+                "waterway/riverbank": {
+                    "name": "Riverbank",
                     "terms": ""
                 },
                 "waterway/boatyard": {
                     "name": "Canal",
                     "terms": ""
                 },
+                "waterway/canal/lock": {
+                    "name": "Canal Lock",
+                    "terms": ""
+                },
                 "waterway/dam": {
                     "name": "Dam",
                     "terms": ""
                     "name": "Marine Fuel Station",
                     "terms": "petrol,gas,diesel,boat"
                 },
+                "waterway/lock_gate": {
+                    "name": "Lock Gate",
+                    "terms": "canal"
+                },
+                "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"
             }
         },
         "imagery": {
+            "AGIV": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Flanders most recent aerial imagery"
+            },
+            "AGIV10cm": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Flanders 2013-2015 aerial imagery 10cm"
+            },
+            "AGIVFlandersGRB": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Flanders GRB"
+            },
+            "AIV_DHMV_II_HILL_25cm": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Digitaal Hoogtemodel Vlaanderen II, multidirectionale hillshade 0,25 m"
+            },
+            "AIV_DHMV_II_SVF_25cm": {
+                "attribution": {
+                    "text": "© agentschap Informatie Vlaanderen"
+                },
+                "name": "AIV Digitaal Hoogtemodel Vlaanderen II, Skyview factor 0,25 m"
+            },
             "Bing": {
                 "description": "Satellite and aerial imagery.",
                 "name": "Bing aerial imagery"
                 "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": {
                 "description": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.",
                 "name": "DigitalGlobe Standard Imagery Vintage"
             },
+            "EOXAT2018CLOUDLESS": {
+                "attribution": {
+                    "text": "Sentinel-2 cloudless - https://s2maps.eu by EOX IT Services GmbH (Contains modified Copernicus Sentinel data 2017 & 2018)"
+                },
+                "description": "Post-processed Sentinel Satellite imagery.",
+                "name": "eox.at 2018 cloudless"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 "description": "Satellite and aerial imagery.",
                 "name": "Mapbox Satellite"
             },
+            "Maxar-Premium": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Maxar Premium is a mosaic composed of Maxar 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": "Maxar Premium Imagery (Beta)"
+            },
+            "Maxar-Standard": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Maxar 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": "Maxar Standard Imagery (Beta)"
+            },
             "OSM_Inspector-Addresses": {
                 "attribution": {
                     "text": "© Geofabrik GmbH, OpenStreetMap contributors, CC-BY-SA"
                 },
                 "name": "OSM Inspector: Tagging"
             },
-            "US-TIGER-Roads-2012": {
-                "name": "TIGER Roads 2012"
+            "SPW_ORTHO_LAST": {
+                "name": "SPW(allonie) most recent aerial imagery"
+            },
+            "SPW_PICC": {
+                "name": "SPW(allonie) PICC numerical imagery"
             },
             "US-TIGER-Roads-2014": {
                 "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
                 "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"
+            },
+            "USDA-NAIP": {
+                "description": "The most recent year of DOQQs from the National Agriculture Imagery Program (NAIP) for each state in the contiguous United States.",
+                "name": "National Agriculture Imagery Program"
+            },
             "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"
             },
+            "UrbISOrtho2016": {
+                "attribution": {
+                    "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
+                },
+                "name": "UrbIS-Ortho 2016"
+            },
+            "UrbISOrtho2017": {
+                "attribution": {
+                    "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
+                },
+                "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"
+                },
+                "name": "UrbisAdm FR"
+            },
+            "UrbisAdmNL": {
+                "attribution": {
+                    "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
+                },
+                "name": "UrbisAdm NL"
+            },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
                     "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
                 "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
                 "name": "basemap.at Orthofoto"
             },
-            "hike_n_bike": {
+            "basemap.at-overlay": {
                 "attribution": {
-                    "text": "© OpenStreetMap contributors"
+                    "text": "basemap.at"
+                },
+                "description": "Annotation overlay provided by basemap.at.",
+                "name": "basemap.at Overlay"
+            },
+            "basemap.at-surface": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Surface layer provided by basemap.at.",
+                "name": "basemap.at Surface"
+            },
+            "basemap.at-terrain": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Terrain layer provided by basemap.at.",
+                "name": "basemap.at Terrain"
+            },
+            "eufar-balaton": {
+                "attribution": {
+                    "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_seamlessphoto": {
+                "attribution": {
+                    "text": "GSI Japan seamless photo"
+                },
+                "description": "Japan GSI seamlessphoto Imagery. The collection of latest imageries of GSI ortho, airphoto, post disaster and others.",
+                "name": "Japan GSI seamlessphoto 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"
+                },
+                "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"
                 },
-                "name": "Hike & Bike"
+                "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 2016, 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"
+            },
+            "ym-Centre-Universitaire-de-Recherche-et-dApplication-en-Tldtection-CURAT-de-lUniversit-Felix-Houphouet-Boigny": {
+                "name": "YouthMappers CURAT",
+                "description": "YouthMappers chapter at Centre Universitaire de Recherche et d'Application en Télédétection (CURAT) de l'Université Felix Houphouet Boigny",
+                "extendedDescription": "Our chapter aim is to promote the use of collaborative free mapping and the use of openstreetmap data in the field of research and their application in the implementation of tools for decision-making. Help students produce their own data of their research."
+            },
+            "ym-The-Gambia-YMCA-University-of-the-Gambia": {
+                "name": "Connected YouthMappers",
+                "description": "YouthMappers chapter at The Gambia YMCA / University of the Gambia",
+                "extendedDescription": "Connected YouthMappers is comprised of dedicated young Gambians who aspire to change and aid national development."
+            },
             "cape-coast-youthmappers": {
                 "name": "University of Cape Coast YouthMappers",
                 "description": "Follow us on Twitter: {url}",
                 "name": "Talk-gh Mailing List",
                 "description": "Talk-gh is the official mailing list for Ghana OSM community."
             },
+            "ym-Kwame-Nkrumah-University-of-Science-and-Technology": {
+                "name": "Kwame Nkrumah University of Science and Technology YouthMappers",
+                "description": "YouthMappers chapter at Kwame Nkrumah University of Science and Technology"
+            },
+            "ym-University-of-Cape-Coast": {
+                "name": "UCC Geographical Society",
+                "description": "YouthMappers chapter at University of Cape Coast",
+                "extendedDescription": "We are a society that encompasses all students who are reading and read geography in the Department of Geography and Regional Planning at the University of Cape Coast. Our main aim is to promote interest in the discipline inside and outside of the classroom. Our motto is “We comprehend the Earth and its inhabitants.”"
+            },
+            "ym-University-of-Energy-and-Natural-Resources": {
+                "name": "Eco-Club",
+                "description": "YouthMappers chapter at University of Energy and Natural Resources",
+                "extendedDescription": "To provide a sound education to all citizens about the deteriorating environment and provide utmost use of recreation of the environment for human survival."
+            },
+            "ym-University-of-Ghana": {
+                "name": "University of Ghana YouthMappers",
+                "description": "YouthMappers chapter at University of Ghana",
+                "extendedDescription": "UG YouthMappers consists of both graduate and undergraduate students possessing knowledge and skills in GIS and Remote Sensing. The club is composed of an energetic team that is poised to address social issues and mitigate environmental problems through mapping. Our fundamental principles are capacity building, empowerment and teamwork."
+            },
+            "ym-University-of-Mines-and-Technology": {
+                "name": "UMaT YouthMappers",
+                "description": "YouthMappers chapter at University of Mines and Technology",
+                "extendedDescription": "UMaT YouthMappers is a group of volunteer students who seek to grant students the opportunity to improve skills in the field of mapping & creating open geographic data and analyses that address locally defined development challenges worldwide."
+            },
+            "ym-General-Lansana-Conte-University": {
+                "name": "YouthMappers General Lansana Conte University",
+                "description": "YouthMappers chapter at General Lansana Conte University",
+                "extendedDescription": "The YouthMappers of the University General Lansana Conté is a non profit community willing to contribute to Map Guinea and others part of the world. We are promoting the use of GIS and Open data to build decision support tools. We also work to build capacities among the students and local communities."
+            },
+            "ym-Institute-of-Science-and-Veterinary-Medicine": {
+                "name": "YouthMappers ISSMV Dalaba",
+                "description": "YouthMappers chapter at Institute of Science and Veterinary Medicine",
+                "extendedDescription": "YouthMappers ISSMV Dabala is a non profit organisation working to promote humanitarian mapping and the use of open sources and open data to build decision making tools in Guinea."
+            },
+            "ym-Universit-de-NZrkor": {
+                "name": "Youthmappers à N'Zérékoré",
+                "description": "YouthMappers chapter at Université de N'Zérékoré",
+                "extendedDescription": "YouthMappers est un groupe qui permet de faire la cartographie des communautés enclavées et à la prise des décisions en cas de catastrophes ou épidémies. Elle permet aussi la production et l'utilisation des données en accès gratuit."
+            },
+            "ym-Dedan-Kimathi-University-of-Technology": {
+                "name": "GDEV",
+                "description": "YouthMappers chapter at Dedan Kimathi University of Technology",
+                "extendedDescription": "GDEV is a group of enthusiastic GIS group at DeKUT that aims at helping students share, engage and learn from each other in matters geospatial"
+            },
+            "ym-Jomo-Kenyatta-University-of-Agriculture-and-Technology": {
+                "name": "Association of Geomatics Engineering Students",
+                "description": "YouthMappers chapter at Jomo Kenyatta University of Agriculture and Technology",
+                "extendedDescription": "The Association of Geomatics Engineering Students (AGES), aims at promoting GIS products and services as well as training students on the use of the same. It not only promotes socialization between the students and practicing professionals, but also provides a platform for exchanging new ideas for holding new GIS and surveying events and training at the university."
+            },
+            "ym-Karatina-University": {
+                "name": "Nature Club Karatina University",
+                "description": "YouthMappers chapter at Karatina University",
+                "extendedDescription": "This chapter aims to bring together all GIS enthusiasts.They include environment experts, wildlife experts, aquatic and tourism officers, just to mention a few. Its main aim is to provide a platform where students can learn from each other and, in the process, understand how to integrate the GIS skills in their various career paths as well as provide solutions to various environmental related challenges."
+            },
+            "ym-Kenyatta-University": {
+                "name": "Kenyatta University GIS Club",
+                "description": "YouthMappers chapter at Kenyatta University",
+                "extendedDescription": "Kenyatta University GIS Club (KUGISC) was founded on 28th October 2016, with more than 200 students and staff from all faculty within campus as members. We are committed to empower members with spatial knowledge, skills and expertise required in understanding the Earth. We help in mapping resources within the university by incorporating geospatial data in their projects as well as fieldwork data collection."
+            },
+            "ym-Moi-University": {
+                "name": "Geography Students Association",
+                "description": "YouthMappers chapter at Moi University",
+                "extendedDescription": "The Geography Students Association at Moi University (GEOSAMU) explores, discovers and aims at developing the entire world through the young Geo-Spatial analysts.  GEOSAMU is part of the Department of Geography."
+            },
+            "ym-Technical-University-of-Kenya": {
+                "name": "Geospatial Science Student Association",
+                "description": "YouthMappers chapter at Technical University of Kenya",
+                "extendedDescription": "It's a geographical information based group with very passionate students in the relevant fields of study. We do training to members on emerging trends in the market and keep up with technological advancements"
+            },
+            "ym-University-of-Nairobi": {
+                "name": "Geospatial Engineering Students Association",
+                "description": "YouthMappers chapter at University of Nairobi",
+                "extendedDescription": "UN students are working with the local OSM community, Map Kibera, and GrouthTruth to learn about open mapping and contribute data for needs in their urban communities."
+            },
+            "ym-African-Methodist-Episcopal-University": {
+                "name": "YouthMappers-AMEU",
+                "description": "YouthMappers chapter at African Methodist Episcopal University"
+            },
+            "ym-Cuttington-University": {
+                "name": "Cuttington University YouthMappers",
+                "description": "YouthMappers chapter at Cuttington University",
+                "extendedDescription": "The YouthMappers at Cuttington University, Suakoko, and Bong County comprised of Students from three different departments; namely, the Department of Natural Resources Management “DONRM”, Department of Environmental Sciences, and the Department of Natural Sciences. Since the establishment of the Chapter in February 2017, the overall membership is  20 students, with each department containing 5 students."
+            },
+            "ym-Grand-Gedeh-County-Community-College": {
+                "name": "YouthMappers at Grand Gedeh County Community College",
+                "description": "YouthMappers chapter at Grand Gedeh County Community College",
+                "extendedDescription": "The Youth Mappers of GGCCC sole intent is to put  places in and around Liberia  that are not on the map. We gather youths from the college within the Grand Gedeh Community College to make it their duties to unite and bring these places to the spot light geographically."
+            },
+            "ym-Nimba-County-Community-College": {
+                "name": "Nimba County Community College Youth Mappers",
+                "description": "YouthMappers chapter at Nimba County Community College"
+            },
+            "ym-Stella-Maris-Polytechnic": {
+                "name": "YouthMappers-SMP",
+                "description": "YouthMappers chapter at Stella Maris Polytechnic"
+            },
+            "ym-University-of-Liberia-YouthMappers": {
+                "name": "University of Liberia YouthMappers",
+                "description": "YouthMappers chapter at University of Liberia YouthMappers",
+                "extendedDescription": "The University of Liberia YouthMappers is a chapter organization of the Global YouthMappers. We are a nonprofit student mapping organization focus on mapping for Liberia’s development and the World at large. The purpose of this organization shall be to utilize technology and geospatial knowledge as means of creating and developing maps; collecting and analyzing data that will address local and worldwide challenges. Our aim is to support and create opportunity for students to develop interest and skills in the fields of mapping. We envision a united student community that are collaborative, active and are willing to work with the University of Liberia YouthMappers in order to better the lives of others."
+            },
             "osm-mg-facebook": {
                 "name": "OpenStreetMap Madagascar Facebook Group",
                 "description": "Malagasy Facebook group for people interested in OpenStreetMap."
                 "name": "Talk-mg Mailing List",
                 "description": "Place for OpenStreetMap contributors, communities and users in Madagascar to share and discuss."
             },
+            "ym-University-of-Malawi": {
+                "name": "Chanco Malawi YouthMappers",
+                "description": "YouthMappers chapter at University of Malawi",
+                "extendedDescription": "Chanco Malawi YouthMappers is the student mapping organization for the University of Malawi's Chancellor College. The students in this chapter focus on mapping for Malawi's development and science needs."
+            },
+            "ym-Universit-des-Sciences-Sociale-et-de-Gestion-de-Bamako": {
+                "name": "Etudiant au Laboratoire HoPE",
+                "description": "YouthMappers chapter at Université des Sciences Sociale et de Gestion de Bamako"
+            },
+            "ym-Universidade-Eduardo-Mondlane": {
+                "name": "Comunidade YouthMappers Moçambique",
+                "description": "YouthMappers chapter at Universidade Eduardo Mondlane",
+                "extendedDescription": "We are a student group that intends to join Mozambican society to create a resilient community of humanitarian mapping. The community intend to map the physical occupation of our Country and create open geographic data, accessible to the public and able to be used in several areas without associated costs."
+            },
+            "ym-Namibia-University-of-Science-and-Technology": {
+                "name": "Geoinformation Technology Student Society",
+                "description": "YouthMappers chapter at Namibia University of Science and Technology"
+            },
+            "ym-Abia-State-University": {
+                "name": "AbsuMappersTeam",
+                "description": "YouthMappers chapter at Abia State University",
+                "extendedDescription": "AbsuMappersTeam is  voluntary team of map enthusiast ,using openstreetmap,GIS and other open source geospatial techno;ogy to solve problems.It is a dedicated for disaster response using OpenStreetMap.It is a  professional mentoring  and empowerment platform for  those with passion for GIS and Mapping.It is a community of  volunteers for geospatial data creation,field data collection and mapping.The team was co-founded by Victor N.Sunday(the Team mentor) and Professor J.U.Ogbonna ,the team coordinator and faculty Advisor. AbsuMapperTeam is an affiliate of UniiqueMappersTeam-Port Harcourt.The team stands to support sustainable development using geospatial  technology"
+            },
+            "ym-Ahmadu-Bello-University": {
+                "name": "ABU Geomappers",
+                "description": "YouthMappers chapter at Ahmadu Bello University",
+                "extendedDescription": "We are a group of Data driven Humanitarian mappers, who are dedicated to rendering humanitarian service in response to disaster and mitigation. We are glad to contribute our expertise and knowledge through mapping, and helping to spread #OpenEvangelism through Training, and collaboration."
+            },
+            "ym-Federal-School-of-Surveys": {
+                "name": "OyoMappersTeam (OMT) Oyo",
+                "description": "YouthMappers chapter at Federal School of Surveys"
+            },
+            "ym-Federal-University-of-Technology-Akure": {
+                "name": "YouthMappers Futa Space Club",
+                "description": "YouthMappers chapter at Federal University of Technology, Akure",
+                "extendedDescription": "Our mission is to raise the next generation of Space Leaders. Activities include research and capacity building in Remote Sensing, GIS, Climate Change, Astronomy, Cosmology, Space Engineering, Global Navigation, Robotics and Space Education."
+            },
+            "ym-Ignatius-Ajuru-University-of-Education": {
+                "name": "IgnatiusMappersTeam (IMT)",
+                "description": "YouthMappers chapter at Ignatius Ajuru University of Education",
+                "extendedDescription": "We are a YouthMappers Chapter of Ignatius Ajuru University of Education involved in crowdsourced mapping of our environment and remote mapping of resilient communities.We are a team of volunteers using openstreetmap and other open Geospatial source for mapping."
+            },
+            "ym-University-of-Nigeria-Nsukka": {
+                "name": "LionMappersTeam (LMT) Nsukka",
+                "description": "YouthMappers chapter at University of Nigeria, Nsukka",
+                "extendedDescription": "The LionMappersTeam is an affiliate of YouthMappers Network, with the sole aim of providing members the opportunity to learn and improve their skills in the field of mapping science and to create open geographic data and analysis that addresses locally defined challenges globally. It is a team of volunteers for crowdsourced mapping and geographic information provision using Openstreetmap, citizen science  and other geospatial  technology for research, training and response to resilient community challenges. We are involved in GIS and Remote Sensing Applications and Research.Paticipatory GIS and Citizen Science,field mapping ,training workshops and outreaches to High Schools."
+            },
+            "ym-University-of-Port-Harcourt": {
+                "name": "UniqueMappersTeam (UMT) Port Harcourt",
+                "description": "YouthMappers chapter at University of Port Harcourt",
+                "extendedDescription": "UniqueMappersTeam(UMT)Port Harcourt  is an action group and a team of volunteers for a collaborative online mapping targeted at training and empowering members with trending mapping skills  to create open geospatial data and analysis that addresses locally defined challenges for geoinformation and to provide humanitarian mapping  services to resilient communities in Niger Delta,Nigeria and elsewhere.We promote Crowdsoucred Mapping and Geographic information volunteering using OpenStreetMap(OSM) platform and other accessible platforms for Rapid Response Mapping,Disaster Mapping,Geo-intelligence Mapping,Map updates and training.Its an affiliate Campus chapter of Humanitarian OpenStreetMap Team(HOT).It is a project-task team of YouthMappers that provide opportunity for members to learn and improve their skills in Geoinformatics so as to explore global opportunities in the field of Mapping and Geoinformation."
+            },
+            "ym-University-of-Nigeria-Enugu-Campus": {
+                "name": "LionMappersTeam (LMT) Enugu",
+                "description": "YouthMappers chapter at University of Nigeria, Enugu Campus",
+                "extendedDescription": "The LionMappersTeam(LMT)Enugu Campus is an affiliate of YouthMappers Network, with the sole aim of providing members the opportunity to learn and improve their skills in the field of Geoinformatics and to create open geographic data and analysis that addresses locally defined challenges globally. It is a team of volunteers for Crowdsourced Mapping and Geographic Information provision using Openstreetmap, Citizen Science and other Geospatial Technology for research, training and response to resilient community challenges. We are involved in Web-Cartography, GIS and Remote Sensing Applications and ResearchWe are passionate about Volunteered Geographic Information.Paticipatory GIS and Citizen Science.Our major activities include online crowdsourced-Cartography, Field Mapping ,Training workshops and outreaches to High School as well as Humanitarian/Disaster Response Mapping."
+            },
+            "ym-Insititue-d-Enseignement-Superieur-de-Ruhengeri": {
+                "name": "YouthMappers at INES Ruhengeri",
+                "description": "YouthMappers chapter at Insititue d' Enseignement Superieur de Ruhengeri",
+                "extendedDescription": "We are students from Land Administration and Management and Land survey Departments from INES-Ruhengeri. We are engaged in mapping activities that create the changes toward sustainable development in our community."
+            },
+            "ym-University-of-Rwanda-Huye-Campus": {
+                "name": "Rwanda YouthMappers",
+                "description": "YouthMappers chapter at University of Rwanda - Huye Campus",
+                "extendedDescription": "Based on the commitment and the purpose of promoting mapping, and the information from YouthMappers public talks, we have organized as students in Geography department who are committed in mapping to found a chapter of our Campus. We have supported by our Facilitator Dr. Gaspard Rwanyiziri (Director of CGIS-Rwanda) and various lecturer mentors."
+            },
+            "ym-Institut-Suprieur-de-Management-Kolda": {
+                "name": "Les Femmes Leaders de ISM/Kolda",
+                "description": "YouthMappers chapter at Institut Supérieur de Management Kolda",
+                "extendedDescription": "Les Femmes Leaders de ISM/Kolda is an all-female mapping group in southern Senegal looking to put Kolda and surrounding villages on the map and better understand how to use OSM."
+            },
+            "ym-Universit-Gaston-Berger": {
+                "name": "YouthMappers at UGB",
+                "description": "YouthMappers chapter at Université Gaston Berger",
+                "extendedDescription": "YouthMappers UGB is made up of young students and researchers who are passionate about mapping. Our aim is to improve students' skills in the field of cartography and to participate in the creation of open geographic data that responds to development challenges around the world and particularly in Africa."
+            },
+            "ym-Fourah-Bay-College": {
+                "name": "Student's Geographical Association",
+                "description": "YouthMappers chapter at Fourah Bay College",
+                "extendedDescription": "The Student's Geographical Association- YouthMappers is an association of Fourah Bay College Students with the common goals of mapping out vulnerable places in Sierra Leone and the world at large for relief and other beneficial purposes,carry out Research and other educative endeavors. The chapter consists of young people with great ideas, development oriented with the capacity to relate with each other, comprehend and implement sustainable developmental projects as a team."
+            },
+            "ym-Njala-University-Freetown-Campus": {
+                "name": "Njala Freetown YouthMappers",
+                "description": "YouthMappers chapter at Njala University, Freetown Campus",
+                "extendedDescription": "We are students of Njala University Freetown Campus, studying Information Technology under the department of Physics and Computer Science. and we are located at Henry Street Freetown, Sierra Leone."
+            },
+            "ym-Njala-University-Njala-Campus": {
+                "name": "YouthMappers Njala University, Njala Campus",
+                "description": "YouthMappers chapter at Njala University, Njala Campus"
+            },
+            "ym-University-of-Pretoria": {
+                "name": "Centre for Geoinformation Science",
+                "description": "YouthMappers chapter at University of Pretoria",
+                "extendedDescription": "The students who map Pretoria are supported by the University of Pretoria's Centre for Geoinformation Science, a platform from where the excellence of UP individuals and teams involved in geographic information science (GISc) research, education and training, professional development and community engagement is encouraged and strengthened through collaborations, education and training and  alliances within South Africa and abroad."
+            },
+            "ym-Ardhi-University": {
+                "name": "ARU Mapper",
+                "description": "YouthMappers chapter at Ardhi University",
+                "extendedDescription": "As upcoming geospatial data consultants we seek to educate and provide advice to the society on how they can use spatial data not only as a form of location but a tool of decision making and predict different hazardous and climatical changes which may harm them or future genarations."
+            },
+            "ym-Institute-of-Finance-Management": {
+                "name": "IFM mappers",
+                "description": "YouthMappers chapter at Institute of Finance Management",
+                "extendedDescription": "This is a new  chapter at out institute and we are looking forward to use our financial education that we are receiving here at the campus  and link ig with the environment in order to develop our sustainable environment towards helping the community  with the effects of our environment in a financial ways by converting them into numbers. this is widely explained in ecosystem accounting and environmental accounts"
+            },
+            "ym-Institute-of-Rural-Development-Planning-Mwanza": {
+                "name": "Youth Mappers Chapter at Institute of Rural Development Planning - Lake Zone Centre",
+                "description": "YouthMappers chapter at Institute of Rural Development Planning Mwanza"
+            },
+            "ym-Institute-of-Rural-Development-Planning": {
+                "name": "Mipango YouthMappers Chapter",
+                "description": "YouthMappers chapter at Institute of Rural Development Planning",
+                "extendedDescription": "Mipango YouthMappers Chapter was introduced at IRDP on 3rd July, 2017 by Dr.Domitilla Bashemera. The founding members were  300 (190 males and 110 female) Bachelor Degree students, who were registered as members of the Chapter. Gerald Zacharia is the president of the chapter and Juster Lugira is Vice President."
+            },
+            "ym-Open-University-of-Tanzania": {
+                "name": "Youth Mappers at Open University of Tanzania",
+                "description": "YouthMappers chapter at Open University of Tanzania",
+                "extendedDescription": "Youth Mappers at Open University of Tanzania\n\nHad been founded by members and students of Open University of Tanzania in Department of Geography who are mainly need to improve their career and help young community through joint and partnership projects with local community groups such as Mikoko Scout Group (www.msg.or.tz) and start cooperation with international colleges and universities for exchange programs in relation to Geography Studies as some programs prepared by Mikoko Scout Group which will link local university and other universities of the same interest through International Nature & Environmental Youth Camp 2019 (www.campsite.msg.or.tz/nature.html )\n\nOur chapter will soon be recognized as youth network program that will open opportunity for students to study and conduct research studies at a local levels."
+            },
+            "ym-Sokoine-University-of-Agriculture": {
+                "name": "SMCoSE YouthMappers",
+                "description": "YouthMappers chapter at Sokoine University of Agriculture",
+                "extendedDescription": "A Chapter comprising of Environmental sciences and management students and Geography studies under the dept. of Geography and  we will be using mapping techniques, based on systems concepts and theories, can be used to facilitate, explore, and capture the different understandings of the relationships, perspectives, and boundaries involved in environmental sustainability to obtain a more complete comprehension of the concept and develop plans for action."
+            },
+            "ym-University-of-Dar-es-Salaam": {
+                "name": "YouthMappers at University of Dar es Salaam",
+                "description": "YouthMappers chapter at University of Dar es Salaam",
+                "extendedDescription": "The purpose of the University of Dar es Salaam YouthMappers  is to use and promote open source data and GIS technologies to map potential disaster areas, provide resources for emergency management, connect its members with open source and GIS organizations in the city of Dar es Salaam, and serve any upcoming needs of our project partners ."
+            },
+            "ym-Busitema-University": {
+                "name": "Good Mappers",
+                "description": "YouthMappers chapter at Busitema University",
+                "extendedDescription": "Good mappers is a team of students in Busitema University. Its main objective is to create a community of experienced mappers who can contribute to the world map."
+            },
+            "ym-Gulu-University": {
+                "name": "CSGU Mappers",
+                "description": "YouthMappers chapter at Gulu University",
+                "extendedDescription": "The CSGU Mappers are the Computing Society at Gulu University. This chapter is creative, passionate, innovative and ready to map Uganda and the world at large, beyond other people's imagination."
+            },
+            "ym-Kumi-University": {
+                "name": "Ever Last YouthMappers",
+                "description": "YouthMappers chapter at Kumi University",
+                "extendedDescription": "This energetic group of students organizes within the faculty of Science and Information Technology."
+            },
+            "ym-Makerere-University": {
+                "name": "Geo YouthMappers",
+                "description": "YouthMappers chapter at Makerere University",
+                "extendedDescription": "Geo YouthMappers is a Makerere University based mapping chapter esteemed to apply the spatial conception to the real world.We have collaborated on various mapping events with OSM. Our main aim is the desire to simplify data and make it readily available mostly for disaster preparedness.\"We map the world and change lives."
+            },
+            "ym-Mbarara-University-of-Science-and-Technology": {
+                "name": "MUST Street Mappers",
+                "description": "YouthMappers chapter at Mbarara University of Science and Technology",
+                "extendedDescription": "MUST Street Mappers is a Youth Mappers chapter at the Mbarara University of Science and Technology that is based on making our country and the world at large a better place through mapping. We base on collected information to notice patterns and data mine to present relevant and beneficial information to society."
+            },
+            "ym-St.-Augustine-International-University": {
+                "name": "YouthMappers at St Augustine International University",
+                "description": "YouthMappers chapter at St. Augustine International University"
+            },
+            "ym-Uganda-Christian-University-Mbale-Campus": {
+                "name": "Mappers for Life",
+                "description": "YouthMappers chapter at Uganda Christian University Mbale Campus",
+                "extendedDescription": "We are Team Mappers for life! Please come and join us as we map together!\" This group works from the Department of Information Technology at the UCU."
+            },
+            "ym-Uganda-Pentecostal-University": {
+                "name": "HiTech Youth Mappers",
+                "description": "YouthMappers chapter at Uganda Pentecostal University",
+                "extendedDescription": "A new Youthmappers Chapter in Western Uganda. Ready to map and provide open data with OpenStreetMap for development purposes."
+            },
+            "ym-St.-Mawaggali-Trades-Training-Institute": {
+                "name": "MawaggaliMappers",
+                "description": "YouthMappers chapter at St. Mawaggali Trades Training Institute",
+                "extendedDescription": "We are the youthappers chapter at St. Mawaggali trades in choma who are want to contribute the different humantarian tasks to serve lives through mapping."
+            },
+            "ym-The-University-of-Zambia": {
+                "name": "YouthMappers Unza",
+                "description": "YouthMappers chapter at The University of Zambia"
+            },
+            "ym-University-of-Zimbabwe": {
+                "name": "UZMappers",
+                "description": "YouthMappers chapter at University of Zimbabwe",
+                "extendedDescription": "UzMappersTeam Zimbabwe is a team of Volunteers using OpenStreetMap for Open Data Mapping and Humanitarian Disaster response mapping .The team empowers its members with open source geospatial technology skills."
+            },
             "OSM-BGD-facebook": {
                 "name": "OpenStreetMap Bangladesh",
                 "description": "Improve OpenStreetMap in Bangladesh",
                 "extendedDescription": "Mapping in Bangladesh? Have questions, want to connect with the community here? Join us at {url}. All are welcome!"
             },
+            "ym-Asian-University-for-Women": {
+                "name": "YouthMappers at AUW",
+                "description": "YouthMappers chapter at Asian University for Women",
+                "extendedDescription": "The Asian University for Women seeks to graduate women who will be skilled and innovative professionals, service-oriented leaders in the businesses and communities in which they will work and live, and promoters of intercultural understanding and sustainable human and economic development in Asia and throughout the world."
+            },
+            "ym-Dhaka-College": {
+                "name": "YouthMappers Daka College",
+                "description": "YouthMappers chapter at Dhaka College",
+                "extendedDescription": "YouthMappers DhakaCollege is an approach by students to help mapping vulnerable areas of the world as a part of Humanitarian Action. YouthMappers  gives the opportunity to the students for helping people and using mapping for humanitarian purposes. This open geographic data can be used for educational, navigational and other humanitarian purposes. Happy mapping."
+            },
+            "ym-Dhaka-University": {
+                "name": "Openstreetmap YouthMappers",
+                "description": "YouthMappers chapter at Dhaka University",
+                "extendedDescription": "It's a great privilege for the students of University of Dhaka to map for humanitarian purposes. Our chapter gives the opportunity to the students for helping people and use mapping for humanitarian purposes."
+            },
+            "ym-Eastern-University": {
+                "name": "YouthMappers at Eastern University",
+                "description": "YouthMappers chapter at Eastern University",
+                "extendedDescription": "YouthMappers at Eastern University, Bangladesh has been formed with a view to assisting people during humanitarian crisis. The students, likewise other mappers of the world, are promised to assist people in using the map for educational, navigational and other humanitarian purposes."
+            },
+            "ym-Jahangirnagar-University": {
+                "name": "YouthMappers at IRS, Jahangirnagar University",
+                "description": "YouthMappers chapter at Jahangirnagar University"
+            },
+            "ym-Khulna-University": {
+                "name": "Openstreetmap",
+                "description": "YouthMappers chapter at Khulna University",
+                "extendedDescription": "KU students and faculty from multiple disciplines are experienced at creating open data for OSM to address local challenges of development, including food security and other topics."
+            },
+            "ym-Rajshahi-University-of-Engineering-Technology": {
+                "name": "YouthMappers at RUET",
+                "description": "YouthMappers chapter at Rajshahi University of Engineering & Technology",
+                "extendedDescription": "The \"YouthMappers at RUET\" is a humanitarian mapping group of students of Rajshahi University of Engineering & Technology (RUET) to share, develop and practice the knowledge of GIS.  This group encourages using open source geospatial data and platform to make solution to reach the most vulnerable group of the world."
+            },
+            "ym-Sherubtse-College": {
+                "name": "Geographical Society",
+                "description": "YouthMappers chapter at Sherubtse College",
+                "extendedDescription": "The Geographical Society, in the Department of Geography & Planning, Sherubtse College, Royal University of Bhutan, with support from the Center for Climate Change and Spatial Information, has made several efforts to create awareness and address important issues at the local and national level. We now join hands with the international student-centered YouthMappers network on \"Mapping for Resilience\" and contributing to a global 'Happiness'!"
+            },
             "OSM-India-facebook": {
                 "name": "OpenStreetMap India - Participatory neighborhood mapping",
                 "description": "Improve OpenStreetMap in India",
                     }
                 }
             },
+            "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",
                 "extendedDescription": "FSHM community members share their OSM mapping updates / experiences through the Riot.im group, this group is also used to discuss things related to free software / hardware, technology and activism."
             },
+            "ym-Gujarat-University": {
+                "name": "CCIM at Ahmedabad",
+                "description": "YouthMappers chapter at Gujarat University"
+            },
             "OSM-IDN-facebook": {
                 "name": "OpenStreetMap Indonesia",
                 "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!"
             },
+            "ym-Universitas-Negeri-Makassar": {
+                "name": "Kontur Geografi",
+                "description": "YouthMappers chapter at Universitas Negeri Makassar"
+            },
+            "ym-University-Muhammadiyah-Surakarta": {
+                "name": "SpaceTime",
+                "description": "YouthMappers chapter at University Muhammadiyah Surakarta",
+                "extendedDescription": "SpaceTime is a community mapping in the Faculty of Geography of Muhammadiyah University of Surakarta. SpaceTime was founded by Bruce Maldy Pratama, Mukhlis Akbar and Irfandi Fauzi. They are active students in the Faculty of Geography University Muhammadiyah Surakarta."
+            },
+            "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!"
             },
+            "ym-Institute-of-Crisis-Management-Studies": {
+                "name": "Institute of Crisis Management Studies YouthMappers",
+                "description": "YouthMappers chapter at Institute of Crisis Management Studies",
+                "extendedDescription": "To develop Crisis Mappers to assist during disaster situations."
+            },
+            "ym-Kathmandu-University": {
+                "name": "Geomatics Engineering Society,GES",
+                "description": "YouthMappers chapter at Kathmandu University",
+                "extendedDescription": "Geomatics Engineering Society (GES) established in 2008 A.D is a departmental club under Department of Civil and Geomatics Engineering (DCGE) at Kathmandu University. GES acts as a platform to develop the skills of students apart from their educational activities by focusing on activities like technical trainings, seminars, talk programs and interaction with experts from related field, sports activities etc."
+            },
+            "ym-Tribhuvan-University": {
+                "name": "Geomatics Engineering Students Association",
+                "description": "YouthMappers chapter at Tribhuvan University",
+                "extendedDescription": "This organization is the student forum of Geomatics Engineering students of Tribhuvan University , Institute of Engineering on the Pashchimanchal campus. Established since the beginning of the degree program, students have been active in mapping and leadership and are thrilled to be a part of the YouthMappers network."
+            },
+            "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 PH Telegram",
                 "description": "Un-official, Telegram local community of OpenStreetMap contributors and friends in the Philippines"
             },
+            "ym-Far-Eastern-University-Institute-of-Technology": {
+                "name": "Junior Philippines Computer Society",
+                "description": "YouthMappers chapter at Far Eastern University -Institute of Technology",
+                "extendedDescription": "FEU has been recognized as one of the leading universities in the Philippines. Its mission centers on producing graduates who have contributed to the advancement of the country. The university continuously challenges itself to raise the bar of excellence to achieve a top-tier status not only in the Philippines but also in the South East Asian region"
+            },
+            "ym-University-of-the-Philippines-Resilience-Institute": {
+                "name": "YouthMappers UP Resilience Institute",
+                "description": "YouthMappers chapter at University of the Philippines Resilience Institute",
+                "extendedDescription": "The UP Resilience Institute was established in 2016 with a mission statement to empower local communities through multidisciplinary research and actions toward resilience. Through UP NOAH Center, and the help of different organizations, we have provided building exposure maps for 17 provinces out of the 82 and uploaded more than 4 million footprints to Open Street Maps."
+            },
             "OSM-RU-forum": {
                 "name": "OpenStreetMap RU forum",
                 "description": "OpenStreetMap Russia web forum"
                 "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!"
                 "description": "Irregular meeting of the OpenStreetMap community in Chiang Mai",
                 "extendedDescription": "Members of the OpenStreetMap community meet every few months in Chiang Mai. Get in contact and check out {url} to see when the next meetup is scheduled"
             },
+            "OSM-TH-facebook": {
+                "name": "OpenStreetMap TH Facebook group",
+                "description": "Facebook group for OpenStreetMappers in Thailand"
+            },
             "OSM-TH-forum": {
                 "name": "OpenStreetMap TH forum",
                 "description": "OpenStreetMap Thailand web forum"
                 "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"
+            },
+            "osmcz-facebook": {
+                "name": "OpenStreetMap CZ on Facebook",
+                "description": "Follow czech community on Facebook - including translated WeeklyOSM!"
+            },
+            "osmcz-twitter": {
+                "name": "Czech twitter @osmcz",
+                "description": "Follow czech community on Twitter - including translated WeeklyOSM!"
+            },
             "talk-cz-mailinglist": {
-                "name": "Talk-cz Mailing List",
+                "name": "Czech mailing list (talk-cz)",
                 "description": "Talk-cz is the official mailing list for Czech community"
             },
             "dk-forum": {
                 "name": "Talk-dk Mailing List",
                 "description": "A mailing list to discuss OpenStreetMap in Denmark"
             },
+            "ym-Queen-Mary-University-of-London": {
+                "name": "Queen Mary YouthMappers",
+                "description": "YouthMappers chapter at Queen Mary University of London",
+                "extendedDescription": "This chapter will be part of the activities of the Queen Mary Geography Society."
+            },
             "fi-forum": {
                 "name": "OpenStreetMap FI forum",
                 "description": "OpenStreetMap Finland web forum"
                 "name": "OWL Mailing List",
                 "description": "This is the mailing list for the Ostwestfalen-Lippe OSM community"
             },
+            "de-telegram": {
+                "name": "OpenStreetMap Germany Telegram",
+                "description": "Join the OpenStreetMap Germany Telegram supergroup at {url}"
+            },
             "osm-de": {
                 "name": "OpenStreetMap Germany",
                 "description": "The platform for information on OpenStreetMap in Germany"
             },
+            "ym-Heidelberg-University": {
+                "name": "disastermappers heidelberg",
+                "description": "YouthMappers chapter at Heidelberg University",
+                "extendedDescription": "Disastermappers Heidelberg was founded in 2014 as a student initiative to build a platform for exchange between students, researchers and humanitarian actors. Disastermappers are a member of Missing Maps and are organizing mapathons, workshops and webinars in Heidelberg and beyond and support HOT and Missing Maps through research and applications."
+            },
             "hu-facebook": {
                 "name": "OpenStreetMap HU on Facebook",
                 "description": "Mappers and OpenStreetMap Facebook in Hungary"
                 "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 Twitter",
+                "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"
             },
+            "ym-Politecnico-di-Milano": {
+                "name": "PoliMappers",
+                "description": "YouthMappers chapter at Politecnico di Milano",
+                "extendedDescription": "PoliMappers is a volunteer students’ association based at Politecnico di Milano. The mission of the group is to train and motivate the next generation of volunteer mappers and to do mapping using free and open source software within the university as well as primary and secondary schools."
+            },
+            "ym-Yarmouk-University": {
+                "name": "YouthMappers at YU",
+                "description": "YouthMappers chapter at Yarmouk University",
+                "extendedDescription": "YouthMappers chapter at YU is the first mapping group in the Middle East and North Africa region where refugees, drought, and poverty are rising crises and in urgent need for humanitarian mapping  activities to mitigate the consequences of such crises. YU Mappers are encouraged to use open data to address challenges in MENA region to bring relief and development to target areas within the region."
+            },
+            "kosovo-telegram": {
+                "name": "OpenStreetMap Kosovo on Telegram",
+                "description": "Semi-official all-Kosovo Telegram public group. We welcome all mappers from anywhere in any language."
+            },
+            "ym-Universit-Mohammed-V-Rabat": {
+                "name": "Brahmapoutre at Rabat",
+                "description": "YouthMappers chapter at Université Mohammed V Rabat",
+                "extendedDescription": "This chapter sees participation in the YouthMappers program as an oppourtunity to share our knowlege create new working relationships with other chapters in different countries"
+            },
             "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"
+            },
+            "si-twitter": {
+                "name": "OpenStreetMap Slovenia Twitter",
+                "description": "Follow OpenStreetMap Slovenia On Twitter: {url}"
+            },
             "OSM-ES-mailinglist": {
                 "name": "Talk-es mailing list",
                 "description": "A mailing list to discuss OpenStreetMap in Spain"
                 "name": "@OSMes on Telegram",
                 "description": "OpenStreetMap Spain Telegram chat"
             },
+            "ym-Universidad-Autonoma-de-Madrid": {
+                "name": "YouthMappers at UAM",
+                "description": "YouthMappers chapter at Universidad Autonoma de Madrid"
+            },
+            "ym-Universidad-Politcnica-de-Madrid": {
+                "name": "Mapeo Humanitario",
+                "description": "YouthMappers chapter at Universidad Politécnica de Madrid",
+                "extendedDescription": "Geo-volunteering group formed at Moncloa Campus on November 2017. Around 20 members from three Universities (Complutense, CEU and UPM). Undergraduate students, MSc and PhD students collaborate together with organizations (MSF, Acción contra el Hambre,...) supported by trainers from Geoinquietos. Official recognition by UPM as Educative Innovation Project (Code  IE1718.0411)"
+            },
             "osm-se": {
                 "name": "OpenStreetMap.se",
                 "description": "Provide OSM services and information for the local community in Sweden"
                 "name": "OpenStreetMap Sweden on Twitter",
                 "description": "Follow us on Twitter: {url}"
             },
+            "ym-Istanbul-Technical-University": {
+                "name": "YouthMappers ITU",
+                "description": "YouthMappers chapter at Istanbul Technical University",
+                "extendedDescription": "YouthMappers ITU is an interdisciplinary and collaborative student community to promote humanitarian mapping for vulnerable settlements and aims to develop and share strategic and innovative spatial information for the future cities by using geographical information systems and open data."
+            },
             "Nottingham-OSM-pub-meetup": {
                 "name": "East Midlands (Nottingham) Monthly pub meet-up",
                 "description": "Social gathering for East Midlands mappers and users",
                 "description": "Join #osm-gb on irc.oftc.net (port 6667)",
                 "extendedDescription": "Join #osm-gb on irc.oftc.net (port 6667), please be patient and wait for a few minutes if you ask a question"
             },
+            "ym-University-of-Exeter": {
+                "name": "University of Exeter British Red Cross Missing Maps",
+                "description": "YouthMappers chapter at University of Exeter",
+                "extendedDescription": "We are a team of enthusiastic Geographers with comprehensive knowledge of GIS. We are passionate about supporting the British Red Cross Society with various humanitarian aid efforts. We are also important teachers of the significance of mapping remotely sensed data and how this helps on the ground. Our mapathons have themed academic focuses that highlight the different GIS research in our geography department, while also functioning as employability awareness events which we use to invite speakers in to talk about their GIS/British Red Cross careers."
+            },
+            "ym-University-of-Warwick": {
+                "name": "University of Warwick Resilience Mapping Society",
+                "description": "YouthMappers chapter at University of Warwick",
+                "extendedDescription": "We are a group of enthusiastic mappers based at Warwick University. Our aim is to get people excited about humanitarian mapping and help them understand the impact this activity has on the field. We are closely aligned with Missing Maps and Doctors Without Borders UK and focus on HOT tasks in our mapping activities and workshops. Our mapathons are listed on the Missing Maps page whenever they are scheduled."
+            },
+            "ym-Sacred-Heart-Junior-College": {
+                "name": "Youth Mappers at Sacred Heart Junior College",
+                "description": "YouthMappers chapter at Sacred Heart Junior College"
+            },
             "OSM-CA-Slack": {
                 "name": "OSM-CA Slack",
                 "description": "All are welcome! Sign up at {signupUrl}."
                 "name": "OpenStreetMap Vancouver",
                 "description": "Mappers and OpenStreetMap users in the Vancouver, BC area"
             },
+            "ym-Universidad-de-Costa-Rica": {
+                "name": "YouthMappers de Universidad de Costa Rica",
+                "description": "YouthMappers chapter at Universidad de Costa Rica",
+                "extendedDescription": "YouthMappers de Universidad de Costa Rica nace en función de acción social para y por miembros de comunidades distintas según temáticas de involucramiento, interacción y representación de variables dentro de un espacio geográfico definido (un territorio) Gracias a las herramientas de OpenStreetMaps tenemos la viabilidad de poder obtener, validar y compartir la información generada para comprobación y uso destinadas a las comunidades o el interesado en tales temáticas objetivas."
+            },
             "OSM-CU-telegram": {
                 "name": "OSM Cuba on Telegram",
                 "description": "OpenStreetMap Cuba Telegram chat"
             },
+            "ym-Universidad-Nacional-Autnoma-de-Honduras": {
+                "name": "PumaGis Hn",
+                "description": "YouthMappers chapter at Universidad Nacional Autónoma de Honduras"
+            },
+            "ym-University-of-the-West-Indies-Mona-Campus": {
+                "name": "Libraries Outreach - ODL",
+                "description": "YouthMappers chapter at University of the West Indies, Mona Campus",
+                "extendedDescription": "The UWI, Mona Campus Library engages in public, outreach and special projects. This will allow our library the means to be a catalyst for spatial literacy and advocate for spatial data sharing and access to Jamaican and Caribbean interests. We have disaster relief and communication needs and   extensive earth science and geo-hazards needs to better serve our campus and community. Specifically, we hace a Science Library to showcase such to all faculty and students."
+            },
             "OSM-NI-telegram": {
                 "name": "OSM Nicaragua on Telegram",
                 "description": "OpenStreetMap Nicaragua Telegram chat"
             },
+            "ym-Universidad-Nacional-de-Ingenieria": {
+                "name": "Yeka Street MGA",
+                "description": "YouthMappers chapter at Universidad Nacional de Ingenieria",
+                "extendedDescription": "YEKA STREET is a work team constituted by students from Universidad Nacional de Ingenieria at Managua, Nicaragua. With the principal purpose of apply our knowledge and skills using many tools and apps to map areas in our cities and contribute to the development community projects and disasters relieve plans. We want to lead the way adding more students from all careers and universities in our country to join us at this cause, increasing in this way the life level and reducing the population vulnerability."
+            },
+            "ym-University-of-Panama": {
+                "name": "YouthMappers UP",
+                "description": "YouthMappers chapter at University of Panama",
+                "extendedDescription": "Student mappers in Panama work with open spatial data to help identify, define, address, and create meaning about locally defined development challenges. They collaborate with students from other countries on community mapping topics from ecotourism to food security, from biodiversity to indigenous issues, promoting a humanistic vision through scientific perspectives."
+            },
+            "ym-Universidad-de-Puerto-Rico-Rio-Piedras": {
+                "name": "UPR YouthMappers",
+                "description": "YouthMappers chapter at Universidad de Puerto Rico - Rio Piedras"
+            },
             "Bay-Area-OpenStreetMappers": {
                 "name": "Bay Area OpenStreetMappers",
                 "description": "Improve OpenStreetMap in the Bay Area",
                 "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": {
+                    "sotmus2019-cfs": {
+                        "name": "Propose a Talk for SotM-US 2019",
+                        "description": "We are calling on all members of the OpenStreetMap community to share your ideas and session proposals for State of the Map US 2019. Whether you are brand new to OSM or have been a core contributor since the beginning, we want to hear from you!",
+                        "where": "Minneapolis, Minnesota"
+                    },
+                    "sotmus2019": {
+                        "name": "State of the Map US 2019",
+                        "description": "Join the OpenStreetMap community at State of the Map US in Minneapolis, Minnesota. Connect with other mappers, businesses, government agencies, and non profits, all collaborating around the free and editable map of the world.",
+                        "where": "Minneapolis, Minnesota"
+                    }
+                }
             },
             "OSM-Utah": {
                 "name": "OpenStreetMap Utah",
                 "description": "Mappers and OpenStreetMap users around Grand Junction, CO",
                 "extendedDescription": "The goal of this group is to introduce OpenStreetMap to the community, develop a community of mappers, create the most amazing geodata possible using whatever method we can and finally strategize in order to get this data out into our community. Imagine accurate trail signage! Imagine further development of bike paths! Imagine anything you want, that's the joy of OpenStreetMap!"
             },
-            "Maptime-Australia-Slack": {
-                "name": "Maptime Australia Slack",
-                "description": "Sign up at {signupUrl}"
+            "ym-Ball-State-University": {
+                "name": "Gamma Theta Upsilon- Iota Omega Chapter",
+                "description": "YouthMappers chapter at Ball State University",
+                "extendedDescription": "Our chapter is a very active one. We primarily focus on community events, fundraising, and field trips. We are currently looking to develop more mapping-related activities to draw in other students from campus who may be interested in contributing."
+            },
+            "ym-California-University-of-Pennsylvania": {
+                "name": "CalU PA GIS Club",
+                "description": "YouthMappers chapter at California University of Pennsylvania",
+                "extendedDescription": "GIS Students at Cal U learn to apply spatial theory to the real world. The university degree program focuses on geography as well as utilizing GIS in emergency management."
+            },
+            "ym-Central-Washington-University": {
+                "name": "Geography Club",
+                "description": "YouthMappers chapter at Central Washington University",
+                "extendedDescription": "Our goal teaming up with Youthmappers is to bring relief to areas that are in need of humanitarian mapping. By doing so, we are serving our fellow brothers and sisters around the world as well as furthering our own cartography skills."
+            },
+            "ym-Clemson-University": {
+                "name": "Clemson Mappers",
+                "description": "YouthMappers chapter at Clemson University",
+                "extendedDescription": "Students in Clemson are supported by the Center for Geospatial Technologies, a community of interdisciplinary geospatial science practitioners supporting research, teaching, and outreach activities using technologies that enable the collection, analysis, and application of geospatial data. Students integrate geospatial technologies within their scholarly activities across all disciplines and build connections throughout the world."
+            },
+            "ym-College-of-William-and-Mary": {
+                "name": "All over the map!",
+                "description": "YouthMappers chapter at College of William and Mary",
+                "extendedDescription": "The students who are all over the map are supported by the Center for Geospatial Analysis, a group integrating GIS across the curriculum and providing student and faculty with hardware, software, and expertise.  Students of all backgrounds utilize GIS across campus, including environmental science and policy, geology, history, business, sociology, biology, anthropology, public policy, and marine sciences."
+            },
+            "ym-Cornell-University": {
+                "name": "Mapping Society",
+                "description": "YouthMappers chapter at Cornell University",
+                "extendedDescription": "Cornell students and faculty use open data and open source software to address challenges at local, national, and global scales. In doing so, we advance our academic and personal goals of developing our own skills around GIS and spatial literacy."
+            },
+            "ym-George-Mason-University": {
+                "name": "Mason Mappers",
+                "description": "YouthMappers chapter at George Mason University",
+                "extendedDescription": "Mason Mappers Student Society is a humanitarian mapping student organization in the George Mason University GGS Department, and its goal is to promote education and knowledge in geo-technologies, geo-info science, to foster good global stewardship and engage in professional development while building a positive, interactive geo-community, as well as shaping students into leaders of tomorrow."
+            },
+            "ym-Indiana-University-of-Pennsylvania": {
+                "name": "Geospatial Science Club",
+                "description": "YouthMappers chapter at Indiana University of Pennsylvania"
+            },
+            "ym-Jacksonville-State-University": {
+                "name": "JSU Disaster Mapping Team",
+                "description": "YouthMappers chapter at Jacksonville State University",
+                "extendedDescription": "The JSU Disaster Mapping Team is a program at Jacksonville State University dedicated to assisting disaster response in times of emergencies. This includes tornadoes, severe thunderstorms, floods, etc. The team is intended to be a valuable asset to surrounding counties and a conduit for the JSU Geoscience Department students to apply what they have learned in an academic setting to support emergency services. Our goal is to streamline disaster response and recovery operations while utilizing student skill sets"
+            },
+            "ym-Kansas-State-University": {
+                "name": "Gamma Theta Upsilon: Beta Psi Chapter",
+                "description": "YouthMappers chapter at Kansas State University",
+                "extendedDescription": "We are the Kansas State University Chapter of Gamma Theta Upsilon, an international geography honor society with affiliation to YouthMappers. We have been active with mapping for OSM and conducted a mapathon called \"Map for Nepal,\" in which we used OpenStreetMap to digitize unmapped areas of Nepal after the earthquake in 2015."
+            },
+            "ym-McGill-University": {
+                "name": "Open Mapping Group McGill: A Member of the McGill Undergraduate Geography Society",
+                "description": "YouthMappers chapter at McGill University",
+                "extendedDescription": "The Open Mapping Group McGill: A Member of McGill Undergraduate Geography Society (OMG McGill) aims to connect students with open geospatial data and technologies to enhance resilience, community-building, and learning through mapping–on campus, in Montreal, in Canada, and abroad."
+            },
+            "ym-Miami-University": {
+                "name": "Geography and Planning Society",
+                "description": "YouthMappers chapter at Miami University",
+                "extendedDescription": "GPS at Miami University aims to create a close-knit community of planners and geographers who want to have fun, learn more about careers and higher education in their field, network, and work alongside professionals for real experience."
+            },
+            "ym-Monroe-Community-College": {
+                "name": "MCC Mapping Corps",
+                "description": "YouthMappers chapter at Monroe Community College"
+            },
+            "ym-Montgomery-College": {
+                "name": "GeoMC",
+                "description": "YouthMappers chapter at Montgomery College",
+                "extendedDescription": "GeoMC’s mission is to provide students with hands-on experience in applying geospatial tools, collecting data, and project management. Most of our students come with a background in GIS and are geography majors. Our chapter’s members come from diverse backgrounds and we all work together to make a positive impact in the world live in."
+            },
+            "ym-New-York-University": {
+                "name": "NYU mHealth Initiative Mapping Corps",
+                "description": "YouthMappers chapter at New York University",
+                "extendedDescription": "The NYU mobile health or “mHealth” research initiative focuses on development of systems that link people - usually via their phones - to the places that they live and traverse, and thus supports novel research on the way phones and maps can be leveraged to understand behavioral decision making and ultimately health outcomes."
+            },
+            "ym-Ohio-Wesleyan-University": {
+                "name": "Environment and Wildlife Club",
+                "description": "YouthMappers chapter at Ohio Wesleyan University",
+                "extendedDescription": "Environment and Wildlife Club looks at environmental issues on campus, in Delaware, and even nationally! We create campus and community projects, explore and enjoy the outdoors, volunteer, and try to promote environmentalism in every aspect of our lives."
+            },
+            "ym-Oklahoma-State-University": {
+                "name": "Geography Club",
+                "description": "YouthMappers chapter at Oklahoma State University"
+            },
+            "ym-State-University-of-New-York-Geneseo": {
+                "name": "SUNY Geneseo GIS Association",
+                "description": "YouthMappers chapter at State University of New York Geneseo",
+                "extendedDescription": "We spread awareness, support, education, volunteerism, and career advancement opportunities in geographic information systems, across disciplines and departments, in the context of SUNY Geneseo, the local community, and global community."
+            },
+            "ym-SUNY-at-Fredonia": {
+                "name": "Geoventurers",
+                "description": "YouthMappers chapter at SUNY at Fredonia",
+                "extendedDescription": "GeoVenturers is a group of students joining together across a number of majors on our campus that see geospatial technologies as a tool to serve others and to bring people together. Mentoring for the group brings in science education from the department of curriculum and instruction. We hope that we can bring our skills to play in helping make people's lives better."
+            },
+            "ym-Texas-Tech-University": {
+                "name": "YouthMappers at TTU",
+                "description": "YouthMappers chapter at Texas Tech University",
+                "extendedDescription": "As one of the co-founding chapters of the network, the TTU YouthMappers are enthusiastic to serve as interdisciplinary leaders to help create open geographic data and analyses that address locally defined development challenges worldwide. The chapter strives to exchange and collaborate with other chapters around the globe while also offering themselves as a local resource and service to Texas Tech student organizations in ways that add value to their respecitive campus activities through mapping."
+            },
+            "ym-The-Citadel": {
+                "name": "YouthMappers at The Citadel",
+                "description": "YouthMappers chapter at The Citadel",
+                "extendedDescription": "This chapter is also a Rotaract Club, which is an affiliate of Rotary International. Multiple members, as well as leadership have expressed an interest in YouthMappers and we would like to affiliate our Citadel Rotaract Club with YouthMappers."
+            },
+            "ym-The-George-Washington-University": {
+                "name": "Humanitarian Mapping Society",
+                "description": "YouthMappers chapter at The George Washington University",
+                "extendedDescription": "Models of leadership and engagement, HMS seeks to render aid and better the world through humanitarian Geographic Information Systems (GIS) projects. This co-founding affiliated chapter on the campus of GWU has a plethora of experience to share, and frequently partners directly with USAID, the American Red Cross, and the US Department of State in their DC area to expand student-led efforts and serve the global community."
+            },
+            "ym-The-Johns-Hopkins-University-SAIS": {
+                "name": "SAIS YouthMappers",
+                "description": "YouthMappers chapter at The Johns Hopkins University, SAIS",
+                "extendedDescription": "The mission of SAIS Youth Mappers is to provide students at the Johns Hopkins University SAIS with the opportunity to become highly skilled humanitarian mappers. As a group within the South Asia Club, its primary focus is on supporting humanitarian mapping projects in the Indo-Pacific Region."
+            },
+            "ym-The-Pennsylvania-State-University": {
+                "name": "Penn State GIS Coalition",
+                "description": "YouthMappers chapter at The Pennsylvania State University",
+                "extendedDescription": "The Penn State Geospatial Information Science (GIS) Coalition is an organization that offers students majoring, minoring, or sharing an interest in GIS opportunities to develop supplementary knowledge and skills necessary to succeed in the professional GIS industry."
+            },
+            "ym-University-of-California-Davis": {
+                "name": "Mapping Club",
+                "description": "YouthMappers chapter at University of California, Davis"
+            },
+            "ym-University-of-Central-Florida": {
+                "name": "Geospatial Information Society",
+                "description": "YouthMappers chapter at University of Central Florida",
+                "extendedDescription": "Our mission is to foster a social and educational environment for all majors who are interested in the discussion and application of GIS. Group and community events throughout the academic year organize students to volunteer to help local and regional communities by using community-based GIS projects and educating local middle and high school students on the use and application of GIS."
+            },
+            "ym-University-of-Chicago": {
+                "name": "Tobler Society",
+                "description": "YouthMappers chapter at University of Chicago"
+            },
+            "ym-University-of-Maryland-College-Park": {
+                "name": "Geography Club",
+                "description": "YouthMappers chapter at University of Maryland - College Park",
+                "extendedDescription": "The mission of the Geography Club at the University of Maryland College Park is to engage and encourage students to explore geographic interests within the campus and the community."
+            },
+            "ym-University-of-North-Texas": {
+                "name": "UNT Geography Club",
+                "description": "YouthMappers chapter at University of North Texas",
+                "extendedDescription": "The Geography Club is a student organization at University of North Texas that welcomes all students who are interested in geography. The objective of the Geography Club is to promote interest in Geography, the Major and the Geography Department along with fellowship among students and faculty. The club also seeks to represent student needs and wants in regard to the study of geography and to provide a forum for the presentation of innovative ideas to the benefit of the University community."
+            },
+            "ym-University-of-Northern-Colorado": {
+                "name": "UNCO Geography and GIS Club",
+                "description": "YouthMappers chapter at University of Northern Colorado",
+                "extendedDescription": "Official Geography and GIS Club chapter affiliated with the University of Northern Colorado where our aim is to learn, share and connect with those around us. #MakingSenseOfTheWorld"
+            },
+            "ym-University-of-Oregon": {
+                "name": "Map by Northwest",
+                "description": "YouthMappers chapter at University of Oregon",
+                "extendedDescription": "Map By Northwest aims to engage undergraduate students at the University of Oregon in mapping projects to assist in humanitarian causes and for conducting geographic research. We welcome students from all disciplines to join us in our mapping adventures."
+            },
+            "ym-University-of-Redlands": {
+                "name": "URSpatial Geo-Thinkers",
+                "description": "YouthMappers chapter at University of Redlands",
+                "extendedDescription": "To build upon the members' GIS skills and knowledge of the tools and methods through applied social engagement as well as to educate the campus community about the power of mapping and spatial analysis through community service events."
+            },
+            "ym-University-of-South-Carolina": {
+                "name": "Geography Graduate Student Association",
+                "description": "YouthMappers chapter at University of South Carolina",
+                "extendedDescription": "The GGSA is a fully student-run organization, designed to serve as an advocate and resource for all geography graduate students by filling the role of liaison between the department and students. Our goal is to further professional, academic, and personal development of graduate students interested in the field of geography and its sub disciplines."
+            },
+            "ym-University-of-Southern-California": {
+                "name": "SC Mappers",
+                "description": "YouthMappers chapter at University of Southern California",
+                "extendedDescription": "We see the world differently: we view it through a spatial lens. With the power of spatial thinking, we connect place and space to help address global challenges. Collaborate with us!"
+            },
+            "ym-University-of-Vermont": {
+                "name": "University of Vermont Humanitarian Mapping Club",
+                "description": "YouthMappers chapter at University of Vermont"
+            },
+            "ym-University-of-Victoria": {
+                "name": "Society of Geography Students",
+                "description": "YouthMappers chapter at University of Victoria",
+                "extendedDescription": "SOGS seeks to promote and represent social and academic interests within the Department of Geography. This is expressed by four key goals: To provide a forum for the discussion of matters concerning the quality and accessibility of education within geography; to provide a means of expressing a consensus of student opinion to deparhnental faculty through representation at deparkrnental meetings and on departrnental committees; to undertake anangements for such activities as are for the benefit of students and are seen to be within the field of interest of students in geography; to act as a liaison through the UVSS and the Course Union Council with other student groups on campus"
+            },
+            "ym-University-of-Wyoming": {
+                "name": "Gamma Theta Upsilon/Geography Club",
+                "description": "YouthMappers chapter at University of Wyoming"
+            },
+            "ym-UW-Madison": {
+                "name": "BadgerMaps",
+                "description": "YouthMappers chapter at UW-Madison",
+                "extendedDescription": "BadgerMaps is the UW campus chapter of Youthmappers, an organization dedicated to humanitarian and community mapping services. We connect our volunteer network with opportunities to create GIS data for projects that need it."
+            },
+            "ym-Vassar-College": {
+                "name": "Hudson Valley Mappers",
+                "description": "YouthMappers chapter at Vassar College",
+                "extendedDescription": "Our mission is to provide a multi-disciplinary platform for peers, educators, and community organizations to engage in local mapping projects with a focus on strengthening our local ecosystems, our built environment, and the health of our community. We also seek to contribute geospatial support for global humanitarian aid and development efforts."
+            },
+            "ym-Villanova-University": {
+                "name": "The Villanova Globeplotters",
+                "description": "YouthMappers chapter at Villanova University",
+                "extendedDescription": "The Villanova Globeplotters is built on Villanova’s Augustinian principle of selfless-service to the global community. Mixed with relaxed social interaction, we strive to provide geospatial outreach to those in need regardless of participating students’ race, academic major, student group association, or college career level."
+            },
+            "ym-West-Virginia-University": {
+                "name": "Maptime Morgantown",
+                "description": "YouthMappers chapter at West Virginia University",
+                "extendedDescription": "Working as a collaborative team, this co-founding chapter focuses on providing an open learning environment for those interested in working on projects that intersect international development, emergency response, and geographic information science.\nThey connect beginners and experts by providing technical training and experience in building meaningful and useful geographic infrastructure data, while connecting to sister cities around the world."
+            },
+            "ym-Western-Michigan-University": {
+                "name": "Geography Club",
+                "description": "YouthMappers chapter at Western Michigan University"
             },
             "talk-au": {
                 "name": "Talk-au Mailing List",
                 "description": "Place for Aussie mappers to chat"
             },
+            "Maptime-Oceania-Slack": {
+                "name": "Maptime Oceania Slack",
+                "description": "Sign up at {signupUrl}"
+            },
+            "talk-nz": {
+                "name": "Talk-nz Mailing List",
+                "description": "New Zealand's OSM community talk"
+            },
             "OSM-AR-facebook": {
                 "name": "OpenStreetMap Argentina Facebook",
                 "description": "Join the OpenStreetMap Argentina community on Facebook",
                 "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 Colombia",
                 "description": "News of the OpenStreetMap Colombia community and the OSMCo Foundation"
             },
+            "ym-Universidad-de-Antioquia": {
+                "name": "Geomatica UDEA",
+                "description": "YouthMappers chapter at Universidad de Antioquia",
+                "extendedDescription": "We are a group interested in geospatial data, voluntary cartography, and participating in mapping with others in our country and within the YouthMappers network."
+            },
+            "ym-Universidad-de-La-Guajira": {
+                "name": "Grupo Mesh",
+                "description": "YouthMappers chapter at Universidad de La Guajira",
+                "extendedDescription": "Grupo Mesh is a student organization at the Universidad de la Guajira in Colombia, including students from the program of Environmental Engineering who learn cartography and open mapping."
+            },
+            "ym-Universidad-de-Los-Andes": {
+                "name": "Cartografos Uniandes",
+                "description": "YouthMappers chapter at Universidad de Los Andes",
+                "extendedDescription": "We are a circle of student participation that seeks to use mapping and spatial reasoning as a means to create bonds of cooperation and integration between the university and society by addressing different spatial, social, political , economic and cultural dynamics."
+            },
+            "ym-Universidad-de-San-Buenaventura": {
+                "name": "YouthMappers San Buenaventura",
+                "description": "YouthMappers chapter at Universidad de San Buenaventura",
+                "extendedDescription": "We are pleased to join YouthMappers mapping for a better world and community."
+            },
+            "ym-Universidad-Distrital-Francisco-Jose-de-Caldas": {
+                "name": "YouthMappers at Bogota",
+                "description": "YouthMappers chapter at Universidad Distrital Francisco Jose de Caldas",
+                "extendedDescription": "The Universidad Distrital Francisco José de Caldas is a public, coeducational, research university based in Bogotá, Colombia with a population of 26,140 students."
+            },
+            "ym-Universidad-Nacional-de-Colombia": {
+                "name": "Grupo UN",
+                "description": "YouthMappers chapter at Universidad Nacional de Colombia",
+                "extendedDescription": "Students are uniting to map and network with university students across the country of Colombia and across the globe.  Geographic specialties include affiliation with microbiology and health disciplines."
+            },
             "OSM-EC-telegram": {
                 "name": "OSM Ecuador on Telegram",
                 "description": "OpenStreetMap Ecuador Telegram chat"
                 "name": "OpenStreetMap Peru",
                 "description": "News and resources for the OpenStreetMap Peru community"
             },
+            "uy-forum": {
+                "name": "OpenStreetMap UY forum",
+                "description": "OpenStreetMap Uruguay web forum"
+            },
+            "uy-irc": {
+                "name": "OpenStreetMap Uruguay on IRC",
+                "description": "Join #osmuruguay on irc.freenode.org (port 6667)",
+                "extendedDescription": "Join #osmuruguay on irc.freenode.org"
+            },
+            "uy-mailinglist": {
+                "name": "Talk-uy Mailing List",
+                "description": "Talk-uy is the official mailing list for the Uruguayan OSM 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!"
             },
+            "OSM-Telegram": {
+                "name": "OpenStreetMap Telegram",
+                "description": "Join the OpenStreetMap Telegram global supergroup at {url}"
+            },
             "OSM-Twitter": {
                 "name": "OpenStreetMap Twitter",
                 "description": "Follow us on Twitter at {url}"