Changeset 18961 in josm for trunk/src/org

Timestamp:

2024-01-30T10:28:35+01:00 (5 months ago)

Author:

GerdP

Message:

see #23397: Improve the results of partial validations

• correct last minute change so that it doesn't use empty collection to filter irrelevant warnings
• correct usage of isPrimitiveUsable() so that CrossingWays.Boundaries works again (old unit test failed)
• add unit tests to check partial validation of DuplicateWay and CrossingWays gives expected results

File:

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

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

@@ -317 +317 @@
             DataSet ds = OsmDataManager.getInstance().getActiveDataSet();
             if (ds != null) {
-                for (Way w: waysToTest) {
-                    selection.addAll(ds.searchWays(w.getBBox()));
+                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) {
-            if (!w.isDeleted() && isPrimitiveUsable(w)) {
-                testWay(w);
-            }
+            testWay(w);
         }
         // free storage
         cellSegments.clear();
         seenWays.clear();
-        waysToTest.clear();
         if (partialSelection)
             removeIrrelevantErrors(waysToTest);
+        waysToTest.clear();
         super.endTest();
     }