patching meta results refs #21, #14341

eclipse-sumo · Feb 21, 2024 · f435435 · f435435
1 parent 01819d1
commit f435435
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 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_18_0+2224-9463baa5d5c
+Eclipse SUMO netconvert Version v1_19_0+0910-7ddfc6d
  Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 Network importer / builder for the microscopic, multi-modal traffic simulation
  SUMO.
@@ -472,6 +472,8 @@ Junctions Options:
                                         of average
   --junctions.minimal-shape            Build junctions with minimal shapes
                                         (ignoring edge overlap)
+  --junctions.endpoint-shape           Build junction shapes based on edge
+                                        endpoints (ignoring edge overlap)
   --internal-junctions.vehicle-width FLOAT  Assumed vehicle width for computing
                                         internal junction positions
   --rectangular-lane-cut               Forces rectangular cuts between lanes

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 2023-10-23 20:43:20 by Eclipse SUMO netconvert Version v1_18_0+2224-9463baa5d5c
+<!-- generated on 2024-02-20 23:25:46 by Eclipse SUMO netconvert Version v1_19_0+0910-7ddfc6d
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
@@ -708,6 +708,9 @@
         <!-- Build junctions with minimal shapes (ignoring edge overlap) -->
         <junctions.minimal-shape value="false" type="BOOL"/>
 
+        <!-- Build junction shapes based on edge endpoints (ignoring edge overlap) -->
+        <junctions.endpoint-shape value="false" type="BOOL"/>
+
         <!-- Assumed vehicle width for computing internal junction positions -->
         <internal-junctions.vehicle-width value="1.8" 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 2023-10-23 20:43:20 by Eclipse SUMO netconvert Version v1_18_0+2224-9463baa5d5c
+<!-- generated on 2024-02-20 23:25:46 by Eclipse SUMO netconvert Version v1_19_0+0910-7ddfc6d
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netconvertConfiguration.xsd">
@@ -260,6 +260,7 @@
         <junctions.small-radius value="1.5" type="FLOAT" help="Default radius for junctions that do not require wide vehicle turns"/>
         <junctions.higher-speed value="false" type="BOOL" help="Use maximum value of incoming and outgoing edge speed on junction instead of average"/>
         <junctions.minimal-shape value="false" type="BOOL" help="Build junctions with minimal shapes (ignoring edge overlap)"/>
+        <junctions.endpoint-shape value="false" type="BOOL" help="Build junction shapes based on edge endpoints (ignoring edge overlap)"/>
         <internal-junctions.vehicle-width value="1.8" type="FLOAT" help="Assumed vehicle width for computing internal junction positions"/>
         <rectangular-lane-cut value="false" type="BOOL" help="Forces rectangular cuts between lanes and intersections"/>
         <check-lane-foes.roundabout value="true" type="BOOL" help="Allow driving onto a multi-lane road if there are foes on other lanes (at roundabouts)"/>

diff --git a/tests/netgen/meta/help/output.netgen b/tests/netgen/meta/help/output.netgen
@@ -1,4 +1,4 @@
-Eclipse SUMO netgenerate Version v1_18_0+2224-9463baa5d5c
+Eclipse SUMO netgenerate Version v1_19_0+0910-7ddfc6d
  Copyright (C) 2001-2024 German Aerospace Center (DLR) and others; https://sumo.dlr.de
 Synthetic network generator for the microscopic, multi-modal traffic simulation
  SUMO.
@@ -418,6 +418,8 @@ Junctions Options:
                                         of average
   --junctions.minimal-shape            Build junctions with minimal shapes
                                         (ignoring edge overlap)
+  --junctions.endpoint-shape           Build junction shapes based on edge
+                                        endpoints (ignoring edge overlap)
   --internal-junctions.vehicle-width FLOAT  Assumed vehicle width for computing
                                         internal junction positions
   --rectangular-lane-cut               Forces rectangular cuts between lanes

diff --git a/tests/netgen/meta/write_template_commented_full/cfg.netgen b/tests/netgen/meta/write_template_commented_full/cfg.netgen
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-10-23 20:43:22 by Eclipse SUMO netgenerate Version v1_18_0+2224-9463baa5d5c
+<!-- generated on 2024-02-20 23:25:47 by Eclipse SUMO netgenerate Version v1_19_0+0910-7ddfc6d
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netgenerateConfiguration.xsd">
@@ -594,6 +594,9 @@
         <!-- Build junctions with minimal shapes (ignoring edge overlap) -->
         <junctions.minimal-shape value="false" type="BOOL"/>
 
+        <!-- Build junction shapes based on edge endpoints (ignoring edge overlap) -->
+        <junctions.endpoint-shape value="false" type="BOOL"/>
+
         <!-- Assumed vehicle width for computing internal junction positions -->
         <internal-junctions.vehicle-width value="1.8" type="FLOAT"/>
 

diff --git a/tests/netgen/meta/write_template_full/cfg.netgen b/tests/netgen/meta/write_template_full/cfg.netgen
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 2023-10-23 20:43:22 by Eclipse SUMO netgenerate Version v1_18_0+2224-9463baa5d5c
+<!-- generated on 2024-02-20 23:25:47 by Eclipse SUMO netgenerate Version v1_19_0+0910-7ddfc6d
 -->
 
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/netgenerateConfiguration.xsd">
@@ -224,6 +224,7 @@
         <junctions.small-radius value="1.5" type="FLOAT" help="Default radius for junctions that do not require wide vehicle turns"/>
         <junctions.higher-speed value="false" type="BOOL" help="Use maximum value of incoming and outgoing edge speed on junction instead of average"/>
         <junctions.minimal-shape value="false" type="BOOL" help="Build junctions with minimal shapes (ignoring edge overlap)"/>
+        <junctions.endpoint-shape value="false" type="BOOL" help="Build junction shapes based on edge endpoints (ignoring edge overlap)"/>
         <internal-junctions.vehicle-width value="1.8" type="FLOAT" help="Assumed vehicle width for computing internal junction positions"/>
         <rectangular-lane-cut value="false" type="BOOL" help="Forces rectangular cuts between lanes and intersections"/>
         <check-lane-foes.roundabout value="true" type="BOOL" help="Allow driving onto a multi-lane road if there are foes on other lanes (at roundabouts)"/>