patching expected results refs #21, #14512

eclipse-sumo · Mar 15, 2024 · e8d1eb7 · e8d1eb7
1 parent 2ee619a
commit e8d1eb7
Show file tree

Hide file tree

Showing 17 changed files with 539 additions and 19 deletions.
diff --git a/tests/netconvert/bugs/ticket10777/net.netconvert b/tests/netconvert/bugs/ticket10777/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-03-14 16:51:43 by Eclipse SUMO netconvert Version v1_19_0+1300-b92ca839bda
+<!-- generated on 2024-03-15 11:03:55 by Eclipse SUMO netconvert Version v1_19_0+1307-c3315d84abc
 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
@@ -534,12 +534,16 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <junction id="7781074470" type="dead_end" x="30.85" y="16.15" incLanes="" intLanes="" shape="29.42,16.86 32.28,15.43"/>
     <junction id="8149932746" type="rail_signal" x="26.14" y="14.17" incLanes="875611587#2_0" intLanes=":8149932746_0_0" shape="24.70,14.88 27.57,13.45 24.70,14.88">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="8149932748" type="rail_signal" x="54.94" y="78.11" incLanes="875611585_0" intLanes=":8149932748_0_0" shape="53.49,78.81 56.49,77.70 56.39,77.41 53.39,78.53">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="8149932750" type="dead_end" x="107.43" y="307.04" incLanes="" intLanes="" shape="109.01,306.78 105.85,307.30"/>
-    <junction id="8149932751" type="dead_end" x="111.20" y="307.40" incLanes="875611586#2_0" intLanes="" shape="112.78,307.16 109.62,307.63"/>
+    <junction id="8149932751" type="dead_end" x="111.20" y="307.40" incLanes="875611586#2_0" intLanes="" shape="112.78,307.16 109.62,307.63">
+        <param key="railway:signal:direction" value="forward"/>
+    </junction>
     <junction id="cluster_251025052_282514172_286726504_3287948381_#2more" type="traffic_light" x="94.25" y="51.70" incLanes="-561742173_0 26323985#0_0 916807055_0 384732623_0 1056718384#0_0 1056718384#0_1 1056718384#0_2 26186987#2_0 26186987#2_1" intLanes=":cluster_251025052_282514172_286726504_3287948381_#2more_0_0 :cluster_251025052_282514172_286726504_3287948381_#2more_1_0 :cluster_251025052_282514172_286726504_3287948381_#2more_2_0 :cluster_251025052_282514172_286726504_3287948381_#2more_31_0 :cluster_251025052_282514172_286726504_3287948381_#2more_32_0 :cluster_251025052_282514172_286726504_3287948381_#2more_33_0 :cluster_251025052_282514172_286726504_3287948381_#2more_6_0 :cluster_251025052_282514172_286726504_3287948381_#2more_7_0 :cluster_251025052_282514172_286726504_3287948381_#2more_8_0 :cluster_251025052_282514172_286726504_3287948381_#2more_8_1 :cluster_251025052_282514172_286726504_3287948381_#2more_34_0 :cluster_251025052_282514172_286726504_3287948381_#2more_35_0 :cluster_251025052_282514172_286726504_3287948381_#2more_36_0 :cluster_251025052_282514172_286726504_3287948381_#2more_13_0 :cluster_251025052_282514172_286726504_3287948381_#2more_14_0 :cluster_251025052_282514172_286726504_3287948381_#2more_15_0 :cluster_251025052_282514172_286726504_3287948381_#2more_16_0 :cluster_251025052_282514172_286726504_3287948381_#2more_37_0 :cluster_251025052_282514172_286726504_3287948381_#2more_38_0 :cluster_251025052_282514172_286726504_3287948381_#2more_19_0 :cluster_251025052_282514172_286726504_3287948381_#2more_20_0 :cluster_251025052_282514172_286726504_3287948381_#2more_21_0 :cluster_251025052_282514172_286726504_3287948381_#2more_22_0 :cluster_251025052_282514172_286726504_3287948381_#2more_23_0 :cluster_251025052_282514172_286726504_3287948381_#2more_24_0 :cluster_251025052_282514172_286726504_3287948381_#2more_25_0 :cluster_251025052_282514172_286726504_3287948381_#2more_26_0 :cluster_251025052_282514172_286726504_3287948381_#2more_27_0 :cluster_251025052_282514172_286726504_3287948381_#2more_39_0 :cluster_251025052_282514172_286726504_3287948381_#2more_40_0 :cluster_251025052_282514172_286726504_3287948381_#2more_41_0" shape="86.81,64.11 102.64,60.58 102.36,58.49 102.41,57.72 102.58,57.14 102.86,56.74 103.27,56.54 102.53,53.42 104.83,47.14 105.26,43.97 105.15,43.16 103.85,40.24 100.83,41.39 99.74,41.65 98.92,41.70 98.38,41.54 98.12,41.16 80.64,45.65 80.76,46.78 80.66,47.22 80.45,47.58 80.14,47.87 79.72,48.07 84.53,63.27">
         <request index="0"  response="0000000000000000000000000000000" foes="0000000000000000000000010000000" cont="0"/>
         <request index="1"  response="0100000100000010000001100000000" foes="0100000100000010000001110000000" cont="0"/>

