]> git.openstreetmap.org Git - rails.git/blobdiff - vendor/assets/iD/iD/locales/en.json
Update to iD v2.7.1
[rails.git] / vendor / assets / iD / iD / locales / en.json
index 989cbd4ba498ce8f831e2f892f7d5126fe903851..ca16b9f2984bccce9364886087ee17545c4ab9c3 100644 (file)
@@ -25,6 +25,9 @@
             },
             "draw_line": {
                 "tail": "Click to add more nodes to the line. Click on other lines to connect to them, and double-click to end the line."
+            },
+            "drag_node": {
+                "connected_to_hidden": "This can't be edited because it is connected to a hidden feature."
             }
         },
         "operations": {
                 "connected_to_hidden": "This can't be split because it is connected to a hidden feature."
             },
             "restriction": {
-                "help": {
-                    "select": "Click to select a road segment.",
-                    "toggle": "Click to toggle turn restrictions.",
-                    "toggle_on": "Click to add a \"{restriction}\" restriction.",
-                    "toggle_off": "Click to remove the \"{restriction}\" restriction."
-                },
                 "annotation": {
                     "create": "Added a turn restriction",
                     "delete": "Deleted a turn restriction"
                 }
             }
         },
+        "restriction": {
+            "controls": {
+                "distance": "Distance",
+                "distance_up_to": "Up to {distance}",
+                "via": "Via",
+                "via_node_only": "Node only",
+                "via_up_to_one": "Up to 1 way",
+                "via_up_to_two": "Up to 2 ways"
+            },
+            "help": {
+                "indirect": "(indirect)",
+                "turn": {
+                    "no_left_turn": "NO Left Turn {indirect}",
+                    "no_right_turn": "NO Right Turn {indirect}",
+                    "no_u_turn": "NO U-Turn {indirect}",
+                    "no_straight_on": "NO Straight On {indirect}",
+                    "only_left_turn": "ONLY Left Turn {indirect}",
+                    "only_right_turn": "ONLY Right Turn {indirect}",
+                    "only_u_turn": "ONLY U-Turn {indirect}",
+                    "only_straight_on": "ONLY Straight On {indirect}",
+                    "allowed_left_turn": "Left Turn Allowed {indirect}",
+                    "allowed_right_turn": "Right Turn Allowed {indirect}",
+                    "allowed_u_turn": "U-Turn Allowed {indirect}",
+                    "allowed_straight_on": "Straight On Allowed {indirect}"
+                },
+                "from": "FROM",
+                "via": "VIA",
+                "to": "TO",
+                "from_name": "{from} {fromName}",
+                "from_name_to_name": "{from} {fromName} {to} {toName}",
+                "via_names": "{via} {viaNames}",
+                "select_from": "Click to select a {from} segment",
+                "select_from_name": "Click to select {from} {fromName}",
+                "toggle": "Click for \"{turn}\""
+            }
+        },
         "undo": {
             "tooltip": "Undo: {action}",
             "nothing": "Nothing to undo."
             "localized_translation_language": "Choose language",
             "localized_translation_name": "Name"
         },
-        "zoom_in_edit": "Zoom in to Edit",
+        "zoom_in_edit": "Zoom in to edit",
         "login": "login",
         "logout": "logout",
         "loading_auth": "Connecting to OpenStreetMap...",
             "about_changeset_comments": "About changeset comments",
             "about_changeset_comments_link": "//wiki.openstreetmap.org/wiki/Good_changeset_comments",
             "google_warning": "You mentioned Google in this comment: remember that copying from Google Maps is strictly forbidden.",
