Changeset 12469 in josm for trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

Timestamp:

2017-07-12T21:41:19+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #15012 - Support WMS endpoint in Imagery -> Rectified Image

File:

• trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (2 diffs)

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

@@ -94 +94 @@
             case WMS_ENDPOINT:
                 // convert to WMS type
-                return getWMSLayerInfo();
+                return getWMSLayerInfo(info);
             case WMTS:
                 // specify which layer to use
@@ -152 +152 @@
     }
 
-    protected ImageryInfo getWMSLayerInfo() throws IOException, WMSGetCapabilitiesException {
+    /**
+     * Asks user to choose a WMS layer from a WMS endpoint.
+     * @param info the WMS endpoint.
+     * @return chosen WMS layer, or null
+     * @throws IOException if any I/O error occurs while contacting the WMS endpoint
+     * @throws WMSGetCapabilitiesException if the WMS getCapabilities request fails
+     */
+    protected static ImageryInfo getWMSLayerInfo(ImageryInfo info) throws IOException, WMSGetCapabilitiesException {
         CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT.equals(info.getImageryType()), "wms_endpoint imagery type expected");