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

Timestamp:

2019-10-16T09:32:07+02:00 (5 years ago)

Author:

GerdP

Message:

fix #18228: drastically improve performance of test "Unconnected highways" when long barriers are involved
Test 'Unconnected highways' completed in 25 ms
instead of
Test 'Unconnected highways' completed in 2.3 s
for example attached to #18228.

File:

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

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

@@ -13 +13 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -536 +537 @@
 
         private boolean barrierBetween(Node endnode) {
-            EastNorth closest = Geometry.closestPointToSegment(n1.getEastNorth(), n2.getEastNorth(), endnode.getEastNorth());
-            Node x = new Node();
-            x.setEastNorth(closest);
+            EastNorth en = endnode.getEastNorth();
+            EastNorth closest = Geometry.closestPointToSegment(n1.getEastNorth(), n2.getEastNorth(), en);
+            Node x = new Node(closest);
             BBox bbox = new BBox(endnode.getCoor(), x.getCoor());
-            for (Way nearbyWay: ds.searchWays(bbox)) {
-                if (nearbyWay != w && nearbyWay.isUsable() && nearbyWay.hasTag("barrier") && !endnode.getParentWays().contains(nearbyWay)) {
-                    //make sure that the barrier is really between the two nodes, not just close to them
-                    Way directWay = new Way();
-                    directWay.addNode(endnode);
-                    directWay.addNode(x);
-                    if (!Geometry.addIntersections(Arrays.asList(nearbyWay, directWay), true, new ArrayList<>()).isEmpty())
-                        return true;
+            for (Way nearbyWay : ds.searchWays(bbox)) {
+                if (nearbyWay != w && nearbyWay.isUsable() && nearbyWay.hasTag("barrier")
+                        && !endnode.getParentWays().contains(nearbyWay)) {
+                    //make sure that the barrier is really between endnode and the highway segment, not just close to or around them
+                    Iterator<Node> iter = nearbyWay.getNodes().iterator();
+                    EastNorth prev = iter.next().getEastNorth();
+                    while (iter.hasNext()) {
+                        EastNorth curr = iter.next().getEastNorth();
+                        if (Geometry.getSegmentSegmentIntersection(closest, en, prev, curr) != null) {
+                            return true;
+                        }
+                        prev = curr;
+                    }
                 }
             }