eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-08 20:12:23 +00:00
Code Activity

bug5073: fix for failing test case;

Browse Source 
a wrapper mark passing in place that has the correct time is now left untouched

Change-Id: I74643898b48a9ca8b374aab020b5efc3e40679b7
This commit is contained in:
Axel Uhl committed 2019-06-07 13:33:47 +02:00
1 parent 08e5aa286d
commit dbfe462fd0
1 file changed
+27 -9
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
+27 -9
View File
@@ -712,21 +712,39 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
} else {
foundFinishMarkPassing = true;
final MarkPassing finishMarkPassingToUse;
if (competitorResult != null && competitorResult.getFinishingTime() != null
&& (originalMarkPassing.getOriginal() == originalMarkPassing || !originalMarkPassing.getTimePoint().equals(competitorResult.getFinishingTime()))) {
// since we so far only have the original mark passing or a wrapper mark passing with an
// incorrect time point, we need to create a wrapper mark passing:
finishMarkPassingToUse = new MarkPassingFromRaceLogProvidedFinishingTimeImpl(
competitorResult.getFinishingTime(), finish, competitor,
originalMarkPassing.getOriginal());
logger.info(getRace().getName()+": Updating finish mark passing "+originalMarkPassing.getOriginal()+" to "+finishMarkPassingToUse);
neededToCreateOrUpdateFinishMarkPassing = true;
if (/* we have a result for the competitor */ competitorResult != null &&
/* the result has a valid finishing time */ competitorResult.getFinishingTime() != null) {
// we do have a competitor result with a valid finishing time; we shall have a wrapper mark
// passing that has the result's finishing time as its time point.
// If we already have a wrapper in place with the correct time, nothing needs to be done.
// If no wrapper is in place or a wrapper is in place but has the wrong time, a wrapper
// for the original is constructed with the time taken from the competitor result.
if (/* is it the original mark passing? */ originalMarkPassing.getOriginal() == originalMarkPassing ||
/* is the time incorrect? */ !originalMarkPassing.getTimePoint().equals(competitorResult.getFinishingTime())) {
// since we so far only have the original mark passing or a wrapper mark passing with an
// incorrect time point, we need to create a wrapper mark passing:
finishMarkPassingToUse = new MarkPassingFromRaceLogProvidedFinishingTimeImpl(
competitorResult.getFinishingTime(), finish, competitor,
originalMarkPassing.getOriginal());
logger.info(getRace().getName()+": Updating finish mark passing "+originalMarkPassing.getOriginal()+" to "+finishMarkPassingToUse);
neededToCreateOrUpdateFinishMarkPassing = true;
} else {
// the finish mark passing already is a wrapper with the correct time; no action is required:
assert originalMarkPassing.getOriginal() != originalMarkPassing;
assert originalMarkPassing.getTimePoint().equals(competitorResult.getFinishingTime());
finishMarkPassingToUse = originalMarkPassing;
neededToCreateOrUpdateFinishMarkPassing = false;
}
} else {
// we don't have a result for the competitor, or we do have a result but the finishing time is null;
// use the original mark passing (null, if none exists) and flag the change in case it is a change
finishMarkPassingToUse = originalMarkPassing.getOriginal();
if (finishMarkPassingToUse != originalMarkPassing) {
logger.info(getRace().getName()+": Reverting race log-based finish mark passing "+originalMarkPassing+" to "+finishMarkPassingToUse+
" because no finishing time found anymore for that competitor in race log");
neededToCreateOrUpdateFinishMarkPassing = true;
} else {
neededToCreateOrUpdateFinishMarkPassing = false;
}
}
if (finishMarkPassingToUse != null) {