patching expected results. refs #12, #11668

eclipse-sumo · Apr 8, 2024 · cb96430 · cb96430
1 parent 864cebc
commit cb96430
Show file tree

Hide file tree

Showing 135 changed files with 1,726 additions and 1,724 deletions.
diff --git a/tests/netconvert/bugs/ticket12676/net.netconvert b/tests/netconvert/bugs/ticket12676/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 13:56:13 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+<!-- generated on 2024-04-08 16:12:58 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
 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
@@ -193,28 +193,28 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":gneJ21_44_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="12.84" length="19.75" shape="5765.64,5667.69 5766.93,5668.86 5769.78,5676.67 5768.94,5686.33"/>
     </edge>
     <edge id=":gneJ21_c0" function="crossing" crossingEdges="gneE12">
-        <lane id=":gneJ21_c0_0" index="0" allow="pedestrian" speed="2.78" length="9.88" width="2.80" customShape="1" shape="5786.46,5674.80 5781.79,5683.51"/>
+        <lane id=":gneJ21_c0_0" index="0" allow="pedestrian" speed="2.78" length="9.88" width="2.80" customShape="1" shape="5786.46,5674.80 5781.79,5683.51" outlineShape="5787.74,5675.37 5782.98,5684.26 5783.02,5684.17 5782.66,5683.82 5782.11,5684.08 5781.75,5684.69 5780.56,5682.85 5785.23,5674.14 5787.69,5675.46 5785.23,5674.14"/>
     </edge>
     <edge id=":gneJ21_c1" function="crossing" crossingEdges="28639688#1">
-        <lane id=":gneJ21_c1_0" index="0" allow="pedestrian" speed="2.78" length="6.55" width="2.80" customShape="1" shape="5790.74,5666.99 5787.63,5672.75"/>
+        <lane id=":gneJ21_c1_0" index="0" allow="pedestrian" speed="2.78" length="6.55" width="2.80" customShape="1" shape="5790.74,5666.99 5787.63,5672.75" outlineShape="5791.97,5667.66 5788.86,5673.42 5787.69,5675.46 5785.23,5674.14 5786.40,5672.08 5789.51,5666.32 5791.52,5664.47 5791.92,5665.07 5792.42,5665.59 5791.97,5667.66"/>
     </edge>
     <edge id=":gneJ21_c2" function="crossing" crossingEdges="148050455#1">
-        <lane id=":gneJ21_c2_0" index="0" allow="pedestrian" speed="2.78" length="6.85" width="2.20" customShape="1" shape="5778.38,5649.00 5784.52,5652.04"/>
+        <lane id=":gneJ21_c2_0" index="0" allow="pedestrian" speed="2.78" length="6.85" width="2.20" customShape="1" shape="5778.38,5649.00 5784.52,5652.04" outlineShape="5778.87,5648.01 5785.01,5651.05 5785.23,5653.62 5785.01,5651.05 5785.23,5653.62 5777.89,5649.99 5778.78,5647.97 5777.89,5649.99"/>
     </edge>
     <edge id=":gneJ21_c3" function="crossing" crossingEdges="-148050455#1">
-        <lane id=":gneJ21_c3_0" index="0" allow="pedestrian" speed="2.78" length="3.16" width="2.20" customShape="1" shape="5773.50,5646.64 5776.32,5648.07"/>
+        <lane id=":gneJ21_c3_0" index="0" allow="pedestrian" speed="2.78" length="3.16" width="2.20" customShape="1" shape="5773.50,5646.64 5776.32,5648.07" outlineShape="5774.00,5645.66 5776.82,5647.09 5778.87,5648.01 5777.89,5649.99 5775.82,5649.05 5771.84,5647.03 5774.00,5645.66"/>
     </edge>
     <edge id=":gneJ21_c4" function="crossing" crossingEdges="737320747#4.146">
