From 19072996f26ff7fb092f1f4b8e340fb43fd9874f Mon Sep 17 00:00:00 2001
From: Jakob Erdmann <jakob.erdmann@dlr.de>
Date: Wed, 18 Sep 2024 17:40:21 +0200
Subject: [PATCH] patching expected meso results refs #21, #15503

---
 .../extended/stops/looped_skip/stopinfos.sumo.meso   | 12 +++++++-----
 .../stops/looped_skip_noWarn/errors.sumo.meso        |  2 ++
 .../stops/looped_skip_noWarn/stopinfos.sumo.meso     | 11 ++++++-----
 .../stops/looped_skip_warn/stopinfos.sumo.meso       | 12 +++++++-----
 4 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 tests/sumo/extended/stops/looped_skip_noWarn/errors.sumo.meso

diff --git a/tests/sumo/extended/stops/looped_skip/stopinfos.sumo.meso b/tests/sumo/extended/stops/looped_skip/stopinfos.sumo.meso
index 1896d160c14b..a3cd0a8df966 100644
--- a/tests/sumo/extended/stops/looped_skip/stopinfos.sumo.meso
+++ b/tests/sumo/extended/stops/looped_skip/stopinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-03-22 17:17:47 by Eclipse SUMO sumo Version v1_16_0+1570-ec89ba0
+<!-- generated on 2024-09-18 17:39:42 by Eclipse SUMO sumo Version v1_20_0+2037-cac2a3bac63
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -11,10 +11,10 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
-        <net-file value="net.net.xml"/>
+        <net-file value="net2.net.xml"/>
         <route-files value="input_routes.rou.xml"/>
     </input>
 
@@ -24,6 +24,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </output>
 
     <processing>
+        <tls.all-off value="true"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -37,9 +38,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <mesosim value="true"/>
     </mesoscopic>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
-    <stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="links" pos="97.95" parking="0" started="56.42" ended="74.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+    <stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="33.10" ended="45.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+    <stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="91.06" ended="103.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
 </stops>
diff --git a/tests/sumo/extended/stops/looped_skip_noWarn/errors.sumo.meso b/tests/sumo/extended/stops/looped_skip_noWarn/errors.sumo.meso
new file mode 100644
index 000000000000..c02d828cc5ca
--- /dev/null
+++ b/tests/sumo/extended/stops/looped_skip_noWarn/errors.sumo.meso
@@ -0,0 +1,2 @@
+Warning: Network contains internal links which are ignored. Vehicles will 'jump' across junctions and thus underestimate route lengths and travel times.
+Warning: Vehicle 'v0' has multiple stops on segment 'CN:0', time=16.62 (stop-output will be merged).
diff --git a/tests/sumo/extended/stops/looped_skip_noWarn/stopinfos.sumo.meso b/tests/sumo/extended/stops/looped_skip_noWarn/stopinfos.sumo.meso
index 1896d160c14b..425a9ceb8810 100644
--- a/tests/sumo/extended/stops/looped_skip_noWarn/stopinfos.sumo.meso
+++ b/tests/sumo/extended/stops/looped_skip_noWarn/stopinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-03-22 17:17:47 by Eclipse SUMO sumo Version v1_16_0+1570-ec89ba0
+<!-- generated on 2024-09-18 17:39:42 by Eclipse SUMO sumo Version v1_20_0+2037-cac2a3bac63
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -11,10 +11,10 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
-        <net-file value="net.net.xml"/>
+        <net-file value="net2.net.xml"/>
         <route-files value="input_routes.rou.xml"/>
     </input>
 
@@ -24,6 +24,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </output>
 
     <processing>
+        <tls.all-off value="true"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -37,9 +38,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <mesosim value="true"/>
     </mesoscopic>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
-    <stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="links" pos="97.95" parking="0" started="56.42" ended="74.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+    <stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="6.62" ended="24.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
 </stops>
diff --git a/tests/sumo/extended/stops/looped_skip_warn/stopinfos.sumo.meso b/tests/sumo/extended/stops/looped_skip_warn/stopinfos.sumo.meso
index 1896d160c14b..a3cd0a8df966 100644
--- a/tests/sumo/extended/stops/looped_skip_warn/stopinfos.sumo.meso
+++ b/tests/sumo/extended/stops/looped_skip_warn/stopinfos.sumo.meso
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-03-22 17:17:47 by Eclipse SUMO sumo Version v1_16_0+1570-ec89ba0
+<!-- generated on 2024-09-18 17:39:42 by Eclipse SUMO sumo Version v1_20_0+2037-cac2a3bac63
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -11,10 +11,10 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
+<sumoConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/sumoConfiguration.xsd">
 
     <input>
-        <net-file value="net.net.xml"/>
+        <net-file value="net2.net.xml"/>
         <route-files value="input_routes.rou.xml"/>
     </input>
 
@@ -24,6 +24,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </output>
 
     <processing>
+        <tls.all-off value="true"/>
         <default.speeddev value="0"/>
     </processing>
 
@@ -37,9 +38,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <mesosim value="true"/>
     </mesoscopic>
 
-</configuration>
+</sumoConfiguration>
 -->
 
 <stops xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/stopinfo_file.xsd">
-    <stopinfo id="v0" type="DEFAULT_VEHTYPE" edge="links" pos="97.95" parking="0" started="56.42" ended="74.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+    <stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="33.10" ended="45.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
+    <stopinfo id="v0" type="t0" edge="CN" pos="0.00" parking="0" started="91.06" ended="103.00" initialPersons="0" loadedPersons="0" unloadedPersons="0" initialContainers="0" loadedContainers="0" unloadedContainers="0"/>
 </stops>