Skip to content

Commit

Permalink
patching expected results refs #21, #14731
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed Apr 23, 2024
1 parent 23380e7 commit 64a8f49
Show file tree
Hide file tree
Showing 16 changed files with 67 additions and 67 deletions.
10 changes: 5 additions & 5 deletions tests/netconvert/bugs/ticket12676/net.netconvert
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-17 16:26:03 by Eclipse SUMO netconvert Version v1_19_0+1873-98d0cec83e7
<!-- generated on 2024-04-23 09:34:32 by Eclipse SUMO netconvert Version v1_19_0+1900-d72e6ec8654
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
Expand Down Expand Up @@ -214,22 +214,22 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<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" 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"/>
<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.70,5686.76 5767.49,5685.94 5765.61,5685.25 5766.17,5682.81 5768.11,5683.52 5772.45,5684.62 5770.60,5686.73 5772.42,5687.22 5772.99,5685.15 5773.50,5683.70 5773.93,5682.85 5774.30,5682.61 5774.60,5682.98 5774.83,5683.95 5776.81,5683.65 5772.45,5684.62"/>
</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"/>
</edge>
<edge id=":gneJ21_w1" function="walkingarea">
<lane id=":gneJ21_w1_0" index="0" allow="pedestrian" speed="2.78" length="10.77" width="2.80" shape="5791.97,5667.66 5792.92,5665.96 5793.94,5664.24 5791.53,5662.86 5789.45,5661.63 5787.83,5660.36 5786.82,5658.88 5786.54,5657.03 5787.12,5654.61 5793.94,5664.24 5787.12,5654.61 5785.26,5653.89 5785.01,5651.05 5790.99,5662.99 5791.21,5663.78 5791.52,5664.47 5791.92,5665.07 5792.42,5665.59"/>
<lane id=":gneJ21_w1_0" index="0" allow="pedestrian" speed="2.78" length="10.77" width="2.80" shape="5791.97,5667.66 5793.94,5664.24 5791.37,5662.56 5789.37,5660.91 5787.95,5659.29 5787.10,5657.70 5786.83,5656.14 5787.12,5654.61 5787.12,5654.61 5785.26,5653.89 5785.01,5651.05 5790.99,5662.99 5791.21,5663.78 5791.52,5664.47 5791.92,5665.07 5792.42,5665.59"/>
</edge>
<edge id=":gneJ21_w2" function="walkingarea">
<lane id=":gneJ21_w2_0" index="0" allow="pedestrian" speed="2.78" length="11.22" width="3.00" shape="5774.00,5645.66 5771.08,5647.27 5769.41,5646.17 5768.40,5647.58 5767.43,5648.60 5766.43,5649.24 5765.28,5649.52 5763.91,5649.48 5762.23,5649.12 5769.41,5646.17 5762.23,5649.12 5761.45,5652.02 5753.72,5651.76 5768.77,5648.89 5769.29,5648.78 5769.79,5648.55 5770.26,5648.21 5770.72,5647.75"/>
<lane id=":gneJ21_w2_0" index="0" allow="pedestrian" speed="2.78" length="11.22" width="3.00" shape="5774.00,5645.66 5769.41,5646.17 5768.45,5647.40 5767.40,5648.34 5766.25,5648.98 5765.01,5649.32 5763.67,5649.37 5762.23,5649.12 5762.23,5649.12 5761.45,5652.02 5753.72,5651.76 5768.77,5648.89 5769.29,5648.78 5769.79,5648.55 5770.26,5648.21 5770.72,5647.75"/>
</edge>
<edge id=":gneJ21_w3" function="walkingarea">
<lane id=":gneJ21_w3_0" index="0" allow="pedestrian" speed="2.78" length="9.81" width="3.00" shape="5749.68,5669.63 5747.06,5668.63 5747.35,5670.45 5746.35,5673.28 5753.65,5678.28 5755.63,5678.56 5756.80,5683.24 5757.36,5680.80"/>
</edge>
<edge id=":gneJ21_w4" function="walkingarea">
<lane id=":gneJ21_w4_0" index="0" allow="pedestrian" speed="2.78" length="5.20" width="2.50" shape="5770.60,5686.73 5774.83,5683.95 5776.81,5683.65 5771.81,5686.79 5776.81,5683.65 5771.63,5684.80 5771.25,5684.94 5770.98,5685.23 5770.78,5685.64 5770.63,5686.14"/>
<lane id=":gneJ21_w4_0" index="0" allow="pedestrian" speed="2.78" length="5.20" width="2.50" shape="5770.60,5686.73 5772.42,5687.22 5772.99,5685.15 5773.50,5683.70 5773.93,5682.85 5774.30,5682.61 5774.60,5682.98 5774.83,5683.95 5776.81,5683.65 5771.63,5684.80 5771.25,5684.94 5770.98,5685.23 5770.78,5685.64 5770.63,5686.14"/>
</edge>
<edge id=":gneJ21_w5" function="walkingarea">
<lane id=":gneJ21_w5_0" index="0" allow="pedestrian" speed="2.78" length="2.36" width="2.80" shape="5786.40,5672.08 5788.86,5673.42 5787.69,5675.46 5785.23,5674.14"/>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-08 16:12:54 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
<!-- generated on 2024-04-23 09:34:31 by Eclipse SUMO netconvert Version v1_19_0+1900-d72e6ec8654
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
Expand Down Expand Up @@ -2064,7 +2064,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id=":1568241231_w0_0" index="0" allow="pedestrian" speed="2.78" length="2.04" width="4.00" shape="4483.98,155.67 4484.74,157.52 4486.68,157.02 4486.45,156.37 4486.13,155.88 4485.72,155.57 4485.23,155.43 4484.65,155.47"/>
</edge>
<edge id=":1568241231_w1" function="walkingarea">
<lane id=":1568241231_w1_0" index="0" allow="pedestrian" speed="2.78" length="9.53" width="4.00" shape="4492.88,155.43 4494.82,154.93 4493.60,151.57 4491.92,149.07 4489.78,147.45 4487.20,146.71 4484.20,146.86 4480.77,147.91 4481.54,149.76 4484.33,148.89 4486.77,148.75 4488.84,149.33 4490.55,150.64 4491.90,152.67"/>
<lane id=":1568241231_w1_0" index="0" allow="pedestrian" speed="2.78" length="9.53" width="4.00" shape="4492.88,155.43 4494.82,154.93 4493.60,151.52 4491.93,149.00 4489.82,147.38 4487.25,146.66 4484.24,146.84 4480.77,147.91 4481.54,149.76 4484.33,148.89 4486.77,148.75 4488.84,149.33 4490.55,150.64 4491.90,152.67"/>
</edge>
<edge id=":1568241232_0" function="internal">
<lane id=":1568241232_0_0" index="0" allow="delivery" speed="5.77" length="6.59" shape="4462.19,168.54 4461.13,166.49 4460.01,165.16 4458.85,164.54 4457.63,164.63"/>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-08 16:12:53 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
<!-- generated on 2024-04-23 09:34:31 by Eclipse SUMO netconvert Version v1_19_0+1900-d72e6ec8654
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
Expand Down Expand Up @@ -47,10 +47,10 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id=":21487229_3_0" index="0" disallow="pedestrian rail_urban rail rail_electric" speed="3.65" length="4.67" shape="100.04,96.62 100.56,97.96 100.43,98.84 99.64,99.27 98.20,99.24"/>
</edge>
<edge id=":21487229_c0" function="crossing" crossingEdges="-4615548 4615548">
<lane id=":21487229_c0_0" index="0" allow="pedestrian" speed="2.78" length="6.40" width="4.00" shape="98.92,101.70 102.59,96.45" outlineShape="97.28,100.55 100.95,95.31 105.31,96.06 104.96,95.75 102.10,93.67 101.01,95.22 104.23,97.60 100.56,102.84 96.87,103.41 97.06,102.97 97.34,102.24 97.52,101.54 97.53,100.95 97.28,100.55"/>
<lane id=":21487229_c0_0" index="0" allow="pedestrian" speed="2.78" length="6.40" width="4.00" shape="98.92,101.70 102.59,96.45" outlineShape="97.28,100.55 100.95,95.31 105.17,96.25 104.76,95.79 102.10,93.67 101.01,95.22 104.23,97.60 100.56,102.84 96.87,103.41 97.06,102.97 97.34,102.24 97.52,101.54 97.53,100.95 97.28,100.55"/>
</edge>
<edge id=":21487229_w0" function="walkingarea">
<lane id=":21487229_w0_0" index="0" allow="pedestrian" speed="2.78" length="9.41" width="4.00" shape="105.75,106.98 108.63,107.84 109.36,104.51 109.35,101.84 108.60,99.63 107.13,97.67 104.96,95.75 102.10,93.67 100.95,95.31 102.99,96.96 104.54,98.74 105.58,100.62 106.14,102.63 106.19,104.75"/>
<lane id=":21487229_w0_0" index="0" allow="pedestrian" speed="2.78" length="9.41" width="4.00" shape="105.75,106.98 108.63,107.84 109.11,105.24 108.96,102.74 108.19,100.33 106.78,98.01 104.76,95.79 102.10,93.67 100.95,95.31 102.99,96.96 104.54,98.74 105.58,100.62 106.14,102.63 106.19,104.75"/>
</edge>
<edge id=":21487229_w1" function="walkingarea">
<lane id=":21487229_w1_0" index="0" allow="pedestrian" speed="2.78" length="2.24" width="4.00" shape="97.28,100.55 96.14,102.19 96.77,103.66 97.06,102.97 97.34,102.24 97.52,101.54 97.53,100.95"/>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-17 16:07:32 by Eclipse SUMO netconvert Version v1_19_0+1873-98d0cec83e7
<!-- generated on 2024-04-23 09:34:30 by Eclipse SUMO netconvert Version v1_19_0+1900-d72e6ec8654
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
Expand Down Expand Up @@ -48,7 +48,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id=":C_2_1" index="1" allow="passenger" speed="7.78" length="5.34" shape="98.67,96.41 99.72,97.28 100.87,97.90 102.12,98.28 103.48,98.40"/>
</edge>
<edge id=":C_w0" function="walkingarea">
<lane id=":C_w0_0" index="0" allow="pedestrian" speed="2.78" length="8.30" width="4.00" shape="93.66,105.33 93.01,102.07 91.60,103.48 93.61,105.42 95.27,106.78 96.83,107.64 98.55,108.13 100.68,108.35 103.48,108.40 91.60,103.48 103.48,108.40 103.48,106.40 100.71,108.25 101.02,106.36 99.14,106.17 97.62,105.73 96.25,104.97 94.79,103.78"/>
<lane id=":C_w0_0" index="0" allow="pedestrian" speed="2.78" length="8.30" width="4.00" shape="93.66,105.33 91.60,103.48 93.30,104.98 95.11,106.21 97.03,107.17 99.07,107.85 101.22,108.26 103.48,108.40 103.48,108.40 103.48,106.40 100.71,108.25 101.02,106.36 99.14,106.17 97.62,105.73 96.25,104.97 94.79,103.78"/>
</edge>
<edge id=":C_w1" function="walkingarea">
<lane id=":C_w1_0" index="0" allow="pedestrian" speed="2.78" length="0.77" width="2.00" shape="103.48,93.60 103.48,91.60 102.07,93.01 102.27,93.19 102.48,93.34 102.71,93.45 102.95,93.53 103.21,93.58"/>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-08 16:12:52 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
<!-- generated on 2024-04-23 09:34:30 by Eclipse SUMO netconvert Version v1_19_0+1900-d72e6ec8654
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
Expand Down Expand Up @@ -52,7 +52,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id=":C_c1_0" index="0" allow="pedestrian" speed="2.78" length="6.40" width="4.00" shape="-3.20,93.55 3.20,93.55" outlineShape="-3.20,91.55 3.20,91.55 3.33,93.15 3.70,94.47 4.32,95.49 -2.76,95.55 -2.90,95.11 -3.20,91.55"/>
</edge>
<edge id=":C_w0" function="walkingarea">
<lane id=":C_w0_0" index="0" allow="pedestrian" speed="2.78" length="11.00" width="4.00" shape="-3.20,91.55 -6.20,91.55 -5.83,95.85 -4.72,99.21 -2.84,101.71 -0.16,103.42 3.35,104.39 7.70,104.70 7.70,103.20 4.37,102.88 1.64,101.91 -0.47,100.29 -1.99,98.02 -2.90,95.11"/>
<lane id=":C_w0_0" index="0" allow="pedestrian" speed="2.78" length="11.00" width="4.00" shape="-3.20,91.55 -6.20,91.55 -5.81,95.57 -4.66,98.86 -2.73,101.41 -0.02,103.24 3.45,104.33 7.70,104.70 7.70,103.20 4.37,102.88 1.64,101.91 -0.47,100.29 -1.99,98.02 -2.90,95.11"/>
</edge>
<edge id=":C_w1" function="walkingarea">
<lane id=":C_w1_0" index="0" allow="pedestrian" speed="2.78" length="3.98" width="4.00" shape="7.70,96.80 7.70,93.05 6.20,91.55 3.20,91.55 3.33,93.15 3.70,94.47 4.32,95.49 5.20,96.22 6.32,96.65"/>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-22 17:31:47 by Eclipse SUMO netconvert Version v1_19_0+1898-54937ed31f8
<!-- generated on 2024-04-23 09:28:05 by Eclipse SUMO netconvert Version v1_19_0+1900-d72e6ec8654
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
Expand Down Expand Up @@ -74,7 +74,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id=":137_14_0" index="0" allow="passenger" speed="13.89" length="4.02" shape="160.46,152.93 164.00,151.02"/>
</edge>
<edge id=":137_c0" function="crossing" crossingEdges="-138 138">
<lane id=":137_c0_0" index="0" allow="pedestrian" speed="2.78" length="12.80" width="4.00" shape="159.62,148.22 166.92,158.73" outlineShape="161.26,147.08 168.57,157.59 164.38,158.58 169.71,159.23 168.57,157.59 165.28,159.87 157.98,149.36 156.98,147.60 157.49,148.23 158.41,148.40 159.67,148.02 161.26,147.08"/>
<lane id=":137_c0_0" index="0" allow="pedestrian" speed="2.78" length="12.80" width="4.00" shape="159.62,148.22 166.92,158.73" outlineShape="161.26,147.08 168.57,157.59 166.19,161.17 169.71,159.23 168.57,157.59 165.28,159.87 157.98,149.36 156.98,147.60 157.49,148.23 158.41,148.40 159.67,148.02 161.26,147.08"/>
</edge>
<edge id=":137_c1" function="crossing" crossingEdges="348 -348">
<lane id=":137_c1_0" index="0" allow="pedestrian" speed="2.78" length="19.20" width="4.00" shape="137.41,144.20 156.49,146.35" outlineShape="137.63,142.21 156.71,144.36 156.81,144.38 156.64,146.21 156.90,147.50 157.49,148.23 158.29,148.38 156.27,148.34 137.19,146.19 136.45,146.11 136.70,145.79 137.27,144.28 137.63,142.21"/>
Expand All @@ -83,7 +83,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id=":137_c2_0" index="0" allow="pedestrian" speed="2.78" length="9.60" width="4.00" shape="128.54,155.16 134.08,147.32" outlineShape="126.90,154.00 132.44,146.16 133.81,146.92 134.97,147.10 135.94,146.73 136.25,146.34 135.71,148.47 130.17,156.31 130.32,156.10 126.90,154.00"/>
</edge>
<edge id=":137_w0" function="walkingarea">
<lane id=":137_w0_0" index="0" allow="pedestrian" speed="2.78" length="27.17" width="4.00" shape="126.90,154.00 169.71,159.23 168.57,157.59 162.29,161.05 155.74,162.89 148.93,163.10 141.85,161.69 134.51,158.66"/>
<lane id=":137_w0_0" index="0" allow="pedestrian" speed="2.78" length="27.17" width="4.00" shape="126.90,154.00 125.75,155.64 133.74,160.52 141.46,163.69 148.92,165.14 156.11,164.88 163.04,162.91 169.71,159.23 168.57,157.59 162.29,161.05 155.74,162.89 148.93,163.10 141.85,161.69 134.51,158.66"/>
</edge>
<edge id=":137_w1" function="walkingarea">
<lane id=":137_w1_0" index="0" allow="pedestrian" speed="2.78" length="3.33" width="4.00" shape="161.26,147.08 160.12,145.43 158.70,144.59 156.71,144.36 156.64,146.21 156.90,147.50 157.49,148.23 158.41,148.40 159.67,148.02"/>
Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- generated on 2024-04-08 16:12:51 by Eclipse SUMO netconvert Version v1_19_0+1720-a3ca558d345
<!-- generated on 2024-04-23 09:34:30 by Eclipse SUMO netconvert Version v1_19_0+1900-d72e6ec8654
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
Expand Down Expand Up @@ -140,13 +140,13 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
<lane id=":C_w6_0" index="0" allow="pedestrian" speed="2.78" length="13.41" width="4.50" shape="86.93,106.67 82.75,104.99 82.28,93.43 86.31,91.42"/>
</edge>
<edge id=":E_w0" function="walkingarea">
<lane id=":E_w0_0" index="0" allow="pedestrian" speed="2.78" length="18.31" width="3.00" shape="201.97,107.65 202.71,110.56 206.72,108.26 209.07,104.40 209.77,99.77 208.85,95.18 206.33,91.43 202.22,89.33 201.61,92.27 203.72,93.68 205.04,96.43 205.53,99.87 205.20,103.33 204.01,106.14"/>
<lane id=":E_w0_0" index="0" allow="pedestrian" speed="2.78" length="18.31" width="3.00" shape="201.97,107.65 202.71,110.56 205.54,108.47 207.17,104.59 207.64,99.82 206.95,95.08 205.14,91.28 202.22,89.33 201.61,92.27 203.72,93.68 205.04,96.43 205.53,99.87 205.20,103.33 204.01,106.14"/>
</edge>
<edge id=":N_w0" function="walkingarea">
<lane id=":N_w0_0" index="0" allow="pedestrian" speed="2.78" length="18.47" width="3.00" shape="92.39,197.87 89.50,197.06 89.57,201.66 91.94,205.58 95.83,208.42 100.45,209.79 105.00,209.30 108.70,206.57 106.31,204.76 104.10,206.03 101.00,205.92 97.66,204.73 94.69,202.79 92.72,200.40"/>
<lane id=":N_w0_0" index="0" allow="pedestrian" speed="2.78" length="18.47" width="3.00" shape="92.39,197.87 89.50,197.06 89.96,200.55 92.67,203.85 96.77,206.53 101.38,208.16 105.65,208.32 108.70,206.57 106.31,204.76 104.10,206.03 101.00,205.92 97.66,204.73 94.69,202.79 92.72,200.40"/>
</edge>
<edge id=":S_w0" function="walkingarea">
<lane id=":S_w0_0" index="0" allow="pedestrian" speed="2.78" length="17.70" width="3.00" shape="107.26,-3.13 110.01,-4.31 107.31,-8.07 103.55,-10.19 99.32,-10.71 95.18,-9.66 91.72,-7.08 89.52,-3.01 92.41,-2.18 93.85,-4.22 96.43,-5.56 99.61,-6.15 102.84,-5.96 105.57,-4.97"/>
<lane id=":S_w0_0" index="0" allow="pedestrian" speed="2.78" length="17.70" width="3.00" shape="107.26,-3.13 110.01,-4.31 107.68,-6.86 103.91,-8.23 99.46,-8.48 95.07,-7.67 91.51,-5.82 89.52,-3.01 92.41,-2.18 93.85,-4.22 96.43,-5.56 99.61,-6.15 102.84,-5.96 105.57,-4.97"/>
</edge>
<edge id=":W_w0" function="walkingarea">
<lane id=":W_w0_0" index="0" allow="pedestrian" speed="2.78" length="18.80" width="3.00" shape="-0.05,92.10 -0.07,89.10 0.03,110.90 0.02,107.90"/>
Expand Down

0 comments on commit 64a8f49

Please sign in to comment.