Changeset 4447 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

18.09.2011 21:07:26 (8 months ago)

Author:

simon04

Message:

fix #6799 - MultipolygonTest: wrong objects in unclosed relation

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• MultipolygonTest.java (modified) (2 diffs)
• UnclosedWays.java (modified) (2 diffs)

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

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -225 +226 @@
             }
 
+            List<Node> openNodes = new LinkedList<Node>();
             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))));
+                openNodes.add(w.get(0));
+                openNodes.add(w.get(w.size() - 1));
+            }
+            if (!openNodes.isEmpty()) {
+                List<OsmPrimitive> primitives = new LinkedList<OsmPrimitive>();
+                primitives.add(r);
+                primitives.addAll(openNodes);
+                Arrays.asList(openNodes, r);
+                errors.add(new TestError(this, Severity.WARNING, tr("Multipolygon is not closed"), NON_CLOSED_WAY,
+                        primitives, openNodes));
             }
 

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

@@ -6 +6 @@
 
 import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Arrays;
 
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -114 +112 @@
                     return;
             }
-            Node f = w.firstNode();
-            Node l = w.lastNode();
-
-            List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>();
-            List<OsmPrimitive> highlight = new ArrayList<OsmPrimitive>();
-            primitives.add(w);
-
-            // The important parts of an unclosed way are the first and
-            // the last node which should be connected, therefore we highlight them
-            highlight.add(f);
-            highlight.add(l);
 
             errors.add(new TestError(this, Severity.WARNING, tr("Unclosed way"),
-                            type, etype, mode, primitives, highlight));
+                    type, etype, mode,
+                    Arrays.asList(w),
+                    // The important parts of an unclosed way are the first and
+                    // the last node which should be connected, therefore we highlight them
+                    Arrays.asList(w.firstNode(), w.lastNode())));
         }
     }