Automatic merge of T1.5.1-1188-gd2c2ab5d66 and 16 pull requests

- 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 #799 at dfc715e: Consolidated wind simulation
- Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters
- Pull request #891 at 9a1d6b2: Auto save
- Pull request #892 at 1f5ba4c: Signal Function OPP_SIG_ID_TRAINPATH
- Pull request #952 at 8347095: Investigation - Pulsing graphics
- Pull request #953 at a519452: Fix Lights Crash on Corrupt Shapes
- Pull request #954 at 53e9cc6: Multiple Track Profiles & Superelevation Improvements
- 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 #876 at f92de76: docs: add source for documents previously on website to source Documentation folder

Author: openrails-bot

Source/Menu/Options.Designer.cs

@@ -165,6 +165,10 @@ public OptionsForm(UserSettings settings, UpdateManager updateManager, bool init
             comboPressureUnit.Text = Settings.PressureUnit;
             comboOtherUnits.Text = settings.Units;
             checkEnableTCSScripts.Checked = !Settings.DisableTCSScripts;    // Inverted as "Enable scripts" is better UI than "Disable scripts"
+            checkAutoSaveActive.Checked = Settings.AutoSaveActive;
+            ButtonAutoSave15.Checked = checkAutoSaveActive.Checked & Settings.AutoSaveInterval == 15;
+            ButtonAutoSave30.Checked = checkAutoSaveActive.Checked & Settings.AutoSaveInterval == 30;
+            ButtonAutoSave60.Checked = checkAutoSaveActive.Checked & Settings.AutoSaveInterval == 60;
 
             // Audio tab
             numericSoundVolumePercent.Value = Settings.SoundVolumePercent;
@@ -456,6 +460,8 @@ void buttonOK_Click(object sender, EventArgs e)
             Settings.PressureUnit = comboPressureUnit.SelectedValue.ToString();
             Settings.Units = comboOtherUnits.SelectedValue.ToString();
             Settings.DisableTCSScripts = !checkEnableTCSScripts.Checked; // Inverted as "Enable scripts" is better UI than "Disable scripts"
+            Settings.AutoSaveActive = checkAutoSaveActive.Checked;
+            Settings.AutoSaveInterval = ButtonAutoSave15.Checked ? 15 : ButtonAutoSave30.Checked ? 30 : 60;
 
             // Audio tab
             Settings.SoundVolumePercent = (int)numericSoundVolumePercent.Value;
@@ -807,6 +813,50 @@ private void checkPerformanceTuner_Click(object sender, EventArgs e)
             labelPerformanceTunerTarget.Enabled = checkPerformanceTuner.Checked;
         }
 
+        private void checkAutoSave_checkchanged(object sender, EventArgs e)
+        {
+            if (checkAutoSaveActive.Checked)
+            {
+                ButtonAutoSave15.Enabled = true;
+                ButtonAutoSave15.Checked = Settings.AutoSaveInterval == 15;
+                ButtonAutoSave30.Enabled = true;
+                ButtonAutoSave30.Checked = Settings.AutoSaveInterval == 30;
+                ButtonAutoSave60.Enabled = true;
+                ButtonAutoSave60.Checked = Settings.AutoSaveInterval == 60;
+            }
+            else
+            {
+                ButtonAutoSave15.Checked = false;
+                ButtonAutoSave15.Enabled = false;
+                ButtonAutoSave30.Checked = false;
+                ButtonAutoSave30.Enabled = false;
+                ButtonAutoSave60.Checked = false;
+                ButtonAutoSave60.Enabled = false;
+            }
+        }
+
+        private void buttonAutoSaveInterval_checkchanged(object sender, EventArgs e)
+        {
+            if (ButtonAutoSave15.Checked)
+            {
+                Settings.AutoSaveInterval = 15;
+                ButtonAutoSave30.Checked = false;
+                ButtonAutoSave60.Checked = false;
+            }
+            else if (ButtonAutoSave30.Checked)
+            {
+                Settings.AutoSaveInterval = 30;
+                ButtonAutoSave15.Checked = false;
+                ButtonAutoSave60.Checked = false;
+            }
+            else if (ButtonAutoSave60.Checked)
+            {
+                Settings.AutoSaveInterval = 60;
+                ButtonAutoSave15.Checked = false;
+                ButtonAutoSave30.Checked = false;
+            }
+        }
+
         #region Help for Options
         // The icons all share the same code which assumes they are named according to a simple scheme as follows:
         //   1. To add a new Help Icon, copy an existing one and paste it onto the tab.

