From 585a65668932f3f42f703f6619553a6c30076356 Mon Sep 17 00:00:00 2001
From: Michael Behrisch <oss@behrisch.de>
Date: Tue, 27 Feb 2018 13:08:32 +0100
Subject: [PATCH] adapting tests to new default arrivalpos, refs #3843

---
 .../basic/person/stop_duration/tripinfos.sumo     |  9 +++++----
 tests/sumo/basic/person/walk/tripinfos.sumo       |  5 +++--
 .../basic/person/walk_duration/tripinfos.sumo     |  5 +++--
 .../sumo/basic/person/walk_routeID/tripinfos.sumo |  5 +++--
 .../basic/person/walk_unconnected/tripinfos.sumo  |  5 +++--
 .../personTrip/access/vehroutes.sumo              | 13 +++++++------
 .../personTrip/basic/vehroutes.sumo               |  7 ++++---
 .../personTrip/busstop/vehroutes.sumo             |  5 +++--
 .../personTrip/busstop_early/vehroutes.sumo       |  5 +++--
 .../personTrip/busstop_too_late/vehroutes.sumo    |  7 ++++---
 .../personTrip/busstop_too_late2/vehroutes.sumo   |  5 +++--
 .../personTrip/busstop_unmatched/vehroutes.sumo   |  5 +++--
 .../personTrip/car/vehroutes.sumo                 |  7 ++++---
 .../personTrip/car_public_walk/tripinfos.sumo     |  6 +++---
 .../personTrip/car_public_walk/vehroutes.sumo     |  5 +++--
 .../personTrip/car_public_walk2/tripinfos.sumo    |  6 +++---
 .../personTrip/car_public_walk2/vehroutes.sumo    |  5 +++--
 .../personTrip/car_public_walk3/tripinfos.sumo    |  6 +++---
 .../personTrip/car_public_walk3/vehroutes.sumo    |  5 +++--
 .../personTrip/car_public_walk4/tripinfos.sumo    |  6 +++---
 .../personTrip/car_public_walk4/vehroutes.sumo    |  5 +++--
 .../personTrip/car_public_walk5/tripinfos.sumo    |  6 +++---
 .../personTrip/car_public_walk5/vehroutes.sumo    |  5 +++--
 .../car_public_walk_internal/tripinfos.sumo       |  6 +++---
 .../car_public_walk_internal/vehroutes.sumo       |  5 +++--
 .../personTrip/car_type/vehroutes.sumo            |  7 ++++---
 .../personTrip/car_walk/vehroutes.sumo            |  9 +++++----
 .../personTrip/car_walk_sidewalk/vehroutes.sumo   |  9 +++++----
 .../personTrip/early_ending_flow/vehroutes.sumo   |  5 +++--
 .../personTrip/early_pt/vehroutes.sumo            |  5 +++--
 .../personTrip/intermodal_car_walk/vehroutes.sumo |  7 ++++---
 .../intermodal_car_walk_input/vehroutes.sumo      | 15 ++++++++-------
 .../intermodal_car_walk_junction/vehroutes.sumo   |  7 ++++---
 .../intermodal_car_walk_no_place/vehroutes.sumo   |  7 ++++---
 .../intermodal_car_walk_ptstop/vehroutes.sumo     |  7 ++++---
 .../personTrip/late_pt/vehroutes.sumo             |  5 +++--
 .../personTrip/prefer_walking/vehroutes.sumo      |  5 +++--
 .../personTrip/prefer_walking2/vehroutes.sumo     |  5 +++--
 .../personTrip/ptline_routing/vehroutes.sumo      |  9 ++-------
 .../personTrip/public_walk/vehroutes.sumo         | 13 +++++++------
 .../personTrip/unusable_bus/vehroutes.sumo        |  7 ++++---
 .../personTrip/vtype/vehroutes.sumo               |  7 ++++---
 .../block_vehicles/walking_forward/tripinfos.sumo |  8 ++++----
 .../tripinfos.sumo                                |  8 ++++----
 .../block_vehicles_walking_forward/tripinfos.sumo |  8 ++++----
 .../block_vehicles/ignore_stopped/tripinfos.sumo  |  4 ++--
 .../jaywalking_forward/tripinfos.sumo             |  8 ++++----
 .../jaywalking_forward_collision/tripinfos.sumo   |  4 ++--
 .../block_vehicles/walking_forward/tripinfos.sumo |  4 ++--
 .../tripinfos.sumo                                |  6 +++---
 .../walking_forward_unprioritized/tripinfos.sumo  |  4 ++--
 .../block_vehicles_walking_forward/tripinfos.sumo |  4 ++--
 .../striping/tls/tlIndex2/tripinfos.sumo          |  6 +++---
 53 files changed, 186 insertions(+), 156 deletions(-)