-            "google_warning_link": "http://www.openstreetmap.org/copyright"
+            "google_warning_link": "https://www.openstreetmap.org/copyright"
         },
         "contributors": {
             "list": "Edits by {users}",
                 "accuracy": "Accuracy",
                 "unknown": "Unknown",
                 "show_tiles": "Show Tiles",
-                "hide_tiles": "Hide Tiles"
+                "hide_tiles": "Hide Tiles",
+                "show_vintage": "Show Vintage",
+                "hide_vintage": "Hide Vintage"
             },
             "history": {
                 "key": "H",
                 "title": "Measurement",
                 "selected": "{n} selected",
                 "geometry": "Geometry",
-                "closed": "closed",
+                "closed_line": "closed line",
+                "closed_area": "closed area",
                 "center": "Center",
                 "perimeter": "Perimeter",
                 "length": "Length",
                 "centroid": "Centroid",
                 "location": "Location",
                 "metric": "Metric",
-                "imperial": "Imperial"
+                "imperial": "Imperial",
+                "node_count": "Number of nodes"
             }
         },
         "geometry": {
             "title": "Background",
             "description": "Background settings",
             "key": "B",
-            "percent_brightness": "{opacity}% brightness",
+            "backgrounds": "Backgrounds",
             "none": "None",
             "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}/{z}, {x}, {y} for Z/X/Y tile scheme\n   - {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}",
-            "fix_misalignment": "Adjust imagery offset",
-            "imagery_source_faq": "Where does this imagery come from?",
+            "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",
-            "offset": "Drag anywhere in the gray area below to adjust the imagery offset, or enter the offset values in meters.",
+            "display_options": "Display Options",
+            "brightness": "Brightness",
+            "contrast": "Contrast",
+            "saturation": "Saturation",
+            "sharpness": "Sharpness",
             "minimap": {
-                "description": "Minimap",
+                "description": "Show Minimap",
                 "tooltip": "Show a zoomed out map to help locate the area currently displayed.",
                 "key": "/"
-            }
+            },
+            "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."
         },
         "map_data": {
             "title": "Map Data",
             "status_code": "Server returned status code {code}",
             "unknown_error_details": "Please ensure you are connected to the internet.",
             "uploading": "Uploading changes to OpenStreetMap...",
+            "conflict_progress": "Checking for conflicts: {num} of {total}",
             "unsaved_changes": "You have unsaved changes",
             "conflict": {
                 "header": "Resolve conflicting edits",
             "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}.",
             "walkthrough": "Start the Walkthrough",
-            "start": "Edit Now"
+            "start": "Edit now"
         },
         "source_switch": {
             "live": "live",
             "untagged_area_tooltip": "Select a feature type that describes what this area is.",
             "untagged_relation": "Untagged relation",
             "untagged_relation_tooltip": "Select a feature type that describes what this relation is.",
-            "many_deletions": "You're deleting {n} features. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
+            "many_deletions": "You're deleting {n} features: {p} nodes, {l} lines, {a} areas, {r} relations. Are you sure you want to do this? This will delete them from the map that everyone else sees on openstreetmap.org.",
             "tag_suggests_area": "The tag {tag} suggests line should be area, but it is not an area",
             "deprecated_tags": "Deprecated tags: {tags}"
         },
         "zoom": {
-            "in": "Zoom In",
-            "out": "Zoom Out"
+            "in": "Zoom in",
+            "out": "Zoom out"
         },
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
         "mapillary": {
             "view_on_mapillary": "View this image on Mapillary"
         },
+        "openstreetcam_images": {
+            "tooltip": "Street-level photos from OpenStreetCam",
+            "title": "Photo Overlay (OpenStreetCam)"
+        },
+        "openstreetcam": {
+            "view_on_openstreetcam": "View this image on OpenStreetCam"
+        },
         "help": {
             "title": "Help",
             "key": "H",
-            "help": "# Help\n\nThis is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the\nfree and editable map of the world. You can use it to add and update\ndata in your area, making an open-source and open-data map of the world\nbetter for everyone.\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. In order to make an edit, you'll need to\n[log in](https://www.openstreetmap.org/login).\n\nThe [iD editor](http://ideditor.com/) is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n",
-            "editing_saving": "# Editing & Saving\n\nThis editor is designed to work primarily online, and you're accessing\nit through a website right now.\n\n### Selecting Features\n\nTo select a map feature, like a road or point of interest, click on it on\nthe map. This will highlight the selected feature and load a sidebar with\ndetails about it. If you right-click on it, it will show a menu of things\nyou can do with the feature.\n\nTo select multiple features, hold down the 'Shift' key. Then either click\non the features you want to select, or drag on the map to draw a contour\naround those features. All the points inside the lasso area will be selected.\n\n### Saving Edits\n\nWhen you make changes like editing roads, buildings, and places, these are\nstored locally until you save them to the server. Don't worry if you make\na mistake - you can undo changes by clicking the undo button, and redo\nchanges by clicking the redo button.\n\nClick 'Save' to finish a group of edits - for instance, if you've completed\nan area of town and would like to start on a new area. You'll have a chance\nto review what you've done, and the editor supplies helpful suggestions\nand warnings if something doesn't seem right about the changes.\n\nIf everything looks good, you can enter a short comment explaining the change\nyou made, and click 'Upload' to post the changes to\n[OpenStreetMap.org](http://www.openstreetmap.org/), where they will be visible\nto all other users and available for others to build and improve upon.\n\nIf you can't finish your edits in one sitting, you can leave the editor\nwindow and come back (on the same browser and computer), and the\neditor application will offer to restore your work.\n\n### Using the editor\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n",
-            "roads": "# Roads\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycleways, and more - any often-crossed\nsegment should be mappable.\n\n### Selecting\n\nClick on a road to select it. An outline should become visible, along\nwith a sidebar showing more information about the road. If you right-click\non it, you'll have a menu of actions you can apply on the road.\n\n### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them\nor to a GPS track. You can adjust these roads so they are in the correct\nplace.\n\nFirst click on the road you want to change. This will highlight it and show\ncontrol points along it that you can drag to better locations. If\nyou want to add new control points for more detail, double-click a part\nof the road without a node, and one will be added.\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its control points onto the other road in\norder to join them. Having roads connect is important for the map\nand essential for providing driving directions.\n\nYou can also right-click on it and select the 'Move' tool, or simply press\nthe `M` shortcut key, to move the entire road at one time, and then click\nagain to save that movement.\n\n### Deleting\n\nIf a road is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the road could simply be newly built.\n\nYou can delete a road by clicking on it to select it, then pressing the 'Delete'\nkey or right-clicking it and then clicking the trash can icon.\n\n### Creating\n\nFound somewhere there should be a road but there isn't? Click the 'Line'\nicon in the top-left of the editor or press the shortcut key `2` to start drawing\na line.\n\nClick on the start of the road on the map to start drawing. If the road\nbranches off from an existing road, start by clicking on the place where they connect.\n\nThen click on points along the road so that it follows the right path, according\nto satellite imagery or GPS. If the road you are drawing crosses another road, connect\nit by clicking on the intersection point. When you're done drawing, double-click\nor press 'Return' or 'Enter' on your keyboard.\n",
-            "gps": "# GPS\n\nCollected GPS traces are one valuable source of data for OpenStreetMap. This editor\nsupports local traces - `.gpx` files on your local computer. You can collect\nthis kind of GPS trace with a number of smartphone applications as well as\npersonal GPS hardware.\n\nFor information on how to perform a GPS survey, read\n[Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).\n\nTo use a GPX track for mapping, drag and drop the GPX file onto the map\neditor. If it's recognized, it will be added to the map as a bright purple\nline. Click on the 'Map Data' menu on the right side to enable,\ndisable, or zoom to this new GPX-powered layer.\n\nThe GPX track isn't directly uploaded to OpenStreetMap - the best way to\nuse it is to draw on the map, using it as a guide for the new features that\nyou add, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create)\nfor other users to use.\n",
-            "imagery": "# Imagery\n\nAerial imagery is an important resource for mapping. A combination of\nairplane flyovers, satellite views, and freely-compiled sources are available\nin the editor under the 'Background Settings' menu on the right.\n\nBy default a [Bing Maps](http://www.bing.com/maps/) satellite layer is\npresented in the editor, but as you pan and zoom the map to new geographical\nareas, new sources will become available. Some countries, like the United\nStates, France, and Denmark have very high-quality imagery available for some areas.\n\nImagery is sometimes offset from the map data because of a mistake on the\nimagery provider's side. If you see a lot of roads shifted from the background,\ndon't immediately move them all to match the background. Instead you can adjust\nthe imagery so that it matches the existing data by clicking 'Fix alignment' at\nthe bottom of the Background Settings UI.\n",
-            "addresses": "# Addresses\n\nAddresses are some of the most useful information for the map.\n\nAlthough addresses are often represented as parts of streets, in OpenStreetMap\nthey're recorded as attributes of buildings and places along streets.\n\nYou can add address information to places mapped as building outlines\nas well as those mapped as single points. The optimal source of address\ndata is from an on-the-ground survey or personal knowledge - as with any\nother feature, copying from commercial sources like Google Maps is strictly\nforbidden.\n",
-            "inspector": "# Using the Inspector\n\nThe inspector is the section on the left side of the page that allows you to\nedit the details of the selected feature.\n\n### Selecting a Feature Type\n\nAfter you add a point, line, or area, you can choose what type of feature it\nis, like whether it's a highway or residential road, supermarket or cafe.\nThe inspector will display buttons for common feature types, and you can\nfind others by typing what you're looking for in the search box.\n\nClick the 'i' in the bottom-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n\n### Using Forms and Editing Tags\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the inspector will display fields with details about\nthe feature like its name and address.\n\nBelow the fields you see, you can click the 'Add field' dropdown to add\nother details, like a Wikipedia link, wheelchair access, and more.\n\nAt the bottom of the inspector, click 'Additional tags' to add arbitrary\nother tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a\ngreat resource for learn more about popular tag combinations.\n\nChanges you make in the inspector are automatically applied to the map.\nYou can undo them at any time by clicking the 'Undo' button.\n",
-            "buildings": "# Buildings\n\nOpenStreetMap is the world's largest database of buildings. You can create\nand improve this database.\n\n### Selecting\n\nYou can select a building by clicking on its border. This will highlight the\nbuilding and load a sidebar showing more information about the building.\nIf you right-click on it, it will show a menu of actions you can execute\nin the building.\n\n### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\n\nTo move an entire building, select it and press the 'M' shortcut key,\nor right-click it and select the 'Move' tool. Move your\nmouse to shift the building, and click when it's correctly placed.\n\nTo fix the specific shape of a building, click and drag the nodes that form\nits border into better places.\n\n### Creating\n\nOne of the main questions around adding buildings to the map is that\nOpenStreetMap records buildings both as shapes and points. The rule of thumb\nis to _map a building as a shape whenever possible_, and map companies, homes,\namenities, and other things that operate out of buildings as points placed\nwithin the building shape.\n\nStart drawing a building as a shape by clicking the 'Area' button in the top\nleft of the interface, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn to close the shape.\n\n### Deleting\n\nIf a building is entirely incorrect - you can see that it doesn't exist in satellite\nimagery and ideally have confirmed locally that it's not present - you can delete\nit, which removes it from the map. Be cautious when deleting features -\nlike any other edit, the results are seen by everyone and satellite imagery\nis often out of date, so the building could simply be newly built.\n\nYou can delete a building by clicking on it to select it, then pressing the 'Delete'\nkey, or right-clicking it and then clicking the trash can icon.\n",
-            "relations": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. For example, two common types of relations are *route relations*,\nwhich group together sections of road that belong to a specific freeway or\nhighway, and *multipolygons*, which group together several lines that define\na complex area (one with several pieces or holes in it like a donut).\n\nThe group of features in a relation are called *members*. In the bottom of the\nsidebar, you can see which relations a feature is a member of, and click on a\nrelation there will select it. When the relation is selected, you can see all of\nits members listed in the sidebar and highlighted on the map.\n\nFor the most part, iD will take care of maintaining relations automatically\nwhile you edit. The main thing you should be aware of is that if you delete a\nsection of road to redraw it more accurately, you should make sure that the\nnew section is a member of the same relations as the original.\n\n## Editing Relations\n\nIf you want to edit relations, here are the basics.\n\nTo add a feature to a relation, select the feature, click the \"+\" button in the\n\"All relations\" section of the sidebar, and select or type the name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the \"+\" button in the \"All relations\" section, and select \"New relation...\".\n\nTo remove a feature from a relation, select the feature and click the trash\nbutton next to the relation you want to remove it from.\n\nYou can create multipolygons with holes using the \"Merge\" tool. Draw two areas (inner\nand outer), hold the Shift key and click on each of them to select them both, and then\npress the 'C' shortcut key. Other option is to select both, and then right-click one\nof the and click the \"Merge\" (+) button.\n"
+            "help": {
+                "title": "Help",
+                "welcome": "Welcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/). With this editor you can update OpenStreetMap right from your web browser.",
+                "open_data_h": "Open Data",
+                "open_data": "Edits that you make on this map will be visible to everyone who uses OpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying, or imagery collected from aerial or street level photos. Copying from commercial sources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright).",
+                "before_start_h": "Before you start",
+                "before_start": "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a walkthrough to teach you the basics of editing OpenStreetMap. Click \"Start the Walkthrough\" on this screen to take the tutorial - it takes only about 15 minutes.",
+                "open_source_h": "Open Source",
+                "open_source": "The iD editor is a collaborative open source project, and you are using version {version} now. The source code is available [on GitHub](https://github.com/openstreetmap/iD).",
+                "open_source_help": "You can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) or [reporting bugs](https://github.com/openstreetmap/iD/issues)."
+            },
+            "overview": {
+                "title": "Overview",
+                "navigation_h": "Navigation",
+                "navigation_drag": "You can drag the map by pressing and holding down the {leftclick} left mouse button and moving the mouse around. You can also use the `↓`, `↑`, `←`, `→` arrow keys on your keyboard.",
+                "navigation_zoom": "You can zoom in or out by scrolling with the mouse wheel or trackpad, or by clicking the {plus} / {minus} buttons along the side of the map. You can also use the `+`, `-` keys on your keyboard.",
+                "features_h": "Map Features",
+                "features": "We use the word *features* to describe things that appear on the map, such as roads, buildings, or points of interest. Anything in the real world can be mapped as a feature on OpenStreetMap. Map features are represented on the map using *points*, *lines*, or *areas*.",
+                "nodes_ways": "In OpenStreetmap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*."
+            },
+            "editing": {
+                "title": "Editing & Saving",
+                "select_h": "Select",
+                "select_left_click": "{leftclick} Left-click on a feature to select it. This will highlight it with a pulsing glow, and the sidebar will display details about that feature, such as its name or address.",
+                "select_right_click": "{rightclick} Right-click on a feature to display the editing menu, which shows the commands that are available, such as rotating, moving, and deleting.",
+                "multiselect_h": "Multiselect",
+                "multiselect_shift_click": "`{shift}`+{leftclick} left-click to select several features together.  This makes it easier to move or delete multiple items.",
+                "multiselect_lasso": "Another way to select multiple features is to hold down the `{shift}` key, then press and hold down the {leftclick} left mouse button and drag the mouse to draw a selection lasso. All of the points inside the lasso area will be selected.",
+                "undo_redo_h": "Undo & Redo",
+                "undo_redo": "Your edits are stored locally in your browser until you choose to save them to the OpenStreetMap server. You can undo edits by clicking the {undo} **Undo** button, and redo them by clicking the {redo} **Redo** button.",
+                "save_h": "Save",
+                "save": "Click {save} **Save** to finish your edits and send them to OpenStreetMap. You should remember to save your work frequently!",
+                "save_validation": "On the save screen, you'll have a chance to review what you've done. iD will also perform some basic checks for missing data and may offer helpful suggestions and warnings if something doesn't seem right.",
+                "upload_h": "Upload",
+                "upload": "Before uploading your changes you must enter a [changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments). Then click **Upload** to send your changes to OpenStreetMap, where they will be merged into the map and publicly visible to everyone.",
+                "backups_h": "Automatic Backups",
+                "backups": "If you can't finish your edits in one sitting, for example if your computer crashes or you close the browser tab, your edits are still saved in your browser's storage. You can come back later (on the same browser and computer), and iD will offer to restore your work.",
+                "keyboard_h": "Keyboard Shortcuts",
+                "keyboard": "You can view a list of keyboard shortcuts by pressing the `?` key."
+            },
+            "feature_editor": {
+                "title": "Feature Editor",
+                "intro": "The *feature editor* appears alongside the map, and allows you to see and edit all of the information for the selected feature.",
+                "definitions": "The top section displays the feature's type. The middle section contains *fields* showing the feature's attributes, such as its name or address.",
+                "type_h": "Feature Type",
+                "type": "You can click on the feature type to change the feature to a different type. Everything that exists in the real world can be added to OpenStreetMap, so there are thousands of feature types to choose from.",
+                "type_picker": "The type picker displays the most common feature types, such as parks, hospitals, restaurants, roads, and buildings. You can search for anything by typing what you're looking for in the search box. You can also click the {inspect} **Info** icon next to the feature type to learn more about it.",
+                "fields_h": "Fields",
+                "fields_all_fields": "The \"All fields\" section contains all of the feature's details that you may edit. In OpenStreetMap, all of the fields are optional, and it's OK to leave a field blank if you are unsure.",
+                "fields_example": "Each feature type will display different fields. For example, a road may display fields for its surface and speed limit, but a restaurant may display fields for the type of food it serves and the hours it is open.",
+                "fields_add_field": "You can also click the \"Add field\" dropdown to add more fields, such as a description, Wikipedia link, wheelchair access, and more.",
+                "tags_h": "Tags",
+                "tags_all_tags": "Below the fields section, you can expand the \"All tags\" section to edit any of the OpenStreetMap *tags* for the selected feature. Each tag consists of a *key* and *value*, data elements that define all of the features stored in OpenStreetMap.",
+                "tags_resources": "Editing a feature's tags requires intermediate knowledge about OpenStreetMap. You should consult resources like the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page) or [Taginfo](https://taginfo.openstreetmap.org/) to learn more about accepted OpenStreetMap tagging practices."
+            },
+            "points": {
+                "title": "Points",
+                "intro": "*Points* can be used to represent features such as shops, restaurants, and monuments. They mark a specific location, and describe what's there.",
+                "add_point_h": "Adding Points",
+                "add_point": "To add a point, click the {point} **Point** button on the toolbar above the map, or press the shortcut key `1`. This will change the mouse cursor to a cross symbol.",
+                "add_point_finish": "To place the new point on the map, position the mouse cursor where the point should go, then {leftclick} left-click or press `Space`.",
+                "move_point_h": "Moving Points",
+                "move_point": "To move a point, place the mouse cursor over the point, then press and hold the {leftclick} left mouse button while dragging the point to its new location.",
+                "delete_point_h": "Deleting Points",
+                "delete_point": "It's OK to delete features that don't exist in the real world. Deleting a feature from OpenStreetMap removes it from the map that everyone uses, so you should make sure a feature is really gone before you delete it.",
+                "delete_point_command": "To delete a point, {rightclick} right-click on the point to select it and show the edit menu, then use the {delete} **Delete** command."
+            },
+            "lines": {
+                "title": "Lines",
+                "intro": "*Lines* are used to represent features such as roads, railroads, and rivers. Lines should be drawn down the center of the feature that they represent.",
+                "add_line_h": "Adding Lines",
+                "add_line": "To add a line, click the {line} **Line** button on the toolbar above the map, or press the shortcut key `2`. This will change the mouse cursor to a cross symbol.",
+                "add_line_draw": "Next, position the mouse cursor where the line should begin and {leftclick} left-click or press `Space` to begin placing nodes along the line. Continue placing more nodes by clicking or pressing `Space`. While drawing, you can zoom in or drag the map in order to add more detail.",
+                "add_line_finish": "To finish a line, press `{return}` or click again on the last node.",
+                "modify_line_h": "Modifying Lines",
+                "modify_line_dragnode": "Often you'll see lines that aren't shaped correctly, for example a road that does not match up with the background imagery. To adjust the shape of a line, first {leftclick} left-click to select it. All nodes of the line will be drawn as small circles. You can then drag the nodes to better locations.",
+                "modify_line_addnode": "You can also create new nodes along a line either by {leftclick}**x2** double-clicking on the line or by dragging the small triangles at the midpoints between nodes.",
+                "connect_line_h": "Connecting Lines",
+                "connect_line": "Having roads connected properly is important for the map and essential for providing driving directions.",
+                "connect_line_display": "The connections between roads are drawn with gray circles. The endpoints of a line are drawn with larger white circles if they don't connect to anything.",
+                "connect_line_drag": "To connect a line to another feature, drag one of the line's nodes onto the other feature until both features snap together. Tip: You can hold down the `{alt}` key to prevent nodes from connecting to other features.",
+                "connect_line_tag": "If you know that the connection has traffic lights or crosswalks, you can add them by selecting the connecting node and using the feature editor to select the correct feature's type.",
+                "disconnect_line_h": "Disconnecting Lines",
+                "disconnect_line_command": "To disconnect a road from another feature, {rightclick} right-click the connecting node and select the {disconnect} **Disconnect** command from the editing menu.",
+                "move_line_h": "Moving Lines",
+                "move_line_command": "To move an entire line, {rightclick} right-click the line and select the {move} **Move** command from the editing menu. Then move the mouse, and {leftclick} left-click to place the line in a new location.",
+                "move_line_connected": "Lines that are connected to other features will stay connected as you move the line to a new location. iD may prevent you from moving a line across another connected line.",
+                "delete_line_h": "Deleting Lines",
+                "delete_line": "If a line is entirely incorrect, for example a road that doesn't exist in the real world, it's OK to delete it. Be careful when deleting features: the background imagery you are using might be outdated, and a road that looks wrong could simply be newly built.",
+                "delete_line_command": "To delete a line, {rightclick} right-click on the line to select it and show the edit menu, then use the {delete} **Delete** command."
+            },
+            "areas": {
+                "title": "Areas",
+                "intro": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas. Areas should be traced around the edge of the feature that they represent, for example, around the base of a building.",
+                "point_or_area_h": "Points or Areas?",
+                "point_or_area": "Many features can be represented as points or areas. You should map buildings and property outlines as areas whenever possible. Place points inside a building area to represent businesses, amenities, and other features located inside the building.",
+                "add_area_h": "Adding Areas",
+                "add_area_command": "To add an area, click the {area} **Area** button on the toolbar above the map, or press the shortcut key `3`. This will change the mouse cursor to a cross symbol.",
+                "add_area_draw": "Next, position the mouse cursor at one of the corners of the feature and {leftclick} left-click or press `Space` to begin placing nodes around the outer edge of the area. Continue placing more nodes by clicking or pressing `Space`. While drawing, you can zoom in or drag the map in order to add more detail.",
+                "add_area_finish": "To finish an area, press `{return}` or click again on either the first or last node.",
+                "square_area_h": "Square Corners",
+                "square_area_command": "Many area features like buildings have square corners. To square the corners of an area, {rightclick} right-click the edge of the area and select the {orthogonalize} **Square** command from the editing menu.",
+                "modify_area_h": "Modifying Areas",
+                "modify_area_dragnode": "Often you'll see areas that aren't shaped correctly, for example a building that does not match up with the background imagery. To adjust the shape of an area, first {leftclick} left-click to select it. All nodes of the area will be drawn as small circles. You can then drag the nodes to better locations.",
+                "modify_area_addnode": "You can also create new nodes along an area either by {leftclick}**x2** double-clicking on the edge of the area or by dragging the small triangles at the midpoints between nodes.",
+                "delete_area_h": "Deleting Areas",
+                "delete_area": "If an area is entirely incorrect, for example a building that doesn't exist in the real world, it's OK to delete it. Be cautious when deleting features - the background imagery you are using might be outdated, and a building that looks wrong could simply be newly built.",
+                "delete_area_command": "To delete an area, {rightclick} right-click on the area to select it and show the edit menu, then use the {delete} **Delete** command."
+            },
+            "relations": {
+                "title": "Relations",
+                "intro": "A *relation* is a special type of feature in OpenStreetMap that groups together other features. The features that belong to a relation are called *members*, and each member can have a *role* in the relation.",
+                "edit_relation_h": "Editing Relations",
+                "edit_relation": "At the bottom of the feature editor, you can expand the \"All relations\" section to see if the selected feature is a member of any relations. You can then click on the relation to select and edit it.",
+                "edit_relation_add": "To add a feature to a relation, select the feature, then click the {plus} add button in the \"All relations\" section of the feature editor. You can choose from a list of nearby relations, or choose the \"New relation...\" option.",
+                "edit_relation_delete": "You can also click the {delete} **Delete** button to remove the selected feature from the relation. If you remove all of the members from a relation, the relation will be deleted automatically.",
+                "maintain_relation_h": "Maintaining Relations",
+                "maintain_relation": "For the most part, iD will maintain relations automatically as you edit. You should take care when replacing features that might be members of relations. For example if you delete a section of road and draw a new section of road to replace it, you should add the new section to the same relations (routes, turn restrictions, etc.) as the original.",
+                "relation_types_h": "Relation Types",
+                "multipolygon_h": "Multipolygons",
+                "multipolygon": "A *multipolygon* relation is a group of one or more *outer* features and one or more inner features. The outer features define the outer edges of the multipolygon, and the inner features define sub-areas or holes cut out from the inside of the multipolygon.",
+                "multipolygon_create": "To create a multipolygon, for example a building with a hole in it, draw the outer edge as an area and the inner edge as a line or different kind of area. Then `{shift}`+{leftclick} left-click to select both features, {rightclick} right-click to show the edit menu, and select the {merge} **Merge** command.",
+                "multipolygon_merge": "Merging several lines or areas will create a new multipolygon relation with all selected areas as members. iD will choose the inner and outer roles automatically, based on which features are contained inside other features.",
+                "turn_restriction_h": "Turn restrictions",
+                "turn_restriction": "A *turn restriction* relation is a group of several road segments in an intersection. Turn restrictions consist of a *from* road, *via* node or roads, and a *to* road.",
+                "turn_restriction_field": "To edit turn restrictions, select a junction node where two or more roads meet. The feature editor will display a special \"Turn Restrictions\" field containing a model of the intersection.",
+                "turn_restriction_editing": "In the \"Turn Restrictions\" field, click to select a \"from\" road, and see whether turns are allowed or restricted to any of the \"to\" roads. You can click on the turn icons to toggle them between allowed and restricted. iD will create relations automatically and set the from, via, and to roles based on your choices.",
+                "route_h": "Routes",
+                "route": "A *route* relation is a group of one or more line features that together form a route network, like a bus route, train route, or highway route.",
+                "route_add": "To add a feature to a route relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation.",
+                "boundary_h": "Boundaries",
+                "boundary": "A *boundary* relation is a group of one or more line features that together form an administrative boundary.",
+                "boundary_add": "To add a feature to a boundary relation, select the feature and scroll down to the \"All relations\" section of the feature editor, then click the {plus} add button to add this feature to a nearby existing relation or a new relation."
+            },
+            "imagery": {
+                "title": "Background Imagery",
+                "intro": "The background imagery that appears beneath the map data is an important resource for mapping. This imagery can be aerial photos collected from satellites, airplanes, and drones, or it can be scanned historical maps or other freely available source data.",
+                "sources_h": "Imagery Sources",
+                "choosing": "To see which imagery sources are available for editing, click the {layers} **Background settings** button on the side of the map.",
+                "sources": "By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is chosen as the background image. Depending on where you are editing, other imagery sources will be available. Some may be newer or have higher resolution, so it is always useful to check and see which layer is the best one to use as a mapping reference.",
+                "offsets_h": "Adjusting Imagery Offset",
+                "offset": "Imagery is sometimes offset slightly from accurate map data. If you see a lot of roads or buildings shifted from the background imagery, it may be the imagery that's incorrect, so don't move them all to match the background. Instead, you can adjust the background so that it matches the existing data by expanding the \"Adjust Imagery Offset\" section at the bottom of the Background Settings pane.",
+                "offset_change": "Click on the small triangles to adjust the imagery offset in small steps, or hold the left mouse button and drag within the gray square to slide the imagery into alignment."
+            },
+            "streetlevel": {
+                "title": "Street Level Photos",
+                "intro": "Street level photos are useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).",
+                "using_h": "Using Street Level Photos",
+                "using": "To use street level photos for mapping, click the {data} **Map data** panel on the side of the map to enable or disable the available photo layers.",
+                "photos": "When enabled, the photo layer displays a line along the sequence of photos. At higher zoom levels, a circle marks at each photo location, and at even higher zoom levels, a cone indicates the direction the camera was facing when the photo was taken.",
+                "viewer": "When you click on one of the photo locations, a photo viewer appears in the bottom corner of the map. The photo viewer contains controls to step forward and backward in the image sequence. It also shows the username of the person who captured the image, the date it was captured, and a link to view the image on the original site."
+            },
+            "gps": {
+                "title": "GPS Traces",
+                "intro": "Collected GPS traces are a valuable source of data for OpenStreetMap. This editor supports *.gpx*, *.geojson*, and *.kml* files on your local computer. You can collect GPS traces with a smartphone, sports watch, or other GPS device.",
+                "survey": "For information on how to perform a GPS survey, read [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/).",
+                "using_h": "Using GPS Traces",
+                "using": "To use a GPS trace for mapping, drag and drop the data file onto the map editor. If it's recognized, it will be drawn on the map as a bright purple line. Click the {data} **Map data** panel on the side of the map to enable, disable, or zoom to your GPS data.",
+                "tracing": "The GPS track isn't sent to OpenStreetMap - the best way to use it is to draw on the map, using it as a guide for the new features that you add.",
+                "upload": "You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use."
+            },
+            "field": {
+                "restrictions": {
+                    "title": "Turn Restrictions Help",
+                    "about": {
+                        "title": "About",
+                        "about": "This field allows you to inspect and modify turn restrictions. It displays a model of the selected intersection including other nearby connected roads.",
+                        "from_via_to": "A turn restriction always contains: one **FROM way**, one **TO way**, and either one **VIA node** or one or more **VIA ways**.",
+                        "maxdist": "The \"{distField}\" slider controls how far to search for additional connected roads.",
+                        "maxvia": "The \"{viaField}\" slider adjusts how many via ways may be included in the search. (Tip: simple is better)"
+                    },
+                    "inspecting": {
+                        "title": "Inspecting",
+                        "about": "Hover over any **FROM** segment to see whether it has any turn restrictions. Each possible **TO** destination will be drawn with a colored shadow showing whether a restriction exists.",
+                        "from_shadow": "{fromShadow} **FROM segment**",
+                        "allow_shadow": "{allowShadow} **TO Allowed**",
+                        "restrict_shadow": "{restrictShadow} **TO Restricted**",
+                        "only_shadow": "{onlyShadow} **TO Only**",
+                        "restricted": "\"Restricted\" means that there is a turn restriction, for example \"No Left Turn\".",
+                        "only": "\"Only\" means that a vehicle taking that path may only make that choice, for example \"Only Straight On\"."
+                    },
+                    "modifying": {
+                        "title": "Modifying",
+                        "about": "To modify turn restrictions, first click on any starting **FROM** segment to select it. The selected segment will pulse, and all possible **TO** destinations will appear as turn symbols.",
+                        "indicators": "Then, click on a turn symbol to toggle it between \"Allowed\", \"Restricted\", and \"Only\".",
+                        "allow_turn": "{allowTurn} **TO Allowed**",
+                        "restrict_turn": "{restrictTurn} **TO Restricted**",
+                        "only_turn": "{onlyTurn} **TO Only**"
+                    },
+                    "tips": {
+                        "title": "Tips",
+                        "simple": "**Prefer simple restrictions over complex ones.**",
+                        "simple_example": "For example, avoid creating a via-way restriction if a simpler via-node turn restriction will do.",
+                        "indirect": "**Some restrictions display the text \"(indirect)\" and are drawn lighter.**",
+                        "indirect_example": "These restrictions exist because of another nearby restriction. For example, an \"Only Straight On\" restriction will indirectly create \"No Turn\" restrictions for all other paths through the intersection.",
+                        "indirect_noedit": "You may not edit indirect restrictions. Instead, edit the nearby direct restriction."
+                    }
+                }
+            }
         },
         "intro": {
             "done": "done",
             },
             "areas": {
                 "title": "Areas",
-                "add_playground": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}They can be also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**",
+                "add_playground": "*Areas* are used to show the boundaries of features like lakes, buildings, and residential areas.{br}They can also be used for more detailed mapping of many features you might normally map as points. **Click the {button} Area button to add a new area.**",
                 "start_playground": "Let's add this playground to the map by drawing an area. Areas are drawn by placing *nodes* along the outer edge of the feature. **Click or press spacebar to place a starting node on one of the corners of the playground.**",
                 "continue_playground": "Continue drawing the area by placing more nodes along the playground's edge. It is OK to connect the area to the existing walking paths.{br}Tip: You can hold down the '{alt}' key to prevent nodes from connecting to other features. **Continue drawing an area for the playground.**",
                 "finish_playground": "Finish the area by pressing enter, or clicking again on either the first or last node. **Finish drawing an area for the playground.**",
                     "title": "Selecting features",
                     "select_one": "Select a single feature",
                     "select_multi": "Select multiple features",
-                    "lasso": "Draw a selection lasso around features"
+                    "lasso": "Draw a selection lasso around features",
+                    "search": "Find features matching search text"
                 },
                 "with_selected": {
                     "title": "With feature selected",
                 }
             }
         },
