Changeset 12941 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-10-08T11:28:05+02:00 (7 years ago)

Author:

GerdP

Message:

fix #14766 - Self-intersection check not working for multipolygons

The test failed to detect self-intersecting rings formed by multiple ways.
This is now handled. Single self-intersecting ways are still only handled by SelfIntersectingWay to avoind duplicate warnings for the same issue.

File:

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

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

@@ -277 +277 @@
             for (int i = 0; i < allPolygons.size(); i++) {
                 PolyData pd1 = allPolygons.get(i);
+                checkPolygonForSelfIntersection(r, pd1);
                 for (int j = i + 1; j < allPolygons.size(); j++) {
                     PolyData pd2 = allPolygons.get(j);
@@ -296 +297 @@
             // now we can calculate the nesting level to verify the roles with some simple node checks
             checkRoles(r, allPolygons, wayMap, sharedNodes);
+        }
+    }
+
+    /**
+     * Check if a polygon ring is self-intersecting when the ring was build from multiple ways.
+     * An self intersection in a single way is checked in {@link SelfIntersectingWay}.
+     * @param r the relation
+     * @param pd the ring
+     */
+    private void checkPolygonForSelfIntersection(Relation r, PolyData pd) {
+        if (pd.getWayIds().size() == 1)
+            return;
+        List<Node> wayNodes = pd.getNodes();
+        int num = wayNodes.size();
+        Set<Node> nodes = new HashSet<>();
+        Node firstNode = wayNodes.get(0);
+        nodes.add(firstNode);
+        List<Node> isNodes = new ArrayList<>();
+        for (int i = 1; i < num - 1; i++) {
+            Node n = wayNodes.get(i);
+            if (nodes.contains(n)) {
+                isNodes.add(n);
+            } else {
+                nodes.add(n);
+            }
+        }
+        if (!isNodes.isEmpty()) {
+            List<OsmPrimitive> prims = new ArrayList<>();
+            prims.add(r);
+            prims.addAll(isNodes);
+            errors.add(TestError.builder(this, Severity.WARNING, CROSSING_WAYS)
+                    .message(tr("Self-intersecting polygon ring"))
+                    .primitives(prims)
+                    .highlight(isNodes)
+                    .build());
+
         }
     }