From 21e37ddc48d39919f76f937a1cb53ac853736d7b Mon Sep 17 00:00:00 2001 From: Michael Behrisch Date: Wed, 9 Oct 2024 19:57:03 +0200 Subject: [PATCH] adding new options to xsd and docs #2 #563 --- data/xsd/duarouterConfiguration.xsd | 3 +- data/xsd/jtrrouterConfiguration.xsd | 3 +- data/xsd/marouterConfiguration.xsd | 4 +- data/xsd/netconvertConfiguration.xsd | 6 +- data/xsd/neteditConfiguration.xsd | 7 ++- data/xsd/netgenerateConfiguration.xsd | 4 +- data/xsd/sumoConfiguration.xsd | 16 ++++- docs/web/docs/Netedit/attribute_help.md | 84 +++++++++++++++++++++---- docs/web/docs/duarouter.md | 1 + docs/web/docs/jtrrouter.md | 1 + docs/web/docs/marouter.md | 2 + docs/web/docs/netconvert.md | 4 ++ docs/web/docs/netedit.md | 5 ++ docs/web/docs/netgenerate.md | 2 + docs/web/docs/sumo.md | 28 +++++++-- 15 files changed, 148 insertions(+), 22 deletions(-) diff --git a/data/xsd/duarouterConfiguration.xsd b/data/xsd/duarouterConfiguration.xsd index 6cf667871b2d..a6e8a3a2bca5 100644 --- a/data/xsd/duarouterConfiguration.xsd +++ b/data/xsd/duarouterConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -81,6 +81,7 @@ + diff --git a/data/xsd/jtrrouterConfiguration.xsd b/data/xsd/jtrrouterConfiguration.xsd index ac16446402a9..0844e94b6910 100644 --- a/data/xsd/jtrrouterConfiguration.xsd +++ b/data/xsd/jtrrouterConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -68,6 +68,7 @@ + diff --git a/data/xsd/marouterConfiguration.xsd b/data/xsd/marouterConfiguration.xsd index 549c873cdf14..3e9be64a951a 100644 --- a/data/xsd/marouterConfiguration.xsd +++ b/data/xsd/marouterConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -72,6 +72,7 @@ + @@ -105,6 +106,7 @@ + diff --git a/data/xsd/netconvertConfiguration.xsd b/data/xsd/netconvertConfiguration.xsd index 9249c76bf5d1..9f344095bc46 100644 --- a/data/xsd/netconvertConfiguration.xsd +++ b/data/xsd/netconvertConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -123,6 +123,7 @@ + @@ -175,6 +176,7 @@ + @@ -255,6 +257,7 @@ + @@ -339,6 +342,7 @@ + diff --git a/data/xsd/neteditConfiguration.xsd b/data/xsd/neteditConfiguration.xsd index b7845a485bc8..4df8183f64fa 100644 --- a/data/xsd/neteditConfiguration.xsd +++ b/data/xsd/neteditConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -40,6 +40,7 @@ + @@ -133,6 +134,7 @@ + @@ -185,6 +187,7 @@ + @@ -265,6 +268,7 @@ + @@ -349,6 +353,7 @@ + diff --git a/data/xsd/netgenerateConfiguration.xsd b/data/xsd/netgenerateConfiguration.xsd index 8ba32cbb4c8b..d80e3359855b 100644 --- a/data/xsd/netgenerateConfiguration.xsd +++ b/data/xsd/netgenerateConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -166,6 +166,7 @@ + @@ -221,6 +222,7 @@ + diff --git a/data/xsd/sumoConfiguration.xsd b/data/xsd/sumoConfiguration.xsd index 08fa92255ed1..110f17af313b 100644 --- a/data/xsd/sumoConfiguration.xsd +++ b/data/xsd/sumoConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -67,12 +67,14 @@ + + @@ -139,6 +141,7 @@ + @@ -210,6 +213,7 @@ + @@ -231,6 +235,7 @@ + @@ -273,6 +278,8 @@ + + @@ -351,6 +358,9 @@ + + + @@ -486,6 +496,9 @@ + + + @@ -572,6 +585,7 @@ + diff --git a/docs/web/docs/Netedit/attribute_help.md b/docs/web/docs/Netedit/attribute_help.md index 907dae9f2c57..dd5d77b22d9d 100644 --- a/docs/web/docs/Netedit/attribute_help.md +++ b/docs/web/docs/Netedit/attribute_help.md @@ -20,10 +20,11 @@ |endOffset|non-negative float|Move the stop line back from the intersection by the given amount *default:* **0.00**| |shapeStart|position|Custom position in which shape start (by default position of junction from)| |shapeEnd|position|Custom position in which shape end (by default position of junction from)| -|isBidi|boolean|Show if edge is bidirectional *default:* **0**| +|isBidi|unique boolean|Show if edge is bidirectional *default:* **0**| |distance|unique float|Distance *default:* **0.00**| |stopOffset|non-negative float|The stop offset as positive value in meters *default:* **0.00**| |stopOException|list of discrete vClasses|Specifies, for which vehicle classes the stopOffset does NOT apply.| +|isRoundabout|unique boolean|Whether this edge is part of a roundabout *default:* **false**| ## lane | Attribute | Type | Description | @@ -69,7 +70,7 @@ |icon|discrete string|POI Icon| |name|string|Name of POI| |layer|float|The layer of the POI for drawing and selecting *default:* **202.00**| -|width|non-negative float|Width of rendered image in meters *default:* **1.00**| +|width|non-negative float|Width of rendered image in meters *default:* **2.60**| |height|non-negative float|Height of rendered image in meters *default:* **1.00**| |imgFile|filename|A bitmap to use for rendering this POI| |relativePath|boolean|Enable or disable use image file as a relative path *default:* **0**| @@ -95,6 +96,7 @@ |tlType|discrete string|An optional type for the traffic light algorithm| |tlLayout|discrete string|An optional layout for the traffic light plan| |tl|string|An optional id for the traffic light program| +|isRoundabout|boolean|Whether this junction is part of a roundabout *default:* **false**| ## busStop | Attribute | Type | Description | @@ -205,6 +207,8 @@ child element of [parkingArea](#parkingarea) |name|string|Name of induction loop| |file|filename|The path to the output file| |vTypes|list of strings|Space separated list of vehicle type ids to consider| +|nextEdges|list of strings|List of edge ids that must all be part of the future route of the vehicle to qualify for detection| +|detectPersons|discrete string|Detect persons instead of vehicles (pedestrians or passengers) *default:* **none**| |friendlyPos|boolean|If set, no error will be reported if element is placed behind the lane. Instead, it will be placed 0.1 meters from the lanes end or at position 0.1, if the position was negative and larger than the lanes length after multiplication with - 1 *default:* **0**| ## laneAreaDetector @@ -219,10 +223,13 @@ child element of [parkingArea](#parkingarea) |name|string|Name of lane area detector| |file|filename|The path to the output file| |vTypes|list of strings|Space separated list of vehicle type ids to consider| +|nextEdges|list of strings|List of edge ids that must all be part of the future route of the vehicle to qualify for detection| +|detectPersons|discrete string|Detect persons instead of vehicles (pedestrians or passengers) *default:* **none**| |timeThreshold|SUMOTime|The time-based threshold that describes how much time has to pass until a vehicle is recognized as halting) *default:* **1.00**| |speedThreshold|non-negative float|The speed-based threshold that describes how slow a vehicle has to be to be recognized as halting) in m/s *default:* **1.39**| |jamThreshold|non-negative float|The maximum distance to the next standing vehicle in order to make this vehicle count as a participant to the jam in m *default:* **10.00**| |friendlyPos|boolean|If set, no error will be reported if element is placed behind the lane. Instead, it will be placed 0.1 meters from the lanes end or at position 0.1, if the position was negative and larger than the lanes length after multiplication with - 1 *default:* **0**| +|show|boolean|Show detector in sumo-gui *default:* **1**| |lanes|list of unique strings|The sequence of lane ids in which the detector shall be laid on| |endPos|unique float|The end position on the lane the detector shall be laid on in meters| @@ -235,6 +242,9 @@ child element of [parkingArea](#parkingarea) |name|string|Name of Entry Exit detector| |file|filename|The path to the output file| |vTypes|list of strings|Space separated list of vehicle type ids to consider| +|nextEdges|list of strings|List of edge ids that must all be part of the future route of the vehicle to qualify for detection| +|detectPersons|discrete string|Detect persons instead of vehicles (pedestrians or passengers) *default:* **none**| +|openEntry|boolean|If set to true, no error will be reported if vehicles leave the detector without first entering it *default:* **0**| |timeThreshold|SUMOTime|The time-based threshold that describes how much time has to pass until a vehicle is recognized as halting) in s *default:* **1.00**| |speedThreshold|float|The speed-based threshold that describes how slow a vehicle has to be to be recognized as halting) in m/s *default:* **1.39**| |expectArrival|boolean|Whether no warning should be issued when a vehicle arrives within the detector area. *default:* **0**| @@ -308,6 +318,8 @@ child element of [entryExitDetector](#entryexitdetector) |name|string|Name of instant induction loop| |file|filename|The path to the output file| |vTypes|list of strings|Space separated list of vehicle type ids to consider| +|nextEdges|list of strings|List of edge ids that must all be part of the future route of the vehicle to qualify for detection| +|detectPersons|discrete string|Detect persons instead of vehicles (pedestrians or passengers) *default:* **none**| |friendlyPos|boolean|If set, no error will be reported if element is placed behind the lane. Instead, it will be placed 0.1 meters from the lanes end or at position 0.1, if the position was negative and larger than the lanes length after multiplication with - 1 *default:* **0**| ## routeProbe @@ -829,15 +841,22 @@ child element of [person](#person), [personFlow](#personflow) |arrivalPos|float|arrival position on the destination edge *default:* **-1**| |vTypes|list of strings|List of possible vehicle types to take| |modes|list of strings|List of possible traffic modes. Walking is always possible regardless of this value| -|lines|list of strings|list of vehicle alternatives to take for the person trip *default:* **ANY**| +|lines|list of strings|list of vehicle alternatives to take for the person trip| +|walkFactor|non-negative float|Walk factor *default:* **0.00**| +|group|string|id of the travel group. Persons with the same group may share a taxi ride| |toTaz|unique string|TAZ end ID| |toJunction|unique string|Junction end ID| |busStop|unique string|BuStop end ID| -|trainStop|unique string|TrainStop start ID| +|trainStop|unique string|TrainStop end ID| +|containerStop|unique string|ContainerStop end ID| +|chargingStation|unique string|ChargingStation end ID| +|parkingArea|unique string|ParkingArea end ID| |fromTaz|unique string|TAZ start ID| |fromJunction|unique string|Junction start ID| |fromBusStop|unique string|BuStop start ID| |fromTrainStop|unique string|TrainStop start ID| +|fromContainerStop|unique string|ContainerStop start ID| +|fromChargingStation|unique string|ChargingStation start ID| ### ride child element of [person](#person), [personFlow](#personflow) @@ -847,11 +866,21 @@ child element of [person](#person), [personFlow](#personflow) |from|unique string|Edge start ID| |to|unique string|Edge end ID| |arrivalPos|float|arrival position on the destination edge *default:* **-1**| -|lines|list of strings|list of vehicle alternatives to take for the ride *default:* **ANY**| +|lines|list of strings|list of vehicle alternatives to take for the ride| +|group|string|id of the travel group. Persons with the same group may share a taxi ride| +|toTaz|unique string|TAZ end ID| +|toJunction|unique string|Junction end ID| |busStop|unique string|BuStop end ID| -|trainStop|unique string|TrainStop start ID| +|trainStop|unique string|TrainStop end ID| +|containerStop|unique string|ContainerStop end ID| +|chargingStation|unique string|ChargingStation end ID| +|parkingArea|unique string|ParkingArea end ID| +|fromTaz|unique string|TAZ start ID| +|fromJunction|unique string|Junction start ID| |fromBusStop|unique string|BuStop start ID| |fromTrainStop|unique string|TrainStop start ID| +|fromContainerStop|unique string|ContainerStop start ID| +|fromChargingStation|unique string|ChargingStation start ID| ### walk child element of [person](#person), [personFlow](#personflow) @@ -861,14 +890,21 @@ child element of [person](#person), [personFlow](#personflow) |from|unique string|Edge start ID| |to|unique string|Edge end ID| |arrivalPos|float|arrival position on the destination edge *default:* **-1**| +|speed|non-negative float|speed of the person for this tranship in m/s (not together with duration) *default:* **1.39**| +|duration|non-negative SUMOTime|duration of the plan in second (not together with speed) *default:* **0**| |toTaz|unique string|TAZ end ID| |toJunction|unique string|Junction end ID| |busStop|unique string|BuStop end ID| -|trainStop|unique string|TrainStop start ID| +|trainStop|unique string|TrainStop end ID| +|containerStop|unique string|ContainerStop end ID| +|chargingStation|unique string|ChargingStation end ID| +|parkingArea|unique string|ParkingArea end ID| |fromTaz|unique string|TAZ start ID| |fromJunction|unique string|Junction start ID| |fromBusStop|unique string|BuStop start ID| |fromTrainStop|unique string|TrainStop start ID| +|fromContainerStop|unique string|ContainerStop start ID| +|fromChargingStation|unique string|ChargingStation start ID| |edges|list of unique strings|list of consecutive edges| |route|list of unique strings|Route ID| @@ -907,6 +943,7 @@ child element of [dataSet](#dataset) |id|unique string|The name of the container| |type|string|The id of the container type to use for this container *default:* **DEFAULT_CONTAINERTYPE**| |color|color|This container's color *default:* **yellow**| +|departPos|string|The position at which the container shall enter the net *default:* **base**| |depart|non-negative float|The time step at which the container shall enter the network *default:* **0.00**| ### transport @@ -917,9 +954,21 @@ child element of [container](#container), [containerFlow](#containerflow) |from|unique string|Edge start ID| |to|unique string|Edge end ID| |arrivalPos|float|arrival position on the destination edge *default:* **-1**| -|lines|list of strings|list of vehicle alternatives to take for the transport *default:* **ANY**| -|containerStop|unique string|ContainerStop start ID| +|lines|list of strings|list of vehicle alternatives to take for the transport| +|group|string|id of the travel group. Persons with the same group may share a taxi ride| +|toTaz|unique string|TAZ end ID| +|toJunction|unique string|Junction end ID| +|busStop|unique string|BuStop end ID| +|trainStop|unique string|TrainStop end ID| +|containerStop|unique string|ContainerStop end ID| +|chargingStation|unique string|ChargingStation end ID| +|parkingArea|unique string|ParkingArea end ID| +|fromTaz|unique string|TAZ start ID| +|fromJunction|unique string|Junction start ID| +|fromBusStop|unique string|BuStop start ID| +|fromTrainStop|unique string|TrainStop start ID| |fromContainerStop|unique string|ContainerStop start ID| +|fromChargingStation|unique string|ChargingStation start ID| ### tranship child element of [container](#container), [containerFlow](#containerflow) @@ -930,9 +979,21 @@ child element of [container](#container), [containerFlow](#containerflow) |to|unique string|Edge end ID| |departPos|non-negative float|The position at which the tranship shall enter the net *default:* **0**| |arrivalPos|float|arrival position on the destination edge *default:* **-1**| -|speed|non-negative float|speed of the container for this tranship in m/s *default:* **1.39**| -|containerStop|unique string|ContainerStop start ID| +|speed|non-negative float|speed of the person for this tranship in m/s (not together with duration) *default:* **1.39**| +|duration|non-negative SUMOTime|duration of the plan in second (not together with speed) *default:* **0**| +|toTaz|unique string|TAZ end ID| +|toJunction|unique string|Junction end ID| +|busStop|unique string|BuStop end ID| +|trainStop|unique string|TrainStop end ID| +|containerStop|unique string|ContainerStop end ID| +|chargingStation|unique string|ChargingStation end ID| +|parkingArea|unique string|ParkingArea end ID| +|fromTaz|unique string|TAZ start ID| +|fromJunction|unique string|Junction start ID| +|fromBusStop|unique string|BuStop start ID| +|fromTrainStop|unique string|TrainStop start ID| |fromContainerStop|unique string|ContainerStop start ID| +|fromChargingStation|unique string|ChargingStation start ID| |edges|list of unique strings|list of consecutive edges| ## containerFlow @@ -941,6 +1002,7 @@ child element of [container](#container), [containerFlow](#containerflow) |id|unique string|The name of the container| |type|string|The id of the container type to use for this container *default:* **DEFAULT_CONTAINERTYPE**| |color|color|This container's color *default:* **yellow**| +|departPos|string|The position at which the container shall enter the net *default:* **base**| |begin|SUMOTime|First flow departure time *default:* **0**| |end|SUMOTime|End of departure interval *default:* **3600**| |number|non-negative integer|probability for emitting a flow each second (not together with vehsPerHour or period) *default:* **1800**| diff --git a/docs/web/docs/duarouter.md b/docs/web/docs/duarouter.md index 5e50eb1cb958..ab33a6bb73f5 100644 --- a/docs/web/docs/duarouter.md +++ b/docs/web/docs/duarouter.md @@ -138,6 +138,7 @@ Files](Basics/Using_the_Command_Line_Applications.md#configuration_files). | **--weights.expand** {{DT_BOOL}} | Expand the end of the last loaded weight interval to infinity; *default:* **false** | | **--weights.minor-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs for minor-link internal lanes; *default:* **1.5** | | **--weights.tls-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs across a traffic light; *default:* **0** | +| **--weights.turnaround-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs for turnaround internal lanes; *default:* **5** | | **--weights.random-factor** {{DT_FLOAT}} | Edge weights for routing are dynamically disturbed by a random factor drawn uniformly from [1,FLOAT); *default:* **1** | | **--weight-period** {{DT_TIME}} | Aggregation period for the given weight files; triggers rebuilding of Contraction Hierarchy; *default:* **3600** | | **--weights.priority-factor** {{DT_FLOAT}} | Consider edge priorities in addition to travel times, weighted by factor; *default:* **0** | diff --git a/docs/web/docs/jtrrouter.md b/docs/web/docs/jtrrouter.md index 02b4894cb189..715aa4d6a8da 100644 --- a/docs/web/docs/jtrrouter.md +++ b/docs/web/docs/jtrrouter.md @@ -105,6 +105,7 @@ Files](Basics/Using_the_Command_Line_Applications.md#configuration_files). | **--restriction-params** {{DT_STR_LIST}} | Comma separated list of param keys to compare for additional restrictions | | **--weights.minor-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs for minor-link internal lanes; *default:* **1.5** | | **--weights.tls-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs across a traffic light; *default:* **0** | +| **--weights.turnaround-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs for turnaround internal lanes; *default:* **5** | | **--max-edges-factor** {{DT_FLOAT}} | Routes are cut off when the route edges to net edges ratio is larger than FLOAT; *default:* **2** | | **-T** {{DT_STR_LIST}}
**--turn-defaults** {{DT_STR_LIST}} | Use STR[] as default turn definition; *default:* **30,50,20** | | **--sink-edges** {{DT_STR_LIST}} | Use STR[] as list of sink edges | diff --git a/docs/web/docs/marouter.md b/docs/web/docs/marouter.md index ed096c78cdf5..af26b36dd60f 100644 --- a/docs/web/docs/marouter.md +++ b/docs/web/docs/marouter.md @@ -158,6 +158,7 @@ configuration: | **--weights.expand** {{DT_BOOL}} | Expand the end of the last loaded weight interval to infinity; *default:* **false** | | **--weights.minor-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs for minor-link internal lanes; *default:* **1.5** | | **--weights.tls-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs across a traffic light; *default:* **0** | +| **--weights.turnaround-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs for turnaround internal lanes; *default:* **5** | | **--aggregation-interval** {{DT_TIME}} | Defines the time interval when aggregating single vehicle input; Defaults to one hour; *default:* **3600** | | **--capacities.default** {{DT_BOOL}} | Ignore edge priorities when calculating capacities and restraints; *default:* **false** | | **--weights.priority-factor** {{DT_FLOAT}} | Consider edge priorities in addition to travel times, weighted by factor; *default:* **0** | @@ -191,6 +192,7 @@ configuration: | Option | Description | |--------|-------------| +| **--defaults-override** {{DT_BOOL}} | Defaults will override given values; *default:* **false** | | **--flow-output.departlane** {{DT_STR}} | Assigns a default depart lane; *default:* **free** | | **--flow-output.departpos** {{DT_STR}} | Assigns a default depart position | | **--flow-output.departspeed** {{DT_STR}} | Assigns a default depart speed; *default:* **max** | diff --git a/docs/web/docs/netconvert.md b/docs/web/docs/netconvert.md index af3153cc2cb2..8be0391ad7db 100644 --- a/docs/web/docs/netconvert.md +++ b/docs/web/docs/netconvert.md @@ -251,6 +251,7 @@ Files](Basics/Using_the_Command_Line_Applications.md#configuration_files). | **--geometry.max-segment-length** {{DT_FLOAT}} | splits geometry to restrict segment length; *default:* **0** | | **--geometry.min-dist** {{DT_FLOAT}} | reduces too similar geometry points; *default:* **-1** | | **--geometry.max-angle** {{DT_FLOAT}} | Warn about edge geometries with an angle above DEGREES in successive segments; *default:* **99** | +| **--geometry.max-angle.fix** {{DT_BOOL}} | Straighten edge geometries with an angle above max-angle successive segments; *default:* **false** | | **--geometry.min-radius** {{DT_FLOAT}} | Warn about edge geometries with a turning radius less than METERS at the start or end; *default:* **9** | | **--geometry.min-radius.fix** {{DT_BOOL}} | Straighten edge geometries to avoid turning radii less than geometry.min-radius; *default:* **false** | | **--geometry.min-radius.fix.railways** {{DT_BOOL}} | Straighten edge geometries to avoid turning radii less than geometry.min-radius (only railways); *default:* **true** | @@ -303,6 +304,7 @@ Files](Basics/Using_the_Command_Line_Applications.md#configuration_files). | **--default.junctions.keep-clear** {{DT_BOOL}} | Whether junctions should be kept clear by default; *default:* **true** | | **--default.junctions.radius** {{DT_FLOAT}} | The default turning radius of intersections; *default:* **4** | | **--default.connection-length** {{DT_FLOAT}} | The default length when overriding connection lengths; *default:* **-1** | +| **--default.connection.cont-pos** {{DT_FLOAT}} | Whether/where connections should have an internal junction; *default:* **-1** | | **--default.right-of-way** {{DT_STR}} | The default algorithm for computing right of way rules ('default', 'edgePriority'); *default:* **default** | ### Tls Building @@ -383,6 +385,7 @@ Files](Basics/Using_the_Command_Line_Applications.md#configuration_files). | **--keep-edges.components** {{DT_INT}} | Only keep the INT largest weakly connected components; *default:* **0** | | **--remove-edges.by-type** {{DT_STR_LIST}} | Remove edges where type is in STR[] | | **--remove-edges.isolated** {{DT_BOOL}} | Removes isolated edges; *default:* **false** | +| **--keep-lanes.min-width** {{DT_FLOAT}} | Only keep lanes with width in meters > FLOAT; *default:* **0.01** | ### Unregulated Nodes @@ -467,6 +470,7 @@ Files](Basics/Using_the_Command_Line_Applications.md#configuration_files). | **--railway.topology.all-bidi.input-file** {{DT_FILE}} | Make all rails edge ids from FILE usable in both direction | | **--railway.topology.direction-priority** {{DT_BOOL}} | Set edge priority values based on estimated main direction; *default:* **false** | | **--railway.topology.extend-priority** {{DT_BOOL}} | Extend loaded edge priority values based on estimated main direction; *default:* **false** | +| **--railway.geometry.straighten** {{DT_BOOL}} | Move junctions to straighten a sequence of rail edges; *default:* **false** | | **--railway.signal.guess.by-stops** {{DT_BOOL}} | Guess signals that guard public transport stops; *default:* **false** | | **--railway.access-distance** {{DT_FLOAT}} | The search radius for finding suitable road accesses for rail stops; *default:* **150** | | **--railway.max-accesses** {{DT_INT}} | The maximum road accesses registered per rail stops; *default:* **5** | diff --git a/docs/web/docs/netedit.md b/docs/web/docs/netedit.md index 77619f01b1e8..ec5c4dfd1786 100644 --- a/docs/web/docs/netedit.md +++ b/docs/web/docs/netedit.md @@ -41,6 +41,7 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **-d** {{DT_FILE}}
**--data-files** {{DT_FILE}} | Load data elements descriptions from FILE(s) | | **-m** {{DT_FILE}}
**--meandata-files** {{DT_FILE}} | Load meanData descriptions from FILE(s) | | **--ignore-missing-inputs** {{DT_BOOL}} | Reset path values (additional, route, data...) after loading netedit config; *default:* **false** | +| **--selection-file** {{DT_FILE}} | Load element selection | | **-s** {{DT_FILE}}
**--sumo-net-file** {{DT_FILE}} | Read SUMO-net from FILE | | **-n** {{DT_FILE}}
**--node-files** {{DT_FILE}} | Read XML-node defs from FILE | | **-e** {{DT_FILE}}
**--edge-files** {{DT_FILE}} | Read XML-edge defs from FILE | @@ -131,6 +132,7 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **--geometry.max-segment-length** {{DT_FLOAT}} | splits geometry to restrict segment length; *default:* **0** | | **--geometry.min-dist** {{DT_FLOAT}} | reduces too similar geometry points; *default:* **-1** | | **--geometry.max-angle** {{DT_FLOAT}} | Warn about edge geometries with an angle above DEGREES in successive segments; *default:* **99** | +| **--geometry.max-angle.fix** {{DT_BOOL}} | Straighten edge geometries with an angle above max-angle successive segments; *default:* **false** | | **--geometry.min-radius** {{DT_FLOAT}} | Warn about edge geometries with a turning radius less than METERS at the start or end; *default:* **9** | | **--geometry.min-radius.fix** {{DT_BOOL}} | Straighten edge geometries to avoid turning radii less than geometry.min-radius; *default:* **false** | | **--geometry.min-radius.fix.railways** {{DT_BOOL}} | Straighten edge geometries to avoid turning radii less than geometry.min-radius (only railways); *default:* **true** | @@ -182,6 +184,7 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **--default.junctions.keep-clear** {{DT_BOOL}} | Whether junctions should be kept clear by default; *default:* **true** | | **--default.junctions.radius** {{DT_FLOAT}} | The default turning radius of intersections; *default:* **4** | | **--default.connection-length** {{DT_FLOAT}} | The default length when overriding connection lengths; *default:* **-1** | +| **--default.connection.cont-pos** {{DT_FLOAT}} | Whether/where connections should have an internal junction; *default:* **-1** | | **--default.right-of-way** {{DT_STR}} | The default algorithm for computing right of way rules ('default', 'edgePriority'); *default:* **default** | ### Tls Building @@ -259,6 +262,7 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **--keep-edges.components** {{DT_INT}} | Only keep the INT largest weakly connected components; *default:* **0** | | **--remove-edges.by-type** {{DT_STR_LIST}} | Remove edges where type is in STR[] | | **--remove-edges.isolated** {{DT_BOOL}} | Removes isolated edges; *default:* **false** | +| **--keep-lanes.min-width** {{DT_FLOAT}} | Only keep lanes with width in meters > FLOAT; *default:* **0.01** | ### Unregulated Nodes | Option | Description | @@ -338,6 +342,7 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **--railway.topology.all-bidi.input-file** {{DT_FILE}} | Make all rails edge ids from FILE usable in both direction | | **--railway.topology.direction-priority** {{DT_BOOL}} | Set edge priority values based on estimated main direction; *default:* **false** | | **--railway.topology.extend-priority** {{DT_BOOL}} | Extend loaded edge priority values based on estimated main direction; *default:* **false** | +| **--railway.geometry.straighten** {{DT_BOOL}} | Move junctions to straighten a sequence of rail edges; *default:* **false** | | **--railway.signal.guess.by-stops** {{DT_BOOL}} | Guess signals that guard public transport stops; *default:* **false** | | **--railway.access-distance** {{DT_FLOAT}} | The search radius for finding suitable road accesses for rail stops; *default:* **150** | | **--railway.max-accesses** {{DT_INT}} | The maximum road accesses registered per rail stops; *default:* **5** | diff --git a/docs/web/docs/netgenerate.md b/docs/web/docs/netgenerate.md index c554d96016da..657af7b76362 100644 --- a/docs/web/docs/netgenerate.md +++ b/docs/web/docs/netgenerate.md @@ -194,6 +194,7 @@ See the [docs](Networks/PlainXML.md) for more info on [junction types](Networks/ | **--default.junctions.keep-clear** {{DT_BOOL}} | Whether junctions should be kept clear by default; *default:* **true** | | **--default.junctions.radius** {{DT_FLOAT}} | The default turning radius of intersections; *default:* **4** | | **--default.connection-length** {{DT_FLOAT}} | The default length when overriding connection lengths; *default:* **-1** | +| **--default.connection.cont-pos** {{DT_FLOAT}} | Whether/where connections should have an internal junction; *default:* **-1** | | **--default.right-of-way** {{DT_STR}} | The default algorithm for computing right of way rules ('default', 'edgePriority'); *default:* **default** | | **-j** {{DT_STR}}
**--default-junction-type** {{DT_STR}} | [traffic_light,priority,right_before_left,left_before_right,traffic_light_right_on_red,priority_stop,allway_stop,...] Determines junction type (see wiki/Networks/PlainXML#Node_types) | @@ -249,6 +250,7 @@ See the [docs](Networks/PlainXML.md) for more info on [junction types](Networks/ | **--remove-edges.input-file** {{DT_FILE}} | Remove edges in FILE. (Each id on a single line. Selection files from sumo-gui are also supported) | | **--keep-edges.in-boundary** {{DT_STR_LIST}} | Only keep edges which are located within the given boundary (given either as CARTESIAN corner coordinates or as polygon ) | | **--keep-edges.in-geo-boundary** {{DT_STR_LIST}} | Only keep edges which are located within the given boundary (given either as GEODETIC corner coordinates or as polygon ) | +| **--keep-lanes.min-width** {{DT_FLOAT}} | Only keep lanes with width in meters > FLOAT; *default:* **0.01** | ### Unregulated Nodes diff --git a/docs/web/docs/sumo.md b/docs/web/docs/sumo.md index 9e069c0048c4..bf84baef2c94 100644 --- a/docs/web/docs/sumo.md +++ b/docs/web/docs/sumo.md @@ -84,12 +84,14 @@ configuration: | **--emission-output.precision** {{DT_INT}} | Write emission values with the given precision (default 2); *default:* **2** | | **--emission-output.geo** {{DT_BOOL}} | Save the positions in emission output using geo-coordinates (lon/lat); *default:* **false** | | **--emission-output.step-scaled** {{DT_BOOL}} | Write emission values scaled to the step length rather than as per-second values; *default:* **false** | +| **--emission-output.attributes** {{DT_STR_LIST}} | List attributes that should be included in the emission output | | **--battery-output** {{DT_FILE}} | Save the battery values of each vehicle | | **--battery-output.precision** {{DT_INT}} | Write battery values with the given precision (default 2); *default:* **2** | | **--elechybrid-output** {{DT_FILE}} | Save the elecHybrid values of each vehicle | | **--elechybrid-output.precision** {{DT_INT}} | Write elecHybrid values with the given precision (default 2); *default:* **2** | | **--elechybrid-output.aggregated** {{DT_BOOL}} | Write elecHybrid values into one aggregated file; *default:* **false** | | **--chargingstations-output** {{DT_FILE}} | Write data of charging stations | +| **--chargingstations-output.aggregated** {{DT_BOOL}} | Write aggregated charging event data instead of single time steps; *default:* **false** | | **--overheadwiresegments-output** {{DT_FILE}} | Write data of overhead wire segments | | **--substations-output** {{DT_FILE}} | Write data of electrical substation stations | | **--substations-output.precision** {{DT_INT}} | Write substation values with the given precision (default 2); *default:* **2** | @@ -156,6 +158,7 @@ configuration: | **--save-state.precision** {{DT_INT}} | Write internal state values with the given precision (default 2); *default:* **2** | | **--pedestrian.jupedsim.wkt** {{DT_FILE}} | The filename to output the JuPedSim network as WKT | | **--pedestrian.jupedsim.wkt.geo** {{DT_BOOL}} | Whether to output JuPedSim network as WKT using geo-coordinates (lon/lat); *default:* **false** | +| **--pedestrian.jupedsim.py** {{DT_FILE}} | The filename to output the JuPedSim setup as Python script | ### Time @@ -185,7 +188,9 @@ configuration: | **--collision.check-junctions** {{DT_BOOL}} | Enables collisions checks on junctions; *default:* **false** | | **--collision.check-junctions.mingap** {{DT_FLOAT}} | Increase or decrease sensitivity for junction collision check; *default:* **0** | | **--collision.mingap-factor** {{DT_FLOAT}} | Sets the fraction of minGap that must be maintained to avoid collision detection. If a negative value is given, the carFollowModel parameter is used; *default:* **-1** | +| **--keep-after-arrival** {{DT_TIME}} | After a vehicle arrives, keep it in memory for the given TIME (for TraCI access); *default:* **0** | | **--max-num-vehicles** {{DT_INT}} | Delay vehicle insertion to stay within the given maximum number; *default:* **-1** | +| **--max-num-persons** {{DT_INT}} | Delay person insertion to stay within the given maximum number; *default:* **-1** | | **--max-num-teleports** {{DT_INT}} | Abort the simulation if the given maximum number of teleports is exceeded; *default:* **-1** | | **--scale** {{DT_FLOAT}} | Scale demand by the given factor (by discarding or duplicating vehicles); *default:* **1** | | **--scale-suffix** {{DT_STR}} | Suffix to be added when creating ids for cloned vehicles; *default:* **.** | @@ -225,6 +230,7 @@ configuration: | **--use-stop-ended** {{DT_BOOL}} | Override stop until times with stop ended times when given; *default:* **false** | | **--use-stop-started** {{DT_BOOL}} | Override stop arrival times with stop started times when given; *default:* **false** | | **--pedestrian.model** {{DT_STR}} | Select among pedestrian models ['nonInteracting', 'striping', 'remote']; *default:* **striping** | +| **--pedestrian.timegap-crossing** {{DT_FLOAT}} | Minimal acceptable gap (in seconds) between two vehicles before starting to cross; *default:* **2** | | **--pedestrian.striping.stripe-width** {{DT_FLOAT}} | Width of parallel stripes for segmenting a sidewalk (meters) for use with model 'striping'; *default:* **0.64** | | **--pedestrian.striping.dawdling** {{DT_FLOAT}} | Factor for random slow-downs [0,1] for use with model 'striping'; *default:* **0.2** | | **--pedestrian.striping.mingap-to-vehicle** {{DT_FLOAT}} | Minimal gap / safety buffer (in meters) from a pedestrian to another vehicle for use with model 'striping'; *default:* **0.25** | @@ -238,7 +244,7 @@ configuration: | **--pedestrian.striping.walkingarea-detail** {{DT_INT}} | Generate INT intermediate points to smooth out lanes within the walkingarea; *default:* **4** | | **--pedestrian.jupedsim.step-length** {{DT_TIME}} | The update interval of the JuPedSim simulation (in seconds); *default:* **0.01** | | **--pedestrian.jupedsim.exit-tolerance** {{DT_FLOAT}} | The distance to accept the JuPedSim arrival point (in meters); *default:* **1** | -| **--pedestrian.jupedsim.model** {{DT_STR}} | The submodel to use in JuPedSim (currently only 'CollisionFreeSpeed'); *default:* **CollisionFreeSpeed** | +| **--pedestrian.jupedsim.model** {{DT_STR}} | The submodel to use in JuPedSim ('CollisionFreeSpeed', 'CollisionFreeSpeedV2', 'GeneralizedCentrifugalForce', 'SocialForce'); *default:* **CollisionFreeSpeed** | | **--pedestrian.jupedsim.strength-neighbor-repulsion** {{DT_FLOAT}} | The neighbor repulsion strength of the JuPedSim model; *default:* **8** | | **--pedestrian.jupedsim.range-neighbor-repulsion** {{DT_FLOAT}} | The neighbor repulsion range of the JuPedSim model (in meters); *default:* **0.1** | | **--pedestrian.jupedsim.strength-geometry-repulsion** {{DT_FLOAT}} | The geometry repulsion strength of the JuPedSim model; *default:* **5** | @@ -246,6 +252,7 @@ configuration: | **--ride.stop-tolerance** {{DT_FLOAT}} | Tolerance to apply when matching pedestrian and vehicle positions on boarding at individual stops; *default:* **10** | | **--mapmatch.distance** {{DT_FLOAT}} | Maximum distance when mapping input coordinates (fromXY etc.) to the road network; *default:* **100** | | **--mapmatch.junctions** {{DT_BOOL}} | Match positions to junctions instead of edges; *default:* **false** | +| **--weights.turnaround-penalty** {{DT_FLOAT}} | Apply the given time penalty when computing routing costs for turnaround internal lanes; *default:* **5** | | **--persontrip.walk-opposite-factor** {{DT_FLOAT}} | Use FLOAT as a factor on walking speed against vehicle traffic direction; *default:* **1** | ### Routing @@ -288,6 +295,8 @@ configuration: | **--person-device.rerouting.explicit** {{DT_STR_LIST}} | Assign a 'rerouting' device to named persons | | **--person-device.rerouting.deterministic** {{DT_BOOL}} | The 'rerouting' devices are set deterministic using a fraction of 1000; *default:* **false** | | **--person-device.rerouting.period** {{DT_TIME}} | The period with which the person shall be rerouted; *default:* **0** | +| **--person-device.rerouting.mode** {{DT_STR}} | Set routing flags (8 ignores temporary blockages); *default:* **0** | +| **--person-device.rerouting.scope** {{DT_STR}} | Which part of the person plan is to be replaced (stage, sequence, or trip); *default:* **stage** | ### Report @@ -355,13 +364,20 @@ configuration: | **--device.stationfinder.explicit** {{DT_STR_LIST}} | Assign a 'stationfinder' device to named vehicles | | **--device.stationfinder.deterministic** {{DT_BOOL}} | The 'stationfinder' devices are set deterministic using a fraction of 1000; *default:* **false** | | **--device.stationfinder.rescueTime** {{DT_TIME}} | Time to wait for a rescue vehicle on the road side when the battery is empty; *default:* **1800** | -| **--device.stationfinder.reserveFactor** {{DT_FLOAT}} | Additional battery buffer for unexpected traffic situation when estimating the battery need; *default:* **1.1** | -| **--device.stationfinder.emptyThreshold** {{DT_FLOAT}} | Battery percentage to go into rescue mode; *default:* **5** | +| **--device.stationfinder.rescueAction** {{DT_STR}} | How to deal with a vehicle which has to stop due to low battery: [none, remove, tow]; *default:* **remove** | +| **--device.stationfinder.reserveFactor** {{DT_FLOAT}} | Scale battery need with this factor to account for unexpected traffic situations; *default:* **1.1** | +| **--device.stationfinder.emptyThreshold** {{DT_FLOAT}} | Battery percentage to go into rescue mode; *default:* **0.05** | | **--device.stationfinder.radius** {{DT_TIME}} | Search radius in travel time seconds; *default:* **180** | +| **--device.stationfinder.maxEuclideanDistance** {{DT_FLOAT}} | Euclidean search distance in meters (a negative value disables the restriction); *default:* **-1** | | **--device.stationfinder.repeat** {{DT_TIME}} | When to trigger a new search if no station has been found; *default:* **60** | -| **--device.stationfinder.maxChargePower** {{DT_FLOAT}} | The maximum charging speed of the vehicle battery; *default:* **1000** | +| **--device.stationfinder.maxChargePower** {{DT_FLOAT}} | The maximum charging speed of the vehicle battery; *default:* **100000** | | **--device.stationfinder.chargeType** {{DT_STR}} | Type of energy transfer; *default:* **charging** | | **--device.stationfinder.waitForCharge** {{DT_TIME}} | After this waiting time vehicle searches for a new station when the initial one is blocked; *default:* **600** | +| **--device.stationfinder.saturatedChargeLevel** {{DT_FLOAT}} | Target state of charge after which the vehicle stops charging; *default:* **0.8** | +| **--device.stationfinder.needToChargeLevel** {{DT_FLOAT}} | State of charge the vehicle begins searching for charging stations; *default:* **0.4** | +| **--device.stationfinder.replacePlannedStop** {{DT_FLOAT}} | Share of stopping time of the next independently planned stop to use for charging instead; *default:* **0** | +| **--device.stationfinder.maxDistanceToReplacedStop** {{DT_FLOAT}} | Maximum distance in meters from the original stop to be replaced by the charging stop; *default:* **300** | +| **--device.stationfinder.chargingStrategy** {{DT_STR}} | Set a charging strategy to alter time and charging load from the set: [none, balanced, latest]; *default:* **none** | | **--device.battery.probability** {{DT_FLOAT}} | The probability for a vehicle to have a 'battery' device; *default:* **-1** | | **--device.battery.explicit** {{DT_STR_LIST}} | Assign a 'battery' device to named vehicles | | **--device.battery.deterministic** {{DT_BOOL}} | The 'battery' devices are set deterministic using a fraction of 1000; *default:* **false** | @@ -494,6 +510,9 @@ configuration: | **--device.glosa.range** {{DT_FLOAT}} | The communication range to the traffic light; *default:* **100** | | **--device.glosa.max-speedfactor** {{DT_FLOAT}} | The maximum speed factor when approaching a green light; *default:* **1.1** | | **--device.glosa.min-speed** {{DT_FLOAT}} | Minimum speed when coasting towards a red light; *default:* **5** | +| **--device.glosa.add-switchtime** {{DT_FLOAT}} | Additional time the vehicle shall need to reach the intersection after the signal turns green; *default:* **0** | +| **--device.glosa.override-safety** {{DT_BOOL}} | Override safety features - ignore the current light state, always follow GLOSA's predicted state; *default:* **false** | +| **--device.glosa.ignore-cfmodel** {{DT_BOOL}} | Vehicles follow a perfect speed calculation - ignore speed calculations from the CF model if not safety critical; *default:* **false** | ### Tripinfo Device | Option | Description | @@ -575,6 +594,7 @@ configuration: | **-B** {{DT_STR_LIST}}
**--breakpoints** {{DT_STR_LIST}} | Use TIME[] as times when the simulation should halt | | **--edgedata-files** {{DT_FILE}} | Load edge/lane weights for visualization from FILE | | **-N** {{DT_FILE}}
**--alternative-net-file** {{DT_FILE}} | Load a secondary road network for abstract visualization from FILE | +| **--selection-file** {{DT_FILE}} | Load pre-selected elements from FILE | | **-D** {{DT_BOOL}}
**--demo** {{DT_BOOL}} | Restart the simulation after ending (demo mode); *default:* **false** | | **-T** {{DT_BOOL}}
**--disable-textures** {{DT_BOOL}} | Do not load background pictures; *default:* **false** | | **--registry-viewport** {{DT_BOOL}} | Load current viewport from registry; *default:* **false** |