From 92d22d54f2006f83006f3912b23558aeda218090 Mon Sep 17 00:00:00 2001 From: tastrax Date: Wed, 22 Nov 2017 18:15:23 +1100 Subject: [PATCH 01/33] Preset for railway=miniature Go easy on me - first github project and pull request! --- data/presets/presets/railway/miniature.json | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 data/presets/presets/railway/miniature.json diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json new file mode 100644 index 000000000..240a4d8da --- /dev/null +++ b/data/presets/presets/railway/miniature.json @@ -0,0 +1,22 @@ +{ + "icon": "railway-rail", + "geometry": [ + "line" + ], + "tags": { + "railway": "miniature" + }, + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail" + ], + "terms": [ + "ridable miniature railway", + "narrow gauge railway", + "minimum gauge railway", + ], + "name": "Miniature Railway" +} From ff1a983a146f20e0a695e3ae15561f6db5a280ee Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Tue, 24 Oct 2017 20:03:13 +0200 Subject: [PATCH 02/33] New help texts --- data/core.yaml | 601 ++++++++++++++++++++++++++++--------------- dist/locales/en.json | 78 +++++- modules/ui/help.js | 44 +++- 3 files changed, 489 insertions(+), 234 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 7d41e40ae..9c0f21f69 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -268,7 +268,7 @@ en: 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}" truncated_list: "Edits by {users} and {count} others" @@ -554,282 +554,455 @@ en: help: title: "Help" key: H - help: | - # Help + help: + intro: | + # Help + + With this [OpenStreetMap](https://www.openstreetmap.org/) editor you can + add and update the free and editable map of the world online with your browser. + + opendata: | + ### Open Data + + 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. + + beforestart: | + ### Before you start + + You should be familiar with OpenStreetMap and this editor before you start editing. + The walkthrough will teach you the basics of editing on OpenStreetMap and you will + practice using the editor. It takes about 15 minutes and then you can start editing. + + opensource: | + ### Open Source + + The iD editor is a collaborative project with [source + code available on GitHub](https://github.com/openstreetmap/iD). + + othereditors: | + ### Other Editors + + While the iD editor is easy to use and requires only a browser, there are also other + [OSM-Editors](https://wiki.openstreetmap.org/wiki/Editors). + Also heavily used is JOSM, a highly expandable standalone Java desktop application. + + overview: + intro: | + # Overview + + This help will repeat and extend information from the walkthrough, which + you should have done by now. + + features: | + ### Features + + In OpenStreetMap we use the word *feature* to describe things that appear on the map. + Anything in the real world can be mapped as a feature on OpenStreetMap. + Features are represented on the map using *points*, *lines*, or *areas*. + Points are sometimes called nodes. Lines and areas are a connected line + of nodes and are sometimes called ways. + + screen: | + ### Screen + + 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. + + navigation: | + ### Navigation + + You can drag the map by pressing and holding the left mouse button + while moving the mouse around. This is also called panning. + 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. + + editing: + intro: | + # Editing & Saving + + To select a feature you want to edit, click on it on the map + or search for it by name in the feature editor. + Selected features are drawn with a pulsing glow and in the + feature editor the feature's type and attributes are shown. + If you right-click on it, the editing menu appears. + + multiselect: | + ### Multiselect + To select multiple features, hold down the 'Shift' key. + Then either click on the features you want to select, + or click, hold and move the mouse on the map to draw + a contour around those features. + All the points inside the lasso area will be selected. + + edit: | + ### Edit + + 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. + + save: | + ### Save + + Click `Save` to finish a group of edits - for instance, if you've completed + an area of town and would like to start on a new area. You'll have a chance + to review what you've done, and the editor supplies helpful suggestions + and warnings if something doesn't seem right about the changes. + + upload: | + ### Upload + + If everything looks good, you should explain your changes as a + [changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments) + and click `Upload` to post the changes to + [OpenStreetMap.org](https://www.openstreetmap.org/), where they will be visible + to all other users and available for others to build and improve upon. + + comeback: | + If you can't finish your edits in one sitting, you can leave the editor + window and come back (on the same browser and computer), and the + editor will offer to restore your work. + + roads: + intro: | + # Roads & Lines + + You can create, fix, and delete roads with this editor. Roads can be all + kinds: paths, highways, trails, cycle ways, and more - any used segment + is mapable. Roads are the most used type of lines. Other examples of + lines are waterways, walls, and fences. What you can do with roads + applies to most types of lines. + + modifying: | + ### Modifying + + Often you'll see roads that aren't aligned to the imagery behind them or + to a GPS track. You can adjust these roads so they are in the correct place. + Click on a road to select it and the pulsing glow will become visible. + All nodes of the road will be shown as small circles. + You can drag the nodes to better locations. + You can also create new nodes either by double-clicking on the road or by + moving the small triangles at the midpoints between nodes. + + move: | + ### Moving + + If you right-click the road the editing menu with several tools appears. + You can select the {move} 'Move' tool, move the entire road at one time, and + then click again to save that movement. You can also simply press the + `M` shortcut key, to start the move. + + connect: | + ### Connecting + + If the road connects to another road, but doesn't properly connect on + the map, you can drag one of its nodes onto the other road in + order to join them. The node will become grey inside. + + Having roads connected properly is important for the map + and essential for providing driving directions. + If two road are connected on the map but not in reality, + you can disconnect them with right-click the connecting node and select + the {disconnect} 'Disconnect' tool or press the `D` shortcut key. + + If you know that the crossing has traffic lights or crossswalks, + you can add them by selecting the connecting node and using the + feature editor to select the correct feature's type. + + attributes: | + ### Attribues + + When a road is selected on the left side the feature editor will show + the type of the road and many attributes like name, speed limit, lines, + and surface. You can modify fields or even add new ones. + + delete: | + ### Deleting + + If a road is entirely incorrect - you can see that it doesn't exist in satellite + imagery and ideally have confirmed locally that it's not present - you can delete + it, which removes it from the map. Be cautious when deleting features - + like any other edit, the results are seen by everyone and satellite imagery + is often out of date, so the road could simply be newly built. + + You can delete a road by clicking on it to select it, then pressing the 'Delete' + key or right-clicking it and then using the {delete} 'Delete' tool. + + create: | + ### 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 + a line. + + Click on the start of the road on the map to start drawing. If the road + branches off from an existing road, start by clicking on the place where they connect. + + Then click on points along the road so that it follows the right path, according + to satellite imagery or GPS. If the road you are drawing crosses another road, connect + it by clicking on the intersection point. When you're done drawing, double-click + or press 'Return' or 'Enter' on your keyboard. + + gps: + intro: | + # GPS + + Collected GPS traces are one valuable source of data for OpenStreetMap. This editor + supports local traces - `.gpx` files on your local computer. You can collect + this kind of GPS trace with a number of smartphone applications as well as + personal GPS hardware. - This is an editor for [OpenStreetMap](http://www.openstreetmap.org/), the - free and editable map of the world. You can use it to add and update - data in your area, making an open-source and open-data map of the world - better for everyone. + For information on how to perform a GPS survey, read + [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/). - Edits that you make on this map will be visible to everyone who uses - OpenStreetMap. In order to make an edit, you'll need to - [log in](https://www.openstreetmap.org/login). + using: | + ### Using - The [iD editor](http://ideditor.com/) is a collaborative project with [source - code available on GitHub](https://github.com/openstreetmap/iD). - editing_saving: | - # Editing & Saving + 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, + disable, or zoom to this new GPX-powered layer. - This editor is designed to work primarily online, and you're accessing - it through a website right now. + The GPX track isn't directly uploaded 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, and also to [upload it to OpenStreetMap](https://www.openstreetmap.org/trace/create) + for other users to use. - ### Selecting Features + buildings: + intro: | + # Buildings & Areas - To select a map feature, like a road or point of interest, click on it on - the map. This will highlight the selected feature and load a sidebar with - details about it. If you right-click on it, it will show a menu of things - you can do with the feature. + OpenStreetMap is the world's largest database of buildings. + You can improve this database. Buildings are the most used type + of areas, others are landuse, lakes, ponds, or forests. + What you can do with buildings applies to most types of areas. - To select multiple features, hold down the 'Shift' key. Then either click - on the features you want to select, or drag on the map to draw a contour - around those features. All the points inside the lasso area will be selected. + select: | + ### Selecting - ### Saving Edits + You can select a building by clicking on its border. the pulsing glow will + will become visible, all nodes will be shown as circles and the + feature editor on the left will show the type of the building and + attributes like name, levels, and address. - When you make changes like editing roads, buildings, 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 button, and redo - changes by clicking the redo button. + modify: | + ### Modifying - Click 'Save' to finish a group of edits - for instance, if you've completed - an area of town and would like to start on a new area. You'll have a chance - to review what you've done, and the editor supplies helpful suggestions - and warnings if something doesn't seem right about the changes. + Sometimes buildings are incorrectly placed or have incorrect tags. + To move an entire building, select it and press the `M` shortcut key, + or right-click it and select the {move} 'Move' tool. Move your + mouse to shift the building, and click when it's correctly placed. - If everything looks good, you can enter a short comment explaining the change - you made, and click 'Upload' to post the changes to - [OpenStreetMap.org](http://www.openstreetmap.org/), where they will be visible - to all other users and available for others to build and improve upon. + To fix the specific shape of a building, click and drag the nodes that form + its border into better places. - If you can't finish your edits in one sitting, you can leave the editor - window and come back (on the same browser and computer), and the - editor application will offer to restore your work. - - ### Using the editor + create: | + ### Creating - You can view a list of keyboard shortcuts by pressing the `?` key. + One of the main questions around adding buildings to the map is that + OpenStreetMap records buildings both as shapes and points. The rule of thumb + is to _map a building as a shape whenever possible_, and map companies, homes, + amenities, and other things that operate out of buildings as points placed + within the building shape. - roads: | - # Roads + Start drawing a building as a shape by clicking the {area} Area button in the top + left of the map, and end it either by pressing 'Return' on your keyboard + or clicking on the first node drawn or clicking again on the last node drawn + to close the shape. - You can create, fix, and delete roads with this editor. Roads can be all - kinds: paths, highways, trails, cycleways, and more - any often-crossed - segment should be mappable. + Then you assign the type of the building to the outline with the feature editor. + Most buildings are houses, if you're not sure choose the generic Building type. - ### Selecting - - Click on a road to select it. An outline should become visible, along - with a sidebar showing more information about the road. If you right-click - on it, you'll have a menu of actions you can apply on the road. + delete: | + ### Deleting - ### Modifying + If a building is entirely incorrect - you can see that it doesn't exist in satellite + imagery and ideally have confirmed locally that it's not present - you can delete + it, which removes it from the map. Be cautious when deleting features - + like any other edit, the results are seen by everyone and satellite imagery + is often out of date, so the building could simply be newly built. - Often you'll see roads that aren't aligned to the imagery behind them - or to a GPS track. You can adjust these roads so they are in the correct - place. + 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. - First click on the road you want to change. This will highlight it and show - control points along it that you can drag to better locations. If - you want to add new control points for more detail, double-click a part - of the road without a node, and one will be added. + addresses: + intro: | + # Addresses & Points - If the road connects to another road, but doesn't properly connect on - the map, you can drag one of its control points onto the other road in - order to join them. Having roads connect is important for the map - and essential for providing driving directions. + Addresses are some of the most useful information for the map. - You can also right-click on it and select the 'Move' tool, or simply press - the `M` shortcut key, to move the entire road at one time, and then click - again to save that movement. + Address information can be added to OpenStreetMap using a variety of methods, + such as adding a simple point containing an address, adding address information + to a building, site or other area, or alternatively to an entrance node. - ### Deleting + nodup: | + ### No duplication - If a road is entirely incorrect - you can see that it doesn't exist in satellite - imagery and ideally have confirmed locally that it's not present - you can delete - it, which removes it from the map. Be cautious when deleting features - - like any other edit, the results are seen by everyone and satellite imagery - is often out of date, so the road could simply be newly built. + Usually address informations doesn't need to be duplicated, e.g. when there + is a building outline on the map and several shops as points inside, + only the building should have an address. - You can delete a road by clicking on it to select it, then pressing the 'Delete' - key or right-clicking it and then clicking the trash can icon. + recommendation: | + ### Recommendation - ### Creating + Most buildings and sites have only one address and it is recommeded to add + the address to the building as a whole. If there is no building on the map + and you cannot draw one, you should add an address point to the map. - Found somewhere there should be a road but there isn't? Click the 'Line' - icon in the top-left of the editor or press the shortcut key `2` to start drawing - a line. + Some buildings or sites have more than one address. You can add the + addresses as separate points inside the building. - Click on the start of the road on the map to start drawing. If the road - branches off from an existing road, start by clicking on the place where they connect. + points: | + ### Other Points - Then click on points along the road so that it follows the right path, according - to satellite imagery or GPS. If the road you are drawing crosses another road, connect - it by clicking on the intersection point. When you're done drawing, double-click - or press 'Return' or 'Enter' on your keyboard. - gps: | - # GPS + While addresses are still the most common type of point feature, + there are other often used types like trees, towers, or poles. - Collected GPS traces are one valuable source of data for OpenStreetMap. This editor - supports local traces - `.gpx` files on your local computer. You can collect - this kind of GPS trace with a number of smartphone applications as well as - personal GPS hardware. + 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. - For information on how to perform a GPS survey, read - [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/). + feature_editor: + intro: | + # Feature Editor - 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, - disable, or zoom to this new GPX-powered layer. + The feature editor is the section on the left side of the page that allows you to + edit the details of the selected feature. - The GPX track isn't directly uploaded 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, and also to [upload it to OpenStreetMap](http://www.openstreetmap.org/trace/create) - for other users to use. - imagery: | - # Imagery + select: | + ### Selecting a Feature Type - 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. + After you add a point, line, or area, you can choose what type of feature it + is, like whether it's a highway or residential road, supermarket or cafe. + The feature editor will display buttons for common feature types, and you can + find others by typing what you're looking for in the search box. + + Click the 'i' in the top-right-hand corner of a feature type button to + learn more about it. Click a button to choose that type. - By default a [Bing Maps](http://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 will become available. Some countries, like the United - States, France, and Denmark have very high-quality imagery available for some areas. + fields: | + ### Fields - Imagery is sometimes offset from the map data because of a mistake on the - imagery provider's side. If you see a lot of roads shifted from the background, - don't immediately move them all to match the background. Instead you can adjust - the imagery so that it matches the existing data by clicking 'Fix alignment' at - the bottom of the Background Settings UI. - addresses: | - # Addresses + After you choose a feature type, or when you select a feature that already + has a type assigned, the feature editor will display fields with details about + the feature like its name or speed limit for a road or levels and address for a building. - Addresses are some of the most useful information for the map. + Below the fields you see, you can click the `Add field` dropdown to add + other details, like a Wikipedia link, wheelchair access, and more. - Although addresses are often represented as parts of streets, in OpenStreetMap - they're recorded as attributes of buildings and places along streets. + tags: | + ### Tags - You can add address information to places mapped as building outlines - as well as those mapped as single points. The optimal source of address - data is from an on-the-ground survey or personal knowledge - as with any - other feature, copying from commercial sources like Google Maps is strictly - forbidden. - inspector: | - # Using the Inspector + Below that you see the tags which is how the fields are stored in OpenStreetMap. + If you cannot find the feature's type with the feature editor or you + cannot add required fields, then you can add additional tags with the `+` button. - The inspector is the section on the left side of the page that allows you to - edit the details of the selected feature. + You will find many tags in the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/), + also [Taginfo](https://taginfo.openstreetmap.org/) is a + great resource to learn more about popular tag combinations. + + undo: | + ### Undo & Redo - ### Selecting a Feature Type + 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. - After you add a point, line, or area, you can choose what type of feature it - is, like whether it's a highway or residential road, supermarket or cafe. - The inspector will display buttons for common feature types, and you can - find others by typing what you're looking for in the search box. + imagery: + intro: | + # Imagery - Click the 'i' in the bottom-right-hand corner of a feature type button to - learn more about it. Click a button to choose that type. + 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. - ### Using Forms and Editing Tags + background: | + ### Background - After you choose a feature type, or when you select a feature that already - has a type assigned, the inspector will display fields with details about - the feature like its name and address. + 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 '*'. - Below the fields you see, you can click the 'Add field' dropdown to add - other details, like a Wikipedia link, wheelchair access, and more. + offset: | + ### Offset - At the bottom of the inspector, click 'Additional tags' to add arbitrary - other tags to the element. [Taginfo](http://taginfo.openstreetmap.org/) is a - great resource for learn more about popular tag combinations. + Imagery is sometimes offset from the map data because of a mistake on the + imagery provider's side. If you see a lot of roads shifted from the background, + don't immediately move them all to match the background. Instead you can adjust + the imagery so that it matches the existing data by clicking 'Fix alignment' at + the bottom of the Background Settings. - Changes you make in the inspector are automatically applied to the map. - You can undo them at any time by clicking the 'Undo' button. - buildings: | - # Buildings + relations: + intro: | + # Relations - OpenStreetMap is the world's largest database of buildings. You can create - and improve this database. + A relation is a special type of feature in OpenStreetMap that groups together + other features. The most common type of relation is the *multipolygon*, + which groups together several areas to define a complex area, which may + consist of several pieces or has holes in it like a donut. Another often + used type of relation is the *Turn restriction*. - ### Selecting + Two other common types of relations are *route relations*, which group together + sections of road that belong to a specific highway, bus route, or hiking route, + and *boundaries*, which group together sections of boundary lines like roads, + rivers, plot boundaries, or other boundary lines. - You can select a building by clicking on its border. This will highlight the - building and load a sidebar showing more information about the building. - If you right-click on it, it will show a menu of actions you can execute - in the building. + members: | + ### Members - ### Modifying + The group of features in a relation are called *members*. In 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. - Sometimes buildings are incorrectly placed or have incorrect tags. + maintain: | + ### Maintaining - To move an entire building, select it and press the 'M' shortcut key, - or right-click it and select the 'Move' tool. Move your - mouse to shift the building, and click when it's correctly placed. + For the most part, iD will take care of maintaining relations automatically + while you edit. The main thing you should be aware of is that if you delete a + section of road to redraw it more accurately, you should make sure that the + new section is a member of the same relations as the original. - To fix the specific shape of a building, click and drag the nodes that form - its border into better places. + edit: | + ## Editing Relations - ### Creating + To add a feature to a relation, select the feature, click the {plus} button + in the 'All relations' section of the feature editor, and select or type + the name of the relation. - One of the main questions around adding buildings to the map is that - OpenStreetMap records buildings both as shapes and points. The rule of thumb - is to _map a building as a shape whenever possible_, and map companies, homes, - amenities, and other things that operate out of buildings as points placed - within the building shape. + 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...'. - Start drawing a building as a shape by clicking the 'Area' button in the top - left of the interface, and end it either by pressing 'Return' on your keyboard - or clicking on the first node drawn to close the shape. + 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. - ### Deleting + multipolygons: | + ### Multipolygons - If a building is entirely incorrect - you can see that it doesn't exist in satellite - imagery and ideally have confirmed locally that it's not present - you can delete - it, which removes it from the map. Be cautious when deleting features - - like any other edit, the results are seen by everyone and satellite imagery - is often out of date, so the building could simply be newly built. + You can create multipolygons with holes using the {merge} 'Merge' tool. + Draw two areas (inner and outer) and select both. + Then press either press the `C` shortcut key or right-click one + of the selected areas and select the 'Merge' {plus} tool. - You can delete a building by clicking on it to select it, then pressing the 'Delete' - key, or right-clicking it and then clicking the trash can icon. - relations: | - # Relations + turnrestrictions: | + ### Turn restrictions - A relation is a special type of feature in OpenStreetMap that groups together - other features. For example, two common types of relations are *route relations*, - which group together sections of road that belong to a specific freeway or - highway, and *multipolygons*, which group together several lines that define - a complex area (one with several pieces or holes in it like a donut). + 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. - The group of features in a relation are called *members*. In the bottom of the - sidebar, 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. - For the most part, iD will take care of maintaining relations automatically - while you edit. The main thing you should be aware of is that if you delete a - section of road to redraw it more accurately, you should make sure that the - new section is a member of the same relations as the original. - - ## Editing Relations - - If you want to edit relations, here are the basics. - - To add a feature to a relation, select the feature, click the "+" button in the - "All relations" section of the sidebar, 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 "+" button in the "All relations" section, and select "New relation...". - - To remove a feature from a relation, select the feature and click the trash - button next to the relation you want to remove it from. - - You can create multipolygons with holes using the "Merge" tool. Draw two areas (inner - and outer), hold the Shift key and click on each of them to select them both, and then - press the 'C' shortcut key. Other option is to select both, and then right-click one - of the and click the "Merge" (+) button. intro: done: done ok: OK diff --git a/dist/locales/en.json b/dist/locales/en.json index 8db61b9f2..588e09b18 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -342,7 +342,7 @@ "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}", @@ -680,15 +680,73 @@ "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": { + "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", + "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", + "othereditors": "### Other Editors\n\nWhile the iD editor is easy to use and requires only a browser, there are also other\n[OSM-Editors](https://wiki.openstreetmap.org/wiki/Editors).\nAlso heavily used is JOSM, a highly expandable standalone Java desktop application.\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" + }, + "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", + "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" + }, + "roads": { + "intro": "# Roads & Lines\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycle ways, and more - any used segment\nis mapable. Roads are the most used type of lines. Other examples of\nlines are waterways, walls, and fences. What you can do with roads\napplies to most types of lines.\n", + "modifying": "### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them or\nto a GPS track. You can adjust these roads so they are in the correct place.\nClick on a road to select it and the pulsing glow will become visible.\nAll nodes of the road will be shown as small circles.\nYou can drag the nodes to better locations.\nYou can also create new nodes either by double-clicking on the road or by\nmoving the small triangles at the midpoints between nodes.\n", + "move": "### Moving\n\nIf you right-click the road the editing menu with several tools appears.\nYou can select the {move} 'Move' tool, move the entire road at one time, and\nthen click again to save that movement. You can also simply press the\n`M` shortcut key, to start the move.\n", + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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" + }, + "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", + "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" + }, + "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", + "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" + } }, "intro": { "done": "done", diff --git a/modules/ui/help.js b/modules/ui/help.js index aafe0c152..620dd5e50 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -13,23 +13,47 @@ import { uiShortcuts } from './shortcuts'; import { uiTooltipHtml } from './tooltipHtml'; import { tooltip } from '../util/tooltip'; +import { icon } from 'intro/helper'; + export function uiHelp(context) { var key = t('help.key'); var docKeys = [ - 'help.help', - 'help.editing_saving', - 'help.roads', - 'help.gps', - 'help.imagery', - 'help.addresses', - 'help.inspector', - 'help.buildings', - 'help.relations']; + ['help.help.',['intro','opendata','beforestart','opensource','othereditors']], + ['help.overview.',['intro','features','screen','navigation']], + ['help.editing.',['intro','multiselect','edit','save','upload','comeback']], + ['help.roads.',['intro','move','connect','attributes','delete','create']], + ['help.gps.',['intro','using']], + ['help.buildings.',['intro','select','modify','create','delete']], + ['help.addresses.',['intro','nodup','recommendation','points']], + ['help.feature_editor.',['intro','select','fields','tags','undo']], + ['help.imagery.',['intro','background','offset']], + ['help.relations.',['intro','members','maintain','edit','multipolygons','turnrestrictions']] + ]; + + var icont = { + apply: icon('#icon-apply', 'pre-text'), + area: icon('#icon-area', 'pre-text'), + help: icon('#icon-help', 'pre-text'), + line: icon('#icon-line', 'pre-text'), + minus: icon('#icon-minus', 'pre-text'), + plus: icon('#icon-plus', 'pre-text'), + point: icon('#icon-point', 'pre-text'), + mapdata: icon('#logo-layers', 'pre-text'), + circularize: icon('#operation-circularize', 'pre-text'), + delete: icon('#operation-delete', 'pre-text'), + orthogonalize: icon('#operation-orthogonalize', 'pre-text'), + split: icon('#operation-split', 'pre-text'), + undo: icon('#operation-undo', 'pre-text'), + redo: icon('#operation-redo', 'pre-text'), + save: icon('#operation-save', 'pre-text'), + move: icon('#operation-move', 'pre-text'), + disconnect: icon('#operation-disconnect', 'pre-text') + }; var docs = docKeys.map(function(key) { - var text = t(key); + var text = key[1].reduce(function(all,part) { return all + t(key[0].concat(part),icont); }, ''); return { title: text.split('\n')[0].replace('#', '').trim(), html: marked(text.split('\n').slice(1).join('\n')) From 6a711552e4a7c0743640a1d1a41a5368f829b566 Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Wed, 25 Oct 2017 09:12:32 +0200 Subject: [PATCH 03/33] Remove other editors --- data/core.yaml | 7 ------- dist/locales/en.json | 3 +-- modules/ui/help.js | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 9c0f21f69..6c0fff188 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -582,13 +582,6 @@ en: The iD editor is a collaborative project with [source code available on GitHub](https://github.com/openstreetmap/iD). - othereditors: | - ### Other Editors - - While the iD editor is easy to use and requires only a browser, there are also other - [OSM-Editors](https://wiki.openstreetmap.org/wiki/Editors). - Also heavily used is JOSM, a highly expandable standalone Java desktop application. - overview: intro: | # Overview diff --git a/dist/locales/en.json b/dist/locales/en.json index 588e09b18..6e308a82f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -684,8 +684,7 @@ "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", "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", - "othereditors": "### Other Editors\n\nWhile the iD editor is easy to use and requires only a browser, there are also other\n[OSM-Editors](https://wiki.openstreetmap.org/wiki/Editors).\nAlso heavily used is JOSM, a highly expandable standalone Java desktop application.\n" + "opensource": "### Open Source\n\nThe iD editor is a collaborative project with [source\ncode available 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", diff --git a/modules/ui/help.js b/modules/ui/help.js index 620dd5e50..b63d7ed3c 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -20,7 +20,7 @@ export function uiHelp(context) { var key = t('help.key'); var docKeys = [ - ['help.help.',['intro','opendata','beforestart','opensource','othereditors']], + ['help.help.',['intro','opendata','beforestart','opensource']], ['help.overview.',['intro','features','screen','navigation']], ['help.editing.',['intro','multiselect','edit','save','upload','comeback']], ['help.roads.',['intro','move','connect','attributes','delete','create']], From 84ac7df859bb2c9ab5ae3ae85c61f2ddb9b3b891 Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Fri, 27 Oct 2017 18:00:03 +0200 Subject: [PATCH 04/33] add icons and tools --- data/core.yaml | 66 ++++++++++++++++++++++++++++++++++++++++++++ dist/locales/en.json | 5 ++++ modules/ui/help.js | 54 ++++++++++++++++++++++++++++-------- 3 files changed, 114 insertions(+), 11 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 6c0fff188..87ff24ce1 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -935,6 +935,72 @@ en: the imagery so that it matches the existing data by clicking 'Fix alignment' at the bottom of the Background Settings. + iconstools: + icons: | + # Icons & Tools + + ### Top row: + {search} Search features + {point} 'Add point' mode + {line} 'Add line' mode + {area} 'Add area' mode + {undo} Undo + {redo} Redo + {save} Save changes + ### Right column: + {plus} Zoom in + {minus} Zoom out + {geolocate} Show my location + {layers} Background settings + {data} Data data + {help} Help + ### Bottom row: + {bug} Report a bug + {translate} Help translate + + tools: | + ## Tools + + 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 + {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} + {apply} Apply + {close} Close + {backward} Backward + {forward} Forward + {fullscreen} Fullscreen + {collapsescreen} Collapse-screen + {up} Up + {down} Down + {relation} Relation + {vertex} Vertex + {load} Load + ### Reserved for later are: + {copy} Copy + {paste} Paste + {alert} Alert + {inspect} Inspect + {nearby} Nearby + {avatar} Avatar + {outlink} Outlink + relations: intro: | # Relations diff --git a/dist/locales/en.json b/dist/locales/en.json index 6e308a82f..f8730dbb8 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -738,6 +738,11 @@ "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", "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" + }, "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", diff --git a/modules/ui/help.js b/modules/ui/help.js index b63d7ed3c..344e45c77 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -15,7 +15,6 @@ import { tooltip } from '../util/tooltip'; import { icon } from 'intro/helper'; - export function uiHelp(context) { var key = t('help.key'); @@ -29,27 +28,61 @@ 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.relations.',['intro','members','maintain','edit','multipolygons','turnrestrictions']] ]; var icont = { + more: icon('#icon-more', 'pre-text'), apply: icon('#icon-apply', 'pre-text'), + alert: icon('#icon-alert', 'pre-text'), + avatar: icon('#icon-avatar', 'pre-text'), + forward: icon('#icon-forward', 'pre-text'), + backward: icon('#icon-backward', 'pre-text'), + fullscreen: icon('#icon-full-screen', 'pre-text'), + collapsescreen: icon('#icon-collapse-screen', 'pre-text'), + geolocate: icon('#icon-geolocate', 'pre-text'), + load: icon('#icon-load', 'pre-text'), + search: icon('#icon-search', 'pre-text'), + bug: icon('#icon-bug', 'pre-text'), + point: icon('#icon-point', 'pre-text'), + line: icon('#icon-line', 'pre-text'), area: icon('#icon-area', 'pre-text'), help: icon('#icon-help', 'pre-text'), - line: icon('#icon-line', 'pre-text'), - minus: icon('#icon-minus', 'pre-text'), plus: icon('#icon-plus', 'pre-text'), - point: icon('#icon-point', 'pre-text'), - mapdata: icon('#logo-layers', 'pre-text'), + minus: icon('#icon-minus', 'pre-text'), + nearby: icon('#icon-nearby', 'pre-text'), + outlink: icon('#icon-out-link', 'pre-text'), + relation: icon('#icon-relation', 'pre-text'), + translate: icon('#icon-translate', 'pre-text'), circularize: icon('#operation-circularize', 'pre-text'), - delete: icon('#operation-delete', 'pre-text'), orthogonalize: icon('#operation-orthogonalize', 'pre-text'), split: icon('#operation-split', 'pre-text'), - undo: icon('#operation-undo', 'pre-text'), - redo: icon('#operation-redo', 'pre-text'), - save: icon('#operation-save', 'pre-text'), + reflect_long: icon('#operation-reflect-long', 'pre-text'), + reflect_short: icon('#operation-reflect-short', 'pre-text'), + simplify: icon('#operation-simplify', 'pre-text'), + smooth: icon('#operation-smooth', 'pre-text'), + straighten: icon('#operation-straighten', 'pre-text'), + rotate: icon('#operation-rotate', 'pre-text'), + reverse: icon('#operation-reverse', 'pre-text'), + continue: icon('#operation-continue', 'pre-text'), + disconnect: icon('#operation-disconnect', 'pre-text'), + layers: icon('#operation-layers', 'pre-text'), + vertex: icon('#icon-vertex', 'pre-text'), + data: icon('#icon-data', 'pre-text'), + down: icon('#icon-down', 'pre-text'), + up: icon('#icon-up', 'pre-text'), + inspect: icon('#icon-inspect', 'pre-text'), + geolocate: icon('#icon-geolocate', 'pre-text'), move: icon('#operation-move', 'pre-text'), - disconnect: icon('#operation-disconnect', 'pre-text') + merge: icon('#operation-merge', 'pre-text'), + copy: icon('#operation-copy', 'pre-text'), + paste: icon('#operation-paste', 'pre-text'), + delete: icon('#operation-delete', 'pre-text'), + close: icon('#icon-close', 'pre-text'), + undo: icon('#icon-undo', 'pre-text'), + redo: icon('#icon-redo', 'pre-text'), + save: icon('#icon-save', 'pre-text') }; var docs = docKeys.map(function(key) { @@ -60,7 +93,6 @@ export function uiHelp(context) { }; }); - function help(selection) { function hide() { From 365290669dea0e29344436775ccff6269655eb4f Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Fri, 27 Oct 2017 18:11:55 +0200 Subject: [PATCH 05/33] remove duplicate key geolocate --- modules/ui/help.js | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/ui/help.js b/modules/ui/help.js index 344e45c77..e5703bf71 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -73,7 +73,6 @@ export function uiHelp(context) { down: icon('#icon-down', 'pre-text'), up: icon('#icon-up', 'pre-text'), inspect: icon('#icon-inspect', 'pre-text'), - geolocate: icon('#icon-geolocate', 'pre-text'), move: icon('#operation-move', 'pre-text'), merge: icon('#operation-merge', 'pre-text'), copy: icon('#operation-copy', 'pre-text'), From 05df663783c5a4b5dc28c9324c743dd883010deb Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Sun, 29 Oct 2017 18:24:29 +0100 Subject: [PATCH 06/33] Add List of Icons & Tools --- data/core.yaml | 90 ++++++++++++++++++++++---------------------- dist/locales/en.json | 38 +++++++++---------- modules/ui/help.js | 7 ++-- 3 files changed, 69 insertions(+), 66 deletions(-) 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) { From 16c3a96777966761aec317f0193076d3b5030016 Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Sun, 29 Oct 2017 22:33:04 +0100 Subject: [PATCH 07/33] improve relations --- data/core.yaml | 110 ++++++++++++++++++++++++------------------- dist/locales/en.json | 22 ++++----- modules/ui/help.js | 2 +- 3 files changed, 74 insertions(+), 60 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 9515c4a7f..011b0b8c2 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -568,7 +568,8 @@ en: OpenStreetMap. They can be visible on every map based on OpenStreetMap. 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. + [Copying from commercial sources](https://www.openstreetmap.org/copyright) + like Google Maps is strictly forbidden. beforestart: | ### Before you start @@ -580,8 +581,9 @@ en: opensource: | ### Open Source - 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) + The iD editor is a collaborative project 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). @@ -604,9 +606,10 @@ en: screen: | ### Screen - 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} search for features and edit feature's type and attributes. + This help is on top of the map area which shows a background imagery + and features on top of it. Here you can edit where the features are. + On the left side is the *feature editor*, there you can edit feature's type + and attributes and also {search} search for features and features's type. navigation: | ### Navigation @@ -939,17 +942,23 @@ en: iconstools: icons: | - # List Icons & Tools + # Icons & Tools + + The icons used in this editor are made to be easily understandable + and all give you more information with mouse-over. + Here icons are often used. ### Feature editor {search} Search features + {apply} Apply + {close} Close ### Top row {point} 'Add point' mode {line} 'Add line' mode {area} 'Add area' mode - {undo} Undo - {redo} Redo + {undo} Undo changes + {redo} Redo changes {save} Save changes ### Right column @@ -967,35 +976,35 @@ en: tools: | ## Tools in the Editing Menu + With right-click on features you can use these tools. + {move} Move {rotate} Rotate {reflect_long} Reflect at long axis {reflect_short} Reflect at short axis {continue} Continue line {reverse} Reverse direction - {merge} Merge selected features into one or create relation + {straighten} Straighten line + {merge} Merge selected features {split} Split in two {disconnect} Disconnect {circularize} Circularize {orthogonalize} Orthogonalize - {straighten} Straighten line {delete} Delete reserved: | ### Reserved for later use are: - {apply} Apply - {close} Close - {backward} Backward {forward} Forward - {fullscreen} Fullscreen - {collapsescreen} Collapse screen + {backward} Backward {up} Up {down} Down + {fullscreen} Fullscreen + {collapsescreen} Collapse screen {relation} Relation {vertex} Vertex - {load} Load {copy} Copy {paste} Paste + {load} Load {simplify} Simplify {smooth} Smooth {alert} Alert @@ -1006,26 +1015,47 @@ en: relations: intro: | - # Relations + # Relations & Members - A relation is a special type of feature in OpenStreetMap that groups together - other features. The most common type of relation is the *multipolygon*, + A *relation* is a special type of feature in OpenStreetMap that groups together other + features, called *members* of the relation. Every member of a relation can have a + *role* for the relation. At the bottom of the feature editor, you can see which + relations a feature is a member of, and the click on a relation there will select it. + When the relation is selected, you can see all of its members highlighted on the map + and listed in the feature editor together with their role for the relation. + + types: | + ### Common Types + + The most common type of relation is the *multipolygon*, which groups together several areas to define a complex area, which may - consist of several pieces or has holes in it like a donut. Another often - used type of relation is the *Turn restriction*. + consist of several pieces or has holes in it like a donut. + Another type of relation is the *Turn restriction* which groups togehter two + roads segments at a crossing to disable turning options. - Two other common types of relations are *route relations*, which group together + Two other types of relations are *route relations*, which group together sections of road that belong to a specific highway, bus route, or hiking route, - and *boundaries*, which group together sections of boundary lines like roads, - rivers, plot boundaries, or other boundary lines. + and *boundaries*, which group together sections of boundary lines which may be + roads, rivers, or plot boundaries at the same time. - members: | - ### Members + multipolygons: | + ### Multipolygons - 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. + Draw two or more areas and select them. Then press either press + the `C` shortcut key or right-click one of the selected areas and + select the {merge} 'Merge' tool. This will create a new multipolygon + relation with all selected areas as members. The areas will have the role + outer except When a area is inside another area it will have the role inner + and become the hole in the outer area. + + turnrestrictions: | + ### Turn restrictions + + Select the crossing node of two or more roads. In the feature editor + you will see the roads connected to the crossing below 'Turn Restrictions'. + There you can select a road and disable U-turn and turns into every other road. + This will create a turn restriction multipolygon with both roads and the + crossing as members with roles from, to, and via. maintain: | ### Maintaining @@ -1036,7 +1066,7 @@ en: new section is a member of the same relations as the original. edit: | - ## Editing Relations + ### Editing Relations 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 @@ -1048,22 +1078,6 @@ en: 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. - multipolygons: | - ### Multipolygons - - You can create multipolygons with holes using the {merge} 'Merge' tool. - 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} 'Merge' tool. - - turnrestrictions: | - ### Turn restrictions - - 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 ok: OK diff --git a/dist/locales/en.json b/dist/locales/en.json index 3ebd624b4..df586800f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -682,14 +682,14 @@ "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. \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", + "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.\n[Copying from commercial sources](https://www.openstreetmap.org/copyright)\nlike 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\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" + "opensource": "### Open Source\n\nThe iD editor is a collaborative project and you use version {version} now.\nYou can contribute and {translate}\n[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} search for features and edit feature's type and attributes.\n", + "screen": "### Screen\n\nThis help is on top of the map area which shows a background imagery\nand features on top of it. Here you can edit where the features are.\nOn the left side is the *feature editor*, there you can edit feature's type\nand attributes and also {search} search for features and features's type.\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": { @@ -739,17 +739,17 @@ "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": "# 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" + "icons": "# Icons & Tools\n\nThe icons used in this editor are made to be easily understandable\nand all give you more information with mouse-over.\nHere icons are often used.\n\n### Feature editor\n{search} Search features\n{apply} Apply\n{close} Close\n\n### Top row\n{point} 'Add point' mode\n{line} 'Add line' mode\n{area} 'Add area' mode\n{undo} Undo changes\n{redo} Redo changes\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\nWith right-click on features you can use these tools.\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{straighten} Straighten line\n{merge} Merge selected features\n{split} Split in two\n{disconnect} Disconnect\n{circularize} Circularize\n{orthogonalize} Orthogonalize\n{delete} Delete\n", + "reserved": "### Reserved for later use are:\n{forward} Forward\n{backward} Backward\n{up} Up\n{down} Down\n{fullscreen} Fullscreen\n{collapsescreen} Collapse screen\n{relation} Relation\n{vertex} Vertex\n{copy} Copy\n{paste} Paste\n{load} Load\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*. 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", + "intro": "# Relations & Members\n\nA *relation* is a special type of feature in OpenStreetMap that groups together other\nfeatures, called *members* of the relation. Every member of a relation can have a\n*role* for the relation. At the bottom of the feature editor, you can see which\nrelations a feature is a member of, and the click on a relation there will select it.\nWhen the relation is selected, you can see all of its members highlighted on the map\nand listed in the feature editor together with their role for the relation.\n", + "types": "### Common Types\n\nThe 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.\nAnother type of relation is the *Turn restriction* which groups togehter two\nroads segments at a crossing to disable turning options.\n\nTwo other 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 which may be\nroads, rivers, or plot boundaries at the same time.\n", + "multipolygons": "### Multipolygons\n\nDraw two or more areas and select them. Then press either press\nthe `C` shortcut key or right-click one of the selected areas and \nselect the {merge} 'Merge' tool. This will create a new multipolygon\nrelation with all selected areas as members. The areas will have the role\nouter except When a area is inside another area it will have the role inner\nand become the hole in the outer area.\n", + "turnrestrictions": "### Turn restrictions\n\nSelect the crossing node of two or more roads. In the feature editor\nyou will see the roads connected to the crossing below 'Turn Restrictions'.\nThere you can select a road and disable U-turn and turns into every other road.\nThis will create a turn restriction multipolygon with both roads and the\ncrossing as members with roles from, to, and via.\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 `+` 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" + "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" } }, "intro": { diff --git a/modules/ui/help.js b/modules/ui/help.js index e432bc517..97429edf9 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -29,7 +29,7 @@ export function uiHelp(context) { ['help.feature_editor.',['intro','select','fields','tags','undo']], ['help.imagery.',['intro','background','offset']], ['help.iconstools.',['icons','tools']], - ['help.relations.',['intro','members','maintain','edit','multipolygons','turnrestrictions']] + ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']] ]; var icont = { From 13ccad0241f32dd9029dcf5a3c6d2e5fb7de08e0 Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Mon, 30 Oct 2017 08:49:54 +0100 Subject: [PATCH 08/33] correct typos --- data/core.yaml | 38 +++++++++++++++++++------------------- dist/locales/en.json | 32 ++++++++++++++++---------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 011b0b8c2..283f7c060 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -4,7 +4,7 @@ en: title: Area description: "Add parks, buildings, lakes or other areas to the map." tail: "Click on the map to start drawing an area, like a park, lake, or building." - add_line: + sadd_line: title: Line description: "Add highways, streets, pedestrian paths, canals or other lines to the map." tail: "Click on the map to start drawing a road, path, or route." @@ -567,7 +567,7 @@ 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. Your edits can be based on personal knowledge, on-the-ground survey, or - background imgagery. + background imagery. [Copying from commercial sources](https://www.openstreetmap.org/copyright) like Google Maps is strictly forbidden. @@ -606,10 +606,10 @@ en: screen: | ### Screen - This help is on top of the map area which shows a background imagery + This help is on top of the map area which shows background imagery and features on top of it. Here you can edit where the features are. On the left side is the *feature editor*, there you can edit feature's type - and attributes and also {search} search for features and features's type. + and attributes and also {search} search for features and feature's type. navigation: | ### Navigation @@ -677,7 +677,7 @@ en: You can create, fix, and delete roads with this editor. Roads can be all kinds: paths, highways, trails, cycle ways, and more - any used segment - is mapable. Roads are the most used type of lines. Other examples of + is mappable. Roads are the most used type of lines. Other examples of lines are waterways, walls, and fences. What you can do with roads applies to most types of lines. @@ -713,12 +713,12 @@ en: you can disconnect them with right-click the connecting node and select the {disconnect} 'Disconnect' tool or press the `D` shortcut key. - If you know that the crossing has traffic lights or crossswalks, + If you know that the crossing 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. attributes: | - ### Attribues + ### Attributtes When a road is selected on the left side the feature editor will show the type of the road and many attributes like name, speed limit, lines, @@ -756,8 +756,8 @@ en: # GPS Collected GPS traces are one valuable source of data for OpenStreetMap. This editor - supports local traces - `.gpx` files on your local computer. You can collect - this kind of GPS trace with a number of smartphone applications as well as + supports local traces files (file types `.gpx`, `.geojson`, and `.kml`) on your local computer. + You can collect this kind of GPS trace with a number of smartphone applications as well as personal GPS hardware. For information on how to perform a GPS survey, read @@ -782,7 +782,7 @@ en: OpenStreetMap is the world's largest database of buildings. You can improve this database. Buildings are the most used type - of areas, others are landuse, lakes, ponds, or forests. + of areas, others are residential areas, farmland, forests, lakes, or ponds. What you can do with buildings applies to most types of areas. select: | @@ -846,14 +846,14 @@ en: nodup: | ### No duplication - Usually address informations doesn't need to be duplicated, e.g. when there + Usually address information doesn't need to be duplicated, e.g. when there is a building outline on the map and several shops as points inside, only the building should have an address. recommendation: | ### Recommendation - Most buildings and sites have only one address and it is recommeded to add + Most buildings and sites have only one address and it is recommended to add the address to the building as a whole. If there is no building on the map and you cannot draw one, you should add an address point to the map. @@ -900,7 +900,7 @@ en: tags: | ### Tags - Below that you see the tags which is how the fields are stored in OpenStreetMap. + Below that you see the tags which are actually stored in OpenStreetMap. If you cannot find the feature's type with the feature editor or you cannot add required fields, then you can add additional tags with the `+` button. @@ -989,7 +989,7 @@ en: {split} Split in two {disconnect} Disconnect {circularize} Circularize - {orthogonalize} Orthogonalize + {orthogonalize} Square corners {delete} Delete reserved: | @@ -998,7 +998,7 @@ en: {backward} Backward {up} Up {down} Down - {fullscreen} Fullscreen + {fullscreen} Full screen {collapsescreen} Collapse screen {relation} Relation {vertex} Vertex @@ -1011,7 +1011,7 @@ en: {inspect} Inspect {nearby} Nearby {avatar} Avatar - {outlink} Outlink + {outlink} Share relations: intro: | @@ -1030,7 +1030,7 @@ en: The most common type of relation is the *multipolygon*, which groups together several areas to define a complex area, which may consist of several pieces or has holes in it like a donut. - Another type of relation is the *Turn restriction* which groups togehter two + Another type of relation is the *Turn restriction* which groups together two roads segments at a crossing to disable turning options. Two other types of relations are *route relations*, which group together @@ -1045,7 +1045,7 @@ en: the `C` shortcut key or right-click one of the selected areas and select the {merge} 'Merge' tool. This will create a new multipolygon relation with all selected areas as members. The areas will have the role - outer except When a area is inside another area it will have the role inner + outer except When an area is inside another area it will have the role inner and become the hole in the outer area. turnrestrictions: | @@ -1054,7 +1054,7 @@ en: Select the crossing node of two or more roads. In the feature editor you will see the roads connected to the crossing below 'Turn Restrictions'. There you can select a road and disable U-turn and turns into every other road. - This will create a turn restriction multipolygon with both roads and the + This will create a turn restriction relation with both roads and the crossing as members with roles from, to, and via. maintain: | diff --git a/dist/locales/en.json b/dist/locales/en.json index df586800f..b1a7c3633 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6,7 +6,7 @@ "description": "Add parks, buildings, lakes or other areas to the map.", "tail": "Click on the map to start drawing an area, like a park, lake, or building." }, - "add_line": { + "sadd_line": { "title": "Line", "description": "Add highways, streets, pedestrian paths, canals or other lines to the map.", "tail": "Click on the map to start drawing a road, path, or route." @@ -682,14 +682,14 @@ "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. \nYour edits can be based on personal knowledge, on-the-ground survey, or\nbackground imgagery.\n[Copying from commercial sources](https://www.openstreetmap.org/copyright)\nlike 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 imagery.\n[Copying from commercial sources](https://www.openstreetmap.org/copyright)\nlike 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 and you use version {version} now.\nYou can contribute and {translate}\n[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 a background imagery\nand features on top of it. Here you can edit where the features are.\nOn the left side is the *feature editor*, there you can edit feature's type\nand attributes and also {search} search for features and features's type.\n", + "screen": "### Screen\n\nThis help is on top of the map area which shows background imagery\nand features on top of it. Here you can edit where the features are.\nOn the left side is the *feature editor*, there you can edit feature's type\nand attributes and also {search} search for features and feature's type.\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": { @@ -701,20 +701,20 @@ "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" }, "roads": { - "intro": "# Roads & Lines\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycle ways, and more - any used segment\nis mapable. Roads are the most used type of lines. Other examples of\nlines are waterways, walls, and fences. What you can do with roads\napplies to most types of lines.\n", + "intro": "# Roads & Lines\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycle ways, and more - any used segment\nis mappable. Roads are the most used type of lines. Other examples of\nlines are waterways, walls, and fences. What you can do with roads\napplies to most types of lines.\n", "modifying": "### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them or\nto a GPS track. You can adjust these roads so they are in the correct place.\nClick on a road to select it and the pulsing glow will become visible.\nAll nodes of the road will be shown as small circles.\nYou can drag the nodes to better locations.\nYou can also create new nodes either by double-clicking on the road or by\nmoving the small triangles at the midpoints between nodes.\n", "move": "### Moving\n\nIf you right-click the road the editing menu with several tools appears.\nYou can select the {move} 'Move' tool, move the entire road at one time, and\nthen click again to save that movement. You can also simply press the\n`M` shortcut key, to start the move.\n", - "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", + "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 crosswalks,\nyou can add them by selecting the connecting node and using the\nfeature editor to select the correct feature's type.\n", + "attributes": "### Attributtes\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 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", + "intro": "# GPS\n\nCollected GPS traces are one valuable source of data for OpenStreetMap. This editor\nsupports local traces files (file types `.gpx`, `.geojson`, and `.kml`) on your local computer.\nYou can collect this 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 {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", + "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 residential areas, farmland, forests, lakes, or ponds.\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", @@ -722,15 +722,15 @@ }, "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", + "nodup": "### No duplication\n\nUsually address information 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 recommended 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 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", + "tags": "### Tags\n\nBelow that you see the tags which are actually 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} 'Undo' button and redo\nchanges by clicking the {redo} 'Redo' button.\n" }, "imagery": { @@ -740,14 +740,14 @@ }, "iconstools": { "icons": "# Icons & Tools\n\nThe icons used in this editor are made to be easily understandable\nand all give you more information with mouse-over.\nHere icons are often used.\n\n### Feature editor\n{search} Search features\n{apply} Apply\n{close} Close\n\n### Top row\n{point} 'Add point' mode\n{line} 'Add line' mode\n{area} 'Add area' mode\n{undo} Undo changes\n{redo} Redo changes\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\nWith right-click on features you can use these tools.\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{straighten} Straighten line\n{merge} Merge selected features\n{split} Split in two\n{disconnect} Disconnect\n{circularize} Circularize\n{orthogonalize} Orthogonalize\n{delete} Delete\n", - "reserved": "### Reserved for later use are:\n{forward} Forward\n{backward} Backward\n{up} Up\n{down} Down\n{fullscreen} Fullscreen\n{collapsescreen} Collapse screen\n{relation} Relation\n{vertex} Vertex\n{copy} Copy\n{paste} Paste\n{load} Load\n{simplify} Simplify\n{smooth} Smooth\n{alert} Alert\n{inspect} Inspect\n{nearby} Nearby\n{avatar} Avatar\n{outlink} Outlink\n" + "tools": "## Tools in the Editing Menu\n\nWith right-click on features you can use these tools.\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{straighten} Straighten line\n{merge} Merge selected features\n{split} Split in two\n{disconnect} Disconnect\n{circularize} Circularize\n{orthogonalize} Square corners\n{delete} Delete\n", + "reserved": "### Reserved for later use are:\n{forward} Forward\n{backward} Backward\n{up} Up\n{down} Down\n{fullscreen} Full screen\n{collapsescreen} Collapse screen\n{relation} Relation\n{vertex} Vertex\n{copy} Copy\n{paste} Paste\n{load} Load\n{simplify} Simplify\n{smooth} Smooth\n{alert} Alert\n{inspect} Inspect\n{nearby} Nearby\n{avatar} Avatar\n{outlink} Share\n" }, "relations": { "intro": "# Relations & Members\n\nA *relation* is a special type of feature in OpenStreetMap that groups together other\nfeatures, called *members* of the relation. Every member of a relation can have a\n*role* for the relation. At the bottom of the feature editor, you can see which\nrelations a feature is a member of, and the click on a relation there will select it.\nWhen the relation is selected, you can see all of its members highlighted on the map\nand listed in the feature editor together with their role for the relation.\n", - "types": "### Common Types\n\nThe 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.\nAnother type of relation is the *Turn restriction* which groups togehter two\nroads segments at a crossing to disable turning options.\n\nTwo other 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 which may be\nroads, rivers, or plot boundaries at the same time.\n", - "multipolygons": "### Multipolygons\n\nDraw two or more areas and select them. Then press either press\nthe `C` shortcut key or right-click one of the selected areas and \nselect the {merge} 'Merge' tool. This will create a new multipolygon\nrelation with all selected areas as members. The areas will have the role\nouter except When a area is inside another area it will have the role inner\nand become the hole in the outer area.\n", - "turnrestrictions": "### Turn restrictions\n\nSelect the crossing node of two or more roads. In the feature editor\nyou will see the roads connected to the crossing below 'Turn Restrictions'.\nThere you can select a road and disable U-turn and turns into every other road.\nThis will create a turn restriction multipolygon with both roads and the\ncrossing as members with roles from, to, and via.\n", + "types": "### Common Types\n\nThe 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.\nAnother type of relation is the *Turn restriction* which groups together two\nroads segments at a crossing to disable turning options.\n\nTwo other 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 which may be\nroads, rivers, or plot boundaries at the same time.\n", + "multipolygons": "### Multipolygons\n\nDraw two or more areas and select them. Then press either press\nthe `C` shortcut key or right-click one of the selected areas and \nselect the {merge} 'Merge' tool. This will create a new multipolygon\nrelation with all selected areas as members. The areas will have the role\nouter except When an area is inside another area it will have the role inner\nand become the hole in the outer area.\n", + "turnrestrictions": "### Turn restrictions\n\nSelect the crossing node of two or more roads. In the feature editor\nyou will see the roads connected to the crossing below 'Turn Restrictions'.\nThere you can select a road and disable U-turn and turns into every other road.\nThis will create a turn restriction relation with both roads and the\ncrossing as members with roles from, to, and via.\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 `+` 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" } From 9a921b72a9f6c9fed223591e11b5976266677550 Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Tue, 31 Oct 2017 09:52:45 +0100 Subject: [PATCH 09/33] add_line instead of errorneous sadd_line --- data/core.yaml | 2 +- dist/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 283f7c060..bd648688d 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -4,7 +4,7 @@ en: title: Area description: "Add parks, buildings, lakes or other areas to the map." tail: "Click on the map to start drawing an area, like a park, lake, or building." - sadd_line: + add_line: title: Line description: "Add highways, streets, pedestrian paths, canals or other lines to the map." tail: "Click on the map to start drawing a road, path, or route." diff --git a/dist/locales/en.json b/dist/locales/en.json index b1a7c3633..65067945c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6,7 +6,7 @@ "description": "Add parks, buildings, lakes or other areas to the map.", "tail": "Click on the map to start drawing an area, like a park, lake, or building." }, - "sadd_line": { + "add_line": { "title": "Line", "description": "Add highways, streets, pedestrian paths, canals or other lines to the map.", "tail": "Click on the map to start drawing a road, path, or route." From 011f351bb7e2c9df18bf6c9c39ea4e617bd6bcb1 Mon Sep 17 00:00:00 2001 From: Manfred Brandl Date: Thu, 2 Nov 2017 14:28:37 +0100 Subject: [PATCH 10/33] do not mention wiki.openstreetmap.org --- data/core.yaml | 6 ++---- dist/locales/en.json | 16 +--------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index bd648688d..e663673ee 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -903,10 +903,8 @@ en: Below that you see the tags which are actually stored in OpenStreetMap. If you cannot find the feature's type with the feature editor or you cannot add required fields, then you can add additional tags with the `+` button. - - You will find many tags in the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/), - also [Taginfo](https://taginfo.openstreetmap.org/) is a - great resource to learn more about popular tag combinations. + [Taginfo](https://taginfo.openstreetmap.org/) is a great resource to learn more + about popular tag combinations. undo: | ### Undo & Redo diff --git a/dist/locales/en.json b/dist/locales/en.json index 65067945c..bd579943a 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -730,7 +730,7 @@ "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 are actually 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", + "tags": "### Tags\n\nBelow that you see the tags which are actually 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[Taginfo](https://taginfo.openstreetmap.org/) is a great resource to learn more\nabout 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} 'Undo' button and redo\nchanges by clicking the {redo} 'Redo' button.\n" }, "imagery": { @@ -5949,13 +5949,6 @@ "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" @@ -5963,13 +5956,6 @@ "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" From 3b775930f67b8877379e3e689e820dbdb24e77aa Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 20 Nov 2017 17:20:54 -0500 Subject: [PATCH 11/33] 4 space tabwidth, no trailing spaces --- data/core.yaml | 22 ++++---- dist/locales/en.json | 14 +++++ modules/ui/help.js | 131 ++++++++++++++++++++++--------------------- 3 files changed, 92 insertions(+), 75 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index e663673ee..dd2be9118 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -558,14 +558,14 @@ en: intro: | # Help - With this [OpenStreetMap](https://www.openstreetmap.org/) editor you can + With this [OpenStreetMap](https://www.openstreetmap.org/) editor you can add and update the free and editable map of the world online with your browser. opendata: | ### Open Data 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. + OpenStreetMap. They can be visible on every map based on OpenStreetMap. Your edits can be based on personal knowledge, on-the-ground survey, or background imagery. [Copying from commercial sources](https://www.openstreetmap.org/copyright) @@ -615,7 +615,7 @@ en: ### Navigation You can drag the map by pressing and holding the left mouse button - while moving the mouse around. This is also called panning. + while moving the mouse around. This is also called panning. 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, @@ -627,7 +627,7 @@ en: # Editing & Saving To select a feature you want to edit, click on it on the map - or search for it by name in the feature editor. + or search for it by name in the feature editor. Selected features are drawn with a pulsing glow and in the feature editor the feature's type and attributes are shown. If you right-click on it, the editing menu appears. @@ -786,11 +786,11 @@ en: What you can do with buildings applies to most types of areas. select: | - ### Selecting + ### Selecting You can select a building by clicking on its border. the pulsing glow will will become visible, all nodes will be shown as circles and the - feature editor on the left will show the type of the building and + feature editor on the left will show the type of the building and attributes like name, levels, and address. modify: | @@ -883,7 +883,7 @@ en: is, like whether it's a highway or residential road, supermarket or cafe. The feature editor will display buttons for common feature types, and you can find others by typing what you're looking for in the search box. - + Click the 'i' in the top-right-hand corner of a feature type button to learn more about it. Click a button to choose that type. @@ -892,7 +892,7 @@ en: After you choose a feature type, or when you select a feature that already has a type assigned, the feature editor will display fields with details about - the feature like its name or speed limit for a road or levels and address for a building. + the feature like its name or speed limit for a road or levels and address for a building. Below the fields you see, you can click the `Add field` dropdown to add other details, like a Wikipedia link, wheelchair access, and more. @@ -905,7 +905,7 @@ en: cannot add required fields, then you can add additional tags with the `+` button. [Taginfo](https://taginfo.openstreetmap.org/) is a great resource to learn more about popular tag combinations. - + undo: | ### Undo & Redo @@ -1040,7 +1040,7 @@ en: ### Multipolygons Draw two or more areas and select them. Then press either press - the `C` shortcut key or right-click one of the selected areas and + the `C` shortcut key or right-click one of the selected areas and select the {merge} 'Merge' tool. This will create a new multipolygon relation with all selected areas as members. The areas will have the role outer except When an area is inside another area it will have the role inner @@ -1073,7 +1073,7 @@ en: To create a new relation, select the first feature that should be a member, 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} + 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. intro: diff --git a/dist/locales/en.json b/dist/locales/en.json index bd579943a..f0c1fa3de 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5949,6 +5949,13 @@ "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" @@ -5956,6 +5963,13 @@ "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" diff --git a/modules/ui/help.js b/modules/ui/help.js index 97429edf9..364e74427 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -19,80 +19,83 @@ export function uiHelp(context) { var key = t('help.key'); var docKeys = [ - ['help.help.',['intro','opendata','beforestart','opensource']], - ['help.overview.',['intro','features','screen','navigation']], - ['help.editing.',['intro','multiselect','edit','save','upload','comeback']], - ['help.roads.',['intro','move','connect','attributes','delete','create']], - ['help.gps.',['intro','using']], - ['help.buildings.',['intro','select','modify','create','delete']], - ['help.addresses.',['intro','nodup','recommendation','points']], - ['help.feature_editor.',['intro','select','fields','tags','undo']], - ['help.imagery.',['intro','background','offset']], - ['help.iconstools.',['icons','tools']], - ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']] - ]; + ['help.help.',['intro','opendata','beforestart','opensource']], + ['help.overview.',['intro','features','screen','navigation']], + ['help.editing.',['intro','multiselect','edit','save','upload','comeback']], + ['help.roads.',['intro','move','connect','attributes','delete','create']], + ['help.gps.',['intro','using']], + ['help.buildings.',['intro','select','modify','create','delete']], + ['help.addresses.',['intro','nodup','recommendation','points']], + ['help.feature_editor.',['intro','select','fields','tags','undo']], + ['help.imagery.',['intro','background','offset']], + ['help.iconstools.',['icons','tools']], + ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']] + ]; var icont = { - more: icon('#icon-more', 'pre-text'), - apply: icon('#icon-apply', 'pre-text'), - alert: icon('#icon-alert', 'pre-text'), - avatar: icon('#icon-avatar', 'pre-text'), - forward: icon('#icon-forward', 'pre-text'), - backward: icon('#icon-backward', 'pre-text'), - fullscreen: icon('#icon-full-screen', 'pre-text'), - collapsescreen: icon('#icon-collapse-screen', 'pre-text'), - geolocate: icon('#icon-geolocate', 'pre-text'), - load: icon('#icon-load', 'pre-text'), - search: icon('#icon-search', 'pre-text'), - bug: icon('#icon-bug', 'pre-text'), - point: icon('#icon-point', 'pre-text'), - line: icon('#icon-line', 'pre-text'), - area: icon('#icon-area', 'pre-text'), - help: icon('#icon-help', 'pre-text'), - plus: icon('#icon-plus', 'pre-text'), - minus: icon('#icon-minus', 'pre-text'), - nearby: icon('#icon-nearby', 'pre-text'), - outlink: icon('#icon-out-link', 'pre-text'), - relation: icon('#icon-relation', 'pre-text'), - translate: icon('#icon-translate', 'pre-text'), - circularize: icon('#operation-circularize', 'pre-text'), - orthogonalize: icon('#operation-orthogonalize', 'pre-text'), - split: icon('#operation-split', 'pre-text'), - reflect_long: icon('#operation-reflect-long', 'pre-text'), - reflect_short: icon('#operation-reflect-short', 'pre-text'), - simplify: icon('#operation-simplify', 'pre-text'), - smooth: icon('#operation-smooth', 'pre-text'), - straighten: icon('#operation-straighten', 'pre-text'), - rotate: icon('#operation-rotate', 'pre-text'), - reverse: icon('#operation-reverse', 'pre-text'), - continue: icon('#operation-continue', 'pre-text'), - disconnect: icon('#operation-disconnect', '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'), - up: icon('#icon-up', 'pre-text'), - inspect: icon('#icon-inspect', 'pre-text'), - move: icon('#operation-move', 'pre-text'), - merge: icon('#operation-merge', 'pre-text'), - copy: icon('#operation-copy', 'pre-text'), - paste: icon('#operation-paste', 'pre-text'), - delete: icon('#operation-delete', 'pre-text'), - close: icon('#icon-close', 'pre-text'), - undo: icon('#icon-undo', 'pre-text'), - redo: icon('#icon-redo', 'pre-text'), - save: icon('#icon-save', 'pre-text'), - version: context.version - }; + more: icon('#icon-more', 'pre-text'), + apply: icon('#icon-apply', 'pre-text'), + alert: icon('#icon-alert', 'pre-text'), + avatar: icon('#icon-avatar', 'pre-text'), + forward: icon('#icon-forward', 'pre-text'), + backward: icon('#icon-backward', 'pre-text'), + fullscreen: icon('#icon-full-screen', 'pre-text'), + collapsescreen: icon('#icon-collapse-screen', 'pre-text'), + geolocate: icon('#icon-geolocate', 'pre-text'), + load: icon('#icon-load', 'pre-text'), + search: icon('#icon-search', 'pre-text'), + bug: icon('#icon-bug', 'pre-text'), + point: icon('#icon-point', 'pre-text'), + line: icon('#icon-line', 'pre-text'), + area: icon('#icon-area', 'pre-text'), + help: icon('#icon-help', 'pre-text'), + plus: icon('#icon-plus', 'pre-text'), + minus: icon('#icon-minus', 'pre-text'), + nearby: icon('#icon-nearby', 'pre-text'), + outlink: icon('#icon-out-link', 'pre-text'), + relation: icon('#icon-relation', 'pre-text'), + translate: icon('#icon-translate', 'pre-text'), + circularize: icon('#operation-circularize', 'pre-text'), + orthogonalize: icon('#operation-orthogonalize', 'pre-text'), + split: icon('#operation-split', 'pre-text'), + reflect_long: icon('#operation-reflect-long', 'pre-text'), + reflect_short: icon('#operation-reflect-short', 'pre-text'), + simplify: icon('#operation-simplify', 'pre-text'), + smooth: icon('#operation-smooth', 'pre-text'), + straighten: icon('#operation-straighten', 'pre-text'), + rotate: icon('#operation-rotate', 'pre-text'), + reverse: icon('#operation-reverse', 'pre-text'), + continue: icon('#operation-continue', 'pre-text'), + disconnect: icon('#operation-disconnect', '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'), + up: icon('#icon-up', 'pre-text'), + inspect: icon('#icon-inspect', 'pre-text'), + move: icon('#operation-move', 'pre-text'), + merge: icon('#operation-merge', 'pre-text'), + copy: icon('#operation-copy', 'pre-text'), + paste: icon('#operation-paste', 'pre-text'), + delete: icon('#operation-delete', 'pre-text'), + close: icon('#icon-close', 'pre-text'), + undo: icon('#icon-undo', 'pre-text'), + redo: icon('#icon-redo', 'pre-text'), + save: icon('#icon-save', 'pre-text'), + version: context.version + }; var docs = docKeys.map(function(key) { - var text = key[1].reduce(function(all,part) { return all + t(key[0].concat(part),icont); }, ''); + var text = key[1].reduce(function(all, part) { + return all + t(key[0].concat(part), icont); + }, ''); return { title: text.split('\n')[0].replace('#', '').trim(), html: marked(text.split('\n').slice(1).join('\n')) }; }); + function help(selection) { function hide() { From 7f1dc5e03caf2ca95a1859a1ca0ef587e2830547 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 20 Nov 2017 17:32:16 -0500 Subject: [PATCH 12/33] Remove pre-text style from icons, remove "icons and tools" section Between keyboard shortcuts screen and onscreen hover text, I think we have the icons covered well enough and don't need to add it to the help. Having it in help means that translators need to do double work. --- data/core.yaml | 73 ---------------------------------- modules/ui/help.js | 99 +++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 123 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index dd2be9118..c600a99d8 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -938,79 +938,6 @@ en: the imagery so that it matches the existing data by clicking 'Fix alignment' at the bottom of the Background Settings. - iconstools: - icons: | - # Icons & Tools - - The icons used in this editor are made to be easily understandable - and all give you more information with mouse-over. - Here icons are often used. - - ### Feature editor - {search} Search features - {apply} Apply - {close} Close - - ### Top row - {point} 'Add point' mode - {line} 'Add line' mode - {area} 'Add area' mode - {undo} Undo changes - {redo} Redo changes - {save} Save changes - - ### Right column - {plus} Zoom in - {minus} Zoom out - {geolocate} Show my location - {layers} Background settings - {data} Map data - {help} Help - - ### Bottom row - {bug} Report a bug - {translate} Help translate - - tools: | - ## Tools in the Editing Menu - - With right-click on features you can use these tools. - - {move} Move - {rotate} Rotate - {reflect_long} Reflect at long axis - {reflect_short} Reflect at short axis - {continue} Continue line - {reverse} Reverse direction - {straighten} Straighten line - {merge} Merge selected features - {split} Split in two - {disconnect} Disconnect - {circularize} Circularize - {orthogonalize} Square corners - {delete} Delete - - reserved: | - ### Reserved for later use are: - {forward} Forward - {backward} Backward - {up} Up - {down} Down - {fullscreen} Full screen - {collapsescreen} Collapse screen - {relation} Relation - {vertex} Vertex - {copy} Copy - {paste} Paste - {load} Load - {simplify} Simplify - {smooth} Smooth - {alert} Alert - {inspect} Inspect - {nearby} Nearby - {avatar} Avatar - {outlink} Share - relations: intro: | # Relations & Members diff --git a/modules/ui/help.js b/modules/ui/help.js index 364e74427..9ce698cb3 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -28,60 +28,59 @@ 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']], ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']] ]; var icont = { - more: icon('#icon-more', 'pre-text'), - apply: icon('#icon-apply', 'pre-text'), - alert: icon('#icon-alert', 'pre-text'), - avatar: icon('#icon-avatar', 'pre-text'), - forward: icon('#icon-forward', 'pre-text'), - backward: icon('#icon-backward', 'pre-text'), - fullscreen: icon('#icon-full-screen', 'pre-text'), - collapsescreen: icon('#icon-collapse-screen', 'pre-text'), - geolocate: icon('#icon-geolocate', 'pre-text'), - load: icon('#icon-load', 'pre-text'), - search: icon('#icon-search', 'pre-text'), - bug: icon('#icon-bug', 'pre-text'), - point: icon('#icon-point', 'pre-text'), - line: icon('#icon-line', 'pre-text'), - area: icon('#icon-area', 'pre-text'), - help: icon('#icon-help', 'pre-text'), - plus: icon('#icon-plus', 'pre-text'), - minus: icon('#icon-minus', 'pre-text'), - nearby: icon('#icon-nearby', 'pre-text'), - outlink: icon('#icon-out-link', 'pre-text'), - relation: icon('#icon-relation', 'pre-text'), - translate: icon('#icon-translate', 'pre-text'), - circularize: icon('#operation-circularize', 'pre-text'), - orthogonalize: icon('#operation-orthogonalize', 'pre-text'), - split: icon('#operation-split', 'pre-text'), - reflect_long: icon('#operation-reflect-long', 'pre-text'), - reflect_short: icon('#operation-reflect-short', 'pre-text'), - simplify: icon('#operation-simplify', 'pre-text'), - smooth: icon('#operation-smooth', 'pre-text'), - straighten: icon('#operation-straighten', 'pre-text'), - rotate: icon('#operation-rotate', 'pre-text'), - reverse: icon('#operation-reverse', 'pre-text'), - continue: icon('#operation-continue', 'pre-text'), - disconnect: icon('#operation-disconnect', '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'), - up: icon('#icon-up', 'pre-text'), - inspect: icon('#icon-inspect', 'pre-text'), - move: icon('#operation-move', 'pre-text'), - merge: icon('#operation-merge', 'pre-text'), - copy: icon('#operation-copy', 'pre-text'), - paste: icon('#operation-paste', 'pre-text'), - delete: icon('#operation-delete', 'pre-text'), - close: icon('#icon-close', 'pre-text'), - undo: icon('#icon-undo', 'pre-text'), - redo: icon('#icon-redo', 'pre-text'), - save: icon('#icon-save', 'pre-text'), + more: icon('#icon-more'), + apply: icon('#icon-apply'), + alert: icon('#icon-alert'), + avatar: icon('#icon-avatar'), + forward: icon('#icon-forward'), + backward: icon('#icon-backward'), + fullscreen: icon('#icon-full-screen'), + collapsescreen: icon('#icon-collapse-screen'), + geolocate: icon('#icon-geolocate'), + load: icon('#icon-load'), + search: icon('#icon-search'), + bug: icon('#icon-bug'), + point: icon('#icon-point'), + line: icon('#icon-line'), + area: icon('#icon-area'), + help: icon('#icon-help'), + plus: icon('#icon-plus'), + minus: icon('#icon-minus'), + nearby: icon('#icon-nearby'), + outlink: icon('#icon-out-link'), + relation: icon('#icon-relation'), + translate: icon('#icon-translate'), + circularize: icon('#operation-circularize'), + orthogonalize: icon('#operation-orthogonalize'), + split: icon('#operation-split'), + reflect_long: icon('#operation-reflect-long'), + reflect_short: icon('#operation-reflect-short'), + simplify: icon('#operation-simplify'), + smooth: icon('#operation-smooth'), + straighten: icon('#operation-straighten'), + rotate: icon('#operation-rotate'), + reverse: icon('#operation-reverse'), + continue: icon('#operation-continue'), + disconnect: icon('#operation-disconnect'), + layers: icon('#icon-layers'), + vertex: icon('#icon-vertex'), + data: icon('#icon-data'), + down: icon('#icon-down'), + up: icon('#icon-up'), + inspect: icon('#icon-inspect'), + move: icon('#operation-move'), + merge: icon('#operation-merge'), + copy: icon('#operation-copy'), + paste: icon('#operation-paste'), + delete: icon('#operation-delete'), + close: icon('#icon-close'), + undo: icon('#icon-undo'), + redo: icon('#icon-redo'), + save: icon('#icon-save'), version: context.version }; From d05c56b914f1915fdc6a5bd3d5a825fa52c94d57 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 20 Nov 2017 18:12:32 -0500 Subject: [PATCH 13/33] Simplify help intro texts --- data/core.yaml | 29 ++++++++++++++--------------- dist/locales/en.json | 25 ++++++++++--------------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index c600a99d8..275cd9e08 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -558,34 +558,33 @@ en: intro: | # Help - With this [OpenStreetMap](https://www.openstreetmap.org/) editor you can - add and update the free and editable map of the world online with your browser. + Welcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/). + With this editor you can update OpenStreetMap right from your web browser. opendata: | ### Open Data - 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. - Your edits can be based on personal knowledge, on-the-ground survey, or - background imagery. - [Copying from commercial sources](https://www.openstreetmap.org/copyright) - like Google Maps is strictly forbidden. + 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 aerial or streetlevel imagery. Copying from commercial sources, like Google Maps, + [is strictly forbidden](https://www.openstreetmap.org/copyright). beforestart: | ### Before you start You should be familiar with OpenStreetMap and this editor before you start editing. - The walkthrough will teach you the basics of editing on OpenStreetMap and you will - practice using the editor. It takes about 15 minutes and then you can start editing. + iD contains a builtin 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. opensource: | ### Open Source - The iD editor is a collaborative project 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). + 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). + + You can help us by [translating iD](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) + or [reporting bugs or suggestions](https://github.com/openstreetmap/iD/issues). overview: intro: | diff --git a/dist/locales/en.json b/dist/locales/en.json index f0c1fa3de..b4e9d7c7f 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -681,19 +681,19 @@ "title": "Help", "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. \nYour edits can be based on personal knowledge, on-the-ground survey, or\nbackground imagery.\n[Copying from commercial sources](https://www.openstreetmap.org/copyright)\nlike 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 and you use version {version} now.\nYou can contribute and {translate}\n[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" + "intro": "# Help\n\nWelcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/).\nWith this editor you can update OpenStreetMap right from your web browser.\n", + "opendata": "### Open Data\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying,\nor aerial or streetlevel imagery. Copying from commercial sources, like Google Maps,\n[is strictly forbidden](https://www.openstreetmap.org/copyright).\n", + "beforestart": "### Before you start\n\nYou should be familiar with OpenStreetMap and this editor before you start editing.\niD contains a builtin walkthrough to teach you the basics of editing OpenStreetMap.\nClick \"Start the Walkthrough\" on this screen to take the tutorial - it takes only\nabout 15 minutes.\n", + "opensource": "### Open Source\n\nThe iD editor is a collaborative open source project, and you are using version {version} now.\nThe source code is available [on GitHub](https://github.com/openstreetmap/iD).\n\nYou can help us by [translating iD](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)\nor [reporting bugs or suggestions](https://github.com/openstreetmap/iD/issues).\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 background imagery\nand features on top of it. Here you can edit where the features are.\nOn the left side is the *feature editor*, there you can edit feature's type\nand attributes and also {search} search for features and feature's type.\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" + "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", + "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\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", @@ -715,7 +715,7 @@ }, "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 residential areas, farmland, forests, lakes, or ponds.\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", + "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" @@ -729,7 +729,7 @@ "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", + "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 are actually 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[Taginfo](https://taginfo.openstreetmap.org/) is a great resource to learn more\nabout 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} 'Undo' button and redo\nchanges by clicking the {redo} 'Redo' button.\n" }, @@ -738,18 +738,13 @@ "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\nThe icons used in this editor are made to be easily understandable\nand all give you more information with mouse-over.\nHere icons are often used.\n\n### Feature editor\n{search} Search features\n{apply} Apply\n{close} Close\n\n### Top row\n{point} 'Add point' mode\n{line} 'Add line' mode\n{area} 'Add area' mode\n{undo} Undo changes\n{redo} Redo changes\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\nWith right-click on features you can use these tools.\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{straighten} Straighten line\n{merge} Merge selected features\n{split} Split in two\n{disconnect} Disconnect\n{circularize} Circularize\n{orthogonalize} Square corners\n{delete} Delete\n", - "reserved": "### Reserved for later use are:\n{forward} Forward\n{backward} Backward\n{up} Up\n{down} Down\n{fullscreen} Full screen\n{collapsescreen} Collapse screen\n{relation} Relation\n{vertex} Vertex\n{copy} Copy\n{paste} Paste\n{load} Load\n{simplify} Simplify\n{smooth} Smooth\n{alert} Alert\n{inspect} Inspect\n{nearby} Nearby\n{avatar} Avatar\n{outlink} Share\n" - }, "relations": { "intro": "# Relations & Members\n\nA *relation* is a special type of feature in OpenStreetMap that groups together other\nfeatures, called *members* of the relation. Every member of a relation can have a\n*role* for the relation. At the bottom of the feature editor, you can see which\nrelations a feature is a member of, and the click on a relation there will select it.\nWhen the relation is selected, you can see all of its members highlighted on the map\nand listed in the feature editor together with their role for the relation.\n", "types": "### Common Types\n\nThe 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.\nAnother type of relation is the *Turn restriction* which groups together two\nroads segments at a crossing to disable turning options.\n\nTwo other 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 which may be\nroads, rivers, or plot boundaries at the same time.\n", - "multipolygons": "### Multipolygons\n\nDraw two or more areas and select them. Then press either press\nthe `C` shortcut key or right-click one of the selected areas and \nselect the {merge} 'Merge' tool. This will create a new multipolygon\nrelation with all selected areas as members. The areas will have the role\nouter except When an area is inside another area it will have the role inner\nand become the hole in the outer area.\n", + "multipolygons": "### Multipolygons\n\nDraw two or more areas and select them. Then press either press\nthe `C` shortcut key or right-click one of the selected areas and\nselect the {merge} 'Merge' tool. This will create a new multipolygon\nrelation with all selected areas as members. The areas will have the role\nouter except When an area is inside another area it will have the role inner\nand become the hole in the outer area.\n", "turnrestrictions": "### Turn restrictions\n\nSelect the crossing node of two or more roads. In the feature editor\nyou will see the roads connected to the crossing below 'Turn Restrictions'.\nThere you can select a road and disable U-turn and turns into every other road.\nThis will create a turn restriction relation with both roads and the\ncrossing as members with roles from, to, and via.\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 `+` 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" + "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" } }, "intro": { From 3ae7ec803208694bb1871169293ead8cb1b0aacb Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Mon, 20 Nov 2017 23:01:20 -0500 Subject: [PATCH 14/33] Simplify help overview, editing texts --- data/core.yaml | 96 ++++++++++++++++++++++---------------------- dist/locales/en.json | 22 +++++----- modules/ui/help.js | 2 +- 3 files changed, 59 insertions(+), 61 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 275cd9e08..1e58d40c6 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -583,91 +583,89 @@ en: 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). - You can help us by [translating iD](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating) - or [reporting bugs or suggestions](https://github.com/openstreetmap/iD/issues). + 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: intro: | # Overview - This help will repeat and extend information from the walkthrough, which - you should have done by now. - features: | - ### Features + ### Map Features - In OpenStreetMap we use the word *feature* to describe things that appear on the map. - Anything in the real world can be mapped as a feature on OpenStreetMap. - Features are represented on the map using *points*, *lines*, or *areas*. - Points are sometimes called nodes. Lines and areas are a connected line - of nodes and are sometimes called ways. + 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. Features are + represented on the map using *points*, *lines*, or *areas*. - screen: | - ### Screen - - This help is on top of the map area which shows background imagery - and features on top of it. Here you can edit where the features are. - On the left side is the *feature editor*, there you can edit feature's type - and attributes and also {search} search for features and feature's type. + In OpenStreetmap, points are sometimes called *nodes*, and lines and areas + are sometimes called *ways*. navigation: | ### Navigation You can drag the map by pressing and holding the left mouse button - while moving the mouse around. This is also called panning. - You can also use the arrow keys on your keyboard, using the keys - while holding 'Ctrl' will move the map for one screenful. + while moving the mouse around. This is also called *panning*. + You can zoom in or out by scrolling with the mouse wheel or trackpad, - or by clicking the {plus} / {minus} buttons on the top-right-hand - of the map, holding 'Ctrl' while clicking will zoom a lot. + or by clicking the {plus} / {minus} buttons along the side of the map. + + keyboard: | + ### Keyboard Shortcuts + + You can view a list of keyboard shortcuts by pressing the `?` key. editing: intro: | # Editing & Saving - To select a feature you want to edit, click on it on the map - or search for it by name in the feature editor. - Selected features are drawn with a pulsing glow and in the - feature editor the feature's type and attributes are shown. - If you right-click on it, the editing menu appears. + `Left-Click` on a feature to select it. This will highlight the + feature with a pusling glow, and the sidebar will display more details, + such as its name or address. + + `Right-click` on a map feature to display the editing menu, which shows + the commands that are available, such as rotating, moving, and deleting. multiselect: | ### Multiselect - To select multiple features, hold down the 'Shift' key. - Then either click on the features you want to select, - or click, hold and move the mouse on the map to draw - a contour around those features. - All the points inside the lasso area will be selected. + + `Shift-click` to select several features together. This makes + it easier to move or delete multiple items. + + Another way to select multiple features is to hold down the `Shift` key, + then press and hold the left mouse button, and drag the mouse to draw a + selection lasso. All of the points inside the lasso area will be selected. edit: | ### Edit - 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. + When you make changes to the map, these are stored locally until you save + them to the server. Don't worry if you make a mistake - until the edits are + saved, you can undo changes by clicking the {undo} `Undo` button, and redo + changes by clicking the {redo} `Redo` button. save: | ### Save - Click `Save` to finish a group of edits - for instance, if you've completed - an area of town and would like to start on a new area. You'll have a chance - to review what you've done, and the editor supplies helpful suggestions - and warnings if something doesn't seem right about the changes. + Click `Save` to finish your edits and send them to the OpenStreetMap + server. You should remember to save your work frequently! + + On the save screen, you'll have a chance to review what you've done. + The editor will perform a basic check for missing data and may offer + helpful suggestions and warnings if something doesn't seem right. upload: | ### Upload - If everything looks good, you should explain your changes as a - [changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments) - and click `Upload` to post the changes to - [OpenStreetMap.org](https://www.openstreetmap.org/), where they will be visible - to all other users and available for others to build and improve upon. + 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. comeback: | - If you can't finish your edits in one sitting, you can leave the editor - window and come back (on the same browser and computer), and the + 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 locally. + You can come back later (on the same browser and computer), and the editor will offer to restore your work. roads: diff --git a/dist/locales/en.json b/dist/locales/en.json index b4e9d7c7f..c8488b67c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -684,21 +684,21 @@ "intro": "# Help\n\nWelcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/).\nWith this editor you can update OpenStreetMap right from your web browser.\n", "opendata": "### Open Data\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying,\nor aerial or streetlevel imagery. Copying from commercial sources, like Google Maps,\n[is strictly forbidden](https://www.openstreetmap.org/copyright).\n", "beforestart": "### Before you start\n\nYou should be familiar with OpenStreetMap and this editor before you start editing.\niD contains a builtin walkthrough to teach you the basics of editing OpenStreetMap.\nClick \"Start the Walkthrough\" on this screen to take the tutorial - it takes only\nabout 15 minutes.\n", - "opensource": "### Open Source\n\nThe iD editor is a collaborative open source project, and you are using version {version} now.\nThe source code is available [on GitHub](https://github.com/openstreetmap/iD).\n\nYou can help us by [translating iD](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)\nor [reporting bugs or suggestions](https://github.com/openstreetmap/iD/issues).\n" + "opensource": "### Open Source\n\nThe iD editor is a collaborative open source project, and you are using version {version} now.\nThe source code is available [on GitHub](https://github.com/openstreetmap/iD).\n\nYou can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)\nor [reporting bugs](https://github.com/openstreetmap/iD/issues).\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 background imagery\nand features on top of it. Here you can edit where the features are.\nOn the left side is the *feature editor*, there you can edit feature's type\nand attributes and also {search} search for features and feature's type.\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" + "intro": "# Overview\n", + "features": "### Map Features\n\nWe use the word *features* to describe things that appear on the map,\nsuch as roads, buildings, or points of interest. Anything in the real\nworld can be mapped as a feature on OpenStreetMap. Features are\nrepresented on the map using *points*, *lines*, or *areas*.\n\nIn OpenStreetmap, points are sometimes called *nodes*, and lines and areas\nare sometimes called *ways*.\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*.\n\nYou can zoom in or out by scrolling with the mouse wheel or trackpad,\nor by clicking the {plus} / {minus} buttons along the side of the map.\n", + "keyboard": "### Keyboard Shortcuts\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\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\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" + "intro": "# Editing & Saving\n\nYou can `Click` on a feature once to select it. This will highlight the\nfeature with a pusling glow, and the sidebar will display more details,\nsuch as its name or address.\n\nIf you `Right-click` a map feature, an editing menu will appear, showing\nthe commands that are available, such as rotating, moving, and deleting.\n", + "multiselect": "### Multiselect\n\nYou can `Shift-click` to select several features together. This makes\nit easier to move or delete multiple items.\n\nAnother way to select multiple features is to hold down the `Shift` key,\nthen press and hold the left mouse button, and drag the mouse to draw a\nselection lasso. All of 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 - until the edits are saved, you\ncan undo changes by 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 and send them to the OpenStreetMap\nserver. You should remember to save your work frequently!\n\nOn the save screen, you'll have a chance to review what you've done.\nThe editor will perform a basic check for missing data and may offer\nhelpful suggestions and warnings if something doesn't seem right.\n", + "upload": "### Upload\n\nBefore uploading your changes you must enter a\n[changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments).\nThen click `Upload` to send your changes to OpenStreetMap, where they will be\nmerged into the map and publicly visible to everyone.\n", + "comeback": "If you can't finish your edits in one sitting, for example if your computer\ncrashes or you close the browser tab, your edits are still saved locally.\nYou can come back later (on the same browser and computer), and the\neditor will offer to restore your work.\n" }, "roads": { "intro": "# Roads & Lines\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycle ways, and more - any used segment\nis mappable. Roads are the most used type of lines. Other examples of\nlines are waterways, walls, and fences. What you can do with roads\napplies to most types of lines.\n", diff --git a/modules/ui/help.js b/modules/ui/help.js index 9ce698cb3..95ce7c2e2 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -20,7 +20,7 @@ export function uiHelp(context) { var docKeys = [ ['help.help.',['intro','opendata','beforestart','opensource']], - ['help.overview.',['intro','features','screen','navigation']], + ['help.overview.',['intro','features','navigation','keyboard']], ['help.editing.',['intro','multiselect','edit','save','upload','comeback']], ['help.roads.',['intro','move','connect','attributes','delete','create']], ['help.gps.',['intro','using']], From f48a00ce50da4657d7954d9396035c5e986b0561 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 21 Nov 2017 10:49:06 -0500 Subject: [PATCH 15/33] Simplify language in GPS section, add section on streetlevel photos --- data/core.yaml | 96 +++++++++++++++++++++++++++++--------------- dist/locales/en.json | 31 ++++++++------ modules/ui/help.js | 1 + 3 files changed, 82 insertions(+), 46 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 1e58d40c6..dc445846e 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -674,17 +674,16 @@ en: You can create, fix, and delete roads with this editor. Roads can be all kinds: paths, highways, trails, cycle ways, and more - any used segment - is mappable. Roads are the most used type of lines. Other examples of + is mappable. Roads are the most used type of line. Other examples of lines are waterways, walls, and fences. What you can do with roads applies to most types of lines. modifying: | ### Modifying - Often you'll see roads that aren't aligned to the imagery behind them or + Often you'll see roads that aren't aligned to the imagery or to a GPS track. You can adjust these roads so they are in the correct place. - Click on a road to select it and the pulsing glow will become visible. - All nodes of the road will be shown as small circles. + Click on a road to select it. All nodes of the road will be shown as small circles. You can drag the nodes to better locations. You can also create new nodes either by double-clicking on the road or by moving the small triangles at the midpoints between nodes. @@ -692,33 +691,37 @@ en: move: | ### Moving - If you right-click the road the editing menu with several tools appears. - You can select the {move} 'Move' tool, move the entire road at one time, and - then click again to save that movement. You can also simply press the - `M` shortcut key, to start the move. + If you `right-click` the road, the editing menu will appear. + You can select the {move} 'Move' tool to move the entire road at one time. + Then click again to place the road in its new location. + You can also press the `M` shortcut key to move a road. connect: | ### Connecting - If the road connects to another road, but doesn't properly connect on - the map, you can drag one of its nodes onto the other road in - order to join them. The node will become grey inside. - Having roads connected properly is important for the map and essential for providing driving directions. - If two road are connected on the map but not in reality, - you can disconnect them with right-click the connecting node and select - the {disconnect} 'Disconnect' tool or press the `D` shortcut key. - If you know that the crossing has traffic lights or crosswalks, + The connections between roads are drawn with grey circles. + The endpoints of a road are drawn with larger white circles if they + don't connect to anything. + + To connect a road to another feature, drag one of its nodes onto the + other feature in order to join them. + + To disconnect a road from another feature, right-click the connecting + node and select the {disconnect} 'Disconnect' tool or press the `D` + shortcut key. + + 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. attributes: | ### Attributtes - When a road is selected on the left side the feature editor will show - the type of the road and many attributes like name, speed limit, lines, + When a road is selected, the feature editor in the sidebar will show + the type of the road and many attributes like name, speed limit, and surface. You can modify fields or even add new ones. delete: | @@ -746,16 +749,15 @@ en: Then click on points along the road so that it follows the right path, according to satellite imagery or GPS. If the road you are drawing crosses another road, connect it by clicking on the intersection point. When you're done drawing, double-click - or press 'Return' or 'Enter' on your keyboard. + or press `Return` or `Enter` on your keyboard. gps: intro: | - # GPS + # GPS Traces - Collected GPS traces are one valuable source of data for OpenStreetMap. This editor - supports local traces files (file types `.gpx`, `.geojson`, and `.kml`) on your local computer. - You can collect this kind of GPS trace with a number of smartphone applications as well as - personal GPS hardware. + 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. For information on how to perform a GPS survey, read [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/). @@ -763,16 +765,44 @@ en: using: | ### Using - 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 {data} 'Map data' menu on the right side to enable, - disable, or zoom to this new GPX-powered layer. + 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 on the {data} 'Map data' panel on the side of the map to enable, + disable, or zoom to your GPS data. - The GPX track isn't directly uploaded 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, and also to [upload it to OpenStreetMap](https://www.openstreetmap.org/trace/create) + 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. + + You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use. + streetlevel: + intro: | + # Street Level Photos + + Street level photos provide a ground-truth prespective of an area, 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: | + ### Using + + To use streetlevel photos for mapping, click on the {data} 'Map data' panel on the + side of the map to enable or disable the available photo layers. + + When enabled, the photo layer will display a line along the sequence of photos. + At higher zooms you will see a circle at each photo location, and at even higher + zooms you will see a viewfield to indicate the direction that the photo was taken. + + viewer: | + + When you click on one of the photo locations, a photo viewer will appear in the + bottom corner of the map. The photo viewer contains controls to step forward and + backward in the image sequence. It will also show 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. + buildings: intro: | # Buildings & Areas @@ -827,8 +857,8 @@ en: like any other edit, the results are seen by everyone and satellite imagery 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. + You can delete a building by clicking on it to select it and then pressing the `Delete` + key, or by right-clicking it and then using the {delete} 'Delete' tool. addresses: intro: | diff --git a/dist/locales/en.json b/dist/locales/en.json index c8488b67c..06575a6da 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -693,32 +693,37 @@ "keyboard": "### Keyboard Shortcuts\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n" }, "editing": { - "intro": "# Editing & Saving\n\nYou can `Click` on a feature once to select it. This will highlight the\nfeature with a pusling glow, and the sidebar will display more details,\nsuch as its name or address.\n\nIf you `Right-click` a map feature, an editing menu will appear, showing\nthe commands that are available, such as rotating, moving, and deleting.\n", - "multiselect": "### Multiselect\n\nYou can `Shift-click` to select several features together. This makes\nit easier to move or delete multiple items.\n\nAnother way to select multiple features is to hold down the `Shift` key,\nthen press and hold the left mouse button, and drag the mouse to draw a\nselection lasso. All of 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 - until the edits are saved, you\ncan undo changes by 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 and send them to the OpenStreetMap\nserver. You should remember to save your work frequently!\n\nOn the save screen, you'll have a chance to review what you've done.\nThe editor will perform a basic check for missing data and may offer\nhelpful suggestions and warnings if something doesn't seem right.\n", + "intro": "# Editing & Saving\n\n`Left-Click` on a feature to select it. This will highlight the\nfeature with a pusling glow, and the sidebar will display more details,\nsuch as its name or address.\n\n`Right-click` on a map feature to display the editing menu, which shows\nthe commands that are available, such as rotating, moving, and deleting.\n", + "multiselect": "### Multiselect\n\n`Shift-click` to select several features together. This makes\nit easier to move or delete multiple items.\n\nAnother way to select multiple features is to hold down the `Shift` key,\nthen press and hold the left mouse button, and drag the mouse to draw a\nselection lasso. All of the points inside the lasso area will be selected.\n", + "edit": "### Edit\n\nWhen you make changes to the map, these are stored locally until you save\nthem to the server. Don't worry if you make a mistake - until the edits are\nsaved, you can undo changes by clicking the {undo} `Undo` button, and redo\nchanges by clicking the {redo} `Redo` button.\n", + "save": "### Save\n\nClick `Save` to finish your edits and send them to the OpenStreetMap\nserver. You should remember to save your work frequently!\n\nOn the save screen, you'll have a chance to review what you've done.\nThe editor will perform a basic check for missing data and may offer\nhelpful suggestions and warnings if something doesn't seem right.\n", "upload": "### Upload\n\nBefore uploading your changes you must enter a\n[changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments).\nThen click `Upload` to send your changes to OpenStreetMap, where they will be\nmerged into the map and publicly visible to everyone.\n", "comeback": "If you can't finish your edits in one sitting, for example if your computer\ncrashes or you close the browser tab, your edits are still saved locally.\nYou can come back later (on the same browser and computer), and the\neditor will offer to restore your work.\n" }, "roads": { - "intro": "# Roads & Lines\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycle ways, and more - any used segment\nis mappable. Roads are the most used type of lines. Other examples of\nlines are waterways, walls, and fences. What you can do with roads\napplies to most types of lines.\n", - "modifying": "### Modifying\n\nOften you'll see roads that aren't aligned to the imagery behind them or\nto a GPS track. You can adjust these roads so they are in the correct place.\nClick on a road to select it and the pulsing glow will become visible.\nAll nodes of the road will be shown as small circles.\nYou can drag the nodes to better locations.\nYou can also create new nodes either by double-clicking on the road or by\nmoving the small triangles at the midpoints between nodes.\n", - "move": "### Moving\n\nIf you right-click the road the editing menu with several tools appears.\nYou can select the {move} 'Move' tool, move the entire road at one time, and\nthen click again to save that movement. You can also simply press the\n`M` shortcut key, to start the move.\n", - "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 crosswalks,\nyou can add them by selecting the connecting node and using the\nfeature editor to select the correct feature's type.\n", - "attributes": "### Attributtes\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", + "intro": "# Roads & Lines\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycle ways, and more - any used segment\nis mappable. Roads are the most used type of line. Other examples of\nlines are waterways, walls, and fences. What you can do with roads\napplies to most types of lines.\n", + "modifying": "### Modifying\n\nOften you'll see roads that aren't aligned to the imagery or\nto a GPS track. You can adjust these roads so they are in the correct place.\nClick on a road to select it. All nodes of the road will be shown as small circles.\nYou can drag the nodes to better locations.\nYou can also create new nodes either by double-clicking on the road or by\nmoving the small triangles at the midpoints between nodes.\n", + "move": "### Moving\n\nIf you `right-click` the road, the editing menu will appear.\nYou can select the {move} 'Move' tool to move the entire road at one time.\nThen click again to place the road in its new location.\nYou can also press the `M` shortcut key to move a road.\n", + "connect": "### Connecting\n\nHaving roads connected properly is important for the map\nand essential for providing driving directions.\n\nThe connections between roads are drawn with grey circles.\nThe endpoints of a road are drawn with larger white circles if they\ndon't connect to anything.\n\nTo connect a road to another feature, drag one of its nodes onto the\nother feature in order to join them.\n\nTo disconnect a road from another feature, right-click the connecting\nnode and select the {disconnect} 'Disconnect' tool or press the `D`\nshortcut key.\n\nIf you know that the connection has traffic lights or crosswalks,\nyou can add them by selecting the connecting node and using the\nfeature editor to select the correct feature's type.\n", + "attributes": "### Attributtes\n\nWhen a road is selected, the feature editor in the sidebar will show\nthe type of the road and many attributes like name, speed limit,\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 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" + "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 files (file types `.gpx`, `.geojson`, and `.kml`) on your local computer.\nYou can collect this 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 {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" + "intro": "# GPS Traces\n\nCollected GPS traces are a valuable source of data for OpenStreetMap. This editor\nsupports `.gpx`, `.geojson`, and `.kml` files on your local computer. You can collect\nGPS traces with a smartphone, sports watch, or other GPS device.\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 GPS trace for mapping, drag and drop the data file onto the map\neditor. If it's recognized, it will be drawn on the map as a bright purple\nline. Click on the {data} 'Map data' panel on the side of the map to enable,\ndisable, or zoom to your GPS data.\n\nThe GPS track isn't sent to OpenStreetMap - the best way to use it is to\ndraw on the map, using it as a guide for the new features that you add.\n\nYou can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" + }, + "streetlevel": { + "intro": "# Street Level Photos\n\nStreet level photos provide a ground-truth prespective of an area, useful\nfor mapping traffic signs, businesses, and other details that you can't\nsee from satellite and aerial images. The iD editor supports street level\nphotos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).\n", + "using": "### Using\n\nTo use streetlevel photos for mapping, click on the {data} 'Map data' panel on the\nside of the map to enable or disable the available photo layers.\n\nWhen enabled, the photo layer will display a line along the sequence of photos.\nAt higher zooms you will see a circle at each photo location, and at even higher\nzooms you will see a viewfield to indicate the direction that the photo was taken.\n", + "viewer": "\nWhen you click on one of the photo locations, a photo viewer will appear in the\nbottom corner of the map. The photo viewer contains controls to step forward and\nbackward in the image sequence. It will also show the person who captured the image,\nthe date it was captured, and a link to view the image on the original site.\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 residential areas, farmland, forests, lakes, or ponds.\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 and then pressing the `Delete`\nkey, or by 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", diff --git a/modules/ui/help.js b/modules/ui/help.js index 95ce7c2e2..adaa4dc9b 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -24,6 +24,7 @@ export function uiHelp(context) { ['help.editing.',['intro','multiselect','edit','save','upload','comeback']], ['help.roads.',['intro','move','connect','attributes','delete','create']], ['help.gps.',['intro','using']], + ['help.streetlevel.',['intro','using','viewer']], ['help.buildings.',['intro','select','modify','create','delete']], ['help.addresses.',['intro','nodup','recommendation','points']], ['help.feature_editor.',['intro','select','fields','tags','undo']], From 467fcb8b9a1fe3f50b3ea93def6728f36c6e4532 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 21 Nov 2017 11:32:38 -0500 Subject: [PATCH 16/33] Simplify language in imagery section, move streetlevel and gps after --- data/core.yaml | 150 +++++++++++++++++++++++-------------------- dist/locales/en.json | 28 ++++---- modules/ui/help.js | 6 +- 3 files changed, 97 insertions(+), 87 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index dc445846e..7c35baa08 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -566,8 +566,8 @@ en: 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 aerial or streetlevel imagery. Copying from commercial sources, like Google Maps, - [is strictly forbidden](https://www.openstreetmap.org/copyright). + or imagery collected from aerial or street level photos. Copying from commercial + sources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright). beforestart: | ### Before you start @@ -751,63 +751,11 @@ en: it by clicking on the intersection point. When you're done drawing, double-click or press `Return` or `Enter` on your keyboard. - gps: - intro: | - # GPS Traces - - 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. - - For information on how to perform a GPS survey, read - [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/). - - using: | - ### 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 on the {data} 'Map data' panel on the side of the map to enable, - disable, or zoom to your GPS data. - - 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. - - You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) - for other users to use. - - streetlevel: - intro: | - # Street Level Photos - - Street level photos provide a ground-truth prespective of an area, 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: | - ### Using - - To use streetlevel photos for mapping, click on the {data} 'Map data' panel on the - side of the map to enable or disable the available photo layers. - - When enabled, the photo layer will display a line along the sequence of photos. - At higher zooms you will see a circle at each photo location, and at even higher - zooms you will see a viewfield to indicate the direction that the photo was taken. - - viewer: | - - When you click on one of the photo locations, a photo viewer will appear in the - bottom corner of the map. The photo viewer contains controls to step forward and - backward in the image sequence. It will also show 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. - buildings: intro: | # Buildings & Areas - OpenStreetMap is the world's largest database of buildings. + OpenStreetMap is the world's largest freely-available database of buildings. You can improve this database. Buildings are the most used type of areas, others are residential areas, farmland, forests, lakes, or ponds. What you can do with buildings applies to most types of areas. @@ -942,28 +890,90 @@ en: imagery: intro: | - # Imagery + # Background Imagery - 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 {layers} `Background settings` menu on the right. + Background imagery is an important resource for mapping, and is displayed + beneath the map data. 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. - background: | - ### Background + To see which imagery sources are available for editing, click on + the {layers} 'Background settings' panel on the side of the map. - 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. + sources: | + ### Sources + + By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is + displayed in the editor. 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. offset: | ### Offset - Imagery is sometimes offset from the map data because of a mistake on the - imagery provider's side. If you see a lot of roads shifted from the background, - don't immediately move them all to match the background. Instead you can adjust - the imagery so that it matches the existing data by clicking 'Fix alignment' at - the bottom of the Background Settings. + Imagery is sometimes offset slightly from accurate map data. + + If you see a lot of roads or buildings shifted from the background imagery, + 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. + + Click on the small triangles to adjust the imagery offset in small steps, + or press the mouse down and drag within the grey square to slide the imagery + into alignment. + + streetlevel: + intro: | + # Street Level Photos + + Street level photos provide a ground-truth prespective of an area, 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: | + ### Using + + To use street level photos for mapping, click on the {data} 'Map data' panel on the + side of the map to enable or disable the available photo layers. + + When enabled, the photo layer will display a line along the sequence of photos. + At higher zooms you will see a circle at each photo location, and at even higher + zooms you will see a viewfield to indicate the direction that the photo was taken. + + viewer: | + + When you click on one of the photo locations, a photo viewer will appear in the + bottom corner of the map. The photo viewer contains controls to step forward and + backward in the image sequence. It will also show 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: + intro: | + # GPS Traces + + 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. + + For information on how to perform a GPS survey, read + [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/). + + using: | + ### 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 on the {data} 'Map data' panel on the side of the map to enable, + disable, or zoom to your GPS data. + + 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. + + You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) + for other users to use. relations: intro: | diff --git a/dist/locales/en.json b/dist/locales/en.json index 06575a6da..af8b7c1e0 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -682,7 +682,7 @@ "key": "H", "help": { "intro": "# Help\n\nWelcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/).\nWith this editor you can update OpenStreetMap right from your web browser.\n", - "opendata": "### Open Data\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying,\nor aerial or streetlevel imagery. Copying from commercial sources, like Google Maps,\n[is strictly forbidden](https://www.openstreetmap.org/copyright).\n", + "opendata": "### Open Data\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying,\nor imagery collected from aerial or street level photos. Copying from commercial\nsources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright).\n", "beforestart": "### Before you start\n\nYou should be familiar with OpenStreetMap and this editor before you start editing.\niD contains a builtin walkthrough to teach you the basics of editing OpenStreetMap.\nClick \"Start the Walkthrough\" on this screen to take the tutorial - it takes only\nabout 15 minutes.\n", "opensource": "### Open Source\n\nThe iD editor is a collaborative open source project, and you are using version {version} now.\nThe source code is available [on GitHub](https://github.com/openstreetmap/iD).\n\nYou can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)\nor [reporting bugs](https://github.com/openstreetmap/iD/issues).\n" }, @@ -709,17 +709,8 @@ "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 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 Traces\n\nCollected GPS traces are a valuable source of data for OpenStreetMap. This editor\nsupports `.gpx`, `.geojson`, and `.kml` files on your local computer. You can collect\nGPS traces with a smartphone, sports watch, or other GPS device.\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 GPS trace for mapping, drag and drop the data file onto the map\neditor. If it's recognized, it will be drawn on the map as a bright purple\nline. Click on the {data} 'Map data' panel on the side of the map to enable,\ndisable, or zoom to your GPS data.\n\nThe GPS track isn't sent to OpenStreetMap - the best way to use it is to\ndraw on the map, using it as a guide for the new features that you add.\n\nYou can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" - }, - "streetlevel": { - "intro": "# Street Level Photos\n\nStreet level photos provide a ground-truth prespective of an area, useful\nfor mapping traffic signs, businesses, and other details that you can't\nsee from satellite and aerial images. The iD editor supports street level\nphotos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).\n", - "using": "### Using\n\nTo use streetlevel photos for mapping, click on the {data} 'Map data' panel on the\nside of the map to enable or disable the available photo layers.\n\nWhen enabled, the photo layer will display a line along the sequence of photos.\nAt higher zooms you will see a circle at each photo location, and at even higher\nzooms you will see a viewfield to indicate the direction that the photo was taken.\n", - "viewer": "\nWhen you click on one of the photo locations, a photo viewer will appear in the\nbottom corner of the map. The photo viewer contains controls to step forward and\nbackward in the image sequence. It will also show the person who captured the image,\nthe date it was captured, and a link to view the image on the original site.\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 residential areas, farmland, forests, lakes, or ponds.\nWhat you can do with buildings applies to most types of areas.\n", + "intro": "# Buildings & Areas\n\nOpenStreetMap is the world's largest freely-available database of buildings.\nYou can improve this database. Buildings are the most used type\nof areas, others are residential areas, farmland, forests, lakes, or ponds.\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", @@ -739,9 +730,18 @@ "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 {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" + "intro": "# Background Imagery\n\nBackground imagery is an important resource for mapping, and is displayed\nbeneath the map data. This imagery can be aerial photos collected\nfrom satellites, airplanes, and drones, or it can be scanned historical\nmaps or other freely available source data.\n\nTo see which imagery sources are available for editing, click on\nthe {layers} 'Background settings' panel on the side of the map.\n", + "sources": "### Sources\n\nBy default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is\ndisplayed in the editor. Depending on where you are editing, other imagery\nsources will be available. Some may be newer or have higher resolution,\nso it is always useful to check and see which layer is the best one to use\nas a mapping reference.\n", + "offset": "### Offset\n\nImagery is sometimes offset slightly from accurate map data.\n\nIf you see a lot of roads or buildings shifted from the background imagery,\ndon't move them all to match the background. Instead, you can adjust\nthe background so that it matches the existing data by expanding the\n'Adjust Imagery Offset' section at the bottom of the Background Settings pane.\n\nClick on the small triangles to adjust the imagery offset in small steps,\nor press the mouse down and drag within the grey square to slide the imagery\ninto alignment.\n" + }, + "streetlevel": { + "intro": "# Street Level Photos\n\nStreet level photos provide a ground-truth prespective of an area, useful\nfor mapping traffic signs, businesses, and other details that you can't\nsee from satellite and aerial images. The iD editor supports street level\nphotos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).\n", + "using": "### Using\n\nTo use street level photos for mapping, click on the {data} 'Map data' panel on the\nside of the map to enable or disable the available photo layers.\n\nWhen enabled, the photo layer will display a line along the sequence of photos.\nAt higher zooms you will see a circle at each photo location, and at even higher\nzooms you will see a viewfield to indicate the direction that the photo was taken.\n", + "viewer": "\nWhen you click on one of the photo locations, a photo viewer will appear in the\nbottom corner of the map. The photo viewer contains controls to step forward and\nbackward in the image sequence. It will also show the username of the person who\ncaptured the image, the date it was captured, and a link to view the image on\nthe original site.\n" + }, + "gps": { + "intro": "# GPS Traces\n\nCollected GPS traces are a valuable source of data for OpenStreetMap. This editor\nsupports `.gpx`, `.geojson`, and `.kml` files on your local computer. You can collect\nGPS traces with a smartphone, sports watch, or other GPS device.\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 GPS trace for mapping, drag and drop the data file onto the map\neditor. If it's recognized, it will be drawn on the map as a bright purple\nline. Click on the {data} 'Map data' panel on the side of the map to enable,\ndisable, or zoom to your GPS data.\n\nThe GPS track isn't sent to OpenStreetMap - the best way to use it is to\ndraw on the map, using it as a guide for the new features that you add.\n\nYou can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" }, "relations": { "intro": "# Relations & Members\n\nA *relation* is a special type of feature in OpenStreetMap that groups together other\nfeatures, called *members* of the relation. Every member of a relation can have a\n*role* for the relation. At the bottom of the feature editor, you can see which\nrelations a feature is a member of, and the click on a relation there will select it.\nWhen the relation is selected, you can see all of its members highlighted on the map\nand listed in the feature editor together with their role for the relation.\n", diff --git a/modules/ui/help.js b/modules/ui/help.js index adaa4dc9b..77090480a 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -23,12 +23,12 @@ export function uiHelp(context) { ['help.overview.',['intro','features','navigation','keyboard']], ['help.editing.',['intro','multiselect','edit','save','upload','comeback']], ['help.roads.',['intro','move','connect','attributes','delete','create']], - ['help.gps.',['intro','using']], - ['help.streetlevel.',['intro','using','viewer']], ['help.buildings.',['intro','select','modify','create','delete']], ['help.addresses.',['intro','nodup','recommendation','points']], ['help.feature_editor.',['intro','select','fields','tags','undo']], - ['help.imagery.',['intro','background','offset']], + ['help.imagery.',['intro','sources','offset']], + ['help.streetlevel.',['intro','using','viewer']], + ['help.gps.',['intro','using']], ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']] ]; From 1f6c8d9132329ca6ae19e72a7618d9a173454f93 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 21 Nov 2017 16:33:58 -0500 Subject: [PATCH 17/33] Move more of the content from the walkthrough into the help sections --- data/core.yaml | 337 +++++++++++++++++++++---------------------- dist/locales/en.json | 67 ++++----- modules/ui/help.js | 10 +- 3 files changed, 207 insertions(+), 207 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 7c35baa08..a976abdc9 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -590,38 +590,33 @@ en: intro: | # Overview + navigation: | + ### Navigation + + You can drag the map by pressing and holding the left mouse button while + moving the mouse around. You can also use the arrow keys on your keyboard. + + 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. + features: | ### Map 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. Features are + world can be mapped as a feature on OpenStreetMap. Map features are represented on the map using *points*, *lines*, or *areas*. In OpenStreetmap, points are sometimes called *nodes*, and lines and areas are sometimes called *ways*. - navigation: | - ### Navigation - - You can drag the map by pressing and holding the left mouse button - while moving the mouse around. This is also called *panning*. - - 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. - - keyboard: | - ### Keyboard Shortcuts - - You can view a list of keyboard shortcuts by pressing the `?` key. - editing: intro: | # Editing & Saving - `Left-Click` on a feature to select it. This will highlight the - feature with a pusling glow, and the sidebar will display more details, - such as its name or address. + `Left-click` on a feature to select it. This will highlight the + feature with a pusling glow, and the sidebar will display details + about that feature, such as it's name or address. `Right-click` on a map feature to display the editing menu, which shows the commands that are available, such as rotating, moving, and deleting. @@ -636,8 +631,8 @@ en: then press and hold the left mouse button, and drag the mouse to draw a selection lasso. All of the points inside the lasso area will be selected. - edit: | - ### Edit + undo_redo: | + ### Undo and Redo When you make changes to the map, these are stored locally until you save them to the server. Don't worry if you make a mistake - until the edits are @@ -647,11 +642,11 @@ en: save: | ### Save - Click `Save` to finish your edits and send them to the OpenStreetMap - server. You should remember to save your work frequently! + Click {save} `Save` to finish your edits and send them to OpenStreetMap. + You should remember to save your work frequently! On the save screen, you'll have a chance to review what you've done. - The editor will perform a basic check for missing data and may offer + iD will also perform some basic checks for missing data and may offer helpful suggestions and warnings if something doesn't seem right. upload: | @@ -662,187 +657,191 @@ en: Then click `Upload` to send your changes to OpenStreetMap, where they will be merged into the map and publicly visible to everyone. - comeback: | + backups: | + ### Automatic 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 locally. - You can come back later (on the same browser and computer), and the - editor will offer to restore your work. + crashes or you close the browser tab, your edits are still saved locally + in your browser's storage. You can come back later (on the same browser + and computer), and iD will offer to restore your work. - roads: + keyboard: | + ### Keyboard Shortcuts + + You can view a list of keyboard shortcuts by pressing the `?` key. + + points: intro: | - # Roads & Lines + # Points - You can create, fix, and delete roads with this editor. Roads can be all - kinds: paths, highways, trails, cycle ways, and more - any used segment - is mappable. Roads are the most used type of line. Other examples of - lines are waterways, walls, and fences. What you can do with roads - applies to most types of lines. + *Points* can be used to represent features such as shops, restaurants, and + monuments. They mark a specific location, and describe what's there. - modifying: | - ### Modifying + add_point: | + ### Adding Points - Often you'll see roads that aren't aligned to the imagery or - to a GPS track. You can adjust these roads so they are in the correct place. - Click on a road to select it. All nodes of the road will be shown as small circles. - You can drag the nodes to better locations. - You can also create new nodes either by double-clicking on the road or by - moving the small triangles at the midpoints between nodes. + To add a point, click the {point} `Point` button on the toolbar + at the top of the map, or press the shortcut key `1`. This will + change the mouse cursor to a cross symbol. - move: | - ### Moving + To place the new point on the map, position the mouse cursor where the point + should go, then `left-click` or press the `spacebar`. - If you `right-click` the road, the editing menu will appear. - You can select the {move} 'Move' tool to move the entire road at one time. - Then click again to place the road in its new location. - You can also press the `M` shortcut key to move a road. + move_point: | + ### Moving Points - connect: | - ### Connecting + To move a point, place the mouse cursor over the point, then press the left + mouse button and hold it down while dragging the point to its new location. + + delete_point: | + ### Deleting Points + + 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. + + To delete a point, `right-click` on the point to select it and + show the edit menu, then use the {delete} `Delete` command. + You can also press the `delete` key on your keyboard. + + lines: + intro: | + # Lines & Roads + + *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: | + ### Adding Lines + + To add a line, click the {line} `Line` button on the toolbar + at the top of the map, or press the shortcut key `2`. This will + change the mouse cursor to a cross symbol. + + Next, position the mouse cursor where the line should begin and `left-click` + or press the `spacebar` to begin placing nodes along the line. + Continue placing more nodes by `left-clicking` or pressing `spacebar`. + While drawing, you can zoom in or drag the map in order to add more detail. + + To finish a line, press `enter` or click on the last node again. + + modify_line: | + ### Modifying Lines + + 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 `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. + + You can also create new nodes along a line either by `double-clicking` on + the line or by dragging the small triangles at the midpoints between nodes. + + connect_line: | + ### Connecting Lines Having roads connected properly is important for the map and essential for providing driving directions. The connections between roads are drawn with grey circles. - The endpoints of a road are drawn with larger white circles if they + The endpoints of a line are drawn with larger white circles if they don't connect to anything. - To connect a road to another feature, drag one of its nodes onto the - other feature in order to join them. - - To disconnect a road from another feature, right-click the connecting - node and select the {disconnect} 'Disconnect' tool or press the `D` - shortcut key. + To connect a line to another feature, drag one of its nodes onto the + other feature to connect them. 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. - attributes: | - ### Attributtes + disconnect_line: | + ### Disconnecting Lines - When a road is selected, the feature editor in the sidebar will show - the type of the road and many attributes like name, speed limit, - and surface. You can modify fields or even add new ones. + To disconnect a road from another feature, `right-click` the connecting + node and select the {disconnect} `Disconnect` tool. - delete: | - ### Deleting + move_line: | + ### Moving Lines - If a road is entirely incorrect - you can see that it doesn't exist in satellite - imagery and ideally have confirmed locally that it's not present - you can delete - it, which removes it from the map. Be cautious when deleting features - - like any other edit, the results are seen by everyone and satellite imagery - is often out of date, so the road could simply be newly built. + To move an entire line, `right-click` the line and select the {move} + `Move` tool from the editing menu. Then move the mouse, and `left-click` + to place the line in a new location. - You can delete a road by clicking on it to select it, then pressing the 'Delete' - key or right-clicking it and then using the {delete} 'Delete' tool. + 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. - create: | - ### Creating + delete_line: | + ### Deleting Lines - Found somewhere there should be a road but there isn't? Click the {line} Line - icon in the top-left of the map or press the shortcut key `2` to start drawing - a 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 cautious when deleting features - + the background imagery you are using might be outdated, and a road that + looks wrong could simply be newly built. - Click on the start of the road on the map to start drawing. If the road - branches off from an existing road, start by clicking on the place where they connect. + To delete a line, `right-click` on the line to select it and + show the edit menu, then use the {delete} `Delete` command. + You can also press the `delete` key on your keyboard. - Then click on points along the road so that it follows the right path, according - to satellite imagery or GPS. If the road you are drawing crosses another road, connect - it by clicking on the intersection point. When you're done drawing, double-click - or press `Return` or `Enter` on your keyboard. - - buildings: + areas: intro: | - # Buildings & Areas + # Areas & Buildings - OpenStreetMap is the world's largest freely-available database of buildings. - You can improve this database. Buildings are the most used type - of areas, others are residential areas, farmland, forests, lakes, or ponds. - What you can do with buildings applies to most types of areas. + *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. - select: | - ### Selecting + point_or_area: | + ### Points or Areas? - You can select a building by clicking on its border. the pulsing glow will - will become visible, all nodes will be shown as circles and the - feature editor on the left will show the type of the building and - attributes like name, levels, and address. + Many features can be represented as points or areas. + It is recommended to map buildings and property outlines as areas + whenever possible, and to map businesses, amenities, and other features + that operate within buildings as points placed inside the building area. - modify: | - ### Modifying + add_area: | + ### Adding Areas - Sometimes buildings are incorrectly placed or have incorrect tags. - To move an entire building, select it and press the `M` shortcut key, - or right-click it and select the {move} 'Move' tool. Move your - mouse to shift the building, and click when it's correctly placed. + To add an area, click the {area} `Area` button on the toolbar + at the top of the map, or press the shortcut key `3`. This will + change the mouse cursor to a cross symbol. - To fix the specific shape of a building, click and drag the nodes that form - its border into better places. + Next, position the mouse cursor at one of the corners of the feature and `left-click` + or press the `spacebar` to begin placing nodes around the outer edge of + the area. Continue placing more nodes by `left-clicking` or pressing `spacebar`. + While drawing, you can zoom in or drag the map in order to add more detail. - create: | - ### Creating + To finish an area, press `enter` or click again on either the first or last node. - One of the main questions around adding buildings to the map is that - OpenStreetMap records buildings both as shapes and points. The rule of thumb - is to _map a building as a shape whenever possible_, and map companies, homes, - amenities, and other things that operate out of buildings as points placed - within the building shape. + square_area: | + ### Square Corners - Start drawing a building as a shape by clicking the {area} Area button in the top - left of the map, and end it either by pressing 'Return' on your keyboard - or clicking on the first node drawn or clicking again on the last node drawn - to close the shape. + Many area features like buildings have square corners. + To square the corners of an area, `right-click` the edge of the area + and select the {square} `Square` tool. - Then you assign the type of the building to the outline with the feature editor. - Most buildings are houses, if you're not sure choose the generic Building type. + modify_area: | + ### Modifying Areas - delete: | - ### Deleting + 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 `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. - If a building is entirely incorrect - you can see that it doesn't exist in satellite - imagery and ideally have confirmed locally that it's not present - you can delete - it, which removes it from the map. Be cautious when deleting features - - like any other edit, the results are seen by everyone and satellite imagery - is often out of date, so the building could simply be newly built. + You can also create new nodes along an area either by `double-clicking` on + the edge of the area or by dragging the small triangles at the midpoints + between nodes. - You can delete a building by clicking on it to select it and then pressing the `Delete` - key, or by right-clicking it and then using the {delete} 'Delete' tool. + delete_area: | + ### Deleting Areas - addresses: - intro: | - # Addresses & Points + 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. - Addresses are some of the most useful information for the map. - - Address information can be added to OpenStreetMap using a variety of methods, - such as adding a simple point containing an address, adding address information - to a building, site or other area, or alternatively to an entrance node. - - nodup: | - ### No duplication - - Usually address information doesn't need to be duplicated, e.g. when there - is a building outline on the map and several shops as points inside, - only the building should have an address. - - recommendation: | - ### Recommendation - - Most buildings and sites have only one address and it is recommended to add - the address to the building as a whole. If there is no building on the map - and you cannot draw one, you should add an address point to the map. - - Some buildings or sites have more than one address. You can add the - addresses as separate points inside the building. - - points: | - ### Other Points - - While addresses are still the most common type of point feature, - 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 map or press the shortcut key `1` to insert a point. + To delete an area, `right-click` on the area to select it and + show the edit menu, then use the {delete} `Delete` command. + You can also press the `delete` key on your keyboard. feature_editor: intro: | @@ -859,7 +858,7 @@ en: The feature editor will display buttons for common feature types, and you can find others by typing what you're looking for in the search box. - Click the 'i' in the top-right-hand corner of a feature type button to + Click the {inspect} icon next to the feature name to learn more about it. Click a button to choose that type. fields: | @@ -885,8 +884,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} '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: | @@ -897,14 +896,14 @@ en: from satellites, airplanes, and drones, or it can be scanned historical maps or other freely available source data. - To see which imagery sources are available for editing, click on - the {layers} 'Background settings' panel on the side of the map. + To see which imagery sources are available for editing, click the + {layers} `Background settings` button on the side of the map. sources: | ### Sources By default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is - displayed in the editor. Depending on where you are editing, other imagery + 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. @@ -920,8 +919,8 @@ en: 'Adjust Imagery Offset' section at the bottom of the Background Settings pane. Click on the small triangles to adjust the imagery offset in small steps, - or press the mouse down and drag within the grey square to slide the imagery - into alignment. + or hold the left mouse botton and drag within the grey square to slide + the imagery into alignment. streetlevel: intro: | @@ -935,7 +934,7 @@ en: using: | ### Using - To use street level photos for mapping, click on the {data} 'Map data' panel on the + 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. When enabled, the photo layer will display a line along the sequence of photos. @@ -966,7 +965,7 @@ en: 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 on the {data} 'Map data' panel on the side of the map to enable, + line. Click the {data} `Map data` panel on the side of the map to enable, disable, or zoom to your GPS data. The GPS track isn't sent to OpenStreetMap - the best way to use it is to diff --git a/dist/locales/en.json b/dist/locales/en.json index af8b7c1e0..10666cd8c 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -688,60 +688,61 @@ }, "overview": { "intro": "# Overview\n", - "features": "### Map Features\n\nWe use the word *features* to describe things that appear on the map,\nsuch as roads, buildings, or points of interest. Anything in the real\nworld can be mapped as a feature on OpenStreetMap. Features are\nrepresented on the map using *points*, *lines*, or *areas*.\n\nIn OpenStreetmap, points are sometimes called *nodes*, and lines and areas\nare sometimes called *ways*.\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*.\n\nYou can zoom in or out by scrolling with the mouse wheel or trackpad,\nor by clicking the {plus} / {minus} buttons along the side of the map.\n", - "keyboard": "### Keyboard Shortcuts\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n" + "navigation": "### Navigation\n\nYou can drag the map by pressing and holding the left mouse button while\nmoving the mouse around. You can also use the arrow keys on your keyboard.\n\nYou can zoom in or out by scrolling with the mouse wheel or trackpad,\nor by clicking the {plus} / {minus} buttons along the side of the map.\n", + "features": "### Map Features\n\nWe use the word *features* to describe things that appear on the map,\nsuch as roads, buildings, or points of interest. Anything in the real\nworld can be mapped as a feature on OpenStreetMap. Map features are\nrepresented on the map using *points*, *lines*, or *areas*.\n\nIn OpenStreetmap, points are sometimes called *nodes*, and lines and areas\nare sometimes called *ways*.\n" }, "editing": { - "intro": "# Editing & Saving\n\n`Left-Click` on a feature to select it. This will highlight the\nfeature with a pusling glow, and the sidebar will display more details,\nsuch as its name or address.\n\n`Right-click` on a map feature to display the editing menu, which shows\nthe commands that are available, such as rotating, moving, and deleting.\n", + "intro": "# Editing & Saving\n\n`Left-click` on a feature to select it. This will highlight the\nfeature with a pusling glow, and the sidebar will display details\nabout that feature, such as it's name or address.\n\n`Right-click` on a map feature to display the editing menu, which shows\nthe commands that are available, such as rotating, moving, and deleting.\n", "multiselect": "### Multiselect\n\n`Shift-click` to select several features together. This makes\nit easier to move or delete multiple items.\n\nAnother way to select multiple features is to hold down the `Shift` key,\nthen press and hold the left mouse button, and drag the mouse to draw a\nselection lasso. All of the points inside the lasso area will be selected.\n", - "edit": "### Edit\n\nWhen you make changes to the map, these are stored locally until you save\nthem to the server. Don't worry if you make a mistake - until the edits are\nsaved, you can undo changes by clicking the {undo} `Undo` button, and redo\nchanges by clicking the {redo} `Redo` button.\n", - "save": "### Save\n\nClick `Save` to finish your edits and send them to the OpenStreetMap\nserver. You should remember to save your work frequently!\n\nOn the save screen, you'll have a chance to review what you've done.\nThe editor will perform a basic check for missing data and may offer\nhelpful suggestions and warnings if something doesn't seem right.\n", + "undo_redo": "### Undo and Redo\n\nWhen you make changes to the map, these are stored locally until you save\nthem to the server. Don't worry if you make a mistake - until the edits are\nsaved, you can undo changes by clicking the {undo} `Undo` button, and redo\nchanges by clicking the {redo} `Redo` button.\n", + "save": "### Save\n\nClick {save} `Save` to finish your edits and send them to OpenStreetMap.\nYou should remember to save your work frequently!\n\nOn the save screen, you'll have a chance to review what you've done.\niD will also perform some basic checks for missing data and may offer\nhelpful suggestions and warnings if something doesn't seem right.\n", "upload": "### Upload\n\nBefore uploading your changes you must enter a\n[changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments).\nThen click `Upload` to send your changes to OpenStreetMap, where they will be\nmerged into the map and publicly visible to everyone.\n", - "comeback": "If you can't finish your edits in one sitting, for example if your computer\ncrashes or you close the browser tab, your edits are still saved locally.\nYou can come back later (on the same browser and computer), and the\neditor will offer to restore your work.\n" + "backups": "### Automatic Backups\n\nIf you can't finish your edits in one sitting, for example if your computer\ncrashes or you close the browser tab, your edits are still saved locally\nin your browser's storage. You can come back later (on the same browser\nand computer), and iD will offer to restore your work.\n", + "keyboard": "### Keyboard Shortcuts\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n" }, - "roads": { - "intro": "# Roads & Lines\n\nYou can create, fix, and delete roads with this editor. Roads can be all\nkinds: paths, highways, trails, cycle ways, and more - any used segment\nis mappable. Roads are the most used type of line. Other examples of\nlines are waterways, walls, and fences. What you can do with roads\napplies to most types of lines.\n", - "modifying": "### Modifying\n\nOften you'll see roads that aren't aligned to the imagery or\nto a GPS track. You can adjust these roads so they are in the correct place.\nClick on a road to select it. All nodes of the road will be shown as small circles.\nYou can drag the nodes to better locations.\nYou can also create new nodes either by double-clicking on the road or by\nmoving the small triangles at the midpoints between nodes.\n", - "move": "### Moving\n\nIf you `right-click` the road, the editing menu will appear.\nYou can select the {move} 'Move' tool to move the entire road at one time.\nThen click again to place the road in its new location.\nYou can also press the `M` shortcut key to move a road.\n", - "connect": "### Connecting\n\nHaving roads connected properly is important for the map\nand essential for providing driving directions.\n\nThe connections between roads are drawn with grey circles.\nThe endpoints of a road are drawn with larger white circles if they\ndon't connect to anything.\n\nTo connect a road to another feature, drag one of its nodes onto the\nother feature in order to join them.\n\nTo disconnect a road from another feature, right-click the connecting\nnode and select the {disconnect} 'Disconnect' tool or press the `D`\nshortcut key.\n\nIf you know that the connection has traffic lights or crosswalks,\nyou can add them by selecting the connecting node and using the\nfeature editor to select the correct feature's type.\n", - "attributes": "### Attributtes\n\nWhen a road is selected, the feature editor in the sidebar will show\nthe type of the road and many attributes like name, speed limit,\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 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" + "points": { + "intro": "# Points\n\n*Points* can be used to represent features such as shops, restaurants, and\nmonuments. They mark a specific location, and describe what's there.\n", + "add_point": "### Adding Points\n\nTo add a point, click the {point} `Point` button on the toolbar\nat the top of the map, or press the shortcut key `1`. This will\nchange the mouse cursor to a cross symbol.\n\nTo place the new point on the map, position the mouse cursor where the point\nshould go, then `left-click` or press the `spacebar`.\n", + "move_point": "### Moving Points\n\nTo move a point, place the mouse cursor over the point, then press the left\nmouse button and hold it down while dragging the point to its new location.\n", + "delete_point": "### Deleting Points\n\nIt's OK to delete features that don't exist in the real world. Deleting a feature\nfrom OpenStreetMap removes it from the map that everyone uses, so you should make\nsure a feature is really gone before you delete it.\n\nTo delete a point, `right-click` on the point to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\n" }, - "buildings": { - "intro": "# Buildings & Areas\n\nOpenStreetMap is the world's largest freely-available database of buildings.\nYou can improve this database. Buildings are the most used type\nof areas, others are residential areas, farmland, forests, lakes, or ponds.\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 and then pressing the `Delete`\nkey, or by right-clicking it and then using the {delete} 'Delete' tool.\n" + "lines": { + "intro": "# Lines & Roads\n\n*Lines* are used to represent features such as roads, railroads, and rivers.\nLines should be drawn down the center of the feature that they represent.\n", + "add_line": "### Adding Lines\n\nTo add a line, click the {line} `Line` button on the toolbar\nat the top of the map, or press the shortcut key `2`. This will\nchange the mouse cursor to a cross symbol.\n\nNext, position the mouse cursor where the line should begin and `left-click`\nor press the `spacebar` to begin placing nodes along the line.\nContinue placing more nodes by `left-clicking` or pressing `spacebar`.\nWhile drawing, you can zoom in or drag the map in order to add more detail.\n\nTo finish a line, press `enter` or click on the last node again.\n", + "modify_line": "### Modifying Lines\n\nOften you'll see lines that aren't shaped correctly, for example a road\nthat does not match up with the background imagery. To adjust the shape\nof a line, first `left-click` to select it. All nodes of the line will be\ndrawn as small circles. You can then drag the nodes to better locations.\n\nYou can also create new nodes along a line either by `double-clicking` on\nthe line or by dragging the small triangles at the midpoints between nodes.\n", + "connect_line": "### Connecting Lines\n\nHaving roads connected properly is important for the map\nand essential for providing driving directions.\n\nThe connections between roads are drawn with grey circles.\nThe endpoints of a line are drawn with larger white circles if they\ndon't connect to anything.\n\nTo connect a line to another feature, drag one of its nodes onto the\nother feature to connect them.\n\nIf you know that the connection has traffic lights or crosswalks,\nyou can add them by selecting the connecting node and using the\nfeature editor to select the correct feature's type.\n", + "disconnect_line": "### Disconnecting Lines\n\nTo disconnect a road from another feature, `right-click` the connecting\nnode and select the {disconnect} `Disconnect` tool.\n", + "move_line": "### Moving Lines\n\nTo move an entire line, `right-click` the line and select the {move}\n`Move` tool from the editing menu. Then move the mouse, and `left-click`\nto place the line in a new location.\n\nLines that are connected to other features will stay connected as you\nmove the line to a new location. iD may prevent you from moving a line\nacross another connected line.\n", + "delete_line": "### Deleting Lines\n\nIf a line is entirely incorrect, for example a road that doesn't exist\nin the real world, it's OK to delete it. Be cautious when deleting features -\nthe background imagery you are using might be outdated, and a road that\nlooks wrong could simply be newly built.\n\nTo delete a line, `right-click` on the line to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\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 information 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 recommended 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 map or press the shortcut key `1` to insert a point.\n" + "areas": { + "intro": "# Areas & Buildings\n\n*Areas* are used to show the boundaries of features like lakes, buildings,\nand residential areas. Areas should be traced around the edge of the\nfeature that they represent, for example, around the base of a building.\n", + "point_or_area": "### Points or Areas?\n\nMany features can be represented as points or areas.\nIt is recommended to map buildings and property outlines as areas\nwhenever possible, and to map businesses, amenities, and other features\nthat operate within buildings as points placed inside the building area.\n", + "add_area": "### Adding Areas\n\nTo add an area, click the {area} `Area` button on the toolbar\nat the top of the map, or press the shortcut key `3`. This will\nchange the mouse cursor to a cross symbol.\n\nNext, position the mouse cursor at one of the corners of the feature and `left-click`\nor press the `spacebar` to begin placing nodes around the outer edge of\nthe area. Continue placing more nodes by `left-clicking` or pressing `spacebar`.\nWhile drawing, you can zoom in or drag the map in order to add more detail.\n\nTo finish an area, press `enter` or click again on either the first or last node.\n", + "square_area": "### Square Corners\n\nMany area features like buildings have square corners.\nTo square the corners of an area, `right-click` the edge of the area\nand select the {square} `Square` tool.\n", + "modify_area": "### Modifying Areas\n\nOften you'll see areas that aren't shaped correctly, for example a building\nthat does not match up with the background imagery. To adjust the shape\nof an area, first `left-click` to select it. All nodes of the area will be\ndrawn as small circles. You can then drag the nodes to better locations.\n\nYou can also create new nodes along an area either by `double-clicking` on\nthe edge of the area or by dragging the small triangles at the midpoints\nbetween nodes.\n", + "delete_area": "### Deleting Areas\n\nIf an area is entirely incorrect, for example a building that doesn't exist\nin the real world, it's OK to delete it. Be cautious when deleting features -\nthe background imagery you are using might be outdated, and a building that\nlooks wrong could simply be newly built.\n\nTo delete an area, `right-click` on the area to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\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", + "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 {inspect} icon next to the feature name 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 are actually 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[Taginfo](https://taginfo.openstreetmap.org/) is a great resource to learn more\nabout 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} '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": "# Background Imagery\n\nBackground imagery is an important resource for mapping, and is displayed\nbeneath the map data. This imagery can be aerial photos collected\nfrom satellites, airplanes, and drones, or it can be scanned historical\nmaps or other freely available source data.\n\nTo see which imagery sources are available for editing, click on\nthe {layers} 'Background settings' panel on the side of the map.\n", - "sources": "### Sources\n\nBy default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is\ndisplayed in the editor. Depending on where you are editing, other imagery\nsources will be available. Some may be newer or have higher resolution,\nso it is always useful to check and see which layer is the best one to use\nas a mapping reference.\n", - "offset": "### Offset\n\nImagery is sometimes offset slightly from accurate map data.\n\nIf you see a lot of roads or buildings shifted from the background imagery,\ndon't move them all to match the background. Instead, you can adjust\nthe background so that it matches the existing data by expanding the\n'Adjust Imagery Offset' section at the bottom of the Background Settings pane.\n\nClick on the small triangles to adjust the imagery offset in small steps,\nor press the mouse down and drag within the grey square to slide the imagery\ninto alignment.\n" + "intro": "# Background Imagery\n\nBackground imagery is an important resource for mapping, and is displayed\nbeneath the map data. This imagery can be aerial photos collected\nfrom satellites, airplanes, and drones, or it can be scanned historical\nmaps or other freely available source data.\n\nTo see which imagery sources are available for editing, click the\n{layers} `Background settings` button on the side of the map.\n", + "sources": "### Sources\n\nBy default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is\nchosen as the background image. Depending on where you are editing, other imagery\nsources will be available. Some may be newer or have higher resolution,\nso it is always useful to check and see which layer is the best one to use\nas a mapping reference.\n", + "offset": "### Offset\n\nImagery is sometimes offset slightly from accurate map data.\n\nIf you see a lot of roads or buildings shifted from the background imagery,\ndon't move them all to match the background. Instead, you can adjust\nthe background so that it matches the existing data by expanding the\n'Adjust Imagery Offset' section at the bottom of the Background Settings pane.\n\nClick on the small triangles to adjust the imagery offset in small steps,\nor hold the left mouse botton and drag within the grey square to slide\nthe imagery into alignment.\n" }, "streetlevel": { "intro": "# Street Level Photos\n\nStreet level photos provide a ground-truth prespective of an area, useful\nfor mapping traffic signs, businesses, and other details that you can't\nsee from satellite and aerial images. The iD editor supports street level\nphotos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).\n", - "using": "### Using\n\nTo use street level photos for mapping, click on the {data} 'Map data' panel on the\nside of the map to enable or disable the available photo layers.\n\nWhen enabled, the photo layer will display a line along the sequence of photos.\nAt higher zooms you will see a circle at each photo location, and at even higher\nzooms you will see a viewfield to indicate the direction that the photo was taken.\n", + "using": "### Using\n\nTo use street level photos for mapping, click the {data} `Map data` panel on the\nside of the map to enable or disable the available photo layers.\n\nWhen enabled, the photo layer will display a line along the sequence of photos.\nAt higher zooms you will see a circle at each photo location, and at even higher\nzooms you will see a viewfield to indicate the direction that the photo was taken.\n", "viewer": "\nWhen you click on one of the photo locations, a photo viewer will appear in the\nbottom corner of the map. The photo viewer contains controls to step forward and\nbackward in the image sequence. It will also show the username of the person who\ncaptured the image, the date it was captured, and a link to view the image on\nthe original site.\n" }, "gps": { "intro": "# GPS Traces\n\nCollected GPS traces are a valuable source of data for OpenStreetMap. This editor\nsupports `.gpx`, `.geojson`, and `.kml` files on your local computer. You can collect\nGPS traces with a smartphone, sports watch, or other GPS device.\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 GPS trace for mapping, drag and drop the data file onto the map\neditor. If it's recognized, it will be drawn on the map as a bright purple\nline. Click on the {data} 'Map data' panel on the side of the map to enable,\ndisable, or zoom to your GPS data.\n\nThe GPS track isn't sent to OpenStreetMap - the best way to use it is to\ndraw on the map, using it as a guide for the new features that you add.\n\nYou can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" + "using": "### Using\n\nTo use a GPS trace for mapping, drag and drop the data file onto the map\neditor. If it's recognized, it will be drawn on the map as a bright purple\nline. Click the {data} `Map data` panel on the side of the map to enable,\ndisable, or zoom to your GPS data.\n\nThe GPS track isn't sent to OpenStreetMap - the best way to use it is to\ndraw on the map, using it as a guide for the new features that you add.\n\nYou can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" }, "relations": { "intro": "# Relations & Members\n\nA *relation* is a special type of feature in OpenStreetMap that groups together other\nfeatures, called *members* of the relation. Every member of a relation can have a\n*role* for the relation. At the bottom of the feature editor, you can see which\nrelations a feature is a member of, and the click on a relation there will select it.\nWhen the relation is selected, you can see all of its members highlighted on the map\nand listed in the feature editor together with their role for the relation.\n", diff --git a/modules/ui/help.js b/modules/ui/help.js index 77090480a..62cfe4e2d 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -20,12 +20,12 @@ export function uiHelp(context) { var docKeys = [ ['help.help.',['intro','opendata','beforestart','opensource']], - ['help.overview.',['intro','features','navigation','keyboard']], - ['help.editing.',['intro','multiselect','edit','save','upload','comeback']], - ['help.roads.',['intro','move','connect','attributes','delete','create']], - ['help.buildings.',['intro','select','modify','create','delete']], - ['help.addresses.',['intro','nodup','recommendation','points']], + ['help.overview.',['intro','features','navigation']], + ['help.editing.',['intro','multiselect','undo_redo','save','upload','backups','keyboard']], ['help.feature_editor.',['intro','select','fields','tags','undo']], + ['help.points.',['intro','add_point','move_point','delete_point']], + ['help.lines.',['intro','add_line','modify_line','connect_line','disconnect_line','move_line','delete_line']], + ['help.areas.',['intro','point_or_area','add_area','square_area','modify_area','delete_area']], ['help.imagery.',['intro','sources','offset']], ['help.streetlevel.',['intro','using','viewer']], ['help.gps.',['intro','using']], From c484e8cc924bf44e6d90d8062348dcd4662845bf Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Tue, 21 Nov 2017 16:46:24 -0500 Subject: [PATCH 18/33] Swap undo/redo when rtl --- modules/ui/help.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/ui/help.js b/modules/ui/help.js index 62cfe4e2d..d723bad3b 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -32,7 +32,7 @@ export function uiHelp(context) { ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']] ]; - var icont = { + var replacements = { more: icon('#icon-more'), apply: icon('#icon-apply'), alert: icon('#icon-alert'), @@ -79,15 +79,15 @@ export function uiHelp(context) { paste: icon('#operation-paste'), delete: icon('#operation-delete'), close: icon('#icon-close'), - undo: icon('#icon-undo'), - redo: icon('#icon-redo'), + undo: icon(textDirection === 'rtl' ? '#icon-redo' : '#icon-undo'), + redo: icon(textDirection === 'rtl' ? '#icon-undo' : '#icon-redo'), save: icon('#icon-save'), version: context.version }; var docs = docKeys.map(function(key) { var text = key[1].reduce(function(all, part) { - return all + t(key[0].concat(part), icont); + return all + t(key[0].concat(part), replacements); }, ''); return { title: text.split('\n')[0].replace('#', '').trim(), From 5a7030894730bcef6f3d586a7aaf975ee8698d3e Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 22 Nov 2017 08:53:16 -0500 Subject: [PATCH 19/33] Simplify language in feature_editor section --- data/core.yaml | 93 ++++++++++++++++++++++++---------------------- modules/ui/help.js | 2 +- 2 files changed, 50 insertions(+), 45 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index a976abdc9..14ce64918 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -670,6 +670,55 @@ en: You can view a list of keyboard shortcuts by pressing the `?` key. + feature_editor: + intro: | + # Feature Editor + + The *feature editor* appears alongside the map, and allows you to see + and edit all of the information for the selected feature. + + The top section displays the feature's type. The middle section + contains *fields* showing the feature's attributes, such as its name or address. + + select: | + ### Feature 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. + + 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: | + ### 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. + + 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. + + You can also click the `Add field` dropdown to add more fields, such as + a description, Wikipedia link, wheelchair access, and more. + + tags: | + ### 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. + + 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: intro: | # Points @@ -843,50 +892,6 @@ en: show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard. - feature_editor: - intro: | - # Feature Editor - - The feature editor is the section on the left side of the page that allows you to - edit the details of the selected feature. - - select: | - ### Selecting a Feature Type - - After you add a point, line, or area, you can choose what type of feature it - is, like whether it's a highway or residential road, supermarket or cafe. - The feature editor will display buttons for common feature types, and you can - find others by typing what you're looking for in the search box. - - Click the {inspect} icon next to the feature name to - learn more about it. Click a button to choose that type. - - fields: | - ### Fields - - After you choose a feature type, or when you select a feature that already - has a type assigned, the feature editor will display fields with details about - the feature like its name or speed limit for a road or levels and address for a building. - - Below the fields you see, you can click the `Add field` dropdown to add - other details, like a Wikipedia link, wheelchair access, and more. - - tags: | - ### Tags - - Below that you see the tags which are actually stored in OpenStreetMap. - If you cannot find the feature's type with the feature editor or you - cannot add required fields, then you can add additional tags with the `+` button. - [Taginfo](https://taginfo.openstreetmap.org/) is a great resource to learn more - about popular tag combinations. - - undo: | - ### Undo & Redo - - Changes you make in the feature editor are automatically applied. - You can undo them at any time by clicking the {undo} `Undo` button and redo - changes by clicking the {redo} `Redo` button. - imagery: intro: | # Background Imagery diff --git a/modules/ui/help.js b/modules/ui/help.js index d723bad3b..831e9748a 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -22,7 +22,7 @@ export function uiHelp(context) { ['help.help.',['intro','opendata','beforestart','opensource']], ['help.overview.',['intro','features','navigation']], ['help.editing.',['intro','multiselect','undo_redo','save','upload','backups','keyboard']], - ['help.feature_editor.',['intro','select','fields','tags','undo']], + ['help.feature_editor.',['intro','select','fields','tags']], ['help.points.',['intro','add_point','move_point','delete_point']], ['help.lines.',['intro','add_line','modify_line','connect_line','disconnect_line','move_line','delete_line']], ['help.areas.',['intro','point_or_area','add_area','square_area','modify_area','delete_area']], From ca49166d6c1bff8a3aab1f85fe20336ff675b751 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 22 Nov 2017 11:51:51 -0500 Subject: [PATCH 20/33] Simplify language in relation section --- data/core.yaml | 168 ++++++++++++++++++++++++------------------- dist/locales/en.json | 41 +++++------ modules/ui/help.js | 6 +- 3 files changed, 120 insertions(+), 95 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 14ce64918..7949d2fdd 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -561,7 +561,7 @@ en: Welcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/). With this editor you can update OpenStreetMap right from your web browser. - opendata: | + open_data: | ### Open Data Edits that you make on this map will be visible to everyone who uses @@ -569,7 +569,7 @@ en: or imagery collected from aerial or street level photos. Copying from commercial sources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright). - beforestart: | + before_start: | ### Before you start You should be familiar with OpenStreetMap and this editor before you start editing. @@ -577,7 +577,7 @@ en: Click "Start the Walkthrough" on this screen to take the tutorial - it takes only about 15 minutes. - opensource: | + open_source: | ### Open Source The iD editor is a collaborative open source project, and you are using version {version} now. @@ -632,7 +632,7 @@ en: selection lasso. All of the points inside the lasso area will be selected. undo_redo: | - ### Undo and Redo + ### Undo & Redo When you make changes to the map, these are stored locally until you save them to the server. Don't worry if you make a mistake - until the edits are @@ -755,7 +755,7 @@ en: lines: intro: | - # Lines & Roads + # Lines *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. @@ -833,7 +833,7 @@ en: areas: intro: | - # Areas & Buildings + # Areas *Areas* are used to show the boundaries of features like lakes, buildings, and residential areas. Areas should be traced around the edge of the @@ -866,7 +866,7 @@ en: Many area features like buildings have square corners. To square the corners of an area, `right-click` the edge of the area - and select the {square} `Square` tool. + and select the {orthogonalize} `Square` tool. modify_area: | ### Modifying Areas @@ -892,6 +892,95 @@ en: show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard. + relations: + intro: | + # Relations + + 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: | + ### Editing Relations + + 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. + + To add a feature to a relation, select the feature, then click the {plus} + 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. + + 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: | + ### Maintaining + + For the most part, iD will maintainin 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. + + types: | + ## Relation Types + + multipolygons: | + ### Multipolygons + + 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. + + 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-click` to select both features, `right-click` + to show the edit menu, and select the {merge} `Merge` tool. + + 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_restrictions: | + ### Turn restrictions + + 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. + + 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. + + 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 choose the from, via, and to roles + based on your choices. + + routes: | + ### Routes + + 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. + + 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} plus to add this feature to a nearby existing relation or a new relation. + + boundaries: | + ### Boundaries + + A *boundary* relation is a group of one or more line features that together + form an administrative boundary. + + 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} plus to add this feature to a nearby existing relation or a new relation. + imagery: intro: | # Background Imagery @@ -979,71 +1068,6 @@ en: You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) for other users to use. - relations: - intro: | - # Relations & Members - - A *relation* is a special type of feature in OpenStreetMap that groups together other - features, called *members* of the relation. Every member of a relation can have a - *role* for the relation. At the bottom of the feature editor, you can see which - relations a feature is a member of, and the click on a relation there will select it. - When the relation is selected, you can see all of its members highlighted on the map - and listed in the feature editor together with their role for the relation. - - types: | - ### Common Types - - The most common type of relation is the *multipolygon*, - which groups together several areas to define a complex area, which may - consist of several pieces or has holes in it like a donut. - Another type of relation is the *Turn restriction* which groups together two - roads segments at a crossing to disable turning options. - - Two other types of relations are *route relations*, which group together - sections of road that belong to a specific highway, bus route, or hiking route, - and *boundaries*, which group together sections of boundary lines which may be - roads, rivers, or plot boundaries at the same time. - - multipolygons: | - ### Multipolygons - - Draw two or more areas and select them. Then press either press - the `C` shortcut key or right-click one of the selected areas and - select the {merge} 'Merge' tool. This will create a new multipolygon - relation with all selected areas as members. The areas will have the role - outer except When an area is inside another area it will have the role inner - and become the hole in the outer area. - - turnrestrictions: | - ### Turn restrictions - - Select the crossing node of two or more roads. In the feature editor - you will see the roads connected to the crossing below 'Turn Restrictions'. - There you can select a road and disable U-turn and turns into every other road. - This will create a turn restriction relation with both roads and the - crossing as members with roles from, to, and via. - - maintain: | - ### Maintaining - - For the most part, iD will take care of maintaining relations automatically - while you edit. The main thing you should be aware of is that if you delete a - section of road to redraw it more accurately, you should make sure that the - new section is a member of the same relations as the original. - - edit: | - ### Editing Relations - - 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 `+` 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. - intro: done: done ok: OK diff --git a/dist/locales/en.json b/dist/locales/en.json index 10666cd8c..d5c366357 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -682,9 +682,9 @@ "key": "H", "help": { "intro": "# Help\n\nWelcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/).\nWith this editor you can update OpenStreetMap right from your web browser.\n", - "opendata": "### Open Data\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying,\nor imagery collected from aerial or street level photos. Copying from commercial\nsources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright).\n", - "beforestart": "### Before you start\n\nYou should be familiar with OpenStreetMap and this editor before you start editing.\niD contains a builtin walkthrough to teach you the basics of editing OpenStreetMap.\nClick \"Start the Walkthrough\" on this screen to take the tutorial - it takes only\nabout 15 minutes.\n", - "opensource": "### Open Source\n\nThe iD editor is a collaborative open source project, and you are using version {version} now.\nThe source code is available [on GitHub](https://github.com/openstreetmap/iD).\n\nYou can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)\nor [reporting bugs](https://github.com/openstreetmap/iD/issues).\n" + "open_data": "### Open Data\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying,\nor imagery collected from aerial or street level photos. Copying from commercial\nsources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright).\n", + "before_start": "### Before you start\n\nYou should be familiar with OpenStreetMap and this editor before you start editing.\niD contains a builtin walkthrough to teach you the basics of editing OpenStreetMap.\nClick \"Start the Walkthrough\" on this screen to take the tutorial - it takes only\nabout 15 minutes.\n", + "open_source": "### Open Source\n\nThe iD editor is a collaborative open source project, and you are using version {version} now.\nThe source code is available [on GitHub](https://github.com/openstreetmap/iD).\n\nYou can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)\nor [reporting bugs](https://github.com/openstreetmap/iD/issues).\n" }, "overview": { "intro": "# Overview\n", @@ -694,12 +694,18 @@ "editing": { "intro": "# Editing & Saving\n\n`Left-click` on a feature to select it. This will highlight the\nfeature with a pusling glow, and the sidebar will display details\nabout that feature, such as it's name or address.\n\n`Right-click` on a map feature to display the editing menu, which shows\nthe commands that are available, such as rotating, moving, and deleting.\n", "multiselect": "### Multiselect\n\n`Shift-click` to select several features together. This makes\nit easier to move or delete multiple items.\n\nAnother way to select multiple features is to hold down the `Shift` key,\nthen press and hold the left mouse button, and drag the mouse to draw a\nselection lasso. All of the points inside the lasso area will be selected.\n", - "undo_redo": "### Undo and Redo\n\nWhen you make changes to the map, these are stored locally until you save\nthem to the server. Don't worry if you make a mistake - until the edits are\nsaved, you can undo changes by clicking the {undo} `Undo` button, and redo\nchanges by clicking the {redo} `Redo` button.\n", + "undo_redo": "### Undo & Redo\n\nWhen you make changes to the map, these are stored locally until you save\nthem to the server. Don't worry if you make a mistake - until the edits are\nsaved, you can undo changes by clicking the {undo} `Undo` button, and redo\nchanges by clicking the {redo} `Redo` button.\n", "save": "### Save\n\nClick {save} `Save` to finish your edits and send them to OpenStreetMap.\nYou should remember to save your work frequently!\n\nOn the save screen, you'll have a chance to review what you've done.\niD will also perform some basic checks for missing data and may offer\nhelpful suggestions and warnings if something doesn't seem right.\n", "upload": "### Upload\n\nBefore uploading your changes you must enter a\n[changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments).\nThen click `Upload` to send your changes to OpenStreetMap, where they will be\nmerged into the map and publicly visible to everyone.\n", "backups": "### Automatic Backups\n\nIf you can't finish your edits in one sitting, for example if your computer\ncrashes or you close the browser tab, your edits are still saved locally\nin your browser's storage. You can come back later (on the same browser\nand computer), and iD will offer to restore your work.\n", "keyboard": "### Keyboard Shortcuts\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n" }, + "feature_editor": { + "intro": "# Feature Editor\n\nThe *feature editor* appears alongside the map, and allows you to see\nand edit all of the information for the selected feature.\n\nThe top section displays the feature's type. The middle section\ncontains *fields* showing the feature's attributes, such as its name or address.\n", + "select": "### Feature Type\n\nYou can click on the feature type to change the feature to a different type.\nEverything that exists in the real world can be added to OpenStreetMap, so there\nare thousands of feature types to choose from.\n\nThe type picker displays the most common feature types - such as parks, hospitals,\nrestaurants, roads, and buildings. You can search for anything by typing what you're\nlooking for in the search box. You can also click the {inspect} info icon next\nto the feature type to learn more about it.\n", + "fields": "### Fields\n\nThe \"All fields\" section contains all of the feature's details that you\nmay edit. In OpenStreetMap, all of the fields are optional, and it's OK\nto leave a field blank if you are unsure.\n\nEach feature type will display different fields. For example, a road\nmay display fields for its surface and speed limit, but a restaurant\nmay display fields for the type of food it serves and the hours it is open.\n\nYou can also click the `Add field` dropdown to add more fields, such as\na description, Wikipedia link, wheelchair access, and more.\n", + "tags": "### Tags\n\nBelow the fields section, you can expand the \"All tags\" section to edit\nany of the OpenStreetMap *tags* for the selected feature. Each tag\nconsists of a *key* and *value*, data elements that define all of\nthe features stored in OpenStreetMap.\n\nEditing a feature's tags requires intermediate knowledge about OpenStreetMap.\nYou should consult resources like the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page)\nor [Taginfo](https://taginfo.openstreetmap.org/) to learn more\nabout accepted OpenStreetMap tagging practices.\n" + }, "points": { "intro": "# Points\n\n*Points* can be used to represent features such as shops, restaurants, and\nmonuments. They mark a specific location, and describe what's there.\n", "add_point": "### Adding Points\n\nTo add a point, click the {point} `Point` button on the toolbar\nat the top of the map, or press the shortcut key `1`. This will\nchange the mouse cursor to a cross symbol.\n\nTo place the new point on the map, position the mouse cursor where the point\nshould go, then `left-click` or press the `spacebar`.\n", @@ -707,7 +713,7 @@ "delete_point": "### Deleting Points\n\nIt's OK to delete features that don't exist in the real world. Deleting a feature\nfrom OpenStreetMap removes it from the map that everyone uses, so you should make\nsure a feature is really gone before you delete it.\n\nTo delete a point, `right-click` on the point to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\n" }, "lines": { - "intro": "# Lines & Roads\n\n*Lines* are used to represent features such as roads, railroads, and rivers.\nLines should be drawn down the center of the feature that they represent.\n", + "intro": "# Lines\n\n*Lines* are used to represent features such as roads, railroads, and rivers.\nLines should be drawn down the center of the feature that they represent.\n", "add_line": "### Adding Lines\n\nTo add a line, click the {line} `Line` button on the toolbar\nat the top of the map, or press the shortcut key `2`. This will\nchange the mouse cursor to a cross symbol.\n\nNext, position the mouse cursor where the line should begin and `left-click`\nor press the `spacebar` to begin placing nodes along the line.\nContinue placing more nodes by `left-clicking` or pressing `spacebar`.\nWhile drawing, you can zoom in or drag the map in order to add more detail.\n\nTo finish a line, press `enter` or click on the last node again.\n", "modify_line": "### Modifying Lines\n\nOften you'll see lines that aren't shaped correctly, for example a road\nthat does not match up with the background imagery. To adjust the shape\nof a line, first `left-click` to select it. All nodes of the line will be\ndrawn as small circles. You can then drag the nodes to better locations.\n\nYou can also create new nodes along a line either by `double-clicking` on\nthe line or by dragging the small triangles at the midpoints between nodes.\n", "connect_line": "### Connecting Lines\n\nHaving roads connected properly is important for the map\nand essential for providing driving directions.\n\nThe connections between roads are drawn with grey circles.\nThe endpoints of a line are drawn with larger white circles if they\ndon't connect to anything.\n\nTo connect a line to another feature, drag one of its nodes onto the\nother feature to connect them.\n\nIf you know that the connection has traffic lights or crosswalks,\nyou can add them by selecting the connecting node and using the\nfeature editor to select the correct feature's type.\n", @@ -716,19 +722,22 @@ "delete_line": "### Deleting Lines\n\nIf a line is entirely incorrect, for example a road that doesn't exist\nin the real world, it's OK to delete it. Be cautious when deleting features -\nthe background imagery you are using might be outdated, and a road that\nlooks wrong could simply be newly built.\n\nTo delete a line, `right-click` on the line to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\n" }, "areas": { - "intro": "# Areas & Buildings\n\n*Areas* are used to show the boundaries of features like lakes, buildings,\nand residential areas. Areas should be traced around the edge of the\nfeature that they represent, for example, around the base of a building.\n", + "intro": "# Areas\n\n*Areas* are used to show the boundaries of features like lakes, buildings,\nand residential areas. Areas should be traced around the edge of the\nfeature that they represent, for example, around the base of a building.\n", "point_or_area": "### Points or Areas?\n\nMany features can be represented as points or areas.\nIt is recommended to map buildings and property outlines as areas\nwhenever possible, and to map businesses, amenities, and other features\nthat operate within buildings as points placed inside the building area.\n", "add_area": "### Adding Areas\n\nTo add an area, click the {area} `Area` button on the toolbar\nat the top of the map, or press the shortcut key `3`. This will\nchange the mouse cursor to a cross symbol.\n\nNext, position the mouse cursor at one of the corners of the feature and `left-click`\nor press the `spacebar` to begin placing nodes around the outer edge of\nthe area. Continue placing more nodes by `left-clicking` or pressing `spacebar`.\nWhile drawing, you can zoom in or drag the map in order to add more detail.\n\nTo finish an area, press `enter` or click again on either the first or last node.\n", "square_area": "### Square Corners\n\nMany area features like buildings have square corners.\nTo square the corners of an area, `right-click` the edge of the area\nand select the {square} `Square` tool.\n", "modify_area": "### Modifying Areas\n\nOften you'll see areas that aren't shaped correctly, for example a building\nthat does not match up with the background imagery. To adjust the shape\nof an area, first `left-click` to select it. All nodes of the area will be\ndrawn as small circles. You can then drag the nodes to better locations.\n\nYou can also create new nodes along an area either by `double-clicking` on\nthe edge of the area or by dragging the small triangles at the midpoints\nbetween nodes.\n", "delete_area": "### Deleting Areas\n\nIf an area is entirely incorrect, for example a building that doesn't exist\nin the real world, it's OK to delete it. Be cautious when deleting features -\nthe background imagery you are using might be outdated, and a building that\nlooks wrong could simply be newly built.\n\nTo delete an area, `right-click` on the area to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\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 {inspect} icon next to the feature name 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 are actually 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[Taginfo](https://taginfo.openstreetmap.org/) is a great resource to learn more\nabout 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} `Undo` button and redo\nchanges by clicking the {redo} `Redo` button.\n" + "relations": { + "intro": "# Relations\n\nA *relation* is a special type of feature in OpenStreetMap that groups\ntogether other features. The features that belong to a relation are\ncalled *members*, and each member can have a *role* in the relation.\n", + "edit": "### Editing Relations\n\nAt the bottom of the feature editor, you can expand the \"All relations\"\nsection to see if the selected feature is a member of any relations.\nYou can then click on the relation to select and edit it.\n\nTo add a feature to a relation, select the feature, then click the {plus}\nbutton in the \"All relations\" section of the feature editor. You can choose\nfrom a list of nearby relations, or choose the 'New relation...' option.\n\nYou can also click the {delete} `Delete` button to remove the selected\nfeature from the relation. If you remove all of the members from a\nrelation, the relation will be deleted automatically.\n", + "maintain": "### Maintaining\n\nFor the most part, iD will maintainin relations automatically as you\nedit. You should take care when replacing features that might be members\nof relations. For example if you delete a section of road and draw a new\nsection of road to replace it, you should add the new section to the same\nrelations (routes, turn restrictions, etc.) as the original.\n", + "types": "## Relation Types\n", + "multipolygons": "### Multipolygons\n\nA *multipolygon* relation is a group of one or more *outer* features and\none or more inner features. The outer features define the outer edges\nof the multipolygon, and the inner features define sub-areas or holes\ncut out from the inside of the multipolygon.\n\nTo create a multipolygon, for example a building with a hole in it,\ndraw the outer edge as an area and the inner edge as a line or different\nkind of area. Then `shift-click` to select both features, `right-click`\nto show the edit menu, and select the {merge} `Merge` tool.\n\nMerging several lines or areas will create a new multipolygon relation\nwith all selected areas as members. iD will choose the inner and outer roles\nautomatically, based on which features are contained inside other features.\n", + "turn_restrictions": "### Turn restrictions\n\nA *turn restriction* relation is a group of several road segments in\nan intersection. Turn restrictions consist of a *from* road, *via*\nnode or roads, and a *to* road.\n\nTo edit turn restrictions, select a junction node where two or more roads\nmeet. The feature editor will display a special 'Turn Restrictions' field\ncontaining a model of the intersection.\n\nIn the 'Turn Restrictions' field, click to select a \"from\" road, and\nsee whether turns are allowed or restricted to any of the \"to\" roads.\nYou can click on the turn icons to toggle them between allowed and restricted.\niD will create relations automatically and choose the from, via, and to roles\nbased on your choices.\n", + "routes": "### Routes\n\nA *route* relation is a group of one or more line features that together\nform a route network, like a bus route, train route, or highway route.\n\nTo add a feature to a route relation, select the feature and scroll down\nto the \"All relations\" section of the feature editor, then click the\n{plus} plus to add this feature to a nearby existing relation or a new relation.\n", + "boundaries": "### Boundaries\n\nA *boundary* relation is a group of one or more line features that together\nform an administrative boundary.\n\nTo add a feature to a boundary relation, select the feature and scroll down\nto the \"All relations\" section of the feature editor, then click the\n{plus} plus to add this feature to a nearby existing relation or a new relation.\n" }, "imagery": { "intro": "# Background Imagery\n\nBackground imagery is an important resource for mapping, and is displayed\nbeneath the map data. This imagery can be aerial photos collected\nfrom satellites, airplanes, and drones, or it can be scanned historical\nmaps or other freely available source data.\n\nTo see which imagery sources are available for editing, click the\n{layers} `Background settings` button on the side of the map.\n", @@ -743,14 +752,6 @@ "gps": { "intro": "# GPS Traces\n\nCollected GPS traces are a valuable source of data for OpenStreetMap. This editor\nsupports `.gpx`, `.geojson`, and `.kml` files on your local computer. You can collect\nGPS traces with a smartphone, sports watch, or other GPS device.\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 GPS trace for mapping, drag and drop the data file onto the map\neditor. If it's recognized, it will be drawn on the map as a bright purple\nline. Click the {data} `Map data` panel on the side of the map to enable,\ndisable, or zoom to your GPS data.\n\nThe GPS track isn't sent to OpenStreetMap - the best way to use it is to\ndraw on the map, using it as a guide for the new features that you add.\n\nYou can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" - }, - "relations": { - "intro": "# Relations & Members\n\nA *relation* is a special type of feature in OpenStreetMap that groups together other\nfeatures, called *members* of the relation. Every member of a relation can have a\n*role* for the relation. At the bottom of the feature editor, you can see which\nrelations a feature is a member of, and the click on a relation there will select it.\nWhen the relation is selected, you can see all of its members highlighted on the map\nand listed in the feature editor together with their role for the relation.\n", - "types": "### Common Types\n\nThe 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.\nAnother type of relation is the *Turn restriction* which groups together two\nroads segments at a crossing to disable turning options.\n\nTwo other 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 which may be\nroads, rivers, or plot boundaries at the same time.\n", - "multipolygons": "### Multipolygons\n\nDraw two or more areas and select them. Then press either press\nthe `C` shortcut key or right-click one of the selected areas and\nselect the {merge} 'Merge' tool. This will create a new multipolygon\nrelation with all selected areas as members. The areas will have the role\nouter except When an area is inside another area it will have the role inner\nand become the hole in the outer area.\n", - "turnrestrictions": "### Turn restrictions\n\nSelect the crossing node of two or more roads. In the feature editor\nyou will see the roads connected to the crossing below 'Turn Restrictions'.\nThere you can select a road and disable U-turn and turns into every other road.\nThis will create a turn restriction relation with both roads and the\ncrossing as members with roles from, to, and via.\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 `+` 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" } }, "intro": { diff --git a/modules/ui/help.js b/modules/ui/help.js index 831e9748a..df739078a 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -19,17 +19,17 @@ export function uiHelp(context) { var key = t('help.key'); var docKeys = [ - ['help.help.',['intro','opendata','beforestart','opensource']], + ['help.help.',['intro','open_data','before_start','open_source']], ['help.overview.',['intro','features','navigation']], ['help.editing.',['intro','multiselect','undo_redo','save','upload','backups','keyboard']], ['help.feature_editor.',['intro','select','fields','tags']], ['help.points.',['intro','add_point','move_point','delete_point']], ['help.lines.',['intro','add_line','modify_line','connect_line','disconnect_line','move_line','delete_line']], ['help.areas.',['intro','point_or_area','add_area','square_area','modify_area','delete_area']], + ['help.relations.',['intro','edit','maintain','types','multipolygons','turn_restrictions','routes','boundaries']], ['help.imagery.',['intro','sources','offset']], ['help.streetlevel.',['intro','using','viewer']], - ['help.gps.',['intro','using']], - ['help.relations.',['intro','types','multipolygons','turnrestrictions','maintain','edit']] + ['help.gps.',['intro','using']] ]; var replacements = { From 4165371c277625aa3bf9e9846b3c158b734d66bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Wed, 22 Nov 2017 12:30:49 -0800 Subject: [PATCH 21/33] Copyediting --- data/core.yaml | 56 ++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index 7949d2fdd..a6a569e10 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -687,7 +687,7 @@ en: Everything that exists in the real world can be added to OpenStreetMap, so there are thousands of feature types to choose from. - The type picker displays the most common feature types - such as parks, hospitals, + 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. @@ -791,12 +791,12 @@ en: Having roads connected properly is important for the map and essential for providing driving directions. - The connections between roads are drawn with grey circles. + 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. - To connect a line to another feature, drag one of its nodes onto the - other feature to connect them. + To connect a line to another feature, drag one of the line's nodes onto + the other feature until both features snap together. If you know that the connection has traffic lights or crosswalks, you can add them by selecting the connecting node and using the @@ -823,7 +823,7 @@ en: ### Deleting Lines 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 cautious when deleting features - + 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. @@ -843,9 +843,9 @@ en: ### Points or Areas? Many features can be represented as points or areas. - It is recommended to map buildings and property outlines as areas - whenever possible, and to map businesses, amenities, and other features - that operate within buildings as points placed inside the building area. + 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: | ### Adding Areas @@ -909,7 +909,7 @@ en: To add a feature to a relation, select the feature, then click the {plus} 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. + from a list of nearby relations, or choose the "New relation..." option. 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 @@ -955,7 +955,7 @@ en: meet. The feature editor will display a special 'Turn Restrictions' field containing a model of the intersection. - In the 'Turn Restrictions' field, click to select a "from" road, and + 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 choose the from, via, and to roles @@ -985,10 +985,10 @@ en: intro: | # Background Imagery - Background imagery is an important resource for mapping, and is displayed - beneath the map data. 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. + 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. To see which imagery sources are available for editing, click the {layers} `Background settings` button on the side of the map. @@ -1007,13 +1007,14 @@ en: Imagery is sometimes offset slightly from accurate map data. - If you see a lot of roads or buildings shifted from the background imagery, - 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. + 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. Click on the small triangles to adjust the imagery offset in small steps, - or hold the left mouse botton and drag within the grey square to slide + or hold the left mouse button and drag within the grey square to slide the imagery into alignment. streetlevel: @@ -1031,17 +1032,18 @@ en: 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. - When enabled, the photo layer will display a line along the sequence of photos. - At higher zooms you will see a circle at each photo location, and at even higher - zooms you will see a viewfield to indicate the direction that the photo was taken. + 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 will appear in the - bottom corner of the map. The photo viewer contains controls to step forward and - backward in the image sequence. It will also show 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. + 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: intro: | From 6490abbb4fd62a419eb475492bc467d101100884 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 22 Nov 2017 16:58:18 -0500 Subject: [PATCH 22/33] Split up all help sections and titles, assemble markdown from keys (also incorporate some of @1ec5's copyedits, and adjust icon styles) --- css/80_app.css | 7 + data/core.yaml | 646 ++++++++++--------------------------------- dist/locales/en.json | 190 +++++++++---- modules/ui/help.js | 269 +++++++++++++----- 4 files changed, 492 insertions(+), 620 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index 51c3811ab..378df26f3 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -2617,6 +2617,13 @@ div.full-screen > button:hover { background:#eee; } +.help-wrap .left-content .icon.pre-text { + vertical-align: text-top; + margin-right: 0; + margin-left: 0; + display: inline-block; +} + .help-wrap .toc { /* This is two columns, 41.66666 x .4 = 16.6666 */ width:40%; diff --git a/data/core.yaml b/data/core.yaml index a6a569e10..d2a6a9edd 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -552,524 +552,158 @@ en: openstreetcam: view_on_openstreetcam: "View this image on OpenStreetCam" help: - title: "Help" + title: Help key: H help: - intro: | - # Help - - 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: | - ### 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: | - ### Before you start - - You should be familiar with OpenStreetMap and this editor before you start editing. - iD contains a builtin 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: | - ### 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). - - 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). - + 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 builtin 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: - intro: | - # Overview - - navigation: | - ### Navigation - - You can drag the map by pressing and holding the left mouse button while - moving the mouse around. You can also use the arrow keys on your keyboard. - - 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. - - features: | - ### Map 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*. - - In OpenStreetmap, points are sometimes called *nodes*, and lines and areas - are sometimes called *ways*. - + title: Overview + navigation_h: "### Navigation" + navigation_drag: "You can drag the map by pressing and holding the left mouse button while 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." + 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: - intro: | - # Editing & Saving - - `Left-click` on a feature to select it. This will highlight the - feature with a pusling glow, and the sidebar will display details - about that feature, such as it's name or address. - - `Right-click` on a map feature to display the editing menu, which shows - the commands that are available, such as rotating, moving, and deleting. - - multiselect: | - ### Multiselect - - `Shift-click` to select several features together. This makes - it easier to move or delete multiple items. - - Another way to select multiple features is to hold down the `Shift` key, - then press and hold the 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: | - ### Undo & Redo - - When you make changes to the map, these are stored locally until you save - them to the server. Don't worry if you make a mistake - until the edits are - saved, you can undo changes by clicking the {undo} `Undo` button, and redo - changes by clicking the {redo} `Redo` button. - - save: | - ### Save - - Click {save} `Save` to finish your edits and send them to OpenStreetMap. - You should remember to save your work frequently! - - 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: | - ### 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: | - ### Automatic 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 locally - 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: | - ### Keyboard Shortcuts - - You can view a list of keyboard shortcuts by pressing the `?` key. - + title: "Editing & Saving" + select_h: "### Select" + select_left_click: "`Left-click` on a feature to select it. This will highlight the feature with a pulsing glow, and the sidebar will display details about that feature, such as its name or address." + select_right_click: "`Right-click` on a map 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-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 the 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: - intro: | - # Feature Editor - - The *feature editor* appears alongside the map, and allows you to see - and edit all of the information for the selected feature. - - The top section displays the feature's type. The middle section - contains *fields* showing the feature's attributes, such as its name or address. - - select: | - ### Feature 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. - - 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: | - ### 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. - - 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. - - You can also click the `Add field` dropdown to add more fields, such as - a description, Wikipedia link, wheelchair access, and more. - - tags: | - ### 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. - - 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. - + 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: - intro: | - # Points - - *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: | - ### Adding Points - - To add a point, click the {point} `Point` button on the toolbar - at the top of the map, or press the shortcut key `1`. This will - change the mouse cursor to a cross symbol. - - To place the new point on the map, position the mouse cursor where the point - should go, then `left-click` or press the `spacebar`. - - move_point: | - ### Moving Points - - To move a point, place the mouse cursor over the point, then press the left - mouse button and hold it down while dragging the point to its new location. - - delete_point: | - ### Deleting Points - - 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. - - To delete a point, `right-click` on the point to select it and - show the edit menu, then use the {delete} `Delete` command. - You can also press the `delete` key on your keyboard. - + 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 at the top of 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 `left-click` or press the `spacebar`." + move_point_h: "### Moving Points" + move_point: "To move a point, place the mouse cursor over the point, then press the left mouse button and hold it down 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, `right-click` on the point to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." lines: - intro: | - # Lines - - *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: | - ### Adding Lines - - To add a line, click the {line} `Line` button on the toolbar - at the top of the map, or press the shortcut key `2`. This will - change the mouse cursor to a cross symbol. - - Next, position the mouse cursor where the line should begin and `left-click` - or press the `spacebar` to begin placing nodes along the line. - Continue placing more nodes by `left-clicking` or pressing `spacebar`. - While drawing, you can zoom in or drag the map in order to add more detail. - - To finish a line, press `enter` or click on the last node again. - - modify_line: | - ### Modifying Lines - - 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 `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. - - You can also create new nodes along a line either by `double-clicking` on - the line or by dragging the small triangles at the midpoints between nodes. - - connect_line: | - ### Connecting Lines - - Having roads connected properly is important for the map - and essential for providing driving directions. - - 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. - - To connect a line to another feature, drag one of the line's nodes onto - the other feature until both features snap together. - - 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: | - ### Disconnecting Lines - - To disconnect a road from another feature, `right-click` the connecting - node and select the {disconnect} `Disconnect` tool. - - move_line: | - ### Moving Lines - - To move an entire line, `right-click` the line and select the {move} - `Move` tool from the editing menu. Then move the mouse, and `left-click` - to place the line in a new location. - - 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: | - ### Deleting Lines - - 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. - - To delete a line, `right-click` on the line to select it and - show the edit menu, then use the {delete} `Delete` command. - You can also press the `delete` key on your keyboard. - + 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 at the top of 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 `left-click` or press the `spacebar` to begin placing nodes along the line. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail." + add_line_finish: "To finish a line, press `enter` or click on the last node again." + 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 `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 `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." + 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, `right-click` the connecting node and select the {disconnect} `Disconnect` tool." + move_line_h: "### Moving Lines" + move_line_command: "To move an entire line, `right-click` the line and select the {move} `Move` tool from the editing menu. Then move the mouse, and `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, `right-click` on the line to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." areas: - intro: | - # Areas - - *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: | - ### Points or Areas? - - 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: | - ### Adding Areas - - To add an area, click the {area} `Area` button on the toolbar - at the top of the map, or press the shortcut key `3`. This will - change the mouse cursor to a cross symbol. - - Next, position the mouse cursor at one of the corners of the feature and `left-click` - or press the `spacebar` to begin placing nodes around the outer edge of - the area. Continue placing more nodes by `left-clicking` or pressing `spacebar`. - While drawing, you can zoom in or drag the map in order to add more detail. - - To finish an area, press `enter` or click again on either the first or last node. - - square_area: | - ### Square Corners - - Many area features like buildings have square corners. - To square the corners of an area, `right-click` the edge of the area - and select the {orthogonalize} `Square` tool. - - modify_area: | - ### Modifying Areas - - 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 `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. - - You can also create new nodes along an area either by `double-clicking` on - the edge of the area or by dragging the small triangles at the midpoints - between nodes. - - delete_area: | - ### Deleting Areas - - 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. - - To delete an area, `right-click` on the area to select it and - show the edit menu, then use the {delete} `Delete` command. - You can also press the `delete` key on your keyboard. - + 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 at the top of 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 `left-click` or press the `spacebar` to begin placing nodes around the outer edge of the area. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail." + add_area_finish: "To finish an area, press `enter` 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, `right-click` the edge of the area and select the {orthogonalize} `Square` tool." + 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 `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 `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, `right-click` on the area to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." relations: - intro: | - # Relations - - 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: | - ### Editing Relations - - 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. - - To add a feature to a relation, select the feature, then click the {plus} - 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. - - 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: | - ### Maintaining - - For the most part, iD will maintainin 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. - - types: | - ## Relation Types - - multipolygons: | - ### Multipolygons - - 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. - - 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-click` to select both features, `right-click` - to show the edit menu, and select the {merge} `Merge` tool. - - 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_restrictions: | - ### Turn restrictions - - 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. - - 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. - - 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 choose the from, via, and to roles - based on your choices. - - routes: | - ### Routes - - 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. - - 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} plus to add this feature to a nearby existing relation or a new relation. - - boundaries: | - ### Boundaries - - A *boundary* relation is a group of one or more line features that together - form an administrative boundary. - - 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} plus to add this feature to a nearby existing relation or a new relation. - + 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} 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-click` to select both features, `right-click` to show the edit menu, and select the {merge} `Merge` tool." + 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 choose 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} plus 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} plus to add this feature to a nearby existing relation or a new relation." imagery: - intro: | - # Background Imagery - - 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. - - To see which imagery sources are available for editing, click the - {layers} `Background settings` button on the side of the map. - - sources: | - ### 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. - - 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. - - Click on the small triangles to adjust the imagery offset in small steps, - or hold the left mouse button and drag within the grey square to slide - the imagery into alignment. - + 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." + choosing: "To see which imagery sources are available for editing, click the {layers} `Background settings` button on the side of the map." + sources_h: "### Sources" + 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: "### 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: - intro: | - # Street Level Photos - - Street level photos provide a ground-truth prespective of an area, 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: | - ### 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. - - 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. - + title: Street Level Photos + intro: "Street level photos provide a ground-truth prespective of an area, 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" + 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: - intro: | - # GPS Traces - - 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. - - For information on how to perform a GPS survey, read - [Mapping with a smartphone, GPS, or paper](http://learnosm.org/en/mobile-mapping/). - - using: | - ### 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. - - 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. - - You can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create) - for other users to use. - + 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" + 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." intro: done: done ok: OK diff --git a/dist/locales/en.json b/dist/locales/en.json index d5c366357..e593d61fe 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -681,77 +681,165 @@ "title": "Help", "key": "H", "help": { - "intro": "# Help\n\nWelcome to the iD editor for [OpenStreetMap](https://www.openstreetmap.org/).\nWith this editor you can update OpenStreetMap right from your web browser.\n", - "open_data": "### Open Data\n\nEdits that you make on this map will be visible to everyone who uses\nOpenStreetMap. Your edits can be based on personal knowledge, on-the-ground surveying,\nor imagery collected from aerial or street level photos. Copying from commercial\nsources, like Google Maps, [is strictly forbidden](https://www.openstreetmap.org/copyright).\n", - "before_start": "### Before you start\n\nYou should be familiar with OpenStreetMap and this editor before you start editing.\niD contains a builtin walkthrough to teach you the basics of editing OpenStreetMap.\nClick \"Start the Walkthrough\" on this screen to take the tutorial - it takes only\nabout 15 minutes.\n", - "open_source": "### Open Source\n\nThe iD editor is a collaborative open source project, and you are using version {version} now.\nThe source code is available [on GitHub](https://github.com/openstreetmap/iD).\n\nYou can help iD by [translating](https://github.com/openstreetmap/iD/blob/master/CONTRIBUTING.md#translating)\nor [reporting bugs](https://github.com/openstreetmap/iD/issues).\n" + "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 builtin 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": { - "intro": "# Overview\n", - "navigation": "### Navigation\n\nYou can drag the map by pressing and holding the left mouse button while\nmoving the mouse around. You can also use the arrow keys on your keyboard.\n\nYou can zoom in or out by scrolling with the mouse wheel or trackpad,\nor by clicking the {plus} / {minus} buttons along the side of the map.\n", - "features": "### Map Features\n\nWe use the word *features* to describe things that appear on the map,\nsuch as roads, buildings, or points of interest. Anything in the real\nworld can be mapped as a feature on OpenStreetMap. Map features are\nrepresented on the map using *points*, *lines*, or *areas*.\n\nIn OpenStreetmap, points are sometimes called *nodes*, and lines and areas\nare sometimes called *ways*.\n" + "title": "Overview", + "navigation_h": "### Navigation", + "navigation_drag": "You can drag the map by pressing and holding the left mouse button while 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.", + "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": { - "intro": "# Editing & Saving\n\n`Left-click` on a feature to select it. This will highlight the\nfeature with a pusling glow, and the sidebar will display details\nabout that feature, such as it's name or address.\n\n`Right-click` on a map feature to display the editing menu, which shows\nthe commands that are available, such as rotating, moving, and deleting.\n", - "multiselect": "### Multiselect\n\n`Shift-click` to select several features together. This makes\nit easier to move or delete multiple items.\n\nAnother way to select multiple features is to hold down the `Shift` key,\nthen press and hold the left mouse button, and drag the mouse to draw a\nselection lasso. All of the points inside the lasso area will be selected.\n", - "undo_redo": "### Undo & Redo\n\nWhen you make changes to the map, these are stored locally until you save\nthem to the server. Don't worry if you make a mistake - until the edits are\nsaved, you can undo changes by clicking the {undo} `Undo` button, and redo\nchanges by clicking the {redo} `Redo` button.\n", - "save": "### Save\n\nClick {save} `Save` to finish your edits and send them to OpenStreetMap.\nYou should remember to save your work frequently!\n\nOn the save screen, you'll have a chance to review what you've done.\niD will also perform some basic checks for missing data and may offer\nhelpful suggestions and warnings if something doesn't seem right.\n", - "upload": "### Upload\n\nBefore uploading your changes you must enter a\n[changeset comment](https://wiki.openstreetmap.org/wiki/Good_changeset_comments).\nThen click `Upload` to send your changes to OpenStreetMap, where they will be\nmerged into the map and publicly visible to everyone.\n", - "backups": "### Automatic Backups\n\nIf you can't finish your edits in one sitting, for example if your computer\ncrashes or you close the browser tab, your edits are still saved locally\nin your browser's storage. You can come back later (on the same browser\nand computer), and iD will offer to restore your work.\n", - "keyboard": "### Keyboard Shortcuts\n\nYou can view a list of keyboard shortcuts by pressing the `?` key.\n" + "title": "Editing & Saving", + "select_h": "### Select", + "select_left_click": "`Left-click` on a feature to select it. This will highlight the feature with a pulsing glow, and the sidebar will display details about that feature, such as its name or address.", + "select_right_click": "`Right-click` on a map 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-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 the 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": { - "intro": "# Feature Editor\n\nThe *feature editor* appears alongside the map, and allows you to see\nand edit all of the information for the selected feature.\n\nThe top section displays the feature's type. The middle section\ncontains *fields* showing the feature's attributes, such as its name or address.\n", - "select": "### Feature Type\n\nYou can click on the feature type to change the feature to a different type.\nEverything that exists in the real world can be added to OpenStreetMap, so there\nare thousands of feature types to choose from.\n\nThe type picker displays the most common feature types - such as parks, hospitals,\nrestaurants, roads, and buildings. You can search for anything by typing what you're\nlooking for in the search box. You can also click the {inspect} info icon next\nto the feature type to learn more about it.\n", - "fields": "### Fields\n\nThe \"All fields\" section contains all of the feature's details that you\nmay edit. In OpenStreetMap, all of the fields are optional, and it's OK\nto leave a field blank if you are unsure.\n\nEach feature type will display different fields. For example, a road\nmay display fields for its surface and speed limit, but a restaurant\nmay display fields for the type of food it serves and the hours it is open.\n\nYou can also click the `Add field` dropdown to add more fields, such as\na description, Wikipedia link, wheelchair access, and more.\n", - "tags": "### Tags\n\nBelow the fields section, you can expand the \"All tags\" section to edit\nany of the OpenStreetMap *tags* for the selected feature. Each tag\nconsists of a *key* and *value*, data elements that define all of\nthe features stored in OpenStreetMap.\n\nEditing a feature's tags requires intermediate knowledge about OpenStreetMap.\nYou should consult resources like the [OpenStreetMap Wiki](https://wiki.openstreetmap.org/wiki/Main_Page)\nor [Taginfo](https://taginfo.openstreetmap.org/) to learn more\nabout accepted OpenStreetMap tagging practices.\n" + "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": { - "intro": "# Points\n\n*Points* can be used to represent features such as shops, restaurants, and\nmonuments. They mark a specific location, and describe what's there.\n", - "add_point": "### Adding Points\n\nTo add a point, click the {point} `Point` button on the toolbar\nat the top of the map, or press the shortcut key `1`. This will\nchange the mouse cursor to a cross symbol.\n\nTo place the new point on the map, position the mouse cursor where the point\nshould go, then `left-click` or press the `spacebar`.\n", - "move_point": "### Moving Points\n\nTo move a point, place the mouse cursor over the point, then press the left\nmouse button and hold it down while dragging the point to its new location.\n", - "delete_point": "### Deleting Points\n\nIt's OK to delete features that don't exist in the real world. Deleting a feature\nfrom OpenStreetMap removes it from the map that everyone uses, so you should make\nsure a feature is really gone before you delete it.\n\nTo delete a point, `right-click` on the point to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\n" + "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 at the top of 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 `left-click` or press the `spacebar`.", + "move_point_h": "### Moving Points", + "move_point": "To move a point, place the mouse cursor over the point, then press the left mouse button and hold it down 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, `right-click` on the point to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." }, "lines": { - "intro": "# Lines\n\n*Lines* are used to represent features such as roads, railroads, and rivers.\nLines should be drawn down the center of the feature that they represent.\n", - "add_line": "### Adding Lines\n\nTo add a line, click the {line} `Line` button on the toolbar\nat the top of the map, or press the shortcut key `2`. This will\nchange the mouse cursor to a cross symbol.\n\nNext, position the mouse cursor where the line should begin and `left-click`\nor press the `spacebar` to begin placing nodes along the line.\nContinue placing more nodes by `left-clicking` or pressing `spacebar`.\nWhile drawing, you can zoom in or drag the map in order to add more detail.\n\nTo finish a line, press `enter` or click on the last node again.\n", - "modify_line": "### Modifying Lines\n\nOften you'll see lines that aren't shaped correctly, for example a road\nthat does not match up with the background imagery. To adjust the shape\nof a line, first `left-click` to select it. All nodes of the line will be\ndrawn as small circles. You can then drag the nodes to better locations.\n\nYou can also create new nodes along a line either by `double-clicking` on\nthe line or by dragging the small triangles at the midpoints between nodes.\n", - "connect_line": "### Connecting Lines\n\nHaving roads connected properly is important for the map\nand essential for providing driving directions.\n\nThe connections between roads are drawn with grey circles.\nThe endpoints of a line are drawn with larger white circles if they\ndon't connect to anything.\n\nTo connect a line to another feature, drag one of its nodes onto the\nother feature to connect them.\n\nIf you know that the connection has traffic lights or crosswalks,\nyou can add them by selecting the connecting node and using the\nfeature editor to select the correct feature's type.\n", - "disconnect_line": "### Disconnecting Lines\n\nTo disconnect a road from another feature, `right-click` the connecting\nnode and select the {disconnect} `Disconnect` tool.\n", - "move_line": "### Moving Lines\n\nTo move an entire line, `right-click` the line and select the {move}\n`Move` tool from the editing menu. Then move the mouse, and `left-click`\nto place the line in a new location.\n\nLines that are connected to other features will stay connected as you\nmove the line to a new location. iD may prevent you from moving a line\nacross another connected line.\n", - "delete_line": "### Deleting Lines\n\nIf a line is entirely incorrect, for example a road that doesn't exist\nin the real world, it's OK to delete it. Be cautious when deleting features -\nthe background imagery you are using might be outdated, and a road that\nlooks wrong could simply be newly built.\n\nTo delete a line, `right-click` on the line to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\n" + "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 at the top of 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 `left-click` or press the `spacebar` to begin placing nodes along the line. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail.", + "add_line_finish": "To finish a line, press `enter` or click on the last node again.", + "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 `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 `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.", + "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, `right-click` the connecting node and select the {disconnect} `Disconnect` tool.", + "move_line_h": "### Moving Lines", + "move_line_command": "To move an entire line, `right-click` the line and select the {move} `Move` tool from the editing menu. Then move the mouse, and `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, `right-click` on the line to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." }, "areas": { - "intro": "# Areas\n\n*Areas* are used to show the boundaries of features like lakes, buildings,\nand residential areas. Areas should be traced around the edge of the\nfeature that they represent, for example, around the base of a building.\n", - "point_or_area": "### Points or Areas?\n\nMany features can be represented as points or areas.\nIt is recommended to map buildings and property outlines as areas\nwhenever possible, and to map businesses, amenities, and other features\nthat operate within buildings as points placed inside the building area.\n", - "add_area": "### Adding Areas\n\nTo add an area, click the {area} `Area` button on the toolbar\nat the top of the map, or press the shortcut key `3`. This will\nchange the mouse cursor to a cross symbol.\n\nNext, position the mouse cursor at one of the corners of the feature and `left-click`\nor press the `spacebar` to begin placing nodes around the outer edge of\nthe area. Continue placing more nodes by `left-clicking` or pressing `spacebar`.\nWhile drawing, you can zoom in or drag the map in order to add more detail.\n\nTo finish an area, press `enter` or click again on either the first or last node.\n", - "square_area": "### Square Corners\n\nMany area features like buildings have square corners.\nTo square the corners of an area, `right-click` the edge of the area\nand select the {square} `Square` tool.\n", - "modify_area": "### Modifying Areas\n\nOften you'll see areas that aren't shaped correctly, for example a building\nthat does not match up with the background imagery. To adjust the shape\nof an area, first `left-click` to select it. All nodes of the area will be\ndrawn as small circles. You can then drag the nodes to better locations.\n\nYou can also create new nodes along an area either by `double-clicking` on\nthe edge of the area or by dragging the small triangles at the midpoints\nbetween nodes.\n", - "delete_area": "### Deleting Areas\n\nIf an area is entirely incorrect, for example a building that doesn't exist\nin the real world, it's OK to delete it. Be cautious when deleting features -\nthe background imagery you are using might be outdated, and a building that\nlooks wrong could simply be newly built.\n\nTo delete an area, `right-click` on the area to select it and\nshow the edit menu, then use the {delete} `Delete` command.\nYou can also press the `delete` key on your keyboard.\n" + "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 at the top of 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 `left-click` or press the `spacebar` to begin placing nodes around the outer edge of the area. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail.", + "add_area_finish": "To finish an area, press `enter` 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, `right-click` the edge of the area and select the {orthogonalize} `Square` tool.", + "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 `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 `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, `right-click` on the area to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." }, "relations": { - "intro": "# Relations\n\nA *relation* is a special type of feature in OpenStreetMap that groups\ntogether other features. The features that belong to a relation are\ncalled *members*, and each member can have a *role* in the relation.\n", - "edit": "### Editing Relations\n\nAt the bottom of the feature editor, you can expand the \"All relations\"\nsection to see if the selected feature is a member of any relations.\nYou can then click on the relation to select and edit it.\n\nTo add a feature to a relation, select the feature, then click the {plus}\nbutton in the \"All relations\" section of the feature editor. You can choose\nfrom a list of nearby relations, or choose the 'New relation...' option.\n\nYou can also click the {delete} `Delete` button to remove the selected\nfeature from the relation. If you remove all of the members from a\nrelation, the relation will be deleted automatically.\n", - "maintain": "### Maintaining\n\nFor the most part, iD will maintainin relations automatically as you\nedit. You should take care when replacing features that might be members\nof relations. For example if you delete a section of road and draw a new\nsection of road to replace it, you should add the new section to the same\nrelations (routes, turn restrictions, etc.) as the original.\n", - "types": "## Relation Types\n", - "multipolygons": "### Multipolygons\n\nA *multipolygon* relation is a group of one or more *outer* features and\none or more inner features. The outer features define the outer edges\nof the multipolygon, and the inner features define sub-areas or holes\ncut out from the inside of the multipolygon.\n\nTo create a multipolygon, for example a building with a hole in it,\ndraw the outer edge as an area and the inner edge as a line or different\nkind of area. Then `shift-click` to select both features, `right-click`\nto show the edit menu, and select the {merge} `Merge` tool.\n\nMerging several lines or areas will create a new multipolygon relation\nwith all selected areas as members. iD will choose the inner and outer roles\nautomatically, based on which features are contained inside other features.\n", - "turn_restrictions": "### Turn restrictions\n\nA *turn restriction* relation is a group of several road segments in\nan intersection. Turn restrictions consist of a *from* road, *via*\nnode or roads, and a *to* road.\n\nTo edit turn restrictions, select a junction node where two or more roads\nmeet. The feature editor will display a special 'Turn Restrictions' field\ncontaining a model of the intersection.\n\nIn the 'Turn Restrictions' field, click to select a \"from\" road, and\nsee whether turns are allowed or restricted to any of the \"to\" roads.\nYou can click on the turn icons to toggle them between allowed and restricted.\niD will create relations automatically and choose the from, via, and to roles\nbased on your choices.\n", - "routes": "### Routes\n\nA *route* relation is a group of one or more line features that together\nform a route network, like a bus route, train route, or highway route.\n\nTo add a feature to a route relation, select the feature and scroll down\nto the \"All relations\" section of the feature editor, then click the\n{plus} plus to add this feature to a nearby existing relation or a new relation.\n", - "boundaries": "### Boundaries\n\nA *boundary* relation is a group of one or more line features that together\nform an administrative boundary.\n\nTo add a feature to a boundary relation, select the feature and scroll down\nto the \"All relations\" section of the feature editor, then click the\n{plus} plus to add this feature to a nearby existing relation or a new relation.\n" + "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} 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-click` to select both features, `right-click` to show the edit menu, and select the {merge} `Merge` tool.", + "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 choose 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} plus 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} plus to add this feature to a nearby existing relation or a new relation." }, "imagery": { - "intro": "# Background Imagery\n\nBackground imagery is an important resource for mapping, and is displayed\nbeneath the map data. This imagery can be aerial photos collected\nfrom satellites, airplanes, and drones, or it can be scanned historical\nmaps or other freely available source data.\n\nTo see which imagery sources are available for editing, click the\n{layers} `Background settings` button on the side of the map.\n", - "sources": "### Sources\n\nBy default, a [Bing Maps](https://www.bing.com/maps/) satellite layer is\nchosen as the background image. Depending on where you are editing, other imagery\nsources will be available. Some may be newer or have higher resolution,\nso it is always useful to check and see which layer is the best one to use\nas a mapping reference.\n", - "offset": "### Offset\n\nImagery is sometimes offset slightly from accurate map data.\n\nIf you see a lot of roads or buildings shifted from the background imagery,\ndon't move them all to match the background. Instead, you can adjust\nthe background so that it matches the existing data by expanding the\n'Adjust Imagery Offset' section at the bottom of the Background Settings pane.\n\nClick on the small triangles to adjust the imagery offset in small steps,\nor hold the left mouse botton and drag within the grey square to slide\nthe imagery into alignment.\n" + "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.", + "choosing": "To see which imagery sources are available for editing, click the {layers} `Background settings` button on the side of the map.", + "sources_h": "### Sources", + "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": "### 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": { - "intro": "# Street Level Photos\n\nStreet level photos provide a ground-truth prespective of an area, useful\nfor mapping traffic signs, businesses, and other details that you can't\nsee from satellite and aerial images. The iD editor supports street level\nphotos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).\n", - "using": "### Using\n\nTo use street level photos for mapping, click the {data} `Map data` panel on the\nside of the map to enable or disable the available photo layers.\n\nWhen enabled, the photo layer will display a line along the sequence of photos.\nAt higher zooms you will see a circle at each photo location, and at even higher\nzooms you will see a viewfield to indicate the direction that the photo was taken.\n", - "viewer": "\nWhen you click on one of the photo locations, a photo viewer will appear in the\nbottom corner of the map. The photo viewer contains controls to step forward and\nbackward in the image sequence. It will also show the username of the person who\ncaptured the image, the date it was captured, and a link to view the image on\nthe original site.\n" + "title": "Street Level Photos", + "intro": "Street level photos provide a ground-truth prespective of an area, 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", + "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": { - "intro": "# GPS Traces\n\nCollected GPS traces are a valuable source of data for OpenStreetMap. This editor\nsupports `.gpx`, `.geojson`, and `.kml` files on your local computer. You can collect\nGPS traces with a smartphone, sports watch, or other GPS device.\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 GPS trace for mapping, drag and drop the data file onto the map\neditor. If it's recognized, it will be drawn on the map as a bright purple\nline. Click the {data} `Map data` panel on the side of the map to enable,\ndisable, or zoom to your GPS data.\n\nThe GPS track isn't sent to OpenStreetMap - the best way to use it is to\ndraw on the map, using it as a guide for the new features that you add.\n\nYou can also [upload your GPS data to OpenStreetMap](https://www.openstreetmap.org/trace/create)\nfor other users to use.\n" + "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", + "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." } }, "intro": { diff --git a/modules/ui/help.js b/modules/ui/help.js index df739078a..5693dce32 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -19,79 +19,222 @@ export function uiHelp(context) { var key = t('help.key'); var docKeys = [ - ['help.help.',['intro','open_data','before_start','open_source']], - ['help.overview.',['intro','features','navigation']], - ['help.editing.',['intro','multiselect','undo_redo','save','upload','backups','keyboard']], - ['help.feature_editor.',['intro','select','fields','tags']], - ['help.points.',['intro','add_point','move_point','delete_point']], - ['help.lines.',['intro','add_line','modify_line','connect_line','disconnect_line','move_line','delete_line']], - ['help.areas.',['intro','point_or_area','add_area','square_area','modify_area','delete_area']], - ['help.relations.',['intro','edit','maintain','types','multipolygons','turn_restrictions','routes','boundaries']], - ['help.imagery.',['intro','sources','offset']], - ['help.streetlevel.',['intro','using','viewer']], - ['help.gps.',['intro','using']] + ['help', [ + 'welcome', + 'open_data_h', + 'open_data', + 'before_start_h', + 'before_start', + 'open_source_h', + 'open_source', + 'open_source_help' + ]], + ['overview', [ + 'navigation_h', + 'navigation_drag', + 'navigation_zoom', + 'features_h', + 'features', + 'nodes_ways' + ]], + ['editing', [ + 'select_h', + 'select_left_click', + 'select_right_click', + 'multiselect_h', + 'multiselect_shift_click', + 'multiselect_lasso', + 'undo_redo_h', + 'undo_redo', + 'save_h', + 'save', + 'save_validation', + 'upload_h', + 'upload', + 'backups_h', + 'backups', + 'keyboard_h', + 'keyboard' + ]], + ['feature_editor', [ + 'intro', + 'definitions', + 'type_h', + 'type', + 'type_picker', + 'fields_h', + 'fields_all_fields', + 'fields_example', + 'fields_add_field', + 'tags_h', + 'tags_all_tags', + 'tags_resources' + ]], + ['points', [ + 'intro', + 'add_point_h', + 'add_point', + 'add_point_finish', + 'move_point_h', + 'move_point', + 'delete_point_h', + 'delete_point', + 'delete_point_command' + ]], + ['lines', [ + 'intro', + 'add_line_h', + 'add_line', + 'add_line_draw', + 'add_line_finish', + 'modify_line_h', + 'modify_line_dragnode', + 'modify_line_addnode', + 'connect_line_h', + 'connect_line', + 'connect_line_display', + 'connect_line_drag', + 'connect_line_tag', + 'disconnect_line_h', + 'disconnect_line_command', + 'move_line_h', + 'move_line_command', + 'move_line_connected', + 'delete_line_h', + 'delete_line', + 'delete_line_command' + ]], + ['areas', [ + 'intro', + 'point_or_area_h', + 'point_or_area', + 'add_area_h', + 'add_area_command', + 'add_area_draw', + 'add_area_finish', + 'square_area_h', + 'square_area_command', + 'modify_area_h', + 'modify_area_dragnode', + 'modify_area_addnode', + 'delete_area_h', + 'delete_area', + 'delete_area_command' + ]], + ['relations', [ + 'intro', + 'edit_relation_h', + 'edit_relation', + 'edit_relation_add', + 'edit_relation_delete', + 'maintain_relation_h', + 'maintain_relation', + 'relation_types_h', + 'multipolygon_h', + 'multipolygon', + 'multipolygon_create', + 'multipolygon_merge', + 'turn_restriction_h', + 'turn_restriction', + 'turn_restriction_field', + 'turn_restriction_editing', + 'route_h', + 'route', + 'route_add', + 'boundary_h', + 'boundary', + 'boundary_add' + ]], + ['imagery', [ + 'intro', + 'choosing', + 'sources_h', + 'sources', + 'offsets_h', + 'offset', + 'offset_change' + ]], + ['streetlevel', [ + 'intro', + 'using_h', + 'using', + 'photos', + 'viewer' + ]], + ['gps', [ + 'intro', + 'survey', + 'using_h', + 'using', + 'tracing', + 'upload' + ]] ]; var replacements = { - more: icon('#icon-more'), - apply: icon('#icon-apply'), - alert: icon('#icon-alert'), - avatar: icon('#icon-avatar'), - forward: icon('#icon-forward'), - backward: icon('#icon-backward'), - fullscreen: icon('#icon-full-screen'), - collapsescreen: icon('#icon-collapse-screen'), - geolocate: icon('#icon-geolocate'), - load: icon('#icon-load'), - search: icon('#icon-search'), - bug: icon('#icon-bug'), - point: icon('#icon-point'), - line: icon('#icon-line'), - area: icon('#icon-area'), - help: icon('#icon-help'), - plus: icon('#icon-plus'), - minus: icon('#icon-minus'), - nearby: icon('#icon-nearby'), - outlink: icon('#icon-out-link'), - relation: icon('#icon-relation'), - translate: icon('#icon-translate'), - circularize: icon('#operation-circularize'), - orthogonalize: icon('#operation-orthogonalize'), - split: icon('#operation-split'), - reflect_long: icon('#operation-reflect-long'), - reflect_short: icon('#operation-reflect-short'), - simplify: icon('#operation-simplify'), - smooth: icon('#operation-smooth'), - straighten: icon('#operation-straighten'), - rotate: icon('#operation-rotate'), - reverse: icon('#operation-reverse'), - continue: icon('#operation-continue'), - disconnect: icon('#operation-disconnect'), - layers: icon('#icon-layers'), - vertex: icon('#icon-vertex'), - data: icon('#icon-data'), - down: icon('#icon-down'), - up: icon('#icon-up'), - inspect: icon('#icon-inspect'), - move: icon('#operation-move'), - merge: icon('#operation-merge'), - copy: icon('#operation-copy'), - paste: icon('#operation-paste'), - delete: icon('#operation-delete'), - close: icon('#icon-close'), - undo: icon(textDirection === 'rtl' ? '#icon-redo' : '#icon-undo'), - redo: icon(textDirection === 'rtl' ? '#icon-undo' : '#icon-redo'), - save: icon('#icon-save'), + more: icon('#icon-more', 'pre-text'), + apply: icon('#icon-apply', 'pre-text'), + alert: icon('#icon-alert', 'pre-text'), + avatar: icon('#icon-avatar', 'pre-text'), + forward: icon('#icon-forward', 'pre-text'), + backward: icon('#icon-backward', 'pre-text'), + fullscreen: icon('#icon-full-screen', 'pre-text'), + collapsescreen: icon('#icon-collapse-screen', 'pre-text'), + geolocate: icon('#icon-geolocate', 'pre-text'), + load: icon('#icon-load', 'pre-text'), + search: icon('#icon-search', 'pre-text'), + bug: icon('#icon-bug', 'pre-text'), + point: icon('#icon-point', 'pre-text'), + line: icon('#icon-line', 'pre-text'), + area: icon('#icon-area', 'pre-text'), + help: icon('#icon-help', 'pre-text'), + plus: icon('#icon-plus', 'pre-text'), + minus: icon('#icon-minus', 'pre-text'), + nearby: icon('#icon-nearby', 'pre-text'), + outlink: icon('#icon-out-link', 'pre-text'), + relation: icon('#icon-relation', 'pre-text'), + translate: icon('#icon-translate', 'pre-text'), + circularize: icon('#operation-circularize', 'pre-text'), + orthogonalize: icon('#operation-orthogonalize', 'pre-text'), + split: icon('#operation-split', 'pre-text'), + reflect_long: icon('#operation-reflect-long', 'pre-text'), + reflect_short: icon('#operation-reflect-short', 'pre-text'), + simplify: icon('#operation-simplify', 'pre-text'), + smooth: icon('#operation-smooth', 'pre-text'), + straighten: icon('#operation-straighten', 'pre-text'), + rotate: icon('#operation-rotate', 'pre-text'), + reverse: icon('#operation-reverse', 'pre-text'), + continue: icon('#operation-continue', 'pre-text'), + disconnect: icon('#operation-disconnect', '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'), + up: icon('#icon-up', 'pre-text'), + inspect: icon('#icon-inspect', 'pre-text'), + move: icon('#operation-move', 'pre-text'), + merge: icon('#operation-merge', 'pre-text'), + copy: icon('#operation-copy', 'pre-text'), + paste: icon('#operation-paste', 'pre-text'), + delete: icon('#operation-delete', 'pre-text'), + close: icon('#icon-close', 'pre-text'), + undo: icon(textDirection === 'rtl' ? '#icon-redo' : '#icon-undo', 'pre-text'), + redo: icon(textDirection === 'rtl' ? '#icon-undo' : '#icon-redo', 'pre-text'), + save: icon('#icon-save', 'pre-text'), version: context.version }; + // For each section, squash all the texts into a single markdown document var docs = docKeys.map(function(key) { + var tkey = 'help.' + key[0]; + var title = t(tkey + '.title'); var text = key[1].reduce(function(all, part) { - return all + t(key[0].concat(part), replacements); + return all + t(tkey + '.' + part, replacements) + '\n\n'; }, ''); + return { - title: text.split('\n')[0].replace('#', '').trim(), - html: marked(text.split('\n').slice(1).join('\n')) + title: title, + html: marked(text.trim()) }; }); From d88300e28ead4d7ca9790b0a8a6e3f7b4110cfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Wed, 22 Nov 2017 15:24:32 -0800 Subject: [PATCH 23/33] Double quotation marks --- data/core.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index d2a6a9edd..d751fb6ad 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -560,7 +560,7 @@ en: 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 builtin 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." + before_start: "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a builtin 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)." @@ -599,11 +599,11 @@ en: 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_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." + 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_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 @@ -660,8 +660,8 @@ en: 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} 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: "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} 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." @@ -672,7 +672,7 @@ en: 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_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 choose 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." From 70fb1432eafb9e902cb919f140cf0062bb3b1cbf Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 22 Nov 2017 21:27:24 -0500 Subject: [PATCH 24/33] Remove the unused icons from the replacements object --- data/core.yaml | 4 ++-- dist/locales/en.json | 18 +++++++++--------- modules/ui/help.js | 32 -------------------------------- 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index d751fb6ad..dbe053fea 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -602,7 +602,7 @@ en: 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_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: @@ -691,7 +691,7 @@ en: 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 provide a ground-truth prespective of an area, useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org)." + intro: "Street level photos are useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org)." using_h: "### Using" 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." diff --git a/dist/locales/en.json b/dist/locales/en.json index e593d61fe..24acf1931 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -686,7 +686,7 @@ "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 builtin 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.", + "before_start": "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a builtin 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)." @@ -728,11 +728,11 @@ "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_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.", + "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": { @@ -793,8 +793,8 @@ "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} 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": "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} 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.", @@ -805,7 +805,7 @@ "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_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 choose 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.", @@ -826,7 +826,7 @@ }, "streetlevel": { "title": "Street Level Photos", - "intro": "Street level photos provide a ground-truth prespective of an area, useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).", + "intro": "Street level photos are useful for mapping traffic signs, businesses, and other details that you can't see from satellite and aerial images. The iD editor supports street level photos from [Mapillary](https://www.mapillary.com) and [OpenStreetCam](https://www.openstreetcam.org).", "using_h": "### Using", "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.", diff --git a/modules/ui/help.js b/modules/ui/help.js index 5693dce32..e7749d879 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -172,50 +172,18 @@ export function uiHelp(context) { ]; var replacements = { - more: icon('#icon-more', 'pre-text'), - apply: icon('#icon-apply', 'pre-text'), - alert: icon('#icon-alert', 'pre-text'), - avatar: icon('#icon-avatar', 'pre-text'), - forward: icon('#icon-forward', 'pre-text'), - backward: icon('#icon-backward', 'pre-text'), - fullscreen: icon('#icon-full-screen', 'pre-text'), - collapsescreen: icon('#icon-collapse-screen', 'pre-text'), - geolocate: icon('#icon-geolocate', 'pre-text'), - load: icon('#icon-load', 'pre-text'), - search: icon('#icon-search', 'pre-text'), - bug: icon('#icon-bug', 'pre-text'), point: icon('#icon-point', 'pre-text'), line: icon('#icon-line', 'pre-text'), area: icon('#icon-area', 'pre-text'), - help: icon('#icon-help', 'pre-text'), plus: icon('#icon-plus', 'pre-text'), minus: icon('#icon-minus', 'pre-text'), - nearby: icon('#icon-nearby', 'pre-text'), - outlink: icon('#icon-out-link', 'pre-text'), - relation: icon('#icon-relation', 'pre-text'), - translate: icon('#icon-translate', 'pre-text'), - circularize: icon('#operation-circularize', 'pre-text'), orthogonalize: icon('#operation-orthogonalize', 'pre-text'), - split: icon('#operation-split', 'pre-text'), - reflect_long: icon('#operation-reflect-long', 'pre-text'), - reflect_short: icon('#operation-reflect-short', 'pre-text'), - simplify: icon('#operation-simplify', 'pre-text'), - smooth: icon('#operation-smooth', 'pre-text'), - straighten: icon('#operation-straighten', 'pre-text'), - rotate: icon('#operation-rotate', 'pre-text'), - reverse: icon('#operation-reverse', 'pre-text'), - continue: icon('#operation-continue', 'pre-text'), disconnect: icon('#operation-disconnect', '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'), - up: icon('#icon-up', 'pre-text'), inspect: icon('#icon-inspect', 'pre-text'), move: icon('#operation-move', 'pre-text'), merge: icon('#operation-merge', 'pre-text'), - copy: icon('#operation-copy', 'pre-text'), - paste: icon('#operation-paste', 'pre-text'), delete: icon('#operation-delete', 'pre-text'), close: icon('#icon-close', 'pre-text'), undo: icon(textDirection === 'rtl' ? '#icon-redo' : '#icon-undo', 'pre-text'), From 278bd9638db437928f1b36530e3bd9b3612e1a61 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 22 Nov 2017 21:31:53 -0500 Subject: [PATCH 25/33] Add core.yaml to gazer watchlist (closes #4556) --- development_server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/development_server.js b/development_server.js index 7b8871a23..b8ce39eec 100644 --- a/development_server.js +++ b/development_server.js @@ -28,6 +28,7 @@ if (isDevelopment) { gaze( [ 'data/**/*.{js,json}', + 'data/core.yaml', // ignore the output files of `buildData` '!data/presets/categories.json', '!data/presets/fields.json', From bf2251bbc4e359e7c358f9153d6332c44e9f0e70 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 22 Nov 2017 22:27:23 -0500 Subject: [PATCH 26/33] Add markdown headings with code, not in translation text --- data/core.yaml | 80 ++++++++++++++++++++++---------------------- dist/locales/en.json | 80 ++++++++++++++++++++++---------------------- modules/ui/help.js | 52 ++++++++++++++++++++++++++-- 3 files changed, 129 insertions(+), 83 deletions(-) diff --git a/data/core.yaml b/data/core.yaml index dbe053fea..b44adddb5 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -557,142 +557,142 @@ en: 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_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_h: "Before you start" before_start: "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a builtin 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_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_h: "Navigation" navigation_drag: "You can drag the map by pressing and holding the left mouse button while 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." - features_h: "### Map Features" + 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_h: "Select" select_left_click: "`Left-click` on a feature to select it. This will highlight the feature with a pulsing glow, and the sidebar will display details about that feature, such as its name or address." select_right_click: "`Right-click` on a map feature to display the editing menu, which shows the commands that are available, such as rotating, moving, and deleting." - multiselect_h: "### Multiselect" + multiselect_h: "Multiselect" multiselect_shift_click: "`Shift-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 the 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_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_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_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_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_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_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_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_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_h: "Adding Points" add_point: "To add a point, click the {point} `Point` button on the toolbar at the top of 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 `left-click` or press the `spacebar`." - move_point_h: "### Moving Points" + move_point_h: "Moving Points" move_point: "To move a point, place the mouse cursor over the point, then press the left mouse button and hold it down while dragging the point to its new location." - delete_point_h: "### Deleting Points" + 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, `right-click` on the point to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." 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_h: "Adding Lines" add_line: "To add a line, click the {line} `Line` button on the toolbar at the top of 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 `left-click` or press the `spacebar` to begin placing nodes along the line. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail." add_line_finish: "To finish a line, press `enter` or click on the last node again." - modify_line_h: "### Modifying Lines" + 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 `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 `double-clicking` on the line or by dragging the small triangles at the midpoints between nodes." - connect_line_h: "### Connecting Lines" + 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." 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_h: "Disconnecting Lines" disconnect_line_command: "To disconnect a road from another feature, `right-click` the connecting node and select the {disconnect} `Disconnect` tool." - move_line_h: "### Moving Lines" + move_line_h: "Moving Lines" move_line_command: "To move an entire line, `right-click` the line and select the {move} `Move` tool from the editing menu. Then move the mouse, and `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_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, `right-click` on the line to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." 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_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_h: "Adding Areas" add_area_command: "To add an area, click the {area} `Area` button on the toolbar at the top of 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 `left-click` or press the `spacebar` to begin placing nodes around the outer edge of the area. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail." add_area_finish: "To finish an area, press `enter` or click again on either the first or last node." - square_area_h: "### Square Corners" + square_area_h: "Square Corners" square_area_command: "Many area features like buildings have square corners. To square the corners of an area, `right-click` the edge of the area and select the {orthogonalize} `Square` tool." - modify_area_h: "### Modifying Areas" + 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 `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 `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_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, `right-click` on the area to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." 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_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} 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_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" + 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-click` to select both features, `right-click` to show the edit menu, and select the {merge} `Merge` tool." 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_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 choose the from, via, and to roles based on your choices." - route_h: "### Routes" + 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} plus to add this feature to a nearby existing relation or a new relation." - boundary_h: "### Boundaries" + 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} plus 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." choosing: "To see which imagery sources are available for editing, click the {layers} `Background settings` button on the side of the map." - sources_h: "### Sources" + sources_h: "Background Sources" 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: "### Offset" + 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" + 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." @@ -700,7 +700,7 @@ en: 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" + 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." diff --git a/dist/locales/en.json b/dist/locales/en.json index 24acf1931..ab1b857c7 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -683,134 +683,134 @@ "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_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_h": "Before you start", "before_start": "You should be familiar with OpenStreetMap and this editor before you start editing. iD contains a builtin 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_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_h": "Navigation", "navigation_drag": "You can drag the map by pressing and holding the left mouse button while 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.", - "features_h": "### Map Features", + "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_h": "Select", "select_left_click": "`Left-click` on a feature to select it. This will highlight the feature with a pulsing glow, and the sidebar will display details about that feature, such as its name or address.", "select_right_click": "`Right-click` on a map feature to display the editing menu, which shows the commands that are available, such as rotating, moving, and deleting.", - "multiselect_h": "### Multiselect", + "multiselect_h": "Multiselect", "multiselect_shift_click": "`Shift-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 the 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_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_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_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_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_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_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_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_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_h": "Adding Points", "add_point": "To add a point, click the {point} `Point` button on the toolbar at the top of 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 `left-click` or press the `spacebar`.", - "move_point_h": "### Moving Points", + "move_point_h": "Moving Points", "move_point": "To move a point, place the mouse cursor over the point, then press the left mouse button and hold it down while dragging the point to its new location.", - "delete_point_h": "### Deleting Points", + "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, `right-click` on the point to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." }, "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_h": "Adding Lines", "add_line": "To add a line, click the {line} `Line` button on the toolbar at the top of 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 `left-click` or press the `spacebar` to begin placing nodes along the line. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail.", "add_line_finish": "To finish a line, press `enter` or click on the last node again.", - "modify_line_h": "### Modifying Lines", + "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 `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 `double-clicking` on the line or by dragging the small triangles at the midpoints between nodes.", - "connect_line_h": "### Connecting Lines", + "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.", "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_h": "Disconnecting Lines", "disconnect_line_command": "To disconnect a road from another feature, `right-click` the connecting node and select the {disconnect} `Disconnect` tool.", - "move_line_h": "### Moving Lines", + "move_line_h": "Moving Lines", "move_line_command": "To move an entire line, `right-click` the line and select the {move} `Move` tool from the editing menu. Then move the mouse, and `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_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, `right-click` on the line to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." }, "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_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_h": "Adding Areas", "add_area_command": "To add an area, click the {area} `Area` button on the toolbar at the top of 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 `left-click` or press the `spacebar` to begin placing nodes around the outer edge of the area. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail.", "add_area_finish": "To finish an area, press `enter` or click again on either the first or last node.", - "square_area_h": "### Square Corners", + "square_area_h": "Square Corners", "square_area_command": "Many area features like buildings have square corners. To square the corners of an area, `right-click` the edge of the area and select the {orthogonalize} `Square` tool.", - "modify_area_h": "### Modifying Areas", + "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 `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 `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_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, `right-click` on the area to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." }, "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_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} 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_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", + "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-click` to select both features, `right-click` to show the edit menu, and select the {merge} `Merge` tool.", "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_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 choose the from, via, and to roles based on your choices.", - "route_h": "### Routes", + "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} plus to add this feature to a nearby existing relation or a new relation.", - "boundary_h": "### Boundaries", + "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} plus to add this feature to a nearby existing relation or a new relation." }, @@ -818,16 +818,16 @@ "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.", "choosing": "To see which imagery sources are available for editing, click the {layers} `Background settings` button on the side of the map.", - "sources_h": "### Sources", + "sources_h": "Background Sources", "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": "### Offset", + "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", + "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." @@ -836,7 +836,7 @@ "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", + "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." diff --git a/modules/ui/help.js b/modules/ui/help.js index e7749d879..7b293efe6 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -171,6 +171,49 @@ export function uiHelp(context) { ]] ]; + var headings = { + 'help.help.open_data_h': 3, + 'help.help.before_start_h': 3, + 'help.help.open_source_h': 3, + 'help.overview.navigation_h': 3, + 'help.overview.features_h': 3, + 'help.editing.select_h': 3, + 'help.editing.multiselect_h': 3, + 'help.editing.undo_redo_h': 3, + 'help.editing.save_h': 3, + 'help.editing.upload_h': 3, + 'help.editing.backups_h': 3, + 'help.editing.keyboard_h': 3, + 'help.feature_editor.type_h': 3, + 'help.feature_editor.fields_h': 3, + 'help.feature_editor.tags_h': 3, + 'help.points.add_point_h': 3, + 'help.points.move_point_h': 3, + 'help.points.delete_point_h': 3, + 'help.lines.add_line_h': 3, + 'help.lines.modify_line_h': 3, + 'help.lines.connect_line_h': 3, + 'help.lines.disconnect_line_h': 3, + 'help.lines.move_line_h': 3, + 'help.lines.delete_line_h': 3, + 'help.areas.point_or_area_h': 3, + 'help.areas.add_area_h': 3, + 'help.areas.square_area_h': 3, + 'help.areas.modify_area_h': 3, + 'help.areas.delete_area_h': 3, + 'help.relations.edit_relation_h': 3, + 'help.relations.maintain_relation_h': 3, + 'help.relations.relation_types_h': 2, + 'help.relations.multipolygon_h': 3, + 'help.relations.turn_restriction_h': 3, + 'help.relations.route_h': 3, + 'help.relations.boundary_h': 3, + 'help.imagery.sources_h': 3, + 'help.imagery.offsets_h': 3, + 'help.streetlevel.using_h': 3, + 'help.gps.using_h': 3, + }; + var replacements = { point: icon('#icon-point', 'pre-text'), line: icon('#icon-line', 'pre-text'), @@ -194,10 +237,13 @@ export function uiHelp(context) { // For each section, squash all the texts into a single markdown document var docs = docKeys.map(function(key) { - var tkey = 'help.' + key[0]; - var title = t(tkey + '.title'); + var helpkey = 'help.' + key[0]; + var title = t(helpkey + '.title'); var text = key[1].reduce(function(all, part) { - return all + t(tkey + '.' + part, replacements) + '\n\n'; + var subkey = helpkey + '.' + part; + var depth = headings[subkey]; // is this subkey a heading? + var hhh = depth ? Array(depth + 1).join('#') + ' ' : ''; // if so, prepend with some ##'s + return all + hhh + t(subkey, replacements) + '\n\n'; }, ''); return { From fd49f47edec671809f01b09d1a72089cda067b35 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Wed, 22 Nov 2017 22:29:06 -0500 Subject: [PATCH 27/33] Now background, map_data, help stay open when user clicks on map surface There is really no need to hide these, and the user might just want to keep the pane open (e.g. viewing help) while they do stuff. --- modules/ui/background.js | 3 --- modules/ui/help.js | 3 --- modules/ui/map_data.js | 4 ---- 3 files changed, 10 deletions(-) diff --git a/modules/ui/background.js b/modules/ui/background.js index 8f1ba2d2f..9b58c79d5 100644 --- a/modules/ui/background.js +++ b/modules/ui/background.js @@ -568,9 +568,6 @@ export function uiBackground(context) { d3_select(document) .call(keybinding); - - context.surface().on('mousedown.background-outside', hide); - context.container().on('mousedown.background-outside', hide); } return background; diff --git a/modules/ui/help.js b/modules/ui/help.js index 7b293efe6..45e5b27aa 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -439,9 +439,6 @@ export function uiHelp(context) { d3_select(document) .call(keybinding); - - context.surface().on('mousedown.help-outside', hide); - context.container().on('mousedown.help-outside', hide); } return help; diff --git a/modules/ui/map_data.js b/modules/ui/map_data.js index 49a238ba3..fb522c098 100644 --- a/modules/ui/map_data.js +++ b/modules/ui/map_data.js @@ -492,11 +492,7 @@ export function uiMapData(context) { d3_select(document) .call(keybinding); - - context.surface().on('mousedown.map_data-outside', hidePanel); - context.container().on('mousedown.map_data-outside', hidePanel); } - return map_data; } From 434bc5af960d23ebb8e32b35e26d507893d9d6e7 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Thu, 23 Nov 2017 02:31:12 -0500 Subject: [PATCH 28/33] Improve styling of keyboard shortcuts, clicks, commands in help text --- css/80_app.css | 23 +++++++---- data/core.yaml | 84 +++++++++++++++++++------------------- dist/locales/en.json | 84 +++++++++++++++++++------------------- modules/ui/help.js | 11 +++-- modules/ui/intro/helper.js | 5 ++- 5 files changed, 110 insertions(+), 97 deletions(-) diff --git a/css/80_app.css b/css/80_app.css index 378df26f3..b8662d899 100644 --- a/css/80_app.css +++ b/css/80_app.css @@ -2613,8 +2613,16 @@ div.full-screen > button:hover { } .help-wrap .left-content .body p code { - padding:2px 4px; - background:#eee; + padding: 3px 4px; + font-size: 12px; + color: #555; + vertical-align: baseline; + background-color: #f6f6f6; + border: solid 1px #ccc; + margin: 0 2px; + border-bottom-color: #bbb; + border-radius: 3px; + box-shadow: inset 0 -1px 0 #bbb; } .help-wrap .left-content .icon.pre-text { @@ -2625,7 +2633,6 @@ div.full-screen > button:hover { } .help-wrap .toc { - /* This is two columns, 41.66666 x .4 = 16.6666 */ width:40%; float:right; margin-left: 20px; @@ -2636,7 +2643,7 @@ div.full-screen > button:hover { .help-wrap .toc li a, .help-wrap .nav a { display: block; - border: 1px solid #CCC; + border: 1px solid #ccc; padding: 5px 10px; } @@ -2650,7 +2657,7 @@ div.full-screen > button:hover { } .help-wrap .toc li a.selected { - background: #E8EBFF; + background: #e8ebff; } .help-wrap .toc li:first-child a { @@ -2658,7 +2665,7 @@ div.full-screen > button:hover { } .help-wrap .toc li:nth-last-child(3) a { - border-bottom: 1px solid #CCC; + border-bottom: 1px solid #ccc; border-radius: 0 0 4px 4px } @@ -3495,11 +3502,11 @@ img.tile-removing { box-shadow: inset 0 -1px 0 #bbb; } -.modal-shortcuts .shortcut-keys svg.mouseclick use.left { +svg.mouseclick use.left { fill: rgba(112, 146, 255, 1); color: rgba(112, 146, 255, 0); } -.modal-shortcuts .shortcut-keys svg.mouseclick use.right { +svg.mouseclick use.right { fill: rgba(112, 146, 255, 0); color: rgba(112, 146, 255, 1); } diff --git a/data/core.yaml b/data/core.yaml index b44adddb5..e40b52190 100644 --- a/data/core.yaml +++ b/data/core.yaml @@ -560,33 +560,33 @@ en: 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 builtin 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." + 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 the left mouse button while 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." + 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: "`Left-click` on a feature to select it. This will highlight the feature with a pulsing glow, and the sidebar will display details about that feature, such as its name or address." - select_right_click: "`Right-click` on a map feature to display the editing menu, which shows the commands that are available, such as rotating, moving, and deleting." + 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-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 the left mouse button, and drag the mouse to draw a selection lasso. All of the points inside the lasso area will be selected." + 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." + 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: "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." + 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" @@ -597,7 +597,7 @@ en: 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." + 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." @@ -609,82 +609,82 @@ en: 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 at the top of 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 `left-click` or press the `spacebar`." + 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 the left mouse button and hold it down while dragging the point to its new location." + 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, `right-click` on the point to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." + 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 at the top of 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 `left-click` or press the `spacebar` to begin placing nodes along the line. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail." - add_line_finish: "To finish a line, press `enter` or click on the last node again." + 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 `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 `double-clicking` on the line or by dragging the small triangles at the midpoints between nodes." + 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." + 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, `right-click` the connecting node and select the {disconnect} `Disconnect` tool." + 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, `right-click` the line and select the {move} `Move` tool from the editing menu. Then move the mouse, and `left-click` to place the line in a new location." + 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, `right-click` on the line to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." + 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 at the top of 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 `left-click` or press the `spacebar` to begin placing nodes around the outer edge of the area. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail." - add_area_finish: "To finish an area, press `enter` or click again on either the first or last node." + 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, `right-click` the edge of the area and select the {orthogonalize} `Square` tool." + 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 `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 `double-clicking` on the edge of the area or by dragging the small triangles at the midpoints between nodes." + 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, `right-click` on the area to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." + 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} 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." + 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-click` to select both features, `right-click` to show the edit menu, and select the {merge} `Merge` tool." + 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 choose the from, via, and to roles based on your choices." + 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} plus to add this feature to a nearby existing relation or a new relation." + 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} plus to add this feature to a nearby existing relation or a new relation." + 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." - choosing: "To see which imagery sources are available for editing, click the {layers} `Background settings` button on the side of the map." - sources_h: "Background Sources" + 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." @@ -693,15 +693,15 @@ en: 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." + 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." + 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." + 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." intro: diff --git a/dist/locales/en.json b/dist/locales/en.json index ab1b857c7..dfab15bd5 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -686,7 +686,7 @@ "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 builtin 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.", + "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)." @@ -694,8 +694,8 @@ "overview": { "title": "Overview", "navigation_h": "Navigation", - "navigation_drag": "You can drag the map by pressing and holding the left mouse button while 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.", + "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*." @@ -703,18 +703,18 @@ "editing": { "title": "Editing & Saving", "select_h": "Select", - "select_left_click": "`Left-click` on a feature to select it. This will highlight the feature with a pulsing glow, and the sidebar will display details about that feature, such as its name or address.", - "select_right_click": "`Right-click` on a map feature to display the editing menu, which shows the commands that are available, such as rotating, moving, and deleting.", + "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-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 the left mouse button, and drag the mouse to draw a selection lasso. All of the points inside the lasso area will be selected.", + "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.", + "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": "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.", + "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", @@ -726,7 +726,7 @@ "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.", + "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.", @@ -739,37 +739,37 @@ "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 at the top of 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 `left-click` or press the `spacebar`.", + "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 the left mouse button and hold it down while dragging the point to its new location.", + "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, `right-click` on the point to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." + "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 at the top of 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 `left-click` or press the `spacebar` to begin placing nodes along the line. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail.", - "add_line_finish": "To finish a line, press `enter` or click on the last node again.", + "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 `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 `double-clicking` on the line or by dragging the small triangles at the midpoints between nodes.", + "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.", + "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, `right-click` the connecting node and select the {disconnect} `Disconnect` tool.", + "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, `right-click` the line and select the {move} `Move` tool from the editing menu. Then move the mouse, and `left-click` to place the line in a new location.", + "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, `right-click` on the line to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." + "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", @@ -777,48 +777,48 @@ "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 at the top of 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 `left-click` or press the `spacebar` to begin placing nodes around the outer edge of the area. Continue placing more nodes by `left-clicking` or pressing `spacebar`. While drawing, you can zoom in or drag the map in order to add more detail.", - "add_area_finish": "To finish an area, press `enter` or click again on either the first or last node.", + "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, `right-click` the edge of the area and select the {orthogonalize} `Square` tool.", + "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 `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 `double-clicking` on the edge of the area or by dragging the small triangles at the midpoints between nodes.", + "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, `right-click` on the area to select it and show the edit menu, then use the {delete} `Delete` command. You can also press the `delete` key on your keyboard." + "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} 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.", + "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-click` to select both features, `right-click` to show the edit menu, and select the {merge} `Merge` tool.", + "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 choose the from, via, and to roles based on your choices.", + "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} plus to add this feature to a nearby existing relation or a new relation.", + "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} plus to add this feature to a nearby existing relation or a new relation." + "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.", - "choosing": "To see which imagery sources are available for editing, click the {layers} `Background settings` button on the side of the map.", - "sources_h": "Background Sources", + "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.", @@ -828,16 +828,16 @@ "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.", + "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.", + "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.", + "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." } diff --git a/modules/ui/help.js b/modules/ui/help.js index 45e5b27aa..6b1e6b435 100644 --- a/modules/ui/help.js +++ b/modules/ui/help.js @@ -8,6 +8,7 @@ import { d3keybinding as d3_keybinding } from '../lib/d3.keybinding.js'; import marked from 'marked'; import { t, textDirection } from '../util/locale'; import { svgIcon } from '../svg'; +import { uiCmd } from './cmd'; import { uiIntro } from './intro'; import { uiShortcuts } from './shortcuts'; import { uiTooltipHtml } from './tooltipHtml'; @@ -147,8 +148,8 @@ export function uiHelp(context) { ]], ['imagery', [ 'intro', - 'choosing', 'sources_h', + 'choosing', 'sources', 'offsets_h', 'offset', @@ -232,13 +233,17 @@ export function uiHelp(context) { undo: icon(textDirection === 'rtl' ? '#icon-redo' : '#icon-undo', 'pre-text'), redo: icon(textDirection === 'rtl' ? '#icon-undo' : '#icon-redo', 'pre-text'), save: icon('#icon-save', 'pre-text'), + leftclick: icon('#walkthrough-mouse', 'pre-text mouseclick', 'left'), + rightclick: icon('#walkthrough-mouse', 'pre-text mouseclick', 'right'), + shift: uiCmd.display('⇧'), + alt: uiCmd.display('⌥'), + return: uiCmd.display('↵'), version: context.version }; // For each section, squash all the texts into a single markdown document var docs = docKeys.map(function(key) { var helpkey = 'help.' + key[0]; - var title = t(helpkey + '.title'); var text = key[1].reduce(function(all, part) { var subkey = helpkey + '.' + part; var depth = headings[subkey]; // is this subkey a heading? @@ -247,7 +252,7 @@ export function uiHelp(context) { }, ''); return { - title: title, + title: t(helpkey + '.title'), html: marked(text.trim()) }; }); diff --git a/modules/ui/intro/helper.js b/modules/ui/intro/helper.js index 37e257fa8..4c8cdb361 100644 --- a/modules/ui/intro/helper.js +++ b/modules/ui/intro/helper.js @@ -38,9 +38,10 @@ export function pad(locOrBox, padding, context) { } -export function icon(name, svgklass) { +export function icon(name, svgklass, useklass) { return '' + - ''; + ''; } From f719e1a9272a7343947492300b17aa13cc2c183b Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Fri, 24 Nov 2017 20:04:43 -0500 Subject: [PATCH 29/33] Fix extra comma and then run build for new preset --- data/presets.yaml | 5 +++++ data/presets/presets.json | 22 +++++++++++++++++++++ data/presets/presets/railway/miniature.json | 4 ++-- data/taginfo.json | 4 ++++ dist/locales/en.json | 4 ++++ 5 files changed, 37 insertions(+), 2 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index f0f13136a..d6757b63a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4453,6 +4453,11 @@ en: name: Railway Milestone # 'terms: milestone,marker' terms: '' + railway/miniature: + # railway=miniature + name: Miniature Railway + # 'terms: rideable miniature railway,narrow gauge railway,minimum gauge railway' + terms: '' railway/monorail: # railway=monorail name: Monorail diff --git a/data/presets/presets.json b/data/presets/presets.json index fdd1e8703..75f448871 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -13206,6 +13206,28 @@ ], "name": "Railway Milestone" }, + "railway/miniature": { + "icon": "railway-rail", + "geometry": [ + "line" + ], + "tags": { + "railway": "miniature" + }, + "fields": [ + "name", + "structure", + "gauge", + "electrified", + "service_rail" + ], + "terms": [ + "rideable miniature railway", + "narrow gauge railway", + "minimum gauge railway" + ], + "name": "Miniature Railway" + }, "railway/monorail": { "icon": "railway-monorail", "geometry": [ diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json index 240a4d8da..cabbc299e 100644 --- a/data/presets/presets/railway/miniature.json +++ b/data/presets/presets/railway/miniature.json @@ -14,9 +14,9 @@ "service_rail" ], "terms": [ - "ridable miniature railway", + "rideable miniature railway", "narrow gauge railway", - "minimum gauge railway", + "minimum gauge railway" ], "name": "Miniature Railway" } diff --git a/data/taginfo.json b/data/taginfo.json index 65f60e1cb..e3e6ab678 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -2528,6 +2528,10 @@ "key": "railway", "value": "milestone" }, + { + "key": "railway", + "value": "miniature" + }, { "key": "railway", "value": "monorail" diff --git a/dist/locales/en.json b/dist/locales/en.json index dfab15bd5..0cdefe708 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5149,6 +5149,10 @@ "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": "" From 680af26bf0730e676146d0a160c09b7408eb049e Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Tue, 21 Nov 2017 22:04:39 +0000 Subject: [PATCH 30/33] chore(package): update d3 to version 4.12.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5291bee43..afdddf21b 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "chai": "^4.1.0", "colors": "^1.1.2", "concat-files": "^0.1.1", - "d3": "4.11.0", + "d3": "4.12.0", "ecstatic": "^3.0.0", "editor-layer-index": "osmlab/editor-layer-index.git#gh-pages", "eslint": "^4.3.0", From 0f9712b3808bcf1f673cf3efd29bf990f491202c Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 25 Nov 2017 00:10:45 -0500 Subject: [PATCH 31/33] Update rollup to v0.51.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index afdddf21b..d6fad1f14 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "npm-run-all": "^4.0.0", "phantomjs-prebuilt": "~2.1.11", "request": "^2.81.0", - "rollup": "0.51.5", + "rollup": "0.51.8", "rollup-plugin-commonjs": "8.2.6", "rollup-plugin-includepaths": "0.2.2", "rollup-plugin-json": "2.2.0", From cfa17593678bd6ddfa11f225f9b6ad62d2a1b236 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sat, 25 Nov 2017 00:11:16 -0500 Subject: [PATCH 32/33] Add scroll zooming support to the OpenStreetCam viewer (closes #4561) --- css/60_photos.css | 8 ++++ modules/services/openstreetcam.js | 63 ++++++++++++++++++++++++++----- 2 files changed, 62 insertions(+), 9 deletions(-) diff --git a/css/60_photos.css b/css/60_photos.css index 94f86793b..a71255e89 100644 --- a/css/60_photos.css +++ b/css/60_photos.css @@ -231,3 +231,11 @@ background: rgba(0,0,0,0.85); color: #fff; } + +.osc-image-wrap { + transform-origin:0 0; + -ms-transform-origin:0 0; + -webkit-transform-origin:0 0; + -moz-transform-origin:0 0; + -o-transform-origin:0 0; +} diff --git a/modules/services/openstreetcam.js b/modules/services/openstreetcam.js index c1df3415a..225ecf246 100644 --- a/modules/services/openstreetcam.js +++ b/modules/services/openstreetcam.js @@ -10,21 +10,37 @@ import { dispatch as d3_dispatch } from 'd3-dispatch'; import { request as d3_request } from 'd3-request'; import { + event as d3_event, select as d3_select, selectAll as d3_selectAll } from 'd3-selection'; +import { + zoom as d3_zoom, + zoomIdentity as d3_zoomIdentity +} from 'd3-zoom'; + import rbush from 'rbush'; import { d3geoTile as d3_geoTile } from '../lib/d3.geo.tile'; import { geoExtent } from '../geo'; -import { utilQsString, utilRebind } from '../util'; + +import { + utilQsString, + utilRebind, + utilSetTransform +} from '../util'; var apibase = 'https://openstreetcam.org', maxResults = 1000, tileZoom = 14, dispatch = d3_dispatch('loadedImages'), + imgZoom = d3_zoom() + .extent([[0, 0], [320, 240]]) + .translateExtent([[0, 0], [320, 240]]) + .scaleExtent([1, 15]) + .on('zoom', zoomPan), _oscCache, _oscSelectedImage; @@ -222,6 +238,12 @@ function searchLimited(psize, limit, projection, rtree) { } +function zoomPan() { + var t = d3_event.transform; + d3_select('#photoviewer .osc-image-wrap') + .call(utilSetTransform, t.x, t.y, t.k); +} + export default { @@ -302,7 +324,9 @@ export default { var wrapEnter = wrap.enter() .append('div') .attr('class', 'photo-wrapper osc-wrapper') - .classed('hide', true); + .classed('hide', true) + .call(imgZoom) + .on('dblclick.zoom', null); wrapEnter .append('div') @@ -334,6 +358,10 @@ export default { .on('click.forward', step(1)) .text('►'); + wrapEnter + .append('div') + .attr('class', 'osc-image-wrap'); + function rotate(deg) { return function() { @@ -344,9 +372,19 @@ export default { var r = sequence.rotation || 0; r += deg; + + if (r > 180) r -= 360; + if (r < -180) r += 360; sequence.rotation = r; - d3_select('#photoviewer .osc-wrapper .osc-image') + var wrap = d3_select('#photoviewer .osc-wrapper'); + + wrap + .transition() + .duration(100) + .call(imgZoom.transform, d3_zoomIdentity); + + wrap.selectAll('.osc-image') .transition() .duration(100) .style('transform', 'rotate(' + r + 'deg)'); @@ -414,20 +452,27 @@ export default { updateViewer: function(d) { var wrap = d3_select('#photoviewer .osc-wrapper'); + var imageWrap = wrap.selectAll('.osc-image-wrap'); + var attribution = wrap.selectAll('.photo-attribution').html(''); - wrap.selectAll('.osc-image') + wrap + .transition() + .duration(100) + .call(imgZoom.transform, d3_zoomIdentity); + + imageWrap + .selectAll('.osc-image') .remove(); if (d) { var sequence = _oscCache.sequences[d.sequence_id]; var r = (sequence && sequence.rotation) || 0; - wrap.append('img') + imageWrap + .append('img') .attr('class', 'osc-image') - .style('transform', 'rotate(' + r + 'deg)') - .attr('src', apibase + '/' + d.imagePath); - - var attribution = wrap.selectAll('.photo-attribution').html(''); + .attr('src', apibase + '/' + d.imagePath) + .style('transform', 'rotate(' + r + 'deg)'); if (d.captured_by) { attribution From c0040f3cd6a3aba9a19da876b5dccb80f6e9afa6 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 26 Nov 2017 19:30:19 -0500 Subject: [PATCH 33/33] Add caseSensitive option for combofields, use for `source=*` (closes #4558) --- data/presets/fields.json | 1 + data/presets/fields/source.json | 1 + data/presets/schema/field.json | 5 +++++ modules/ui/fields/combo.js | 2 ++ 4 files changed, 9 insertions(+) diff --git a/data/presets/fields.json b/data/presets/fields.json index 5c086d479..fff751e4e 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -1738,6 +1738,7 @@ "universal": true, "label": "Sources", "snake_case": false, + "caseSensitive": true, "options": [ "survey", "local knowledge", diff --git a/data/presets/fields/source.json b/data/presets/fields/source.json index b4411e47e..0d953e6e4 100644 --- a/data/presets/fields/source.json +++ b/data/presets/fields/source.json @@ -5,6 +5,7 @@ "universal": true, "label": "Sources", "snake_case": false, + "caseSensitive": true, "options": [ "survey", "local knowledge", diff --git a/data/presets/schema/field.json b/data/presets/schema/field.json index 504bdc442..df4ef642d 100644 --- a/data/presets/schema/field.json +++ b/data/presets/schema/field.json @@ -115,6 +115,11 @@ "description": "If true, replace spaces with underscores in the tag value (combo type fields)", "type": "boolean", "default": true + }, + "caseSensitive": { + "description": "If true, allow case sensitive field values (combo type fields)", + "type": "boolean", + "default": false } }, "additionalProperties": false diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js index df1dc9dc4..875fc6393 100644 --- a/modules/ui/fields/combo.js +++ b/modules/ui/fields/combo.js @@ -37,8 +37,10 @@ export function uiFieldCombo(field, context) { optstrings = field.strings && field.strings.options, optarray = field.options, snake_case = (field.snake_case || (field.snake_case === undefined)), + caseSensitive = field.caseSensitive, combobox = d3_combobox() .container(context.container()) + .caseSensitive(caseSensitive) .minItems(isMulti || isSemi ? 1 : 2), comboData = [], multiData = [],