Changes between Version 34 and Version 52 of Help/Menu/OSMLayer

Timestamp:

(multiple changes)

Author:

(multiple changes)

Comment:

(multiple changes)

Help/Menu/OSMLayer

@@ -3 +3 @@
 = Context Menu > OSM Data Layer =
 
-Data layers contain map data objects downloaded from OpenStreetMap or created and edited by users, usually meant to upload them back to OSM. Special [#Layerstate layer states] may block this.
+A Data layer contains map data objects downloaded from OpenStreetMap or created and edited by users, usually meant to upload them back to OSM. Special [#LayerState layer states] may block this.
 
 
-=== Context menu ===
+=== Context menu ===#ContextMenu
 OSM data layers have following context menu:
 
-|| [[Image(source:trunk/images/dialogs/activate.svg)]] ||\
+||= **Icon** =||= **Name** =||= **Shortcut** =||
+||  [[JOSMImage(dialogs/activate,link=wikitr:/Help/Dialog/LayerList#ActivateLayer,middle)]]  ||\
 || [wikitr:/Help/Dialog/LayerList#ActivateLayer Activate] ||\
 || **`Shift+A`⤳`[0–9]`** ||\
 ||
-|| [[Image(source:trunk/images/dialogs/showhide.png)]] ||\
+||  [[JOSMImage(dialogs/showhide,link=wikitr:/Help/Dialog/LayerList#VisibilityLayer,middle)]]  ||\
 || [wikitr:/Help/Dialog/LayerList#VisibilityLayer Show/Hide] ||\
 || **`Shift+S`⤳`[0–9]`**||\
 ||
-|| [[Image(source:trunk/images/dialogs/delete.png)]] ||\
+||  [[JOSMImage(dialogs/autoscale/layer,link=wikitr:/Help/Action/ZoomToLayer,middle)]]  ||\
+|| [wikitr:/Help/Action/ZoomToLayer Zoom to layer] ||\
+|| ||\
+||
+||  [[JOSMImage(dialogs/delete,24,link=wikitr:/Help/Dialog/LayerList#DeleteLayer,middle)]]  ||\
 || [wikitr:/Help/Dialog/LayerList#DeleteLayer Delete] || ||\
 ||
 ||||
-|| [[Image(source:trunk/images/dialogs/mergedown.png)]] ||\
+||  [[JOSMImage(dialogs/mergedown,link=wikitr:/Help/Action/MergeLayer,middle)]]  ||\
 || [wikitr:/Help/Action/MergeLayer Merge] || ||\
 ||
-|| [[Image(source:trunk/images/dialogs/duplicatelayer.png)]] ||\
+||  [[JOSMImage(dialogs/duplicatelayer,link=wikitr:/Help/Action/DuplicateLayer,middle)]]  ||\
 || [wikitr:/Help/Action/DuplicateLayer Duplicate] || ||\
 ||
-|| [[Image(source:trunk/images/save.png)]] ||\
-||[wikitr:/Help/Action/Save Save] || ||\
+||  [[JOSMImage(save,link=wikitr:/Help/Action/Save,middle)]]  ||\
+|| [wikitr:/Help/Action/Save Save] || ||\
 ||
-|| [[Image(source:trunk/images/save_as.png)]] ||\
+||  [[JOSMImage(save_as,link=wikitr:/Help/Action/SaveAs,middle)]]  ||\
 || [wikitr:/Help/Action/SaveAs Save as ...] || ||\
 ||
-|| [[Image(source:trunk/images/exportgpx.png)]] ||\
+||  [[JOSMImage(exportgpx,link=wikitr:/Help/Action/GpxExport,middle,24)]]  ||\
 || [wikitr:/Help/Action/GpxExport Export to GPX ...] ''(only in [wikitr:/Help/ExpertMode expert mode])'' || ||\
 ||
-|| [[Image(source:trunk/images/converttogpx.png)]] ||\
+||  [[JOSMImage(converttogpx,link=wikitr:/Help/Action/ConvertToGpxLayer,middle,24)]]  ||\
 || [wikitr:/Help/Action/ConvertToGpxLayer Convert To GPX Layer] ''(only in expert mode)'' || ||\
 ||
 ||||
-|| [[Image(source:trunk/images/dialogs/edit.png)]] ||\
+||  [[JOSMImage(dialogs/edit,link=wikitr:/Help/Action/RenameLayer,middle)]]  ||\
 || [wikitr:/Help/Action/RenameLayer Rename Layer] || ||\
 ||
-|| [[Image(source:trunk/images/no_upload.svg)]]||\
-|| [wiki:Help/Action/EncourageDiscourageUpload Discourage upload] ''(only in expert mode)'' || ||\
+||  [[JOSMImage(no_upload,link=wikitr:/Help/Action/EncourageDiscourageUpload,middle)]]  ||\
+|| [wikitr:/Help/Action/EncourageDiscourageUpload Discourage upload] ''(only in expert mode)'' || ||\
 ||
-|| || [wikitr:/Help/Action/DataConsistantyTest Data consistency test] || ||\
+||  || Data consistency test || ||\
 ||
 ||||
-|| [[Image(source:trunk/images/info.png)]] ||\
+||  [[JOSMImage(info,link=wikitr:/Help/Action/LayerInfo,middle)]]  ||\
 || [wikitr:/Help/Action/LayerInfo Info] || ||\
 ||
 
 
-=== Layer State ===
-Normally all actions are possible with the OSM data in a layer. But the three switches Upload, Download and Locked can change this:
+=== Layer State ===#LayerState
+By default all actions are possible with the OSM data in a layer.
+But the three switches Upload, Download and Locked can change this:
 
-||||= Layer state =||=  Upload =||=  Download =||=  Block =||\
-||=   Behaviour  =||\
+||||= **Switch** =||= **Upload** =||= **Download** =||= **Locked** =||= **Behavior** =||\
 ||
-|| [[Image(source:trunk/images/layer/osmdata_small.png,link=)]] ||\
-|| Default || . || . || . ||\
+||||= **key name** =||= `upload` =||= `download` =||= `locked` =||= =||\
 ||
-|| [[Image(source:trunk/images/warning-small.png,8,right,bottom,link=)]] ||\
-|| Rework || `false` || . || . ||\
-|| Warn before upload ||\
+|| [[JOSMImage(layer/osmdata_small)]] ||\
+|| Default || || || ||\
+|| No special behavior. ||\
 ||
-|| [[Image(source:trunk/images/warning-small.png,8,link=)]] ||\
-|| Test/Blocked   || `never` || . || . ||\
-|| Download and edit ||\
+|| [[Image(Help/Menu/OSMLayer:noupload.svg,link=,middle)]] ||\
+|| Upload discouraged ||  `false`  || || ||\
+|| A warning before the upload appears. ||\
 ||
-|| [[Image(source:trunk/images/warning-small.png,8,right,top,link=)]] ||\
-|| Private   || `never` || `never` || . ||\
-|| Only editing ||\
+|| [[Image(Help/Menu/OSMLayer:noupload.svg,link=,middle)]] ||\
+|| Upload blocked ||  `never`  || || ||\
+|| Uploading is not possible, the upload button is greyed out. ||\
 ||
-|| [[Image(lock-16px.svg,13,link=)]] ||\
-|| Locked   || . || . ||  `true`  ||\
-|| No action possible ||\
+|| [[Image(Help/Menu/OSMLayer:nodownload.svg,link=,middle)]] ||\
+|| Download blocked || ||  `never`  || ||\
+|| The downloaded data goes into another layer which doesn't block downloads if available. Otherwise a new layer is created. ||\
+||
+|| [[Image(Help/Menu/OSMLayer:nodownloadnoupload.svg,top,link=,middle)]] ||\
+|| Upload and download blocked ||  `never`  ||  `never`  || ||\
+|| The combination of the two states above. ||\
+||
+|| [[JOSMImage(lock)]] ||\
+|| Locked || || ||  `true`  ||\
+|| This includes `download=never` and `upload=never` and additionally blocks any editing of the data. ||\
 ||
 
-The Upload switch can be toggled to `false` with [wikitr:/Help/Action/EncourageDiscourageUpload Discourage Upload], the context menu item mentioned above. 
-For all other switches the .osm-file must be edited with a text editor.
-In the second line the switches are part of the osm key.
+The Upload switch can be toggled to `false` with [wikitr:/Help/Action/EncourageDiscourageUpload Discourage upload] in the context menu mentioned above. 
+For all other states the switches must be edited in the .osm-file with a text editor.
+The switches are optional parts of the osm key in the second line.
 
 {{{#!xml
-# Default file header 
-# Implying upload='true', download='never' and locked='false'
+# Default:
 <osm version='0.6' generator='JOSM'>
 
-# To warn before uploading: 
-# Same switch as 'Upload' in the Layer list context menu
+# Upload discouraged: 
 <osm version='0.6' generator='JOSM' upload='false'>
 
-# To block uploads:
+# Upload blocked:
 <osm version='0.6' generator='JOSM' upload='never'>
 
-# To block downloads:
+# Download blocked:
 <osm version='0.6' generator='JOSM' download='never'>
 
-# To lock a file: 
-# This implies download='never' and upload='never'
+# Upload and download blocked:
+<osm version='0.6' generator='JOSM' upload='never' download='never'>
+
+# Locked: 
 <osm version='0.6' generator='JOSM' locked='true'>
 }}}
 
 ----
-Back to [wikitr:/Help/Dialog/LayerList Layer List Dialog]\\
+Back to [wikitr:/Help/Dialog/LayerList Layers panel]\\
 Back to [wikitr:/Help Main Help]