diff --git a/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/routes.netedit b/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/routes.netedit
index fc6b6aca2e8..7099a4a6e64 100644
--- a/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/routes.netedit
+++ b/tests/netedit/demandelements/container/create/default_stop/default_stop_containerstop/routes.netedit
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-07 11:53:34 by Eclipse SUMO netedit Version 1.19.0
+<!-- generated on 2023-11-16 08:36:24 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <container id="c_0" depart="0.00">
-        <stop duration="60.00"/>
+        <stop fromContainerStop="containerStopA" duration="60.00"/>
     </container>
 </routes>
diff --git a/tests/netedit/demandelements/container/create/default_stop/default_stop_lane/routes.netedit b/tests/netedit/demandelements/container/create/default_stop/default_stop_lane/routes.netedit
index bd90045e296..4d02cf0d3d8 100644
--- a/tests/netedit/demandelements/container/create/default_stop/default_stop_lane/routes.netedit
+++ b/tests/netedit/demandelements/container/create/default_stop/default_stop_lane/routes.netedit
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-07 11:56:32 by Eclipse SUMO netedit Version 1.19.0
+<!-- generated on 2023-11-16 08:36:24 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <container id="c_0" depart="0.00">
-        <stop duration="60.00"/>
+        <stop edge="Edge0" endPos="26.09" duration="60.00"/>
     </container>
 </routes>
diff --git a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/routes.netedit b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/routes.netedit
index c8b0342a9c2..25c73528780 100644
--- a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/routes.netedit
+++ b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_containerstop/routes.netedit
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-07 14:04:29 by Eclipse SUMO netedit Version v1_19_0+0012-7f242da7bd0
+<!-- generated on 2023-11-16 08:36:33 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <containerFlow id="cf_0" begin="0.00" end="3600.00" containersPerHour="1800">
-        <stop duration="60.00"/>
+        <stop fromContainerStop="containerStopA" duration="60.00"/>
     </containerFlow>
 </routes>
diff --git a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_lane/routes.netedit b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_lane/routes.netedit
index f355ff5f967..9b9aebbb72c 100644
--- a/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_lane/routes.netedit
+++ b/tests/netedit/demandelements/containerflow/create/default_stop/default_stop_lane/routes.netedit
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-07 14:03:01 by Eclipse SUMO netedit Version v1_19_0+0012-7f242da7bd0
+<!-- generated on 2023-11-16 08:36:33 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <containerFlow id="cf_0" begin="0.00" end="3600.00" containersPerHour="1800">
-        <stop duration="60.00"/>
+        <stop edge="Edge0" endPos="26.09" duration="60.00"/>
     </containerFlow>
 </routes>
diff --git a/tests/netedit/demandelements/containerflow/create/period/log.netedit b/tests/netedit/demandelements/containerflow/create/period/log.netedit
index c927d0f921e..e69de29bb2d 100644
--- a/tests/netedit/demandelements/containerflow/create/period/log.netedit
+++ b/tests/netedit/demandelements/containerflow/create/period/log.netedit
@@ -1,2 +0,0 @@
-Warning: Double edges aren't allowed
-Warning: Only two from-to elements are allowed
diff --git a/tests/netedit/demandelements/containerflow/create/period/routes.netedit b/tests/netedit/demandelements/containerflow/create/period/routes.netedit
index c2b93efff4d..f55e83be913 100644
--- a/tests/netedit/demandelements/containerflow/create/period/routes.netedit
+++ b/tests/netedit/demandelements/containerflow/create/period/routes.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-07 14:07:25 by Eclipse SUMO netedit Version v1_19_0+0012-7f242da7bd0
+<!-- generated on 2023-11-16 08:39:07 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
@@ -8,7 +8,10 @@
     <containerFlow id="cf_0" begin="0.00" end="3600.00" period="2.00">
         <tranship from="Edge0" containerStop="containerStopA"/>
     </containerFlow>
-    <containerFlow id="cf_1" begin="0.00" end="3600.00" period="22.00">
+    <containerFlow id="cf_1" begin="0.00" end="3600.00" period="20.50">
+        <tranship from="Edge0" to="Edge2"/>
+    </containerFlow>
+    <containerFlow id="cf_2" begin="0.00" end="3600.00" period="22.00">
         <tranship from="Edge0" to="Edge2"/>
     </containerFlow>
 </routes>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/additionals.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/additionals.netedit
index 0be3e682618..c6b250570b6 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/additionals.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/additionals.netedit
@@ -1,10 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-11 14:02:18 by Eclipse SUMO netedit Version v1_14_1+1589-5bfaa410f84
+<!-- generated on 2023-11-16 08:50:50 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <!-- StoppingPlaces -->
-    <containerStop id="containerStopA" lane="Edge2_0" startPos="20.00" endPos="30.00"/>
-    <containerStop id="containerStopB" lane="Edge2_0" startPos="35.00" endPos="45.00"/>
+    <busStop id="busStopA" lane="Edge2_1" startPos="29.80" endPos="39.80"/>
+    <busStop id="busStopB" name="i" lane="EdgeCenter1_1" startPos="17.50" endPos="22.50"/>
+    <trainStop id="trainStopA" lane="Edge3_1" startPos="9.80" endPos="19.80"/>
+    <trainStop id="trainStopB" name="m" lane="EdgeCenter1_1" startPos="11.50" endPos="16.50"/>
+    <containerStop id="containerStopA" lane="Edge2_1" startPos="9.80" endPos="19.80"/>
+    <containerStop id="containerStopB" lane="EdgeCenter1_1" startPos="5.50" endPos="10.50"/>
+    <chargingStation id="chargingStationA" lane="Edge2_1" startPos="20.80" endPos="28.80"/>
+    <chargingStation id="chargingStationB" lane="EdgeCenter0_1" startPos="2.30" endPos="7.30"/>
+    <parkingArea id="parkingAreaA" lane="Edge3_1" startPos="29.80" endPos="39.80"/>
+    <parkingArea id="parkingAreaB" lane="EdgeCenter0_1" startPos="14.30" endPos="19.30"/>
+    <!-- TAZs -->
+    <taz id="taz_green" shape="18.00,20.00 18.00,16.00 0.00,16.00 0.00,20.00 18.00,20.00" fill="1" color="green">
+        <tazSource id="Edge2" weight="1.00"/>
+        <tazSink id="Edge2" weight="1.00"/>
+        <tazSource id="Edge3" weight="1.00"/>
+        <tazSink id="Edge3" weight="1.00"/>
+    </taz>
+    <taz id="taz_red" shape="36.00,20.00 36.00,16.00 54.00,16.00 54.00,20.00 36.00,20.00" fill="1" color="red">
+        <tazSource id="Edge0" weight="1.00"/>
+        <tazSink id="Edge0" weight="1.00"/>
+        <tazSource id="Edge5" weight="1.00"/>
+        <tazSink id="Edge5" weight="1.00"/>
+    </taz>
 </additional>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/guisettingsoutput.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/guisettingsoutput.netedit
index 853bcae3289..1f3258d2914 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/guisettingsoutput.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/guisettingsoutput.netedit
@@ -1,16 +1,16 @@
 <viewsettings>