diff --git a/tests/sumo/basic/person/stop_duration/tripinfos.sumo b/tests/sumo/basic/person/stop_duration/tripinfos.sumo
index 973eafad17a..e4de13897cb 100644
--- a/tests/sumo/basic/person/stop_duration/tripinfos.sumo
+++ b/tests/sumo/basic/person/stop_duration/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:16:03 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 12:57:56 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
@@ -32,8 +33,8 @@ SPDX-License-Identifier: EPL-2.0
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <personinfo id="p1" depart="0.00">
-        <walk depart="0.00" departPos="0.00" arrival="12.00" arrivalPos="0.00" duration="12.00" routeLength="500.00" timeLoss="2.00" maxSpeed="50.00"/>
-        <stop duration="20.00" arrival="32.00" arrivalPos="0.00" actType="waiting"/>
-        <walk depart="32.00" departPos="0.00" arrival="74.00" arrivalPos="0.00" duration="42.00" routeLength="500.00" timeLoss="2.00" maxSpeed="12.50"/>
+        <walk depart="0.00" departPos="0.00" arrival="12.00" arrivalPos="250.00" duration="12.00" routeLength="750.00" timeLoss="2.00" maxSpeed="74.99"/>
+        <stop duration="20.00" arrival="32.00" arrivalPos="250.00" actType="waiting"/>
+        <walk depart="32.00" departPos="250.00" arrival="74.00" arrivalPos="250.00" duration="42.00" routeLength="500.00" timeLoss="2.00" maxSpeed="12.50"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/basic/person/walk/tripinfos.sumo b/tests/sumo/basic/person/walk/tripinfos.sumo
index e2f9e2e9c84..c559b9522ce 100644
--- a/tests/sumo/basic/person/walk/tripinfos.sumo
+++ b/tests/sumo/basic/person/walk/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:16:02 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 12:57:55 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
@@ -32,6 +33,6 @@ SPDX-License-Identifier: EPL-2.0
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <personinfo id="p1" depart="0.00">
-        <walk depart="0.00" departPos="0.00" arrival="251.00" arrivalPos="0.00" duration="251.00" routeLength="500.00" timeLoss="1.00" maxSpeed="2.00"/>
+        <walk depart="0.00" departPos="0.00" arrival="375.00" arrivalPos="250.00" duration="375.00" routeLength="750.00" timeLoss="0.00" maxSpeed="2.00"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/basic/person/walk_duration/tripinfos.sumo b/tests/sumo/basic/person/walk_duration/tripinfos.sumo
index 887f44bd153..45352277c51 100644
--- a/tests/sumo/basic/person/walk_duration/tripinfos.sumo
+++ b/tests/sumo/basic/person/walk_duration/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:16:03 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 12:57:55 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
@@ -36,6 +37,6 @@ SPDX-License-Identifier: EPL-2.0
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <personinfo id="p1" depart="0.00">
-        <walk depart="0.00" departPos="0.00" arrival="22.00" arrivalPos="0.00" duration="22.00" routeLength="500.00" timeLoss="2.00" maxSpeed="25.00"/>
+        <walk depart="0.00" departPos="0.00" arrival="22.00" arrivalPos="250.00" duration="22.00" routeLength="750.00" timeLoss="2.00" maxSpeed="37.50"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/basic/person/walk_routeID/tripinfos.sumo b/tests/sumo/basic/person/walk_routeID/tripinfos.sumo
index e2f9e2e9c84..c559b9522ce 100644
--- a/tests/sumo/basic/person/walk_routeID/tripinfos.sumo
+++ b/tests/sumo/basic/person/walk_routeID/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:16:02 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 12:57:55 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
@@ -32,6 +33,6 @@ SPDX-License-Identifier: EPL-2.0
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <personinfo id="p1" depart="0.00">
-        <walk depart="0.00" departPos="0.00" arrival="251.00" arrivalPos="0.00" duration="251.00" routeLength="500.00" timeLoss="1.00" maxSpeed="2.00"/>
+        <walk depart="0.00" departPos="0.00" arrival="375.00" arrivalPos="250.00" duration="375.00" routeLength="750.00" timeLoss="0.00" maxSpeed="2.00"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/basic/person/walk_unconnected/tripinfos.sumo b/tests/sumo/basic/person/walk_unconnected/tripinfos.sumo
index fa79200bebc..dd8485cf1e8 100644
--- a/tests/sumo/basic/person/walk_unconnected/tripinfos.sumo
+++ b/tests/sumo/basic/person/walk_unconnected/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:16:01 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 12:57:54 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
     </output>
 
@@ -32,6 +33,6 @@ SPDX-License-Identifier: EPL-2.0
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <personinfo id="p1" depart="0.00">
-        <walk depart="0.00" departPos="0.00" arrival="65.00" arrivalPos="0.00" duration="65.00" routeLength="126.84" timeLoss="1.58" maxSpeed="2.00"/>
+        <walk depart="0.00" departPos="0.00" arrival="96.00" arrivalPos="62.32" duration="96.00" routeLength="189.16" timeLoss="1.42" maxSpeed="2.00"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/access/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/access/vehroutes.sumo
index 3274fea9a15..7a30473e71a 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/access/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/access/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:52 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:06 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,14 +29,14 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="909.00">
+    <person id="p1" depart="0.00" arrival="1002.00">
+        <walk edges="end middle beg"/>
+    </person>
+
+    <person id="p0" depart="0.00" arrival="1111.00">
         <walk edges="beg beg2left" busStop="beg2left"/>
         <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
         <walk edges="left2end end"/>
     </person>
 
-    <person id="p1" depart="0.00" arrival="1207.00">
-        <walk edges="end middle beg"/>
-    </person>
-
 </routes>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/basic/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/basic/vehroutes.sumo
index a458d69fa83..73218a1baac 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/basic/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/basic/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:17:18 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 12:59:20 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -27,11 +28,11 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p1" depart="0.00" arrival="1196.00">
+    <person id="p1" depart="0.00" arrival="996.00">
         <walk edges="end middle beg"/>
     </person>
 
-    <person id="p0" depart="0.00" arrival="1203.00">
+    <person id="p0" depart="0.00" arrival="1403.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo
index edee44b9fd0..823f5e006f9 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:50 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:04 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="1140.00">
+    <person id="p0" depart="0.00" arrival="941.00">
         <walk edges="beg" busStop="beg_0"/>
         <ride from="beg" to="left" busStop="left_0" lines="bus"/>
         <ride from="left" to="end" busStop="end_0" lines="bus2"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo
index d9f7435f50b..0de23831bfe 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop_early/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 15:26:16 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:05 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="200.00" arrival="1839.00">
+    <person id="p0" depart="200.00" arrival="1640.00">
         <walk edges="beg" busStop="beg_0"/>
         <ride from="beg" to="left" busStop="left_0" lines="bus"/>
         <ride from="left" to="end" busStop="end_0" lines="bus2"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo
index 25b9ee6eefc..bb6c85ba320 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:50 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:04 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,14 +29,14 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="1140.00">
+    <person id="p0" depart="0.00" arrival="941.00">
         <walk edges="beg" busStop="beg_0"/>
         <ride from="beg" to="left" busStop="left_0" lines="bus"/>
         <ride from="left" to="end" busStop="end_0" lines="bus2"/>
         <walk edges="end"/>
     </person>
 
-    <person id="p1" depart="2000.00" arrival="3201.00">
+    <person id="p1" depart="2000.00" arrival="3399.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late2/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late2/vehroutes.sumo
index e7fd6fbb598..6cc12072127 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late2/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop_too_late2/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:50 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:05 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="720.00" arrival="1921.00">
+    <person id="p0" depart="720.00" arrival="2119.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/busstop_unmatched/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/busstop_unmatched/vehroutes.sumo
index cb9bd10fc50..2dd582061dc 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/busstop_unmatched/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/busstop_unmatched/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:51 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:05 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="1203.00">
+    <person id="p0" depart="0.00" arrival="1403.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car/vehroutes.sumo
index 9ac5064aef5..1a473852553 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:21 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:02 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -27,11 +28,11 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="101.00">
+    <person id="p0" depart="0.00" arrival="112.00">
         <ride from="beg" to="end" lines="p0_0"/>
     </person>
 
-    <vehicle id="p0_0" depart="triggered" arrival="101.00">
+    <vehicle id="p0_0" depart="triggered" arrival="112.00">
         <routeDistribution>
             <route replacedOnEdge="" replacedAtTime="0.00" probability="0" edges="beg"/>
             <route edges="beg middle end"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/tripinfos.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/tripinfos.sumo
