From f807130dc4a8b9f021613d88a0eb0831836ced13 Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Sun, 1 Dec 2024 21:11:53 +0100
Subject: [PATCH] patching expected results refs #21, #15822

---
 .../rail/interlocking/railsignalvehs.sumo     |  44 ++++----
 .../overlapping_driveways/railsignalvehs.sumo | 102 +++++++++---------
 .../constraints/bidi/railsignalvehs.sumo      |  38 +++----
 .../railsignalvehs.sumo                       |  34 +++---
 .../large_step_size/railsignalvehs.sumo       |  30 +++---
 .../protect_flank_option/railsignalvehs.sumo  |  42 ++++----
 .../parking_insertion/railsignalvehs.sumo     |  42 ++++----
 .../railsignalvehs.sumo                       |  14 +--
 .../update_driveways/railsignalvehs.sumo      |  46 ++++----
 .../bidiDepart_reversal/railsignalvehs.sumo   |  42 ++++----
 .../railsignalvehs.sumo                       |  46 ++++----
 .../double_reversal_dwEnd/railsignalvehs.sumo |  38 +++----
 .../railsignalvehs.sumo                       |  94 ++++++++--------
 .../subdriveway_reversal/railsignalvehs.sumo  |  74 ++++++-------
 .../two_double_reversals/railsignalvehs.sumo  |  54 +++++-----
 15 files changed, 370 insertions(+), 370 deletions(-)

diff --git a/tests/sumo/rail/interlocking/railsignalvehs.sumo b/tests/sumo/rail/interlocking/railsignalvehs.sumo
index dc59336c267..ba4a6627bb5 100644
--- a/tests/sumo/rail/interlocking/railsignalvehs.sumo
+++ b/tests/sumo/rail/interlocking/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:49 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -42,74 +42,74 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="gneJ1">
         <link linkIndex="0" from="gneE2_0" to=":gneJ1_0_0">
             <driveWay id="gneJ1.1">
-                <entry id="ICE0" time="16564.00" reason="1"/>
+                <entry id="ICE0" time="16564.00" reason="junction"/>
             </driveWay>
         </link>
         <link linkIndex="1" from="gneE0_0" to=":gneJ1_1_0">
             <driveWay id="gneJ1.0">
-                <entry id="RB1" time="16147.00" reason="1"/>
-                <exit id="RB1" time="16403.00" reason="1"/>
+                <entry id="RB1" time="16147.00" reason="junction"/>
+                <exit id="RB1" time="16403.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="gneJ2">
         <link linkIndex="0" from="-gneE3_0" to=":gneJ2_0_0">
             <driveWay id="gneJ2.1">
-                <entry id="ICE0" time="16365.00" reason="1"/>
-                <exit id="ICE0" time="16597.00" reason="1"/>
+                <entry id="ICE0" time="16365.00" reason="junction"/>
+                <exit id="ICE0" time="16597.00" reason="junction"/>
             </driveWay>
         </link>
         <link linkIndex="1" from="gneE1_0" to=":gneJ2_1_0">
             <driveWay id="gneJ2.0">
-                <entry id="RB1" time="16393.00" reason="1"/>
-                <exit id="RB1" time="16474.00" reason="1"/>
+                <entry id="RB1" time="16393.00" reason="junction"/>
+                <exit id="RB1" time="16474.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="gneJ3">
         <link linkIndex="0" from="-gneE4_0" to=":gneJ3_0_0">
             <driveWay id="gneJ3.1">
-                <entry id="ICE0" time="16313.00" reason="1"/>
-                <exit id="ICE0" time="16391.00" reason="1"/>
+                <entry id="ICE0" time="16313.00" reason="junction"/>
+                <exit id="ICE0" time="16391.00" reason="junction"/>
             </driveWay>
         </link>
         <link linkIndex="1" from="-gneE4_0" to=":gneJ3_1_0"/>
         <link linkIndex="2" from="-gneE7_0" to=":gneJ3_2_0">
             <driveWay id="gneJ3.2">
-                <entry id="RB2" time="16336.00" reason="1"/>
-                <exit id="RB2" time="16379.00" reason="9"/>
+                <entry id="RB2" time="16336.00" reason="junction"/>
+                <exit id="RB2" time="16379.00" reason="arrived"/>
             </driveWay>
         </link>
         <link linkIndex="3" from="gneE3_0" to=":gneJ3_3_0">
             <driveWay id="gneJ3.0">
-                <entry id="RB1" time="16472.00" reason="1"/>
-                <exit id="RB1" time="16516.00" reason="9"/>
+                <entry id="RB1" time="16472.00" reason="junction"/>
+                <exit id="RB1" time="16516.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
     <departJunction id="gneJ5">
         <driveWay id="gneJ5.d0">
-            <entry id="ICE0" time="16250.00" reason="0"/>
-            <exit id="ICE0" time="16327.00" reason="1"/>
+            <entry id="ICE0" time="16250.00" reason="departed"/>
+            <exit id="ICE0" time="16327.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="gneJ10">
         <driveWay id="gneJ10.d0">
-            <entry id="RB2" time="16250.00" reason="0"/>
-            <exit id="RB2" time="16340.00" reason="1"/>
+            <entry id="RB2" time="16250.00" reason="departed"/>
+            <exit id="RB2" time="16340.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="gneJ7">
         <driveWay id="gneJ7.d0">
-            <entry id="RB1" time="16000.00" reason="0"/>
-            <exit id="RB1" time="16150.00" reason="1"/>
+            <entry id="RB1" time="16000.00" reason="departed"/>
+            <exit id="RB1" time="16150.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/overlapping_driveways/railsignalvehs.sumo b/tests/sumo/rail/overlapping_driveways/railsignalvehs.sumo
index a8cae37d0c1..76693fc97a2 100644
--- a/tests/sumo/rail/overlapping_driveways/railsignalvehs.sumo
+++ b/tests/sumo/rail/overlapping_driveways/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:01:29 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-12-01 21:10:49 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -35,90 +35,90 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="J0">
         <link linkIndex="0" from="E6_0" to=":J0_0_0">
             <driveWay id="J0.0">
-                <entry id="v_0" time="20.00" reason="1"/>
-                <exit id="v_0" time="40.00" reason="1"/>
-                <entry id="v_1" time="48.00" reason="1"/>
-                <exit id="v_1" time="68.00" reason="1"/>
-                <entry id="v_2" time="76.00" reason="1"/>
-                <exit id="v_2" time="96.00" reason="1"/>
-                <entry id="v_3" time="104.00" reason="1"/>
-                <exit id="v_3" time="124.00" reason="1"/>
+                <entry id="v_0" time="20.00" reason="junction"/>
+                <exit id="v_0" time="40.00" reason="junction"/>
+                <entry id="v_1" time="48.00" reason="junction"/>
+                <exit id="v_1" time="68.00" reason="junction"/>
+                <entry id="v_2" time="76.00" reason="junction"/>
+                <exit id="v_2" time="96.00" reason="junction"/>
+                <entry id="v_3" time="104.00" reason="junction"/>
+                <exit id="v_3" time="124.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="J1">
         <link linkIndex="0" from="E0_0" to=":J1_0_0">
             <driveWay id="J1.0">
