Changeset 16203 in josm for trunk/src/org

Timestamp:

2020-03-27T10:18:45+01:00 (4 years ago)

Author:

GerdP

Message:

see #18985: avoid to download parents of deleted (invisble) objects

• filter invisible objects before starting DownloadReferrersTask
• don't show "retrying with an individual request for each object" for a rc 404 when only one object was requested

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/io/DownloadPrimitivesWithReferrersTask.java (modified) (1 diff)
• io/MultiFetchServerObjectReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

@@ -114 +114 @@
         currentTask.run();
         // Then, download referrers for each primitive
-        if (downloadReferrers) {
-            currentTask = new DownloadReferrersTask(tmpLayer, ids);
-            currentTask.run();
-            synchronized (this) {
-                if (currentTask.getProgressMonitor().isCanceled())
-                    cancel();
+        if (downloadReferrers && tmpLayer.data != null) {
+            // see #18895: don't try to download parents for invisible objects
+            List<PrimitiveId> visible = ids.stream().map(tmpLayer.data::getPrimitiveById)
+                    .filter(p -> p != null && p.isVisible()).collect(Collectors.toList());
+            if (!visible.isEmpty()) {
+                currentTask = new DownloadReferrersTask(tmpLayer, visible);
+                currentTask.run();
+                synchronized (this) {
+                    if (currentTask.getProgressMonitor().isCanceled())
+                        cancel();
+                }
             }
         }

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -578 +578 @@
                         return res;
                     }
-                    Logging.info(tr("Server replied with response code 404, retrying with an individual request for each object."));
-                    return singleGetIdPackage(type, pkg, progressMonitor);
+                    if (pkg.size() == 1) {
+                        FetchResult res = new FetchResult(new DataSet(), new HashSet<PrimitiveId>());
+                        res.missingPrimitives.add(new SimplePrimitiveId(pkg.iterator().next(), type));
+                        return res;
+                    } else {
+                        Logging.info(tr("Server replied with response code 404, retrying with an individual request for each object."));
+                        return singleGetIdPackage(type, pkg, progressMonitor);
+                    }
                 } else {
                     throw e;