]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Merge remote-tracking branch 'upstream/pull/2470'
[rails.git] / vendor / assets / iD / iD / locales / en.json
index a3c0fd810493b67413d6c5125836d0138664dc63..97f7c0eea2eeebc6516219fc49c31df6d29b29b3 100644 (file)
@@ -7,7 +7,7 @@
             "undo": "undo",
             "zoom_to": "zoom to",
             "copy": "copy",
-            "open_wikidata": "open on wikidata.org",
+            "view_on": "view on {domain}",
             "favorite": "favorite"
         },
         "toolbar": {
                 "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.",
-                "not_downloaded": "This can't be made circular because parts of it have not yet been downloaded."
+                "not_downloaded": "This can't be made circular because parts of it have not yet been downloaded.",
+                "already_circular": "This can't be made circular because it's already circular."
             },
             "orthogonalize": {
                 "title": "Square",
                 "description": {
-                    "vertex": "Square this corner.",
-                    "line": "Square the corners of this line.",
-                    "area": "Square the corners of this area."
+                    "corner": {
+                        "single": "Square this corner.",
+                        "multiple": "Square these corners."
+                    },
+                    "feature": {
+                        "single": "Square the corners of this feature.",
+                        "multiple": "Square the corners of these features."
+                    }
                 },
                 "key": "Q",
                 "annotation": {
-                    "vertex": "Squared a single corner.",
-                    "line": "Squared the corners of a line.",
-                    "area": "Squared the corners of an area."
+                    "corner": {
+                        "single": "Squared a corner.",
+                        "multiple": "Squared several corners."
+                    },
+                    "feature": {
+                        "single": "Squared the corners of a feature.",
+                        "multiple": "Squared the corners of several features."
+                    }
+                },
+                "multiple_blockers": {
+                    "multiple": "These can't be squared for multiple reasons."
+                },
+                "end_vertex": {
+                    "single": "This can't be squared because it is an endpoint.",
+                    "multiple": "These can't be squared because they are endpoints."
+                },
+                "square_enough": {
+                    "single": "This can't be made more square than it already is.",
+                    "multiple": "These can't be made more square than they already are."
+                },
+                "not_squarish": {
+                    "single": "This can't be made square because it is not squarish.",
+                    "multiple": "These can't be made square because they are not squarish."
+                },
+                "too_large": {
+                    "single": "This can't be made square because not enough of it is currently visible.",
+                    "multiple": "These can't be made square because not enough of them are currently visible."
                 },
-                "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.",
-                "not_downloaded": "This can't be made square because parts of it have not yet been downloaded."
+                "connected_to_hidden": {
+                    "single": "This can't be made square because it is connected to a hidden feature.",
+                    "multiple": "These can't be made square because some are connected to hidden features."
+                },
+                "not_downloaded": {
+                    "single": "This can't be made square because parts of it have not yet been downloaded.",
+                    "multiple": "These can't be made square because parts of them have not yet been downloaded."
+                }
             },
             "straighten": {
                 "title": "Straighten",
             },
             "reverse": {
                 "title": "Reverse",
-                "description": "Make this line go in the opposite direction.",
+                "description": {
+                    "point": "Flip the direction of this point.",
+                    "points": "Flip the direction of these points.",
+                    "line": "Make this line go in the opposite direction.",
+                    "lines": "Make these lines go in the opposite direction.",
+                    "features": "Flip the directions of these features."
+                },
                 "key": "V",
-                "annotation": "Reversed a line."
+                "annotation": {
+                    "point": "Reversed a point.",
+                    "points": "Reversed multiple points.",
+                    "line": "Reversed a line.",
+                    "lines": "Reversed multiple lines.",
+                    "features": "Reversed multiple features."
+                }
             },
             "split": {
                 "title": "Split",
             "translate": "Translate",
             "localized_translation_label": "Multilingual Name",
             "localized_translation_language": "Choose language",
-            "localized_translation_name": "Name"
+            "localized_translation_name": "Name",
+            "language_and_code": "{language} ({code})"
         },
         "zoom_in_edit": "Zoom in to edit",
         "login": "Log In",
             "hidden_warning": "{count} hidden features",
             "hidden_details": "These features are currently hidden: {details}"
         },
-        "status": {
-            "error": "Unable to connect to API.",
-            "offline": "The API is offline. Please try editing later.",
-            "readonly": "The API is read-only. You will need to wait to save your changes.",
-            "rateLimit": "The API is limiting anonymous connections.  You can fix this by logging in."
+        "osm_api_status": {
+            "message": {
+                "error": "Unable to reach the OpenStreetMap API. Your edits are safe locally. Check your network connection.",
+                "offline": "The OpenStreetMap API is offline. Your edits are safe locally. Please come back later.",
+                "readonly": "The OpenStreetMap API is currently read-only. You can continue editing, but must wait to save your changes.",
+                "rateLimit": "The OpenStreetMap API is limiting anonymous connections. You can fix this by logging in."
+            },
+            "retry": "Retry"
         },
         "commit": {
             "title": "Upload to OpenStreetMap",
         },
         "geocoder": {
             "search": "Search worldwide...",
-            "no_results_visible": "No results in visible map area",
             "no_results_worldwide": "No results found"
         },
         "geolocate": {
             "switch": "Switch back to this background",
             "custom": "Custom",
             "overlays": "Overlays",
-            "imagery_source_faq": "Imagery Info / Report a Problem",
+            "imagery_problem_faq": "Report an Imagery Problem",
             "reset": "reset",
             "reset_all": "Reset All",
             "display_options": "Display Options",
                 "tooltip": "Show a zoomed out map to help locate the area currently displayed.",
                 "key": "/"
             },
+            "panel": {
+                "description": "Show Detail Panel",
+                "tooltip": "Show advanced background information."
+            },
             "fix_misalignment": "Adjust imagery offset",
             "offset": "Drag anywhere in the gray area below to adjust the imagery offset, or enter the offset values in meters."
         },
                     "zoom": "Zoom to data"
                 }
             },
-            "fill_area": "Fill Areas",
+            "style_options": "Style Options",
+            "highlight_edits": {
+                "key": "G"
+            },
             "map_features": "Map Features",
             "autohidden": "These features have been automatically hidden because too many would be shown on the screen.  You can zoom in to edit them.",
             "osmhidden": "These features have been automatically hidden because the OpenStreetMap layer is hidden."
         },
+        "visual_diff": {
+            "highlight_edits": {
+                "description": "Highlight Changes",
+                "tooltip": "Outline edited features"
+            }
+        },
         "photo_overlays": {
             "title": "Photo Overlays",
             "traffic_signs": {
                 }
             }
         },
+        "preferences": {
+            "title": "Preferences",
+            "description": "Preferences",
+            "key": "P",
+            "privacy": {
+                "title": "Privacy",
+                "privacy_link": "View the iD privacy policy",
+                "third_party_icons": {
+                    "description": "Show Third Party Icons",
+                    "tooltip": "Uncheck this box to avoid loading icons from third party sites such as Wikimedia Commons, Facebook, or Twitter."
+                }
+            }
+        },
         "restore": {
             "heading": "You have unsaved changes",
             "description": "Do you wish to restore unsaved changes from a previous editing session?",
         "splash": {
             "welcome": "Welcome to the iD OpenStreetMap editor",
             "text": "iD is a friendly but powerful tool for contributing to the world's best free world map. This is version {version}. For more information see {website} and report bugs at {github}.",
+            "privacy_update": "Our privacy policy has recently been updated.",
+            "privacy": "{updateMessage} By using this software, you agree to do so in accordance with the iD privacy policy, which can be found {here}.",
             "walkthrough": "Start the Walkthrough",
             "start": "Edit now"
         },
         "mapillary_images": {
             "tooltip": "Street-level photos from Mapillary"
         },
+        "mapillary_map_features": {
+            "title": "Map Features",
+            "tooltip": "Map features from Mapillary",
+            "request_data": "Request Data",
+            "construction": {
+                "flat": {
+                    "crosswalk_plain": "plain crosswalk"
+                }
+            },
+            "marking": {
+                "discrete": {
+                    "crosswalk_zebra": "zebra crosswalk"
+                }
+            },
+            "object": {
+                "banner": "banner",
+                "bench": "bench",
+                "bike_rack": "bike rack",
+                "billboard": "billboard",
+                "catch_basin": "catch basin",
+                "cctv_camera": "CCTV camera",
+                "fire_hydrant": "fire hydrant",
+                "mailbox": "mailbox",
+                "manhole": "manhole",
+                "phone_booth": "phone booth",
+                "sign": {
+                    "advertisement": "advertisement",
+                    "information": "information sign",
+                    "store": "shop sign"
+                },
+                "street_light": "street light",
+                "support": {
+                    "utility_pole": "utility pole"
+                },
+                "traffic_cone": "traffic cone",
+                "traffic_light": {
+                    "cyclists": "cyclist traffic light",
+                    "general_horizontal": "horizontal traffic light",
+                    "general_single": "single traffic light",
+                    "general_upright": "vertical traffic light",
+                    "other": "traffic light",
+                    "pedestrians": "pedestrian traffic light"
+                },
+                "trash_can": "trash can"
+            }
+        },
         "mapillary": {
             "title": "Mapillary",
             "signs": {
             "rules": {
                 "title": "Rules"
             },
+            "user_resolved_issues": "Issues resolved by your edits",
+            "warnings_and_errors": "Warnings and errors",
             "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"
+                    "edits_in_view": "Your edits in view look fine",
+                    "no_edits": "You have no edits yet"
                 },
                 "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}",
+                    "everything_else": "Issues with everything else: {count}",
+                    "everything_else_elsewhere": "Issues elsewhere with everything else: {count}",
                     "disabled_rules": "Issues with disabled rules: {count}",
                     "disabled_rules_elsewhere": "Issues elsewhere with disabled rules: {count}",
                     "ignored_issues": "Ignored issues: {count}",
                     "reference": "Buildings should not intersect except on different layers."
                 },
                 "building-highway": {
-                    "reference": "Highways crossing buildings should use bridges, tunnels, coverings, or entrances."
+                    "reference": "Highways crossing buildings should use bridges, tunnels, or different layers."
                 },
                 "building-railway": {
-                    "reference": "Railways crossing buildings should use bridges or tunnels."
+                    "reference": "Railways crossing buildings should use bridges, tunnels, or different layers."
                 },
                 "building-waterway": {
                     "reference": "Waterways crossing buildings should use tunnels or different layers."
                 }
             },
             "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",
+                "message_language": "{feature} has the suspicious name \"{name}\" in {language}",
                 "reference": "Names should be the actual, on-the-ground names of features."
             },
+            "help_request": {
+                "title": "Help Requests",
+                "tip": "Find features where others requested assistance"
+            },
             "incompatible_source": {
                 "title": "Suspicious Sources",
                 "tip": "Find features with suspicious source tags",
                     "reference": "Google products are proprietary and must not be used as references."
                 }
             },
+            "incorrect_name": {
+                "message": "{feature} has the mistaken name \"{name}\"",
+                "message_language": "{feature} has the mistaken name \"{name}\" in {language}"
+            },
             "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.",
+                    "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\"."
                 }
             },
+            "mismatched_geometry": {
+                "title": "Mismatched Geometry",
+                "tip": "Find features with conflicting tags and geometry"
+            },
             "missing_role": {
                 "title": "Missing Roles",
                 "message": "{member} has no role within {relation}",
                 },
                 "noncanonical_brand": {
                     "message": "{feature} looks like a brand with nonstandard tags",
+                    "message_incomplete": "{feature} looks like a brand with incomplete tags",
                     "reference": "All features of the same brand should be tagged the same way."
                 }
             },
+            "point_as_vertex": {
+                "message": "{feature} should be a standalone point based on its tags",
+                "reference": "Some features shouldn't be part of lines or areas."
+            },
             "private_data": {
                 "title": "Private Information",
                 "tip": "Find features that may contain private information",
                     "message": "{feature} might be tagged with private contact information"
                 }
             },
+            "suspicious_name": {
+                "title": "Suspicious Names",
+                "tip": "Find features with generic or suspicious names"
+            },
             "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": {
                     }
                 }
             },
+            "unclosed_multipolygon_part": {
+                "message": "{feature} has an unclosed part",
+                "reference": "All inner and outer parts of multipolygons should have connected endpoints."
+            },
             "unsquare_way": {
                 "title": "Unsquare Corners (up to {val}°)",
                 "message": "{feature} has unsquare corners",
                     "reference": "Buildings with unsquare corners can often be drawn more accurately."
                 }
             },
+            "vertex_as_point": {
+                "message": "{feature} should be part of a line or area based on its tags",
+                "reference": "Some features shouldn't be standalone points."
+            },
             "fix": {
+                "add_a_bridge": {
+                    "title": "Add a bridge",
+                    "annotation": "Added a bridge."
+                },
+                "add_a_tunnel": {
+                    "title": "Add a tunnel",
+                    "annotation": "Added a tunnel."
+                },
+                "address_the_concern": {
+                    "title": "Address the concern"
+                },
                 "connect_almost_junction": {
                     "annotation": "Connected very close features."
                 },
                 "connect_features": {
                     "title": "Connect the features"
                 },
+                "connect_using_ford": {
+                    "title": "Connect using a ford"
+                },
                 "continue_from_start": {
                     "title": "Continue drawing from start"
                 },
                 "delete_feature": {
                     "title": "Delete this feature"
                 },
+                "extract_point": {
+                    "title": "Extract this point"
+                },
                 "ignore_issue": {
                     "title": "Ignore this issue"
                 },
                     "title": "Remove from relation"
                 },
                 "remove_generic_name": {
-                    "title": "Remove the name",
                     "annotation": "Removed a generic name."
                 },
+                "remove_mistaken_name": {
+                    "annotation": "Removed a mistaken name."
+                },
                 "remove_private_info": {
                     "annotation": "Removed private information."
                 },
                 "remove_tags": {
                     "title": "Remove the tags"
                 },
+                "remove_the_name": {
+                    "title": "Remove the name"
+                },
                 "reposition_features": {
                     "title": "Reposition the features"
                 },
                     "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_layers_or_levels": {
+                    "title": "Use different layers or levels"
+                },
                 "use_different_levels": {
                     "title": "Use different levels"
-                },
-                "use_tunnel": {
-                    "title": "Use a tunnel"
                 }
             }
         },
                 },
                 "display_options": {
                     "title": "Display options",
-                    "background": "Show background options",
+                    "background": "Toggle background imagery pane",
                     "background_switch": "Switch back to last background",
-                    "map_data": "Show map data options",
+                    "map_data": "Toggle map data pane",
+                    "issues": "Toggle validation issues pane",
+                    "preferences": "Toggle user preferences pane",
                     "fullscreen": "Enter full screen mode",
                     "sidebar": "Toggle sidebar",
                     "wireframe": "Toggle wireframe mode",
                     "osm_data": "Toggle OpenStreetMap data",
-                    "minimap": "Toggle minimap"
+                    "minimap": "Toggle minimap",
+                    "highlight_edits": "Highlight unsaved edits"
                 },
                 "selecting": {
                     "title": "Selecting features",
                     "search": "Find features matching search text"
                 },
                 "with_selected": {
-                    "title": "With feature selected",
+                    "title": "With features selected",
                     "edit_menu": "Toggle edit menu",
-                    "zoom_to": "Zoom to selected feature"
+                    "zoom_to": "Zoom to selected features"
                 },
                 "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",
                     "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"
                     "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",