-    <scheme name="standard">
-        <opengl dither="0" fps="0" drawBoundaries="0" forceDrawPositionSelection="0" forceDrawRectangleSelection="0"/>
-        <background backgroundColor="white" showGrid="0" gridXSize="100.00" gridYSize="100.00"/>
-        <edges laneEdgeMode="0" scaleMode="0" laneShowBorders="1" showBikeMarkings="1" showLinkDecals="1" realisticLinkRules="0" showLinkRules="1" showRails="1" hideConnectors="0" widthExaggeration="1.00" minSize="0.00" showDirection="0" showSublanes="1" spreadSuperposed="0" edgeParam="EDGE_KEY" laneParam="LANE_KEY" vehicleParam="PARAM_NUMERICAL" vehicleScaleParam="PARAM_NUMERICAL" vehicleTextParam="PARAM_TEXT" edgeData="speed" edgeValueHideCheck="0" edgeValueHideThreshold="0.00"
+    <scheme name="testing">
+        <opengl dither="0" fps="0" drawBoundaries="0" forceDrawPositionSelection="0" disableDottedContours="0" forceDrawRectangleSelection="0" geometryIndices_show="0" geometryIndices_size="50.00" geometryIndices_color="255,0,128" geometryIndices_bgColor="128,0,0,0" geometryIndices_constantSize="1" geometryIndices_onlySelected="0"/>
+        <background backgroundColor="white" showGrid="1" gridXSize="2.00" gridYSize="2.00"/>
+        <edges laneEdgeMode="0" scaleMode="0" laneShowBorders="0" showBikeMarkings="1" showLinkDecals="1" realisticLinkRules="0" showLinkRules="1" showRails="1" secondaryShape="0" hideConnectors="0" widthExaggeration="1.00" minSize="0.00" showDirection="0" showSublanes="1" spreadSuperposed="0" edgeParam="EDGE_KEY" laneParam="LANE_KEY" vehicleParam="PARAM_NUMERICAL" vehicleScaleParam="PARAM_NUMERICAL" vehicleTextParam="PARAM_TEXT" edgeData="speed" edgeDataID="" edgeDataScaling="" edgeValueHideCheck="0" edgeValueHideThreshold="0.00" edgeValueHideCheck2="0" edgeValueHideThreshold2="200.00"
                 edgeName_show="0" edgeName_size="60.00" edgeName_color="orange" edgeName_bgColor="128,0,0,0" edgeName_constantSize="1" edgeName_onlySelected="0"
                 internalEdgeName_show="0" internalEdgeName_size="45.00" internalEdgeName_color="128,64,0" internalEdgeName_bgColor="128,0,0,0" internalEdgeName_constantSize="1" internalEdgeName_onlySelected="0"
                 cwaEdgeName_show="0" cwaEdgeName_size="60.00" cwaEdgeName_color="magenta" cwaEdgeName_bgColor="128,0,0,0" cwaEdgeName_constantSize="1" cwaEdgeName_onlySelected="0"
                 streetName_show="0" streetName_size="60.00" streetName_color="yellow" streetName_bgColor="128,0,0,0" streetName_constantSize="1" streetName_onlySelected="0"
-                edgeValue_show="0" edgeValue_size="100.00" edgeValue_color="cyan" edgeValue_bgColor="128,0,0,0" edgeValue_constantSize="1" edgeValue_onlySelected="0">
+                edgeValue_show="0" edgeValue_size="100.00" edgeValue_color="cyan" edgeValue_bgColor="128,0,0,0" edgeValue_constantSize="1" edgeValue_onlySelected="0" edgeScaleValue_show="0" edgeScaleValue_size="100.00" edgeScaleValue_color="blue" edgeScaleValue_bgColor="128,0,0,0" edgeScaleValue_constantSize="1" edgeScaleValue_onlySelected="0">
             <colorScheme name="uniform">
                 <entry color="black" name="road"/>
-                <entry color="grey" name="sidetranship"/>
+                <entry color="grey" name="sidewalk"/>
                 <entry color="192,66,44" name="bike lane"/>
                 <entry color="200,255,200" name="green verge"/>
                 <entry color="150,200,200" name="waterway"/>
@@ -31,7 +31,7 @@
                 <entry color="grey" threshold="32.00" name="pedestrian"/>
                 <entry color="10,10,10" threshold="64.00" name="passenger"/>
                 <entry color="166,147,26" threshold="256.00" name="taxi"/>
-                <entry color="40,100,40" threshold="512.00" name="container"/>
+                <entry color="40,100,40" threshold="512.00" name="bus"/>
                 <entry color="80,80,80" threshold="2080.00" name="pedestrian_delivery"/>
                 <entry color="192,66,44" threshold="65536.00" name="bicycle"/>
                 <entry color="150,200,200" threshold="8388608.00" name="waterway"/>
@@ -113,13 +113,13 @@
                 <entry color="red" threshold="1.00"/>
             </colorScheme>
             <colorScheme name="by edgeData (numerical, streetwise)" interpolated="1">
-                <entry color="204,204,204" name="missing data"/>
+                <entry color="225,225,225" name="missing data"/>
             </colorScheme>
             <scalingScheme name="default">
                 <entry color="1.00" name="uniform"/>
             </scalingScheme>
         </edges>
-        <vehicles vehicleMode="0" vehicleScaleMode="0" vehicleQuality="0" vehicle_minSize="1.00" vehicle_exaggeration="1.00" vehicle_constantSize="0" vehicle_constantSizeSelected="0" showBlinker="1" drawMinGap="0" drawBrakeGap="0" showBTRange="0" showRouteIndex="0" scaleLength="1" showParkingInfo="0"
+        <vehicles vehicleMode="0" vehicleScaleMode="0" vehicleQuality="0" vehicle_minSize="1.00" vehicle_exaggeration="1.00" vehicle_constantSize="0" vehicle_constantSizeSelected="0" showBlinker="1" drawMinGap="0" drawBrakeGap="0" showBTRange="0" showRouteIndex="0" scaleLength="1" drawReversed="0" showParkingInfo="0"
                   vehicleName_show="0" vehicleName_size="60.00" vehicleName_color="204,153,0" vehicleName_bgColor="128,0,0,0" vehicleName_constantSize="1" vehicleName_onlySelected="0"
                   vehicleValue_show="0" vehicleValue_size="80.00" vehicleValue_color="cyan" vehicleValue_bgColor="128,0,0,0" vehicleValue_constantSize="1" vehicleValue_onlySelected="0"
                   vehicleScaleValue_show="0" vehicleScaleValue_size="80.00" vehicleScaleValue_color="grey" vehicleScaleValue_bgColor="128,0,0,0" vehicleScaleValue_constantSize="1" vehicleScaleValue_onlySelected="0"
@@ -131,13 +131,13 @@
                 <entry color="1.00"/>
             </scalingScheme>
         </vehicles>
-        <containers containerMode="0" containerQuality="0" container_minSize="1.00" container_exaggeration="1.00" container_constantSize="0" container_constantSizeSelected="0"
-                 containerName_show="0" containerName_size="60.00" containerName_color="0,153,204" containerName_bgColor="128,0,0,0" containerName_constantSize="1" containerName_onlySelected="0"
-                  containerValue_show="0" containerValue_size="80.00" containerValue_color="cyan" containerValue_bgColor="128,0,0,0" containerValue_constantSize="1" containerValue_onlySelected="0">
+        <persons personMode="0" personQuality="2" showPedestrianNetwork="1" pedestrianNetworkColor="179,217,255" person_minSize="1.00" person_exaggeration="1.00" person_constantSize="0" person_constantSizeSelected="0"
+                 personName_show="0" personName_size="60.00" personName_color="0,153,204" personName_bgColor="128,0,0,0" personName_constantSize="1" personName_onlySelected="0"
+                  personValue_show="0" personValue_size="80.00" personValue_color="cyan" personValue_bgColor="128,0,0,0" personValue_constantSize="1" personValue_onlySelected="0">
             <colorScheme name="uniform">
                 <entry color="yellow"/>
             </colorScheme>
-        </containers>
+        </persons>
         <containers containerMode="0" containerQuality="0" container_minSize="1.00" container_exaggeration="1.00" container_constantSize="0" container_constantSizeSelected="0"
                  containerName_show="0" containerName_size="60.00" containerName_color="0,153,204" containerName_bgColor="128,0,0,0" containerName_constantSize="1" containerName_onlySelected="0">
             <colorScheme name="uniform">
@@ -145,8 +145,8 @@
             </colorScheme>
         </containers>
         <junctions junctionMode="0"
