Changeset 2609 in josm

Timestamp:

Dec 11, 2009 8:24:41 PM (3 years ago)

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSetMerger.java (modified) (2 diffs)
• data/osm/Way.java (modified) (2 diffs)
• io/MultiFetchServerObjectReader.java (modified) (2 diffs)
• io/OsmReader.java (modified) (1 diff)

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

@@ -145 +145 @@
         if (myWay == null)
             throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
-        myWay.setHasIncompleteNodes();
     }
 
@@ -163 +162 @@
             throw new RuntimeException(tr("Missing merge target for node with id {0}", other.getUniqueId()));
         if (myNode.isIncomplete() || myNode.isDeleted() || !myNode.isVisible()) return;
-
-        for (Way w: OsmPrimitive.getFilteredList(myNode.getReferrers(), Way.class)) {
-            w.setHasIncompleteNodes();
-        }
     }
 

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

@@ -26 +26 @@
     private Node[] nodes = new Node[0];
     private BBox bbox;
-    private boolean hasIncompleteNodes;
 
     /**
@@ -377 +376 @@
     }
 
-    //TODO This method should not be necessary. hasIncomplete state should be updated automatically when incomplete state of nodes change
-    public void setHasIncompleteNodes() {
-        hasIncompleteNodes = false;
+    public boolean hasIncompleteNodes() {
         for (Node node:getNodes()) {
-            if (node.isIncomplete()) {
-                hasIncompleteNodes = true;
-                break;
-            }
-        }
-    }
-
-    public boolean hasIncompleteNodes() {
-        return hasIncompleteNodes;
+            if (node.isIncomplete())
+                return true;
+        }
+        return false;
     }
 

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)) {