Source/Menu/Options.cs

@@ -576,6 +576,7 @@ public static class FormatStrings
         public static string kN = Catalog.GetString("kN");
         public static string lbf = Catalog.GetString("lbf");
         public static string klbf = Catalog.GetString("klbf");
+        public static string deg = Catalog.GetString("°");
 
         /// <summary>
         /// Formatted unlocalized speed string, used in reports and logs.
@@ -845,6 +846,11 @@ public static string FormatAirFlow(float flowM3pS, bool isMetric)
             return String.Format(CultureInfo.CurrentCulture, "{0:F0} {1}", flow, isMetric ? lps : cfm);
         }
 
+        public static string FormatAngleDeg(float angleDeg)
+        {
+            return String.Format(CultureInfo.CurrentCulture, "{0:F0} {1}", angleDeg, deg);
+        }
+
         /// <summary>
         /// Converts duration in floating-point seconds to whole hours, minutes and seconds (rounded down).
         /// </summary>

Source/ORTS.Common/Conversions.cs

@@ -168,6 +168,10 @@ public enum DirectXFeature
         public String Units { get; set; }
         [Default(false)]
         public bool DisableTCSScripts { get; set; }
+        [Default(false)]
+        public bool AutoSaveActive { get; set; }
+        [Default (15)]
+        public int AutoSaveInterval { get; set; }
 
         // Audio settings:
         [Default(100)]
@@ -312,12 +316,6 @@ public enum DirectXFeature
         public bool AdhesionProportionalToWeather { get; set; }
         [Default(false)]
         public bool NoForcedRedAtStationStops { get; set; }
-        [Default(100)]
-        public int PrecipitationBoxHeight { get; set; }
-        [Default(500)]
-        public int PrecipitationBoxWidth { get; set; }
-        [Default(500)]
-        public int PrecipitationBoxLength { get; set; }
         [Default(false)]
         public bool CorrectQuestionableBrakingParams { get; set; }
         [Default(false)]

Source/ORTS.Settings/UserSettings.cs