diff --git a/tests/netconvert/bugs/ticket10826/net.netconvert b/tests/netconvert/bugs/ticket10826/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-03-14 16:51:43 by Eclipse SUMO netconvert Version v1_19_0+1300-b92ca839bda
+<!-- generated on 2024-03-15 11:03:55 by Eclipse SUMO netconvert Version v1_19_0+1307-c3315d84abc
 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
@@ -717,15 +717,19 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <junction id="301870609" type="dead_end" x="200.84" y="23.51" incLanes="33289080#2_0 33289080#2_1" intLanes="" shape="197.70,22.91 203.99,24.11"/>
     <junction id="3153581358" type="rail_signal" x="233.86" y="124.65" incLanes="310003023#1_0" intLanes=":3153581358_0_0" shape="233.50,126.21 234.44,123.16 234.27,123.10 233.22,126.12">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="3153585663" type="rail_signal" x="320.39" y="146.27" incLanes="310144574#0_0" intLanes=":3153585663_0_0" shape="320.14,147.86 320.85,144.74 320.70,144.70 319.86,147.79">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="3153585678" type="rail_signal" x="584.62" y="213.25" incLanes="310144574#1_0" intLanes=":3153585678_0_0" shape="584.43,214.84 584.95,211.68 584.14,214.78 584.28,214.82">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="3155095017" type="rail_signal" x="185.08" y="157.07" incLanes="310143559#2_0" intLanes=":3155095017_0_0" shape="186.65,157.37 183.58,156.48 183.49,156.78 186.58,157.63">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="3155095026" type="dead_end" x="66.98" y="767.69" incLanes="" intLanes="" shape="68.57,767.94 65.40,767.45"/>
     <junction id="3156641235" type="dead_end" x="211.52" y="10.25" incLanes="310264604_0" intLanes="" shape="209.93,10.04 213.10,10.46"/>
@@ -833,21 +837,27 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     </junction>
     <junction id="7781218437" type="rail_signal" x="93.77" y="613.03" incLanes="310143559#0_0" intLanes=":7781218437_0_0" shape="95.34,613.32 92.20,612.73 95.34,613.32">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="7781218438" type="rail_signal" x="107.97" y="555.43" incLanes="25290479#1_0" intLanes=":7781218438_0_0" shape="109.54,555.71 106.39,555.15 109.54,555.72">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="7781218440" type="rail_signal" x="116.55" y="493.74" incLanes="310143559#1_0" intLanes=":7781218440_0_0" shape="118.11,494.06 114.98,493.42 118.11,494.06">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="7781218441" type="rail_signal" x="130.52" y="441.31" incLanes="25290479#0_0" intLanes=":7781218441_0_0" shape="132.09,441.62 128.96,440.99 132.09,441.62">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="7781218446" type="rail_signal" x="205.81" y="79.51" incLanes="26811659#0_0" intLanes=":7781218446_0_0" shape="207.41,79.56 204.24,79.16 204.20,79.45 207.38,79.86">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="7781218448" type="rail_signal" x="362.77" y="159.25" incLanes="310003023#0_0" intLanes=":7781218448_0_0" shape="362.44,160.82 363.11,157.69 362.44,160.82">
         <request index="0" response="0" foes="0" cont="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="9710305460" type="traffic_light" x="181.81" y="130.12" incLanes="316779266#2_0 316779266#2_1 316779266#2_2" intLanes=":9710305460_0_0 :9710305460_0_1 :9710305460_0_2" shape="186.55,130.89 177.13,129.07 177.09,129.23 186.48,131.27">
         <request index="0" response="000" foes="000" cont="0"/>

diff --git a/tests/netconvert/import/OSM/bugs/ticket8039/net.netconvert b/tests/netconvert/import/OSM/bugs/ticket8039/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-03-14 16:51:37 by Eclipse SUMO netconvert Version v1_19_0+1300-b92ca839bda
+<!-- generated on 2024-03-15 11:03:50 by Eclipse SUMO netconvert Version v1_19_0+1307-c3315d84abc
 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
@@ -608,9 +608,11 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
     <junction id="5672130270" type="dead_end" x="379.83" y="744.18" incLanes="" intLanes="" shape="381.21,745.23 381.28,743.23 378.38,743.21 378.43,745.21"/>
     <junction id="7847344753" type="rail_signal" x="432.10" y="328.05" incLanes="859066429#0_0" intLanes="" shape="433.71,328.10 430.53,327.71 430.49,328.01 433.67,328.38">
         <request index="0" response="0" foes="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="7847344754" type="rail_signal" x="426.88" y="349.33" incLanes="859066431#1_0" intLanes="" shape="428.49,349.35 425.31,349.00 425.28,349.30 428.46,349.65">
         <request index="0" response="0" foes="0"/>
+        <param key="railway:signal:direction" value="forward"/>
     </junction>
     <junction id="8007877014" type="dead_end" x="458.28" y="0.00" incLanes="859066427#2_0" intLanes="" shape="456.69,-0.08 459.88,0.08"/>
     <junction id="8007877017" type="dead_end" x="436.82" y="283.67" incLanes="" intLanes="" shape="435.23,283.51 438.42,283.84"/>