diff --git a/data/core.yaml b/data/core.yaml index 87ff24ce1..9515c4a7f 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -566,8 +566,9 @@ en: Edits that you make on this map will be freely available to everyone who uses OpenStreetMap. They can be visible on every map based on OpenStreetMap. - The optimal resources for mapping are on-the-ground survey, personal knowledge, - or the provieded background. Copying from commercial sources like Google Maps is strictly forbidden. + Your edits can be based on personal knowledge, on-the-ground survey, or + background imgagery. + Copying from commercial sources like Google Maps is strictly forbidden. beforestart: | ### Before you start @@ -579,8 +580,10 @@ en: opensource: | ### Open Source - The iD editor is a collaborative project with [source - code available on GitHub](https://github.com/openstreetmap/iD). + This editor is called iD and you use version {version} now. + You can contribute and {translate} [help translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) + or {bug} [report a bug](https://github.com/openstreetmap/iD/issues). + The source code is available for [contributions on GitHub](https://github.com/openstreetmap/iD). overview: intro: | @@ -603,9 +606,7 @@ en: This help is on top of the map area which shows OpenStreetMap data on top of a background imagery. On the left side is the *feature editor*, - there you can search for features and edit feature's type and attributes. - The buttons in the top row and the right column explain their - function if you hold the mouse pointer over them. + there you can {search} search for features and edit feature's type and attributes. navigation: | ### Navigation @@ -615,8 +616,8 @@ en: You can also use the arrow keys on your keyboard, using the keys while holding 'Ctrl' will move the map for one screenful. You can zoom in or out by scrolling with the mouse wheel or trackpad, - or by clicking the {plus} / {minus} buttons, holding 'Ctrl' while - clicking will zoom a lot. + or by clicking the {plus} / {minus} buttons on the top-right-hand + of the map, holding 'Ctrl' while clicking will zoom a lot. editing: intro: | @@ -642,7 +643,8 @@ en: When you make changes like editing roads, building, and places these are stored locally until you save them to the server. Don't worry if you make a mistake - you can undo changes - by clicking the {undo} Undo button, and redo changes by clicking the {redo} Redo button. + by clicking the {undo} 'Undo' button, and redo changes + by clicking the {redo} 'Redo' button. save: | ### Save @@ -735,7 +737,7 @@ en: ### Creating Found somewhere there should be a road but there isn't? Click the {line} Line - icon in the top-left of the editor or press the shortcut key `2` to start drawing + icon in the top-left of the map or press the shortcut key `2` to start drawing a line. Click on the start of the road on the map to start drawing. If the road @@ -763,7 +765,7 @@ en: To use a GPX track for mapping, drag and drop the GPX file onto the map editor. If it's recognized, it will be added to the map as a bright purple - line. Click on the 'Map Data' menu on the right side to enable, + line. Click on the {data} 'Map data' menu on the right side to enable, disable, or zoom to this new GPX-powered layer. The GPX track isn't directly uploaded to OpenStreetMap - the best way to @@ -826,7 +828,7 @@ en: is often out of date, so the building could simply be newly built. You can delete a building by clicking on it to select it, then pressing the 'Delete' - key, or right-clicking it and then using the {delete} Delete tool. + key, or right-clicking it and then using the {delete} 'Delete' tool. addresses: intro: | @@ -862,7 +864,7 @@ en: there are other often used types like trees, towers, or poles. To create a point feature click the {point} Point icon in the top-left - of the editor or press the shortcut key `1` to insert a point. + of the map or press the shortcut key `1` to insert a point. feature_editor: intro: | @@ -907,8 +909,8 @@ en: ### Undo & Redo Changes you make in the feature editor are automatically applied. - You can undo them at any time by clicking the {undo} button and redo - changes by clicking the {redo} Redo button. + You can undo them at any time by clicking the {undo} 'Undo' button and redo + changes by clicking the {redo} 'Redo' button. imagery: intro: | @@ -916,7 +918,7 @@ en: Aerial imagery is an important resource for mapping. A combination of airplane flyovers, satellite views, and freely-compiled sources are available - in the editor under the `Background settings` menu on the right. + in the editor under the {layers} `Background settings` menu on the right. background: | ### Background @@ -924,7 +926,7 @@ en: By default a [Bing Maps](https://www.bing.com/maps/) satellite layer is presented in the editor, but as you pan and zoom the map to new geographical areas, new sources from the [Open Imagery Network](https://openimagerynetwork.github.io/) - will become available and the best for the area will be marked with a '*'. + will become available. offset: | ### Offset @@ -937,64 +939,65 @@ en: iconstools: icons: | - # Icons & Tools + # List Icons & Tools - ### Top row: + ### Feature editor {search} Search features + + ### Top row {point} 'Add point' mode {line} 'Add line' mode {area} 'Add area' mode {undo} Undo {redo} Redo {save} Save changes - ### Right column: + + ### Right column {plus} Zoom in {minus} Zoom out {geolocate} Show my location {layers} Background settings - {data} Data data + {data} Map data {help} Help - ### Bottom row: + + ### Bottom row {bug} Report a bug {translate} Help translate tools: | - ## Tools + ## Tools in the Editing Menu - The editing menu has the following tools to operate on selected features: {move} Move {rotate} Rotate {reflect_long} Reflect at long axis {reflect_short} Reflect at short axis {continue} Continue line {reverse} Reverse direction - {merge} Merge features into one or create relation + {merge} Merge selected features into one or create relation {split} Split in two {disconnect} Disconnect {circularize} Circularize {orthogonalize} Orthogonalize {straighten} Straighten line {delete} Delete - ### Reserved for later are: - {simplify} Simplify - {smooth} Smooth - more: | - ### More icons {more} + reserved: | + ### Reserved for later use are: {apply} Apply {close} Close {backward} Backward {forward} Forward {fullscreen} Fullscreen - {collapsescreen} Collapse-screen + {collapsescreen} Collapse screen {up} Up {down} Down {relation} Relation {vertex} Vertex {load} Load - ### Reserved for later are: {copy} Copy {paste} Paste + {simplify} Simplify + {smooth} Smooth {alert} Alert {inspect} Inspect {nearby} Nearby @@ -1019,7 +1022,7 @@ en: members: | ### Members - The group of features in a relation are called *members*. In the bottom of the + The group of features in a relation are called *members*. At the bottom of the feature editor, you can see which relations a feature is a member of, and click on a relation there will select it. When the relation is selected, you can see all of its members listed in the sidebar and highlighted on the map. @@ -1035,32 +1038,31 @@ en: edit: | ## Editing Relations - To add a feature to a relation, select the feature, click the {plus} button + To add a feature to a relation, select the feature, click the `+` button in the 'All relations' section of the feature editor, and select or type the name of the relation. To create a new relation, select the first feature that should be a member, - click the {plus} button in the 'All relations' section, and select 'New relation...'. + click the `+` button in the 'All relations' section, and select 'New relation...'. To remove a feature from a relation, select the feature and click the {delete} - Delete button next to the relation you want to remove it from. + 'Delete' button next to the relation you want to remove it from. multipolygons: | ### Multipolygons You can create multipolygons with holes using the {merge} 'Merge' tool. - Draw two areas (inner and outer) and select both. + Draw two or more areas (inner and outer) and select them. Then press either press the `C` shortcut key or right-click one - of the selected areas and select the 'Merge' {plus} tool. + of the selected areas and select the {merge} 'Merge' tool. turnrestrictions: | ### Turn restrictions - You can create turn restrictions in the feature editor when you select - an intersection node common to two or more roads on the map. - For every turn connected with the intersection you can forbid U-turn and for - every other road you can forbid left-turn, straight-on or right-turn. - + You can create turn restrictions when you select the point at a street + crossing of to two or more roads on the map. + In the feature editor your will find a graphical tool below 'Turn Restrictions' + where you can select a road and disable U-turn and turns into every other road. intro: done: done diff --git a/dist/locales/en.json b/dist/locales/en.json index f8730dbb8..3ebd624b4 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -682,20 +682,20 @@ "key": "H", "help": { "intro": "# Help\n\nWith this [OpenStreetMap](https://www.openstreetmap.org/) editor you can \nadd and update the free and editable map of the world online with your browser.\n", - "opendata": "### Open Data\n\nEdits that you make on this map will be freely available to everyone who uses\nOpenStreetMap. They can be visible on every map based on OpenStreetMap. \nThe optimal resources for mapping are on-the-ground survey, personal knowledge,\nor the provieded background. Copying from commercial sources like Google Maps is strictly forbidden.\n", + "opendata": "### Open Data\n\nEdits that you make on this map will be freely available to everyone who uses\nOpenStreetMap. They can be visible on every map based on OpenStreetMap. \nYour edits can be based on personal knowledge, on-the-ground survey, or\nbackground imgagery.\nCopying from commercial sources like Google Maps is strictly forbidden.\n", "beforestart": "### Before you start\n\nYou should be familiar with OpenStreetMap and this editor before you start editing.\nThe walkthrough will teach you the basics of editing on OpenStreetMap and you will\npractice using the editor. It takes about 15 minutes and then you can start editing.\n", - "opensource": "### Open Source\n\nThe iD editor is a collaborative project with [source\ncode available on GitHub](https://github.com/openstreetmap/iD).\n" + "opensource": "### Open Source\n\nThis editor is called iD and you use version {version} now.\nYou can contribute and {translate} [help translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)\nor {bug} [report a bug](https://github.com/openstreetmap/iD/issues).\nThe source code is available for [contributions on GitHub](https://github.com/openstreetmap/iD).\n" }, "overview": { "intro": "# Overview\n\nThis help will repeat and extend information from the walkthrough, which\nyou should have done by now.\n", "features": "### Features\n\nIn OpenStreetMap we use the word *feature* to describe things that appear on the map.\nAnything in the real world can be mapped as a feature on OpenStreetMap.\nFeatures are represented on the map using *points*, *lines*, or *areas*.\nPoints are sometimes called nodes. Lines and areas are a connected line\nof nodes and are sometimes called ways.\n", - "screen": "### Screen\n\nThis help is on top of the map area which shows OpenStreetMap data\non top of a background imagery. On the left side is the *feature editor*,\nthere you can search for features and edit feature's type and attributes.\nThe buttons in the top row and the right column explain their\nfunction if you hold the mouse pointer over them.\n", - "navigation": "### Navigation\n\nYou can drag the map by pressing and holding the left mouse button\nwhile moving the mouse around. This is also called panning. \nYou can also use the arrow keys on your keyboard, using the keys\nwhile holding 'Ctrl' will move the map for one screenful.\nYou can zoom in or out by scrolling with the mouse wheel or trackpad,\nor by clicking the {plus} / {minus} buttons, holding 'Ctrl' while\nclicking will zoom a lot.\n" + "screen": "### Screen\n\nThis help is on top of the map area which shows OpenStreetMap data\non top of a background imagery. On the left side is the *feature editor*,\nthere you can {search} search for features and edit feature's type and attributes.\n", + "navigation": "### Navigation\n\nYou can drag the map by pressing and holding the left mouse button\nwhile moving the mouse around. This is also called panning. \nYou can also use the arrow keys on your keyboard, using the keys\nwhile holding 'Ctrl' will move the map for one screenful.\nYou can zoom in or out by scrolling with the mouse wheel or trackpad,\nor by clicking the {plus} / {minus} buttons on the top-right-hand\nof the map, holding 'Ctrl' while clicking will zoom a lot.\n" }, "editing": { "intro": "# Editing & Saving\n\nTo select a feature you want to edit, click on it on the map\nor search for it by name in the feature editor. \nSelected features are drawn with a pulsing glow and in the\nfeature editor the feature's type and attributes are shown.\nIf you right-click on it, the editing menu appears.\n", "multiselect": "### Multiselect\nTo select multiple features, hold down the 'Shift' key.\nThen either click on the features you want to select,\nor click, hold and move the mouse on the map to draw\na contour around those features.\nAll the points inside the lasso area will be selected.\n", - "edit": "### Edit\n\nWhen you make changes like editing roads, building, and places\nthese are stored locally until you save them to the server.\nDon't worry if you make a mistake - you can undo changes\nby clicking the {undo} Undo button, and redo changes by clicking the {redo} Redo button.\n", + "edit": "### Edit\n\nWhen you make changes like editing roads, building, and places\nthese are stored locally until you save them to the server.\nDon't worry if you make a mistake - you can undo changes\nby clicking the {undo} 'Undo' button, and redo changes\nby clicking the {redo} 'Redo' button.\n", "save": "### Save\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", "upload": "### Upload\n\nIf everything looks good, you should explain your changes as a\n[changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments)\nand click `Upload` to post the changes to\n[OpenStreetMap.org](https://www.openstreetmap.org/), where they will be visible\nto all other users and available for others to build and improve upon.\n", "comeback": "If 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 will offer to restore your work.\n" @@ -707,49 +707,49 @@ "connect": "### Connecting\n\nIf the road connects to another road, but doesn't properly connect on\nthe map, you can drag one of its nodes onto the other road in\norder to join them. The node will become grey inside.\n\nHaving roads connected properly is important for the map\nand essential for providing driving directions.\nIf two road are connected on the map but not in reality,\nyou can disconnect them with right-click the connecting node and select\nthe {disconnect} 'Disconnect' tool or press the `D` shortcut key.\n\nIf you know that the crossing has traffic lights or crossswalks,\nyou can add them by selecting the connecting node and using the\nfeature editor to select the correct feature's type.\n", "attributes": "### Attribues\n\nWhen a road is selected on the left side the feature editor will show\nthe type of the road and many attributes like name, speed limit, lines,\nand surface. You can modify fields or even add new ones.\n", "delete": "### 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 using the {delete} 'Delete' tool.\n", - "create": "### Creating\n\nFound somewhere there should be a road but there isn't? Click the {line} 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" + "create": "### Creating\n\nFound somewhere there should be a road but there isn't? Click the {line} Line\nicon in the top-left of the map 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": { "intro": "# 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", - "using": "### Using\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](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" + "using": "### Using\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 {data} '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](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" }, "buildings": { "intro": "# Buildings & Areas\n\nOpenStreetMap is the world's largest database of buildings.\nYou can improve this database. Buildings are the most used type\nof areas, others are landuse, lakes, ponds, or forests.\nWhat you can do with buildings applies to most types of areas.\n", "select": "### Selecting \n\nYou can select a building by clicking on its border. the pulsing glow will\nwill become visible, all nodes will be shown as circles and the\nfeature editor on the left will show the type of the building and \nattributes like name, levels, and address.\n", "modify": "### Modifying\n\nSometimes buildings are incorrectly placed or have incorrect tags.\nTo move an entire building, select it and press the `M` shortcut key,\nor right-click it and select the {move} '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", "create": "### 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} Area button in the top\nleft of the map, and end it either by pressing 'Return' on your keyboard\nor clicking on the first node drawn or clicking again on the last node drawn\nto close the shape.\n\nThen you assign the type of the building to the outline with the feature editor.\nMost buildings are houses, if you're not sure choose the generic Building type.\n", - "delete": "### 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 using the {delete} Delete tool.\n" + "delete": "### 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 using the {delete} 'Delete' tool.\n" }, "addresses": { "intro": "# Addresses & Points\n\nAddresses are some of the most useful information for the map.\n\nAddress information can be added to OpenStreetMap using a variety of methods,\nsuch as adding a simple point containing an address, adding address information\nto a building, site or other area, or alternatively to an entrance node.\n", "nodup": "### No duplication\n\nUsually address informations doesn't need to be duplicated, e.g. when there\nis a building outline on the map and several shops as points inside,\nonly the building should have an address.\n", "recommendation": "### Recommendation\n\nMost buildings and sites have only one address and it is recommeded to add\nthe address to the building as a whole. If there is no building on the map\nand you cannot draw one, you should add an address point to the map.\n\nSome buildings or sites have more than one address. You can add the\naddresses as separate points inside the building.\n", - "points": "### Other Points\n\nWhile addresses are still the most common type of point feature,\nthere are other often used types like trees, towers, or poles.\n\nTo create a point feature click the {point} Point icon in the top-left\nof the editor or press the shortcut key `1` to insert a point.\n" + "points": "### Other Points\n\nWhile addresses are still the most common type of point feature,\nthere are other often used types like trees, towers, or poles.\n\nTo create a point feature click the {point} Point icon in the top-left\nof the map or press the shortcut key `1` to insert a point.\n" }, "feature_editor": { "intro": "# Feature Editor\n\nThe feature editor is the section on the left side of the page that allows you to\nedit the details of the selected feature.\n", "select": "### 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 feature editor 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 top-right-hand corner of a feature type button to\nlearn more about it. Click a button to choose that type.\n", "fields": "### Fields\n\nAfter you choose a feature type, or when you select a feature that already\nhas a type assigned, the feature editor will display fields with details about\nthe feature like its name or speed limit for a road or levels and address for a building. \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", "tags": "### Tags\n\nBelow that you see the tags which is how the fields are stored in OpenStreetMap.\nIf you cannot find the feature's type with the feature editor or you\ncannot add required fields, then you can add additional tags with the `+` button.\n\nYou will find many tags in the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/),\nalso [Taginfo](https://taginfo.openstreetmap.org/) is a\ngreat resource to learn more about popular tag combinations.\n", - "undo": "### Undo & Redo\n\nChanges you make in the feature editor are automatically applied.\nYou can undo them at any time by clicking the {undo} button and redo\nchanges by clicking the {redo} Redo button.\n" + "undo": "### Undo & Redo\n\nChanges you make in the feature editor are automatically applied.\nYou can undo them at any time by clicking the {undo} 'Undo' button and redo\nchanges by clicking the {redo} 'Redo' button.\n" }, "imagery": { - "intro": "# 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", - "background": "### Background\n\nBy default a [Bing Maps](https://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 from the [Open Imagery Network](https://openimagerynetwork.github.io/)\nwill become available and the best for the area will be marked with a '*'.\n", + "intro": "# 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 {layers} `Background settings` menu on the right.\n", + "background": "### Background\n\nBy default a [Bing Maps](https://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 from the [Open Imagery Network](https://openimagerynetwork.github.io/)\nwill become available.\n", "offset": "### Offset\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.\n" }, "iconstools": { - "icons": "# Icons & Tools\n\n### Top row:\n{search} Search features\n{point} 'Add point' mode\n{line} 'Add line' mode\n{area} 'Add area' mode\n{undo} Undo\n{redo} Redo\n{save} Save changes\n### Right column:\n{plus} Zoom in\n{minus} Zoom out\n{geolocate} Show my location\n{layers} Background settings\n{data} Data data\n{help} Help\n### Bottom row:\n{bug} Report a bug\n{translate} Help translate\n", - "tools": "## Tools\n\nThe editing menu has the following tools to operate on selected features:\n{move} Move\n{rotate} Rotate\n{reflect_long} Reflect at long axis\n{reflect_short} Reflect at short axis\n{continue} Continue line\n{reverse} Reverse direction\n{merge} Merge features into one or create relation\n{split} Split in two\n{disconnect} Disconnect\n{circularize} Circularize\n{orthogonalize} Orthogonalize\n{straighten} Straighten line\n{delete} Delete\n### Reserved for later are:\n{simplify} Simplify\n{smooth} Smooth\n", - "more": "### More icons {more}\n{apply} Apply\n{close} Close\n{backward} Backward\n{forward} Forward\n{fullscreen} Fullscreen\n{collapsescreen} Collapse-screen\n{up} Up\n{down} Down\n{relation} Relation\n{vertex} Vertex\n{load} Load\n### Reserved for later are:\n{copy} Copy\n{paste} Paste\n{alert} Alert\n{inspect} Inspect\n{nearby} Nearby\n{avatar} Avatar\n{outlink} Outlink\n" + "icons": "# List Icons & Tools\n\n### Feature editor\n{search} Search features\n\n### Top row\n{point} 'Add point' mode\n{line} 'Add line' mode\n{area} 'Add area' mode\n{undo} Undo\n{redo} Redo\n{save} Save changes\n\n### Right column\n{plus} Zoom in\n{minus} Zoom out\n{geolocate} Show my location\n{layers} Background settings\n{data} Map data\n{help} Help\n\n### Bottom row\n{bug} Report a bug\n{translate} Help translate\n", + "tools": "## Tools in the Editing Menu\n\n{move} Move\n{rotate} Rotate\n{reflect_long} Reflect at long axis\n{reflect_short} Reflect at short axis\n{continue} Continue line\n{reverse} Reverse direction\n{merge} Merge selected features into one or create relation\n{split} Split in two\n{disconnect} Disconnect\n{circularize} Circularize\n{orthogonalize} Orthogonalize\n{straighten} Straighten line\n{delete} Delete\n", + "reserved": "### Reserved for later use are:\n{apply} Apply\n{close} Close\n{backward} Backward\n{forward} Forward\n{fullscreen} Fullscreen\n{collapsescreen} Collapse screen\n{up} Up\n{down} Down\n{relation} Relation\n{vertex} Vertex\n{load} Load\n{copy} Copy\n{paste} Paste\n{simplify} Simplify\n{smooth} Smooth\n{alert} Alert\n{inspect} Inspect\n{nearby} Nearby\n{avatar} Avatar\n{outlink} Outlink\n" }, "relations": { "intro": "# Relations\n\nA relation is a special type of feature in OpenStreetMap that groups together\nother features. The most common type of relation is the *multipolygon*,\nwhich groups together several areas to define a complex area, which may\nconsist of several pieces or has holes in it like a donut. Another often\nused type of relation is the *Turn restriction*.\n\nTwo other common types of relations are *route relations*, which group together\nsections of road that belong to a specific highway, bus route, or hiking route,\nand *boundaries*, which group together sections of boundary lines like roads,\nrivers, plot boundaries, or other boundary lines.\n", - "members": "### Members\n\nThe group of features in a relation are called *members*. In the bottom of the\nfeature editor, 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", + "members": "### Members\n\nThe group of features in a relation are called *members*. At the bottom of the\nfeature editor, 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", "maintain": "### Maintaining\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", - "edit": "## Editing Relations\n\nTo add a feature to a relation, select the feature, click the {plus} button\nin the 'All relations' section of the feature editor, and select or type\nthe name of the relation.\n\nTo create a new relation, select the first feature that should be a member,\nclick the {plus} button in the 'All relations' section, and select 'New relation...'.\n\nTo remove a feature from a relation, select the feature and click the {delete} \nDelete button next to the relation you want to remove it from.\n", - "multipolygons": "### Multipolygons\n\nYou can create multipolygons with holes using the {merge} 'Merge' tool.\nDraw two areas (inner and outer) and select both.\nThen press either press the `C` shortcut key or right-click one\nof the selected areas and select the 'Merge' {plus} tool.\n", - "turnrestrictions": "### Turn restrictions\n\nYou can create turn restrictions in the feature editor when you select\nan intersection node common to two or more roads on the map.\nFor every turn connected with the intersection you can forbid U-turn and for\nevery other road you can forbid left-turn, straight-on or right-turn.\n" + "edit": "## Editing Relations\n\nTo add a feature to a relation, select the feature, click the `+` button\nin the 'All relations' section of the feature editor, and select or type\nthe 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 {delete} \n'Delete' button next to the relation you want to remove it from.\n", + "multipolygons": "### Multipolygons\n\nYou can create multipolygons with holes using the {merge} 'Merge' tool.\nDraw two or more areas (inner and outer) and select them.\nThen press either press the `C` shortcut key or right-click one\nof the selected areas and select the {merge} 'Merge' tool.\n", + "turnrestrictions": "### Turn restrictions\n\nYou can create turn restrictions when you select the point at a street\ncrossing of to two or more roads on the map.\nIn the feature editor your will find a graphical tool below 'Turn Restrictions'\nwhere you can select a road and disable U-turn and turns into every other road.\n" } }, "intro": { diff --git a/modules/ui/help.js b/modules/ui/help.js index e5703bf71..e432bc517 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -28,7 +28,7 @@ export function uiHelp(context) { ['help.addresses.',['intro','nodup','recommendation','points']], ['help.feature_editor.',['intro','select','fields','tags','undo']], ['help.imagery.',['intro','background','offset']], - ['help.iconstools.',['icons','tools','more']], + ['help.iconstools.',['icons','tools']], ['help.relations.',['intro','members','maintain','edit','multipolygons','turnrestrictions']] ]; @@ -67,7 +67,7 @@ export function uiHelp(context) { reverse: icon('#operation-reverse', 'pre-text'), continue: icon('#operation-continue', 'pre-text'), disconnect: icon('#operation-disconnect', 'pre-text'), - layers: icon('#operation-layers', 'pre-text'), + layers: icon('#icon-layers', 'pre-text'), vertex: icon('#icon-vertex', 'pre-text'), data: icon('#icon-data', 'pre-text'), down: icon('#icon-down', 'pre-text'), @@ -81,7 +81,8 @@ export function uiHelp(context) { close: icon('#icon-close', 'pre-text'), undo: icon('#icon-undo', 'pre-text'), redo: icon('#icon-redo', 'pre-text'), - save: icon('#icon-save', 'pre-text') + save: icon('#icon-save', 'pre-text'), + version: context.version }; var docs = docKeys.map(function(key) {