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

bug5606: making the leaderboard parameter required for producing the new attribute values

Browse Source
This commit is contained in:
Axel Uhl
2021-07-28 00:24:53 +09:00
parent 93d7162604
commit b71441eb8b
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/MarkPassingsJsonSerializer.java
+11 -3
View File
@@ -6,6 +6,7 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
import java.util.NavigableSet;
import java.util.Set;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
@@ -117,9 +118,16 @@ public class MarkPassingsJsonSerializer extends AbstractTrackedRaceDataJsonSeria
if (leaderboard != null) {
final Pair<RaceColumn, Fleet> raceColumnAndFleet = leaderboard.getRaceColumnAndFleet(trackedRace);
if (raceColumnAndFleet != null) {
markPassingJson.put(TOTAL_POINTS, leaderboard.getTotalPoints(competitor, raceColumnAndFleet.getA(), markPassing.getTimePoint()));
markPassingJson.put(NET_POINTS, leaderboard.getNetPoints(competitor, raceColumnAndFleet.getA(), markPassing.getTimePoint()));
markPassingJson.put(MAX_POINTS_REASON, leaderboard.getMaxPointsReason(competitor, raceColumnAndFleet.getA(), markPassing.getTimePoint()));
final TimePoint markPassingTimePoint = markPassing.getTimePoint();
final LeaderboardDTOCalculationReuseCache cacheForMarkPassingTimePoint = new LeaderboardDTOCalculationReuseCache(markPassingTimePoint);
final Double totalPoints = leaderboard.getTotalPoints(
competitor, raceColumnAndFleet.getA(), markPassingTimePoint, cacheForMarkPassingTimePoint);
markPassingJson.put(TOTAL_POINTS, totalPoints);
final Set<RaceColumn> discards = leaderboard.getResultDiscardingRule().getDiscardedRaceColumns(competitor, leaderboard,
leaderboard.getRaceColumns(), markPassingTimePoint, cacheForMarkPassingTimePoint);
markPassingJson.put(NET_POINTS, leaderboard.getNetPoints(competitor, raceColumnAndFleet.getA(), markPassingTimePoint,
discards, ()->totalPoints));
markPassingJson.put(MAX_POINTS_REASON, leaderboard.getMaxPointsReason(competitor, raceColumnAndFleet.getA(), markPassingTimePoint));
}
}
}