patching expected results refs #21, #15943

eclipse-sumo · Dec 20, 2024 · fb9ec07 · fb9ec07
1 parent 1782fa2
commit fb9ec07
Show file tree

Hide file tree

Showing 16 changed files with 1,178 additions and 1,289 deletions.
diff --git a/tests/netconvert/function/bikeLanes/connections_mixed/connections/net.netconvert b/tests/netconvert/function/bikeLanes/connections_mixed/connections/net.netconvert
diff --git a/tests/netconvert/function/bikeLanes/connections_mixed/connections2/net.netconvert b/tests/netconvert/function/bikeLanes/connections_mixed/connections2/net.netconvert
diff --git a/tests/netconvert/function/bikeLanes/connections_mixed/merge_right/net.netconvert b/tests/netconvert/function/bikeLanes/connections_mixed/merge_right/net.netconvert
diff --git a/tests/netconvert/function/bikeLanes/connections_mixed/merge_straight/net.netconvert b/tests/netconvert/function/bikeLanes/connections_mixed/merge_straight/net.netconvert
diff --git a/tests/netconvert/function/bikeLanes/connections_mixed/merge_straight_verge/net.netconvert b/tests/netconvert/function/bikeLanes/connections_mixed/merge_straight_verge/net.netconvert
diff --git a/tests/netconvert/import/OSM/bugs/ticket9062/typemap_ped_bike/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket9062/typemap_ped_bike/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-28 22:49:39 by Eclipse SUMO netconvert Version v1_19_0+1959-e51fd22bc0f
+<!-- generated on 2024-12-20 13:46:40 by Eclipse SUMO netconvert Version v1_21_0+1546-57149b55864
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
         <type-files value="/scr1/sumo/data/typemap/osmNetconvert.typ.xml,/scr1/sumo/data/typemap/osmNetconvertPedestrians.typ.xml,/scr1/sumo/data/typemap/osmNetconvertBicycle.typ.xml"/>
@@ -39,7 +39,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <xml-validation value="never"/>
     </report>
 
-</configuration>
+</netconvertConfiguration>
 -->
 
 <net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
@@ -345,7 +345,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="-142575672#3" to="158236381" fromLane="1" toLane="1" allow="bus delivery bicycle" tl="cluster_1652675097_1652675099_1704693785_2697454318_#12more" linkIndex="12" dir="r" state="o"/>
     <connection from="-142575672#3" to="52080655#2" fromLane="1" toLane="1" tl="cluster_1652675097_1652675099_1704693785_2697454318_#12more" linkIndex="13" dir="s" state="o"/>
     <connection from="-142575672#3" to="52080655#2" fromLane="1" toLane="2" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" tl="cluster_1652675097_1652675099_1704693785_2697454318_#12more" linkIndex="14" dir="s" state="o"/>
-    <connection from="-142575672#3" to="670062912#1" fromLane="1" toLane="1" tl="cluster_1652675097_1652675099_1704693785_2697454318_#12more" linkIndex="15" dir="l" state="o"/>
+    <connection from="-142575672#3" to="670062912#1" fromLane="2" toLane="1" tl="cluster_1652675097_1652675099_1704693785_2697454318_#12more" linkIndex="15" dir="l" state="o"/>
     <connection from="-142575672#3" to="670062912#1" fromLane="2" toLane="3" disallow="pedestrian tram rail_urban rail rail_electric rail_fast ship container cable_car subway aircraft wheelchair scooter drone" tl="cluster_1652675097_1652675099_1704693785_2697454318_#12more" linkIndex="16" dir="l" state="o"/>
     <connection from="-142575672#3" to="142575672#3" fromLane="2" toLane="1" tl="cluster_1652675097_1652675099_1704693785_2697454318_#12more" linkIndex="17" dir="t" state="o"/>
     <connection from="-142575672#4" to="-142575672#3" fromLane="1" toLane="1" dir="s" state="M"/>

