patching expected results refs #21, #14699

eclipse-sumo · Apr 12, 2024 · 21358ae · 21358ae
1 parent 1506a63
commit 21358ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/tests/netconvert/bugs/ticket6924/net.netconvert b/tests/netconvert/bugs/ticket6924/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-12 13:49:28 by Eclipse SUMO netconvert Version v1_19_0+1810-4e00b3ca5f6
 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,16 +37,16 @@ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
         <lane id=":gneJ0_0_0" index="0" allow="rail" speed="0.10" length="0.10" shape="0.00,0.00 0.00,0.00"/>
     </edge>
     <edge id=":gneJ1_0" function="internal" bidi=":gneJ1_1">
-        <lane id=":gneJ1_0_0" index="0" allow="rail" speed="13.89" length="0.64" shape="99.93,-0.07 99.79,-0.15 99.67,-0.11 99.53,-0.04 99.34,0.00"/>
+        <lane id=":gneJ1_0_0" index="0" allow="rail" speed="13.89" length="0.62" shape="99.93,-0.07 99.79,-0.15 99.67,-0.11 99.53,-0.04 99.34,0.00"/>
     </edge>
     <edge id=":gneJ1_1" function="internal" bidi=":gneJ1_0">
-        <lane id=":gneJ1_1_0" index="0" allow="rail" speed="13.89" length="0.60" shape="99.34,0.00 99.93,-0.07"/>
+        <lane id=":gneJ1_1_0" index="0" allow="rail" speed="13.89" length="0.62" shape="99.34,0.00 99.93,-0.07"/>
     </edge>
     <edge id=":gneJ4_0" function="internal" bidi=":gneJ4_1">
-        <lane id=":gneJ4_0_0" index="0" allow="rail" speed="13.89" length="0.60" shape="100.66,0.00 100.07,0.07"/>
+        <lane id=":gneJ4_0_0" index="0" allow="rail" speed="13.89" length="0.62" shape="100.66,0.00 100.07,0.07"/>
     </edge>
     <edge id=":gneJ4_1" function="internal" bidi=":gneJ4_0">
-        <lane id=":gneJ4_1_0" index="0" allow="rail" speed="13.89" length="0.64" shape="100.07,0.07 100.21,0.15 100.33,0.11 100.47,0.04 100.66,0.00"/>
+        <lane id=":gneJ4_1_0" index="0" allow="rail" speed="13.89" length="0.62" shape="100.07,0.07 100.21,0.15 100.33,0.11 100.47,0.04 100.66,0.00"/>
     </edge>
     <edge id=":gneJ5_0" function="internal">
         <lane id=":gneJ5_0_0" index="0" allow="rail" speed="0.10" length="0.10" shape="300.00,0.00 300.00,0.00"/>