index 513ac759d53..f235eef3cc1 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/tripinfos.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:07:29 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,11 +33,11 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="p0_0" depart="0.00" departLane="beg_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="34.00" arrivalLane="beg2left_0" arrivalPos="250.00" arrivalSpeed="27.71" duration="34.00" routeLength="748.45" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="6.87" rerouteNo="1" devices="vehroute_p0_0 tripinfo_p0_0 person_p0_0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.0" depart="0.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="128.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.0 tripinfo_train.0 routing_train.0" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.1" depart="300.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="429.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="129.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="3.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.1 tripinfo_train.1 routing_train.1 person_train.1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
         <ride waitingTime="0.00" vehicle="p0_0" depart="0.00" arrival="34.00" arrivalPos="250.00" duration="34.00" routeLength="753.35"/>
         <ride waitingTime="291.00" vehicle="train.1" depart="325.00" arrival="406.00" arrivalPos="1240.00" duration="81.00" routeLength="1000.00"/>
-        <walk depart="406.00" departPos="250.00" arrival="611.00" arrivalPos="0.00" duration="205.00" routeLength="252.85" timeLoss="22.95" maxSpeed="1.39"/>
+        <walk depart="406.00" departPos="250.00" arrival="810.00" arrivalPos="249.28" duration="404.00" routeLength="502.13" timeLoss="42.47" maxSpeed="1.39"/>
     </personinfo>
-    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.3" depart="900.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="1028.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.3 tripinfo_train.3 routing_train.3" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/vehroutes.sumo
index fef27781a6f..e3910dd17a5 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:23 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
@@ -36,7 +37,7 @@ SPDX-License-Identifier: EPL-2.0
         </routeDistribution>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="611.00">
+    <person id="p0" depart="0.00" arrival="810.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
         <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
         <walk edges="left2end end"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/tripinfos.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/tripinfos.sumo
index 03a3a0c8991..a6d91aa85b7 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/tripinfos.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:07:29 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,11 +33,11 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="p0_0" depart="0.00" departLane="beg_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="42.00" arrivalLane="beg2left_0" arrivalPos="450.00" arrivalSpeed="27.25" duration="42.00" routeLength="948.45" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="7.01" rerouteNo="1" devices="vehroute_p0_0 tripinfo_p0_0 person_p0_0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.0" depart="0.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="128.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.0 tripinfo_train.0 routing_train.0" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.1" depart="300.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="429.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="129.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="3.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.1 tripinfo_train.1 routing_train.1 person_train.1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
         <ride waitingTime="0.00" vehicle="p0_0" depart="0.00" arrival="42.00" arrivalPos="450.00" duration="42.00" routeLength="971.66"/>
         <ride waitingTime="283.00" vehicle="train.1" depart="325.00" arrival="406.00" arrivalPos="1240.00" duration="81.00" routeLength="1000.00"/>
-        <walk depart="406.00" departPos="250.00" arrival="611.00" arrivalPos="0.00" duration="205.00" routeLength="252.85" timeLoss="22.95" maxSpeed="1.39"/>
+        <walk depart="406.00" departPos="250.00" arrival="810.00" arrivalPos="249.28" duration="404.00" routeLength="502.13" timeLoss="42.47" maxSpeed="1.39"/>
     </personinfo>
-    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.3" depart="900.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="1028.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.3 tripinfo_train.3 routing_train.3" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/vehroutes.sumo
index 36600021ecb..3dd7a4fb86a 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk2/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:23 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
@@ -36,7 +37,7 @@ SPDX-License-Identifier: EPL-2.0
         </routeDistribution>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="611.00">
+    <person id="p0" depart="0.00" arrival="810.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
         <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
         <walk edges="left2end end"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/tripinfos.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/tripinfos.sumo
index 25a93b46bd0..d444ebc8ce5 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/tripinfos.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:07:29 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -37,12 +37,12 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="p0_0" depart="0.00" departLane="beg_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="25.00" arrivalLane="beg_0" arrivalPos="500.00" arrivalSpeed="27.68" duration="25.00" routeLength="494.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="6.65" rerouteNo="0" devices="vehroute_p0_0 tripinfo_p0_0 person_p0_0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.0" depart="0.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="128.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.0 tripinfo_train.0 routing_train.0" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.1" depart="300.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="429.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="129.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="3.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.1 tripinfo_train.1 routing_train.1 person_train.1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
         <ride waitingTime="0.00" vehicle="p0_0" depart="0.00" arrival="25.00" arrivalPos="500.00" duration="25.00" routeLength="509.21"/>
         <walk depart="25.00" departPos="0.00" arrival="226.00" arrivalPos="250.00" duration="201.00" routeLength="250.00" timeLoss="21.00" maxSpeed="1.39"/>
         <ride waitingTime="99.00" vehicle="train.1" depart="325.00" arrival="406.00" arrivalPos="1240.00" duration="81.00" routeLength="1000.00"/>
-        <walk depart="406.00" departPos="250.00" arrival="610.00" arrivalPos="0.00" duration="204.00" routeLength="251.13" timeLoss="23.19" maxSpeed="1.39"/>
+        <walk depart="406.00" departPos="250.00" arrival="808.00" arrivalPos="250.00" duration="402.00" routeLength="501.13" timeLoss="41.19" maxSpeed="1.39"/>
     </personinfo>
-    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.3" depart="900.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="1028.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.3 tripinfo_train.3 routing_train.3" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/vehroutes.sumo
index 4417f873835..a71b2f13204 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk3/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Dec  1 21:08:06 2017 by SUMO Version v0_31_0-840-g3d7cc9b5ae
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
@@ -37,7 +38,7 @@ SPDX-License-Identifier: EPL-2.0
         <route edges="beg"/>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="610.00">
+    <person id="p0" depart="0.00" arrival="808.00">
         <ride from="beg" to="beg" lines="p0_0"/>
         <walk edges="beg2left" busStop="beg2left"/>
         <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/tripinfos.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/tripinfos.sumo
index 13ff005f98f..8b85c4aa012 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/tripinfos.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:07:29 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,11 +33,11 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="p0_0" depart="0.00" departLane="beg_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="34.00" arrivalLane="beg2left_0" arrivalPos="250.00" arrivalSpeed="27.71" duration="34.00" routeLength="748.45" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="6.87" rerouteNo="1" devices="vehroute_p0_0 tripinfo_p0_0 person_p0_0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.0" depart="0.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="128.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.0 tripinfo_train.0 routing_train.0" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.1" depart="300.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="429.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="129.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="3.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.1 tripinfo_train.1 routing_train.1 person_train.1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
         <ride waitingTime="0.00" vehicle="p0_0" depart="0.00" arrival="34.00" arrivalPos="250.00" duration="34.00" routeLength="753.35"/>
         <ride waitingTime="291.00" vehicle="train.1" depart="325.00" arrival="406.00" arrivalPos="1240.00" duration="81.00" routeLength="1000.00"/>
