]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Merge remote-tracking branch 'upstream/pull/2084'
[rails.git] / vendor / assets / iD / iD / locales / en.json
index 2655f494c5f0ade7c1e79b7ceb29688fd8c361b3..a6fa4d7345e627eef25a468db3ca3ed7e3f9bdeb 100644 (file)
@@ -1,9 +1,13 @@
 {
     "en": {
         "icons": {
+            "download": "download",
             "information": "info",
             "remove": "remove",
-            "undo": "undo"
+            "undo": "undo",
+            "zoom_to": "zoom to",
+            "copy": "copy",
+            "open_wikidata": "open on wikidata.org"
         },
         "modes": {
             "add_area": {
             },
             "connect": {
                 "annotation": {
-                    "point": "Connected a way to a point.",
-                    "vertex": "Connected a way to another.",
-                    "line": "Connected a way to a line.",
-                    "area": "Connected a way to an area."
+                    "from_vertex": {
+                        "to_point": "Connected a way to a point.",
+                        "to_vertex": "Connected a way to another.",
+                        "to_line": "Connected a way to a line.",
+                        "to_area": "Connected a way to an area.",
+                        "to_adjacent_vertex": "Merged adjacent points in a way.",
+                        "to_sibling_vertex": "Connected a way to itself."
+                    },
+                    "from_point": {
+                        "to_point": "Merged a point with another.",
+                        "to_vertex": "Merged a point with a point in a way.",
+                        "to_line": "Moved a point to a line.",
+                        "to_area": "Moved a point to an area."
+                    }
                 },
                 "relation": "These features can't be connected because they have conflicting relation roles.",
                 "restriction": "These features can't be connected because it would damage a \"{relation}\" relation."
         "browser_notice": "This editor is supported in Firefox, Chrome, Safari, Opera, and Internet Explorer 11 and above. Please upgrade your browser or use Potlatch 2 to edit the map.",
         "translate": {
             "translate": "Translate",
-            "localized_translation_label": "Multilingual name",
+            "localized_translation_label": "Multilingual Name",
             "localized_translation_language": "Choose language",
             "localized_translation_name": "Name"
         },
         "loading_auth": "Connecting to OpenStreetMap...",
         "report_a_bug": "Report a bug",
         "help_translate": "Help translate",
+        "sidebar": {
+            "key": "`",
+            "tooltip": "Toggle the sidebar."
+        },
         "feature_info": {
             "hidden_warning": "{count} hidden features",
             "hidden_details": "These features are currently hidden: {details}"
                 "edited_by": "Edited By",
                 "changeset": "Changeset",
                 "unknown": "Unknown",
-                "link_text": "History on openstreetmap.org"
+                "link_text": "History on openstreetmap.org",
+                "note_no_history": "No History (New Note)",
+                "note_comments": "Comments",
+                "note_created_date": "Created Date",
+                "note_created_user": "Created By",
+                "note_link_text": "Note on openstreetmap.org"
             },
             "location": {
                 "key": "L",
             "vertex": "vertex",
             "line": "line",
             "area": "area",
-            "relation": "relation"
+            "relation": "relation",
+            "note": "note"
         },
         "geocoder": {
             "search": "Search worldwide...",
             "way": "Way",
             "relation": "Relation",
             "location": "Location",
-            "add_fields": "Add field:"
+            "add_fields": "Add field:",
+            "lock": {
+                "suggestion": "The \"{label}\" field is locked because there is a Wikidata tag. You can delete it or edit the tags in the \"All tags\" section."
+            }
         },
         "background": {
             "title": "Background",
             "best_imagery": "Best known imagery source for this location",
             "switch": "Switch back to this background",
             "custom": "Custom",
-            "custom_button": "Edit custom background",
-            "custom_prompt": "Enter a tile URL template. Valid tokens are:\n   - {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n   - {-y} or {ty} for flipped TMS-style Y coordinates\n   - {u} for quadtile scheme\n   - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}",
             "overlays": "Overlays",
             "imagery_source_faq": "Imagery Info / Report a Problem",
             "reset": "reset",
                 "notes": {
                     "tooltip": "Note data from OpenStreetMap",
                     "title": "OpenStreetMap notes"
+                },
+                "custom": {
+                    "tooltip": "Drag and drop a data file onto the page, or click the button to setup",
+                    "title": "Custom Map Data",
+                    "zoom": "Zoom to data"
                 }
             },
             "fill_area": "Fill Areas",
                 "tooltip": "Areas are drawn fully filled."
             }
         },
+        "settings": {
+            "custom_background": {
+                "tooltip": "Edit custom background",
+                "header": "Custom Background Settings",
+                "instructions": "Enter a tile URL template. Valid tokens are:\n   {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme\n   {-y} or {ty} for flipped TMS-style Y coordinates\n   {u} for quadtile scheme\n   {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}",
+                "template": {
+                    "placeholder": "Enter a url template"
+                }
+            },
+            "custom_data": {
+                "tooltip": "Edit custom data layer",
+                "header": "Custom Map Data Settings",
+                "file": {
+                    "instructions": "Choose a local data file. Supported types are:\n   .gpx, .kml, .geojson, .json",
+                    "label": "Browse files"
+                },
+                "or": "Or",
+                "url": {
+                    "instructions": "Enter a data file URL or vector tile URL template. Valid tokens are:\n   {zoom} or {z}, {x}, {y} for Z/X/Y tile scheme",
+                    "placeholder": "Enter a url"
+                }
+            }
+        },
         "restore": {
             "heading": "You have unsaved changes",
             "description": "Do you wish to restore unsaved changes from a previous editing session?",
         },
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
-        "gpx": {
-            "local_layer": "Add a GPX",
-            "drag_drop": "Drag and drop a .gpx, .geojson or .kml file on the page, or click the button to the right to browse",
-            "zoom": "Zoom to layer",
-            "browse": "Browse for a file"
-        },
-        "mvt": {
-            "local_layer": "Add a MVT",
-            "drag_drop": "Drag and drop a .mvt or .pbf file on the page, or click the button to the right to browse",
-            "zoom": "Zoom to layer",
-            "browse": "Browse for a file"
-        },
         "streetside": {
             "tooltip": "Streetside photos from Microsoft",
             "title": "Photo Overlay (Bing Streetside)",
             "anonymous": "anonymous",
             "closed": "(Closed)",
             "commentTitle": "Comments",
+            "status": {
+                "opened": "opened {when}",
+                "reopened": "reopened {when}",
+                "commented": "commented {when}",
+                "closed": "closed {when}"
+            },
             "newComment": "New Comment",
             "inputPlaceholder": "Enter a comment to share with other users.",
             "close": "Close Note",
                     "background_switch": "Switch back to last background",
                     "map_data": "Show map data options",
                     "fullscreen": "Enter full screen mode",
+                    "sidebar": "Toggle sidebar",
                     "wireframe": "Toggle wireframe mode",
                     "minimap": "Toggle minimap"
                 },
             "coordinate": "{coordinate}{direction}",
             "coordinate_pair": "{latitude}, {longitude}"
         },
+        "wikidata": {
+            "identifier": "Identifier",
+            "label": "Label",
+            "description": "Description"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
                 "category-route": {
                     "name": "Route Features"
                 },
+                "category-utility": {
+                    "name": "Utility Features"
+                },
                 "category-water-area": {
                     "name": "Water Features"
                 },
                     "options": {
                         "yes": {
                             "title": "Allowed",
-                            "description": "Access permitted by law; a right of way"
+                            "description": "Access allowed by law; a right of way"
                         },
                         "no": {
                             "title": "Prohibited",
-                            "description": "Access not permitted to the general public"
+                            "description": "Access not allowed to the general public"
                         },
                         "permissive": {
                             "title": "Permissive",
-                            "description": "Access permitted until such time as the owner revokes the permission"
+                            "description": "Access allowed until such time as the owner revokes the permission"
                         },
                         "private": {
                             "title": "Private",
-                            "description": "Access permitted only with permission of the owner on an individual basis"
+                            "description": "Access allowed only with permission of the owner on an individual basis"
                         },
                         "designated": {
                             "title": "Designated",
-                            "description": "Access permitted according to signs or specific local laws"
+                            "description": "Access allowed according to signs or specific local laws"
                         },
                         "destination": {
                             "title": "Destination",
-                            "description": "Access permitted only to reach a destination"
+                            "description": "Access allowed only to reach a destination"
                         },
                         "dismount": {
                             "title": "Dismount",
-                            "description": "Access permitted but rider must dismount"
+                            "description": "Access allowed but rider must dismount"
+                        },
+                        "permit": {
+                            "title": "Permit",
+                            "description": "Access allowed only with a valid permit or license"
                         }
                     }
                 },
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "bridge/support": {
+                    "label": "Type"
+                },
                 "building_area": {
                     "label": "Building"
                 },
                 "collection_times": {
                     "label": "Collection Times"
                 },
+                "colour": {
+                    "label": "Color"
+                },
                 "comment": {
                     "label": "Changeset Comment",
                     "placeholder": "Brief description of your contributions (required)"
                 "content": {
                     "label": "Content"
                 },
+                "conveying": {
+                    "label": "Movement Direction",
+                    "options": {
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "reversible": "Reversible"
+                    }
+                },
                 "country": {
                     "label": "Country"
                 },
                 "description": {
                     "label": "Description"
                 },
+                "design": {
+                    "label": "Design"
+                },
                 "devices": {
                     "label": "Devices",
                     "placeholder": "1, 2, 3..."
                     "label": "Display"
                 },
                 "distance": {
-                    "label": "Total Distance"
+                    "label": "Distance"
                 },
                 "dock": {
                     "label": "Type"
                         "pond": "Pond"
                     }
                 },
+                "fireplace": {
+                    "label": "Fireplace"
+                },
                 "fitness_station": {
                     "label": "Equipment Type"
                 },
                 "fixme": {
                     "label": "Fix Me"
                 },
+                "flag/type": {
+                    "label": "Flag Type"
+                },
                 "ford": {
                     "label": "Type",
                     "placeholder": "Default"
                 "frequency": {
                     "label": "Operating Frequency"
                 },
+                "from": {
+                    "label": "From"
+                },
                 "fuel_multi": {
                     "label": "Fuel Types"
                 },
                 "historic/civilization": {
                     "label": "Historic Civilization"
                 },
+                "historic/wreck/date_sunk": {
+                    "label": "Date Sunk"
+                },
+                "historic/wreck/visible_at_high_tide": {
+                    "label": "Visible At High Tide"
+                },
+                "historic/wreck/visible_at_low_tide": {
+                    "label": "Visible At Low Tide"
+                },
                 "hoops": {
                     "label": "Hoops",
                     "placeholder": "1, 2, 4..."
                     "label": "Lanes",
                     "placeholder": "1, 2, 3..."
                 },
+                "language_multi": {
+                    "label": "Languages"
+                },
                 "layer": {
                     "label": "Layer",
                     "placeholder": "0"
                 "lit": {
                     "label": "Lit"
                 },
+                "location_pool": {
+                    "label": "Location",
+                    "options": {
+                        "outdoor": "Outdoor",
+                        "indoor": "Indoor",
+                        "roof": "Rooftop"
+                    }
+                },
                 "location": {
                     "label": "Location"
                 },
                 "map_type": {
                     "label": "Type"
                 },
+                "material": {
+                    "label": "Material"
+                },
                 "maxheight": {
                     "label": "Max Height",
                     "placeholder": "4, 4.5, 5, 14'0\", 14'6\", 15'0\""
                     "label": "Telephone",
                     "placeholder": "+31 42 123 4567"
                 },
-                "piste/difficulty": {
+                "piste/difficulty_downhill": {
                     "label": "Difficulty",
                     "placeholder": "Easy, Intermediate, Advanced...",
                     "options": {
                         "extreme": "Extreme (climbing equipment required)"
                     }
                 },
+                "piste/difficulty_nordic": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice - Flat, no effort needed",
+                        "easy": "Easy - Soft hills, short steep section",
+                        "intermediate": "Intermediate - Steep section",
+                        "advanced": "Advanced - Narrow, steep or icy section, sharp turn",
+                        "expert": "Expert - Dangerous terrain around"
+                    }
+                },
+                "piste/difficulty_skitour": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice - L: <30° incline",
+                        "easy": "Easy - WS: 30-35° incline",
+                        "intermediate": "Intermediate - ZS: 35-40° incline",
+                        "advanced": "Advanced - S: 40-45° incline",
+                        "expert": "Expert - SS: 45–50° incline",
+                        "freeride": "Freeride - AS: 50–55° incline",
+                        "extreme": "Extreme - EX: >55° incline"
+                    }
+                },
+                "piste/difficulty": {
+                    "label": "Difficulty",
+                    "placeholder": "Easy, Intermediate, Advanced...",
+                    "options": {
+                        "novice": "Novice",
+                        "easy": "Easy",
+                        "intermediate": "Intermediate",
+                        "advanced": "Advanced",
+                        "expert": "Expert",
+                        "freeride": "Freeride",
+                        "extreme": "Extreme"
+                    }
+                },
+                "piste/grooming_downhill": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "mogul": "Mogul",
+                        "backcountry": "Backcountry - no grooming"
+                    }
+                },
+                "piste/grooming_hike": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic - Winter Hiking",
+                        "backcountry": "Backcountry - Snowshoeing"
+                    }
+                },
+                "piste/grooming_nordic": {
+                    "label": "Grooming",
+                    "options": {
+                        "classic": "Classic",
+                        "backcountry": "Backcountry, no grooming",
+                        "classic+skating": "Classic and Skating",
+                        "scooter": "Scooter/Snowmobile",
+                        "skating": "Skating"
+                    }
+                },
                 "piste/grooming": {
                     "label": "Grooming",
                     "options": {
                         "sleigh": "Sleigh",
                         "ice_skate": "Ice Skate",
                         "snow_park": "Snow Park",
-                        "playground": "Playground"
+                        "playground": "Playground",
+                        "connection": "Connection"
                     }
                 },
                 "place": {
                 "recycling_accepts": {
                     "label": "Accepts"
                 },
+                "recycling_type": {
+                    "label": "Type",
+                    "placeholder": "Container, Center",
+                    "options": {
+                        "container": "Container",
+                        "centre": "Center"
+                    }
+                },
                 "ref_aeroway_gate": {
                     "label": "Gate Number"
                 },
                 "sanitary_dump_station": {
                     "label": "Toilet Disposal"
                 },
+                "scuba_diving": {
+                    "label": "Services"
+                },
+                "seamark/beacon_isolated_danger/shape": {
+                    "label": "Shape"
+                },
+                "seamark/beacon_lateral/category": {
+                    "label": "Category",
+                    "options": {
+                        "port": "Port",
+                        "starboard": "Starboard",
+                        "waterway_left": "Waterway Left",
+                        "waterway_right": "Waterway Right",
+                        "danger_left": "Danger Left",
+                        "danger_right": "Danger Right"
+                    }
+                },
+                "seamark/beacon_lateral/colour": {
+                    "label": "Color",
+                    "options": {
+                        "red": "Red",
+                        "green": "Green",
+                        "grey": "Grey"
+                    }
+                },
+                "seamark/beacon_lateral/shape": {
+                    "label": "Shape"
+                },
+                "seamark/beacon_lateral/system": {
+                    "label": "System",
+                    "options": {
+                        "iala-a": "IALA A",
+                        "iala-b": "IALA B",
+                        "cevni": "CEVNI",
+                        "other": "Other"
+                    }
+                },
+                "seamark/buoy_lateral/category": {
+                    "label": "Category",
+                    "options": {
+                        "port": "Port",
+                        "starboard": "Starboard",
+                        "channel_left": "Channel Left",
+                        "channel_right": "Channel Right",
+                        "waterway_left": "Waterway Left",
+                        "waterway_right": "Waterway Right",
+                        "danger_left": "Danger Left",
+                        "danger_right": "Danger Right",
+                        "preferred_channel_port": "Preferred Channel Port",
+                        "preferred_channel_starboard": "Preferred Channel Starboard"
+                    }
+                },
+                "seamark/buoy_lateral/colour": {
+                    "label": "Color",
+                    "options": {
+                        "red": "Red",
+                        "green": "Green",
+                        "red;white;red;white": "Red-White-Red-White",
+                        "green;white;green;white": "Green-White-Green-White",
+                        "red;green;red": "Red-Green-Red",
+                        "green;red;green": "Green-Red-Green",
+                        "white": "White",
+                        "yellow": "Yellow"
+                    }
+                },
+                "seamark/buoy_lateral/shape": {
+                    "label": "Shape"
+                },
+                "seamark/buoy_lateral/system": {
+                    "label": "System",
+                    "options": {
+                        "iala-a": "IALA A",
+                        "iala-b": "IALA B",
+                        "cevni": "CEVNI",
+                        "other": "Other"
+                    }
+                },
+                "seamark/mooring/category": {
+                    "label": "Category"
+                },
+                "seamark/type": {
+                    "label": "Seamark"
+                },
+                "seamark/wreck/category": {
+                    "label": "Category"
+                },
                 "seasonal": {
                     "label": "Seasonal"
                 },
+                "seats": {
+                    "label": "Seats",
+                    "placeholder": "2, 4, 6..."
+                },
                 "second_hand": {
                     "label": "Sells Used",
                     "placeholder": "Yes, No, Only",
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "swimming_pool": {
+                    "label": "Type"
+                },
                 "switch": {
                     "label": "Type",
                     "options": {
                         "only": "Takeaway Only"
                     }
                 },
+                "to": {
+                    "label": "To"
+                },
                 "toilets/disposal": {
                     "label": "Disposal",
                     "options": {
                 "traffic_calming": {
                     "label": "Type"
                 },
+                "traffic_sign": {
+                    "label": "Traffic Sign"
+                },
+                "traffic_sign/direction": {
+                    "label": "Direction",
+                    "options": {
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "both": "Both / All"
+                    }
+                },
                 "traffic_signals": {
                     "label": "Type"
                 },
                 "width": {
                     "label": "Width (Meters)"
                 },
+                "wikidata": {
+                    "label": "Wikidata"
+                },
                 "wikipedia": {
                     "label": "Wikipedia"
                 },
                     "name": "Traffic Circle",
                     "terms": ""
                 },
+                "embankment": {
+                    "name": "Embankment",
+                    "terms": ""
+                },
                 "highway": {
                     "name": "Highway",
                     "terms": ""
                     "name": "Roundabout",
                     "terms": ""
                 },
+                "seamark": {
+                    "name": "Seamark",
+                    "terms": ""
+                },
                 "waterway": {
                     "name": "Waterway",
                     "terms": ""
                     "name": "Nursing Home",
                     "terms": ""
                 },
+                "amenity/recycling": {
+                    "name": "Recycling",
+                    "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
+                },
                 "amenity/register_office": {
                     "name": "Register Office",
                     "terms": ""
                     "terms": "bike,repair,chain,pump"
                 },
                 "amenity/biergarten": {
-                    "name": "Beer Garden",
+                    "name": "Biergarten",
                     "terms": "beer,bier,booze"
                 },
                 "amenity/boat_rental": {
                     "name": "Dentist",
                     "terms": "tooth,teeth"
                 },
+                "amenity/dive_centre": {
+                    "name": "Dive Center",
+                    "terms": "diving,scuba"
+                },
                 "amenity/doctors": {
                     "name": "Doctor",
                     "terms": "medic*,physician"
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
                 },
+                "amenity/fast_food/burger": {
+                    "name": "Burger Fast Food",
+                    "terms": "breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/chicken": {
+                    "name": "Chicken Fast Food",
+                    "terms": "breakfast,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/fish_and_chips": {
+                    "name": "Fish & Chips Fast Food",
+                    "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries"
+                },
+                "amenity/fast_food/kebab": {
+                    "name": "Kebab Fast Food",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/fast_food/pizza": {
+                    "name": "Pizza Fast Food",
+                    "terms": "dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice"
+                },
+                "amenity/fast_food/sandwich": {
+                    "name": "Sandwich Fast Food",
+                    "terms": "breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
                 "amenity/fire_station": {
                     "name": "Fire Station",
                     "terms": ""
                     "name": "Preschool/Kindergarten Grounds",
                     "terms": "kindergarden,pre-school"
                 },
+                "amenity/language_school": {
+                    "name": "Language School",
+                    "terms": "esl"
+                },
                 "amenity/library": {
                     "name": "Library",
                     "terms": "book"
                     "name": "Monastery Grounds",
                     "terms": "abbey,basilica,bethel,cathedral,chancel,chantry,chapel,church,fold,house of God,house of prayer,house of worship,minster,mission,monastery,mosque,oratory,parish,sacellum,sanctuary,shrine,synagogue,tabernacle,temple"
                 },
+                "amenity/money_transfer": {
+                    "name": "Money Transfer Station",
+                    "terms": "money order,check,bill,currency,finance,wire transfer,cable,person to person,cash to cash,exchange"
+                },
                 "amenity/motorcycle_parking": {
                     "name": "Motorcycle Parking",
                     "terms": ""
                     "terms": ""
                 },
                 "amenity/parking": {
-                    "name": "Car Parking",
-                    "terms": ""
+                    "name": "Parking Lot",
+                    "terms": "automobile parking,car lot,car parking,rv parking,truck parking,vehicle parking"
                 },
-                "amenity/pavilion": {
-                    "name": "Pavilion",
-                    "terms": ""
+                "amenity/parking/multi-storey": {
+                    "name": "Multilevel Parking Garage",
+                    "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
+                },
+                "amenity/payment_centre": {
+                    "name": "Payment Center",
+                    "terms": "check,tax pay,bill pay,currency,finance,cash,money"
+                },
+                "amenity/payment_terminal": {
+                    "name": "Payment Terminal",
+                    "terms": "interactive kiosk,ekiosk,atm,bill pay,tax pay,phone pay,finance,cash,money transfer,card"
                 },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",
-                    "terms": "drug*,med*,prescription"
+                    "terms": "apothecary,drug*,med*,prescription"
                 },
                 "amenity/place_of_worship": {
                     "name": "Place of Worship",
                     "name": "Recycling Center",
                     "terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
                 },
-                "amenity/recycling": {
+                "amenity/recycling_container": {
                     "name": "Recycling Container",
                     "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                 },
                     "name": "Restaurant",
                     "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
                 },
+                "amenity/restaurant/american": {
+                    "name": "American Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,coffee,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/asian": {
+                    "name": "Asian Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/chinese": {
+                    "name": "Chinese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/french": {
+                    "name": "French Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/german": {
+                    "name": "German Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/greek": {
+                    "name": "Greek Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,gyros,pitas,olives"
+                },
+                "amenity/restaurant/indian": {
+                    "name": "Indian Restaurant",
+                    "terms": "bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,curry"
+                },
+                "amenity/restaurant/italian": {
+                    "name": "Italian Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,pasta,pizza"
+                },
+                "amenity/restaurant/japanese": {
+                    "name": "Japanese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/mexican": {
+                    "name": "Mexican Restaurant",
+                    "terms": "bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas"
+                },
+                "amenity/restaurant/noodle": {
+                    "name": "Noodle Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,ramen noodles,soup,soba noodles,cellophane noodles,rice noodles"
+                },
+                "amenity/restaurant/pizza": {
+                    "name": "Pizza Restaurant",
+                    "terms": "bar,dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice"
+                },
+                "amenity/restaurant/seafood": {
+                    "name": "Seafood Restaurant",
+                    "terms": "bar,breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,fish,shellfish,molluscs,crustaceans,clams,oysters,lobsters,crab,shrimp,squid,octopus"
+                },
+                "amenity/restaurant/steakhouse": {
+                    "name": "Steakhouse",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,steak house,chop house,beef"
+                },
+                "amenity/restaurant/sushi": {
+                    "name": "Sushi Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/thai": {
+                    "name": "Thai Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/turkish": {
+                    "name": "Turkish Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
+                "amenity/restaurant/vietnamese": {
+                    "name": "Vietnamese Restaurant",
+                    "terms": "bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table"
+                },
                 "amenity/sanitary_dump_station": {
                     "name": "RV Toilet Disposal",
                     "terms": "Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet"
                     "name": "Shelter",
                     "terms": "lean-to,gazebo,picnic"
                 },
+                "amenity/shelter/gazebo": {
+                    "name": "Gazebo",
+                    "terms": ""
+                },
+                "amenity/shelter/lean_to": {
+                    "name": "Lean-To",
+                    "terms": ""
+                },
+                "amenity/shelter/picnic_shelter": {
+                    "name": "Picnic Shelter",
+                    "terms": "pavilion"
+                },
+                "amenity/shelter/public_transport": {
+                    "name": "Transit Shelter",
+                    "terms": "bus stop,metro stop,waiting"
+                },
                 "amenity/shower": {
                     "name": "Shower",
                     "terms": "rain closet"
                     "name": "Theater",
                     "terms": "theatre,performance,play,musical"
                 },
+                "amenity/theatre/type/amphi": {
+                    "name": "Amphitheatre",
+                    "terms": "open air,outdoor,greek,ampi"
+                },
                 "amenity/toilets": {
                     "name": "Toilets",
                     "terms": "bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C."
                     "name": "University Grounds",
                     "terms": "college"
                 },
+                "amenity/vehicle_inspection": {
+                    "name": "Vehicle Inspection",
+                    "terms": "car inspection"
+                },
                 "amenity/vending_machine": {
                     "name": "Vending Machine",
                     "terms": ""
                     "terms": "newspaper"
                 },
                 "amenity/vending_machine/parcel_pickup_dropoff": {
-                    "name": "Parcel Pickup/Dropoff Vending Machine",
-                    "terms": "parcel,mail,pickup"
+                    "name": "Parcel Pickup/Dropoff Locker",
+                    "terms": "mail,parcel,pickup"
+                },
+                "amenity/vending_machine/parcel_pickup": {
+                    "name": "Parcel Pickup Locker",
+                    "terms": "amazon,locker,mail,parcel,pickup"
                 },
                 "amenity/vending_machine/parking_tickets": {
                     "name": "Parking Ticket Vending Machine",
                     "name": "Roller Coaster",
                     "terms": "theme park,amusement ride"
                 },
+                "attraction/summer_toboggan": {
+                    "name": "Summer Toboggan",
+                    "terms": "alpine slide,mountain coaster"
+                },
                 "attraction/train": {
                     "name": "Tourist Train",
                     "terms": "theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train"
                     "name": "Fence",
                     "terms": ""
                 },
+                "barrier/fence/railing": {
+                    "name": "Railing",
+                    "terms": "railing,handrail,guard rail"
+                },
                 "barrier/gate": {
                     "name": "Gate",
                     "terms": ""
                 },
+                "barrier/guard_rail": {
+                    "name": "Guard Rail",
+                    "terms": "guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier"
+                },
                 "barrier/hedge": {
                     "name": "Hedge",
                     "terms": ""
                 },
                 "barrier/kerb": {
-                    "name": "Kerb",
+                    "name": "Curb",
                     "terms": ""
                 },
+                "barrier/kerb/flush": {
+                    "name": "Flush Curb",
+                    "terms": "even curb,level curb,tactile curb"
+                },
+                "barrier/kerb/lowered": {
+                    "name": "Lowered Curb",
+                    "terms": "curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp"
+                },
                 "barrier/kissing_gate": {
                     "name": "Kissing Gate",
                     "terms": ""
                     "name": "Administrative Boundary",
                     "terms": ""
                 },
+                "bridge/support": {
+                    "name": "Bridge Support",
+                    "terms": ""
+                },
+                "bridge/support/pier": {
+                    "name": "Bridge Pier",
+                    "terms": ""
+                },
                 "building": {
                     "name": "Building",
                     "terms": ""
                     "name": "Cabin",
                     "terms": ""
                 },
+                "building/carport": {
+                    "name": "Carport",
+                    "terms": "covered parking space,garage,car,porch"
+                },
                 "building/cathedral": {
                     "name": "Cathedral Building",
                     "terms": ""
                     "name": "Mosque Building",
                     "terms": ""
                 },
+                "building/pavilion": {
+                    "name": "Pavilion Building",
+                    "terms": "sports"
+                },
                 "building/public": {
                     "name": "Public Building",
                     "terms": ""
                     "name": "Winery",
                     "terms": ""
                 },
-                "embankment": {
-                    "name": "Embankment",
-                    "terms": ""
-                },
                 "emergency/designated": {
                     "name": "Emergency Access Designated",
                     "terms": ""
                     "name": "Entrance/Exit",
                     "terms": "entrance,exit,door"
                 },
-                "footway/crossing-raised": {
-                    "name": "Raised Street Crossing",
-                    "terms": "flat top,hump,speed,slow"
-                },
-                "footway/crossing": {
-                    "name": "Street Crossing",
-                    "terms": ""
-                },
-                "footway/crosswalk-raised": {
-                    "name": "Raised Pedestrian Crosswalk",
-                    "terms": "zebra crossing,flat top,hump,speed,slow"
-                },
-                "footway/crosswalk": {
-                    "name": "Pedestrian Crosswalk",
-                    "terms": "zebra crossing"
-                },
-                "footway/sidewalk": {
-                    "name": "Sidewalk",
-                    "terms": ""
-                },
                 "ford": {
                     "name": "Ford",
                     "terms": ""
                     "name": "Indoor Corridor",
                     "terms": "gallery,hall,hallway,indoor,passage,passageway"
                 },
-                "highway/crossing-raised": {
-                    "name": "Raised Street Crossing",
-                    "terms": "flat top,hump,speed,slow"
+                "highway/crossing/zebra-raised": {
+                    "name": "Marked Crosswalk (Raised)",
+                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
                 },
-                "highway/crossing": {
-                    "name": "Street Crossing",
-                    "terms": ""
+                "highway/crossing/zebra": {
+                    "name": "Marked Crosswalk",
+                    "terms": "zebra crossing,marked crossing,crosswalk"
                 },
-                "highway/crosswalk-raised": {
-                    "name": "Raised Pedestrian Crosswalk",
-                    "terms": "zebra crossing,flat top,hump,speed,slow"
+                "highway/crossing/marked-raised": {
+                    "name": "Marked Crosswalk (Raised)",
+                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
+                },
+                "highway/crossing/marked": {
+                    "name": "Marked Crosswalk",
+                    "terms": "zebra crossing,marked crossing,crosswalk"
+                },
+                "highway/crossing/unmarked-raised": {
+                    "name": "Unmarked Crossing (Raised)",
+                    "terms": "flat top,hump,speed,slow"
                 },
-                "highway/crosswalk": {
-                    "name": "Pedestrian Crosswalk",
-                    "terms": "zebra crossing"
+                "highway/crossing/unmarked": {
+                    "name": "Unmarked Crossing",
+                    "terms": ""
                 },
                 "highway/cycleway": {
                     "name": "Cycle Path",
                     "name": "Foot Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
+                "highway/footway/zebra-raised": {
+                    "name": "Marked Crosswalk (Raised)",
+                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
+                },
+                "highway/footway/zebra": {
+                    "name": "Marked Crosswalk",
+                    "terms": "zebra crossing,marked crossing,crosswalk"
+                },
+                "highway/footway/conveying": {
+                    "name": "Moving Walkway",
+                    "terms": "moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor"
+                },
+                "highway/footway/marked-raised": {
+                    "name": "Marked Crosswalk (Raised)",
+                    "terms": "zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow"
+                },
+                "highway/footway/marked": {
+                    "name": "Marked Crosswalk",
+                    "terms": "zebra crossing,marked crossing,crosswalk"
+                },
+                "highway/footway/sidewalk": {
+                    "name": "Sidewalk",
+                    "terms": "pavement,sidepath"
+                },
+                "highway/footway/unmarked-raised": {
+                    "name": "Unmarked Crossing (Raised)",
+                    "terms": "flat top,hump,speed,slow"
+                },
+                "highway/footway/unmarked": {
+                    "name": "Unmarked Crossing",
+                    "terms": ""
+                },
                 "highway/give_way": {
                     "name": "Yield Sign",
                     "terms": "give way,yield,sign"
                     "name": "Living Street",
                     "terms": ""
                 },
+                "highway/milestone": {
+                    "name": "Highway Milestone",
+                    "terms": "milestone,marker"
+                },
                 "highway/mini_roundabout": {
                     "name": "Mini-Roundabout",
                     "terms": ""
                     "name": "Steps",
                     "terms": "stairs,staircase"
                 },
+                "highway/steps/conveying": {
+                    "name": "Escalator",
+                    "terms": "moving staircase,moving stairway,people mover"
+                },
                 "highway/stop": {
                     "name": "Stop Sign",
                     "terms": "stop,halt,sign"
                     "name": "Wayside Shrine",
                     "terms": ""
                 },
+                "historic/wreck": {
+                    "name": "Shipwreck",
+                    "terms": "hull,mast,maritime,remains,ship,boat"
+                },
+                "internet_access/wlan": {
+                    "name": "Wi-Fi Hotspot",
+                    "terms": "wi-fi,wifi,hotspot"
+                },
                 "junction": {
                     "name": "Junction",
                     "terms": ""
                     "name": "Amusement Arcade",
                     "terms": "pay-to-play games,video games,driving simulators,pinball machines"
                 },
+                "leisure/bandstand": {
+                    "name": "Bandstand",
+                    "terms": ""
+                },
                 "leisure/beach_resort": {
                     "name": "Beach Resort",
                     "terms": ""
                     "name": "Firepit",
                     "terms": "fireplace,campfire"
                 },
+                "leisure/fishing": {
+                    "name": "Fishing Spot",
+                    "terms": "angler"
+                },
                 "leisure/fitness_centre": {
                     "name": "Gym / Fitness Center",
                     "terms": "health,gym,leisure,studio"
                     "name": "American Football Field",
                     "terms": ""
                 },
+                "leisure/pitch/badminton": {
+                    "name": "Badminton Court",
+                    "terms": ""
+                },
                 "leisure/pitch/baseball": {
-                    "name": "Baseball Diamond",
+                    "name": "Baseball Field",
                     "terms": ""
                 },
                 "leisure/pitch/basketball": {
                     "name": "Soccer Field",
                     "terms": "football"
                 },
+                "leisure/pitch/softball": {
+                    "name": "Softball Field",
+                    "terms": "softball,diamond"
+                },
                 "leisure/pitch/table_tennis": {
                     "name": "Ping Pong Table",
                     "terms": "table tennis,ping pong"
                 },
                 "leisure/slipway": {
                     "name": "Slipway",
-                    "terms": "boat launch,boat ramp"
+                    "terms": "boat launch,boat ramp,boat landing"
                 },
                 "leisure/sports_centre": {
                     "name": "Sports Center / Complex",
                 },
                 "leisure/swimming_pool": {
                     "name": "Swimming Pool",
-                    "terms": "dive,water"
+                    "terms": "dive,water,aquatics"
                 },
                 "leisure/track": {
                     "name": "Racetrack (Non-Motorsport)",
                     "name": "Man Made",
                     "terms": ""
                 },
-                "man_made/embankment": {
-                    "name": "Embankment",
-                    "terms": ""
-                },
                 "man_made/adit": {
                     "name": "Adit",
                     "terms": "entrance,underground,mine,cave"
                     "name": "Bridge",
                     "terms": ""
                 },
+                "man_made/bunker_silo": {
+                    "name": "Bunker Silo",
+                    "terms": "Silage,Storage"
+                },
                 "man_made/chimney": {
                     "name": "Chimney",
                     "terms": ""
                     "name": "Cut line",
                     "terms": ""
                 },
+                "man_made/embankment": {
+                    "name": "Embankment",
+                    "terms": ""
+                },
                 "man_made/flagpole": {
                     "name": "Flagpole",
                     "terms": ""
                     "name": "Mast",
                     "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
                 },
+                "man_made/mast/communication": {
+                    "name": "Communication Mast",
+                    "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
+                },
+                "man_made/mast/communication/mobile_phone": {
+                    "name": "Mobile Phone Mast",
+                    "terms": "antenna,cell mast,cell phone mast,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,transmission mast,transmission tower"
+                },
+                "man_made/mast/communication/radio": {
+                    "name": "Radio Broadcast Mast",
+                    "terms": "antenna,broadcast tower,communication mast,communication tower,guyed tower,radio mast,radio tower,transmission mast,transmission tower"
+                },
+                "man_made/mast/communication/television": {
+                    "name": "Television Broadcast Mast",
+                    "terms": "antenna,broadcast tower,communication mast,communication tower,guyed tower,television mast,television tower,transmission mast,transmission tower,tv mast,tv tower"
+                },
                 "man_made/monitoring_station": {
                     "name": "Monitoring Station",
                     "terms": "weather,earthquake,seismology,air,gps"
                 },
-                "man_made/observation": {
-                    "name": "Observation Tower",
-                    "terms": "lookout tower,fire tower"
-                },
                 "man_made/observatory": {
                     "name": "Observatory",
                     "terms": "astronomical,meteorological"
                 },
                 "man_made/pipeline": {
                     "name": "Pipeline",
-                    "terms": ""
+                    "terms": "oil,natural gas,water,sewer,sewage"
                 },
                 "man_made/pumping_station": {
                     "name": "Pumping Station",
                     "name": "Storage Tank",
                     "terms": "water,oil,gas,petrol"
                 },
-                "man_made/surveillance_camera": {
-                    "name": "Surveillance Camera",
-                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
-                },
                 "man_made/surveillance": {
                     "name": "Surveillance",
                     "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
                 },
+                "man_made/surveillance/camera": {
+                    "name": "Surveillance Camera",
+                    "terms": "anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam"
+                },
                 "man_made/survey_point": {
                     "name": "Survey Point",
                     "terms": "trig point,triangulation pillar,trigonometrical station"
                     "name": "Tower",
                     "terms": ""
                 },
+                "man_made/tower/communication": {
+                    "name": "Communication Tower",
+                    "terms": "antenna,broadcast tower,cell phone tower,cell tower,communication mast,communication tower,guyed tower,mobile phone tower,radio mast,radio tower,television tower,transmission mast,transmission tower,tv tower"
+                },
+                "man_made/tower/observation": {
+                    "name": "Observation Tower",
+                    "terms": "lookout tower,fire tower"
+                },
                 "man_made/wastewater_plant": {
                     "name": "Wastewater Plant",
                     "terms": "sewage*,water treatment plant,reclamation plant"
                     "terms": ""
                 },
                 "natural/tree_row": {
-                    "name": "Tree row",
+                    "name": "Tree Row",
                     "terms": ""
                 },
                 "natural/tree": {
                     "name": "Quasi-NGO Office",
                     "terms": "ngo,non government,non-government,organization,organisation,quasi autonomous,quasi-autonomous"
                 },
+                "office/religion": {
+                    "name": "Religious Office",
+                    "terms": ""
+                },
                 "office/research": {
                     "name": "Research Office",
                     "terms": ""
                     "name": "Water Utility Office",
                     "terms": "water board,utility"
                 },
-                "piste": {
-                    "name": "Piste/Ski Trail",
-                    "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
+                "piste/downhill": {
+                    "name": "Downhill Piste/Ski Run",
+                    "terms": "ski,alpine,snowboard,downhill,piste"
+                },
+                "piste/hike": {
+                    "name": "Snowshoeing or Winter Hiking Trail",
+                    "terms": "hike,winter hiking,snowshoe,snowshoeing,piste,ski"
+                },
+                "piste/ice_skate": {
+                    "name": "Ice Skating Piste",
+                    "terms": "ice,skating,ski,piste"
+                },
+                "piste/nordic": {
+                    "name": "Nordic or Crosscountry Piste/Ski Trail",
+                    "terms": "ski,nordic,crosscountry,skating,piste"
+                },
+                "piste/piste": {
+                    "name": "Winter Sport Trails",
+                    "terms": "ski,nordic,crosscountry,downhill,alpine,snowboard,skitour,ski touring,sled,luge,sleigh,sledge,ski-joring,husky,horse,winter hiking,snowshoe,snowshoeing,ice,skating"
+                },
+                "piste/skitour": {
+                    "name": "Ski Touring Trail",
+                    "terms": "ski,skitour,crosscountry,ski touring,piste"
+                },
+                "piste/sled": {
+                    "name": "Sled Piste",
+                    "terms": "ski,sled,luge,sleigh,sledge,piste"
+                },
+                "piste/sleigh": {
+                    "name": "Sleigh Piste",
+                    "terms": "ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse"
                 },
                 "place/farm": {
                     "name": "Farm",
                     "terms": ""
                 },
+                "place/city_block": {
+                    "name": "City Block",
+                    "terms": ""
+                },
                 "place/city": {
                     "name": "City",
                     "terms": ""
                     "name": "Substation",
                     "terms": ""
                 },
+                "power/cable/underground": {
+                    "name": "Underground Power Cable",
+                    "terms": ""
+                },
                 "power/generator": {
                     "name": "Power Generator",
                     "terms": "hydro,solar,turbine,wind"
                 },
-                "power/generator/source_nuclear": {
+                "power/generator/method/photovoltaic": {
+                    "name": "Solar Panel",
+                    "terms": "photovoltaic module,PV module,sunlight"
+                },
+                "power/generator/source/nuclear": {
                     "name": "Nuclear Reactor",
                     "terms": "fission,generator,nuclear,nuke,reactor"
                 },
-                "power/generator/source_wind": {
+                "power/generator/source/wind": {
                     "name": "Wind Turbine",
                     "terms": "generator,turbine,windmill,wind"
                 },
                 },
                 "power/tower": {
                     "name": "High-Voltage Tower",
-                    "terms": ""
+                    "terms": "power"
                 },
                 "power/transformer": {
                     "name": "Transformer",
                     "name": "Ferry Route",
                     "terms": ""
                 },
+                "seamark/beacon_isolated_danger": {
+                    "name": "Danger Beacon",
+                    "terms": "beacon isolated danger,isolated danger beacon,iala"
+                },
+                "seamark/beacon_lateral": {
+                    "name": "Channel Beacon",
+                    "terms": "lateral beacon,beacon lateral,cevni,channel marker,iala,lateral mark"
+                },
+                "seamark/buoy_lateral": {
+                    "name": "Channel Buoy",
+                    "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark"
+                },
+                "seamark/buoy_lateral/green": {
+                    "name": "Green Buoy",
+                    "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark"
+                },
+                "seamark/buoy_lateral/red": {
+                    "name": "Red Buoy",
+                    "terms": "lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark"
+                },
+                "seamark/mooring": {
+                    "name": "Mooring",
+                    "terms": "dolphin,pile,bollard,buoy,post"
+                },
                 "shop": {
                     "name": "Shop",
                     "terms": ""
                     "name": "Carpet Store",
                     "terms": "rug"
                 },
+                "shop/catalogue": {
+                    "name": "Catalog Shop",
+                    "terms": ""
+                },
                 "shop/charity": {
                     "name": "Charity Store",
                     "terms": "thrift,op shop,nonprofit"
                 },
                 "shop/chemist": {
                     "name": "Drugstore",
-                    "terms": "med*,drug*,gift"
+                    "terms": "apothecary,med*,drug*,gift"
                 },
                 "shop/chocolate": {
                     "name": "Chocolate Store",
                     "name": "Cosmetics Store",
                     "terms": ""
                 },
+                "shop/country_store": {
+                    "name": "Country Store",
+                    "terms": ""
+                },
                 "shop/craft": {
                     "name": "Arts and Crafts Store",
                     "terms": "art*,paint*,frame"
                     "name": "Greengrocer",
                     "terms": "fruit,vegetable"
                 },
+                "shop/hairdresser_supply": {
+                    "name": "Hairdresser Supply Store",
+                    "terms": "barber,shampoo,conditioner"
+                },
                 "shop/hairdresser": {
                     "name": "Hairdresser",
                     "terms": "barber"
                     "name": "Paint Store",
                     "terms": ""
                 },
+                "shop/party": {
+                    "name": "Party Supply Store",
+                    "terms": "balloons,costumes,decorations,invitations"
+                },
                 "shop/pastry": {
                     "name": "Pastry Shop",
                     "terms": "patisserie,cake shop,cakery"
                 },
                 "shop/scuba_diving": {
                     "name": "Scuba Diving Shop",
-                    "terms": ""
+                    "terms": "diving,scuba"
                 },
                 "shop/seafood": {
                     "name": "Seafood Shop",
                     "name": "Consignment/Thrift Store",
                     "terms": "secondhand,second hand,resale,thrift,used"
                 },
+                "shop/sewing": {
+                    "name": "Sewing Supply Shop",
+                    "terms": "haberdashery"
+                },
                 "shop/shoes": {
                     "name": "Shoe Store",
                     "terms": ""
                     "name": "Artwork",
                     "terms": "mural,sculpture,statue"
                 },
+                "tourism/artwork/mural": {
+                    "name": "Mural",
+                    "terms": "fresco,wall painting"
+                },
+                "tourism/artwork/sculpture": {
+                    "name": "Sculpture",
+                    "terms": "statue,figure,carving"
+                },
+                "tourism/artwork/statue": {
+                    "name": "Statue",
+                    "terms": "sculpture,figure,carving"
+                },
                 "tourism/attraction": {
                     "name": "Tourist Attraction",
                     "terms": ""
                     "name": "Speed Table",
                     "terms": "flat top,hump,speed,slow"
                 },
+                "traffic_sign_vertex": {
+                    "name": "Traffic Sign",
+                    "terms": "road,highway"
+                },
+                "traffic_sign": {
+                    "name": "Traffic Sign",
+                    "terms": "road,highway"
+                },
+                "traffic_sign/city_limit_vertex": {
+                    "name": "City Limit Sign",
+                    "terms": "town,village,hamlet,boundary,edge,border,road,highway"
+                },
+                "traffic_sign/city_limit": {
+                    "name": "City Limit Sign",
+                    "terms": "town,village,hamlet,boundary,edge,border,road,highway"
+                },
+                "traffic_sign/maxspeed_vertex": {
+                    "name": "Speed Limit Sign",
+                    "terms": "max speed,maximum speed,road,highway"
+                },
+                "traffic_sign/maxspeed": {
+                    "name": "Speed Limit Sign",
+                    "terms": "max speed,maximum speed,road,highway"
+                },
                 "type/multipolygon": {
                     "name": "Multipolygon",
                     "terms": ""
                     "name": "Marine Fuel Station",
                     "terms": "petrol,gas,diesel,boat"
                 },
+                "waterway/milestone": {
+                    "name": "Waterway Milestone",
+                    "terms": "milestone,marker"
+                },
                 "waterway/river": {
                     "name": "River",
                     "terms": "beck,branch,brook,course,creek,estuary,rill,rivulet,run,runnel,stream,tributary,watercourse"
             "SPW_PICC": {
                 "name": "SPW(allonie) PICC numerical imagery"
             },
-            "US-TIGER-Roads-2012": {
-                "name": "TIGER Roads 2012"
-            },
             "US-TIGER-Roads-2014": {
                 "description": "At zoom level 16+, public domain map data from the US Census. At lower zooms, only changes since 2006 minus changes already incorporated into OpenStreetMap",
                 "name": "TIGER Roads 2014"
                 "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
                 "name": "TIGER Roads 2017"
             },
+            "US-TIGER-Roads-2018": {
+                "description": "Yellow = Public domain map data from the US Census. Red = Data not found in OpenStreetMap",
+                "name": "TIGER Roads 2018"
+            },
             "US_Forest_Service_roads_overlay": {
                 "description": "Highway: Green casing = unclassified. Brown casing = track. Surface: gravel = light brown fill, Asphalt = black, paved = gray, ground =white, concrete = blue, grass = green. Seasonal = white bars",
                 "name": "U.S. Forest Roads Overlay"
                 },
                 "name": "UrbIS-Ortho 2017"
             },
+            "UrbISOrtho2018": {
+                "attribution": {
+                    "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
+                },
+                "name": "UrbIS-Ortho 2018"
+            },
             "UrbisAdmFR": {
                 "attribution": {
                     "text": "Realized by means of Brussels UrbIS®© - Distribution & Copyright CIRB"
                 "description": "Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery.",
                 "name": "basemap.at Orthofoto"
             },
-            "hike_n_bike": {
+            "eufar-balaton": {
                 "attribution": {
-                    "text": "© OpenStreetMap contributors"
+                    "text": "EUFAR Balaton ortofotó 2010"
+                },
+                "description": "1940 geo-tagged photography from Balaton Limnological Institute.",
+                "name": "EUFAR Balaton orthophotos"
+            },
+            "finds.jp_KBN_2500": {
+                "attribution": {
+                    "text": "GSI KIBAN 2500"
+                },
+                "description": "GSI Kiban 2500 via finds.jp. Good for tracing, but a bit older.",
+                "name": "Japan GSI KIBAN 2500"
+            },
+            "gsi.go.jp": {
+                "attribution": {
+                    "text": "GSI Japan"
+                },
+                "description": "Japan GSI ortho Imagery. Usually better than bing, but a bit older.",
+                "name": "Japan GSI ortho Imagery"
+            },
+            "gsi.go.jp_std_map": {
+                "attribution": {
+                    "text": "GSI Japan"
+                },
+                "description": "Japan GSI Standard Map. Widely covered.",
+                "name": "Japan GSI Standard Map"
+            },
+            "helsingborg-orto": {
+                "attribution": {
+                    "text": "© Helsingborg municipality"
+                },
+                "description": "Orthophotos from the municipality of Helsingborg 2016, public domain",
+                "name": "Helsingborg Orthophoto"
+            },
+            "kalmar-orto-2014": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                },
+                "description": "Orthophotos for the north coast of the municipality of Kalmar 2014",
+                "name": "Kalmar North Orthophoto 2014"
+            },
+            "kalmar-orto-2016": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                },
+                "description": "Orthophotos for the south coast of the municipality of Kalmar 2016",
+                "name": "Kalmar South Orthophoto 2016"
+            },
+            "kalmar-orto-2018": {
+                "attribution": {
+                    "text": "© Kalmar municipality"
+                },
+                "description": "Orthophotos for urban areas of the municipality of Kalmar 2018",
+                "name": "Kalmar Urban Orthophoto 2018"
+            },
+            "kelkkareitit": {
+                "attribution": {
+                    "text": "© Kelkkareitit.fi"
+                },
+                "description": "Kelkkareitit.fi snowmobile trails from OSM (Nordic coverage)",
+                "name": "Nordic snowmobile overlay"
+            },
+            "lantmateriet-orto1960": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                },
+                "description": "Mosaic of Swedish orthophotos from the period 1955–1965. Older and younger pictures may occur.",
+                "name": "Lantmäteriet Historic Orthophoto 1960"
+            },
+            "lantmateriet-orto1975": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                },
+                "description": "Mosaic of Swedish orthophotos from the period 1970–1980. Is under construction.",
+                "name": "Lantmäteriet Historic Orthophoto 1975"
+            },
+            "lantmateriet-topowebb": {
+                "attribution": {
+                    "text": "© Lantmäteriet, CC0"
+                },
+                "description": "Topographic map of Sweden 1:50 000",
+                "name": "Lantmäteriet Topographic Map"
+            },
+            "linkoping-orto": {
+                "attribution": {
+                    "text": "© Linköping municipality"
                 },
-                "name": "Hike & Bike"
+                "description": "Orthophotos from the municipality of Linköping 2010, open data",
+                "name": "Linköping Orthophoto"
             },
             "mapbox_locator_overlay": {
                 "attribution": {
                 "attribution": {
                     "text": "© Lantmäteriet"
                 },
-                "description": "Scan of ´Economic maps´ ca 1950-1980",
-                "name": "Lantmäteriet Economic Map (historic)"
+                "description": "Scan of \"Economic maps\" ca. 1950–1980",
+                "name": "Lantmäteriet Economic Map 1950–1980"
             },
             "qa_no_address": {
                 "attribution": {
                 },
                 "name": "skobbler"
             },
+            "skoterleder": {
+                "attribution": {
+                    "text": "© Skoterleder.org"
+                },
+                "description": "Snowmobile trails",
+                "name": "Snowmobile map Sweden"
+            },
             "stamen-terrain-background": {
                 "attribution": {
                     "text": "Map tiles by Stamen Design, under CC BY 3.0. Data by OpenStreetMap, under ODbL"
                 },
                 "name": "Stamen Terrain"
             },
+            "stockholm-orto": {
+                "attribution": {
+                    "text": "© Stockholm municipality, CC0"
+                },
+                "description": "Orthophotos from the municipality of Stockholm 2015, CC0 license",
+                "name": "Stockholm Orthophoto"
+            },
             "tf-cycle": {
                 "attribution": {
                     "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
             }
         },
         "community": {
+            "bw-facebook": {
+                "name": "Mapping Botswana on Facebook",
+                "description": "Page of OpenStreetMap in Botswana"
+            },
+            "bw-twitter": {
+                "name": "Mapping Botswana on Twitter",
+                "description": "Twitter of OpenStreetMap in Botswana"
+            },
             "cape-coast-youthmappers": {
                 "name": "University of Cape Coast YouthMappers",
                 "description": "Follow us on Twitter: {url}",
                     }
                 }
             },
+            "osm-india-forum": {
+                "name": "OpenStreetMap India forum",
+                "description": "OpenStreetMap India web forum"
+            },
+            "osm-india-github": {
+                "name": "OpenStreetMap India GitHub",
+                "description": "Code with us: {url}"
+            },
             "OSM-india-mailinglist": {
                 "name": "OpenStreetMap India Mailinglist",
                 "description": "Talk-in is the official Mailinglist for Indian Community"
             },
+            "osm-india-telegram": {
+                "name": "OpenStreetMap India Telegram",
+                "description": "Join our family: {url}"
+            },
             "OSM-india-twitter": {
                 "name": "OpenStreetMap India Twitter",
                 "description": "We are just a tweet away: {url}"
             },
+            "osm-india-website": {
+                "name": "OpenStreetMap India",
+                "description": "Mappers and OpenStreetMap users in India"
+            },
+            "osm-india-wiki": {
+                "name": "OpenStreetMap Wikiproject India",
+                "description": "Everything you need to know about mapping in India: {url}"
+            },
+            "osm-india-youtube": {
+                "name": "OpenStreetMap India Youtube",
+                "description": "Subscribe to our channel: {url}"
+            },
             "OSM-India-Puducherry-Facebook": {
                 "name": "Free Software Hardware Movement - Facebook",
                 "description": "FSHM Facebook page to know about community events, activities",
                 "extendedDescription": "FSHM organizes events relating to free software/hardware, technology, activism and OpenStreetMap. Its FB page is the best way to keep in contact with its events."
             },
+            "OSM-Puducherry-Mailing-List": {
+                "name": "Free Software Hardware Movement - Mailing List",
+                "description": "FSHM Puducherry mailing list to discuss mapping in Puducherry and other things.",
+                "extendedDescription": "FSHM organizes events relating to free software/hardware, technology, activism and OpenStreetMap."
+            },
             "OSM-India-Puducherry-Matrix": {
                 "name": "Free Software Hardware Movement - Matrix",
                 "description": "FSHM Riot group to discuss, share and update mapping activities, events in and around Puducherry",
                 "name": "Talk-be Mailing List",
                 "description": "Talk-be is the official mailing list for the Belgian OSM community"
             },
-            "be-maptime": {
-                "name": "Maptime Belgium",
-                "description": "Social events organized around mapping - beginners most welcome!",
-                "extendedDescription": "Maptime is an open learning environment for all levels and degrees of knowledge, offering intentional educational support for the beginner. Maptime is simultaneously flexible and structured, creating space for mapping tutorials, workshops, ongoing projects with a shared goal, and independent/collaborative work time."
-            },
             "be-matrix": {
                 "name": "OpenStreetMap BE Matrix channel",
                 "description": "All mappers are welcome!",
                 "name": "OpenStreetMap Hungary Meetup",
                 "description": "The platform for organizing meetups in Hungary"
             },
+            "is-facebook": {
+                "name": "OSM Iceland on Facebook",
+                "description": "Page of OpenStreetMap in Iceland"
+            },
+            "is-mailinglist": {
+                "name": "Talk-is Mailing List",
+                "description": "Talk-is is the official mailing list for the Icelandic OSM community"
+            },
+            "is-twitter": {
+                "name": "OSM Iceland on Twittter",
+                "description": "Twitter of OpenStreetMap in Iceland"
+            },
             "it-facebook": {
                 "name": "OpenStreetMap Italy Facebook",
                 "description": "Join the OpenStreetMap Italy community on Facebook"
                 "name": "OpenStreetMap mailing list for Trentino",
                 "description": "OpenStreetMap Italy regional talk list for Trentino"
             },
+            "kosovo-telegram": {
+                "name": "OpenStreetMap Kosovo on Telegram",
+                "description": "Semi-official all-Kosovo Telegram public group. We welcome all mappers from anywhere in any language."
+            },
             "no-forum": {
                 "name": "OpenStreetMap Norway Web Forum",
                 "description": "OpenStreetMap Norway web forum"
                 "description": "Mappers and OpenStreetMap users, around Portland, ME",
                 "extendedDescription": "Maptime is, rather literally, time for mapmaking.  Our mission is to open the doors of cartographic possibility to anyone interested by creating a time and space for collaborative learning, exploration, and map creation using mapping tools and technologies."
             },
+            "MaptimeHRVA-twitter": {
+                "name": "MaptimeHRVA Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
             "us-ma-mailinglist": {
                 "name": "Talk-us-massachusetts Mailing List",
                 "description": "Email mailing list for the Massachusetts OSM community"
                 "name": "OpenStreetMap Brasil Twitter",
                 "description": "Follow us on Twitter at {url}"
             },
+            "RS-telegram": {
+                "name": "OpenStreetMap Rio Grande do Sul Telegram Group",
+                "description": "Join the OpenStreetMap Rio Grande do Sul community on Telegram",
+                "extendedDescription": "Join the community to learn more about OpenStreetMap, ask questions or participate in our meetings. Everyone is welcome!"
+            },
             "OSM-CL-facebook": {
                 "name": "OpenStreetMap Chile Facebook",
                 "description": "Join the OpenStreetMap Chile community on Facebook",
                 "name": "OpenStreetMap Peru",
                 "description": "News and resources for the OpenStreetMap Peru community"
             },
+            "LATAM-Facebook": {
+                "name": "OpenStreetMap Latam Facebook",
+                "description": "OpenStreetMap Latam on Facebook"
+            },
+            "LATAM-Telegram": {
+                "name": "OpenStreetMap Latam Telegram",
+                "description": "OpenStreetMap Telegram for Latin America"
+            },
+            "LATAM-Twitter": {
+                "name": "OpenStreetMap Latam Twitter",
+                "description": "Follow us on Twitter at {url}"
+            },
+            "osm-latam": {
+                "name": "OpenStreetMap Latam",
+                "description": "Supporting OpenStreetMap in Latin America",
+                "events": {
+                    "sotm-latam-2018": {
+                        "name": "State of the Map Latam 2018",
+                        "description": "State of the Map Latam is the annual conference for all mappers and users of OpenStreetMap in Latin America. The program includes talks, panels, workshops, and mapathons related to OpenStreetMap.",
+                        "where": "Buenos Aires, Argentina"
+                    }
+                }
+            },
+            "OSM-Discord": {
+                "name": "OpenStreetMap Discord",
+                "description": "Get in touch with other mappers via Discord"
+            },
             "OSM-Facebook": {
                 "name": "OpenStreetMap on Facebook",
                 "description": "Like us on Facebook for news and updates about OpenStreetMap."
                 "description": "Ask a question and get answers on OSM's community-driven question and answer site.",
                 "extendedDescription": "{url} is for everyone who needs help with OpenStreetMap.  Whether you are a beginner mapper or have a technical question, we're here to help!"
             },
+            "OSM-IRC": {
+                "name": "OpenStreetMap IRC",
+                "description": "Join #osm on irc.oftc.net (port 6667)"
+            },
             "OSM-Reddit": {
                 "name": "OpenStreetMap on Reddit",
                 "description": "/r/openstreetmap/ is a great place to learn more about OpenStreetMap.  Ask us anything!"