Changeset 15811 in josm for trunk/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.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/UpdatePrimitivesTask.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import java.util.Collections;
 
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.MultiFetchServerObjectReader;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 /**
@@ -33 +31 @@
         super(tr("Update objects"), layer);
         this.toUpdate = toUpdate != null ? toUpdate : Collections.<OsmPrimitive>emptyList();
-    }
-
-    protected void initMultiFetchReaderWithNodes(MultiFetchServerObjectReader reader) {
-        getProgressMonitor().indeterminateSubTask(tr("Initializing nodes to update ..."));
-        for (OsmPrimitive primitive : toUpdate) {
-            if (primitive instanceof Node && !primitive.isNew()) {
-                reader.append(primitive);
-            }
-        }
-    }
-
-    protected void initMultiFetchReaderWithWays(MultiFetchServerObjectReader reader) {
-        getProgressMonitor().indeterminateSubTask(tr("Initializing ways to update ..."));
-        for (OsmPrimitive primitive : toUpdate) {
-            if (primitive instanceof Way && !primitive.isNew()) {
-                // this also adds way nodes
-                reader.append(primitive);
-            }
-        }
-    }
-
-    protected void initMultiFetchReaderWithRelations(MultiFetchServerObjectReader reader) {
-        getProgressMonitor().indeterminateSubTask(tr("Initializing relations to update ..."));
-        for (OsmPrimitive primitive : toUpdate) {
-            if (primitive instanceof Relation && !primitive.isNew()) {
-                // this also adds relation members
-                reader.append(primitive);
-            }
-        }
+        setDownloadRelations(Config.getPref().getBoolean("update.selected.complete-relation", true));
     }
 
     @Override
     protected void initMultiFetchReader(MultiFetchServerObjectReader reader) {
-        initMultiFetchReaderWithNodes(reader);
-        initMultiFetchReaderWithWays(reader);
-        initMultiFetchReaderWithRelations(reader);
+        // don't update new primitives
+        toUpdate.stream().filter(p -> !p.isNew()).forEach(reader::append);
     }
 }