Changeset 7432 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-08-19T15:59:51+02:00 (10 years ago)

Author:

Don-vip

Message:

fix #10388 - Incomplete download of relation members

File:

• trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java (modified) (5 diffs)

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

@@ -29 +29 @@
 import org.xml.sax.SAXException;
 
+/**
+ * Task downloading a set of OSM primitives.
+ * @since 4081
+ */
 public class DownloadPrimitivesTask extends PleaseWaitRunnable {
     private DataSet ds;
@@ -43 +47 @@
 
     /**
-     * Creates the  task
+     * Constructs a new {@code DownloadPrimitivesTask}.
      *
      * @param layer the layer in which primitives are updated. Must not be null.
@@ -57 +61 @@
 
     /**
-     * Creates the  task
+     * Constructs a new {@code DownloadPrimitivesTask}.
      *
      * @param layer the layer in which primitives are updated. Must not be null.
@@ -68 +72 @@
      */
     public DownloadPrimitivesTask(OsmDataLayer layer, List<PrimitiveId> ids, boolean fullRelation,
-            ProgressMonitor progessMonitor) throws IllegalArgumentException {
-        super(tr("Download objects"), progessMonitor, false /* don't ignore exception */);
+            ProgressMonitor progressMonitor) throws IllegalArgumentException {
+        super(tr("Download objects"), progressMonitor, false /* don't ignore exception */);
         ensureParameterNotNull(layer, "layer");
         this.ids = ids;
@@ -151 +155 @@
             for (Relation r : ds.getRelations()) {
                 if (canceled) return;
-                if (r.hasIncompleteMembers()) {
+                // 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;