diff --git a/tests/netconvert/import/OSM/public_transport/bus_stop_direction_from_pt_lines/net.netconvert b/tests/netconvert/import/OSM/public_transport/bus_stop_direction_from_pt_lines/net.netconvert
diff --git a/tests/netconvert/import/OSM/public_transport/duplicate_lines/net.netconvert b/tests/netconvert/import/OSM/public_transport/duplicate_lines/net.netconvert
diff --git a/tests/netconvert/import/OSM/public_transport/ptline_network_modification/net.netconvert b/tests/netconvert/import/OSM/public_transport/ptline_network_modification/net.netconvert
diff --git a/tests/netconvert/import/XML/connection_guessing/4arm_rw3/net.netconvert b/tests/netconvert/import/XML/connection_guessing/4arm_rw3/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 13:56:02 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+<!-- generated on 2024-12-20 14:05:35 by Eclipse SUMO netconvert Version v1_21_0+1546-57149b55864
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
         <node-files value="input_plain.nod.xml"/>
@@ -33,7 +33,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <xml-validation value="never"/>
     </report>
 
-</configuration>
+</netconvertConfiguration>
 -->
 
 <net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
@@ -215,10 +215,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <connection from="171826985#3" to="-534588621#1" fromLane="4" toLane="2" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="6" dir="l" state="o"/>
     <connection from="202156994#0" to="-534588621#1" fromLane="1" toLane="1" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="14" dir="r" state="O"/>
     <connection from="202156994#0" to="-534588621#1" fromLane="1" toLane="2" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="15" dir="r" state="O"/>
-    <connection from="202156994#0" to="72157174#1" fromLane="1" toLane="1" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="16" dir="s" state="O"/>
-    <connection from="202156994#0" to="72157174#1" fromLane="2" toLane="2" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="17" dir="s" state="O"/>
-    <connection from="202156994#0" to="72157174#1" fromLane="3" toLane="3" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="18" dir="s" state="O"/>
-    <connection from="202156994#0" to="4773465#1" fromLane="4" toLane="1" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="19" dir="l" state="o"/>
+    <connection from="202156994#0" to="72157174#1" fromLane="2" toLane="1" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="16" dir="s" state="O"/>
+    <connection from="202156994#0" to="72157174#1" fromLane="3" toLane="2" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="17" dir="s" state="O"/>
+    <connection from="202156994#0" to="72157174#1" fromLane="4" toLane="3" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="18" dir="s" state="O"/>
+    <connection from="202156994#0" to="4773465#1" fromLane="5" toLane="1" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="19" dir="l" state="o"/>
     <connection from="202156994#0" to="4773465#1" fromLane="5" toLane="3" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="20" dir="l" state="o"/>
     <connection from="202157002#3" to="24913519#1" fromLane="1" toLane="1" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="21" dir="r" state="o"/>
     <connection from="202157002#3" to="-534588621#1" fromLane="1" toLane="1" tl="cluster_1827996421_1827996431_1827996455_2121324874_21487210_29221504_29221506_341340973_3792418589_3792418616_3792418629_3792418630_3792418641_3792418791" linkIndex="22" dir="s" state="o"/>

diff --git a/tests/netconvert/import/XML/connection_guessing/bus_bay_bikelanes2/net.netconvert b/tests/netconvert/import/XML/connection_guessing/bus_bay_bikelanes2/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 13:56:02 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+<!-- generated on 2024-12-20 14:05:35 by Eclipse SUMO netconvert Version v1_21_0+1546-57149b55864
 This data file and the accompanying materials
 are made available under the terms of the Eclipse Public License v2.0
 which accompanies this distribution, and is available at
@@ -11,7 +11,7 @@ Public License 2.0 are satisfied: GNU General Public License, version 2
 or later which is available at
 https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
 SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
-<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
+<netconvertConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
         <node-files value="input_plain.nod.xml"/>
@@ -34,7 +34,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <ignore-errors.edge-type value="true"/>
     </report>
 
-</configuration>
+</netconvertConfiguration>
 -->
 
 <net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">

