updated network and moved internal junctions. refs #4252

eclipse-sumo · Jun 27, 2018 · c5ccd18 · c5ccd18
1 parent aa0ac79
commit c5ccd18
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/tests/sumo/junction_model/indirect_left_turn/straight_from_left/errors.sumo b/tests/sumo/junction_model/indirect_left_turn/straight_from_left/errors.sumo
diff --git a/tests/sumo/junction_model/indirect_left_turn/straight_from_left/net.net.xml b/tests/sumo/junction_model/indirect_left_turn/straight_from_left/net.net.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Di 19 Jun 2018 14:05:25 CEST by Eclipse SUMO netedit Version acf65a0
+<!-- generated on Wed 27 Jun 2018 09:22:24 AM CEST by Eclipse SUMO netedit Version 6446968
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
-        <sumo-net-file value="hbs_intersections_4.net.xml"/>
+        <sumo-net-file value="net.net.xml"/>
     </input>
 
     <output>
-        <output-file value="hbs_intersections_4.net.xml"/>
+        <output-file value="net.net.xml"/>
     </output>
 
     <processing>
@@ -20,10 +20,6 @@
         <walkingareas value="false"/>
     </processing>
 
-    <visualisation>
-        <registry-viewport value="true"/>
-    </visualisation>
-
 </configuration>
 -->
 
@@ -38,7 +34,7 @@
         <lane id=":C_1_0" index="0" allow="bicycle" speed="13.89" length="37.07" width="2.00" shape="211.41,111.64 174.35,110.70"/>
     </edge>
     <edge id=":C_2" function="internal">
-        <lane id=":C_2_0" index="0" allow="bicycle" speed="13.89" length="30.00" width="1.50" shape="211.41,111.64 200.79,113.20 192.30,113.30 189.09,113.20 188.62,106.89 188.58,105.65"/>
+        <lane id=":C_2_0" index="0" allow="bicycle" speed="13.89" length="23.00" width="1.50" shape="211.41,111.64 200.79,113.20 192.30,113.30 189.09,113.20 189.05,112.64"/>
     </edge>
     <edge id=":C_3" function="internal">
         <lane id=":C_3_0" index="0" disallow="bicycle" speed="13.89" length="13.26" width="3.00" shape="211.59,106.62 204.64,106.97 199.65,108.59 198.89,109.32"/>
@@ -47,16 +43,16 @@
         <lane id=":C_4_0" index="0" disallow="bicycle" speed="13.89" length="37.15" width="3.50" shape="211.59,106.62 174.45,105.55"/>
     </edge>
     <edge id=":C_5" function="internal">
-        <lane id=":C_5_0" index="0" speed="13.89" length="11.76" width="3.00" shape="211.71,103.37 202.41,102.21 200.20,101.31"/>
+        <lane id=":C_5_0" index="0" speed="13.89" length="10.96" width="3.00" shape="211.71,103.37 204.18,102.46 201.00,101.34"/>
     </edge>
     <edge id=":C_24" function="internal">
-        <lane id=":C_24_0" index="0" speed="13.89" length="16.20" width="1.50" shape="188.58,105.65 188.37,99.22 188.51,89.46"/>
+        <lane id=":C_24_0" index="0" speed="13.89" length="23.20" width="1.50" shape="189.05,112.64 188.62,106.89 188.37,99.22 188.51,89.46"/>
     </edge>
     <edge id=":C_25" function="internal">
         <lane id=":C_25_0" index="0" speed="13.89" length="7.47" width="3.00" shape="198.89,109.32 196.61,111.50 195.54,115.69"/>
     </edge>
     <edge id=":C_26" function="internal">
-        <lane id=":C_26_0" index="0" speed="13.89" length="16.36" width="3.00" shape="200.20,101.31 195.81,99.52 191.93,95.29 190.76,89.53"/>
+        <lane id=":C_26_0" index="0" speed="13.89" length="16.84" width="3.00" shape="201.00,101.34 197.38,100.06 192.51,95.86 190.76,89.53"/>
     </edge>
     <edge id=":C_6" function="internal">
         <lane id=":C_6_0" index="0" allow="bicycle" speed="13.89" length="16.58" width="2.00" shape="197.29,89.71 198.17,91.73 200.91,93.25 205.53,94.27 212.02,94.79"/>
@@ -68,7 +64,7 @@
         <lane id=":C_8_0" index="0" allow="bicycle" speed="13.89" length="26.03" width="1.50" shape="197.29,89.71 197.79,115.73"/>
     </edge>
     <edge id=":C_9" function="internal">