-                <entry id="v_0" time="35.00" reason="1"/>
-                <exit id="v_0" time="57.00" reason="1"/>
-                <entry id="v_2" time="91.00" reason="1"/>
-                <exit id="v_2" time="152.00" reason="1"/>
+                <entry id="v_0" time="35.00" reason="junction"/>
+                <exit id="v_0" time="57.00" reason="junction"/>
+                <entry id="v_2" time="91.00" reason="junction"/>
+                <exit id="v_2" time="152.00" reason="junction"/>
             </driveWay>
             <subDriveWay id="J1.0.0">
-                <entry id="v_0" time="35.00" reason="1"/>
-                <exit id="v_0" time="49.00" reason="1"/>
-                <entry id="v_1" time="63.00" reason="1"/>
-                <exit id="v_1" time="77.00" reason="1"/>
-                <entry id="v_2" time="91.00" reason="1"/>
-                <exit id="v_2" time="105.00" reason="1"/>
-                <entry id="v_3" time="119.00" reason="1"/>
-                <exit id="v_3" time="133.00" reason="1"/>
+                <entry id="v_0" time="35.00" reason="junction"/>
+                <exit id="v_0" time="49.00" reason="junction"/>
+                <entry id="v_1" time="63.00" reason="junction"/>
+                <exit id="v_1" time="77.00" reason="junction"/>
+                <entry id="v_2" time="91.00" reason="junction"/>
+                <exit id="v_2" time="105.00" reason="junction"/>
+                <entry id="v_3" time="119.00" reason="junction"/>
+                <exit id="v_3" time="133.00" reason="junction"/>
             </subDriveWay>
             <driveWay id="J1.1">
-                <entry id="v_1" time="63.00" reason="1"/>
-                <exit id="v_1" time="85.00" reason="1"/>
-                <entry id="v_3" time="119.00" reason="1"/>
-                <exit id="v_3" time="180.00" reason="1"/>
+                <entry id="v_1" time="63.00" reason="junction"/>
+                <exit id="v_1" time="85.00" reason="junction"/>
+                <entry id="v_3" time="119.00" reason="junction"/>
+                <exit id="v_3" time="180.00" reason="junction"/>
             </driveWay>
             <subDriveWay id="J1.1.0">
-                <entry id="v_0" time="35.00" reason="1"/>
-                <exit id="v_0" time="49.00" reason="1"/>
-                <entry id="v_1" time="63.00" reason="1"/>
-                <exit id="v_1" time="77.00" reason="1"/>
-                <entry id="v_2" time="91.00" reason="1"/>
-                <exit id="v_2" time="105.00" reason="1"/>
-                <entry id="v_3" time="119.00" reason="1"/>
-                <exit id="v_3" time="133.00" reason="1"/>
+                <entry id="v_0" time="35.00" reason="junction"/>
+                <exit id="v_0" time="49.00" reason="junction"/>
+                <entry id="v_1" time="63.00" reason="junction"/>
+                <exit id="v_1" time="77.00" reason="junction"/>
+                <entry id="v_2" time="91.00" reason="junction"/>
+                <exit id="v_2" time="105.00" reason="junction"/>
+                <entry id="v_3" time="119.00" reason="junction"/>
+                <exit id="v_3" time="133.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <railSignal id="J3">
         <link linkIndex="0" from="E2_0" to=":J3_0_0">
             <driveWay id="J3.0">
-                <entry id="v_0" time="53.00" reason="1"/>
-                <exit id="v_0" time="132.00" reason="9"/>
-                <entry id="v_2" time="135.00" reason="1"/>
-                <exit id="v_2" time="239.00" reason="9"/>
+                <entry id="v_0" time="53.00" reason="junction"/>
+                <exit id="v_0" time="132.00" reason="arrived"/>
+                <entry id="v_2" time="135.00" reason="junction"/>
+                <exit id="v_2" time="239.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="J5">
         <link linkIndex="0" from="E4_0" to=":J5_0_0">
             <driveWay id="J5.0">
-                <entry id="v_1" time="81.00" reason="1"/>
-                <exit id="v_1" time="160.00" reason="9"/>
-                <entry id="v_3" time="163.00" reason="1"/>
-                <exit id="v_3" time="267.00" reason="9"/>
+                <entry id="v_1" time="81.00" reason="junction"/>
+                <exit id="v_1" time="160.00" reason="arrived"/>
+                <entry id="v_3" time="163.00" reason="junction"/>
+                <exit id="v_3" time="267.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
     <departJunction id="J7">
         <driveWay id="J7.d0">
-            <entry id="v_0" time="0.00" reason="0"/>
-            <exit id="v_0" time="28.00" reason="1"/>
-            <entry id="v_1" time="28.00" reason="0"/>
-            <exit id="v_1" time="56.00" reason="1"/>
-            <entry id="v_2" time="56.00" reason="0"/>
-            <exit id="v_2" time="84.00" reason="1"/>
-            <entry id="v_3" time="84.00" reason="0"/>
-            <exit id="v_3" time="112.00" reason="1"/>
+            <entry id="v_0" time="0.00" reason="departed"/>
+            <exit id="v_0" time="28.00" reason="junction"/>
+            <entry id="v_1" time="28.00" reason="departed"/>
+            <exit id="v_1" time="56.00" reason="junction"/>
+            <entry id="v_2" time="56.00" reason="departed"/>
+            <exit id="v_2" time="84.00" reason="junction"/>
+            <entry id="v_3" time="84.00" reason="departed"/>
+            <exit id="v_3" time="112.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/rail_signal/constraints/bidi/railsignalvehs.sumo b/tests/sumo/rail/rail_signal/constraints/bidi/railsignalvehs.sumo
index ff40b597a1a..f64aff12334 100644
--- a/tests/sumo/rail/rail_signal/constraints/bidi/railsignalvehs.sumo
+++ b/tests/sumo/rail/rail_signal/constraints/bidi/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -37,7 +37,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
@@ -45,20 +45,20 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <link linkIndex="0" from="-b_0" to="-a_0"/>
         <link linkIndex="1" from="a_0" to="b_0">
             <driveWay id="A.0">
-                <entry id="t0" time="124.00" reason="1"/>
-                <exit id="t0" time="188.00" reason="1"/>
+                <entry id="t0" time="124.00" reason="junction"/>
+                <exit id="t0" time="188.00" reason="junction"/>
             </driveWay>
             <subDriveWay id="A.0.0">
-                <entry id="t0" time="124.00" reason="1"/>
-                <exit id="t0" time="185.00" reason="1"/>
+                <entry id="t0" time="124.00" reason="junction"/>
+                <exit id="t0" time="185.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <railSignal id="D">
         <link linkIndex="0" from="-b2_0" to="-a2_0">
             <driveWay id="D.0">
-                <entry id="t1" time="122.00" reason="1"/>
-                <exit id="t1" time="178.00" reason="9"/>
+                <entry id="t1" time="122.00" reason="junction"/>
+                <exit id="t1" time="178.00" reason="arrived"/>
             </driveWay>
         </link>
         <link linkIndex="1" from="a2_0" to="b2_0"/>
@@ -67,34 +67,34 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <link linkIndex="0" from="-f_0" to="-e_0"/>
         <link linkIndex="1" from="e_0" to="f_0">
             <driveWay id="J0.0">
