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

.github/workflows/wheel-macos.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-13, macos-14]
         python_version: [3.8, 3.9, '3.10', 3.11, 3.12]
         exclude:
           - os: macos-14
@@ -71,8 +71,8 @@ jobs:
         python3 -m build --wheel
         python3 tools/build_config/version.py tools/build_config/setup-libsumo.py tools/setup.py
         python3 -m build --wheel tools -o dist
-        if [[ "${{ matrix.python_version }}" != "3.8" ]]; then rm dist/eclipse_sumo-*; fi
-        if [[ "${{ matrix.python_version }}" == "3.8" ]]; then mv dist/eclipse_sumo-* `echo dist/eclipse_sumo-* | sed 's/cp38-cp38/py2.py3-none/'`; fi
+        if [[ "${{ matrix.python_version }}" != "3.12" ]]; then rm dist/eclipse_sumo-*; fi
+        if [[ "${{ matrix.python_version }}" == "3.12" ]]; then mv dist/eclipse_sumo-* `echo dist/eclipse_sumo-* | sed 's/cp312-cp312/py2.py3-none/'`; fi
 
     - name: Uploading artifacts (Python wheels)
       uses: actions/upload-artifact@v4
@@ -88,13 +88,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14]
-        python_version: [3.8, 3.9, '3.10', 3.11, 3.12]
-        # exclude:
-        #   - os: macos-14
-        #     python_version: 3.8
-        #   - os: macos-14
-        #     python_version: 3.9
+        os: [macos-13, macos-14, macos-15]
+        python_version: ['3.10', 3.11, 3.12]
+        include:
+          - os: macos-13
+            python_version: 3.8
+          - os: macos-13
+            python_version: 3.9
     runs-on: ${{ matrix.os }}
 
     steps:

docs/web/docs/Simulation/Output/FCDOutput.md

