Automatic merge of T1.4-rc6-12-gfab59f576 and 9 pull requests

- Pull request #480 at 6bc94a9: Blueprint https://blueprints.launchpad.net/or/+spec/digital-alignment-in-3dcabs
- Pull request #503 at a2845f8: Update derailment functionality
- Pull request #508 at 21fb5e9: Blueprint https://blueprints.launchpad.net/or/+spec/odometer-cabview-controls
- Pull request #510 at d4d3256: Add performance monitoring for diesel mechanic locomotives and new parameters
- Pull request #512 at b76931f: Fixed dynamic brake being applied during standstill when dynamic brake blending is enabled
- Pull request #514 at 8bf4a09: Bug fix for https://bugs.launchpad.net/or/+bug/1946373. The keywords should not be translated.
- Pull request #516 at 1498583: feat: Build Unstable Version as debug
- Pull request #517 at dc566d5: Strengthen Contributing guidance
- Pull request #518 at 59424c1: Added rules to policy page on website

Source/Documentation/Manual/cabs.rst

@@ -347,6 +347,8 @@ ORTS_SIGNED_TRACTION_BRAKING, with the only difference that the braking
 force does include also the train brake force in addition to the dynamic 
 brake force.
 
+.. _cabs-odometer:
+
 Odometer controls
 -----------------
 
@@ -378,15 +380,15 @@ Here is an example of use of the odometer control blocks within a .cvf file::
     MouseControl ( 1 )
   )
   TwoState (
-    Type ( ORTS_ODOMETER_DIRECTION )
+    Type ( ORTS_ODOMETER_DIRECTION TWO_STATE)
     Position ( 320 100 13 15 )
     Graphic ( OdoDirectionSwitch.ace )
     NumFrames ( 2 2 1 )
     Style ( ONOFF )
     MouseControl ( 1 )
   )
   Digital (
-    Type ( ORTS_ODOMETER )
+    Type ( ORTS_ODOMETER DIGITAL)
     Position ( 377 100 26 17 )
     ScaleRange ( 0 100000 )
     Accuracy ( 0 )

Source/Documentation/Manual/driving.rst

@@ -585,7 +585,7 @@ will know, without switching views, that the other end of the train has
 just reached the same point, e.g. the entrance to a siding, etc. 
 
 The odometer can be accessed also through cabview controls, if they are defined 
-within the cabview.
+within the cabview, see :ref:`here <cabs-odometer>`.
 
 
 .. |uarr|   unicode:: U+02191 .. UPWARDS ARROW

Source/Orts.Simulation/Common/Commands.cs

@@ -1598,7 +1598,6 @@ public ToggleOdometerCommand(CommandLog log)
         public override void Redo()
         {
             Receiver.OdometerToggle();
-            // Report();
         }
 
         public override string ToString()
@@ -1621,7 +1620,6 @@ public ResetOdometerCommand(CommandLog log, bool toState)
         public override void Redo()
         {
             Receiver.OdometerReset(ToState);
-            // Report();
         }
 
         public override string ToString()
@@ -1644,7 +1642,6 @@ public ToggleOdometerDirectionCommand(CommandLog log)
         public override void Redo()
         {
             Receiver.OdometerToggleDirection();
-            // Report();
         }
 
         public override string ToString()

Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs

@@ -5109,7 +5109,7 @@ public virtual float GetDataOf(CabViewControl cvc)
                     switch (cvc.Units)
                     {
                         case CABViewControlUnits.KILOMETRES:
-                            data = OdometerM / 1000;
+                            data = (float)Me.ToKiloM(OdometerM);
                             break;
                         case CABViewControlUnits.MILES:
                             data = (float)Me.ToMi(OdometerM);