added test refs #10458, #21

tests/sumo/sublane_model/bugs/testsuite.sumo

@@ -70,5 +70,8 @@ ticket10060b
 # collision
 ticket10458
 
+# collision
+ticket10458b
+
 # deadlock
 ticket10509

tests/sumo/sublane_model/bugs/ticket10458b/errors.sumo

@@ -0,0 +1,3 @@
+Warning: Unused states in tlLogic 'C', program '0' in phase 0 after tl-index 2
+Warning: Teleporting vehicle 'b.1'; junction collision with vehicle 'b.0', lane=':C_2_0', gap=-1.99', latGap=-0.65, time=9.00 stage=laneChange.
+Warning: Vehicle 'b.1' ends teleporting on edge 'E1', time=9.00.

tests/sumo/sublane_model/bugs/ticket10458b/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"/>
+    </flow>
+</routes>

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

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2022-04-07 13:27:37 by Eclipse SUMO netedit Version v1_12_0+2026-df88210
+<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.83,60.49,128.10" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+
+    <edge id=":C_0" function="internal">
+        <lane id=":C_0_0" index="0" speed="13.89" length="14.55" shape="9.78,103.97 9.88,89.42"/>
+    </edge>
+    <edge id=":C_1" function="internal">
+        <lane id=":C_1_0" index="0" speed="13.89" length="14.47" shape="23.36,89.55 23.29,104.01"/>
+    </edge>
+    <edge id=":C_2" function="internal">
+        <lane id=":C_2_0" index="0" speed="13.89" length="24.99" width="1.60" shape="4.18,97.57 8.75,97.07 14.69,95.97 21.56,94.87 28.94,94.35"/>
+    </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="18.97" width="4.80" shape="-14.79,97.57 4.18,97.57"/>
+    </edge>
+    <edge id="E1" from="C" to="J2" priority="-1" shape="21.70,99.97 60.49,99.88">
+        <lane id="E1_0" index="0" speed="13.89" length="31.54" width="1.60" shape="28.94,94.35 60.48,94.28"/>
+        <lane id="E1_1" index="1" speed="13.89" length="31.54" width="4.80" shape="28.95,97.55 60.48,97.48"/>
+    </edge>
+    <edge id="E2" from="J3" to="C" priority="-1" shape="21.87,71.83 21.70,99.97">
+        <lane id="E2_0" index="0" speed="13.89" length="17.71" shape="23.47,71.84 23.36,89.55"/>
+    </edge>
+    <edge id="E3" from="C" to="J4" priority="-1" shape="21.70,99.97 21.62,128.10">
+        <lane id="E3_0" index="0" speed="13.89" length="24.09" shape="23.29,104.01 23.22,128.10"/>
+    </edge>
+    <edge id="E4" from="J6" to="C" priority="-1" shape="11.38,127.93 11.38,99.97">
+        <lane id="E4_0" index="0" speed="13.89" length="23.96" shape="9.78,127.93 9.78,103.97"/>
+    </edge>
+    <edge id="E5" from="C" to="J7" priority="-1" shape="11.38,99.97 11.64,72.09">
+        <lane id="E5_0" index="0" speed="13.89" length="17.35" shape="9.88,89.42 10.04,72.08"/>
+    </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="E4_0 E2_0 E0_0" intLanes=":C_0_0 :C_1_0 :C_2_0" shape="8.18,103.97 24.89,104.02 25.35,101.76 25.91,100.97 26.70,100.41 27.71,100.07 28.95,99.95 28.94,93.55 26.72,93.11 25.94,92.56 25.39,91.78 25.07,90.78 24.96,89.56 8.28,89.41 7.80,92.61 7.23,93.73 6.43,94.53 5.42,95.01 4.18,95.17 4.18,99.97 6.40,100.41 7.18,100.97 7.74,101.75 8.07,102.75">
+        <request index="0" response="000" foes="100" cont="0"/>
+        <request index="1" response="000" foes="100" cont="0"/>
+        <request index="2" response="011" foes="011" 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="J2" type="dead_end" x="60.49" y="99.88" incLanes="E1_0 E1_1" intLanes="" shape="60.48,93.48 60.49,99.88"/>
+    <junction id="J3" type="dead_end" x="21.87" y="71.83" incLanes="" intLanes="" shape="21.87,71.83 25.07,71.85"/>
+    <junction id="J4" type="dead_end" x="21.62" y="128.10" incLanes="E3_0" intLanes="" shape="24.82,128.11 21.62,128.10"/>
+    <junction id="J6" type="dead_end" x="11.38" y="127.93" incLanes="" intLanes="" shape="11.38,127.93 8.18,127.93"/>
+    <junction id="J7" type="dead_end" x="11.64" y="72.09" incLanes="E5_0" intLanes="" shape="8.44,72.06 11.64,72.09"/>
+
+    <connection from="E0" to="E1" fromLane="0" toLane="0" via=":C_2_0" tl="C" linkIndex="2" dir="s" 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="E4" to="E5" fromLane="0" toLane="0" via=":C_0_0" tl="C" linkIndex="0" dir="s" state="O"/>
+
+    <connection from=":C_0" to="E5" fromLane="0" toLane="0" dir="s" 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"/>
+
+</net>

tests/sumo/sublane_model/bugs/ticket10458b/options.sumo

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