From 1f1212c464879058bd0f6efce96392221c81ed86 Mon Sep 17 00:00:00 2001
From: leo <leo.lemaire007@orange.fr>
Date: Fri, 13 May 2022 00:33:29 +0200
Subject: [PATCH] fix IA

---
 Car.py                                 |   4 +-
 rdpt_polytech_burst_2_shortcut.rou.xml |  12 +--
 rdpt_polytech_shortcut.net.xml         | 130 ++++++++++++++-----------
 3 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/Car.py b/Car.py
index 06f73ce..8a14647 100644
--- a/Car.py
+++ b/Car.py
@@ -434,7 +434,9 @@ class Car():
 
         vb = (vleader + self.v) / 2
         bb = (bleader + self.b) / 2
-        vsec = vleader + (self.leaderDist - vleader * self.T - self.minSpace)/((vb/bb) + self.T) if vb != 0 else vleader
+        if vb == 0:
+            vb = bb
+        vsec = vleader + (self.leaderDist - vleader * self.T - self.minSpace)/((vb/bb) + self.T)
         vd = min(self.v + self.a * dt, vsec, vmax)
         self.v = max(0, vd-self.nu)
         self.updateGraph(self.v, vmax, vsec)
diff --git a/rdpt_polytech_burst_2_shortcut.rou.xml b/rdpt_polytech_burst_2_shortcut.rou.xml
index 2fdbb62..de932f4 100644
--- a/rdpt_polytech_burst_2_shortcut.rou.xml
+++ b/rdpt_polytech_burst_2_shortcut.rou.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-05-13 00:04:01 by Eclipse SUMO netedit Version 1.12.0
+<!-- generated on 2022-05-13 00:25:03 by Eclipse SUMO netedit Version 1.12.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <flow id="f_0" begin="0.00" end="3600.00" vehsPerHour="1800.00">
         <param key="burstInterval" value="30"/>
         <param key="burstTime" value="9"/>
-        <route edges="E2 30807871 26745293#0 318654808 941887916 600325951#0 600325949 600325948 143886851#0 26745142 E3"/>
+        <route edges="E2 30807871 26745293#0 318654808 941887916 600325951#0 600325949 600325948 143886851#0 26745142 26745142.145 E3"/>
     </flow>
     <flow id="f_1" begin="0.00" end="3600.00" vehsPerHour="1800.00">
         <param key="burstInterval" value="30"/>
@@ -22,17 +22,17 @@
     <flow id="f_3" begin="0.00" end="3600.00" vehsPerHour="1800.00">
         <param key="burstInterval" value="30"/>
         <param key="burstTime" value="7"/>
-        <route edges="E0 -318654806#1 E4 301625138 -30807871 -E2"/>
+        <route edges="E0 -318654806#1 -318654806#1.64 318654807#0 600325948 143886851#0 301625138 -30807871 -E2"/>
     </flow>
     <flow id="f_4" begin="0.00" end="3600.00" vehsPerHour="1800.00">
         <param key="burstInterval" value="30"/>
         <param key="burstTime" value="7"/>
-        <route edges="E0 -318654806#1 318654807#0 600325948 600325946 318654808 941887917#0 -143879980 -E1"/>
+        <route edges="E0 -318654806#1 -318654806#1.64 318654807#0 600325948 600325946 318654808 941887917#0 -143879980 -E1"/>
     </flow>
     <flow id="f_5" begin="0.00" end="3600.00" vehsPerHour="1800.00">
         <param key="burstInterval" value="30"/>
         <param key="burstTime" value="7"/>
-        <route edges="E0 -318654806#1 E4 26745142 E3"/>
+        <route edges="E0 -318654806#1 E4 26745142.145 E3"/>
     </flow>
     <flow id="f_7" begin="0.00" end="3600.00" vehsPerHour="1800.00">
         <param key="burstInterval" value="30"/>
@@ -42,7 +42,7 @@
     <flow id="f_8" begin="0.00" end="3600.00" vehsPerHour="1800.00">
         <param key="burstInterval" value="30"/>
         <param key="burstTime" value="15"/>
-        <route edges="E1 143879980 941887918#0 600325951#0 600325949 600325948 143886851#0 26745142 E3"/>
+        <route edges="E1 143879980 941887918#0 600325951#0 600325949 600325948 143886851#0 26745142 26745142.145 E3"/>
     </flow>
     <flow id="f_9" begin="0.00" end="3600.00" vehsPerHour="1800.00">
         <param key="burstInterval" value="30"/>
