Changeset 12147 in josm

Timestamp:

2017-05-14T21:21:19+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #14793 - fix WMTS CRS identification as per OGC specification (case-insensitive & version optional)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java (modified) (2 diffs)

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

@@ -5 +5 @@
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Locale;
 
 import javax.xml.namespace.QName;
@@ -202 +203 @@
      * @param crsIdentifier CRS identifier
      * @return CRS Identifier as it is used within JOSM (without prefix)
+     * @see <a href="https://portal.opengeospatial.org/files/?artifact_id=24045">
+     *     Definition identifier URNs in OGC namespace, chapter 7.2: URNs for single objects</a>
      */
     public static String crsToCode(String crsIdentifier) {
         if (crsIdentifier.startsWith("urn:ogc:def:crs:")) {
-            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*):.*:(.*)$", "$1:$2");
+            return crsIdentifier.replaceFirst("urn:ogc:def:crs:([^:]*)(?::.*)?:(.*)$", "$1:$2").toUpperCase(Locale.ENGLISH);
         }
         return crsIdentifier;

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.imagery;
+
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Rule;
@@ -29 +31 @@
         UtilityClassTestUtil.assertUtilityClassWellDefined(GetCapabilitiesParseHelper.class);
     }
+
+    /**
+     * Unit test of {@code GetCapabilitiesParseHelper#crsToCode} method.
+     */
+    @Test
+    public void testCrsToCode() {
+        assertEquals("EPSG:3127", GetCapabilitiesParseHelper.crsToCode("urn:ogc:def:crs:epsg:3127"));
+        assertEquals("EPSG:3127", GetCapabilitiesParseHelper.crsToCode("urn:ogc:def:crs:epsg::3127"));
+        assertEquals("EPSG:3127", GetCapabilitiesParseHelper.crsToCode("urn:ogc:def:crs:epsg:6.6:3127"));
+    }
 }