Changeset 407 in josm

Timestamp:

2007-10-19T13:50:36+02:00 (17 years ago)

Author:

gebner

Message:

Add incompleteness checks.

Location:

trunk

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/build.xml

@@ -31 +31 @@
 
                 <!-- create josm-custom.jar -->
+                <delete file="dist/josm-custom.jar"/>
                 <jar destfile="dist/josm-custom.jar" basedir="build">
                         <manifest>

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -80 +80 @@
                 HashSet<Relation> relationsUsingWays = new HashSet<Relation>();
                 for (Relation r : Main.ds.relations) {
-                        if (r.deleted) continue;
+                        if (r.deleted || r.incomplete) continue;
                         for (RelationMember rm : r.members) {
                                 if (rm.member instanceof Way) {

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

@@ -46 +46 @@
         public void visit(Node n) {
                 for (Way w : ds.ways) {
-                        if (w.deleted)
-                                continue;
+                        if (w.deleted || w.incomplete) continue;
                         for (Node n2 : w.nodes) {
                                 if (n == n2) {

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

@@ -157 +157 @@
                 TreeMap<Double, List<WaySegment>> nearest = new TreeMap<Double, List<WaySegment>>();
                 for (Way w : Main.ds.ways) {
-                        if (w.deleted)
-                                continue;
+                        if (w.deleted || w.incomplete) continue;
                         Node lastN = null;
                         int i = -2;
                         for (Node n : w.nodes) {
                                 i++;
-                                if (n.deleted) continue;
+                                if (n.deleted || n.incomplete) continue;
                                 if (lastN == null) {
                                         lastN = n;
@@ -261 +260 @@
                 Collection<OsmPrimitive> nearest = new HashSet<OsmPrimitive>();
                         for (Way w : Main.ds.ways) {
-                        if (w.deleted) continue;
+                        if (w.deleted || w.incomplete) continue;
                         Node lastN = null;
                         for (Node n : w.nodes) {
-                                if (n.deleted) continue;
+                                if (n.deleted || n.incomplete) continue;
                                 if (lastN == null) {
                                         lastN = n;
@@ -283 +282 @@
                         }
                 for (Node n : Main.ds.nodes) {
-                        if (!n.deleted && getPoint(n.eastNorth).distanceSq(p) < 100) {
+                        if (!n.deleted && !n.incomplete
+                                        && getPoint(n.eastNorth).distanceSq(p) < 100) {
                                 nearest.add(n);
                         }

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -484 +484 @@
                 TreeMap<Relation, Collection<String>> roles = new TreeMap<Relation, Collection<String>>();
                 for (Relation r : Main.ds.relations) {
-                        if (!r.deleted) {
+                        if (!r.deleted && !r.incomplete) {
                                 for (RelationMember m : r.members) {
                                         if (newSelection.contains(m.member)) {

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -123 +123 @@
                 int i = 0;
                 for (Relation e : Main.ds.relations) {
-                        if (!e.deleted)
+                        if (!e.deleted && !e.incomplete)
                                 list.setElementAt(e, i++);
                 }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -195 +195 @@
         @Override public void visitBoundingBox(final BoundingXYVisitor v) {
                 for (final Node n : data.nodes)
-                        if (!n.deleted)
+                        if (!n.deleted && !n.incomplete)
                                 v.visit(n);
         }