diff --git a/data/xsd/activitygenConfiguration.xsd b/data/xsd/activitygenConfiguration.xsd index eea107e8e22e..6c15e025d5c1 100644 --- a/data/xsd/activitygenConfiguration.xsd +++ b/data/xsd/activitygenConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -63,6 +63,8 @@ + + diff --git a/data/xsd/dfrouterConfiguration.xsd b/data/xsd/dfrouterConfiguration.xsd index 24dea89df7ac..73d9a931c4db 100644 --- a/data/xsd/dfrouterConfiguration.xsd +++ b/data/xsd/dfrouterConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -111,6 +111,8 @@ + + diff --git a/data/xsd/duarouterConfiguration.xsd b/data/xsd/duarouterConfiguration.xsd index dd2170a65359..58a2857166b0 100644 --- a/data/xsd/duarouterConfiguration.xsd +++ b/data/xsd/duarouterConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -140,6 +140,8 @@ + + diff --git a/data/xsd/jtrrouterConfiguration.xsd b/data/xsd/jtrrouterConfiguration.xsd index ad4323b2defe..3548fc695c52 100644 --- a/data/xsd/jtrrouterConfiguration.xsd +++ b/data/xsd/jtrrouterConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -111,6 +111,8 @@ + + diff --git a/data/xsd/marouterConfiguration.xsd b/data/xsd/marouterConfiguration.xsd index 581436f73e8f..59a47a65df3e 100644 --- a/data/xsd/marouterConfiguration.xsd +++ b/data/xsd/marouterConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -134,6 +134,8 @@ + + diff --git a/data/xsd/netconvertConfiguration.xsd b/data/xsd/netconvertConfiguration.xsd index 8c9d6799398e..72869568061f 100644 --- a/data/xsd/netconvertConfiguration.xsd +++ b/data/xsd/netconvertConfiguration.xsd @@ -1,6 +1,6 @@ - diff --git a/data/xsd/neteditConfiguration.xsd b/data/xsd/neteditConfiguration.xsd index 27b6ab12c70f..7f9942a4ca00 100644 --- a/data/xsd/neteditConfiguration.xsd +++ b/data/xsd/neteditConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -77,6 +77,7 @@ + @@ -415,6 +416,7 @@ + @@ -447,10 +449,6 @@ - - - - @@ -503,6 +501,8 @@ + + diff --git a/data/xsd/netgenerateConfiguration.xsd b/data/xsd/netgenerateConfiguration.xsd index 618de810cc50..1f210a670a0c 100644 --- a/data/xsd/netgenerateConfiguration.xsd +++ b/data/xsd/netgenerateConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -96,6 +96,7 @@ + @@ -301,6 +302,8 @@ + + diff --git a/data/xsd/od2tripsConfiguration.xsd b/data/xsd/od2tripsConfiguration.xsd index 525f4776e731..5d37c7d97bae 100644 --- a/data/xsd/od2tripsConfiguration.xsd +++ b/data/xsd/od2tripsConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -91,6 +91,8 @@ + + diff --git a/data/xsd/polyconvertConfiguration.xsd b/data/xsd/polyconvertConfiguration.xsd index f28ade5031f6..eacebd3cb99e 100644 --- a/data/xsd/polyconvertConfiguration.xsd +++ b/data/xsd/polyconvertConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -97,6 +97,7 @@ + @@ -115,6 +116,8 @@ + + diff --git a/data/xsd/sumoConfiguration.xsd b/data/xsd/sumoConfiguration.xsd index e89b316fb6da..2f99f40ab844 100644 --- a/data/xsd/sumoConfiguration.xsd +++ b/data/xsd/sumoConfiguration.xsd @@ -1,6 +1,6 @@ - @@ -216,7 +216,8 @@ - + + @@ -276,6 +277,8 @@ + + @@ -417,6 +420,7 @@ + diff --git a/docs/web/docs/Netedit/attribute_help.md b/docs/web/docs/Netedit/attribute_help.md index dedaa4dec4e3..7c918cec9178 100644 --- a/docs/web/docs/Netedit/attribute_help.md +++ b/docs/web/docs/Netedit/attribute_help.md @@ -66,6 +66,7 @@ |pos|unique position|The position in view| |color|color|The color with which the POI shall be displayed *default:* **red**| |type|string|A typename for the POI| +|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**| @@ -129,7 +130,7 @@ child element of [busStop](#busstop), [trainStop](#trainstop) | Attribute | Type | Description | |-----------|------|-------------| |lane|unique string|The name of the lane the stop access shall be located at| -|pos|unique float|The position on the lane (the lower position on the lane) in meters *default:* **0.00**| +|pos|unique string|The position on the lane (the lower position on the lane) in meters *default:* **0.00**| |length|non-negative float|The walking length of the access in meters *default:* **-1.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**| @@ -160,6 +161,8 @@ child element of [busStop](#busstop), [trainStop](#trainstop) |efficiency|float|Charging efficiency [0,1] *default:* **0.95**| |chargeInTransit|boolean|Enable or disable charge in transit, i.e. vehicle must or must not to stop for charging *default:* **0**| |chargeDelay|SUMOTime|Time delay after the vehicles has reached / stopped on the charging station, before the energy transfer (charging) begins *default:* **0.00**| +|chargeType|discrete string|Battery charging type *default:* **normal**| +|waitingTime|SUMOTime|Waiting time before start charging *default:* **900.00**| ## parkingArea | Attribute | Type | Description | @@ -454,7 +457,7 @@ child element of [variableSpeedSign](#variablespeedsign) |to|unique string|The ID of the edge the trip ends at| |via|list of unique strings|List of intermediate edge ids which shall be part of the trip| |color|color|This vehicle's color *default:* **yellow**| -|departLane|string|The lane on which thevehicle shall be inserted *default:* **first**| +|departLane|string|The lane on which the vehicle shall be inserted *default:* **first**| |departPos|string|The position at which the vehicle shall enter the net *default:* **base**| |departSpeed|string|The speed with which the vehicle shall enter the network *default:* **0.00**| |arrivalLane|string|The lane at which the vehicle shall leave the network *default:* **current**| @@ -481,7 +484,7 @@ child element of [variableSpeedSign](#variablespeedsign) |departEdge|unique string|The index of the edge within route the vehicle starts at| |arrivalEdge|unique string|The index of the edge within route the vehicle ends at| |color|color|This vehicle's color *default:* **yellow**| -|departLane|string|The lane on which thevehicle shall be inserted *default:* **first**| +|departLane|string|The lane on which the vehicle shall be inserted *default:* **first**| |departPos|string|The position at which the vehicle shall enter the net *default:* **base**| |departSpeed|string|The speed with which the vehicle shall enter the network *default:* **0.00**| |arrivalLane|string|The lane at which the vehicle shall leave the network *default:* **current**| @@ -504,7 +507,7 @@ also child element of [calibrator](#calibrator) |begin|SUMOTime|First calibrator flow departure time *default:* **0**| |end|SUMOTime|End of departure interval *default:* **3600**| |color|color|This vehicle's color *default:* **yellow**| -|departLane|string|The lane on which thevehicle shall be inserted *default:* **first**| +|departLane|string|The lane on which the vehicle shall be inserted *default:* **first**| |departPos|string|The position at which the vehicle shall enter the net *default:* **base**| |departSpeed|string|The speed with which the vehicle shall enter the network *default:* **0.00**| |arrivalLane|string|The lane at which the vehicle shall leave the network *default:* **current**| @@ -707,10 +710,10 @@ child element of [route](#route), [trip](#trip), [flow](#flow) |duration|non-negative SUMOTime|Minimum duration for stopping *default:* **60**| |until|non-negative SUMOTime|The time step at which the route continues *default:* **0.00**| |extension|SUMOTime|If set to a non-negative time value, then the stop duration can be extended at most by the extension value in seconds *default:* **0**| -|triggered|discrete string|Whether a person or container or both may end the stop *default:* **0**| +|triggered|discrete string|Whether a person or container or both may end the stop *default:* **false**| |expected|list of strings|List of elements that must board the vehicle before it may continue| |permitted|list of strings|List of elements that can board the vehicle before it may continue| -|parking|discrete string|Whether the vehicle stops on the road or beside *default:* **0**| +|parking|discrete string|Whether the vehicle stops on the road or beside *default:* **false**| |actType|string|Activity displayed for stopped person in GUI and output files| |tripId|string|Parameter to be applied to the vehicle to track the trip id within a cyclical public transport route| |line|string|New line attribute to be set on the vehicle when reaching this stop (for cyclical public transport route)| @@ -722,7 +725,7 @@ child element of [route](#route), [trip](#trip), [flow](#flow) |chargingStation|list of unique strings|ChargingStation associated with this stop| |parkingArea|list of unique strings|ParkingArea associated with this stop| |speed|non-negative float|Speed to be kept while driving between startPos and endPos *default:* **0.00**| -|edge|unique string|The ID of the edge the stop shall be located at| +|edge|unique string|Edge ID| ## connection | Attribute | Type | Description | @@ -770,7 +773,7 @@ child element of [route](#route), [trip](#trip), [flow](#flow) |speed|non-negative float|The maximum speed allowed on the lane in m/s *default:* **13.89**| |allow|list of vClasses|Explicitly allows the given vehicle classes (not given will be not allowed) *default:* **all**| |disallow|list of vClasses|Explicitly disallows the given vehicle classes (not given will be allowed)| -|width|non-negative float|Lane width for all lanes of this lane in meters (used for visualization) *default:* **-1**| +|width|non-negative float|Lane width for all lanes of this type in meters (used for visualization) *default:* **-1**| ## routeDistribution | Attribute | Type | Description | @@ -815,43 +818,53 @@ child element of [person](#person), [personFlow](#personflow) | Attribute | Type | Description | |-----------|------|-------------| -|from|unique string|The ID of the edge the person trip starts at| -|to|unique string|The ID of the edge the person trip ends at| +|from|unique string|Edge start ID| +|to|unique string|Edge end ID| |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**| -|toBusStop|unique string|Id of the destination busStop| -|toTrainStop|unique string|Id of the destination trainStop| -|fromJunction|unique string|The name of the junction the person trip starts at| -|toJunction|unique string|The name of the junction the person trip ends at| +|toTaz|unique string|TAZ end ID| +|toJunction|unique string|Junction end ID| +|busStop|unique string|BuStop end ID| +|trainStop|unique string|TrainStop start 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| ### ride child element of [person](#person), [personFlow](#personflow) | Attribute | Type | Description | |-----------|------|-------------| -|from|unique string|The ID of the edge the ride starts at| -|to|unique string|The ID of the edge the ride ends at| +|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**| -|toBusStop|unique string|ID of the destination bus stop| -|toTrainStop|unique string|ID of the destination train stop| +|busStop|unique string|BuStop end ID| +|trainStop|unique string|TrainStop start ID| +|fromBusStop|unique string|BuStop start ID| +|fromTrainStop|unique string|TrainStop start ID| ### walk child element of [person](#person), [personFlow](#personflow) | Attribute | Type | Description | |-----------|------|-------------| -|from|unique string|The ID of the edge the walk starts at| -|to|unique string|The ID of the edge the walk ends at| +|from|unique string|Edge start ID| +|to|unique string|Edge end ID| |arrivalPos|float|arrival position on the destination edge *default:* **-1**| -|toBusStop|unique string|Id of the destination bus stop| -|toTrainStop|unique string|ID of the destination train stop| -|edges|list of unique strings|id of the edges to walk| -|route|list of unique strings|The id of the route to walk| -|fromJunction|unique string|The name of the junction the walk starts at| -|toJunction|unique string|The name of the junction the walk ends at| +|toTaz|unique string|TAZ end ID| +|toJunction|unique string|Junction end ID| +|busStop|unique string|BuStop end ID| +|trainStop|unique string|TrainStop start 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| +|edges|list of unique strings|list of consecutive edges| +|route|list of unique strings|Route ID| ## personFlow | Attribute | Type | Description | @@ -895,24 +908,26 @@ child element of [container](#container), [containerFlow](#containerflow) | Attribute | Type | Description | |-----------|------|-------------| -|from|unique string|The ID of the edge the transport starts at| -|to|unique string|The ID of the edge the transport ends at| +|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**| -|toContainerStop|unique string|ID of the destination container stop| +|containerStop|unique string|ContainerStop start ID| +|fromContainerStop|unique string|ContainerStop start ID| ### tranship child element of [container](#container), [containerFlow](#containerflow) | Attribute | Type | Description | |-----------|------|-------------| -|from|unique string|The ID of the edge the tranship starts at| -|to|unique string|The ID of the edge the tranship ends at| +|from|unique string|Edge start ID| +|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**| -|toContainerStop|unique string|Id of the destination container stop| -|edges|list of unique strings|id of the edges to walk| +|containerStop|unique string|ContainerStop start ID| +|fromContainerStop|unique string|ContainerStop start ID| +|edges|list of unique strings|list of consecutive edges| ## containerFlow | Attribute | Type | Description | diff --git a/docs/web/docs/activitygen.md b/docs/web/docs/activitygen.md index a58c33f19fee..0d379f35c6c6 100644 --- a/docs/web/docs/activitygen.md +++ b/docs/web/docs/activitygen.md @@ -94,6 +94,8 @@ Command Line Applications\#Reporting Options](Basics/Using_the_Command_Line_Appl | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | | **--debug** {{DT_BOOL}} | Detailed messages about every single step; *default:* **false** | diff --git a/docs/web/docs/dfrouter.md b/docs/web/docs/dfrouter.md index 6cf112a6b86d..10b7b8130794 100644 --- a/docs/web/docs/dfrouter.md +++ b/docs/web/docs/dfrouter.md @@ -147,6 +147,8 @@ Options](Basics/Using_the_Command_Line_Applications.md#reporting_options). | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | | **--report-empty-detectors** {{DT_BOOL}} | Lists detectors with no flow (enable -v); *default:* **false** | | **--print-absolute-flows** {{DT_BOOL}} | Prints aggregated detector flows; *default:* **false** | diff --git a/docs/web/docs/duarouter.md b/docs/web/docs/duarouter.md index 67b6d02d0ecc..92d535a1b67d 100644 --- a/docs/web/docs/duarouter.md +++ b/docs/web/docs/duarouter.md @@ -202,6 +202,8 @@ Options](Basics/Using_the_Command_Line_Applications.md#reporting_options). | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | | **--ignore-errors** {{DT_BOOL}} | Continue if a route could not be build; *default:* **false** | | **--stats-period** {{DT_INT}} | Defines how often statistics shall be printed; *default:* **-1** | diff --git a/docs/web/docs/jtrrouter.md b/docs/web/docs/jtrrouter.md index c0546e1de840..d92d1dcf16c5 100644 --- a/docs/web/docs/jtrrouter.md +++ b/docs/web/docs/jtrrouter.md @@ -153,6 +153,8 @@ Options](Basics/Using_the_Command_Line_Applications.md#reporting_options). | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | | **--ignore-errors** {{DT_BOOL}} | Continue if a route could not be build; *default:* **false** | | **--stats-period** {{DT_INT}} | Defines how often statistics shall be printed; *default:* **-1** | diff --git a/docs/web/docs/marouter.md b/docs/web/docs/marouter.md index a01fcd1174b3..4591e67905a0 100644 --- a/docs/web/docs/marouter.md +++ b/docs/web/docs/marouter.md @@ -213,6 +213,8 @@ configuration: | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | | **--ignore-errors** {{DT_BOOL}} | Continue if a route could not be build; *default:* **false** | | **--stats-period** {{DT_INT}} | Defines how often statistics shall be printed; *default:* **-1** | diff --git a/docs/web/docs/netconvert.md b/docs/web/docs/netconvert.md index 71a77fcd5c91..cb06b66ed9d4 100644 --- a/docs/web/docs/netconvert.md +++ b/docs/web/docs/netconvert.md @@ -414,7 +414,7 @@ Files](Basics/Using_the_Command_Line_Applications.md#configuration_files). | **--junctions.internal-link-detail** {{DT_INT}} | Generate INT intermediate points to smooth out lanes within the intersection; *default:* **5** | | **--junctions.scurve-stretch** {{DT_FLOAT}} | Generate longer intersections to allow for smooth s-curves when the number of lanes changes; *default:* **0** | | **--junctions.join-turns** {{DT_BOOL}} | Builds common edges for turning connections with common from- and to-edge. This causes discrepancies between geometrical length and assigned length due to averaging but enables lane-changing while turning; *default:* **false** | -| **--junctions.limit-turn-speed** {{DT_FLOAT}} | Limits speed on junctions to an average lateral acceleration of at most FLOAT m/s^2); *default:* **5.5** | +| **--junctions.limit-turn-speed** {{DT_FLOAT}} | Limits speed on junctions to an average lateral acceleration of at most FLOAT (m/s^2); *default:* **5.5** | | **--junctions.limit-turn-speed.min-angle** {{DT_FLOAT}} | Do not limit turn speed for angular changes below FLOAT (degrees). The value is subtracted from the geometric angle before computing the turning radius.; *default:* **15** | | **--junctions.limit-turn-speed.min-angle.railway** {{DT_FLOAT}} | Do not limit turn speed for angular changes below FLOAT (degrees) on railway edges. The value is subtracted from the geometric angle before computing the turning radius.; *default:* **35** | | **--junctions.limit-turn-speed.warn.straight** {{DT_FLOAT}} | Warn about turn speed limits that reduce the speed of straight connections by more than FLOAT; *default:* **5** | diff --git a/docs/web/docs/netedit.md b/docs/web/docs/netedit.md index 0c76ee5171d6..6f02247f94bd 100644 --- a/docs/web/docs/netedit.md +++ b/docs/web/docs/netedit.md @@ -77,6 +77,7 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **--matsim-output** {{DT_FILE}} | The generated net will be written to FILE using MATsim format | | **--opendrive-output** {{DT_FILE}} | The generated net will be written to FILE using OpenDRIVE format | | **--dlr-navteq-output** {{DT_FILE}} | The generated net will be written to dlr-navteq files with the given PREFIX | +| **--dlr-navteq.version** {{DT_STR}} | The dlr-navteq output format version to write; *default:* **6.5** | | **--dlr-navteq.precision** {{DT_INT}} | The network coordinates are written with the specified level of output precision; *default:* **2** | | **--output.street-names** {{DT_BOOL}} | Street names will be included in the output (if available); *default:* **false** | | **--output.original-names** {{DT_BOOL}} | Writes original names, if given, as parameter; *default:* **false** | @@ -286,7 +287,7 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **--junctions.internal-link-detail** {{DT_INT}} | Generate INT intermediate points to smooth out lanes within the intersection; *default:* **5** | | **--junctions.scurve-stretch** {{DT_FLOAT}} | Generate longer intersections to allow for smooth s-curves when the number of lanes changes; *default:* **0** | | **--junctions.join-turns** {{DT_BOOL}} | Builds common edges for turning connections with common from- and to-edge. This causes discrepancies between geometrical length and assigned length due to averaging but enables lane-changing while turning; *default:* **false** | -| **--junctions.limit-turn-speed** {{DT_FLOAT}} | Limits speed on junctions to an average lateral acceleration of at most FLOAT m/s^2); *default:* **5.5** | +| **--junctions.limit-turn-speed** {{DT_FLOAT}} | Limits speed on junctions to an average lateral acceleration of at most FLOAT (m/s^2); *default:* **5.5** | | **--junctions.limit-turn-speed.min-angle** {{DT_FLOAT}} | Do not limit turn speed for angular changes below FLOAT (degrees). The value is subtracted from the geometric angle before computing the turning radius.; *default:* **15** | | **--junctions.limit-turn-speed.min-angle.railway** {{DT_FLOAT}} | Do not limit turn speed for angular changes below FLOAT (degrees) on railway edges. The value is subtracted from the geometric angle before computing the turning radius.; *default:* **35** | | **--junctions.limit-turn-speed.warn.straight** {{DT_FLOAT}} | Warn about turn speed limits that reduce the speed of straight connections by more than FLOAT; *default:* **5** | @@ -403,6 +404,7 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **--opendrive.position-ids** {{DT_BOOL}} | Sets edge-id based on road-id and offset in m (legacy); *default:* **false** | | **--opendrive.lane-shapes** {{DT_BOOL}} | Use custom lane shapes to compensate discarded lane types; *default:* **false** | | **--opendrive.signal-groups** {{DT_BOOL}} | Use the OpenDRIVE controller information for the generated signal program; *default:* **false** | +| **--opendrive.ignore-misplaced-signals** {{DT_BOOL}} | Ignore traffic signals which do not control any driving lane; *default:* **false** | ### Netedit | Option | Description | @@ -434,10 +436,6 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **--poi-prefix** {{DT_STR}} | Prefix for poi naming; *default:* **poi** | | **--jps.walkableArea-prefix** {{DT_STR}} | Prefix for jps walkable area naming; *default:* **jps.walkable_area** | | **--jps.obstacle-prefix** {{DT_STR}} | Prefix for jps obstacle naming; *default:* **jps.obstacle** | -| **--jps.waitingArea-prefix** {{DT_STR}} | Prefix for jps waiting area naming; *default:* **jps.waiting_area** | -| **--jps.source-prefix** {{DT_STR}} | Prefix for jps source naming; *default:* **jps.source** | -| **--jps.sink-prefix** {{DT_STR}} | Prefix for jps sink naming; *default:* **jps.sink** | -| **--jps.waypoint-prefix** {{DT_STR}} | Prefix for jps waypoints naming; *default:* **jps.waypoint** | | **--route-prefix** {{DT_STR}} | Prefix for route naming; *default:* **r** | | **--routeDistribution-prefix** {{DT_STR}} | Prefix for route distribution naming; *default:* **rd** | | **--vType-prefix** {{DT_STR}} | Prefix for type naming; *default:* **t** | @@ -487,6 +485,8 @@ configuration: [sumoConfiguration.xsd](https://sumo.dlr.de/xsd/neteditConfigurat | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | | **--ignore-errors** {{DT_BOOL}} | Continue on broken input; *default:* **false** | | **--ignore-errors.connections** {{DT_BOOL}} | Continue on invalid connections; *default:* **false** | diff --git a/docs/web/docs/netgenerate.md b/docs/web/docs/netgenerate.md index 7e49c97a35cd..d939a283180b 100644 --- a/docs/web/docs/netgenerate.md +++ b/docs/web/docs/netgenerate.md @@ -113,6 +113,7 @@ Files](Basics/Using_the_Command_Line_Applications.md#configuration_files). | **--matsim-output** {{DT_FILE}} | The generated net will be written to FILE using MATsim format | | **--opendrive-output** {{DT_FILE}} | The generated net will be written to FILE using OpenDRIVE format | | **--dlr-navteq-output** {{DT_FILE}} | The generated net will be written to dlr-navteq files with the given PREFIX | +| **--dlr-navteq.version** {{DT_STR}} | The dlr-navteq output format version to write; *default:* **6.5** | | **--dlr-navteq.precision** {{DT_INT}} | The network coordinates are written with the specified level of output precision; *default:* **2** | | **--output.street-names** {{DT_BOOL}} | Street names will be included in the output (if available); *default:* **false** | | **--output.original-names** {{DT_BOOL}} | Writes original names, if given, as parameter; *default:* **false** | @@ -278,7 +279,7 @@ See the [docs](Networks/PlainXML.md) for more info on [junction types](Networks/ | **--junctions.internal-link-detail** {{DT_INT}} | Generate INT intermediate points to smooth out lanes within the intersection; *default:* **5** | | **--junctions.scurve-stretch** {{DT_FLOAT}} | Generate longer intersections to allow for smooth s-curves when the number of lanes changes; *default:* **0** | | **--junctions.join-turns** {{DT_BOOL}} | Builds common edges for turning connections with common from- and to-edge. This causes discrepancies between geometrical length and assigned length due to averaging but enables lane-changing while turning; *default:* **false** | -| **--junctions.limit-turn-speed** {{DT_FLOAT}} | Limits speed on junctions to an average lateral acceleration of at most FLOAT m/s^2); *default:* **5.5** | +| **--junctions.limit-turn-speed** {{DT_FLOAT}} | Limits speed on junctions to an average lateral acceleration of at most FLOAT (m/s^2); *default:* **5.5** | | **--junctions.limit-turn-speed.min-angle** {{DT_FLOAT}} | Do not limit turn speed for angular changes below FLOAT (degrees). The value is subtracted from the geometric angle before computing the turning radius.; *default:* **15** | | **--junctions.limit-turn-speed.min-angle.railway** {{DT_FLOAT}} | Do not limit turn speed for angular changes below FLOAT (degrees) on railway edges. The value is subtracted from the geometric angle before computing the turning radius.; *default:* **35** | | **--junctions.limit-turn-speed.warn.straight** {{DT_FLOAT}} | Warn about turn speed limits that reduce the speed of straight connections by more than FLOAT; *default:* **5** | @@ -334,6 +335,8 @@ Options](Basics/Using_the_Command_Line_Applications.md#reporting_options). | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | ### Random Number diff --git a/docs/web/docs/od2trips.md b/docs/web/docs/od2trips.md index 6d9b66509b8d..3d475575d9a6 100644 --- a/docs/web/docs/od2trips.md +++ b/docs/web/docs/od2trips.md @@ -121,6 +121,8 @@ Options](Basics/Using_the_Command_Line_Applications.md#reporting_options). | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | | **--ignore-errors** {{DT_BOOL}} | Continue on broken input; *default:* **false** | diff --git a/docs/web/docs/polyconvert.md b/docs/web/docs/polyconvert.md index f45b99d3e447..58882c5754e1 100644 --- a/docs/web/docs/polyconvert.md +++ b/docs/web/docs/polyconvert.md @@ -166,6 +166,7 @@ command line. | **--prefix** {{DT_STR}} | Sets STR as default prefix | | **--type** {{DT_STR}} | Sets STR as default type; *default:* **unknown** | | **--fill** {{DT_BOOL}} | Fills polygons by default; *default:* **true** | +| **--icon** {{DT_STR}} | Sets STR as default icon | | **--layer** {{DT_FLOAT}} | Sets FLOAT as default layer; *default:* **-1** | | **--discard** {{DT_BOOL}} | Sets default action to discard; *default:* **false** | @@ -189,6 +190,8 @@ Options](Basics/Using_the_Command_Line_Applications.md#reporting_options). | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | # See Also diff --git a/docs/web/docs/sumo.md b/docs/web/docs/sumo.md index 9a339eb02856..08a1c274037e 100644 --- a/docs/web/docs/sumo.md +++ b/docs/web/docs/sumo.md @@ -234,7 +234,8 @@ configuration: | **--pedestrian.striping.reserve-oncoming.max** {{DT_FLOAT}} | Maximum width in m to reserve for oncoming pedestrians; *default:* **1.28** | | **--pedestrian.striping.legacy-departposlat** {{DT_BOOL}} | Interpret departPosLat for walks in legacy style; *default:* **false** | | **--pedestrian.striping.walkingarea-detail** {{DT_INT}} | Generate INT intermediate points to smooth out lanes within the walkingarea; *default:* **4** | -| **--pedestrian.remote.address** {{DT_STR}} | The address (host:port) of the external simulation; *default:* **localhost:9000** | +| **--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 the destination point considered as arrival (in meters); *default:* **1** | | **--ride.stop-tolerance** {{DT_FLOAT}} | Tolerance to apply when matching pedestrian and vehicle positions on boarding at individual stops; *default:* **10** | | **--persontrip.walk-opposite-factor** {{DT_FLOAT}} | Use FLOAT as a factor on walking speed against vehicle traffic direction; *default:* **1** | @@ -294,6 +295,8 @@ configuration: | **-l** {{DT_FILE}}
**--log** {{DT_FILE}} | Writes all messages to FILE (implies verbose) | | **--message-log** {{DT_FILE}} | Writes all non-error messages to FILE (implies verbose) | | **--error-log** {{DT_FILE}} | Writes all warnings and errors to FILE | +| **--log.timestamps** {{DT_BOOL}} | Writes timestamps in front of all messages; *default:* **false** | +| **--log.processid** {{DT_BOOL}} | Writes process ID in front of all messages; *default:* **false** | | **--language** {{DT_STR}} | Language to use in messages; *default:* **C** | | **--duration-log.disable** {{DT_BOOL}} | Disable performance reports for individual simulation steps; *default:* **false** | | **-t** {{DT_BOOL}}
**--duration-log.statistics** {{DT_BOOL}} | Enable statistics on vehicle trips; *default:* **false** | @@ -435,6 +438,7 @@ configuration: | **--device.bluelight.explicit** {{DT_STR[]}} | Assign a 'bluelight' device to named vehicles | | **--device.bluelight.deterministic** {{DT_BOOL}} | The 'bluelight' devices are set deterministic using a fraction of 1000; *default:* **false** | | **--device.bluelight.reactiondist** {{DT_FLOAT}} | Set the distance at which other drivers react to the blue light and siren sound; *default:* **25** | +| **--device.bluelight.mingapfactor** {{DT_FLOAT}} | Reduce the minGap for reacting vehicles by the given factor; *default:* **1** | ### Fcd Device