Merge pull request #784 from Roeterdink/IncorrectDistanceAlongTrack

cjakeman · web-flow · commit eb30a97e9920 · 2023-02-27T20:07:45.000Z
Incorrect distance along track
diff --git a/Source/Orts.Simulation/Simulation/Physics/Train.cs b/Source/Orts.Simulation/Simulation/Physics/Train.cs
@@ -15840,7 +15840,7 @@ public StationStop CalculateStationStop(int platformStartID, int arrivalTime, in
                                 {
                                     int otherSectionIndex = thisElement.Direction == 0 ?
                                         otherPlatform.TCSectionIndex[0] :
-                                        otherPlatform.TCSectionIndex[thisPlatform.TCSectionIndex.Count - 1];
+                                        otherPlatform.TCSectionIndex[otherPlatform.TCSectionIndex.Count - 1];
                                     if (otherSectionIndex == beginSectionIndex)
                                     {
                                         if (otherPlatform.TCOffset[0, thisElement.Direction] < actualBegin)
@@ -19172,7 +19172,7 @@ public float GetDistanceAlongRoute(int startSectionIndex, float startOffset,
             {
                 float totalLength = startOffset;
 
-                if (startSectionIndex == endSectionIndex)
+                if (startSectionIndex == endSectionIndex && startSectionIndex > -1)
                 {
                     TrackCircuitSection thisSection = signals.TrackCircuitList[this[startSectionIndex].TCSectionIndex];
                     totalLength = startOffset - (thisSection.Length - endOffset);

Original file line number	Diff line number	Diff line change
`@@ -15840,7 +15840,7 @@ public StationStop CalculateStationStop(int platformStartID, int arrivalTime, in`
`15840`	`15840`	`{`
`15841`	`15841`	`int otherSectionIndex = thisElement.Direction == 0 ?`
`15842`	`15842`	`otherPlatform.TCSectionIndex[0] :`
`15843`		`- otherPlatform.TCSectionIndex[thisPlatform.TCSectionIndex.Count - 1];`
	`15843`	`+ otherPlatform.TCSectionIndex[otherPlatform.TCSectionIndex.Count - 1];`
`15844`	`15844`	`if (otherSectionIndex == beginSectionIndex)`
`15845`	`15845`	`{`
`15846`	`15846`	`if (otherPlatform.TCOffset[0, thisElement.Direction] < actualBegin)`
`@@ -19172,7 +19172,7 @@ public float GetDistanceAlongRoute(int startSectionIndex, float startOffset,`
`19172`	`19172`	`{`
`19173`	`19173`	`float totalLength = startOffset;`
`19174`	`19174`
`19175`		`- if (startSectionIndex == endSectionIndex)`
	`19175`	`+ if (startSectionIndex == endSectionIndex && startSectionIndex > -1)`
`19176`	`19176`	`{`
`19177`	`19177`	`TrackCircuitSection thisSection = signals.TrackCircuitList[this[startSectionIndex].TCSectionIndex];`
`19178`	`19178`	`totalLength = startOffset - (thisSection.Length - endOffset);`