Changeset 16734 in josm for trunk

Timestamp:

2020-07-06T17:44:17+02:00 (4 years ago)

Author:

simon04

Message:

fix #19483 - Remote control /imagery: parse extended URL (parse imagery type from URL)

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandler.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java (modified) (1 diff)

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

@@ -53 +53 @@
 
     protected ImageryInfo buildImageryInfo() {
-        args.computeIfAbsent("type", ignore -> ImageryType.WMS.getDefault().getTypeString());
+        ImageryInfo fromExtendedUrl = new ImageryInfo("", args.get("url"));
+        args.put("url", fromExtendedUrl.getUrl());
+        args.computeIfAbsent("min_zoom", ignore -> String.valueOf(fromExtendedUrl.getMinZoom()));
+        args.computeIfAbsent("max_zoom", ignore -> String.valueOf(fromExtendedUrl.getMaxZoom()));
+        args.computeIfAbsent("type", ignore -> fromExtendedUrl.getSourceType().getTypeString());
         args.computeIfAbsent("name", ignore -> args.getOrDefault("title", tr("Remote imagery")));
         ImageryPreferenceEntry imageryPreferenceEntry = StructUtils.deserializeStruct(args, ImageryPreferenceEntry.class);
@@ -101 +105 @@
         return new String[] {
             "/imagery?title=osm&type=tms&url=https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
+            "/imagery?url=[0-19]https://a.tile.openstreetmap.org/%7Bzoom%7D/%7Bx%7D/%7By%7D.png",
             "/imagery?title=landsat&type=wms&url=http://irs.gis-lab.info/?" +
                     "layers=landsat&SRS=%7Bproj%7D&WIDTH=%7Bwidth%7D&HEIGHT=%7Bheight%7D&BBOX=%7Bbbox%7D",

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java

@@ -104 +104 @@
         assertEquals("XA", imageryInfo.getCountryCode());
     }
+
+    /**
+     * Non-regression test for bug #19483.
+     * @throws Exception if any error occurs
+     */
+    @Test
+    public void testTicket19483() throws Exception {
+        String url = "https://localhost/imagery?url=" +
+                "tms[3-7]%3Ahttps%3A%2F%2Fservices.digitalglobe.com%2Fearthservice%2Ftmsaccess%2F" +
+                "tms%2F1.0.0%2FDigitalGlobe%3AImageryTileService%40EPSG%3A3857%40jpg%2F%7Bz%7D%2F%7Bx%7D%2F%7B-y%7D.jpg%3F" +
+                "connectId%3D0123456789";
+        ImageryInfo imageryInfo = newHandler(url).buildImageryInfo();
+        assertEquals(ImageryInfo.ImageryType.TMS, imageryInfo.getImageryType());
+        assertEquals("https://services.digitalglobe.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe:ImageryTileService" +
+                "@EPSG:3857@jpg/{z}/{x}/{-y}.jpg?connectId=0123456789", imageryInfo.getUrl());
+        assertEquals("tms[3,7]:https://services.digitalglobe.com/earthservice/tmsaccess/tms/1.0.0/DigitalGlobe:ImageryTileService" +
+                "@EPSG:3857@jpg/{z}/{x}/{-y}.jpg?connectId=0123456789", imageryInfo.getExtendedUrl());
+        assertEquals(3, imageryInfo.getMinZoom());
+        assertEquals(7, imageryInfo.getMaxZoom());
+    }
 }