Merge branch 'main' of github.com:eclipse-sumo/sumo into Netedit_dev

eclipse-sumo · Sep 6, 2024 · 62b5c4c · 62b5c4c
2 parents 74ef12f + ef43c30
commit 62b5c4c
Show file tree

Hide file tree

Showing 267 changed files with 12,714 additions and 660 deletions.
diff --git a/data/xsd/additional_file.xsd b/data/xsd/additional_file.xsd
@@ -258,7 +258,7 @@
                 </xsd:restriction>
             </xsd:simpleType>
         </xsd:attribute>
-        <xsd:attribute name="source" type="xsd:string" use="required"/>
+        <xsd:attribute name="source" type="xsd:string" use="optional"/>
         <xsd:attribute name="dest" type="xsd:string" use="required"/>
         <xsd:attribute name="saveDetectors" type="boolType" use="optional"/>
         <xsd:attribute name="saveConditions" type="boolType" use="optional"/>
@@ -568,8 +568,10 @@
         <xsd:attribute name="id" type="detectorIdType" use="required"/>
         <xsd:attribute name="edge" type="xsd:string" use="optional"/>
         <xsd:attribute name="lane" type="xsd:string" use="optional"/>
-        <xsd:attribute name="pos" type="floatType" use="required"/>
+        <xsd:attribute name="node" type="xsd:string" use="optional"/>
+        <xsd:attribute name="pos" type="floatType" use="optional"/>
         <xsd:attribute name="friendlyPos" type="boolType" use="optional"/>
+        <xsd:attribute name="local" type="boolType" use="optional"/>
         <xsd:attribute name="period" type="positiveFloatType" use="optional"/>
         <xsd:attribute name="freq" type="positiveFloatType" use="optional"/>
         <xsd:attribute name="file" type="xsd:string" use="optional"/>

diff --git a/data/xsd/routeTypes.xsd b/data/xsd/routeTypes.xsd
@@ -102,6 +102,8 @@
         </xsd:attribute>
         <xsd:attribute name="jmStoplineGap" type="nonNegativeFloatType"/>
         <xsd:attribute name="jmTimegapMinor" type="nonNegativeFloatType"/>
+        <xsd:attribute name="jmStopSignWait" type="xsd:float"/>
+        <xsd:attribute name="jmAllwayStopWait" type="xsd:float"/>
         <xsd:attribute name="sigma">
             <xsd:simpleType>
                 <xsd:restriction base="xsd:float">

diff --git a/docs/web/docs/ChangeLog.md b/docs/web/docs/ChangeLog.md
@@ -52,7 +52,10 @@ title: ChangeLog
   - Fixed emergency braking at zipper with low visibilityDistance #15224
   - Fixed bug where parking rerouter does not reroute occupants #15276
   - Fixed crash when using rerouters on vehicles with stops and looped routes #15290
-  - Fixed low insertion speed for `departSpeed="max"` with waypoint #15308 
+  - Fixed low insertion speed for `departSpeed="max"` with waypoint #15308
+  - Fixed nondeterministc order of constraint trackers in saved state #15406
+  - Fixed infinite loop if rerouter interval end < begin #15416
+  - Fixed bug where vType-param "device.rerouting.probability" could not be used to prevent rerouting #15288 
 
 - netconvert
   - Fixed crash when guessing ramps #14836 (regression in 1.20.0)
@@ -71,7 +74,8 @@ title: ChangeLog
   - Fixed invalid pedestrian infrastructure connections that could cause invalid pedestrian routes #15177, #15183
   - Fixed broken lane shape in opendrive import #15197
   - Matsim import now handles node ids with unusual characters #15196
-  - Fixed crash during opendrive import with boundary filter #15243 
+  - Fixed crash during opendrive import with boundary filter #15243
+  - Fixed crash when using tlLayout="alternateOneWay" with crossings #14027 
 
 - netedit
   - Polygon context menu functions *simplify shape* and *close shape* are working again #14857 (regression in 1.6.0)
@@ -92,7 +96,8 @@ title: ChangeLog
   - Fixed invalid dotted contour around calibrators #15138 (regression in 1.20.0)  
   - Fixed click detection to rerouter/vaporizer and stoppingPlace symbols #15280 (regression in 1.20.0)
   - Fixed coloring of selected Persons and containers #15254 (regression in 1.20.0)
-  - Fixed crash when creating tranships with different speed #15339 (regression in 1.20.0) 
+  - Fixed crash when creating tranships with different speed #15339 (regression in 1.20.0)
+  - Fixed crash related to invalid endOffset #15317 (regression in 1.20.0)
   - Fixed crash when using "Replace junction by geometry point" and traffic demand is loaded #14863
   - In inspect mode, the junction contour no longer hides link indices #14948
   - Fixed invalid NEMA controller when changing type from static #15007