+        "units": {
+            "feet": "{quantity} ft",
+            "miles": "{quantity} mi",
+            "square_feet": "{quantity} sq ft",
+            "square_miles": "{quantity} sq mi",
+            "acres": "{quantity} ac",
+            "meters": "{quantity} m",
+            "kilometers": "{quantity} km",
+            "square_meters": "{quantity} m²",
+            "square_kilometers": "{quantity} km²",
+            "hectares": "{quantity} ha",
+            "area_pair": "{area1} ({area2})",
+            "arcdegrees": "{quantity}°",
+            "arcminutes": "{quantity}′",
+            "arcseconds": "{quantity}″",
+            "north": "N",
+            "south": "S",
+            "east": "E",
+            "west": "W",
+            "coordinate": "{coordinate}{direction}",
+            "coordinate_pair": "{latitude}, {longitude}"
+        },
         "presets": {
             "categories": {
                 "category-barrier": {
                 "aeroway": {
                     "label": "Type"
                 },
+                "agrarian": {
+                    "label": "Products"
+                },
                 "amenity": {
                     "label": "Type"
                 },
                 "board_type": {
                     "label": "Type"
                 },
+                "boules": {
+                    "label": "Type"
+                },
                 "boundary": {
                     "label": "Type"
                 },
                 "brand": {
                     "label": "Brand"
                 },
+                "brewery": {
+                    "label": "Draft Beers"
+                },
                 "bridge": {
                     "label": "Type",
                     "placeholder": "Default"
                 "bunker_type": {
                     "label": "Type"
                 },
+                "cables": {
+                    "label": "Cables",
+                    "placeholder": "1, 2, 3..."
+                },
                 "camera/direction": {
                     "label": "Direction (Degrees Clockwise)",
                     "placeholder": "45, 90, 180, 270"
                     "label": "Capacity",
                     "placeholder": "50, 100, 200..."
                 },
-                "cardinal_direction": {
-                    "label": "Direction",
-                    "options": {
-                        "N": "North",
-                        "E": "East",
-                        "S": "South",
-                        "W": "West",
-                        "NE": "Northeast",
-                        "SE": "Southeast",
-                        "SW": "Southwest",
-                        "NW": "Northwest",
-                        "NNE": "North-northeast",
-                        "ENE": "East-northeast",
-                        "ESE": "East-southeast",
-                        "SSE": "South-southeast",
-                        "SSW": "South-southwest",
-                        "WSW": "West-southwest",
-                        "WNW": "West-northwest",
-                        "NNW": "North-northwest"
-                    }
-                },
                 "castle_type": {
                     "label": "Type"
                 },
-                "clock_direction": {
-                    "label": "Direction",
-                    "options": {
-                        "clockwise": "Clockwise",
-                        "anticlockwise": "Counterclockwise"
-                    }
-                },
                 "clothes": {
                     "label": "Clothes"
                 },
                         }
                     }
                 },
+                "dance/style": {
+                    "label": "Dance Styles"
+                },
                 "date": {
                     "label": "Date"
                 },
                 "description": {
                     "label": "Description"
                 },
+                "devices": {
+                    "label": "Devices",
+                    "placeholder": "1, 2, 3..."
+                },
                 "diaper": {
                     "label": "Diaper Changing Available"
                 },
+                "direction_cardinal": {
+                    "label": "Direction",
+                    "options": {
+                        "N": "North",
+                        "E": "East",
+                        "S": "South",
+                        "W": "West",
+                        "NE": "Northeast",
+                        "SE": "Southeast",
+                        "SW": "Southwest",
+                        "NW": "Northwest",
+                        "NNE": "North-northeast",
+                        "ENE": "East-northeast",
+                        "ESE": "East-southeast",
+                        "SSE": "South-southeast",
+                        "SSW": "South-southwest",
+                        "WSW": "West-southwest",
+                        "WNW": "West-northwest",
+                        "NNW": "North-northwest"
+                    }
+                },
+                "direction_clock": {
+                    "label": "Direction",
+                    "options": {
+                        "clockwise": "Clockwise",
+                        "anticlockwise": "Counterclockwise"
+                    }
+                },
+                "direction_vertex": {
+                    "label": "Direction",
+                    "options": {
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "both": "Both / All"
+                    }
+                },
+                "direction": {
+                    "label": "Direction (Degrees Clockwise)",
+                    "placeholder": "45, 90, 180, 270"
+                },
+                "dispensing": {
+                    "label": "Dispenses Prescriptions"
+                },
                 "display": {
                     "label": "Display"
                 },
                         "pond": "Pond"
                     }
                 },
