patching expected results refs #21, refs #4912

eclipse-sumo · Dec 12, 2018 · cf54021 · cf54021
1 parent c6b7170
commit cf54021
Show file tree

Hide file tree

Showing 141 changed files with 3,433 additions and 3,409 deletions.
diff --git a/tests/complex/netconvert/opendrive_roundtrip/net.complex b/tests/complex/netconvert/opendrive_roundtrip/net.complex
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 Mon Oct  1 23:14:53 2018 by Eclipse SUMO netconvert Version v1_0_1+0134-106951d
+<!-- generated on Wed Dec 12 15:44:33 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
 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
@@ -17,6 +17,7 @@ SPDX-License-Identifier: EPL-2.0
     </output>
 
     <processing>
+        <geometry.max-grade.fix value="false"/>
         <offset.disable-normalization value="true"/>
         <lefthand value="false"/>
     </processing>
@@ -55,7 +56,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":C_1_1" index="1" allow="passenger" speed="13.89" length="24.80" shape="98.40,112.40 98.40,87.60"/>
     </edge>
     <edge id=":C_8" function="internal">
-        <lane id=":C_8_0" index="0" speed="13.89" length="4.73" shape="92.10,105.98 90.93,105.28 87.60,104.80"/>
+        <lane id=":C_8_0" index="0" allow="passenger" speed="13.89" length="4.73" shape="92.10,105.98 90.93,105.28 87.60,104.80"/>
     </edge>
     <edge id=":C_3" function="internal">
         <lane id=":C_3_0" index="0" allow="passenger" speed="13.89" length="24.80" shape="104.80,87.60 104.80,112.40"/>
@@ -65,7 +66,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":C_5_0" index="0" allow="passenger" speed="13.89" length="7.60" shape="101.60,87.60 100.72,93.72 100.00,94.93"/>
     </edge>
     <edge id=":C_9" function="internal">
-        <lane id=":C_9_0" index="0" speed="13.89" length="14.98" shape="100.00,94.93 98.10,98.10 93.72,100.72 87.60,101.60"/>
+        <lane id=":C_9_0" index="0" allow="passenger" speed="13.89" length="14.98" shape="100.00,94.93 98.10,98.10 93.72,100.72 87.60,101.60"/>
     </edge>
     <edge id=":C_6" function="internal">
         <lane id=":C_6_0" index="0" allow="passenger" speed="13.89" length="7.53" shape="87.60,95.20 90.92,94.72 93.30,93.30 94.02,92.10"/>
@@ -74,10 +75,10 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":C_7_0" index="0" allow="passenger" speed="13.89" length="18.03" shape="87.60,98.40 93.72,99.28 98.10,101.90 100.72,106.28 100.96,107.90"/>
     </edge>
     <edge id=":C_10" function="internal">
-        <lane id=":C_10_0" index="0" speed="13.89" length="4.73" shape="94.02,92.10 94.72,90.93 95.20,87.60"/>
+        <lane id=":C_10_0" index="0" allow="passenger" speed="13.89" length="4.73" shape="94.02,92.10 94.72,90.93 95.20,87.60"/>
     </edge>
     <edge id=":C_11" function="internal">
-        <lane id=":C_11_0" index="0" speed="13.89" length="4.55" shape="100.96,107.90 101.60,112.40"/>
+        <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="1.00" length="12.80" width="4.50" shape="106.40,110.15 93.60,110.15"/>

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 Thu Aug 16 15:52:06 2018 by Eclipse SUMO netconvert Version c310b0a
+<!-- generated on Wed Dec 12 15:44:33 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
 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
@@ -56,7 +56,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":gneJ1_1_1" index="1" disallow="pedestrian" speed="13.89" length="10.11" shape="82.39,2.29 72.26,2.44"/>
     </edge>
     <edge id=":gneJ1_3" function="internal">
-        <lane id=":gneJ1_3_0" index="0" speed="8.27" length="4.03" shape="77.40,11.84 76.92,12.43 75.36,15.31"/>
+        <lane id=":gneJ1_3_0" index="0" allow="bicycle" speed="8.27" length="4.03" shape="77.40,11.84 76.92,12.43 75.36,15.31"/>
     </edge>
     <edge id=":gneJ1_c0" function="crossing" crossingEdges="cyclepath_out">
         <lane id=":gneJ1_c0_0" index="0" allow="pedestrian" speed="1.00" length="3.20" width="4.00" shape="77.64,14.15 74.72,12.83"/>

