patching expected results refs #21, #4392

eclipse-sumo · Feb 22, 2024 · 52f6d06 · 52f6d06
1 parent 4998ef0
commit 52f6d06
Show file tree

Hide file tree

Showing 21 changed files with 2,390 additions and 2,497 deletions.
diff --git a/tests/netconvert/import/OSM/bugs/ticket12223/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket12223/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-05 10:32:16 by Eclipse SUMO netconvert Version v1_14_1+11463-7dae0f08724
+<!-- generated on 2024-02-22 13:54:09 by Eclipse SUMO netconvert Version v1_19_0+0965-4998ef0cb0f
 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
@@ -292,8 +292,8 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="808642122#3_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="21.05" shape="108.69,85.00 105.60,105.67"/>
     </edge>
     <edge id="93203448" from="3895729380" to="597395969" priority="11" type="cycleway.lane|cycleway.track|highway.secondary">
-        <lane id="93203448_0" index="0" allow="bicycle" speed="13.89" length="3.01" width="1.50" shape="100.27,-1.80 100.34,-1.61"/>
-        <lane id="93203448_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="3.01" shape="98.04,-1.06 98.10,-0.87"/>
+        <lane id="93203448_0" index="0" allow="bicycle" speed="13.89" length="3.01" width="1.50" shape="108.63,-4.56 108.69,-4.37"/>
+        <lane id="93203448_1" index="1" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="3.01" width="12.00" shape="102.22,-2.44 102.28,-2.25"/>
     </edge>
     <edge id="998193588" from="273473116" to="1883138781" priority="17" type="railway.tram" spreadType="center" shape="3.57,97.99 0.00,99.35">
         <lane id="998193588_0" index="0" allow="tram" speed="13.89" length="4.48" shape="2.20,98.51 0.00,99.35"/>
@@ -497,7 +497,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <request index="3" response="0000" foes="0000"/>
     </junction>
     <junction id="3895729380" type="dead_end" x="96.71" y="0.00" incLanes="-93203448_0 -93203448_1" intLanes="" shape="96.71,0.00 92.24,1.47 96.71,0.00"/>
-    <junction id="597395969" type="priority" x="97.28" y="1.74" incLanes="-176072020#0_0 -176072020#0_1 93203448_0 93203448_1 46733382#1_0" intLanes="" shape="93.49,5.30 105.49,1.46 100.86,-2.40 91.94,0.54 90.95,2.34 91.46,4.28">
+    <junction id="597395969" type="priority" x="97.28" y="1.74" incLanes="-176072020#0_0 -176072020#0_1 93203448_0 93203448_1 46733382#1_0" intLanes="" shape="93.49,5.30 105.49,1.46 109.22,-5.16 91.94,0.54 90.95,2.34 91.46,4.28">
         <request index="0" response="00000" foes="00000"/>
         <request index="1" response="00000" foes="00000"/>
         <request index="2" response="00000" foes="00000"/>

diff --git a/tests/netconvert/import/OSM/bugs/ticket869/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket869/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-05-09 15:52:31 by Eclipse SUMO netconvert Version v1_17_0+0192-02ed9c7dd44
+<!-- generated on 2024-02-22 13:54:07 by Eclipse SUMO netconvert Version v1_19_0+0965-4998ef0cb0f
 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
@@ -54,18 +54,18 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="157562752_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="20216614.24" shape="6657136.08,19089107.64 -1.51,0.53"/>
     </edge>
     <edge id="8614778" from="61330091" to="61321502" priority="3" type="highway.residential" spreadType="center" shape="574138.68,13718947.37 574165.80,13718990.57 574191.62,13719031.59 574221.78,13719077.72">
-        <lane id="8614778_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="154.60" shape="574140.04,13718946.52 574167.15,13718989.72 574192.97,13719030.73 574223.12,13719076.85"/>
-        <lane id="8614778_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="154.60" shape="574137.33,13718948.22 574164.44,13718991.42 574190.28,13719032.46 574220.44,13719078.60"/>
+        <lane id="8614778_0" index="0" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="154.60" width="6.70" shape="574141.52,13718945.59 574168.63,13718988.79 574194.44,13719029.78 574224.58,13719075.89"/>
+        <lane id="8614778_1" index="1" disallow="tram rail_urban rail rail_electric rail_fast ship" speed="13.89" length="154.60" width="6.70" shape="574135.84,13718949.15 574162.96,13718992.36 574188.81,13719033.40 574218.98,13719079.56"/>
     </edge>
 
