From c2448932b8d01ca7b78298bb2da14b1ec73c4d20 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 7 Nov 2013 13:53:23 +0100 Subject: [PATCH] adjusted getDistanceToLine and corresponding test so that they use absoluteCrossTrackError instead of crossTrackError --- .../src/com/sap/sailing/domain/common/AbstractPosition.java | 2 +- .../src/com/sap/sailing/domain/test/PositionTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java index 506eaf0d64a..47911abb4c8 100755 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java @@ -151,7 +151,7 @@ public class AbstractPosition implements Position { if (toRight > 90) { distance = this.getDistance(right); } else { - distance = this.crossTrackError(left, left.getBearingGreatCircle(right)); + distance = this.absoluteCrossTrackError(left, left.getBearingGreatCircle(right)); } } // Right now this always returns a positiv value. It might be possible to change it so that the sign indicates diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java index 70624fbff71..80d2a06458e 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PositionTest.java @@ -231,7 +231,7 @@ public class PositionTest { Position p4 = new DegreePosition(5, 0); Position p5 = new DegreePosition(2, 2); Position p6 = new DegreePosition(0, -2); - assertEquals(p2.getDistanceToLine(left, right).getMeters(), Math.abs(p2.crossTrackError(left, left.getBearingGreatCircle(right)).getMeters()), delta); + assertEquals(p2.getDistanceToLine(left, right).getMeters(), p2.absoluteCrossTrackError(left, left.getBearingGreatCircle(right)).getMeters(), delta); assertEquals(p3.getDistanceToLine(left, right).getMeters(), p3.getDistance(left).getMeters(), delta); assertEquals(p4.getDistanceToLine(left, right).getMeters(), p4.getDistance(right).getMeters(), delta); assertEquals(p5.getDistanceToLine(left, right).getMeters(), p5.getDistance(right).getMeters(), delta);