Changeset 13872 in josm for trunk/src

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• data/imagery/WMSEndpointTileSource.java (modified) (1 diff)
• io/imagery/WMSImagery.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -167 +167 @@
         try {
             CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT.equals(info.getImageryType()), "wms_endpoint imagery type expected");
-            final WMSImagery wms = new WMSImagery(info.getUrl());
+            final WMSImagery wms = new WMSImagery(info.getUrl(), info.getCustomHttpHeaders());
 
             final WMSLayerTree tree = new WMSLayerTree();
@@ -201 +201 @@
                     .map(LayerDetails::getName)
                     .collect(Collectors.joining(", "));
-            ImageryInfo ret = new ImageryInfo(info.getName() + selectedLayers,
-                    url,
-                    "wms",
-                    info.getEulaAcceptanceRequired(),
-                    info.getCookies());
-
+            // Use full copy of original Imagery info to copy all attributes. Only overwrite what's different
+            ImageryInfo ret = new ImageryInfo(info);
+            ret.setUrl(url);
+            ret.setImageryType(ImageryType.WMS);
+            ret.setName(info.getName() + selectedLayers);
             ret.setServerProjections(wms.getServerProjections(tree.getSelectedLayers()));
-
             return ret;
         } catch (MalformedURLException ex) {

trunk/src/org/openstreetmap/josm/data/imagery/WMSEndpointTileSource.java

@@ -43 +43 @@
         CheckParameterUtil.ensure(info, "imageryType", x -> ImageryType.WMS_ENDPOINT.equals(x.getImageryType()));
         try {
-            wmsi = new WMSImagery(info.getUrl());
+            wmsi = new WMSImagery(info.getUrl(), info.getCustomHttpHeaders());
         } catch (IOException | WMSGetCapabilitiesException e) {
             throw new IllegalArgumentException(e);

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 + "?";
+                            }
                         }
                     }