-    <junction id="1697931355" type="priority" x="0.00" y="0.00" incLanes="157562752_0" intLanes=":1697931355_0_0" shape="0.00,0.00 -3.02,1.05 0.00,-0.00">
+    <junction id="1697931355" type="priority" x="0.00" y="0.00" incLanes="157562752_0" intLanes=":1697931355_0_0" shape="0.00,-0.00 -3.02,1.05 0.00,0.00">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
     <junction id="1697931360" type="priority" x="6657137.59" y="19089107.12" incLanes="-157562752_0" intLanes=":1697931360_0_0" shape="6657137.59,19089107.12 6657140.61,19089106.06 6657137.59,19089107.12">
         <request index="0" response="0" foes="0" cont="0"/>
     </junction>
-    <junction id="61321502" type="dead_end" x="574221.78" y="13719077.72" incLanes="8614778_0 8614778_1" intLanes="" shape="574224.46,13719075.97 574219.10,13719079.47"/>
-    <junction id="61330091" type="dead_end" x="574138.68" y="13718947.37" incLanes="" intLanes="" shape="574135.97,13718949.07 574141.39,13718945.67"/>
+    <junction id="61321502" type="dead_end" x="574221.78" y="13719077.72" incLanes="8614778_0 8614778_1" intLanes="" shape="574227.39,13719074.06 574216.17,13719081.39"/>
+    <junction id="61330091" type="dead_end" x="574138.68" y="13718947.37" incLanes="" intLanes="" shape="574133.01,13718950.93 574144.36,13718943.80"/>
 
     <connection from="-157562752" to="157562752" fromLane="0" toLane="0" via=":1697931360_0_0" dir="t" state="M"/>
     <connection from="157562752" to="-157562752" fromLane="0" toLane="0" via=":1697931355_0_0" dir="t" state="M"/>

diff --git a/tests/netconvert/import/OSM/bugs/ticket8791/additional.netconvert b/tests/netconvert/import/OSM/bugs/ticket8791/additional.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-11-16 14:22:40 by Eclipse SUMO netconvert Version v1_19_0+0199-174aad6ec8d
+<!-- generated on 2024-02-22 13:54:08 by Eclipse SUMO netconvert Version v1_19_0+0965-4998ef0cb0f
 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
@@ -47,7 +47,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <busStop id="-8341032348" name="Ahrensburg, Grauer Esel" lane="-19431426#9_0" startPos="90.43" endPos="105.43" friendlyPos="true" lines="576"/>
     <busStop id="1711953915" name="Ahrensburg, Klaus-Groth-Straße" lane="11646390_0" startPos="39.04" endPos="54.04" friendlyPos="true" lines="476"/>
     <busStop id="1711953916" name="Ahrensburg, Klaus-Groth-Straße" lane="11646390_0" startPos="39.04" endPos="54.04" friendlyPos="true" lines="569 474 8110 769"/>
-    <busStop id="1711974496" name="Ahrensburg, Rathaus" lane="206357901#0_0" startPos="16.87" endPos="31.87" friendlyPos="true" lines="576 476 569 474"/>
+    <busStop id="1711974496" name="Ahrensburg, Rathaus" lane="206357901#0_0" startPos="16.97" endPos="31.97" friendlyPos="true" lines="576 476 569 474"/>
     <busStop id="1711974498" name="Ahrensburg, Rathaus" lane="297003189#5_0" startPos="0.00" endPos="13.78" friendlyPos="true" lines="476 474 569 576 8110 769"/>
     <busStop id="2705494849" name="Ahrensburg, Fritz-Reuter-Straße" lane="39546438_0" startPos="103.60" endPos="118.60" friendlyPos="true" lines="576 369 776"/>
     <busStop id="69420884" name="Ahrensburg, Reesenbüttler Graben" lane="76424358_0" startPos="12.26" endPos="27.26" friendlyPos="true" lines="369 769 776"/>