Junction restrictions hook

TLM/TLM/Constants.cs

@@ -1,4 +1,5 @@
 namespace TrafficManager {
+    using TrafficManager.API.Hook;
     using TrafficManager.API.Manager;
     using TrafficManager.API.Notifier;
     using TrafficManager.API.UI;
@@ -37,6 +38,8 @@ public static float ByteToFloat(byte b) {
 
         public static IManagerFactory ManagerFactory => Manager.Impl.ManagerFactory.Instance;
 
+        public static IHookFactory HookFactory => Hook.Impl.HookFactory.Instance;
+
         public static IUIFactory UIFactory => UI.UIFactory.Instance;
 
         public static INotifier Notifier => TrafficManager.Notifier.Instance;

TLM/TLM/Custom/PathFinding/CustomPathFind.cs

@@ -1084,10 +1084,11 @@ ref nextSegmentId.ToSegment(),
 #if JUNCTIONRESTRICTIONS
                                 // next segment does not have pedestrian lanes but cims need to
                                 // cross it to reach the next segment
-                                if (!junctionManager.IsPedestrianCrossingAllowed(
+                                if (!junctionManager.GetValueOrDefault(
                                         leftSegmentId,
                                         leftSegment.m_startNode ==
-                                        nextNodeId)) {
+                                        nextNodeId,
+                                        JunctionRestrictionFlags.AllowPedestrianCrossing)) {
                                     break;
                                 }
 #endif
@@ -1122,10 +1123,11 @@ ref nextSegmentId.ToSegment(),
 #if JUNCTIONRESTRICTIONS
                                 // next segment does not have pedestrian lanes but cims need to
                                 // cross it to reach the next segment
-                                if (!junctionManager.IsPedestrianCrossingAllowed(
+                                if (!junctionManager.GetValueOrDefault(
                                         rightSegmentId,
                                         rightSegment.m_startNode ==
-                                        nextNodeId)) {
+                                        nextNodeId,
+                                        JunctionRestrictionFlags.AllowPedestrianCrossing)) {
                                     break;
                                 }
 #endif
@@ -3167,9 +3169,10 @@ private void ProcessItemPedBicycle(
                     if (Options.junctionRestrictionsEnabled &&
                         item.Position.m_segment == nextSegmentId) {
                         // check if pedestrians are not allowed to cross here
-                        if (!junctionManager.IsPedestrianCrossingAllowed(
+                        if (!junctionManager.GetValueOrDefault(
                                 nextSegmentId,
-                                nextIsStartNode)) {
+                                nextIsStartNode,
+                                JunctionRestrictionFlags.AllowPedestrianCrossing)) {
                             if (isLogEnabled) {
                                 DebugLog(
                                     unitId,
@@ -3587,7 +3590,7 @@ private bool ProcessItemRouted(
                         prevIsCarLane && // u-turns for road vehicles only
                         (!isHeavyVehicle_ || isStockUturnPoint) && // only small vehicles may perform u-turns OR everyone at stock u-turn points
                         !prevIsOutgoingOneWay && // do not u-turn on one-ways
-                        junctionManager.IsUturnAllowed(prevSegmentId, nextIsStartNode);
+                        junctionManager.GetValueOrDefault(prevSegmentId, nextIsStartNode, JunctionRestrictionFlags.AllowUTurn);
 
                     if (isLogEnabled) {
                         DebugLog(
@@ -3600,7 +3603,7 @@ private bool ProcessItemRouted(
                             $"\tisStockUturnPoint={isStockUturnPoint}\n" +
                             $"\tprevIsOutgoingOneWay={prevIsOutgoingOneWay}\n" +
                             $"\tjManager.IsUturnAllowed(prevSegmentId, " +
-                            $"nextIsStartNode)={junctionManager.IsUturnAllowed(prevSegmentId, nextIsStartNode)}\n" +
+                            $"nextIsStartNode)={junctionManager.GetValueOrDefault(prevSegmentId, nextIsStartNode, JunctionRestrictionFlags.AllowUTurn)}\n" +
                             $"\tm_queueItem.vehicleId={queueItem_.vehicleId}\n" +
                             $"\tm_queueItem.spawned={queueItem_.spawned}\n" +
                             $"\tprevSegmentId={prevSegmentId}\n" +

TLM/TLM/Geometry/Impl/SegmentEndId.cs → TLM/TLM/Geometry/Impl/SegmentEndIdApi.cs

@@ -1,14 +1,16 @@
 namespace TrafficManager.Geometry.Impl {
+    using System;
     using TrafficManager.API.Traffic;
     using TrafficManager.Util.Extensions;
 
-    public class SegmentEndId : ISegmentEndId {
-        public SegmentEndId(ushort segmentId, ushort nodeId) {
+    [Obsolete("New code should use TrafficManager.Network.Data.SegmentId unless it needs to implement ISegmentEndId. ISegmentEndId should be deprecated in the future, and should be avoided in new APIs.")]
+    public class SegmentEndIdApi : ISegmentEndId {
+        public SegmentEndIdApi(ushort segmentId, ushort nodeId) {
             SegmentId = segmentId;
             StartNode = segmentId.ToSegment().IsStartNode(nodeId);
         }
 
-        public SegmentEndId(ushort segmentId, bool startNode) {
+        public SegmentEndIdApi(ushort segmentId, bool startNode) {
             SegmentId = segmentId;
             StartNode = startNode;
         }

TLM/TLM/Hook/Impl/HookFactory.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using TrafficManager.API.Hook;
+
+namespace TrafficManager.Hook.Impl {
+    public class HookFactory : IHookFactory {
+
+        public static IHookFactory Instance = new HookFactory();
+
+        public IJunctionRestrictionsHook JunctionRestrictionsHook => Manager.Impl.JunctionRestrictionsManager.Instance;
+    }
+}

TLM/TLM/Manager/Impl/ExtNodeManager.cs

@@ -90,7 +90,7 @@ public void AddSegment(ushort nodeId, ushort segmentId) {
             {
                 var replacement = new SegmentEndReplacement {
                     oldSegmentEndId = ExtNodes[nodeId].removedSegmentEndId,
-                    newSegmentEndId = new SegmentEndId(segmentId, nodeId),
+                    newSegmentEndId = new SegmentEndIdApi(segmentId, nodeId),
                 };
 
                 ExtNodes[nodeId].removedSegmentEndId = null;
@@ -100,7 +100,7 @@ public void AddSegment(ushort nodeId, ushort segmentId) {
 
         public void RemoveSegment(ushort nodeId, ushort segmentId) {
             if (ExtNodes[nodeId].segmentIds.Remove(segmentId)) {
-                ExtNodes[nodeId].removedSegmentEndId = new SegmentEndId(segmentId, nodeId);
+                ExtNodes[nodeId].removedSegmentEndId = new SegmentEndIdApi(segmentId, nodeId);
             }
         }