Changeset 7432 in josm for trunk/src/org

Timestamp:

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

Author:

Don-vip

Message:

fix #10388 - Incomplete download of relation members

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Relation.java (modified) (3 diffs)
• gui/io/DownloadPrimitivesTask.java (modified) (5 diffs)
• io/MultiFetchServerObjectReader.java (modified) (1 diff)
• io/OsmServerObjectReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -19 +19 @@
 
 /**
- * An relation, having a set of tags and any number (0...n) of members.
+ * A relation, having a set of tags and any number (0...n) of members.
  *
  * @author Frederik Ramm
@@ -502 +502 @@
 
     /**
-     * Replies true if at least one child primitive is incomplete
+     * Determines if at least one child primitive is incomplete.
      *
      * @return true if at least one child primitive is incomplete
@@ -515 +515 @@
 
     /**
-     * Replies a collection with the incomplete children this relation
-     * refers to
+     * Replies a collection with the incomplete children this relation refers to.
      *
      * @return the incomplete children. Empty collection if no children are incomplete.

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;

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

@@ -387 +387 @@
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
         int n = nodes.size() + ways.size() + relations.size();
-        progressMonitor.beginTask(trn("Downloading {0} object from ''{1}''", "Downloading {0} objects from ''{1}''", n, n, OsmApi.getOsmApi().getBaseUrl()));
+        progressMonitor.beginTask(trn("Downloading {0} object from ''{1}''",
+                "Downloading {0} objects from ''{1}''", n, n, OsmApi.getOsmApi().getBaseUrl()));
         try {
             missingPrimitives = new HashSet<>();

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

@@ -104 +104 @@
      * Downloads and parses the data.
      *
-     * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if
-     * null
+     * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null
      * @return the downloaded data
      * @throws OsmTransferException