Upstream merge 2024-07-11

.github/workflows/prune-container-images.yml

@@ -19,4 +19,4 @@ jobs:
           # remove all snapshot container images that have not been pulled for over a year
           # --keep-semver makes sure that any image with a x.y.z version scheme is unaffected by this
           pip install prune-container-repo==0.0.4
-          prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=90 --keep-semver --activate
+          prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=365 --keep-semver --activate

doc-templates/OsmMapper.md

@@ -0,0 +1,30 @@
+# OSM tag mapping
+
+This page is intended to give an overview of which OpenStreetMap(OSM) tags OTP uses to evaluate its
+walking and bicycling instructions. If a tag is not part of the documentation on this page
+then this tag mapper (profile) does not use it. 
+
+The exception are access permissions and wheelchair accessibility tags like
+
+- `access=no`
+- `wheelchair=no`
+- `oneway=yes`
+
+These are identical for all mappers and not separately listed on this page.
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+Lower safety values make an OSM way more desirable and higher values less desirable.
+
+<!-- INSERT: props -->
+
+### Safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Their safety values are multiplied with the base values from the selected
+way properties. Multiple mixins can apply to the same way and their effects compound.
+
+<!-- INSERT: mixins -->

doc-templates/sandbox/VehicleRentalServiceDirectory.md

@@ -1,10 +1,10 @@
-# Vehicle Rental Service Directory API support.
+# Vehicle Rental Service Directory API support
 
-This adds support for the GBFS service directory endpoint component located at 
-https://github.com/entur/lamassu. OTP uses the service directory to lookup and connect to all GBFS
-endpoints registered in the directory. This simplifies the management of the GBFS endpoints, since
-multiple services/components like OTP can connect to the directory and get the necessary
-configuration from it.
+This adds support for the GBFS service directory endpoint component
+[Lamassu](https://github.com/entur/lamassu). 
+OTP uses the service directory to lookup and connects to all GBFS endpoints registered in the 
+directory. This simplifies the management of the GBFS endpoints, since multiple services/components 
+like OTP can connect to the directory and get the necessary configuration from it.
 
 
 ## Contact Info
@@ -17,6 +17,7 @@ configuration from it.
 - Initial implementation of bike share updater API support
 - Make json tag names configurable [#3447](https://github.com/opentripplanner/OpenTripPlanner/pull/3447)
 - Enable GBFS geofencing with VehicleRentalServiceDirectory [#5324](https://github.com/opentripplanner/OpenTripPlanner/pull/5324)
+- Enable `allowKeepingVehicleAtDestination` [#5944](https://github.com/opentripplanner/OpenTripPlanner/pull/5944)
 
 
 ## Configuration

docs/Changelog.md

@@ -41,6 +41,11 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Fix NullPointerException in stop transfer priority cost vector generation [#5943](https://github.com/opentripplanner/OpenTripPlanner/pull/5943)
 - Convert transferSlack configuration to duration [#5897](https://github.com/opentripplanner/OpenTripPlanner/pull/5897)
 - Expose stop transfer priority in Transmodel API [#5942](https://github.com/opentripplanner/OpenTripPlanner/pull/5942)
+- Add rental system to GraphQL API [#5909](https://github.com/opentripplanner/OpenTripPlanner/pull/5909)
+- Improve handling of SIRI added trip with unresolvable agency [#5931](https://github.com/opentripplanner/OpenTripPlanner/pull/5931)
+- Fix copy-on-write in TimetableSnapshot [#5941](https://github.com/opentripplanner/OpenTripPlanner/pull/5941)
+- Generate documentation for OSM tag mappers [#5929](https://github.com/opentripplanner/OpenTripPlanner/pull/5929)
+- Disable Legacy REST API by default [#5948](https://github.com/opentripplanner/OpenTripPlanner/pull/5948)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

docs/Configuration.md

@@ -241,7 +241,7 @@ Here is a list of all features which can be toggled on/off and their default val
 | `FaresV2`                                  | Enable import of GTFS-Fares v2 data.                                                                                                                                                                                                                                                                             |                    |    ✓️   |
 | `FlexRouting`                              | Enable FLEX routing.                                                                                                                                                                                                                                                                                             |                    |    ✓️   |
 | `GoogleCloudStorage`                       | Enable Google Cloud Storage integration.                                                                                                                                                                                                                                                                         |                    |    ✓️   |
-| `LegacyRestApi`                            | Enable legacy REST API. This API will be removed in the future.                                                                                                                                                                                                                                                  |         ✓️         |    ✓️   |
+| `LegacyRestApi`                            | Enable legacy REST API. This API will be removed in the future.                                                                                                                                                                                                                                                  |                    |    ✓️   |
 | `RealtimeResolver`                         | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data                                                                                                                                                                                                      |                    |    ✓️   |
 | `ReportApi`                                | Enable the report API.                                                                                                                                                                                                                                                                                           |                    |    ✓️   |
 | `RestAPIPassInDefaultConfigAsJson`         | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY!                                                                                                                                                                                                                      |                    |         |