Changes between Version 35 and Version 36 of Help/Menu/OSMLayer

Timestamp:

2018-03-02T20:01:13+01:00 (7 years ago)

Author:

Klumbumbus

Comment:

fixes in layer states section

Help/Menu/OSMLayer

@@ -57 +57 @@
 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 =||=  locked =||\
+||||= Layer state =||=  `upload` =||=  `download` =||=  `locked` =||\
 ||=   Behaviour  =||\
 ||
 || [[Image(source:trunk/images/layer/osmdata_small.png,link=)]] ||\
 || Default || || || ||\
+|| No special behavior. ||\
 ||
 || [[Image(noupload.png,link=)]] ||\
-|| Rework || `false` || || ||\
-|| Warn before upload ||\
+|| Upload discouraged || `false` || || ||\
+|| A warning before the upload appears. ||\
 ||
 || [[Image(noupload.png,link=)]] ||\
-|| Test/Blocked   || `never` || || ||\
-|| Download and edit ||\
+|| Upload impossible || `never` || || ||\
+|| Uploading is not possible, the upload button is greyed out. ||\
+||
+|| [[Image(nodownload.png,link=)]] ||\
+|| Download impossible || || `never` || ||\
+|| A new layer is created during a download. ||\
 ||
 || [[Image(nodownloadnoupload.png,top,link=)]] ||\
-|| Private   || `never` || `never` || ||\
-|| Only editing ||\
+|| Upload and download impossible || `never` || `never` || ||\
+|| The combination of the two states above. ||\
 ||
 || [[Image(wiki:Help/Dialog/LayerList:lock-16px.svg,13,link=)]] ||\
-|| Locked   || || ||  `true`  ||\
-|| No action possible ||\
+|| Locked || || ||  `true`  ||\
+|| This includes `download=never` and `upload=never` and additionally blockes any editing of the data. ||\
 ||
 
@@ -85 +90 @@
 
 {{{#!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 impossible:
 <osm version='0.6' generator='JOSM' upload='never'>
 
-# To block downloads:
+# Download impossible:
 <osm version='0.6' generator='JOSM' download='never'>
 
-# To lock a file: 
-# This implies download='never' and upload='never'
+# Upload and download impossible:
+<osm version='0.6' generator='JOSM' upload='never' download='never'>
+
+# Locked: 
 <osm version='0.6' generator='JOSM' locked='true'>
 }}}