diff --git a/tests/tools/import/OSM/webWizard/errors.tools b/tests/tools/import/OSM/webWizard/errors.tools
@@ -125,13 +125,11 @@ Warning: Could not import polygon from relation '2678660' (name: reason: found g
 Warning: Could not import polygon from relation '4065109' (missing ways)
 Warning: Could not import polygon from relation '8178851' (missing ways)
 Warning: 7 total messages of type: Could not import polygon from relation '%' (missing ways)
-Warning: Unequal lengths of bidi lane ':cluster_1668685163_262478055_3253177076_3820768524_#9more_9_0' and lane ':cluster_1668685163_262478055_3253177076_3820768524_#9more_0_0' (31.57 != 31.56).
 Warning: At actuated tlLogic 'GS_25662542', linkIndex 13,14,15 has no controlling detector.
 Warning: At actuated tlLogic 'cluster_1673527224_1673527227_21487161_303436603_#9more', linkIndex 8,9,10,30 has no controlling detector.
 Warning: At actuated tlLogic 'joinedS_1840326421_cluster_1828018077_1828018093_1828018094_1828018095_#5more', linkIndex 2,8,9,10,31,32,33,34 has no controlling detector.
 Warning: At actuated tlLogic 'joinedS_cluster_1876468341_25665883_29219439_5747234980_#4more_cluster_262469634_29219441_961875301_961875308_#2more', linkIndex 5,6,16,24,32,33 has no controlling detector.
 Warning: busStop '30731700' on lane '167272531#9_0' is too short for vehicle '21_tram_12:1'.
-Warning: Unequal lengths of bidi lane ':cluster_1668685163_262478055_3253177076_3820768524_#9more_9_0' and lane ':cluster_1668685163_262478055_3253177076_3820768524_#9more_0_0' (31.57 != 31.56).
 Warning: busStop '30731700' on lane '167272531#9_0' is too short for vehicle 'pt_tram_12:1.0'.
 Warning: Teleporting vehicle 'pt_tram_M2:0.1'; frontal collision with vehicle 'pt_tram_M2:3.0', lane='148458500#0_0', gap=-1.00, time=476.00 stage=move.
 Warning: Vehicle 'pt_tram_M2:0.1' ends teleporting on edge '148458500#1', time=480.00.

diff --git a/tests/tools/import/OSM/webWizard/osmimport.tools b/tests/tools/import/OSM/webWizard/osmimport.tools
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2024-04-12 13:33:24 by Eclipse SUMO netconvert Version v1_19_0+1808-cce61b695d5
+<!-- generated on 2024-04-12 13:49:19 by Eclipse SUMO netconvert Version v1_19_0+1810-4e00b3ca5f6
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
 
     <input>
         <type-files value="${SUMO_HOME}/data/typemap/osmNetconvert.typ.xml,${SUMO_HOME}/data/typemap/osmNetconvertUrbanDe.typ.xml,${SUMO_HOME}/data/typemap/osmNetconvertPedestrians.typ.xml,${SUMO_HOME}/data/typemap/osmNetconvertShips.typ.xml,${SUMO_HOME}/data/typemap/osmNetconvertBicycle.typ.xml,${SUMO_HOME}/data/typemap/osmNetconvertAerialway.typ.xml"/>
-        <osm-files value="/home/erdm_ja/.texttest/tmp/tools.12Apr133322.618135/tools/import/OSM/webWizard/osm_bbox.osm.xml"/>
+        <osm-files value="/home/erdm_ja/.texttest/tmp/tools.12Apr134914.685387/tools/import/OSM/webWizard/osm_bbox.osm.xml"/>
     </input>
 
     <output>
@@ -22364,7 +22364,7 @@
         <lane id=":cluster_1668685163_262478055_3253177076_3820768524_#9more_15_0" index="0" allow="bus bicycle" speed="9.72" length="4.03" shape="1054.21,2804.44 1058.09,2803.38"/>
     </edge>
     <edge id=":cluster_1668685163_262478055_3253177076_3820768524_#9more_9" function="internal" bidi=":cluster_1668685163_262478055_3253177076_3820768524_#9more_0">
-        <lane id=":cluster_1668685163_262478055_3253177076_3820768524_#9more_9_0" index="0" allow="tram" speed="13.89" length="31.57" shape="1025.09,2805.49 1024.97,2811.82 1025.11,2821.27 1025.33,2830.71 1025.46,2837.05"/>
+        <lane id=":cluster_1668685163_262478055_3253177076_3820768524_#9more_9_0" index="0" allow="tram" speed="13.89" length="31.56" shape="1025.09,2805.49 1024.97,2811.82 1025.11,2821.27 1025.33,2830.71 1025.46,2837.05"/>
     </edge>
     <edge id=":cluster_1668685163_262478055_3253177076_3820768524_#9more_10" function="internal">
         <lane id=":cluster_1668685163_262478055_3253177076_3820768524_#9more_10_0" index="0" allow="tram" speed="13.89" length="7.57" shape="1031.08,2809.36 1030.38,2816.90"/>