-                   drawLinkTLIndex_show="0" drawLinkTLIndex_size="65.00" drawLinkTLIndex_color="128,128,255" drawLinkTLIndex_bgColor="0,0,0,0" drawLinkTLIndex_constantSize="0" drawLinkTLIndex_onlySelected="0"
-                   drawLinkJunctionIndex_show="0" drawLinkJunctionIndex_size="65.00" drawLinkJunctionIndex_color="128,128,255" drawLinkJunctionIndex_bgColor="0,0,0,0" drawLinkJunctionIndex_constantSize="0" drawLinkJunctionIndex_onlySelected="0"
+                   drawLinkTLIndex_show="0" drawLinkTLIndex_size="65.00" drawLinkTLIndex_color="128,128,255" drawLinkTLIndex_bgColor="invisible" drawLinkTLIndex_constantSize="0" drawLinkTLIndex_onlySelected="0"
+                   drawLinkJunctionIndex_show="0" drawLinkJunctionIndex_size="65.00" drawLinkJunctionIndex_color="128,128,255" drawLinkJunctionIndex_bgColor="invisible" drawLinkJunctionIndex_constantSize="0" drawLinkJunctionIndex_onlySelected="0"
                    junctionID_show="0" junctionID_size="60.00" junctionID_color="0,255,128" junctionID_bgColor="128,0,0,0" junctionID_constantSize="1" junctionID_onlySelected="0"
                    junctionName_show="0" junctionName_size="60.00" junctionName_color="192,255,128" junctionName_bgColor="128,0,0,0" junctionName_constantSize="1" junctionName_onlySelected="0"
                    internalJunctionName_show="0" internalJunctionName_size="50.00" internalJunctionName_color="0,204,128" internalJunctionName_bgColor="128,0,0,0" internalJunctionName_constantSize="1" internalJunctionName_onlySelected="0"
@@ -178,6 +178,7 @@
                 <entry color="172,108,44" name="zipper"/>
                 <entry color="192,255,192" name="traffic_light_right_on_red"/>
                 <entry color="128,0,128" name="rail_crossing"/>
+                <entry color="0,0,128" name="left_before_right"/>
             </colorScheme>
             <colorScheme name="by height" interpolated="1">
                 <entry color="blue" threshold="-10.00"/>
@@ -188,8 +189,8 @@
                 <entry color="magenta" threshold="200.00"/>
             </colorScheme>
         </junctions>
-        <additionals addMode="0" add_minSize="1.00" add_exaggeration="1.00" add_constantSize="0" add_constantSizeSelected="0" addName_show="0" addName_size="60.00" addName_color="255,0,128" addName_bgColor="128,0,0,0" addName_constantSize="1" addName_onlySelected="0" addFullName_show="0" addFullName_size="60.00" addFullName_color="255,0,128" addFullName_bgColor="128,0,0,0" addFullName_constantSize="1" addFullName_onlySelected="0" containerStopColor="76,170,50" containerStopColorSign="255,235,0" chargingStationColor="114,210,252" chargingStationColorCharge="255,180,0" chargingStationColorSign="255,235,0" containerStopColor="83,89,172" containerStopColorSign="177,184,186,171" parkingAreaColor="83,89,172" parkingAreaColorSign="177,184,186" parkingSpaceColor="255,200,200" parkingSpaceColorContour="green" containerTripColor="200,0,255" containerTripWidth="0.25" rideColor="blue" rideWidth="0.25" selectedAdditionalColor="0,0,150" selectedConnectionColor="0,0,100" selectedContainerColor="0,0,120" selectedContainerPlanColor="0,0,130" selectedCrossingColor="0,100,196" selectedEdgeColor="0,0,204" selectedEdgeDataColor="0,0,150" selectedLaneColor="0,0,128" selectedContainerColor="0,0,120" selectedContainerPlanColor="0,0,130" selectedProhibitionColor="0,0,120" selectedRouteColor="0,0,150" selectedVehicleColor="0,0,100" selectionColor="0,0,204" stopColor="220,20,30" waypointColor="0,127,14" stopContainerColor="red" stopContainerColor="red" trainStopColor="76,170,50" trainStopColorSign="255,235,0" transhipColor="100,0,200" transhipWidth="0.25" transportColor="100,200,0" transportWidth="0.25" tripWidth="0.20" vehicleTripColor="200,0,255" transhipColor="green" transhipWidth="0.25"/>
-        <pois poiTextParam="PARAM_TEXT" poi_minSize="0.00" poi_exaggeration="1.00" poi_constantSize="0" poi_constantSizeSelected="0" poiDetail="16" poiName_show="0" poiName_size="50.00" poiName_color="255,0,128" poiName_bgColor="128,0,0,0" poiName_constantSize="1" poiName_onlySelected="0" poiType_show="0" poiType_size="60.00" poiType_color="255,0,128" poiType_bgColor="128,0,0,0" poiType_constantSize="1" poiType_onlySelected="0" poiText_show="0" poiText_size="80.00" poiText_color="140,0,255" poiText_bgColor="128,0,0,0" poiText_constantSize="1" poiText_onlySelected="0">
+        <additionals addMode="0" add_minSize="1.00" add_exaggeration="1.00" add_constantSize="0" add_constantSizeSelected="0" addName_show="0" addName_size="60.00" addName_color="255,0,128" addName_bgColor="128,0,0,0" addName_constantSize="1" addName_onlySelected="0" addFullName_show="0" addFullName_size="60.00" addFullName_color="255,0,128" addFullName_bgColor="128,0,0,0" addFullName_constantSize="1" addFullName_onlySelected="0" busStopColor="76,170,50" busStopColorSign="255,235,0" chargingStationColor="114,210,252" chargingStationColorCharge="255,180,0" chargingStationColorSign="255,235,0" containerStopColor="83,89,172" containerStopColorSign="177,184,186,171" parkingAreaColor="83,89,172" parkingAreaColorSign="177,184,186" parkingSpaceColor="255,200,200" parkingSpaceColorContour="green" personTripColor="200,0,255" personTripWidth="0.25" rideColor="blue" rideWidth="0.25" selectedAdditionalColor="0,0,150" selectedConnectionColor="0,0,100" selectedContainerColor="0,0,120" selectedContainerPlanColor="0,0,130" selectedCrossingColor="0,100,196" selectedEdgeColor="0,0,204" selectedEdgeDataColor="0,0,150" selectedLaneColor="0,0,128" selectedPersonColor="0,0,120" selectedPersonPlanColor="0,0,130" selectedProhibitionColor="0,0,120" selectedRouteColor="0,0,150" selectedVehicleColor="0,0,100" selectionColor="0,0,204" stopColor="220,20,30" waypointColor="0,127,14" stopContainerColor="red" stopPersonColor="red" trainStopColor="76,170,50" trainStopColorSign="255,235,0" transhipColor="100,0,200" transhipWidth="0.25" transportColor="100,200,0" transportWidth="0.25" tripWidth="0.20" vehicleTripColor="200,0,255" walkColor="green" walkWidth="0.25"/>
+        <pois poiTextParam="PARAM_TEXT" poi_minSize="0.00" poi_exaggeration="1.00" poi_constantSize="0" poi_constantSizeSelected="0" poiDetail="16" poiName_show="0" poiName_size="50.00" poiName_color="0,127,70" poiName_bgColor="128,0,0,0" poiName_constantSize="1" poiName_onlySelected="0" poiType_show="0" poiType_size="60.00" poiType_color="0,127,70" poiType_bgColor="128,0,0,0" poiType_constantSize="1" poiType_onlySelected="0" poiText_show="0" poiText_size="80.00" poiText_color="140,0,255" poiText_bgColor="128,0,0,0" poiText_constantSize="1" poiText_onlySelected="0">
             <colorScheme name="given POI color">
                 <entry color="red"/>
             </colorScheme>
@@ -212,8 +213,12 @@
             <colorScheme name="uniform">
                 <entry color="orange"/>
             </colorScheme>