diff --git a/rdpt_polytech_shortcut.net.xml b/rdpt_polytech_shortcut.net.xml
index 056539f..47ba40c 100644
--- a/rdpt_polytech_shortcut.net.xml
+++ b/rdpt_polytech_shortcut.net.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-05-13 00:03:31 by Eclipse SUMO netedit Version 1.12.0
+<!-- generated on 2022-05-13 00:24:53 by Eclipse SUMO netedit Version 1.12.0
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
-        <sumo-net-file value="/home/leo/Sketchbook/python/Traffic/rdpt_polytech_fixed.net.xml"/>
+        <sumo-net-file value="/home/leo/Sketchbook/python/Traffic/rdpt_polytech_shortcut.net.xml"/>
     </input>
 
     <output>
@@ -76,16 +76,10 @@
     <type id="railway.tram" priority="17" numLanes="1" speed="13.89" allow="tram" oneway="1"/>
 
     <edge id=":293352605_0" function="internal">
-        <lane id=":293352605_0_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="18.05" length="19.27" shape="396.70,371.83 395.40,367.60 393.82,362.61 392.06,357.70 390.23,353.70"/>
+        <lane id=":293352605_0_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="18.05" length="14.17" shape="395.35,367.53 394.31,364.05 393.29,360.73 392.10,357.48 390.53,354.23"/>
     </edge>
     <edge id=":293352605_1" function="internal">
-        <lane id=":293352605_1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="19.44" shape="396.70,371.83 395.77,367.50 395.11,362.26 394.55,357.00 393.89,352.60"/>
-    </edge>
-    <edge id=":293352605_2" function="internal">
-        <lane id=":293352605_2_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="10.48" length="18.42" shape="391.87,370.98 393.59,367.80 393.89,363.86 392.77,359.16 390.23,353.70"/>
-    </edge>
-    <edge id=":293352605_3" function="internal">
-        <lane id=":293352605_3_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="12.81" length="19.07" shape="391.87,370.98 393.76,367.80 394.73,363.67 394.77,358.61 393.89,352.60"/>
+        <lane id=":293352605_1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="14.42" shape="395.35,367.53 394.65,363.97 394.50,360.41 394.44,356.84 394.02,353.20"/>
     </edge>
     <edge id=":293353900_0" function="internal">
         <lane id=":293353900_0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="0.32" shape="388.74,327.76 388.67,327.45"/>
@@ -100,22 +94,16 @@
         <lane id=":293354399_1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="8.70" shape="397.12,414.65 395.39,412.75 394.33,411.32 393.56,409.71 392.75,407.28"/>
     </edge>
     <edge id=":296978977_0" function="internal">
-        <lane id=":296978977_0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="12.38" shape="362.98,398.23 359.93,396.89 357.22,396.04 354.44,395.37 351.18,394.57"/>
+        <lane id=":296978977_0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="4.04" shape="362.98,398.23 361.91,397.68 361.17,397.33 360.40,397.05 359.25,396.73"/>
     </edge>
     <edge id=":296978977_1" function="internal">
-        <lane id=":296978977_1_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="6.09" length="12.61" shape="362.98,398.23 358.61,395.66 356.53,393.52 356.74,391.79 359.24,390.49"/>
+        <lane id=":296978977_1_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="5.49" length="11.77" shape="362.98,398.23 359.72,396.29 359.07,395.08 361.04,394.60 365.62,394.85"/>
     </edge>
     <edge id=":296978977_2" function="internal">
-        <lane id=":296978977_2_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="5.31" length="10.88" shape="362.98,398.23 359.62,396.28 358.67,395.04 360.14,394.51 364.02,394.69"/>
+        <lane id=":296978977_2_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="5.69" shape="360.07,393.64 361.70,394.09 362.81,394.41 363.94,394.64 365.62,394.85"/>
     </edge>
     <edge id=":296978977_3" function="internal">
-        <lane id=":296978977_3_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="11.11" length="7.48" shape="352.01,391.48 354.13,391.87 355.64,391.73 357.13,391.22 359.24,390.49"/>
-    </edge>
-    <edge id=":296978977_4" function="internal">
-        <lane id=":296978977_4_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="12.45" shape="352.01,391.48 355.22,392.45 357.96,393.37 360.72,394.15 364.02,394.69"/>
-    </edge>
-    <edge id=":296978977_5" function="internal">
-        <lane id=":296978977_5_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="3.65" length="4.67" shape="352.01,391.48 352.96,392.56 353.14,393.44 352.55,394.11 351.18,394.57"/>
+        <lane id=":296978977_3_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="3.65" length="4.67" shape="360.07,393.64 361.03,394.72 361.21,395.59 360.61,396.26 359.25,396.73"/>
     </edge>
     <edge id=":3241296483_0" function="internal">
         <lane id=":3241296483_0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="0.18" shape="369.52,238.83 369.51,238.77 369.50,238.74 369.49,238.70 369.48,238.65"/>
