Changeset 334 in josm for branch

Timestamp:

2007-09-27T02:23:27+02:00 (17 years ago)

Author:

framm

Message:

• fixed bug in getNearestWaySegment that led to strange results when ignore list was populated

File:

• branch/0.5/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (1 diff)

branch/0.5/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -168 +168 @@
                                         continue;
                                 }
-                                if (ignore != null && ignore.contains(new WaySegment(w, i))) {
-                                        continue;
-                                }
-                                Point A = getPoint(lastN.eastNorth);
-                                Point B = getPoint(n.eastNorth);
-                                double c = A.distanceSq(B);
-                                double a = p.distanceSq(B);
-                                double b = p.distanceSq(A);
-                                double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
-                                if (perDist < 100 && minDistanceSq > perDist && a < c+100 && b < c+100) {
-                                        minDistanceSq = perDist;
-                                        minPrimitive = w;
-                                        minI = i;
+                                if (ignore == null || !ignore.contains(new WaySegment(w, i))) {
+                                        Point A = getPoint(lastN.eastNorth);
+                                        Point B = getPoint(n.eastNorth);
+                                        double c = A.distanceSq(B);
+                                        double a = p.distanceSq(B);
+                                        double b = p.distanceSq(A);
+                                        double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
+                                        if (perDist < 100 && minDistanceSq > perDist && a < c+100 && b < c+100) {
+                                                minDistanceSq = perDist;
+                                                minPrimitive = w;
+                                                minI = i;
+                                        }
                                 }
                                 lastN = n;