Skip to content

Commit f31023d

Browse files
committed
Merge remote-tracking branch 'otp/dev-2.x' into feedinfo-query
2 parents 8a41412 + 670ed28 commit f31023d

File tree

32 files changed

+995
-320
lines changed

32 files changed

+995
-320
lines changed

README.md

+2-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Overview
22

33
[![Join the chat at https://gitter.im/opentripplanner/OpenTripPLanner](https://badges.gitter.im/opentripplanner/OpenTripPlanner.svg)](https://gitter.im/opentripplanner/OpenTripPlanner)
4-
[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im)
4+
[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat&?cacheSeconds=172800)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im)
55
[![codecov](https://codecov.io/gh/opentripplanner/OpenTripPlanner/branch/dev-2.x/graph/badge.svg?token=ak4PbIKgZ1)](https://codecov.io/gh/opentripplanner/OpenTripPlanner)
66
[![Commit activity](https://img.shields.io/github/commit-activity/y/opentripplanner/OpenTripPlanner)](https://github.com/opentripplanner/OpenTripPlanner/graphs/contributors)
77
[![Docker Pulls](https://img.shields.io/docker/pulls/opentripplanner/opentripplanner)](https://hub.docker.com/r/opentripplanner/opentripplanner)
@@ -60,16 +60,7 @@ the world.
6060

6161
## Getting in touch
6262

63-
The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner)
64-
where most of the core developers are. You can also send questions and comments to the
65-
[mailing list](http://groups.google.com/group/opentripplanner-users).
66-
67-
Changes and extensions to OTP are debated in issues on [GitHub](https://github.com/opentripplanner/OpenTripPlanner/issues)
68-
and in the [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner). More general
69-
questions and announcements of interest to non-developer OTP users should be directed to
70-
the [opentripplanner-users](https://groups.google.com/forum/#!forum/opentripplanner-users) list.
71-
Other details of [project governance](http://docs.opentripplanner.org/en/dev-2.x/Governance/) can be
72-
found in the main documentation.
63+
The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) where most of the core developers are. Bug reports may be filed via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues). The OpenTripPlanner [mailing list](http://groups.google.com/group/opentripplanner-users) is used almost exclusively for project announcements. The mailing list and issue tracker are not intended for support questions or discussions. Please use the chat for this purpose. Other details of [project governance](http://docs.opentripplanner.org/en/dev-2.x/Governance/) can be found in the main documentation.
7364

7465
## OTP Ecosystem
7566

client-next/package-lock.json

+128-122
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client-next/package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,35 @@
2121
"bootstrap": "5.3.3",
2222
"graphql": "16.8.1",
2323
"graphql-request": "6.1.0",
24-
"maplibre-gl": "4.1.2",
25-
"react": "18.2.0",
24+
"maplibre-gl": "4.1.3",
25+
"react": "18.3.1",
2626
"react-bootstrap": "2.10.2",
27-
"react-dom": "18.2.0",
27+
"react-dom": "18.3.1",
2828
"react-map-gl": "7.1.7"
2929
},
3030
"devDependencies": {
3131
"@graphql-codegen/cli": "5.0.2",
3232
"@graphql-codegen/client-preset": "4.2.5",
3333
"@graphql-codegen/introspection": "4.0.3",
3434
"@parcel/watcher": "2.4.1",
35-
"@testing-library/react": "15.0.2",
36-
"@types/react": "18.2.79",
37-
"@types/react-dom": "18.2.25",
38-
"@typescript-eslint/eslint-plugin": "7.7.0",
39-
"@typescript-eslint/parser": "7.7.0",
35+
"@testing-library/react": "15.0.6",
36+
"@types/react": "18.3.1",
37+
"@types/react-dom": "18.3.0",
38+
"@typescript-eslint/eslint-plugin": "7.8.0",
39+
"@typescript-eslint/parser": "7.8.0",
4040
"@vitejs/plugin-react": "4.2.1",
41-
"@vitest/coverage-v8": "1.5.0",
41+
"@vitest/coverage-v8": "1.5.3",
4242
"eslint": "8.57.0",
4343
"eslint-config-prettier": "9.1.0",
4444
"eslint-plugin-import": "2.29.1",
4545
"eslint-plugin-jsx-a11y": "6.8.0",
4646
"eslint-plugin-react": "7.34.1",
47-
"eslint-plugin-react-hooks": "4.6.0",
47+
"eslint-plugin-react-hooks": "4.6.2",
4848
"eslint-plugin-react-refresh": "0.4.6",
4949
"jsdom": "24.0.0",
5050
"prettier": "3.2.5",
5151
"typescript": "5.4.5",
52-
"vite": "5.2.8",
53-
"vitest": "1.5.0"
52+
"vite": "5.2.11",
53+
"vitest": "1.5.3"
5454
}
5555
}

doc-templates/VehicleParking.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
## Contact Info
44

55
- For HSL Park and Ride updater: Digitransit team, HSL, Helsinki, Finland
6-
- For Bikely and NOI updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io)
6+
- For Bikely, NOI and Bikeep updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io)
77

88

99
## Documentation
@@ -44,6 +44,9 @@ All updaters have the following parameters in common:
4444

4545
<!-- INSERT: noi-open-data-hub -->
4646

47+
## Bikeep
48+
49+
<!-- INSERT: bikeep -->
4750

4851
## Changelog
4952

docs/Changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
1515
- Overwrite default WALK directMode when it is not set in the request, but modes is set [#5779](https://github.com/opentripplanner/OpenTripPlanner/pull/5779)
1616
- Fix trip duplication in Graph Builder DSJ mapping [#5794](https://github.com/opentripplanner/OpenTripPlanner/pull/5794)
1717
- Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676)
18+
- Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783)
1819
[](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
1920

2021
## 2.5.0 (2024-03-13)

docs/RouterConfiguration.md

+6
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,12 @@ Used to group requests when monitoring OTP.
844844
"fromDateTime" : "-P1D",
845845
"timeout" : 300000
846846
}
847+
},
848+
{
849+
"type" : "vehicle-parking",
850+
"feedId" : "bikeep",
851+
"sourceType" : "bikeep",
852+
"url" : "https://services.bikeep.com/location/v1/public-areas/no-baia-mobility/locations"
847853
}
848854
],
849855
"rideHailingServices" : [

docs/apis/GTFS-GraphQL-API.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ makes it easy to use this API in a Java application.
1111
## URLs
1212
- GraphQL endpoint: [`http://localhost:8080/otp/gtfs/v1`](http://localhost:8080/otp/gtfs/v1)
1313
- HTML schema documentation: [https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/](https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/)
14-
- Built-in visual GraphQL client: [http://localhost:8080/graphiql](http://localhost:8080/graphiql)
14+
- Built-in visual GraphQL client: [http://localhost:8080/graphiql](http://localhost:8080/graphiql) (note the additional `i`!)
1515

1616
## Built-in API client
1717

@@ -43,4 +43,4 @@ If you want to disable it, do it in `otp-config.json`:
4343
"GtfsGraphQlApi": false
4444
}
4545
}
46-
```
46+
```

docs/index.md

+1-6
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,7 @@ your own OTP instance, the best place to start is the [Basic Tutorial](Basic-Tut
6060

6161
# Getting help
6262

63-
The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner)
64-
where most of the core developers are.
65-
You can also send questions and comments to the [mailing list](http://groups.google.com/group/opentripplanner-users)
66-
or file bug reports via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues).
67-
Note that the issue tracker is not intended for support questions or discussions. Please use the
68-
chat or the mailing list instead.
63+
The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) where most of the core developers are. Bug reports may be filed via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues). The issue tracker is not intended for support questions or discussions. Please use the chat for this purpose. The OpenTripPlanner [mailing list](http://groups.google.com/group/opentripplanner-users) is treated as a legacy communications channel and used almost exclusively for project announcements. Again, please direct development and support discussions to the Gitter chat.
6964

7065
# Financial and In-Kind Support
7166

docs/sandbox/IBIAccessibilityScore.md

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
1-
# IBI Group Accessibility Score - OTP Sandbox Extension
1+
# IBI Group Accessibility Score
22

33
## Contact Info
44

55
- IBI Group ([transitrealtime@ibigroup.com](mailto:transitrealtime@ibigroup.com))
66

7-
## Changelog
8-
9-
- Create initial
10-
implementation [#4221](https://github.com/opentripplanner/OpenTripPlanner/pull/4221)
11-
127
## Documentation
138

149
This extension computes a numeric accessibility score between 0 and 1 and adds it to the itinerary
@@ -32,4 +27,8 @@ To enable the feature add the following to `router-config.json`:
3227
}
3328
```
3429

35-
The score is only computed when you search for wheelchair-accessible routes.
30+
The score is only computed when you search for wheelchair-accessible routes.
31+
32+
## Changelog
33+
34+
- Create initial implementation [#4221](https://github.com/opentripplanner/OpenTripPlanner/pull/4221)

0 commit comments

Comments
 (0)