Changeset 13346 in josm for trunk/src

Timestamp:

2018-01-20T19:54:16+01:00 (6 years ago)

Author:

Don-vip

Message:

WMS capabilities: support 1.3.0-only servers such as ​http://www.umweltkarten-niedersachsen.de/arcgis/services/WRRL_wms/MapServer/WMSServer?

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (2 diffs)

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

@@ -235 +235 @@
         }
 
+        doAttemptGetCapabilities(serviceUrlStr, getCapabilitiesUrl);
+    }
+
+    private void doAttemptGetCapabilities(String serviceUrlStr, URL getCapabilitiesUrl)
+            throws IOException, WMSGetCapabilitiesException {
         final Response response = HttpClient.create(getCapabilitiesUrl).connect();
 
@@ -241 +246 @@
         }
 
-        parseCapabilities(serviceUrlStr, response.getContent());
+        try {
+            parseCapabilities(serviceUrlStr, response.getContent());
+        } catch (WMSGetCapabilitiesException e) {
+            String url = getCapabilitiesUrl.toExternalForm();
+            // ServiceException for servers handling only WMS 1.3.0 ?
+            if (e.getCause() == null && url.contains("VERSION=1.1.1")) {
+                doAttemptGetCapabilities(serviceUrlStr, new URL(url.replace("VERSION=1.1.1", "VERSION=1.3.0")));
+                if (serviceUrl.toExternalForm().contains("VERSION=1.1.1")) {
+                    serviceUrl = new URL(serviceUrl.toExternalForm().replace("VERSION=1.1.1", "VERSION=1.3.0"));
+                }
+            } else {
+                throw e;
+            }
+        }
     }