+            <colorScheme name="random">
+                <entry color="yellow"/>
+            </colorScheme>
         </polys>
+        <view3D show3DTLSLinkMarkers="1" show3DTLSDomes="1" show3DHeadUpDisplay="1" generate3DTLSModels="0" ambient3DLight="32,32,32" diffuse3DLight="64,64,64"/>
         <legend showSizeLegend="1" showColorLegend="0" showVehicleColorLegend="0"/>
     </scheme>
-    <viewport zoom="100.00" x="31.40" y="20.00" angle="0.00"/>
+    <viewport zoom="140.00" x="30.00" y="25.00" angle="0.00"/>
 </viewsettings>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/net.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/net.netedit
index 15b9c21e6b9..d04e0154012 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/net.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/net.netedit
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-20 11:07:30 by Eclipse SUMO netedit Version v1_14_1+1845-cb87dca9d69
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+<!-- generated on 2023-11-16 08:50:50 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
+<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
 
     <input>
-        <sumo-net-file value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\input_net.net.xml"/>
+        <additional-files value="/home/palcraft/.texttest/tmp/netedit.gui.16Nov083511.27446/netedit.gui/demandelements/containerplan/stops/stop_edge/create/default/additionals.add.xml"/>
+        <route-files value="/home/palcraft/.texttest/tmp/netedit.gui.16Nov083511.27446/netedit.gui/demandelements/containerplan/stops/stop_edge/create/default/routes.rou.xml"/>
+        <data-files value="/home/palcraft/.texttest/tmp/netedit.gui.16Nov083511.27446/netedit.gui/demandelements/containerplan/stops/stop_edge/create/default/datas.dat.xml"/>
+        <sumo-net-file value="/home/palcraft/.texttest/tmp/netedit.gui.16Nov083511.27446/netedit.gui/demandelements/containerplan/stops/stop_edge/create/default/net.net.xml"/>
     </input>
 
     <output>
-        <output-file value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\net.net.xml"/>
+        <output-file value="/home/palcraft/.texttest/tmp/netedit.gui.16Nov083511.27446/netedit.gui/demandelements/containerplan/stops/stop_edge/create/default/net.net.xml"/>
     </output>
 
     <processing>
@@ -30,27 +33,20 @@
     </pedestrian>
 
     <netedit>
-        <additional-files value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\additionals.xml"/>
-        <additionals-output value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\additionals.xml"/>
-        <route-files value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\routes.xml"/>
-        <demandelements-output value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\routes.xml"/>
-        <data-files value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\datas.xml"/>
-        <dataelements-output value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\datas.xml"/>
+        <ignore-supermode-question value="true"/>
     </netedit>
 
     <visualisation>
-        <gui-settings-file value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\gui-settings.xml"/>
-        <window-size value="936, 697"/>
+        <gui-settings-file value="/home/palcraft/.texttest/tmp/netedit.gui.16Nov083511.27446/netedit.gui/demandelements/containerplan/stops/stop_edge/create/default/gui-settings.xml"/>
+        <window-size value="1280, 720"/>
         <window-pos value="50,50"/>
         <gui-testing value="true"/>
-        <gui-testing-debug value="true"/>
-        <gui-testing-debug-gl value="true"/>
-        <gui-testing.setting-output value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\guisettingsoutput.xml"/>
+        <gui-testing.setting-output value="/home/palcraft/.texttest/tmp/netedit.gui.16Nov083511.27446/netedit.gui/demandelements/containerplan/stops/stop_edge/create/default/guisettingsoutput.xml"/>
     </visualisation>
 
     <report>
         <no-warnings value="true"/>
-        <error-log value="C:\Users\SUMO-Test\.texttest\tmp\netedit.gui.20Oct110616.1456\netedit.gui\demandelements\containerplan\stops\stop_edge\create\default\log.txt"/>
+        <error-log value="/home/palcraft/.texttest/tmp/netedit.gui.16Nov083511.27446/netedit.gui/demandelements/containerplan/stops/stop_edge/create/default/log.txt"/>
     </report>
 
 </configuration>
@@ -58,116 +54,177 @@
 
 <net version="1.16" 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="-10.00,-20.00" convBoundary="0.00,0.00,60.00,40.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
+    <location netOffset="-10.00,-20.00" convBoundary="0.00,10.00,60.00,40.00" origBoundary="-10000000000.00,-10000000000.00,10000000000.00,10000000000.00" projParameter="!"/>
 
-    <edge id=":Junction2_0" function="internal">
-        <lane id=":Junction2_0_0" index="0" speed="7.33" length="11.73" shape="58.40,7.20 57.85,4.75 56.20,3.00 53.45,1.95 49.60,1.60"/>
+    <edge id=":Junction1_0" function="internal">
+        <lane id=":Junction1_0_0" index="0" allow="pedestrian bicycle" speed="3.09" length="1.61" width="2.00" shape="55.80,15.20 55.74,14.76 55.55,14.45 55.24,14.26 54.80,14.20"/>
+        <lane id=":Junction1_0_1" index="1" disallow="pedestrian" speed="5.37" length="5.81" shape="58.40,15.20 58.17,13.62 57.50,12.50 56.38,11.82 54.80,11.60"/>
     </edge>
-    <edge id=":Junction2_1" function="internal">
-        <lane id=":Junction2_1_0" index="0" speed="9.32" length="19.63" shape="49.60,-1.60 56.25,-1.05 61.00,0.60 63.85,3.35 64.80,7.20"/>
-        <lane id=":Junction2_1_1" index="1" speed="8.67" length="16.85" shape="49.60,-1.60 54.85,-1.05 58.60,0.60 60.85,3.35 61.60,7.20"/>
+    <edge id=":Junction1_2" function="internal">
+        <lane id=":Junction1_2_0" index="0" allow="pedestrian bicycle" speed="8.15" length="15.16" width="2.00" shape="54.80,5.80 58.91,6.39 61.85,8.15 63.61,11.09 64.20,15.20"/>
+        <lane id=":Junction1_2_1" index="1" disallow="pedestrian" speed="7.10" length="10.97" shape="54.80,8.40 57.78,8.83 59.90,10.10 61.17,12.23 61.60,15.20"/>
     </edge>
-    <edge id=":Junction3_0" function="internal">
-        <lane id=":Junction3_0_0" index="0" speed="8.67" length="16.85" shape="61.60,32.80 60.85,36.65 58.60,39.40 54.85,41.05 49.60,41.60"/>
+    <edge id=":Junction2_0" function="internal">
+        <lane id=":Junction2_0_0" index="0" allow="pedestrian bicycle" speed="8.15" length="15.16" width="2.00" shape="64.20,34.80 63.61,38.91 61.85,41.85 58.91,43.61 54.80,44.20"/>
+        <lane id=":Junction2_0_1" index="1" disallow="pedestrian" speed="7.10" length="10.97" shape="61.60,34.80 61.17,37.77 59.90,39.90 57.78,41.17 54.80,41.60"/>
     </edge>
-    <edge id=":Junction3_1" function="internal">
-        <lane id=":Junction3_1_0" index="0" speed="6.51" length="9.03" shape="49.60,38.40 52.05,38.05 53.80,37.00 54.85,35.25 55.20,32.80"/>
-        <lane id=":Junction3_1_1" index="1" speed="7.33" length="11.73" shape="49.60,38.40 53.45,38.05 56.20,37.00 57.85,35.25 58.40,32.80"/>
+    <edge id=":Junction2_2" function="internal">
+        <lane id=":Junction2_2_0" index="0" allow="pedestrian bicycle" speed="3.09" length="1.61" width="2.00" shape="54.80,35.80 55.24,35.74 55.55,35.55 55.74,35.24 55.80,34.80"/>
+        <lane id=":Junction2_2_1" index="1" disallow="pedestrian" speed="5.37" length="5.81" shape="54.80,38.40 56.38,38.17 57.50,37.50 58.17,36.38 58.40,34.80"/>
     </edge>
     <edge id=":Junction3_0" function="internal">
