From d07957882eaf29a8d1dc91ea3680ae7c793e73fa Mon Sep 17 00:00:00 2001 From: Kai Boernert Date: Tue, 13 Jun 2017 15:46:25 +0200 Subject: [PATCH] prerace logic moved to auotplayhelper --- .../gwt/autoplay/client/utils/AutoplayHelper.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java index 3e7d1fb3913..979e7f3190e 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java @@ -40,7 +40,9 @@ import com.sap.sse.gwt.client.player.Timer; import com.sap.sse.gwt.client.player.Timer.PlayModes; public class AutoplayHelper { + private static final long PRE_RACE_DELAY = 180000; private static final long WAIT_TIME_AFTER_END_OF_RACE_MIILIS = 60 * 1000; // 1 min + private static final RaceMapResources raceMapResources = GWT.create(RaceMapResources.class); private static RaceTimesInfoProvider raceTimesInfoProvider; private static Timer raceboardTimer = new Timer(PlayModes.Live, /* delayBetweenAutoAdvancesInMilliseconds */1000l); @@ -125,8 +127,11 @@ public class AutoplayHelper { .getTime() < raceTimes.endOfRace.getTime() + WAIT_TIME_AFTER_END_OF_RACE_MIILIS)) { long startTimeInMs = raceTimes.getStartOfRace().getTime(); long delayToLiveInMs = raceTimes.delayToLiveInMs; - return new Pair( - startTimeInMs - serverTimeDuringRequest.getTime() - delayToLiveInMs, raceIdentifier); + long startIn = startTimeInMs - serverTimeDuringRequest.getTime() - delayToLiveInMs; + if(startIn <= PRE_RACE_DELAY){ + return new Pair( + startIn, raceIdentifier); + } } } }