-                <entry id="t0" time="185.00" reason="1"/>
-                <exit id="t0" time="240.00" reason="9"/>
+                <entry id="t0" time="185.00" reason="junction"/>
+                <exit id="t0" time="240.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="J1">
         <link linkIndex="0" from="-f2_0" to="-e2_0">
             <driveWay id="J1.0">
-                <entry id="t1" time="72.00" reason="1"/>
-                <exit id="t1" time="126.00" reason="1"/>
+                <entry id="t1" time="72.00" reason="junction"/>
+                <exit id="t1" time="126.00" reason="junction"/>
             </driveWay>
             <subDriveWay id="J1.0.0">
-                <entry id="t1" time="72.00" reason="1"/>
-                <exit id="t1" time="121.00" reason="1"/>
+                <entry id="t1" time="72.00" reason="junction"/>
+                <exit id="t1" time="121.00" reason="junction"/>
             </subDriveWay>
         </link>
         <link linkIndex="1" from="e2_0" to="f2_0"/>
     </railSignal>
     <departJunction id="J2">
         <driveWay id="J2.d0">
-            <entry id="t1" time="20.00" reason="0"/>
-            <exit id="t1" time="80.00" reason="1"/>
+            <entry id="t1" time="20.00" reason="departed"/>
+            <exit id="t1" time="80.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="gneJ1">
         <driveWay id="gneJ1.d0">
-            <entry id="t0" time="0.00" reason="0"/>
-            <exit id="t0" time="141.00" reason="1"/>
+            <entry id="t0" time="0.00" reason="departed"/>
+            <exit id="t0" time="141.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/rail_signal/indirect_guard_route_conflict/railsignalvehs.sumo b/tests/sumo/rail/rail_signal/indirect_guard_route_conflict/railsignalvehs.sumo
index 2fe5c2f222c..3857b41e9c3 100644
--- a/tests/sumo/rail/rail_signal/indirect_guard_route_conflict/railsignalvehs.sumo
+++ b/tests/sumo/rail/rail_signal/indirect_guard_route_conflict/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -36,19 +36,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="B.A">
         <link linkIndex="0" from="T12_0_0" to=":B.A_1_0">
             <driveWay id="B.A.0">
-                <entry id="rail2" time="133.00" reason="1"/>
-                <exit id="rail2" time="207.00" reason="1"/>
+                <entry id="rail2" time="133.00" reason="junction"/>
+                <exit id="rail2" time="207.00" reason="junction"/>
             </driveWay>
             <subDriveWay id="B.A.0.0">
-                <entry id="rail2" time="133.00" reason="1"/>
-                <exit id="rail2" time="168.00" reason="1"/>
+                <entry id="rail2" time="133.00" reason="junction"/>
+                <exit id="rail2" time="168.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
@@ -61,8 +61,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <railSignal id="B.N2">
         <link linkIndex="0" from="T15_0_0" to=":B.N2_1_0">
             <driveWay id="B.N2.0">
-                <entry id="rail2" time="202.00" reason="1"/>
-                <exit id="rail2" time="226.00" reason="9"/>
+                <entry id="rail2" time="202.00" reason="junction"/>
+                <exit id="rail2" time="226.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
@@ -72,25 +72,25 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <railSignal id="B.P2">
         <link linkIndex="0" from="T15_1_0" to=":B.P2_0_0">
             <driveWay id="B.P2.0">
-                <entry id="rail1" time="28.00" reason="1"/>
-                <exit id="rail1" time="105.00" reason="9"/>
+                <entry id="rail1" time="28.00" reason="junction"/>
+                <exit id="rail1" time="105.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="B.P2.0.0">
-                <entry id="rail1" time="28.00" reason="1"/>
-                <exit id="rail1" time="63.00" reason="1"/>
+                <entry id="rail1" time="28.00" reason="junction"/>
+                <exit id="rail1" time="63.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <departJunction id="A">
         <driveWay id="A.d0">
-            <entry id="rail2" time="105.00" reason="0"/>
-            <exit id="rail2" time="148.00" reason="1"/>
+            <entry id="rail2" time="105.00" reason="departed"/>
+            <exit id="rail2" time="148.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="B.N2">
         <driveWay id="B.N2.d0">
-            <entry id="rail1" time="0.00" reason="0"/>
-            <exit id="rail1" time="43.00" reason="1"/>
+            <entry id="rail1" time="0.00" reason="departed"/>
+            <exit id="rail1" time="43.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/rail_signal/large_step_size/railsignalvehs.sumo b/tests/sumo/rail/rail_signal/large_step_size/railsignalvehs.sumo
index 592c236fffc..fc78dd879aa 100644
--- a/tests/sumo/rail/rail_signal/large_step_size/railsignalvehs.sumo
+++ b/tests/sumo/rail/rail_signal/large_step_size/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:01:29 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -42,7 +42,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
@@ -54,29 +54,29 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <railSignal id="gneJ3">
         <link linkIndex="0" from="gneE2_0" to=":gneJ3_0_0">
             <driveWay id="gneJ3.0">
-                <entry id="rail1" time="39.00" reason="1"/>
-                <exit id="rail1" time="96.00" reason="1"/>
-                <entry id="rail2" time="99.00" reason="1"/>
-                <exit id="rail2" time="123.00" reason="1"/>
+                <entry id="rail1" time="39.00" reason="junction"/>
+                <exit id="rail1" time="96.00" reason="junction"/>
+                <entry id="rail2" time="99.00" reason="junction"/>
+                <exit id="rail2" time="123.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="gneJ5">
         <link linkIndex="0" from="gneE4_0" to=":gneJ5_0_0">
             <driveWay id="gneJ5.0">
-                <entry id="rail1" time="93.00" reason="1"/>
-                <exit id="rail1" time="120.00" reason="9"/>
-                <entry id="rail2" time="123.00" reason="1"/>
-                <exit id="rail2" time="132.00" reason="9"/>
+                <entry id="rail1" time="93.00" reason="junction"/>
+                <exit id="rail1" time="120.00" reason="arrived"/>
+                <entry id="rail2" time="123.00" reason="junction"/>
+                <exit id="rail2" time="132.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
     <departJunction id="gneJ1">
         <driveWay id="gneJ1.d0">
-            <entry id="rail1" time="0.00" reason="0"/>
-            <exit id="rail1" time="42.00" reason="1"/>
-            <entry id="rail2" time="42.00" reason="0"/>
-            <exit id="rail2" time="99.00" reason="1"/>
+            <entry id="rail1" time="0.00" reason="departed"/>
+            <exit id="rail1" time="42.00" reason="junction"/>
+            <entry id="rail2" time="42.00" reason="departed"/>
+            <exit id="rail2" time="99.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/rail_signal/moving_block/protect_flank_option/railsignalvehs.sumo b/tests/sumo/rail/rail_signal/moving_block/protect_flank_option/railsignalvehs.sumo
index 2148c465516..c05c7f9cb9a 100644
--- a/tests/sumo/rail/rail_signal/moving_block/protect_flank_option/railsignalvehs.sumo
+++ b/tests/sumo/rail/rail_signal/moving_block/protect_flank_option/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -37,50 +37,50 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="gneJ6">
         <link linkIndex="0" from="-a_0" to=":gneJ6_0_0">
             <driveWay id="gneJ6.0">