@@ -114,7 +119,10 @@ title: ChangeLog
   - Fixed crash recomputing network with volatile recomputing and loaded vehicles #15356
   - Can now create rides with only one edge #15361
   - Fixed clicking Person/container plans over TAZs #15363
-  - Fixed crash trying to move persons over TAZ #15365 
+  - Fixed crash trying to move persons over TAZ #15365
+  - Fixed crash when using taxi with pre-booking and ride sharing #15385
+  - Fixed crash joining junctions with crossings #15328
+  - Fixed loss of TAZ edges after recomputing with volatile options #15401 
 
 - sumo-gui
   - Reloading now works if SUMO_HOME is not set #14830 (regression in 1.15.0)
@@ -131,7 +139,9 @@ title: ChangeLog
   - Fixed invalid lateral placement of wide busStops and containerStops #15089
   - Fixed invalid rotation of articulated vehicles when parked #15168
   - Improved clickable message log in translated GUI #14759
-  - Added warning if breakpoint file does not exist #3424 
+  - Added warning if breakpoint file does not exist #3424
+  - Fixed centering on riding person when vehicle exaggeration is active #15397
+  - Fixed inconsistent rendering of walkingarea shape depending on zoom #15424 
 
 - meso
   - Fixed invalid segment properties when an edge does not allow passenger cars #15020
@@ -143,7 +153,9 @@ title: ChangeLog
   - Fixed crash when trying to call `traci.vehicle.dispatchTaxi` for an undeparted vehicle #15016
   - Fixed invalid error when constructing a new TraCILogic with libsumo #15164
   - traci.simulation.findIntermodalRoute can now be used to find taxi mode routes #15172
-  - traci.vehicle.getNextTLS now works for parking vehicles #15181  
+  - traci.vehicle.getNextTLS now works for parking vehicles #15181
+  - Fixed crash when calling vehicle.getDrivingDistance2D in meso #15404
+  - vehicle.getLeader retrieval now works beyond 3000m if subsequent edges have only 1 lane (i.e. for railways) #15418 
 
 - tools
   - osmGet.py: Fixed error downloading data from servers that do not provide gzipped data. #15105 (regression in 1.20.0)
@@ -206,7 +218,8 @@ title: ChangeLog
   - OSM import now warns if ways, nodes or relations are out of order #14892
   - OSM import now handles trolleybus routes #14932
   - Shapefile import now respects option **--default.spreadtype** #14984
-  - Added option **--geometry.max-angle.fix** for removing sharp angles within edge #15221 
+  - Added option **--geometry.max-angle.fix** for removing sharp angles within edge #15221
+  - Added option **--default.connection.cont-pos** to change the default internal junction position (or disable internal junctions) #13642
 
 - marouter
   - Loaded trip attributes (i.e. departLane and departSpeed) are now preserved #15049
@@ -220,10 +233,13 @@ title: ChangeLog
   - chargingStation attributes can now be modified #12772
   - Added functions `edge.getBidiEdge` and `lane.getBidiLane` #15186
   - Added functions `getMass` and `setMass` to the vehicle, person and vehicletype dommains #15258
-  - Added person stages now support all stopping places and not only busStops #15281 
+  - Added person stages now support all stopping places and not only busStops #15281
+  - Meso simulation now supports functions `vehicle.getSegmentIndex` and `vehicle.getSegmentID` #14681
+  - Meso simulation with option **--meso-lane-queue** now supports `vehicle.getLaneIndex` #15341  
 
 - tools
   - plotXMLAttributes.py: can now use special attribute `@FILE` to simplify plotting of multiple files where each file provides one value #14843
+  - plotXMLAttributes.py: added option **--robust-parser** which handles files without linebreak after each element #15340 
   - gtfs2pt.py: Now warns if no valid GTFS inside the network boundaries has been found #14876
   - addStops2Routes.py: Can now create waypoints by setting option **--speed**. #14895
   - traceExporter.py now supports options **-c** and **-C** for loading and saving configuration files #14934
@@ -415,6 +431,7 @@ title: ChangeLog
   - A personFlow with `depart="triggered"` can now be distributed over a flow of vehicles #14806
   - vTypes and parkingAreas now support attribute 'parkingBadges' to control access #14482
   - personInfo (in tripinfo-output) now include data that aggregates over all stages of the plan #14823