@@ -192,6 +180,18 @@
     <edge id=":878876594_1" function="internal">
         <lane id=":878876594_1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="8.18" shape="397.32,389.31 399.13,387.68 400.34,386.45 401.69,385.50 403.91,384.68"/>
     </edge>
+    <edge id=":J6_0" function="internal">
+        <lane id=":J6_0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="10.21" length="8.04" shape="299.11,394.57 301.20,393.68 302.36,392.56 303.22,391.04 304.41,388.95"/>
+    </edge>
+    <edge id=":J6_1" function="internal">
+        <lane id=":J6_1_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="8.06" shape="299.11,394.57 301.39,393.84 302.94,393.33 304.52,392.88 306.85,392.37"/>
+    </edge>
+    <edge id=":J7_0" function="internal">
+        <lane id=":J7_0_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="17.05" length="10.52" shape="310.46,256.25 309.59,253.28 309.04,251.09 308.12,249.12 306.16,246.85"/>
+    </edge>
+    <edge id=":J7_1" function="internal">
+        <lane id=":J7_1_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="22.22" length="10.51" shape="313.65,254.22 306.16,246.85"/>
+    </edge>
 
     <edge id="-143879980" from="4921070996" to="4921070995" name="Boulevard des Européens" priority="10" type="highway.tertiary" shape="453.43,448.73 467.57,467.55 483.45,489.28 500.31,512.89 512.44,529.86 523.49,546.98 533.62,563.60 552.22,594.77 568.78,622.99">
         <lane id="-143879980_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="209.00" shape="454.82,447.91 468.86,466.60 484.75,488.34 501.61,511.96 513.76,528.96 524.85,546.13 534.99,562.77 553.60,593.96 570.07,622.02">
@@ -203,8 +203,13 @@
             <param key="origId" value="30807871"/>
         </lane>
     </edge>
-    <edge id="-318654806#1" from="878876537" to="296978977" name="Route de Gachet" priority="3" type="highway.residential" shape="244.09,422.67 252.38,418.91 266.54,411.10 279.68,403.78 288.40,399.93 297.47,396.75 305.62,394.25 313.96,392.57 324.91,391.03 336.11,390.02 345.01,391.27 353.85,393.63">
-        <lane id="-318654806#1_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="115.57" shape="243.55,421.16 251.66,417.48 265.76,409.70 278.97,402.35 287.81,398.44 296.97,395.23 305.23,392.70 313.69,390.99 324.73,389.44 336.15,388.41 345.33,389.70 352.01,391.48">
+    <edge id="-318654806#1" from="878876537" to="J6" name="Route de Gachet" priority="3" type="highway.residential" shape="244.09,422.67 252.38,418.91 266.54,411.10 279.68,403.78 288.40,399.93 297.47,396.75 302.07,395.34">
+        <lane id="-318654806#1_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="61.74" shape="243.55,421.16 251.66,417.48 265.76,409.70 278.97,402.35 287.81,398.44 296.97,395.23 299.11,394.57">
+            <param key="origId" value="318654806"/>
+        </lane>
+    </edge>
+    <edge id="-318654806#1.64" from="J6" to="296978977" name="Route de Gachet" priority="3" type="highway.residential" shape="302.07,395.34 305.62,394.25 313.96,392.57 324.91,391.03 336.11,390.02 345.01,391.27 353.85,393.63">
+        <lane id="-318654806#1.64_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="54.12" shape="306.85,392.37 313.69,390.99 324.73,389.44 336.15,388.41 345.33,389.70 360.07,393.64">
             <param key="origId" value="318654806"/>
         </lane>
     </edge>
@@ -228,12 +233,17 @@
         </lane>
     </edge>
     <edge id="143886851#0" from="878876594" to="293352605" name="Rue Émile Borel" priority="10" type="highway.tertiary" spreadType="center" shape="399.77,386.38 398.83,381.12 397.53,374.49 395.35,367.53">
-        <lane id="143886851#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="10.81" shape="399.05,382.37 398.83,381.12 397.53,374.49 396.70,371.83">
+        <lane id="143886851#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="15.32" shape="399.05,382.37 398.83,381.12 397.53,374.49 395.35,367.53">
             <param key="origId" value="143886851"/>
         </lane>
     </edge>