-        <lane id=":C_9_0" index="0" allow="bicycle" speed="13.89" length="14.14" width="2.00" shape="197.29,89.71 195.64,99.07 193.08,102.94"/>
+        <lane id=":C_9_0" index="0" allow="bicycle" speed="13.89" length="11.20" width="2.00" shape="197.29,89.71 195.00,97.24 192.89,99.83"/>
     </edge>
     <edge id=":C_10" function="internal">
         <lane id=":C_10_0" index="0" disallow="bicycle" speed="13.89" length="26.11" width="3.00" shape="194.04,89.62 195.54,115.69"/>
@@ -77,7 +73,7 @@
         <lane id=":C_11_0" index="0" disallow="bicycle" speed="13.89" length="7.06" width="3.50" shape="194.04,89.62 192.69,96.55"/>
     </edge>
     <edge id=":C_27" function="internal">
-        <lane id=":C_27_0" index="0" speed="13.89" length="21.27" width="2.00" shape="193.08,102.94 191.27,105.68 184.17,109.56 174.35,110.70"/>
+        <lane id=":C_27_0" index="0" speed="13.89" length="22.22" width="2.00" shape="192.89,99.83 189.47,104.03 182.11,108.91 174.35,110.70"/>
     </edge>
     <edge id=":C_28" function="internal">
         <lane id=":C_28_0" index="0" speed="13.89" length="21.64" width="3.50" shape="192.69,96.55 192.66,96.74 188.93,101.77 182.86,104.70 174.45,105.55"/>
@@ -89,7 +85,7 @@
         <lane id=":C_13_0" index="0" allow="bicycle" speed="13.89" length="37.34" width="2.00" shape="174.70,93.69 212.02,94.79"/>
     </edge>
     <edge id=":C_14" function="internal">
-        <lane id=":C_14_0" index="0" allow="bicycle" speed="13.89" length="35.15" width="1.50" shape="174.70,93.69 185.31,92.72 191.74,92.44 197.29,92.05 198.24,100.05 198.35,104.49"/>
+        <lane id=":C_14_0" index="0" allow="bicycle" speed="13.89" length="24.00" width="1.50" shape="174.70,93.69 185.31,92.72 191.74,92.44 197.29,92.05 197.45,93.39"/>
     </edge>
     <edge id=":C_15" function="internal">
         <lane id=":C_15_0" index="0" speed="13.89" length="13.05" width="3.00" shape="174.60,98.71 181.57,98.27 186.59,96.59 187.15,96.06"/>
@@ -98,16 +94,16 @@
         <lane id=":C_16_0" index="0" disallow="bicycle" speed="13.89" length="37.26" width="3.50" shape="174.60,98.71 211.83,99.94"/>
     </edge>
     <edge id=":C_17" function="internal">
-        <lane id=":C_17_0" index="0" disallow="bicycle" speed="13.89" length="12.46" width="3.00" shape="174.53,101.96 183.82,103.00 186.71,104.15"/>
+        <lane id=":C_17_0" index="0" disallow="bicycle" speed="13.89" length="11.63" width="3.00" shape="174.53,101.96 182.06,102.80 185.89,104.13"/>
     </edge>
     <edge id=":C_29" function="internal">
-        <lane id=":C_29_0" index="0" speed="13.89" length="11.27" width="1.50" shape="198.35,104.49 198.41,106.77 197.79,115.73"/>
+        <lane id=":C_29_0" index="0" speed="13.89" length="22.41" width="1.50" shape="197.45,93.39 198.24,100.05 198.41,106.77 197.79,115.73"/>
     </edge>
     <edge id=":C_30" function="internal">
         <lane id=":C_30_0" index="0" speed="13.89" length="7.75" width="3.00" shape="187.15,96.06 189.65,93.68 190.76,89.53"/>
     </edge>
     <edge id=":C_31" function="internal">
-        <lane id=":C_31_0" index="0" speed="13.89" length="15.70" width="3.00" shape="186.71,104.15 190.42,105.63 194.32,109.86 195.54,115.69"/>
+        <lane id=":C_31_0" index="0" speed="13.89" length="16.17" width="3.00" shape="185.89,104.13 188.86,105.16 193.75,109.36 195.54,115.69"/>
     </edge>
     <edge id=":C_18" function="internal">
         <lane id=":C_18_0" index="0" allow="bicycle" speed="13.89" length="16.56" width="2.00" shape="189.11,115.56 188.22,113.55 185.46,112.07 180.84,111.12 174.35,110.70"/>