+                "fitness_station": {
+                    "label": "Equipment Type"
+                },
                 "fixme": {
                     "label": "Fix Me"
                 },
                     "label": "Type",
                     "placeholder": "Default"
                 },
+                "frequency": {
+                    "label": "Operating Frequency"
+                },
                 "fuel_multi": {
                     "label": "Fuel Types"
                 },
                 "generator/type": {
                     "label": "Type"
                 },
+                "government": {
+                    "label": "Type"
+                },
                 "grape_variety": {
                     "label": "Grape Varieties"
                 },
                 "memorial": {
                     "label": "Type"
                 },
-                "milestone_position": {
-                    "label": "Milestone Position",
-                    "placeholder": "Distance to one decimal (123.4)"
+                "monitoring_multi": {
+                    "label": "Monitoring"
                 },
                 "mtb/scale": {
                     "label": "Mountain Biking Difficulty",
                     "options": {
                         "undefined": "Assumed to be Yes",
                         "yes": "Yes",
-                        "no": "No"
+                        "no": "No",
+                        "reversible": "Reversible",
+                        "alternating": "Alternating"
                     }
                 },
                 "oneway": {
                     "options": {
                         "undefined": "Assumed to be No",
                         "yes": "Yes",
-                        "no": "No"
+                        "no": "No",
+                        "reversible": "Reversible",
+                        "alternating": "Alternating"
                     }
                 },
                 "opening_hours": {
                     "label": "Par",
                     "placeholder": "3, 4, 5..."
                 },
-                "parallel_direction": {
-                    "label": "Direction",
-                    "options": {
-                        "forward": "Forward",
-                        "backward": "Backward"
-                    }
-                },
                 "park_ride": {
                     "label": "Park and Ride"
                 },
                 "payment_multi": {
                     "label": "Payment Types"
                 },
+                "phases": {
+                    "label": "Phases",
+                    "placeholder": "1, 2, 3..."
+                },
                 "phone": {
                     "label": "Phone",
                     "placeholder": "+31 42 123 4567"
                 "railway": {
                     "label": "Type"
                 },
-                "recycling_accepts": {
-                    "label": "Accepts"
+                "railway/position": {
+                    "label": "Milestone Position",
+                    "placeholder": "Distance to one decimal (123.4)"
                 },
-                "recycling_type": {
-                    "label": "Recycling Type",
+                "railway/signal/direction": {
+                    "label": "Direction",
                     "options": {
-                        "container": "Container",
-                        "centre": "Recycling Center"
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "both": "Both / All"
                     }
                 },
+                "rating": {
+                    "label": "Power Rating"
+                },
+                "recycling_accepts": {
+                    "label": "Accepts"
+                },
                 "ref_aeroway_gate": {
                     "label": "Gate Number"
                 },
                 "ref": {
                     "label": "Reference Code"
                 },
+                "ref/isil": {
+                    "label": "ISIL Code"
+                },
                 "relation": {
                     "label": "Type"
                 },
                 "studio": {
                     "label": "Type"
                 },
+                "substance": {
+                    "label": "Substance"
+                },
                 "substation": {
                     "label": "Type"
                 },
                 "surveillance/zone": {
                     "label": "Surveillance Zone"
                 },
+                "switch": {
+                    "label": "Type",
+                    "options": {
+                        "mechanical": "Mechanical",
+                        "circuit_breaker": "Circuit Breaker",
+                        "disconnector": "Disconnector",
+                        "earthing": "Earthing"
+                    }
+                },
                 "tactile_paving": {
                     "label": "Tactile Paving"
                 },
                 "traffic_signals": {
                     "label": "Type"
                 },
+                "traffic_signals/direction": {
+                    "label": "Direction",
+                    "options": {
+                        "forward": "Forward",
+                        "backward": "Backward",
+                        "both": "Both / All"
+                    }
+                },
                 "trail_visibility": {
                     "label": "Trail Visibility",
                     "placeholder": "Excellent, Good, Bad...",
                         "no": "No: pathless, excellent orientation skills required"
                     }
                 },
+                "transformer": {
+                    "label": "Type",
+                    "options": {
+                        "distribution": "Distribution",
+                        "generator": "Generator",
+                        "converter": "Converter",
+                        "traction": "Traction",
+                        "auto": "Autotransformer",
+                        "phase_angle_regulator": "Phase Angle Regulator",
+                        "auxiliary": "Auxiliary",
+                        "yes": "Unknown"
+                    }
+                },
                 "trees": {
                     "label": "Trees"
                 },
                         "scoria": "Scoria"
                     }
                 },
+                "voltage": {
+                    "label": "Voltage"
+                },
+                "voltage/primary": {
+                    "label": "Primary Voltage"
+                },
+                "voltage/secondary": {
+                    "label": "Secondary Voltage"
+                },
+                "voltage/tertiary": {
+                    "label": "Tertiary Voltage"
+                },
                 "wall": {
                     "label": "Type"
                 },
                 "wheelchair": {
                     "label": "Wheelchair Access"
                 },
+                "wholesale": {
+                    "label": "Wholesale"
+                },
                 "width": {
                     "label": "Width (Meters)"
                 },
                 "wikipedia": {
                     "label": "Wikipedia"
+                },
+                "windings": {
+                    "label": "Windings",
+                    "placeholder": "1, 2, 3..."
+                },
+                "windings/configuration": {
+                    "label": "Windings Configuration",
+                    "options": {
+                        "star": "Star / Wye",
+                        "delta": "Delta",
+                        "open-delta": "Open Delta",
+                        "zigzag": "Zig Zag",
+                        "open": "Open",
+                        "scott": "Scott",
+                        "leblanc": "Leblanc"
+                    }
                 }
             },
             "presets": {
                     "name": "Amenity",
                     "terms": ""
                 },
