Changeset 5583 in osm

Timestamp:

2007-11-18T19:11:52+01:00 (17 years ago)

Author:

gabriel

Message:

validator plugin: check for incomplete objects.

Location:

applications/editors/josm/plugins

Files:

• dist/validator.jar (modified) ( previous)
• validator/src/org/openstreetmap/josm/plugins/validator/Test.java (modified) (1 diff)
• validator/src/org/openstreetmap/josm/plugins/validator/TestError.java (modified) (1 diff)
• validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java (modified) (1 diff)
• validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java (modified) (1 diff)
• validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java (modified) (1 diff)
• validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java (modified) (1 diff)
• validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java (modified) (1 diff)
• validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java (modified) (2 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Test.java

@@ -123 +123 @@
         for (OsmPrimitive p : selection)
         {
-                if( !p.deleted )
+                if( !p.deleted || !p.incomplete )
                         p.visit(this);
         }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/TestError.java

@@ -201 +201 @@
         for( OsmPrimitive p : primitives)
         {
-            if( !p.deleted )
+            if( !p.deleted || !p.incomplete )
                 p.visit(v);
         }

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java

@@ -52 +52 @@
         public void visit(Way w) 
         {
-        if( w.deleted )
+        if( w.deleted || w.incomplete )
             return;
         

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java

@@ -51 +51 @@
         public void visit(Way w) 
         {
-        if( w.deleted )
+        if( w.deleted || w.incomplete )
             return;
         

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java

@@ -119 +119 @@
                 // merge and replace them with the 'target' node
                 for (Way w : Main.ds.ways) {
-                        if (w.deleted) continue;
+                        if (w.deleted || w.incomplete) continue;
                         // FIXME: use some fancy method from java.util.Collections and
                         // List.replace

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java

@@ -19 +19 @@
 
         @Override public void visit(Way w) {
-                if (w.deleted) return;
+                if (w.deleted || w.incomplete) return;
 
                 Node lastN = null;

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java

@@ -52 +52 @@
         public void visit(Way w) 
         {
-        if( w.deleted )
+        if( w.deleted || w.incomplete )
             return;
         

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java

@@ -50 +50 @@
                 if (partialSelection) {
                         for (OsmPrimitive p : selection) {
-                                if (!p.deleted && p instanceof Node) {
+                                if (!p.deleted && !p.incomplete && p instanceof Node) {
                                         p.visit(this);
                                 }
@@ -59 +59 @@
                 } else {
                         for (OsmPrimitive p : selection) {
-                                if (!p.deleted) {
+                                if (!p.deleted && !p.incomplete) {
                                         p.visit(this);
                                 }