Changeset 13929 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2018-06-13T23:37:59+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #11000 - add layer_locked, download_policy, upload_policy to download handlers (import, load_data, load_object and load_and_zoom). Bump remote control version to 1.8

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -267 +267 @@
                 layerName = OsmDataLayer.createNewName();
             }
+            if (settings.getDownloadPolicy() != null) {
+                dataSet.setDownloadPolicy(settings.getDownloadPolicy());
+            }
+            if (settings.getUploadPolicy() != null) {
+                dataSet.setUploadPolicy(settings.getUploadPolicy());
+            }
+            if (dataSet.isLocked() && !settings.isLocked()) {
+                dataSet.unlock();
+            } else if (!dataSet.isLocked() && settings.isLocked()) {
+                dataSet.lock();
+            }
             return new OsmDataLayer(dataSet, layerName, null);
         }