Changeset 16412 in josm

Timestamp:

2020-05-15T20:17:24+02:00 (5 years ago)

Author:

simon04

Message:

fix #19193 - WMSImagery: fix parsing of version 1.3.0 capabilities

For the constant CAPABILITIES_ROOT_130, the namespaceURI and localPart were interchanged.

Location:

trunk

Files:

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

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

@@ -56 +56 @@
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     // WMS 1.0 - 1.3.0
-    private static final QName CAPABILITITES_ROOT_130 = new QName("WMS_Capabilities", WMS_NS_URL);
+    private static final QName CAPABILITIES_ROOT_130  = new QName(WMS_NS_URL, "WMS_Capabilities");
     private static final QName QN_ABSTRACT            = new QName(WMS_NS_URL, "Abstract");
     private static final QName QN_CAPABILITY          = new QName(WMS_NS_URL, "Capability");
@@ -374 +374 @@
 
     private void attemptGetCapabilities(String url) throws IOException, WMSGetCapabilitiesException {
-        Logging.debug("Trying WMS getcapabilities with url {0}", url);
+        Logging.debug("Trying WMS GetCapabilities with url {0}", url);
         try (CachedFile cf = new CachedFile(url); InputStream in = cf.setHttpHeaders(headers).
                 setMaxAge(7 * CachedFile.DAYS).
@@ -385 +385 @@
                     if (event == XMLStreamReader.START_ELEMENT) {
                         if (tagEquals(CAPABILITIES_ROOT_111, reader.getName())) {
-                            // version 1.1.1
-                            this.version = reader.getAttributeValue(null, "version");
-                            if (this.version == null) {
-                                this.version = "1.1.1";
-                            }
+                            this.version = Utils.firstNotEmptyString("1.1.1",
+                                    reader.getAttributeValue(null, "version"));
                         }
-                        if (tagEquals(CAPABILITITES_ROOT_130, reader.getName())) {
-                            this.version = reader.getAttributeValue(WMS_NS_URL, "version");
+                        if (tagEquals(CAPABILITIES_ROOT_130, reader.getName())) {
+                            this.version = Utils.firstNotEmptyString("1.3.0",
+                                    reader.getAttributeValue(WMS_NS_URL, "version"),
+                                    reader.getAttributeValue(null, "version"));
                         }
                         if (tagEquals(QN_SERVICE, reader.getName())) {

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -84 +85 @@
     @Test
     public void testTicket16248() throws IOException, WMSGetCapabilitiesException {
-        tileServer.stubFor(
-                WireMock.get(WireMock.anyUrl())
-                .willReturn(WireMock.aResponse().withBody(
-                        Files.readAllBytes(Paths.get(TestUtils.getRegressionDataFile(16248, "capabilities.xml")))
-                        ))
-                );
+        byte[] capabilities = Files.readAllBytes(Paths.get(TestUtils.getRegressionDataFile(16248, "capabilities.xml")));
+        tileServer.stubFor(WireMock.get(WireMock.anyUrl()).willReturn(WireMock.aResponse().withBody(capabilities)));
         WMSImagery wms = new WMSImagery(tileServer.url("any"));
         assertEquals("http://wms.hgis.cartomatic.pl/topo/3857/m25k?", wms.buildRootUrl());
         assertEquals("wms.hgis.cartomatic.pl", wms.getLayers().get(0).getName());
-        assertEquals("http://wms.hgis.cartomatic.pl/topo/3857/m25k?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&"
-                + "LAYERS=wms.hgis.cartomatic.pl&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
+        assertEquals("http://wms.hgis.cartomatic.pl/topo/3857/m25k?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.3.0&SERVICE=WMS&REQUEST=GetMap&"
+                + "LAYERS=wms.hgis.cartomatic.pl&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
+                wms.buildGetMapUrl(wms.getLayers(), (List<String>) null, true));
+    }
+
+    /**
+     * Non-regression test for bug #19193.
+     * @throws IOException if any I/O error occurs
+     * @throws WMSGetCapabilitiesException never
+     */
+    @Test
+    public void testTicket19193() throws IOException, WMSGetCapabilitiesException {
+        byte[] capabilities = Files.readAllBytes(Paths.get(TestUtils.getRegressionDataFile(19193, "capabilities.xml")));
+        tileServer.stubFor(WireMock.get(WireMock.anyUrl()).willReturn(WireMock.aResponse().withBody(capabilities)));
+        WMSImagery wms = new WMSImagery(tileServer.url("any"));
+        assertEquals("https://inspire.brandenburg.de/services/gn_alkis_wms?", wms.buildRootUrl());
+        assertEquals(1, wms.getLayers().size());
+        assertNull(wms.getLayers().get(0).getName());
+        assertEquals("INSPIRE GN ALKIS BB", wms.getLayers().get(0).getTitle());
+        assertEquals("https://inspire.brandenburg.de/services/gn_alkis_wms?FORMAT=image/png&TRANSPARENT=TRUE&VERSION=1.3.0&"
+                + "SERVICE=WMS&REQUEST=GetMap&LAYERS=null&STYLES=&CRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}",
                 wms.buildGetMapUrl(wms.getLayers(), (List<String>) null, true));
     }