Changeset 15209 in josm for trunk

Timestamp:

2019-07-06T20:10:03+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17801 - create WMS URL correctly

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/imagery/AddWMSLayerPanel.java (modified) (2 diffs)
• io/imagery/WMSImagery.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java

@@ -123 +123 @@
             wmsUrl.setEnabled(enabled);
             if (endpoint.isSelected() && !setDefaultLayers.isSelected() && wms != null) {
-                name.setText(wms.buildRootUrl());
+                name.setText(wms.buildRootUrlWithoutCapabilities());
             }
             onLayerSelectionChanged();
@@ -161 +161 @@
                 )
             );
-            name.setText(wms.buildRootUrl() + ": " + Utils.join(", ", tree.getSelectedLayers()));
+            name.setText(wms.buildRootUrlWithoutCapabilities() + ": " + Utils.join(", ", tree.getSelectedLayers()));
         }
         showBounds.setEnabled(tree.getSelectedLayers().size() == 1);

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

@@ -45 +45 @@
 public class WMSImagery {
 
-    private static final String CAPABILITIES_QUERY_STRING = "SERVICE=WMS&REQUEST=GetCapabilities";
+    private static final String SERVICE_WMS = "SERVICE=WMS";
+    private static final String REQUEST_GET_CAPABILITIES = "REQUEST=GetCapabilities";
+    private static final String CAPABILITIES_QUERY_STRING = SERVICE_WMS + "&" + REQUEST_GET_CAPABILITIES;
 
     /**
@@ -270 +272 @@
 
     /**
+     * @return root URL of services without the GetCapabilities call
+     * @since 15209
+     */
+    public String buildRootUrlWithoutCapabilities() {
+        return buildRootUrl()
+                .replace(CAPABILITIES_QUERY_STRING, "")
+                .replace(SERVICE_WMS, "")
+                .replace(REQUEST_GET_CAPABILITIES, "")
+                .replace("?&", "?");
+    }
+
+    /**
      * Returns URL for accessing GetMap service. String will contain following parameters:
      * * {proj} - that needs to be replaced with projection (one of {@link #getServerProjections(List)})
@@ -322 +336 @@
                         selectedLayers.size());
 
-        return buildRootUrl() + "FORMAT=" + format + ((imageFormatHasTransparency(format) && transparent) ? "&TRANSPARENT=TRUE" : "")
-                + "&VERSION=" + this.version + "&SERVICE=WMS&REQUEST=GetMap&LAYERS="
+        return buildRootUrlWithoutCapabilities()
+                + "FORMAT=" + format + ((imageFormatHasTransparency(format) && transparent) ? "&TRANSPARENT=TRUE" : "")
+                + "&VERSION=" + this.version + "&" + SERVICE_WMS + "&REQUEST=GetMap&LAYERS="
                 + selectedLayers.stream().collect(Collectors.joining(","))
                 + "&STYLES="