-                <entry id="EW" time="35.00" reason="1"/>
-                <exit id="EW" time="89.00" reason="9"/>
+                <entry id="EW" time="35.00" reason="junction"/>
+                <exit id="EW" time="89.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="gneJ6.0.0">
-                <entry id="EW" time="35.00" reason="1"/>
-                <exit id="EW" time="49.00" reason="1"/>
+                <entry id="EW" time="35.00" reason="junction"/>
+                <exit id="EW" time="49.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <railSignal id="gneJ8">
         <link linkIndex="0" from="a_0" to=":gneJ8_0_0">
             <driveWay id="gneJ8.0">
-                <entry id="WE0" time="56.00" reason="1"/>
-                <entry id="WE1" time="68.00" reason="1"/>
-                <exit id="WE0" time="181.00" reason="9"/>
-                <exit id="WE1" time="191.00" reason="9"/>
+                <entry id="WE0" time="56.00" reason="junction"/>
+                <entry id="WE1" time="68.00" reason="junction"/>
+                <exit id="WE0" time="181.00" reason="arrived"/>
+                <exit id="WE1" time="191.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="gneJ8.0.0">
-                <entry id="WE0" time="56.00" reason="1"/>
-                <entry id="WE1" time="68.00" reason="1"/>
-                <exit id="WE0" time="71.00" reason="1"/>
-                <exit id="WE1" time="83.00" reason="1"/>
+                <entry id="WE0" time="56.00" reason="junction"/>
+                <entry id="WE1" time="68.00" reason="junction"/>
+                <exit id="WE0" time="71.00" reason="junction"/>
+                <exit id="WE1" time="83.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <departJunction id="gneJ7">
         <driveWay id="gneJ7.d0">
-            <entry id="EW" time="0.00" reason="0"/>
-            <exit id="EW" time="40.00" reason="1"/>
+            <entry id="EW" time="0.00" reason="departed"/>
+            <exit id="EW" time="40.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="gneJ0">
         <driveWay id="gneJ0.d0">
-            <entry id="WE0" time="1.00" reason="0"/>
-            <entry id="WE1" time="22.00" reason="0"/>
-            <exit id="WE0" time="66.00" reason="1"/>
-            <exit id="WE1" time="78.00" reason="1"/>
+            <entry id="WE0" time="1.00" reason="departed"/>
+            <entry id="WE1" time="22.00" reason="departed"/>
+            <exit id="WE0" time="66.00" reason="junction"/>
+            <exit id="WE1" time="78.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/rail_signal/parking_insertion/railsignalvehs.sumo b/tests/sumo/rail/rail_signal/parking_insertion/railsignalvehs.sumo
index f551f4c23a8..ef5f5a60640 100644
--- a/tests/sumo/rail/rail_signal/parking_insertion/railsignalvehs.sumo
+++ b/tests/sumo/rail/rail_signal/parking_insertion/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -37,60 +37,60 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="B">
         <link linkIndex="0" from="-d.100_0" to=":B_0_0">
             <driveWay id="B.1">
-                <entry id="oncoming" time="112.00" reason="1"/>
-                <exit id="oncoming" time="129.00" reason="9"/>
+                <entry id="oncoming" time="112.00" reason="junction"/>
+                <exit id="oncoming" time="129.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="B.1.0">
-                <entry id="oncoming" time="112.00" reason="1"/>
-                <exit id="oncoming" time="125.00" reason="1"/>
+                <entry id="oncoming" time="112.00" reason="junction"/>
+                <exit id="oncoming" time="125.00" reason="junction"/>
             </subDriveWay>
         </link>
         <link linkIndex="1" from="c_0" to=":B_1_0">
             <driveWay id="B.0">
-                <entry id="ego" time="57.00" reason="1"/>
-                <exit id="ego" time="95.00" reason="9"/>
+                <entry id="ego" time="57.00" reason="junction"/>
+                <exit id="ego" time="95.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="B.0.0">
-                <entry id="ego" time="57.00" reason="1"/>
-                <exit id="ego" time="72.00" reason="1"/>
+                <entry id="ego" time="57.00" reason="junction"/>
+                <exit id="ego" time="72.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <railSignal id="gneJ3">
         <link linkIndex="0" from="-e_0" to=":gneJ3_0_0">
             <driveWay id="gneJ3.0">
-                <entry id="oncoming" time="75.00" reason="1"/>
-                <exit id="oncoming" time="117.00" reason="1"/>
+                <entry id="oncoming" time="75.00" reason="junction"/>
+                <exit id="oncoming" time="117.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="gneJ8">
         <link linkIndex="0" from="b_0" to=":gneJ8_1_0">
             <driveWay id="gneJ8.0">
-                <entry id="ego" time="39.00" reason="1"/>
-                <exit id="ego" time="63.00" reason="1"/>
+                <entry id="ego" time="39.00" reason="junction"/>
+                <exit id="ego" time="63.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <departJunction id="J0">
         <driveWay id="J0.d0">
-            <entry id="oncoming" time="13.00" reason="0"/>
-            <exit id="oncoming" time="92.00" reason="1"/>
+            <entry id="oncoming" time="13.00" reason="departed"/>
+            <exit id="oncoming" time="92.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="A">
         <driveWay id="A.d0">
-            <entry id="ego" time="0.00" reason="0"/>
-            <exit id="ego" time="17.00" reason="7"/>
-            <entry id="ego" time="26.00" reason="7"/>
-            <exit id="ego" time="50.00" reason="1"/>
+            <entry id="ego" time="0.00" reason="departed"/>
+            <exit id="ego" time="17.00" reason="parking"/>
+            <entry id="ego" time="26.00" reason="parking"/>
+            <exit id="ego" time="50.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/rail_signal/reversal_before_signal/railsignalvehs.sumo b/tests/sumo/rail/rail_signal/reversal_before_signal/railsignalvehs.sumo
index 8c1240a18c6..f2470d82db0 100644
--- a/tests/sumo/rail/rail_signal/reversal_before_signal/railsignalvehs.sumo
+++ b/tests/sumo/rail/rail_signal/reversal_before_signal/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -36,15 +36,15 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="B">
         <link linkIndex="0" from="-b_0" to=":B_0_0">
             <driveWay id="B.1">
-                <entry id="t0" time="36.00" reason="1"/>
-                <exit id="t0" time="80.00" reason="5"/>
+                <entry id="t0" time="36.00" reason="junction"/>
+                <exit id="t0" time="80.00" reason="teleport"/>
             </driveWay>
         </link>
         <link linkIndex="1" from="a_0" to=":B_1_0">
@@ -65,8 +65,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </departJunction>
     <departJunction id="B">
         <driveWay id="B.d0">
-            <entry id="t0" time="0.00" reason="0"/>
-            <exit id="t0" time="18.00" reason="5"/>
+            <entry id="t0" time="0.00" reason="departed"/>
+            <exit id="t0" time="18.00" reason="teleport"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/rail_signal/update_driveways/railsignalvehs.sumo b/tests/sumo/rail/rail_signal/update_driveways/railsignalvehs.sumo
index a672faeeb3e..5c4f8919dd6 100644
--- a/tests/sumo/rail/rail_signal/update_driveways/railsignalvehs.sumo
+++ b/tests/sumo/rail/rail_signal/update_driveways/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -36,54 +36,54 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="J1">
         <link linkIndex="0" from="E0_0" to=":J1_1_0">
             <driveWay id="J1.0">
