Merge remote-tracking branch 'origin/master' into bug3401_yachtscoring

# Conflicts:
#	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch

java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/RecordCompetitorGPSFix.java

@@ -33,7 +33,7 @@ public class RecordCompetitorGPSFix extends AbstractRaceOperation<Void> {
     public Void internalApplyTo(RacingEventService toState) throws Exception {
         DynamicTrackedRace trackedRace = (DynamicTrackedRace) toState.getTrackedRace(getRaceIdentifier());
         Competitor competitor = trackedRace.getRace().getCompetitorById(competitorID);
-        trackedRace.recordFix(competitor, gpsFix);
+        trackedRace.recordFix(competitor, gpsFix, /* onlyWhenInTrackingTimeInterval */ false); // record the fix in any case
         return null;
     }
 

java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/RecordMarkGPSFixForExistingTrack.java

@@ -32,7 +32,7 @@ public class RecordMarkGPSFixForExistingTrack extends RecordMarkGPSFix {
     public Void internalApplyTo(RacingEventService toState) throws Exception {
         DynamicTrackedRace trackedRace = getTrackedRace(toState);
         Mark mark = getMarkById(trackedRace);
-        trackedRace.recordFix(mark, getFix());
+        trackedRace.recordFix(mark, getFix(), /* onlyWhenInTrackingTimeInterval */ false); // record the fix in any case
         return null;
     }
 

java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/RecordMarkGPSFixForNewMarkTrack.java

@@ -25,7 +25,7 @@ public class RecordMarkGPSFixForNewMarkTrack extends RecordMarkGPSFix {
     @Override
     public Void internalApplyTo(RacingEventService toState) throws Exception {
         DynamicTrackedRace trackedRace = getTrackedRace(toState);
-        trackedRace.recordFix(mark, getFix());
+        trackedRace.recordFix(mark, getFix(), /* onlyWhenInTrackingTimeInterval */ false); // record the fix in any case
         return null;
     }
 }

java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/RecordWindFix.java

@@ -17,7 +17,7 @@ public class RecordWindFix extends AbstractWindOperation {
     @Override
     public Void internalApplyTo(RacingEventService toState) throws Exception {
         DynamicTrackedRace trackedRace = (DynamicTrackedRace) toState.getTrackedRace(getRaceIdentifier());
-        trackedRace.recordWind(getWind(), getWindSource());
+        trackedRace.recordWind(getWind(), getWindSource(), /* applyFilter */ false);
         return null;
     }