Changeset 13929 in josm for trunk

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)
• io/remotecontrol/RemoteControl.java (modified) (1 diff)
• io/remotecontrol/handler/ImportHandler.java (modified) (2 diffs)
• io/remotecontrol/handler/LoadAndZoomHandler.java (modified) (2 diffs)
• io/remotecontrol/handler/LoadDataHandler.java (modified) (2 diffs)
• io/remotecontrol/handler/LoadObjectHandler.java (modified) (2 diffs)
• io/remotecontrol/handler/RequestHandler.java (modified) (4 diffs)

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);
         }

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControl.java

@@ -41 +41 @@
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 7;
+    static final int protocolMinorVersion = 8;
 
     /**

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java

@@ -64 +64 @@
     @Override
     public String[] getOptionalParams() {
-        return new String[] {"new_layer", "layer_name"};
+        return new String[] {"new_layer", "layer_name", "layer_locked", "download_policy", "upload_policy"};
     }
 
@@ -102 +102 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
+        validateDownloadParams();
         String urlString = args != null ? args.get("url") : null;
         if (Config.getPref().getBoolean("remotecontrol.importhandler.fix_url_query", true)) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandler.java

@@ -83 +83 @@
     public String[] getOptionalParams() {
         return new String[] {"new_layer", "layer_name", "addtags", "select", "zoom_mode",
-                "changeset_comment", "changeset_source", "changeset_hashtags", "search"};
+                "changeset_comment", "changeset_source", "changeset_hashtags", "search",
+                "layer_locked", "download_policy", "upload_policy"};
     }
 
@@ -261 +262 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
+        validateDownloadParams();
         // Process mandatory arguments
         minlat = 0;

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadDataHandler.java

@@ -51 +51 @@
     @Override
     public String[] getOptionalParams() {
-        return new String[] {"new_layer", "mime_type", "layer_name"};
+        return new String[] {"new_layer", "mime_type", "layer_name", "layer_locked", "download_policy", "upload_policy"};
     }
 
@@ -80 +80 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
+        validateDownloadParams();
         this.data = args.get("data");
         /**

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/LoadObjectHandler.java

@@ -41 +41 @@
     @Override
     public String[] getOptionalParams() {
-        return new String[] {"new_layer", "layer_name", "addtags", "relation_members", "referrers"};
+        return new String[] {"new_layer", "layer_name", "layer_locked", "download_policy", "upload_policy",
+                "addtags", "relation_members", "referrers"};
     }
 
@@ -97 +98 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
+        validateDownloadParams();
         ps.clear();
         for (String i : splitArg("objects", SPLITTER_COMMA)) {

trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

@@ -14 +14 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.regex.Pattern;
 
@@ -21 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
+import org.openstreetmap.josm.data.osm.DownloadPolicy;
+import org.openstreetmap.josm.data.osm.UploadPolicy;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
 import org.openstreetmap.josm.spi.preferences.Config;
@@ -299 +303 @@
     }
 
+    private <T> T get(String key, Function<String, T> parser, Supplier<T> defaultSupplier) {
+        String val = args.get(key);
+        return val != null && !val.isEmpty() ? parser.apply(val) : defaultSupplier.get();
+    }
+
     private boolean isLoadInNewLayer() {
-        return args.get("new_layer") != null && !args.get("new_layer").isEmpty()
-                ? Boolean.parseBoolean(args.get("new_layer"))
-                : Config.getPref().getBoolean(loadInNewLayerKey, loadInNewLayerDefault);
+        return get("new_layer", Boolean::parseBoolean, () -> Config.getPref().getBoolean(loadInNewLayerKey, loadInNewLayerDefault));
+    }
+
+    private boolean is(String key) {
+        return get(key, Boolean::parseBoolean, () -> false);
     }
 
@@ -308 +319 @@
         return new DownloadParams()
                 .withNewLayer(isLoadInNewLayer())
-                .withLayerName(args.get("layer_name"));
+                .withLayerName(args.get("layer_name"))
+                .withLocked(is("layer_locked"))
+                .withDownloadPolicy(get("download_policy", DownloadPolicy::of, () -> DownloadPolicy.NORMAL))
+                .withUploadPolicy(get("upload_policy", UploadPolicy::of, () -> UploadPolicy.NORMAL));
+    }
+
+    protected void validateDownloadParams() throws RequestHandlerBadRequestException {
+        try {
+            getDownloadParams();
+        } catch (IllegalArgumentException e) {
+            throw new RequestHandlerBadRequestException(e);
+        }
     }