@@ -710,7 +710,7 @@ public void AIUpdate(float elapsedClockSeconds, double clockTime, bool preUpdate
 
                 if (Cars[0] is MSTSLocomotive leadingLoco)
                 {
-                    var isRainingOrSnowing = Simulator.Weather.PricipitationIntensityPPSPM2 > 0;
+                    var isRainingOrSnowing = Simulator.Weather.PrecipitationIntensityPPSPM2 > 0;
                     if (leadingLoco.Wiper && !isRainingOrSnowing)
                         leadingLoco.SignalEvent(Event.WiperOff);
                     else if (!leadingLoco.Wiper && isRainingOrSnowing)

Source/Orts.Simulation/Simulation/AIs/AITrain.cs

@@ -2205,14 +2205,14 @@ public virtual void physicsUpdate(float elapsedClockSeconds)
         public void UpdateWindComponents()
         {
             // Gets wind direction and speed, and determines HUD display values for the train as a whole. 
-            //These will be representative of the train whilst it is on a straight track, but each wagon will vary when going around a curve.
+            // These will be representative of the train whilst it is on a straight track, but each wagon will vary when going around a curve.
             // Note both train and wind direction will be positive between 0 (north) and 180 (south) through east, and negative between 0 (north) and 180 (south) through west
             // Wind and train direction to be converted to an angle between 0 and 360 deg.
                 // Calculate Wind speed and direction, and train direction
                 // Update the value of the Wind Speed and Direction for the train
-                PhysicsWindDirectionDeg = MathHelper.ToDegrees(Simulator.Weather.WindDirection);
-                PhysicsWindSpeedMpS = Simulator.Weather.WindSpeed;
-                float TrainSpeedMpS = Math.Abs(SpeedMpS);
+            PhysicsWindDirectionDeg = MathHelper.ToDegrees(Simulator.Weather.WindInstantaneousDirectionRad);
+            PhysicsWindSpeedMpS = Simulator.Weather.WindInstantaneousSpeedMpS;
+            var speedMpS = Math.Abs(SpeedMpS);
 
                 // If a westerly direction (ie -ve) convert to an angle between 0 and 360
                 if (PhysicsWindDirectionDeg < 0)
@@ -2221,7 +2221,7 @@ public void UpdateWindComponents()
                 if (PhysicsTrainLocoDirectionDeg < 0)
                     PhysicsTrainLocoDirectionDeg += 360;
 
-                // calculate angle between train and eind direction
+            // Calculate angle between train and wind direction
                 if (PhysicsWindDirectionDeg > PhysicsTrainLocoDirectionDeg)
                     ResultantWindComponentDeg = PhysicsWindDirectionDeg - PhysicsTrainLocoDirectionDeg;
                 else if (PhysicsTrainLocoDirectionDeg > PhysicsWindDirectionDeg)
@@ -2237,9 +2237,8 @@ public void UpdateWindComponents()
                 if (ResultantWindComponentDeg > 180)
                     ResultantWindComponentDeg = 360 - ResultantWindComponentDeg;
 
-                float WindAngleRad = MathHelper.ToRadians(ResultantWindComponentDeg);
-
-                WindResultantSpeedMpS = (float)Math.Sqrt(TrainSpeedMpS * TrainSpeedMpS + PhysicsWindSpeedMpS * PhysicsWindSpeedMpS + 2.0f * TrainSpeedMpS * PhysicsWindSpeedMpS * (float)Math.Cos(WindAngleRad));
+            var windAngleRad = MathHelper.ToRadians(ResultantWindComponentDeg);
+            WindResultantSpeedMpS = (float)Math.Sqrt(speedMpS * speedMpS + PhysicsWindSpeedMpS * PhysicsWindSpeedMpS + 2.0f * speedMpS * PhysicsWindSpeedMpS * (float)Math.Cos(windAngleRad));
             }
 
 

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

@@ -3263,7 +3263,7 @@ public virtual void UpdateFrictionCoefficient(float elapsedClockSeconds)
             {
                 var fogBaseFrictionCoefficientFactor = 1.0f;
                 var pricBaseFrictionCoefficientFactor = 1.0f;
-                float pric = Simulator.Weather.PricipitationIntensityPPSPM2 * 1000;
+                float pric = Simulator.Weather.PrecipitationIntensityPPSPM2 * 1000;
                 // precipitation will calculate a base coefficient value between 60% (light rain) and 90% (heavy rain) - this will be a factor that is used to adjust the base value 
                 // assume linear value between upper and lower precipitation values. Limits are set in the weather module, ie Rain = 0.01ppm (10) and Snow = 0.005ppm (5)
                 float precGrad = (0.2f - 0) / (10f - 5f);
@@ -3279,7 +3279,7 @@ public virtual void UpdateFrictionCoefficient(float elapsedClockSeconds)
                 }
 
                 // Adjust adhesion for impact of fog - default = 20000m = 20km
-                float fog = Simulator.Weather.FogDistance;
+                float fog = Simulator.Weather.VisibilityM;
                 if (fog < 20000) // as fog thickens then decrease adhesion
                 {
                     fogBaseFrictionCoefficientFactor = Math.Min((fog * 2.75e-4f + 0.6f), 1.0f); // If fog is less then 2km then it will impact friction, decrease adhesion to 60% (same as light rain transition)