-        <lane id=":gneJ21_c4_0" index="0" allow="pedestrian" speed="2.78" length="9.24" width="2.80" customShape="1" shape="5751.73,5660.89 5755.03,5652.26"/>
+        <lane id=":gneJ21_c4_0" index="0" allow="pedestrian" speed="2.78" length="9.24" width="2.80" customShape="1" shape="5751.73,5660.89 5755.03,5652.26" outlineShape="5750.42,5660.39 5753.72,5651.76 5756.68,5651.86 5753.72,5651.76 5756.68,5651.86 5753.04,5661.39 5750.42,5660.39 5753.04,5661.39"/>
     </edge>
     <edge id=":gneJ21_c5" function="crossing" crossingEdges="54169280#0">
-        <lane id=":gneJ21_c5_0" index="0" allow="pedestrian" speed="2.78" length="6.43" width="2.80" customShape="1" shape="5748.37,5669.13 5750.69,5663.13"/>
+        <lane id=":gneJ21_c5_0" index="0" allow="pedestrian" speed="2.78" length="6.43" width="2.80" customShape="1" shape="5748.37,5669.13 5750.69,5663.13" outlineShape="5747.06,5668.63 5749.38,5662.63 5750.42,5660.39 5753.04,5661.39 5752.00,5663.63 5749.68,5669.63 5747.06,5668.63"/>
     </edge>
     <edge id=":gneJ21_c6" function="crossing" crossingEdges="30399663#1">
-        <lane id=":gneJ21_c6_0" index="0" allow="pedestrian" speed="2.78" length="9.04" width="2.50" customShape="1" shape="5765.89,5684.03 5757.08,5682.02"/>
+        <lane id=":gneJ21_c6_0" index="0" allow="pedestrian" speed="2.78" length="9.04" width="2.50" customShape="1" shape="5765.89,5684.03 5757.08,5682.02" outlineShape="5765.61,5685.25 5756.80,5683.24 5757.36,5680.80 5766.17,5682.81 5765.61,5685.25 5766.17,5682.81"/>
     </edge>
     <edge id=":gneJ21_c7" function="crossing" crossingEdges="-30399663#1">
-        <lane id=":gneJ21_c7_0" index="0" allow="pedestrian" speed="2.78" length="3.21" width="2.50" customShape="1" shape="5770.91,5685.52 5767.80,5684.73"/>
+        <lane id=":gneJ21_c7_0" index="0" allow="pedestrian" speed="2.78" length="3.21" width="2.50" customShape="1" shape="5770.91,5685.52 5767.80,5684.73" outlineShape="5770.60,5686.73 5767.49,5685.94 5765.61,5685.25 5766.17,5682.81 5768.11,5683.52 5772.45,5684.62 5771.63,5684.80 5771.25,5684.94 5770.98,5685.23 5770.78,5685.64 5770.63,5686.14 5770.60,5686.73"/>
     </edge>
     <edge id=":gneJ21_w0" function="walkingarea">
         <lane id=":gneJ21_w0_0" index="0" allow="pedestrian" speed="2.78" length="3.47" width="2.80" shape="5781.50,5687.03 5783.49,5686.79 5783.02,5684.17 5782.66,5683.82 5782.11,5684.08 5781.75,5684.69 5781.55,5685.55 5781.50,5686.55"/>

diff --git a/tests/netconvert/bugs/ticket13542b/net.netconvert b/tests/netconvert/bugs/ticket13542b/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 13:56:13 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+<!-- generated on 2024-04-08 16:12:58 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
 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
@@ -43,7 +43,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":9945733962_0_0" index="0" allow="bicycle" speed="5.56" length="3.69" width="1.00" shape="47.89,73.99 45.72,76.97"/>
     </edge>
     <edge id=":9945733962_c0" function="crossing" crossingEdges="886496552#6">
-        <lane id=":9945733962_c0_0" index="0" allow="pedestrian" speed="2.78" length="1.00" width="4.00" shape="46.32,75.32 47.12,75.91"/>
+        <lane id=":9945733962_c0_0" index="0" allow="pedestrian" speed="2.78" length="1.00" width="4.00" shape="46.32,75.32 47.12,75.91" outlineShape="47.49,73.70 48.30,74.29 45.95,77.52 45.14,76.94 47.49,73.70 47.38,73.83 46.39,75.57 45.14,76.94"/>
     </edge>
     <edge id=":9945733962_w0" function="walkingarea">
         <lane id=":9945733962_w0_0" index="0" allow="pedestrian" speed="2.78" length="2.23" width="4.00" shape="46.12,77.27 47.73,78.45 48.43,76.59 49.26,74.76 49.92,75.46 48.30,74.29 45.95,77.52"/>
