Changeset 2591 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

Timestamp:

2009-12-06T20:26:21+01:00 (14 years ago)

Author:

jttt

Message:

Fix #4114 - NPE when zooming out after updating a partially downloaded relation or downloding the referrers of a node

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (2 diffs)

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()));
-        if (!myWay.isIncomplete() || other.getNodesCount() == 0) return;
-        for (Node n: myWay.getNodes()) {
-            if (n.isIncomplete()) return;
-        }
-        myWay.setHasIncompleteNodes(false);
+        myWay.setHasIncompleteNodes();
     }
 
@@ -168 +164 @@
         if (myNode.isIncomplete() || myNode.isDeleted() || !myNode.isVisible()) return;
 
-        wayloop:
-            for (Way w: OsmPrimitive.getFilteredList(myNode.getReferrers(), Way.class)) {
-                if (w.isDeleted() || ! w.isVisible() || ! w.isIncomplete()) {
-                    continue;
-                }
-                for (Node n: w.getNodes()) {
-                    if (n.isIncomplete()) {
-                        continue wayloop;
-                    }
-                }
-                // all nodes are complete - set the way complete too
-                w.setHasIncompleteNodes(false);
-            }
+        for (Way w: OsmPrimitive.getFilteredList(myNode.getReferrers(), Way.class)) {
+            w.setHasIncompleteNodes();
+        }
     }