Changeset 18962 in josm for trunk

Timestamp:

2024-01-30T10:53:13+01:00 (10 months ago)

Author:

GerdP

Message:

see #23397: Improve the results of partial validations

• don't call endTest() in static method CrossingWays.isSelfCrossing(), this fixes the failing unit test AlignInCircleActionTest

File:

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

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

@@ -310 +310 @@
     @Override
     public void endTest() {
-        final Collection<Way> selection;
-        if (this instanceof SelfCrossing || !partialSelection) {
-            selection = waysToTest;
-        } else {
-            selection = new HashSet<>();
-            DataSet ds = OsmDataManager.getInstance().getActiveDataSet();
-            if (ds != null) {
-                for (Way wt : waysToTest) {
-                    selection.addAll(ds.searchWays(wt.getBBox()).stream()
-                            .filter(w -> !w.isDeleted() && isPrimitiveUsable(w)).collect(Collectors.toList()));
-                    if (this instanceof CrossingWays.Boundaries) {
-                        List<Relation> relations = ds.searchRelations(wt.getBBox()).stream()
-                                .filter(p -> isPrimitiveUsable(p)).collect(Collectors.toList());
-                        for (Relation r: relations) {
-                            for (Way w : r.getMemberPrimitives(Way.class)) {
-                                if (!w.isIncomplete())
-                                    selection.add(w);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        for (Way w : selection) {
-            testWay(w);
-        }
+        runTest();
         // free storage
         cellSegments.clear();
@@ -345 +320 @@
     }
 
+    protected void runTest() {
+        final Collection<Way> selection;
+        if (this instanceof SelfCrossing || !partialSelection) {
+            selection = waysToTest;
+        } else {
+            selection = addNearbyObjects();
+        }
+        for (Way w : selection) {
+            testWay(w);
+        }
+
+    }
+
+    private Collection<Way> addNearbyObjects() {
+        final Collection<Way> selection = new HashSet<>();
+        DataSet ds = OsmDataManager.getInstance().getActiveDataSet();
+        if (ds != null) {
+            for (Way wt : waysToTest) {
+                selection.addAll(ds.searchWays(wt.getBBox()).stream()
+                        .filter(w -> !w.isDeleted() && isPrimitiveUsable(w)).collect(Collectors.toList()));
+                if (this instanceof CrossingWays.Boundaries) {
+                    List<Relation> relations = ds.searchRelations(wt.getBBox()).stream()
+                            .filter(p -> isPrimitiveUsable(p)).collect(Collectors.toList());
+                    for (Relation r: relations) {
+                        for (Way w : r.getMemberPrimitives(Way.class)) {
+                            if (!w.isIncomplete())
+                                selection.add(w);
+                        }
+                    }
+                }
+            }
+        }
+        return selection;
+    }
     static boolean isCoastline(OsmPrimitive w) {
         return w.hasTag("natural", "water", "coastline") || w.hasTag(LANDUSE, "reservoir");
@@ -521 +530 @@
         SelfCrossing test = new SelfCrossing();
         test.visit(way);
-        test.endTest();
+        test.runTest();
         return !test.getErrors().isEmpty();
     }