Changeset 13699 in josm

Timestamp:

2018-05-02T22:48:35+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16248 - fix parsing of XML namespace in WMS capabilities (patch by Bartosz Firyn, modified)

Location:

trunk

Files:

• src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (2 diffs)
• test/data/regress/16248 (added)
• test/data/regress/16248/capabilities.xml (added)
• test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -34 +34 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.imagery.GetCapabilitiesParseHelper;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.projection.Projections;
@@ -347 +348 @@
             child = getChild(child, "OnlineResource");
             if (child != null) {
-                String baseURL = child.getAttribute("xlink:href");
+                String baseURL = child.getAttributeNS(GetCapabilitiesParseHelper.XLINK_NS_URL, "href");
                 if (!baseURL.equals(serviceUrlStr)) {
                     URL newURL = new URL(baseURL);

trunk/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java

@@ -56 +56 @@
         }
     }
+
+    /**
+     * Non-regression test for bug #16248.
+     * @throws IOException if any I/O error occurs
+     * @throws WMSGetCapabilitiesException never
+     */
+    @Test
+    public void testTicket16248() throws IOException, WMSGetCapabilitiesException {
+        try (InputStream is = TestUtils.getRegressionDataStream(16248, "capabilities.xml")) {
+            WMSImagery wms = new WMSImagery();
+            wms.parseCapabilities(null, is);
+            assertEquals("http://wms.hgis.cartomatic.pl/topo/3857/m25k", wms.getServiceUrl().toExternalForm());
+        }
+    }
 }