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

Timestamp:

2016-08-15T14:24:27+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13347 - simplify CrossingWays test (patch by Gerd Petermann)

File:

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

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

@@ -8 +8 @@
 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;
@@ -41 +39 @@
     /** 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);
@@ -189 +185 @@
         super.startTest(monitor);
         cellSegments.clear();
-        errorSegments.clear();
         seenWays.clear();
     }
@@ -197 +192 @@
         super.endTest();
         cellSegments.clear();
-        errorSegments.clear();
         seenWays.clear();
     }
@@ -242 +236 @@
                     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;
                     }
@@ -279 +271 @@
      * @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<>();