patching expected meta results after adding option refs #21,#1123

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15364 afbd958f-9f77-42d5-a016-97a22340ccf4
eclipse-sumo · Jan 9, 2014 · fe1dffd · fe1dffd
1 parent 866d36e
commit fe1dffd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/sumo/tests/netconvert/meta/help/output.netconvert b/sumo/tests/netconvert/meta/help/output.netconvert
@@ -1,4 +1,4 @@
-SUMO netconvert Version dev-SVN-rUNKNOWN
+SUMO netconvert Version dev-SVN-r15362
  Copyright (C) 2001-2013 DLR and contributors; http://sumo-sim.org
 Road network importer / builder for the road traffic simulation SUMO.
 
@@ -198,6 +198,9 @@ Processing Options:
   --geometry.min-radius.fix           Straighten edge geometries to avoid
                                         turning radii less than
                                         geometry.min-radius
+  --geometry.junction-mismatch-threshold FLOAT  Warn if the junction shape is
+                                        to far away from the original node
+                                        position
   --offset.disable-normalization      Turn off normalizing node positions
   --offset.x FLOAT                    Adds FLOAT to net x-positions
   --offset.y FLOAT                    Adds FLOAT to net y-positions

diff --git a/sumo/tests/netconvert/meta/write_template_commented_full/cfg.netconvert b/sumo/tests/netconvert/meta/write_template_commented_full/cfg.netconvert
@@ -381,6 +381,9 @@
         <!-- Straighten edge geometries to avoid turning radii less than geometry.min-radius -->
         <geometry.min-radius.fix value="false" type="BOOL"/>
 
+        <!-- Warn if the junction shape is to far away from the original node position -->
+        <geometry.junction-mismatch-threshold value="20" type="FLOAT"/>
+
         <!-- Turn off normalizing node positions -->
         <offset.disable-normalization value="false" synonymes="disable-normalize-node-positions" type="BOOL"/>
 

diff --git a/sumo/tests/netconvert/meta/write_template_full/cfg.netconvert b/sumo/tests/netconvert/meta/write_template_full/cfg.netconvert
@@ -145,6 +145,7 @@
         <geometry.max-angle value="99" type="FLOAT" help="Warn about edge geometries with an angle above DEGREES in successive segments"/>
         <geometry.min-radius value="9" type="FLOAT" help="Warn about edge geometries with a turning radius less than METERS at the start or end"/>
         <geometry.min-radius.fix value="false" type="BOOL" help="Straighten edge geometries to avoid turning radii less than geometry.min-radius"/>
+        <geometry.junction-mismatch-threshold value="20" type="FLOAT" help="Warn if the junction shape is to far away from the original node position"/>
         <offset.disable-normalization value="false" synonymes="disable-normalize-node-positions" type="BOOL" help="Turn off normalizing node positions"/>
         <offset.x value="0" synonymes="x-offset-to-apply" type="FLOAT" help="Adds FLOAT to net x-positions"/>
         <offset.y value="0" synonymes="y-offset-to-apply" type="FLOAT" help="Adds FLOAT to net y-positions"/>