Changeset 15787 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2020-01-27T09:17:42+01:00 (4 years ago)

Author:

GerdP

Message:

see #18624: Download parent ways/relations downloads way nodes twice (or more)
Improve performance, esp. when multiple nodes of the same way are selected

• DownloadReferrersTask: download all incomplete nodes of all parent ways with one MultiFetchServerObjectReader instead of repeating this step for each parent way. Saves lots of FULL api calls for the parent ways (/full)
• updated parent way nodes are recognized
• DownloadPrimitivesWithReferrersTask creates only one DownloadReferrersTask for all primitives to profit from the above changes

File:

• trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.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)
-            for (PrimitiveId id : ids) {
-                synchronized (this) {
-                    if (canceled) {
-                        currentTask = null;
-                        return;
-                    }
-                    currentTask = new DownloadReferrersTask(
-                            tmpLayer, id, getProgressMonitor().createSubTaskMonitor(1, false));
-                }
-                currentTask.run();
-            }
+        if (downloadReferrers) {
+            currentTask = new DownloadReferrersTask(tmpLayer, ids);
+            currentTask.run();
+            synchronized (this) {
+                if (currentTask.getProgressMonitor().isCanceled())
+                    cancel();
+            }
+        }
         currentTask = null;
     }