Allow Depart Early

Author: Roeterdink

Source/Orts.Simulation/Simulation/Physics/Train.cs

@@ -13255,6 +13255,7 @@ public bool CreateStationStop(int platformStartID, int arrivalTime, int departTi
                         false,
                         false,
                         false,
+                        false,
                         StationStop.STOPTYPE.STATION_STOP);
 
                 thisStation.arrivalDT = arrivalDT;
@@ -16065,6 +16066,7 @@ public StationStop CalculateStationStop(int platformStartID, int arrivalTime, in
                         false,
                         false,
                         false,
+                        false,
                         StationStop.STOPTYPE.STATION_STOP);
 
                 thisStation.arrivalDT = arrivalDT;
@@ -20565,6 +20567,7 @@ public enum STOPTYPE
             public bool RestrictPlatformToSignal = false;                                         // restrict end of platform to signal position
             public bool ExtendPlatformToSignal = false;                                           // extend end of platform to next signal position
             public bool EndStop = false;                                                          // train terminates at station
+            public bool AllowDepartEarly = false;                                                 // train may depart early if boarding is completed
             public List<int> ConnectionsWaiting = new List<int>();                                // List of trains waiting
             public Dictionary<int, int> ConnectionsAwaited = new Dictionary<int, int>();          // List of awaited trains : key = trainno., value = arr time
             public Dictionary<int, WaitInfo> ConnectionDetails = new Dictionary<int, WaitInfo>(); // Details of connection : key = trainno., value = wait info
@@ -20578,7 +20581,7 @@ public StationStop(int platformReference, PlatformDetails platformItem, int subr
                 int tcSectionIndex, int direction, int exitSignal, bool holdSignal, bool noWaitSignal, bool noClaimAllowed, float stopOffset,
                 int arrivalTime, int departTime, bool terminal, int? actualMinStopTime, float? keepClearFront, float? keepClearRear, 
                 bool forcePosition, bool closeupSignal, bool closeup,
-                bool restrictPlatformToSignal, bool extendPlatformToSignal, bool endStop, STOPTYPE actualStopType)
+                bool restrictPlatformToSignal, bool extendPlatformToSignal, bool endStop, bool allowdepartearly, STOPTYPE actualStopType)
             {
                 ActualStopType = actualStopType;
                 PlatformReference = platformReference;
@@ -20618,6 +20621,7 @@ public StationStop(int platformReference, PlatformDetails platformItem, int subr
                 RestrictPlatformToSignal = restrictPlatformToSignal;
                 ExtendPlatformToSignal = extendPlatformToSignal;
                 EndStop = endStop;
+                AllowDepartEarly = allowdepartearly;
 
                 CallOnAllowed = false;
             }
@@ -20732,6 +20736,7 @@ public StationStop(BinaryReader inf, Signals signalRef)
                 RestrictPlatformToSignal = inf.ReadBoolean();
                 ExtendPlatformToSignal = inf.ReadBoolean();
                 EndStop = inf.ReadBoolean();
+                AllowDepartEarly = inf.ReadBoolean();
             }
 
             //================================================================================================//
@@ -20855,6 +20860,7 @@ public void Save(BinaryWriter outf)
                 outf.Write(RestrictPlatformToSignal);
                 outf.Write(ExtendPlatformToSignal);
                 outf.Write(EndStop);
+                outf.Write(AllowDepartEarly);
             }
 
             /// <summary>
@@ -20877,6 +20883,20 @@ public int CalculateDepartTime(int presentTime, Train stoppedTrain)
                 int eightHundredHours = 8 * 3600;
                 int sixteenHundredHours = 16 * 3600;
 
+                int stopTime = 0;
+
+                // allow to depart early if set (timetable mode only, so no need to check for valid schedule)
+                if (AllowDepartEarly)
+                {
+                    stoppedTrain.ComputeTrainBoardingTime(this, ref stopTime);
+                    ActualDepart = ActualArrival + stopTime;
+
+                    // correct for times around midnight
+                    if (ActualDepart > 24 * 3600) ActualDepart -= 24 * 3600;
+                    if (DepartTime == 0) DepartTime = ActualDepart;
+                    return stopTime;
+                }
+
                 // preset depart to booked time
                 ActualDepart = DepartTime;
 
@@ -20891,7 +20911,8 @@ public int CalculateDepartTime(int presentTime, Train stoppedTrain)
                 }
 
                 // correct stop time for stop around midnight
