Changeset 18088 in osm for applications/editors/josm/plugins/validator

Timestamp:

2009-10-11T18:22:56+02:00 (15 years ago)

Author:

stoecker

Message:

fixed josm 3574

Location:

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator

Files:

• Test.java (modified) (5 diffs)
• tests/UnclosedWays.java (modified) (3 diffs)
• tests/UntaggedWay.java (modified) (2 diffs)

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

@@ -8 +8 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -56 +58 @@
     /** Whether the test is run on a partial selection data */
     protected boolean partialSelection;
-    
+
     /** the progress monitor to use */
     protected ProgressMonitor progressMonitor;
+
+    /**
+     * the data structure with child->parent references
+     */
+    protected BackreferencedDataSet backreferenceDataSet;
 
     /**
@@ -93 +100 @@
      */
     public void startTest(ProgressMonitor progressMonitor) {
-        if (progressMonitor == null) {
-                this.progressMonitor = NullProgressMonitor.INSTANCE;
-        } else {
-                this.progressMonitor = progressMonitor;
-        }
-        this.progressMonitor.beginTask(tr("Running test {0}", name));
-        errors = new ArrayList<TestError>(30);
+        backreferenceDataSet = new BackreferencedDataSet(Main.main.getCurrentDataSet());
+        backreferenceDataSet.build();
+        if (progressMonitor == null) {
+                this.progressMonitor = NullProgressMonitor.INSTANCE;
+        } else {
+                this.progressMonitor = progressMonitor;
+        }
+        this.progressMonitor.beginTask(tr("Running test {0}", name));
+        errors = new ArrayList<TestError>(30);
     }
 
@@ -125 +134 @@
      */
     public void endTest() {
-        progressMonitor.finishTask();
-        progressMonitor = null;
+        progressMonitor.finishTask();
+        progressMonitor = null;
+        backreferenceDataSet = null;
     }
 
@@ -137 +147 @@
     public void visit(Collection<OsmPrimitive> selection)
     {
-        progressMonitor.setTicksCount(selection.size());
+        progressMonitor.setTicksCount(selection.size());
         for (OsmPrimitive p : selection) {
             if( p.isUsable() )

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

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -36 +37 @@
     @Override
     public void startTest(ProgressMonitor monitor) {
-        super.startTest(monitor);
+        super.startTest(monitor);
         _errorWays = new Bag<Way, Way>();
     }
@@ -108 +109 @@
         if (type != null && !w.isClosed())
         {
+            for (OsmPrimitive parent: this.backreferenceDataSet.getParents(w)) {
+                if (parent instanceof Relation && "multipolygon".equals(parent.get("type")))
+                    return;
+            }
             Node f = w.getNode(0);
             Node l = w.getNode(w.getNodesCount() - 1);

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

@@ -90 +90 @@
                     if( !hasName && !isRoundabout)
                         errors.add( new TestError(this, Severity.WARNING, tr("Unnamed ways"), UNNAMED_WAY, w) );
-                    else if(isRoundabout)
+                    else if(isRoundabout)
                         errors.add( new TestError(this, Severity.WARNING, tr("Unnamed junction"), UNNAMED_JUNCTION, w) );
                 }
@@ -115 +115 @@
     public void startTest(ProgressMonitor monitor)
     {
-        super.startTest(monitor);
+        super.startTest(monitor);
         multipolygonways = new LinkedList<Way>();
         for (final Relation r : Main.main.getCurrentDataSet().relations)