diff --git a/tests/netconvert/import/XML/connection_guessing/turn_lane_bike/net.netconvert b/tests/netconvert/import/XML/connection_guessing/turn_lane_bike/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-12-20 10:14:24 by Eclipse SUMO netconvert Version v1_21_0+1522-8cbae08792c
+<!-- generated on 2024-12-20 13:46:35 by Eclipse SUMO netconvert Version v1_21_0+1546-57149b55864
 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
@@ -169,7 +169,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <connection from="-4402014#2" to="4588220#0" fromLane="1" toLane="1" tl="GS_25662542" linkIndex="11" dir="r" state="o"/>
     <connection from="-4402014#2" to="-4588217#5" fromLane="1" toLane="1" tl="GS_25662542" linkIndex="12" dir="s" state="o"/>
-    <connection from="-4402014#2" to="-326116286#2" fromLane="1" toLane="1" tl="GS_25662542" linkIndex="13" dir="l" state="o"/>
+    <connection from="-4402014#2" to="-326116286#2" fromLane="2" toLane="1" tl="GS_25662542" linkIndex="13" dir="l" state="o"/>
     <connection from="-4402014#2" to="-326116286#2" fromLane="2" toLane="2" tl="GS_25662542" linkIndex="14" dir="l" state="o"/>
     <connection from="-4588220#2" to="-4588217#5" fromLane="1" toLane="1" tl="GS_25662542" linkIndex="5" dir="r" state="O"/>
     <connection from="-4588220#2" to="-326116286#2" fromLane="1" toLane="1" tl="GS_25662542" linkIndex="6" dir="s" state="O"/>

diff --git a/tests/tools/import/OSM/webWizard/errors.tools b/tests/tools/import/OSM/webWizard/errors.tools
@@ -122,19 +122,15 @@ Warning: Could not import polygon from relation '2678660' (name: reason: found g
 Warning: Could not import polygon from relation '4065109' (missing ways)
 Warning: Could not import polygon from relation '8178851' (missing ways)
 Warning: 7 total messages of type: Could not import polygon from relation '%' (missing ways)
-Warning: At actuated tlLogic 'GS_25662542', linkIndex 13,14,15 has no controlling detector.
+Warning: At actuated tlLogic 'GS_cluster_21487285_29207836', linkIndex 16 has no controlling detector.
 Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 8,9,10,30 has no controlling detector.
-Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 2,8,9,10,31,32,33,34 has no controlling detector.
+Warning: At actuated tlLogic 'cluster_1827996421_1827996431_1827996455_2121324874_#10more', linkIndex 16 has no controlling detector.
+Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 2,7,8,9,10,31,32,33,34 has no controlling detector.
 Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 5,6,16,24,32,33 has no controlling detector.
 Warning: busStop '30731700' on lane '167272531#9_0' is too short for vehicle '21_tram_12:1'.
 Warning: busStop '30731700' on lane '167272531#9_0' is too short for vehicle 'pt_tram_12:1.0'.
-Warning: Person 'ped122' is jammed on edge ':1828018040_c0', time=639.00.
-Warning: Vehicle 'pt_tram_12:0.1' performs emergency braking on lane ':98973667_3_0' with decel=7.00, wished=3.00, severity=1.00, time=755.00.
 Warning: Person 'ped67' aborted waiting for M5:3 at busStop '30731481'.
 Warning: Person 'ped94' aborted waiting for N2:0 at busStop '2915590925'.
-Warning: Person 'ped145' aborted waiting for N42:0 at busStop '2915590925'.
-Warning: Person 'ped157' aborted waiting for N42:1 at busStop '3867910439'.
-Warning: Person 'ped136' aborted waiting for N42:1 at busStop '3867910439'.
-Warning: Person 'ped155' aborted waiting for N42:1 at busStop '3867910439'.
-Warning: Person 'ped59' aborted waiting for M5:0 at busStop '1633759766'.
+Warning: Person 'ped53' aborted waiting for 200:0 at busStop '1827996417'.
+Warning: Person 'ped75' aborted waiting for 200:0 at busStop '1827996417'.
 Warning: Person 'ped47' aborted waiting for TXL:0 at busStop '3869306771'.