-                <entry id="v0" time="20.00" reason="1"/>
-                <exit id="v0" time="40.00" reason="1"/>
-                <entry id="v1" time="1020.00" reason="1"/>
-                <exit id="v1" time="1040.00" reason="1"/>
+                <entry id="v0" time="20.00" reason="junction"/>
+                <exit id="v0" time="40.00" reason="junction"/>
+                <entry id="v1" time="1020.00" reason="junction"/>
+                <exit id="v1" time="1040.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="J2">
         <link linkIndex="0" from="E1_0" to=":J2_1_0">
             <driveWay id="J2.0">
-                <entry id="v0" time="35.00" reason="1"/>
-                <exit id="v0" time="53.00" reason="9"/>
-                <entry id="v1" time="1035.00" reason="1"/>
-                <exit id="v1" time="1053.00" reason="9"/>
+                <entry id="v0" time="35.00" reason="junction"/>
+                <exit id="v0" time="53.00" reason="arrived"/>
+                <entry id="v1" time="1035.00" reason="junction"/>
+                <exit id="v1" time="1053.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="J2.0.0">
-                <entry id="v1" time="1035.00" reason="1"/>
-                <exit id="v1" time="1049.00" reason="1"/>
+                <entry id="v1" time="1035.00" reason="junction"/>
+                <exit id="v1" time="1049.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <departJunction id="J5">
         <driveWay id="J5.d0">
-            <entry id="v2" time="1049.00" reason="0"/>
-            <exit id="v2" time="1103.00" reason="9"/>
+            <entry id="v2" time="1049.00" reason="departed"/>
+            <exit id="v2" time="1103.00" reason="arrived"/>
         </driveWay>
         <subDriveWay id="J5.d0.0">
-            <entry id="v2" time="1049.00" reason="0"/>
-            <exit id="v2" time="1099.00" reason="1"/>
+            <entry id="v2" time="1049.00" reason="departed"/>
+            <exit id="v2" time="1099.00" reason="junction"/>
         </subDriveWay>
         <subDriveWay id="J5.d0.1">
-            <entry id="v2" time="1049.00" reason="0"/>
-            <exit id="v2" time="1090.00" reason="1"/>
+            <entry id="v2" time="1049.00" reason="departed"/>
+            <exit id="v2" time="1090.00" reason="junction"/>
         </subDriveWay>
     </departJunction>
     <departJunction id="J0">
         <driveWay id="J0.d0">
-            <entry id="v0" time="0.00" reason="0"/>
-            <exit id="v0" time="28.00" reason="1"/>
-            <entry id="v1" time="1000.00" reason="0"/>
-            <exit id="v1" time="1028.00" reason="1"/>
+            <entry id="v0" time="0.00" reason="departed"/>
+            <exit id="v0" time="28.00" reason="junction"/>
+            <entry id="v1" time="1000.00" reason="departed"/>
+            <exit id="v1" time="1028.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo b/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo
index 7329722a547..c6673bf9562 100644
--- a/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo
+++ b/tests/sumo/rail/reversal/bidiDepart_reversal/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -38,23 +38,23 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="J1">
         <link linkIndex="0" from="E0_0" to=":J1_1_0">
             <driveWay id="J1.0">
-                <entry id="v1" time="111.00" reason="1"/>
-                <exit id="v1" time="159.00" reason="1"/>
+                <entry id="v1" time="111.00" reason="junction"/>
+                <exit id="v1" time="159.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="J3">
         <link linkIndex="0" from="E2_0" to=":J3_2_0">
             <driveWay id="J3.0">
-                <entry id="v1" time="142.00" reason="1"/>
-                <exit id="v1" time="174.00" reason="1"/>
+                <entry id="v1" time="142.00" reason="junction"/>
+                <exit id="v1" time="174.00" reason="junction"/>
             </driveWay>
             <driveWay id="J3.1"/>
         </link>
@@ -62,33 +62,33 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <railSignal id="J4">
         <link linkIndex="0" from="E3_0" to=":J4_0_0">
             <driveWay id="J4.0">
-                <entry id="v0" time="30.00" reason="1"/>
-                <exit id="v0" time="45.00" reason="9"/>
-                <entry id="v2" time="131.00" reason="1"/>
-                <exit id="v2" time="146.00" reason="9"/>
-                <entry id="v1" time="167.00" reason="1"/>
-                <exit id="v1" time="179.00" reason="9"/>
+                <entry id="v0" time="30.00" reason="junction"/>
+                <exit id="v0" time="45.00" reason="arrived"/>
+                <entry id="v2" time="131.00" reason="junction"/>
+                <exit id="v2" time="146.00" reason="arrived"/>
+                <entry id="v1" time="167.00" reason="junction"/>
+                <exit id="v1" time="179.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
     <departJunction id="J4">
         <driveWay id="J4.d0">
-            <entry id="v0" time="0.00" reason="0"/>
-            <exit id="v0" time="38.00" reason="1"/>
-            <entry id="v2" time="110.00" reason="1"/>
-            <exit id="v2" time="139.00" reason="1"/>
+            <entry id="v0" time="0.00" reason="departed"/>
+            <exit id="v0" time="38.00" reason="junction"/>
+            <entry id="v2" time="110.00" reason="junction"/>
+            <exit id="v2" time="139.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="J0">
         <driveWay id="J0.d0">
-            <entry id="v1" time="100.00" reason="0"/>
-            <exit id="v1" time="115.00" reason="1"/>
+            <entry id="v1" time="100.00" reason="departed"/>
+            <exit id="v1" time="115.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="J3">
         <driveWay id="J3.d0">
-            <entry id="v2" time="109.00" reason="0"/>
-            <exit id="v2" time="139.00" reason="1"/>
+            <entry id="v2" time="109.00" reason="departed"/>
+            <exit id="v2" time="139.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/reversal/consecutive_before_reversal/railsignalvehs.sumo b/tests/sumo/rail/reversal/consecutive_before_reversal/railsignalvehs.sumo
index 6db333a7c49..2956b5919d6 100644
--- a/tests/sumo/rail/reversal/consecutive_before_reversal/railsignalvehs.sumo
+++ b/tests/sumo/rail/reversal/consecutive_before_reversal/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:01:29 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -36,52 +36,52 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="A">
         <link linkIndex="0" from="a_0" to=":A_1_0">
             <driveWay id="A.0">
-                <entry id="t0" time="20.00" reason="1"/>
-                <exit id="t0" time="40.00" reason="1"/>
-                <entry id="t1" time="48.00" reason="1"/>
-                <exit id="t1" time="123.00" reason="1"/>
+                <entry id="t0" time="20.00" reason="junction"/>
+                <exit id="t0" time="40.00" reason="junction"/>
+                <entry id="t1" time="48.00" reason="junction"/>
+                <exit id="t1" time="123.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="B">
         <link linkIndex="0" from="b_0" to=":B_1_0">
             <driveWay id="B.0">
