diff --git a/docs/web/docs/ChangeLog/Changes_in_2021_releases.md b/docs/web/docs/ChangeLog/Changes_in_2021_releases.md index 48e7679147a..fcc8e2aa85f 100644 --- a/docs/web/docs/ChangeLog/Changes_in_2021_releases.md +++ b/docs/web/docs/ChangeLog/Changes_in_2021_releases.md @@ -178,7 +178,7 @@ title: Changes in the 2021 releases (versions 1.9.0, 1.9.1, 1.9.2, 1.10.0 and 1. - Fixed bug where command 'traci.vehicle.changeLane' was ignored in sublane simulation. Issue #9147, #9493 - Function 'traci.vehicle.replaceStop' no longer fails while on junction. Issue #9467 - Fixed invalid stop duration reported after updating duration with setStop. Issue #9522 - - Added missing convenience functions in traci.vehicle (i.e. 'isAtBusstop' to libsumo and libtraci python bindings. Issue #9591 + - Added missing convenience functions in traci.vehicle (i.e. 'isAtBusstop') to libsumo and libtraci python bindings. Issue #9591 - Fixed missing vehicles when using subscriptionFilterLateralDistance. Issue #9603 - tools @@ -821,7 +821,7 @@ title: Changes in the 2021 releases (versions 1.9.0, 1.9.1, 1.9.2, 1.10.0 and 1. - Lane changing restrictions are now imported from OSM. To achieve legacy behavior, set option **--ignore-change-restrictions all**. Issue #8221 - Added option **--tls.no-mixed** which prevents building phases where different connections from the same lane have green and red signals. Issue #7821 - Element `` is now supported in an edge `` to pre-configure speed, width and permissions for individual lanes. Issue #7791 - - Merging of overlapping geo-referenced networks with re-occuring ids now works without setting option **--ignore-errors**. Issue #8019 + - Merging of overlapping geo-referenced networks with re-occurring ids now works without setting option **--ignore-errors**. Issue #8019 - When using option **--junctions.join-same** to merge overlapping networks with different junction ids, the option **--edges.join** can now be used to automatically remove duplicate edges. Issue #8019 - Added option **--railway.topology.repair.minimal**. This works similar to **--railway.topology.repair** but avoids creating bidirectional tracks that are not needed for public transport routes (only applies when using option **--ptline-output**). Issue #7982 - Public transport edges that are disconnected from the main road network (in particular railways) are now included in the output when using option **--keep.edges.components 1** as long as they have public transport stops that are written via option **--ptstop-output**. Issue #8061 diff --git a/docs/web/docs/Developer/Implementation_Notes/Error_Handling.md b/docs/web/docs/Developer/Implementation_Notes/Error_Handling.md index 0bf2621cb83..d66bd3e1ece 100644 --- a/docs/web/docs/Developer/Implementation_Notes/Error_Handling.md +++ b/docs/web/docs/Developer/Implementation_Notes/Error_Handling.md @@ -46,13 +46,13 @@ direct feedback (for instance on one way socket connections) we ignore the data (with something like a log message), otherwise we try to give feedback. -*Programming bugs* should be catched in a way that allows to retrack +*Programming bugs* should be caught in a way that allows to retrack them. The user shall not be confronted with any segfaults-popups or things like that. Rather, an error message about an improper behavior shall be printed (currently: "Quitting (on unknown error).") and the application should quit correctly. -*System errors* should be catched and printed to the user. The +*System errors* should be caught and printed to the user. The application should then quit correctly. ### Implementation in command line applications diff --git a/docs/web/docs/Netedit/editModesNetwork.md b/docs/web/docs/Netedit/editModesNetwork.md index 96218a7618f..42396bfb875 100644 --- a/docs/web/docs/Netedit/editModesNetwork.md +++ b/docs/web/docs/Netedit/editModesNetwork.md @@ -217,7 +217,7 @@ Creation of polygon. ![](../images/ModePolygon4ClosingShape.png) Polygon with shape closed. -The points of a shape can be edited in the Move mode by clicking on the outline to create a new point or above an already existing one in order to modify its position. If a point moves to the same position of an adjacent point, they fuse together, and if the final point moves to the position of the initial point, the polygon gets closed. If the polygon has the option “block shape” activated, it won’t be editable, but only moved as a set. +The points of a shape can be edited in the Move mode by clicking on the outline to create a new point or above an already existing one in order to modify its position. If a point moves to the same position of an adjacent point, they fuse together, and if the final point moves to the position of the initial point, the polygon gets closed. If the polygon has the option “block shape” activated, it won't be editable, but only moved as a set. ![](../images/ModePolygon5MovingVertex.png) Moving Polygon's shape point. diff --git a/docs/web/docs/Networks/Import/ArcView.md b/docs/web/docs/Networks/Import/ArcView.md index 12e1a0fe9c8..6cf3edb5b65 100644 --- a/docs/web/docs/Networks/Import/ArcView.md +++ b/docs/web/docs/Networks/Import/ArcView.md @@ -67,7 +67,7 @@ to describe the edges' attributes. In this case, the column to retrieve an according street's type name from must be named using **--shapefile.type-id** {{DT_IDList}} and a [SUMO edge type file](../../SUMO_edge_type_file.md) must be given to [netconvert](../../netconvert.md) using **--type-files** {{DT_FILE}}. If something fails with the -types or the explicit values, it can be catched using **--shapefile.use-defaults-on-failure**. In these cases, +types or the explicit values, it can be caught using **--shapefile.use-defaults-on-failure**. In these cases, the default [netconvert](../../netconvert.md) values are used. Besides this, it is possible to load own [connection descriptions](../../Networks/PlainXML.md#connection_descriptions). diff --git a/docs/web/docs/Networks/Import/OpenStreetMap.md b/docs/web/docs/Networks/Import/OpenStreetMap.md index 453b195cde4..09c571b6dff 100644 --- a/docs/web/docs/Networks/Import/OpenStreetMap.md +++ b/docs/web/docs/Networks/Import/OpenStreetMap.md @@ -493,7 +493,7 @@ additional type maps from !!! caution The values in those type maps were set-up ad-hoc and are not yet verified. It would be a great help if someone would revisit and improve them. Please let us know. -## Explicite Road Attributes +## Explicit Road Attributes In case an edge contains the definition about the number of lanes (key="*lanes*") or the allowed speed (key="*maxspeed*"), this diff --git a/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md b/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md index 7dc4ebac490..b387f7c50a4 100644 --- a/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md +++ b/docs/web/docs/Simulation/Output/Amitran_Traffic_Measures.md @@ -23,7 +23,7 @@ file="" \[vTypes=""\] \[excludeEmpty="true"\]/\> | period (alias freq) | int (time) | The aggregation period the values the detector collects shall be summed up. If not given, the whole time range between begin and end is aggregated | | begin | int (time) | The time to start writing (intervals starting before this time are discarded). If not given, the simulation's begin is used. | | end | int (time) | The time to end writing (intervals starting at or after this time are discarded). If not given the simulation's end is used. | -| vTypes | string | A space separated ist of vehicle types to collect data for. If not given, collect for all types. | +| vTypes | string | A space separated list of vehicle types to collect data for. If not given, collect for all types. | | excludeEmpty | string (true, false, defaults) | If set to true, edges/lanes which were not used by a vehicle during this period will not be written; *default: false*. If set to "defaults" default values for travel time and emissions depending on edge length and maximum speed get printed. | ## Generated Output diff --git a/docs/web/docs/Simulation/Output/FullOutput.md b/docs/web/docs/Simulation/Output/FullOutput.md index 9be453e6171..de583740c94 100644 --- a/docs/web/docs/Simulation/Output/FullOutput.md +++ b/docs/web/docs/Simulation/Output/FullOutput.md @@ -94,8 +94,8 @@ The meanings of the written values are given in the following table. | pos | meters | The position of the vehicle on a specific lane (distance of the front bumper from the start of the lane) | | speed | m/s | The current speed of the vehicle | | angle | degree | The angle of the vehicle | -| pos_x | \--- | The absolut X coordinate of the vehicle (center of front bumper). The value depends on the given geographic projection. | -| pos_y | \--- | The absolut Y coordinate of the vehicle (center of front bumper). The value depends on the given geographic projection | +| pos_x | \--- | The absolute X coordinate of the vehicle (center of front bumper). The value depends on the given geographic projection. | +| pos_y | \--- | The absolute Y coordinate of the vehicle (center of front bumper). The value depends on the given geographic projection | | traveltime | seconds | The mean travel time on the specific lane | | fuel\@lane | l/km/h | The fuel consumption on the specific lane | | maxspeed | m/s | The maximum speed of the vehicles on the specific lane | diff --git a/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md b/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md index 6a0df309824..1b0426d621e 100644 --- a/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md +++ b/docs/web/docs/Simulation/Output/Lane-_or_Edge-based_Traffic_Measures.md @@ -66,7 +66,7 @@ For additional attributes see the table below. ### Simplified definition -If none of the addional attributes listed above are needed, a meandata definition can be declared without defining an additional file by setting one of the following options: +If none of the additional attributes listed above are needed, a meandata definition can be declared without defining an additional file by setting one of the following options: - **--edgedata-output** FILENAME - **--lanedata-output** FILENAME diff --git a/docs/web/docs/Simulation/Output/SSM_Device.md b/docs/web/docs/Simulation/Output/SSM_Device.md index 6f43a60b309..5466c7d63eb 100644 --- a/docs/web/docs/Simulation/Output/SSM_Device.md +++ b/docs/web/docs/Simulation/Output/SSM_Device.md @@ -18,7 +18,7 @@ For instance, a single vehicle can be equipped (with a device parametrized by de ``` ## Preparing the network file -The SSM device makes use of the [right-of-way information](../../../Networks/SUMO_Road_Networks.md#junctions_and_right-of-way) of the intersections to derive some of the measures. It uses the foe matrix of the right-of-way definition to extract crossing and merging paths. If an intersection is set to **unregulated**, this information is not available and thus e.g. no PET measure can be computed for this intersection. +The SSM device makes use of the [right-of-way information](../../Networks/SUMO_Road_Networks.md#junctions_and_right-of-way) of the intersections to derive some of the measures. It uses the foe matrix of the right-of-way definition to extract crossing and merging paths. If an intersection is set to **unregulated**, this information is not available and thus e.g. no PET measure can be computed for this intersection. ## Output File diff --git a/docs/web/docs/Simulation/Output/TripInfo.md b/docs/web/docs/Simulation/Output/TripInfo.md index 191aed7bb0f..22526b2e98f 100644 --- a/docs/web/docs/Simulation/Output/TripInfo.md +++ b/docs/web/docs/Simulation/Output/TripInfo.md @@ -176,7 +176,7 @@ The attributes within the stages have the following meaning: | Name | Type | Description | | ----------- | -------------------- | -------------------------------------------------------------------------------------------------------------------------------- | -| `depart` | (simulation) seconds | The departure time for this stage. For `,`, this is the time where the vehicle is entered. (-1 if the vehicl wasn't entered) | +| `depart` | (simulation) seconds | The departure time for this stage. For `,`, this is the time where the vehicle is entered. (-1 if the vehicle wasn't entered) | | `arrival` | (simulation) seconds | The arrival time for this stage N.B. In stop stages this is the time at which the stage ends i.e. after the duration time period (-1 if the stage did not start) | | `arrivalPos` | m | The arrival position on the destination edge for this stage | | `duration` | (simulation) seconds | For walking and stopping, this is time spent in that stage. For a riding stage, this **only** is the time spent inside the vehicle. (-1 if the stage did not start or the person did not enter the vehicle) | diff --git a/docs/web/docs/Simulation/Stationfinder.md b/docs/web/docs/Simulation/Stationfinder.md index 10a3235d5f9..e51cf97f9f8 100644 --- a/docs/web/docs/Simulation/Stationfinder.md +++ b/docs/web/docs/Simulation/Stationfinder.md @@ -87,7 +87,7 @@ element of the form ` value= ``` -## Availabe Person Attributes +## Available Person Attributes | Attribute | Type | Range | Default | Remark | |---------------------|-----------|--------------------|-----------------|---------------------------| diff --git a/docs/web/docs/Specification/index.md b/docs/web/docs/Specification/index.md index a29ad156a10..2357d1478ed 100644 --- a/docs/web/docs/Specification/index.md +++ b/docs/web/docs/Specification/index.md @@ -79,7 +79,7 @@ created at time "begin". The id of the created vehicles is Types define physical parameters such as length, acceleration, deceleration and maximum speed and give a list of categories cars of -this type belong to. All theses parameters are identical among all +this type belong to. All these parameters are identical among all vehicles of a type. diff --git a/docs/web/docs/TraCI/ChargingStation.md b/docs/web/docs/TraCI/ChargingStation.md index ac302bf6e83..5c514114534 100644 --- a/docs/web/docs/TraCI/ChargingStation.md +++ b/docs/web/docs/TraCI/ChargingStation.md @@ -19,7 +19,7 @@ value is also shown in the table. | -------------------------------------------- | ------------------- | ----------------- | -------------------------------------------------------------- | | end pos | double | The end position of the stop along the lane measured in m. | [getEndPos](https://sumo.dlr.de/pydoc/traci._chargingstation.html#ChargingStationDomain-getEndPos) | | lane ID | string | Returns the lane of this calibrator (if it applies to a single lane) | [getLaneID](https://sumo.dlr.de/pydoc/traci._chargingstation.html#ChargingStationDomain-getLaneID) | -| name | sting | Returns the name of this stop | [getName](https://sumo.dlr.de/pydoc/traci._chargingstation.html#ChargingStationDomain-getName) | +| name | string | Returns the name of this stop | [getName](https://sumo.dlr.de/pydoc/traci._chargingstation.html#ChargingStationDomain-getName) | | start pos | double | The starting position of the stop along the lane measured in m. | [getStartPos](https://sumo.dlr.de/pydoc/traci._chargingstation.html#ChargingStationDomain-getStartPos) | | vehicle count | integer | Get the total number of vehicles stopped at the named charging station. | [getVehicleCount](https://sumo.dlr.de/pydoc/traci._chargingstation.html#ChargingStationDomain-getVehicleCount) | | vehicle ID | stringList | Get the IDs of vehicles stopped at the named charging station. | [getVehicleIDs](https://sumo.dlr.de/pydoc/traci._chargingstation.html#ChargingStationDomain-getVehicleIDs) |