Changeset 2587 in josm for trunk

Timestamp:

2009-12-06T14:43:18+01:00 (15 years ago)

Author:

jttt

Message:

Added Way.hasIncompletNodes(), Way.isIncomplete() now returns true only if way is not downloaded, not if one of the nodes is missing. Way.isUsable() return false if one of the way nodes is incomplete

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/DataSetMerger.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Way.java (modified) (2 diffs)
• src/org/openstreetmap/josm/io/OsmReader.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java (modified) (1 diff)

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

@@ -150 +150 @@
             if (n.isIncomplete()) return;
         }
-        myWay.setIncomplete(false);
+        myWay.setHasIncompleteNodes(false);
     }
 
@@ -168 +168 @@
             throw new RuntimeException(tr("Missing merge target for node with id {0}", other.getUniqueId()));
         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;
+
+        wayloop:
+            for (Way w: OsmPrimitive.getFilteredList(myNode.getReferrers(), Way.class)) {
+                if (w.isDeleted() || ! w.isVisible() || ! w.isIncomplete()) {
+                    continue;
                 }
-            }
-            // all nodes are complete - set the way complete too
-            w.setIncomplete(false);
-        }
+                for (Node n: w.getNodes()) {
+                    if (n.isIncomplete()) {
+                        continue wayloop;
+                    }
+                }
+                // all nodes are complete - set the way complete too
+                w.setHasIncompleteNodes(false);
+            }
     }
 

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

@@ -1155 +1155 @@
     }
 
+    //TODO This method should not be necessary, incomplete state should be handled internally by OsmPrimitive
     public void setIncomplete(boolean incomplete) {
         this.incomplete = incomplete;

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

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

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

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

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java

@@ -1142 +1142 @@
         Way w = (Way)target.getPrimitiveById(3, OsmPrimitiveType.WAY);
         assertNotNull(w);
-        assertFalse(w.isIncomplete());
+        assertFalse(w.hasIncompleteNodes());
+        assertFalse(w.isUsable());
         assertEquals(2, w.getNodesCount());
         assertEquals(1, w.getNode(0).getId());