Merge pull request #412 from Sharpe49/tcs-speed-post-features

cjakeman · web-flow · commit a41612493217 · 2021-08-15T16:25:12.000+01:00
New TCS function to get speed post information (including warning speed posts) https://trello.com/c/S38d2RoV/482-further-tcs-handles-related-to-signals-and-sound-events
diff --git a/Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs b/Source/Orts.Simulation/Common/Scripting/TrainControlSystem.cs
@@ -118,6 +118,12 @@ public abstract class TrainControlSystem : AbstractTrainScriptClass
         /// </summary>
         public Func<string, int, float, SignalFeatures> NextGenericSignalFeatures;
         /// <summary>
+        /// Features of next speed post
+        /// int: position of speed post in the speed post sequence along the train route, starting from train front; 0 for first speed post;
+        /// float: max testing distance
+        /// </summary>
+        public Func<int, float, SpeedPostFeatures> NextSpeedPostFeatures;
+        /// <summary>
         /// Next normal signal has a repeater head
         /// </summary>
         public Func<bool> DoesNextNormalSignalHaveRepeaterHead;
@@ -690,6 +696,24 @@ public SignalFeatures(string mainHeadSignalTypeName, Aspect aspect, float distan
         }
     }
 
+    public struct SpeedPostFeatures
+    {
+        public readonly string SpeedPostTypeName;
+        public readonly bool IsWarning;
+        public readonly float DistanceM;
+        public readonly float SpeedLimitMpS;
+        public readonly float AltitudeM;
+
+        public SpeedPostFeatures(string speedPostTypeName, bool isWarning, float distanceM, float speedLimitMpS, float altitudeM)
+        {
+            SpeedPostTypeName = speedPostTypeName;
+            IsWarning = isWarning;
+            DistanceM = distanceM;
+            SpeedLimitMpS = speedLimitMpS;
+            AltitudeM = altitudeM;
+        }
+    }
+
     public struct TunnelInfo
     {
         /// <summary>
diff --git a/Source/Orts.Simulation/Orts.Simulation.csproj b/Source/Orts.Simulation/Orts.Simulation.csproj
@@ -146,6 +146,7 @@
     <Compile Include="Simulation\Signalling\CsSignalScripts.cs" />
     <Compile Include="Simulation\Signalling\Signals.cs" />
     <Compile Include="Simulation\Signalling\SIGSCRfile.cs" />
+    <Compile Include="Simulation\Signalling\SpeedPostWorldObject.cs" />
     <Compile Include="Simulation\Simulator.cs" />
     <Compile Include="Simulation\SuperElevation.cs" />
     <Compile Include="Simulation\Timetables\PoolInfo.cs" />
diff --git a/Source/Orts.Simulation/Simulation/AIs/AITrain.cs b/Source/Orts.Simulation/Simulation/AIs/AITrain.cs
@@ -41,6 +41,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using Event = Orts.Common.Event;
 
 namespace Orts.Simulation.AIs
@@ -1164,7 +1165,7 @@ public void CheckSignalObjects()
             float validSpeed = AllowedMaxSpeedMpS;
             List<ObjectItemInfo> processedList = new List<ObjectItemInfo>();
 
-            foreach (ObjectItemInfo thisInfo in SignalObjectItems)
+            foreach (ObjectItemInfo thisInfo in SignalObjectItems.Where(item => !item.speed_isWarning))
             {
 
                 // check speedlimit
diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/Source/Orts.Simulation/Simulation/Physics/Train.cs
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/TrainControlSystem.cs
@@ -1,4 +1,4 @@
-﻿// COPYRIGHT 2013, 2014 by the Open Rails project.
+﻿// COPYRIGHT 2021 by the Open Rails project.
 // 
 // This file is part of Open Rails.
 // 
@@ -21,16 +21,15 @@
 using Orts.Common;
 using Orts.Parsers.Msts;
 using Orts.Simulation.Physics;
-using Orts.Simulation.Signalling;
 using Orts.Simulation.RollingStocks.SubSystems.PowerSupplies;
 using ORTS.Common;
 using ORTS.Scripting.Api;
+using ORTS.Scripting.Api.ETCS;
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
-using ORTS.Scripting.Api.ETCS;
 
 namespace Orts.Simulation.RollingStocks.SubSystems
 {
@@ -288,6 +287,7 @@ public void Initialize()
                 Script.NextGenericSignalDistanceM = (string type) =>
                     NextGenericSignalItem<float>(0, ref ItemDistance, GenericItemDistance, Train.TrainObjectItem.TRAINOBJECTTYPE.SIGNAL, type);
                 Script.NextGenericSignalFeatures = (arg1, arg2, arg3) => NextGenericSignalFeatures(arg1, arg2, arg3, Train.TrainObjectItem.TRAINOBJECTTYPE.SIGNAL);
+                Script.NextSpeedPostFeatures = (arg1, arg2) => NextSpeedPostFeatures(arg1, arg2);
                 Script.DoesNextNormalSignalHaveRepeaterHead = () => DoesNextNormalSignalHaveRepeaterHead();
                 Script.CurrentPostSpeedLimitMpS = () => Locomotive.Train.allowedMaxSpeedLimitMpS;
                 Script.NextPostSpeedLimitMpS = (value) => NextGenericSignalItem<float>(value, ref ItemSpeedLimit, float.MaxValue, Train.TrainObjectItem.TRAINOBJECTTYPE.SPEEDPOST);
@@ -625,7 +625,7 @@ SignalFeatures NextGenericSignalFeatures(string signalTypeName, int itemSequence
             }
             else if (type == Train.TrainObjectItem.TRAINOBJECTTYPE.SPEEDPOST)
             {
-                var playerTrainSpeedpostList = Locomotive.Train.PlayerTrainSpeedposts[dir];
+                var playerTrainSpeedpostList = Locomotive.Train.PlayerTrainSpeedposts[dir].Where(x => !x.IsWarning).ToList();
                 if (itemSequenceIndex > playerTrainSpeedpostList.Count - 1)
                     goto Exit; // no n-th speedpost available
                 var trainSpeedpost = playerTrainSpeedpostList[itemSequenceIndex];
@@ -642,6 +642,43 @@ SignalFeatures NextGenericSignalFeatures(string signalTypeName, int itemSequence
                 altitudeM: altitudeM, textAspect: textAspect);
         }
 
+        SpeedPostFeatures NextSpeedPostFeatures(int itemSequenceIndex, float maxDistanceM)
+        {
+            var speedPostTypeName = "";
+            var isWarning = false;
+            var distanceM = float.MaxValue;
+            var speedLimitMpS = -1f;
+            var altitudeM = float.MinValue;
+
+            int dir = Locomotive.Train.MUDirection == Direction.Reverse ? 1 : 0;
+
+            if (Locomotive.Train.ValidRoute[dir] == null || dir == 1 && Locomotive.Train.PresentPosition[dir].TCSectionIndex < 0)
+                goto Exit;
+
+            int index = dir == 0 ? Locomotive.Train.PresentPosition[dir].RouteListIndex :
+                Locomotive.Train.ValidRoute[dir].GetRouteIndex(Locomotive.Train.PresentPosition[dir].TCSectionIndex, 0);
+            if (index < 0)
+                goto Exit;
+
+            var playerTrainSpeedpostList = Locomotive.Train.PlayerTrainSpeedposts[dir];
+            if (itemSequenceIndex > playerTrainSpeedpostList.Count - 1)
+                goto Exit; // no n-th speedpost available
+            var trainSpeedpost = playerTrainSpeedpostList[itemSequenceIndex];
+            if (trainSpeedpost.DistanceToTrainM > maxDistanceM)
+                goto Exit; // the requested speedpost is too distant
+
+            // All OK, we can retrieve the data for the required speedpost;
+            speedPostTypeName = Path.GetFileNameWithoutExtension(trainSpeedpost.SignalObject.SpeedPostWorldObject?.SFileName);
+            isWarning = trainSpeedpost.IsWarning;
+            distanceM = trainSpeedpost.DistanceToTrainM;
+            speedLimitMpS = trainSpeedpost.AllowedSpeedMpS;
+            altitudeM = trainSpeedpost.SignalObject.tdbtraveller.Y;
+
+        Exit:
+            return new SpeedPostFeatures(speedPostTypeName: speedPostTypeName, isWarning: isWarning, distanceM: distanceM, speedLimitMpS: speedLimitMpS,
+                altitudeM: altitudeM);
+        }
+
         private bool DoesNextNormalSignalHaveRepeaterHead()
         {
             var signal = Locomotive.Train.NextSignalObject[Locomotive.Train.MUDirection == Direction.Reverse ? 1 : 0];
diff --git a/Source/Orts.Simulation/Simulation/Signalling/Signals.cs b/Source/Orts.Simulation/Simulation/Signalling/Signals.cs
@@ -68,6 +68,8 @@ public class Signals
         private List<SignalWorldObject> SignalWorldList = new List<SignalWorldObject>();
         private Dictionary<uint, SignalRefObject> SignalRefList;
         private Dictionary<uint, SignalObject> SignalHeadList;
+        private List<SpeedPostWorldObject> SpeedPostWorldList = new List<SpeedPostWorldObject>();
+        private Dictionary<int, int> SpeedPostRefList = new Dictionary<int, int>();
         public static SIGSCRfile scrfile;
         public static CsSignalScripts CsSignalScripts;
         public int ORTSSignalTypeCount { get; private set; }
@@ -467,6 +469,7 @@ private void BuildSignalWorld(Simulator simulator, SignalConfigurationFile sigcf
 
             var Tokens = new List<TokenID>();
             Tokens.Add(TokenID.Signal);
+            Tokens.Add(TokenID.Speedpost);
             Tokens.Add(TokenID.Platform);
 
             // loop through files, use only extention .w, skip w+1000000+1000000.w file
@@ -538,7 +541,19 @@ private void BuildSignalWorld(Simulator simulator, SignalConfigurationFile sigcf
                             }
                         }
                     }
-                    else  if (worldObject.GetType() == typeof(PlatformObj))
+                    else if (worldObject is SpeedPostObj speedPostObj)
+                    {
+                        SpeedPostWorldList.Add(new SpeedPostWorldObject(speedPostObj));
+                        int thisSpeedPostId = SpeedPostWorldList.Count() - 1;
+                        foreach(TrItemId trItemId in speedPostObj.trItemIDList)
+                        {
+                            if (!SpeedPostRefList.ContainsKey(trItemId.dbID))
+                            {
+                                SpeedPostRefList.Add(trItemId.dbID, thisSpeedPostId);
+                            }
+                        }
+                    }
+                    else if (worldObject.GetType() == typeof(PlatformObj))
                     {
                         var thisWorldObj = worldObject as PlatformObj;
                         if (!PlatformSidesList.ContainsKey(thisWorldObj.trItemIDList[0].dbID)) PlatformSidesList.Add(thisWorldObj.trItemIDList[0].dbID, thisWorldObj.PlatformData);
@@ -633,7 +648,7 @@ private void BuildSignalList(TrItem[] TrItems, TrackNode[] trackNodes, TrackSect
                     else if (trItem.ItemType == TrItem.trItemType.trSPEEDPOST)
                     {
                         SpeedPostItem Speedpost = (SpeedPostItem)trItem;
-                        if (Speedpost.IsLimit)
+                        if (!Speedpost.IsMilePost)
                         {
                             noSignals++;
                         }
@@ -981,15 +996,14 @@ private void ScanSection(TrItem[] TrItems, TrackNode[] trackNodes, int index,
                         else if (TrItems[TDBRef].ItemType == TrItem.trItemType.trSPEEDPOST)
                         {
                             SpeedPostItem speedItem = (SpeedPostItem)TrItems[TDBRef];
-                            if (speedItem.IsLimit)
+                            if (!speedItem.IsMilePost)
                             {
                                 speedItem.SigObj = foundSignals;
 
                                 lastSignal = AddSpeed(index, i, speedItem, TDBRef, tsectiondat, tdbfile, ORTSSignalTypeCount);
                                 speedItem.SigObj = lastSignal;
-
                             }
-                            else if (speedItem.IsMilePost)
+                            else
                             {
                                 speedItem.SigObj = foundMileposts;
                                 lastMilepost = AddMilepost(index, i, speedItem, TDBRef, tsectiondat, tdbfile);
@@ -1231,22 +1245,39 @@ private void AddWorldInfo()
             {
                 if (signal != null)
                 {
-                    foreach (SignalHead head in signal.SignalHeads)
+                    if (signal.isSignal)
                     {
+                        foreach (SignalHead head in signal.SignalHeads)
+                        {
 
-                        // get reference using TDB index from head
+                            // get reference using TDB index from head
 
-                        uint TDBRef = Convert.ToUInt32(head.TDBIndex);
-                        SignalRefObject thisRef;
+                            uint TDBRef = Convert.ToUInt32(head.TDBIndex);
+                            SignalRefObject thisRef;
 
-                        if (SignalRefList.TryGetValue(TDBRef, out thisRef))
+                            if (SignalRefList.TryGetValue(TDBRef, out thisRef))
+                            {
+                                uint signalIndex = thisRef.SignalWorldIndex;
+                                if (signal.WorldObject == null)
+                                {
+                                    signal.WorldObject = SignalWorldList[(int)signalIndex];
+                                }
+                                SignalRefList.Remove(TDBRef);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        SignalHead head = signal.SignalHeads[0];
+                        int speedPostIndex;
+
+                        if (SpeedPostRefList.TryGetValue(head.TDBIndex, out speedPostIndex))
                         {
-                            uint signalIndex = thisRef.SignalWorldIndex;
-                            if (signal.WorldObject == null)
+                            if (signal.SpeedPostWorldObject == null)
                             {
-                                signal.WorldObject = SignalWorldList[(int)signalIndex];
+                                signal.SpeedPostWorldObject = SpeedPostWorldList[speedPostIndex];
                             }
-                            SignalRefList.Remove(TDBRef);
+                            SpeedPostRefList.Remove(head.TDBIndex);
                         }
                     }
                 }
@@ -8351,6 +8382,7 @@ public enum HoldState                // signal is locked in hold
         public static TrackNode[] trackNodes;
         public static TrItem[] trItems;
         public SignalWorldObject WorldObject;   // Signal World Object information
+        public SpeedPostWorldObject SpeedPostWorldObject; // Speed Post World Object information
 
         public int trackNode;                   // Track node which contains this signal
         public int trRefIndex;                  // Index to TrItemRef within Track Node 
@@ -9205,7 +9237,7 @@ public MstsSignalAspect this_sig_lr(int fn_type, ref bool sigfound)
         public ObjectSpeedInfo this_sig_speed(MstsSignalFunction fn_type)
         {
             var sigAsp = MstsSignalAspect.STOP;
-            var set_speed = new ObjectSpeedInfo(-1, -1, false, false, 0);
+            var set_speed = new ObjectSpeedInfo(-1, -1, false, false, 0, false);
 
             foreach (SignalHead sigHead in SignalHeads)
             {
@@ -9363,14 +9395,14 @@ public int SpeedPostType()
 
         public ObjectSpeedInfo this_lim_speed(MstsSignalFunction fn_type)
         {
-            var set_speed = new ObjectSpeedInfo(9E9f, 9E9f, false, false, 0);
+            var set_speed = new ObjectSpeedInfo(9E9f, 9E9f, false, false, 0, false);
 
             foreach (SignalHead sigHead in SignalHeads)
             {
                 if (sigHead.sigFunction == fn_type)
                 {
                     ObjectSpeedInfo this_speed = sigHead.speed_info[(int)sigHead.state];
-                    if (this_speed != null)
+                    if (this_speed != null && !this_speed.speed_isWarning)
                     {
                         if (this_speed.speed_pass > 0 && this_speed.speed_pass < set_speed.speed_pass)
                         {
@@ -12806,7 +12838,7 @@ public SignalHead(SignalObject sigOoject, int trItem, int TDBRef, SpeedPostItem
 
             float passSpeed = speedItem.IsPassenger ? speedMpS : -1;
             float freightSpeed = speedItem.IsFreight ? speedMpS : -1;
-            ObjectSpeedInfo speedinfo = new ObjectSpeedInfo(passSpeed, freightSpeed, false, false, speedItem is TempSpeedPostItem? (speedMpS == 999f? 2 : 1) : 0);
+            ObjectSpeedInfo speedinfo = new ObjectSpeedInfo(passSpeed, freightSpeed, false, false, speedItem is TempSpeedPostItem? (speedMpS == 999f? 2 : 1) : 0, speedItem.IsWarning);
             speed_info[(int)state] = speedinfo;
         }
 
@@ -12837,7 +12869,7 @@ public void SetSignalType(TrItem[] TrItems, SignalConfigurationFile sigCFG)
                 foreach (SignalAspect thisAspect in signalType.Aspects)
                 {
                     int arrindex = (int)thisAspect.Aspect;
-                    speed_info[arrindex] = new ObjectSpeedInfo(thisAspect.SpeedMpS, thisAspect.SpeedMpS, thisAspect.Asap, thisAspect.Reset, thisAspect.NoSpeedReduction? 1 : 0);
+                    speed_info[arrindex] = new ObjectSpeedInfo(thisAspect.SpeedMpS, thisAspect.SpeedMpS, thisAspect.Asap, thisAspect.Reset, thisAspect.NoSpeedReduction? 1 : 0, false);
                 }
 
                 // set normal subtype
@@ -13558,7 +13590,8 @@ public enum ObjectItemFindState
         public int speed_flag;
         public int speed_reset;
         // for signals: if = 1 no speed reduction; for speedposts: if = 0 standard; = 1 start of temp speedreduction post; = 2 end of temp speed reduction post
-        public int speed_noSpeedReductionOrIsTempSpeedReduction; 
+        public int speed_noSpeedReductionOrIsTempSpeedReduction;
+        public bool speed_isWarning;
         public float actual_speed;                   // set active by TRAIN
 
         public bool processed;                       // for AI trains, set active by TRAIN
@@ -13597,6 +13630,7 @@ public ObjectItemInfo(SignalObject thisObject, float distance)
                 speed_flag = speed_info.speed_flag;
                 speed_reset = speed_info.speed_reset;
                 speed_noSpeedReductionOrIsTempSpeedReduction = speed_info.speed_noSpeedReductionOrIsTempSpeedReduction;
+                speed_isWarning = speed_info.speed_isWarning;
             }
         }
 
@@ -13622,19 +13656,21 @@ public class ObjectSpeedInfo
         public int speed_flag;
         public int speed_reset;
         public int speed_noSpeedReductionOrIsTempSpeedReduction;
+        public bool speed_isWarning;
 
         //================================================================================================//
         /// <summary>
         /// Constructor
         /// </summary>
 
-        public ObjectSpeedInfo(float pass, float freight, bool asap, bool reset, int nospeedreductionOristempspeedreduction)
+        public ObjectSpeedInfo(float pass, float freight, bool asap, bool reset, int nospeedreductionOristempspeedreduction, bool isWarning)
         {
             speed_pass = pass;
             speed_freight = freight;
             speed_flag = asap ? 1 : 0;
             speed_reset = reset ? 1 : 0;
             speed_noSpeedReductionOrIsTempSpeedReduction = nospeedreductionOristempspeedreduction;
+            speed_isWarning = isWarning;
         }
     }
 
diff --git a/Source/Orts.Simulation/Simulation/Signalling/SpeedPostWorldObject.cs b/Source/Orts.Simulation/Simulation/Signalling/SpeedPostWorldObject.cs
@@ -0,0 +1,16 @@
+﻿using Orts.Formats.Msts;
+using System.IO;
+
+namespace Orts.Simulation.Signalling
+{
+    public class SpeedPostWorldObject
+    {
+        public string SFileName { get; }
+
+        public SpeedPostWorldObject(SpeedPostObj speedPostItem)
+        {
+            // get filename in Uppercase
+            SFileName = Path.GetFileName(speedPostItem.FileName).ToUpperInvariant();
+        }
+    }
+}
diff --git a/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs b/Source/RunActivity/Viewer3D/Popups/TrackMonitorWindow.cs
@@ -908,7 +908,7 @@ int drawSpeedpost(SpriteBatch spriteBatch, Point offset, int startObjectArea, in
 
                 var labelPoint = new Point(offset.X + speedTextOffset, offset.Y + newLabelPosition + textOffset[forward ? 0 : 1]);
                 var speedString = FormatStrings.FormatSpeedLimitNoUoM(allowedSpeed, metric);
-                Font.Draw(spriteBatch, labelPoint, speedString, thisItem.SpeedObjectType == Train.TrainObjectItem.SpeedItemType.Standard ? Color.White :
+                Font.Draw(spriteBatch, labelPoint, speedString, thisItem.SpeedObjectType == Train.TrainObjectItem.SpeedItemType.Standard ? (thisItem.IsWarning ? Color.Yellow : Color.White) :
                     (thisItem.SpeedObjectType == Train.TrainObjectItem.SpeedItemType.TempRestrictedStart ? Color.Red : Color.LightGreen));
 
                 if (itemOffset < firstLabelPosition && !firstLabelShown)

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ public class Signals`
`68`	`68`	`private List<SignalWorldObject> SignalWorldList = new List<SignalWorldObject>();`
`69`	`69`	`private Dictionary<uint, SignalRefObject> SignalRefList;`
`70`	`70`	`private Dictionary<uint, SignalObject> SignalHeadList;`
	`71`	`+ private List<SpeedPostWorldObject> SpeedPostWorldList = new List<SpeedPostWorldObject>();`
	`72`	`+ private Dictionary<int, int> SpeedPostRefList = new Dictionary<int, int>();`
`71`	`73`	`public static SIGSCRfile scrfile;`
`72`	`74`	`public static CsSignalScripts CsSignalScripts;`
`73`	`75`	`public int ORTSSignalTypeCount { get; private set; }`
`@@ -467,6 +469,7 @@ private void BuildSignalWorld(Simulator simulator, SignalConfigurationFile sigcf`
`467`	`469`
`468`	`470`	`var Tokens = new List<TokenID>();`
`469`	`471`	`Tokens.Add(TokenID.Signal);`
	`472`	`+ Tokens.Add(TokenID.Speedpost);`
`470`	`473`	`Tokens.Add(TokenID.Platform);`
`471`	`474`
`472`	`475`	`// loop through files, use only extention .w, skip w+1000000+1000000.w file`
`@@ -538,7 +541,19 @@ private void BuildSignalWorld(Simulator simulator, SignalConfigurationFile sigcf`
`538`	`541`	`}`
`539`	`542`	`}`
`540`	`543`	`}`
`541`		`- else if (worldObject.GetType() == typeof(PlatformObj))`
	`544`	`+ else if (worldObject is SpeedPostObj speedPostObj)`
	`545`	`+ {`
	`546`	`+ SpeedPostWorldList.Add(new SpeedPostWorldObject(speedPostObj));`
	`547`	`+ int thisSpeedPostId = SpeedPostWorldList.Count() - 1;`
	`548`	`+ foreach(TrItemId trItemId in speedPostObj.trItemIDList)`
	`549`	`+ {`
	`550`	`+ if (!SpeedPostRefList.ContainsKey(trItemId.dbID))`
	`551`	`+ {`
	`552`	`+ SpeedPostRefList.Add(trItemId.dbID, thisSpeedPostId);`
	`553`	`+ }`
	`554`	`+ }`
	`555`	`+ }`
	`556`	`+ else if (worldObject.GetType() == typeof(PlatformObj))`
`542`	`557`	`{`
`543`	`558`	`var thisWorldObj = worldObject as PlatformObj;`
`544`	`559`	`if (!PlatformSidesList.ContainsKey(thisWorldObj.trItemIDList[0].dbID)) PlatformSidesList.Add(thisWorldObj.trItemIDList[0].dbID, thisWorldObj.PlatformData);`
`@@ -633,7 +648,7 @@ private void BuildSignalList(TrItem[] TrItems, TrackNode[] trackNodes, TrackSect`
`633`	`648`	`else if (trItem.ItemType == TrItem.trItemType.trSPEEDPOST)`
`634`	`649`	`{`
`635`	`650`	`SpeedPostItem Speedpost = (SpeedPostItem)trItem;`
`636`		`- if (Speedpost.IsLimit)`
	`651`	`+ if (!Speedpost.IsMilePost)`
`637`	`652`	`{`
`638`	`653`	`noSignals++;`
`639`	`654`	`}`
`@@ -981,15 +996,14 @@ private void ScanSection(TrItem[] TrItems, TrackNode[] trackNodes, int index,`
`981`	`996`	`else if (TrItems[TDBRef].ItemType == TrItem.trItemType.trSPEEDPOST)`
`982`	`997`	`{`
`983`	`998`	`SpeedPostItem speedItem = (SpeedPostItem)TrItems[TDBRef];`
`984`		`- if (speedItem.IsLimit)`
	`999`	`+ if (!speedItem.IsMilePost)`
`985`	`1000`	`{`
`986`	`1001`	`speedItem.SigObj = foundSignals;`
`987`	`1002`
`988`	`1003`	`lastSignal = AddSpeed(index, i, speedItem, TDBRef, tsectiondat, tdbfile, ORTSSignalTypeCount);`
`989`	`1004`	`speedItem.SigObj = lastSignal;`
`990`		`-`
`991`	`1005`	`}`
`992`		`- else if (speedItem.IsMilePost)`
	`1006`	`+ else`
`993`	`1007`	`{`
`994`	`1008`	`speedItem.SigObj = foundMileposts;`
`995`	`1009`	`lastMilepost = AddMilepost(index, i, speedItem, TDBRef, tsectiondat, tdbfile);`
`@@ -1231,22 +1245,39 @@ private void AddWorldInfo()`
`1231`	`1245`	`{`
`1232`	`1246`	`if (signal != null)`
`1233`	`1247`	`{`
`1234`		`- foreach (SignalHead head in signal.SignalHeads)`
	`1248`	`+ if (signal.isSignal)`
`1235`	`1249`	`{`
	`1250`	`+ foreach (SignalHead head in signal.SignalHeads)`
	`1251`	`+ {`
`1236`	`1252`
`1237`		`- // get reference using TDB index from head`
	`1253`	`+ // get reference using TDB index from head`
`1238`	`1254`
`1239`		`- uint TDBRef = Convert.ToUInt32(head.TDBIndex);`
`1240`		`- SignalRefObject thisRef;`
	`1255`	`+ uint TDBRef = Convert.ToUInt32(head.TDBIndex);`
	`1256`	`+ SignalRefObject thisRef;`
`1241`	`1257`
`1242`		`- if (SignalRefList.TryGetValue(TDBRef, out thisRef))`
	`1258`	`+ if (SignalRefList.TryGetValue(TDBRef, out thisRef))`
	`1259`	`+ {`
	`1260`	`+ uint signalIndex = thisRef.SignalWorldIndex;`
	`1261`	`+ if (signal.WorldObject == null)`
	`1262`	`+ {`
	`1263`	`+ signal.WorldObject = SignalWorldList[(int)signalIndex];`
	`1264`	`+ }`
	`1265`	`+ SignalRefList.Remove(TDBRef);`
	`1266`	`+ }`
	`1267`	`+ }`
	`1268`	`+ }`
	`1269`	`+ else`
	`1270`	`+ {`
	`1271`	`+ SignalHead head = signal.SignalHeads[0];`
	`1272`	`+ int speedPostIndex;`
	`1273`	`+`
	`1274`	`+ if (SpeedPostRefList.TryGetValue(head.TDBIndex, out speedPostIndex))`
`1243`	`1275`	`{`
`1244`		`- uint signalIndex = thisRef.SignalWorldIndex;`
`1245`		`- if (signal.WorldObject == null)`
	`1276`	`+ if (signal.SpeedPostWorldObject == null)`
`1246`	`1277`	`{`
`1247`		`- signal.WorldObject = SignalWorldList[(int)signalIndex];`
	`1278`	`+ signal.SpeedPostWorldObject = SpeedPostWorldList[speedPostIndex];`
`1248`	`1279`	`}`
`1249`		`- SignalRefList.Remove(TDBRef);`
	`1280`	`+ SpeedPostRefList.Remove(head.TDBIndex);`
`1250`	`1281`	`}`
`1251`	`1282`	`}`
`1252`	`1283`	`}`
`@@ -8351,6 +8382,7 @@ public enum HoldState // signal is locked in hold`
`8351`	`8382`	`public static TrackNode[] trackNodes;`
`8352`	`8383`	`public static TrItem[] trItems;`
`8353`	`8384`	`public SignalWorldObject WorldObject; // Signal World Object information`
	`8385`	`+ public SpeedPostWorldObject SpeedPostWorldObject; // Speed Post World Object information`
`8354`	`8386`
`8355`	`8387`	`public int trackNode; // Track node which contains this signal`
`8356`	`8388`	`public int trRefIndex; // Index to TrItemRef within Track Node`
`@@ -9205,7 +9237,7 @@ public MstsSignalAspect this_sig_lr(int fn_type, ref bool sigfound)`
`9205`	`9237`	`public ObjectSpeedInfo this_sig_speed(MstsSignalFunction fn_type)`
`9206`	`9238`	`{`
`9207`	`9239`	`var sigAsp = MstsSignalAspect.STOP;`
`9208`		`- var set_speed = new ObjectSpeedInfo(-1, -1, false, false, 0);`
	`9240`	`+ var set_speed = new ObjectSpeedInfo(-1, -1, false, false, 0, false);`
`9209`	`9241`
`9210`	`9242`	`foreach (SignalHead sigHead in SignalHeads)`
`9211`	`9243`	`{`
`@@ -9363,14 +9395,14 @@ public int SpeedPostType()`
`9363`	`9395`
`9364`	`9396`	`public ObjectSpeedInfo this_lim_speed(MstsSignalFunction fn_type)`
`9365`	`9397`	`{`
`9366`		`- var set_speed = new ObjectSpeedInfo(9E9f, 9E9f, false, false, 0);`
	`9398`	`+ var set_speed = new ObjectSpeedInfo(9E9f, 9E9f, false, false, 0, false);`
`9367`	`9399`
`9368`	`9400`	`foreach (SignalHead sigHead in SignalHeads)`
`9369`	`9401`	`{`
`9370`	`9402`	`if (sigHead.sigFunction == fn_type)`
`9371`	`9403`	`{`
`9372`	`9404`	`ObjectSpeedInfo this_speed = sigHead.speed_info[(int)sigHead.state];`
`9373`		`- if (this_speed != null)`
	`9405`	`+ if (this_speed != null && !this_speed.speed_isWarning)`
`9374`	`9406`	`{`
`9375`	`9407`	`if (this_speed.speed_pass > 0 && this_speed.speed_pass < set_speed.speed_pass)`
`9376`	`9408`	`{`
`@@ -12806,7 +12838,7 @@ public SignalHead(SignalObject sigOoject, int trItem, int TDBRef, SpeedPostItem`
`12806`	`12838`
`12807`	`12839`	`float passSpeed = speedItem.IsPassenger ? speedMpS : -1;`
`12808`	`12840`	`float freightSpeed = speedItem.IsFreight ? speedMpS : -1;`
`12809`		`- ObjectSpeedInfo speedinfo = new ObjectSpeedInfo(passSpeed, freightSpeed, false, false, speedItem is TempSpeedPostItem? (speedMpS == 999f? 2 : 1) : 0);`
	`12841`	`+ ObjectSpeedInfo speedinfo = new ObjectSpeedInfo(passSpeed, freightSpeed, false, false, speedItem is TempSpeedPostItem? (speedMpS == 999f? 2 : 1) : 0, speedItem.IsWarning);`
`12810`	`12842`	`speed_info[(int)state] = speedinfo;`
`12811`	`12843`	`}`
`12812`	`12844`
`@@ -12837,7 +12869,7 @@ public void SetSignalType(TrItem[] TrItems, SignalConfigurationFile sigCFG)`
`12837`	`12869`	`foreach (SignalAspect thisAspect in signalType.Aspects)`
`12838`	`12870`	`{`
`12839`	`12871`	`int arrindex = (int)thisAspect.Aspect;`
`12840`		`- speed_info[arrindex] = new ObjectSpeedInfo(thisAspect.SpeedMpS, thisAspect.SpeedMpS, thisAspect.Asap, thisAspect.Reset, thisAspect.NoSpeedReduction? 1 : 0);`
	`12872`	`+ speed_info[arrindex] = new ObjectSpeedInfo(thisAspect.SpeedMpS, thisAspect.SpeedMpS, thisAspect.Asap, thisAspect.Reset, thisAspect.NoSpeedReduction? 1 : 0, false);`
`12841`	`12873`	`}`
`12842`	`12874`
`12843`	`12875`	`// set normal subtype`
`@@ -13558,7 +13590,8 @@ public enum ObjectItemFindState`
`13558`	`13590`	`public int speed_flag;`
`13559`	`13591`	`public int speed_reset;`
`13560`	`13592`	`// for signals: if = 1 no speed reduction; for speedposts: if = 0 standard; = 1 start of temp speedreduction post; = 2 end of temp speed reduction post`
`13561`		`- public int speed_noSpeedReductionOrIsTempSpeedReduction;`
	`13593`	`+ public int speed_noSpeedReductionOrIsTempSpeedReduction;`
	`13594`	`+ public bool speed_isWarning;`
`13562`	`13595`	`public float actual_speed; // set active by TRAIN`
`13563`	`13596`
`13564`	`13597`	`public bool processed; // for AI trains, set active by TRAIN`
`@@ -13597,6 +13630,7 @@ public ObjectItemInfo(SignalObject thisObject, float distance)`
`13597`	`13630`	`speed_flag = speed_info.speed_flag;`
`13598`	`13631`	`speed_reset = speed_info.speed_reset;`
`13599`	`13632`	`speed_noSpeedReductionOrIsTempSpeedReduction = speed_info.speed_noSpeedReductionOrIsTempSpeedReduction;`
	`13633`	`+ speed_isWarning = speed_info.speed_isWarning;`
`13600`	`13634`	`}`
`13601`	`13635`	`}`
`13602`	`13636`
`@@ -13622,19 +13656,21 @@ public class ObjectSpeedInfo`
`13622`	`13656`	`public int speed_flag;`
`13623`	`13657`	`public int speed_reset;`
`13624`	`13658`	`public int speed_noSpeedReductionOrIsTempSpeedReduction;`
	`13659`	`+ public bool speed_isWarning;`
`13625`	`13660`
`13626`	`13661`	`//================================================================================================//`
`13627`	`13662`	`/// <summary>`
`13628`	`13663`	`/// Constructor`
`13629`	`13664`	`/// </summary>`
`13630`	`13665`
`13631`		`- public ObjectSpeedInfo(float pass, float freight, bool asap, bool reset, int nospeedreductionOristempspeedreduction)`
	`13666`	`+ public ObjectSpeedInfo(float pass, float freight, bool asap, bool reset, int nospeedreductionOristempspeedreduction, bool isWarning)`
`13632`	`13667`	`{`
`13633`	`13668`	`speed_pass = pass;`
`13634`	`13669`	`speed_freight = freight;`
`13635`	`13670`	`speed_flag = asap ? 1 : 0;`
`13636`	`13671`	`speed_reset = reset ? 1 : 0;`
`13637`	`13672`	`speed_noSpeedReductionOrIsTempSpeedReduction = nospeedreductionOristempspeedreduction;`
	`13673`	`+ speed_isWarning = isWarning;`
`13638`	`13674`	`}`
`13639`	`13675`	`}`
`13640`	`13676`