Changeset 16589 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2020-06-09T23:44:55+02:00 (4 years ago)

Author:

simon04

Message:

fix #19364 - Remote control /imagery: support all imagery options

Location:

trunk/src/org/openstreetmap/josm/io/remotecontrol

Files:

• RemoteControl.java (modified) (1 diff)
• handler/ImageryHandler.java (modified) (4 diffs)

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

@@ -32 +32 @@
      */
     static final int protocolMajorVersion = 1;
-    static final int protocolMinorVersion = 9;
+    static final int protocolMinorVersion = 10;
 
     /**

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

@@ -6 +6 @@
 import java.util.Arrays;
 
+import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryPreferenceEntry;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
-import org.openstreetmap.josm.data.imagery.ImageryLayerInfo;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.remotecontrol.PermissionPrefWithDefault;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -40 +42 @@
     @Override
     public String[] getOptionalParams() {
-        return new String[] {"title", "type", "cookies", "min_zoom", "max_zoom"};
+        return StructUtils.serializeStruct(new ImageryPreferenceEntry(), ImageryPreferenceEntry.class,
+                StructUtils.SerializeOptions.INCLUDE_NULL, StructUtils.SerializeOptions.INCLUDE_DEFAULT
+        ).keySet().toArray(new String[0]);
     }
 
@@ -48 +52 @@
     }
 
-    protected static ImageryInfo findBingEntry() {
-        return ImageryLayerInfo.instance.getDefaultLayers().stream()
-                .filter(i -> ImageryType.BING == i.getImageryType())
-                .findFirst().orElse(null);
-    }
-
     protected ImageryInfo buildImageryInfo() {
-        String url = args.get("url");
-        String title = args.get("title");
-        String type = args.get("type");
-        final ImageryInfo bing = ImageryType.BING.getTypeString().equals(type) ? findBingEntry() : null;
-        if ((title == null || title.isEmpty()) && bing != null) {
-            title = bing.getName();
-        }
-        if (title == null || title.isEmpty()) {
-            title = tr("Remote imagery");
-        }
-        String cookies = args.get("cookies");
-        final ImageryInfo imgInfo = new ImageryInfo(title, url, type, null, cookies);
-        if (bing != null) {
-            imgInfo.setIcon(bing.getIcon());
-        }
-        String minZoom = args.get("min_zoom");
-        if (minZoom != null && !minZoom.isEmpty()) {
-            try {
-                imgInfo.setDefaultMinZoom(Integer.parseInt(minZoom));
-            } catch (NumberFormatException e) {
-                Logging.error(e);
-            }
-        }
-        String maxZoom = args.get("max_zoom");
-        if (maxZoom != null && !maxZoom.isEmpty()) {
-            try {
-                imgInfo.setDefaultMaxZoom(Integer.parseInt(maxZoom));
-            } catch (NumberFormatException e) {
-                Logging.error(e);
-            }
-        }
-        return imgInfo;
+        args.computeIfAbsent("type", ignore -> ImageryType.WMS.getDefault().getTypeString());
+        args.computeIfAbsent("name", ignore -> args.getOrDefault("title", tr("Remote imagery")));
+        ImageryPreferenceEntry imageryPreferenceEntry = StructUtils.deserializeStruct(args, ImageryPreferenceEntry.class);
+        return new ImageryInfo(imageryPreferenceEntry);
     }
 
@@ -111 +81 @@
     @Override
     protected void validateRequest() throws RequestHandlerBadRequestException {
-        String url = args != null ? args.get("url") : null;
-        String type = args != null ? args.get("type") : null;
-        String cookies = args != null ? args.get("cookies") : null;
         try {
-            ImageryLayer.create(new ImageryInfo(null, url, type, null, cookies));
+            CheckParameterUtil.ensureParameterNotNull(args);
+            CheckParameterUtil.ensureParameterNotNull(args.get("url"));
+            ImageryLayer.create(buildImageryInfo());
         } catch (IllegalArgumentException e) {
             throw new RequestHandlerBadRequestException(e.getMessage(), e);