Changeset 13872 in josm for trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

Timestamp:

2018-05-30T19:04:15+02:00 (6 years ago)

Author:

wiktorn

Message:

Fix WMS_ENDPOINT headers.

• Use custom headers when calling GetCapabilities on server
• Pass custom headers and other imagery attributes after layer selection
• if GetCapabilities document defines GetMap url, ensure that it ends with '?'

Closes: #16330

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (1 diff)

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

@@ -432 +432 @@
                         // TODO should we handle also POST?
                         if ("GET".equalsIgnoreCase(mode) && getMapUrl != null && !"".equals(getMapUrl)) {
-                            this.getMapUrl = getMapUrl;
+                            if (getMapUrl.endsWith("?")) {
+                                this.getMapUrl = getMapUrl;
+                            } else {
+                                this.getMapUrl = getMapUrl + "?";
+                            }
                         }
                     }