diff --git a/tests/netedit/bugs/revision24081/meandatas.netedit b/tests/netedit/bugs/revision24081/meandatas.netedit
index 4817a589d55c..cf47467a2449 100644
--- a/tests/netedit/bugs/revision24081/meandatas.netedit
+++ b/tests/netedit/bugs/revision24081/meandatas.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-09 14:47:01 by Eclipse SUMO netedit Version v1_21_0+1256-5c6b5e0a822
+<!-- generated on 2024-12-20 14:35:01 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
 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,8 +14,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <!-- MeanDataEdges -->
-    <edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
-    <!-- MeanDataLanes -->
-    <laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
 </additional>
diff --git a/tests/netedit/bugs/ticket10588/meandatas.netedit b/tests/netedit/bugs/ticket10588/meandatas.netedit
index 4817a589d55c..c36b1bc405be 100644
--- a/tests/netedit/bugs/ticket10588/meandatas.netedit
+++ b/tests/netedit/bugs/ticket10588/meandatas.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-09 14:47:01 by Eclipse SUMO netedit Version v1_21_0+1256-5c6b5e0a822
+<!-- generated on 2024-12-20 14:39:37 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
 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,8 +14,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <!-- MeanDataEdges -->
-    <edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
-    <!-- MeanDataLanes -->
-    <laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
 </additional>
diff --git a/tests/netedit/bugs/ticket10591/meandatas.netedit b/tests/netedit/bugs/ticket10591/meandatas.netedit
index 4817a589d55c..2249d395e5aa 100644
--- a/tests/netedit/bugs/ticket10591/meandatas.netedit
+++ b/tests/netedit/bugs/ticket10591/meandatas.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-09 14:47:01 by Eclipse SUMO netedit Version v1_21_0+1256-5c6b5e0a822
+<!-- generated on 2024-12-20 14:40:20 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
 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,8 +14,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <!-- MeanDataEdges -->
-    <edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
-    <!-- MeanDataLanes -->
-    <laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
 </additional>
diff --git a/tests/netedit/bugs/ticket1711/meandatas.netedit b/tests/netedit/bugs/ticket1711/meandatas.netedit
index 4817a589d55c..26ce18ac4b7f 100644
--- a/tests/netedit/bugs/ticket1711/meandatas.netedit
+++ b/tests/netedit/bugs/ticket1711/meandatas.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-09 14:47:01 by Eclipse SUMO netedit Version v1_21_0+1256-5c6b5e0a822
+<!-- generated on 2024-12-20 14:36:42 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
 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,8 +14,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <!-- MeanDataEdges -->
-    <edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
-    <!-- MeanDataLanes -->
-    <laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
 </additional>
diff --git a/tests/netedit/bugs/ticket3900/meandatas.netedit b/tests/netedit/bugs/ticket3900/meandatas.netedit
index 4817a589d55c..cf9b003fb8e1 100644
--- a/tests/netedit/bugs/ticket3900/meandatas.netedit
+++ b/tests/netedit/bugs/ticket3900/meandatas.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-09 14:47:01 by Eclipse SUMO netedit Version v1_21_0+1256-5c6b5e0a822
+<!-- generated on 2024-12-20 14:37:04 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
 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,8 +14,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <!-- MeanDataEdges -->
-    <edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
-    <!-- MeanDataLanes -->
-    <laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
 </additional>
diff --git a/tests/netedit/bugs/ticket4528/meandatas.netedit b/tests/netedit/bugs/ticket4528/meandatas.netedit
index 4817a589d55c..7ce2ba88d42b 100644
--- a/tests/netedit/bugs/ticket4528/meandatas.netedit
+++ b/tests/netedit/bugs/ticket4528/meandatas.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-09 14:47:01 by Eclipse SUMO netedit Version v1_21_0+1256-5c6b5e0a822
+<!-- generated on 2024-12-20 14:37:47 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
 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,8 +14,4 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <!-- MeanDataEdges -->
-    <edgeData id="meanDataEdge" file="meanDataEdgeOutput.xml"/>
-    <!-- MeanDataLanes -->
-    <laneData id="meanDataLane" file="meanDataLaneOutput.xml"/>
 </additional>
diff --git a/tests/netedit/elements/additionals/detentry/load/parent_invalid/errors.netedit b/tests/netedit/elements/additionals/detentry/load/parent_invalid/errors.netedit
index ba96b5b595f5..a05c8bfe7e9b 100644
--- a/tests/netedit/elements/additionals/detentry/load/parent_invalid/errors.netedit
+++ b/tests/netedit/elements/additionals/detentry/load/parent_invalid/errors.netedit
@@ -5,9 +5,7 @@
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 Error: Attribute 'id' is missing in definition of a entryExitDetector.
-Error: 'detEntry' must be defined within the definition of a 'e3Detector' (found rootFile).
-Error: 'detExit' must be defined within the definition of a 'e3Detector' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/additionals/detentry/load/parent_invalid/additionals.add.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.additionals.detectors.20Dec130554.3871/netedit.daily.elements.additionals.detectors/elements/additionals/detentry/load/parent_invalid/additionals.add.xml failed.
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 '-avx512er' is not a recognized feature for this target (ignoring feature)
diff --git a/tests/netedit/elements/additionals/detentry/load/parent_invalid/log.netedit b/tests/netedit/elements/additionals/detentry/load/parent_invalid/log.netedit
index 1e3101c5b5c9..f0170e140ba2 100644
--- a/tests/netedit/elements/additionals/detentry/load/parent_invalid/log.netedit
+++ b/tests/netedit/elements/additionals/detentry/load/parent_invalid/log.netedit
@@ -1,4 +1,2 @@
 Error: Attribute 'id' is missing in definition of a entryExitDetector.
-Error: 'detEntry' must be defined within the definition of a 'e3Detector' (found rootFile).
-Error: 'detExit' must be defined within the definition of a 'e3Detector' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/additionals/detentry/load/parent_invalid/additionals.add.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.additionals.detectors.20Dec130554.3871/netedit.daily.elements.additionals.detectors/elements/additionals/detentry/load/parent_invalid/additionals.add.xml failed.
diff --git a/tests/netedit/elements/additionals/detexit/load/parent_invalid/errors.netedit b/tests/netedit/elements/additionals/detexit/load/parent_invalid/errors.netedit
index e4e7f0a35956..0c2a68ebd632 100644
--- a/tests/netedit/elements/additionals/detexit/load/parent_invalid/errors.netedit
+++ b/tests/netedit/elements/additionals/detexit/load/parent_invalid/errors.netedit
@@ -5,9 +5,7 @@
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 Error: Attribute 'id' is missing in definition of a entryExitDetector.
-Error: 'detExit' must be defined within the definition of a 'e3Detector' (found rootFile).
-Error: 'detEntry' must be defined within the definition of a 'e3Detector' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/additionals/detexit/load/parent_invalid/additionals.add.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.additionals.detectors.20Dec130554.3871/netedit.daily.elements.additionals.detectors/elements/additionals/detexit/load/parent_invalid/additionals.add.xml failed.
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 '-avx512er' is not a recognized feature for this target (ignoring feature)
diff --git a/tests/netedit/elements/additionals/detexit/load/parent_invalid/log.netedit b/tests/netedit/elements/additionals/detexit/load/parent_invalid/log.netedit
index 0ab19035dca9..9a440c625710 100644
--- a/tests/netedit/elements/additionals/detexit/load/parent_invalid/log.netedit
+++ b/tests/netedit/elements/additionals/detexit/load/parent_invalid/log.netedit
@@ -1,4 +1,2 @@
 Error: Attribute 'id' is missing in definition of a entryExitDetector.