diff --git a/tests/netconvert/bugs/ticket1674/net.netconvert b/tests/netconvert/bugs/ticket1674/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu Aug 16 15:52:06 2018 by Eclipse SUMO netconvert Version c310b0a
+<!-- generated on Wed Dec 12 15:44:33 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
 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,10 +43,10 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":823316987_2_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="77.12,58.01 75.74,58.41 74.87,58.20"/>
     </edge>
     <edge id=":823316987_9" function="internal">
-        <lane id=":823316987_9_0" index="0" speed="7.89" length="8.68" shape="72.87,60.94 71.35,61.42 68.23,60.82 64.96,58.67"/>
+        <lane id=":823316987_9_0" index="0" disallow="rail_urban rail rail_electric" speed="7.89" length="8.68" shape="72.87,60.94 71.35,61.42 68.23,60.82 64.96,58.67"/>
     </edge>
     <edge id=":823316987_10" function="internal">
-        <lane id=":823316987_10_0" index="0" speed="3.65" length="2.34" shape="74.87,58.20 74.51,57.38 74.67,55.95"/>
+        <lane id=":823316987_10_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="74.87,58.20 74.51,57.38 74.67,55.95"/>
     </edge>
     <edge id=":823316987_3" function="internal">
         <lane id=":823316987_3_0" index="0" disallow="rail_urban rail rail_electric" speed="6.37" length="8.72" shape="67.06,56.26 69.13,57.63 71.08,58.03 72.93,57.47 74.67,55.95"/>
@@ -67,7 +67,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":823316987_8_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="67.44,67.40 68.66,66.63 69.55,66.58"/>
     </edge>
     <edge id=":823316987_11" function="internal">
-        <lane id=":823316987_11_0" index="0" speed="3.65" length="2.34" shape="69.55,66.58 70.12,67.27 70.37,68.69"/>
+        <lane id=":823316987_11_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="69.55,66.58 70.12,67.27 70.37,68.69"/>
     </edge>
     <edge id=":829260290_0" function="internal">
         <lane id=":829260290_0_0" index="0" allow="delivery bicycle pedestrian" speed="3.65" length="4.67" shape="99.32,68.04 99.77,69.41 99.58,70.28 98.77,70.66 97.34,70.54"/>
@@ -97,7 +97,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":829260313_5_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="91.30,40.49 89.92,40.91 89.04,40.71"/>
     </edge>
     <edge id=":829260313_9" function="internal">
-        <lane id=":829260313_9_0" index="0" speed="3.65" length="2.34" shape="89.04,40.71 88.68,39.90 88.82,38.46"/>
+        <lane id=":829260313_9_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="89.04,40.71 88.68,39.90 88.82,38.46"/>
     </edge>
     <edge id=":829260313_6" function="internal">
         <lane id=":829260313_6_0" index="0" disallow="rail_urban rail rail_electric" speed="13.89" length="16.58" shape="78.40,51.34 80.70,48.08 83.42,44.76 86.23,41.51 88.82,38.46"/>
@@ -109,10 +109,10 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":829260313_8_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.46" shape="78.40,51.34 79.70,50.72 80.60,50.80 80.66,50.90"/>
     </edge>
     <edge id=":829260313_10" function="internal">
-        <lane id=":829260313_10_0" index="0" speed="13.89" length="11.69" shape="82.51,48.36 85.37,47.24 89.71,45.88 93.38,44.11"/>
+        <lane id=":829260313_10_0" index="0" disallow="rail_urban rail rail_electric" speed="13.89" length="11.69" shape="82.51,48.36 85.37,47.24 89.71,45.88 93.38,44.11"/>
     </edge>
     <edge id=":829260313_11" function="internal">