-    <edge id="26745142" from="293352605" to="50695857" priority="9" type="highway.motorway_link" spreadType="center" shape="396.00,367.08 393.56,360.45 391.16,355.37 384.58,343.55 377.25,331.29 364.69,311.93 356.58,300.53 341.13,281.87 310.15,250.70 271.16,213.11 254.62,196.83 229.16,172.25 211.18,156.04 190.74,137.97 169.68,121.73 145.73,103.74 126.56,89.78 114.09,80.37">
-        <lane id="26745142_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="22.22" length="382.29" shape="390.23,353.70 384.58,343.55 377.25,331.29 364.69,311.93 356.58,300.53 341.13,281.87 310.15,250.70 271.16,213.11 254.62,196.83 229.16,172.25 211.18,156.04 190.74,137.97 169.68,121.73 145.73,103.74 126.56,89.78 121.26,85.78">
+    <edge id="26745142" from="293352605" to="J7" priority="9" type="highway.motorway_link" spreadType="center" shape="396.00,367.08 393.56,360.45 391.16,355.37 384.58,343.55 377.25,331.29 364.69,311.93 356.58,300.53 341.13,281.87 310.15,250.70">
+        <lane id="26745142_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="22.22" length="126.79" shape="390.53,354.23 384.58,343.55 377.25,331.29 364.69,311.93 356.58,300.53 341.13,281.87 313.65,254.22">
+            <param key="origId" value="26745142"/>
+        </lane>
+    </edge>
+    <edge id="26745142.145" from="J7" to="50695857" priority="9" type="highway.motorway_link" spreadType="center" shape="310.15,250.70 271.16,213.11 254.62,196.83 229.16,172.25 211.18,156.04 190.74,137.97 169.68,121.73 145.73,103.74 126.56,89.78 114.09,80.37">
+        <lane id="26745142.145_0" index="0" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" speed="22.22" length="245.61" shape="306.16,246.85 271.16,213.11 254.62,196.83 229.16,172.25 211.18,156.04 190.74,137.97 169.68,121.73 145.73,103.74 126.56,89.78 121.26,85.78">
             <param key="origId" value="26745142"/>
         </lane>
     </edge>
@@ -243,7 +253,7 @@
         </lane>
     </edge>
     <edge id="301625138" from="293352605" to="293353900" name="Rue Émile Borel" priority="10" type="highway.tertiary" spreadType="center" shape="396.90,367.12 388.71,327.59">
-        <lane id="301625138_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="25.37" shape="393.89,352.60 388.74,327.76">
+        <lane id="301625138_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="25.98" shape="394.02,353.20 388.74,327.76">
             <param key="origId" value="301625138"/>
         </lane>
     </edge>
@@ -253,12 +263,12 @@
         </lane>
     </edge>
     <edge id="318654806#0" from="296978977" to="878876537" name="Route de Gachet" priority="3" type="highway.residential" shape="353.85,393.63 345.01,391.27 336.11,390.02 324.91,391.03 313.96,392.57 305.62,394.25 297.47,396.75 288.40,399.93 279.68,403.78 266.54,411.10 252.38,418.91 244.09,422.67">
-        <lane id="318654806#0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="113.37" shape="351.18,394.57 344.69,392.84 336.07,391.63 325.09,392.62 314.23,394.15 306.01,395.80 297.97,398.27 288.99,401.42 280.39,405.21 267.32,412.50 253.10,420.34 244.87,424.07">
+        <lane id="318654806#0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="121.72" shape="359.25,396.73 344.69,392.84 336.07,391.63 325.09,392.62 314.23,394.15 306.01,395.80 297.97,398.27 288.99,401.42 280.39,405.21 267.32,412.50 253.10,420.34 244.87,424.07">
             <param key="origId" value="318654806"/>
         </lane>
     </edge>
     <edge id="318654807#0" from="296978977" to="3242647362" name="Route de Gachet" priority="3" type="highway.residential" spreadType="center" shape="353.85,393.63 376.30,395.96 384.24,395.80 388.57,395.06 392.38,393.83 394.16,393.04">
-        <lane id="318654807#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="25.33" shape="364.02,394.69 376.30,395.96 384.24,395.80 388.57,395.06 389.19,394.86">
+        <lane id="318654807#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="23.72" shape="365.62,394.85 376.30,395.96 384.24,395.80 388.57,395.06 389.19,394.86">
             <param key="origId" value="318654807"/>
         </lane>
     </edge>
@@ -314,15 +324,13 @@
     <edge id="E3" from="50695857" to="J3" priority="-1">
         <lane id="E3_0" index="0" speed="13.89" length="26.14" shape="118.72,84.48 95.34,72.77"/>
     </edge>
