Merge pull request #449 from kvakvs/446-show-unlimited-over-140kmph

Speed limits: Unlimited speed display fix; Unlimited default speed fix

Author: kvakvs

TLM/TLM/Traffic/Data/SpeedLimit.cs

@@ -122,44 +122,73 @@ public static ushort ToKmphPrecise(float speed) {
 			return (ushort)Mathf.Round(speed * SPEED_TO_KMPH);
 		}
 
-		/// <summary>
-		/// Based on the MPH/KMPH settings round the current speed to the nearest STEP and
-		/// then decrease by STEP.
-		/// </summary>
-		/// <param name="speed">Ingame speed</param>
-		/// <returns>Ingame speed decreased by the increment for MPH or KMPH</returns>
-		public static float GetPrevious(float speed) {
-			if (speed < 0f) {
-				return -1f;
-			}
-			if (GlobalConfig.Instance.Main.DisplaySpeedLimitsMph) {
-				var rounded = ToMphRounded(speed);
-				return (rounded > LOWER_MPH ? rounded - MPH_STEP : LOWER_MPH) / SPEED_TO_MPH;
-			} else {
-				var rounded = ToKmphRounded(speed);
-				return (rounded > LOWER_KMPH ? rounded - KMPH_STEP : LOWER_KMPH) / SPEED_TO_KMPH;
-			}
-		}
-
-		/// <summary>
-		/// Based on the MPH/KMPH settings round the current speed to the nearest STEP and
-		/// then increase by STEP.
-		/// </summary>
-		/// <param name="speed">Ingame speed</param>
-		/// <returns>Ingame speed increased by the increment for MPH or KMPH</returns>
-		public static float GetNext(float speed) {
-			if (speed < 0f) {
-				return -1f;
-			}
-			if (GlobalConfig.Instance.Main.DisplaySpeedLimitsMph) {
-				var rounded = ToMphRounded(speed);
-				return (rounded < UPPER_MPH ? rounded + MPH_STEP : UPPER_MPH) / SPEED_TO_MPH;
-			}
-			else {
-				var rounded = ToKmphRounded(speed);
-				return (rounded < UPPER_KMPH ? rounded + KMPH_STEP : UPPER_KMPH) / SPEED_TO_KMPH;
-			}
-		}
+        /// <summary>
+        /// Based on the MPH/KMPH settings round the current speed to the nearest STEP and
+        /// then decrease by STEP.
+        /// </summary>
+        /// <param name="speed">Ingame speed</param>
+        /// <returns>Ingame speed decreased by the increment for MPH or KMPH</returns>
+        public static float GetPrevious(float speed) {
+            if (speed < 0f) {
+                return -1f;
+            }
+
+            if (GlobalConfig.Instance.Main.DisplaySpeedLimitsMph) {
+                ushort rounded = ToMphRounded(speed);
+                if (rounded == LOWER_MPH) {
+                    return 0;
+                }
+
+                if (rounded == 0) {
+                    return UPPER_MPH / SPEED_TO_MPH;
+                }
+
+                return (rounded > LOWER_MPH ? rounded - MPH_STEP : LOWER_MPH) / SPEED_TO_MPH;
+            } else {
+                ushort rounded = ToKmphRounded(speed);
+                if (rounded == LOWER_KMPH) {
+                    return 0;
+                }
+
+                if (rounded == 0) {
+                    return UPPER_KMPH / SPEED_TO_KMPH;
+                }
+
+                return (rounded > LOWER_KMPH ? rounded - KMPH_STEP : LOWER_KMPH) / SPEED_TO_KMPH;
+            }
+        }
+
+        /// <summary>
+        /// Based on the MPH/KMPH settings round the current speed to the nearest STEP and
+        /// then increase by STEP.
+        /// </summary>
+        /// <param name="speed">Ingame speed</param>
+        /// <returns>Ingame speed increased by the increment for MPH or KMPH</returns>
+        public static float GetNext(float speed) {
+            if (speed < 0f) {
+                return -1f;
+            }
+
+            if (GlobalConfig.Instance.Main.DisplaySpeedLimitsMph) {
+                ushort rounded = ToMphRounded(speed);
+                rounded += MPH_STEP;
+
+                if (rounded > UPPER_MPH) {
+                    rounded = 0;
+                }
+
+                return rounded / SPEED_TO_MPH;
+            } else {
+                ushort rounded = ToKmphRounded(speed);
+                rounded += KMPH_STEP;
+
+                if (rounded > UPPER_KMPH) {
+                    rounded = 0;
+                }
+
+                return rounded / SPEED_TO_KMPH;
+            }
+        }
 
 		/// <summary>
 		/// For US signs and MPH enabled, scale textures vertically by 1.25f.

TLM/TLM/UI/TextureResources.cs

@@ -241,8 +241,8 @@ public static Texture2D GetSpeedLimitTexture(float speedLimit) {
         /// <returns></returns>
         public static Texture2D GetSpeedLimitTexture(float speedLimit, MphSignStyle mphStyle, SpeedUnit unit) {
             // Select the source for the textures based on unit and the theme
-            var mph = unit == SpeedUnit.Mph;
-            var textures = SpeedLimitTexturesKmph;
+            bool mph = unit == SpeedUnit.Mph;
+            IDictionary<int, Texture2D> textures = SpeedLimitTexturesKmph;
             if (mph) {
                 switch (mphStyle) {
                     case MphSignStyle.SquareUS:
@@ -257,22 +257,20 @@ public static Texture2D GetSpeedLimitTexture(float speedLimit, MphSignStyle mphS
                 }
             }
 
-            // Trim the range
-            if (speedLimit > SpeedLimitManager.MAX_SPEED * 0.95f) {
-                return textures[0];
-            }
-
             // Round to nearest 5 MPH or nearest 10 km/h
-            var index = mph ? SpeedLimit.ToMphRounded(speedLimit) : SpeedLimit.ToKmphRounded(speedLimit);
+            ushort index = mph ? SpeedLimit.ToMphRounded(speedLimit) : SpeedLimit.ToKmphRounded(speedLimit);
 
             // Trim the index since 140 km/h / 90 MPH is the max sign we have
-            var upper = mph ? SpeedLimit.UPPER_MPH : SpeedLimit.UPPER_KMPH;
-#if DEBUG
-            if (index > upper) {
-                Log.Info($"Trimming speed={speedLimit} index={index} to {upper}");
+            ushort upper = mph ? SpeedLimit.UPPER_MPH : SpeedLimit.UPPER_KMPH;
+
+            // Show unlimited if the speed cannot be represented by the available sign textures
+            if (index == 0 || index > upper) {
+                // Log._Debug($"Trimming speed={speedLimit} index={index} to {upper}");
+                return textures[0];
             }
-#endif
-            var trimIndex = Math.Min(upper, Math.Max((ushort)0, index));
+
+            // Trim from below to not go below index 5 (5 kmph or 5 mph)
+            ushort trimIndex = Math.Max((ushort)5, index);
             return textures[trimIndex];
         }