Changeset 357 in josm for trunk/src/org

Timestamp:

2007-10-10T00:10:27+02:00 (17 years ago)

Author:

gebner

Message:

Add incompleteness checks for nodes.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Way.java (modified) (1 diff)
• data/osm/visitor/SimplePaintVisitor.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (1 diff)
• gui/SelectionManager.java (modified) (2 diffs)

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

@@ -63 +63 @@
             return o instanceof Way ? Long.valueOf(id).compareTo(o.id) : -1;
     }
-        
+
         @Deprecated
         public boolean isIncomplete() {
-                return false;
+                return incomplete;
         }
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java

@@ -93 +93 @@
          */
         public void visit(Node n) {
+                if (n.incomplete) return;
+
                 Color color = null;
                 if (inactive)
@@ -108 +110 @@
          */
         public void visit(Way w) {
+                if (w.incomplete) return;
+
                 Color wayColor;
                 if (inactive)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -132 +132 @@
                 Node minPrimitive = null;
                 for (Node n : Main.ds.nodes) {
-                        if (n.deleted)
+                        if (n.deleted || n.incomplete)
                                 continue;
                         Point sp = getPoint(n.eastNorth);

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -297 +297 @@
                         // nodes
                         for (Node n : Main.ds.nodes) {
-                                if (!n.deleted && r.contains(nc.getPoint(n.eastNorth)))
+                                if (!n.deleted && !n.incomplete && r.contains(nc.getPoint(n.eastNorth)))
                                         selection.add(n);
                         }
@@ -303 +303 @@
                         // ways
                         for (Way w : Main.ds.ways) {
-                                if (w.deleted || w.nodes.isEmpty())
+                                if (w.deleted || w.nodes.isEmpty() || w.incomplete)
                                                 continue;
                                 if (alt) {
                                         for (Node n : w.nodes) {
-                                                if (r.contains(nc.getPoint(n.eastNorth))) {
+                                                if (!n.incomplete && r.contains(nc.getPoint(n.eastNorth))) {
                                                         selection.add(w);
-                                                break;
+                                                        break;
+                                                }
                                         }
-                                }
                                 } else {
                                         boolean allIn = true;
                                         for (Node n : w.nodes) {
-                                                if (!r.contains(nc.getPoint(n.eastNorth))) {
+                                                if (!n.incomplete && !r.contains(nc.getPoint(n.eastNorth))) {
                                                         allIn = false;
                                                         break;
-                        }
-                }
+                                                }
+                                        }
                                         if (allIn) selection.add(w);
                                 }
-        }
+                        }
                 }
                 return selection;