-        <lane id=":Junction3_0_0" index="0" allow="bicycle" speed="6.25" length="8.25" width="2.00" shape="3.50,41.00 1.53,40.64 0.12,39.58 -0.72,37.79 -1.00,35.30"/>
-    </edge>
-    <edge id=":Junction3_1" function="internal">
-        <lane id=":Junction3_1_0" index="0" allow="bicycle" speed="4.44" length="4.03" width="2.00" shape="1.00,35.30 1.16,36.39 1.62,37.17 2.41,37.64 3.50,37.80"/>
-    </edge>
-    <edge id=":gneJ8_0" function="internal">
-        <lane id=":gneJ8_0_0" index="0" allow="bicycle" speed="6.46" length="9.27" width="2.00" shape="-1.00,24.70 -0.72,21.68 0.12,19.52 1.53,18.23 3.50,17.80"/>
-    </edge>
-    <edge id=":gneJ8_1" function="internal">
-        <lane id=":gneJ8_1_0" index="0" allow="bicycle" speed="4.62" length="4.03" width="2.00" shape="3.50,22.20 2.41,22.36 1.62,22.83 1.16,23.61 1.00,24.70"/>
-    </edge>
-    <edge id=":gneJ9_0" function="internal">
-        <lane id=":gneJ9_0_0" index="0" speed="3.65" length="4.67" shape="30.00,18.40 31.20,19.20 31.60,20.00 31.20,20.80 30.00,21.60"/>
-    </edge>
-
-    <edge id="gneE10" from="Junction3" to="gneJ8" priority="-1">
-        <lane id="gneE10_0" index="0" allow="bicycle" speed="13.89" length="10.60" width="2.00" shape="-1.00,35.30 -1.00,24.70"/>
-    </edge>
-    <edge id="gneE11" from="gneJ8" to="Junction3" priority="-1">
-        <lane id="gneE11_0" index="0" allow="bicycle" speed="13.89" length="10.60" width="2.00" shape="1.00,24.70 1.00,35.30"/>
-    </edge>
-    <edge id="Edge0" from="Junction0" to="Junction2" priority="-1">
-        <lane id="Edge0_0" index="0" speed="13.89" length="49.60" shape="0.00,-1.60 49.60,-1.60"/>
-    </edge>
-    <edge id="Edge4" from="Junction3" to="Junction2" priority="-1">
-        <lane id="Edge4_0" index="0" speed="13.89" length="25.60" shape="55.20,32.80 55.20,7.20"/>
-        <lane id="Edge4_1" index="1" speed="13.89" length="25.60" shape="58.40,32.80 58.40,7.20"/>
-    </edge>
-    <edge id="Edge1" from="Junction2" to="Junction3" priority="-1">
-        <lane id="Edge1_0" index="0" speed="13.89" length="25.60" shape="64.80,7.20 64.80,32.80"/>
-        <lane id="Edge1_1" index="1" speed="13.89" length="25.60" shape="61.60,7.20 61.60,32.80"/>
-    </edge>
-    <edge id="Edge2" from="Junction3" to="Junction3" priority="-1">
-        <lane id="Edge2_0" index="0" speed="13.89" length="46.10" shape="49.60,41.60 3.50,41.60"/>
-    </edge>
-    <edge id="Edge3" from="Junction3" to="Junction3" priority="-1">
-        <lane id="Edge3_0" index="0" speed="13.89" length="46.10" shape="3.50,38.40 49.60,38.40"/>
-    </edge>
-    <edge id="Edge5" from="Junction2" to="Junction0" priority="-1">
-        <lane id="Edge5_0" index="0" speed="13.89" length="49.60" shape="49.60,1.60 0.00,1.60"/>
-    </edge>
-    <edge id="gneE8" from="gneJ8" to="gneJ9" priority="-1">
-        <lane id="gneE8_0" index="0" speed="13.89" length="26.50" shape="3.50,18.40 30.00,18.40"/>
-    </edge>
-    <edge id="gneE9" from="gneJ9" to="gneJ8" priority="-1">
-        <lane id="gneE9_0" index="0" speed="13.89" length="26.50" shape="30.00,21.60 3.50,21.60"/>
-    </edge>
-
-    <junction id="Junction0" type="dead_end" x="0.00" y="0.00" incLanes="Edge5_0" intLanes="" shape="0.00,0.00 0.00,3.20 0.00,0.00"/>
-    <junction id="Junction2" type="priority" x="60.00" y="0.00" incLanes="Edge4_0 Edge4_1 Edge0_0" intLanes=":Junction2_0_0 :Junction2_1_0 :Junction2_1_1" shape="53.60,7.20 66.40,7.20 65.93,4.02 64.53,1.42 62.20,-0.60 58.93,-2.04 54.73,-2.91 49.60,-3.20 49.60,3.20 51.82,3.64 52.60,4.20 53.16,4.98 53.49,5.98">
-        <request index="0" response="000" foes="000" cont="0"/>
-        <request index="1" response="000" foes="000" cont="0"/>
-        <request index="2" response="000" foes="000" cont="0"/>
+        <lane id=":Junction3_0_0" index="0" allow="pedestrian bicycle" speed="8.15" length="15.16" width="2.00" shape="5.20,44.20 1.09,43.61 -1.85,41.85 -3.61,38.91 -4.20,34.80"/>
+        <lane id=":Junction3_0_1" index="1" allow="bus" speed="7.10" length="10.97" shape="5.20,41.60 2.22,41.17 0.10,39.90 -1.17,37.78 -1.60,34.80"/>
+    </edge>
+    <edge id=":Junction3_2" function="internal">
+        <lane id=":Junction3_2_0" index="0" allow="pedestrian bicycle" speed="3.09" length="1.61" width="2.00" shape="4.20,34.80 4.26,35.24 4.45,35.55 4.76,35.74 5.20,35.80"/>
+        <lane id=":Junction3_2_1" index="1" allow="bus" speed="5.37" length="5.81" shape="1.60,34.80 1.82,36.38 2.50,37.50 3.62,38.17 5.20,38.40"/>
+    </edge>
+    <edge id=":Junction4_0" function="internal">
+        <lane id=":Junction4_0_0" index="0" allow="pedestrian bicycle" speed="8.15" length="15.16" width="2.00" shape="-4.20,30.20 -3.61,26.09 -1.85,23.15 1.09,21.39 5.20,20.80"/>
+        <lane id=":Junction4_0_1" index="1" allow="bus" speed="7.10" length="10.97" shape="-1.60,30.20 -1.17,27.22 0.10,25.10 2.23,23.82 5.20,23.40"/>
+    </edge>
+    <edge id=":Junction4_2" function="internal">
+        <lane id=":Junction4_2_0" index="0" allow="pedestrian bicycle" speed="3.09" length="1.61" width="2.00" shape="5.20,29.20 4.76,29.26 4.45,29.45 4.26,29.76 4.20,30.20"/>
+        <lane id=":Junction4_2_1" index="1" allow="bus" speed="5.37" length="5.81" shape="5.20,26.60 3.62,26.82 2.50,27.50 1.82,28.62 1.60,30.20"/>
+    </edge>
+    <edge id=":JunctionCenter_0" function="internal">
+        <lane id=":JunctionCenter_0_0" index="0" allow="pedestrian bicycle" speed="5.12" length="8.47" width="2.00" shape="30.00,20.80 33.15,22.90 34.20,25.00 33.15,27.10 30.00,29.20"/>
+        <lane id=":JunctionCenter_0_1" index="1" disallow="pedestrian" speed="3.65" length="8.47" shape="30.00,23.40 31.20,24.20 31.60,25.00 31.20,25.80 30.00,26.60"/>
+    </edge>
+
+    <edge id="Edge0" from="Junction0" to="Junction1" priority="-1">
+        <lane id="Edge0_0" index="0" allow="pedestrian bicycle" speed="13.89" length="54.80" width="2.00" shape="0.00,5.80 54.80,5.80"/>
+        <lane id="Edge0_1" index="1" disallow="pedestrian" speed="13.89" length="54.80" shape="0.00,8.40 54.80,8.40"/>
+    </edge>
+    <edge id="Edge1" from="Junction1" to="Junction2" priority="-1">
+        <lane id="Edge1_0" index="0" allow="pedestrian bicycle" speed="13.89" length="19.60" width="2.00" shape="64.20,15.20 64.20,34.80"/>
+        <lane id="Edge1_1" index="1" disallow="pedestrian" speed="13.89" length="19.60" shape="61.60,15.20 61.60,34.80"/>
+    </edge>
+    <edge id="Edge2" from="Junction2" to="Junction3" priority="-1">
+        <lane id="Edge2_0" index="0" allow="pedestrian bicycle" speed="13.89" length="49.60" width="2.00" shape="54.80,44.20 5.20,44.20"/>
+        <lane id="Edge2_1" index="1" disallow="pedestrian" speed="13.89" length="49.60" shape="54.80,41.60 5.20,41.60"/>
+    </edge>
+    <edge id="Edge3" from="Junction3" to="Junction2" priority="-1">
+        <lane id="Edge3_0" index="0" allow="pedestrian bicycle" speed="13.89" length="49.60" width="2.00" shape="5.20,35.80 54.80,35.80"/>
+        <lane id="Edge3_1" index="1" disallow="pedestrian" speed="13.89" length="49.60" shape="5.20,38.40 54.80,38.40"/>
+    </edge>
+    <edge id="Edge4" from="Junction2" to="Junction1" priority="-1">
+        <lane id="Edge4_0" index="0" allow="pedestrian bicycle" speed="13.89" length="19.60" width="2.00" shape="55.80,34.80 55.80,15.20"/>
+        <lane id="Edge4_1" index="1" disallow="pedestrian" speed="13.89" length="19.60" shape="58.40,34.80 58.40,15.20"/>
+    </edge>
+    <edge id="Edge5" from="Junction1" to="Junction0" priority="-1">
+        <lane id="Edge5_0" index="0" allow="pedestrian bicycle" speed="13.89" length="54.80" width="2.00" shape="54.80,14.20 0.00,14.20"/>
+        <lane id="Edge5_1" index="1" disallow="pedestrian" speed="13.89" length="54.80" shape="54.80,11.60 0.00,11.60"/>
+    </edge>
+    <edge id="EdgeBike0" from="Junction3" to="Junction4" priority="-1">
+        <lane id="EdgeBike0_0" index="0" allow="pedestrian bicycle" speed="13.89" length="4.60" width="2.00" shape="-4.20,34.80 -4.20,30.20"/>
+        <lane id="EdgeBike0_1" index="1" allow="bus" speed="13.89" length="4.60" shape="-1.60,34.80 -1.60,30.20"/>
+    </edge>
+    <edge id="EdgeBike1" from="Junction4" to="Junction3" priority="-1">
+        <lane id="EdgeBike1_0" index="0" allow="pedestrian bicycle" speed="13.89" length="4.60" width="2.00" shape="4.20,30.20 4.20,34.80"/>
+        <lane id="EdgeBike1_1" index="1" allow="bus" speed="13.89" length="4.60" shape="1.60,30.20 1.60,34.80"/>
+    </edge>
+    <edge id="EdgeCenter0" from="Junction4" to="JunctionCenter" priority="-1">
+        <lane id="EdgeCenter0_0" index="0" allow="pedestrian bicycle" speed="13.89" length="24.80" width="2.00" shape="5.20,20.80 30.00,20.80"/>
+        <lane id="EdgeCenter0_1" index="1" disallow="pedestrian" speed="13.89" length="24.80" shape="5.20,23.40 30.00,23.40"/>
+    </edge>
+    <edge id="EdgeCenter1" from="JunctionCenter" to="Junction4" priority="-1">
+        <lane id="EdgeCenter1_0" index="0" allow="pedestrian bicycle" speed="13.89" length="24.80" width="2.00" shape="30.00,29.20 5.20,29.20"/>
+        <lane id="EdgeCenter1_1" index="1" disallow="pedestrian" speed="13.89" length="24.80" shape="30.00,26.60 5.20,26.60"/>
+    </edge>
+
+    <tlLogic id="Junction1" type="static" programID="0" offset="0">
+        <phase duration="42" state="GGGG"/>
+        <phase duration="3"  state="yyyy"/>
+        <phase duration="42" state="GGGG"/>
+        <phase duration="3"  state="yyyy"/>
+    </tlLogic>
+    <tlLogic id="Junction2" type="static" programID="0" offset="0">
+        <phase duration="42" state="GGGG"/>
+        <phase duration="3"  state="yyyy"/>
+        <phase duration="42" state="GGGG"/>
+        <phase duration="3"  state="yyyy"/>
+    </tlLogic>
+    <tlLogic id="Junction3" type="static" programID="0" offset="0">
+        <phase duration="42" state="GGGG"/>
+        <phase duration="3"  state="yyyy"/>
+        <phase duration="42" state="GGGG"/>
+        <phase duration="3"  state="yyyy"/>
+    </tlLogic>
+    <tlLogic id="Junction4" type="static" programID="0" offset="0">
+        <phase duration="42" state="GGGG"/>
+        <phase duration="3"  state="yyyy"/>
+        <phase duration="42" state="GGGG"/>
+        <phase duration="3"  state="yyyy"/>
+    </tlLogic>
+
+    <junction id="Junction0" type="dead_end" x="0.00" y="10.00" incLanes="Edge5_0 Edge5_1" intLanes="" shape="0.00,10.00 0.00,15.20 0.00,10.00"/>
+    <junction id="Junction1" type="traffic_light" x="60.00" y="10.00" incLanes="Edge4_0 Edge4_1 Edge0_0 Edge0_1" intLanes=":Junction1_0_0 :Junction1_0_1 :Junction1_2_0 :Junction1_2_1" shape="54.80,15.20 65.20,15.20 64.91,12.02 64.04,9.42 62.60,7.40 60.58,5.96 57.98,5.09 54.80,4.80">
+        <request index="0" response="0000" foes="0000" cont="0"/>
+        <request index="1" response="0000" foes="0000" cont="0"/>
+        <request index="2" response="0000" foes="0000" cont="0"/>
+        <request index="3" response="0000" foes="0000" cont="0"/>
     </junction>