-        <walk depart="406.00" departPos="250.00" arrival="604.00" arrivalPos="0.00" duration="198.00" routeLength="252.85" timeLoss="15.95" maxSpeed="1.39"/>
+        <walk depart="406.00" departPos="250.00" arrival="802.00" arrivalPos="249.28" duration="396.00" routeLength="502.13" timeLoss="34.47" maxSpeed="1.39"/>
     </personinfo>
-    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.3" depart="900.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="1028.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.3 tripinfo_train.3 routing_train.3" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/vehroutes.sumo
index dc86f98697f..6635939d5ca 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk4/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:23 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
@@ -36,7 +37,7 @@ SPDX-License-Identifier: EPL-2.0
         </routeDistribution>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="604.00">
+    <person id="p0" depart="0.00" arrival="802.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
         <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
         <walk edges="left2end end"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/tripinfos.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/tripinfos.sumo
index af9a43ab72a..c7cd43ea0d8 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/tripinfos.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:07:29 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,11 +33,11 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="p0_0" depart="0.00" departLane="beg_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="29.00" arrivalLane="beg2left_0" arrivalPos="100.00" arrivalSpeed="27.05" duration="29.00" routeLength="598.45" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="6.76" rerouteNo="1" devices="vehroute_p0_0 tripinfo_p0_0 person_p0_0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.0" depart="0.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="128.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.0 tripinfo_train.0 routing_train.0" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.1" depart="300.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="429.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="129.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="3.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.1 tripinfo_train.1 routing_train.1 person_train.1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
         <ride waitingTime="0.00" vehicle="p0_0" depart="0.00" arrival="29.00" arrivalPos="100.00" duration="29.00" routeLength="617.26"/>
         <ride waitingTime="296.00" vehicle="train.1" depart="325.00" arrival="406.00" arrivalPos="1240.00" duration="81.00" routeLength="1000.00"/>
-        <walk depart="406.00" departPos="250.00" arrival="611.00" arrivalPos="0.00" duration="205.00" routeLength="252.85" timeLoss="22.95" maxSpeed="1.39"/>
+        <walk depart="406.00" departPos="250.00" arrival="811.00" arrivalPos="249.28" duration="405.00" routeLength="502.13" timeLoss="43.47" maxSpeed="1.39"/>
     </personinfo>
-    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.3" depart="900.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="1028.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.3 tripinfo_train.3 routing_train.3" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/vehroutes.sumo
index 3eaa09419c7..2aee68a9a49 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk5/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:24 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
@@ -36,7 +37,7 @@ SPDX-License-Identifier: EPL-2.0
         </routeDistribution>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="611.00">
+    <person id="p0" depart="0.00" arrival="811.00">
         <ride from="beg" to="beg2left" busStop="beg2left" lines="p0_0"/>
         <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
         <walk edges="left2end end"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/tripinfos.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/tripinfos.sumo
index 9feb22b7c37..3242c04f8a5 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/tripinfos.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:07:29 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -37,12 +37,12 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="p0_0" depart="0.00" departLane="beg_0" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="25.00" arrivalLane="beg_0" arrivalPos="498.55" arrivalSpeed="27.68" duration="25.00" routeLength="493.45" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="6.65" rerouteNo="0" devices="vehroute_p0_0 tripinfo_p0_0 person_p0_0" vType="DEFAULT_VEHTYPE" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.0" depart="0.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="128.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.0 tripinfo_train.0 routing_train.0" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.1" depart="300.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="429.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="129.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="3.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.1 tripinfo_train.1 routing_train.1 person_train.1" vType="train" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
         <ride waitingTime="0.00" vehicle="p0_0" depart="0.00" arrival="25.00" arrivalPos="498.55" duration="25.00" routeLength="509.21"/>
         <walk depart="25.00" departPos="0.00" arrival="226.00" arrivalPos="250.00" duration="201.00" routeLength="250.00" timeLoss="21.00" maxSpeed="1.39"/>
         <ride waitingTime="99.00" vehicle="train.1" depart="325.00" arrival="406.00" arrivalPos="1240.00" duration="81.00" routeLength="1000.00"/>
-        <walk depart="406.00" departPos="250.00" arrival="611.00" arrivalPos="0.00" duration="205.00" routeLength="252.85" timeLoss="22.95" maxSpeed="1.39"/>
+        <walk depart="406.00" departPos="250.00" arrival="809.00" arrivalPos="249.28" duration="403.00" routeLength="502.13" timeLoss="41.47" maxSpeed="1.39"/>
     </personinfo>
-    <tripinfo id="train.2" depart="600.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="728.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.2 tripinfo_train.2 routing_train.2" vType="train" speedFactor="1.00" vaporized=""/>
     <tripinfo id="train.3" depart="900.00" departLane="gneE0_0" departPos="109.60" departSpeed="0.00" departDelay="0.00" arrival="1028.00" arrivalLane="gneE0_0" arrivalPos="1529.03" arrivalSpeed="13.89" duration="128.00" routeLength="1419.43" waitingTime="0.00" waitingCount="0" stopTime="2.00" timeLoss="23.75" rerouteNo="1" devices="vehroute_train.3 tripinfo_train.3 routing_train.3" vType="train" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/vehroutes.sumo
index a34c60f7f69..6054851cf2c 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_public_walk_internal/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:52 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <tripinfo-output value="tripinfos.xml"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
@@ -37,7 +38,7 @@ SPDX-License-Identifier: EPL-2.0
         <route edges="beg"/>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="611.00">
+    <person id="p0" depart="0.00" arrival="809.00">
         <ride from="beg" to="beg" lines="p0_0"/>
         <walk edges="beg2left" busStop="beg2left"/>
         <ride from="gneE0" to="gneE0" busStop="left2end" lines="train"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_type/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_type/vehroutes.sumo
index 6a2aa011da5..33148cfe4bc 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_type/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_type/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:22 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:03 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -27,11 +28,11 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="101.00">
+    <person id="p0" depart="0.00" arrival="112.00">
         <ride from="beg" to="end" lines="p0_0"/>
     </person>
 