+                "circular": {
+                    "name": "Traffic Circle",
+                    "terms": ""
+                },
                 "highway": {
                     "name": "Highway",
                     "terms": ""
                     "name": "Billboard",
                     "terms": ""
                 },
+                "aerialway/station": {
+                    "name": "Aerialway Station",
+                    "terms": ""
+                },
                 "aerialway/cable_car": {
                     "name": "Cable Car",
                     "terms": "tramway,ropeway"
                     "name": "Rope Tow Lift",
                     "terms": "handle tow,bugel lift"
                 },
-                "aerialway/station": {
-                    "name": "Aerialway Station",
-                    "terms": ""
-                },
                 "aerialway/t-bar": {
                     "name": "T-bar Lift",
                     "terms": "tbar"
                     "name": "Airport Terminal",
                     "terms": "airport,aerodrome"
                 },
+                "amenity/bus_station": {
+                    "name": "Bus Station / Terminal",
+                    "terms": ""
+                },
                 "amenity/coworking_space": {
                     "name": "Coworking Space",
                     "terms": ""
                 },
+                "amenity/ferry_terminal": {
+                    "name": "Ferry Station / Terminal",
+                    "terms": ""
+                },
                 "amenity/nursing_home": {
                     "name": "Nursing Home",
                     "terms": ""
                     "name": "Register Office",
                     "terms": ""
                 },
+                "amenity/scrapyard": {
+                    "name": "Scrap Yard",
+                    "terms": ""
+                },
                 "amenity/swimming_pool": {
                     "name": "Swimming Pool",
                     "terms": ""
                 },
                 "amenity/animal_boarding": {
                     "name": "Animal Boarding Facility",
-                    "terms": "boarding,cat,dog,horse,kitten,pet boarding,pet care,pet hotel,puppy,reptile"
+                    "terms": "boarding,cat,cattery,dog,horse,kennel,kitten,pet,pet boarding,pet care,pet hotel,puppy,reptile"
                 },
                 "amenity/animal_breeding": {
                     "name": "Animal Breeding Facility",
                     "name": "Currency Exchange",
                     "terms": "bureau de change,money changer"
                 },
-                "amenity/bus_station": {
-                    "name": "Bus Station",
-                    "terms": ""
-                },
                 "amenity/cafe": {
                     "name": "Cafe",
                     "terms": "bistro,coffee,tea"
                 },
+                "amenity/car_pooling": {
+                    "name": "Car Pooling",
+                    "terms": ""
+                },
                 "amenity/car_rental": {
                     "name": "Car Rental",
                     "terms": ""
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
                 },
-                "amenity/ferry_terminal": {
-                    "name": "Ferry Terminal",
-                    "terms": ""
-                },
                 "amenity/fire_station": {
                     "name": "Fire Station",
                     "terms": ""
                     "name": "Library",
                     "terms": "book"
                 },