-    <junction id="Junction3" type="priority" x="60.00" y="40.00" incLanes="Edge1_0 Edge1_1 Edge3_0" intLanes=":Junction3_0_0 :Junction3_1_0 :Junction3_1_1" shape="66.40,32.80 53.60,32.80 53.16,35.02 52.60,35.80 51.82,36.36 50.82,36.69 49.60,36.80 49.60,43.20 54.73,42.91 58.93,42.04 62.20,40.60 64.53,38.58 65.93,35.98">
-        <request index="0" response="000" foes="000" cont="0"/>
-        <request index="1" response="000" foes="000" cont="0"/>
-        <request index="2" response="000" foes="000" cont="0"/>
+    <junction id="Junction2" type="traffic_light" x="60.00" y="40.00" incLanes="Edge1_0 Edge1_1 Edge3_0 Edge3_1" intLanes=":Junction2_0_0 :Junction2_0_1 :Junction2_2_0 :Junction2_2_1" shape="65.20,34.80 54.80,34.80 54.80,45.20 57.98,44.91 60.58,44.04 62.60,42.60 64.04,40.58 64.91,37.98">
+        <request index="0" response="0000" foes="0000" cont="0"/>
+        <request index="1" response="0000" foes="0000" cont="0"/>
+        <request index="2" response="0000" foes="0000" cont="0"/>
+        <request index="3" response="0000" foes="0000" cont="0"/>
     </junction>
