Changeset 2591 in josm for trunk

Timestamp:

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

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSetMerger.java (modified) (2 diffs)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/Way.java (modified) (1 diff)
• io/OsmReader.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();
+        }
     }
 

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

@@ -1119 +1119 @@
         StringBuilder builder = new StringBuilder();
 
+        if (isIncomplete()) {
+            builder.append("I");
+        }
         if (isModified()) {
             builder.append("M");

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

@@ -378 +378 @@
 
     //TODO This method should not be necessary. hasIncomplete state should be updated automatically when incomplete state of nodes change
-    public void setHasIncompleteNodes(boolean hasIncompleteNodes) {
-        this.hasIncompleteNodes = hasIncompleteNodes;
+    public void setHasIncompleteNodes() {
+        hasIncompleteNodes = false;
+        for (Node node:getNodes()) {
+            if (node.isIncomplete()) {
+                hasIncompleteNodes = true;
+                break;
+            }
+        }
     }
 

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

@@ -418 +418 @@
         for (Long externalWayId: ways.keySet()) {
             Way w = (Way)externalIdMap.get("w" + externalWayId);
-            boolean hasIncompleteNodes = false;
             List<Node> wayNodes = new ArrayList<Node>();
             for (long id : ways.get(externalWayId)) {
@@ -438 +437 @@
                         ds.addPrimitive(n);
                     }
-                    hasIncompleteNodes = true;
                 }
                 wayNodes.add(n);
             }
             w.setNodes(wayNodes);
-            if (hasIncompleteNodes) {
+            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 " +
                             "loaded data and is therefore incomplete too.", externalWayId, w.getNodesCount()));
                 }
-                w.setHasIncompleteNodes(true);
                 ds.addPrimitive(w);
             } else {
-                w.setHasIncompleteNodes(false);
                 ds.addPrimitive(w);
             }