-Error: 'detExit' must be defined within the definition of a 'e3Detector' (found rootFile).
-Error: 'detEntry' must be defined within the definition of a 'e3Detector' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/additionals/detexit/load/parent_invalid/additionals.add.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.additionals.detectors.20Dec130554.3871/netedit.daily.elements.additionals.detectors/elements/additionals/detexit/load/parent_invalid/additionals.add.xml failed.
diff --git a/tests/netedit/elements/demands/person/load/color/errors.netedit b/tests/netedit/elements/demands/person/load/color/errors.netedit
index cf8e6c2b9813..e958d82ef513 100644
--- a/tests/netedit/elements/demands/person/load/color/errors.netedit
+++ b/tests/netedit/elements/demands/person/load/color/errors.netedit
@@ -5,10 +5,8 @@
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 Error: Attribute 'color' in definition of person 'p_1' Invalid color definition ''.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Attribute 'color' in definition of person 'p_2' Invalid color definition 'dummycolor'.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/person/load/color/routes.rou.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.demands.persons.20Dec130554.3903/netedit.daily.elements.demands.persons/elements/demands/person/load/color/routes.rou.xml failed.
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 '-avx512er' is not a recognized feature for this target (ignoring feature)
diff --git a/tests/netedit/elements/demands/person/load/color/log.netedit b/tests/netedit/elements/demands/person/load/color/log.netedit
index 068b5617826f..90a1c2fa8641 100644
--- a/tests/netedit/elements/demands/person/load/color/log.netedit
+++ b/tests/netedit/elements/demands/person/load/color/log.netedit
@@ -1,5 +1,3 @@
 Error: Attribute 'color' in definition of person 'p_1' Invalid color definition ''.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Attribute 'color' in definition of person 'p_2' Invalid color definition 'dummycolor'.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/person/load/color/routes.rou.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.demands.persons.20Dec130554.3903/netedit.daily.elements.demands.persons/elements/demands/person/load/color/routes.rou.xml failed.
diff --git a/tests/netedit/elements/demands/person/load/depart/errors.netedit b/tests/netedit/elements/demands/person/load/depart/errors.netedit
index 6168b258a825..171fdaddf016 100644
--- a/tests/netedit/elements/demands/person/load/depart/errors.netedit
+++ b/tests/netedit/elements/demands/person/load/depart/errors.netedit
@@ -5,15 +5,11 @@
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 Error: Attribute 'depart' is missing in definition of person 'p_0'.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Attribute 'depart' in definition of person 'p_1' is empty.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Invalid departure time for vehicle 'p_2';
  must be one of ("triggered", "containerTriggered", "now", or a float >= 0)
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Negative departure time in the definition of vehicle 'p_3'.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/person/load/depart/routes.rou.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.demands.persons.20Dec130554.3903/netedit.daily.elements.demands.persons/elements/demands/person/load/depart/routes.rou.xml failed.
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 '-avx512er' is not a recognized feature for this target (ignoring feature)
diff --git a/tests/netedit/elements/demands/person/load/depart/log.netedit b/tests/netedit/elements/demands/person/load/depart/log.netedit
index 7e514f8a1ed6..35b474e5d0e6 100644
--- a/tests/netedit/elements/demands/person/load/depart/log.netedit
+++ b/tests/netedit/elements/demands/person/load/depart/log.netedit
@@ -1,10 +1,6 @@
 Error: Attribute 'depart' is missing in definition of person 'p_0'.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Attribute 'depart' in definition of person 'p_1' is empty.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Invalid departure time for vehicle 'p_2';
  must be one of ("triggered", "containerTriggered", "now", or a float >= 0)
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Negative departure time in the definition of vehicle 'p_3'.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/person/load/depart/routes.rou.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.demands.persons.20Dec130554.3903/netedit.daily.elements.demands.persons/elements/demands/person/load/depart/routes.rou.xml failed.
diff --git a/tests/netedit/elements/demands/person/load/departpos/errors.netedit b/tests/netedit/elements/demands/person/load/departpos/errors.netedit
index 32b7638a2f77..ab6a660f9aea 100644
--- a/tests/netedit/elements/demands/person/load/departpos/errors.netedit
+++ b/tests/netedit/elements/demands/person/load/departpos/errors.netedit
@@ -5,9 +5,7 @@
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 Error: Attribute 'departPos' in definition of person 'p_1' is empty.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/person/load/departpos/routes.rou.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.demands.persons.20Dec130554.3903/netedit.daily.elements.demands.persons/elements/demands/person/load/departpos/routes.rou.xml failed.
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 '-avx512er' is not a recognized feature for this target (ignoring feature)
diff --git a/tests/netedit/elements/demands/person/load/departpos/log.netedit b/tests/netedit/elements/demands/person/load/departpos/log.netedit
index 978ed681755b..5c134a09ca21 100644
--- a/tests/netedit/elements/demands/person/load/departpos/log.netedit
+++ b/tests/netedit/elements/demands/person/load/departpos/log.netedit
@@ -1,4 +1,2 @@
 Error: Attribute 'departPos' in definition of person 'p_1' is empty.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/person/load/departpos/routes.rou.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.demands.persons.20Dec130554.3903/netedit.daily.elements.demands.persons/elements/demands/person/load/departpos/routes.rou.xml failed.
diff --git a/tests/netedit/elements/demands/person/load/type/errors.netedit b/tests/netedit/elements/demands/person/load/type/errors.netedit
index ed0ea5190d1a..057ecb3ef53e 100644
--- a/tests/netedit/elements/demands/person/load/type/errors.netedit
+++ b/tests/netedit/elements/demands/person/load/type/errors.netedit
@@ -5,10 +5,9 @@
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 Error: Attribute 'type' in definition of person 'p_1' is empty.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Could not build person with ID 'p_2' in netedit; vType parent with ID 'dummyType' doesn't exist.
 Error: Could not build personTrip in netedit; person parent doesn't exist.
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/person/load/type/routes.rou.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.demands.persons.20Dec130554.3903/netedit.daily.elements.demands.persons/elements/demands/person/load/type/routes.rou.xml failed.
 '-avx512er' is not a recognized feature for this target (ignoring feature)
 '-avx512pf' is not a recognized feature for this target (ignoring feature)
 '-avx512er' is not a recognized feature for this target (ignoring feature)
diff --git a/tests/netedit/elements/demands/person/load/type/log.netedit b/tests/netedit/elements/demands/person/load/type/log.netedit
index b75af595ff5d..80b1730a71b1 100644
--- a/tests/netedit/elements/demands/person/load/type/log.netedit
+++ b/tests/netedit/elements/demands/person/load/type/log.netedit
@@ -1,5 +1,4 @@
 Error: Attribute 'type' in definition of person 'p_1' is empty.
