From 1d4bd5cda9b04206563878c601e864aa199e2fb8 Mon Sep 17 00:00:00 2001
From: namdre <jakob.erdmann@dlr.de>
Date: Sun, 20 Nov 2022 15:37:19 +0100
Subject: [PATCH] patching expected results refs #21, #10589

---
 .../bugs/ticket10589/errors.netconvert        |  18 ++
 .../bugs/ticket10589/knownbugs.netconvert     |   7 -
 .../bugs/ticket10589/net.netconvert           | 149 ++++++-----
 .../bugs/ticket10589/output.netconvert        |  53 ++++
 .../OSM/bugs/ticket5398/knownbugs.netconvert  |   7 -
 .../OSM/bugs/ticket5513/errors.netconvert     |   6 +-
 .../import/OSM/bugs/ticket5513/net.netconvert | 253 +++++++++++-------
 .../OSM/bugs/ticket871/errors.netconvert      |   1 +
 .../bugs/ticket871/joined_nodes.netconvert    |  11 +-
 .../import/OSM/bugs/ticket871/net.netconvert  |  61 +++--
 10 files changed, 368 insertions(+), 198 deletions(-)
 delete mode 100644 tests/netconvert/bugs/ticket10589/knownbugs.netconvert
 delete mode 100644 tests/netconvert/import/OSM/bugs/ticket5398/knownbugs.netconvert