-                int stopTime = DepartTime - ArrivalTime;
+                stopTime = DepartTime - ArrivalTime;
+                
                 if (DepartTime < eightHundredHours && ArrivalTime > sixteenHundredHours) // stop over midnight
                 {
                     stopTime += (24 * 3600);

Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs

@@ -3185,6 +3185,7 @@ public enum SignalHoldType
             public DateTime departureDT;
             public DateTime passDT;
             public bool arrdeppassvalid;
+            public bool allowDepartEarly;
             public SignalHoldType holdState;
             public bool noWaitSignal;
             //          public int passageTime;   // not yet implemented
@@ -3207,6 +3208,7 @@ public StopInfo(string name, string arrTime, string depTime, TimetableInfo ttinf
                 departureTime = -1;
                 passTime = -1;
                 Commands = null;
+                allowDepartEarly = false;
 
                 TimeSpan atime;
                 bool validArrTime = false;
@@ -3224,22 +3226,32 @@ public StopInfo(string name, string arrTime, string depTime, TimetableInfo ttinf
                         passDT = new DateTime(atime.Ticks);
                     }
                 }
+                if (arrTime.Contains("*"))
+                {
+                    allowDepartEarly = true;
+                    string arrivTime = arrTime.Replace('*', ':');
+                    validArrTime = TimeSpan.TryParse(arrivTime, out atime);
+                    if (validArrTime)
+                    {
+                        departureTime = arrivalTime = Convert.ToInt32(atime.TotalSeconds);
+                        departureDT = arrivalDT = new DateTime(atime.Ticks);
+                    }
+                }
                 else
                 {
-
                     validArrTime = TimeSpan.TryParse(arrTime, out atime);
                     if (validArrTime)
                     {
                         arrivalTime = Convert.ToInt32(atime.TotalSeconds);
                         arrivalDT = new DateTime(atime.Ticks);
                     }
-                }
 
-                validDepTime = TimeSpan.TryParse(depTime, out atime);
-                if (validDepTime)
-                {
-                    departureTime = Convert.ToInt32(atime.TotalSeconds);
-                    departureDT = new DateTime(atime.Ticks);
+                    validDepTime = TimeSpan.TryParse(depTime, out atime);
+                    if (validDepTime)
+                    {
+                        departureTime = Convert.ToInt32(atime.TotalSeconds);
+                        departureDT = new DateTime(atime.Ticks);
+                    }
                 }
 
                 arrdeppassvalid = (validArrTime || validDepTime);
@@ -3418,7 +3430,8 @@ public bool BuildStopInfo(TTTrain actTrain, int actPlatformID, Signals signalRef
 
                     // create station stop info
                     validStop = actTrain.CreateStationStop(actPlatformID, arrivalTime, departureTime, arrivalDT, departureDT, AITrain.clearingDistanceM,
-                        AITrain.minStopDistanceM, terminal, actMinStopTime,keepClearFront, keepClearRear, forcePosition, closeupSignal, closeup, restrictPlatformToSignal, extendPlatformToSignal, endStop);
+                        AITrain.minStopDistanceM, terminal, actMinStopTime,keepClearFront, keepClearRear, forcePosition, closeupSignal, closeup, restrictPlatformToSignal,
+                        extendPlatformToSignal, endStop, allowDepartEarly);
 
                     // override holdstate using stop info - but only if exit signal is defined
 

Source/Orts.Simulation/Simulation/Timetables/TTTrain.cs

@@ -1017,7 +1017,7 @@ public override StationStop SetAlternativeStationStop(StationStop orgStop, TCSub
                         StationStop newStop = CalculateStationStop(signalRef.PlatformDetailsList[altPlatformIndex].PlatformReference[0],
                         orgStop.ArrivalTime, orgStop.DepartTime, orgStop.arrivalDT, orgStop.departureDT, clearingDistanceM, minStopDistanceM,
                         orgStop.Terminal, orgStop.ActualMinStopTime, orgStop.KeepClearFront, orgStop.KeepClearRear, orgStop.ForcePosition,
-                        orgStop.CloseupSignal, orgStop.Closeup, orgStop.RestrictPlatformToSignal, orgStop.ExtendPlatformToSignal, orgStop.EndStop);
+                        orgStop.CloseupSignal, orgStop.Closeup, orgStop.RestrictPlatformToSignal, orgStop.ExtendPlatformToSignal, orgStop.EndStop, orgStop.AllowDepartEarly);
 
                         // add new holding signal if required
                         if (newStop.HoldSignal && newStop.ExitSignal >= 0)
@@ -1406,7 +1406,7 @@ public override bool PostInit()
 
         public StationStop CalculateStationStop(int platformStartID, int arrivalTime, int departTime, DateTime arrivalDT, DateTime departureDT, float clearingDistanceM,
             float minStopDistance, bool terminal, int? actMinStopTime, float? keepClearFront, float? keepClearRear, bool forcePosition, bool closeupSignal, 
-            bool closeup, bool restrictPlatformToSignal, bool extendPlatformToSignal, bool endStop)
+            bool closeup, bool restrictPlatformToSignal, bool extendPlatformToSignal, bool endStop, bool allowdepartearly)
         {
             int platformIndex;
             int activeSubroute = 0;
@@ -1491,6 +1491,7 @@ public StationStop CalculateStationStop(int platformStartID, int arrivalTime, in
                         restrictPlatformToSignal,
                         extendPlatformToSignal,
                         endStop,
+                        allowdepartearly,
                         StationStop.STOPTYPE.STATION_STOP);
 
                 thisStation.arrivalDT = arrivalDT;
@@ -2105,11 +2106,11 @@ public StationStop CalculateStationStopPosition(TCSubpathRoute thisRoute, int ro
         /// <returns></returns>
         public bool CreateStationStop(int platformStartID, int arrivalTime, int departTime, DateTime arrivalDT, DateTime departureDT, float clearingDistanceM,
             float minStopDistanceM, bool terminal, int? actMinStopTime, float? keepClearFront, float? keepClearRear, bool forcePosition, bool closeupSignal, 
-            bool closeup, bool restrictPlatformToSignal, bool extendPlatformToSignal, bool endStop)
+            bool closeup, bool restrictPlatformToSignal, bool extendPlatformToSignal, bool endStop, bool allowdepartearly)
         {
             StationStop thisStation = CalculateStationStop(platformStartID, arrivalTime, departTime, arrivalDT, departureDT, clearingDistanceM,
                 minStopDistanceM, terminal, actMinStopTime, keepClearFront, keepClearRear, forcePosition, closeupSignal, closeup,
-                restrictPlatformToSignal, extendPlatformToSignal, endStop);
+                restrictPlatformToSignal, extendPlatformToSignal, endStop, allowdepartearly);
 
             if (thisStation != null)
             {