@@ -119,7 +115,7 @@
         <lane id=":C_20_0" index="0" allow="bicycle" speed="13.89" length="26.11" width="1.50" shape="189.11,115.56 188.51,89.46"/>
     </edge>
     <edge id=":C_21" function="internal">
-        <lane id=":C_21_0" index="0" allow="bicycle" speed="13.89" length="14.21" width="2.00" shape="189.11,115.56 190.69,106.17 193.27,102.26"/>
+        <lane id=":C_21_0" index="0" allow="bicycle" speed="13.89" length="11.15" width="2.00" shape="189.11,115.56 191.36,108.05 193.45,105.49"/>
     </edge>
     <edge id=":C_22" function="internal">
         <lane id=":C_22_0" index="0" speed="13.89" length="26.15" width="3.00" shape="192.36,115.63 190.76,89.53"/>
@@ -128,7 +124,7 @@
         <lane id=":C_23_0" index="0" disallow="bicycle" speed="13.89" length="6.99" width="3.50" shape="192.36,115.63 193.64,108.76"/>
     </edge>
     <edge id=":C_32" function="internal">
-        <lane id=":C_32_0" index="0" speed="13.89" length="21.19" width="2.00" shape="193.27,102.26 195.03,99.58 202.14,95.79 212.02,94.79"/>
+        <lane id=":C_32_0" index="0" speed="13.89" length="22.17" width="2.00" shape="193.45,105.49 196.89,101.29 204.25,96.48 212.02,94.79"/>
     </edge>
     <edge id=":C_33" function="internal">
         <lane id=":C_33_0" index="0" speed="13.89" length="21.59" width="3.50" shape="193.64,108.76 193.69,108.50 197.38,103.51 203.42,100.66 211.83,99.94"/>
@@ -185,10 +181,10 @@
     <junction id="C" type="traffic_light" x="193.18" y="102.90" incLanes="EW1_0 EW1_1 EW1_2 EW1_3 SN1_0 SN1_1 WE1_0 WE1_1 WE1_2 WE1_3 NS1_0 NS1_1" intLanes=":C_0_0 :C_1_0 :C_24_0 :C_25_0 :C_4_0 :C_26_0 :C_6_0 :C_7_0 :C_8_0 :C_27_0 :C_10_0 :C_28_0 :C_12_0 :C_13_0 :C_29_0 :C_30_0 :C_16_0 :C_31_0 :C_18_0 :C_19_0 :C_20_0 :C_32_0 :C_22_0 :C_33_0" shape="211.37,112.64 212.06,93.80 198.92,89.76 187.76,89.44 174.72,92.69 174.33,111.70 187.48,115.53 198.54,115.75">
         <request index="0"  response="000000000000000000000000" foes="000000100100010100000000" cont="0"/>
         <request index="1"  response="101000000000101000000000" foes="111111100100111100000000" cont="0"/>
-        <request index="2"  response="101000011011101000010000" foes="111100011011111100010000" cont="1"/>
+        <request index="2"  response="101000111111101000010000" foes="111100111111111100010000" cont="1"/>
         <request index="3"  response="000000000000000000000110" foes="000000100100010100000110" cont="1"/>
         <request index="4"  response="101000000000101000000000" foes="111111100100111100000000" cont="0"/>
-        <request index="5"  response="101000011011101000000000" foes="111100011011111100000000" cont="1"/>
+        <request index="5"  response="101000011111101000000000" foes="111100011111111100000000" cont="1"/>
         <request index="6"  response="000000010010000000000000" foes="101000010010000000000000" cont="0"/>
         <request index="7"  response="000000010010000000000000" foes="101000010010000000000000" cont="0"/>
         <request index="8"  response="000000110110000000111111" foes="101000110110000000111111" cont="0"/>
@@ -197,10 +193,10 @@
         <request index="11" response="010111110110000000110110" foes="010111110110000000110110" cont="1"/>
         <request index="12" response="000000000000000000000000" foes="010100000000000000100100" cont="0"/>
         <request index="13" response="101000000000101000000000" foes="111100000000111111100100" cont="0"/>
-        <request index="14" response="101000010000101000011011" foes="111100010000111100011011" cont="1"/>
+        <request index="14" response="101000010000101000011011" foes="111100010000111100111111" cont="1"/>
         <request index="15" response="000000000110000000000000" foes="010100000110000000100100" cont="1"/>
         <request index="16" response="101000000000101000000000" foes="111100000000111111100100" cont="0"/>