-    <vehicle id="p0_0" type="typ0" depart="triggered" arrival="101.00">
+    <vehicle id="p0_0" type="typ0" depart="triggered" arrival="112.00">
         <routeDistribution>
             <route replacedOnEdge="" replacedAtTime="0.00" probability="0" edges="beg"/>
             <route edges="beg middle end"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_walk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_walk/vehroutes.sumo
index b7da460ffea..e94985a3fb2 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_walk/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_walk/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:22 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:03 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -27,18 +28,18 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="101.00">
+    <person id="p0" depart="0.00" arrival="112.00">
         <ride from="beg" to="end" lines="p0_0"/>
     </person>
 
-    <vehicle id="p0_0" depart="triggered" arrival="101.00">
+    <vehicle id="p0_0" depart="triggered" arrival="112.00">
         <routeDistribution>
             <route replacedOnEdge="" replacedAtTime="0.00" probability="0" edges="beg"/>
             <route edges="beg middle end"/>
         </routeDistribution>
     </vehicle>
 
-    <person id="p1" depart="0.00" arrival="1202.00">
+    <person id="p1" depart="0.00" arrival="1002.00">
         <walk edges="end middle beg"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/car_walk_sidewalk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/car_walk_sidewalk/vehroutes.sumo
index b7da460ffea..f1d9036a481 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/car_walk_sidewalk/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/car_walk_sidewalk/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:22 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:04 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -27,18 +28,18 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="101.00">
+    <person id="p0" depart="0.00" arrival="112.00">
         <ride from="beg" to="end" lines="p0_0"/>
     </person>
 
-    <vehicle id="p0_0" depart="triggered" arrival="101.00">
+    <vehicle id="p0_0" depart="triggered" arrival="112.00">
         <routeDistribution>
             <route replacedOnEdge="" replacedAtTime="0.00" probability="0" edges="beg"/>
             <route edges="beg middle end"/>
         </routeDistribution>
     </vehicle>
 
-    <person id="p1" depart="0.00" arrival="1202.00">
+    <person id="p1" depart="0.00" arrival="1002.00">
         <walk edges="end middle beg"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo
index 5d5b40a84c2..7479ffb24a0 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/early_ending_flow/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:53 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="public" depart="4.00" arrival="158.00">
+    <person id="public" depart="4.00" arrival="134.00">
         <walk edges="b" busStop="busstop1"/>
         <ride from="b" to="g" busStop="busstop3" lines="100"/>
         <walk edges="g"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo
index 0082bfc908b..4e3d0f164e6 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/early_pt/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:53 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:52 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="public" depart="4.00" arrival="122.00">
+    <person id="public" depart="4.00" arrival="97.00">
         <walk edges="b" busStop="busstop1"/>
         <ride from="b" to="g" busStop="busstop3" lines="100"/>
         <walk edges="g"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk/vehroutes.sumo
index ea8575796f0..a06b1303747 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:51 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -35,12 +36,12 @@ SPDX-License-Identifier: EPL-2.0
         </routeDistribution>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="104.00">
+    <person id="p0" depart="0.00" arrival="305.00">
         <ride from="beg" to="middle" lines="p0_0"/>
         <walk edges="middle end"/>
     </person>
 
-    <person id="p1" depart="0.00" arrival="1212.00">
+    <person id="p1" depart="0.00" arrival="1005.00">
         <walk edges="end middle beg"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_input/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_input/vehroutes.sumo
index 6297ae4b541..20657484f25 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_input/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_input/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/30/17 10:26:23 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 12:59:21 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -31,16 +32,16 @@ SPDX-License-Identifier: EPL-2.0
         <route edges="beg middle"/>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="102.00">
-        <ride from="beg" to="middle" lines="p0_0"/>
-        <walk edges="end"/>
-    </person>
-
     <vehicle id="p1_0" depart="triggered" arrival="102.00">
         <route edges="beg beg2left left left2end"/>
     </vehicle>
 
-    <person id="p1" depart="0.00" arrival="903.00">
+    <person id="p0" depart="0.00" arrival="300.00">
+        <ride from="beg" to="middle" lines="p0_0"/>
+        <walk edges="end"/>
+    </person>
+
+    <person id="p1" depart="0.00" arrival="505.00">
         <ride from="beg" to="left2end" lines="p1_0"/>
         <walk edges="middle"/>
     </person>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_junction/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_junction/vehroutes.sumo
index d040e51272d..005941230a1 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_junction/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_junction/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:51 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -38,12 +39,12 @@ SPDX-License-Identifier: EPL-2.0
         </routeDistribution>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="103.00">
+    <person id="p0" depart="0.00" arrival="305.00">
         <ride from="beg" to="middle" lines="p0_0"/>
         <walk edges="end"/>
     </person>
 
-    <person id="p1" depart="0.00" arrival="1212.00">
+    <person id="p1" depart="0.00" arrival="1005.00">
         <walk edges="end middle beg"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_no_place/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_no_place/vehroutes.sumo
index 1ccc6992348..8041a429d2f 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_no_place/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_no_place/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:51 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -27,11 +28,11 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p1" depart="0.00" arrival="1206.00">
+    <person id="p1" depart="0.00" arrival="1002.00">
         <walk edges="end middle beg"/>
     </person>
 
-    <person id="p0" depart="0.00" arrival="1213.00">
+    <person id="p0" depart="0.00" arrival="1413.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_ptstop/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_ptstop/vehroutes.sumo
index f542d070201..30568b0bea2 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_ptstop/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/intermodal_car_walk_ptstop/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:51 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:51 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -39,12 +40,12 @@ SPDX-License-Identifier: EPL-2.0
         </routeDistribution>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="104.00">
+    <person id="p0" depart="0.00" arrival="305.00">
         <ride from="beg" to="middle" lines="p0_0"/>
         <walk edges="middle end"/>
     </person>
 
-    <person id="p1" depart="0.00" arrival="1212.00">
+    <person id="p1" depart="0.00" arrival="1005.00">
         <walk edges="end middle beg"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/late_pt/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/late_pt/vehroutes.sumo
index f51c80887a2..201e4f3603f 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/late_pt/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/late_pt/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:53 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 11:17:53 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="public" depart="4.00" arrival="121.00">
+    <person id="public" depart="4.00" arrival="97.00">
         <walk edges="b" busStop="busstop1"/>
         <ride from="b" to="g" busStop="busstop3" lines="100"/>
         <walk edges="g"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/prefer_walking/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/prefer_walking/vehroutes.sumo
