added test refs #10458, #21

tests/sumo/sublane_model/bugs/testsuite.sumo

@@ -73,6 +73,9 @@ ticket10458
 # collision
 ticket10458b
 
+# collision
+ticket10458c
+
 # deadlock
 ticket10509
 

tests/sumo/sublane_model/bugs/ticket10458c/errors.sumo

@@ -0,0 +1,2 @@
+Warning: Teleporting vehicle 'b.1'; junction collision with vehicle 'b.0', lane=':C_2_0', gap=-1.97', latGap=-0.58, time=14.00 stage=move.
+Warning: Vehicle 'b.1' ends teleporting on edge 'E4', time=16.00.

tests/sumo/sublane_model/bugs/ticket10458c/input_routes.rou.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2022-04-07 09:49:27 by Eclipse SUMO netedit Version v1_12_0+2009-12c4140
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+    <vType id="bike" vClass="bicycle"/>
+    <flow id="b" type="bike" begin="0.00" number="6" end="1" departPosLat="free" arrivalLane="0" departPos="-1">
+        <route edges="E0 E1 E4"/>
+    </flow>
+</routes>

tests/sumo/sublane_model/bugs/ticket10458c/net.net.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2022-04-08 10:26:03 by Eclipse SUMO netedit Version v1_12_0+2053-f71860f
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+
+    <input>
+        <sumo-net-file value="net.net.xml"/>
+    </input>
+
+    <output>
+        <output-file value="net.net.xml"/>
+    </output>
+
+    <processing>
+        <geometry.min-radius.fix.railways value="false"/>
+        <geometry.max-grade.fix value="false"/>
+        <offset.disable-normalization value="true"/>
+        <lefthand value="false"/>
+    </processing>
+
+    <junctions>
+        <no-turnarounds value="true"/>
+        <junctions.corner-detail value="5"/>
+        <junctions.limit-turn-speed value="5.5"/>
+        <rectangular-lane-cut value="false"/>
+    </junctions>
+
+    <pedestrian>
+        <walkingareas value="false"/>
+    </pedestrian>
+
+    <report>
+        <aggregate-warnings value="5"/>
+    </report>
+
+</configuration>
+-->
+
+<net version="1.9" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+
+    <location netOffset="0.00,0.00" convBoundary="-14.79,71.90,25.49,127.88" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <edge id=":C_0" function="internal">
+        <lane id=":C_0_0" index="0" speed="6.46" length="8.92" width="1.60" shape="18.74,89.52 19.10,91.63 20.24,93.15 22.17,94.08 24.89,94.41"/>
+    </edge>
+    <edge id=":C_1" function="internal">
+        <lane id=":C_1_0" index="0" speed="13.89" length="14.45" shape="18.74,89.52 19.23,103.96"/>
+    </edge>
+    <edge id=":C_2" function="internal">
+        <lane id=":C_2_0" index="0" speed="13.89" length="13.97" width="1.60" shape="11.38,97.57 14.63,97.06 17.41,95.96 20.56,94.87 24.89,94.41"/>
+    </edge>
+    <edge id=":C_3" function="internal">
+        <lane id=":C_3_0" index="0" speed="7.42" length="11.51" shape="11.38,97.57 14.81,97.97 17.26,99.17 18.73,101.17 19.23,103.96"/>
+    </edge>
+    <edge id=":J2_0" function="internal">
+        <lane id=":J2_0_0" index="0" speed="6.34" length="9.09" width="1.60" shape="25.56,94.42 28.03,94.81 29.77,95.89 30.79,97.67 31.09,100.14"/>
+        <lane id=":J2_0_1" index="1" speed="4.78" length="3.90" width="4.80" shape="25.52,97.62 26.58,97.79 27.32,98.25 27.76,99.01 27.89,100.07"/>
+    </edge>
+
+    <edge id="E0" from="J0" to="C" priority="-1" shape="-14.79,99.97 11.38,99.97">
+        <lane id="E0_0" index="0" speed="13.89" length="26.17" width="4.80" shape="-14.79,97.57 11.38,97.57"/>
+    </edge>
+    <edge id="E1" from="C" to="J2" priority="-1" shape="21.70,99.97 25.49,100.02">
+        <lane id="E1_0" index="0" speed="13.89" length="0.67" width="1.60" shape="24.89,94.41 25.56,94.42"/>
+        <lane id="E1_1" index="1" speed="13.89" length="0.67" width="4.80" shape="24.85,97.61 25.52,97.62"/>
+    </edge>
+    <edge id="E2" from="J3" to="C" priority="-1" shape="17.45,71.90 17.05,94.86">
+        <lane id="E2_0" index="0" speed="13.89" length="17.60" shape="19.05,71.93 18.74,89.52"/>
+    </edge>
+    <edge id="E3" from="C" to="J4" priority="-1" shape="17.63,102.93 17.71,127.88">
+        <lane id="E3_0" index="0" speed="13.89" length="23.91" shape="19.23,103.96 19.31,127.87"/>
+    </edge>
+    <edge id="E4" from="J2" to="J1" priority="-1">
+        <lane id="E4_0" index="0" speed="13.89" length="11.37" width="1.60" shape="31.09,100.14 30.84,111.51"/>
+        <lane id="E4_1" index="1" speed="13.89" length="11.37" width="4.80" shape="27.89,100.07 27.64,111.44"/>
+    </edge>
+
+    <tlLogic id="C" type="static" programID="0" offset="0">
+        <phase duration="5"  state="GGrr"/>
+        <phase duration="3"  state="yyrr"/>
+        <phase duration="42" state="rrGG"/>
+        <phase duration="3"  state="rryy"/>
+    </tlLogic>
+
+    <junction id="C" type="traffic_light" x="16.54" y="99.97" incLanes="E2_0 E0_0" intLanes=":C_0_0 :C_1_0 :C_2_0 :C_3_0" shape="17.63,103.97 20.83,103.96 21.27,101.74 21.82,100.97 22.60,100.43 23.60,100.11 24.82,100.01 24.90,93.61 22.34,93.13 21.45,92.57 20.82,91.78 20.45,90.77 20.34,89.55 17.14,89.50 16.46,92.65 15.65,93.75 14.54,94.54 13.11,95.01 11.38,95.17 11.38,99.97 14.85,100.41 16.06,100.97 16.93,101.75 17.46,102.75">
+        <request index="0" response="0000" foes="0100" cont="0"/>
+        <request index="1" response="0000" foes="1100" cont="0"/>
+        <request index="2" response="0011" foes="0011" cont="0"/>
+        <request index="3" response="0010" foes="0010" cont="0"/>
+    </junction>
+    <junction id="J0" type="dead_end" x="-14.79" y="99.97" incLanes="" intLanes="" shape="-14.79,99.97 -14.79,95.17"/>
+    <junction id="J1" type="dead_end" x="25.24" y="111.38" incLanes="E4_0 E4_1" intLanes="" shape="31.63,111.53 25.24,111.38"/>
+    <junction id="J2" type="priority" x="25.49" y="100.02" incLanes="E1_0 E1_1" intLanes=":J2_0_0 :J2_0_1" shape="25.57,93.62 25.49,100.02 31.89,100.16 31.25,96.57 30.38,95.30 29.15,94.39 27.54,93.83">
+        <request index="0" response="00" foes="00" cont="0"/>
+        <request index="1" response="00" foes="00" cont="0"/>
+    </junction>
+    <junction id="J3" type="dead_end" x="17.45" y="71.90" incLanes="" intLanes="" shape="17.45,71.90 20.65,71.96"/>
+    <junction id="J4" type="dead_end" x="17.71" y="127.88" incLanes="E3_0" intLanes="" shape="20.91,127.87 17.71,127.88"/>
+
+    <connection from="E0" to="E1" fromLane="0" toLane="0" via=":C_2_0" tl="C" linkIndex="2" dir="s" state="o"/>
+    <connection from="E0" to="E3" fromLane="0" toLane="0" via=":C_3_0" tl="C" linkIndex="3" dir="l" state="o"/>
+    <connection from="E1" to="E4" fromLane="0" toLane="0" via=":J2_0_0" dir="l" state="M"/>
+    <connection from="E1" to="E4" fromLane="1" toLane="1" via=":J2_0_1" dir="l" state="M"/>
+    <connection from="E2" to="E1" fromLane="0" toLane="0" via=":C_0_0" tl="C" linkIndex="0" dir="r" state="O"/>
+    <connection from="E2" to="E3" fromLane="0" toLane="0" via=":C_1_0" tl="C" linkIndex="1" dir="s" state="O"/>
+
+    <connection from=":C_0" to="E1" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":C_1" to="E3" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":C_2" to="E1" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":C_3" to="E3" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":J2_0" to="E4" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":J2_0" to="E4" fromLane="1" toLane="1" dir="l" state="M"/>
+
+</net>

tests/sumo/sublane_model/bugs/ticket10458c/options.sumo

@@ -0,0 +1,4 @@
+-n net.net.xml
+-r input_routes.rou.xml
+--no-step-log
+--lateral-resolution 0.8