diff --git a/.github/workflows/prune-container-images.yml b/.github/workflows/prune-container-images.yml
index f3987a064a9..c1653701c3b 100644
--- a/.github/workflows/prune-container-images.yml
+++ b/.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
diff --git a/doc/templates/OsmMapper.md b/doc/templates/OsmMapper.md
new file mode 100644
index 00000000000..1690deac627
--- /dev/null
+++ b/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.
+
+
+
+### 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.
+
+
diff --git a/doc/templates/sandbox/VehicleRentalServiceDirectory.md b/doc/templates/sandbox/VehicleRentalServiceDirectory.md
index d9908de1a90..787a17e90e4 100644
--- a/doc/templates/sandbox/VehicleRentalServiceDirectory.md
+++ b/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
diff --git a/doc/user/Changelog.md b/doc/user/Changelog.md
index ca97c053229..1ae81820e72 100644
--- a/doc/user/Changelog.md
+++ b/doc/user/Changelog.md
@@ -40,6 +40,13 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
- Require valid polygons for AreaStop [#5915](https://github.com/opentripplanner/OpenTripPlanner/pull/5915)
- 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)
+- Enforce non-null coordinates on multimodal station [#5971](https://github.com/opentripplanner/OpenTripPlanner/pull/5971)
[](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
## 2.5.0 (2024-03-13)
diff --git a/doc/user/Configuration.md b/doc/user/Configuration.md
index e7d30fbaae5..340cae06091 100644
--- a/doc/user/Configuration.md
+++ b/doc/user/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! | | |
diff --git a/doc/user/Container-Image.md b/doc/user/Container-Image.md
index d8e6db6d614..ed2441f5ac1 100644
--- a/doc/user/Container-Image.md
+++ b/doc/user/Container-Image.md
@@ -4,7 +4,9 @@ The CI pipeline deploys container images for runtimes like Docker, Kubernetes or
[Dockerhub](https://hub.docker.com/r/opentripplanner/opentripplanner/tags).
The image assumes you use a volume to mount the input data (GTFS/NeTex, OSM) and config files into
-`/var/opentripplanner/`. When serving a graph it's also expected to be in this directory.
+`/var/opentripplanner/`. When serving a graph it's also expected to be in this directory. If a logback
+extensions file needs to be used, it should be mounted to the root location `/logback-include-extensions.xml`
+instead of the `/var/opentripplanner/` directory.
## Quick start
diff --git a/doc/user/apis/Apis.md b/doc/user/apis/Apis.md
index ab6b41a25cd..9e8f31f6eeb 100644
--- a/doc/user/apis/Apis.md
+++ b/doc/user/apis/Apis.md
@@ -25,5 +25,5 @@ The [Geocoder API](../sandbox/GeocoderAPI.md) allows you to geocode stop names a
The OTP REST API used to power many apps and frontends. For years it was the only way to access
OTP programmatically.
-Over time it has been replaced by the GraphQL APIs and is scheduled to be disabled by default
-and eventually removed completely. It's therefore not recommended to use it.
+Over time it has been replaced by the GraphQL APIs and is now disabled by default
+and will eventually be removed completely. It's therefore not recommended to use it.
diff --git a/doc/user/osm/Default.md b/doc/user/osm/Default.md
new file mode 100644
index 00000000000..814420b791f
--- /dev/null
+++ b/doc/user/osm/Default.md
@@ -0,0 +1,214 @@
+# 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.
+
+
+
+
+| specifier | permission | bike safety | walk safety |
+|---------------------------------------------------------|--------------------------|-------------------------------|-------------|
+| `mtb:scale=3` | `NONE` | | |
+| `mtb:scale=4` | `NONE` | | |
+| `mtb:scale=5` | `NONE` | | |
+| `mtb:scale=6` | `NONE` | | |
+| `highway=corridor` | `PEDESTRIAN` | | |
+| `highway=steps` | `PEDESTRIAN` | | |
+| `highway=crossing` | `PEDESTRIAN` | | |
+| `highway=platform` | `PEDESTRIAN` | | |
+| `public_transport=platform` | `PEDESTRIAN` | | |
+| `railway=platform` | `PEDESTRIAN` | | |
+| `footway=sidewalk; highway=footway` | `PEDESTRIAN` | | |
+| `mtb:scale=1` | `PEDESTRIAN` | | |
+| `mtb:scale=2` | `PEDESTRIAN` | | |
+| `mtb:scale=0` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=cycleway` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=path` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=pedestrian` | `PEDESTRIAN_AND_BICYCLE` | 0.9 | |
+| `highway=footway` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=bridleway` | `PEDESTRIAN_AND_BICYCLE` | 1.3 | |
+| `highway=living_street` | `ALL` | 0.9 | |
+| `highway=unclassified` | `ALL` | | |
+| `highway=road` | `ALL` | | |
+| `highway=byway` | `ALL` | 1.3 | |
+| `highway=track` | `ALL` | 1.3 | |
+| `highway=service` | `ALL` | 1.1 | |
+| `highway=residential` | `ALL` | 0.98 | |
+| `highway=residential_link` | `ALL` | 0.98 | |
+| `highway=tertiary` | `ALL` | | |
+| `highway=tertiary_link` | `ALL` | | |
+| `highway=secondary` | `ALL` | 1.5 | |
+| `highway=secondary_link` | `ALL` | 1.5 | |
+| `highway=primary` | `ALL` | 2.06 | |
+| `highway=primary_link` | `ALL` | 2.06 | |
+| `highway=trunk_link` | `CAR` | 2.06 | |
+| `highway=motorway_link` | `CAR` | 2.06 | |
+| `highway=trunk` | `CAR` | 7.47 | |
+| `highway=motorway` | `CAR` | 8.0 | |
+| `present(highway); cycleway=lane` | `PEDESTRIAN_AND_BICYCLE` | 0.87 | |
+| `highway=service; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=residential; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=residential_link; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=tertiary; cycleway=lane` | `ALL` | 0.87 | |
+| `highway=tertiary_link; cycleway=lane` | `ALL` | 0.87 | |
+| `highway=secondary; cycleway=lane` | `ALL` | 0.96 | |
+| `highway=secondary_link; cycleway=lane` | `ALL` | 0.96 | |
+| `highway=primary; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=primary_link; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=trunk; cycleway=lane` | `BICYCLE_AND_CAR` | 1.5 | |
+| `highway=trunk_link; cycleway=lane` | `BICYCLE_AND_CAR` | 1.15 | |
+| `highway=motorway; cycleway=lane` | `BICYCLE_AND_CAR` | 2.0 | |
+| `highway=motorway_link; cycleway=lane` | `BICYCLE_AND_CAR` | 1.15 | |
+| `present(highway); cycleway=share_busway` | `PEDESTRIAN_AND_BICYCLE` | 0.92 | |
+| `highway=service; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=residential; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=residential_link; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=tertiary; cycleway=share_busway` | `ALL` | 0.92 | |
+| `highway=tertiary_link; cycleway=share_busway` | `ALL` | 0.92 | |
+| `highway=secondary; cycleway=share_busway` | `ALL` | 0.99 | |
+| `highway=secondary_link; cycleway=share_busway` | `ALL` | 0.99 | |
+| `highway=primary; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=primary_link; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=trunk; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.75 | |
+| `highway=trunk_link; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.25 | |
+| `highway=motorway; cycleway=share_busway` | `BICYCLE_AND_CAR` | 2.5 | |
+| `highway=motorway_link; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.25 | |
+| `present(highway); cycleway=opposite_lane` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 0.87 | |
+| `highway=service; cycleway=opposite_lane` | `ALL` | forward: 1.1 back: 0.77 | |
+| `highway=residential; cycleway=opposite_lane` | `ALL` | forward: 0.98 back: 0.77 | |
+| `highway=residential_link; cycleway=opposite_lane` | `ALL` | forward: 0.98 back: 0.77 | |
+| `highway=tertiary; cycleway=opposite_lane` | `ALL` | forward: 1.0 back: 0.87 | |
+| `highway=tertiary_link; cycleway=opposite_lane` | `ALL` | forward: 1.0 back: 0.87 | |
+| `highway=secondary; cycleway=opposite_lane` | `ALL` | forward: 1.5 back: 0.96 | |
+| `highway=secondary_link; cycleway=opposite_lane` | `ALL` | forward: 1.5 back: 0.96 | |
+| `highway=primary; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=primary_link; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=trunk; cycleway=opposite_lane` | `BICYCLE_AND_CAR` | forward: 7.47 back: 1.5 | |
+| `highway=trunk_link; cycleway=opposite_lane` | `BICYCLE_AND_CAR` | forward: 2.06 back: 1.15 | |
+| `present(highway); cycleway=track` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=service; cycleway=track` | `ALL` | 0.65 | |
+| `highway=residential; cycleway=track` | `ALL` | 0.65 | |
+| `highway=residential_link; cycleway=track` | `ALL` | 0.65 | |
+| `highway=tertiary; cycleway=track` | `ALL` | 0.75 | |
+| `highway=tertiary_link; cycleway=track` | `ALL` | 0.75 | |
+| `highway=secondary; cycleway=track` | `ALL` | 0.8 | |
+| `highway=secondary_link; cycleway=track` | `ALL` | 0.8 | |
+| `highway=primary; cycleway=track` | `ALL` | 0.85 | |
+| `highway=primary_link; cycleway=track` | `ALL` | 0.85 | |
+| `highway=trunk; cycleway=track` | `BICYCLE_AND_CAR` | 0.95 | |
+| `highway=trunk_link; cycleway=track` | `BICYCLE_AND_CAR` | 0.85 | |
+| `present(highway); cycleway=opposite_track` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 0.75 | |
+| `highway=service; cycleway=opposite_track` | `ALL` | forward: 1.1 back: 0.65 | |
+| `highway=residential; cycleway=opposite_track` | `ALL` | forward: 0.98 back: 0.65 | |
+| `highway=residential_link; cycleway=opposite_track` | `ALL` | forward: 0.98 back: 0.65 | |
+| `highway=tertiary; cycleway=opposite_track` | `ALL` | forward: 1.0 back: 0.75 | |
+| `highway=tertiary_link; cycleway=opposite_track` | `ALL` | forward: 1.0 back: 0.75 | |
+| `highway=secondary; cycleway=opposite_track` | `ALL` | forward: 1.5 back: 0.8 | |
+| `highway=secondary_link; cycleway=opposite_track` | `ALL` | forward: 1.5 back: 0.8 | |
+| `highway=primary; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=primary_link; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=trunk; cycleway=opposite_track` | `BICYCLE_AND_CAR` | forward: 7.47 back: 0.95 | |
+| `highway=trunk_link; cycleway=opposite_track` | `BICYCLE_AND_CAR` | forward: 2.06 back: 0.85 | |
+| `present(highway); cycleway=shared_lane` | `PEDESTRIAN_AND_BICYCLE` | 0.77 | |
+| `highway=service; cycleway=shared_lane` | `ALL` | 0.73 | |
+| `highway=residential; cycleway=shared_lane` | `ALL` | 0.77 | |
+| `highway=residential_link; cycleway=shared_lane` | `ALL` | 0.77 | |
+| `highway=tertiary; cycleway=shared_lane` | `ALL` | 0.83 | |
+| `highway=tertiary_link; cycleway=shared_lane` | `ALL` | 0.83 | |
+| `highway=secondary; cycleway=shared_lane` | `ALL` | 1.25 | |
+| `highway=secondary_link; cycleway=shared_lane` | `ALL` | 1.25 | |
+| `highway=primary; cycleway=shared_lane` | `ALL` | 1.75 | |
+| `highway=primary_link; cycleway=shared_lane` | `ALL` | 1.75 | |
+| `present(highway); cycleway=opposite` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 1.4 | |
+| `highway=service; cycleway=opposite` | `ALL` | 1.1 | |
+| `highway=residential; cycleway=opposite` | `ALL` | 0.98 | |
+| `highway=residential_link; cycleway=opposite` | `ALL` | 0.98 | |
+| `highway=tertiary; cycleway=opposite` | `ALL` | | |
+| `highway=tertiary_link; cycleway=opposite` | `ALL` | | |
+| `highway=secondary; cycleway=opposite` | `ALL` | forward: 1.5 back: 1.71 | |
+| `highway=secondary_link; cycleway=opposite` | `ALL` | forward: 1.5 back: 1.71 | |
+| `highway=primary; cycleway=opposite` | `ALL` | forward: 2.06 back: 2.99 | |
+| `highway=primary_link; cycleway=opposite` | `ALL` | forward: 2.06 back: 2.99 | |
+| `highway=path; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=footway; bicycle=yes; area=yes` | `PEDESTRIAN_AND_BICYCLE` | 0.9 | |
+| `highway=pedestrian; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `footway=sidewalk; highway=footway; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 2.5 | |
+| `footway=sidewalk; highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=footway; footway=crossing` | `PEDESTRIAN_AND_BICYCLE` | 2.5 | |
+| `highway=footway; footway=crossing; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=track; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 1.18 | |
+| `highway=track; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.99 | |
+| `highway=track; bicycle=yes; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 1.18 | |
+| `highway=track; bicycle=designated; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 0.99 | |
+| `highway=track; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 1.3 | |
+| `present(highway); bicycle=designated` | `ALL` | 0.97 | |
+| `highway=service; bicycle=designated` | `ALL` | 0.84 | |
+| `highway=residential; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=unclassified; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=residential_link; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=tertiary; bicycle=designated` | `ALL` | 0.97 | |
+| `highway=tertiary_link; bicycle=designated` | `ALL` | 0.97 | |
+| `highway=secondary; bicycle=designated` | `ALL` | 1.46 | |
+| `highway=secondary_link; bicycle=designated` | `ALL` | 1.46 | |
+| `highway=primary; bicycle=designated` | `ALL` | 2.0 | |
+| `highway=primary_link; bicycle=designated` | `ALL` | 2.0 | |
+| `highway=trunk; bicycle=designated` | `BICYCLE_AND_CAR` | 7.25 | |
+| `highway=trunk_link; bicycle=designated` | `BICYCLE_AND_CAR` | 2.0 | |
+| `highway=motorway; bicycle=designated` | `BICYCLE_AND_CAR` | 7.76 | |
+| `highway=motorway_link; bicycle=designated` | `BICYCLE_AND_CAR` | 2.0 | |
+
+
+
+### 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.
+
+
+
+
+| matcher | bicycle safety | walk safety |
+|------------------------------------------------------------|----------------|-------------|
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 0.7 | |
+| `surface=unpaved` | 1.18 | |
+| `surface=compacted` | 1.18 | |
+| `surface=wood` | 1.18 | |
+| `surface=cobblestone` | 1.3 | |
+| `surface=sett` | 1.3 | |
+| `surface=unhewn_cobblestone` | 1.5 | |
+| `surface=grass_paver` | 1.3 | |
+| `surface=pebblestone` | 1.3 | |
+| `surface=metal` | 1.3 | |
+| `surface=ground` | 1.5 | |
+| `surface=dirt` | 1.5 | |
+| `surface=earth` | 1.5 | |
+| `surface=grass` | 1.5 | |
+| `surface=mud` | 1.5 | |
+| `surface=woodchip` | 1.5 | |
+| `surface=gravel` | 1.5 | |
+| `surface=artifical_turf` | 1.5 | |
+| `surface=sand` | 100.0 | |
+| `foot=discouraged` | | 3.0 |
+| `bicycle=discouraged` | 3.0 | |
+| `foot=use_sidepath` | | 5.0 |
+| `bicycle=use_sidepath` | 5.0 | |
+
+
diff --git a/doc/user/osm/Finland.md b/doc/user/osm/Finland.md
new file mode 100644
index 00000000000..8a60b5f0b13
--- /dev/null
+++ b/doc/user/osm/Finland.md
@@ -0,0 +1,259 @@
+# 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.
+
+
+
+
+| specifier | permission | bike safety | walk safety |
+|---------------------------------------------------------------------------------|--------------------------|-------------------------------|-------------|
+| `highway=living_street` | `ALL` | 0.9 | |
+| `highway=unclassified` | `ALL` | | |
+| `highway=road` | `ALL` | | |
+| `highway=byway` | `ALL` | 1.3 | |
+| `highway=track` | `ALL` | 1.3 | |
+| `highway=service` | `ALL` | 1.1 | |
+| `highway=residential` | `ALL` | 0.98 | |
+| `highway=residential_link` | `ALL` | 0.98 | |
+| `highway=tertiary` | `ALL` | | |
+| `highway=tertiary_link` | `ALL` | | |
+| `highway=secondary` | `ALL` | 1.5 | |
+| `highway=secondary_link` | `ALL` | 1.5 | |
+| `highway=primary` | `ALL` | 2.06 | |
+| `highway=primary_link` | `ALL` | 2.06 | |
+| `highway=trunk_link` | `ALL` | 2.06 | |
+| `highway=trunk` | `ALL` | 7.47 | |
+| `highway=trunk; tunnel=yes` | `CAR` | 7.47 | |
+| `motorroad=yes` | `CAR` | 7.47 | |
+| `present(highway); informal=yes` | `NONE` | | |
+| `highway=service; access=private` | `NONE` | | |
+| `highway=trail` | `NONE` | | |
+| `present(highway); seasonal=winter` | `NONE` | | |
+| `present(highway); ice_road=yes` | `NONE` | | |
+| `present(highway); winter_road=yes` | `NONE` | | |
+| `highway=footway` | `PEDESTRIAN` | | |
+| `footway=sidewalk; highway=footway` | `PEDESTRIAN` | | |
+| `highway=cycleway; segregated=yes` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | 1.1 |
+| `highway=footway; bridge=yes` | `PEDESTRIAN` | | |
+| `highway=footway; tunnel=yes` | `PEDESTRIAN` | | |
+| `highway=cycleway; bridge=yes` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=cycleway; tunnel=yes` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=footway; footway=crossing; crossing=traffic_signals` | `PEDESTRIAN` | | 1.1 |
+| `highway=footway; footway=crossing` | `PEDESTRIAN` | | 1.2 |
+| `highway=cycleway; cycleway=crossing; segregated=yes; crossing=traffic_signals` | `PEDESTRIAN_AND_BICYCLE` | 0.8 | 1.1 |
+| `highway=cycleway; footway=crossing; segregated=yes; crossing=traffic_signals` | `PEDESTRIAN` | 0.8 | 1.1 |
+| `highway=cycleway; cycleway=crossing; segregated=yes` | `PEDESTRIAN_AND_BICYCLE` | 1.2 | 1.2 |
+| `highway=cycleway; footway=crossing; segregated=yes` | `PEDESTRIAN` | 1.2 | 1.2 |
+| `highway=cycleway; cycleway=crossing; crossing=traffic_signals` | `PEDESTRIAN_AND_BICYCLE` | 0.8 | 1.15 |
+| `highway=cycleway; footway=crossing; crossing=traffic_signals` | `PEDESTRIAN_AND_BICYCLE` | 0.8 | 1.15 |
+| `highway=cycleway; cycleway=crossing` | `PEDESTRIAN_AND_BICYCLE` | 1.2 | 1.25 |
+| `highway=cycleway; footway=crossing` | `PEDESTRIAN_AND_BICYCLE` | 1.2 | 1.25 |
+| `highway=cycleway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=service; tunnel=yes; access=destination` | `NONE` | | |
+| `highway=service; access=destination` | `ALL` | 1.1 | |
+| `mtb:scale=3` | `NONE` | | |
+| `mtb:scale=4` | `NONE` | | |
+| `mtb:scale=5` | `NONE` | | |
+| `mtb:scale=6` | `NONE` | | |
+| `highway=corridor` | `PEDESTRIAN` | | |
+| `highway=steps` | `PEDESTRIAN` | | |
+| `highway=crossing` | `PEDESTRIAN` | | |
+| `highway=platform` | `PEDESTRIAN` | | |
+| `public_transport=platform` | `PEDESTRIAN` | | |
+| `railway=platform` | `PEDESTRIAN` | | |
+| `footway=sidewalk; highway=footway` | `PEDESTRIAN` | | |
+| `mtb:scale=1` | `PEDESTRIAN` | | |
+| `mtb:scale=2` | `PEDESTRIAN` | | |
+| `mtb:scale=0` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=cycleway` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=path` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=pedestrian` | `PEDESTRIAN_AND_BICYCLE` | 0.9 | |
+| `highway=footway` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=bridleway` | `PEDESTRIAN_AND_BICYCLE` | 1.3 | |
+| `highway=living_street` | `ALL` | 0.9 | |
+| `highway=unclassified` | `ALL` | | |
+| `highway=road` | `ALL` | | |
+| `highway=byway` | `ALL` | 1.3 | |
+| `highway=track` | `ALL` | 1.3 | |
+| `highway=service` | `ALL` | 1.1 | |
+| `highway=residential` | `ALL` | 0.98 | |
+| `highway=residential_link` | `ALL` | 0.98 | |
+| `highway=tertiary` | `ALL` | | |
+| `highway=tertiary_link` | `ALL` | | |
+| `highway=secondary` | `ALL` | 1.5 | |
+| `highway=secondary_link` | `ALL` | 1.5 | |
+| `highway=primary` | `ALL` | 2.06 | |
+| `highway=primary_link` | `ALL` | 2.06 | |
+| `highway=trunk_link` | `CAR` | 2.06 | |
+| `highway=motorway_link` | `CAR` | 2.06 | |
+| `highway=trunk` | `CAR` | 7.47 | |
+| `highway=motorway` | `CAR` | 8.0 | |
+| `present(highway); cycleway=lane` | `PEDESTRIAN_AND_BICYCLE` | 0.87 | |
+| `highway=service; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=residential; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=residential_link; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=tertiary; cycleway=lane` | `ALL` | 0.87 | |
+| `highway=tertiary_link; cycleway=lane` | `ALL` | 0.87 | |
+| `highway=secondary; cycleway=lane` | `ALL` | 0.96 | |
+| `highway=secondary_link; cycleway=lane` | `ALL` | 0.96 | |
+| `highway=primary; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=primary_link; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=trunk; cycleway=lane` | `BICYCLE_AND_CAR` | 1.5 | |
+| `highway=trunk_link; cycleway=lane` | `BICYCLE_AND_CAR` | 1.15 | |
+| `highway=motorway; cycleway=lane` | `BICYCLE_AND_CAR` | 2.0 | |
+| `highway=motorway_link; cycleway=lane` | `BICYCLE_AND_CAR` | 1.15 | |
+| `present(highway); cycleway=share_busway` | `PEDESTRIAN_AND_BICYCLE` | 0.92 | |
+| `highway=service; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=residential; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=residential_link; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=tertiary; cycleway=share_busway` | `ALL` | 0.92 | |
+| `highway=tertiary_link; cycleway=share_busway` | `ALL` | 0.92 | |
+| `highway=secondary; cycleway=share_busway` | `ALL` | 0.99 | |
+| `highway=secondary_link; cycleway=share_busway` | `ALL` | 0.99 | |
+| `highway=primary; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=primary_link; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=trunk; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.75 | |
+| `highway=trunk_link; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.25 | |
+| `highway=motorway; cycleway=share_busway` | `BICYCLE_AND_CAR` | 2.5 | |
+| `highway=motorway_link; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.25 | |
+| `present(highway); cycleway=opposite_lane` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 0.87 | |
+| `highway=service; cycleway=opposite_lane` | `ALL` | forward: 1.1 back: 0.77 | |
+| `highway=residential; cycleway=opposite_lane` | `ALL` | forward: 0.98 back: 0.77 | |
+| `highway=residential_link; cycleway=opposite_lane` | `ALL` | forward: 0.98 back: 0.77 | |
+| `highway=tertiary; cycleway=opposite_lane` | `ALL` | forward: 1.0 back: 0.87 | |
+| `highway=tertiary_link; cycleway=opposite_lane` | `ALL` | forward: 1.0 back: 0.87 | |
+| `highway=secondary; cycleway=opposite_lane` | `ALL` | forward: 1.5 back: 0.96 | |
+| `highway=secondary_link; cycleway=opposite_lane` | `ALL` | forward: 1.5 back: 0.96 | |
+| `highway=primary; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=primary_link; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=trunk; cycleway=opposite_lane` | `BICYCLE_AND_CAR` | forward: 7.47 back: 1.5 | |
+| `highway=trunk_link; cycleway=opposite_lane` | `BICYCLE_AND_CAR` | forward: 2.06 back: 1.15 | |
+| `present(highway); cycleway=track` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=service; cycleway=track` | `ALL` | 0.65 | |
+| `highway=residential; cycleway=track` | `ALL` | 0.65 | |
+| `highway=residential_link; cycleway=track` | `ALL` | 0.65 | |
+| `highway=tertiary; cycleway=track` | `ALL` | 0.75 | |
+| `highway=tertiary_link; cycleway=track` | `ALL` | 0.75 | |
+| `highway=secondary; cycleway=track` | `ALL` | 0.8 | |
+| `highway=secondary_link; cycleway=track` | `ALL` | 0.8 | |
+| `highway=primary; cycleway=track` | `ALL` | 0.85 | |
+| `highway=primary_link; cycleway=track` | `ALL` | 0.85 | |
+| `highway=trunk; cycleway=track` | `BICYCLE_AND_CAR` | 0.95 | |
+| `highway=trunk_link; cycleway=track` | `BICYCLE_AND_CAR` | 0.85 | |
+| `present(highway); cycleway=opposite_track` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 0.75 | |
+| `highway=service; cycleway=opposite_track` | `ALL` | forward: 1.1 back: 0.65 | |
+| `highway=residential; cycleway=opposite_track` | `ALL` | forward: 0.98 back: 0.65 | |
+| `highway=residential_link; cycleway=opposite_track` | `ALL` | forward: 0.98 back: 0.65 | |
+| `highway=tertiary; cycleway=opposite_track` | `ALL` | forward: 1.0 back: 0.75 | |
+| `highway=tertiary_link; cycleway=opposite_track` | `ALL` | forward: 1.0 back: 0.75 | |
+| `highway=secondary; cycleway=opposite_track` | `ALL` | forward: 1.5 back: 0.8 | |
+| `highway=secondary_link; cycleway=opposite_track` | `ALL` | forward: 1.5 back: 0.8 | |
+| `highway=primary; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=primary_link; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=trunk; cycleway=opposite_track` | `BICYCLE_AND_CAR` | forward: 7.47 back: 0.95 | |
+| `highway=trunk_link; cycleway=opposite_track` | `BICYCLE_AND_CAR` | forward: 2.06 back: 0.85 | |
+| `present(highway); cycleway=shared_lane` | `PEDESTRIAN_AND_BICYCLE` | 0.77 | |
+| `highway=service; cycleway=shared_lane` | `ALL` | 0.73 | |
+| `highway=residential; cycleway=shared_lane` | `ALL` | 0.77 | |
+| `highway=residential_link; cycleway=shared_lane` | `ALL` | 0.77 | |
+| `highway=tertiary; cycleway=shared_lane` | `ALL` | 0.83 | |
+| `highway=tertiary_link; cycleway=shared_lane` | `ALL` | 0.83 | |
+| `highway=secondary; cycleway=shared_lane` | `ALL` | 1.25 | |
+| `highway=secondary_link; cycleway=shared_lane` | `ALL` | 1.25 | |
+| `highway=primary; cycleway=shared_lane` | `ALL` | 1.75 | |
+| `highway=primary_link; cycleway=shared_lane` | `ALL` | 1.75 | |
+| `present(highway); cycleway=opposite` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 1.4 | |
+| `highway=service; cycleway=opposite` | `ALL` | 1.1 | |
+| `highway=residential; cycleway=opposite` | `ALL` | 0.98 | |
+| `highway=residential_link; cycleway=opposite` | `ALL` | 0.98 | |
+| `highway=tertiary; cycleway=opposite` | `ALL` | | |
+| `highway=tertiary_link; cycleway=opposite` | `ALL` | | |
+| `highway=secondary; cycleway=opposite` | `ALL` | forward: 1.5 back: 1.71 | |
+| `highway=secondary_link; cycleway=opposite` | `ALL` | forward: 1.5 back: 1.71 | |
+| `highway=primary; cycleway=opposite` | `ALL` | forward: 2.06 back: 2.99 | |
+| `highway=primary_link; cycleway=opposite` | `ALL` | forward: 2.06 back: 2.99 | |
+| `highway=path; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=footway; bicycle=yes; area=yes` | `PEDESTRIAN_AND_BICYCLE` | 0.9 | |
+| `highway=pedestrian; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `footway=sidewalk; highway=footway; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 2.5 | |
+| `footway=sidewalk; highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=footway; footway=crossing` | `PEDESTRIAN_AND_BICYCLE` | 2.5 | |
+| `highway=footway; footway=crossing; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=track; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 1.18 | |
+| `highway=track; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.99 | |
+| `highway=track; bicycle=yes; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 1.18 | |
+| `highway=track; bicycle=designated; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 0.99 | |
+| `highway=track; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 1.3 | |
+| `present(highway); bicycle=designated` | `ALL` | 0.97 | |
+| `highway=service; bicycle=designated` | `ALL` | 0.84 | |
+| `highway=residential; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=unclassified; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=residential_link; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=tertiary; bicycle=designated` | `ALL` | 0.97 | |
+| `highway=tertiary_link; bicycle=designated` | `ALL` | 0.97 | |
+| `highway=secondary; bicycle=designated` | `ALL` | 1.46 | |
+| `highway=secondary_link; bicycle=designated` | `ALL` | 1.46 | |
+| `highway=primary; bicycle=designated` | `ALL` | 2.0 | |
+| `highway=primary_link; bicycle=designated` | `ALL` | 2.0 | |
+| `highway=trunk; bicycle=designated` | `BICYCLE_AND_CAR` | 7.25 | |
+| `highway=trunk_link; bicycle=designated` | `BICYCLE_AND_CAR` | 2.0 | |
+| `highway=motorway; bicycle=designated` | `BICYCLE_AND_CAR` | 7.76 | |
+| `highway=motorway_link; bicycle=designated` | `BICYCLE_AND_CAR` | 2.0 | |
+
+
+
+### 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.
+
+
+
+
+| matcher | bicycle safety | walk safety |
+|------------------------------------------------------------|----------------|-------------|
+| `bicycle=use_sidepath` | | 5.0 |
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 0.7 | |
+| `surface=unpaved` | 1.18 | |
+| `surface=compacted` | 1.18 | |
+| `surface=wood` | 1.18 | |
+| `surface=cobblestone` | 1.3 | |
+| `surface=sett` | 1.3 | |
+| `surface=unhewn_cobblestone` | 1.5 | |
+| `surface=grass_paver` | 1.3 | |
+| `surface=pebblestone` | 1.3 | |
+| `surface=metal` | 1.3 | |
+| `surface=ground` | 1.5 | |
+| `surface=dirt` | 1.5 | |
+| `surface=earth` | 1.5 | |
+| `surface=grass` | 1.5 | |
+| `surface=mud` | 1.5 | |
+| `surface=woodchip` | 1.5 | |
+| `surface=gravel` | 1.5 | |
+| `surface=artifical_turf` | 1.5 | |
+| `surface=sand` | 100.0 | |
+| `foot=discouraged` | | 3.0 |
+| `bicycle=discouraged` | 3.0 | |
+| `foot=use_sidepath` | | 5.0 |
+| `bicycle=use_sidepath` | 5.0 | |
+
+
diff --git a/doc/user/osm/Germany.md b/doc/user/osm/Germany.md
new file mode 100644
index 00000000000..922aa3af836
--- /dev/null
+++ b/doc/user/osm/Germany.md
@@ -0,0 +1,234 @@
+# 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.
+
+
+
+
+| specifier | permission | bike safety | walk safety |
+|---------------------------------------------------------|--------------------------|-------------------------------|-------------|
+| `highway=track` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=track; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=residential; junction=roundabout` | `ALL` | 0.98 | |
+| `present(highway); junction=roundabout` | `BICYCLE_AND_CAR` | | |
+| `highway=pedestrian` | `PEDESTRIAN` | | |
+| `highway=residential; maxspeed=30` | `ALL` | 0.9 | |
+| `highway=footway; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 0.8 | |
+| `footway=sidewalk; highway=footway; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 1.2 | |
+| `highway=unclassified; cycleway=lane` | `ALL` | 0.87 | |
+| `mtb:scale=3` | `NONE` | | |
+| `mtb:scale=4` | `NONE` | | |
+| `mtb:scale=5` | `NONE` | | |
+| `mtb:scale=6` | `NONE` | | |
+| `highway=corridor` | `PEDESTRIAN` | | |
+| `highway=steps` | `PEDESTRIAN` | | |
+| `highway=crossing` | `PEDESTRIAN` | | |
+| `highway=platform` | `PEDESTRIAN` | | |
+| `public_transport=platform` | `PEDESTRIAN` | | |
+| `railway=platform` | `PEDESTRIAN` | | |
+| `footway=sidewalk; highway=footway` | `PEDESTRIAN` | | |
+| `mtb:scale=1` | `PEDESTRIAN` | | |
+| `mtb:scale=2` | `PEDESTRIAN` | | |
+| `mtb:scale=0` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=cycleway` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=path` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=pedestrian` | `PEDESTRIAN_AND_BICYCLE` | 0.9 | |
+| `highway=footway` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=bridleway` | `PEDESTRIAN_AND_BICYCLE` | 1.3 | |
+| `highway=living_street` | `ALL` | 0.9 | |
+| `highway=unclassified` | `ALL` | | |
+| `highway=road` | `ALL` | | |
+| `highway=byway` | `ALL` | 1.3 | |
+| `highway=track` | `ALL` | 1.3 | |
+| `highway=service` | `ALL` | 1.1 | |
+| `highway=residential` | `ALL` | 0.98 | |
+| `highway=residential_link` | `ALL` | 0.98 | |
+| `highway=tertiary` | `ALL` | | |
+| `highway=tertiary_link` | `ALL` | | |
+| `highway=secondary` | `ALL` | 1.5 | |
+| `highway=secondary_link` | `ALL` | 1.5 | |
+| `highway=primary` | `ALL` | 2.06 | |
+| `highway=primary_link` | `ALL` | 2.06 | |
+| `highway=trunk_link` | `CAR` | 2.06 | |
+| `highway=motorway_link` | `CAR` | 2.06 | |
+| `highway=trunk` | `CAR` | 7.47 | |
+| `highway=motorway` | `CAR` | 8.0 | |
+| `present(highway); cycleway=lane` | `PEDESTRIAN_AND_BICYCLE` | 0.87 | |
+| `highway=service; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=residential; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=residential_link; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=tertiary; cycleway=lane` | `ALL` | 0.87 | |
+| `highway=tertiary_link; cycleway=lane` | `ALL` | 0.87 | |
+| `highway=secondary; cycleway=lane` | `ALL` | 0.96 | |
+| `highway=secondary_link; cycleway=lane` | `ALL` | 0.96 | |
+| `highway=primary; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=primary_link; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=trunk; cycleway=lane` | `BICYCLE_AND_CAR` | 1.5 | |
+| `highway=trunk_link; cycleway=lane` | `BICYCLE_AND_CAR` | 1.15 | |
+| `highway=motorway; cycleway=lane` | `BICYCLE_AND_CAR` | 2.0 | |
+| `highway=motorway_link; cycleway=lane` | `BICYCLE_AND_CAR` | 1.15 | |
+| `present(highway); cycleway=share_busway` | `PEDESTRIAN_AND_BICYCLE` | 0.92 | |
+| `highway=service; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=residential; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=residential_link; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=tertiary; cycleway=share_busway` | `ALL` | 0.92 | |
+| `highway=tertiary_link; cycleway=share_busway` | `ALL` | 0.92 | |
+| `highway=secondary; cycleway=share_busway` | `ALL` | 0.99 | |
+| `highway=secondary_link; cycleway=share_busway` | `ALL` | 0.99 | |
+| `highway=primary; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=primary_link; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=trunk; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.75 | |
+| `highway=trunk_link; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.25 | |
+| `highway=motorway; cycleway=share_busway` | `BICYCLE_AND_CAR` | 2.5 | |
+| `highway=motorway_link; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.25 | |
+| `present(highway); cycleway=opposite_lane` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 0.87 | |
+| `highway=service; cycleway=opposite_lane` | `ALL` | forward: 1.1 back: 0.77 | |
+| `highway=residential; cycleway=opposite_lane` | `ALL` | forward: 0.98 back: 0.77 | |
+| `highway=residential_link; cycleway=opposite_lane` | `ALL` | forward: 0.98 back: 0.77 | |
+| `highway=tertiary; cycleway=opposite_lane` | `ALL` | forward: 1.0 back: 0.87 | |
+| `highway=tertiary_link; cycleway=opposite_lane` | `ALL` | forward: 1.0 back: 0.87 | |
+| `highway=secondary; cycleway=opposite_lane` | `ALL` | forward: 1.5 back: 0.96 | |
+| `highway=secondary_link; cycleway=opposite_lane` | `ALL` | forward: 1.5 back: 0.96 | |
+| `highway=primary; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=primary_link; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=trunk; cycleway=opposite_lane` | `BICYCLE_AND_CAR` | forward: 7.47 back: 1.5 | |
+| `highway=trunk_link; cycleway=opposite_lane` | `BICYCLE_AND_CAR` | forward: 2.06 back: 1.15 | |
+| `present(highway); cycleway=track` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=service; cycleway=track` | `ALL` | 0.65 | |
+| `highway=residential; cycleway=track` | `ALL` | 0.65 | |
+| `highway=residential_link; cycleway=track` | `ALL` | 0.65 | |
+| `highway=tertiary; cycleway=track` | `ALL` | 0.75 | |
+| `highway=tertiary_link; cycleway=track` | `ALL` | 0.75 | |
+| `highway=secondary; cycleway=track` | `ALL` | 0.8 | |
+| `highway=secondary_link; cycleway=track` | `ALL` | 0.8 | |
+| `highway=primary; cycleway=track` | `ALL` | 0.85 | |
+| `highway=primary_link; cycleway=track` | `ALL` | 0.85 | |
+| `highway=trunk; cycleway=track` | `BICYCLE_AND_CAR` | 0.95 | |
+| `highway=trunk_link; cycleway=track` | `BICYCLE_AND_CAR` | 0.85 | |
+| `present(highway); cycleway=opposite_track` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 0.75 | |
+| `highway=service; cycleway=opposite_track` | `ALL` | forward: 1.1 back: 0.65 | |
+| `highway=residential; cycleway=opposite_track` | `ALL` | forward: 0.98 back: 0.65 | |
+| `highway=residential_link; cycleway=opposite_track` | `ALL` | forward: 0.98 back: 0.65 | |
+| `highway=tertiary; cycleway=opposite_track` | `ALL` | forward: 1.0 back: 0.75 | |
+| `highway=tertiary_link; cycleway=opposite_track` | `ALL` | forward: 1.0 back: 0.75 | |
+| `highway=secondary; cycleway=opposite_track` | `ALL` | forward: 1.5 back: 0.8 | |
+| `highway=secondary_link; cycleway=opposite_track` | `ALL` | forward: 1.5 back: 0.8 | |
+| `highway=primary; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=primary_link; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=trunk; cycleway=opposite_track` | `BICYCLE_AND_CAR` | forward: 7.47 back: 0.95 | |
+| `highway=trunk_link; cycleway=opposite_track` | `BICYCLE_AND_CAR` | forward: 2.06 back: 0.85 | |
+| `present(highway); cycleway=shared_lane` | `PEDESTRIAN_AND_BICYCLE` | 0.77 | |
+| `highway=service; cycleway=shared_lane` | `ALL` | 0.73 | |
+| `highway=residential; cycleway=shared_lane` | `ALL` | 0.77 | |
+| `highway=residential_link; cycleway=shared_lane` | `ALL` | 0.77 | |
+| `highway=tertiary; cycleway=shared_lane` | `ALL` | 0.83 | |
+| `highway=tertiary_link; cycleway=shared_lane` | `ALL` | 0.83 | |
+| `highway=secondary; cycleway=shared_lane` | `ALL` | 1.25 | |
+| `highway=secondary_link; cycleway=shared_lane` | `ALL` | 1.25 | |
+| `highway=primary; cycleway=shared_lane` | `ALL` | 1.75 | |
+| `highway=primary_link; cycleway=shared_lane` | `ALL` | 1.75 | |
+| `present(highway); cycleway=opposite` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 1.4 | |
+| `highway=service; cycleway=opposite` | `ALL` | 1.1 | |
+| `highway=residential; cycleway=opposite` | `ALL` | 0.98 | |
+| `highway=residential_link; cycleway=opposite` | `ALL` | 0.98 | |
+| `highway=tertiary; cycleway=opposite` | `ALL` | | |
+| `highway=tertiary_link; cycleway=opposite` | `ALL` | | |
+| `highway=secondary; cycleway=opposite` | `ALL` | forward: 1.5 back: 1.71 | |
+| `highway=secondary_link; cycleway=opposite` | `ALL` | forward: 1.5 back: 1.71 | |
+| `highway=primary; cycleway=opposite` | `ALL` | forward: 2.06 back: 2.99 | |
+| `highway=primary_link; cycleway=opposite` | `ALL` | forward: 2.06 back: 2.99 | |
+| `highway=path; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=footway; bicycle=yes; area=yes` | `PEDESTRIAN_AND_BICYCLE` | 0.9 | |
+| `highway=pedestrian; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `footway=sidewalk; highway=footway; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 2.5 | |
+| `footway=sidewalk; highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=footway; footway=crossing` | `PEDESTRIAN_AND_BICYCLE` | 2.5 | |
+| `highway=footway; footway=crossing; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=track; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 1.18 | |
+| `highway=track; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.99 | |
+| `highway=track; bicycle=yes; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 1.18 | |
+| `highway=track; bicycle=designated; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 0.99 | |
+| `highway=track; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 1.3 | |
+| `present(highway); bicycle=designated` | `ALL` | 0.97 | |
+| `highway=service; bicycle=designated` | `ALL` | 0.84 | |
+| `highway=residential; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=unclassified; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=residential_link; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=tertiary; bicycle=designated` | `ALL` | 0.97 | |
+| `highway=tertiary_link; bicycle=designated` | `ALL` | 0.97 | |
+| `highway=secondary; bicycle=designated` | `ALL` | 1.46 | |
+| `highway=secondary_link; bicycle=designated` | `ALL` | 1.46 | |
+| `highway=primary; bicycle=designated` | `ALL` | 2.0 | |
+| `highway=primary_link; bicycle=designated` | `ALL` | 2.0 | |
+| `highway=trunk; bicycle=designated` | `BICYCLE_AND_CAR` | 7.25 | |
+| `highway=trunk_link; bicycle=designated` | `BICYCLE_AND_CAR` | 2.0 | |
+| `highway=motorway; bicycle=designated` | `BICYCLE_AND_CAR` | 7.76 | |
+| `highway=motorway_link; bicycle=designated` | `BICYCLE_AND_CAR` | 2.0 | |
+
+
+
+### 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.
+
+
+
+
+| matcher | bicycle safety | walk safety |
+|------------------------------------------------------------|----------------|-------------|
+| `highway=tertiary` | 1.2 | |
+| `maxspeed=70` | 1.5 | |
+| `maxspeed=80` | 2.0 | |
+| `maxspeed=90` | 3.0 | |
+| `maxspeed=100` | 5.0 | |
+| `tracktype=grade1` | | |
+| `tracktype=grade2` | 1.1 | |
+| `tracktype=grade3` | 1.15 | |
+| `tracktype=grade4` | 1.3 | |
+| `tracktype=grade5` | 1.5 | |
+| `lit=no` | 1.05 | |
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 0.7 | |
+| `surface=unpaved` | 1.18 | |
+| `surface=compacted` | 1.18 | |
+| `surface=wood` | 1.18 | |
+| `surface=cobblestone` | 1.3 | |
+| `surface=sett` | 1.3 | |
+| `surface=unhewn_cobblestone` | 1.5 | |
+| `surface=grass_paver` | 1.3 | |
+| `surface=pebblestone` | 1.3 | |
+| `surface=metal` | 1.3 | |
+| `surface=ground` | 1.5 | |
+| `surface=dirt` | 1.5 | |
+| `surface=earth` | 1.5 | |
+| `surface=grass` | 1.5 | |
+| `surface=mud` | 1.5 | |
+| `surface=woodchip` | 1.5 | |
+| `surface=gravel` | 1.5 | |
+| `surface=artifical_turf` | 1.5 | |
+| `surface=sand` | 100.0 | |
+| `foot=discouraged` | | 3.0 |
+| `bicycle=discouraged` | 3.0 | |
+| `foot=use_sidepath` | | 5.0 |
+| `bicycle=use_sidepath` | 5.0 | |
+
+
diff --git a/doc/user/osm/Norway.md b/doc/user/osm/Norway.md
new file mode 100644
index 00000000000..d38fc4c04df
--- /dev/null
+++ b/doc/user/osm/Norway.md
@@ -0,0 +1,122 @@
+# 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.
+
+
+
+
+| specifier | permission | bike safety | walk safety |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------|-------------|-------------|
+| `highway one of [motorway, motorway_link]` | `CAR` | | |
+| `highway one of [trunk, trunk_link, primary, primary_link]; motorroad=yes` | `CAR` | | |
+| `highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]` | `ALL` | | |
+| `cycleway=track; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]` | `ALL` | | |
+| `cycleway=lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]` | `ALL` | 1.27 | |
+| `cycleway=lane; maxspeed < 50; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]` | `ALL` | 1.1 | |
+| `cycleway=lane; highway one of [unclassified, residential]` | `ALL` | 1.1 | |
+| `highway=service` | `ALL` | | |
+| `highway=service; service=parking_aisle` | `ALL` | 2.5 | |
+| `highway=service; service=drive-through` | `ALL` | 2.5 | |
+| `highway=living_street` | `ALL` | 1.83 | |
+| `highway=pedestrian` | `PEDESTRIAN_AND_BICYCLE` | 1.2 | |
+| `highway=busway` | `PEDESTRIAN_AND_BICYCLE` | 2.37 | 1.9 |
+| `highway=service; bus one of [yes, designated]` | `PEDESTRIAN_AND_BICYCLE` | 2.37 | 1.9 |
+| `highway=footway` | `PEDESTRIAN_AND_BICYCLE` | 1.42 | |
+| `highway=cycleway` | `PEDESTRIAN_AND_BICYCLE` | 1.05 | 1.4 |
+| `highway=cycleway; lanes > 1` | `PEDESTRIAN_AND_BICYCLE` | | 1.4 |
+| `highway=cycleway; oneway=yes` | `PEDESTRIAN_AND_BICYCLE` | | 1.4 |
+| `highway=cycleway; sidewalk one of [yes, left, right, both]` | `PEDESTRIAN_AND_BICYCLE` | 1.05 | |
+| `highway=cycleway; lanes > 1; sidewalk one of [yes, left, right, both]` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=cycleway; oneway=yes; sidewalk one of [yes, left, right, both]` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=cycleway; foot=designated; segregated=no` | `PEDESTRIAN_AND_BICYCLE` | 1.05 | 1.15 |
+| `highway=path; foot=designated; bicycle=designated; segregated=no` | `PEDESTRIAN_AND_BICYCLE` | 1.05 | 1.15 |
+| `highway=cycleway; foot=designated; segregated=yes` | `PEDESTRIAN_AND_BICYCLE` | 1.05 | |
+| `highway=path; foot=designated; bicycle=designated; segregated=yes` | `PEDESTRIAN_AND_BICYCLE` | 1.05 | |
+| `highway=cycleway; foot=designated; segregated=yes; lanes > 1` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=cycleway; foot=designated; present(segregated); motor_vehicle=destination` | `PEDESTRIAN_AND_BICYCLE` | 1.57 | |
+| `highway=path; foot=designated; bicycle=designated; present(segregated); motor_vehicle=destination` | `PEDESTRIAN_AND_BICYCLE` | 1.57 | |
+| `highway=footway; footway=sidewalk` | `PEDESTRIAN_AND_BICYCLE` | 1.93 | 1.1 |
+| `highway=footway; footway=crossing` | `PEDESTRIAN_AND_BICYCLE` | 2.33 | 1.35 |
+| `highway=cycleway; cycleway=crossing` | `PEDESTRIAN_AND_BICYCLE` | 2.33 | 1.35 |
+| `highway=track` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=bridleway` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=path` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=steps` | `PEDESTRIAN` | | |
+| `highway=corridor` | `PEDESTRIAN` | | |
+| `highway=footway; indoor=yes` | `PEDESTRIAN` | | |
+| `highway=platform` | `PEDESTRIAN` | | |
+| `public_transport=platform` | `PEDESTRIAN` | | |
+| `trail_visibility one of [bad, low, poor, horrible, no]; highway=path` | `NONE` | | |
+| `sac_scale one of [demanding_mountain_hiking, alpine_hiking, demanding_alpine_hiking, difficult_alpine_hiking]; highway one of [path, steps]` | `NONE` | | |
+| `smoothness one of [horrible, very_horrible]; highway one of [path, bridleway, track]` | `PEDESTRIAN` | | 1.15 |
+| `smoothness=impassable; highway one of [path, bridleway, track]` | `NONE` | | |
+| `1 > mtb:scale < 2; highway one of [path, bridleway, track]` | `PEDESTRIAN` | | 1.15 |
+| `mtb:scale > 2; highway one of [path, bridleway, track]` | `NONE` | | |
+
+
+
+### 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.
+
+
+
+
+| matcher | bicycle safety | walk safety |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|-------------|
+| `cycleway=shared_lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]` | 0.85 | |
+| `lcn=yes¦rcn=yes¦ncn=yes` | 0.85 | |
+| `oneway=yes; cycleway not one of [no, none] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]` | forward: 1.0 back: 1.15 | |
+| `embedded_rails one of [tram, light_rail, disused]` | 1.2 | |
+| `tunnel=yes; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]` | | 2.0 |
+| `bridge=yes; sidewalk not one of [no, separate] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]¦verge=no; sidewalk not one of [no, separate] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]` | | 2.0 |
+| `junction=roundabout; sidewalk not one of [no, separate] or absent` | | 2.0 |
+| `surface=grass_paver` | 1.2 | |
+| `surface=sett` | 1.2 | |
+| `surface=cobblestone` | 1.2 | |
+| `surface=unhewn_cobblestone` | 3.0 | |
+| `surface=metal_grid` | 1.2 | |
+| `surface=metal` | 1.2 | |
+| `smoothness=intermediate; surface one of [asfalt, concrete, paving_stones, paved, wood]` | 1.2 | |
+| `smoothness=bad; surface one of [asfalt, concrete, paving_stones, paved, wood]` | 1.4 | 1.6 |
+| `surface=unpaved; !tracktype` | 1.8 | 1.6 |
+| `surface=compacted` | 1.4 | 1.4 |
+| `surface=fine_gravel` | 1.8 | 1.6 |
+| `surface=pebblestone` | 1.8 | 1.6 |
+| `surface=gravel` | 1.8 | 1.6 |
+| `surface=woodchip` | 1.8 | 1.6 |
+| `surface=ground` | 2.3 | 2.4 |
+| `surface=dirt` | 2.3 | 2.4 |
+| `surface=earth` | 2.3 | 2.4 |
+| `surface=grass` | 2.3 | 1.8 |
+| `surface=mud` | 3.0 | 3.0 |
+| `surface=sand` | 3.0 | 1.8 |
+| `!tracktype; surface not one of [unpaved] or absent; highway one of [track, bridleway]` | 1.8 | 1.6 |
+| `tracktype=grade2; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]` | 1.4 | 1.4 |
+| `tracktype=grade3; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]` | 1.8 | 1.6 |
+| `tracktype=grade4; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]` | 2.3 | 1.8 |
+| `tracktype=grade5; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]` | 2.3 | 2.4 |
+| `surface not one of [no, none] or absent; highway=path` | 2.3 | 2.4 |
+| `sac_scale=mountain_hiking` | | 1.8 |
+| `trail_visibility=intermediate` | | 1.8 |
+
+
diff --git a/doc/user/osm/UK.md b/doc/user/osm/UK.md
new file mode 100644
index 00000000000..4a640caf95c
--- /dev/null
+++ b/doc/user/osm/UK.md
@@ -0,0 +1,228 @@
+# 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.
+
+
+
+
+| specifier | permission | bike safety | walk safety |
+|---------------------------------------------------------|--------------------------|-------------------------------|-------------|
+| `highway=trunk_link` | `ALL` | 2.06 | |
+| `highway=trunk` | `ALL` | 7.47 | |
+| `highway=trunk; cycleway=lane` | `ALL` | 1.5 | |
+| `highway=trunk_link; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=trunk; cycleway=share_busway` | `ALL` | 1.75 | |
+| `highway=trunk_link; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=trunk; cycleway=opposite_lane` | `ALL` | forward: 7.47 back: 1.5 | |
+| `highway=trunk_link; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=trunk; cycleway=track` | `ALL` | 0.95 | |
+| `highway=trunk_link; cycleway=track` | `ALL` | 0.85 | |
+| `highway=trunk; cycleway=opposite_track` | `ALL` | forward: 7.47 back: 0.95 | |
+| `highway=trunk_link; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=trunk; bicycle=designated` | `ALL` | 7.25 | |
+| `highway=trunk_link; bicycle=designated` | `ALL` | 2.0 | |
+| `mtb:scale=3` | `NONE` | | |
+| `mtb:scale=4` | `NONE` | | |
+| `mtb:scale=5` | `NONE` | | |
+| `mtb:scale=6` | `NONE` | | |
+| `highway=corridor` | `PEDESTRIAN` | | |
+| `highway=steps` | `PEDESTRIAN` | | |
+| `highway=crossing` | `PEDESTRIAN` | | |
+| `highway=platform` | `PEDESTRIAN` | | |
+| `public_transport=platform` | `PEDESTRIAN` | | |
+| `railway=platform` | `PEDESTRIAN` | | |
+| `footway=sidewalk; highway=footway` | `PEDESTRIAN` | | |
+| `mtb:scale=1` | `PEDESTRIAN` | | |
+| `mtb:scale=2` | `PEDESTRIAN` | | |
+| `mtb:scale=0` | `PEDESTRIAN_AND_BICYCLE` | | |
+| `highway=cycleway` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=path` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=pedestrian` | `PEDESTRIAN_AND_BICYCLE` | 0.9 | |
+| `highway=footway` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=bridleway` | `PEDESTRIAN_AND_BICYCLE` | 1.3 | |
+| `highway=living_street` | `ALL` | 0.9 | |
+| `highway=unclassified` | `ALL` | | |
+| `highway=road` | `ALL` | | |
+| `highway=byway` | `ALL` | 1.3 | |
+| `highway=track` | `ALL` | 1.3 | |
+| `highway=service` | `ALL` | 1.1 | |
+| `highway=residential` | `ALL` | 0.98 | |
+| `highway=residential_link` | `ALL` | 0.98 | |
+| `highway=tertiary` | `ALL` | | |
+| `highway=tertiary_link` | `ALL` | | |
+| `highway=secondary` | `ALL` | 1.5 | |
+| `highway=secondary_link` | `ALL` | 1.5 | |
+| `highway=primary` | `ALL` | 2.06 | |
+| `highway=primary_link` | `ALL` | 2.06 | |
+| `highway=trunk_link` | `CAR` | 2.06 | |
+| `highway=motorway_link` | `CAR` | 2.06 | |
+| `highway=trunk` | `CAR` | 7.47 | |
+| `highway=motorway` | `CAR` | 8.0 | |
+| `present(highway); cycleway=lane` | `PEDESTRIAN_AND_BICYCLE` | 0.87 | |
+| `highway=service; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=residential; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=residential_link; cycleway=lane` | `ALL` | 0.77 | |
+| `highway=tertiary; cycleway=lane` | `ALL` | 0.87 | |
+| `highway=tertiary_link; cycleway=lane` | `ALL` | 0.87 | |
+| `highway=secondary; cycleway=lane` | `ALL` | 0.96 | |
+| `highway=secondary_link; cycleway=lane` | `ALL` | 0.96 | |
+| `highway=primary; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=primary_link; cycleway=lane` | `ALL` | 1.15 | |
+| `highway=trunk; cycleway=lane` | `BICYCLE_AND_CAR` | 1.5 | |
+| `highway=trunk_link; cycleway=lane` | `BICYCLE_AND_CAR` | 1.15 | |
+| `highway=motorway; cycleway=lane` | `BICYCLE_AND_CAR` | 2.0 | |
+| `highway=motorway_link; cycleway=lane` | `BICYCLE_AND_CAR` | 1.15 | |
+| `present(highway); cycleway=share_busway` | `PEDESTRIAN_AND_BICYCLE` | 0.92 | |
+| `highway=service; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=residential; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=residential_link; cycleway=share_busway` | `ALL` | 0.85 | |
+| `highway=tertiary; cycleway=share_busway` | `ALL` | 0.92 | |
+| `highway=tertiary_link; cycleway=share_busway` | `ALL` | 0.92 | |
+| `highway=secondary; cycleway=share_busway` | `ALL` | 0.99 | |
+| `highway=secondary_link; cycleway=share_busway` | `ALL` | 0.99 | |
+| `highway=primary; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=primary_link; cycleway=share_busway` | `ALL` | 1.25 | |
+| `highway=trunk; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.75 | |
+| `highway=trunk_link; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.25 | |
+| `highway=motorway; cycleway=share_busway` | `BICYCLE_AND_CAR` | 2.5 | |
+| `highway=motorway_link; cycleway=share_busway` | `BICYCLE_AND_CAR` | 1.25 | |
+| `present(highway); cycleway=opposite_lane` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 0.87 | |
+| `highway=service; cycleway=opposite_lane` | `ALL` | forward: 1.1 back: 0.77 | |
+| `highway=residential; cycleway=opposite_lane` | `ALL` | forward: 0.98 back: 0.77 | |
+| `highway=residential_link; cycleway=opposite_lane` | `ALL` | forward: 0.98 back: 0.77 | |
+| `highway=tertiary; cycleway=opposite_lane` | `ALL` | forward: 1.0 back: 0.87 | |
+| `highway=tertiary_link; cycleway=opposite_lane` | `ALL` | forward: 1.0 back: 0.87 | |
+| `highway=secondary; cycleway=opposite_lane` | `ALL` | forward: 1.5 back: 0.96 | |
+| `highway=secondary_link; cycleway=opposite_lane` | `ALL` | forward: 1.5 back: 0.96 | |
+| `highway=primary; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=primary_link; cycleway=opposite_lane` | `ALL` | forward: 2.06 back: 1.15 | |
+| `highway=trunk; cycleway=opposite_lane` | `BICYCLE_AND_CAR` | forward: 7.47 back: 1.5 | |
+| `highway=trunk_link; cycleway=opposite_lane` | `BICYCLE_AND_CAR` | forward: 2.06 back: 1.15 | |
+| `present(highway); cycleway=track` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=service; cycleway=track` | `ALL` | 0.65 | |
+| `highway=residential; cycleway=track` | `ALL` | 0.65 | |
+| `highway=residential_link; cycleway=track` | `ALL` | 0.65 | |
+| `highway=tertiary; cycleway=track` | `ALL` | 0.75 | |
+| `highway=tertiary_link; cycleway=track` | `ALL` | 0.75 | |
+| `highway=secondary; cycleway=track` | `ALL` | 0.8 | |
+| `highway=secondary_link; cycleway=track` | `ALL` | 0.8 | |
+| `highway=primary; cycleway=track` | `ALL` | 0.85 | |
+| `highway=primary_link; cycleway=track` | `ALL` | 0.85 | |
+| `highway=trunk; cycleway=track` | `BICYCLE_AND_CAR` | 0.95 | |
+| `highway=trunk_link; cycleway=track` | `BICYCLE_AND_CAR` | 0.85 | |
+| `present(highway); cycleway=opposite_track` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 0.75 | |
+| `highway=service; cycleway=opposite_track` | `ALL` | forward: 1.1 back: 0.65 | |
+| `highway=residential; cycleway=opposite_track` | `ALL` | forward: 0.98 back: 0.65 | |
+| `highway=residential_link; cycleway=opposite_track` | `ALL` | forward: 0.98 back: 0.65 | |
+| `highway=tertiary; cycleway=opposite_track` | `ALL` | forward: 1.0 back: 0.75 | |
+| `highway=tertiary_link; cycleway=opposite_track` | `ALL` | forward: 1.0 back: 0.75 | |
+| `highway=secondary; cycleway=opposite_track` | `ALL` | forward: 1.5 back: 0.8 | |
+| `highway=secondary_link; cycleway=opposite_track` | `ALL` | forward: 1.5 back: 0.8 | |
+| `highway=primary; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=primary_link; cycleway=opposite_track` | `ALL` | forward: 2.06 back: 0.85 | |
+| `highway=trunk; cycleway=opposite_track` | `BICYCLE_AND_CAR` | forward: 7.47 back: 0.95 | |
+| `highway=trunk_link; cycleway=opposite_track` | `BICYCLE_AND_CAR` | forward: 2.06 back: 0.85 | |
+| `present(highway); cycleway=shared_lane` | `PEDESTRIAN_AND_BICYCLE` | 0.77 | |
+| `highway=service; cycleway=shared_lane` | `ALL` | 0.73 | |
+| `highway=residential; cycleway=shared_lane` | `ALL` | 0.77 | |
+| `highway=residential_link; cycleway=shared_lane` | `ALL` | 0.77 | |
+| `highway=tertiary; cycleway=shared_lane` | `ALL` | 0.83 | |
+| `highway=tertiary_link; cycleway=shared_lane` | `ALL` | 0.83 | |
+| `highway=secondary; cycleway=shared_lane` | `ALL` | 1.25 | |
+| `highway=secondary_link; cycleway=shared_lane` | `ALL` | 1.25 | |
+| `highway=primary; cycleway=shared_lane` | `ALL` | 1.75 | |
+| `highway=primary_link; cycleway=shared_lane` | `ALL` | 1.75 | |
+| `present(highway); cycleway=opposite` | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 back: 1.4 | |
+| `highway=service; cycleway=opposite` | `ALL` | 1.1 | |
+| `highway=residential; cycleway=opposite` | `ALL` | 0.98 | |
+| `highway=residential_link; cycleway=opposite` | `ALL` | 0.98 | |
+| `highway=tertiary; cycleway=opposite` | `ALL` | | |
+| `highway=tertiary_link; cycleway=opposite` | `ALL` | | |
+| `highway=secondary; cycleway=opposite` | `ALL` | forward: 1.5 back: 1.71 | |
+| `highway=secondary_link; cycleway=opposite` | `ALL` | forward: 1.5 back: 1.71 | |
+| `highway=primary; cycleway=opposite` | `ALL` | forward: 2.06 back: 2.99 | |
+| `highway=primary_link; cycleway=opposite` | `ALL` | forward: 2.06 back: 2.99 | |
+| `highway=path; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.6 | |
+| `highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `highway=footway; bicycle=yes; area=yes` | `PEDESTRIAN_AND_BICYCLE` | 0.9 | |
+| `highway=pedestrian; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.75 | |
+| `footway=sidewalk; highway=footway; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 2.5 | |
+| `footway=sidewalk; highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=footway; footway=crossing` | `PEDESTRIAN_AND_BICYCLE` | 2.5 | |
+| `highway=footway; footway=crossing; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1 | |
+| `highway=track; bicycle=yes` | `PEDESTRIAN_AND_BICYCLE` | 1.18 | |
+| `highway=track; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 0.99 | |
+| `highway=track; bicycle=yes; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 1.18 | |
+| `highway=track; bicycle=designated; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 0.99 | |
+| `highway=track; present(surface)` | `PEDESTRIAN_AND_BICYCLE` | 1.3 | |
+| `present(highway); bicycle=designated` | `ALL` | 0.97 | |
+| `highway=service; bicycle=designated` | `ALL` | 0.84 | |
+| `highway=residential; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=unclassified; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=residential_link; bicycle=designated` | `ALL` | 0.95 | |
+| `highway=tertiary; bicycle=designated` | `ALL` | 0.97 | |
+| `highway=tertiary_link; bicycle=designated` | `ALL` | 0.97 | |
+| `highway=secondary; bicycle=designated` | `ALL` | 1.46 | |
+| `highway=secondary_link; bicycle=designated` | `ALL` | 1.46 | |
+| `highway=primary; bicycle=designated` | `ALL` | 2.0 | |
+| `highway=primary_link; bicycle=designated` | `ALL` | 2.0 | |
+| `highway=trunk; bicycle=designated` | `BICYCLE_AND_CAR` | 7.25 | |
+| `highway=trunk_link; bicycle=designated` | `BICYCLE_AND_CAR` | 2.0 | |
+| `highway=motorway; bicycle=designated` | `BICYCLE_AND_CAR` | 7.76 | |
+| `highway=motorway_link; bicycle=designated` | `BICYCLE_AND_CAR` | 2.0 | |
+
+
+
+### 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.
+
+
+
+
+| matcher | bicycle safety | walk safety |
+|------------------------------------------------------------|----------------|-------------|
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 0.7 | |
+| `surface=unpaved` | 1.18 | |
+| `surface=compacted` | 1.18 | |
+| `surface=wood` | 1.18 | |
+| `surface=cobblestone` | 1.3 | |
+| `surface=sett` | 1.3 | |
+| `surface=unhewn_cobblestone` | 1.5 | |
+| `surface=grass_paver` | 1.3 | |
+| `surface=pebblestone` | 1.3 | |
+| `surface=metal` | 1.3 | |
+| `surface=ground` | 1.5 | |
+| `surface=dirt` | 1.5 | |
+| `surface=earth` | 1.5 | |
+| `surface=grass` | 1.5 | |
+| `surface=mud` | 1.5 | |
+| `surface=woodchip` | 1.5 | |
+| `surface=gravel` | 1.5 | |
+| `surface=artifical_turf` | 1.5 | |
+| `surface=sand` | 100.0 | |
+| `foot=discouraged` | | 3.0 |
+| `bicycle=discouraged` | 3.0 | |
+| `foot=use_sidepath` | | 5.0 |
+| `bicycle=use_sidepath` | 5.0 | |
+
+
diff --git a/doc/user/sandbox/ReportApi.md b/doc/user/sandbox/ReportApi.md
index 1a0668d1740..bc219ec2f98 100644
--- a/doc/user/sandbox/ReportApi.md
+++ b/doc/user/sandbox/ReportApi.md
@@ -24,14 +24,6 @@ This module mounts an endpoint for generating reports under `otp/report`. Availa
- [/otp/report/transfers.csv](http://localhost:8080/otp/report/transfers.csv)
- [/otp/report/graph.json](http://localhost:8080/otp/report/graph.json)
Detailed numbers of transit and street entities in the graph
-- [/otp/report/bicycle-safety.html](http://localhost:8080/otp/report/bicycle-safety.html):
- Interactive viewer of the rules that determine how bicycle safety factors are calculated.
-- [/otp/report/bicycle-safety.csv](http://localhost:8080/otp/report/bicycle-safety.csv): Raw CSV
- data for the bicycle safety report.
- - [Norwegian version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=norway)
- - [German version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=germany)
- - [UK version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=uk)
- - [Finnish version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=finland)
- [/otp/report/transit/group/priorities](http://localhost:8080/otp/report/transit/group/priorities):
List all transit groups used for transit-group-priority (Competition neutral planning).
diff --git a/doc/user/sandbox/VehicleRentalServiceDirectory.md b/doc/user/sandbox/VehicleRentalServiceDirectory.md
index 8009a62f912..1be5418e155 100644
--- a/doc/user/sandbox/VehicleRentalServiceDirectory.md
+++ b/doc/user/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
@@ -29,17 +30,18 @@ the `router-config.json`
-| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since |
-|-----------------------------------------------------|:---------------:|---------------------------------------------------------------------------------|:----------:|---------------|:-----:|
-| language | `string` | Language code. | *Optional* | | 2.1 |
-| sourcesName | `string` | Json tag name for updater sources. | *Optional* | `"systems"` | 2.1 |
-| updaterNetworkName | `string` | Json tag name for the network name for each source. | *Optional* | `"id"` | 2.1 |
-| updaterUrlName | `string` | Json tag name for endpoint urls for each source. | *Optional* | `"url"` | 2.1 |
-| url | `uri` | Endpoint for the VehicleRentalServiceDirectory | *Required* | | 2.1 |
-| [headers](#vehicleRentalServiceDirectory_headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.1 |
-| [networks](#vehicleRentalServiceDirectory_networks) | `object[]` | List all networks to include. Use "network": "default-network" to set defaults. | *Optional* | | 2.4 |
-| geofencingZones | `boolean` | Enables geofencingZones for the given network | *Optional* | `false` | 2.4 |
-| network | `string` | The network name | *Required* | | 2.4 |
+| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since |
+|----------------------------------------------------------------------------------------------------------------------|:---------------:|---------------------------------------------------------------------------------|:----------:|---------------|:-----:|
+| language | `string` | Language code. | *Optional* | | 2.1 |
+| sourcesName | `string` | Json tag name for updater sources. | *Optional* | `"systems"` | 2.1 |
+| updaterNetworkName | `string` | Json tag name for the network name for each source. | *Optional* | `"id"` | 2.1 |
+| updaterUrlName | `string` | Json tag name for endpoint urls for each source. | *Optional* | `"url"` | 2.1 |
+| url | `uri` | Endpoint for the VehicleRentalServiceDirectory | *Required* | | 2.1 |
+| [headers](#vehicleRentalServiceDirectory_headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.1 |
+| [networks](#vehicleRentalServiceDirectory_networks) | `object[]` | List all networks to include. Use "network": "default-network" to set defaults. | *Optional* | | 2.4 |
+| [allowKeepingVehicleAtDestination](#vehicleRentalServiceDirectory_networks_0_allowKeepingVehicleAtDestination) | `boolean` | Enables `allowKeepingVehicleAtDestination` for the given network. | *Optional* | `false` | 2.5 |
+| [geofencingZones](#vehicleRentalServiceDirectory_networks_0_geofencingZones) | `boolean` | Enables geofencingZones for the given network | *Optional* | `false` | 2.4 |
+| network | `string` | The network name | *Required* | | 2.4 |
@@ -69,6 +71,28 @@ networks are dropped. Note! The values in the "default-network" are not used to
missing field values in networks listed.
+
allowKeepingVehicleAtDestination
+
+**Since version:** `2.5` ∙ **Type:** `boolean` ∙ **Cardinality:** `Optional` ∙ **Default value:** `false`
+**Path:** /vehicleRentalServiceDirectory/networks/[0]
+
+Enables `allowKeepingVehicleAtDestination` for the given network.
+
+Configures if a vehicle rented from a station must be returned to another one or can
+be kept at the end of the trip.
+
+See the regular [GBFS documentation](../UpdaterConfig.md#gbfs-vehicle-rental-systems) for more information.
+
+
+
geofencingZones
+
+**Since version:** `2.4` ∙ **Type:** `boolean` ∙ **Cardinality:** `Optional` ∙ **Default value:** `false`
+**Path:** /vehicleRentalServiceDirectory/networks/[0]
+
+Enables geofencingZones for the given network
+
+See the regular [GBFS documentation](../UpdaterConfig.md#gbfs-vehicle-rental-systems) for more information.
+
diff --git a/mkdocs.yml b/mkdocs.yml
index 586f78566aa..145d3f3809e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -73,6 +73,12 @@ nav:
- Configuration:
- Introduction: 'Configuration.md'
- Build: 'BuildConfiguration.md'
+ - OSM Tag Mapping:
+ - Default: 'osm/Default.md'
+ - Finland: 'osm/Finland.md'
+ - Germany: 'osm/Germany.md'
+ - Norway: 'osm/Norway.md'
+ - UK: 'osm/UK.md'
- Router: 'RouterConfiguration.md'
- "Route Request": 'RouteRequest.md'
- "Realtime Updaters": 'UpdaterConfig.md'
diff --git a/pom.xml b/pom.xml
index 88c4933d866..6763eca09c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,15 +56,15 @@
- 154
+ 155
- 31.2
+ 31.32.51.1
- 2.17.1
+ 2.17.23.1.75.10.3
- 1.13.0
- 5.5.3
+ 1.13.2
+ 5.6.01.5.69.11.12.0.13
@@ -242,12 +242,12 @@
org.apache.maven.pluginsmaven-surefire-plugin
- 3.3.0
+ 3.3.1me.fabriciorbymaven-surefire-junit5-tree-reporter
- 1.2.1
+ 1.3.0
@@ -321,7 +321,7 @@
but we need the Maven project version as well, so we perform substitution. -->
io.github.git-commit-idgit-commit-id-maven-plugin
- 9.0.0
+ 9.0.1
diff --git a/renovate.json5 b/renovate.json5
index 7b957c577e3..d8ba10984e5 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -113,6 +113,7 @@
"org.mockito:mockito-core",
"com.tngtech.archunit:archunit",
"org.apache.maven.plugins:maven-surefire-plugin",
+ "me.fabriciorby:maven-surefire-junit5-tree-reporter",
"org.jacoco:jacoco-maven-plugin", // coverage plugin
"org.apache.commons:commons-compress", // only used by tests
// maven plugins
diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
index 3971d03ac6d..6466d7bf6d6 100644
--- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
@@ -41,14 +41,15 @@
import org.opentripplanner.street.search.request.StreetSearchRequest;
import org.opentripplanner.street.search.state.State;
import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
import org.opentripplanner.transit.model.site.AreaStop;
import org.opentripplanner.transit.service.DefaultTransitService;
import org.opentripplanner.transit.service.TransitModel;
/**
* This tests that the feed for the Cobb County Flex service is processed correctly. This service
- * contains both flex zones but also scheduled stops. Inside the zone passengers can get on or off
- * anywhere so there it works more like a taxi.
+ * contains both flex zones but also scheduled stops. Inside the zone, passengers can get on or off
+ * anywhere, so there it works more like a taxi.
*
* Read about the details at: https://www.cobbcounty.org/transportation/cobblinc/routes-and-schedules/flex
*/
@@ -212,6 +213,7 @@ private static List getItineraries(
var result = TransitRouter.route(
request,
serverContext,
+ TransitGroupPriorityService.empty(),
transitStartOfTime,
additionalSearchDays,
new DebugTimingAggregator()
diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
index b7431c16091..59995062eb7 100644
--- a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
@@ -35,6 +35,7 @@
import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
import org.opentripplanner.transit.service.DefaultTransitService;
import org.opentripplanner.transit.service.StopModel;
+import org.opentripplanner.transit.service.TransitEditorService;
import org.opentripplanner.transit.service.TransitModel;
import org.opentripplanner.updater.spi.UpdateError;
import uk.org.siri.siri20.VehicleModesEnumeration;
@@ -77,6 +78,7 @@ class AddedTripBuilderTest {
private final Deduplicator DEDUPLICATOR = new Deduplicator();
private final TransitModel TRANSIT_MODEL = new TransitModel(STOP_MODEL, DEDUPLICATOR);
+ private TransitEditorService transitService;
private EntityResolver ENTITY_RESOLVER;
@BeforeEach
@@ -101,6 +103,7 @@ void setUp() {
// Create transit model index
TRANSIT_MODEL.index();
+ transitService = new DefaultTransitService(TRANSIT_MODEL);
// Create the entity resolver only after the model has been indexed
ENTITY_RESOLVER =
@@ -110,7 +113,7 @@ void setUp() {
@Test
void testAddedTrip() {
var addedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
TRIP_ID,
@@ -151,37 +154,33 @@ void testAddedTrip() {
assertEquals(SubMode.of(SUB_MODE), route.getNetexSubmode(), "submode should be mapped");
assertNotEquals(REPLACED_ROUTE, route, "Should not re-use replaced route");
- // Assert transit model index
- var transitModelIndex = TRANSIT_MODEL.getTransitModelIndex();
- assertNotNull(transitModelIndex);
assertEquals(
route,
- transitModelIndex.getRouteForId(TransitModelForTest.id(LINE_REF)),
+ transitService.getRouteForId(TransitModelForTest.id(LINE_REF)),
"Route should be added to transit index"
);
assertEquals(
trip,
- transitModelIndex.getTripForId().get(TRIP_ID),
+ transitService.getTripForId(TRIP_ID),
"Route should be added to transit index"
);
- var pattern = transitModelIndex.getPatternForTrip().get(trip);
+ var pattern = transitService.getPatternForTrip(trip);
assertNotNull(pattern);
assertEquals(route, pattern.getRoute());
assertTrue(
- transitModelIndex
- .getServiceCodesRunningForDate()
- .get(SERVICE_DATE)
+ transitService
+ .getServiceCodesRunningForDate(SERVICE_DATE)
.contains(TRANSIT_MODEL.getServiceCodes().get(trip.getServiceId())),
"serviceId should be running on service date"
);
assertNotNull(
- transitModelIndex.getTripOnServiceDateById().get(TRIP_ID),
+ transitService.getTripOnServiceDateById(TRIP_ID),
"TripOnServiceDate should be added to transit index by id"
);
assertNotNull(
- transitModelIndex
- .getTripOnServiceDateForTripAndDay()
- .get(new TripIdAndServiceDate(TRIP_ID, SERVICE_DATE)),
+ transitService.getTripOnServiceDateForTripAndDay(
+ new TripIdAndServiceDate(TRIP_ID, SERVICE_DATE)
+ ),
"TripOnServiceDate should be added to transit index for trip and day"
);
@@ -239,7 +238,7 @@ void testAddedTrip() {
@Test
void testAddedTripOnAddedRoute() {
var firstAddedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
TRIP_ID,
@@ -265,7 +264,7 @@ void testAddedTripOnAddedRoute() {
var tripId2 = TransitModelForTest.id("TRIP_ID_2");
var secondAddedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
tripId2,
@@ -296,10 +295,7 @@ void testAddedTripOnAddedRoute() {
Route route = secondTrip.getRoute();
assertSame(firstTrip.getRoute(), route, "route be reused from the first trip");
- // Assert transit model index
- var transitModelIndex = TRANSIT_MODEL.getTransitModelIndex();
- assertNotNull(transitModelIndex);
- assertEquals(2, transitModelIndex.getPatternsForRoute().get(route).size());
+ assertEquals(2, transitService.getPatternsForRoute(route).size());
// Assert trip times
var times = secondAddedTrip.successValue().tripTimes();
@@ -316,7 +312,7 @@ void testAddedTripOnAddedRoute() {
@Test
void testAddedTripOnExistingRoute() {
var addedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
TRIP_ID,
@@ -347,7 +343,7 @@ void testAddedTripOnExistingRoute() {
@Test
void testAddedTripWithoutReplacedRoute() {
var addedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
TRIP_ID,
@@ -390,7 +386,7 @@ void testAddedTripWithoutReplacedRoute() {
@Test
void testAddedTripFailOnMissingServiceId() {
var addedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
TRIP_ID,
@@ -445,7 +441,7 @@ void testAddedTripFailOnNonIncreasingDwellTime() {
);
var addedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
TRIP_ID,
@@ -484,7 +480,7 @@ void testAddedTripFailOnTooFewCalls() {
.build()
);
var addedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
TRIP_ID,
@@ -531,7 +527,7 @@ void testAddedTripFailOnUnknownStop() {
.build()
);
var addedTrip = new AddedTripBuilder(
- TRANSIT_MODEL,
+ transitService,
ENTITY_RESOLVER,
AbstractTransitEntity::getId,
TRIP_ID,
diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
index a069f5c6656..45e7979b353 100644
--- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
@@ -1,24 +1,13 @@
package org.opentripplanner.ext.siri;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertFailure;
-import java.util.List;
import java.util.Set;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.opentripplanner.model.PickDrop;
import org.opentripplanner.transit.model.timetable.RealTimeState;
-import org.opentripplanner.transit.model.timetable.Trip;
-import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
-import org.opentripplanner.transit.model.timetable.TripTimes;
-import org.opentripplanner.transit.model.timetable.TripTimesFactory;
-import org.opentripplanner.transit.service.DefaultTransitService;
-import org.opentripplanner.transit.service.StopModel;
-import org.opentripplanner.transit.service.TransitModel;
-import org.opentripplanner.transit.service.TransitService;
-import org.opentripplanner.updater.TimetableSnapshotSourceParameters;
import org.opentripplanner.updater.spi.UpdateError;
-import org.opentripplanner.updater.spi.UpdateResult;
import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
class SiriTimetableSnapshotSourceTest {
@@ -88,6 +77,30 @@ void testAddedJourneyWithInvalidScheduledData() {
assertFailure(UpdateError.UpdateErrorType.NEGATIVE_HOP_TIME, result);
}
+ @Test
+ void testAddedJourneyWithUnresolvableAgency() {
+ var env = RealtimeTestEnvironment.siri();
+
+ // Create an extra journey with unknown line and operator
+ var createExtraJourney = new SiriEtBuilder(env.getDateTimeHelper())
+ .withEstimatedVehicleJourneyCode("newJourney")
+ .withIsExtraJourney(true)
+ .withOperatorRef("unknown operator")
+ .withLineRef("unknown line")
+ .withEstimatedCalls(builder ->
+ builder
+ .call(env.stopA1)
+ .departAimedExpected("10:58", "10:48")
+ .call(env.stopB1)
+ .arriveAimedExpected("10:08", "10:58")
+ )
+ .buildEstimatedTimetableDeliveries();
+
+ var result = env.applyEstimatedTimetable(createExtraJourney);
+ assertEquals(0, result.successful());
+ assertFailure(UpdateError.UpdateErrorType.CANNOT_RESOLVE_AGENCY, result);
+ }
+
@Test
void testReplaceJourney() {
var env = RealtimeTestEnvironment.siri();
@@ -402,10 +415,6 @@ void testExtraUnknownStop() {
assertFailure(UpdateError.UpdateErrorType.INVALID_STOP_SEQUENCE, result);
}
- private void assertFailure(UpdateError.UpdateErrorType expectedError, UpdateResult result) {
- assertEquals(Set.of(expectedError), result.failures().keySet());
- }
-
private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) {
return new SiriEtBuilder(env.getDateTimeHelper())
.withEstimatedCalls(builder ->
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/BicycleSafetyReport.java b/src/ext/java/org/opentripplanner/ext/reportapi/model/BicycleSafetyReport.java
deleted file mode 100644
index 8830189107d..00000000000
--- a/src/ext/java/org/opentripplanner/ext/reportapi/model/BicycleSafetyReport.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.opentripplanner.ext.reportapi.model;
-
-import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource;
-import org.opentripplanner.openstreetmap.wayproperty.WayPropertySet;
-
-public class BicycleSafetyReport {
-
- public static void main(String[] args) {
- System.out.println(makeCsv(OsmTagMapperSource.NORWAY));
- }
-
- public static String makeCsv(OsmTagMapperSource source) {
- var wayPropertySet = new WayPropertySet();
-
- source.getInstance().populateProperties(wayPropertySet);
-
- var buf = new CsvReportBuilder(",");
-
- buf.addHeader(
- "OSM tags for osmWayPropertySet " + source,
- "mixin",
- "permissions",
- "safety penalty there",
- "safety penalty back"
- );
-
- wayPropertySet
- .getWayProperties()
- .forEach(p -> {
- buf.addText(p.specifier().toString());
- buf.addBoolean(false);
- buf.addText(p.properties().getPermission().toString());
-
- var safetyProps = p.properties().bicycleSafety();
- if (safetyProps != null) {
- buf.addNumber(safetyProps.forward());
- buf.addNumber(safetyProps.back());
- }
- buf.newLine();
- });
-
- wayPropertySet
- .getMixins()
- .forEach(p -> {
- buf.addText(p.specifier().toString());
- buf.addBoolean(true);
- buf.addText("");
-
- var safetyProps = p.bicycleSafety();
- buf.addNumber(safetyProps.forward());
- buf.addNumber(safetyProps.back());
- buf.newLine();
- });
-
- return buf.toString();
- }
-}
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
index 635469cb3a2..66ad29fad56 100644
--- a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
+++ b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
@@ -4,9 +4,9 @@
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.stream.Collectors;
-import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.PriorityGroupConfigurator;
import org.opentripplanner.routing.api.request.request.TransitRequest;
import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
/**
* This class is used to report all transit-groups used for transit-group-priority. The report is
@@ -17,14 +17,14 @@
public class TransitGroupPriorityReport {
public static String build(Collection patterns, TransitRequest request) {
- var c = PriorityGroupConfigurator.of(
+ var service = new TransitGroupPriorityService(
request.priorityGroupsByAgency(),
request.priorityGroupsGlobal()
);
var map = new TreeMap();
for (var it : patterns) {
- int groupId = c.lookupTransitGroupPriorityId(it);
+ int groupId = service.lookupTransitGroupPriorityId(it);
var de = map.computeIfAbsent(groupId, DebugEntity::new);
de.add(
it.getRoute().getAgency().getId().toString(),
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java b/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
index a859b4ff78a..e06aec71b53 100644
--- a/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
+++ b/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
@@ -1,25 +1,18 @@
package org.opentripplanner.ext.reportapi.resource;
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.DefaultValue;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
import java.time.Duration;
-import org.opentripplanner.ext.reportapi.model.BicycleSafetyReport;
import org.opentripplanner.ext.reportapi.model.CachedValue;
import org.opentripplanner.ext.reportapi.model.GraphReportBuilder;
import org.opentripplanner.ext.reportapi.model.GraphReportBuilder.GraphStats;
import org.opentripplanner.ext.reportapi.model.TransfersReport;
import org.opentripplanner.ext.reportapi.model.TransitGroupPriorityReport;
import org.opentripplanner.model.transfer.TransferService;
-import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource;
import org.opentripplanner.routing.api.request.RouteRequest;
import org.opentripplanner.standalone.api.OtpServerRequestContext;
import org.opentripplanner.transit.service.TransitService;
@@ -51,39 +44,6 @@ public String getTransfersAsCsv() {
return TransfersReport.export(transferService.listAll(), transitService);
}
- @GET
- @Path("/bicycle-safety.html")
- @Produces(MediaType.TEXT_HTML)
- public Response getBicycleSafetyPage() {
- try (var is = getClass().getResourceAsStream("/reportapi/report.html")) {
- return Response.ok(new String(is.readAllBytes(), StandardCharsets.UTF_8)).build();
- } catch (IOException e) {
- return Response.serverError().build();
- }
- }
-
- @GET
- @Path("/bicycle-safety.csv")
- @Produces("text/csv")
- public Response getBicycleSafetyAsCsv(
- @DefaultValue("DEFAULT") @QueryParam("osmWayPropertySet") String osmWayPropertySet
- ) {
- OsmTagMapperSource source;
- try {
- source = OsmTagMapperSource.valueOf(osmWayPropertySet.toUpperCase());
- } catch (IllegalArgumentException ignore) {
- throw new BadRequestException("Unknown osmWayPropertySet: " + osmWayPropertySet);
- }
-
- return Response
- .ok(BicycleSafetyReport.makeCsv(source))
- .header(
- "Content-Disposition",
- "attachment; filename=\"" + osmWayPropertySet + "-bicycle-safety.csv\""
- )
- .build();
- }
-
@GET
@Path("/transit/group/priorities")
@Produces(MediaType.TEXT_PLAIN)
diff --git a/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java b/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
index 8eae3be7077..be5b30b38b9 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
@@ -2,6 +2,7 @@
import static java.lang.Boolean.TRUE;
import static org.opentripplanner.ext.siri.mapper.SiriTransportModeMapper.mapTransitMainMode;
+import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.CANNOT_RESOLVE_AGENCY;
import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_START_DATE;
import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_VALID_STOPS;
import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TOO_FEW_STOPS;
@@ -13,6 +14,8 @@
import java.util.List;
import java.util.Objects;
import java.util.function.Function;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.opentripplanner.ext.siri.mapper.PickDropMapper;
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.framework.time.ServiceDateUtils;
@@ -33,7 +36,7 @@
import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
import org.opentripplanner.transit.model.timetable.TripTimesFactory;
-import org.opentripplanner.transit.service.TransitModel;
+import org.opentripplanner.transit.service.TransitEditorService;
import org.opentripplanner.updater.spi.DataValidationExceptionMapper;
import org.opentripplanner.updater.spi.UpdateError;
import org.rutebanken.netex.model.BusSubmodeEnumeration;
@@ -49,7 +52,7 @@
class AddedTripBuilder {
private static final Logger LOG = LoggerFactory.getLogger(AddedTripBuilder.class);
- private final TransitModel transitModel;
+ private final TransitEditorService transitService;
private final EntityResolver entityResolver;
private final ZoneId timeZone;
private final Function getTripPatternId;
@@ -70,7 +73,7 @@ class AddedTripBuilder {
AddedTripBuilder(
EstimatedVehicleJourney estimatedVehicleJourney,
- TransitModel transitModel,
+ TransitEditorService transitService,
EntityResolver entityResolver,
Function getTripPatternId
) {
@@ -109,16 +112,16 @@ class AddedTripBuilder {
calls = CallWrapper.of(estimatedVehicleJourney);
- this.transitModel = transitModel;
+ this.transitService = transitService;
this.entityResolver = entityResolver;
this.getTripPatternId = getTripPatternId;
- timeZone = transitModel.getTimeZone();
+ timeZone = transitService.getTimeZone();
replacedTrips = getReplacedVehicleJourneys(estimatedVehicleJourney);
}
AddedTripBuilder(
- TransitModel transitModel,
+ TransitEditorService transitService,
EntityResolver entityResolver,
Function getTripPatternId,
FeedScopedId tripId,
@@ -136,9 +139,9 @@ class AddedTripBuilder {
String headsign,
List replacedTrips
) {
- this.transitModel = transitModel;
+ this.transitService = transitService;
this.entityResolver = entityResolver;
- this.timeZone = transitModel.getTimeZone();
+ this.timeZone = transitService.getTimeZone();
this.getTripPatternId = getTripPatternId;
this.tripId = tripId;
this.operator = operator;
@@ -165,16 +168,20 @@ Result build() {
return UpdateError.result(tripId, NO_START_DATE);
}
- FeedScopedId calServiceId = transitModel.getOrCreateServiceIdForDate(serviceDate);
+ FeedScopedId calServiceId = transitService.getOrCreateServiceIdForDate(serviceDate);
if (calServiceId == null) {
return UpdateError.result(tripId, NO_START_DATE);
}
Route route = entityResolver.resolveRoute(lineRef);
if (route == null) {
- route = createRoute();
+ Agency agency = resolveAgency();
+ if (agency == null) {
+ return UpdateError.result(tripId, CANNOT_RESOLVE_AGENCY);
+ }
+ route = createRoute(agency);
LOG.info("Adding route {} to transitModel.", route);
- transitModel.getTransitModelIndex().addRoutes(route);
+ transitService.addRoutes(route);
}
Trip trip = createTrip(route, calServiceId);
@@ -214,14 +221,14 @@ Result build() {
RealTimeTripTimes tripTimes = TripTimesFactory.tripTimes(
trip,
aimedStopTimes,
- transitModel.getDeduplicator()
+ transitService.getDeduplicator()
);
// validate the scheduled trip times
// they are in general superseded by real-time trip times
// but in case of trip cancellation, OTP will fall back to scheduled trip times
// therefore they must be valid
tripTimes.validateNonIncreasingTimes();
- tripTimes.setServiceCode(transitModel.getServiceCodes().get(trip.getServiceId()));
+ tripTimes.setServiceCode(transitService.getServiceCodeForId(trip.getServiceId()));
pattern.add(tripTimes);
RealTimeTripTimes updatedTripTimes = tripTimes.copyScheduledTimes();
@@ -260,17 +267,14 @@ Result build() {
// Adding trip to index necessary to include values in graphql-queries
// TODO - SIRI: should more data be added to index?
- transitModel.getTransitModelIndex().getTripForId().put(tripId, trip);
- transitModel.getTransitModelIndex().getPatternForTrip().put(trip, pattern);
- transitModel.getTransitModelIndex().getPatternsForRoute().put(route, pattern);
- transitModel
- .getTransitModelIndex()
- .getTripOnServiceDateById()
- .put(tripOnServiceDate.getId(), tripOnServiceDate);
- transitModel
- .getTransitModelIndex()
- .getTripOnServiceDateForTripAndDay()
- .put(new TripIdAndServiceDate(tripId, serviceDate), tripOnServiceDate);
+ transitService.addTripForId(tripId, trip);
+ transitService.addPatternForTrip(trip, pattern);
+ transitService.addPatternsForRoute(route, pattern);
+ transitService.addTripOnServiceDateById(tripOnServiceDate.getId(), tripOnServiceDate);
+ transitService.addTripOnServiceDateForTripAndDay(
+ new TripIdAndServiceDate(tripId, serviceDate),
+ tripOnServiceDate
+ );
return Result.success(new TripUpdate(stopPattern, updatedTripTimes, serviceDate));
}
@@ -278,34 +282,40 @@ Result build() {
/**
* Method to create a Route. Commonly used to create a route if a real-time message
* refers to a route that is not in the transit model.
- *
- * We will find the first Route with same Operator, and use the same Authority
- * If no operator found, copy the agency from replaced route
- *
* If no name is given for the route, an empty string will be set as the name.
*
* @return a new Route
*/
- private Route createRoute() {
+ @Nonnull
+ private Route createRoute(Agency agency) {
var routeBuilder = Route.of(entityResolver.resolveId(lineRef));
routeBuilder.withShortName(shortName);
routeBuilder.withMode(transitMode);
routeBuilder.withNetexSubmode(transitSubMode);
routeBuilder.withOperator(operator);
+ routeBuilder.withAgency(agency);
- // TODO - SIRI: Is there a better way to find authority/Agency?
- Agency agency = transitModel
- .getTransitModelIndex()
+ return routeBuilder.build();
+ }
+
+ /**
+ * Attempt to find the agency to which this new trip belongs.
+ * The algorithm retrieves any route operated by the same operator as the one operating this new
+ * trip and resolves its agency.
+ * If no route with the same operator can be found, the algorithm falls back to retrieving the
+ * agency operating the replaced route.
+ * If none can be found the method returns null.
+ */
+ @Nullable
+ private Agency resolveAgency() {
+ return transitService
.getAllRoutes()
.stream()
.filter(r -> r != null && r.getOperator() != null && r.getOperator().equals(operator))
.findFirst()
.map(Route::getAgency)
.orElseGet(() -> replacedRoute != null ? replacedRoute.getAgency() : null);
- routeBuilder.withAgency(agency);
-
- return routeBuilder.build();
}
private Trip createTrip(Route route, FeedScopedId calServiceId) {
diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index db9c1fcc441..7ab316bfc55 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -23,8 +23,8 @@
import org.opentripplanner.transit.model.timetable.Trip;
import org.opentripplanner.transit.model.timetable.TripTimes;
import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TransitEditorService;
import org.opentripplanner.transit.service.TransitModel;
-import org.opentripplanner.transit.service.TransitService;
import org.opentripplanner.updater.TimetableSnapshotSourceParameters;
import org.opentripplanner.updater.spi.DataValidationExceptionMapper;
import org.opentripplanner.updater.spi.UpdateError;
@@ -56,9 +56,8 @@ public class SiriTimetableSnapshotSource implements TimetableSnapshotProvider {
* messages.
*/
private final SiriTripPatternCache tripPatternCache;
- private final TransitModel transitModel;
- private final TransitService transitService;
+ private final TransitEditorService transitService;
private final TimetableSnapshotManager snapshotManager;
@@ -72,7 +71,6 @@ public SiriTimetableSnapshotSource(
parameters,
() -> LocalDate.now(transitModel.getTimeZone())
);
- this.transitModel = transitModel;
this.transitService = new DefaultTransitService(transitModel);
this.tripPatternCache =
new SiriTripPatternCache(tripPatternIdGenerator, transitService::getPatternForTrip);
@@ -115,7 +113,7 @@ public UpdateResult applyEstimatedTimetable(
var journeys = estimatedJourneyVersion.getEstimatedVehicleJourneies();
LOG.debug("Handling {} EstimatedVehicleJourneys.", journeys.size());
for (EstimatedVehicleJourney journey : journeys) {
- results.add(apply(journey, transitModel, fuzzyTripMatcher, entityResolver));
+ results.add(apply(journey, transitService, fuzzyTripMatcher, entityResolver));
}
}
}
@@ -135,7 +133,7 @@ public TimetableSnapshot getTimetableSnapshot() {
private Result apply(
EstimatedVehicleJourney journey,
- TransitModel transitModel,
+ TransitEditorService transitService,
@Nullable SiriFuzzyTripMatcher fuzzyTripMatcher,
EntityResolver entityResolver
) {
@@ -147,7 +145,7 @@ private Result apply(
result =
new AddedTripBuilder(
journey,
- transitModel,
+ transitService,
entityResolver,
tripPatternIdGenerator::generateUniqueTripPatternId
)
@@ -265,7 +263,7 @@ private Result handleModifiedTrip(
pattern,
estimatedVehicleJourney,
serviceDate,
- transitModel.getTimeZone(),
+ transitService.getTimeZone(),
entityResolver
)
.build();
diff --git a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
index 3876ff44651..b65c22b4727 100644
--- a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
+++ b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
@@ -8,6 +8,7 @@
import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem;
import org.opentripplanner.transit.model.framework.FeedScopedId;
import org.opentripplanner.updater.spi.DataSource;
import org.opentripplanner.updater.spi.GenericJsonDataSource;
@@ -32,6 +33,7 @@ public class SmooveBikeRentalDataSource
private final String networkName;
private final RentalVehicleType vehicleType;
+ private final VehicleRentalSystem system;
public SmooveBikeRentalDataSource(SmooveBikeRentalDataSourceParameters config) {
this(config, new OtpHttpClientFactory());
@@ -45,6 +47,24 @@ public SmooveBikeRentalDataSource(
networkName = config.getNetwork(DEFAULT_NETWORK_NAME);
vehicleType = RentalVehicleType.getDefaultType(networkName);
overloadingAllowed = config.overloadingAllowed();
+ system =
+ new VehicleRentalSystem(
+ networkName,
+ "fi",
+ "Helsinki/Espoo",
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ null,
+ "Europe/Helsinki",
+ null,
+ null,
+ null
+ );
}
/**
@@ -94,6 +114,7 @@ protected VehicleRentalStation parseElement(JsonNode node) {
station.vehicleTypesAvailable = Map.of(vehicleType, station.vehiclesAvailable);
station.vehicleSpacesAvailable = Map.of(vehicleType, station.spacesAvailable);
station.overloadingAllowed = overloadingAllowed;
+ station.system = system;
return station;
}
}
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
index 9b350dec345..03b0acd59cd 100644
--- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
+++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
@@ -105,8 +105,7 @@ private static List buildListOfNetworksFr
new GbfsVehicleRentalDataSourceParameters(
updaterUrl.get(),
parameters.getLanguage(),
- // allowKeepingRentedVehicleAtDestination - not part of GBFS, not supported here
- false,
+ networkParams.allowKeepingAtDestination(),
parameters.getHeaders(),
networkName,
networkParams.geofencingZones(),
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
index 25d394f72ec..c8b638edae3 100644
--- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
+++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
@@ -5,15 +5,18 @@
/**
* Parameters for a specific network.
*
- * The {@link GbfsVehicleRentalDataSourceParameters} support {@code overloadingAllowed} and
- * {@code allowKeepingRentedVehicleAtDestination} is not included here since they are not part of
- * the GBFS specification. If there is a demand for these, they can be added.
+ * The {@link GbfsVehicleRentalDataSourceParameters} supports {@code overloadingAllowed}
+ * which is not included here since it is not part of
+ * the GBFS specification. If there is a demand for it, it can be added.
*
* @param network The network name
* @param geofencingZones enable geofencingZones for the given network
+ * @param allowKeepingAtDestination if a vehicle that was picked up from a station must be returned
+ * to another one or can be kept at the destination.
+ * {@link org.opentripplanner.standalone.config.routerconfig.updaters.sources.VehicleRentalSourceFactory#allOwKeepingRentedVehicleAtDestination()}
*/
-public record NetworkParameters(String network, boolean geofencingZones) {
- public NetworkParameters withName(String network) {
- return new NetworkParameters(network, geofencingZones);
- }
-}
+public record NetworkParameters(
+ String network,
+ boolean geofencingZones,
+ boolean allowKeepingAtDestination
+) {}
diff --git a/src/ext/resources/reportapi/report.html b/src/ext/resources/reportapi/report.html
deleted file mode 100644
index bfa5af66603..00000000000
--- a/src/ext/resources/reportapi/report.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-