-    <edge id="E4" from="296978977" to="293352605" priority="-1" shape="353.85,393.63 356.13,393.05 358.35,392.43 360.53,391.78 362.65,391.09 364.73,390.37 366.76,389.61 368.74,388.82 370.66,387.99 372.54,387.13 374.37,386.23 376.15,385.30 377.88,384.33 379.56,383.33 381.19,382.29 382.77,381.22 384.31,380.11 385.79,378.97 387.22,377.79 388.61,376.58 389.94,375.33 391.22,374.05 392.46,372.74 393.64,371.38 394.78,370.00 395.86,368.58 396.90,367.12">
-        <lane id="E4_0" index="0" speed="13.89" length="38.53" shape="359.24,390.49 360.05,390.25 362.14,389.57 364.19,388.86 366.18,388.12 368.13,387.34 370.01,386.53 371.85,385.68 373.65,384.80 375.39,383.89 377.08,382.94 378.72,381.97 380.31,380.95 381.85,379.91 383.35,378.83 384.79,377.72 386.19,376.57 387.54,375.39 388.83,374.18 390.07,372.93 391.27,371.67 391.87,370.98"/>
+    <edge id="E4" from="J6" to="J7" priority="-1" shape="302.07,395.34 303.07,393.90 304.05,392.44 305.01,390.98 305.95,389.51 306.86,388.03 307.76,386.54 308.62,385.04 309.47,383.53 310.29,382.01 311.09,380.49 311.87,378.95 312.62,377.41 313.35,375.85 314.06,374.29 314.75,372.71 315.41,371.13 316.05,369.54 316.66,367.94 317.26,366.33 317.83,364.71 318.38,363.08 318.90,361.45 319.40,359.80 319.88,358.14 320.34,356.48 320.77,354.80 321.18,353.12 321.57,351.43 321.93,349.73 322.27,348.01 322.59,346.29 322.89,344.56 323.16,342.83 323.41,341.08 323.64,339.32 323.84,337.55 324.02,335.78 324.18,333.99 324.32,332.20 324.43,330.40 324.52,328.58 324.59,326.76 324.63,324.93 324.65,323.09 324.65,321.24 324.62,319.38 324.58,317.51 324.50,315.64 324.41,313.75 324.29,311.85 324.15,309.95 323.99,308.04 323.81,306.11 323.60,304.18 323.37,302.24 323.11,300.29 322.84,298.33 322.54,296.36 322.22,294.38 321.87,292.39 321.50,290.39 321.11,288.39 320.70,286.37 320.26,284.35 319.80,282.31 319.32,280.27 318.81,278.22 318.28,276.16 317.73,274.09 317.15,272.01 316.56,269.92 315.94,267.82 315.29,265.71 314.63,263.59 313.94,261.47 313.23,259.33 312.49,257.19 311.73,255.04 310.95,252.87 310.15,250.70">
+        <lane id="E4_0" index="0" speed="13.89" length="137.72" shape="304.41,388.95 304.59,388.66 305.49,387.20 306.38,385.73 307.23,384.25 308.07,382.76 308.88,381.26 309.67,379.76 310.44,378.24 311.18,376.72 311.90,375.18 312.60,373.64 313.28,372.08 313.93,370.52 314.56,368.96 315.16,367.38 315.76,365.79 316.32,364.19 316.86,362.58 317.37,360.97 317.87,359.35 318.34,357.70 318.79,356.07 319.22,354.41 319.62,352.75 320.01,351.08 320.36,349.41 320.70,347.71 321.02,346.01 321.31,344.30 321.58,342.59 321.82,340.86 322.05,339.13 322.25,337.38 322.43,335.63 322.59,333.86 322.72,332.09 322.83,330.31 322.92,328.51 322.99,326.71 323.03,324.90 323.05,323.08 323.05,321.25 323.02,319.41 322.98,317.56 322.90,315.71 322.81,313.84 322.69,311.96 322.55,310.08 322.40,308.18 322.22,306.27 322.01,304.36 321.78,302.44 321.52,300.50 321.26,298.56 320.96,296.61 320.64,294.65 320.30,292.67 319.93,290.69 319.54,288.70 319.13,286.70 318.70,284.70 318.24,282.67 317.76,280.65 317.26,278.61 316.73,276.56 316.19,274.51 315.61,272.44 315.02,270.36 314.41,268.28 313.76,266.18 313.11,264.08 312.42,261.97 311.71,259.84 310.98,257.72 310.46,256.25"/>
     </edge>
 
