Changeset 4251 in josm for trunk/src/org

Timestamp:

2011-07-16T12:36:05+02:00 (13 years ago)

Author:

bastiK

Message:

applied #6598 - Parallelway mode reports wrong offset distance in statusline (patch by olejorgenb)

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

@@ -405 +405 @@
                 referenceSegment.getSecondNode().getEastNorth(), enp);
 
+        // Note: d is the distance in _projected units_
         double d = enp.distance(nearestPointOnRefLine);
+        double realD = mv.getProjection().eastNorth2latlon(enp).greatCircleDistance(mv.getProjection().eastNorth2latlon(nearestPointOnRefLine));
+        double snappedRealD = realD;
+        
         // TODO: abuse of isToTheRightSideOfLine function.
         boolean toTheRight = Geometry.isToTheRightSideOfLine(referenceSegment.getFirstNode(),
@@ -413 +417 @@
             // TODO: Very simple snapping
             // - Snap steps and/or threshold relative to the distance?
-            long closestWholeUnit = Math.round(d);
-            if (Math.abs(closestWholeUnit - d) < snapThreshold) {
-                d = closestWholeUnit;
+            long closestWholeUnit = Math.round(realD);
+            if (Math.abs(closestWholeUnit - realD) < snapThreshold) {
+                snappedRealD = closestWholeUnit;
             } else {
-                d = closestWholeUnit + Math.signum(closestWholeUnit - d) * -0.5;
+                snappedRealD = closestWholeUnit + Math.signum(closestWholeUnit - realD) * -0.5;
             }
         }
+        d = snappedRealD * (d/realD); // convert back to projected distance. (probably ok on small scales)
         helperLineStart = nearestPointOnRefLine;
         helperLineEnd = enp;
@@ -426 +431 @@
         }
         pWays.changeOffset(d);
-
-        Main.map.statusLine.setDist(Math.abs(d));
+        
+        Main.map.statusLine.setDist(Math.abs(snappedRealD));
         Main.map.statusLine.repaint();
         mv.repaint();