Merge branch 'bug6209' into bug5959

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java

@@ -87,7 +87,7 @@ public class ManeuverDetectionOnMdM2011SemifinalTest extends OnlineTracTracBased
         // at 13:35:54 with a much smaller jibing angle while the maneuver before which otherwise is grouped into the jibe then is
         // only a bearing away by a lot.
         assertManeuver(maneuvers, ManeuverType.JIBE, Tack.PORT, new MillisecondsTimePoint(c.getTime()), /* tolerance in milliseconds */ 10000);
-        c.set(2011, 10-1, 30, 13, 36, 49);
+        c.set(2011, 10-1, 30, 13, 36, 50);
         assertManeuver(maneuvers, ManeuverType.JIBE, Tack.STARBOARD, new MillisecondsTimePoint(c.getTime()), /* tolerance in milliseconds */ 3000);
     }
 

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CourseChangeBasedTrackApproximation.java

@@ -187,10 +187,8 @@ public class CourseChangeBasedTrackApproximation implements Serializable, GPSTra
         private GPSFixMoving addOldEnoughFix(GPSFixMoving next) {
             assert window.isEmpty() || !next.getTimePoint().before(window.peekFirst().getTimePoint());
             final GPSFixMoving result;
-            final SpeedWithBearing nextSpeed = /* TODO this was the original code that can depend on fixes newer than next: */ next.isEstimatedSpeedCached() ? next.getCachedEstimatedSpeed() : track.getEstimatedSpeed(next.getTimePoint());
-//                                               next.getSpeed();
-            int TODO; // TODO bug6209: try without dependency on newer fixes and see if it helps produce equal results for early/late initialization
-            if (nextSpeed != null) { // TODO bug6209: this gets messy... if we drop a fix because no estimated speed can be determined for it, and later fix additions may change this, where would we get this fix from again?
+            final SpeedWithBearing nextSpeed = next.isEstimatedSpeedCached() ? next.getCachedEstimatedSpeed() : track.getEstimatedSpeed(next.getTimePoint());
+            if (nextSpeed != null) {
                 numberOfFixesAdded++;
                 int insertPosition = window.size();
                 GPSFixMoving previous;