index 305346f4194..66db4a0405d 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/prefer_walking/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/prefer_walking/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:50 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:05 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="1203.00">
+    <person id="p0" depart="0.00" arrival="1400.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/prefer_walking2/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/prefer_walking2/vehroutes.sumo
index 5f8f5baabda..f6a37644fee 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/prefer_walking2/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/prefer_walking2/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:51 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:05 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,7 +29,7 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="3.00" arrival="1207.00">
+    <person id="p0" depart="3.00" arrival="1403.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo
index 745f29a491c..5e9475d4127 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/ptline_routing/vehroutes.sumo
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:52 by SUMO Version v0_31_0+1143-87c09f1032
-This data file and the accompanying materials
-are made available under the terms of the Eclipse Public License v2.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
+<!-- generated on 02/26/18 23:11:07 by SUMO Version v0_32_0+0405-d1c1ff1104
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
@@ -71,7 +66,7 @@ SPDX-License-Identifier: EPL-2.0
         <stop busStop="end_0" until="500.00"/>
     </vehicle>
 
-    <person id="p0" depart="0.00" arrival="739.00">
+    <person id="p0" depart="0.00" arrival="538.00">
         <walk edges="beg" busStop="beg_0"/>
         <ride from="beg" to="end" busStop="end_0" lines="bus"/>
         <walk edges="end"/>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/public_walk/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/public_walk/vehroutes.sumo
index 9e5d6d8c547..9d10e2258e4 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/public_walk/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/public_walk/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:50 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:04 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -15,6 +15,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -28,18 +29,18 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p0" depart="0.00" arrival="920.00">
+    <person id="p0" depart="0.00" arrival="721.00">
         <walk edges="beg" busStop="beg_0"/>
         <ride from="beg" to="end" busStop="end_0" lines="bus"/>
         <walk edges="end"/>
     </person>
 
-    <person id="walker" depart="0.00" arrival="1201.00">
-        <walk edges="beg middle end"/>
+    <person id="p1" depart="0.00" arrival="1000.00">
+        <walk edges="end middle beg"/>
     </person>
 
-    <person id="p1" depart="0.00" arrival="1202.00">
-        <walk edges="end middle beg"/>
+    <person id="walker" depart="0.00" arrival="1400.00">
+        <walk edges="beg middle end"/>
     </person>
 
 </routes>
diff --git a/tests/sumo/extended/simulation_routing/personTrip/unusable_bus/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/unusable_bus/vehroutes.sumo
index e687d1f2e73..af291b66310 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/unusable_bus/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/unusable_bus/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:34:50 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/26/18 23:11:05 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -27,11 +28,11 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p1" depart="0.00" arrival="1199.00">
+    <person id="p1" depart="0.00" arrival="998.00">
         <walk edges="end middle beg"/>
     </person>
 
-    <person id="p0" depart="0.00" arrival="1200.00">
+    <person id="p0" depart="0.00" arrival="1399.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/extended/simulation_routing/personTrip/vtype/vehroutes.sumo b/tests/sumo/extended/simulation_routing/personTrip/vtype/vehroutes.sumo
index 333d2560af7..d3bfa16c1ff 100644
--- a/tests/sumo/extended/simulation_routing/personTrip/vtype/vehroutes.sumo
+++ b/tests/sumo/extended/simulation_routing/personTrip/vtype/vehroutes.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 11/29/17 14:17:18 by SUMO Version v0_31_0+1143-87c09f1032
+<!-- generated on 02/27/18 12:59:20 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +14,7 @@ SPDX-License-Identifier: EPL-2.0
     </input>
 
     <output>
+        <write-license value="true"/>
         <vehroute-output value="vehroutes.xml"/>
         <vehroute-output.skip-ptlines value="true"/>
     </output>
@@ -27,11 +28,11 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <person id="p1" depart="0.00" arrival="1196.00">
+    <person id="p1" depart="0.00" arrival="996.00">
         <walk edges="end middle beg"/>
     </person>
 
-    <person id="p0" type="0" depart="0.00" arrival="1203.00">
+    <person id="p0" type="0" depart="0.00" arrival="1403.00">
         <walk edges="beg middle end"/>
     </person>
 
diff --git a/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward/tripinfos.sumo b/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward/tripinfos.sumo
index 7e8aa4501d1..06e6c754daa 100644
--- a/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:40 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:19 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -32,9 +32,9 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="11.00" arrival="55.00" arrivalPos="0.00" duration="55.00" routeLength="74.40" timeLoss="1.43" maxSpeed="1.39"/>
-    </personinfo>
     <tripinfo id="car_SE.0" depart="46.00" departLane="SC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="63.00" arrivalLane="CE_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="174.95" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="3.20" rerouteNo="0" devices="tripinfo_car_SE.0" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="car_SE.1" depart="50.00" departLane="SC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="67.00" arrivalLane="CE_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="174.95" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="3.20" rerouteNo="0" devices="tripinfo_car_SE.1" vType="car" speedFactor="1.00" vaporized=""/>
+    <personinfo id="p0" depart="0.00">
+        <walk depart="0.00" departPos="11.00" arrival="86.00" arrivalPos="43.45" duration="86.00" routeLength="117.85" timeLoss="1.15" maxSpeed="1.39"/>
+    </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo b/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
index 3c44c9c07ef..5ce3d7c3a4d 100644
--- a/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/nonInteracting/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:40 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:19 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -32,9 +32,9 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="11.00" arrival="55.00" arrivalPos="0.00" duration="55.00" routeLength="74.40" timeLoss="1.43" maxSpeed="1.39"/>
-    </personinfo>
     <tripinfo id="car_NE.0" depart="46.00" departLane="NC_4" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="63.00" arrivalLane="CE_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="192.35" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="3.12" rerouteNo="0" devices="tripinfo_car_NE.0" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="car_NE.1" depart="50.00" departLane="NC_4" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="67.00" arrivalLane="CE_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="192.35" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="3.12" rerouteNo="0" devices="tripinfo_car_NE.1" vType="car" speedFactor="1.00" vaporized=""/>
+    <personinfo id="p0" depart="0.00">
+        <walk depart="0.00" departPos="11.00" arrival="86.00" arrivalPos="43.45" duration="86.00" routeLength="117.85" timeLoss="1.15" maxSpeed="1.39"/>
+    </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/nonInteracting/subsecond/block_vehicles_walking_forward/tripinfos.sumo b/tests/sumo/pedestrian_model/nonInteracting/subsecond/block_vehicles_walking_forward/tripinfos.sumo
index c80911ae5b5..dc35bef2b4c 100644
--- a/tests/sumo/pedestrian_model/nonInteracting/subsecond/block_vehicles_walking_forward/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/nonInteracting/subsecond/block_vehicles_walking_forward/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:44 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:22 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -41,9 +41,9 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="11.00" arrival="53.70" arrivalPos="0.00" duration="53.70" routeLength="74.40" timeLoss="0.13" maxSpeed="1.39"/>
-    </personinfo>
     <tripinfo id="car_SE.0" depart="46.00" departLane="SC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="64.90" arrivalLane="CE_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="18.90" routeLength="174.95" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="5.60" rerouteNo="0" devices="tripinfo_car_SE.0" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="car_SE.1" depart="50.00" departLane="SC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="69.10" arrivalLane="CE_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="19.10" routeLength="174.95" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="5.81" rerouteNo="0" devices="tripinfo_car_SE.1" vType="car" speedFactor="1.00" vaporized=""/>