-    <junction id="293352605" type="priority" x="396.90" y="367.12" incLanes="143886851#0_0 E4_0" intLanes=":293352605_0_0 :293352605_1_0 :293352605_2_0 :293352605_3_0" shape="395.17,372.31 398.22,371.35 397.15,367.40 396.66,364.42 396.49,361.91 396.40,359.37 396.14,356.33 395.46,352.28 392.32,352.93 391.75,353.14 388.71,354.26 390.45,357.73 391.62,360.86 392.21,363.66 392.23,366.13 391.68,368.25 390.56,370.04 393.18,371.91 394.01,371.25 394.36,371.22 394.67,371.38 394.94,371.75">
-        <request index="0" response="0000" foes="1100" cont="0"/>
-        <request index="1" response="0000" foes="1000" cont="0"/>
-        <request index="2" response="0001" foes="0001" cont="0"/>
-        <request index="3" response="0011" foes="0011" cont="0"/>
+    <junction id="293352605" type="priority" x="396.90" y="367.12" incLanes="143886851#0_0" intLanes=":293352605_0_0 :293352605_1_0" shape="393.82,368.01 396.88,367.05 396.14,364.13 395.92,361.91 395.97,360.03 396.09,358.14 396.03,355.88 395.58,352.88 392.45,353.53 392.05,353.67 389.01,354.80 390.41,357.44 391.31,359.46 391.91,361.19 392.40,362.97 392.97,365.13">
+        <request index="0" response="00" foes="00" cont="0"/>
+        <request index="1" response="00" foes="00" cont="0"/>
     </junction>
     <junction id="293353900" type="priority" x="390.28" y="327.30" incLanes="301625138_0 30807871_0" intLanes=":293353900_0_0 :293353900_1_0" shape="387.18,328.13 393.42,326.67 393.37,326.43 387.11,327.79">
         <request index="0" response="00" foes="00" cont="0"/>
@@ -332,13 +340,11 @@
         <request index="0" response="00" foes="00" cont="0"/>
         <request index="1" response="00" foes="00" cont="0"/>
     </junction>
-    <junction id="296978977" type="right_before_left" x="353.85" y="393.63" incLanes="143879989#0_0 -318654806#1_0" intLanes=":296978977_0_0 :296978977_1_0 :296978977_2_0 :296978977_3_0 :296978977_4_0 :296978977_5_0" shape="362.26,399.65 363.70,396.80 363.85,396.28 364.18,393.09 361.02,392.70 360.06,392.52 359.50,392.35 359.36,392.19 359.64,392.05 358.85,388.94 356.49,389.80 355.64,390.10 354.79,390.26 353.77,390.22 352.42,389.94 350.77,396.12 353.26,396.73 355.14,397.12 356.68,397.46 358.19,397.88 359.95,398.56">
-        <request index="0" response="000000" foes="100000" cont="0"/>
-        <request index="1" response="011000" foes="011000" cont="0"/>
-        <request index="2" response="010000" foes="010000" cont="0"/>
-        <request index="3" response="000000" foes="000010" cont="0"/>
-        <request index="4" response="000000" foes="000110" cont="0"/>
-        <request index="5" response="000001" foes="000001" cont="0"/>
+    <junction id="296978977" type="right_before_left" x="353.85" y="393.63" incLanes="143879989#0_0 -318654806#1.64_0" intLanes=":296978977_0_0 :296978977_1_0 :296978977_2_0 :296978977_3_0" shape="362.26,399.65 363.70,396.80 363.30,396.46 363.47,396.37 363.88,396.34 364.54,396.36 365.45,396.44 365.78,393.26 363.79,392.99 363.10,392.83 362.42,392.64 361.60,392.40 360.48,392.09 358.83,398.27 360.15,398.66 360.60,398.83 361.03,399.03">
+        <request index="0" response="0000" foes="1000" cont="0"/>
+        <request index="1" response="0100" foes="0100" cont="0"/>
+        <request index="2" response="0000" foes="0010" cont="0"/>
+        <request index="3" response="0001" foes="0001" cont="0"/>
     </junction>
     <junction id="3241296483" type="priority" x="371.05" y="238.31" incLanes="-30807871_0 E2_0" intLanes=":3241296483_0_0 :3241296483_3_0 :3241296483_2_0" shape="367.96,239.16 374.22,237.81 374.16,237.55 374.13,237.46 374.11,237.37 374.02,237.11">
         <request index="0" response="000" foes="000" cont="0"/>
@@ -370,7 +376,7 @@
         <request index="0" response="00" foes="00" cont="0"/>
         <request index="1" response="00" foes="00" cont="0"/>
     </junction>