-Error: 'personTrip' must be defined within the definition of a 'person or personFlow' (found rootFile).
 Error: Could not build person with ID 'p_2' in netedit; vType parent with ID 'dummyType' doesn't exist.
 Error: Could not build personTrip in netedit; person parent doesn't exist.
-Error: Loading of /home/palcraft/.texttest/tmp/netedit.gui.18Dec174643.2935/netedit.gui/elements/demands/person/load/type/routes.rou.xml failed.
+Error: Loading of /home/palcraft/.texttest/tmp/netedit.daily.elements.demands.persons.20Dec130554.3903/netedit.daily.elements.demands.persons/elements/demands/person/load/type/routes.rou.xml failed.
diff --git a/tests/netedit/selection/basic/click/additionals.netedit b/tests/netedit/selection/basic/click/additionals.netedit
index 8da9b80d2d33..cb746b9f1d36 100644
--- a/tests/netedit/selection/basic/click/additionals.netedit
+++ b/tests/netedit/selection/basic/click/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 13:01:11 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:34:14 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/basic/default/additionals.netedit b/tests/netedit/selection/basic/default/additionals.netedit
index e1c7f5cbabfe..72f9a850b136 100644
--- a/tests/netedit/selection/basic/default/additionals.netedit
+++ b/tests/netedit/selection/basic/default/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 11:26:23 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:33:52 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -35,10 +35,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -51,6 +47,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <instantInductionLoop id="e1i_0" lane="E12_1" pos="9.80" file="e1i_0.xml"/>
     <instantInductionLoop id="e1i_1" lane="-E12_1" pos="2.80" file="e1i_1.xml"/>
diff --git a/tests/netedit/selection/basic/wrong_parameters/additionals.netedit b/tests/netedit/selection/basic/wrong_parameters/additionals.netedit
index 246264679396..c7cf2526fbd5 100644
--- a/tests/netedit/selection/basic/wrong_parameters/additionals.netedit
+++ b/tests/netedit/selection/basic/wrong_parameters/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-07 15:04:04 by Eclipse SUMO netedit Version v1_20_0+1549-9bd79766fae
+<!-- generated on 2024-12-20 18:35:21 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -33,10 +33,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -49,6 +45,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <laneAreaDetector id="e2_4" lanes="E4_1 E5_1" pos="5.80" endPos="4.80" period="300.00" file="e2_4.xml"/>
     <laneAreaDetector id="e2_5" lanes="E8_1 E2_1" pos="5.80" endPos="4.80" period="300.00" file="e2_5.xml"/>
diff --git a/tests/netedit/selection/bugs/ticket2948/additionals.netedit b/tests/netedit/selection/bugs/ticket2948/additionals.netedit
new file mode 100644
index 000000000000..2e4b6f0fe511
--- /dev/null
+++ b/tests/netedit/selection/bugs/ticket2948/additionals.netedit
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-12-20 14:34:11 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
+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
+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
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/netedit/selection/bugs/ticket2948/datas.netedit b/tests/netedit/selection/bugs/ticket2948/datas.netedit
new file mode 100644
index 000000000000..6b1dcbbd6000
--- /dev/null
+++ b/tests/netedit/selection/bugs/ticket2948/datas.netedit
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-12-20 14:34:11 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
+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
+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
+-->
+
+<data xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/datamode_file.xsd">
+</data>
diff --git a/tests/netedit/selection/bugs/ticket2948/guisettingsoutput.netedit b/tests/netedit/selection/bugs/ticket2948/guisettingsoutput.netedit
index 3ad9a3e22310..8eb0cd43c48f 100644
--- a/tests/netedit/selection/bugs/ticket2948/guisettingsoutput.netedit
+++ b/tests/netedit/selection/bugs/ticket2948/guisettingsoutput.netedit
@@ -1,13 +1,13 @@
 <viewsettings>
     <scheme name="testing">
-        <opengl dither="0" fps="0" drawBoundaries="0" forceDrawPositionSelection="0" forceDrawRectangleSelection="0"/>
-        <background backgroundColor="white" showGrid="1" gridXSize="1.00" gridYSize="1.00"/>
-        <edges laneEdgeMode="0" scaleMode="0" laneShowBorders="0" showBikeMarkings="1" showLinkDecals="1" 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" vehicleTextParam="PARAM_TEXT" edgeData="speed"
-                edgeName_show="0" edgeName_size="60.00" edgeName_color="orange" edgeName_bgColor="128,0,0,0" edgeName_constantSize="1"
-                internalEdgeName_show="0" internalEdgeName_size="45.00" internalEdgeName_color="128,64,0" internalEdgeName_bgColor="128,0,0,0" internalEdgeName_constantSize="1"
-                cwaEdgeName_show="0" cwaEdgeName_size="60.00" cwaEdgeName_color="magenta" cwaEdgeName_bgColor="128,0,0,0" cwaEdgeName_constantSize="1"
-                streetName_show="0" streetName_size="60.00" streetName_color="yellow" streetName_bgColor="128,0,0,0" streetName_constantSize="1"
-                edgeValue_show="0" edgeValue_size="100.00" edgeValue_color="cyan" edgeValue_bgColor="128,0,0,0" edgeValue_constantSize="1">
+        <opengl dither="0" fps="0" trueZ="0" drawBoundaries="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" disableHideByZoom="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" edgeValueSetNeutral="0" edgeValueNeutralThreshold="0.00" edgeValueFixRange="0"
+                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" 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="sidewalk"/>
@@ -21,6 +21,7 @@
                 <entry color="green" name="connector"/>
                 <entry color="orange" name="forbidden"/>
                 <entry color="145,145,145" name="data mode"/>
+                <entry color="200,240,240" name="airway"/>
             </colorScheme>
             <colorScheme name="by selection">
                 <entry color="grey" name="unselected"/>
@@ -35,10 +36,10 @@
                 <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"/>
-                <entry color="255,206,0" threshold="50495455.00" name="motorway"/>
-                <entry color="black" threshold="50593759.00" name="disallow_pedestrian"/>
-                <entry color="black" threshold="50593791.00" name="normal_road"/>
-                <entry color="green" threshold="67108863.00" name="all"/>
+                <entry color="255,206,0" threshold="7247921119.00" name="motorway"/>
+                <entry color="black" threshold="7248019423.00" name="disallow_pedestrian"/>
+                <entry color="black" threshold="7248019455.00" name="normal_road"/>
+                <entry color="green" threshold="8589934591.00" name="all"/>
             </colorScheme>
             <colorScheme name="by allowed speed (lanewise)" interpolated="1">
                 <entry color="red" threshold="0.00"/>
@@ -112,39 +113,46 @@
                 <entry color="204,204,204" threshold="0.00"/>
                 <entry color="red" threshold="1.00"/>
             </colorScheme>
+            <colorScheme name="by edgeData (numerical, streetwise)" interpolated="1">
+                <entry color="225,225,225" name="missing data"/>
+            </colorScheme>
             <scalingScheme name="default">
                 <entry color="1.00" name="uniform"/>
             </scalingScheme>
         </edges>
