java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/IncrementalManeuverDetectorImpl.java
... ...
@@ -10,6 +10,7 @@ import java.util.stream.Collectors;
10 10
import com.sap.sailing.domain.base.Competitor;
11 11
import com.sap.sailing.domain.common.NauticalSide;
12 12
import com.sap.sailing.domain.common.Wind;
13
+import com.sap.sailing.domain.common.WindSourceType;
13 14
import com.sap.sailing.domain.common.tracking.GPSFixMoving;
14 15
import com.sap.sailing.domain.maneuverdetection.ApproximatedFixesCalculator;
15 16
import com.sap.sailing.domain.maneuverdetection.IncrementalApproximatedFixesCalculator;
... ...
@@ -257,7 +258,8 @@ public class IncrementalManeuverDetectorImpl extends ManeuverDetectorImpl implem
257 258
// maneuver spot calculation => recalculate maneuvers of existing maneuver curve
258 259
CompleteManeuverCurve maneuverCurve = currentExistingManeuverSpot.getManeuverCurve();
259 260
WindMeasurement windMeasurement = currentExistingManeuverSpot.getWindMeasurement();
260
- Wind wind = trackedRace.getWind(windMeasurement.getPosition(), windMeasurement.getTimePoint());
261
+ Wind wind = trackedRace.getWind(windMeasurement.getPosition(), windMeasurement.getTimePoint(),
262
+ /* exclude */ trackedRace.getWindSources(WindSourceType.MANEUVER_BASED_ESTIMATION));
261 263
List<Maneuver> maneuvers = determineManeuversFromManeuverCurve(maneuverCurve.getMainCurveBoundaries(),
262 264
maneuverCurve.getManeuverCurveWithStableSpeedAndCourseBoundaries(), wind,
263 265
maneuverCurve.getMarkPassing());
java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorImpl.java
... ...
@@ -19,6 +19,7 @@ import com.sap.sailing.domain.common.Position;
19 19
import com.sap.sailing.domain.common.SpeedWithBearing;
20 20
import com.sap.sailing.domain.common.Tack;
21 21
import com.sap.sailing.domain.common.Wind;
22
+import com.sap.sailing.domain.common.WindSourceType;
22 23
import com.sap.sailing.domain.common.tracking.GPSFixMoving;
23 24
import com.sap.sailing.domain.maneuverdetection.ApproximatedFixesCalculator;
24 25
import com.sap.sailing.domain.maneuverdetection.ManeuverDetector;
... ...
@@ -321,7 +322,8 @@ public class ManeuverDetectorImpl extends AbstractManeuverDetectorImpl {
321 322
}
322 323
TimePoint maneuverTimePoint = maneuverCurve.getMainCurveBoundaries().getTimePoint();
323 324
Position maneuverPosition = track.getEstimatedPosition(maneuverTimePoint, /* extrapolate */false);
324
- final Wind wind = trackedRace.getWind(maneuverPosition, maneuverTimePoint);
325
+ final Wind wind = trackedRace.getWind(maneuverPosition, maneuverTimePoint,
326
+ /* exclude */ trackedRace.getWindSources(WindSourceType.MANEUVER_BASED_ESTIMATION));
325 327
List<Maneuver> maneuvers = determineManeuversFromManeuverCurve(maneuverCurve.getMainCurveBoundaries(),
326 328
maneuverCurve.getManeuverCurveWithStableSpeedAndCourseBoundaries(), wind,
327 329
maneuverCurve.getMarkPassing());
java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverDetectorWithEstimationDataSupportDecoratorImpl.java
... ...
@@ -12,6 +12,7 @@ import com.sap.sailing.domain.common.ManeuverType;
12 12
import com.sap.sailing.domain.common.Position;
13 13
import com.sap.sailing.domain.common.SpeedWithBearing;
14 14
import com.sap.sailing.domain.common.Wind;
15
+import com.sap.sailing.domain.common.WindSourceType;
15 16
import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl;
16 17
import com.sap.sailing.domain.common.tracking.GPSFixMoving;
17 18
import com.sap.sailing.domain.maneuverdetection.CompleteManeuverCurveWithEstimationData;
... ...
@@ -74,7 +75,8 @@ public class ManeuverDetectorWithEstimationDataSupportDecoratorImpl
74 75
TimePoint maneuverTimePoint = maneuverCurve.getMainCurveBoundaries().getTimePoint();
75 76
Position maneuverPosition = maneuverDetector.track.getEstimatedPosition(maneuverTimePoint,
76 77
/* extrapolate */false);
77
- Wind wind = maneuverDetector.trackedRace.getWind(maneuverPosition, maneuverTimePoint);
78
+ Wind wind = maneuverDetector.trackedRace.getWind(maneuverPosition, maneuverTimePoint,
79
+ /* exclude */ maneuverDetector.trackedRace.getWindSources(WindSourceType.MANEUVER_BASED_ESTIMATION));
78 80
maneuvers
79 81
.addAll(maneuverDetector.determineManeuversFromManeuverCurve(maneuverCurve.getMainCurveBoundaries(),
80 82
maneuverCurve.getManeuverCurveWithStableSpeedAndCourseBoundaries(), wind,