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

Timestamp:

2017-12-21T15:36:03+01:00 (6 years ago)

Author:

Don-vip

Message:

WMS robustness

File:

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

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

@@ -221 +221 @@
                 getCapabilitiesUrl = new URL(serviceUrlStr);
             }
-            serviceUrl = new URL(serviceUrlStr);
+            // Make sure we don't keep GetCapabilities request in service URL
+            serviceUrl = new URL(serviceUrlStr.replace("REQUEST=GetCapabilities", "").replace("&&", "&"));
         } catch (HeadlessException e) {
             Logging.warn(e);
@@ -267 +268 @@
                 String baseURL = child.getAttribute("xlink:href");
                 if (!baseURL.equals(serviceUrlStr)) {
-                    Logging.info("GetCapabilities specifies a different service URL: " + baseURL);
-                    serviceUrl = new URL(baseURL);
+                    URL newURL = new URL(baseURL);
+                    if (newURL.getAuthority() != null) {
+                        Logging.info("GetCapabilities specifies a different service URL: " + baseURL);
+                        serviceUrl = newURL;
+                    }
                 }
             }