Changeset 16734 in josm for trunk/test/unit/org/openstreetmap/josm/io

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)

File:

• trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/ImageryHandlerTest.java (modified) (1 diff)

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