-        <vehicles vehicleMode="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"
-                  vehicleName_show="0" vehicleName_size="60.00" vehicleName_color="204,153,0" vehicleName_bgColor="128,0,0,0" vehicleName_constantSize="1"
-                  vehicleValue_show="0" vehicleValue_size="80.00" vehicleValue_color="cyan" vehicleValue_bgColor="128,0,0,0" vehicleValue_constantSize="1"
-                  vehicleText_show="0" vehicleText_size="80.00" vehicleText_color="red" vehicleText_bgColor="128,0,0,0" vehicleText_constantSize="1">
+        <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" showChargingInfo="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"
+                  vehicleText_show="0" vehicleText_size="80.00" vehicleText_color="red" vehicleText_bgColor="128,0,0,0" vehicleText_constantSize="1" vehicleText_onlySelected="0">
             <colorScheme name="uniform">
                 <entry color="yellow"/>
             </colorScheme>
+            <scalingScheme name="uniform">
+                <entry color="1.00"/>
+            </scalingScheme>
         </vehicles>
-        <persons personMode="0" personQuality="0" 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"
-                  personValue_show="0" personValue_size="80.00" personValue_color="cyan" personValue_bgColor="128,0,0,0" personValue_constantSize="1">
+        <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>
         </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_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">
                 <entry color="yellow"/>
             </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"
-                   drawLinkJunctionIndex_show="0" drawLinkJunctionIndex_size="65.00" drawLinkJunctionIndex_color="128,128,255" drawLinkJunctionIndex_bgColor="0,0,0,0" drawLinkJunctionIndex_constantSize="0"
-                   junctionID_show="0" junctionID_size="60.00" junctionID_color="0,255,128" junctionID_bgColor="128,0,0,0" junctionID_constantSize="1"
-                   junctionName_show="0" junctionName_size="60.00" junctionName_color="192,255,128" junctionName_bgColor="128,0,0,0" junctionName_constantSize="1"
-                   internalJunctionName_show="0" internalJunctionName_size="50.00" internalJunctionName_color="0,204,128" internalJunctionName_bgColor="128,0,0,0" internalJunctionName_constantSize="1"
-                   tlsPhaseIndex_show="0" tlsPhaseIndex_size="150.00" tlsPhaseIndex_color="yellow" tlsPhaseIndex_bgColor="128,0,0,0" tlsPhaseIndex_constantSize="1" tlsPhaseName_show="0" tlsPhaseName_size="150.00" tlsPhaseName_color="orange" tlsPhaseName_bgColor="128,0,0,0" tlsPhaseName_constantSize="1"
-                   showLane2Lane="0" drawShape="1" drawCrossingsAndWalkingareas="1" junction_minSize="1.00" junction_exaggeration="1.00" junction_constantSize="0" junction_constantSizeSelected="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"
+                   tlsPhaseIndex_show="0" tlsPhaseIndex_size="150.00" tlsPhaseIndex_color="yellow" tlsPhaseIndex_bgColor="128,0,0,0" tlsPhaseIndex_constantSize="1" tlsPhaseIndex_onlySelected="0" tlsPhaseName_show="0" tlsPhaseName_size="150.00" tlsPhaseName_color="orange" tlsPhaseName_bgColor="128,0,0,0" tlsPhaseName_constantSize="1" tlsPhaseName_onlySelected="0"
+                   showLane2Lane="0" drawShape="1" drawCrossingsAndWalkingareas="1" junction_minSize="1.00" junction_exaggeration="1.00" junction_constantSize="0" junction_constantSizeSelected="0" junctionValueHideCheck="0" junctionValueHideThreshold="0.00" junctionValueHideCheck2="0" junctionValueHideThreshold2="100.00" junctionValueSetNeutral="0" junctionValueNeutralThreshold="0.00" junctionValueFixRange="0">
             <colorScheme name="uniform">
                 <entry color="102,0,0"/>
                 <entry color="204,0,0" name="junction bubble"/>
@@ -171,6 +179,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"/>
@@ -181,8 +190,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" addFullName_show="0" addFullName_size="60.00" addFullName_color="255,0,128" addFullName_bgColor="128,0,0,0" addFullName_constantSize="1"/>
-        <pois poi_minSize="0.00" poi_exaggeration="1.00" poi_constantSize="0" poi_constantSizeSelected="0" poiName_show="0" poiName_size="50.00" poiName_color="255,0,128" poiName_bgColor="128,0,0,0" poiName_constantSize="1" poiType_show="0" poiType_size="60.00" poiType_color="255,0,128" poiType_bgColor="128,0,0,0" poiType_constantSize="1">
+        <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" poiUseCustomLayer="0" poiCustomLayer="0.00">
             <colorScheme name="given POI color">
                 <entry color="red"/>
             </colorScheme>
@@ -194,7 +203,7 @@
                 <entry color="red"/>
             </colorScheme>
         </pois>
-        <polys poly_minSize="0.00" poly_exaggeration="1.00" poly_constantSize="0" poly_constantSizeSelected="0" polyName_show="0" polyName_size="50.00" polyName_color="255,0,128" polyName_bgColor="128,0,0,0" polyName_constantSize="1" polyType_show="0" polyType_size="60.00" polyType_color="255,0,128" polyType_bgColor="128,0,0,0" polyType_constantSize="1">
+        <polys poly_minSize="0.00" poly_exaggeration="1.00" poly_constantSize="0" poly_constantSizeSelected="0" polyName_show="0" polyName_size="50.00" polyName_color="255,0,128" polyName_bgColor="128,0,0,0" polyName_constantSize="1" polyName_onlySelected="0" polyType_show="0" polyType_size="60.00" polyType_color="255,0,128" polyType_bgColor="128,0,0,0" polyType_constantSize="1" polyType_onlySelected="0" polyUseCustomLayer="0" polyCustomLayer="0.00">
             <colorScheme name="given polygon color">
                 <entry color="orange"/>
             </colorScheme>
@@ -205,8 +214,12 @@
             <colorScheme name="uniform">
                 <entry color="orange"/>
             </colorScheme>
+            <colorScheme name="random">
+                <entry color="yellow"/>
+            </colorScheme>
         </polys>
-        <legend showSizeLegend="1" showColorLegend="0"/>
+        <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="50.00" y="50.00" angle="0.00"/>
+    <viewport zoom="140.00" x="0.00" y="0.00" angle="0.00"/>
 </viewsettings>
diff --git a/tests/netedit/selection/bugs/ticket2948/log.netedit b/tests/netedit/selection/bugs/ticket2948/log.netedit
index c002f3360927..4357a462de84 100644
--- a/tests/netedit/selection/bugs/ticket2948/log.netedit
+++ b/tests/netedit/selection/bugs/ticket2948/log.netedit
@@ -1,18 +1,12 @@
 Warning: The traffic light 'J0' does not control any links; it will not be build.
 Warning: Could not build program '0' for traffic light 'J0'