+                "amenity/love_hotel": {
+                    "name": "Love Hotel",
+                    "terms": ""
+                },
                 "amenity/marketplace": {
                     "name": "Marketplace",
                     "terms": ""
                     "name": "Motorcycle Parking",
                     "terms": ""
                 },
+                "amenity/music_school": {
+                    "name": "Music School",
+                    "terms": "school of music"
+                },
                 "amenity/nightclub": {
                     "name": "Nightclub",
                     "terms": "disco*,night club,dancing,dance club"
                 },
                 "amenity/place_of_worship/hindu": {
                     "name": "Hindu Temple",
-                    "terms": "garbhargriha,mandu,puja,shrine,temple"
+                    "terms": "kovil,devasthana,mandir,kshetram,alayam,shrine,temple"
                 },
                 "amenity/place_of_worship/jewish": {
                     "name": "Synagogue",
                     "terms": "bottle,can,dump,glass,garbage,rubbish,scrap,trash"
                 },
                 "amenity/recycling": {
-                    "name": "Recycling",
+                    "name": "Recycling Container",
                     "terms": "bin,can,bottle,glass,garbage,rubbish,scrap,trash"
                 },
                 "amenity/restaurant": {
                     "name": "School Grounds",
                     "terms": "academy,elementary school,middle school,high school"
                 },
-                "amenity/scrapyard": {
-                    "name": "Scrap Yard",
-                    "terms": "car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard"
-                },
                 "amenity/shelter": {
                     "name": "Shelter",
                     "terms": "lean-to,gazebo,picnic"
                     "name": "Shower",
                     "terms": "rain closet"
                 },
+                "amenity/smoking_area": {
+                    "name": "Smoking Area",
+                    "terms": ""
+                },
                 "amenity/social_facility": {
                     "name": "Social Facility",
                     "terms": ""
                     "name": "Hedge",
                     "terms": ""
                 },
+                "barrier/kerb": {
+                    "name": "Kerb",
+                    "terms": ""
+                },
                 "barrier/kissing_gate": {
                     "name": "Kissing Gate",
                     "terms": ""
                     "name": "Barn",
                     "terms": ""
                 },
+                "building/boathouse": {
+                    "name": "Boathouse",
+                    "terms": ""
+                },
+                "building/bungalow": {
+                    "name": "Bungalow",
+                    "terms": "home,detached"
+                },
                 "building/cabin": {
                     "name": "Cabin",
                     "terms": ""
                     "name": "Church Building",
                     "terms": ""
                 },
+                "building/civic": {
+                    "name": "Civic Building",
+                    "terms": ""
+                },
                 "building/college": {
                     "name": "College Building",
                     "terms": "university"
                     "name": "Dormitory",
                     "terms": ""
                 },
+                "building/farm_auxiliary": {
+                    "name": "Farm Building",
+                    "terms": ""
+                },
+                "building/farm": {
+                    "name": "Farm House",
+                    "terms": ""
+                },
                 "building/garage": {
                     "name": "Garage",
                     "terms": ""
                     "name": "Preschool/Kindergarten Building",
                     "terms": "kindergarden,pre-school"
                 },
+                "building/mosque": {
+                    "name": "Mosque Building",
+                    "terms": ""
+                },
                 "building/public": {
                     "name": "Public Building",
                     "terms": ""
                     "name": "Roof",
                     "terms": ""
                 },
+                "building/ruins": {
+                    "name": "Building Ruins",
+                    "terms": ""
+                },
                 "building/school": {
                     "name": "School Building",
                     "terms": "academy,elementary school,middle school,high school"
                     "name": "Semi-Detached House",
                     "terms": "home,double,duplex,twin,family,residence,dwelling"
                 },
+                "building/service": {
+                    "name": "Service Building",
+                    "terms": ""
+                },
                 "building/shed": {
                     "name": "Shed",
                     "terms": ""
                     "name": "Stable",
                     "terms": ""
                 },
+                "building/stadium": {
+                    "name": "Stadium Building",
+                    "terms": ""
+                },
                 "building/static_caravan": {
                     "name": "Static Mobile Home",
                     "terms": ""
                 },
+                "building/temple": {
+                    "name": "Temple Building",
+                    "terms": ""
+                },
                 "building/terrace": {
                     "name": "Row Houses",
                     "terms": "home,terrace,brownstone,family,residence,dwelling"
                 },
+                "building/transportation": {
+                    "name": "Transportation Building",
+                    "terms": ""
+                },
                 "building/university": {
                     "name": "University Building",
                     "terms": "college"
                     "name": "Caterer",
                     "terms": ""
                 },
+                "craft/chimney_sweeper": {
+                    "name": "Chimney Sweeper",
+                    "terms": ""
+                },
                 "craft/clockmaker": {
                     "name": "Clockmaker",
                     "terms": ""
                     "name": "Scaffolder",
                     "terms": ""
                 },