+    <personinfo id="p0" depart="0.00">
+        <walk depart="0.00" departPos="11.00" arrival="85.00" arrivalPos="43.45" duration="85.00" routeLength="117.85" timeLoss="0.15" maxSpeed="1.39"/>
+    </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/striping/block_vehicles/ignore_stopped/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/block_vehicles/ignore_stopped/tripinfos.sumo
index ff88a9bd6a6..545aea06c31 100644
--- a/tests/sumo/pedestrian_model/striping/block_vehicles/ignore_stopped/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/block_vehicles/ignore_stopped/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:47 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:25 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -38,6 +38,6 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="v2" depart="1.00" departLane="EC_1" departPos="0.00" departSpeed="0.00" departDelay="0.00" arrival="18.00" arrivalLane="CW_1" arrivalPos="93.15" arrivalSpeed="13.89" duration="17.00" routeLength="200.00" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="2.19" rerouteNo="0" devices="tripinfo_v2" vType="t0" speedFactor="1.00" vaporized=""/>
     <tripinfo id="v0" depart="0.00" departLane="WC_1" departPos="60.00" departSpeed="0.00" departDelay="0.00" arrival="21.00" arrivalLane="CN_1" arrivalPos="93.15" arrivalSpeed="13.89" duration="21.00" routeLength="140.01" waitingTime="5.00" waitingCount="1" stopTime="0.00" timeLoss="10.34" rerouteNo="0" devices="tripinfo_v0" vType="t1" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="88.15" arrival="87.00" arrivalPos="0.00" duration="87.00" routeLength="109.63" timeLoss="8.07" maxSpeed="1.39"/>
+        <walk depart="0.00" departPos="88.15" arrival="54.00" arrivalPos="46.58" duration="54.00" routeLength="63.05" timeLoss="8.60" maxSpeed="1.39"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward/tripinfos.sumo
index db3aea8d76a..80d8e462012 100644
--- a/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:47 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:25 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -34,13 +34,13 @@ SPDX-License-Identifier: EPL-2.0
 -->
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
-    <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="83.90" arrival="22.00" arrivalPos="0.00" duration="22.00" routeLength="29.20" timeLoss="0.98" maxSpeed="1.39"/>
-    </personinfo>
     <tripinfo id="EW.1" depart="2.00" departLane="EC_4" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="27.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="25.00" routeLength="194.90" waitingTime="4.00" waitingCount="1" stopTime="0.00" timeLoss="10.36" rerouteNo="0" devices="tripinfo_EW.1" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="EW.0" depart="1.00" departLane="EC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="28.00" arrivalLane="CW_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="27.00" routeLength="194.90" waitingTime="6.00" waitingCount="1" stopTime="0.00" timeLoss="12.36" rerouteNo="0" devices="tripinfo_EW.0" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="EW.3" depart="10.00" departLane="EC_4" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="28.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="18.00" routeLength="194.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="3.93" rerouteNo="0" devices="tripinfo_EW.3" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="EW.2" depart="9.00" departLane="EC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="29.00" arrivalLane="CW_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="20.00" routeLength="194.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="5.90" rerouteNo="0" devices="tripinfo_EW.2" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="EW.5" depart="13.00" departLane="EC_4" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="30.00" arrivalLane="CW_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="194.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="2.65" rerouteNo="0" devices="tripinfo_EW.5" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="EW.4" depart="11.00" departLane="EC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="31.00" arrivalLane="CW_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="20.00" routeLength="194.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="5.45" rerouteNo="0" devices="tripinfo_EW.4" vType="car" speedFactor="1.00" vaporized=""/>
+    <personinfo id="p0" depart="0.00">
+        <walk depart="0.00" departPos="83.90" arrival="53.00" arrivalPos="43.45" duration="53.00" routeLength="72.65" timeLoss="0.69" maxSpeed="1.39"/>
+    </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward_collision/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward_collision/tripinfos.sumo
index e3efe0ef7d0..3d08258fcb2 100644
--- a/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward_collision/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/block_vehicles/jaywalking_forward_collision/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:47 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:25 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -41,6 +41,6 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="WE.3" depart="10.00" departLane="WC_4" departPos="5.10" departSpeed="7.80" departDelay="0.00" arrival="27.00" arrivalLane="CE_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="194.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="2.20" rerouteNo="0" devices="tripinfo_WE.3" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="WE.5" depart="13.00" departLane="WC_4" departPos="5.10" departSpeed="7.80" departDelay="0.00" arrival="29.00" arrivalLane="CE_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="16.00" routeLength="194.90" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="1.23" rerouteNo="0" devices="tripinfo_WE.5" vType="car" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="2.00" arrival="86.00" arrivalPos="0.00" duration="86.00" routeLength="116.60" timeLoss="2.05" maxSpeed="1.39"/>
+        <walk depart="0.00" departPos="2.00" arrival="54.00" arrivalPos="43.45" duration="54.00" routeLength="73.15" timeLoss="1.33" maxSpeed="1.39"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward/tripinfos.sumo
index 23e9e5aa8e9..a5631f256b9 100644
--- a/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:45 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:24 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -37,6 +37,6 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="car_SE.0" depart="46.00" departLane="SC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="63.00" arrivalLane="CE_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="174.95" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="3.20" rerouteNo="0" devices="tripinfo_car_SE.0" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="car_SE.1" depart="50.00" departLane="SC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="72.00" arrivalLane="CE_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="22.00" routeLength="174.95" waitingTime="2.00" waitingCount="1" stopTime="0.00" timeLoss="8.52" rerouteNo="0" devices="tripinfo_car_SE.1" vType="car" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="11.00" arrival="74.00" arrivalPos="0.00" duration="74.00" routeLength="102.10" timeLoss="0.49" maxSpeed="1.39"/>
+        <walk depart="0.00" departPos="11.00" arrival="105.00" arrivalPos="43.45" duration="105.00" routeLength="145.55" timeLoss="0.20" maxSpeed="1.39"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
index 6d03e340096..980660672d5 100644
--- a/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward_left_turning_vehicle/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:46 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:24 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,8 +35,8 @@ SPDX-License-Identifier: EPL-2.0
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <tripinfo id="car_NE.0" depart="46.00" departLane="NC_4" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="63.00" arrivalLane="CE_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="17.00" routeLength="192.35" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="3.12" rerouteNo="0" devices="tripinfo_car_NE.0" vType="car" speedFactor="1.00" vaporized=""/>
+    <tripinfo id="car_NE.1" depart="50.00" departLane="NC_4" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="75.00" arrivalLane="CE_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="25.00" routeLength="192.35" waitingTime="4.00" waitingCount="1" stopTime="0.00" timeLoss="10.94" rerouteNo="0" devices="tripinfo_car_NE.1" vType="car" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="11.00" arrival="74.00" arrivalPos="0.00" duration="74.00" routeLength="102.10" timeLoss="0.49" maxSpeed="1.39"/>
+        <walk depart="0.00" departPos="11.00" arrival="105.00" arrivalPos="43.45" duration="105.00" routeLength="145.55" timeLoss="0.20" maxSpeed="1.39"/>
     </personinfo>