-Warning: The traffic light 'J6' does not control any links; it will not be build.
-Warning: Could not build program '0' for traffic light 'J6'
-Warning: Edge 'E0' is not connected to outgoing edges at junction 'J1'.
-Warning: Edge 'E1' is not connected to outgoing edges at junction 'J2'.
-Warning: Lane 'E1_0' is not connected from any incoming edge at junction 'J1'.
-Warning: Edge 'E2' is not connected to outgoing edges at junction 'J3'.
-Warning: Lane 'E2_0' is not connected from any incoming edge at junction 'J2'.
-Warning: Edge 'E3' is not connected to outgoing edges at junction 'J4'.
-Warning: Lane 'E3_0' is not connected from any incoming edge at junction 'J3'.
-Warning: Edge 'E4' is not connected to outgoing edges at junction 'J5'.
-Warning: Lane 'E4_0' is not connected from any incoming edge at junction 'J4'.
-Warning: Lane 'E5_0' is not connected from any incoming edge at junction 'J5'.
+Warning: The traffic light 'J3' does not control any links; it will not be build.
+Warning: Could not build program '0' for traffic light 'J3'
+Warning: Cannot restore attribute 'selected=true' for computed connection from lane 'E1_0'
+Warning: Cannot restore attribute 'selected=true' for computed connection from lane 'E0_0'
+Warning: Cannot restore attribute 'selected=true' for computed connection from lane '-E2_0'
+Warning: Cannot restore attribute 'selected=true' for computed connection from lane '-E1_0'
 Warning: The traffic light 'J0' does not control any links; it will not be build.
 Warning: Could not build program '0' for traffic light 'J0'
-Warning: The traffic light 'J6' does not control any links; it will not be build.
-Warning: Could not build program '0' for traffic light 'J6'
+Warning: The traffic light 'J3' does not control any links; it will not be build.
+Warning: Could not build program '0' for traffic light 'J3'
diff --git a/tests/netedit/selection/bugs/ticket2948/meandatas.netedit b/tests/netedit/selection/bugs/ticket2948/meandatas.netedit
new file mode 100644
index 000000000000..2e4b6f0fe511
--- /dev/null
+++ b/tests/netedit/selection/bugs/ticket2948/meandatas.netedit
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-12-20 14:34:11 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
+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
+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
+-->
+
+<additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
+</additional>
diff --git a/tests/netedit/selection/bugs/ticket2948/net.netedit b/tests/netedit/selection/bugs/ticket2948/net.netedit
index b3fb6c6cb353..cba6cc05452d 100644
--- a/tests/netedit/selection/bugs/ticket2948/net.netedit
+++ b/tests/netedit/selection/bugs/ticket2948/net.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-09-26 14:30:34 by Eclipse SUMO netedit Version v1_20_0+2157-7cbf65e8f91
+<!-- generated on 2024-12-20 14:34:11 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
 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,15 +14,16 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <neteditConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/neteditConfiguration.xsd">
 
     <input>
-        <additional-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Sep142855.892\netedit.gui\bugs\ticket1711\additionals.add.xml"/>
-        <route-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Sep142855.892\netedit.gui\bugs\ticket1711\routes.rou.xml"/>
-        <data-files value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Sep142855.892\netedit.gui\bugs\ticket1711\datas.dat.xml"/>
-        <sumo-net-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Sep142855.892\netedit.gui\bugs\ticket1711\net.net.xml"/>
+        <additional-files value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/additionals.add.xml"/>
+        <route-files value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/routes.rou.xml"/>
+        <data-files value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/datas.dat.xml"/>
+        <meandata-files value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/datas.med.add.xml"/>
+        <sumo-net-file value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/net.net.xml"/>
     </input>
 
     <output>
         <write-license value="true"/>
-        <output-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Sep142855.892\netedit.gui\bugs\ticket1711\net.net.xml"/>
+        <output-file value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/net.net.xml"/>
     </output>
 
     <processing>
@@ -45,19 +46,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <netedit>
         <ignore-supermode-question value="true"/>
+        <force-saving value="true"/>
     </netedit>
 
     <visualisation>
-        <gui-settings-file value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Sep142855.892\netedit.gui\bugs\ticket1711\gui-settings.xml"/>
+        <gui-settings-file value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/gui-settings.xml"/>
         <window-size value="1280, 720"/>
         <window-pos value="50,50"/>
         <gui-testing value="true"/>
-        <gui-testing.setting-output value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Sep142855.892\netedit.gui\bugs\ticket1711\guisettingsoutput.xml"/>
+        <gui-testing.setting-output value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/guisettingsoutput.xml"/>
     </visualisation>
 
     <report>
         <no-warnings value="true"/>
-        <error-log value="C:\Users\alva_pa\.texttest\tmp\netedit.gui.26Sep142855.892\netedit.gui\bugs\ticket1711\log.txt"/>
+        <error-log value="/home/palcraft/.texttest/tmp/netedit.daily.basic.20Dec130554.3867/netedit.daily.basic/selection/bugs/ticket2948/log.txt"/>
     </report>
 
 </neteditConfiguration>
@@ -67,6 +69,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <location netOffset="0.00,0.00" convBoundary="-60.00,-30.00,60.00,30.00" origBoundary="-10000000000.000000,-10000000000.000000,10000000000.000000,10000000000.000000" projParameter="+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs"/>
 
+    <edge id=":J1_0" function="internal">
+        <lane id=":J1_0_0" index="0" speed="3.90" length="2.58" shape="22.40,-16.80 22.30,-17.50 22.00,-18.00 21.50,-18.30 20.80,-18.40"/>
+    </edge>
+    <edge id=":J1_1" function="internal">
+        <lane id=":J1_1_0" index="0" speed="6.08" length="7.74" shape="20.80,-21.60 22.90,-21.30 24.40,-20.40 25.30,-18.90 25.60,-16.80"/>
+    </edge>
+    <edge id=":J2_0" function="internal">
+        <lane id=":J2_0_0" index="0" speed="6.08" length="7.74" shape="25.60,16.80 25.30,18.90 24.40,20.40 22.90,21.30 20.80,21.60"/>
+    </edge>
+    <edge id=":J2_1" function="internal">
+        <lane id=":J2_1_0" index="0" speed="3.90" length="2.58" shape="20.80,18.40 21.50,18.30 22.00,18.00 22.30,17.50 22.40,16.80"/>
+    </edge>
     <edge id=":JunctionExtern0_0" function="internal">
         <lane id=":JunctionExtern0_0_0" index="0" disallow="pedestrian" speed="3.53" length="4.38" width="3.00" shape="-60.00,1.50 -61.12,0.75 -61.50,0.00 -61.12,-0.75 -60.00,-1.50"/>
     </edge>
@@ -74,28 +88,76 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":JunctionExtern1_0_0" index="0" disallow="pedestrian" speed="3.53" length="4.38" width="3.00" shape="60.00,-1.50 61.12,-0.75 61.50,0.00 61.12,0.75 60.00,1.50"/>
     </edge>
 