-                "craft/sculpter": {
-                    "name": "Sculpter",
+                "craft/sculptor": {
+                    "name": "Sculptor",
                     "terms": ""
                 },
                 "craft/shoemaker": {
                     "name": "Stonemason",
                     "terms": "masonry"
                 },
-                "craft/sweep": {
-                    "name": "Chimney Sweep",
-                    "terms": ""
-                },
                 "craft/tiler": {
                     "name": "Tiler",
                     "terms": ""
                     "name": "Emergency Phone",
                     "terms": ""
                 },
+                "emergency/water_tank": {
+                    "name": "Emergency Water Tank",
+                    "terms": "water tank,cistern,reservoir"
+                },
                 "entrance": {
                     "name": "Entrance/Exit",
                     "terms": ""
                     "name": "Speech Therapist",
                     "terms": "speech,therapist,therapy,voice"
                 },
+                "highway/bus_stop": {
+                    "name": "Bus Stop / Platform",
+                    "terms": ""
+                },
                 "highway/bridleway": {
                     "name": "Bridle Path",
                     "terms": "bridleway,equestrian,horse"
                 },
-                "highway/bus_stop": {
-                    "name": "Bus Stop",
+                "highway/bus_guideway": {
+                    "name": "Bus Guideway",
                     "terms": ""
                 },
                 "highway/corridor": {
                     "name": "Path",
                     "terms": "hike,hiking,trackway,trail,walk"
                 },
-                "highway/pedestrian": {
+                "highway/pedestrian_area": {
+                    "name": "Pedestrian Area",
+                    "terms": "center,centre,plaza,quad,square,walkway"
+                },
+                "highway/pedestrian_line": {
                     "name": "Pedestrian Street",
-                    "terms": ""
+                    "terms": "center,centre,plaza,quad,square,walkway"
                 },
                 "highway/primary_link": {
                     "name": "Primary Link",
                     "name": "Basin",
                     "terms": ""
                 },
+                "landuse/brownfield": {
+                    "name": "Brownfield",
+                    "terms": ""
+                },
                 "landuse/cemetery": {
                     "name": "Cemetery",
                     "terms": ""
                     "terms": "tree"
                 },
                 "landuse/garages": {
-                    "name": "Garages",
+                    "name": "Garage Landuse",
                     "terms": ""
                 },
                 "landuse/grass": {
                     "name": "Grass",
                     "terms": ""
                 },
+                "landuse/greenfield": {
+                    "name": "Greenfield",
+                    "terms": ""
+                },
+                "landuse/greenhouse_horticulture": {
+                    "name": "Greenhouse Horticulture",
+                    "terms": "flower,greenhouse,horticulture,grow,vivero"
+                },
                 "landuse/harbour": {
                     "name": "Harbor",
                     "terms": "boat"
                     "name": "Industrial Area",
                     "terms": ""
                 },
+                "landuse/industrial/scrap_yard": {
+                    "name": "Scrap Yard",
+                    "terms": "car,junk,metal,salvage,scrap,u-pull-it,vehicle,wreck,yard"
+                },
+                "landuse/industrial/slaughterhouse": {
+                    "name": "Slaughterhouse",
+                    "terms": "abattoir,beef,butchery,calf,chicken,cow,killing house,meat,pig,pork,poultry,shambles,stockyard"
+                },
                 "landuse/landfill": {
                     "name": "Landfill",
                     "terms": "dump"
                     "name": "Recreation Ground",
                     "terms": "playing fields"
                 },
+                "landuse/religious": {
+                    "name": "Religious Area",
+                    "terms": ""
+                },
                 "landuse/residential": {
                     "name": "Residential Area",
                     "terms": ""
                     "name": "Adult Gaming Center",
                     "terms": "gambling,slot machine"
                 },
+                "leisure/amusement_arcade": {
+                    "name": "Amusement Arcade",
+                    "terms": "pay-to-play games,video games,driving simulators,pinball machines"
+                },
                 "leisure/bird_hide": {
                     "name": "Bird Hide",
                     "terms": "machan,ornithology"
                     "name": "Dance Hall",
                     "terms": "ballroom,jive,swing,tango,waltz"
                 },
+                "leisure/dancing_school": {
+                    "name": "Dance School",
+                    "terms": "jive,swing,tango,waltz,dance teaching"
+                },
                 "leisure/dog_park": {
                     "name": "Dog Park",
                     "terms": ""
                 },
                 "leisure/fitness_station": {
                     "name": "Outdoor Fitness Station",
-                    "terms": "fitness,gym,trim trail"
+                    "terms": "exercise,fitness,gym,trim trail"
+                },
+                "leisure/fitness_station/balance_beam": {
+                    "name": "Exercise Balance Beam",
+                    "terms": "balance,exercise,fitness,gym,trim trail"
+                },
+                "leisure/fitness_station/box": {
+                    "name": "Exercise Box",
+                    "terms": "box,exercise,fitness,gym,jump,trim trail"
+                },
+                "leisure/fitness_station/horizontal_bar": {
+                    "name": "Exercise Horizontal Bar",
+                    "terms": "bar,chinup,chin up,exercise,fitness,gym,pullup,pull up,trim trail"
+                },
+                "leisure/fitness_station/horizontal_ladder": {
+                    "name": "Exercise Monkey Bars",
+                    "terms": "bar,chinup,chin up,exercise,fitness,gym,ladder,monkey bars,pullup,pull up,trim trail"
+                },
+                "leisure/fitness_station/hyperextension": {
+                    "name": "Hyperextension Station",
+                    "terms": "back,exercise,extension,fitness,gym,roman chair,trim trail"
+                },
+                "leisure/fitness_station/parallel_bars": {
+                    "name": "Parallel Bars",
+                    "terms": "bar,dip,exercise,fitness,gym,trim trail"
+                },
+                "leisure/fitness_station/push-up": {
+                    "name": "Push-Up Station",
+                    "terms": "bar,exercise,fitness,gym,pushup,push up,trim trail"
+                },
+                "leisure/fitness_station/rings": {
+                    "name": "Exercise Rings",
+                    "terms": "exercise,fitness,gym,muscle up,pullup,pull up,trim trail"
+                },
+                "leisure/fitness_station/sign": {
+                    "name": "Exercise Instruction Sign",
+                    "terms": "exercise,fitness,gym,trim trail"
+                },
+                "leisure/fitness_station/sit-up": {
+                    "name": "Sit-Up Station",
+                    "terms": "crunch,exercise,fitness,gym,situp,sit up,trim trail"
+                },
+                "leisure/fitness_station/stairs": {
+                    "name": "Exercise Stairs",
+                    "terms": "exercise,fitness,gym,steps,trim trail"
                 },
                 "leisure/garden": {
                     "name": "Garden",
                     "name": "Beach Volleyball Court",
                     "terms": "volleyball"
                 },
+                "leisure/pitch/boules": {
+                    "name": "Boules/Bocce Court",
+                    "terms": "bocce,lyonnaise,pétanque"
+                },
                 "leisure/pitch/bowls": {
                     "name": "Bowling Green",
                     "terms": ""
                     "name": "Racetrack (Running)",
                     "terms": "race*,running,sprint,track"
                 },
+                "leisure/sauna": {
+                    "name": "Sauna",
+                    "terms": ""
+                },
                 "leisure/slipway": {
                     "name": "Slipway",
                     "terms": "boat launch,boat ramp"
                     "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/monitoring_station": {
+                    "name": "Monitoring Station",
+                    "terms": "weather,earthquake,seismology,air,gps"
+                },
                 "man_made/observation": {
                     "name": "Observation Tower",
                     "terms": "lookout tower,fire tower"
                     "name": "Office",
                     "terms": ""
                 },
+                "office/administrative": {
+                    "name": "Administrative Office",
+                    "terms": ""
+                },
                 "office/physician": {
                     "name": "Physician",
                     "terms": ""
                     "terms": ""
                 },
                 "office/accountant": {
-                    "name": "Accountant",
+                    "name": "Accountant Office",
                     "terms": ""
                 },
-                "office/administrative": {
-                    "name": "Administrative Office",
+                "office/adoption_agency": {
+                    "name": "Adoption Agency",
                     "terms": ""
                 },
+                "office/advertising_agency": {
+                    "name": "Advertising Agency",
+                    "terms": "ad,ad agency,advert agency,advertising,marketing"
+                },
                 "office/architect": {
-                    "name": "Architect",
+                    "name": "Architect Office",
                     "terms": ""
                 },
+                "office/association": {
+                    "name": "Nonprofit Organization Office",
+                    "terms": "association,non-profit,nonprofit,organization,society"
+                },
+                "office/charity": {
+                    "name": "Charity Office",
+                    "terms": "charitable organization"
+                },
                 "office/company": {
-                    "name": "Company Office",
+                    "name": "Corporate Office",
                     "terms": ""
                 },
                 "office/coworking": {
                     "name": "Employment Agency",
                     "terms": "job"
                 },
+                "office/energy_supplier": {
+                    "name": "Energy Supplier Office",
+                    "terms": "electricity,energy company,energy utility,gas utility"
+                },
                 "office/estate_agent": {
                     "name": "Real Estate Office",
                     "terms": ""
                     "name": "Financial Office",
                     "terms": ""
                 },
+                "office/forestry": {
+                    "name": "Forestry Office",
+                    "terms": "forest,ranger"
+                },
+                "office/foundation": {
+                    "name": "Foundation Office",
+                    "terms": ""
+                },
                 "office/government": {
                     "name": "Government Office",
                     "terms": ""
                     "name": "Register Office",
                     "terms": "clerk,marriage,death,birth,certificate"
                 },
+                "office/government/tax": {
+                    "name": "Tax and Revenue Office",
+                    "terms": "fiscal authorities,revenue office,tax office"
+                },
+                "office/guide": {
+                    "name": "Tour Guide Office",
+                    "terms": "dive guide,mountain guide,tour guide"
+                },
                 "office/insurance": {
                     "name": "Insurance Office",
                     "terms": ""
                 },
                 "office/it": {
-                    "name": "IT Office",
-                    "terms": ""
+                    "name": "Information Technology Office",
+                    "terms": "computer,information,software,technology"
                 },
                 "office/lawyer": {
                     "name": "Law Office",
                 },
                 "office/lawyer/notary": {
                     "name": "Notary Office",
-                    "terms": "clerk,signature,wills,deeds,estate"
+                    "terms": ""
+                },
+                "office/moving_company": {
+                    "name": "Moving Company Office",
+                    "terms": "relocation"
                 },
                 "office/newspaper": {
-                    "name": "Newspaper",
+                    "name": "Newspaper Office",
                     "terms": ""
                 },
                 "office/ngo": {
                     "name": "NGO Office",
-                    "terms": ""
+                    "terms": "ngo,non government,non-government,organization,organisation"
+                },
+                "office/notary": {
+                    "name": "Notary Office",
+                    "terms": "clerk,deeds,estate,signature,wills"
                 },
                 "office/political_party": {
                     "name": "Political Party",
                     "terms": ""
                 },
+                "office/private_investigator": {
+                    "name": "Private Investigator Office",
+                    "terms": "PI,private eye,private detective"
+                },
+                "office/quango": {
+                    "name": "Quasi-NGO Office",
+                    "terms": "ngo,non government,non-government,organization,organisation,quasi autonomous,quasi-autonomous"
+                },
                 "office/research": {
                     "name": "Research Office",
                     "terms": ""
                 },
+                "office/surveyor": {
+                    "name": "Surveyor Office",
+                    "terms": ""
+                },
+                "office/tax_advisor": {
+                    "name": "Tax Advisor Office",
+                    "terms": "tax,tax consultant"
+                },
                 "office/telecommunication": {
                     "name": "Telecom Office",
-                    "terms": ""
+                    "terms": "communication,internet,phone,voice"
                 },
                 "office/therapist": {
-                    "name": "Therapist",
-                    "terms": ""
+                    "name": "Therapist Office",
+                    "terms": "therapy"
+                },
+                "office/water_utility": {
+                    "name": "Water Utility Office",
+                    "terms": "water board,utility"
                 },
                 "piste": {
                     "name": "Piste/Ski Trail",
                     "name": "Island",
                     "terms": "archipelago,atoll,bar,cay,isle,islet,key,reef"
                 },
+                "place/islet": {
+                    "name": "Islet",
+                    "terms": "archipelago,atoll,bar,cay,isle,islet,key,reef"
+                },
                 "place/isolated_dwelling": {
                     "name": "Isolated Dwelling",
                     "terms": ""
                     "name": "Neighborhood",
                     "terms": "neighbourhood"
                 },
+                "place/plot": {
+                    "name": "Plot",
+                    "terms": "tract,land,lot,parcel"
+                },
                 "place/quarter": {
                     "name": "Sub-Borough / Quarter",
                     "terms": "boro,borough,quarter"
                     "terms": ""
                 },
                 "playground/balance_beam": {
-                    "name": "Balance Beam",
+                    "name": "Play Balance Beam",
                     "terms": ""
                 },
                 "playground/basket_spinner": {
                     "terms": ""
                 },
                 "playground/horizontal_bar": {
-                    "name": "Horizontal Bar",
+                    "name": "Play Horizontal Bar",
                     "terms": "high bar"
                 },
                 "playground/rocker": {
                     "name": "Substation",
                     "terms": ""
                 },
+                "power/switch": {
+                    "name": "Power Switch",
+                    "terms": ""
+                },
                 "power/tower": {
                     "name": "High-Voltage Tower",
                     "terms": ""
                     "name": "Transformer",
                     "terms": ""
                 },
+                "public_transport/linear_platform_aerialway": {
+                    "name": "Aerialway Stop / Platform",
+                    "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/linear_platform_bus": {
+                    "name": "Bus Stop / Platform",
+                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/linear_platform_ferry": {
+                    "name": "Ferry Stop / Platform",
+                    "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/linear_platform_light_rail": {
+                    "name": "Light Rail Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/linear_platform_monorail": {
+                    "name": "Monorail Stop / Platform",
+                    "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
+                },
+                "public_transport/linear_platform_subway": {
+                    "name": "Subway Stop / Platform",
+                    "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                },
+                "public_transport/linear_platform_train": {
+                    "name": "Train Stop / Platform",
+                    "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
+                },
+                "public_transport/linear_platform_tram": {
+                    "name": "Tram Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/linear_platform_trolleybus": {
+                    "name": "Trolleybus Stop / Platform",
+                    "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
+                },
+                "public_transport/linear_platform": {
+                    "name": "Transit Stop / Platform",
+                    "terms": "platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_aerialway": {
+                    "name": "Aerialway Stop / Platform",
+                    "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_bus": {
+                    "name": "Bus Stop / Platform",
+                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_ferry": {
+                    "name": "Ferry Stop / Platform",
+                    "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_light_rail": {
+                    "name": "Light Rail Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/platform_monorail": {
+                    "name": "Monorail Stop / Platform",
+                    "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
+                },
+                "public_transport/platform_subway": {
+                    "name": "Subway Stop / Platform",
+                    "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                },
+                "public_transport/platform_train": {
+                    "name": "Train Stop / Platform",
+                    "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
+                },
+                "public_transport/platform_tram": {
+                    "name": "Tram Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/platform_trolleybus": {
+                    "name": "Trolleybus Stop / Platform",
+                    "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
+                },
                 "public_transport/platform": {
-                    "name": "Platform",
+                    "name": "Transit Stop / Platform",
+                    "terms": "platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/station_aerialway": {
+                    "name": "Aerialway Station",
+                    "terms": "aerialway,cable car,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_bus": {
+                    "name": "Bus Station / Terminal",
+                    "terms": "bus,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_ferry": {
+                    "name": "Ferry Station / Terminal",
+                    "terms": "boat,dock,ferry,pier,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_light_rail": {
+                    "name": "Light Rail Station",
+                    "terms": "electric,light rail,public transit,public transportation,rail,station,terminal,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/station_monorail": {
+                    "name": "Monorail Station",
+                    "terms": "monorail,public transit,public transportation,rail,station,terminal,transit,transportation"
+                },
+                "public_transport/station_subway": {
+                    "name": "Subway Station",
+                    "terms": "metro,public transit,public transportation,rail,station,subway,terminal,track,transit,transportation,underground"
+                },
+                "public_transport/station_train_halt": {
+                    "name": "Train Station (Halt / Request)",
+                    "terms": "halt,public transit,public transportation,rail,station,track,train,transit,transportation,whistle stop"
+                },
+                "public_transport/station_train": {
+                    "name": "Train Station",
+                    "terms": "public transit,public transportation,rail,station,terminal,track,train,transit,transportation"
+                },
+                "public_transport/station_tram": {
+                    "name": "Tram Station",
+                    "terms": "electric,light rail,public transit,public transportation,rail,station,streetcar,terminal,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/station_trolleybus": {
+                    "name": "Trolleybus Station / Terminal",
+                    "terms": "bus,electric,public transit,public transportation,station,streetcar,terminal,trackless,tram,trolley,transit,transportation"
+                },
+                "public_transport/station": {
+                    "name": "Transit Station",
+                    "terms": "public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/stop_area": {
+                    "name": "Transit Stop Area",
                     "terms": ""
                 },
+                "public_transport/stop_position_aerialway": {
+                    "name": "Aerialway Stopping Location",
+                    "terms": "aerialway,cable car,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_bus": {
+                    "name": "Bus Stopping Location",
+                    "terms": "bus,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_ferry": {
+                    "name": "Ferry Stopping Location",
+                    "terms": "boat,dock,ferry,pier,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_light_rail": {
+                    "name": "Light Rail Stopping Location",
+                    "terms": "electric,light rail,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/stop_position_monorail": {
+                    "name": "Monorail Stopping Location",
+                    "terms": "monorail,public transit,public transportation,rail,transit,transportation"
+                },
+                "public_transport/stop_position_subway": {
+                    "name": "Subway Stopping Location",
+                    "terms": "metro,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                },
+                "public_transport/stop_position_train": {
+                    "name": "Train Stopping Location",
+                    "terms": "public transit,public transportation,rail,track,train,transit,transportation"
+                },
+                "public_transport/stop_position_tram": {
+                    "name": "Tram Stopping Location",
+                    "terms": "electric,light rail,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/stop_position_trolleybus": {
+                    "name": "Trolleybus Stopping Location",
+                    "terms": "bus,electric,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
+                },
                 "public_transport/stop_position": {
-                    "name": "Stop Position",
+                    "name": "Transit Stopping Location",
+                    "terms": "public transit,public transportation,transit,transportation"
+                },
+                "railway/halt": {
+                    "name": "Train Station (Halt / Request)",
+                    "terms": "break,interrupt,rest,wait,interruption"
+                },
+                "railway/platform": {
+                    "name": "Train Stop / Platform",
                     "terms": ""
                 },
+                "railway/station": {
+                    "name": "Train Station",
+                    "terms": "train station,station"
+                },
+                "railway/tram_stop": {
+                    "name": "Tram Stopping Position",
+                    "terms": "light rail,streetcar,tram,trolley"
+                },
                 "railway/abandoned": {
                     "name": "Abandoned Railway",
                     "terms": ""
                     "name": "Funicular",
                     "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
                 },
-                "railway/halt": {
-                    "name": "Railway Halt",
-                    "terms": "break,interrupt,rest,wait,interruption"
-                },
                 "railway/level_crossing": {
                     "name": "Railway Crossing (Road)",
                     "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
                 },
+                "railway/light_rail": {
+                    "name": "Light Rail",
+                    "terms": "light rail,streetcar,trolley"
+                },
                 "railway/milestone": {
                     "name": "Railway Milestone",
                     "terms": "milestone,marker"
                 },
+                "railway/miniature": {
+                    "name": "Miniature Railway",
+                    "terms": "rideable miniature railway,narrow gauge railway,minimum gauge railway"
+                },
                 "railway/monorail": {
                     "name": "Monorail",
                     "terms": ""
                     "name": "Narrow Gauge Rail",
                     "terms": "narrow gauge railway,narrow gauge railroad"
                 },
-                "railway/platform": {
-                    "name": "Railway Platform",
-                    "terms": ""
-                },
                 "railway/rail": {
                     "name": "Rail",
                     "terms": ""
                     "name": "Railway Signal",
                     "terms": "signal,lights"
                 },
-                "railway/station": {
-                    "name": "Railway Station",
-                    "terms": "train station,station"
-                },
                 "railway/subway_entrance": {
                     "name": "Subway Entrance",
                     "terms": "metro,transit"
                     "name": "Train Wash",
                     "terms": "wash,clean"
                 },
-                "railway/tram_stop": {
-                    "name": "Tram Stop",
-                    "terms": "light rail,streetcar,tram,trolley"
-                },
                 "railway/tram": {
                     "name": "Tram",
                     "terms": "light rail,streetcar,tram,trolley"
                     "name": "Vacant Shop",
                     "terms": ""
                 },
+                "shop/agrarian": {
+                    "name": "Farm Supply Shop",
+                    "terms": "agricultural inputs,agricultural machines,seeds,pesticides,fertilizer,agricultural tools"
+                },
                 "shop/alcohol": {
                     "name": "Liquor Store",
                     "terms": "alcohol,beer,booze,wine"
                     "name": "Hardware Store",
                     "terms": ""
                 },
+                "shop/health_food": {
+                    "name": "Health Food Shop",
+                    "terms": "wholefood,vitamins,vegetarian,vegan"
+                },
                 "shop/hearing_aids": {
                     "name": "Hearing Aids Store",
                     "terms": ""
                     "terms": "diamond,gem,ring"
                 },
                 "shop/kiosk": {
-                    "name": "News Kiosk",
+                    "name": "Kiosk",
                     "terms": ""
                 },
                 "shop/kitchen": {
                     "name": "Weapon Shop",
                     "terms": "ammo,gun,knife,knives"
                 },
+                "shop/wholesale": {
+                    "name": "Wholesale Store",
+                    "terms": "warehouse club,cash and carry"
+                },
                 "shop/window_blind": {
                     "name": "Window Blind Store",
                     "terms": ""
                 },
                 "tourism/alpine_hut": {
                     "name": "Alpine Hut",
-                    "terms": ""
+                    "terms": "climbing hut"
                 },
                 "tourism/apartment": {
                     "name": "Guest Apartment / Condo",
                     "terms": "Motor Home,Camper"
                 },
                 "tourism/chalet": {
-                    "name": "Chalet",
-                    "terms": ""
+                    "name": "Holiday Cottage",
+                    "terms": "holiday,holiday cottage,holiday home,vacation,vacation home"
                 },
                 "tourism/gallery": {
                     "name": "Art Gallery",
                     "name": "Viewpoint",
                     "terms": ""
                 },
+                "tourism/wilderness_hut": {
+                    "name": "Wilderness Hut",
+                    "terms": "wilderness hut,backcountry hut,bothy"
+                },
                 "tourism/zoo": {
                     "name": "Zoo",
                     "terms": "animal"
                     "name": "Riding Route",
                     "terms": ""
                 },
+                "type/route/light_rail": {
+                    "name": "Light Rail Route",
+                    "terms": ""
+                },
                 "type/route/pipeline": {
                     "name": "Pipeline Route",
                     "terms": ""
                 },
+                "type/route/piste": {
+                    "name": "Piste/Ski Route",
+                    "terms": ""
+                },
                 "type/route/power": {
                     "name": "Power Route",
                     "terms": ""
                     "name": "Road Route",
                     "terms": ""
                 },
+                "type/route/subway": {
+                    "name": "Subway Route",
+                    "terms": ""
+                },
                 "type/route/train": {
                     "name": "Train Route",
                     "terms": ""
                 "description": "Premium DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Premium Imagery"
             },
+            "DigitalGlobe-Premium-vintage": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "name": "DigitalGlobe Premium Imagery Vintage"
+            },
             "DigitalGlobe-Standard": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 "description": "Standard DigitalGlobe satellite imagery.",
                 "name": "DigitalGlobe Standard Imagery"
             },
+            "DigitalGlobe-Standard-vintage": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Imagery boundaries and capture dates. Labels appear at zoom level 14 and higher.",
+                "name": "DigitalGlobe Standard Imagery Vintage"
+            },
             "EsriWorldImagery": {
                 "attribution": {
                     "text": "Terms & Feedback"
                 "description": "Esri world imagery.",
                 "name": "Esri World Imagery"
             },
+            "EsriWorldImageryClarity": {
+                "attribution": {
+                    "text": "Terms & Feedback"
+                },
+                "description": "Esri archive imagery that may be clearer and more accurate than the default layer.",
+                "name": "Esri World Imagery (Clarity) Beta"
+            },
             "MAPNIK": {
                 "attribution": {
                     "text": "© OpenStreetMap contributors, CC-BY-SA"
             },
             "Waymarked_Trails-Cycling": {
                 "attribution": {
-                    "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
                 },
                 "name": "Waymarked Trails: Cycling"
             },
             "Waymarked_Trails-Hiking": {
                 "attribution": {
-                    "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
                 },
                 "name": "Waymarked Trails: Hiking"
             },
             "Waymarked_Trails-MTB": {
                 "attribution": {
-                    "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
                 },
                 "name": "Waymarked Trails: MTB"
             },
             "Waymarked_Trails-Skating": {
                 "attribution": {
-                    "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
                 },
                 "name": "Waymarked Trails: Skating"
             },
             "Waymarked_Trails-Winter_Sports": {
                 "attribution": {
-                    "text": "© Michael Spreng, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0"
+                    "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0"
                 },
                 "name": "Waymarked Trails: Winter Sports"
             },