eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 22:43:57 +00:00
Code Activity

Changed calculation of toTimePoint for loading wind because it now can

Browse Source 
be called if no TrackedRace is available
This commit is contained in:
Steffen Schaefer committed 2017-05-30 10:28:02 +02:00
1 parent 49160e3c30
commit 5aae6fa38a
1 file changed
+19 -15
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/RaceContext.java
+19 -15
View File
@@ -172,17 +172,19 @@ public class RaceContext {
/**
* Determines the end of the interval for which to compute wind data for the race. Usually, this will be the
* {@link TrackedRace#getEndOfRace() end of the race}; however, if this time point is not (yet) known, e.g., during
* {@link getFinishTime() end of the race}; however, if this time point is not (yet) known, e.g., during
* a live race that is still ongoing, instead the current time point minus the live delay is chosen. If, however,
* the {@link TrackedRace#getTimePointOfNewestEvent() the race's newest event} is older than this time point,
* the time point of the race's newest event is used.
*/
private TimePoint getWindToTimePoint() {
TimePoint toTimePoint = trackedRace.getEndOfRace() == null ? MillisecondsTimePoint.now().minus(
trackedRace.getDelayToLiveInMillis()) : trackedRace.getEndOfRace();
TimePoint newestEvent = trackedRace.getTimePointOfNewestEvent();
if (newestEvent != null && newestEvent.before(toTimePoint)) {
toTimePoint = newestEvent;
final TimePoint finishTime = getFinishTime();
TimePoint toTimePoint = finishTime == null ? getLiveTimePoint() : finishTime;
if(trackedRace != null) {
TimePoint newestEvent = trackedRace.getTimePointOfNewestEvent();
if (newestEvent != null && newestEvent.before(toTimePoint)) {
toTimePoint = newestEvent;
}
}
return toTimePoint;
}
@@ -344,9 +346,7 @@ public class RaceContext {
raceListRaceDTO.setWindSourcesCount(getWindSourceCount());
raceListRaceDTO.setVideoCount(getVideoCount());
raceListRaceDTO.setAudioCount(getAudioCount());
if (trackedRace != null) {
raceListRaceDTO.setWind(RaceWindCalculator.getWindStatisticsOrNull(trackedRace,getWindToTimePoint(),getStartTime(),raceLog));
}
raceListRaceDTO.setWind(RaceWindCalculator.getWindStatisticsOrNull(trackedRace,getWindToTimePoint(),getStartTime(),raceLog));
return raceListRaceDTO;
}
return null;
@@ -387,12 +387,16 @@ public class RaceContext {
}
private TimePoint getLiveTimePoint() {
return new MillisecondsTimePoint(getLiveTimePointInMillis());
}
private long getLiveTimePointInMillis() {
final Long liveDelay = leaderboard.getDelayToLiveInMillis();
return System.currentTimeMillis() - (liveDelay == null ? 0l : liveDelay);
final TimePoint liveTimePoint;
if (trackedRace != null) {
liveTimePoint = MillisecondsTimePoint.now().minus(
trackedRace.getDelayToLiveInMillis());
} else {
final Long liveDelay = leaderboard.getDelayToLiveInMillis();
long liveTimePointInMillis = System.currentTimeMillis() - (liveDelay == null ? 0l : liveDelay);
liveTimePoint = new MillisecondsTimePoint(liveTimePointInMillis);
}
return liveTimePoint;
}
private SimpleCompetitorDTO getWinnerOrNull() {