@@ -90,19 +90,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":cluster_261705708_8243171049_987195315_9945733967_12_0" index="0" disallow="pedestrian bicycle tram rail_urban rail rail_electric rail_fast ship" speed="8.39" length="4.03" shape="57.89,65.60 61.03,68.12"/>
     </edge>
     <edge id=":cluster_261705708_8243171049_987195315_9945733967_c0" function="crossing" crossingEdges="-23925119#3 23925119#3">
-        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c0_0" index="0" allow="pedestrian" speed="2.78" length="6.40" width="4.00" shape="60.17,65.70 56.83,71.16"/>
+        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c0_0" index="0" allow="pedestrian" speed="2.78" length="6.40" width="4.00" shape="60.17,65.70 56.83,71.16" outlineShape="61.87,66.75 58.53,72.21 56.57,71.23 54.73,70.77 59.17,63.49 59.35,64.18 60.32,65.55 61.87,66.75"/>
     </edge>
     <edge id=":cluster_261705708_8243171049_987195315_9945733967_c1" function="crossing" crossingEdges="886496552#4">
-        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c1_0" index="0" allow="pedestrian" speed="2.78" length="1.00" width="4.00" shape="59.19,58.14 59.97,58.76"/>
+        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c1_0" index="0" allow="pedestrian" speed="2.78" length="1.00" width="4.00" shape="59.19,58.14 59.97,58.76" outlineShape="60.34,56.50 61.28,57.24 59.88,59.16 59.24,60.72 57.95,59.72 60.42,56.57 57.95,59.72"/>
     </edge>
     <edge id=":cluster_261705708_8243171049_987195315_9945733967_c2" function="crossing" crossingEdges="1102336903#0">
-        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c2_0" index="0" allow="pedestrian" speed="2.78" length="9.60" width="4.00" shape="49.66,50.82 57.27,56.67"/>
+        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c2_0" index="0" allow="pedestrian" speed="2.78" length="9.60" width="4.00" shape="49.66,50.82 57.27,56.67" outlineShape="50.80,49.17 58.49,55.09 56.05,58.26 58.49,55.09 56.05,58.26 48.44,52.40 50.88,49.23"/>
     </edge>
     <edge id=":cluster_261705708_8243171049_987195315_9945733967_c3" function="crossing" crossingEdges="40191606">
-        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c3_0" index="0" allow="pedestrian" speed="2.78" length="9.60" width="4.00" shape="43.82,74.07 35.89,68.66"/>
+        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c3_0" index="0" allow="pedestrian" speed="2.78" length="9.60" width="4.00" shape="43.82,74.07 35.89,68.66" outlineShape="42.69,75.72 34.76,70.31 37.02,67.01 44.95,72.42 42.69,75.72 46.22,75.47 47.20,73.73 47.61,73.54 49.96,70.30 44.95,72.42"/>
     </edge>
     <edge id=":cluster_261705708_8243171049_987195315_9945733967_c4" function="crossing" crossingEdges="886496552#6">
-        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c4_0" index="0" allow="pedestrian" speed="2.78" length="1.00" width="4.00" shape="49.59,72.51 48.78,71.92"/>
+        <lane id=":cluster_261705708_8243171049_987195315_9945733967_c4_0" index="0" allow="pedestrian" speed="2.78" length="1.00" width="4.00" shape="49.59,72.51 48.78,71.92" outlineShape="48.50,74.18 47.53,73.48 49.96,70.30 51.44,71.38 49.83,72.51 48.42,74.13"/>
     </edge>
     <edge id=":cluster_261705708_8243171049_987195315_9945733967_w0" function="walkingarea">
         <lane id=":cluster_261705708_8243171049_987195315_9945733967_w0_0" index="0" allow="pedestrian" speed="2.78" length="5.67" width="4.00" shape="61.87,66.75 62.71,65.33 63.75,63.62 62.79,58.40 61.21,57.17 59.88,59.16 59.13,60.99 58.96,62.67 59.35,64.18 60.32,65.55"/>