-        <lane id=":829260313_11_0" index="0" speed="3.65" length="2.22" shape="80.66,50.90 81.07,51.56 81.13,53.00"/>
+        <lane id=":829260313_11_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.22" shape="80.66,50.90 81.07,51.56 81.13,53.00"/>
     </edge>
     <edge id=":829260314_0" function="internal">
         <lane id=":829260314_0_0" index="0" disallow="rail_urban rail rail_electric" speed="4.78" length="4.88" shape="81.50,57.94 80.41,56.99 79.36,56.63 78.35,56.87 77.37,57.71"/>
@@ -133,7 +133,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":829260314_5_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="81.03,53.17 79.72,53.78 78.83,53.70"/>
     </edge>
     <edge id=":829260314_9" function="internal">
-        <lane id=":829260314_9_0" index="0" speed="3.65" length="2.34" shape="78.83,53.70 78.35,52.95 78.29,51.50"/>
+        <lane id=":829260314_9_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="78.83,53.70 78.35,52.95 78.29,51.50"/>
     </edge>
     <edge id=":829260314_6" function="internal">
         <lane id=":829260314_6_0" index="0" disallow="rail_urban rail rail_electric" speed="13.89" length="5.35" shape="74.92,55.65 75.98,54.46 76.72,53.66 77.41,52.82 78.29,51.50"/>
@@ -145,10 +145,10 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":829260314_8_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="74.92,55.65 76.31,55.24 77.18,55.45"/>
     </edge>
     <edge id=":829260314_10" function="internal">
-        <lane id=":829260314_10_0" index="0" speed="6.92" length="5.65" shape="78.79,53.62 78.93,53.59 81.30,54.16 83.91,55.80"/>
+        <lane id=":829260314_10_0" index="0" allow="delivery bicycle pedestrian" speed="6.92" length="5.65" shape="78.79,53.62 78.93,53.59 81.30,54.16 83.91,55.80"/>
     </edge>
     <edge id=":829260314_11" function="internal">
-        <lane id=":829260314_11_0" index="0" speed="3.65" length="2.34" shape="77.18,55.45 77.53,56.27 77.37,57.71"/>
+        <lane id=":829260314_11_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="2.34" shape="77.18,55.45 77.53,56.27 77.37,57.71"/>
     </edge>
     <edge id=":829260331_0" function="internal">
         <lane id=":829260331_0_0" index="0" disallow="rail_urban rail rail_electric" speed="3.65" length="4.67" shape="109.26,13.62 110.64,13.21 111.52,13.40 111.88,14.22 111.74,15.66"/>

diff --git a/tests/netconvert/bugs/ticket1907/net.netconvert b/tests/netconvert/bugs/ticket1907/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Mon Nov 19 16:10:31 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
+<!-- generated on Wed Dec 12 15:44:33 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
 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
@@ -18,6 +18,7 @@ SPDX-License-Identifier: EPL-2.0
     </output>
 
     <processing>
+        <geometry.max-grade.fix value="false"/>
         <offset.disable-normalization value="true"/>
         <lefthand value="false"/>
     </processing>
@@ -51,7 +52,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":1553017429_1_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="2.34" shape="231.72,504.11 230.34,504.53 229.47,504.33"/>
     </edge>
     <edge id=":1553017429_5" function="internal">
-        <lane id=":1553017429_5_0" index="0" speed="11.11" length="2.34" shape="229.47,504.33 229.10,503.51 229.25,502.08"/>
+        <lane id=":1553017429_5_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="2.34" shape="229.47,504.33 229.10,503.51 229.25,502.08"/>
     </edge>
     <edge id=":1553017429_2" function="internal">
         <lane id=":1553017429_2_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="14.10" shape="216.90,508.28 220.85,506.81 223.77,506.07 226.35,504.88 229.25,502.08"/>
@@ -63,7 +64,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":1553017429_4_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="2.35" shape="221.84,512.85 223.19,512.34 224.08,512.47"/>
     </edge>
     <edge id=":1553017429_6" function="internal">
-        <lane id=":1553017429_6_0" index="0" speed="11.11" length="2.35" shape="224.08,512.47 224.50,513.26 224.46,514.71"/>
+        <lane id=":1553017429_6_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="2.35" shape="224.08,512.47 224.50,513.26 224.46,514.71"/>
     </edge>
     <edge id=":1553017429_c0" function="crossing" crossingEdges="-324751736 324751736">
         <lane id=":1553017429_c0_0" index="0" allow="pedestrian" speed="1.00" length="6.40" width="4.00" shape="226.74,502.61 231.69,506.67"/>