-    <junction id="50695857" type="priority" x="114.09" y="80.37" incLanes="26745142_0" intLanes=":50695857_0_0" shape="120.29,87.06 122.22,84.50 121.25,83.86 120.89,83.68 120.50,83.53 120.04,83.33 119.44,83.05 118.00,85.91 118.88,86.29 119.19,86.41 119.50,86.54 119.85,86.74">
+    <junction id="50695857" type="priority" x="114.09" y="80.37" incLanes="26745142.145_0" intLanes=":50695857_0_0" shape="120.29,87.06 122.22,84.50 121.25,83.86 120.89,83.68 120.50,83.53 120.04,83.33 119.44,83.05 118.00,85.91 118.88,86.29 119.19,86.41 119.50,86.54 119.85,86.74">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
     <junction id="878876537" type="priority" x="244.09" y="422.67" incLanes="318654806#0_0 E0_0" intLanes=":878876537_0_0 :878876537_3_0 :878876537_2_0" shape="245.53,425.53 242.88,419.70 245.05,425.72">
@@ -386,6 +392,14 @@
     <junction id="J1" type="dead_end" x="573.99" y="634.84" incLanes="-E1_0" intLanes="" shape="573.99,634.84 576.92,633.55 573.99,634.84"/>
     <junction id="J2" type="dead_end" x="367.16" y="226.80" incLanes="-E2_0" intLanes="" shape="367.16,226.80 364.13,227.82 367.16,226.80"/>
     <junction id="J3" type="dead_end" x="96.06" y="71.34" incLanes="E3_0" intLanes="" shape="94.63,74.20 96.06,71.34"/>
+    <junction id="J6" type="priority" x="302.07" y="395.34" incLanes="-318654806#1_0" intLanes=":J6_0_0 :J6_1_0" shape="307.33,393.91 306.38,390.83 305.66,390.86 305.48,390.74 305.44,390.53 305.52,390.24 305.72,389.87 303.10,388.03 301.39,391.23 300.82,391.94 299.96,392.53 298.64,393.04 299.58,396.10 302.42,395.19 303.41,394.86 304.42,394.57 305.65,394.26">
+        <request index="0" response="00" foes="00" cont="0"/>
+        <request index="1" response="00" foes="00" cont="0"/>
+    </junction>
+    <junction id="J7" type="priority" x="310.15" y="250.70" incLanes="E4_0 26745142_0" intLanes=":J7_0_0 :J7_1_0" shape="308.96,256.81 311.96,255.70 312.52,255.35 314.79,253.10 307.27,245.70 305.05,248.01 306.43,249.50 307.25,250.76 307.70,251.96 308.00,253.25 308.35,254.81">
+        <request index="0" response="10" foes="10" cont="0"/>
+        <request index="1" response="00" foes="01" cont="0"/>
+    </junction>
 
     <junction id=":3241296483_3_0" type="internal" x="370.75" y="236.92" incLanes=":3241296483_1_0 E2_0" intLanes=":3241296483_2_0"/>
     <junction id=":4921070995_3_0" type="internal" x="569.50" y="624.21" incLanes=":4921070995_2_0 E1_0" intLanes=":4921070995_0_0"/>
@@ -395,16 +409,17 @@
     <connection from="-143879980" to="143879980" fromLane="0" toLane="0" via=":4921070995_2_0" dir="t" state="m"/>
     <connection from="-30807871" to="-E2" fromLane="0" toLane="0" via=":3241296483_0_0" dir="s" state="M"/>
     <connection from="-30807871" to="30807871" fromLane="0" toLane="0" via=":3241296483_1_0" dir="t" state="m"/>
-    <connection from="-318654806#1" to="E4" fromLane="0" toLane="0" via=":296978977_3_0" dir="R" state="="/>
-    <connection from="-318654806#1" to="318654807#0" fromLane="0" toLane="0" via=":296978977_4_0" dir="s" state="="/>
-    <connection from="-318654806#1" to="318654806#0" fromLane="0" toLane="0" via=":296978977_5_0" dir="t" state="="/>
+    <connection from="-318654806#1" to="E4" fromLane="0" toLane="0" via=":J6_0_0" dir="R" state="M"/>
+    <connection from="-318654806#1" to="-318654806#1.64" fromLane="0" toLane="0" via=":J6_1_0" dir="s" state="M"/>
+    <connection from="-318654806#1.64" to="318654807#0" fromLane="0" toLane="0" via=":296978977_2_0" dir="s" state="="/>
+    <connection from="-318654806#1.64" to="318654806#0" fromLane="0" toLane="0" via=":296978977_3_0" dir="t" state="="/>
     <connection from="143879980" to="941887918#0" fromLane="0" toLane="0" via=":4921070996_0_0" dir="s" state="M"/>
     <connection from="143879989#0" to="318654806#0" fromLane="0" toLane="0" via=":296978977_0_0" dir="s" state="="/>
