Changeset 13929 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java

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/io/remotecontrol/handler/RequestHandler.java (modified) (4 diffs)

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