+    <edge id="-E0" from="J1" to="J0" priority="-1">
+        <lane id="-E0_0" index="0" speed="20.00" length="46.80" shape="20.80,-18.40 -26.00,-18.40"/>
+    </edge>
+    <edge id="-E1" from="J2" to="J1" priority="-1">
+        <lane id="-E1_0" index="0" speed="20.00" length="33.60" shape="22.40,16.80 22.40,-16.80"/>
+    </edge>
+    <edge id="-E2" from="J3" to="J2" priority="-1">
+        <lane id="-E2_0" index="0" speed="20.00" length="44.80" shape="-24.00,18.40 20.80,18.40"/>
+    </edge>
+    <edge id="E0" from="J0" to="J1" priority="-1">
+        <lane id="E0_0" index="0" speed="20.00" length="46.80" shape="-26.00,-21.60 20.80,-21.60"/>
+    </edge>
+    <edge id="E1" from="J1" to="J2" priority="-1">
+        <lane id="E1_0" index="0" speed="20.00" length="33.60" shape="25.60,-16.80 25.60,16.80"/>
+    </edge>
+    <edge id="E2" from="J2" to="J3" priority="-1">
+        <lane id="E2_0" index="0" speed="20.00" length="44.80" shape="20.80,21.60 -24.00,21.60"/>
+    </edge>
     <edge id="EdgeExternBot" from="JunctionExtern0" to="JunctionExtern1" priority="-1" length="175.00" shape="-60.00,0.00 -45.00,0.00 -45.00,-25.00 -40.00,-30.00 40.00,-30.00 45.00,-25.00 45.00,0.00 60.00,0.00">
-        <lane id="EdgeExternBot_0" index="0" disallow="pedestrian" speed="13.89" length="175.00" width="3.00" shape="-60.00,-1.50 -46.50,-1.50 -46.50,-25.62 -40.62,-31.50 40.62,-31.50 46.50,-25.62 46.50,-1.50 60.00,-1.50"/>
+        <lane id="EdgeExternBot_0" index="0" disallow="pedestrian" speed="20.00" length="175.00" width="3.00" shape="-60.00,-1.50 -46.50,-1.50 -46.50,-25.62 -40.62,-31.50 40.62,-31.50 46.50,-25.62 46.50,-1.50 60.00,-1.50"/>
     </edge>
     <edge id="EdgeExternTop" from="JunctionExtern1" to="JunctionExtern0" priority="-1" length="175.00" shape="60.00,0.00 45.00,0.00 45.00,25.00 40.00,30.00 -40.00,30.00 -45.00,25.00 -45.00,0.00 -60.00,0.00">
-        <lane id="EdgeExternTop_0" index="0" disallow="pedestrian" speed="13.89" length="175.00" width="3.00" shape="60.00,1.50 46.50,1.50 46.50,25.62 40.62,31.50 -40.62,31.50 -46.50,25.62 -46.50,1.50 -60.00,1.50"/>
+        <lane id="EdgeExternTop_0" index="0" disallow="pedestrian" speed="20.00" length="175.00" width="3.00" shape="60.00,1.50 46.50,1.50 46.50,25.62 40.62,31.50 -40.62,31.50 -46.50,25.62 -46.50,1.50 -60.00,1.50"/>
     </edge>
 
-    <junction id="J0" type="dead_end" x="-25.00" y="0.00" incLanes="" intLanes="" shape="-25.00,0.00"/>
-    <junction id="J1" type="dead_end" x="0.00" y="25.00" incLanes="" intLanes="" shape="0.00,25.00"/>
-    <junction id="J2" type="dead_end" x="0.00" y="-25.00" incLanes="" intLanes="" shape="0.00,-25.00"/>
-    <junction id="J3" type="dead_end" x="25.00" y="0.00" incLanes="" intLanes="" shape="25.00,0.00"/>
-    <junction id="Junction5" type="dead_end" x="0.00" y="0.00" incLanes="" intLanes="" shape="0.00,0.00"/>
-    <junction id="JunctionExtern0" type="priority" x="-60.00" y="0.00" incLanes="EdgeExternTop_0" intLanes=":JunctionExtern0_0_0" shape="-60.00,0.00 -60.00,3.00 -60.00,0.00">
+    <tlLogic id="J1" type="static" programID="0" offset="0">
+        <phase duration="90" state="GG"/>
+    </tlLogic>
+    <tlLogic id="J2" type="static" programID="0" offset="0">
+        <phase duration="90" state="GG"/>
+    </tlLogic>
+    <tlLogic id="JunctionExtern0" type="static" programID="0" offset="0">
+        <phase duration="80" state="G"/>
+        <phase duration="5"  state="y"/>
+        <phase duration="5"  state="r"/>
+    </tlLogic>
+    <tlLogic id="JunctionExtern1" type="static" programID="0" offset="0">
+        <phase duration="80" state="G"/>
+        <phase duration="5"  state="y"/>
+        <phase duration="5"  state="r"/>
+    </tlLogic>
+
+    <junction id="J0" type="dead_end" x="-26.00" y="-20.00" incLanes="-E0_0" intLanes="" shape="-26.00,-20.00 -26.00,-16.80 -26.00,-20.00"/>
+    <junction id="J1" type="traffic_light" x="24.00" y="-20.00" incLanes="-E1_0 E0_0" intLanes=":J1_0_0 :J1_1_0" shape="20.80,-16.80 27.20,-16.80 26.49,-20.36 25.60,-21.60 24.36,-22.49 22.76,-23.02 20.80,-23.20">
+        <request index="0" response="00" foes="00" cont="0"/>
+        <request index="1" response="00" foes="00" cont="0"/>
+    </junction>
+    <junction id="J2" type="traffic_light" x="24.00" y="20.00" incLanes="E1_0 -E2_0" intLanes=":J2_0_0 :J2_1_0" shape="27.20,16.80 20.80,16.80 20.80,23.20 24.36,22.49 25.60,21.60 26.49,20.36 27.02,18.76">
+        <request index="0" response="00" foes="00" cont="0"/>
+        <request index="1" response="00" foes="00" cont="0"/>
+    </junction>
+    <junction id="J3" type="dead_end" x="-24.00" y="20.00" incLanes="E2_0" intLanes="" shape="-24.00,20.00 -24.00,23.20 -24.00,20.00"/>
+    <junction id="JunctionExtern0" type="traffic_light" x="-60.00" y="0.00" incLanes="EdgeExternTop_0" intLanes=":JunctionExtern0_0_0" shape="-60.00,0.00 -60.00,3.00 -60.00,0.00">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
-    <junction id="JunctionExtern1" type="priority" x="60.00" y="0.00" incLanes="EdgeExternBot_0" intLanes=":JunctionExtern1_0_0" shape="60.00,0.00 60.00,-3.00 60.00,0.00">
+    <junction id="JunctionExtern1" type="traffic_light" x="60.00" y="0.00" incLanes="EdgeExternBot_0" intLanes=":JunctionExtern1_0_0" shape="60.00,0.00 60.00,-3.00 60.00,0.00">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
 
