Changeset 18780 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2023-07-26T17:37:57+02:00 (11 months ago)

Author:

taylor.smock

Message:

Fix #22733: Add UI feedback for url guessing, account for nan responses from servers

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (6 diffs)

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

@@ -12 +12 @@
 import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -36 +37 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.CachedFile;
 import org.openstreetmap.josm.tools.Logging;
@@ -151 +154 @@
      */
     public WMSImagery(String url, Map<String, String> headers) throws IOException, WMSGetCapabilitiesException {
+        this(url, headers, NullProgressMonitor.INSTANCE);
+    }
+
+    /**
+     * Make getCapabilities request towards given URL using headers
+     * @param url service url
+     * @param headers HTTP headers to be sent with request
+     * @param monitor Feedback for which URL we are currently trying, the integer is the <i>total number of urls</i> we are going to try
+     * @throws IOException when connection error when fetching get capabilities document
+     * @throws WMSGetCapabilitiesException when there are errors when parsing get capabilities document
+     * @throws InvalidPathException if a Path object cannot be constructed for the capabilities cached file
+     * @since xxx
+     */
+    public WMSImagery(String url, Map<String, String> headers, ProgressMonitor monitor)
+            throws IOException, WMSGetCapabilitiesException {
         if (headers != null) {
             this.headers.putAll(headers);
@@ -157 +175 @@
         IOException savedExc = null;
         String workingAddress = null;
+        final String[] baseAdditions = {
+            normalizeUrl(url),
+            url,
+            url + CAPABILITIES_QUERY_STRING,
+        };
+        final String[] versionAdditions = {"", "&VERSION=1.3.0", "&VERSION=1.1.1"};
+        final int totalNumberOfUrlsToTry = baseAdditions.length * versionAdditions.length;
+        monitor.setTicksCount(totalNumberOfUrlsToTry);
         url_search:
-        for (String z: new String[]{
-                normalizeUrl(url),
-                url,
-                url + CAPABILITIES_QUERY_STRING,
-        }) {
-            for (String ver: new String[]{"", "&VERSION=1.3.0", "&VERSION=1.1.1"}) {
+        for (String z : baseAdditions) {
+            for (String ver : versionAdditions) {
+                if (monitor.isCanceled()) {
+                    break url_search;
+                }
                 try {
+                    monitor.setCustomText(z + ver);
+                    monitor.worked(1);
                     attemptGetCapabilities(z + ver);
                     workingAddress = z;
@@ -193 +220 @@
             }
         }
-
         if (savedExc != null) {
             throw savedExc;
@@ -616 +642 @@
 
     private static Bounds parseBBox(Projection conv, String miny, String minx, String maxy, String maxx) {
-        if (miny == null || minx == null || maxy == null || maxx == null) {
+        if (miny == null || minx == null || maxy == null || maxx == null || Arrays.asList(miny, minx, maxy, maxx).contains("nan")) {
             return null;
         }