Ticket #4146: FixDownloadIncompleteWays.patch

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

@@ -144 +144 @@
         Way myWay = (Way)getMergeTarget(other);
         if (myWay == null)
             throw new RuntimeException(tr("Missing merge target for way with id {0}", other.getUniqueId()));
-        myWay.setHasIncompleteNodes();
     }
 
     /**
@@ -162 +161 @@
         if (myNode == null)
             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();
-        }
     }
 
     /**

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

@@ -25 +25 @@
      */
     private Node[] nodes = new Node[0];
     private BBox bbox;
-    private boolean hasIncompleteNodes;
 
     /**
      *
@@ -376 +375 @@
         bbox = new BBox(this);
     }
 
-    //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;
-            }
+            if (node.isIncomplete())
+                return true;
         }
+        return false;
     }
 
-    public boolean hasIncompleteNodes() {
-        return hasIncompleteNodes;
-    }
-
     @Override
     public boolean isUsable() {
         return super.isUsable() && !hasIncompleteNodes();

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

@@ -192 +192 @@
                     continue;
                 }
             }
-            appendGeneric(member.getMember());
+            if (!member.getMember().isIncomplete()) {
+                appendGeneric(member.getMember());
+            }
         }
         return this;
     }
@@ -374 +376 @@
 
     protected void rememberNodesOfIncompleteWaysToLoad(DataSet from) {
         for (Way w: from.getWays()) {
-            if (w.isIncomplete()) {
+            if (w.hasIncompleteNodes()) {
                 for (Node n: w.getNodes()) {
                     if (n.isIncomplete()) {
                         nodes.add(n.getId());

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

@@ -481 +481 @@
                 wayNodes.add(n);
             }
             w.setNodes(wayNodes);
-            w.setHasIncompleteNodes();
             if (w.hasIncompleteNodes()) {
                 if (logger.isLoggable(Level.FINE)) {
                     logger.fine(tr("Marked way {0} with {1} nodes incomplete because at least one node was missing in the " +