-                <entry id="t0" time="35.00" reason="1"/>
-                <exit id="t0" time="71.00" reason="1"/>
-                <entry id="t1" time="106.00" reason="1"/>
-                <exit id="t1" time="157.00" reason="1"/>
+                <entry id="t0" time="35.00" reason="junction"/>
+                <exit id="t0" time="71.00" reason="junction"/>
+                <entry id="t1" time="106.00" reason="junction"/>
+                <exit id="t1" time="157.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="D">
         <link linkIndex="0" from="d_0" to=":D_1_0">
             <driveWay id="D.0">
-                <entry id="t0" time="66.00" reason="1"/>
-                <exit id="t0" time="131.00" reason="9"/>
-                <entry id="t1" time="152.00" reason="1"/>
-                <exit id="t1" time="217.00" reason="9"/>
+                <entry id="t0" time="66.00" reason="junction"/>
+                <exit id="t0" time="131.00" reason="arrived"/>
+                <entry id="t1" time="152.00" reason="junction"/>
+                <exit id="t1" time="217.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="D.0.0">
-                <entry id="t0" time="66.00" reason="1"/>
-                <exit id="t0" time="103.00" reason="1"/>
-                <entry id="t1" time="152.00" reason="1"/>
-                <exit id="t1" time="189.00" reason="1"/>
+                <entry id="t0" time="66.00" reason="junction"/>
+                <exit id="t0" time="103.00" reason="junction"/>
+                <entry id="t1" time="152.00" reason="junction"/>
+                <exit id="t1" time="189.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <departJunction id="J0">
         <driveWay id="J0.d0">
-            <entry id="t0" time="0.00" reason="0"/>
-            <exit id="t0" time="28.00" reason="1"/>
-            <entry id="t1" time="28.00" reason="0"/>
-            <exit id="t1" time="56.00" reason="1"/>
+            <entry id="t0" time="0.00" reason="departed"/>
+            <exit id="t0" time="28.00" reason="junction"/>
+            <entry id="t1" time="28.00" reason="departed"/>
+            <exit id="t1" time="56.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/reversal/double_reversal_dwEnd/railsignalvehs.sumo b/tests/sumo/rail/reversal/double_reversal_dwEnd/railsignalvehs.sumo
index 5c223bc6557..91d91088871 100644
--- a/tests/sumo/rail/reversal/double_reversal_dwEnd/railsignalvehs.sumo
+++ b/tests/sumo/rail/reversal/double_reversal_dwEnd/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:01:29 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -38,7 +38,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
@@ -46,10 +46,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <link linkIndex="0" from="-E1_0" to=":J1_0_0"/>
         <link linkIndex="1" from="E0_0" to=":J1_1_0">
             <driveWay id="J1.0">
-                <entry id="v0" time="20.00" reason="1"/>
-                <exit id="v0" time="49.00" reason="1"/>
-                <entry id="v1" time="51.00" reason="1"/>
-                <exit id="v1" time="329.00" reason="1"/>
+                <entry id="v0" time="20.00" reason="junction"/>
+                <exit id="v0" time="49.00" reason="junction"/>
+                <entry id="v1" time="51.00" reason="junction"/>
+                <exit id="v1" time="329.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
@@ -57,10 +57,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <link linkIndex="0" from="-E3_0" to=":J3_0_0"/>
         <link linkIndex="1" from="E2_0" to=":J3_2_0">
             <driveWay id="J3.0">
-                <entry id="v0" time="45.00" reason="1"/>
-                <exit id="v0" time="309.00" reason="1"/>
-                <entry id="v1" time="312.00" reason="1"/>
-                <exit id="v1" time="362.00" reason="1"/>
+                <entry id="v0" time="45.00" reason="junction"/>
+                <exit id="v0" time="309.00" reason="junction"/>
+                <entry id="v1" time="312.00" reason="junction"/>
+                <exit id="v1" time="362.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
@@ -68,19 +68,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <link linkIndex="0" from="-E4_0" to=":J4_0_0"/>
         <link linkIndex="1" from="E3_0" to=":J4_1_0">
             <driveWay id="J4.0">
-                <entry id="v0" time="301.00" reason="1"/>
-                <exit id="v0" time="316.00" reason="9"/>
-                <entry id="v1" time="353.00" reason="1"/>
-                <exit id="v1" time="369.00" reason="9"/>
+                <entry id="v0" time="301.00" reason="junction"/>
+                <exit id="v0" time="316.00" reason="arrived"/>
+                <entry id="v1" time="353.00" reason="junction"/>
+                <exit id="v1" time="369.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
     <departJunction id="J0">
         <driveWay id="J0.d0">
-            <entry id="v0" time="0.00" reason="0"/>
-            <exit id="v0" time="28.00" reason="1"/>
-            <entry id="v1" time="28.00" reason="0"/>
-            <exit id="v1" time="67.00" reason="1"/>
+            <entry id="v0" time="0.00" reason="departed"/>
+            <exit id="v0" time="28.00" reason="junction"/>
+            <entry id="v1" time="28.00" reason="departed"/>
+            <exit id="v1" time="67.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/reversal/reversal_after_common_block/railsignalvehs.sumo b/tests/sumo/rail/reversal/reversal_after_common_block/railsignalvehs.sumo
index 3e6c094356f..01cbfe92939 100644
--- a/tests/sumo/rail/reversal/reversal_after_common_block/railsignalvehs.sumo
+++ b/tests/sumo/rail/reversal/reversal_after_common_block/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 14:27:09 by Eclipse SUMO sumo Version v1_20_0+0696-f5985653822
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -36,99 +36,99 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="A">
         <link linkIndex="0" from="a_0" to=":A_1_0">
             <driveWay id="A.0">
-                <entry id="t0" time="4.00" reason="1"/>
-                <exit id="t0" time="22.00" reason="1"/>
+                <entry id="t0" time="4.00" reason="junction"/>
+                <exit id="t0" time="22.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="A2">
         <link linkIndex="0" from="a2_0" to=":A2_1_0">
             <driveWay id="A2.0">
-                <entry id="t1" time="139.00" reason="1"/>
-                <exit id="t1" time="184.00" reason="1"/>
+                <entry id="t1" time="139.00" reason="junction"/>
+                <exit id="t1" time="184.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="C">
         <link linkIndex="0" from="c_0" to=":C_2_0">
             <driveWay id="C.0">
-                <entry id="t0" time="18.00" reason="1"/>
-                <exit id="t0" time="37.00" reason="1"/>
+                <entry id="t0" time="18.00" reason="junction"/>
+                <exit id="t0" time="37.00" reason="junction"/>
             </driveWay>
             <driveWay id="C.1">
-                <entry id="t1" time="180.00" reason="1"/>
-                <exit id="t1" time="199.00" reason="1"/>
+                <entry id="t1" time="180.00" reason="junction"/>
+                <exit id="t1" time="199.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
     <railSignal id="E">
         <link linkIndex="0" from="e_0" to=":E_2_0">
             <driveWay id="E.0">
-                <entry id="t0" time="33.00" reason="1"/>
-                <exit id="t0" time="93.00" reason="1"/>
+                <entry id="t0" time="33.00" reason="junction"/>
+                <exit id="t0" time="93.00" reason="junction"/>
             </driveWay>
             <subDriveWay id="E.0.0">
