New Speed Limits UI

TLM/TLM/Constants.cs

@@ -3,6 +3,7 @@ namespace TrafficManager {
     using TrafficManager.API.Manager;
     using UnityEngine;
     using TrafficManager.API.Notifier;
+    using TrafficManager.U;
 
     public static class Constants {
         /// <summary>
@@ -22,8 +23,23 @@ public static class Constants {
         public const float SPEED_TO_MPH = 32.06f; // 50 km/h converted to mph
 
         /// <summary>
-        /// The maximum amount of segments a node can hold.
+        /// Screen pixel size for overlay signs, such as one-per-segment speed limits.
         /// </summary>
+        public static float OverlaySignVisibleSize => 100.0f * UIScaler.UIScale;
+
+        /// <summary>
+        /// World size for clickable signs used in overlays. Larger than readonly signs.
+        /// This is used as offset in grids of signs such as lane speed limit signs.
+        /// </summary>
+        public const float OVERLAY_INTERACTIVE_SIGN_SIZE = 6.0f;
+
+        /// <summary>
+        /// World size for readonly signs used in overlays.
+        /// This is used as offset in grids of signs such as lane speed limit signs.
+        /// </summary>
+        public const float OVERLAY_READONLY_SIGN_SIZE = 3.8f;
+
+        /// <summary>The maximum amount of segments a node can hold.</summary>
         public const int MAX_SEGMENTS_OF_NODE = 8;
 
         public static float ByteToFloat(byte b) {

TLM/TLM/Manager/Impl/AdvancedParkingManager.cs

@@ -2551,6 +2551,8 @@ bool LoopHandler(int i, int j) {
                     } // if find parking prop at building
 
                     buildingId = building.m_nextGridBuilding;
+                    building = ref buildingId.ToBuilding();
+
                     if (++numIterations >= 49152) {
                         CODebugBase<LogChannel>.Error(
                             LogChannel.Core,

TLM/TLM/Manager/Impl/SpeedLimitManager.cs

@@ -146,11 +146,12 @@ private bool MayHaveCustomSpeedLimits([NotNull] NetInfo.Lane laneInfo) {
                 laneIndex++;
             }
 
-            if (validLanes > 0) {
-                meanSpeedLimit = meanSpeedLimit.Scale(1.0f / validLanes);
+            switch (validLanes) {
+                case 0:
+                    return null;
+                case > 0:
+                    return meanSpeedLimit.Scale(1.0f / validLanes);
             }
-
-            return meanSpeedLimit;
         }
 
         /// <summary>
@@ -511,10 +512,13 @@ public bool SetLaneSpeedLimit(ushort segmentId,
                 return false;
             }
 
-            Log._Assert(action.Override != null, "action.Override != null");
+            if (action.Type == SetSpeedLimitAction.ActionType.ResetToDefault) {
+                Flags.RemoveLaneSpeedLimit(laneId);
+                return true;
+            }
 
             if (action.Type != SetSpeedLimitAction.ActionType.ResetToDefault
-                && !IsValidRange(action.Override.Value.GameUnits)) {
+                && !IsValidRange(action.GuardedValue.Override.GameUnits)) {
                 return false;
             }
 
@@ -523,15 +527,17 @@ public bool SetLaneSpeedLimit(ushort segmentId,
                 return false;
             }
 
-            if (action.Type != SetSpeedLimitAction.ActionType.ResetToDefault) {
-                Flags.SetLaneSpeedLimit(segmentId, laneIndex, laneId, action);
-            } else {
-                Flags.RemoveLaneSpeedLimit(laneId);
-            }
+            Flags.SetLaneSpeedLimit(segmentId, laneIndex, laneId, action);
 
             return true;
         }
 
+        public void ResetCustomDefaultSpeedlimit([NotNull] string netinfoName) {
+            if (this.customLaneSpeedLimitByNetInfoName_.ContainsKey(netinfoName)) {
+                this.customLaneSpeedLimitByNetInfoName_.Remove(netinfoName);
+            }
+        }
+
         /// <summary>Sets speed limit for all configurable lanes.</summary>
         /// <param name="action">Speed limit in game units, or null to restore defaults.</param>
         /// <returns>
@@ -562,10 +568,8 @@ public bool SetSegmentSpeedLimit(ushort segmentId,
                 return false;
             }
 
-            Log._Assert(action.Override != null, "action.Override != null");
-
             if (action.Type == SetSpeedLimitAction.ActionType.SetOverride
-                && !IsValidRange(action.Override.Value.GameUnits)) {
+                && !IsValidRange(action.GuardedValue.Override.GameUnits)) {
                 return false;
             }
 
@@ -601,7 +605,7 @@ public bool SetSegmentSpeedLimit(ushort segmentId,
                         Flags.RemoveLaneSpeedLimit(curLaneId);
                     } else {
                         bool showMph = GlobalConfig.Instance.Main.DisplaySpeedLimitsMph;
-                        string overrideStr = action.Override.Value.FormatStr(showMph);
+                        string overrideStr = action.GuardedValue.Override.FormatStr(showMph);
 
                         Log._Debug(
                             $"SpeedLimitManager: Setting lane {curLaneId} to {overrideStr}");