Ticket #13347: simplify_CrossingWays.patch

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

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.EastNorth;
@@ -40 +38 @@
 
     /** All way segments, grouped by cells */
     private final Map<Point2D, List<WaySegment>> cellSegments = new HashMap<>(1000);
-    /** The already detected errors */
-    private final Set<WaySegment> errorSegments = new HashSet<>();
     /** The already detected ways in error */
     private final Map<List<Way>, List<WaySegment>> seenWays = new HashMap<>(50);
 
@@ -188 +184 @@
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
         cellSegments.clear();
-        errorSegments.clear();
         seenWays.clear();
     }
 
@@ -196 +191 @@
     public void endTest() {
         super.endTest();
         cellSegments.clear();
-        errorSegments.clear();
         seenWays.clear();
     }
 
@@ -241 +235 @@
                     List<Way> prims;
                     List<WaySegment> highlight;
 
-                    if ((errorSegments.contains(es1) && errorSegments.contains(es2))
-                            || !es1.intersects(es2)
-                            || ignoreWaySegmentCombination(es1.way, es2.way)) {
+                    if (!es1.intersects(es2) || ignoreWaySegmentCombination(es1.way, es2.way)) {
                         continue;
                     }
 
@@ -278 +270 @@
      * @param n2 The second EastNorth
      * @return A list with all the cells the segment crosses
      */
-    public List<List<WaySegment>> getSegments(EastNorth n1, EastNorth n2) {
+    private List<List<WaySegment>> getSegments(EastNorth n1, EastNorth n2) {
 
         List<List<WaySegment>> cells = new ArrayList<>();
         for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.griddetail)) {