+  - tranship to stopping place other than containerStop can now be defined #15399 
 
 - netedit
   - Now sidewalk and bikelane width can be edited in *create edge mode*. #9725
@@ -435,6 +452,7 @@ title: ChangeLog
   - Reduced exaggerated size of long vehicles (i.e. trains) when zoomed out. Issue #14423
   - Reduced the number of bike markings being rendered to increase realism and reduce clutter. #14545
   - Airways now have their own default color #14813
+  - Added more information to stop info in vehicle parameter dialog #15395 
 
 - netconvert
   - Edge widths are now imported from OSM. The new option **--ignore-widths** can be used to restore legacy behavior. #4392

diff --git a/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md b/docs/web/docs/Definition_of_Vehicles,_Vehicle_Types,_and_Routes.md
@@ -984,8 +984,11 @@ listed below.
 | jmIgnoreJunctionFoeProb        | float                                | 0          | This value causes vehicles to ignore foe vehicles and pedestrians that have already entered a junction with the given probability. The check is performed anew every simulation step. (range \[0,1\]).                                                                                                                                                                                                                                                                    |
 | jmSigmaMinor           | float, scaling factor (like *sigma*) | sigma      | This value configures driving imperfection (dawdling) while passing a minor link (ahead of the intersection after having committed to drive and while still on the intersection).                                                                                                                                                                                                                                                            |
 | jmStoplineGap          | float \>= 0 (m)                      | 1          | This value configures stopping distance in front of prioritary / TL-controlled stop line. In case the stop line has been relocated by a [**stopOffset**](Networks/SUMO_Road_Networks.md#stop_offsets) item, the maximum of both distances is applied.       |
+| jmStoplineCrossingGap          | float \>= 0 (m)                      | 1          | This value configures stopping distance in front of a pedestrian crossing. In case the stop line has been relocated by a [**stopOffset**](Networks/SUMO_Road_Networks.md#stop_offsets) item, the maximum of both distances is applied.       |
+
 | jmTimegapMinor         | float s                              | 1          | This value defines the minimum time gap when passing ahead of a prioritized vehicle.    |
 | jmStopSignWait         | float s                              | step-length | This value defines the minimum stopping duration before passing a stop sign (default is a single simulation step)    |
+| jmAllwayStopWait       | float s                              | step-length | This value defines the minimum stopping duration before passing an allway_stop sign (default is a single simulation step)    |
 | impatience             | float or 'off'                       | 0.0        | Willingness of drivers to impede vehicles with higher priority. See below for semantics.  |
 
 

diff --git a/docs/web/docs/Networks/Import/ArcView.md b/docs/web/docs/Networks/Import/ArcView.md
@@ -16,7 +16,7 @@ network stored in "my_shape_files.shp", "my_shape_files.shx",
 "my_shape_files.proj", and "my_shape_files.dbf":
 
 ```
-netconvert --shapefile-prefix my_shape_files
+netconvert --shapefile-prefix my_shape_files
 ```
 
 Unfortunately, shape files describe how information is stored

diff --git a/docs/web/docs/Simulation/Calibrator.md b/docs/web/docs/Simulation/Calibrator.md
@@ -142,6 +142,9 @@ The normal behavior is to replace the type of the passing vehicles with the type
 !!! caution
     The type modification happens when the vehicle enters the calibrator edge regardless of the configured calibrator position.
 
+!!! caution
+    Type calibration does currently not work with the mesoscopic model.
+
 ### Type-dependent mapping
 
 If the traffic consists of multiple vehicle types (i.e. passenger cars and trucks) it may be desirable to either
@@ -198,6 +201,27 @@ Example additional-file input:
 ```
 In this example, all cars will be mapped to slower cars (type 'car' to 'car2') and all trucks will be mapped to trucks that keep larger distances.
 
+### Calibrating on junctions
+
+You can define a type calibration for a whole junction in the following way:
+
+```xml
+<additional>
+  <calibrator id="cars" node="J1" pos="0">
+    <flow begin="0" end="1800" type="myNewCarType"/>
+  </calibrator>
+  <calibrator id="carsUndone" node="J2" pos="0" local="true">
+    <flow begin="0" end="1800" type="myNewCarType2"/>
+  </calibrator>
+</additional>
+```
+
+This will change the vehicle type once the vehicle enters one of the edges which approach the junction.
+The second variant above with the `local` attribute will also undo the changes (revert to the original type)
+once the vehicle has left any edge outgoing from the junction.
+As with the general type calibration the `pos` attribute is being ignored.
+
+
 # Building a scenario without knowledge of routes, based on flow measurements
 
 !!! note