@@ -176,7 +176,7 @@ When not all vehicles are equipped with an **fcd**-device, other vehicles and pe
 - **--fcd-output.distance** will add [kilometrage](../Railways.md#kilometrage_mileage_chainage) information to the output
 - **--fcd-output.acceleration** will add acceleration data to the output (also lateral acceleration when using the [sublane model](../SublaneModel.md))
 - **--fcd-output.max-leader-distance FLOAT** will add attributes leaderGap, leaderSpeed, leaderID whenever a vehicle has a leader within the given distance. Otherwise, leaderID will be "" and leaderGap, leaderSpeed will be -1.
-- **--fcd-output.params KEY1,KEY2,...** adds [generic parameters](../GenericParameters.md) to the output (supports device and carfollowmodel parameters as well as arbitrary user-define values)
+- **--fcd-output.params KEY1,KEY2,...** adds [generic parameters](../GenericParameters.md) to the output (supports device and car-following model parameters as well as arbitrary user-define values)
 - **--fcd-output.attributes ATTR1,ATTR2,...** restrict / extend written attributes to the given list to customize output (can be any combination of the attributes above). The value **all** enables all attributes.
 
 ## NOTES

docs/web/docs/Simulation/Output/Lanearea_Detectors_(E2).md

@@ -134,7 +134,7 @@ The values are described in the following table.
 | begin                       | (simulation) seconds | The first time step the values were collected in                                                                                                                                                            |
 | end                         | (simulation) seconds | The last time step + DELTA_T the values were collected in (may be equal to begin)                                                                                                                          |
 | id                          | id                   | The id of the detector (needed if several detectors share an output file)                                                                                                                                   |
-| sampledSeconds              | s                    | The total time all vehicles which contributed data were on the detector. this may be fractional even if the time step is one second, because the times when the vehicle enters and leaves are interpolated. |
+| sampledSeconds              | s                    | The total time all vehicles which contributed data were on the detector. This may be fractional even if the time step is one second, because the times when the vehicle enters and leaves are interpolated. |
 | nVehEntered                 | \#                   | The number of vehicles that entered the detector in the corresponding interval. (vehicle front has passed 'pos')                                                                                                                            |
 | nVehLeft                    | \#                   | The number of vehicles that left the detector in the corresponding interval. (vehicle back has passed 'endPos' / has changed lane / has been teleported / has parked)  |
 | nVehSeen                    | \#                   | The number of vehicles that were on the detector in the corresponding interval (were "seen" by the detector).                                                                                               |

docs/web/docs/Tools/Routes.md

@@ -114,6 +114,17 @@ python tools/route/cutRoutes.py reduced.net.xml orig.rou.xml
 
 Filtering stopping places is also supported by setting the options **--additional-input** and **--stops-output**.
 
+# cutTrips.py
+
+This script cuts down trips from a large scenario to a sub-scenario.
+Only trips that start and end in the sub-scenario network are kept
+(this differs from [cutRoutes.py](#cutroutespy) which also keeps routes passing through the
+sub-scenario network).
+
+```python
+python tools/route/cutRoutes.py --trips-output output.rou.xml cut.net.xml orig.rou.xml
+```
+
 # splitRouteFiles.py
 
 This script splits a list of route files (e.g. coming from [duarouter](../duarouter.md))

docs/web/docs/Tools/index.md

@@ -48,62 +48,61 @@ For scripts in other subdirectories of tools you have to replace xml in this exa
 
 ## Using tools from netedit
 
-Since version 1.17.0, netedit supports calling many tools via configuration dialog by using the 'Tools' menu. For a demonstration, see the [SUMO 2023 Confererence tutorial](../Tutorials/index.md#sumo_user_conference_tutorials).
+Since version 1.17.0, netedit supports calling many tools via configuration dialog by using the 'Tools' menu. For a demonstration, see the [SUMO 2023 Conference tutorial](../Tutorials/index.md#sumo_user_conference_tutorials).
 
 # Tools by category
 
 The tools are divided into the following topics:
 
 - *[assign](Assign.md)* - traffic assignment tools
-- *[build](Build.md)* - tools used for code styling and
+- *[build_config](Build.md)* - tools used for code styling and
 by the building subsystems
 - *[detector](Detector.md)* - some tools for dealing
 with real life induction loop data
-- *[turn-data](Turns.md)* - some tools with turning counts and turning
-  ratio data
-with real life induction loop data
+- *[devel](devel.md)* - tools for developers
 - *[district](District.md)* - tools for handling traffic
 analysis zones (TAZ) aka districts
+- *[drt](Drt.md)* - tools to simulate demand responsive transport
+- *[emissions](Emissions.md)* - tools for computing and
+visualizing emissions
 - *import* - additional tools to import data from a variety of formats
   - *[GTFS](Import/GTFS.md)* - some helpers for using GTFS data
   - *[MATSim](Import/MATSim.md)* - some helpers for
     using MATSim data
-  - *[OpenDRIVE](Import/OpenDRIVE.md)* - some helpers for
-    using OpenDRIVE data
   - *[OSM](Import/OSM.md)* - some helpers for
     accessing/using OpenStreetMap data
+  - *[OpenDRIVE](Import/OpenDRIVE.md)* - some helpers for
+    using OpenDRIVE data
   - *[Vissim](Import/VISSIM.md)* - some helpers for
     using VISSIM data
   - *[Visum](Import/VISUM.md)* - some helpers for
     using VISUM data
 - *[net](Net.md)* - tools for working with networks
 (mainly SUMO-networks)
-- *projects* - additional tools used by our projects
+- *[output](Output.md)* - python tools for working with
+sumo output files
+- *[railways](Railways.md)* - tools for the simulations of trains
 - *[route](Routes.md)* - tools for working with routes
 - *[shapes](Shapes.md)* - tools for working with shapes
 (PoIs and polygons)
+- *[sumolib](Sumolib.md)* - python library for working
+with sumo networks, simulation output and miscellaneous utility
+functions
 - *[tls](tls.md)* - tools for traffic light systems
-- *[traci](../TraCI/Interfacing_TraCI_from_Python.md)* - Python
-implementation of the TraCI interface
 - *[traceExporter](TraceExporter.md)* - generate
 mobility traces / trajectories / orbits / gps tracks in various
 formats
+- *[traci](../TraCI/Interfacing_TraCI_from_Python.md)* - Python
+implementation of the TraCI interface
 - *[trip](Trip.md)* - Trip generation and modification
 without [od2trips](../od2trips.md)
+- *[turn-data](Turns.md)* - some tools with turning counts and turning
+  ratio data
+with real life induction loop data
 - *[visualization](Visualization.md)* - graphical
 evaluation of SUMO-outputs
-- *[sumolib](Sumolib.md)* - python library for working
-with sumo networks, simulation output and miscellaneous utility
-functions
-- *[output](Output.md)* - python tools for working with
-sumo output files
-- *[emissions](Emissions.md)* - tools for computing and
-visualizing emissions
-- *[railways](Railways.md)* - tools for the simulations of trains
-- *[drt](Drt.md)* - tools to simulate demand responsive transport
 - *[xml](Xml.md)* - python tools for converting xml and
 xml schema related utilities
-- *[devel](devel.md)* - tools for developers
 - *[miscellaneous](Misc.md)* - tools that do not fit the
 above categories