+                    "reverse": "Reverse selected features",
                     "move": "Move selected features",
                     "rotate": "Rotate selected features",
                     "orthogonalize": "Square corners of a line or area",
                 }
             },
             "fields": {
+                "access_aisle": {
+                    "label": "Type"
+                },
                 "access_simple": {
-                    "label": "Allowed Access"
+                    "label": "Allowed Access",
+                    "terms": "permitted,private,public"
                 },
                 "access": {
                     "label": "Allowed Access",
+                    "terms": "",
                     "placeholder": "Not Specified",
                     "types": {
                         "access": "All",
                         }
                     }
                 },
+                "addr/interpolation": {
+                    "label": "Type",
+                    "options": {
+                        "all": "All",
+                        "even": "Even",
+                        "odd": "Odd",
+                        "alphabetic": "Alphabetic"
+                    }
+                },
                 "address": {
                     "label": "Address",
+                    "terms": "location",
                     "placeholders": {
                         "block_number": "Block Number",
                         "block_number!jp": "Block No.",
                         "city": "City",
+                        "city!cn": "City/Prefecture/League",
                         "city!jp": "City/Town/Village/Tokyo Special Ward",
                         "city!vn": "City/Town",
                         "conscriptionnumber": "123",
                         "county": "County",
                         "county!jp": "District",
                         "district": "District",
+                        "district!cn": "District/County/Banner",
                         "district!vn": "Arrondissement/Town/District",
                         "floor": "Floor",
                         "hamlet": "Hamlet",
                         "place": "Place",
                         "postcode": "Postcode",
                         "province": "Province",
+                        "province!cn": "Province/Municipality/AR/SAR",
                         "province!jp": "Prefecture",
                         "quarter": "Quarter",
                         "quarter!jp": "ÅŒaza/Machi",
                     "label": "Products"
                 },
                 "air_conditioning": {
-                    "label": "Air Conditioning"
+                    "label": "Air Conditioning",
+                    "terms": "cooling system,refrigeration"
                 },
                 "amenity": {
                     "label": "Type"
                     "label": "For Animals"
                 },
                 "architect": {
-                    "label": "Architect"
+                    "label": "Architect",
+                    "terms": "building designer"
                 },
                 "area/highway": {
                     "label": "Type"
                 "attraction": {
                     "label": "Type"
                 },
+                "baby_seat": {
+                    "label": "Baby Seat"
+                },
                 "backrest": {
                     "label": "Backrest"
                 },
                 "bar": {
-                    "label": "Bar"
+                    "label": "Bar",
+                    "terms": ""
                 },
                 "barrier": {
                     "label": "Type"
                     "label": "Beauty Specialty"
                 },
                 "bench": {
-                    "label": "Bench"
+                    "label": "Bench",
+                    "terms": "seating"
                 },
                 "bicycle_parking": {
                     "label": "Type"
                 },
                 "bin": {
-                    "label": "Waste Bin"
+                    "label": "Waste Bin",
+                    "terms": "garbage can,trash can"
+                },
+                "blind": {
+                    "label": "Blind Person Access",
+                    "terms": "sight impairment,vision impairment",
+                    "options": {
+                        "yes": "Yes",
+                        "limited": "Limited",
+                        "no": "No"
+                    }
                 },
                 "blood_components": {
                     "label": "Blood Components",
                 "board_type": {
                     "label": "Type"
                 },
+                "bollard": {
+                    "label": "Type"
+                },
                 "booth": {
                     "label": "Booth"
                 },
                     "label": "Type"
                 },
                 "brand": {
-                    "label": "Brand"
+                    "label": "Brand",
+                    "terms": ""
                 },
                 "brewery": {
-                    "label": "Draft Beers"
+                    "label": "Draft Beers",
+                    "terms": "on tap"
                 },
                 "bridge": {
                     "label": "Type",
                     "label": "Building"
                 },
                 "building": {
-                    "label": "Building"
+                    "label": "Building",
+                    "terms": "structure"
                 },
                 "building/levels_building": {
                     "label": "Building Levels",
+                    "terms": "",
+                    "placeholder": "2, 4, 6..."
+                },
+                "building/levels/underground": {
+                    "label": "Underground Levels",
+                    "terms": "basement levels",
                     "placeholder": "2, 4, 6..."
                 },
                 "building/material": {
-                    "label": "Material"
+                    "label": "Material",
+                    "terms": ""
                 },
                 "bunker_type": {
                     "label": "Type"
                 },
                 "capacity": {
                     "label": "Capacity",
+                    "terms": "",
                     "placeholder": "50, 100, 200..."
                 },
                 "cash_in": {
                 "castle_type": {
                     "label": "Type"
                 },
+                "changing_table": {
+                    "label": "Diaper Changing Table"
+                },
+                "charge_fee": {
+                    "label": "Fee Amount",
+                    "terms": "",
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
+                },
+                "charge_toll": {
+                    "label": "Toll Amount",
+                    "terms": "",
+                    "placeholder": "1 EUR, 5 USD, 10 JPY…"
+                },
                 "check_date": {
                     "label": "Last Checked Date"
                 },
                     "label": "Collection Times"
                 },
                 "colour": {
-                    "label": "Color"
+                    "label": "Color",
+                    "terms": ""
                 },
                 "comment": {
                     "label": "Changeset Comment",
                     "placeholder": "Brief description of your contributions (required)"
                 },
                 "communication_multi": {
-                    "label": "Communication Types"
+                    "label": "Communication Types",
+                    "terms": ""
+                },
+                "connectivity": {
+                    "label": "Connectivity"
                 },
                 "construction": {
                     "label": "Type"
                 "consulate": {
                     "label": "Type"
                 },
+                "consulting": {
+                    "label": "Expertise"
+                },
                 "contact/webcam": {
                     "label": "Webcam URL",
                     "placeholder": "http://example.com/"
                 "content": {
                     "label": "Content"
                 },
+                "conveying_escalator": {
+                    "label": "Escalator"
+                },
                 "conveying": {
                     "label": "Movement Direction",
                     "options": {
                         "reversible": "Reversible"
                     }
                 },
+                "country_flag": {
+                    "label": "Flag Country"
+                },
                 "country": {
                     "label": "Country"
                 },
                     "placeholder": "1, 2, 3..."
                 },
                 "covered": {
-                    "label": "Covered"
+                    "label": "Covered",
+                    "terms": ""
                 },
                 "craft": {
                     "label": "Type"
                 "crossing": {
                     "label": "Type"
                 },
+                "crossing/island": {
+                    "label": "Refuge Island"
+                },
                 "cuisine": {
                     "label": "Cuisines"
                 },
                 "currency_multi": {
-                    "label": "Currency Types"
+                    "label": "Currency Types",
+                    "terms": "bills,cash,coins,money"
                 },
                 "cutting": {
                     "label": "Type",
                 },
                 "cycleway": {
                     "label": "Bike Lanes",
+                    "terms": "",
                     "placeholder": "none",
                     "types": {
                         "cycleway:left": "Left side",
                     "label": "Date"
                 },
                 "delivery": {
-                    "label": "Delivery"
+                    "label": "Delivery",
+                    "terms": ""
                 },
                 "denomination": {
-                    "label": "Denomination"
+                    "label": "Denomination",
+                    "terms": ""
                 },
                 "denotation": {
                     "label": "Denotation"
                     }
                 },
                 "description": {
-                    "label": "Description"
+                    "label": "Description",
+                    "terms": "summary"
                 },
                 "design": {
                     "label": "Design"
                     "label": "Destination Road Numbers"
                 },
                 "destination/symbol_oneway": {
-                    "label": "Destination Symbols"
+                    "label": "Destination Symbols",
+                    "terms": ""
                 },
                 "devices": {
                     "label": "Devices",
                     "label": "Diameter",
                     "placeholder": "5 mm, 10 cm, 15 in…"
                 },
-                "diaper": {
-                    "label": "Diaper Changing Available"
-                },
                 "diet_multi": {
-                    "label": "Diet Types"
+                    "label": "Diet Types",
+                    "terms": "gluten free,fruitarian,halal,kosher,lactose free,meat,pescatarian,raw,vegan,vegetarian"
                 },
                 "diplomatic": {
                     "label": "Type"
                 "distance": {
                     "label": "Distance"
                 },
+                "disused/railway": {
+                    "label": "Type"
+                },
                 "dock": {
                     "label": "Type"
                 },
                 "dog": {
                     "label": "Dogs",
+                    "terms": "animals,pets",
                     "options": {
                         "yes": "Allowed",
                         "leashed": "Leashed Only",
                 "door": {
                     "label": "Door"
                 },
+                "drink_multi": {
+                    "label": "Drinks"
+                },
+                "drinking_water": {
+                    "label": "Drinkable",
+                    "terms": "drinkworthy,potable"
+                },
                 "drive_through": {
-                    "label": "Drive-Through"
+                    "label": "Drive-Through",
+                    "terms": ""
                 },
                 "duration": {
                     "label": "Duration",
+                    "terms": "",
                     "placeholder": "00:00"
                 },
                 "electrified": {
                     }
                 },
                 "elevation": {
-                    "label": "Elevation"
+                    "label": "Elevation",
+                    "terms": "altitude"
                 },
                 "email": {
                     "label": "Email",
+                    "terms": "",
                     "placeholder": "example@example.com"
                 },
                 "embankment": {
                 },
                 "fax": {
                     "label": "Fax",
+                    "terms": "",
                     "placeholder": "+31 42 123 4567"
                 },
                 "fee": {
-                    "label": "Fee"
+                    "label": "Fee",
+                    "terms": ""
                 },
                 "fence_type": {
                     "label": "Type"
                 },
                 "fire_hydrant/diameter": {
-                    "label": "Diameter (mm, in, or letters)"
+                    "label": "Diameter (mm, in, or letters)",
+                    "terms": ""
                 },
                 "fire_hydrant/pressure": {
-                    "label": "Pressure (bar)"
+                    "label": "Pressure (bar)",
+                    "terms": ""
                 },
                 "fire_hydrant/type": {
                     "label": "Shape",
                     "label": "Fireplace"
                 },
                 "fishing": {
-                    "label": "Fishing"
+                    "label": "Fishing",
+                    "terms": ""
                 },
                 "fitness_station": {
                     "label": "Equipment Type"
                 },
                 "fixme": {
-                    "label": "Fix Me"
+                    "label": "Fix Me",
+                    "terms": "help request"
                 },
                 "flag/type": {
                     "label": "Flag Type"
                     "label": "Floating"
                 },
                 "flood_prone": {
-                    "label": "Flood Prone"
+                    "label": "Flood Prone",
+                    "terms": ""
                 },
                 "ford": {
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "fountain": {
+                    "label": "Type"
+                },
                 "frequency_electrified": {
-                    "label": "Operating Frequency"
+                    "label": "Operating Frequency",
+                    "terms": ""
                 },
                 "frequency": {
-                    "label": "Operating Frequency"
+                    "label": "Operating Frequency",
+                    "terms": ""
                 },
                 "from": {
                     "label": "From"
                 },
                 "gender": {
                     "label": "Gender",
+                    "terms": "access,female,male,unisex",
                     "placeholder": "Unknown",
                     "options": {
                         "male": "Male",
                 "generator/type": {
                     "label": "Type"
                 },
+                "gnis/feature_id": {
+                    "label": "GNIS Feature ID",
+                    "terms": "Federal Geographic Names Information Service,United States Board on Geographic Names,USA"
+                },
                 "government": {
                     "label": "Type"
                 },
                     "placeholder": "1-18"
                 },
                 "handrail": {
-                    "label": "Handrail"
+                    "label": "Handrail",
+                    "terms": ""
                 },
                 "hashtags": {
-                    "label": "Suggested Hashtags",
+                    "label": "Hashtags",
                     "placeholder": "#example"
                 },
                 "healthcare": {
                     "label": "Specialties"
                 },
                 "height_building": {
-                    "label": "Building Height (Meters)"
+                    "label": "Building Height (Meters)",
+                    "terms": ""
                 },
                 "height": {
-                    "label": "Height (Meters)"
+                    "label": "Height (Meters)",
+                    "terms": ""
                 },
                 "highspeed": {
-                    "label": "High-Speed"
+                    "label": "High-Speed",
+                    "terms": ""
                 },
                 "highway": {
                     "label": "Type"
                 },
                 "horse_scale": {
                     "label": "Horseback Riding Difficulty",
+                    "terms": "",
                     "placeholder": "Difficult, Dangerous...",
                     "options": {
                         "common": "Easy: No problems or difficulties. (default)",
                     }
                 },
                 "iata": {
-                    "label": "IATA"
+                    "label": "IATA Airport Code"
                 },
                 "icao": {
-                    "label": "ICAO"
+                    "label": "ICAO Airport Code"
                 },
                 "incline_steps": {
                     "label": "Incline",
                     }
                 },
                 "incline": {
-                    "label": "Incline"
+                    "label": "Incline",
+                    "terms": ""
                 },
                 "indoor_type": {
                     "label": "Type"
                 },
                 "indoor": {
-                    "label": "Indoor"
+                    "label": "Indoor",
+                    "terms": ""
                 },
                 "industrial": {
                     "label": "Type"
                 },
+                "informal": {
+                    "label": "Informal",
+                    "terms": ""
+                },
                 "information": {
                     "label": "Type"
                 },
                 "inscription": {
-                    "label": "Inscription"
+                    "label": "Inscription",
+                    "terms": ""
                 },
                 "intermittent_yes": {
                     "label": "Intermittent"
                 },
                 "intermittent": {
-                    "label": "Intermittent"
+                    "label": "Intermittent",
+                    "terms": ""
                 },
                 "internet_access": {
                     "label": "Internet Access",
+                    "terms": "wifi,wlan",
                     "options": {
                         "yes": "Yes",
                         "no": "No",
                     }
                 },
                 "internet_access/fee": {
-                    "label": "Internet Access Fee"
+                    "label": "Internet Access Fee",
+                    "terms": "wifi fee"
                 },
                 "internet_access/ssid": {
-                    "label": "Wifi Network Name"
+                    "label": "Wifi Network Name",
+                    "terms": "ssid"
                 },
                 "interval": {
-                    "label": "Interval"
+                    "label": "Interval",
+                    "terms": ""
                 },
                 "junction_line": {
                     "label": "Junction",
+                    "terms": "",
                     "options": {
                         "roundabout": "Roundabout",
                         "circular": "Traffic Circle",
                     }
                 },
                 "junction/ref_oneway": {
-                    "label": "Junction Number"
+                    "label": "Junction Number",
+                    "terms": ""
                 },
                 "kerb": {
                     "label": "Curb"
                 },
                 "lanes": {
                     "label": "Lanes",
+                    "terms": "",
                     "placeholder": "1, 2, 3..."
                 },
                 "language_multi": {
                 },
                 "layer": {
                     "label": "Layer",
+                    "terms": "",
                     "placeholder": "0"
                 },
                 "leaf_cycle_singular": {
                 "length": {
                     "label": "Length (Meters)"
                 },
+                "level_semi": {
+                    "label": "Levels",
+                    "terms": "building floors,decks,stories,storeys,storys"
+                },
                 "level": {
-                    "label": "Level"
+                    "label": "Level",
+                    "terms": "building floor,deck,storey,story"
                 },
                 "levels": {
                     "label": "Levels",
+                    "terms": "",
                     "placeholder": "2, 4, 6..."
                 },
                 "liaison": {
                     "label": "Type"
                 },
+                "line_attachment": {
+                    "label": "Line Attachment"
+                },
                 "lit": {
-                    "label": "Lit"
+                    "label": "Lit",
+                    "terms": "lamp,lighting"
                 },
                 "location_pool": {
                     "label": "Location",
                     }
                 },
                 "location": {
-                    "label": "Location"
+                    "label": "Location",
+                    "terms": ""
                 },
                 "lock": {
                     "label": "Lock"
                 },
+                "lockable": {
+                    "label": "Lockable",
+                    "terms": ""
+                },
                 "man_made": {
                     "label": "Type"
                 },
                     "label": "Type"
                 },
                 "manufacturer": {
-                    "label": "Manufacturer"
+                    "label": "Manufacturer",
+                    "terms": ""
                 },
                 "map_size": {
                     "label": "Coverage"
                 "map_type": {
                     "label": "Type"
                 },
+                "mapillary": {
+                    "label": "Mapillary Image ID",
+                    "terms": ""
+                },
+                "marker": {
+                    "label": "Type"
+                },
                 "material": {
-                    "label": "Material"
+                    "label": "Material",
+                    "terms": ""
+                },
+                "max_age": {
+                    "label": "Maximum Age",
+                    "terms": "upper age limit"
                 },
                 "maxheight": {
                     "label": "Max Height",
+                    "terms": "",
                     "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
                 },
                 "maxspeed": {
                     "label": "Speed Limit",
+                    "terms": "",
                     "placeholder": "40, 50, 60..."
                 },
                 "maxspeed/advisory": {
                     "label": "Advisory Speed Limit",
+                    "terms": "",
                     "placeholder": "40, 50, 60..."
                 },
                 "maxstay": {
-                    "label": "Max Stay"
+                    "label": "Max Stay",
+                    "terms": ""
                 },
                 "maxweight_bridge": {
-                    "label": "Max Weight"
+                    "label": "Max Weight",
+                    "terms": ""
                 },
                 "maxweight": {
-                    "label": "Max Weight"
+                    "label": "Max Weight",
+                    "terms": ""
                 },
                 "memorial": {
                     "label": "Type"
                 },
                 "microbrewery": {
-                    "label": "Microbrewery"
+                    "label": "Microbrewery",
+                    "terms": "brewpub,craft beer"
+                },
+                "min_age": {
+                    "label": "Minimum Age",
+                    "terms": "lower age limit"
                 },
                 "minspeed": {
                     "label": "Minimum Speed Limit",
+                    "terms": "",
                     "placeholder": "20, 30, 40..."
                 },
                 "monitoring_multi": {
                 },
                 "mtb/scale": {
                     "label": "Mountain Biking Difficulty",
+                    "terms": "",
                     "placeholder": "0, 1, 2, 3...",
                     "options": {
                         "0": "0: Solid gravel/packed earth, no obstacles, wide curves",
                 },
                 "mtb/scale/imba": {
                     "label": "IMBA Trail Difficulty",
+                    "terms": "",
                     "placeholder": "Easy, Medium, Difficult...",
                     "options": {
                         "0": "Easiest (white circle)",
                 },
                 "mtb/scale/uphill": {
                     "label": "Mountain Biking Uphill Difficulty",
+                    "terms": "",
                     "placeholder": "0, 1, 2, 3...",
                     "options": {
                         "0": "0: Avg. incline <10%, gravel/packed earth, no obstacles",
                 },
                 "name": {
                     "label": "Name",
+                    "terms": "label,title",
                     "placeholder": "Common name (if any)"
                 },
                 "natural": {
                     "label": "Natural"
                 },
                 "network_bicycle": {
-                    "label": "Network Type",
+                    "label": "Network Class",
                     "placeholder": "Local, Regional, National, International",
                     "options": {
                         "lcn": "Local",
                     }
                 },
                 "network_foot": {
-                    "label": "Network Type",
+                    "label": "Network Class",
                     "placeholder": "Local, Regional, National, International",
                     "options": {
                         "lwn": "Local",
                     }
                 },
                 "network_horse": {
-                    "label": "Network Type",
+                    "label": "Network Class",
                     "placeholder": "Local, Regional, National, International",
                     "options": {
                         "lhn": "Local",
                     "label": "Network"
                 },
                 "network": {
-                    "label": "Network"
+                    "label": "Network",
+                    "terms": ""
+                },
+                "network/type": {
+                    "label": "Network Type",
+                    "terms": ""
+                },
+                "not/name": {
+                    "label": "Incorrect Names",
+                    "terms": "common mistake names,wrong names"
                 },
                 "note": {
-                    "label": "Note"
+                    "label": "Note",
+                    "terms": "comment"
                 },
                 "office": {
                     "label": "Type"
                     }
                 },
                 "oneway/bicycle": {
-                    "label": "One Way (Bicycles)"
+                    "label": "One Way (Bicycles)",
+                    "terms": ""
                 },
                 "opening_date": {
                     "label": "Expected Opening Date"
                 },
                 "opening_hours": {
                     "label": "Hours",
+                    "terms": "",
                     "placeholder": "Unknown"
                 },
                 "operator": {
-                    "label": "Operator"
+                    "label": "Operator",
+                    "terms": ""
+                },
+                "operator/type": {
+                    "label": "Operator Type"
                 },
                 "outdoor_seating": {
-                    "label": "Outdoor Seating"
+                    "label": "Outdoor Seating",
+                    "terms": ""
                 },
                 "par": {
                     "label": "Par",
                     "placeholder": "3, 4, 5..."
                 },
                 "park_ride": {
-                    "label": "Park and Ride"
+                    "label": "Park and Ride",
+                    "terms": ""
                 },
                 "parking": {
                     "label": "Type",
                     }
                 },
                 "payment_multi_fee": {
-                    "label": "Payment Types"
+                    "label": "Payment Types",
+                    "terms": ""
                 },
                 "payment_multi": {
-                    "label": "Payment Types"
+                    "label": "Payment Types",
+                    "terms": ""
                 },
                 "phases": {
                     "label": "Phases",
                 },
                 "phone": {
                     "label": "Telephone",
+                    "terms": "phone number",
                     "placeholder": "+31 42 123 4567"
                 },
                 "piste/difficulty_downhill": {
                 "playground": {
                     "label": "Type"
                 },
-                "playground/baby": {
-                    "label": "Baby Seat"
+                "playground/theme": {
+                    "label": "Theme"
                 },
-                "playground/max_age": {
-                    "label": "Maximum Age"
-                },
-                "playground/min_age": {
-                    "label": "Minimum Age"
+                "polling_station": {
+                    "label": "Polling Place",
+                    "terms": "voting place"
                 },
                 "population": {
                     "label": "Population"
                 },
+                "post": {
+                    "label": "Delivery Address"
+                },
                 "power_supply": {
-                    "label": "Power Supply"
+                    "label": "Power Supply",
+                    "terms": ""
                 },
                 "power": {
                     "label": "Type"
                 },
+                "preschool": {
+                    "label": "Preschool"
+                },
                 "produce": {
                     "label": "Produce"
                 },
                 "product": {
-                    "label": "Products"
+                    "label": "Products",
+                    "terms": ""
+                },
+                "public_bookcase/type": {
+                    "label": "Type"
+                },
+                "pump": {
+                    "label": "Pump"
                 },
                 "railway": {
                     "label": "Type"
                 "rating": {
                     "label": "Power Rating"
                 },
+                "rcn_ref": {
+                    "label": "Cycling Code"
+                },
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
                     "label": "Platform Number"
                 },
                 "ref_road_number": {
-                    "label": "Road Number"
+                    "label": "Road Number",
+                    "terms": ""
                 },
                 "ref_room_number": {
                     "label": "Room Number"
                 },
                 "ref_route": {
-                    "label": "Route Number"
+                    "label": "Route Number",
+                    "terms": ""
                 },
                 "ref_runway": {
                     "label": "Runway Number",
                     "placeholder": "e.g. A5"
                 },
                 "ref": {
-                    "label": "Reference Code"
+                    "label": "Reference Code",
+                    "terms": ""
                 },
                 "ref/isil": {
                     "label": "ISIL Code"
                 },
+                "ref/vatin": {
+                    "label": "VAT ID Number",
+                    "terms": "value added tax identification number,vatin"
+                },
                 "relation": {
                     "label": "Type"
                 },
                 "religion": {
-                    "label": "Religion"
+                    "label": "Religion",
+                    "terms": ""
                 },
                 "reservation": {
                     "label": "Reservations",
+                    "terms": "",
                     "options": {
                         "yes": "Accepted",
                         "no": "Not Accepted",
                         "recommended": "Recommended"
                     }
                 },
+                "residential": {
+                    "label": "Type"
+                },
                 "resort": {
                     "label": "Type"
                 },
                     "label": "Turn Restrictions"
                 },
                 "roof/colour": {
-                    "label": "Roof Color"
+                    "label": "Roof Color",
+                    "terms": ""
                 },
                 "room": {
                     "label": "Type"
                 "route": {
                     "label": "Type"
                 },
+                "rwn_ref": {
+                    "label": "Walking Code"
+                },
                 "sac_scale": {
                     "label": "Hiking Difficulty",
+                    "terms": "",
                     "placeholder": "Mountain Hiking, Alpine Hiking...",
                     "options": {
                         "hiking": "T1: Hiking",
                     }
                 },
                 "salt": {
-                    "label": "Salt"
+                    "label": "Salt",
+                    "terms": "saline,salinated"
                 },
                 "sanitary_dump_station": {
-                    "label": "Toilet Disposal"
+                    "label": "Toilet Disposal",
+                    "terms": ""
                 },
                 "screen": {
                     "label": "Screens",
                     "label": "Category"
                 },
                 "seamark/type": {
-                    "label": "Seamark"
+                    "label": "Seamark",
+                    "terms": "marine"
                 },
                 "seamark/wreck/category": {
                     "label": "Category"
                 },
                 "second_hand": {
                     "label": "Sells Used",
+                    "terms": "",
                     "placeholder": "Yes, No, Only",
                     "options": {
                         "yes": "Yes",
                 },
                 "service_rail": {
                     "label": "Service Type",
+                    "terms": "",
                     "options": {
                         "spur": "Spur",
                         "yard": "Yard",
                 },
                 "smoking": {
                     "label": "Smoking",
+                    "terms": "",
                     "placeholder": "No, Separated, Yes...",
                     "options": {
                         "no": "No smoking anywhere",
                 },
                 "smoothness": {
                     "label": "Smoothness",
+                    "terms": "",
                     "placeholder": "Thin Rollers, Wheels, Off-Road...",
                     "options": {
                         "excellent": "Thin Rollers: rollerblade, skateboard",
                         "impassable": "Impassable / No wheeled vehicle"
                     }
                 },
+                "sms": {
+                    "label": "SMS",
+                    "terms": ""
+                },
                 "social_facility_for": {
                     "label": "People Served"
                 },
                     "label": "Type"
                 },
                 "source": {
-                    "label": "Sources"
+                    "label": "Sources",
+                    "terms": "reference"
+                },
+                "species/wikidata": {
+                    "label": "Species Wikidata",
+                    "terms": ""
                 },
                 "sport_ice": {
                     "label": "Sports"
                     "label": "Sports"
                 },
                 "stars": {
-                    "label": "Stars"
+                    "label": "Stars",
+                    "terms": "rating"
                 },
                 "start_date": {
-                    "label": "Start Date"
+                    "label": "Start Date",
+                    "terms": "inception"
                 },
                 "step_count": {
-                    "label": "Number of Steps"
+                    "label": "Number of Steps",
+                    "terms": ""
+                },
+                "stile": {
+                    "label": "Type"
                 },
                 "stop": {
                     "label": "Stop Type",
                 "street_cabinet": {
                     "label": "Type"
                 },
+                "stroller": {
+                    "label": "Stroller Access",
+                    "terms": "baby carriage,perambulator,pram,pushchair",
+                    "options": {
+                        "yes": "Yes",
+                        "limited": "Limited",
+                        "no": "No"
+                    }
+                },
                 "structure_waterway": {
                     "label": "Structure",
                     "placeholder": "Unknown",
                 },
                 "structure": {
                     "label": "Structure",
+                    "terms": "",
                     "placeholder": "Unknown",
                     "options": {
                         "bridge": "Bridge",
                     "label": "Type"
                 },
                 "supervised": {
-                    "label": "Supervised"
+                    "label": "Supervised",
+                    "terms": "guarded,manned"
                 },
                 "support": {
                     "label": "Support"
                 },
                 "surface": {
-                    "label": "Surface"
+                    "label": "Surface",
+                    "terms": ""
                 },
                 "surveillance": {
                     "label": "Surveillance Kind"
                     "label": "Surveillance Zone"
                 },
                 "survey/date": {
-                    "label": "Last Survey Date"
+                    "label": "Last Survey Date",
+                    "terms": ""
                 },
                 "swimming_pool": {
                     "label": "Type"
                     }
                 },
                 "tactile_paving": {
-                    "label": "Tactile Paving"
+                    "label": "Tactile Paving",
+                    "terms": ""
                 },
                 "takeaway": {
                     "label": "Takeaway",
+                    "terms": "take out,takeout",
                     "placeholder": "Yes, No, Takeaway Only...",
                     "options": {
                         "yes": "Yes",
                     "label": "Target"
                 },
                 "tidal": {
-                    "label": "Tidal"
+                    "label": "Tidal",
+                    "terms": ""
                 },
                 "to": {
                     "label": "To"
                     }
                 },
                 "toilets/handwashing": {
-                    "label": "Handwashing"
+                    "label": "Handwashing",
+                    "terms": ""
                 },
                 "toilets/position": {
-                    "label": "Positions"
+                    "label": "Positions",
+                    "terms": ""
                 },
                 "toll": {
-                    "label": "Toll"
+                    "label": "Toll",
+                    "terms": ""
                 },
                 "tomb": {
                     "label": "Type"
                 "tower/type": {
                     "label": "Type"
                 },
+                "townhall/type": {
+                    "label": "Type"
+                },
                 "tracktype": {
                     "label": "Track Type",
                     "placeholder": "Solid, Mostly Solid, Soft...",
                 },
                 "trail_visibility": {
                     "label": "Trail Visibility",
+                    "terms": "",
                     "placeholder": "Excellent, Good, Bad...",
                     "options": {
                         "excellent": "Excellent: unambiguous path or markers everywhere",
                     "label": "Type"
                 },
                 "trolley_wire": {
-                    "label": "Overhead Trolley Wires"
+                    "label": "Overhead Trolley Wires",
+                    "terms": ""
                 },
                 "tunnel": {
                     "label": "Type",
                 },
                 "usage_rail": {
                     "label": "Usage Type",
+                    "terms": "",
                     "options": {
                         "main": "Main",
                         "branch": "Branch",
                         "tourism": "Tourism"
                     }
                 },
+                "utility_semi": {
+                    "label": "Utilities"
+                },
+                "utility": {
+                    "label": "Utility"
+                },
                 "valve": {
                     "label": "Type"
                 },
                 "vending": {
                     "label": "Types of Goods"
                 },
+                "video_calls": {
+                    "label": "Video Calls",
+                    "terms": ""
+                },
                 "visibility": {
                     "label": "Visibility",
                     "options": {
                     }
                 },
                 "voltage_electrified": {
-                    "label": "Voltage"
+                    "label": "Voltage",
+                    "terms": ""
                 },
                 "voltage": {
                     "label": "Voltage"
                 },
                 "voltage/primary": {
-                    "label": "Primary Voltage"
+                    "label": "Primary Voltage",
+                    "terms": ""
                 },
                 "voltage/secondary": {
-                    "label": "Secondary Voltage"
+                    "label": "Secondary Voltage",
+                    "terms": ""
                 },
                 "voltage/tertiary": {
-                    "label": "Tertiary Voltage"
+                    "label": "Tertiary Voltage",
+                    "terms": ""
                 },
                 "wall": {
                     "label": "Type"
                 },
+                "waste": {
+                    "label": "Waste"
+                },
                 "water_point": {
                     "label": "Water Point"
                 },
                     "label": "Water Source"
                 },
                 "water_volume": {
-                    "label": "Water Reserve Volume (m³)"
+                    "label": "Water Reserve Volume (m³)",
+                    "terms": ""
                 },
                 "water": {
                     "label": "Type"
                 },
                 "website": {
                     "label": "Website",
+                    "terms": "internet presence,uri,url,webpage",
                     "placeholder": "https://example.com"
                 },
                 "wetland": {
                     "label": "Type"
                 },
                 "wheelchair": {
-                    "label": "Wheelchair Access"
+                    "label": "Wheelchair Access",
+                    "terms": "handicap access",
+                    "options": {
+                        "yes": "Yes",
+                        "limited": "Limited",
+                        "no": "No"
+                    }
                 },
                 "wholesale": {
                     "label": "Wholesale"
                 },
                 "width": {
-                    "label": "Width (Meters)"
+                    "label": "Width (Meters)",
+                    "terms": ""
                 },
                 "wikidata": {
-                    "label": "Wikidata"
+                    "label": "Wikidata",
+                    "terms": ""
+                },
+                "wikimedia_commons": {
+                    "label": "Wikimedia Commons Page",
+                    "terms": "",
+                    "placeholder": "File:Example.jpg"
                 },
                 "wikipedia": {
-                    "label": "Wikipedia"
+                    "label": "Wikipedia",
+                    "terms": ""
                 },
                 "windings": {
                     "label": "Windings",
+                    "terms": "",
                     "placeholder": "1, 2, 3..."
                 },
                 "windings/configuration": {
                     "label": "Windings Configuration",
+                    "terms": "",
                     "options": {
                         "star": "Star / Wye",
                         "delta": "Delta",
             },
             "presets": {
                 "aerialway": {
-                    "name": "Aerialway",
-                    "terms": ""
+                    "name": "Aerialway"
                 },
                 "aeroway": {
-                    "name": "Aeroway",
-                    "terms": ""
+                    "name": "Aeroway"
                 },
                 "amenity": {
-                    "name": "Amenity",
-                    "terms": ""
+                    "name": "Amenity"
                 },
                 "attraction": {
-                    "name": "Attraction",
-                    "terms": ""
+                    "name": "Attraction"
                 },
                 "boundary": {
-                    "name": "Boundary",
-                    "terms": ""
+                    "name": "Boundary"
                 },
                 "building_point": {
-                    "name": "Building",
-                    "terms": ""
+                    "name": "Building"
                 },
                 "embankment": {
-                    "name": "Embankment",
-                    "terms": ""
+                    "name": "Embankment"
                 },
                 "emergency": {
-                    "name": "Emergency Feature",
-                    "terms": ""
+                    "name": "Emergency Feature"
+                },
+                "ford_line": {
+                    "name": "Ford"
                 },
                 "highway": {
-                    "name": "Highway",
-                    "terms": ""
+                    "name": "Highway Feature"
                 },
                 "indoor": {
-                    "name": "Indoor Feature",
-                    "terms": ""
+                    "name": "Indoor Feature"
                 },
                 "landuse": {
-                    "name": "Land Use",
-                    "terms": ""
+                    "name": "Land Use Feature"
                 },
                 "leisure": {
-                    "name": "Leisure",
-                    "terms": ""
+                    "name": "Leisure Feature"
                 },
                 "man_made": {
-                    "name": "Man Made",
-                    "terms": ""
+                    "name": "Man Made Feature"
                 },
                 "natural": {
-                    "name": "Natural",
-                    "terms": ""
+                    "name": "Natural Feature"
                 },
                 "place": {
-                    "name": "Place",
-                    "terms": ""
+                    "name": "Place"
                 },
                 "playground": {
-                    "name": "Playground Equipment",
-                    "terms": ""
+                    "name": "Playground Equipment"
                 },
                 "power": {
-                    "name": "Power",
-                    "terms": ""
+                    "name": "Power Feature"
                 },
                 "railway": {
-                    "name": "Railway",
-                    "terms": ""
+                    "name": "Railway Feature"
                 },
                 "seamark": {
-                    "name": "Seamark",
-                    "terms": ""
+                    "name": "Seamark"
                 },
                 "tourism": {
-                    "name": "Tourism",
-                    "terms": ""
+                    "name": "Tourism Feature"
                 },
                 "waterway": {
-                    "name": "Waterway",
-                    "terms": ""
+                    "name": "Waterway Feature"
+                },
+                "addr/interpolation": {
+                    "name": "Address Interpolation"
                 },
                 "address": {
                     "name": "Address",
                     "name": "Billboard",
                     "terms": ""
                 },
+                "advertising/board": {
+                    "name": "Notice Board",
+                    "terms": ""
+                },
                 "advertising/column": {
                     "name": "Advertising Column",
                     "terms": ""
                 },
-                "aerialway/station": {
-                    "name": "Aerialway Station",
+                "advertising/poster_box": {
+                    "name": "Poster Box",
+                    "terms": ""
+                },
+                "advertising/totem": {
+                    "name": "Advertising Totem",
                     "terms": ""
                 },
                 "aerialway/cable_car": {
                     "terms": ""
                 },
                 "aerialway/j-bar": {
-                    "name": "J-bar Lift",
+                    "name": "J-Bar Lift",
                     "terms": "jbar"
                 },
                 "aerialway/magic_carpet": {
                     "terms": "handle tow,bugel lift"
                 },
                 "aerialway/t-bar": {
-                    "name": "T-bar Lift",
+                    "name": "T-Bar Lift",
                     "terms": "tbar"
                 },
                 "aerialway/zip_line": {
                     "name": "Helipad",
                     "terms": "helicopter,helipad,heliport"
                 },
+                "aeroway/holding_position": {
+                    "name": "Aircraft Holding Position",
+                    "terms": ""
+                },
                 "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/parking_position": {
+                    "name": "Aircraft Parking Position",
+                    "terms": ""
+                },
                 "aeroway/runway": {
                     "name": "Runway",
                     "terms": "landing strip"
                 },
+                "aeroway/spaceport": {
+                    "name": "Spaceport",
+                    "terms": "cosmodrome,rocket launch center,rocket launch complex,rocket launch site,rocket range,space port"
+                },
                 "aeroway/taxiway": {
                     "name": "Taxiway",
                     "terms": ""
                     "terms": ""
                 },
                 "amenity/bus_station": {
-                    "name": "Bus Station / Terminal",
-                    "terms": ""
+                    "name": "Bus Station / Terminal"
                 },
                 "amenity/coworking_space": {
-                    "name": "Coworking Space",
-                    "terms": ""
+                    "name": "Coworking Space"
                 },
                 "amenity/embassy": {
-                    "name": "Embassy",
-                    "terms": ""
+                    "name": "Embassy"
                 },
                 "amenity/ferry_terminal": {
-                    "name": "Ferry Station / Terminal",
-                    "terms": ""
+                    "name": "Ferry Station / Terminal"
                 },
                 "amenity/nursing_home": {
-                    "name": "Nursing Home",
-                    "terms": ""
+                    "name": "Nursing Home"
                 },
                 "amenity/recycling": {
-                    "name": "Recycling",
-                    "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
+                    "name": "Recycling"
                 },
                 "amenity/register_office": {
-                    "name": "Register Office",
-                    "terms": ""
+                    "name": "Register Office"
                 },
                 "amenity/scrapyard": {
-                    "name": "Scrap Yard",
-                    "terms": ""
+                    "name": "Scrap Yard"
                 },
                 "amenity/swimming_pool": {
-                    "name": "Swimming Pool",
-                    "terms": ""
+                    "name": "Swimming Pool"
                 },
                 "amenity/animal_boarding": {
                     "name": "Animal Boarding Facility",
                 },
                 "amenity/bicycle_parking": {
                     "name": "Bicycle Parking",
-                    "terms": "bike"
+                    "terms": "bike,cycle parking,cycling"
                 },
                 "amenity/bicycle_parking/building": {
                     "name": "Bicycle Parking Garage",
-                    "terms": "Multi-Storey Bicycle Park,Multi-Storey Bike Park,Bike Parking Station"
+                    "terms": "Bike Parking Station,cycle parking,cycling,Multi-Storey Bicycle Park,Multi-Storey Bike Park"
                 },
                 "amenity/bicycle_parking/lockers": {
                     "name": "Bicycle Lockers",
-                    "terms": "Bike Lockers"
+                    "terms": "cycle locker,cycling,Bike Lockers"
                 },
                 "amenity/bicycle_parking/shed": {
                     "name": "Bicycle Shed",
-                    "terms": "Bike Shed"
+                    "terms": "cycle shed,cycling,Bike Shed"
                 },
                 "amenity/bicycle_rental": {
                     "name": "Bicycle Rental",
-                    "terms": "bike,bicycle,bikeshare,bike share,bicycle share,hub,dock"
+                    "terms": "bike,bicycle,bikeshare,bike share,bicycle share,cycle dock,cycle hub,cycleshare,cycling"
                 },
                 "amenity/bicycle_repair_station": {
                     "name": "Bicycle Repair Tool Stand",
-                    "terms": "bike,repair,chain,pump,tools,stand,multitool"
+                    "terms": "bike chain,bike multitool,bike repair,bike tools,cycle pump,cycle repair,cycling"
                 },
                 "amenity/biergarten": {
                     "name": "Biergarten",
                     "terms": "bistro,coffee,tea"
                 },
                 "amenity/car_pooling": {
-                    "name": "Car Pooling",
-                    "terms": ""
+                    "name": "Car Pooling Station",
+                    "terms": "car sharing,carpooling,lift sharing,ride sharing"
                 },
                 "amenity/car_rental": {
                     "name": "Car Rental",
                     "terms": ""
                 },
                 "amenity/car_sharing": {
-                    "name": "Car Sharing",
+                    "name": "Car Sharing Station",
                     "terms": ""
                 },
                 "amenity/car_wash": {
                     "name": "Dojo / Martial Arts Academy",
                     "terms": "martial arts,dojang"
                 },
+                "amenity/dressing_room": {
+                    "name": "Changing Room",
+                    "terms": "changeroom,dressing room,fitting room,locker room"
+                },
                 "amenity/drinking_water": {
                     "name": "Drinking Water",
                     "terms": "potable water source,water fountain,drinking fountain,bubbler,water tap"
                     "terms": "restaurant,takeaway"
                 },
                 "amenity/fast_food/ice_cream": {
-                    "name": "Ice Cream Fast Food",
-                    "terms": ""
+                    "name": "Ice Cream Fast Food"
                 },
                 "amenity/fast_food/burger": {
                     "name": "Burger Fast Food",
                     "name": "Fish & Chips Fast Food",
                     "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries"
                 },
+                "amenity/fast_food/hot_dog": {
+                    "name": "Hot Dog Fast Food",
+                    "terms": "ballpark,frankfurter,frank,hotdog stand,sandwich,sausage,wiener"
+                },
                 "amenity/fast_food/kebab": {
                     "name": "Kebab Fast Food",
                     "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                 },
                 "amenity/fountain": {
                     "name": "Fountain",
-                    "terms": ""
+                    "terms": "basin,water"
                 },
                 "amenity/fuel": {
                     "name": "Gas Station",
                     "name": "Internet Cafe",
                     "terms": "cybercafe,taxiphone,teleboutique,coffee,cafe,net,lanhouse"
                 },
+                "amenity/karaoke_box": {
+                    "name": "Karaoke Box",
+                    "terms": "karaoke club,karaoke room,karaoke television,KTV"
+                },
                 "amenity/kindergarten": {
                     "name": "Preschool/Kindergarten Grounds",
                     "terms": "kindergarden,pre-school"
                     "name": "Language School",
                     "terms": "esl"
                 },
+                "amenity/letter_box": {
+                    "name": "Letter Box",
+                    "terms": "curbside delivery box,home delivery box,direct-to-door delivery box,letter hole,letter plate,letter slot,letterbox,letterhole,letterplate,letterslot,mail box,mail hole,mail slot,mailbox,mailhole,mailslot,through-door delivery box"
+                },
                 "amenity/library": {
                     "name": "Library",
                     "terms": "book"
                 },
+                "amenity/loading_dock": {
+                    "name": "Loading Dock",
+                    "terms": "door,loading bay,shipping,unloading,warehouse"
+                },
                 "amenity/love_hotel": {
                     "name": "Love Hotel",
                     "terms": ""
                     "name": "Multilevel Parking Garage",
                     "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
                 },
+                "amenity/parking/park_ride": {
+                    "name": "Park & Ride Lot",
+                    "terms": "commuter parking lot,incentive parking lot,metro parking lot,park and pool lot,park and ride lot,P+R,public transport parking lot,public transit parking lot,train parking lot"
+                },
                 "amenity/parking/underground": {
                     "name": "Underground Parking",
                     "terms": "automobile parking,car lot,car parking,rv parking,subsurface parking,truck parking,vehicle parking"
                     "name": "Police",
                     "terms": "badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol"
                 },
+                "amenity/polling_station": {
+                    "name": "Permanent Polling Place",
+                    "terms": "ballot box,ballot drop,democracy,elections,polling place,vote,voting booth,voting machine"
+                },
                 "amenity/post_box": {
-                    "name": "Mailbox",
-                    "terms": "letter drop,mail box,package drop,post box,postal box"
+                    "name": "Mail Drop Box",
+                    "terms": "drop box,dropbox,letter drop,mail box,mail collection box,mail drop,mail dropoff,mailbox,package drop,pillar box,pillarbox,post box,postal box,postbox"
+                },
+                "amenity/post_depot": {
+                    "name": "Post Sorting Office",
+                    "terms": "mail processing and distribution center,post depot"
                 },
                 "amenity/post_office": {
                     "name": "Post Office",
                     "name": "Recycling Container",
                     "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                 },
+                "amenity/recycling/container/electrical_items": {
+                    "name": "E-Waste Container",
+                    "terms": "computers,electronic waste,electronics recycling,ewaste bin,phones,tablets"
+                },
+                "amenity/recycling/container/green_waste": {
+                    "name": "Green Waste Container",
+                    "terms": "biodegradable,biological,compost,decomposable,garbage bin,garden waste,organic,rubbish,food scrap"
+                },
+                "amenity/research_institute": {
+                    "name": "Research Institute Grounds",
+                    "terms": "applied research,experimentation,r&d,r & d,r and d,research and development,research institution,research laboratory,research labs"
+                },
                 "amenity/restaurant": {
                     "name": "Restaurant",
                     "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                 },
                 "amenity/shelter/lean_to": {
                     "name": "Lean-To",
-                    "terms": ""
+                    "terms": "alpine hut,cabin,leanto,lodging,overnight accommodations,sleeping shelter,wilderness hut"
                 },
                 "amenity/shelter/picnic_shelter": {
                     "name": "Picnic Shelter",
                     "name": "Studio",
                     "terms": "recording,radio,television"
                 },
+                "amenity/studio/audio": {
+                    "name": "Recording Studio",
+                    "terms": "audio mixing,audio production,audio recording,audio studio"
+                },
+                "amenity/studio/radio": {
+                    "name": "Radio Station",
+                    "terms": "am radio,fm radio,radio broadcast,radio studio"
+                },
+                "amenity/studio/television": {
+                    "name": "Television Station",
+                    "terms": "television broadcast,television studio,tv broadcast,tv station,tv studio"
+                },
+                "amenity/studio/video": {
+                    "name": "Film Studio",
+                    "terms": "movie production,movie studio,video production,video recording,video studio"
+                },
                 "amenity/taxi": {
                     "name": "Taxi Stand",
                     "terms": "cab"
                     "name": "Town Hall",
                     "terms": "village,city,government,courthouse,municipal"
                 },
+                "amenity/townhall/city": {
+                    "name": "City Hall",
+                    "terms": "council,courthouse,government,mayor,municipality"
+                },
                 "amenity/toy_library": {
                     "name": "Toy Library",
                     "terms": "game,toy"
                     "name": "Vending Machine",
                     "terms": ""
                 },
+                "amenity/vending_machine/bottle_return": {
+                    "name": "Bottle Return Machine",
+                    "terms": "bottle return"
+                },
+                "amenity/vending_machine/bread": {
+                    "name": "Bread Vending Machine",
+                    "terms": "baguette,bread"
+                },
                 "amenity/vending_machine/cigarettes": {
                     "name": "Cigarette Vending Machine",
                     "terms": "cigarette"
                     "name": "Drink Vending Machine",
                     "terms": "drink,soda,beverage,juice,pop"
                 },
+                "amenity/vending_machine/eggs": {
+                    "name": "Egg Vending Machine",
+                    "terms": "egg"
+                },
                 "amenity/vending_machine/electronics": {
                     "name": "Electronics Vending Machine",
                     "terms": "cable,charger,earbud,headphone,phone,tablet"
                     "name": "Ice Cream Vending Machine",
                     "terms": "chocolate,ice cream,frozen,popsicle,vanilla"
                 },
+                "amenity/vending_machine/ice_cubes": {
+                    "name": "Ice Vending Machine",
+                    "terms": "cubes,ice"
+                },
                 "amenity/vending_machine/newspapers": {
                     "name": "Newspaper Vending Machine",
                     "terms": "newspaper"
                 },
                 "amenity/vending_machine/parcel_pickup_dropoff": {
                     "name": "Parcel Pickup/Dropoff Locker",
-                    "terms": "mail,parcel,pickup"
+                    "terms": "mail,packstation,parcel,pickup"
                 },
                 "amenity/vending_machine/parcel_pickup": {
                     "name": "Parcel Pickup Locker",
-                    "terms": "amazon,locker,mail,parcel,pickup"
+                    "terms": "amazon,locker,mail,packstation,parcel,pickup"
                 },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "Parking Ticket Vending Machine",
                 },
                 "amenity/water_point": {
                     "name": "RV Drinking Water",
-                    "terms": ""
+                    "terms": "water faucet,water point,water tap,water source,water spigot"
                 },
                 "amenity/watering_place": {
                     "name": "Animal Watering Place",
                     "terms": ""
                 },
+                "amenity/weighbridge": {
+                    "name": "Truck Scale",
+                    "terms": "weigh station,weighbridge"
+                },
                 "area": {
                     "name": "Area",
                     "terms": "polygon"
                 },
                 "area/highway": {
-                    "name": "Road Surface",
+                    "name": "Road Area",
                     "terms": "area:highway,edge of pavement,highway area,highway shape,pavement,road shape,street area"
                 },
                 "attraction/amusement_ride": {
                     "terms": "ferris wheel,theme park,amusement ride"
                 },
                 "attraction/bumper_car": {
-                    "name": "Bumper Car",
+                    "name": "Bumper Cars",
                     "terms": "theme park,dodgem cars,autoscooter"
                 },
                 "attraction/bungee_jumping": {
                     "terms": "theme park,ghost train"
                 },
                 "attraction/drop_tower": {
-                    "name": "Drop Tower",
+                    "name": "Drop Tower Ride",
                     "terms": "theme park,amusement ride,gondola,tower,big drop"
                 },
+                "attraction/kiddie_ride": {
+                    "name": "Kiddie Ride",
+                    "terms": ""
+                },
+                "attraction/log_flume": {
+                    "name": "Log Flume",
+                    "terms": "theme park,amusement ride,flume"
+                },
                 "attraction/maze": {
                     "name": "Maze",
                     "terms": "theme park,amusement ride,labyrinth"
                 },
                 "attraction/pirate_ship": {
-                    "name": "Pirate Ship",
+                    "name": "Pirate Ship Ride",
                     "terms": "theme park,carnival ride,amusement ride"
                 },
                 "attraction/river_rafting": {
-                    "name": "River Rafting",
+                    "name": "River Rapids Ride",
                     "terms": "theme park,aquatic park,water park,rafting simulator,river rafting ride,river rapids ride"
                 },
                 "attraction/roller_coaster": {
                     "name": "Summer Toboggan",
                     "terms": "alpine slide,mountain coaster"
                 },
+                "attraction/swing_carousel": {
+                    "name": "Swing Carousel",
+                    "terms": "theme park,amusement ride,carousel,tower,carousel tower"
+                },
                 "attraction/train": {
                     "name": "Tourist Train",
                     "terms": "theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train"
                     "terms": ""
                 },
                 "barrier/entrance": {
-                    "name": "Entrance",
-                    "terms": ""
+                    "name": "Entrance"
                 },
                 "barrier/block": {
                     "name": "Block",
                     "terms": ""
                 },
+                "barrier/bollard_line": {
+                    "name": "Bollard Row",
+                    "terms": ""
+                },
                 "barrier/bollard": {
                     "name": "Bollard",
                     "terms": ""
                 },
                 "barrier/cattle_grid": {
                     "name": "Cattle Grid",
-                    "terms": ""
+                    "terms": "cattle guard,cattle stop,livestock grid,stock gate,stock grid,stock stop,Texas gate,vehicle pass"
                 },
                 "barrier/chain": {
                     "name": "Chain",
                 },
                 "barrier/cycle_barrier": {
                     "name": "Cycle Barrier",
-                    "terms": ""
+                    "terms": "bicycle barrier,bicycling barrier,bike gates,cycling barrier"
                 },
                 "barrier/ditch": {
                     "name": "Trench",
                     "name": "Wall",
                     "terms": ""
                 },
+                "barrier/wall/noise_barrier": {
+                    "name": "Noise Barrier",
+                    "terms": "acoustical barrier,noise wall,noisewall,sound barrier,sound berm,sound wall,soundberm,soundwall"
+                },
                 "boundary/administrative": {
                     "name": "Administrative Boundary",
                     "terms": ""
                     "terms": ""
                 },
                 "building/bunker": {
-                    "name": "Bunker",
-                    "terms": ""
+                    "name": "Bunker"
                 },
                 "building/entrance": {
-                    "name": "Entrance/Exit",
-                    "terms": ""
+                    "name": "Entrance/Exit"
                 },
                 "building/train_station": {
-                    "name": "Train Station Building",
-                    "terms": ""
+                    "name": "Train Station Building"
                 },
                 "building/apartments": {
                     "name": "Apartment Building",
                 },
                 "building/stable": {
                     "name": "Stable",
-                    "terms": ""
+                    "terms": "horse shelter"
                 },
                 "building/stadium": {
                     "name": "Stadium Building",
                     "name": "Warehouse",
                     "terms": ""
                 },
-                "camp_site/camp_pitch": {
-                    "name": "Camp Pitch",
-                    "terms": "tent,rv"
-                },
                 "club": {
                     "name": "Club",
                     "terms": "social"
                     "name": "Craft",
                     "terms": ""
                 },
-                "craft/jeweler": {
-                    "name": "Jeweler",
-                    "terms": ""
-                },
                 "craft/locksmith": {
-                    "name": "Locksmith",
-                    "terms": ""
-                },
-                "craft/optician": {
-                    "name": "Optician",
-                    "terms": ""
+                    "name": "Locksmith"
                 },
                 "craft/tailor": {
-                    "name": "Tailor",
-                    "terms": "clothes,suit"
+                    "name": "Tailor"
                 },
                 "craft/agricultural_engines": {
                     "name": "Argricultural Engines Mechanic",
                     "name": "Chimney Sweeper",
                     "terms": ""
                 },
+                "craft/cleaning": {
+                    "name": "Cleaning Service",
+                    "terms": ""
+                },
                 "craft/clockmaker": {
                     "name": "Clockmaker",
                     "terms": ""
                     "terms": "pipe"
                 },
                 "craft/pottery": {
-                    "name": "Pottery",
-                    "terms": "ceramic"
+                    "name": "Pottery Maker",
+                    "terms": "ceramic,kiln,pot,vase"
                 },
                 "craft/rigger": {
                     "name": "Rigger",
                     "name": "Winery",
                     "terms": ""
                 },
+                "cycleway/asl": {
+                    "name": "Advanced Stop Line",
+                    "terms": "advanced stop box,asl,bicycle box,bike box,bikebox,cycle box,cycle stop marking"
+                },
+                "demolished/building": {
+                    "name": "Recently Demolished Building"
+                },
+                "disused/railway": {
+                    "name": "Disused Railway Feature"
+                },
                 "emergency/designated": {
-                    "name": "Emergency Access Designated",
-                    "terms": ""
+                    "name": "Emergency Access Designated"
                 },
                 "emergency/destination": {
-                    "name": "Emergency Access Destination",
-                    "terms": ""
+                    "name": "Emergency Access Destination"
                 },
                 "emergency/no": {
-                    "name": "Emergency Access No",
-                    "terms": ""
+                    "name": "Emergency Access No"
                 },
                 "emergency/official": {
-                    "name": "Emergency Access Official",
-                    "terms": ""
+                    "name": "Emergency Access Official"
                 },
                 "emergency/private": {
-                    "name": "Emergency Access Private",
-                    "terms": ""
+                    "name": "Emergency Access Private"
                 },
                 "emergency/yes": {
-                    "name": "Emergency Access Yes",
-                    "terms": ""
+                    "name": "Emergency Access Yes"
                 },
                 "emergency/ambulance_station": {
                     "name": "Ambulance Station",
                     "terms": "speech,therapist,therapy,voice"
                 },
                 "highway/bus_stop": {
-                    "name": "Bus Stop",
-                    "terms": ""
+                    "name": "Bus Stop"
                 },
                 "highway/crossing": {
-                    "name": "Crossing",
-                    "terms": ""
+                    "name": "Crossing"
                 },
                 "highway/bridleway": {
                     "name": "Bridle Path",
                     "terms": "gallery,hall,hallway,indoor,passage,passageway"
                 },
                 "highway/crossing/zebra-raised": {
-                    "name": "Marked Crosswalk (Raised)",
-                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
+                    "name": "Marked Crosswalk (Raised)"
                 },
                 "highway/crossing/zebra": {
-                    "name": "Marked Crosswalk",
-                    "terms": "zebra crossing,marked crossing,crosswalk"
+                    "name": "Marked Crosswalk"
                 },
                 "highway/crossing/marked-raised": {
                     "name": "Marked Crosswalk (Raised)",
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path",
-                    "terms": "bike path,bicyle path"
+                    "terms": "bicyle path,bike path,cycling path"
                 },
                 "highway/cycleway/crossing": {
-                    "name": "Cycle Crossing",
-                    "terms": ""
+                    "name": "Cycle Crossing"
                 },
                 "highway/cycleway/bicycle_foot": {
                     "name": "Cycle & Foot Path",
                     "terms": "hike,hiking,promenade,trackway,trail,walk"
                 },
                 "highway/footway/crossing": {
-                    "name": "Pedestrian Crossing",
-                    "terms": ""
+                    "name": "Pedestrian Crossing"
                 },
                 "highway/footway/zebra-raised": {
-                    "name": "Marked Crosswalk (Raised)",
-                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
+                    "name": "Marked Crosswalk (Raised)"
                 },
                 "highway/footway/zebra": {
-                    "name": "Marked Crosswalk",
-                    "terms": "zebra crossing,marked crossing,crosswalk"
+                    "name": "Marked Crosswalk"
+                },
+                "highway/footway/access_aisle": {
+                    "name": "Access Aisle",
+                    "terms": "accessible van loading zone,disabled parking access zone,handicap parking access zone,parking lot aisle,striped zone,tow zone,tow-away zone,towaway zone,wheelchair aisle"
                 },
                 "highway/footway/conveying": {
                     "name": "Moving Walkway",
                     "name": "Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
+                "highway/path/informal": {
+                    "name": "Informal Path",
+                    "terms": "bootleg trail,cow path,desire line,desire path,desireline,desirepath,elephant path,game trail,goat track,herd path,pig trail,shortcut,social trail,use trail"
+                },
                 "highway/pedestrian_area": {
                     "name": "Pedestrian Area",
                     "terms": "center,centre,plaza,quad,square,walkway"
                     "terms": "road,street"
                 },
                 "highway/raceway": {
-                    "name": "Racetrack (Motorsport)",
+                    "name": "Motorsport Racetrack",
                     "terms": "auto*,formula one,kart,motocross,nascar,race*,track"
                 },
+                "highway/raceway/karting": {
+                    "name": "Karting Racetrack",
+                    "terms": "carting,go carts,go karts,go-karts,gokarts,kart racing,karting track,motorsports,shifter karts,superkarts"
+                },
+                "highway/raceway/motocross": {
+                    "name": "Motocross Racetrack",
+                    "terms": "off-road racing,offroad moto racing,motocross circuit,motorcycle track,motorsports"
+                },
                 "highway/residential": {
                     "name": "Residential Road",
                     "terms": "road,street"
                     "terms": "hull,mast,maritime,remains,ship,boat"
                 },
                 "indoor/corridor_line": {
-                    "name": "Indoor Corridor",
-                    "terms": ""
+                    "name": "Indoor Corridor"
                 },
                 "indoor/area": {
                     "name": "Indoor Area",
                     "name": "Indoor Door",
                     "terms": "doorframe,doorway,portal,room access,threshold"
                 },
+                "indoor/elevator": {
+                    "name": "Indoor Elevator Shaft",
+                    "terms": "elevator,lift"
+                },
                 "indoor/room": {
                     "name": "Room",
                     "terms": "antechamber,anteroom,atrium,cell,chamber,concourse,foyer,indoor room,lobby,vestibule"
                 },
+                "indoor/stairs": {
+                    "name": "Indoor Stairwell",
+                    "terms": "stair,stairs,staircase,stairway,stairwell,steps"
+                },
                 "indoor/wall": {
                     "name": "Indoor Wall",
                     "terms": "indoor barrier,room divider,room partition"
                     "terms": "wi-fi,wifi,hotspot"
                 },
                 "junction": {
-                    "name": "Junction",
-                    "terms": ""
-                },
-                "junction/circular": {
-                    "name": "Traffic Circle",
-                    "terms": ""
-                },
-                "junction/jughandle": {
-                    "name": "Jughandle",
-                    "terms": ""
-                },
-                "junction/roundabout": {
-                    "name": "Roundabout",
+                    "name": "Junction",
                     "terms": ""
                 },
                 "landuse/basin": {
-                    "name": "Basin",
-                    "terms": ""
+                    "name": "Basin"
                 },
                 "landuse/farm": {
-                    "name": "Farmland",
-                    "terms": ""
+                    "name": "Farmland"
                 },
                 "landuse/pond": {
-                    "name": "Pond",
-                    "terms": ""
+                    "name": "Pond"
                 },
                 "landuse/reservoir": {
-                    "name": "Reservoir",
-                    "terms": ""
+                    "name": "Reservoir"
                 },
                 "landuse/allotments": {
                     "name": "Community Garden",
                     "terms": ""
                 },
                 "landuse/construction": {
-                    "name": "Construction",
-                    "terms": ""
+                    "name": "Construction Area",
+                    "terms": "building,bulldozer,construction site,construction zone,crane,demolition,development,infrastructure"
                 },
                 "landuse/farmland": {
                     "name": "Farmland",
                     "name": "Farmyard",
                     "terms": "crop,grow,plant"
                 },
+                "landuse/flowerbed": {
+                    "name": "Flowerbed",
+                    "terms": "floral garden,flower garden"
+                },
                 "landuse/forest": {
                     "name": "Managed Forest",
-                    "terms": "cut,forest,forestry,lumber,silviculture,tree"
+                    "terms": "boreal,cut,forest,forestry,forrest,lumber,silviculture,taiga,tree,trees,woodlands,woods"
                 },
                 "landuse/garages": {
                     "name": "Garage Landuse",
                 },
                 "landuse/grass": {
                     "name": "Grass",
-                    "terms": ""
+                    "terms": "field,green,lawn,managed grass,mown grass,turf"
                 },
                 "landuse/greenfield": {
                     "name": "Greenfield",
                     "terms": "escape game,escape the room,puzzle room,quest room"
                 },
                 "leisure/firepit": {
-                    "name": "Firepit",
-                    "terms": "fireplace,campfire"
+                    "name": "Fire Pit",
+                    "terms": "bonfire,campfire,fire circle,fire hole,fire place,fire ring,firepit,fireplace,firering"
                 },
                 "leisure/fishing": {
                     "name": "Fishing Spot",
                 },
                 "leisure/fitness_centre": {
                     "name": "Gym / Fitness Center",
-                    "terms": "health,gym,leisure,studio"
+                    "terms": "health,gym,leisure,pilates,studio"
                 },
                 "leisure/fitness_centre/yoga": {
                     "name": "Yoga Studio",
-                    "terms": "studio,asanas,modern yoga,meditation"
+                    "terms": "asanas,meditation,modern yoga,studio"
                 },
                 "leisure/fitness_station": {
                     "name": "Outdoor Fitness Station",
                     "name": "Bowling Green",
                     "terms": ""
                 },
+                "leisure/pitch/chess": {
+                    "name": "Giant Chess Board",
+                    "terms": "chessboard,checkerboard,checkers,chequerboard,garden chess,large chess,oversize chess"
+                },
                 "leisure/pitch/cricket": {
                     "name": "Cricket Field",
                     "terms": ""
                     "terms": ""
                 },
                 "man_made/bridge": {
-                    "name": "Bridge",
+                    "name": "Bridge Area",
                     "terms": ""
                 },
                 "man_made/bunker_silo": {
                     "name": "Bunker Silo",
                     "terms": "Silage,Storage"
                 },
+                "man_made/cairn": {
+                    "name": "Cairn",
+                    "terms": "rock pile,stone stack,stone pile,càrn"
+                },
                 "man_made/chimney": {
                     "name": "Chimney",
                     "terms": ""
                     "name": "Lighthouse",
                     "terms": ""
                 },
+                "man_made/manhole": {
+                    "name": "Manhole",
+                    "terms": "cover,hole,sewer,sewage,telecom"
+                },
+                "man_made/manhole/drain": {
+                    "name": "Storm Drain",
+                    "terms": "cover,drain,hole,rain,sewer,sewage,storm"
+                },
+                "man_made/manhole/gas": {
+                    "name": "Gas Utility Manhole",
+                    "terms": "cover,gas,heat,hole,utility"
+                },
+                "man_made/manhole/power": {
+                    "name": "Power Utility Manhole",
+                    "terms": "cover,hole,electric,hole,power,utility"
+                },
+                "man_made/manhole/sewer": {
+                    "name": "Sewer Utility Manhole",
+                    "terms": "cover,drain,hole,sewer,sewage,utility"
+                },
+                "man_made/manhole/telecom": {
+                    "name": "Telecom Utility Manhole",
+                    "terms": "bt,cable,cover,phone,hole,telecom,telephone,utility"
+                },
+                "man_made/manhole/water": {
+                    "name": "Water Utility Manhole",
+                    "terms": "cover,drinking,hole,utility,water"
+                },
                 "man_made/mast": {
                     "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"
                     "name": "Monitoring Station",
                     "terms": "weather,earthquake,seismology,air,gps"
                 },
+                "man_made/obelisk": {
+                    "name": "Obelisk",
+                    "terms": ""
+                },
                 "man_made/observatory": {
                     "name": "Observatory",
                     "terms": "astronomical,meteorological"
                     "name": "Survey Point",
                     "terms": "trig point,triangulation pillar,trigonometrical station"
                 },
+                "man_made/torii": {
+                    "name": "Torii",
+                    "terms": "Japanese gate,Shinto shrine"
+                },
                 "man_made/tower": {
                     "name": "Tower",
                     "terms": ""
                     "terms": "lookout tower,fire tower"
                 },
                 "man_made/tunnel": {
-                    "name": "Tunnel",
+                    "name": "Tunnel Area",
                     "terms": "bore,dig,shaft,underground passage,underpass"
                 },
+                "man_made/utility_pole": {
+                    "name": "Utility Pole",
+                    "terms": ""
+                },
                 "man_made/wastewater_plant": {
                     "name": "Wastewater Plant",
                     "terms": "sewage*,water treatment plant,reclamation plant"
                 },
+                "man_made/water_tap": {
+                    "name": "Water Tap",
+                    "terms": "drinking water,water faucet,water point,water source,water spigot"
+                },
                 "man_made/water_tower": {
                     "name": "Water Tower",
                     "terms": ""
                 },
                 "man_made/water_well": {
                     "name": "Water Well",
-                    "terms": ""
+                    "terms": "aquifer,drinking water,water point,water source"
                 },
                 "man_made/water_works": {
                     "name": "Water Works",
                     "name": "Factory",
                     "terms": "assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery"
                 },
-                "manhole": {
-                    "name": "Manhole",
-                    "terms": "cover,hole,sewer,sewage,telecom"
+                "marker": {
+                    "name": "Marker",
+                    "terms": "identifier,marking,plate,pole,post,sign"
                 },
-                "manhole/drain": {
-                    "name": "Storm Drain",
-                    "terms": "cover,drain,hole,rain,sewer,sewage,storm"
+                "marker/utility": {
+                    "name": "Utility Marker",
+                    "terms": "gas line marker,identifier,marking,oil marker,pipline marker,plate,pole,post,sign"
                 },
-                "manhole/telecom": {
-                    "name": "Telecom Manhole",
-                    "terms": "cover,phone,hole,telecom,telephone,bt"
+                "marker/utility/power": {
+                    "name": "Power Marker",
+                    "terms": "electric line,identifier,marking,plate,pole,post,power cable,power line,sign"
                 },
                 "military/bunker": {
                     "name": "Military Bunker",
                 },
                 "natural/grassland": {
                     "name": "Grassland",
-                    "terms": "prairie,savanna"
+                    "terms": "field,prairie,savanna"
                 },
                 "natural/heath": {
                     "name": "Heath",
                 },
                 "natural/spring": {
                     "name": "Spring",
-                    "terms": ""
+                    "terms": "aquifer,hydro,seep,water source"
                 },
                 "natural/stone": {
                     "name": "Unattached Stone / Boulder",
                     "terms": "detention,drain,overflow,rain,retention"
                 },
                 "natural/water/canal": {
-                    "name": "Canal",
+                    "name": "Canal Area",
                     "terms": ""
                 },
                 "natural/water/lake": {
                     "terms": ""
                 },
                 "natural/water/river": {
-                    "name": "River",
+                    "name": "River Area",
                     "terms": "beck,branch,brook,course,creek,estuary,rill,riverbank,rivulet,run,runnel,stream,tributary,watercourse"
                 },
                 "natural/water/stream": {
-                    "name": "Stream",
+                    "name": "Stream Area",
                     "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": {
                     "terms": "bog,fen,marsh,mire,moor,muskeg,peatland,quagmire,reedbed,saltmarsh,swamp,tidalflat,wet meadow"
                 },
                 "natural/wood": {
-                    "name": "Wood",
-                    "terms": "tree"
+                    "name": "Natural Wood",
+                    "terms": "boreal,forest,forrest,taiga,tree,trees,woodlands,woods"
+                },
+                "network/type/node_network": {
+                    "name": "Recreational Network Node",
+                    "terms": "node network,rcn,rwn"
                 },
                 "noexit/yes": {
                     "name": "No Exit",
                     "terms": ""
                 },
                 "office/administrative": {
-                    "name": "Administrative Office",
-                    "terms": ""
+                    "name": "Administrative Office"
                 },
                 "office/physician": {
-                    "name": "Physician",
-                    "terms": ""
+                    "name": "Physician"
                 },
                 "office/travel_agent": {
-                    "name": "Travel Agency",
-                    "terms": ""
+                    "name": "Travel Agency"
                 },
                 "office/accountant": {
                     "name": "Accountant Office",
                     "name": "Corporate Office",
                     "terms": ""
                 },
+                "office/consulting": {
+                    "name": "Consultancy Office",
+                    "terms": "consulting firm office"
+                },
                 "office/coworking": {
                     "name": "Coworking Space",
                     "terms": "coworking,office"
                     "terms": ""
                 },
                 "office/lawyer/notary": {
-                    "name": "Notary Office",
-                    "terms": ""
+                    "name": "Notary Office"
                 },
                 "office/moving_company": {
                     "name": "Moving Company Office",
                     "terms": "clerk,deeds,estate,signature,wills"
                 },
                 "office/political_party": {
-                    "name": "Political Party",
+                    "name": "Political Party Office",
                     "terms": ""
                 },
                 "office/private_investigator": {
                 },
                 "office/research": {
                     "name": "Research Office",
-                    "terms": ""
+                    "terms": "R and D,research and development,research lab"
                 },
                 "office/surveyor": {
                     "name": "Surveyor Office",
                 },
                 "office/telecommunication": {
                     "name": "Telecom Office",
-                    "terms": "communication,internet,phone,voice"
+                    "terms": "communication,internet service provider,isp,network,telephone,voice"
                 },
                 "office/therapist": {
                     "name": "Therapist Office",
                     "terms": "ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse"
                 },
                 "place/farm": {
-                    "name": "Farm",
-                    "terms": ""
+                    "name": "Farm"
                 },
                 "place/city_block": {
                     "name": "City Block",
                 },
                 "playground/horizontal_bar": {
                     "name": "Play Horizontal Bar",
-                    "terms": "high bar"
+                    "terms": "chin-up bar,high bar,pull-up bar"
                 },
                 "playground/rocker": {
                     "name": "Spring Rider",
                 },
                 "playground/sandpit": {
                     "name": "Sandpit",
-                    "terms": ""
+                    "terms": "sandbox"
                 },
                 "playground/seesaw": {
                     "name": "Seesaw",
                 },
                 "playground/structure": {
                     "name": "Play Structure",
-                    "terms": ""
+                    "terms": "jungle gym"
                 },
                 "playground/swing": {
                     "name": "Swing",
                     "name": "Point",
                     "terms": "node,other,vertex,vertices"
                 },
+                "polling_station": {
+                    "name": "Temporary Polling Place",
+                    "terms": "ballot box,ballot drop,democracy,elections,polling place,vote,voting booth,voting machine"
+                },
                 "power/sub_station": {
-                    "name": "Substation",
-                    "terms": ""
+                    "name": "Substation"
                 },
                 "power/cable/underground": {
                     "name": "Underground Power Cable",
                 },
                 "power/line": {
                     "name": "Power Line",
-                    "terms": ""
+                    "terms": "electric power transmission line,high voltage line,high tension line"
                 },
                 "power/minor_line": {
                     "name": "Minor Power Line",
                     "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"
+                    "name": "Aerialway Stop / Platform"
                 },
                 "public_transport/platform/ferry_point": {
-                    "name": "Ferry Stop / Platform",
-                    "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
+                    "name": "Ferry Stop / Platform"
                 },
                 "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"
+                    "name": "Light Rail Stop / Platform"
                 },
                 "public_transport/platform/monorail_point": {
-                    "name": "Monorail Stop / Platform",
-                    "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
+                    "name": "Monorail Stop / Platform"
                 },
                 "public_transport/platform/subway_point": {
-                    "name": "Subway Stop / Platform",
-                    "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                    "name": "Subway Stop / Platform"
                 },
                 "public_transport/platform/train_point": {
-                    "name": "Train Stop / Platform",
-                    "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
-                },
-                "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"
+                    "name": "Train Stop / Platform"
                 },
                 "public_transport/platform/aerialway": {
                     "name": "Aerialway Platform",
                     "name": "Train Platform",
                     "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
                 },
+                "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/platform/tram": {
                     "name": "Tram Platform",
                     "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
                     "terms": "public transit,public transportation,transit,transportation"
                 },
                 "railway/halt": {
-                    "name": "Train Station (Halt / Request)",
-                    "terms": "break,interrupt,rest,wait,interruption"
+                    "name": "Train Station (Halt / Request)"
                 },
                 "railway/platform": {
-                    "name": "Train Platform",
-                    "terms": ""
+                    "name": "Train Platform"
                 },
                 "railway/station": {
-                    "name": "Train Station",
-                    "terms": "train station,station"
+                    "name": "Train Station"
                 },
                 "railway/tram_stop": {
-                    "name": "Tram Stopping Position",
-                    "terms": "light rail,streetcar,tram,trolley"
+                    "name": "Tram Stopping Position"
                 },
                 "railway/abandoned": {
                     "name": "Abandoned Railway",
                     "name": "Tram",
                     "terms": "light rail,streetcar,tram,trolley"
                 },
+                "railway/yard": {
+                    "name": "Rail Yard",
+                    "terms": "freight car stop,freight train station,rail freight station,railroad yard,railway yard"
+                },
                 "relation": {
                     "name": "Relation",
                     "terms": ""
                 },
                 "route/ferry": {
                     "name": "Ferry Route",
-                    "terms": ""
+                    "terms": "boat,merchant vessel,ship,water bus,water shuttle,water taxi"
                 },
                 "seamark/beacon_isolated_danger": {
                     "name": "Danger Beacon",
                     "terms": ""
                 },
                 "shop/boutique": {
-                    "name": "Boutique",
-                    "terms": ""
+                    "name": "Boutique"
                 },
                 "shop/fashion": {
-                    "name": "Fashion Store",
-                    "terms": ""
+                    "name": "Fashion Store"
                 },
                 "shop/fishmonger": {
-                    "name": "Fishmonger",
-                    "terms": ""
+                    "name": "Fishmonger"
                 },
                 "shop/furnace": {
-                    "name": "Furnace Store",
-                    "terms": "oven,stove"
+                    "name": "Furnace Store"
                 },
                 "shop/vacant": {
-                    "name": "Vacant Shop",
-                    "terms": ""
+                    "name": "Vacant Shop"
                 },
                 "shop/agrarian": {
                     "name": "Farm Supply Shop",
                     "name": "Book Store",
                     "terms": ""
                 },
+                "shop/brewing_supplies": {
+                    "name": "Brewing Supply Store",
+                    "terms": "brew shop,homebrew supply store"
+                },
                 "shop/butcher": {
                     "name": "Butcher",
                     "terms": "chicken,beef,lamb,meat,pork"
                 },
+                "shop/camera": {
+                    "name": "Camera Equipment Store",
+                    "terms": "camera,film,lens,photo"
+                },
                 "shop/candles": {
                     "name": "Candle Shop",
                     "terms": "wax"
                     "name": "E-Cigarette Shop",
                     "terms": "electronic,vape,vaping,vapor"
                 },
+                "shop/electrical": {
+                    "name": "Electrical Equipment Store",
+                    "terms": "cable,electric,fan,LED,lighting,power,wire"
+                },
                 "shop/electronics": {
                     "name": "Electronics Store",
                     "terms": "appliance,audio,blueray,camera,computer,dvd,home theater,radio,speaker,tv,video"
                 },
                 "shop/farm": {
                     "name": "Produce Stand",
-                    "terms": "farm shop,farm stand"
+                    "terms": "baked goods,farm shop,farm stand,fresh food,fruits,greengrocer,organics,vegetables"
                 },
                 "shop/fashion_accessories": {
                     "name": "Fashion Accessories Store",
                     "name": "Fishing Shop",
                     "terms": "bait,fishing line,flies,fly,lure,reel,rod,tackle"
                 },
+                "shop/flooring": {
+                    "name": "Flooring Supply Shop",
+                    "terms": "tile"
+                },
                 "shop/florist": {
                     "name": "Florist",
                     "terms": "flower"
                 },
                 "shop/general": {
                     "name": "General Store",
-                    "terms": "Village Shop"
+                    "terms": "village shop"
                 },
                 "shop/gift": {
                     "name": "Gift Shop",
                     "name": "Hifi Store",
                     "terms": "audio,hi-fi,high fidelity,stereo,video"
                 },
+                "shop/hobby": {
+                    "name": "Hobby Shop",
+                    "terms": "manga,figurine,model"
+                },
                 "shop/houseware": {
                     "name": "Houseware Store",
                     "terms": "home,household,kitchenware"
                 },
                 "shop/photo": {
                     "name": "Photography Store",
-                    "terms": "camera,film"
+                    "terms": "camera,film,lens,photo"
+                },
+                "shop/pottery": {
+                    "name": "Pottery Store",
+                    "terms": "ceramic,pot,vase"
+                },
+                "shop/printer_ink": {
+                    "name": "Printer Ink Store",
+                    "terms": "copier ink,fax ink,ink cartridges,toner"
+                },
+                "shop/psychic": {
+                    "name": "Psychic",
+                    "terms": "astrology,crystal ball,divination,fortune teller,seer,spirit"
                 },
                 "shop/pyrotechnics": {
                     "name": "Fireworks Store",
                     "name": "Religious Store",
                     "terms": ""
                 },
+                "shop/rental": {
+                    "name": "Rental Shop",
+                    "terms": ""
+                },
                 "shop/scuba_diving": {
                     "name": "Scuba Diving Shop",
                     "terms": "diving,scuba"
                     "name": "Shoe Store",
                     "terms": "boots,cleats,clogs,heels,loafers,oxfords,sneakers"
                 },
+                "shop/spices": {
+                    "name": "Spice Shop",
+                    "terms": "chili,cinnamon,curry,ginger,herbs,pepper,saffron,salt,spice store,spices,turmeric,wasabi"
+                },
                 "shop/sports": {
                     "name": "Sporting Goods Store",
                     "terms": "athletics"
                     "name": "Supermarket",
                     "terms": "grocery,store,shop"
                 },
+                "shop/swimming_pool": {
+                    "name": "Pool Supply Store",
+                    "terms": "hot tub equipment store,hot tub maintenance store,hot tub supply store,pool shop,pool store,swimming pool equipment store,swimming pool installation store,swimming pool maintenance store,swimming pool supply shop"
+                },
                 "shop/tailor": {
                     "name": "Tailor",
                     "terms": "clothes,suit"
                     "name": "Tea Store",
                     "terms": ""
                 },
+                "shop/telecommunication": {
+                    "name": "Telecom Retail Store",
+                    "terms": "communication,internet service provider,isp,network,telephone,voice"
+                },
                 "shop/ticket": {
                     "name": "Ticket Seller",
                     "terms": "box office"
                     "name": "Tobacco Shop",
                     "terms": "cigarettes,cigars"
                 },
+                "shop/tool_hire": {
+                    "name": "Tool Rental",
+                    "terms": ""
+                },
                 "shop/toys": {
                     "name": "Toy Store",
                     "terms": "games"
                 },
                 "shop/travel_agency": {
                     "name": "Travel Agency",
-                    "terms": ""
+                    "terms": "cruises,flights,hotels,tickets,travel packages"
                 },
                 "shop/tyres": {
                     "name": "Tire Store",
                     "name": "Wine Shop",
                     "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",
-                    "terms": "climbing hut"
+                    "terms": "cabin,climbing hut,lodge,lodging,overnight accommodations,wilderness hut"
                 },
                 "tourism/apartment": {
                     "name": "Guest Apartment / Condo",
-                    "terms": ""
+                    "terms": "bnb,holiday rental,lodging,overnight accommodations,vacation rental"
                 },
                 "tourism/aquarium": {
                     "name": "Aquarium",
                     "name": "Tourist Attraction",
                     "terms": ""
                 },
+                "tourism/camp_pitch": {
+                    "name": "Camp Pitch",
+                    "terms": "tent,rv"
+                },
                 "tourism/camp_site": {
                     "name": "Campground",
                     "terms": "tent,rv"
                 },
                 "tourism/chalet": {
                     "name": "Holiday Cottage",
-                    "terms": "holiday,holiday cottage,holiday home,vacation,vacation home"
+                    "terms": "chalet,holiday cabin,holiday cottage,holiday home,lodge,lodging,overnight accommodations,vacation cabin,vacation home"
                 },
                 "tourism/gallery": {
                     "name": "Art Gallery",
                 },
                 "tourism/guest_house": {
                     "name": "Guest House",
-                    "terms": "B&B,Bed and Breakfast"
+                    "terms": "b & b,b and b,B&B,Bed and Breakfast,bnb,lodging,overnight accommodations"
                 },
                 "tourism/hostel": {
                     "name": "Hostel",
-                    "terms": ""
+                    "terms": "bunk beds,dormitories,dorms,lodging,overnight accommodations"
                 },
                 "tourism/hotel": {
                     "name": "Hotel",
-                    "terms": ""
+                    "terms": "concierge,lodge,lodging,overnight accommodations"
                 },
                 "tourism/information": {
                     "name": "Information",
                 },
                 "tourism/motel": {
                     "name": "Motel",
-                    "terms": ""
+                    "terms": "lodging,motor hotel,overnight accommodations"
                 },
                 "tourism/museum": {
                     "name": "Museum",
                 },
                 "tourism/wilderness_hut": {
                     "name": "Wilderness Hut",
-                    "terms": "wilderness hut,backcountry hut,bothy"
+                    "terms": "alpine hut,cabin,backcountry hut,bothy,lodge,lodging,overnight accommodations,sleeping shelter,wilderness hut"
                 },
                 "tourism/zoo": {
                     "name": "Zoo",
                     "terms": "max speed,maximum speed,road,highway"
                 },
                 "type/multipolygon": {
-                    "name": "Multipolygon",
-                    "terms": ""
+                    "name": "Multipolygon"
                 },
                 "type/boundary": {
                     "name": "Boundary",
                     "name": "Administrative Boundary",
                     "terms": ""
                 },
+                "type/connectivity": {
+                    "name": "Lane Connectivity",
+                    "terms": ""
+                },
                 "type/enforcement": {
                     "name": "Enforcement",
                     "terms": ""
                     "terms": ""
                 },
                 "waterway/riverbank": {
-                    "name": "Riverbank",
-                    "terms": ""
+                    "name": "Riverbank"
                 },
                 "waterway/boatyard": {
                     "name": "Boatyard",
                     "name": "Drain",
                     "terms": ""
                 },
+                "waterway/fish_pass": {
+                    "name": "Fish Pass",
+                    "terms": "eel ladder,eel pass,fish ladder,fish migration,fish passage,fish siphon,fish steps,fish way,fishladder,fishpass,fishsteps,fishway"
+                },
                 "waterway/fuel": {
                     "name": "Marine Fuel Station",
                     "terms": "petrol,gas,diesel,boat"
                 },
                 "waterway/water_point": {
                     "name": "Marine Drinking Water",
-                    "terms": ""
+                    "terms": "water faucet,water point,water tap,water source,water spigot"
                 },
                 "waterway/waterfall": {
                     "name": "Waterfall",
                 },
                 "waterway/weir": {
                     "name": "Weir",
-                    "terms": ""
+                    "terms": "low-head dam,low-rise dam,wier"
                 }
             }
         },
                 "description": "Satellite and aerial imagery.",
                 "name": "Bing aerial imagery"
             },
-            "DigitalGlobe-Premium": {
-                "attribution": {
-                    "text": "Terms & Feedback"
-                },
-                "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": "Imagery boundaries and capture dates. Labels appear at zoom level 13 and higher.",
-                "name": "DigitalGlobe Premium Imagery Vintage"
-            },
-            "DigitalGlobe-Standard": {
-                "attribution": {
-                    "text": "Terms & Feedback"
-                },
-                "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": {
-                "attribution": {
-                    "text": "Terms & Feedback"
-                },
-                "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": "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"
                 "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
                 "name": "TIGER Roads 2018"
             },
+            "US-TIGER-Roads-2019": {
+                "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
+                "name": "TIGER Roads 2019"
+            },
             "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"
                 },
                 "name": "UrbIS-Ortho 2018"
             },
+            "UrbISOrtho2019": {
+                "attribution": {
+                    "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
+                },
+                "name": "UrbIS-Ortho 2019"
+            },
             "UrbisAdmFR": {
                 "attribution": {
                     "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
                 "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."
             },
+            "map-kibera": {
+                "name": "Map Kibera Trust",
+                "description": "Map Kibera is a registered organization working in Kenya",
+                "extendedDescription": "Map Kibera Trust’s mission is to increase influence and representation of marginalized communities through the creative use of digital tools for action."
+            },
+            "osm-kenya": {
+                "name": "OSM Kenya",
+                "description": "OSM Kenya is a community of OSM contributors and users",
+                "extendedDescription": "OSM is a local community for individuals interested in OpenStreetMap including organizations, developers, and YouthMappers chapters in the country."
+            },
             "ym-Dedan-Kimathi-University-of-Technology": {
                 "name": "GDEV",
                 "description": "YouthMappers chapter at Dedan Kimathi University of Technology",
                 "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-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-University-of-Nigeria-Nsukka": {
                 "name": "LionMappersTeam (LMT) Nsukka",
                 "description": "YouthMappers chapter at University of Nigeria, Nsukka",
                 "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."
+            "osm-africa-telegram": {
+                "name": "OpenStreetMap Africa Telegram",
+                "description": "OpenStreetMap Telegram for Africa"
             },
             "ym-Insititue-d-Enseignement-Superieur-de-Ruhengeri": {
                 "name": "YouthMappers at INES Ruhengeri",
                 "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-afghanistan-facebook": {
+                "name": "OpenStreetMap Afghanistan",
+                "description": "Improve OpenStreetMap in Afghanistan"
+            },
             "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!"
+                "extendedDescription": "Mapping in Bangladesh? Have questions, want to connect with the community here? Join us at {url}. All are welcome!",
+                "events": {
+                    "sotmasia2019": {
+                        "name": "State of the Map Asia 2019",
+                        "description": "Join the 2019 OpenStreetMap region-wide event at State of the Map Asia in Dhaka",
+                        "where": "Krishibid Institution Bangladesh (KIB), Dhaka, Bangladesh"
+                    }
+                }
             },
             "ym-Asian-University-for-Women": {
                 "name": "YouthMappers at AUW",
                 "description": "YouthMappers chapter at Jahangirnagar University"
             },
             "ym-Khulna-University": {
-                "name": "Openstreetmap",
+                "name": "Khulna University YouthMappers",
                 "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."
             },
             "OSM-India-facebook": {
                 "name": "OpenStreetMap India - Participatory neighborhood mapping",
                 "description": "Improve OpenStreetMap in India",
-                "extendedDescription": "Mapping in India? Have questions, want to connect with the community here? Join us at {url}. All are welcome!",
-                "events": {
-                    "sotmasia2018": {
-                        "name": "State of the Map Asia 2018",
-                        "description": "Join the 2018 OpenStreetMap region-wide event at State of the Map Asia in India",
-                        "where": "Indian Institute of Management, Bangalore, India"
-                    }
-                }
+                "extendedDescription": "Mapping in India? Have questions, want to connect with the community here? Join us at {url}. All are welcome!"
             },
             "osm-india-forum": {
                 "name": "OpenStreetMap India forum",
                 "name": "OpenStreetMap Japan Mailinglist",
                 "description": "Talk-ja is an Official Mailinglist for Japanese Community"
             },
+            "OSM-Japan-telegram": {
+                "name": "OpenStreetMap Japan Telegram",
+                "description": "A Telegram group for the OSM Japan community: {url}"
+            },
             "OSM-japan-twitter": {
                 "name": "OpenStreetMap Japan Twitter",
                 "description": "Hashtag on Twitter: {url}"
                 "name": "OpenStreetMap Japan",
                 "description": "Mappers and OpenStreetMap users in Japan"
             },
+            "OSM-Korea-mailinglist": {
+                "name": "OpenStreetMap Korea Mailinglist",
+                "description": "Talk-ko is an Official Mailinglist for the Communities to dicuss matters about Korea"
+            },
+            "OSM-Korea-telegram": {
+                "name": "OSM Korea Telegram",
+                "description": "Unofficial Group 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!"
                 "name": "OpenStreetMap RU telegram",
                 "description": "OpenStreetMap Russia telegram chat"
             },
-            "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",
                 "name": "OpenStreetMap Taiwan Mailinglist",
                 "description": "Talk-tw is an Official Mailinglist for the Communities to dicuss matters about Taiwan"
             },
+            "OSM-TW-telegram": {
+                "name": "OpenStreetMap Taiwan Telegram",
+                "description": "A Telegram group for the OSM Taiwan community: {url}"
+            },
             "OSM-TH-CNX-meetup": {
                 "name": "OSM Meetup Chiang Mai",
                 "description": "Irregular meeting of the OpenStreetMap community in Chiang Mai",
                 "name": "OpenStreetMap Belarus",
                 "description": "OpenStreetMap Belarus telegram chat"
             },
+            "be-chapter": {
+                "name": "OpenStreetMap Belgium Local Chapter",
+                "description": "We help grow and improve OpenStreetMap in Belgium.",
+                "extendedDescription": "If you want to help to improve and grow the mapping community in Belgium, to make even more people crazy about mapping, OpenStreetMap Belgium is the right place for you!"
+            },
             "be-facebook": {
-                "name": "OpenStreetMap BE Community",
+                "name": "OpenStreetMap BE Facebook Community",
                 "description": "Mappers and OpenStreetMap on Facebook in Belgium"
             },
             "be-forum": {
                 "name": "OpenStreetMap Belgium Twitter",
                 "description": "OSM Belgium on Twitter: @osm_be"
             },
+            "OSM-BiH-telegram": {
+                "name": "OpenStreetMap BiH Telegram",
+                "description": "A Telegram group for the OSM Bosnia and Herzegovina community: {url}"
+            },
             "hr-facebook": {
                 "name": "OpenStreetMap Croatia Facebook group",
                 "description": "OpenStreetMap Croatia Facebook group"
             },
             "osmcz-facebook": {
                 "name": "OpenStreetMap CZ on Facebook",
-                "description": "Follow czech community on Facebook - including translated WeeklyOSM!"
+                "description": "Follow Czech community on Facebook - including translated WeeklyOSM!"
+            },
+            "OSM-CZ-telegram": {
+                "name": "OpenStreetMap CZ Telegram",
+                "description": "A Telegram group for the OSM Czech community: {url}"
             },
             "osmcz-twitter": {
                 "name": "Czech twitter @osmcz",
                 "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": "Talk-fi Mailing List",
                 "description": "Talk-fi is the official mailing list for the Finnish OSM community"
             },
+            "fr-chapter": {
+                "name": "OpenStreetMap France Local Chapter",
+                "description": "We help grow and improve OpenStreetMap in France."
+            },
             "fr-facebook": {
                 "name": "OpenStreetMap France Facebook page",
                 "description": "OpenStreetMap France Facebook page"
                 "name": "Talk-fr Mailing List",
                 "description": "Talk-fr mailing list"
             },
+            "fr-telegram": {
+                "name": "OpenStreetMap France on Telegram",
+                "description": "A Telegram group for the OSM France community: {url}"
+            },
             "fr-twitter": {
                 "name": "OpenStreetMap France on Twitter",
                 "description": "OpenStreetMap France on Twitter: {url}"
                 "name": "OpenStreetMap DE forum",
                 "description": "OpenStreetMap Germany web forum"
             },
+            "de-hamburg-telegram": {
+                "name": "OSM Hamburg on Telegram",
+                "description": "OpenStreetMap Hamburg Telegram chat: {url}"
+            },
             "de-irc": {
                 "name": "OpenStreetMap Germany IRC",
                 "description": "Join #osm-de on irc.oftc.net (port 6667)"
                 "name": "OpenStreetMap Hungary Meetup",
                 "description": "The platform for organizing meetups in Hungary"
             },
+            "is-chapter": {
+                "name": "OpenStreetMap Iceland Local Chapter",
+                "description": "We help grow and improve OpenStreetMap in Iceland."
+            },
             "is-facebook": {
                 "name": "OSM Iceland on Facebook",
                 "description": "Page of OpenStreetMap in Iceland"
                 "name": "OSM Iceland on Twitter",
                 "description": "Twitter of OpenStreetMap in Iceland"
             },
+            "ireland-chapter": {
+                "name": "OpenStreetMap Ireland Local Chapter",
+                "description": "We help grow and improve OpenStreetMap in Ireland.",
+                "extendedDescription": "OpenStreetMap Ireland provides an advocate voice for the OpenStreetMap project on the island of Ireland, in addition to interacting with other open initiatives."
+            },
+            "ireland-facebook": {
+                "name": "OpenStreetMap Ireland Facebook group",
+                "description": "OpenStreetMap Ireland Facebook page"
+            },
+            "ireland-irc": {
+                "name": "OpenStreetMap Ireland IRC",
+                "description": "Join #osm-ie on irc.oftc.net (port 6667)",
+                "extendedDescription": "Join #osm-ie on irc.oftc.net (port 6667), please be patient and wait for a few minutes if you ask a question"
+            },
+            "ireland-mailinglist": {
+                "name": "Talk-ie Mailing List",
+                "description": "Talk-ie is the mailing list for the Irish OSM community"
+            },
+            "ireland-telegram": {
+                "name": "OSM Ireland on Telegram",
+                "description": "OpenStreetMap Ireland Telegram chat"
+            },
+            "ireland-twitter": {
+                "name": "OpenStreetMap IE on Twitter",
+                "description": "OpenStreetMap IE on Twitter: {url}"
+            },
+            "it-chapter": {
+                "name": "OpenStreetMap Italy Local Chapter",
+                "description": "We help grow and improve OpenStreetMap in Italy."
+            },
             "it-facebook": {
                 "name": "OpenStreetMap Italy Facebook",
                 "description": "Join the OpenStreetMap Italy community on Facebook"
                 "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."
             },
+            "lu-mailinglist": {
+                "name": "Talk-lu Mailing List",
+                "description": "Official mailing list for the Luxembourgish OSM community"
+            },
             "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"
             },
+            "nl-forum": {
+                "name": "Netherlands OpenStreetMap forum",
+                "description": "OpenStreetMap Netherlands web forum"
+            },
+            "nl-telegram": {
+                "name": "Netherlands OpenStreetMap Telegram",
+                "description": "A Telegram group for the OSM Netherlands community: {url}"
+            },
             "no-forum": {
                 "name": "OpenStreetMap Norway Web Forum",
                 "description": "OpenStreetMap Norway web forum"
                 "name": "OpenStreetMap Poland Forum",
                 "description": "Forum of Polish OpenStreetMap community"
             },
+            "pt-mailinglist": {
+                "name": "Talk-pt Mailing List",
+                "description": "Talk-pt is the official mailing list for the Portuguese OSM community"
+            },
+            "pt-telegram": {
+                "name": "OpenStreetMap Portugal on Telegram",
+                "description": "Telegram Group of the Portuguese OpenStreetMap community {url}"
+            },
             "si-forum": {
                 "name": "OpenStreetMap Slovenia Forum",
                 "description": "Forum of OpenStreetMap community in Slovenia"
                 "name": "OpenStreetMap Slovenia Twitter",
                 "description": "Follow OpenStreetMap Slovenia On Twitter: {url}"
             },
+            "Galicia-Telegram": {
+                "name": "OpenStreetMap Galicia Telegram",
+                "description": "OpenStreetMap Telegram for Galicia"
+            },
+            "Galicia-Twitter": {
+                "name": "OpenStreetMap Galicia Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
+            "galicia-wiki": {
+                "name": "OpenStreetMap Wikiproject Galicia",
+                "description": "Everything you need to know about mapping in Galicia: {url}"
+            },
             "OSM-ES-mailinglist": {
                 "name": "Talk-es mailing list",
                 "description": "A mailing list to discuss OpenStreetMap in Spain"
                 "name": "OpenStreetMap Sweden on Twitter",
                 "description": "Follow us on Twitter: {url}"
             },
+            "ch-irc": {
+                "name": "OpenStreetMap Switzerland IRC",
+                "description": "Join #osm-ch on irc.oftc.net (port 6667)"
+            },
+            "ch-mailinglist": {
+                "name": "Openstreetmap Schweiz/Suisse/Svizzera/Svizra Mailing List",
+                "description": "Mailing list for Switzerland"
+            },
+            "ch-twitter": {
+                "name": "OpenStreetMap Switzerland Twitter",
+                "description": "Follow us on Twitter: {url}"
+            },
+            "osm-ch": {
+                "name": "OpenStreetMap Switzerland",
+                "description": "The platform for information on OpenStreetMap in Switzerland"
+            },
             "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."
             },
+            "ua-facebook": {
+                "name": "OpenStreetMap Ukraine Facebook group",
+                "description": "Join the OpenStreetMap Ukraine community on Facebook"
+            },
+            "ua-forum": {
+                "name": "OpenStreetMap Ukraine Forum",
+                "description": "Forum of OpenStreetMap community in Ukraine"
+            },
+            "ua-github": {
+                "name": "OpenStreetMap Ukraine on GitHub",
+                "description": "OpenStreetMap Ukraine GitHub"
+            },
+            "ua-slack": {
+                "name": "OpenStreetMap Ukraine Slack",
+                "description": "Join the OpenStreetMap Ukraine community on Slack"
+            },
+            "ua-telegram": {
+                "name": "@osmUA on Telegram",
+                "description": "OpenStreetMap Ukraine Telegram chat"
+            },
+            "ua-twitter": {
+                "name": "OpenStreetMap UA Twitter",
+                "description": "OpenStreetMap Ukraine on Twitter: {url}"
+            },
+            "ua-osm": {
+                "name": "OpenStreetMap Website Ukraine",
+                "description": "OpenStreetMap website in Ukraine"
+            },
+            "scotland-twitter": {
+                "name": "OpenStreetMap Alba on Twitter",
+                "description": "OpenStreetMap Alba on Twitter: {url}"
+            },
             "Nottingham-OSM-pub-meetup": {
                 "name": "East Midlands (Nottingham) Monthly pub meet-up",
                 "description": "Social gathering for East Midlands mappers and users",
                 "extendedDescription": "A group have been meeting since March 2011, initially in Nottingham, and, more recently in Derby, and from time to time elsewhere in the East Midlands. These are social gatherings, but are an excellent place to come and ask specific questions about OSM either in the area or in general. In the summer months we usually do some light mapping for an hour in the vicinity of our meeting place. The group as a whole has a special interest in mapping public rights of way and from time to time has mapping meetings for this purpose."
             },
+            "gb-irc": {
+                "name": "OpenStreetMap United Kingdom IRC",
+                "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"
+            },
+            "uk-localchapter": {
+                "name": "OpenStreetMap UK",
+                "description": "The official Local Chapter for the UK (including Northern Ireland).",
+                "extendedDescription": "We support OpenStreetMap by holding events, providing community resources, building partnerships, and by spreading the word. Join OpenStreetMap UK here: {signupUrl}"
+            },
+            "uk-london-twitter": {
+                "name": "OpenStreetMap London on Twitter",
+                "description": "OpenStreetMap London on Twitter: {url}"
+            },
             "gb-mailinglist": {
                 "name": "Talk-gb Mailing List",
-                "description": "Talk-gb is the main communication forum list for the British (including Northern Ireland) OSM community"
+                "description": "Talk-gb is the main communication forum list for the UK (including Northern Ireland) OSM community"
             },
             "mappa-mercia-group": {
                 "name": "Mappa Mercia local group",
                 "description": "A home for OpenStreetMap enthusiasts in the Midlands",
                 "extendedDescription": "Mappa Mercia is a project to grow OpenStreetMap in the West Midlands, UK. We run community events, provide training and support local organisations wishing to open up their data."
             },
-            "gb-irc": {
-                "name": "OpenStreetMap United Kingdom IRC",
-                "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"
+            "uk-twitter": {
+                "name": "OpenStreetMap UK on Twitter",
+                "description": "OpenStreetMap UK on Twitter: {url}"
+            },
+            "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."
             },
             "ym-University-of-Exeter": {
                 "name": "University of Exeter British Red Cross Missing Maps",
                 "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."
             },
+            "il-telegram": {
+                "name": "OSM Israel on Telegram",
+                "description": "A Telegram group for the OpenStreetMap community in Israel: {url}"
+            },
+            "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."
+            },
+            "sa-telegram": {
+                "name": "OSM Saudi Arabia on Telegram",
+                "description": "A Telegram group for the OpenStreetMap community in Saudi Arabia: {url}"
+            },
             "ym-Sacred-Heart-Junior-College": {
                 "name": "Youth Mappers at Sacred Heart Junior College",
                 "description": "YouthMappers chapter at Sacred Heart Junior College"
                 "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": {
+            "ni-facebook": {
+                "name": "OpenStreetMap NI Community",
+                "description": "Mappers and OpenStreetMap on Facebook in Nicaragua"
+            },
+            "ni-mailinglist": {
+                "name": "Talk-ni Mailing List",
+                "description": "Talk-ni is the official mailing list for the Nicaraguan OSM community"
+            },
+            "ni-telegram": {
                 "name": "OSM Nicaragua on Telegram",
                 "description": "OpenStreetMap Nicaragua Telegram chat"
             },
+            "ni-twitter": {
+                "name": "OpenStreetMap Nicaragua Twitter",
+                "description": "OSM Nicaragua on Twitter: @osm_ni"
+            },
+            "osm-ni": {
+                "name": "MapaNica.net",
+                "description": "Provide OSM services and information for the local community in Nicaragua"
+            },
             "ym-Universidad-Nacional-de-Ingenieria": {
                 "name": "Yeka Street MGA",
                 "description": "YouthMappers chapter at Universidad Nacional de Ingenieria",
                 "description": "Mappers and OpenStreetMap users in the state of Colorado, USA",
                 "extendedDescription": "OpenStreetMap (OSM) Colorado is a local collaboration of people interested in contributing their efforts to create free maps. We encourage all of our mappers to organize or suggest mapping events throughout the state. Meetup activities can be simple social mixers, OSM basic to advanced training, or community mapping parties."
             },
-            "OSM-NYC": {
-                "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",
             "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}",
-                "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"
-                    }
-                }
+                "extendedDescription": "We support OpenStreetMap by holding annual conferences, providing community resources, building partnerships, and by spreading the word. Join OpenStreetMap US here: {signupUrl}"
             },
             "OSM-Utah": {
                 "name": "OpenStreetMap Utah",
                 "name": "Geography Club",
                 "description": "YouthMappers chapter at Western Michigan University"
             },
+            "geogeeks_perth_meetup": {
+                "name": "GeoGeeks Perth Meetup",
+                "description": "Perth-based meetup group for people interested in mapping, geospatial data, and open source. We'll be working on anything that involves a sense of place."
+            },
             "talk-au": {
                 "name": "Talk-au Mailing List",
                 "description": "Place for Aussie mappers to chat"
                 "description": "Join the OpenStreetMap Brasília community on Telegram",
                 "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
             },
+            "OSM-br-discord": {
+                "name": "OpenStreetMap Brasil Discord",
+                "description": "Join the OpenStreetMap Brasil community on Discord"
+            },
             "OSM-br-mailinglist": {
                 "name": "Talk-br Mailing List",
                 "description": "A mailing list to discuss OpenStreetMap in Brazil"
                 "name": "Talk-uy Mailing List",
                 "description": "Talk-uy is the official mailing list for the Uruguayan OSM community"
             },
+            "ve-forum": {
+                "name": "OpenStreetMap VE Forum",
+                "description": "OpenStreetMap Venezuela web forum"
+            },
+            "ve-mailinglist": {
+                "name": "Talk-ve Mailing List",
+                "description": "Talk-ve is the official mailing list for the Venezuelan OSM community"
+            },
+            "ve-telegram": {
+                "name": "OpenStreetMap Venezuela Telegram",
+                "description": "Join the OpenStreetMap Venezuela community on Telegram"
+            },
             "LATAM-Facebook": {
                 "name": "OpenStreetMap Latam Facebook",
                 "description": "OpenStreetMap Latam on Facebook"
             },
             "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"
-                    }
-                }
+                "description": "Supporting OpenStreetMap in Latin America"
             },
             "OSM-Discord": {
                 "name": "OpenStreetMap Discord",
             "OSMF": {
                 "name": "OpenStreetMap Foundation",
                 "description": "OSMF is a UK-based not-for-profit that supports the OpenStreetMap Project",
-                "extendedDescription": "OSMF supports the OpenStreetMap by fundraising, maintaining the servers which power OSM, organizing the annual State of the Map conference, and coordinating the volunteers who keep OSM running. You can show your support and have a voice in the direction of OpenStreetMap by joining as an OSMF member here: {signupUrl}",
-                "events": {
-                    "sotm2018": {
-                        "name": "State of the Map 2018",
-                        "description": "Join us for 3 days in Milan, Italy for the annual worldwide OpenStreetMap conference, bringing together everyone in the community to socialize, share, and learn.",
-                        "where": "Milan, Italy"
-                    }
-                }
+                "extendedDescription": "OSMF supports the OpenStreetMap by fundraising, maintaining the servers which power OSM, organizing the annual State of the Map conference, and coordinating the volunteers who keep OSM running. You can show your support and have a voice in the direction of OpenStreetMap by joining as an OSMF member here: {signupUrl}"
             }
         }
     }