@@ -91,7 +92,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":1865620718_1_1" index="1" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="8.09" shape="152.12,486.81 153.89,488.50 155.07,489.70 156.19,490.94 157.80,492.78"/>
     </edge>
     <edge id=":1865620718_3" function="internal">
-        <lane id=":1865620718_3_0" index="0" speed="11.11" length="4.04" shape="156.73,487.77 157.61,489.18 159.34,490.81"/>
+        <lane id=":1865620718_3_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="4.04" shape="156.73,487.77 157.61,489.18 159.34,490.81"/>
     </edge>
     <edge id=":1865620718_c0" function="crossing" crossingEdges="175999152">
         <lane id=":1865620718_c0_0" index="0" allow="pedestrian" speed="1.00" length="3.20" width="4.00" shape="158.72,488.32 156.78,490.87"/>
@@ -244,7 +245,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":3526736114_2_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="5.19" shape="222.55,516.97 222.36,517.49 223.02,517.62 224.52,517.35 226.87,516.68"/>
     </edge>
     <edge id=":3526736114_9" function="internal">
-        <lane id=":3526736114_9_0" index="0" speed="11.11" length="2.34" shape="220.30,517.15 219.94,516.33 220.11,514.90"/>
+        <lane id=":3526736114_9_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="2.34" shape="220.30,517.15 219.94,516.33 220.11,514.90"/>
     </edge>
     <edge id=":3526736114_3" function="internal">
         <lane id=":3526736114_3_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="5.41" shape="215.27,516.96 216.85,516.59 217.99,516.39 218.99,515.96 220.11,514.90"/>
@@ -265,7 +266,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":3526736114_8_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="2.34" shape="216.23,519.47 217.62,519.08 218.48,519.29"/>
     </edge>
     <edge id=":3526736114_10" function="internal">
-        <lane id=":3526736114_10_0" index="0" speed="11.11" length="2.34" shape="218.48,519.29 218.84,520.11 218.67,521.54"/>
+        <lane id=":3526736114_10_0" index="0" disallow="tram rail_urban rail rail_electric pedestrian ship" speed="11.11" length="2.34" shape="218.48,519.29 218.84,520.11 218.67,521.54"/>
     </edge>
     <edge id=":3526736114_c1" function="crossing" crossingEdges="-324751734#0 182175776">
         <lane id=":3526736114_c1_0" index="0" allow="pedestrian" speed="1.00" length="6.40" width="4.00" shape="217.59,515.39 222.48,519.53"/>

diff --git a/tests/netconvert/bugs/ticket2094/net.netconvert b/tests/netconvert/bugs/ticket2094/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Thu Aug 16 15:52:06 2018 by Eclipse SUMO netconvert Version c310b0a
+<!-- generated on Wed Dec 12 15:44:33 2018 by Eclipse SUMO netconvert Version v1_0_1+0645-93703db
 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
@@ -51,7 +51,7 @@ SPDX-License-Identifier: EPL-2.0
         <lane id=":cluster_294152029_560899595_593898177_4_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="3.65" length="2.53" shape="59.77,92.12 58.36,92.40 57.51,92.11 57.45,91.94"/>
     </edge>
     <edge id=":cluster_294152029_560899595_593898177_9" function="internal">
-        <lane id=":cluster_294152029_560899595_593898177_9_0" index="0" speed="3.65" length="2.15" shape="57.45,91.94 57.23,91.27 57.52,89.85"/>
+        <lane id=":cluster_294152029_560899595_593898177_9_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="3.65" length="2.15" shape="57.45,91.94 57.23,91.27 57.52,89.85"/>
     </edge>
     <edge id=":cluster_294152029_560899595_593898177_5" function="internal">
         <lane id=":cluster_294152029_560899595_593898177_5_0" index="0" disallow="tram rail_urban rail rail_electric ship" speed="6.62" length="10.04" shape="48.88,90.34 50.80,91.97 52.88,92.43 55.12,91.73 57.52,89.85"/>