Changeset 4293 in josm for trunk/src

Timestamp:

2011-08-08T00:07:56+02:00 (13 years ago)

Author:

stoecker

Message:

fix #5467 - patch by simon04 - The validator doesn't show the last/first node of a broken Area

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -6 +6 @@
 import java.awt.geom.GeneralPath;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -26 +27 @@
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.xml.AreaPrototype;
 
 public class MultipolygonTest extends Test {
@@ -118 +118 @@
             for (ElemStyle s : styles.generateStyles(w, SCALE, null, false).a) {
                 if (s instanceof AreaElemStyle) {
-                    errors.add( new TestError(this, Severity.WARNING, tr("Area style way is not closed"), NOT_CLOSED,  w));
+                    List<Node> nodes = w.getNodes();
+                    errors.add(new TestError(this, Severity.WARNING, tr("Area style way is not closed"), NOT_CLOSED, 
+                            Collections.singletonList(w), Arrays.asList(nodes.get(0), nodes.get(nodes.size() - 1))));
                     break;
                 }
@@ -216 +218 @@
             }
 
-            if (!nonClosedWays.isEmpty()) {
-                errors.add(new TestError(this, Severity.WARNING, tr("Multipolygon is not closed"), NON_CLOSED_WAY,  Collections.singletonList(r), nonClosedWays));
+            for (List<Node> w : nonClosedWays) {
+                errors.add(new TestError(this, Severity.WARNING, tr("Multipolygon is not closed"), NON_CLOSED_WAY, 
+                        w, Arrays.asList(w.get(0), w.get(w.size() - 1))));
             }