Changeset 17635 in josm for trunk/src/org

Timestamp:

2021-03-22T10:19:02+01:00 (4 years ago)

Author:

GerdP

Message:

fix #20633: Download object: Too slow when downloading a relation with members with OSM api

• reduce work for DatasetMerger: avoid to add incomplete relation to downloaded dataset when full relation will be downloaded later. Saves lots of complex reindexRelation calls, esp. with complex relations.

File:

• trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (modified) (2 diffs)

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

@@ -443 +443 @@
      */
     private void downloadRelations(ProgressMonitor progressMonitor) throws OsmTransferException {
+        boolean removeIncomplete = outputDataSet.isEmpty();
         Set<Long> toDownload = new LinkedHashSet<>(relations);
         fetchPrimitives(toDownload, OsmPrimitiveType.RELATION, progressMonitor);
@@ -450 +451 @@
         // OSM multi-fetch api may return invisible objects, we don't try to get details for them
         for (Relation r : outputDataSet.getRelations()) {
-            if (!r.isVisible())
+            if (!r.isVisible()) {
                 toDownload.remove(r.getUniqueId());
-        }
+            } else if (removeIncomplete) {
+                outputDataSet.removePrimitive(r);
+            }
+        }
+
         // fetch full info for all visible relations
         for (long id : toDownload) {