-    <connection from="EdgeExternBot" to="EdgeExternTop" fromLane="0" toLane="0" via=":JunctionExtern1_0_0" dir="t" state="M"/>
-    <connection from="EdgeExternTop" to="EdgeExternBot" fromLane="0" toLane="0" via=":JunctionExtern0_0_0" dir="t" state="M"/>
-
+    <connection from="-E1" to="-E0" fromLane="0" toLane="0" via=":J1_0_0" tl="J1" linkIndex="0" dir="r" state="O"/>
+    <connection from="-E2" to="-E1" fromLane="0" toLane="0" via=":J2_1_0" tl="J2" linkIndex="1" dir="r" state="O"/>
+    <connection from="E0" to="E1" fromLane="0" toLane="0" via=":J1_1_0" tl="J1" linkIndex="1" dir="l" state="O"/>
+    <connection from="E1" to="E2" fromLane="0" toLane="0" via=":J2_0_0" tl="J2" linkIndex="0" dir="l" state="O"/>
+    <connection from="EdgeExternBot" to="EdgeExternTop" fromLane="0" toLane="0" via=":JunctionExtern1_0_0" tl="JunctionExtern1" linkIndex="0" dir="t" state="O"/>
+    <connection from="EdgeExternTop" to="EdgeExternBot" fromLane="0" toLane="0" via=":JunctionExtern0_0_0" tl="JunctionExtern0" linkIndex="0" dir="t" state="O"/>
+
+    <connection from=":J1_0" to="-E0" fromLane="0" toLane="0" dir="r" state="M"/>
+    <connection from=":J1_1" to="E1" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":J2_0" to="E2" fromLane="0" toLane="0" dir="l" state="M"/>
+    <connection from=":J2_1" to="-E1" fromLane="0" toLane="0" dir="r" state="M"/>
     <connection from=":JunctionExtern0_0" to="EdgeExternBot" fromLane="0" toLane="0" dir="t" state="M"/>
     <connection from=":JunctionExtern1_0" to="EdgeExternTop" fromLane="0" toLane="0" dir="t" state="M"/>
 
diff --git a/tests/netedit/selection/bugs/ticket2948/output.netedit b/tests/netedit/selection/bugs/ticket2948/output.netedit
index 1775778c854d..3ef495d231ea 100644
--- a/tests/netedit/selection/bugs/ticket2948/output.netedit
+++ b/tests/netedit/selection/bugs/ticket2948/output.netedit
@@ -1,16 +1,13 @@
 TestFunctions: Netedit opened successfully
 Finding reference
 TestFunctions: 'reference.png' found. Position: 304 - 168
-TestFunctions: Clicked over position 604 - 303
-TestFunctions: Clicked over position 704 - 303
-TestFunctions: Clicked over position 704 - 403
-TestFunctions: Clicked over position 704 - 503
-TestFunctions: Clicked over position 604 - 503
-TestFunctions: Clicked over position 504 - 503
-TestFunctions: Clicked over position 504 - 403
-TestFunctions: Clicked over position 709 - 393
+TestFunctions: Clicked over position 561 - 592
+TestFunctions: Clicked over position 1038 - 594
+TestFunctions: Clicked over position 1041 - 210
+TestFunctions: Clicked over position 563 - 210
+TestFunctions: Clicked over position 561 - 592
 traffic_light
-TestFunctions: Clicked over position 707 - 453
+TestFunctions: Clicked over position 661 - 592
 20
 TestFunctions: Clicked over position 304 - 168
 TestFunctions: Clicked over position 304 - 168
diff --git a/tests/netedit/selection/bugs/ticket2948/routes.netedit b/tests/netedit/selection/bugs/ticket2948/routes.netedit
new file mode 100644
index 000000000000..017cfc12fa26
--- /dev/null
+++ b/tests/netedit/selection/bugs/ticket2948/routes.netedit
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- generated on 2024-12-20 14:34:11 by Eclipse SUMO netedit Version v1_21_0+1568-7ba4877f071
+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
+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
+-->
+
+<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
+</routes>
diff --git a/tests/netedit/selection/lockselection/additionals/additionals.netedit b/tests/netedit/selection/lockselection/additionals/additionals.netedit
index 08def6c99eb8..a596c27b9475 100644
--- a/tests/netedit/selection/lockselection/additionals/additionals.netedit
+++ b/tests/netedit/selection/lockselection/additionals/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:02:15 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:40:34 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -35,10 +35,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -51,9 +47,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
-    <!-- Detectors -->
-    <laneAreaDetector id="e2_4" lanes="E4_1 E5_1" pos="5.80" endPos="4.80" period="300.00" file="e2_4.xml"/>
-    <laneAreaDetector id="e2_5" lanes="E8_1 E2_1" pos="5.80" endPos="4.80" period="300.00" file="e2_5.xml"/>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Other additionals -->
     <rerouter id="rr_0" edges="E12" pos="-10.00,18.00"/>
     <rerouter id="rr_1" edges="-E9" pos="10.00,-18.00"/>
diff --git a/tests/netedit/selection/lockselection/crossings/additionals.netedit b/tests/netedit/selection/lockselection/crossings/additionals.netedit
index 8c882cfad43e..08737cd0ec88 100644
--- a/tests/netedit/selection/lockselection/crossings/additionals.netedit
+++ b/tests/netedit/selection/lockselection/crossings/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:03:22 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:40:37 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/lockselection/edges/additionals.netedit b/tests/netedit/selection/lockselection/edges/additionals.netedit
index f99a043f212c..ff26a0fdbf73 100644
--- a/tests/netedit/selection/lockselection/edges/additionals.netedit
+++ b/tests/netedit/selection/lockselection/edges/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-07 15:15:06 by Eclipse SUMO netedit Version v1_20_0+1549-9bd79766fae
+<!-- generated on 2024-12-20 18:39:28 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -33,10 +33,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -49,6 +45,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <laneAreaDetector id="e2_4" lanes="E4_1 E5_1" pos="5.80" endPos="4.80" period="300.00" file="e2_4.xml"/>
     <laneAreaDetector id="e2_5" lanes="E8_1 E2_1" pos="5.80" endPos="4.80" period="300.00" file="e2_5.xml"/>
diff --git a/tests/netedit/selection/lockselection/junctions/additionals.netedit b/tests/netedit/selection/lockselection/junctions/additionals.netedit
index c8ed276f9b04..fa2b9e2c7adc 100644
--- a/tests/netedit/selection/lockselection/junctions/additionals.netedit
+++ b/tests/netedit/selection/lockselection/junctions/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-07 15:14:01 by Eclipse SUMO netedit Version v1_20_0+1549-9bd79766fae
+<!-- generated on 2024-12-20 18:39:17 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -33,10 +33,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -49,6 +45,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <laneAreaDetector id="e2_4" lanes="E4_1 E5_1" pos="5.80" endPos="4.80" period="300.00" file="e2_4.xml"/>
     <laneAreaDetector id="e2_5" lanes="E8_1 E2_1" pos="5.80" endPos="4.80" period="300.00" file="e2_5.xml"/>
