Changeset 18628 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2023-01-10T23:55:56+01:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22642: {apikey} fails for Swedish historic orthophoto endpoint imagery

This occurred since we were not replacing the {apikey} for endpoints.

File:

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

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

@@ -31 +31 @@
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.imagery.LayerDetails;
+import org.openstreetmap.josm.data.imagery.TemplatedWMSTileSource;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.Layer;
 import org.openstreetmap.josm.data.imagery.WMTSTileSource.WMTSGetCapabilitiesException;
+import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -280 +282 @@
             throws IOException, WMSGetCapabilitiesException {
         CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT == info.getImageryType(), "wms_endpoint imagery type expected");
-        final WMSImagery wms = new WMSImagery(info.getUrl(), info.getCustomHttpHeaders());
+        // We need to get the URL with {apikey} replaced. See #22642.
+        final TemplatedWMSTileSource tileSource = new TemplatedWMSTileSource(info, ProjectionRegistry.getProjection());
+        final WMSImagery wms = new WMSImagery(tileSource.getBaseUrl(), info.getCustomHttpHeaders());
         LayerSelection selection = choice.apply(wms);
         if (selection == null) {