Changeset 10735 in josm

Timestamp:

2016-08-05T19:44:17+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13264 - more lenient TMS url regex to allow - zoom separator

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -685 +685 @@
         defaultMinZoom = 0;
         for (ImageryType type : ImageryType.values()) {
-            Matcher m = Pattern.compile(type.getTypeString()+"(?:\\[(?:(\\d+),)?(\\d+)\\])?:(.*)").matcher(url);
+            Matcher m = Pattern.compile(type.getTypeString()+"(?:\\[(?:(\\d+)[,-])?(\\d+)\\])?:(.*)").matcher(url);
             if (m.matches()) {
                 this.url = m.group(3);

trunk/test/unit/org/openstreetmap/josm/data/imagery/ImageryInfoTest.java

@@ -43 +43 @@
 
     /**
+     * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/13264">Bug #13264</a>.
+     */
+    @Test
+    public void testConstruct13264() {
+        final ImageryInfo info = new ImageryInfo("test imagery", "tms[16-23]:http://localhost");
+        assertEquals(ImageryInfo.ImageryType.TMS, info.getImageryType());
+        assertEquals(16, info.getMinZoom());
+        assertEquals(23, info.getMaxZoom());
+        assertEquals("http://localhost", info.getUrl());
+    }
+
+    /**
      * Tests the {@linkplain Preferences#serializeStruct(Object, Class) serialization} of {@link ImageryInfo.ImageryPreferenceEntry}
      */