patching expected results refs #21

eclipse-sumo · Mar 14, 2024 · 5989c44 · 5989c44
1 parent c2367d8
commit 5989c44
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/tests/netconvert/function/projection/utm_heightmap/net.netconvert b/tests/netconvert/function/projection/utm_heightmap/net.netconvert
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Mar 16 10:31:48 2021 by Eclipse SUMO netconvert Version v1_8_0+1657-6f75391
+<!-- generated on 2024-03-14 08:19:40 by Eclipse SUMO netconvert Version v1_19_0+1280-c2367d8cd52
 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
 http://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
@@ -24,14 +29,14 @@ SPDX-License-Identifier: EPL-2.0
     </projection>
 
     <report>
+        <verbose value="true"/>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
     </report>
 
 </configuration>
 -->
 
-<net version="1.16" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+<net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
 
     <location netOffset="-277843.65,-5330206.51" convBoundary="0.00,0.00,3330.25,3904.56" origBoundary="12.014694,48.087529,12.061386,48.121459" projParameter="+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>
 
@@ -40,6 +45,6 @@ SPDX-License-Identifier: EPL-2.0
     </edge>
 
     <junction id="0" type="dead_end" x="0.00" y="3904.56" z="597.20" incLanes="" intLanes="" shape="-0.00,3904.56,597.20 -2.43,3902.49,597.20"/>
-    <junction id="1" type="dead_end" x="3330.25" y="0.00" z="516.30" incLanes="o_0" intLanes="" shape="3327.81,-2.08,516.30 3330.25,-0.00,516.30"/>
+    <junction id="1" type="dead_end" x="3330.25" y="0.00" z="516.30" incLanes="o_0" intLanes="" shape="3327.81,-2.08,516.30 3330.25,0.00,516.30"/>
 
 </net>
diff --git a/tests/netconvert/function/projection/utm_heightmap32/net.netconvert b/tests/netconvert/function/projection/utm_heightmap32/net.netconvert
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Mar 16 10:31:48 2021 by Eclipse SUMO netconvert Version v1_8_0+1657-6f75391
+<!-- generated on 2024-03-14 08:19:40 by Eclipse SUMO netconvert Version v1_19_0+1280-c2367d8cd52
 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
 http://www.eclipse.org/legal/epl-v20.html
-SPDX-License-Identifier: EPL-2.0
+This file may also be made available under the following Secondary
+Licenses when the conditions for such availability set forth in the Eclipse
+Public License 2.0 are satisfied: GNU General Public License, version 2
+or later which is available at
+https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
+SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
@@ -24,14 +29,14 @@ SPDX-License-Identifier: EPL-2.0
     </projection>
 
     <report>
+        <verbose value="true"/>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
     </report>
 
 </configuration>
 -->
 
-<net version="1.16" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+<net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
 
     <location netOffset="-277843.65,-5330206.51" convBoundary="0.00,0.00,3330.25,3904.56" origBoundary="12.014694,48.087529,12.061386,48.121459" projParameter="+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>
 
@@ -40,6 +45,6 @@ SPDX-License-Identifier: EPL-2.0
     </edge>
 
     <junction id="0" type="dead_end" x="0.00" y="3904.56" z="597.20" incLanes="" intLanes="" shape="-0.00,3904.56,597.20 -2.43,3902.49,597.20"/>
-    <junction id="1" type="dead_end" x="3330.25" y="0.00" z="516.30" incLanes="o_0" intLanes="" shape="3327.81,-2.08,516.30 3330.25,-0.00,516.30"/>
+    <junction id="1" type="dead_end" x="3330.25" y="0.00" z="516.30" incLanes="o_0" intLanes="" shape="3327.81,-2.08,516.30 3330.25,0.00,516.30"/>
 
 </net>
diff --git a/tests/netconvert/import/shape/geo/net.netconvert b/tests/netconvert/import/shape/geo/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-05-15 12:52:33 by Eclipse SUMO netconvert Version v1_13_0+0250-d69a610
+<!-- generated on 2024-03-14 08:19:40 by Eclipse SUMO netconvert Version v1_19_0+1280-c2367d8cd52
 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
@@ -37,7 +37,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 </configuration>
 -->
 
-<net version="1.16" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+<net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
 
     <location netOffset="-393250.70,-5817849.97" convBoundary="0.00,0.00,647.20,469.84" origBoundary="13.427344,52.500380,13.436832,52.504554" projParameter="+proj=utm +zone=33 +ellps=WGS84 +datum=WGS84 +units=m +no_defs"/>
 
@@ -370,7 +370,7 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id="194559652_0" index="0" speed="13.89" length="65.27" shape="545.63,15.75 549.29,27.58 575.03,61.25 581.41,69.60"/>
     </edge>
     <edge id="194711249" from="62" to="101" priority="0" spreadType="center" shape="595.85,59.43 589.45,50.91 575.85,32.79 619.75,0.00">
-        <lane id="194711249_0" index="0" speed="13.89" length="84.95" shape="593.96,56.91 589.45,50.91 575.85,32.79 619.75,0.00"/>
+        <lane id="194711249_0" index="0" speed="13.89" length="84.95" shape="593.96,56.91 589.45,50.91 575.85,32.79 619.75,-0.00"/>
     </edge>
     <edge id="195332166" from="3" to="27" priority="0" spreadType="center" shape="274.24,286.06 238.55,227.20 203.69,169.73">
         <lane id="195332166_0" index="0" speed="13.89" length="124.81" shape="271.27,281.17 238.55,227.20 206.55,174.45"/>

diff --git a/tests/netconvert/import/shape/handmade/net.netconvert b/tests/netconvert/import/shape/handmade/net.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2022-05-01 16:02:25 by Eclipse SUMO netconvert Version v1_12_0+2423-814bcc9fbc4
+<!-- generated on 2024-03-14 08:19:40 by Eclipse SUMO netconvert Version v1_19_0+1280-c2367d8cd52
 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
@@ -32,13 +32,12 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
 
     <report>
         <xml-validation value="never"/>
-        <aggregate-warnings value="5"/>
     </report>
 
 </configuration>
 -->
 
-<net version="1.16" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
+<net version="1.20" junctionCornerDetail="5" limitTurnSpeed="5.50" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/net_file.xsd">
 
     <location netOffset="-312.00,-423.00" convBoundary="0.00,0.00,1116.00,216.00" origBoundary="312.00,423.00,1428.00,639.00" projParameter="!"/>