-    <junction id="Junction3" type="priority" x="0.00" y="40.00" incLanes="Edge2_0 gneE11_0" intLanes=":Junction3_0_0 :Junction3_1_0" shape="3.50,43.20 3.50,36.80 2.67,36.63 2.38,36.42 2.17,36.13 2.04,35.76 2.00,35.30 -2.00,35.30 -1.85,37.71 -1.39,39.69 -0.63,41.23 0.44,42.32 1.82,42.98">
-        <request index="0" response="00" foes="00" cont="0"/>
-        <request index="1" response="00" foes="00" cont="0"/>
+    <junction id="Junction3" type="traffic_light" x="0.00" y="40.00" incLanes="Edge2_0 Edge2_1 EdgeBike1_0 EdgeBike1_1" intLanes=":Junction3_0_0 :Junction3_0_1 :Junction3_2_0 :Junction3_2_1" shape="5.20,45.20 5.20,34.80 -5.20,34.80 -4.91,37.98 -4.04,40.58 -2.60,42.60 -0.58,44.04 2.02,44.91">
+        <request index="0" response="0000" foes="0000" cont="0"/>
+        <request index="1" response="0000" foes="0000" cont="0"/>
+        <request index="2" response="0000" foes="0000" cont="0"/>
+        <request index="3" response="0000" foes="0000" cont="0"/>
+    </junction>
+    <junction id="Junction4" type="traffic_light" x="0.00" y="25.00" incLanes="EdgeBike0_0 EdgeBike0_1 EdgeCenter1_0 EdgeCenter1_1" intLanes=":Junction4_0_0 :Junction4_0_1 :Junction4_2_0 :Junction4_2_1" shape="-5.20,30.20 5.20,30.20 5.20,19.80 2.02,20.09 -0.58,20.96 -2.60,22.40 -4.04,24.42 -4.91,27.02">
+        <request index="0" response="0000" foes="0000" cont="0"/>
+        <request index="1" response="0000" foes="0000" cont="0"/>
+        <request index="2" response="0000" foes="0000" cont="0"/>
+        <request index="3" response="0000" foes="0000" cont="0"/>
     </junction>
-    <junction id="gneJ8" type="priority" x="0.00" y="20.00" incLanes="gneE10_0 gneE9_0" intLanes=":gneJ8_0_0 :gneJ8_1_0" shape="-2.00,24.70 2.00,24.70 2.17,23.87 2.38,23.58 2.67,23.37 3.04,23.24 3.50,23.20 3.50,16.80 0.44,17.68 -0.62,18.77 -1.39,20.31 -1.85,22.29">
+    <junction id="JunctionCenter" type="priority" x="30.00" y="25.00" incLanes="EdgeCenter0_0 EdgeCenter0_1" intLanes=":JunctionCenter_0_0 :JunctionCenter_0_1" shape="30.00,25.00 30.00,19.80 30.00,25.00">
         <request index="0" response="00" foes="00" cont="0"/>
         <request index="1" response="00" foes="00" cont="0"/>
     </junction>
-    <junction id="gneJ9" type="priority" x="30.00" y="20.00" incLanes="gneE8_0" intLanes=":gneJ9_0_0" shape="30.00,20.00 30.00,16.80 30.00,20.00">
-        <request index="0" response="0" foes="0" cont="0"/>
-    </junction>
 
-    <connection from="gneE10" to="gneE8" fromLane="0" toLane="0" via=":gneJ8_0_0" dir="l" state="M"/>
-    <connection from="gneE11" to="Edge3" fromLane="0" toLane="0" via=":Junction3_1_0" dir="r" state="M"/>
-    <connection from="Edge0" to="Edge1" fromLane="0" toLane="0" via=":Junction2_1_0" dir="l" state="M"/>
-    <connection from="Edge0" to="Edge1" fromLane="0" toLane="1" via=":Junction2_1_1" dir="l" state="M"/>
-    <connection from="Edge4" to="Edge5" fromLane="1" toLane="0" via=":Junction2_0_0" dir="r" state="M"/>
-    <connection from="Edge1" to="Edge2" fromLane="1" toLane="0" via=":Junction3_0_0" dir="l" state="M"/>
-    <connection from="Edge2" to="gneE10" fromLane="0" toLane="0" via=":Junction3_0_0" dir="l" state="M"/>
-    <connection from="Edge3" to="Edge4" fromLane="0" toLane="0" via=":Junction3_1_0" dir="r" state="M"/>
-    <connection from="Edge3" to="Edge4" fromLane="0" toLane="1" via=":Junction3_1_1" dir="r" state="M"/>
-    <connection from="gneE8" to="gneE9" fromLane="0" toLane="0" via=":gneJ9_0_0" dir="t" state="M"/>
-    <connection from="gneE9" to="gneE11" fromLane="0" toLane="0" via=":gneJ8_1_0" dir="r" state="M"/>
-
-    <connection from=":Junction2_0" to="Edge5" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":Junction2_1" to="Edge1" fromLane="0" toLane="0" dir="l" state="M"/>
-    <connection from=":Junction2_1" to="Edge1" fromLane="1" toLane="1" dir="l" state="M"/>
-    <connection from=":Junction3_0" to="Edge2" fromLane="0" toLane="0" dir="l" state="M"/>
-    <connection from=":Junction3_1" to="Edge4" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":Junction3_1" to="Edge4" fromLane="1" toLane="1" dir="r" state="M"/>
-    <connection from=":Junction3_0" to="gneE10" fromLane="0" toLane="0" dir="l" state="M"/>
-    <connection from=":Junction3_1" to="Edge3" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":gneJ8_0" to="gneE8" fromLane="0" toLane="0" dir="l" state="M"/>
-    <connection from=":gneJ8_1" to="gneE11" fromLane="0" toLane="0" dir="r" state="M"/>
-    <connection from=":gneJ9_0" to="gneE9" fromLane="0" toLane="0" dir="t" state="M"/>
+    <connection from="Edge0" to="Edge1" fromLane="0" toLane="0" via=":Junction1_2_0" tl="Junction1" linkIndex="2" dir="l" state="O"/>
+    <connection from="Edge0" to="Edge1" fromLane="1" toLane="1" via=":Junction1_2_1" tl="Junction1" linkIndex="3" dir="l" state="O"/>
+    <connection from="Edge1" to="Edge2" fromLane="0" toLane="0" via=":Junction2_0_0" tl="Junction2" linkIndex="0" dir="l" state="O"/>
+    <connection from="Edge1" to="Edge2" fromLane="1" toLane="1" via=":Junction2_0_1" tl="Junction2" linkIndex="1" dir="l" state="O"/>
+    <connection from="Edge2" to="EdgeBike0" fromLane="0" toLane="0" via=":Junction3_0_0" tl="Junction3" linkIndex="0" dir="l" state="O"/>
+    <connection from="Edge2" to="EdgeBike0" fromLane="1" toLane="1" via=":Junction3_0_1" tl="Junction3" linkIndex="1" dir="l" state="O"/>
+    <connection from="Edge3" to="Edge4" fromLane="0" toLane="0" via=":Junction2_2_0" tl="Junction2" linkIndex="2" dir="r" state="O"/>
+    <connection from="Edge3" to="Edge4" fromLane="1" toLane="1" via=":Junction2_2_1" tl="Junction2" linkIndex="3" dir="r" state="O"/>
+    <connection from="Edge4" to="Edge5" fromLane="0" toLane="0" via=":Junction1_0_0" tl="Junction1" linkIndex="0" dir="r" state="O"/>
+    <connection from="Edge4" to="Edge5" fromLane="1" toLane="1" via=":Junction1_0_1" tl="Junction1" linkIndex="1" dir="r" state="O"/>
+    <connection from="EdgeBike0" to="EdgeCenter0" fromLane="0" toLane="0" via=":Junction4_0_0" tl="Junction4" linkIndex="0" dir="l" state="O"/>
+    <connection from="EdgeBike0" to="EdgeCenter0" fromLane="1" toLane="1" via=":Junction4_0_1" tl="Junction4" linkIndex="1" dir="l" state="O"/>
+    <connection from="EdgeBike1" to="Edge3" fromLane="0" toLane="0" via=":Junction3_2_0" tl="Junction3" linkIndex="2" dir="r" state="O"/>
+    <connection from="EdgeBike1" to="Edge3" fromLane="1" toLane="1" keepClear="0" via=":Junction3_2_1" tl="Junction3" linkIndex="3" dir="r" state="O"/>
+    <connection from="EdgeCenter0" to="EdgeCenter1" fromLane="0" toLane="0" via=":JunctionCenter_0_0" dir="t" state="M"/>
+    <connection from="EdgeCenter0" to="EdgeCenter1" fromLane="1" toLane="1" via=":JunctionCenter_0_1" dir="t" state="M"/>
+    <connection from="EdgeCenter1" to="EdgeBike1" fromLane="0" toLane="0" via=":Junction4_2_0" tl="Junction4" linkIndex="2" dir="r" state="O"/>
+    <connection from="EdgeCenter1" to="EdgeBike1" fromLane="1" toLane="1" via=":Junction4_2_1" tl="Junction4" linkIndex="3" dir="r" state="O"/>
+
+    <connection from=":Junction1_0" to="Edge5" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":Junction1_0" to="Edge5" fromLane="1" toLane="1" dir="r" state="M"/>
+    <connection from=":Junction1_2" to="Edge1" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":Junction1_2" to="Edge1" fromLane="1" toLane="1" dir="l" state="M"/>
+    <connection from=":Junction2_0" to="Edge2" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":Junction2_0" to="Edge2" fromLane="1" toLane="1" dir="l" state="M"/>
+    <connection from=":Junction2_2" to="Edge4" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":Junction2_2" to="Edge4" fromLane="1" toLane="1" dir="r" state="M"/>
+    <connection from=":Junction3_0" to="EdgeBike0" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":Junction3_0" to="EdgeBike0" fromLane="1" toLane="1" dir="l" state="M"/>
+    <connection from=":Junction3_2" to="Edge3" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":Junction3_2" to="Edge3" fromLane="1" toLane="1" dir="r" state="M"/>
+    <connection from=":Junction4_0" to="EdgeCenter0" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":Junction4_0" to="EdgeCenter0" fromLane="1" toLane="1" dir="l" state="M"/>
+    <connection from=":Junction4_2" to="EdgeBike1" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":Junction4_2" to="EdgeBike1" fromLane="1" toLane="1" dir="r" state="M"/>
+    <connection from=":JunctionCenter_0" to="EdgeCenter1" fromLane="0" toLane="0" dir="t" state="M"/>
+    <connection from=":JunctionCenter_0" to="EdgeCenter1" fromLane="1" toLane="1" dir="t" state="M"/>
 
 </net>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/output.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/output.netedit
