eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-02 10:23:51 +00:00
Code Activity

I got rid of the isTurn method from the AbstractPosition

Browse Source
This commit is contained in:
I077899 committed 2013-03-22 14:11:07 +02:00
1 parent 012850ec68
commit 0adfb84db8
3 files changed
+15 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java
-14
View File
@@ -6,7 +6,6 @@ import com.sap.sailing.domain.common.impl.RadianPosition;
public class AbstractPosition implements Position {
private static final double TRESHOLD_DEGREES = 25.0;
private static final long serialVersionUID = -3057027562787541064L;
@Override
@@ -123,17 +122,4 @@ public class AbstractPosition implements Position {
public String toString() {
return "("+getLatDeg()+","+getLngDeg()+")";
}
@Override
public boolean isTurn(final Position previousPoint, final Position nextPoint) {
final Bearing b1 = previousPoint.getBearingGreatCircle(this);
final Bearing b2 = this.getBearingGreatCircle(nextPoint);
double diff = b1.getDifferenceTo(b2).getDegrees();
if (diff < 0) {
diff = 360 + diff;
}
return !((diff >= 0 && diff <= TRESHOLD_DEGREES) || (diff >= (180 - TRESHOLD_DEGREES) && diff <= (180 + TRESHOLD_DEGREES)) || (diff >= (360 - TRESHOLD_DEGREES) && diff <= 360));
}
}
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java
-5
View File
@@ -57,9 +57,4 @@ public interface Position extends Serializable {
* no solution, and a <code>NaN</code> or exception will result.
*/
Distance alongTrackDistance(Position p, Bearing bearing);
/**
* Returns true is the current position can be considered a turn comparing to the previous and the next one.
*/
boolean isTurn(Position previousPoint, Position nextPoint);
}
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathImpl.java
+15 -1
View File
@@ -24,6 +24,8 @@ import com.sap.sailing.simulator.windfield.WindField;
public class PathImpl implements Path, Serializable {
private static final double TRESHOLD_DEGREES = 25.0;
private static final long serialVersionUID = -6354445155884413937L;
List<TimedPositionWithSpeed> pathPoints;
WindField windField;
@@ -266,7 +268,7 @@ public class PathImpl implements Path, Serializable {
previousPoint = this.pathPoints.get(index - 1);
nextPoint = this.pathPoints.get(index + 1);
if (currentPoint.getPosition().isTurn(previousPoint.getPosition(), nextPoint.getPosition())) {
if (isTurn(currentPoint.getPosition(), previousPoint.getPosition(), nextPoint.getPosition())) {
list.add(currentPoint);
}
}
@@ -356,4 +358,16 @@ public class PathImpl implements Path, Serializable {
return true;
}
private static boolean isTurn(Position currentPosition, Position previousPoint, Position nextPoint) {
final Bearing b1 = previousPoint.getBearingGreatCircle(currentPosition);
final Bearing b2 = currentPosition.getBearingGreatCircle(nextPoint);
double diff = b1.getDifferenceTo(b2).getDegrees();
if (diff < 0) {
diff = 360 + diff;
}
return !((diff >= 0 && diff <= TRESHOLD_DEGREES) || (diff >= (180 - TRESHOLD_DEGREES) && diff <= (180 + TRESHOLD_DEGREES)) || (diff >= (360 - TRESHOLD_DEGREES) && diff <= 360));
}
}