-                <entry id="t0" time="33.00" reason="1"/>
-                <exit id="t0" time="51.00" reason="1"/>
-                <entry id="t1" time="196.00" reason="1"/>
-                <exit id="t1" time="214.00" reason="1"/>
+                <entry id="t0" time="33.00" reason="junction"/>
+                <exit id="t0" time="51.00" reason="junction"/>
+                <entry id="t1" time="196.00" reason="junction"/>
+                <exit id="t1" time="214.00" reason="junction"/>
             </subDriveWay>
             <driveWay id="E.1">
-                <entry id="t1" time="196.00" reason="1"/>
-                <exit id="t1" time="256.00" reason="1"/>
+                <entry id="t1" time="196.00" reason="junction"/>
+                <exit id="t1" time="256.00" reason="junction"/>
             </driveWay>
             <subDriveWay id="E.1.0">
-                <entry id="t0" time="33.00" reason="1"/>
-                <exit id="t0" time="51.00" reason="1"/>
-                <entry id="t1" time="196.00" reason="1"/>
-                <exit id="t1" time="214.00" reason="1"/>
+                <entry id="t0" time="33.00" reason="junction"/>
+                <exit id="t0" time="51.00" reason="junction"/>
+                <entry id="t1" time="196.00" reason="junction"/>
+                <exit id="t1" time="214.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <railSignal id="G">
         <link linkIndex="0" from="-h_0" to=":G_0_0">
             <driveWay id="G.0">
-                <entry id="t0" time="85.00" reason="1"/>
-                <exit id="t0" time="147.00" reason="9"/>
+                <entry id="t0" time="85.00" reason="junction"/>
+                <exit id="t0" time="147.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="G.0.0">
-                <entry id="t0" time="85.00" reason="1"/>
-                <exit id="t0" time="143.00" reason="1"/>
+                <entry id="t0" time="85.00" reason="junction"/>
+                <exit id="t0" time="143.00" reason="junction"/>
             </subDriveWay>
             <subDriveWay id="G.0.1">
-                <entry id="t0" time="85.00" reason="1"/>
-                <exit id="t0" time="129.00" reason="1"/>
+                <entry id="t0" time="85.00" reason="junction"/>
+                <exit id="t0" time="129.00" reason="junction"/>
             </subDriveWay>
             <subDriveWay id="G.0.2">
-                <entry id="t0" time="85.00" reason="1"/>
-                <exit id="t0" time="114.00" reason="1"/>
+                <entry id="t0" time="85.00" reason="junction"/>
+                <exit id="t0" time="114.00" reason="junction"/>
             </subDriveWay>
             <subDriveWay id="G.0.3">
-                <entry id="t0" time="85.00" reason="1"/>
-                <exit id="t0" time="136.00" reason="1"/>
+                <entry id="t0" time="85.00" reason="junction"/>
+                <exit id="t0" time="136.00" reason="junction"/>
             </subDriveWay>
             <subDriveWay id="G.0.4">
-                <entry id="t0" time="85.00" reason="1"/>
-                <exit id="t0" time="105.00" reason="1"/>
-                <entry id="t1" time="248.00" reason="1"/>
-                <exit id="t1" time="268.00" reason="1"/>
+                <entry id="t0" time="85.00" reason="junction"/>
+                <exit id="t0" time="105.00" reason="junction"/>
+                <entry id="t1" time="248.00" reason="junction"/>
+                <exit id="t1" time="268.00" reason="junction"/>
             </subDriveWay>
             <driveWay id="G.1">
-                <entry id="t1" time="248.00" reason="1"/>
-                <exit id="t1" time="276.00" reason="9"/>
+                <entry id="t1" time="248.00" reason="junction"/>
+                <exit id="t1" time="276.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="G.1.0">
-                <entry id="t0" time="85.00" reason="1"/>
-                <exit id="t0" time="105.00" reason="1"/>
-                <entry id="t1" time="248.00" reason="1"/>
-                <exit id="t1" time="268.00" reason="1"/>
+                <entry id="t0" time="85.00" reason="junction"/>
+                <exit id="t0" time="105.00" reason="junction"/>
+                <entry id="t1" time="248.00" reason="junction"/>
+                <exit id="t1" time="268.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
@@ -137,14 +137,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </railSignal>
     <departJunction id="J0">
         <driveWay id="J0.d0">
-            <entry id="t0" time="0.00" reason="0"/>
-            <exit id="t0" time="8.00" reason="1"/>
+            <entry id="t0" time="0.00" reason="departed"/>
+            <exit id="t0" time="8.00" reason="junction"/>
         </driveWay>
     </departJunction>
     <departJunction id="J1">
         <driveWay id="J1.d0">
-            <entry id="t1" time="20.00" reason="0"/>
-            <exit id="t1" time="156.00" reason="1"/>
+            <entry id="t1" time="20.00" reason="departed"/>
+            <exit id="t1" time="156.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/reversal/subdriveway_reversal/railsignalvehs.sumo b/tests/sumo/rail/reversal/subdriveway_reversal/railsignalvehs.sumo
index f47346c382d..4b47accee46 100644
--- a/tests/sumo/rail/reversal/subdriveway_reversal/railsignalvehs.sumo
+++ b/tests/sumo/rail/reversal/subdriveway_reversal/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:01:29 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -36,70 +36,70 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="A">
         <link linkIndex="0" from="a_0" to=":A_1_0">
             <driveWay id="A.0">
-                <entry id="t0" time="20.00" reason="1"/>
-                <exit id="t0" time="75.00" reason="9"/>
+                <entry id="t0" time="20.00" reason="junction"/>
+                <exit id="t0" time="75.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="A.0.0">
-                <entry id="t0" time="20.00" reason="1"/>
-                <exit id="t0" time="64.00" reason="1"/>
+                <entry id="t0" time="20.00" reason="junction"/>
+                <exit id="t0" time="64.00" reason="junction"/>
             </subDriveWay>
             <subDriveWay id="A.0.1">
-                <entry id="t0" time="20.00" reason="1"/>
-                <exit id="t0" time="57.00" reason="1"/>
-                <entry id="t1" time="67.00" reason="1"/>
-                <exit id="t1" time="119.00" reason="1"/>
-                <entry id="t2" time="162.00" reason="1"/>
-                <exit id="t2" time="214.00" reason="1"/>
+                <entry id="t0" time="20.00" reason="junction"/>
+                <exit id="t0" time="57.00" reason="junction"/>
+                <entry id="t1" time="67.00" reason="junction"/>
+                <exit id="t1" time="119.00" reason="junction"/>
+                <entry id="t2" time="162.00" reason="junction"/>
+                <exit id="t2" time="214.00" reason="junction"/>
             </subDriveWay>
             <driveWay id="A.1">
-                <entry id="t1" time="67.00" reason="1"/>
-                <exit id="t1" time="145.00" reason="1"/>
-                <entry id="t2" time="162.00" reason="1"/>
-                <exit id="t2" time="240.00" reason="1"/>
+                <entry id="t1" time="67.00" reason="junction"/>
+                <exit id="t1" time="145.00" reason="junction"/>
+                <entry id="t2" time="162.00" reason="junction"/>
+                <exit id="t2" time="240.00" reason="junction"/>
             </driveWay>
             <subDriveWay id="A.1.0">
