Changeset 15811 in josm for trunk/src/org/openstreetmap/josm/gui/io/AbstractPrimitiveTask.java

Timestamp:

2020-02-03T06:35:22+01:00 (4 years ago)

Author:

GerdP

Message:

fix #18566: Download object: member of relations always downloaded (18566.3.patch)

• return same result when downloading objects, no matter if overpass api is enabled or not.
• fix an EDT violation in class ChildRelationBrowser
• let MultiFetchOverpassObjectReader create a single overpass query, no matter how many objects are requested

(gives much better reaction times).

• use multi-fetch in ChildRelationBrowser to reduce duplicated code. Small disadvantage: When downloading multiple members of a relation the dialog doesn't update after each member. Should not matter much as the overall time for multiple members is shorter

I tried to keep the code backward compatible. Plugins reverter and undelete should continue to work.

File:

• trunk/src/org/openstreetmap/josm/gui/io/AbstractPrimitiveTask.java (modified) (6 diffs)

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

@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
-import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ExceptionDialogUtil;
@@ -42 +41 @@
 
     private boolean zoom;
-    private boolean downloadRelations;
-    private boolean fullRelation;
+    protected boolean fullRelation;
 
     protected AbstractPrimitiveTask(String title, OsmDataLayer layer) {
@@ -71 +69 @@
 
     /**
-     * Sets whether .
-     * @param downloadRelations {@code true} if
+     * Sets whether all members of the relation should be downloaded completely.
      * @param fullRelation {@code true} if a full download is required,
      *                     i.e., a download including the immediate children of a relation.
      * @return {@code this}
+     * since 15811 (changed parameter list)
      */
-    public final AbstractPrimitiveTask setDownloadRelations(boolean downloadRelations, boolean fullRelation) {
-        this.downloadRelations = downloadRelations;
+    public final AbstractPrimitiveTask setDownloadRelations(boolean fullRelation) {
         this.fullRelation = fullRelation;
         return this;
@@ -101 +98 @@
                 if (canceled)
                     return;
-                multiObjectReader = MultiFetchServerObjectReader.create();
+                multiObjectReader = MultiFetchServerObjectReader.create().setRecurseDownRelations(fullRelation);
             }
             initMultiFetchReader(multiObjectReader);
@@ -111 +108 @@
             new DataSetMerger(ds, theirDataSet).merge();
 
-            if (downloadRelations) {
-                loadIncompleteRelationMembers();
-            }
-
             loadIncompleteNodes();
         } catch (OsmTransferException e) {
@@ -120 +113 @@
                 return;
             lastException = e;
-        }
-    }
-
-    protected void loadIncompleteRelationMembers() throws OsmTransferException {
-        // if incomplete relation members exist, download them too
-        for (Relation r : ds.getRelations()) {
-            if (canceled)
-                return;
-            // Relations may be incomplete in case of nested relations if child relations are accessed before their parent
-            // (it may happen because "relations" has no deterministic sort order, see #10388)
-            if (r.isIncomplete() || r.hasIncompleteMembers()) {
-                synchronized (this) {
-                    if (canceled)
-                        return;
-                    objectReader = new OsmServerObjectReader(r.getId(), OsmPrimitiveType.RELATION, fullRelation);
-                }
-                DataSet theirDataSet = objectReader.parseOsm(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                synchronized (this) {
-                    objectReader = null;
-                }
-                new DataSetMerger(ds, theirDataSet).merge();
-            }
         }
     }