diff --git a/tests/netconvert/bugs/ticket1557/net.netconvert b/tests/netconvert/bugs/ticket1557/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 13:56:13 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+<!-- generated on 2024-04-08 16:12:56 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
 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
@@ -87,13 +87,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":C_11_0" index="0" allow="passenger" speed="13.89" length="4.55" shape="100.96,107.90 101.60,112.40"/>
     </edge>
     <edge id=":C_c0" function="crossing" crossingEdges="CN NC">
-        <lane id=":C_c0_0" index="0" allow="pedestrian" speed="2.78" length="12.80" width="4.50" shape="106.40,110.15 93.60,110.15"/>
+        <lane id=":C_c0_0" index="0" allow="pedestrian" speed="2.78" length="12.80" width="4.50" shape="106.40,110.15 93.60,110.15" outlineShape="106.50,112.40 93.50,112.40 93.60,107.90 106.40,107.90 106.40,112.40"/>
     </edge>
     <edge id=":C_c1" function="crossing" crossingEdges="CS SC">
-        <lane id=":C_c1_0" index="0" allow="pedestrian" speed="2.78" length="12.80" width="4.50" shape="93.60,89.85 106.40,89.85"/>
+        <lane id=":C_c1_0" index="0" allow="pedestrian" speed="2.78" length="12.80" width="4.50" shape="93.60,89.85 106.40,89.85" outlineShape="93.50,87.60 106.50,87.60 106.40,92.10 93.60,92.10 93.60,87.60"/>
     </edge>
     <edge id=":C_c2" function="crossing" crossingEdges="CW WC">
-        <lane id=":C_c2_0" index="0" allow="pedestrian" speed="2.78" length="12.80" width="4.50" shape="89.85,106.40 89.85,93.60"/>
+        <lane id=":C_c2_0" index="0" allow="pedestrian" speed="2.78" length="12.80" width="4.50" shape="89.85,106.40 89.85,93.60" outlineShape="87.60,106.50 87.60,93.50 92.10,93.60 92.10,106.40 87.60,106.40"/>
     </edge>
     <edge id=":C_w0" function="walkingarea">
         <lane id=":C_w0_0" index="0" allow="pedestrian" speed="2.78" length="4.86" width="4.50" shape="92.10,106.40 87.60,106.40 87.60,107.90 87.60,110.90 89.10,112.40 92.10,112.40 93.60,112.40 93.60,107.90"/>

diff --git a/tests/netconvert/bugs/ticket1586/net.netconvert b/tests/netconvert/bugs/ticket1586/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 13:56:13 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+<!-- generated on 2024-04-08 16:12:56 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
 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
@@ -46,7 +46,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":gneJ0_1_2" index="2" disallow="pedestrian" speed="13.89" length="8.44" shape="174.79,1.68 166.83,1.63"/>
     </edge>
     <edge id=":gneJ0_c0" function="crossing" crossingEdges="cyclepath_in">
-        <lane id=":gneJ0_c0_0" index="0" allow="pedestrian" speed="2.78" length="3.20" width="4.00" shape="172.51,10.61 169.35,11.12"/>
+        <lane id=":gneJ0_c0_0" index="0" allow="pedestrian" speed="2.78" length="3.20" width="4.00" shape="172.51,10.61 169.35,11.12" outlineShape="172.83,12.59 169.67,13.09 169.44,12.03 169.11,11.16 168.70,10.49 168.19,10.01 167.59,9.72 167.04,9.65 169.04,9.14 172.20,8.64 172.70,8.56 172.60,9.17 172.61,10.71 172.83,12.59"/>
     </edge>
     <edge id=":gneJ0_w0" function="walkingarea">
         <lane id=":gneJ0_w0_0" index="0" allow="pedestrian" speed="2.78" length="3.81" width="4.00" shape="172.83,12.59 174.66,8.48 174.70,6.48 173.85,6.63 173.22,7.13 172.80,7.98 172.60,9.17 172.61,10.71"/>
