patching expected results refs #21, #14512

eclipse-sumo · Mar 15, 2024 · 0505fec · 0505fec
1 parent fc10775
commit 0505fec
Show file tree

Hide file tree

Showing 16 changed files with 1,168 additions and 677 deletions.
diff --git a/tests/netconvert/import/OSM/public_transport/monorail_all/additional.netconvert b/tests/netconvert/import/OSM/public_transport/monorail_all/additional.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-10-14 08:53:20 by Eclipse SUMO netconvert Version v1_14_1+1724-2e45f2b
+<!-- generated on 2024-03-15 10:15:50 by Eclipse SUMO netconvert Version v1_19_0+1305-3dcf69d3212
 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
@@ -45,10 +45,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 -->
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
-    <busStop id="-1609100922" name="Westende" lane="-326203720_0" startPos="2324.11" endPos="2524.11" friendlyPos="true"/>
+    <busStop id="-1609100922" name="Westende" lane="-326203720_0" startPos="2324.11" endPos="2524.11" friendlyPos="true" lines="60"/>
     <busStop id="-266775534" name="Hammerstein" lane="-36388592_0" startPos="980.20" endPos="1180.20" friendlyPos="true"/>
-    <busStop id="-271135646" name="Pestalozzistraße" lane="-326203720_0" startPos="1799.43" endPos="1999.43" friendlyPos="true"/>
-    <busStop id="-271135683" name="Robert-Daum-Platz" lane="-326203720_0" startPos="974.72" endPos="1174.72" friendlyPos="true"/>
+    <busStop id="-271135646" name="Pestalozzistraße" lane="-326203720_0" startPos="1799.43" endPos="1999.43" friendlyPos="true" lines="60"/>
+    <busStop id="-271135683" name="Robert-Daum-Platz" lane="-326203720_0" startPos="974.72" endPos="1174.72" friendlyPos="true" lines="60"/>
     <busStop id="-271135716" name="Wuppertal Hauptbahnhof" lane="-305115095_0" startPos="0.00" endPos="44.03" friendlyPos="true"/>
     <busStop id="-271135733" name="Kluse" lane="-305115093_0" startPos="711.21" endPos="911.21" friendlyPos="true"/>
     <busStop id="-271135799" name="Loher Brücke" lane="-37195413_0" startPos="3113.86" endPos="3313.86" friendlyPos="true"/>
@@ -58,9 +58,9 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <busStop id="-272692299" name="Landgericht" lane="-305115093_0" startPos="0.00" endPos="200.00" friendlyPos="true"/>
     <busStop id="-272692551" name="Völklinger Straße" lane="-37195413_0" startPos="3881.60" endPos="4081.60" friendlyPos="true"/>
     <busStop id="-272694179" name="Alter Markt" lane="-37195413_0" startPos="1823.30" endPos="2023.30" friendlyPos="true"/>
-    <busStop id="-3125935756" name="Ohligsmühle" lane="-326203720_0" startPos="300.31" endPos="500.31" friendlyPos="true"/>
+    <busStop id="-3125935756" name="Ohligsmühle" lane="-326203720_0" startPos="300.31" endPos="500.31" friendlyPos="true" lines="60"/>
     <busStop id="-3328241005" name="Zoo/Stadion" lane="-326203722_0" startPos="24.79" endPos="49.79" friendlyPos="true"/>
-    <busStop id="-380536713" name="Varresbecker Straße" lane="-326203720_0" startPos="3197.00" endPos="3397.00" friendlyPos="true"/>
+    <busStop id="-380536713" name="Varresbecker Straße" lane="-326203720_0" startPos="3197.00" endPos="3397.00" friendlyPos="true" lines="60"/>
     <busStop id="-432883106" name="Sonnborner Straße" lane="-36388592_0" startPos="348.36" endPos="548.36" friendlyPos="true"/>
     <busStop id="-432883109" name="Zoo/Stadion" lane="-326203721_0" startPos="24.72" endPos="49.72" friendlyPos="true"/>
     <busStop id="-454042501" name="Bruch" lane="-36388592_0" startPos="1842.08" endPos="2042.08" friendlyPos="true"/>

