Automatic merge of T1.5.1-1090-g9915d87ce6 and 20 pull requests

- Pull request #891 at 9a1d6b2: Auto save
- Pull request #954 at 3efaf6d: Multiple Track Profiles & Superelevation Improvements
- Pull request #959 at 2452cb0: Fix TrackViewer crash on big zoom value
- Pull request #972 at e90a2aa: On Map window color changed switch or signal is not changed
- Pull request #976 at 877cc94:  Increased center of gravity range
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #882 at 8f695a4: Blueprint/train car operations UI window
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #922 at a3bc9e7: Autopilot for timetable mode
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #962 at 46d0472: Fix pantographs on unpowered cars
- Pull request #970 at 6fa5eed: feat: Remove unnecessary Windows.Forms usage
- Pull request #973 at c35be87: fix: Using singular target framework to allow for different platforms across different projects
- Pull request #974 at 5faea6f: Bug fix for https://bugs.launchpad.net/or/+bug/2076034 Doors remain open in AI trains
- Pull request #978 at 91f3ee8: fix: adds MilepostUnitsMiles to Manual
- Pull request #900 at c27f32d: DMI updates
- Pull request #903 at 4a4b032: Downloading route content (Github, zip)
- Pull request #799 at dfc715e: Consolidated wind simulation
- Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder
- Pull request #952 at 8347095: Investigation - Pulsing graphics

Author: openrails-bot

Source/Orts.Formats.Msts/ShapeDescriptorFile.cs

@@ -16,8 +16,6 @@
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
-
 using Orts.Parsers.Msts;
 
 namespace Orts.Formats.Msts
@@ -31,26 +29,16 @@ public class ShapeDescriptorFile
             shape = new SDShape();
         }
 
-        public static Dictionary<string, SDShape> Cache = new Dictionary<string, SDShape>();
-
         public ShapeDescriptorFile(string filename)
         {
-            var shapeDescriptorPath = filename.ToLowerInvariant();
-            if (Cache.ContainsKey(shapeDescriptorPath))
+            using (STFReader stf = new STFReader(filename, false))
             {
-                shape = Cache[shapeDescriptorPath];
-            }
-            else
-            {
-                using (STFReader stf = new STFReader(filename, false))
-                {
-                    stf.ParseFile(new STFReader.TokenProcessor[] {
-                        new STFReader.TokenProcessor("shape", ()=>{ shape = new SDShape(stf); }),
-                    });
-                    //TODO This should be changed to STFException.TraceError() with defaults values created
-                    if (shape == null) throw new STFException(stf, "Missing shape statement");
-                }
-                Cache.Add(shapeDescriptorPath, shape);
+                stf.ParseFile(new STFReader.TokenProcessor[] {
+                    new STFReader.TokenProcessor("shape", ()=>{ shape = new SDShape(stf); }),
+                });
+                //TODO This should be changed to STFException.TraceError() with defaults values created
+                if (shape == null)
+                    throw new STFException(stf, "Missing shape statement");
             }
         }
 

Source/RunActivity/Viewer3D/Scenery.cs

@@ -349,12 +349,9 @@ public WorldFile(Viewer viewer, int tileX, int tileZ, bool visible)
                     }
                 }
 
-                var shapeDescriptorPath = shapeFilePath + "d";
-                if (shapeFilePath != null)
-                {
-                    var shape = new ShapeDescriptorFile(shapeDescriptorPath);
-                    if (shape != null)
+                if (shapeFilePath != null && File.Exists(shapeFilePath + "d"))
                 {
+                    var shape = new ShapeDescriptorFile(shapeFilePath + "d");
                     if (shape.shape.ESD_Bounding_Box != null)
                     {
                         var min = shape.shape.ESD_Bounding_Box.Min;
@@ -367,7 +364,6 @@ public WorldFile(Viewer viewer, int tileX, int tileZ, bool visible)
                         BoundingBoxes.Add(new BoundingBox(transform, new Vector3((max.X - min.X) / 2, (max.Y - min.Y) / 2, (max.Z - min.Z) / 2), worldMatrix.XNAMatrix.Translation.Y));
                     }
                 }
-                }
 
                 try
                 {