Changeset 16412 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-05-15T20:17:24+02:00 (4 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.

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (3 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())) {