diff --git a/tests/netconvert/import/OSM/public_transport/monorail_all/errors.netconvert b/tests/netconvert/import/OSM/public_transport/monorail_all/errors.netconvert
@@ -10,5 +10,5 @@ Warning: Could not re-assign PT stop '271135812', probably broken osm file.
 Warning: Could not re-assign PT stop '271135799', probably broken osm file.
 Warning: Ambiguity in turnarounds computation at junction '271135578'.
 Warning: Ambiguity in turnarounds computation at junction '453246005'.
-Warning: 18 total messages of type: Could not re-assign PT stop '%', probably broken osm file.
+Warning: 13 total messages of type: Could not re-assign PT stop '%', probably broken osm file.
 Warning: 6 total messages of type: Ignoring track count % for edge '%'.
diff --git a/tests/netconvert/import/OSM/railway/S42/net.netconvert b/tests/netconvert/import/OSM/railway/S42/net.netconvert
diff --git a/tests/netconvert/import/OSM/railway/S42_all_signals/net.netconvert b/tests/netconvert/import/OSM/railway/S42_all_signals/net.netconvert
diff --git a/tests/netconvert/import/OSM/railway/S42_custom_signals/net.netconvert b/tests/netconvert/import/OSM/railway/S42_custom_signals/net.netconvert
diff --git a/tests/netconvert/import/OSM/railway/inconsistent_directions2/additional.netconvert b/tests/netconvert/import/OSM/railway/inconsistent_directions2/additional.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-05-14 10:59:23 by Eclipse SUMO netconvert Version v1_17_0+0277-c73eb30
+<!-- generated on 2024-03-15 10:15:50 by Eclipse SUMO netconvert Version v1_19_0+1305-3dcf69d3212
 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
@@ -40,7 +40,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
 <additional xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/additional_file.xsd">
     <busStop id="-2513869313" name="S Griebnitzsee" lane="-4469442_0" startPos="384.49" endPos="584.49" friendlyPos="true"/>
-    <busStop id="-2514016658" name="S Potsdam Hauptbahnhof" lane="-28984028#1_0" startPos="0.00" endPos="48.83" friendlyPos="true"/>
+    <busStop id="-2514016658" name="S Potsdam Hauptbahnhof" lane="-28984028#1_0" startPos="0.00" endPos="48.83" friendlyPos="true" lines="S7"/>
     <busStop id="-318701320" name="S Babelsberg" lane="-28983424#1_0" startPos="0.00" endPos="162.46" friendlyPos="true"/>
     <busStop id="2513869313" name="S Griebnitzsee" lane="4469442_0" startPos="189.88" endPos="389.88" friendlyPos="true" lines="S7"/>
     <busStop id="2514016658" name="S Potsdam Hauptbahnhof" lane="28984028#1_0" startPos="0.00" endPos="48.83" friendlyPos="true"/>

diff --git a/tests/netconvert/import/OSM/railway/inconsistent_directions2/errors.netconvert b/tests/netconvert/import/OSM/railway/inconsistent_directions2/errors.netconvert
@@ -4,5 +4,5 @@ Warning: The referenced geometry information (ref='27133048') is not known
 Warning: The referenced geometry information (ref='365416591') is not known
 Warning: The referenced geometry information (ref='318693769') is not known
 Warning: Discarding unknown compound 'usage.main' in type 'railway.light_rail|usage.main' (first occurrence for edge '4469442').
-Warning: Could not re-assign PT stop '2514016658', probably broken osm file.
+Warning: PT stop '2514016658' has been moved to edge '-28984028#1'.
 Warning: 11 total messages of type: The referenced geometry information (ref='%') is not known