-    <tripinfo id="car_NE.1" depart="50.00" departLane="NC_4" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="75.00" arrivalLane="CE_4" arrivalPos="86.15" arrivalSpeed="13.89" duration="25.00" routeLength="192.35" waitingTime="4.00" waitingCount="1" stopTime="0.00" timeLoss="10.94" rerouteNo="0" devices="tripinfo_car_NE.1" vType="car" speedFactor="1.00" vaporized=""/>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward_unprioritized/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward_unprioritized/tripinfos.sumo
index d477572c9cb..7b22c4f563e 100644
--- a/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward_unprioritized/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/block_vehicles/walking_forward_unprioritized/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:47 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:25 by SUMO Version v0_32_0+0405-d1c1ff1104
 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
@@ -37,6 +37,6 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="car_SE.0" depart="46.00" departLane="SC_2" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="63.00" arrivalLane="CE_2" arrivalPos="87.25" arrivalSpeed="13.89" duration="17.00" routeLength="181.98" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="3.09" rerouteNo="0" devices="tripinfo_car_SE.0" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="car_SE.1" depart="50.00" departLane="SC_2" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="72.00" arrivalLane="CE_2" arrivalPos="87.25" arrivalSpeed="13.89" duration="22.00" routeLength="181.98" waitingTime="3.00" waitingCount="1" stopTime="0.00" timeLoss="8.72" rerouteNo="0" devices="tripinfo_car_SE.1" vType="car" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="11.00" arrival="74.00" arrivalPos="0.00" duration="74.00" routeLength="101.75" timeLoss="0.74" maxSpeed="1.39"/>
+        <walk depart="0.00" departPos="11.00" arrival="105.00" arrivalPos="43.63" duration="105.00" routeLength="145.38" timeLoss="0.33" maxSpeed="1.39"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/striping/subsecond/block_vehicles_walking_forward/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/subsecond/block_vehicles_walking_forward/tripinfos.sumo
index 827f30a0186..8a8730a26b8 100644
--- a/tests/sumo/pedestrian_model/striping/subsecond/block_vehicles_walking_forward/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/subsecond/block_vehicles_walking_forward/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 02/13/18 16:08:55 by SUMO Version v0_32_0+0193-b79a12bb06
+<!-- generated on 02/27/18 13:00:31 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,6 +44,6 @@ SPDX-License-Identifier: EPL-2.0
     <tripinfo id="car_SE.0" depart="46.00" departLane="SC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="64.90" arrivalLane="CE_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="18.90" routeLength="174.95" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="5.60" rerouteNo="0" devices="tripinfo_car_SE.0" vType="car" speedFactor="1.00" vaporized=""/>
     <tripinfo id="car_SE.1" depart="50.00" departLane="SC_3" departPos="5.10" departSpeed="0.00" departDelay="0.00" arrival="72.40" arrivalLane="CE_3" arrivalPos="86.15" arrivalSpeed="13.89" duration="22.40" routeLength="174.95" waitingTime="0.00" waitingCount="0" stopTime="0.00" timeLoss="9.12" rerouteNo="0" devices="tripinfo_car_SE.1" vType="car" speedFactor="1.00" vaporized=""/>
     <personinfo id="p0" depart="0.00">
-        <walk depart="0.00" departPos="11.00" arrival="73.70" arrivalPos="0.00" duration="73.70" routeLength="102.10" timeLoss="0.19" maxSpeed="1.39"/>
+        <walk depart="0.00" departPos="11.00" arrival="104.90" arrivalPos="43.45" duration="104.90" routeLength="145.55" timeLoss="0.10" maxSpeed="1.39"/>
     </personinfo>
 </tripinfos>
diff --git a/tests/sumo/pedestrian_model/striping/tls/tlIndex2/tripinfos.sumo b/tests/sumo/pedestrian_model/striping/tls/tlIndex2/tripinfos.sumo
index e146076be10..6ac3a45664a 100644
--- a/tests/sumo/pedestrian_model/striping/tls/tlIndex2/tripinfos.sumo
+++ b/tests/sumo/pedestrian_model/striping/tls/tlIndex2/tripinfos.sumo
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Fri Feb 23 09:53:55 2018 by SUMO Version v0_32_0+0527-c9e9e3e
+<!-- generated on 02/27/18 13:00:33 by SUMO Version v0_32_0+0405-d1c1ff1104
 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,9 +33,9 @@ SPDX-License-Identifier: EPL-2.0
 
 <tripinfos xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/tripinfo_file.xsd">
     <personinfo id="EW" depart="10.00">
-        <walk depart="10.00" departPos="82.25" arrival="44.00" arrivalPos="0.00" duration="34.00" routeLength="30.50" timeLoss="12.04" maxSpeed="1.39"/>
+        <walk depart="10.00" departPos="82.25" arrival="76.00" arrivalPos="43.63" duration="66.00" routeLength="74.13" timeLoss="12.63" maxSpeed="1.39"/>
     </personinfo>
     <personinfo id="WE" depart="10.00">
-        <walk depart="10.00" departPos="5.00" arrival="127.00" arrivalPos="0.00" duration="117.00" routeLength="117.75" timeLoss="32.22" maxSpeed="1.39"/>
+        <walk depart="10.00" departPos="5.00" arrival="96.00" arrivalPos="43.63" duration="86.00" routeLength="74.13" timeLoss="32.63" maxSpeed="1.39"/>
     </personinfo>
 </tripinfos>