Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/dev-2.x' into flex-duration-fa…
Browse files Browse the repository at this point in the history
…ctors
  • Loading branch information
leonardehrenfried committed May 6, 2024
2 parents a4dc25b + b1d36f9 commit 42b36bf
Show file tree
Hide file tree
Showing 31 changed files with 995 additions and 311 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Overview

[![Join the chat at https://gitter.im/opentripplanner/OpenTripPLanner](https://badges.gitter.im/opentripplanner/OpenTripPlanner.svg)](https://gitter.im/opentripplanner/OpenTripPlanner)
[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im)
[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat&?cacheSeconds=172800)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im)
[![codecov](https://codecov.io/gh/opentripplanner/OpenTripPlanner/branch/dev-2.x/graph/badge.svg?token=ak4PbIKgZ1)](https://codecov.io/gh/opentripplanner/OpenTripPlanner)
[![Commit activity](https://img.shields.io/github/commit-activity/y/opentripplanner/OpenTripPlanner)](https://github.com/opentripplanner/OpenTripPlanner/graphs/contributors)
[![Docker Pulls](https://img.shields.io/docker/pulls/opentripplanner/opentripplanner)](https://hub.docker.com/r/opentripplanner/opentripplanner)
Expand Down
250 changes: 128 additions & 122 deletions client-next/package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions client-next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@
"bootstrap": "5.3.3",
"graphql": "16.8.1",
"graphql-request": "6.1.0",
"maplibre-gl": "4.1.2",
"react": "18.2.0",
"maplibre-gl": "4.1.3",
"react": "18.3.1",
"react-bootstrap": "2.10.2",
"react-dom": "18.2.0",
"react-dom": "18.3.1",
"react-map-gl": "7.1.7"
},
"devDependencies": {
"@graphql-codegen/cli": "5.0.2",
"@graphql-codegen/client-preset": "4.2.5",
"@graphql-codegen/introspection": "4.0.3",
"@parcel/watcher": "2.4.1",
"@testing-library/react": "15.0.2",
"@types/react": "18.2.79",
"@types/react-dom": "18.2.25",
"@typescript-eslint/eslint-plugin": "7.7.0",
"@typescript-eslint/parser": "7.7.0",
"@testing-library/react": "15.0.6",
"@types/react": "18.3.1",
"@types/react-dom": "18.3.0",
"@typescript-eslint/eslint-plugin": "7.8.0",
"@typescript-eslint/parser": "7.8.0",
"@vitejs/plugin-react": "4.2.1",
"@vitest/coverage-v8": "1.5.0",
"@vitest/coverage-v8": "1.5.3",
"eslint": "8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-react-hooks": "4.6.2",
"eslint-plugin-react-refresh": "0.4.6",
"jsdom": "24.0.0",
"prettier": "3.2.5",
"typescript": "5.4.5",
"vite": "5.2.8",
"vitest": "1.5.0"
"vite": "5.2.11",
"vitest": "1.5.3"
}
}
5 changes: 4 additions & 1 deletion doc-templates/VehicleParking.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Contact Info

- For HSL Park and Ride updater: Digitransit team, HSL, Helsinki, Finland
- For Bikely and NOI updater: Leonard Ehrenfried, [[email protected]](mailto:[email protected])
- For Bikely, NOI and Bikeep updater: Leonard Ehrenfried, [[email protected]](mailto:[email protected])


## Documentation
Expand Down Expand Up @@ -44,6 +44,9 @@ All updaters have the following parameters in common:

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

## Bikeep

<!-- INSERT: bikeep -->

## Changelog

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

## 2.5.0 (2024-03-13)
Expand Down
6 changes: 6 additions & 0 deletions docs/RouterConfiguration.md
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,12 @@ Used to group requests when monitoring OTP.
"fromDateTime" : "-P1D",
"timeout" : 300000
}
},
{
"type" : "vehicle-parking",
"feedId" : "bikeep",
"sourceType" : "bikeep",
"url" : "https://services.bikeep.com/location/v1/public-areas/no-baia-mobility/locations"
}
],
"rideHailingServices" : [
Expand Down
7 changes: 1 addition & 6 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,7 @@ your own OTP instance, the best place to start is the [Basic Tutorial](Basic-Tut

# Getting help

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.
You can also send questions and comments to the [mailing list](http://groups.google.com/group/opentripplanner-users)
or file bug reports via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues).
Note that the issue tracker is not intended for support questions or discussions. Please use the
chat or the mailing list instead.
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.

# Financial and In-Kind Support

Expand Down
13 changes: 6 additions & 7 deletions docs/sandbox/IBIAccessibilityScore.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
# IBI Group Accessibility Score - OTP Sandbox Extension
# IBI Group Accessibility Score

## Contact Info

- IBI Group ([[email protected]](mailto:[email protected]))

## Changelog

- Create initial
implementation [#4221](https://github.com/opentripplanner/OpenTripPlanner/pull/4221)

## Documentation

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

The score is only computed when you search for wheelchair-accessible routes.
The score is only computed when you search for wheelchair-accessible routes.

## Changelog

- Create initial implementation [#4221](https://github.com/opentripplanner/OpenTripPlanner/pull/4221)
Loading

0 comments on commit 42b36bf

Please sign in to comment.