Merge pull request #25 from FireController1847/1.10.15

Turn On Red (Previously Right On Red)

Author: krzychu124

TLM/TLM/Geometry/Impl/SegmentGeometry.cs

@@ -898,13 +898,30 @@ public bool IsIncomingStraightSegment(ushort toSegmentId, bool startNode) {
 			return contains;
 		}
 
-		/// <summary>
-		/// Determines if, according to the stored geometry data, the managed segment is only connected to highways at the given node.
-		/// 
-		/// A segment geometry verification is not performed.
-		/// </summary>
-		/// <returns>true, if, according to the stored geometry data, the managed segment is only connected to highways at the given node, false otherwise</returns>
-		public bool HasOnlyHighways(bool startNode) {
+        /// <summary>
+        /// Determines if, according to the stored geometry data, the segment is eligible for turn-on-red.
+        /// 
+        /// A segment geometry verification is not performed.
+        /// </summary>
+        /// <returns>true, if eligible for turn-on-red</returns>
+        public bool HasValidTurnOnRedOutgoingSegment(SegmentEndGeometry segmentEndGeometry) {
+            if (Constants.ServiceFactory.SimulationService.LeftHandDrive) {
+                return (segmentEndGeometry.NumOutgoingLeftSegments > 0 ||
+                    (IsOneWay() && (segmentEndGeometry.NumOutgoingLeftSegments > 0 || segmentEndGeometry.NumOutgoingRightSegments > 0 && segmentEndGeometry.OutgoingOneWay)));
+            } else {
+                return (segmentEndGeometry.NumOutgoingRightSegments > 0 ||
+                    (IsOneWay() && (segmentEndGeometry.NumOutgoingLeftSegments > 0 && segmentEndGeometry.OutgoingOneWay  || segmentEndGeometry.NumOutgoingRightSegments > 0)));
+            }
+        }
+
+
+        /// <summary>
+        /// Determines if, according to the stored geometry data, the managed segment is only connected to highways at the given node.
+        /// 
+        /// A segment geometry verification is not performed.
+        /// </summary>
+        /// <returns>true, if, according to the stored geometry data, the managed segment is only connected to highways at the given node, false otherwise</returns>
+        public bool HasOnlyHighways(bool startNode) {
 			SegmentEndGeometry endGeometry = startNode ? startNodeGeometry : endNodeGeometry;
 			return endGeometry.OnlyHighways;
 		}

TLM/TLM/Manager/IJunctionRestrictionsManager.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -14,14 +14,23 @@ public interface IJunctionRestrictionsManager {
 		/// <returns><code>true</code> if u-turns may be customized, <code>false</code> otherwise</returns>
 		bool IsUturnAllowedConfigurable(ushort segmentId, bool startNode, ref NetNode node);
 
-		/// <summary>
-		/// Determines if lane changing behavior may be controlled at the given segment end.
+        /// <summary>
+		/// Determines if turn-on-red behavior may be controlled at the given segment end.
 		/// </summary>
 		/// <param name="segmentId">segment id</param>
 		/// <param name="startNode">at start node?</param>
 		/// <param name="node">node data</param>
-		/// <returns><code>true</code> if lane changing may be customized, <code>false</code> otherwise</returns>
-		bool IsLaneChangingAllowedWhenGoingStraightConfigurable(ushort segmentId, bool startNode, ref NetNode node);
+		/// <returns><code>true</code> if turn-on-red may be customized, <code>false</code> otherwise</returns>
+		bool IsTurnOnRedAllowedConfigurable(ushort segmentId, bool startNode, ref NetNode node);
+
+        /// <summary>
+        /// Determines if lane changing behavior may be controlled at the given segment end.
+        /// </summary>
+        /// <param name="segmentId">segment id</param>
+        /// <param name="startNode">at start node?</param>
+        /// <param name="node">node data</param>
+        /// <returns><code>true</code> if lane changing may be customized, <code>false</code> otherwise</returns>
+        bool IsLaneChangingAllowedWhenGoingStraightConfigurable(ushort segmentId, bool startNode, ref NetNode node);
 
 		/// <summary>
 		/// Determines if entering blocked junctions may be controlled at the given segment end.
@@ -50,14 +59,23 @@ public interface IJunctionRestrictionsManager {
 		/// <returns><code>true</code> if u-turns are allowed by default, <code>false</code> otherwise</returns>
 		bool GetDefaultUturnAllowed(ushort segmentId, bool startNode, ref NetNode node);
 
-		/// <summary>
-		/// Determines the default setting for straight lane changes at the given segment end.
-		/// </summary>
-		/// <param name="segmentId">segment id</param>
-		/// <param name="startNode">at start node?</param>
-		/// <param name="node">node data</param>
-		/// <returns><code>true</code> if straight lane changes are allowed by default, <code>false</code> otherwise</returns>
-		bool GetDefaultLaneChangingAllowedWhenGoingStraight(ushort segmentId, bool startNode, ref NetNode node);
+        /// <summary>
+        /// Determines the default setting for turn-on-red at the given segment end.
+        /// </summary>
+        /// <param name="segmentId">segment id</param>
+        /// <param name="startNode">at start node?</param>
+        /// <param name="node">node data</param>
+        /// <returns><code>true</code> if turn-on-red is allowed by default, <code>false</code> otherwise</returns>
+        bool GetDefaultTurnOnRedAllowed(ushort segmentId, bool startNode, ref NetNode node);
+
+        /// <summary>
+        /// Determines the default setting for straight lane changes at the given segment end.
+        /// </summary>
+        /// <param name="segmentId">segment id</param>
+        /// <param name="startNode">at start node?</param>
+        /// <param name="node">node data</param>
+        /// <returns><code>true</code> if straight lane changes are allowed by default, <code>false</code> otherwise</returns>
+        bool GetDefaultLaneChangingAllowedWhenGoingStraight(ushort segmentId, bool startNode, ref NetNode node);
 
 		/// <summary>
 		/// Determines the default setting for entering a blocked junction at the given segment end.