-                <entry id="t0" time="20.00" reason="1"/>
-                <exit id="t0" time="57.00" reason="1"/>
-                <entry id="t1" time="67.00" reason="1"/>
-                <exit id="t1" time="119.00" reason="1"/>
-                <entry id="t2" time="162.00" reason="1"/>
-                <exit id="t2" time="214.00" reason="1"/>
+                <entry id="t0" time="20.00" reason="junction"/>
+                <exit id="t0" time="57.00" reason="junction"/>
+                <entry id="t1" time="67.00" reason="junction"/>
+                <exit id="t1" time="119.00" reason="junction"/>
+                <entry id="t2" time="162.00" reason="junction"/>
+                <exit id="t2" time="214.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <railSignal id="D">
         <link linkIndex="0" from="-e_0" to=":D_0_0">
             <driveWay id="D.0">
-                <entry id="t1" time="131.00" reason="1"/>
-                <exit id="t1" time="194.00" reason="9"/>
-                <entry id="t2" time="226.00" reason="1"/>
-                <exit id="t2" time="289.00" reason="9"/>
+                <entry id="t1" time="131.00" reason="junction"/>
+                <exit id="t1" time="194.00" reason="arrived"/>
+                <entry id="t2" time="226.00" reason="junction"/>
+                <exit id="t2" time="289.00" reason="arrived"/>
             </driveWay>
             <subDriveWay id="D.0.0">
-                <entry id="t1" time="131.00" reason="1"/>
-                <exit id="t1" time="159.00" reason="1"/>
-                <entry id="t2" time="226.00" reason="1"/>
-                <exit id="t2" time="254.00" reason="1"/>
+                <entry id="t1" time="131.00" reason="junction"/>
+                <exit id="t1" time="159.00" reason="junction"/>
+                <entry id="t2" time="226.00" reason="junction"/>
+                <exit id="t2" time="254.00" reason="junction"/>
             </subDriveWay>
         </link>
     </railSignal>
     <departJunction id="J0">
         <driveWay id="J0.d0">
-            <entry id="t0" time="0.00" reason="0"/>
-            <exit id="t0" time="28.00" reason="1"/>
+            <entry id="t0" time="0.00" reason="departed"/>
+            <exit id="t0" time="28.00" reason="junction"/>
         </driveWay>
         <driveWay id="J0.d1">
-            <entry id="t1" time="28.00" reason="0"/>
-            <exit id="t1" time="84.00" reason="1"/>
-            <entry id="t2" time="84.00" reason="0"/>
-            <exit id="t2" time="179.00" reason="1"/>
+            <entry id="t1" time="28.00" reason="departed"/>
+            <exit id="t1" time="84.00" reason="junction"/>
+            <entry id="t2" time="84.00" reason="departed"/>
+            <exit id="t2" time="179.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>
diff --git a/tests/sumo/rail/reversal/two_double_reversals/railsignalvehs.sumo b/tests/sumo/rail/reversal/two_double_reversals/railsignalvehs.sumo
index 2470aafb9a6..beaa93c01d3 100644
--- a/tests/sumo/rail/reversal/two_double_reversals/railsignalvehs.sumo
+++ b/tests/sumo/rail/reversal/two_double_reversals/railsignalvehs.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-10-16 09:01:29 by Eclipse SUMO sumo Version v1_20_0+0684-f016839ee01
+<!-- generated on 2024-12-01 21:10:48 by Eclipse SUMO sumo Version v1_21_0+1087-eb0d227282f
 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
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
         <net-file value="net.net.xml"/>
@@ -36,21 +36,21 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <no-step-log value="true"/>
     </report>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <railsignal-vehicle-output>
     <railSignal id="A">
         <link linkIndex="0" from="a_0" to=":A_1_0">
             <driveWay id="A.0">
-                <entry id="t0" time="4.00" reason="1"/>
-                <exit id="t0" time="29.00" reason="1"/>
-                <entry id="t2" time="142.00" reason="1"/>
-                <exit id="t2" time="192.00" reason="1"/>
+                <entry id="t0" time="4.00" reason="junction"/>
+                <exit id="t0" time="29.00" reason="junction"/>
+                <entry id="t2" time="142.00" reason="junction"/>
+                <exit id="t2" time="192.00" reason="junction"/>
             </driveWay>
             <driveWay id="A.1">
-                <entry id="t1" time="32.00" reason="1"/>
-                <exit id="t1" time="139.00" reason="1"/>
+                <entry id="t1" time="32.00" reason="junction"/>
+                <exit id="t1" time="139.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
@@ -60,14 +60,14 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <railSignal id="D">
         <link linkIndex="0" from="d_0" to=":D_1_0">
             <driveWay id="D.0">
-                <entry id="t0" time="26.00" reason="1"/>
-                <exit id="t0" time="102.00" reason="1"/>
-                <entry id="t2" time="188.00" reason="1"/>
-                <exit id="t2" time="265.00" reason="1"/>
+                <entry id="t0" time="26.00" reason="junction"/>
+                <exit id="t0" time="102.00" reason="junction"/>
+                <entry id="t2" time="188.00" reason="junction"/>
+                <exit id="t2" time="265.00" reason="junction"/>
             </driveWay>
             <driveWay id="D.1">
-                <entry id="t1" time="131.00" reason="1"/>
-                <exit id="t1" time="160.00" reason="1"/>
+                <entry id="t1" time="131.00" reason="junction"/>
+                <exit id="t1" time="160.00" reason="junction"/>
             </driveWay>
         </link>
     </railSignal>
@@ -77,25 +77,25 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <railSignal id="F">
         <link linkIndex="0" from="f_0" to=":F_1_0">
             <driveWay id="F.0">
-                <entry id="t0" time="94.00" reason="1"/>
-                <exit id="t0" time="109.00" reason="9"/>
-                <entry id="t1" time="156.00" reason="1"/>
-                <exit id="t1" time="164.00" reason="9"/>
-                <entry id="t2" time="257.00" reason="1"/>
-                <exit id="t2" time="272.00" reason="9"/>
+                <entry id="t0" time="94.00" reason="junction"/>
+                <exit id="t0" time="109.00" reason="arrived"/>
+                <entry id="t1" time="156.00" reason="junction"/>
+                <exit id="t1" time="164.00" reason="arrived"/>
+                <entry id="t2" time="257.00" reason="junction"/>
+                <exit id="t2" time="272.00" reason="arrived"/>
             </driveWay>
         </link>
     </railSignal>
     <departJunction id="J0">
         <driveWay id="J0.d0">
-            <entry id="t0" time="0.00" reason="0"/>
-            <exit id="t0" time="8.00" reason="1"/>
-            <entry id="t2" time="49.00" reason="0"/>
-            <exit id="t2" time="159.00" reason="1"/>
+            <entry id="t0" time="0.00" reason="departed"/>
+            <exit id="t0" time="8.00" reason="junction"/>
+            <entry id="t2" time="49.00" reason="departed"/>
+            <exit id="t2" time="159.00" reason="junction"/>
         </driveWay>
         <driveWay id="J0.d1">
-            <entry id="t1" time="8.00" reason="0"/>
-            <exit id="t1" time="49.00" reason="1"/>
+            <entry id="t1" time="8.00" reason="departed"/>
+            <exit id="t1" time="49.00" reason="junction"/>
         </driveWay>
     </departJunction>
 </railsignal-vehicle-output>