@@ -65,7 +65,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":gneJ1_3_0" index="0" allow="bicycle" speed="7.48" length="4.18" shape="78.96,9.79 77.52,11.15 76.39,13.03"/>
     </edge>
     <edge id=":gneJ1_c0" function="crossing" crossingEdges="cyclepath_out">
-        <lane id=":gneJ1_c0_0" index="0" allow="pedestrian" speed="2.78" length="3.20" width="4.00" shape="78.67,11.87 75.75,10.55"/>
+        <lane id=":gneJ1_c0_0" index="0" allow="pedestrian" speed="2.78" length="3.20" width="4.00" shape="78.67,11.87 75.75,10.55" outlineShape="77.85,13.69 74.93,12.38 75.58,10.78 75.97,9.48 76.08,8.51 80.83,10.65 80.73,10.68 79.85,11.15 79.08,11.81 78.41,12.66 77.85,13.69"/>
     </edge>
     <edge id=":gneJ1_w0" function="walkingarea">
         <lane id=":gneJ1_w0_0" index="0" allow="pedestrian" speed="2.78" length="4.19" width="4.00" shape="77.85,13.69 82.83,12.29 82.81,10.29 81.72,10.39 80.73,10.68 79.85,11.15 79.08,11.81 78.41,12.66"/>

diff --git a/tests/netconvert/bugs/ticket1586d/net.netconvert b/tests/netconvert/bugs/ticket1586d/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-02-29 13:56:13 by Eclipse SUMO netconvert Version v1_19_0+1092-a49a04372af
+<!-- generated on 2024-04-08 16:12:56 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
 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,7 +45,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":gneJ0_1_1" index="1" disallow="pedestrian" speed="13.89" length="7.91" shape="174.79,1.68 166.83,1.63"/>
     </edge>
     <edge id=":gneJ0_c0" function="crossing" crossingEdges="cyclepath_in">
-        <lane id=":gneJ0_c0_0" index="0" allow="pedestrian" speed="2.78" length="3.20" width="4.00" shape="172.51,10.61 169.35,11.12"/>
+        <lane id=":gneJ0_c0_0" index="0" allow="pedestrian" speed="2.78" length="3.20" width="4.00" shape="172.51,10.61 169.35,11.12" outlineShape="172.83,12.59 169.67,13.09 169.44,12.03 169.11,11.16 168.70,10.49 168.19,10.01 167.59,9.72 167.04,9.65 169.04,9.14 172.20,8.64 172.70,8.56 172.60,9.17 172.61,10.71 172.83,12.59"/>
     </edge>
     <edge id=":gneJ0_w0" function="walkingarea">
         <lane id=":gneJ0_w0_0" index="0" allow="pedestrian" speed="2.78" length="3.81" width="4.00" shape="172.83,12.59 174.66,8.48 174.70,6.48 173.85,6.63 173.22,7.13 172.80,7.98 172.60,9.17 172.61,10.71"/>
@@ -64,7 +64,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":gneJ1_3_0" index="0" allow="bicycle" speed="7.48" length="4.18" shape="78.96,9.79 77.52,11.15 76.39,13.03"/>
     </edge>
     <edge id=":gneJ1_c0" function="crossing" crossingEdges="cyclepath_out">
-        <lane id=":gneJ1_c0_0" index="0" allow="pedestrian" speed="2.78" length="3.20" width="4.00" shape="78.67,11.87 75.75,10.55"/>
+        <lane id=":gneJ1_c0_0" index="0" allow="pedestrian" speed="2.78" length="3.20" width="4.00" shape="78.67,11.87 75.75,10.55" outlineShape="77.85,13.69 74.93,12.38 75.58,10.78 75.97,9.48 76.08,8.51 80.83,10.65 80.73,10.68 79.85,11.15 79.08,11.81 78.41,12.66 77.85,13.69"/>
     </edge>
     <edge id=":gneJ1_w0" function="walkingarea">
         <lane id=":gneJ1_w0_0" index="0" allow="pedestrian" speed="2.78" length="4.19" width="4.00" shape="77.85,13.69 82.83,12.29 82.81,10.29 81.72,10.39 80.73,10.68 79.85,11.15 79.08,11.81 78.41,12.66"/>