-        <request index="17" response="101000000000101000011011" foes="111100000000111100011011" cont="1"/>
+        <request index="17" response="101000000000101000011011" foes="111100000000111100011111" cont="1"/>
         <request index="18" response="000000000000000000010010" foes="000000000000101000010010" cont="0"/>
         <request index="19" response="000000000000000000010010" foes="000000000000101000010010" cont="0"/>
         <request index="20" response="000000111111000000110110" foes="000000111111101000110110" cont="0"/>
@@ -217,20 +213,20 @@
     <junction id="gneJ6" type="dead_end" x="192.25" y="211.77" incLanes="" intLanes="" shape="192.25,211.77 185.75,211.65"/>
     <junction id="gneJ8" type="dead_end" x="409.35" y="109.02" incLanes="" intLanes="" shape="409.35,109.02 408.95,119.91"/>
 
-    <junction id=":C_24_0" type="internal" x="188.58" y="105.65" incLanes=":C_2_0 WE1_0 WE1_2" intLanes=":C_4_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_12_0 :C_13_0 :C_15_0 :C_16_0 :C_20_0 :C_21_0 :C_22_0 :C_23_0"/>
+    <junction id=":C_24_0" type="internal" x="189.05" y="112.64" incLanes=":C_2_0 WE1_0 WE1_2" intLanes=":C_4_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_12_0 :C_13_0 :C_14_0 :C_15_0 :C_16_0 :C_17_0 :C_20_0 :C_21_0 :C_22_0 :C_23_0"/>
     <junction id=":C_25_0" type="internal" x="198.89" y="109.32" incLanes=":C_3_0 EW1_0" intLanes=":C_1_0 :C_2_0 :C_8_0 :C_10_0 :C_14_0 :C_17_0"/>
-    <junction id=":C_26_0" type="internal" x="200.20" y="101.31" incLanes=":C_5_0 WE1_0 WE1_2" intLanes=":C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_12_0 :C_13_0 :C_15_0 :C_16_0 :C_20_0 :C_21_0 :C_22_0 :C_23_0"/>
-    <junction id=":C_27_0" type="internal" x="193.08" y="102.94" incLanes=":C_9_0 NS1_0 NS1_1" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_5_0 :C_10_0 :C_13_0 :C_14_0 :C_16_0 :C_17_0 :C_18_0 :C_19_0 :C_20_0 :C_22_0"/>
+    <junction id=":C_26_0" type="internal" x="201.00" y="101.34" incLanes=":C_5_0 WE1_0 WE1_2" intLanes=":C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_12_0 :C_13_0 :C_14_0 :C_15_0 :C_16_0 :C_20_0 :C_21_0 :C_22_0 :C_23_0"/>
+    <junction id=":C_27_0" type="internal" x="192.89" y="99.83" incLanes=":C_9_0 NS1_0 NS1_1" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_5_0 :C_10_0 :C_13_0 :C_14_0 :C_16_0 :C_17_0 :C_18_0 :C_19_0 :C_20_0 :C_22_0"/>
     <junction id=":C_28_0" type="internal" x="192.69" y="96.55" incLanes=":C_11_0 NS1_0 NS1_1" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_5_0 :C_13_0 :C_14_0 :C_16_0 :C_17_0 :C_18_0 :C_19_0 :C_20_0 :C_22_0"/>
-    <junction id=":C_29_0" type="internal" x="198.35" y="104.49" incLanes=":C_14_0 EW1_0 EW1_2" intLanes=":C_0_0 :C_1_0 :C_3_0 :C_4_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_16_0 :C_20_0 :C_21_0 :C_22_0 :C_23_0"/>
+    <junction id=":C_29_0" type="internal" x="197.45" y="93.39" incLanes=":C_14_0 EW1_0 EW1_2" intLanes=":C_0_0 :C_1_0 :C_2_0 :C_3_0 :C_4_0 :C_5_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_16_0 :C_20_0 :C_21_0 :C_22_0 :C_23_0"/>
     <junction id=":C_30_0" type="internal" x="187.15" y="96.06" incLanes=":C_15_0 WE1_0" intLanes=":C_2_0 :C_5_0 :C_13_0 :C_14_0 :C_20_0 :C_22_0"/>
