eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-21 05:05:31 +00:00
Code Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Generic Wiki User
2023-07-11 15:48:19 +00:00
parent 393cf34960 c25fcd2759
commit f841f5529f
1 changed files with 1 additions and 6 deletions
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/ui/server/SailingServiceImpl.java
+1 -6
View File
@@ -2344,8 +2344,6 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
private void fillLeaderboardData(Leaderboard leaderboard, boolean withGeoLocationData, boolean withStatisticalData,
StrippedLeaderboardDTO leaderboardDTO) {
TimePoint startOfLatestRace = null;
Long delayToLiveInMillisForLatestRace = null;
leaderboardDTO.displayName = leaderboard.getDisplayName();
leaderboardDTO.competitorDisplayNames = new HashMap<>();
leaderboardDTO.competitorsCount = Util.size(leaderboard.getCompetitors());
@@ -2366,7 +2364,7 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
}
leaderboardDTO.courseAreas = new ArrayList<>();
Util.addAll(Util.map(leaderboard.getCourseAreas(), this::convertToCourseAreaDTO), leaderboardDTO.courseAreas);
leaderboardDTO.setDelayToLiveInMillisForLatestRace(delayToLiveInMillisForLatestRace);
leaderboardDTO.setDelayToLiveInMillisForLatestRace(leaderboard.getDelayToLiveInMillis());
leaderboardDTO.hasCarriedPoints = leaderboard.hasCarriedPoints();
if (leaderboard.getResultDiscardingRule() instanceof ThresholdBasedResultDiscardingRule) {
leaderboardDTO.discardThresholds = ((ThresholdBasedResultDiscardingRule) leaderboard.getResultDiscardingRule()).getDiscardIndexResultsStartingWithHowManyRaces();
@@ -2379,9 +2377,6 @@ public class SailingServiceImpl extends ResultCachingProxiedRemoteServiceServlet
RegattaAndRaceIdentifier raceIdentifier = null;
TrackedRace trackedRace = raceColumn.getTrackedRace(fleet);
if (trackedRace != null) {
if (startOfLatestRace == null || (trackedRace.getStartOfRace() != null && trackedRace.getStartOfRace().compareTo(startOfLatestRace) > 0)) {
delayToLiveInMillisForLatestRace = trackedRace.getDelayToLiveInMillis();
}
raceIdentifier = new RegattaNameAndRaceName(trackedRace.getTrackedRegatta().getRegatta().getName(), trackedRace.getRace().getName());
raceDTO = baseDomainFactory.createRaceDTO(getService(), withGeoLocationData, raceIdentifier, trackedRace);
if (withStatisticalData) {