Changeset 2609 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-12-11T20:24:41+01:00 (14 years ago)

Author:

stoecker

Message:

applied #4146 - patch by mjulius - fix downloading incomplete relation

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• MultiFetchServerObjectReader.java (modified) (2 diffs)
• OsmReader.java (modified) (1 diff)

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

@@ -193 +193 @@
                 }
             }
-            appendGeneric(member.getMember());
+            if (!member.getMember().isIncomplete()) {
+                appendGeneric(member.getMember());
+            }
         }
         return this;
@@ -375 +377 @@
     protected void rememberNodesOfIncompleteWaysToLoad(DataSet from) {
         for (Way w: from.getWays()) {
-            if (w.isIncomplete()) {
+            if (w.hasIncompleteNodes()) {
                 for (Node n: w.getNodes()) {
                     if (n.isIncomplete()) {

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

@@ -482 +482 @@
             }
             w.setNodes(wayNodes);
-            w.setHasIncompleteNodes();
             if (w.hasIncompleteNodes()) {
                 if (logger.isLoggable(Level.FINE)) {