-    <junction id=":C_31_0" type="internal" x="186.71" y="104.15" incLanes=":C_17_0 EW1_0 EW1_2" intLanes=":C_0_0 :C_1_0 :C_3_0 :C_4_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_20_0 :C_21_0 :C_22_0 :C_23_0"/>
-    <junction id=":C_32_0" type="internal" x="193.27" y="102.26" incLanes=":C_21_0 SN1_0 SN1_1" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_5_0 :C_6_0 :C_7_0 :C_8_0 :C_10_0 :C_13_0 :C_14_0 :C_16_0 :C_17_0 :C_22_0"/>
+    <junction id=":C_31_0" type="internal" x="185.89" y="104.13" incLanes=":C_17_0 EW1_0 EW1_2" intLanes=":C_0_0 :C_1_0 :C_2_0 :C_3_0 :C_4_0 :C_8_0 :C_9_0 :C_10_0 :C_11_0 :C_20_0 :C_21_0 :C_22_0 :C_23_0"/>
+    <junction id=":C_32_0" type="internal" x="193.45" y="105.49" incLanes=":C_21_0 SN1_0 SN1_1" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_5_0 :C_6_0 :C_7_0 :C_8_0 :C_10_0 :C_13_0 :C_14_0 :C_16_0 :C_17_0 :C_22_0"/>
     <junction id=":C_33_0" type="internal" x="193.64" y="108.76" incLanes=":C_23_0 SN1_0 SN1_1" intLanes=":C_1_0 :C_2_0 :C_4_0 :C_5_0 :C_6_0 :C_7_0 :C_8_0 :C_10_0 :C_13_0 :C_14_0 :C_16_0 :C_17_0"/>
 
     <connection from="EW1" to="SN2" fromLane="0" toLane="0" via=":C_0_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="0" dir="r" state="O"/>
     <connection from="EW1" to="EW2" fromLane="0" toLane="0" via=":C_1_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="1" dir="s" state="O"/>
-    <connection from="EW1" to="NS2" fromLane="0" toLane="0" contPos="30.00" shape="211.41,111.64 200.79,113.20 192.30,113.30 189.09,113.20 188.62,106.89 188.37,99.22 188.51,89.46" via=":C_2_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="2" dir="l" state="o"/>
+    <connection from="EW1" to="NS2" fromLane="0" toLane="0" contPos="23.00" shape="211.41,111.64 200.79,113.20 192.30,113.30 189.09,113.20 188.62,106.89 188.37,99.22 188.51,89.46" via=":C_2_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="2" dir="l" state="o"/>
     <connection from="EW1" to="SN2" fromLane="2" toLane="1" via=":C_3_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="3" dir="r" state="o"/>
     <connection from="EW1" to="EW2" fromLane="2" toLane="2" via=":C_4_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="4" dir="s" state="O"/>
     <connection from="EW1" to="NS2" fromLane="3" toLane="1" via=":C_5_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="5" dir="l" state="o"/>
@@ -248,7 +244,7 @@
     <connection from="SN1" to="EW2" fromLane="1" toLane="2" via=":C_11_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="11" dir="l" state="o"/>
     <connection from="WE1" to="NS2" fromLane="0" toLane="0" via=":C_12_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="12" dir="r" state="O"/>
     <connection from="WE1" to="WE2" fromLane="0" toLane="0" via=":C_13_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="13" dir="s" state="O"/>
-    <connection from="WE1" to="SN2" fromLane="0" toLane="0" shape="174.70,93.69 185.31,92.72 191.74,92.44 197.29,92.05 198.24,100.05 198.41,106.77 197.79,115.73" via=":C_14_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="14" dir="l" state="o"/>
+    <connection from="WE1" to="SN2" fromLane="0" toLane="0" contPos="24.00" shape="174.70,93.69 185.31,92.72 191.74,92.44 197.29,92.05 198.24,100.05 198.41,106.77 197.79,115.73" via=":C_14_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="14" dir="l" state="o"/>
     <connection from="WE1" to="NS2" fromLane="2" toLane="1" via=":C_15_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="15" dir="r" state="o"/>
     <connection from="WE1" to="WE2" fromLane="2" toLane="2" via=":C_16_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="16" dir="s" state="O"/>
     <connection from="WE1" to="SN2" fromLane="3" toLane="1" via=":C_17_0" tl="_gneJ24_gneJ25_gneJ26_gneJ27_gneJ28_gneJ29_gneJ30_gneJ31" linkIndex="17" dir="l" state="o"/>