-    <connection from="143879989#0" to="E4" fromLane="0" toLane="0" via=":296978977_1_0" dir="l" state="="/>
-    <connection from="143879989#0" to="318654807#0" fromLane="0" toLane="0" via=":296978977_2_0" dir="l" state="="/>
+    <connection from="143879989#0" to="318654807#0" fromLane="0" toLane="0" via=":296978977_1_0" dir="l" state="="/>
     <connection from="143886851#0" to="26745142" fromLane="0" toLane="0" via=":293352605_0_0" dir="s" state="M"/>
     <connection from="143886851#0" to="301625138" fromLane="0" toLane="0" via=":293352605_1_0" dir="s" state="M"/>
-    <connection from="26745142" to="E3" fromLane="0" toLane="0" via=":50695857_0_0" dir="s" state="M"/>
+    <connection from="26745142" to="26745142.145" fromLane="0" toLane="0" via=":J7_1_0" dir="s" state="M"/>
+    <connection from="26745142.145" to="E3" fromLane="0" toLane="0" via=":50695857_0_0" dir="s" state="M"/>
     <connection from="26745293#0" to="318654808" fromLane="0" toLane="0" via=":3242646161_0_0" dir="s" state="m" visibility="9.00"/>
     <connection from="301625138" to="-30807871" fromLane="0" toLane="0" via=":293353900_0_0" dir="s" state="M"/>
     <connection from="30807871" to="26745293#0" fromLane="0" toLane="0" via=":293353900_1_0" dir="s" state="M"/>
@@ -425,23 +440,18 @@
     <connection from="E0" to="-318654806#1" fromLane="0" toLane="0" keepClear="0" via=":878876537_2_0" dir="s" state="M"/>
     <connection from="E1" to="143879980" fromLane="0" toLane="0" keepClear="0" via=":4921070995_0_0" dir="s" state="M"/>
     <connection from="E2" to="30807871" fromLane="0" toLane="0" keepClear="0" via=":3241296483_2_0" dir="s" state="M"/>
-    <connection from="E4" to="26745142" fromLane="0" toLane="0" via=":293352605_2_0" dir="r" state="m"/>
-    <connection from="E4" to="301625138" fromLane="0" toLane="0" via=":293352605_3_0" dir="R" state="m"/>
+    <connection from="E4" to="26745142.145" fromLane="0" toLane="0" via=":J7_0_0" dir="s" state="m"/>
 
     <connection from=":293352605_0" to="26745142" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":293352605_1" to="301625138" fromLane="0" toLane="0" dir="s" state="M"/>
-    <connection from=":293352605_2" to="26745142" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":293352605_3" to="301625138" fromLane="0" toLane="0" dir="R" state="M"/>
     <connection from=":293353900_0" to="-30807871" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":293353900_1" to="26745293#0" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":293354399_0" to="143879989#0" fromLane="0" toLane="0" dir="R" state="M"/>
     <connection from=":293354399_1" to="600325949" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":296978977_0" to="318654806#0" fromLane="0" toLane="0" dir="s" state="M"/>
-    <connection from=":296978977_1" to="E4" fromLane="0" toLane="0" dir="l" state="M"/>
-    <connection from=":296978977_2" to="318654807#0" fromLane="0" toLane="0" dir="l" state="M"/>
-    <connection from=":296978977_3" to="E4" fromLane="0" toLane="0" dir="R" state="M"/>
-    <connection from=":296978977_4" to="318654807#0" fromLane="0" toLane="0" dir="s" state="M"/>
-    <connection from=":296978977_5" to="318654806#0" fromLane="0" toLane="0" dir="t" state="M"/>
+    <connection from=":296978977_1" to="318654807#0" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":296978977_2" to="318654807#0" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":296978977_3" to="318654806#0" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from=":3241296483_0" to="-E2" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":3241296483_1" to="30807871" fromLane="0" toLane="0" via=":3241296483_3_0" dir="t" state="m"/>
     <connection from=":3241296483_3" to="30807871" fromLane="0" toLane="0" dir="t" state="M"/>
@@ -467,6 +477,10 @@
     <connection from=":878876537_2" to="-318654806#1" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":878876594_0" to="143886851#0" fromLane="0" toLane="0" dir="r" state="M"/>
     <connection from=":878876594_1" to="600325946" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":J6_0" to="E4" fromLane="0" toLane="0" dir="R" state="M"/>
+    <connection from=":J6_1" to="-318654806#1.64" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":J7_0" to="26745142.145" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":J7_1" to="26745142.145" fromLane="0" toLane="0" dir="s" state="M"/>
 
     <roundabout nodes="293354399 3242645066 3242646161 3242646366 3242647362 878876594" edges="318654808 600325946 600325948 600325949 600325951#0 941887916"/>