patching expected results refs #21, #5883

eclipse-sumo · Aug 7, 2019 · c570d2b · c570d2b
1 parent 440ef61
commit c570d2b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/tests/netconvert/meta/help/output.netconvert b/tests/netconvert/meta/help/output.netconvert
@@ -1,4 +1,4 @@
-Eclipse SUMO netconvert Version v1_2_0+1435-a7b8d24
+Eclipse SUMO netconvert Version v1_2_0+1444-7f63c6c
  Copyright (C) 2001-2019 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 Network importer / builder for the microscopic, multi-modal traffic simulation
   SUMO.
@@ -136,6 +136,9 @@ Processing Options:
   --geometry.remove.min-length FLOAT   Allow merging edges with differing
                                          attributes when their length is below
                                          min-length
+  --geometry.remove.width-tolerance FLOAT  Allow merging edges with differing
+                                         lane widths if the difference is below
+                                         FLOAT
   --geometry.max-segment-length FLOAT  splits geometry to restrict segment
                                          length
   --geometry.min-dist FLOAT            reduces too similar geometry points

diff --git a/tests/netconvert/meta/write_template_commented_full/cfg.netconvert b/tests/netconvert/meta/write_template_commented_full/cfg.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Aug  6 13:49:27 2019 by Eclipse SUMO netconvert Version v1_2_0+1435-a7b8d24
+<!-- generated on Tue Aug  6 16:51:33 2019 by Eclipse SUMO netconvert Version v1_2_0+1444-7f63c6c
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
@@ -228,6 +228,9 @@
         <!-- Allow merging edges with differing attributes when their length is below min-length -->
         <geometry.remove.min-length value="0" type="FLOAT"/>
 
+        <!-- Allow merging edges with differing lane widths if the difference is below FLOAT -->
+        <geometry.remove.width-tolerance value="0" type="FLOAT"/>
+
         <!-- splits geometry to restrict segment length -->
         <geometry.max-segment-length value="0" type="FLOAT"/>
 

diff --git a/tests/netconvert/meta/write_template_full/cfg.netconvert b/tests/netconvert/meta/write_template_full/cfg.netconvert
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on Tue Aug  6 13:49:27 2019 by Eclipse SUMO netconvert Version v1_2_0+1435-a7b8d24
+<!-- generated on Tue Aug  6 16:51:24 2019 by Eclipse SUMO netconvert Version v1_2_0+1444-7f63c6c
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
@@ -88,6 +88,7 @@
         <geometry.remove.keep-edges.explicit value="" type="STR" help="Ensure that the given list of edges is not modified"/>
         <geometry.remove.keep-edges.input-file value="" type="FILE" help="Ensure that the edges in FILE are not modified (Each id on a single line. Selection files from SUMO-GUI are also supported)"/>
         <geometry.remove.min-length value="0" type="FLOAT" help="Allow merging edges with differing attributes when their length is below min-length"/>
+        <geometry.remove.width-tolerance value="0" type="FLOAT" help="Allow merging edges with differing lane widths if the difference is below FLOAT"/>
         <geometry.max-segment-length value="0" type="FLOAT" help="splits geometry to restrict segment length"/>
         <geometry.min-dist value="-1" type="FLOAT" help="reduces too similar geometry points"/>
         <geometry.max-angle value="99" type="FLOAT" help="Warn about edge geometries with an angle above DEGREES in successive segments"/>