diff --git a/tests/netconvert/bugs/ticket10589/errors.netconvert b/tests/netconvert/bugs/ticket10589/errors.netconvert
index e69de29bb2d..d9d6ed07479 100644
--- a/tests/netconvert/bugs/ticket10589/errors.netconvert
+++ b/tests/netconvert/bugs/ticket10589/errors.netconvert
@@ -0,0 +1,18 @@
+Warning: Removing pt stop '3214057380' on non existing edge '317671621#0'.
+Warning: Removing pt stop '3239586702' on non existing edge '887901759#1'.
+Warning: Cannot revise pt stop localization for pt line '10082594', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3239586702' from line '10082594'.
+Warning: Cannot revise pt stop localization for pt line '10082595', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3214057380' from line '10082595'.
+Warning: Cannot revise pt stop localization for pt line '2752852', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3239586702' from line '2752852'.
+Warning: Cannot revise pt stop localization for pt line '2770412', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3214057380' from line '2770412'.
+Warning: Cannot revise pt stop localization for pt line '2770413', which has no route edges. Ignoring!
+Warning: Removed invalid stop '3214057380' from line '2770413'.
+Warning: Removing pt stop '3214057380' on non existing edge ''.
+Warning: Removing pt stop '3239586702' on non existing edge ''.
+Warning: Removed 2 pt stops because they could not be assigned to the network
+Warning: Not joining junctions 35651824,35651826,56456270,56456273 (parallel outgoing 6146263#1,7745712#0).
+Warning: 14 total messages of type: Cannot revise pt stop localization for pt line '%', which has no route edges. Ignoring!
+Warning: 14 total messages of type: Removed invalid stop '%' from line '%'.
diff --git a/tests/netconvert/bugs/ticket10589/knownbugs.netconvert b/tests/netconvert/bugs/ticket10589/knownbugs.netconvert
deleted file mode 100644
index 9807407f22e..00000000000
--- a/tests/netconvert/bugs/ticket10589/knownbugs.netconvert
+++ /dev/null
@@ -1,7 +0,0 @@
-
-[Reported by Windows at 26Apr09:43:28]
-search_string:Join
-search_file:output
-ignore_other_errors:1
-full_description:strange junction shape after joining
-brief_description:see #10589
diff --git a/tests/netconvert/bugs/ticket10589/net.netconvert b/tests/netconvert/bugs/ticket10589/net.netconvert
index a1593f624de..1711bde359b 100644
--- a/tests/netconvert/bugs/ticket10589/net.netconvert
+++ b/tests/netconvert/bugs/ticket10589/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-04-26 09:40:55 by Eclipse SUMO netconvert Version v1_12_0+2169-dc900b9b64f
+<!-- generated on 2022-11-20 13:42:59 by Eclipse SUMO netconvert Version v1_15_0+0458-51ec704
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -14,7 +14,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
-        <type-files value="C:\Users\behr_mi\Projekte\sumo\repos\sumo\data\typemap\osmNetconvert.typ.xml"/>
         <osm-files value="data/osm_bbox.osm.xml.gz"/>
     </input>
 
@@ -57,7 +56,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <report>
         <verbose value="true"/>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
     </report>
 
 </configuration>
@@ -65,17 +63,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <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="-603780.39,-5791997.35" convBoundary="0.00,0.00,209.80,240.71" origBoundary="10.520775,52.268533,10.524070,52.271252" projParameter="+proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>
+    <location netOffset="-603780.39,-5791997.36" convBoundary="0.00,0.00,209.80,240.71" origBoundary="10.520775,52.268533,10.524070,52.271252" projParameter="+proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>
 
     <type id="highway.bridleway" priority="1" numLanes="1" speed="2.78" allow="pedestrian" oneway="1" width="2.00"/>
     <type id="highway.bus_guideway" priority="1" numLanes="1" speed="27.78" allow="bus" oneway="1"/>
-    <type id="highway.cycleway" priority="1" numLanes="1" speed="8.33" allow="bicycle" oneway="0" width="1.00"/>
+    <type id="highway.cycleway" priority="1" numLanes="1" speed="5.56" allow="bicycle" oneway="0" width="1.00"/>
     <type id="highway.footway" priority="1" numLanes="1" speed="2.78" allow="pedestrian" oneway="1" width="2.00"/>
     <type id="highway.ford" priority="1" numLanes="1" speed="2.78" allow="army" oneway="0"/>
     <type id="highway.living_street" priority="2" numLanes="1" speed="2.78" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
     <type id="highway.motorway" priority="14" numLanes="2" speed="39.44" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" oneway="1"/>
     <type id="highway.motorway_link" priority="9" numLanes="1" speed="22.22" allow="private emergency authority army vip passenger hov taxi bus coach delivery truck trailer motorcycle evehicle custom1 custom2" oneway="1"/>
-    <type id="highway.path" priority="1" numLanes="1" speed="2.78" allow="pedestrian bicycle" oneway="0" width="2.00"/>
+    <type id="highway.path" priority="1" numLanes="1" speed="5.56" allow="pedestrian bicycle" oneway="0" width="2.00"/>
     <type id="highway.pedestrian" priority="1" numLanes="1" speed="2.78" allow="pedestrian" oneway="1" width="2.00"/>
     <type id="highway.primary" priority="12" numLanes="2" speed="27.78" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
     <type id="highway.primary_link" priority="7" numLanes="1" speed="22.22" disallow="tram rail_urban rail rail_electric rail_fast ship" oneway="0"/>
@@ -107,6 +105,24 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <edge id=":35644756_0" function="internal">
         <lane id=":35644756_0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="3.65" length="4.67" shape="-0.88,59.65 -1.44,58.33 -1.34,57.44 -0.56,56.99 0.88,56.98"/>
     </edge>
+    <edge id=":35651826_0" function="internal">
+        <lane id=":35651826_0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="11.65" shape="143.95,154.79 134.21,148.41"/>
+    </edge>
+    <edge id=":35651826_1" function="internal">
+        <lane id=":35651826_1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="12.53" shape="143.95,154.79 142.81,153.36 142.12,150.88 141.91,147.35 142.16,142.76"/>
+    </edge>
+    <edge id=":35651826_2" function="internal">
+        <lane id=":35651826_2_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="3.65" length="4.67" shape="143.95,154.79 143.38,153.46 143.48,152.57 144.25,152.12 145.70,152.10"/>
+    </edge>
+    <edge id=":35651826_3" function="internal">
+        <lane id=":35651826_3_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="5.71" length="9.20" shape="135.97,145.73 138.44,146.92 140.30,146.82 141.54,145.44 142.16,142.76"/>
+    </edge>
+    <edge id=":35651826_4" function="internal">
+        <lane id=":35651826_4_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="11.63" shape="135.97,145.73 145.70,152.10"/>
+    </edge>
+    <edge id=":35651826_5" function="internal">
+        <lane id=":35651826_5_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="3.65" length="4.67" shape="135.97,145.73 136.53,147.06 136.42,147.95 135.65,148.40 134.21,148.41"/>
+    </edge>
     <edge id=":35651828_0" function="internal">
         <lane id=":35651828_0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="14.40" shape="55.00,96.36 42.96,88.45"/>
     </edge>
@@ -134,31 +150,29 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <edge id=":35651828_8" function="internal">
         <lane id=":35651828_8_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="3.65" length="4.67" shape="44.72,85.78 45.28,87.11 45.18,87.99 44.40,88.44 42.96,88.45"/>
     </edge>
-    <edge id=":cluster_35651824_35651826_56456270_56456273_0" function="internal">
-        <lane id=":cluster_35651824_35651826_56456270_56456273_0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="5.71" length="9.20" shape="135.97,145.73 138.44,146.92 140.30,146.82 141.54,145.44 142.16,142.76"/>
-    </edge>
-    <edge id=":cluster_35651824_35651826_56456270_56456273_1" function="internal">
-        <lane id=":cluster_35651824_35651826_56456270_56456273_1_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="9.70" length="25.82" shape="135.97,145.73 139.57,148.43 146.70,153.74 153.73,158.77 157.03,160.61"/>
+    <edge id=":56456270_0" function="internal">
+        <lane id=":56456270_0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="6.10" length="9.33" shape="152.34,156.38 154.66,157.39 156.60,157.22 158.16,155.87 159.35,153.35"/>
     </edge>
-    <edge id=":cluster_35651824_35651826_56456270_56456273_2" function="internal">
-        <lane id=":cluster_35651824_35651826_56456270_56456273_2_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="3.65" length="4.67" shape="135.97,145.73 136.53,147.06 136.42,147.95 135.65,148.40 134.21,148.41"/>
+    <edge id=":56456270_1" function="internal">
+        <lane id=":56456270_1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="3.66" length="4.71" shape="152.34,156.38 153.10,157.62 153.12,158.52 152.42,159.09 150.98,159.31"/>
     </edge>
-    <edge id=":cluster_35651824_35651826_56456270_56456273_3" function="internal">
-        <lane id=":cluster_35651824_35651826_56456270_56456273_3_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="11.11" length="29.41" shape="155.34,168.02 154.31,164.84 150.45,160.51 143.75,155.04 134.21,148.41"/>
+    <edge id=":56456270_2" function="internal">
+        <lane id=":56456270_2_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="7.97" length="9.60" shape="155.47,167.17 155.44,164.96 154.69,162.92 153.20,161.03 150.98,159.31"/>
     </edge>
-    <edge id=":cluster_35651824_35651826_56456270_56456273_4" function="internal">
-        <lane id=":cluster_35651824_35651826_56456270_56456273_4_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="11.11" length="28.99" shape="155.34,168.02 153.84,160.60 149.13,153.55 144.23,147.42 142.16,142.76"/>
-    </edge>
-    <edge id=":cluster_35651824_35651826_56456270_56456273_5" function="internal">
-        <lane id=":cluster_35651824_35651826_56456270_56456273_5_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="7.50" shape="155.34,168.02 155.68,165.79 155.96,164.27 156.36,162.77 157.03,160.61"/>
-        <lane id=":cluster_35651824_35651826_56456270_56456273_5_1" index="1" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="7.50" shape="158.46,168.77 158.79,166.61 159.06,165.13 159.43,163.68 160.08,161.59"/>
+    <edge id=":56456270_3" function="internal">
+        <lane id=":56456270_3_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="14.27" shape="155.47,167.17 156.22,162.98 156.99,160.16 157.97,157.39 159.35,153.35"/>
+        <lane id=":56456270_3_1" index="1" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="14.27" shape="158.59,167.92 159.33,163.79 160.08,161.02 161.04,158.30 162.39,154.32"/>
     </edge>
 
-    <edge id="-477680253#3" from="35651828" to="cluster_35651824_35651826_56456270_56456273" name="Kaiserstraße" priority="3" type="highway.residential" shape="49.80,91.03 79.56,110.58 141.36,151.19">
+    <edge id="-477680253#1" from="35651826" to="56456270" name="Kaiserstraße" priority="3" type="highway.residential" shape="141.36,151.19 149.42,156.42 152.03,158.08 158.56,161.10">
+        <lane id="-477680253#1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="7.90" shape="145.70,152.10 150.29,155.08 152.34,156.38">
+            <param key="origId" value="477680253 5137650"/>
+        </lane>
+    </edge>
+    <edge id="-477680253#3" from="35651828" to="35651826" name="Kaiserstraße" priority="3" type="highway.residential" shape="49.80,91.03 79.56,110.58 141.36,151.19">
         <lane id="-477680253#3_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="94.78" shape="56.75,93.69 80.44,109.25 135.97,145.73">
             <param key="origId" value="477680253"/>
         </lane>
-        <param key="origTo" value="35651826"/>
     </edge>
     <edge id="-477680253#4" from="35644756" to="35651828" name="Kaiserstraße" priority="3" type="highway.residential">
         <lane id="-477680253#4_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="52.45" shape="0.88,56.98 44.72,85.78">
@@ -170,45 +184,46 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
             <param key="origId" value="5139887"/>
         </lane>
     </edge>
-    <edge id="477680253#2" from="cluster_35651824_35651826_56456270_56456273" to="35651828" name="Kaiserstraße" priority="3" type="highway.residential" shape="141.36,151.19 79.56,110.58 49.80,91.03">
+    <edge id="477680253#2" from="35651826" to="35651828" name="Kaiserstraße" priority="3" type="highway.residential" shape="141.36,151.19 79.56,110.58 49.80,91.03">
         <lane id="477680253#2_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="94.78" shape="134.21,148.41 78.68,111.92 55.00,96.36">
             <param key="origId" value="477680253"/>
         </lane>
-        <param key="origFrom" value="35651826"/>
     </edge>
     <edge id="477680253#4" from="35651828" to="35644756" name="Kaiserstraße" priority="3" type="highway.residential">
         <lane id="477680253#4_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="52.45" shape="42.96,88.45 -0.88,59.65">
             <param key="origId" value="477680253"/>
         </lane>
     </edge>
+    <edge id="5137650" from="56456270" to="35651826" name="Kaiserstraße" priority="3" type="highway.residential" shape="158.56,161.10 152.03,158.08 149.42,156.42 141.36,151.19">
+        <lane id="5137650_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="8.36" shape="150.98,159.31 148.55,157.77 143.95,154.79">
+            <param key="origId" value="5137650 477680253"/>
+        </lane>
+    </edge>
     <edge id="5139887#0" from="35651828" to="27557093" name="Großer Hof" priority="3" type="highway.residential" shape="49.80,91.03 52.40,87.26 72.11,58.56 76.95,51.44 82.79,41.86 86.12,36.39 86.86,32.24 88.81,21.40 90.89,9.53 91.02,8.84 91.94,3.65 92.57,0.00">
         <lane id="5139887#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="94.62" shape="52.60,84.13 70.79,57.66 75.60,50.58 81.42,41.03 84.60,35.82 85.28,31.95 87.23,21.12 89.32,9.26 89.44,8.56 90.36,3.37 90.99,-0.27">
             <param key="origId" value="5139887"/>
         </lane>
     </edge>
-    <edge id="6146263#0" from="27557091" to="cluster_35651824_35651826_56456270_56456273" name="Wendenstraße" priority="11" type="highway.secondary" spreadType="center" shape="165.40,240.71 161.91,229.66 159.14,216.45 157.43,206.93 156.18,195.37 155.46,183.37 155.76,175.95 157.06,167.33 158.56,161.10">
-        <lane id="6146263#0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="73.47" shape="163.87,241.19 160.36,230.06 157.57,216.75 155.85,207.16 154.58,195.50 153.86,183.38 154.16,175.80 155.34,168.02">
+    <edge id="6146263#0" from="27557091" to="56456270" name="Wendenstraße" priority="11" type="highway.secondary" spreadType="center" shape="165.40,240.71 161.91,229.66 159.14,216.45 157.43,206.93 156.18,195.37 155.46,183.37 155.76,175.95 157.06,167.33 158.56,161.10">
+        <lane id="6146263#0_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="74.34" shape="163.87,241.19 160.36,230.06 157.57,216.75 155.85,207.16 154.58,195.50 153.86,183.38 154.16,175.80 155.47,167.17">
             <param key="origId" value="6146263"/>
         </lane>
-        <lane id="6146263#0_1" index="1" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="73.47" shape="166.93,240.23 163.45,229.25 160.71,216.14 159.02,206.70 157.77,195.23 157.06,183.35 157.35,176.10 158.46,168.77">
+        <lane id="6146263#0_1" index="1" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="74.34" shape="166.93,240.23 163.45,229.25 160.71,216.14 159.02,206.70 157.77,195.23 157.06,183.35 157.35,176.10 158.59,167.92">
             <param key="origId" value="6146263"/>
         </lane>
-        <param key="origTo" value="56456270"/>
     </edge>
-    <edge id="6146263#1" from="cluster_35651824_35651826_56456270_56456273" to="27557056" name="Wendenstraße" priority="11" type="highway.secondary" spreadType="center" shape="158.56,161.10 161.35,152.34 164.31,144.75 170.77,127.77 175.80,113.27 182.47,93.98 186.81,81.33 196.17,56.19 203.97,36.98 209.80,24.56">
-        <lane id="6146263#1_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="145.92" shape="157.03,160.61 159.84,151.80 162.82,144.18 169.27,127.22 174.29,112.75 180.96,93.45 185.30,80.79 194.68,55.61 202.51,36.34 208.35,23.88">
+    <edge id="6146263#1" from="56456270" to="27557056" name="Wendenstraße" priority="11" type="highway.secondary" spreadType="center" shape="158.56,161.10 161.35,152.34 164.31,144.75 170.77,127.77 175.80,113.27 182.47,93.98 186.81,81.33 196.17,56.19 203.97,36.98 209.80,24.56">
+        <lane id="6146263#1_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="138.29" shape="159.35,153.35 159.84,151.80 162.82,144.18 169.27,127.22 174.29,112.75 180.96,93.45 185.30,80.79 194.68,55.61 202.51,36.34 208.35,23.88">
             <param key="origId" value="6146263"/>
         </lane>
-        <lane id="6146263#1_1" index="1" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="145.92" shape="160.08,161.59 162.86,152.87 165.80,145.33 172.28,128.31 177.31,113.80 183.99,94.50 188.31,81.86 197.66,56.77 205.44,37.62 211.25,25.24">
+        <lane id="6146263#1_1" index="1" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="138.29" shape="162.39,154.32 162.86,152.87 165.80,145.33 172.28,128.31 177.31,113.80 183.99,94.50 188.31,81.86 197.66,56.77 205.44,37.62 211.25,25.24">
             <param key="origId" value="6146263"/>
         </lane>
-        <param key="origFrom" value="56456270"/>
     </edge>
-    <edge id="7745712#0" from="cluster_35651824_35651826_56456270_56456273" to="27557095" name="Werder" priority="3" type="highway.residential" spreadType="center" shape="141.36,151.19 141.74,147.15 144.59,117.11 146.57,96.18 151.01,77.46 154.79,61.50 158.38,46.37 162.24,30.10 165.70,15.69">
+    <edge id="7745712#0" from="35651826" to="27557095" name="Werder" priority="3" type="highway.residential" spreadType="center" shape="141.36,151.19 141.74,147.15 144.59,117.11 146.57,96.18 151.01,77.46 154.79,61.50 158.38,46.37 162.24,30.10 165.70,15.69">
         <lane id="7745712#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="8.33" length="129.52" shape="142.16,142.76 144.59,117.11 146.57,96.18 151.01,77.46 154.79,61.50 158.38,46.37 162.24,30.10 165.70,15.69">
             <param key="origId" value="7745712"/>
         </lane>
-        <param key="origFrom" value="35651826"/>
     </edge>
 
     <junction id="27557056" type="dead_end" x="209.80" y="24.56" incLanes="6146263#1_0 6146263#1_1" intLanes="" shape="206.90,23.20 212.69,25.92"/>
@@ -220,6 +235,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <junction id="35644756" type="priority" x="0.00" y="58.32" incLanes="477680253#4_0" intLanes=":35644756_0_0" shape="0.00,58.32 -1.76,60.99 0.00,58.32">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
+    <junction id="35651826" type="right_before_left" x="141.36" y="151.19" incLanes="5137650_0 -477680253#3_0" intLanes=":35651826_0_0 :35651826_1_0 :35651826_2_0 :35651826_3_0 :35651826_4_0 :35651826_5_0" shape="143.08,156.13 146.57,150.76 144.76,148.92 144.19,147.71 143.82,146.31 143.68,144.71 143.75,142.92 140.56,142.61 139.98,144.58 139.45,145.05 138.74,145.18 137.88,144.96 136.84,144.40 133.33,149.75">
+        <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>
     <junction id="35651828" type="right_before_left" x="49.80" y="91.03" incLanes="477680253#2_0 -5139887#1_0 -477680253#4_0" intLanes=":35651828_0_0 :35651828_1_0 :35651828_2_0 :35651828_3_0 :35651828_4_0 :35651828_5_0 :35651828_6_0 :35651828_7_0 :35651828_8_0" shape="54.12,97.70 57.63,92.35 56.03,90.76 55.69,89.88 55.67,88.93 55.96,87.92 56.56,86.86 51.29,83.23 49.61,84.88 48.69,85.24 47.71,85.28 46.68,85.02 45.60,84.44 42.08,89.79">
         <request index="0" response="000000000" foes="100010000" cont="0"/>
         <request index="1" response="011000000" foes="011110000" cont="0"/>
@@ -231,37 +254,45 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="7" response="000011000" foes="000011110" cont="0"/>
         <request index="8" response="000010001" foes="000010001" cont="0"/>
     </junction>
-    <junction id="cluster_35651824_35651826_56456270_56456273" type="priority" x="150.34" y="156.70" incLanes="-477680253#3_0 6146263#0_0 6146263#0_1" intLanes=":cluster_35651824_35651826_56456270_56456273_0_0 :cluster_35651824_35651826_56456270_56456273_1_0 :cluster_35651824_35651826_56456270_56456273_2_0 :cluster_35651824_35651826_56456270_56456273_3_0 :cluster_35651824_35651826_56456270_56456273_4_0 :cluster_35651824_35651826_56456270_56456273_5_0 :cluster_35651824_35651826_56456270_56456273_5_1" shape="161.60,162.07 155.51,160.13 153.34,163.49 150.65,163.13 147.90,159.98 145.53,154.95 144.00,148.96 143.75,142.92 140.56,142.61 139.98,144.58 139.45,145.05 138.74,145.18 137.88,144.96 136.84,144.40 133.33,149.75 139.75,154.09 144.96,157.89 148.97,161.14 151.78,163.85 153.38,166.02 153.78,167.65 160.02,169.15 160.43,166.49 160.60,165.56 160.83,164.64 161.14,163.55">
-        <request index="0" response="0010000" foes="0010000" cont="0"/>
-        <request index="1" response="1110000" foes="1110000" cont="0"/>
-        <request index="2" response="0001000" foes="0001000" cont="0"/>
-        <request index="3" response="0000000" foes="0000100" cont="0"/>
-        <request index="4" response="0000000" foes="0000011" cont="0"/>
-        <request index="5" response="0000000" foes="0000010" cont="0"/>
-        <request index="6" response="0000000" foes="0000010" cont="0"/>
+    <junction id="56456270" type="priority" x="158.56" y="161.10" incLanes="-477680253#1_0 6146263#0_0 6146263#0_1" intLanes=":56456270_0_0 :56456270_1_0 :56456270_2_0 :56456270_3_0 :56456270_3_1" shape="163.92,154.80 157.82,152.86 156.69,154.98 155.94,155.50 155.09,155.66 154.11,155.47 153.02,154.92 150.30,160.77 152.53,162.60 153.26,163.57 153.74,164.58 153.95,165.63 153.90,166.79 160.15,168.29 160.64,165.35 161.12,163.20 161.63,161.45 162.23,159.73 162.97,157.64">
+        <request index="0" response="11000" foes="11000" cont="0"/>
+        <request index="1" response="00100" foes="00100" cont="0"/>
+        <request index="2" response="00000" foes="00010" cont="0"/>
+        <request index="3" response="00000" foes="00001" cont="0"/>
+        <request index="4" response="00000" foes="00001" cont="0"/>
     </junction>
 
-    <connection from="-477680253#3" to="7745712#0" fromLane="0" toLane="0" via=":cluster_35651824_35651826_56456270_56456273_0_0" dir="r" state="m"/>
-    <connection from="-477680253#3" to="6146263#1" fromLane="0" toLane="0" via=":cluster_35651824_35651826_56456270_56456273_1_0" dir="r" state="m"/>
-    <connection from="-477680253#3" to="477680253#2" fromLane="0" toLane="0" via=":cluster_35651824_35651826_56456270_56456273_2_0" dir="t" state="m"/>
-    <connection from="-477680253#4" to="5139887#0" fromLane="0" toLane="0" via=":35651828_6_0" dir="r" state="="/>
+    <connection from="-477680253#1" to="6146263#1" fromLane="0" toLane="0" via=":56456270_0_0" dir="r" state="m"/>
+    <connection from="-477680253#1" to="5137650" fromLane="0" toLane="0" via=":56456270_1_0" dir="t" state="m"/>
+    <connection from="-477680253#3" to="7745712#0" fromLane="0" toLane="0" via=":35651826_3_0" dir="r" state="M"/>
+    <connection from="-477680253#3" to="-477680253#1" fromLane="0" toLane="0" via=":35651826_4_0" dir="s" state="M"/>
+    <connection from="-477680253#3" to="477680253#2" fromLane="0" toLane="0" via=":35651826_5_0" dir="t" state="="/>
+    <connection from="-477680253#4" to="5139887#0" fromLane="0" toLane="0" via=":35651828_6_0" dir="r" state="M"/>
     <connection from="-477680253#4" to="-477680253#3" fromLane="0" toLane="0" via=":35651828_7_0" dir="s" state="="/>
     <connection from="-477680253#4" to="477680253#4" fromLane="0" toLane="0" via=":35651828_8_0" dir="t" state="="/>
-    <connection from="-5139887#1" to="-477680253#3" fromLane="0" toLane="0" via=":35651828_3_0" dir="r" state="="/>
+    <connection from="-5139887#1" to="-477680253#3" fromLane="0" toLane="0" via=":35651828_3_0" dir="r" state="M"/>
     <connection from="-5139887#1" to="477680253#4" fromLane="0" toLane="0" via=":35651828_4_0" dir="l" state="="/>
     <connection from="-5139887#1" to="5139887#0" fromLane="0" toLane="0" via=":35651828_5_0" dir="t" state="="/>
-    <connection from="477680253#2" to="477680253#4" fromLane="0" toLane="0" via=":35651828_0_0" dir="s" state="="/>
+    <connection from="477680253#2" to="477680253#4" fromLane="0" toLane="0" via=":35651828_0_0" dir="s" state="M"/>
     <connection from="477680253#2" to="5139887#0" fromLane="0" toLane="0" via=":35651828_1_0" dir="l" state="="/>
     <connection from="477680253#2" to="-477680253#3" fromLane="0" toLane="0" via=":35651828_2_0" dir="t" state="="/>
     <connection from="477680253#4" to="-477680253#4" fromLane="0" toLane="0" via=":35644756_0_0" dir="t" state="M"/>
+    <connection from="5137650" to="477680253#2" fromLane="0" toLane="0" via=":35651826_0_0" dir="s" state="M"/>
+    <connection from="5137650" to="7745712#0" fromLane="0" toLane="0" via=":35651826_1_0" dir="l" state="="/>
+    <connection from="5137650" to="-477680253#1" fromLane="0" toLane="0" via=":35651826_2_0" dir="t" state="="/>
     <connection from="5139887#0" to="-5139887#1" fromLane="0" toLane="0" via=":27557093_0_0" dir="t" state="M"/>
-    <connection from="6146263#0" to="477680253#2" fromLane="0" toLane="0" via=":cluster_35651824_35651826_56456270_56456273_3_0" dir="r" state="M"/>
-    <connection from="6146263#0" to="7745712#0" fromLane="0" toLane="0" via=":cluster_35651824_35651826_56456270_56456273_4_0" dir="R" state="M"/>
-    <connection from="6146263#0" to="6146263#1" fromLane="0" toLane="0" via=":cluster_35651824_35651826_56456270_56456273_5_0" dir="s" state="M"/>
-    <connection from="6146263#0" to="6146263#1" fromLane="1" toLane="1" via=":cluster_35651824_35651826_56456270_56456273_5_1" dir="s" state="M"/>
+    <connection from="6146263#0" to="5137650" fromLane="0" toLane="0" via=":56456270_2_0" dir="r" state="M"/>
+    <connection from="6146263#0" to="6146263#1" fromLane="0" toLane="0" via=":56456270_3_0" dir="s" state="M"/>
+    <connection from="6146263#0" to="6146263#1" fromLane="1" toLane="1" via=":56456270_3_1" dir="s" state="M"/>
 
     <connection from=":27557093_0" to="-5139887#1" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from=":35644756_0" to="-477680253#4" fromLane="0" toLane="0" dir="t" state="M"/>
+    <connection from=":35651826_0" to="477680253#2" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":35651826_1" to="7745712#0" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":35651826_2" to="-477680253#1" fromLane="0" toLane="0" dir="t" state="M"/>
+    <connection from=":35651826_3" to="7745712#0" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":35651826_4" to="-477680253#1" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":35651826_5" to="477680253#2" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from=":35651828_0" to="477680253#4" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":35651828_1" to="5139887#0" fromLane="0" toLane="0" dir="l" state="M"/>
     <connection from=":35651828_2" to="-477680253#3" fromLane="0" toLane="0" dir="t" state="M"/>
@@ -271,12 +302,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from=":35651828_6" to="5139887#0" fromLane="0" toLane="0" dir="r" state="M"/>
     <connection from=":35651828_7" to="-477680253#3" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from=":35651828_8" to="477680253#4" fromLane="0" toLane="0" dir="t" state="M"/>
-    <connection from=":cluster_35651824_35651826_56456270_56456273_0" to="7745712#0" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":cluster_35651824_35651826_56456270_56456273_1" to="6146263#1" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":cluster_35651824_35651826_56456270_56456273_2" to="477680253#2" fromLane="0" toLane="0" dir="t" state="M"/>
-    <connection from=":cluster_35651824_35651826_56456270_56456273_3" to="477680253#2" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":cluster_35651824_35651826_56456270_56456273_4" to="7745712#0" fromLane="0" toLane="0" dir="R" state="M"/>
-    <connection from=":cluster_35651824_35651826_56456270_56456273_5" to="6146263#1" fromLane="0" toLane="0" dir="s" state="M"/>
-    <connection from=":cluster_35651824_35651826_56456270_56456273_5" to="6146263#1" fromLane="1" toLane="1" dir="s" state="M"/>
+    <connection from=":56456270_0" to="6146263#1" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":56456270_1" to="5137650" fromLane="0" toLane="0" dir="t" state="M"/>
+    <connection from=":56456270_2" to="5137650" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":56456270_3" to="6146263#1" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from=":56456270_3" to="6146263#1" fromLane="1" toLane="1" dir="s" state="M"/>
 
 </net>
diff --git a/tests/netconvert/bugs/ticket10589/output.netconvert b/tests/netconvert/bugs/ticket10589/output.netconvert
index a9d787cc55c..38df5903722 100644
--- a/tests/netconvert/bugs/ticket10589/output.netconvert
+++ b/tests/netconvert/bugs/ticket10589/output.netconvert
@@ -1 +1,54 @@
+Parsing types from '/scr1/sumo/data/typemap/osmNetconvert.typ.xml' ... done.
+Parsing nodes from osm-file 'data/osm_bbox.osm.xml.gz' ... done (5ms).
+Parsing edges from osm-file 'data/osm_bbox.osm.xml.gz' ... done (6ms).
+Removing duplicate edges ... done.
+Parsing relations from osm-file 'data/osm_bbox.osm.xml.gz' ... done (8ms).
+ Removed 1 traffic lights before loading plain-XML
+ Import done:
+   61 nodes loaded.
+   33 types loaded.
+   25 edges loaded.
+Proj projection parameters used: '+proj=utm +zone=32 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'.
+Removing self-loops ... done (0ms).
+Processing public transport stops ... done (0ms).
+Revising public transport stops based on pt lines ... 
+done (0ms).
+Joining junction clusters ... 
+done (0ms).
+Removing empty nodes and geometry nodes ... done (0ms).
+   53 nodes removed.
+Moving network to origin ... done (1ms).
+Computing turning directions ... done (0ms).
+Assigning nodes to traffic lights ... done (0ms).
+Guessing and setting on-/off-ramps ... done (0ms).
+Sorting nodes' edges ... done (0ms).
+Computing node shapes ... done (0ms).
+Computing edge shapes ... done (0ms).
+Computing node types ... done (0ms).
+Computing priorities ... done (0ms).
+Computing approached edges ... done (0ms).
+Guessing and setting roundabouts ... done (0ms).
+Computing approaching lanes ... done (1ms).
+Dividing of lanes on approached lanes ... done (0ms).
+Processing turnarounds ... done (0ms).
+Rechecking of lane endings ... done (0ms).
+Joining traffic light nodes ... done (0ms).
+Computing traffic light control information ... done (0ms).
+Computing node logics ... done (0ms).
+Computing traffic light logics ... done (0ms).
+ 0 traffic light(s) computed.
+Building inner edges ... done (0ms).
+-----------------------------------------------------
+Summary:
+ Node type statistics:
+  Unregulated junctions       : 0
+  Dead-end junctions          : 3
+  Priority junctions          : 3
+  Right-before-left junctions : 2
+ Network boundaries:
+  Original boundary  : 10.52,52.27,10.52,52.27
+  Applied offset     : -603780.39,-5791997.36
+  Converted boundary : 0.00,0.00,209.80,240.71
+-----------------------------------------------------
+Writing network ... done (3ms).
 Success.
diff --git a/tests/netconvert/import/OSM/bugs/ticket5398/knownbugs.netconvert b/tests/netconvert/import/OSM/bugs/ticket5398/knownbugs.netconvert
deleted file mode 100644
index f6bdaa9a380..00000000000
--- a/tests/netconvert/import/OSM/bugs/ticket5398/knownbugs.netconvert
+++ /dev/null
@@ -1,7 +0,0 @@
-
-[Reported by erdm_ja at 05Feb11:27:19]
-search_string:Not joining junctions
-search_file:errors
-ignore_other_errors:1
-full_description:should be joined
-brief_description:see #5398
diff --git a/tests/netconvert/import/OSM/bugs/ticket5513/errors.netconvert b/tests/netconvert/import/OSM/bugs/ticket5513/errors.netconvert
index 6557787d47c..f7194c9c3ef 100644
--- a/tests/netconvert/import/OSM/bugs/ticket5513/errors.netconvert
+++ b/tests/netconvert/import/OSM/bugs/ticket5513/errors.netconvert
@@ -7,12 +7,12 @@ Warning: Discarding unusable type 'waterway.dam' (first occurence for edge '2346
 Warning: Discarding unusable type 'highway.footway' (first occurence for edge '615359756').
 Warning: Not joining junctions 201158128,201158137,201158163,5819001494 (not compact (maxEdge=47795936#2 length=8.36)).
 Warning: Not joining junctions 201583479,3649519965 (only 1 exit node).
+Warning: Not joining junctions 201220801,201589322,3645231524,3645231555,5819001482 (parallel incoming -615359751#0,19386227#0).
+Warning: Not joining junctions 201221330,201588819 (parallel outgoing 19358290#0,47795936#0).
 Warning: Not joining junctions 201221373,5819001427 (parallel incoming -615359726#1,19358290#1).
-Warning: Not joining junctions 201221409,3645240254,5996484329 (slip lane).
 Warning: Reducing junction cluster 3645200026,5819001456,5819001459 (parallel incoming -615359739#1,94669185#2).
 Warning: Reducing junction cluster 5819001430,5819001435,5819001672 (5 incoming edges).
-Warning: Not joining junctions 5819001429,5819001431 (parallel incoming -615359732,615359729#1).
 Warning: Ambiguity in turnarounds computation at junction '5819001479'.
 Warning: The traffic light '201221451' does not control any links; it will not be build.
 Warning: Could not build program '0' for traffic light '201221451'
-Warning: 8 total messages of type: Not joining junctions % (%).
+Warning: 10 total messages of type: Not joining junctions % (%).
diff --git a/tests/netconvert/import/OSM/bugs/ticket5513/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket5513/net.netconvert
index 56b18529d64..9820f127d50 100644
--- a/tests/netconvert/import/OSM/bugs/ticket5513/net.netconvert
+++ b/tests/netconvert/import/OSM/bugs/ticket5513/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-04 09:25:48 by Eclipse SUMO netconvert Version v1_14_1+1404-60b7850a127
+<!-- generated on 2022-11-20 13:42:55 by Eclipse SUMO netconvert Version v1_15_0+0458-51ec704
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -112,8 +112,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="-47795933#1_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="58.47" shape="588.31,1411.04 638.81,1422.65"/>
         <param key="ref" value="RI 114"/>
     </edge>
-    <edge id="-47795958" from="cluster_201220801_201589322_3645231524_3645231555_#1more" to="201146870" priority="12" type="highway.primary" shape="446.79,1800.76 499.03,1826.44 507.10,1830.82 514.85,1835.31 521.75,1839.70 527.68,1844.33 532.44,1849.35 536.85,1855.19 601.18,1953.59">
-        <lane id="-47795958_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="237.61" shape="447.49,1799.33 499.76,1825.02 507.89,1829.43 515.68,1833.94 522.67,1838.39 528.76,1843.14 533.66,1848.31 538.16,1854.27 602.52,1952.72"/>
+    <edge id="-47795958" from="201220801" to="201146870" priority="12" type="highway.primary" shape="446.79,1800.76 499.03,1826.44 507.10,1830.82 514.85,1835.31 521.75,1839.70 527.68,1844.33 532.44,1849.35 536.85,1855.19 601.18,1953.59">
+        <lane id="-47795958_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="223.85" shape="449.92,1800.52 499.76,1825.02 507.89,1829.43 515.68,1833.94 522.67,1838.39 528.76,1843.14 533.66,1848.31 538.16,1854.27 602.52,1952.72"/>
         <param key="ref" value="RI 114"/>
     </edge>
     <edge id="-480176669" from="1802287943" to="3646961143" priority="10" type="highway.tertiary">
@@ -281,8 +281,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <edge id="-615359749#2" from="5819001481" to="5819001479" priority="4" type="highway.unclassified" shape="536.15,1664.53 522.98,1661.25 525.76,1638.03">
         <lane id="-615359749#2_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="36.96" shape="526.62,1663.81 521.22,1662.47 522.81,1649.19"/>
     </edge>
-    <edge id="-615359751#0" from="5819001490" to="cluster_201220801_201589322_3645231524_3645231555_#1more" priority="4" type="highway.unclassified" shape="460.65,1741.98 450.83,1766.98 453.03,1767.78 457.25,1769.23 460.63,1771.56 462.95,1773.84 464.00,1777.11 464.06,1782.46">
-        <lane id="-615359751#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="64.60" shape="459.68,1748.84 452.92,1766.04 453.56,1766.28 457.98,1767.79 461.65,1770.32 464.16,1772.79"/>
+    <edge id="-615359751#0" from="5819001490" to="5819001482" priority="4" type="highway.unclassified" shape="460.65,1741.98 450.83,1766.98 453.03,1767.78 457.25,1769.23 460.63,1771.56 462.95,1773.84 464.00,1777.11 464.06,1782.46">
+        <lane id="-615359751#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="49.80" shape="459.68,1748.84 452.92,1766.04 453.56,1766.28 457.98,1767.79 461.65,1770.32 464.35,1772.98 465.60,1776.85 465.61,1777.57"/>
     </edge>
     <edge id="-615359751#1" from="5819001489" to="5819001490" priority="4" type="highway.unclassified">
         <lane id="-615359751#1_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="15.19" shape="467.70,1728.43 464.97,1735.37"/>
@@ -349,9 +349,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="19355567_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="42.41" shape="331.46,1763.44 329.51,1762.37 327.37,1760.00 325.44,1756.32 324.81,1754.16"/>
         <lane id="19355567_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="42.41" shape="333.03,1760.65 331.52,1759.82 330.02,1758.16 328.43,1755.12 328.18,1754.28"/>
     </edge>
-    <edge id="19358290#0" from="cluster_201221330_201588819" to="3649758008" priority="11" type="highway.secondary" spreadType="center" shape="423.28,1701.54 429.66,1701.09 433.91,1700.44 437.73,1699.54 441.66,1697.78 444.80,1695.76 447.14,1692.94 448.78,1689.01 449.79,1684.93 455.70,1641.22">
-        <lane id="19358290#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="86.79" shape="427.56,1699.64 429.49,1699.50 433.60,1698.87 437.22,1698.01 440.90,1696.37 443.72,1694.55 445.76,1692.10 447.25,1688.50 448.21,1684.63 454.11,1641.01"/>
-        <lane id="19358290#0_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="86.79" shape="427.78,1702.83 429.84,1702.68 434.21,1702.01 438.25,1701.06 442.43,1699.19 445.87,1696.97 448.53,1693.78 450.30,1689.51 451.36,1685.23 457.28,1641.43"/>
+    <edge id="19358290#0" from="201221330" to="3649758008" priority="11" type="highway.secondary" spreadType="center" shape="423.28,1701.54 429.66,1701.09 433.91,1700.44 437.73,1699.54 441.66,1697.78 444.80,1695.76 447.14,1692.94 448.78,1689.01 449.79,1684.93 455.70,1641.22">
+        <lane id="19358290#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="78.67" shape="442.28,1695.48 443.72,1694.55 445.76,1692.10 447.25,1688.50 448.21,1684.63 454.11,1641.01"/>
+        <lane id="19358290#0_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="78.67" shape="442.65,1699.05 445.87,1696.97 448.53,1693.78 450.30,1689.51 451.36,1685.23 457.28,1641.43"/>
     </edge>
     <edge id="19358290#1" from="3649758008" to="201221373" priority="11" type="highway.secondary" spreadType="center" shape="455.70,1641.22 463.22,1585.56 463.54,1580.82 463.07,1576.09 461.63,1572.32 459.34,1569.51 456.18,1566.75 426.66,1546.51 423.42,1544.09 420.79,1540.97 419.23,1537.14">
         <lane id="19358290#1_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="125.49" shape="454.11,1641.01 461.63,1585.40 461.93,1580.84 461.50,1576.46 460.22,1573.13 458.18,1570.63 455.20,1568.02 425.73,1547.81 422.31,1545.27 421.34,1544.11"/>
@@ -398,9 +398,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <edge id="19385774#1" from="201583483" to="201583479" priority="3" type="highway.residential" spreadType="center">
         <lane id="19385774#1_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="27.63" shape="529.30,1474.27 513.90,1468.97"/>
     </edge>
-    <edge id="19386227#0" from="201588809" to="cluster_201220801_201589322_3645231524_3645231555_#1more" priority="7" type="highway.primary_link" spreadType="center" shape="430.40,1765.11 430.18,1770.08 430.36,1773.96 431.03,1777.53 431.84,1780.99 433.13,1784.43">
-        <lane id="19386227#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="29.91" shape="432.53,1776.88 432.59,1777.20 433.37,1780.52 434.63,1783.87"/>
-        <lane id="19386227#0_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="29.91" shape="429.25,1776.75 429.46,1777.86 430.31,1781.45 431.63,1784.99"/>
+    <edge id="19386227#0" from="201588809" to="3645231555" priority="7" type="highway.primary_link" spreadType="center" shape="430.40,1765.11 430.18,1770.08 430.36,1773.96 431.03,1777.53 431.84,1780.99 433.13,1784.43">
+        <lane id="19386227#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="19.65" shape="432.51,1776.76 432.53,1776.88"/>
+        <lane id="19386227#0_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="19.65" shape="429.25,1776.75 429.47,1777.90"/>
+    </edge>
+    <edge id="19386227#1" from="3645231555" to="201220801" priority="7" type="highway.primary_link" spreadType="center" shape="433.13,1784.43 435.49,1788.86 437.79,1792.38 440.43,1795.20 442.94,1797.57 448.83,1798.30">
+        <lane id="19386227#1_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="21.52" shape="438.22,1790.10 439.06,1791.39 440.06,1792.47"/>
+        <lane id="19386227#1_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="21.52" shape="435.38,1791.61 436.53,1793.37 439.31,1796.35"/>
     </edge>
     <edge id="19390809" from="201583483" to="201648374" priority="3" type="highway.residential">
         <lane id="19390809_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="34.03" shape="533.63,1471.93 546.67,1444.30"/>
@@ -430,9 +434,21 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="19397237#2_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="27.36" shape="562.79,1788.44 559.19,1788.16 555.09,1787.97"/>
         <lane id="19397237#2_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="27.36" shape="563.24,1785.26 559.38,1784.96 555.24,1784.77"/>
     </edge>
-    <edge id="19397237#3" from="201158128" to="cluster_201220801_201589322_3645231524_3645231555_#1more" priority="11" type="highway.secondary" spreadType="center" shape="542.45,1785.79 464.06,1782.46">
-        <lane id="19397237#3_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="100.25" shape="540.19,1787.30 463.99,1784.06"/>
-        <lane id="19397237#3_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="100.25" shape="540.32,1784.10 464.13,1780.86"/>
+    <edge id="19397237#3" from="201158128" to="5819001482" priority="11" type="highway.secondary" spreadType="center">
+        <lane id="19397237#3_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="78.46" shape="540.19,1787.30 468.52,1784.25"/>
+        <lane id="19397237#3_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="78.46" shape="540.32,1784.10 468.66,1781.05"/>
+    </edge>
+    <edge id="19397237#4" from="5819001482" to="201589322" priority="11" type="highway.secondary" spreadType="center">
+        <lane id="19397237#4_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="11.73" shape="459.12,1783.85 454.56,1783.66"/>
+        <lane id="19397237#4_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="11.73" shape="459.26,1780.65 454.69,1780.46"/>
+    </edge>
+    <edge id="19397237#5" from="201589322" to="3645231555" priority="11" type="highway.secondary" spreadType="center" shape="452.34,1781.96 444.26,1781.60 440.18,1781.82 436.37,1782.95 433.13,1784.43">
+        <lane id="19397237#5_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="19.68" shape="442.02,1783.32 440.75,1783.39"/>
+        <lane id="19397237#5_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="19.68" shape="442.16,1780.11 439.91,1780.23 439.40,1780.38"/>
+    </edge>
+    <edge id="19397237#6" from="3645231555" to="3645231524" priority="11" type="highway.secondary" spreadType="center" shape="433.13,1784.43 428.02,1786.96 424.83,1787.81 421.90,1788.20 418.07,1788.26">
+        <lane id="19397237#6_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="15.74" shape="428.53,1788.48 428.34,1788.53"/>
+        <lane id="19397237#6_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="15.74" shape="427.74,1785.38 427.55,1785.43"/>
     </edge>
     <edge id="280535301" from="201374158" to="2846367224" priority="11" type="highway.secondary" spreadType="center" shape="639.35,1798.16 631.94,1798.88 625.16,1798.62 618.48,1797.63 603.74,1794.47">
         <lane id="280535301_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="36.03" shape="627.42,1798.71 625.16,1798.62 618.48,1797.63 607.65,1795.31"/>
@@ -446,6 +462,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="359893830_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="57.01" shape="424.70,1775.27 423.37,1776.34 419.32,1778.06 415.20,1778.90 410.68,1779.22 410.41,1779.20"/>
         <lane id="359893830_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="57.01" shape="421.76,1773.53 418.37,1774.99 414.77,1775.72 410.82,1776.00"/>
     </edge>
+    <edge id="359893832" from="201589322" to="201220801" priority="7" type="highway.primary_link" spreadType="center" shape="452.34,1781.96 448.93,1783.57 446.69,1785.55 445.29,1788.21 444.67,1791.38 444.63,1794.70 445.49,1797.68 446.79,1800.76">
+        <lane id="359893832_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="21.96" shape="446.62,1789.74 446.58,1789.94"/>
+        <lane id="359893832_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="21.96" shape="443.79,1787.62 443.39,1789.59"/>
+    </edge>
     <edge id="359894536" from="3645240254" to="cluster_201364769_201364910" priority="11" type="highway.secondary" spreadType="center" shape="435.29,1385.01 446.25,1386.08 499.57,1395.08">
         <lane id="359894536_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="66.21" shape="443.66,1384.22 446.46,1384.49 492.60,1392.28"/>
         <lane id="359894536_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="66.21" shape="443.30,1387.40 446.04,1387.67 492.06,1395.43"/>
@@ -489,9 +509,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="47795934_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="66.59" shape="490.58,1404.08 444.86,1396.23 442.39,1395.36"/>
         <lane id="47795934_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="66.59" shape="491.12,1400.93 445.66,1393.12 442.76,1392.10"/>
     </edge>
-    <edge id="47795936#0" from="cluster_201221330_201588819" to="3645231518" priority="12" type="highway.primary" spreadType="center" shape="455.87,1707.08 463.13,1708.73 470.00,1710.63 477.79,1712.98 486.44,1715.73 494.68,1718.79 499.17,1721.07 503.80,1723.99 508.29,1727.44">
-        <lane id="47795936#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="73.26" shape="463.74,1707.24 470.44,1709.09 478.26,1711.45 486.96,1714.22 495.32,1717.32 499.96,1719.67 503.86,1722.14"/>
-        <lane id="47795936#0_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="73.26" shape="463.03,1710.36 469.55,1712.17 477.31,1714.51 485.92,1717.24 494.03,1720.26 498.38,1722.46 501.90,1724.69"/>
+    <edge id="47795936#0" from="201588819" to="3645231518" priority="12" type="highway.primary" spreadType="center" shape="455.87,1707.08 463.13,1708.73 470.00,1710.63 477.79,1712.98 486.44,1715.73 494.68,1718.79 499.17,1721.07 503.80,1723.99 508.29,1727.44">
+        <lane id="47795936#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="56.74" shape="463.74,1707.24 470.44,1709.09 478.26,1711.45 486.96,1714.22 495.32,1717.32 499.96,1719.67 503.86,1722.14"/>
+        <lane id="47795936#0_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="56.74" shape="463.03,1710.36 469.55,1712.17 477.31,1714.51 485.92,1717.24 494.03,1720.26 498.38,1722.46 501.90,1724.69"/>
         <param key="ref" value="RI 114"/>
     </edge>
     <edge id="47795936#1" from="3645231518" to="201158163" priority="12" type="highway.primary" spreadType="center">
@@ -539,18 +559,23 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="47795952#1_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="129.90" shape="482.78,1513.82 464.56,1642.14"/>
         <param key="ref" value="RI 114"/>
     </edge>
-    <edge id="47795952#2" from="3649758011" to="cluster_201221330_201588819" priority="12" type="highway.primary" spreadType="center" shape="466.12,1642.51 459.45,1695.83 458.62,1699.30 457.68,1702.44 455.87,1707.08">
-        <lane id="47795952#2_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="77.26" shape="467.69,1642.85 461.02,1696.12 460.17,1699.72 459.96,1700.41"/>
-        <lane id="47795952#2_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="77.26" shape="464.52,1642.45 457.87,1695.55 457.08,1698.88 456.97,1699.24"/>
+    <edge id="47795952#2" from="3649758011" to="201588819" priority="12" type="highway.primary" spreadType="center" shape="466.12,1642.51 459.45,1695.83 458.62,1699.30 457.68,1702.44 455.87,1707.08">
+        <lane id="47795952#2_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="65.55" shape="467.69,1642.85 461.02,1696.12 460.17,1699.72 459.96,1700.41"/>
+        <lane id="47795952#2_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="65.55" shape="464.52,1642.45 457.87,1695.55 457.08,1698.88 456.97,1699.24"/>
         <param key="ref" value="RI 114"/>
     </edge>
-    <edge id="47795957#1" from="cluster_201220801_201589322_3645231524_3645231555_#1more" to="201220797" priority="12" type="highway.primary" spreadType="center" shape="418.07,1788.26 401.18,1780.89 393.88,1777.96 386.25,1775.44 378.80,1773.68">
-        <lane id="47795957#1_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="66.73" shape="417.43,1789.72 408.95,1786.03"/>
-        <lane id="47795957#1_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="66.73" shape="418.71,1786.79 409.70,1782.86"/>
+    <edge id="47795957#0" from="201220801" to="3645231524" priority="12" type="highway.primary" spreadType="center" shape="445.51,1803.70 418.07,1788.26">
+        <lane id="47795957#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="34.21" shape="444.33,1804.87 427.08,1795.16"/>
+        <lane id="47795957#0_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="34.21" shape="445.90,1802.08 428.65,1792.37"/>
         <param key="ref" value="RI 114"/>
     </edge>
-    <edge id="47795958" from="201146870" to="cluster_201220801_201589322_3645231524_3645231555_#1more" priority="12" type="highway.primary" shape="601.18,1953.59 536.85,1855.19 532.44,1849.35 527.68,1844.33 521.75,1839.70 514.85,1835.31 507.10,1830.82 499.03,1826.44 446.79,1800.76">
-        <lane id="47795958_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="237.61" shape="599.84,1954.47 535.55,1856.11 531.22,1850.38 526.61,1845.52 520.83,1841.00 514.02,1836.68 506.32,1832.22 498.29,1827.86 446.08,1802.20"/>
+    <edge id="47795957#1" from="3645231524" to="201220797" priority="12" type="highway.primary" spreadType="center" shape="418.07,1788.26 401.18,1780.89 393.88,1777.96 386.25,1775.44 378.80,1773.68">
+        <lane id="47795957#1_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="41.91" shape="415.42,1788.85 408.95,1786.03"/>
+        <lane id="47795957#1_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="41.91" shape="416.70,1785.91 409.70,1782.86"/>
+        <param key="ref" value="RI 114"/>
+    </edge>
+    <edge id="47795958" from="201146870" to="201220801" priority="12" type="highway.primary" shape="601.18,1953.59 536.85,1855.19 532.44,1849.35 527.68,1844.33 521.75,1839.70 514.85,1835.31 507.10,1830.82 499.03,1826.44 446.79,1800.76">
+        <lane id="47795958_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="223.85" shape="599.84,1954.47 535.55,1856.11 531.22,1850.38 526.61,1845.52 520.83,1841.00 514.02,1836.68 506.32,1832.22 498.29,1827.86 448.50,1803.39"/>
         <param key="ref" value="RI 114"/>
     </edge>
     <edge id="480176669" from="3646961143" to="1802287943" priority="10" type="highway.tertiary">
@@ -565,9 +590,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="547275318_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="58.00" shape="294.51,1876.47 278.53,1843.65 275.58,1839.52 272.81,1836.42"/>
         <lane id="547275318_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="58.00" shape="297.38,1875.07 281.29,1842.01 278.08,1837.52 275.03,1834.10"/>
     </edge>
-    <edge id="602386832" from="cluster_201221330_201588819" to="201588809" priority="11" type="highway.secondary" spreadType="center" shape="455.87,1707.08 430.40,1765.11">
-        <lane id="602386832_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="71.59" shape="453.96,1715.43 432.71,1763.83"/>
-        <lane id="602386832_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="71.59" shape="451.03,1714.14 429.78,1762.55"/>
+    <edge id="602386832" from="201588819" to="201588809" priority="11" type="highway.secondary" spreadType="center">
+        <lane id="602386832_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="63.38" shape="454.08,1715.14 432.71,1763.83"/>
+        <lane id="602386832_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="63.38" shape="451.15,1713.85 429.78,1762.55"/>
     </edge>
     <edge id="615359718#0" from="3649758013" to="5819001425" priority="4" type="highway.unclassified">
         <lane id="615359718#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="9.41" shape="358.12,1628.70 357.61,1626.94"/>
@@ -722,8 +747,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <edge id="615359749#2" from="5819001479" to="5819001481" priority="4" type="highway.unclassified" shape="525.76,1638.03 522.98,1661.25 536.15,1664.53">
         <lane id="615359749#2_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="36.96" shape="525.99,1649.57 524.73,1660.04 527.39,1660.71"/>
     </edge>
-    <edge id="615359751#0" from="cluster_201220801_201589322_3645231524_3645231555_#1more" to="5819001490" priority="4" type="highway.unclassified" shape="464.06,1782.46 464.00,1777.11 462.95,1773.84 460.63,1771.56 457.25,1769.23 453.03,1767.78 450.83,1766.98 460.65,1741.98">
-        <lane id="615359751#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="64.60" shape="460.85,1774.03 459.61,1772.80 456.52,1770.68 452.50,1769.29 448.75,1767.92 456.70,1747.67"/>
+    <edge id="615359751#0" from="5819001482" to="5819001490" priority="4" type="highway.unclassified" shape="464.06,1782.46 464.00,1777.11 462.95,1773.84 460.63,1771.56 457.25,1769.23 453.03,1767.78 450.83,1766.98 460.65,1741.98">
+        <lane id="615359751#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="49.80" shape="462.41,1777.60 462.41,1777.37 461.55,1774.71 459.61,1772.80 456.52,1770.68 452.50,1769.29 448.75,1767.92 456.70,1747.67"/>
     </edge>
     <edge id="615359751#1" from="5819001490" to="5819001489" priority="4" type="highway.unclassified">
         <lane id="615359751#1_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="5.55" length="15.19" shape="461.99,1734.20 464.72,1727.26"/>
@@ -759,6 +784,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="661157895#1_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="203.31" shape="502.09,1388.01 508.94,1334.62 511.52,1314.30 532.18,1227.36 534.57,1215.24"/>
         <param key="ref" value="RI 114"/>
     </edge>
+    <edge id="661157896" from="201221330" to="201588819" priority="11" type="highway.secondary" spreadType="center">
+        <lane id="661157896_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="33.06" shape="442.66,1703.21 448.16,1704.14"/>
+        <lane id="661157896_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="33.06" shape="442.13,1706.36 447.62,1707.30"/>
+    </edge>
     <edge id="661157897#0" from="201220797" to="201178374" priority="12" type="highway.primary" spreadType="center">
         <lane id="661157897#0_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="30.77" shape="376.94,1775.11 350.18,1772.49"/>
         <lane id="661157897#0_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="10.00" length="30.77" shape="377.25,1771.92 350.50,1769.30"/>
@@ -809,9 +838,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="94669185#2_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="25.82" shape="385.58,1695.84 390.26,1695.56 397.95,1695.85 400.03,1696.07"/>
         <lane id="94669185#2_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="25.82" shape="385.96,1699.03 390.30,1698.77 397.72,1699.04 399.69,1699.25"/>
     </edge>
-    <edge id="94669185#3" from="3645200026" to="cluster_201221330_201588819" priority="11" type="highway.secondary" spreadType="center" shape="404.76,1698.18 423.28,1701.54">
-        <lane id="94669185#3_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="35.35" shape="409.68,1697.45 423.57,1699.96"/>
-        <lane id="94669185#3_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="35.35" shape="409.11,1700.60 423.00,1703.11"/>
+    <edge id="94669185#3" from="3645200026" to="201221330" priority="11" type="highway.secondary" spreadType="center">
+        <lane id="94669185#3_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="18.82" shape="409.68,1697.45 421.70,1699.62"/>
+        <lane id="94669185#3_1" index="1" disallow="tram rail_urban rail rail_electric ship" speed="8.88" length="18.82" shape="409.11,1700.60 421.13,1702.77"/>
     </edge>
 
     <tlLogic id="201158128" type="static" programID="0" offset="0">
@@ -844,18 +873,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="42" state="rrrGGGrr"/>
         <phase duration="3"  state="rrryyyrr"/>
     </tlLogic>
+    <tlLogic id="201588819" type="static" programID="0" offset="0">
+        <phase duration="42" state="GGGrrr"/>
+        <phase duration="3"  state="yyyrrr"/>
+        <phase duration="42" state="rrrGGG"/>
+        <phase duration="3"  state="rrryyy"/>
+    </tlLogic>
     <tlLogic id="3649519965" type="static" programID="0" offset="0">
         <phase duration="42" state="GGGGrr"/>
         <phase duration="3"  state="yyyyrr"/>
         <phase duration="42" state="rrrrGG"/>
         <phase duration="3"  state="rrrryy"/>
     </tlLogic>
-    <tlLogic id="cluster_201221330_201588819" type="static" programID="0" offset="0">
-        <phase duration="42" state="GGGGGrrr"/>
-        <phase duration="3"  state="yyyyyrrr"/>
-        <phase duration="42" state="rrrGGGGG"/>
-        <phase duration="3"  state="rrryyyyy"/>
-    </tlLogic>
     <tlLogic id="cluster_201364769_201364910" type="static" programID="0" offset="0">
         <phase duration="42" state="GGgGGGrrrr"/>
         <phase duration="3"  state="yyyyyyrrrr"/>
@@ -880,17 +909,17 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="42" state="GGGGrrr"/>
         <phase duration="3"  state="yyyyrrr"/>
     </tlLogic>
-    <tlLogic id="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" type="static" programID="0" offset="0">
-        <phase duration="15" state="ggrrrrGrrGg"/>
-        <phase duration="3"  state="ggrrrryrryg"/>
-        <phase duration="6"  state="ggrrrrrrrrg"/>
-        <phase duration="3"  state="yyrrrrrrrry"/>
-        <phase duration="18" state="rrGGrrGrrrr"/>
-        <phase duration="3"  state="rryyrryrrrr"/>
-        <phase duration="18" state="rrrGGGGrrrr"/>
-        <phase duration="3"  state="rrryyyyrrrr"/>
-        <phase duration="18" state="rrrrrrrGGrr"/>
-        <phase duration="3"  state="rrrrrrryyrr"/>
+    <tlLogic id="joinedS_201220797_201220801_3645231524_3645231555" type="static" programID="0" offset="0">
+        <phase duration="15" state="GGrrrrrrrrr"/>
+        <phase duration="3"  state="yyrrrrrrrrr"/>
+        <phase duration="15" state="rrGrrrrrrrr"/>
+        <phase duration="3"  state="rryrrrrrrrr"/>
+        <phase duration="15" state="rrrGGrrrrrr"/>
+        <phase duration="3"  state="rrryyrrrrrr"/>
+        <phase duration="15" state="rrrrrGGGrrr"/>
+        <phase duration="3"  state="rrrrryyyrrr"/>
+        <phase duration="15" state="rrrrrrrrGGG"/>
+        <phase duration="3"  state="rrrrrrrryyy"/>
     </tlLogic>
     <tlLogic id="joinedS_3645240254_5996484329" type="static" programID="0" offset="0">
         <phase duration="38" state="GGgrrrrGgg"/>
@@ -960,6 +989,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="2" response="0000" foes="0011"/>
         <request index="3" response="0000" foes="0011"/>
     </junction>
+    <junction id="201220801" type="traffic_light" x="446.79" y="1800.76" incLanes="47795958_0 359893832_0 359893832_1 19386227#1_0 19386227#1_1" intLanes="" shape="447.80,1804.82 450.62,1799.08 448.94,1797.96 447.83,1796.53 447.29,1794.81 447.33,1792.77 447.94,1790.44 449.12,1787.80 441.65,1790.14 441.39,1790.80 441.21,1790.93 440.99,1790.93 440.74,1790.79 440.44,1790.52 438.95,1798.21 446.68,1800.68 443.55,1806.26">
+        <request index="0" response="00000" foes="10000"/>
+        <request index="1" response="00000" foes="01000"/>
+        <request index="2" response="00000" foes="11000"/>
+        <request index="3" response="00110" foes="00110"/>
+        <request index="4" response="00101" foes="00101"/>
+    </junction>
+    <junction id="201221330" type="priority" x="423.28" y="1701.54" incLanes="94669185#3_0 94669185#3_1" intLanes="" shape="441.86,1707.94 442.93,1701.63 442.26,1701.42 442.16,1701.29 442.23,1701.14 442.44,1700.96 442.82,1700.77 442.10,1693.70 438.31,1696.08 435.29,1697.71 432.59,1698.65 429.77,1698.98 426.39,1698.75 421.98,1698.05 420.84,1704.35">
+        <request index="0" response="0000" foes="0000"/>
+        <request index="1" response="0000" foes="0000"/>
+        <request index="2" response="0000" foes="0000"/>
+        <request index="3" response="0000" foes="0000"/>
+    </junction>
     <junction id="201221373" type="priority" x="419.23" y="1537.14" incLanes="19358290#1_0 19358290#1_1 615359733_0" intLanes="" shape="419.80,1544.77 426.09,1542.09 423.57,1539.24 422.73,1537.40 422.17,1535.27 421.89,1532.87 421.89,1530.19 415.44,1531.19 414.95,1533.66 414.45,1534.81 413.77,1535.91 412.91,1536.96 411.88,1537.94 414.52,1544.11 416.33,1543.13 417.21,1543.09 418.09,1543.35 418.95,1543.91">
         <request index="0" response="00000" foes="10000"/>
         <request index="1" response="00000" foes="01000"/>
@@ -1071,6 +1113,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="2" response="0000" foes="0000"/>
         <request index="3" response="0000" foes="0000"/>
     </junction>
+    <junction id="201588819" type="traffic_light" x="455.87" y="1707.08" incLanes="47795952#2_0 47795952#2_1 661157896_0 661157896_1" intLanes="" shape="462.67,1711.93 464.10,1705.68 462.14,1704.70 461.57,1703.99 461.26,1703.14 461.22,1702.13 461.46,1700.99 455.47,1698.66 454.04,1701.25 452.98,1702.06 451.69,1702.55 450.17,1702.72 448.42,1702.57 447.35,1708.87 449.36,1709.65 449.91,1710.29 450.14,1711.10 450.07,1712.07 449.69,1713.21 455.55,1715.78 457.35,1713.04 458.47,1712.22 459.73,1711.76 461.13,1711.66">
+        <request index="0" response="000000" foes="011000"/>
+        <request index="1" response="000000" foes="111000"/>
+        <request index="2" response="000000" foes="111000"/>
+        <request index="3" response="000111" foes="000111"/>
+        <request index="4" response="000111" foes="000111"/>
+        <request index="5" response="000110" foes="000110"/>
+    </junction>
+    <junction id="201589322" type="priority" x="452.34" y="1781.96" incLanes="19397237#4_0 19397237#4_1" intLanes="" shape="454.49,1785.26 454.76,1778.86 452.09,1778.72 448.50,1778.45 446.87,1778.38 444.90,1778.39 442.24,1778.50 441.95,1784.93 442.70,1785.03 442.90,1785.20 442.97,1785.44 442.92,1785.77 442.74,1786.17 447.85,1793.26 448.06,1790.74 448.63,1788.69 449.56,1787.12 450.84,1786.02 452.49,1785.40">
+        <request index="0" response="0000" foes="0000"/>
+        <request index="1" response="0000" foes="0000"/>
+        <request index="2" response="0000" foes="0000"/>
+        <request index="3" response="0000" foes="0000"/>
+    </junction>
     <junction id="201648374" type="priority" x="548.12" y="1444.98" incLanes="19390809_0" intLanes="" shape="548.12,1444.98 545.23,1443.61 548.12,1444.98">
         <request index="0" response="0" foes="0"/>
     </junction>
@@ -1118,6 +1174,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="3" response="00000" foes="00001"/>
         <request index="4" response="00000" foes="00001"/>
     </junction>
+    <junction id="3645231524" type="traffic_light" x="418.07" y="1788.26" incLanes="47795957#0_0 47795957#0_1 19397237#6_0 19397237#6_1" intLanes="" shape="426.30,1796.56 429.43,1790.98 428.96,1790.57 428.92,1790.37 429.00,1790.17 429.21,1789.97 429.55,1789.77 429.26,1782.78 426.88,1783.84 424.65,1784.58 422.59,1785.02 420.68,1785.14 418.93,1784.95 417.34,1784.45 414.78,1790.31 417.32,1791.46 419.17,1792.38 420.65,1793.21 423.88,1795.16">
+        <request index="0" response="0000" foes="1100"/>
+        <request index="1" response="0000" foes="1100"/>
+        <request index="2" response="0011" foes="0011"/>
+        <request index="3" response="0011" foes="0011"/>
+    </junction>
+    <junction id="3645231555" type="traffic_light" x="433.13" y="1784.43" incLanes="19397237#5_0 19397237#5_1 19386227#0_0 19386227#0_1" intLanes="" shape="433.96,1792.37 439.63,1789.35 438.63,1787.02 438.73,1786.18 439.23,1785.55 440.14,1785.15 441.45,1784.96 438.74,1778.91 436.45,1779.13 435.58,1778.82 434.88,1778.23 434.37,1777.35 434.03,1776.19 427.96,1778.46 428.17,1781.30 427.85,1782.39 427.25,1783.27 426.38,1783.94 425.22,1784.40 428.10,1790.25 430.44,1790.03 431.47,1790.27 432.39,1790.74 433.23,1791.44">
+        <request index="0" response="000000" foes="011000"/>
+        <request index="1" response="000000" foes="111000"/>
+        <request index="2" response="000000" foes="111000"/>
+        <request index="3" response="000111" foes="000111"/>
+        <request index="4" response="000111" foes="000111"/>
+        <request index="5" response="000110" foes="000110"/>
+    </junction>
     <junction id="3645240254" type="traffic_light" x="435.92" y="1388.14" incLanes="47795934_0 47795934_1 -47795932_0 -47795932_1 19358290#2_0 19358290#2_1" intLanes="" shape="442.20,1396.99 443.84,1382.63 441.69,1381.96 440.98,1381.31 440.53,1380.46 440.32,1379.40 440.36,1378.14 434.01,1377.36 433.30,1379.50 432.66,1380.20 431.82,1380.64 430.79,1380.82 429.56,1380.76 427.74,1393.43 430.02,1394.30 430.77,1395.08 431.24,1396.09 431.45,1397.33 431.39,1398.80 437.74,1399.57 438.45,1397.52 439.10,1396.94 439.94,1396.66 440.97,1396.68">
         <request index="0" response="0000000000" foes="1111000000"/>
         <request index="1" response="0000000000" foes="1111000000"/>
@@ -1487,6 +1557,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="7" response="000011000" foes="000011110"/>
         <request index="8" response="000010001" foes="000010001"/>
     </junction>
+    <junction id="5819001482" type="priority" x="464.06" y="1782.46" incLanes="19397237#3_0 19397237#3_1 -615359751#0_0" intLanes="" shape="468.46,1785.85 468.73,1779.45 467.89,1779.21 467.60,1778.95 467.39,1778.58 467.26,1778.11 467.21,1777.55 460.81,1777.62 460.86,1778.46 460.68,1778.74 460.37,1778.93 459.92,1779.04 459.33,1779.05 459.06,1785.45">
+        <request index="0" response="00000" foes="01000"/>
+        <request index="1" response="00000" foes="01000"/>
+        <request index="2" response="00000" foes="11000"/>
+        <request index="3" response="00111" foes="00111"/>
+        <request index="4" response="00100" foes="00100"/>
+    </junction>
     <junction id="5819001489" type="priority" x="466.21" y="1727.85" incLanes="615359751#1_0" intLanes="" shape="466.21,1727.85 463.23,1726.68 466.21,1727.85">
         <request index="0" response="0" foes="0"/>
     </junction>
@@ -1547,27 +1624,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="4" response="000000" foes="000100"/>
         <request index="5" response="000000" foes="000100"/>
     </junction>
-    <junction id="cluster_201220801_201589322_3645231524_3645231555_#1more" type="traffic_light" x="442.88" y="1787.57" incLanes="47795958_0 19397237#3_0 19397237#3_1 -615359751#0_0 19386227#0_0 19386227#0_1" intLanes="" shape="445.38,1803.63 448.20,1797.89 445.15,1795.26 445.40,1792.44 448.19,1789.77 452.73,1787.53 458.23,1786.06 463.93,1785.66 464.20,1779.26 465.78,1772.18 430.13,1785.55 429.83,1787.90 428.44,1788.17 426.23,1787.83 423.20,1786.88 419.35,1785.32 416.79,1791.19">
-        <request index="0" response="000000000" foes="000001100"/>
-        <request index="1" response="010000000" foes="010100000"/>
-        <request index="2" response="000000001" foes="111100001"/>
-        <request index="3" response="000000001" foes="111100001"/>
-        <request index="4" response="000000000" foes="001100000"/>
-        <request index="5" response="010011110" foes="010011110"/>
-        <request index="6" response="010011100" foes="110011100"/>
-        <request index="7" response="000001100" foes="001101110"/>
-        <request index="8" response="001001100" foes="001001100"/>
-    </junction>
-    <junction id="cluster_201221330_201588819" type="traffic_light" x="439.58" y="1704.31" incLanes="47795952#2_0 47795952#2_1 94669185#3_0 94669185#3_1" intLanes="" shape="462.67,1711.93 464.10,1705.68 462.14,1704.70 461.57,1703.99 461.26,1703.14 461.22,1702.13 461.46,1700.99 455.47,1698.66 427.89,1704.42 427.45,1698.04 426.11,1698.26 425.64,1698.38 425.17,1698.47 424.61,1698.48 423.85,1698.39 422.71,1704.69 430.16,1706.10 436.83,1707.54 442.43,1709.00 446.63,1710.48 449.11,1711.98 449.56,1713.50 455.42,1716.07 457.30,1713.17 458.44,1712.29 459.71,1711.79 461.13,1711.67">
-        <request index="0" response="00000000" foes="01100000"/>
-        <request index="1" response="00000000" foes="11100000"/>
-        <request index="2" response="00000000" foes="11100000"/>
-        <request index="3" response="00000000" foes="00000000"/>
-        <request index="4" response="00000000" foes="00000000"/>
-        <request index="5" response="00000111" foes="00000111"/>
-        <request index="6" response="00000111" foes="00000111"/>
-        <request index="7" response="00000110" foes="00000110"/>
-    </junction>
     <junction id="cluster_201364769_201364910" type="traffic_light" x="499.09" y="1399.46" incLanes="19368141#1_0 19368141#1_1 359894536_0 359894536_1 94669166_0 94669166_1" intLanes="" shape="505.31,1408.20 507.72,1393.14 505.23,1392.27 504.42,1391.54 503.89,1390.62 503.64,1389.52 503.68,1388.21 497.33,1387.40 496.61,1389.53 495.96,1390.21 495.12,1390.63 494.09,1390.80 492.88,1390.70 490.31,1405.66 492.88,1406.58 493.73,1407.32 494.29,1408.26 494.55,1409.38 494.51,1410.70 500.86,1411.51 501.58,1409.38 502.23,1408.70 503.07,1408.27 504.09,1408.11">
         <request index="0" response="0000000000" foes="1111000000"/>
         <request index="1" response="0000000000" foes="1111000000"/>
@@ -1814,8 +1870,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="-615359749#1" to="-615359749#2" fromLane="0" toLane="0" dir="l" state="="/>
     <connection from="-615359749#1" to="615359749#1" fromLane="0" toLane="0" dir="t" state="="/>
     <connection from="-615359749#2" to="-615359749#1" fromLane="0" toLane="0" dir="l" state="M"/>
-    <connection from="-615359751#0" to="-47795958" fromLane="0" toLane="0" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="7" dir="r" state="o"/>
-    <connection from="-615359751#0" to="47795957#1" fromLane="0" toLane="1" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="8" dir="l" state="o"/>
+    <connection from="-615359751#0" to="19397237#4" fromLane="0" toLane="1" dir="l" state="m"/>
+    <connection from="-615359751#0" to="615359751#0" fromLane="0" toLane="0" dir="t" state="m"/>
     <connection from="-615359751#1" to="615359752#0" fromLane="0" toLane="0" dir="r" state="M"/>
     <connection from="-615359751#1" to="-615359751#0" fromLane="0" toLane="0" dir="s" state="="/>
     <connection from="-615359751#1" to="615359751#1" fromLane="0" toLane="0" dir="t" state="="/>
@@ -1883,8 +1939,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="19385774#0" to="19385774#1" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="19385774#0" to="19390809" fromLane="0" toLane="0" dir="l" state="M"/>
     <connection from="19385774#1" to="47795943#3" fromLane="0" toLane="0" dir="r" state="m"/>
-    <connection from="19386227#0" to="-47795958" fromLane="0" toLane="0" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="9" dir="s" state="o"/>
-    <connection from="19386227#0" to="47795957#1" fromLane="1" toLane="1" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="10" dir="l" state="o"/>
+    <connection from="19386227#0" to="19386227#1" fromLane="0" toLane="0" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="8" dir="s" state="o"/>
+    <connection from="19386227#0" to="19386227#1" fromLane="1" toLane="1" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="9" dir="s" state="o"/>
+    <connection from="19386227#0" to="19397237#6" fromLane="1" toLane="1" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="10" dir="l" state="o"/>
+    <connection from="19386227#1" to="-47795958" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="19386227#1" to="47795957#0" fromLane="1" toLane="1" dir="r" state="m"/>
     <connection from="19390809" to="-19390809" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from="19396804#0" to="19396804#1" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="19396804#0" to="19396804#1" fromLane="1" toLane="1" dir="s" state="M"/>
@@ -1898,17 +1957,27 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="19397237#1" to="19397237#2" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from="19397237#2" to="19397237#3" fromLane="0" toLane="0" tl="201158128" linkIndex="0" dir="s" state="O"/>
     <connection from="19397237#2" to="19397237#3" fromLane="1" toLane="1" tl="201158128" linkIndex="1" dir="s" state="O"/>
-    <connection from="19397237#3" to="-47795958" fromLane="0" toLane="0" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="3" dir="r" state="o"/>
-    <connection from="19397237#3" to="47795957#1" fromLane="0" toLane="0" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="4" dir="s" state="o"/>
-    <connection from="19397237#3" to="47795957#1" fromLane="1" toLane="1" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="5" dir="s" state="o"/>
-    <connection from="19397237#3" to="615359751#0" fromLane="1" toLane="0" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="6" dir="l" state="O"/>
+    <connection from="19397237#3" to="19397237#4" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="19397237#3" to="19397237#4" fromLane="1" toLane="1" dir="s" state="M"/>
+    <connection from="19397237#3" to="615359751#0" fromLane="1" toLane="0" dir="l" state="M"/>
+    <connection from="19397237#4" to="359893832" fromLane="0" toLane="0" dir="R" state="M"/>
+    <connection from="19397237#4" to="359893832" fromLane="0" toLane="1" dir="R" state="M"/>
+    <connection from="19397237#4" to="19397237#5" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="19397237#4" to="19397237#5" fromLane="1" toLane="1" dir="s" state="M"/>
+    <connection from="19397237#5" to="19386227#1" fromLane="0" toLane="0" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="5" dir="r" state="O"/>
+    <connection from="19397237#5" to="19397237#6" fromLane="0" toLane="0" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="6" dir="s" state="O"/>
+    <connection from="19397237#5" to="19397237#6" fromLane="1" toLane="1" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="7" dir="s" state="O"/>
+    <connection from="19397237#6" to="47795957#1" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="19397237#6" to="47795957#1" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from="280535301" to="19397237#0" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="280535301" to="19397237#0" fromLane="0" toLane="1" dir="s" state="M"/>
     <connection from="359891757" to="19397167" fromLane="0" toLane="0" tl="201579267" linkIndex="0" dir="r" state="O"/>
     <connection from="359891757" to="19397167" fromLane="1" toLane="1" tl="201579267" linkIndex="1" dir="r" state="O"/>
     <connection from="359891757" to="-47795742" fromLane="1" toLane="0" tl="201579267" linkIndex="2" dir="l" state="o"/>
-    <connection from="359893830" to="661157897#0" fromLane="0" toLane="0" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="0" dir="s" state="O"/>
-    <connection from="359893830" to="661157897#0" fromLane="1" toLane="1" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="1" dir="s" state="O"/>
+    <connection from="359893830" to="661157897#0" fromLane="0" toLane="0" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="0" dir="s" state="O"/>
+    <connection from="359893830" to="661157897#0" fromLane="1" toLane="1" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="1" dir="s" state="O"/>
+    <connection from="359893832" to="-47795958" fromLane="0" toLane="0" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="3" dir="s" state="O"/>
+    <connection from="359893832" to="47795957#0" fromLane="1" toLane="1" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="4" dir="l" state="O"/>
     <connection from="359894536" to="661157895#1" fromLane="0" toLane="0" tl="cluster_201364769_201364910" linkIndex="3" dir="r" state="O"/>
     <connection from="359894536" to="94669179#0" fromLane="0" toLane="0" tl="cluster_201364769_201364910" linkIndex="4" dir="s" state="O"/>
     <connection from="359894536" to="94669179#0" fromLane="1" toLane="1" tl="cluster_201364769_201364910" linkIndex="5" dir="s" state="O"/>
@@ -1963,12 +2032,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="47795952#0" to="47795952#1" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from="47795952#1" to="47795952#2" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="47795952#1" to="47795952#2" fromLane="1" toLane="1" dir="s" state="M"/>
-    <connection from="47795952#2" to="47795936#0" fromLane="0" toLane="0" tl="cluster_201221330_201588819" linkIndex="0" dir="r" state="O"/>
-    <connection from="47795952#2" to="602386832" fromLane="0" toLane="0" tl="cluster_201221330_201588819" linkIndex="1" dir="s" state="O"/>
-    <connection from="47795952#2" to="602386832" fromLane="1" toLane="1" tl="cluster_201221330_201588819" linkIndex="2" dir="s" state="O"/>
+    <connection from="47795952#2" to="47795936#0" fromLane="0" toLane="0" tl="201588819" linkIndex="0" dir="r" state="O"/>
+    <connection from="47795952#2" to="602386832" fromLane="0" toLane="0" tl="201588819" linkIndex="1" dir="s" state="O"/>
+    <connection from="47795952#2" to="602386832" fromLane="1" toLane="1" tl="201588819" linkIndex="2" dir="s" state="O"/>
+    <connection from="47795957#0" to="47795957#1" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="47795957#0" to="47795957#1" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from="47795957#1" to="661157897#0" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="47795957#1" to="661157897#0" fromLane="1" toLane="1" dir="s" state="M"/>
-    <connection from="47795958" to="47795957#1" fromLane="0" toLane="0" tl="joinedS_201220797_cluster_201220801_201589322_3645231524_3645231555_#1more" linkIndex="2" dir="s" state="O"/>
+    <connection from="47795958" to="47795957#0" fromLane="0" toLane="0" tl="joinedS_201220797_201220801_3645231524_3645231555" linkIndex="2" dir="s" state="O"/>
     <connection from="480176669" to="169055291" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="547275315" to="-547275318" fromLane="0" toLane="0" tl="201484338" linkIndex="4" dir="r" state="O"/>
     <connection from="547275315" to="359891757" fromLane="0" toLane="0" tl="201484338" linkIndex="5" dir="s" state="O"/>
@@ -2131,6 +2202,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="635791722#0" to="635791722#1" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="635791722#0" to="635791722#1" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from="635791722#1" to="-635791722#1" fromLane="1" toLane="1" dir="t" state="M"/>
+    <connection from="661157896" to="47795936#0" fromLane="0" toLane="0" tl="201588819" linkIndex="3" dir="s" state="o"/>
+    <connection from="661157896" to="47795936#0" fromLane="1" toLane="1" tl="201588819" linkIndex="4" dir="s" state="o"/>
+    <connection from="661157896" to="602386832" fromLane="1" toLane="1" tl="201588819" linkIndex="5" dir="l" state="o"/>
     <connection from="661157897#0" to="661157897#1" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="661157897#0" to="661157897#1" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from="661157897#0" to="19355567" fromLane="1" toLane="0" dir="L" state="M"/>
@@ -2162,10 +2236,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="94669185#2" to="94669185#3" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="94669185#2" to="94669185#3" fromLane="1" toLane="1" dir="s" state="M"/>
     <connection from="94669185#2" to="615359739#0" fromLane="1" toLane="0" dir="l" state="M"/>
-    <connection from="94669185#3" to="19358290#0" fromLane="0" toLane="0" tl="cluster_201221330_201588819" linkIndex="3" dir="R" state="O"/>
-    <connection from="94669185#3" to="19358290#0" fromLane="0" toLane="1" tl="cluster_201221330_201588819" linkIndex="4" dir="R" state="O"/>
-    <connection from="94669185#3" to="47795936#0" fromLane="0" toLane="0" tl="cluster_201221330_201588819" linkIndex="5" dir="s" state="o"/>
-    <connection from="94669185#3" to="47795936#0" fromLane="1" toLane="1" tl="cluster_201221330_201588819" linkIndex="6" dir="s" state="o"/>
-    <connection from="94669185#3" to="602386832" fromLane="1" toLane="1" tl="cluster_201221330_201588819" linkIndex="7" dir="l" state="o"/>
+    <connection from="94669185#3" to="19358290#0" fromLane="0" toLane="0" dir="R" state="M"/>
+    <connection from="94669185#3" to="19358290#0" fromLane="0" toLane="1" dir="R" state="M"/>
+    <connection from="94669185#3" to="661157896" fromLane="0" toLane="0" dir="s" state="M"/>
+    <connection from="94669185#3" to="661157896" fromLane="1" toLane="1" dir="s" state="M"/>
 
 </net>
diff --git a/tests/netconvert/import/OSM/bugs/ticket871/errors.netconvert b/tests/netconvert/import/OSM/bugs/ticket871/errors.netconvert
index 4e1d99cb40a..f3fcebf2394 100644
--- a/tests/netconvert/import/OSM/bugs/ticket871/errors.netconvert
+++ b/tests/netconvert/import/OSM/bugs/ticket871/errors.netconvert
@@ -3,3 +3,4 @@ Warning: Removing pt stop '246422911' on non existing edge '22894125'.
 Warning: Removing pt stop '246422944' on non existing edge '22894125'.
 Warning: Could not find corresponding edge or compatible lane for free-floating pt stop '246422911' (Bahnhof Deutz). Thus, it will be removed!
 Warning: Could not find corresponding edge or compatible lane for free-floating pt stop '246422944' (Deutz Fachhochschule). Thus, it will be removed!
+Warning: Not joining junctions 442733,613378773 (parallel outgoing 48273910#1,8078855#0).
diff --git a/tests/netconvert/import/OSM/bugs/ticket871/joined_nodes.netconvert b/tests/netconvert/import/OSM/bugs/ticket871/joined_nodes.netconvert
index bb581259b83..d649528d5ca 100644
--- a/tests/netconvert/import/OSM/bugs/ticket871/joined_nodes.netconvert
+++ b/tests/netconvert/import/OSM/bugs/ticket871/joined_nodes.netconvert
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Dec 14 11:32:42 2020 by Eclipse SUMO netconvert Version v1_8_0+0240-6f1f621077
+<!-- generated on 2022-11-20 13:42:55 by Eclipse SUMO netconvert Version v1_15_0+0458-51ec704
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
@@ -38,7 +43,6 @@ SPDX-License-Identifier: EPL-2.0
 
     <report>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
     </report>
 
 </configuration>
@@ -46,5 +50,4 @@ SPDX-License-Identifier: EPL-2.0
 
 <nodes version="1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/nodes_file.xsd">
     <join nodes="201673130 370118526 392086464 436241843 449770 449778 449797 456826693 456826694 613378775"/>
-    <join nodes="442733 613378773"/>
 </nodes>
diff --git a/tests/netconvert/import/OSM/bugs/ticket871/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket871/net.netconvert
index fc3ca289942..4ac184f2d9e 100644
--- a/tests/netconvert/import/OSM/bugs/ticket871/net.netconvert
+++ b/tests/netconvert/import/OSM/bugs/ticket871/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-09-30 15:12:08 by Eclipse SUMO netconvert Version v1_14_1+1380-70dcd03b0c6
+<!-- generated on 2022-11-20 13:42:55 by Eclipse SUMO netconvert Version v1_15_0+0458-51ec704
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -112,26 +112,29 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <param key="ref" value="L 111"/>
     </edge>
     <edge id="22894009" from="246411203" to="cluster_201673130_370118526_392086464_436241843_#6more" priority="12" type="highway.primary" spreadType="center" shape="376.09,0.00 376.50,3.24 385.42,56.82 390.54,121.31 387.49,146.03 380.96,156.89 370.16,163.41 195.04,199.92">
-        <lane id="22894009_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="368.96" shape="380.85,-0.62 381.25,2.54 390.18,56.23 395.36,121.42 392.13,147.63 384.46,160.39 371.94,167.94 194.43,204.95"/>
-        <lane id="22894009_1" index="1" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="368.96" shape="377.67,-0.21 378.09,3.00 387.01,56.62 392.15,121.35 389.04,146.57 382.13,158.06 370.75,164.92 193.82,201.81"/>
-        <lane id="22894009_2" index="2" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="368.96" shape="374.50,0.21 374.92,3.47 383.83,57.01 388.93,121.28 385.94,145.50 379.80,155.73 369.57,161.90 193.20,198.66"/>
-        <lane id="22894009_3" index="3" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="368.96" shape="371.33,0.62 371.76,3.94 380.65,57.40 385.72,121.21 382.85,144.43 377.46,153.40 368.38,158.88 192.59,195.52"/>
+        <lane id="22894009_0" index="0" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="368.92" shape="380.85,-0.62 381.25,2.54 390.18,56.23 395.36,121.42 392.13,147.63 384.46,160.39 371.94,167.94 195.19,204.79"/>
+        <lane id="22894009_1" index="1" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="368.92" shape="377.67,-0.21 378.09,3.00 387.01,56.62 392.15,121.35 389.04,146.57 382.13,158.06 370.75,164.92 194.58,201.65"/>
+        <lane id="22894009_2" index="2" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="368.92" shape="374.50,0.21 374.92,3.47 383.83,57.01 388.93,121.28 385.94,145.50 379.80,155.73 369.57,161.90 193.96,198.51"/>
+        <lane id="22894009_3" index="3" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="368.92" shape="371.33,0.62 371.76,3.94 380.65,57.40 385.72,121.21 382.85,144.43 377.46,153.40 368.38,158.88 193.35,195.37"/>
         <param key="ref" value="L 111"/>
     </edge>
     <edge id="32856652#0" from="60747529" to="cluster_201673130_370118526_392086464_436241843_#6more" priority="11" type="highway.secondary" spreadType="center" shape="140.10,114.00 151.65,139.17 174.58,179.68">
         <lane id="32856652#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="92.33" shape="140.10,114.00 151.65,139.17 167.80,167.70"/>
     </edge>
     <edge id="4532170#0" from="cluster_201673130_370118526_392086464_436241843_#6more" to="201673113" priority="11" type="highway.secondary" spreadType="center" shape="180.35,190.54 185.24,189.58 193.02,188.02">
-        <lane id="4532170#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="18.49" shape="190.89,186.82 192.57,186.48"/>
-        <lane id="4532170#0_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="18.49" shape="191.50,189.96 193.20,189.62"/>
+        <lane id="4532170#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="18.42" shape="191.65,186.67 192.57,186.48"/>
+        <lane id="4532170#0_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="18.42" shape="192.26,189.81 193.20,189.62"/>
         <param key="ref" value="L 111"/>
     </edge>
-    <edge id="48273909" from="cluster_201673130_370118526_392086464_436241843_#6more" to="cluster_442733_613378773" priority="12" type="highway.primary" spreadType="center" shape="185.47,201.64 195.50,230.73">
-        <lane id="48273909_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="32.51" shape="192.33,216.62 192.40,216.81"/>
-        <lane id="48273909_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="32.51" shape="189.42,217.99 189.54,218.32"/>
+    <edge id="48273909" from="cluster_201673130_370118526_392086464_436241843_#6more" to="442733" priority="12" type="highway.primary" spreadType="center" shape="185.47,201.64 198.53,229.68">
+        <lane id="48273909_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="31.68" shape="191.82,211.48 193.88,215.90"/>
+        <lane id="48273909_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="31.68" shape="188.92,212.83 191.00,217.30"/>
     </edge>
-    <edge id="48273910#1" from="cluster_442733_613378773" to="449798" priority="11" type="highway.secondary" spreadType="center" shape="179.17,221.05 173.12,217.47 163.62,214.51 144.02,209.10">
-        <lane id="48273910#1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="46.80" shape="179.17,221.05 173.12,217.47 163.62,214.51 158.23,213.02"/>
+    <edge id="48273910#0" from="442733" to="613378773" priority="11" type="highway.secondary" spreadType="center">
+        <lane id="48273910#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="12.57" shape="182.21,222.85 179.30,221.12"/>
+    </edge>
+    <edge id="48273910#1" from="613378773" to="449798" priority="11" type="highway.secondary" spreadType="center" shape="179.17,221.05 173.12,217.47 163.62,214.51 144.02,209.10">
+        <lane id="48273910#1_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="37.31" shape="179.04,220.97 173.12,217.47 163.62,214.51 158.23,213.02"/>
     </edge>
     <edge id="48274301#0" from="449801" to="449799" priority="11" type="highway.secondary" spreadType="center" shape="53.65,209.81 63.55,208.37 87.55,206.33 113.12,202.36 142.68,198.40">
         <lane id="48274301#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="89.79" shape="52.96,205.06 63.01,203.60 86.98,201.57 112.44,197.61 141.65,193.70"/>
@@ -147,9 +150,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="48274301#1_3" index="3" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="35.10" shape="144.30,202.94 147.90,201.99"/>
         <param key="ref" value="L 111"/>
     </edge>
-    <edge id="8078855#0" from="cluster_442733_613378773" to="cluster_201673130_370118526_392086464_436241843_#6more" priority="12" type="highway.primary" spreadType="center" shape="195.50,230.73 185.98,218.36 177.89,211.75">
-        <lane id="8078855#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="32.15" shape="185.84,220.80 184.83,219.48 176.88,212.99"/>
-        <lane id="8078855#0_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="32.15" shape="188.51,219.01 187.14,217.24 178.90,210.51"/>
+    <edge id="8078855#0" from="442733" to="cluster_201673130_370118526_392086464_436241843_#6more" priority="12" type="highway.primary" spreadType="center" shape="192.97,232.68 185.98,218.36 177.89,211.75">
+        <lane id="8078855#0_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="32.07" shape="185.09,220.18 184.70,219.37 176.88,212.99"/>
+        <lane id="8078855#0_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="32.07" shape="187.97,218.78 187.27,217.34 178.90,210.51"/>
     </edge>
 
     <tlLogic id="449799" type="static" programID="0" offset="0">
@@ -157,6 +160,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="3"  state="yyyy"/>
         <phase duration="5"  state="rrrr"/>
     </tlLogic>
+    <tlLogic id="613378773" type="static" programID="0" offset="0">
+        <phase duration="82" state="G"/>
+        <phase duration="3"  state="y"/>
+        <phase duration="5"  state="r"/>
+    </tlLogic>
     <tlLogic id="613386126" type="static" programID="0" offset="0">
         <phase duration="82" state="GG"/>
         <phase duration="3"  state="yy"/>
@@ -170,11 +178,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <phase duration="37" state="GGGggrrrrrGGggrrrrr"/>
         <phase duration="3"  state="yyyyyrrrrryyyyrrrrr"/>
     </tlLogic>
-    <tlLogic id="cluster_442733_613378773" type="static" programID="0" offset="0">
-        <phase duration="82" state="GG"/>
-        <phase duration="3"  state="yy"/>
-        <phase duration="5"  state="rr"/>
-    </tlLogic>
 
     <junction id="201673113" type="priority" x="193.02" y="188.02" incLanes="4532170#0_0 4532170#0_1" intLanes="" shape="193.83,191.12 192.50,184.86 192.25,184.91 193.51,191.19">
         <request index="0" response="00" foes="00"/>
@@ -182,6 +185,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </junction>
     <junction id="246411203" type="dead_end" x="376.09" y="0.00" incLanes="" intLanes="" shape="369.74,0.82 382.43,-0.82"/>
     <junction id="251322101" type="dead_end" x="129.07" y="139.77" incLanes="132405263#0_0 132405263#0_1" intLanes="" shape="126.12,140.99 132.03,138.54"/>
+    <junction id="442733" type="priority" x="195.50" y="230.73" incLanes="48273909_0 48273909_1" intLanes="" shape="195.32,215.20 183.65,220.89 183.02,221.47 181.39,224.22 188.73,228.09 194.06,229.81 197.39,229.38 198.70,226.81 198.01,222.08">
+        <request index="0" response="00" foes="00"/>
+        <request index="1" response="00" foes="00"/>
+    </junction>
     <junction id="449785" type="dead_end" x="359.32" y="2.46" incLanes="19392620_0 19392620_1" intLanes="" shape="356.19,3.13 362.45,1.79"/>
     <junction id="449798" type="priority" x="144.02" y="209.10" incLanes="48273910#1_0 145357157#0_0 145357157#0_1" intLanes="" shape="157.80,214.56 158.65,211.48 158.74,209.71 157.60,203.41 142.66,206.08 143.68,212.40 146.70,212.03 148.95,212.03 150.81,212.34 152.65,212.90 154.86,213.67">
         <request index="0" response="110" foes="110"/>
@@ -196,12 +203,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </junction>
     <junction id="449801" type="dead_end" x="53.65" y="209.81" incLanes="" intLanes="" shape="54.57,216.15 52.73,203.48"/>
     <junction id="60747529" type="dead_end" x="140.10" y="114.00" incLanes="" intLanes="" shape="138.64,114.66 141.55,113.33"/>
+    <junction id="613378773" type="traffic_light" x="179.17" y="221.05" incLanes="48273910#0_0" intLanes="" shape="178.49,222.50 180.12,219.75 179.86,219.59 178.23,222.35">
+        <request index="0" response="0" foes="0"/>
+    </junction>
     <junction id="613386126" type="traffic_light" x="101.90" y="215.96" incLanes="145357157#2_0 145357157#2_1" intLanes="" shape="102.54,219.09 101.51,212.78 101.40,212.79 102.16,219.15">
         <request index="0" response="00" foes="00"/>
         <request index="1" response="00" foes="00"/>
     </junction>
     <junction id="613393415" type="dead_end" x="0.00" y="228.13" incLanes="145357157#3_0 145357157#3_1" intLanes="" shape="0.46,231.30 -0.46,224.96"/>
-    <junction id="cluster_201673130_370118526_392086464_436241843_#6more" type="traffic_light" x="177.63" y="197.99" incLanes="8078855#0_0 8078855#0_1 22894009_0 22894009_1 22894009_2 22894009_3 32856652#0_0 48274301#1_0 48274301#1_1 48274301#1_2 48274301#1_3" intLanes="" shape="175.87,214.23 179.92,209.27 182.00,211.04 183.78,212.73 185.26,214.31 186.44,215.81 187.32,217.21 187.91,218.52 193.96,216.43 193.11,213.63 192.65,211.29 192.59,209.40 192.91,207.98 193.63,207.02 194.74,206.52 190.58,185.25 187.23,185.28 183.79,184.05 180.24,181.57 176.60,177.83 172.85,172.84 169.01,166.58 147.02,187.05 148.12,188.75 148.12,189.45 147.75,190.05 147.01,190.54 145.91,190.93 149.59,211.35 155.50,210.50 160.80,210.18 165.49,210.39 169.56,211.14 173.02,212.42">
+    <junction id="cluster_201673130_370118526_392086464_436241843_#6more" type="traffic_light" x="177.63" y="197.99" incLanes="8078855#0_0 8078855#0_1 22894009_0 22894009_1 22894009_2 22894009_3 32856652#0_0 48274301#1_0 48274301#1_1 48274301#1_2 48274301#1_3" intLanes="" shape="175.87,214.23 179.92,209.27 187.47,213.50 193.27,210.80 192.77,208.70 192.98,207.88 193.51,207.21 194.35,206.71 195.50,206.36 191.34,185.10 187.76,185.17 184.13,183.99 180.43,181.53 176.68,177.82 172.87,172.83 169.01,166.58 147.02,187.05 148.12,188.75 148.12,189.45 147.75,190.05 147.01,190.54 145.91,190.93 149.59,211.35 155.50,210.50 160.80,210.18 165.49,210.39 169.56,211.14 173.02,212.42">
         <request index="0"  response="0000000000011000000" foes="0000000000011000000"/>
         <request index="1"  response="0111100000111000000" foes="0111111000111000000"/>
         <request index="2"  response="0111100000111000000" foes="0111111000111000000"/>
@@ -222,10 +232,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="17" response="0000000000011000000" foes="0000001100011011110"/>
         <request index="18" response="0000001000011000000" foes="0000001000011000000"/>
     </junction>
-    <junction id="cluster_442733_613378773" type="traffic_light" x="187.34" y="225.89" incLanes="48273909_0 48273909_1" intLanes="" shape="193.66,215.56 184.51,221.69 184.41,222.00 183.84,221.78 182.91,221.32 181.62,220.62 179.99,219.67 178.36,222.43 184.95,225.87 189.92,227.48 193.27,227.26 195.02,225.19 195.15,221.29">
-        <request index="0" response="00" foes="00"/>
-        <request index="1" response="00" foes="00"/>
-    </junction>
 
     <connection from="145357157#0" to="145357157#2" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="145357157#0" to="145357157#2" fromLane="1" toLane="1" dir="s" state="M"/>
@@ -242,8 +248,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="32856652#0" to="132405263#0" fromLane="0" toLane="1" tl="cluster_201673130_370118526_392086464_436241843_#6more" linkIndex="13" dir="t" state="o"/>
     <connection from="4532170#0" to="19392620" fromLane="0" toLane="0" dir="s" state="M"/>
     <connection from="4532170#0" to="19392620" fromLane="1" toLane="1" dir="s" state="M"/>
-    <connection from="48273909" to="48273910#1" fromLane="0" toLane="0" tl="cluster_442733_613378773" linkIndex="0" dir="l" state="O"/>
-    <connection from="48273909" to="8078855#0" fromLane="1" toLane="1" tl="cluster_442733_613378773" linkIndex="1" dir="t" state="O"/>
+    <connection from="48273909" to="48273910#0" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from="48273909" to="8078855#0" fromLane="1" toLane="1" dir="t" state="M"/>
+    <connection from="48273910#0" to="48273910#1" fromLane="0" toLane="0" tl="613378773" linkIndex="0" dir="s" state="O"/>
     <connection from="48273910#1" to="145357157#2" fromLane="0" toLane="0" dir="s" state="m"/>
     <connection from="48274301#0" to="48274301#1" fromLane="0" toLane="0" tl="449799" linkIndex="0" dir="s" state="O"/>
     <connection from="48274301#0" to="48274301#1" fromLane="1" toLane="1" tl="449799" linkIndex="1" dir="s" state="O"/>