diff --git a/tests/netedit/selection/lockselection/lanes/additionals.netedit b/tests/netedit/selection/lockselection/lanes/additionals.netedit
index e6d15a39a6f3..9e7cda8204ad 100644
--- a/tests/netedit/selection/lockselection/lanes/additionals.netedit
+++ b/tests/netedit/selection/lockselection/lanes/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-07 15:16:12 by Eclipse SUMO netedit Version v1_20_0+1549-9bd79766fae
+<!-- generated on 2024-12-20 18:39:32 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -33,10 +33,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -49,6 +45,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <laneAreaDetector id="e2_4" lanes="E4_1 E5_1" pos="5.80" endPos="4.80" period="300.00" file="e2_4.xml"/>
     <laneAreaDetector id="e2_5" lanes="E8_1 E2_1" pos="5.80" endPos="4.80" period="300.00" file="e2_5.xml"/>
diff --git a/tests/netedit/selection/lockselection/obstacles/additionals.netedit b/tests/netedit/selection/lockselection/obstacles/additionals.netedit
index 136d490a1175..d49d420727da 100644
--- a/tests/netedit/selection/lockselection/obstacles/additionals.netedit
+++ b/tests/netedit/selection/lockselection/obstacles/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:06:13 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:41:45 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/lockselection/pois/additionals.netedit b/tests/netedit/selection/lockselection/pois/additionals.netedit
index 0de1a1c7e659..c62d2482eea2 100644
--- a/tests/netedit/selection/lockselection/pois/additionals.netedit
+++ b/tests/netedit/selection/lockselection/pois/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:11:08 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:41:41 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/lockselection/polygons/additionals.netedit b/tests/netedit/selection/lockselection/polygons/additionals.netedit
index d82e7a58e923..c74dd7ae3aab 100644
--- a/tests/netedit/selection/lockselection/polygons/additionals.netedit
+++ b/tests/netedit/selection/lockselection/polygons/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:04:31 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:41:28 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/lockselection/tazs/additionals.netedit b/tests/netedit/selection/lockselection/tazs/additionals.netedit
index d85754fdabfe..fdc68ead85c4 100644
--- a/tests/netedit/selection/lockselection/tazs/additionals.netedit
+++ b/tests/netedit/selection/lockselection/tazs/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:12:16 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:42:34 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/lockselection/walkable_areas/additionals.netedit b/tests/netedit/selection/lockselection/walkable_areas/additionals.netedit
index 940ad560247b..c654c8e06d17 100644
--- a/tests/netedit/selection/lockselection/walkable_areas/additionals.netedit
+++ b/tests/netedit/selection/lockselection/walkable_areas/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:07:55 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:42:48 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/lockselection/walking_areas/additionals.netedit b/tests/netedit/selection/lockselection/walking_areas/additionals.netedit
index 5cbc850d46a3..36d439084145 100644
--- a/tests/netedit/selection/lockselection/walking_areas/additionals.netedit
+++ b/tests/netedit/selection/lockselection/walking_areas/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:09:02 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:42:50 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/operations/clear/additionals.netedit b/tests/netedit/selection/operations/clear/additionals.netedit
index fb228e04cde4..717c780f06e9 100644
--- a/tests/netedit/selection/operations/clear/additionals.netedit
+++ b/tests/netedit/selection/operations/clear/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:28:26 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:37:28 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/operations/load/additionals.netedit b/tests/netedit/selection/operations/load/additionals.netedit
index 3c3e9e8a8a1e..2a388c05e352 100644
--- a/tests/netedit/selection/operations/load/additionals.netedit
+++ b/tests/netedit/selection/operations/load/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-07 15:12:02 by Eclipse SUMO netedit Version v1_20_0+1549-9bd79766fae
+<!-- generated on 2024-12-20 18:38:24 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -33,10 +33,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -49,6 +45,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <laneAreaDetector id="e2_4" lanes="E4_1 E5_1" pos="5.80" endPos="4.80" period="300.00" file="e2_4.xml"/>
     <laneAreaDetector id="e2_5" lanes="E8_1 E2_1" pos="5.80" endPos="4.80" period="300.00" file="e2_5.xml"/>
diff --git a/tests/netedit/selection/operations/save/additionals.netedit b/tests/netedit/selection/operations/save/additionals.netedit
index 83a018943ec3..df712c7e5b7c 100644
--- a/tests/netedit/selection/operations/save/additionals.netedit
+++ b/tests/netedit/selection/operations/save/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 15:37:58 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:38:27 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -47,10 +47,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -63,6 +59,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>
diff --git a/tests/netedit/selection/viewoptions/automatic_junctions/additionals.netedit b/tests/netedit/selection/viewoptions/automatic_junctions/additionals.netedit
index 4b8d5583927b..600fe76b52f2 100644
--- a/tests/netedit/selection/viewoptions/automatic_junctions/additionals.netedit
+++ b/tests/netedit/selection/viewoptions/automatic_junctions/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-08-07 15:09:40 by Eclipse SUMO netedit Version v1_20_0+1549-9bd79766fae
+<!-- generated on 2024-12-20 18:37:32 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -33,10 +33,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -49,9 +45,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
-    <!-- Detectors -->
-    <laneAreaDetector id="e2_4" lanes="E4_1 E5_1" pos="5.80" endPos="4.80" period="300.00" file="e2_4.xml"/>
-    <laneAreaDetector id="e2_5" lanes="E8_1 E2_1" pos="5.80" endPos="4.80" period="300.00" file="e2_5.xml"/>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Other additionals -->
     <vaporizer id="-E10" begin="0.00" end="3600.00"/>
     <vaporizer id="-E11" begin="0.00" end="3600.00"/>
diff --git a/tests/netedit/selection/viewoptions/toggle_edges/additionals.netedit b/tests/netedit/selection/viewoptions/toggle_edges/additionals.netedit
index 1613cbd92ed9..ed66c4fae7cd 100644
--- a/tests/netedit/selection/viewoptions/toggle_edges/additionals.netedit
+++ b/tests/netedit/selection/viewoptions/toggle_edges/additionals.netedit
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-07-04 14:03:34 by Eclipse SUMO netedit Version v1_20_0+0930-542f1297b48
+<!-- generated on 2024-12-20 18:36:45 by Eclipse SUMO netedit Version v1_21_0+1592-32db52eb7dd
 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
@@ -44,10 +44,6 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <containerStop id="ct_1" lane="E11_0" startPos="5.80" endPos="15.80"/>
     <containerStop id="ct_2" lane="-E7_0" startPos="4.80" endPos="14.80"/>
     <containerStop id="ct_4" lane="-E6_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
-    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
-    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <parkingArea id="pa_0" lane="-E4_0">
         <space x="-26.00" y="10.00"/>
     </parkingArea>
@@ -60,6 +56,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <parkingArea id="pa_3" lane="-E5_0">
         <space x="-26.00" y="-18.00"/>
     </parkingArea>
+    <chargingStation id="cs_0" lane="E6_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_1" lane="-E10_0" startPos="5.80" endPos="15.80"/>
+    <chargingStation id="cs_2" lane="-E11_0" startPos="4.80" endPos="14.80"/>
+    <chargingStation id="cs_3" lane="E7_0" startPos="5.80" endPos="15.80"/>
     <!-- Detectors -->
     <inductionLoop id="e1_0" lane="E0_1" pos="2.80" period="300.00" file="e1_0.xml"/>
     <inductionLoop id="e1_1" lane="-E0_1" pos="19.80" period="300.00" file="e1_1.xml"/>