index 21604bf31ac..b6cfcd74a93 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/output.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/output.netedit
@@ -1,12 +1,11 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-tranship: edge
-TestFunctions: Clicked over position 578 - 568
-TestFunctions: Clicked over position 484 - 233
-TestFunctions: Clicked over position 384 - 578
-stopContainer: edge
-TestFunctions: Clicked over position 484 - 233
+tranship
+TestFunctions: Clicked over position 754 - 608
+TestFunctions: Clicked over position 679 - 201
+stop
+TestFunctions: Clicked over position 679 - 201
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Netedit closed successfully
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/routes.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/routes.netedit
index 8efcae7e5cc..071c0607b5a 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/routes.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/create/default/routes.netedit
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-20 16:18:12 by Eclipse SUMO netedit Version v1_14_1+1858-9c52672d8be
+<!-- generated on 2023-11-16 08:50:50 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <container id="c_0" depart="0.00">
-        <tranship from="Edge0" to="Edge2" departPos="0.00"/>
-        <stop edge="Edge2" endPos="36.89" duration="60.00"/>
+        <tranship from="Edge0" to="Edge2"/>
+        <stop edge="Edge2" endPos="34.81" duration="60.00"/>
     </container>
 </routes>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/acttype/routes.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/acttype/routes.netedit
index 2af76ed0ba9..df08fb2f23e 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/acttype/routes.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/acttype/routes.netedit
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-01 15:06:06 by Eclipse SUMO netedit Version v1_18_0+2330-771ae636b15
+<!-- generated on 2023-11-16 08:54:50 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <container id="c_0" depart="0.00">
         <tranship from="Edge0" to="Edge2"/>
-        <stop duration="30.20" actType="singing"/>
+        <stop edge="Edge2" endPos="20.32" duration="30.20" actType="singing"/>
     </container>
 </routes>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/duration/routes.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/duration/routes.netedit
index 10801829a4d..28c5dc32e7b 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/duration/routes.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/duration/routes.netedit
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-20 10:41:12 by Eclipse SUMO netedit Version v1_14_1+1845-cb87dca9d69
+<!-- generated on 2023-11-16 08:54:44 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <container id="c_0" depart="0.00">
-        <tranship from="Edge0" to="Edge2" departPos="0.00"/>
+        <tranship from="Edge0" to="Edge2"/>
     </container>
     <container id="c_1" depart="0.00">
-        <tranship from="Edge0" to="Edge2" departPos="0.00"/>
+        <tranship from="Edge0" to="Edge2"/>
         <stop edge="Edge2" endPos="40.32" duration="20.20"/>
     </container>
 </routes>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/endpos/routes.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/endpos/routes.netedit
index 9fb5571d1a7..44c1c8d72ab 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/endpos/routes.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/endpos/routes.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-01 15:05:04 by Eclipse SUMO netedit Version v1_18_0+2330-771ae636b15
+<!-- generated on 2023-11-16 08:54:03 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
@@ -10,6 +10,6 @@
     </container>
     <container id="c_1" depart="0.00">
         <tranship from="Edge0" to="Edge2"/>
-        <stop/>
+        <stop edge="Edge2" endPos="40.32"/>
     </container>
 </routes>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/friendlypos/routes.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/friendlypos/routes.netedit
index 3d687fd2ca2..5b2c624c2fd 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/friendlypos/routes.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/friendlypos/routes.netedit
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-20 10:40:23 by Eclipse SUMO netedit Version v1_14_1+1845-cb87dca9d69
+<!-- generated on 2023-11-16 08:54:13 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
     <!-- Vehicles, persons and containers (sorted by depart) -->
     <container id="c_0" depart="0.00">
-        <tranship from="Edge0" to="Edge2" departPos="0.00"/>
+        <tranship from="Edge0" to="Edge2"/>
     </container>
     <container id="c_1" depart="0.00">
-        <tranship from="Edge0" to="Edge2" departPos="0.00"/>
+        <tranship from="Edge0" to="Edge2"/>
         <stop edge="Edge2" endPos="20.32" duration="30.20" friendlyPos="1"/>
     </container>
 </routes>
diff --git a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/until/routes.netedit b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/until/routes.netedit
index 191351ae0e8..7be9f39dc1b 100644
--- a/tests/netedit/demandelements/containerplan/stops/stop_edge/load/until/routes.netedit
+++ b/tests/netedit/demandelements/containerplan/stops/stop_edge/load/until/routes.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-01 15:05:55 by Eclipse SUMO netedit Version v1_18_0+2330-771ae636b15
+<!-- generated on 2023-11-16 08:54:47 by Eclipse SUMO netedit Version v1_19_0+0186-4470c33a83d
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
@@ -10,6 +10,6 @@
     </container>
     <container id="c_1" depart="0.00">
         <tranship from="Edge0" to="Edge2"/>
-        <stop until="50.20"/>
+        <stop edge="Edge2" endPos="40.32" until="50.20"/>
     </container>
 </routes>