Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dt 6111 Update OTP2 information to Digitransit.fi #260

Merged
merged 66 commits into from
Nov 11, 2024
Merged

Conversation

HenrikSundell
Copy link
Contributor

No description provided.

Copy link
Member

@optionsome optionsome left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might change the routing endpoint url slightly and expose the transmodel API as well so this pr is on hold for a bit.

| Hämeenlinna | [Hameenlinna](https://api.digitransit.fi/routing-data/v3/waltti/Hameenlinna-gtfs.zip) | [waltti](https://api.digitransit.fi/routing/v2/routers/waltti/index/graphql)
| Lahti | [Lahti](https://api.digitransit.fi/routing-data/v3/waltti/Lahti-gtfs.zip) | [waltti](https://api.digitransit.fi/routing/v2/routers/waltti/index/graphql)
| Vaasa | [Vaasa](https://api.digitransit.fi/routing-data/v3/waltti/Vaasa-gtfs.zip) | [waltti](https://api.digitransit.fi/routing/v2/routers/waltti/index/graphql)
| Mikkeli | [Mikkeli](https://api.digitransit.fi/routing-data/v3/waltti/Mikkeli-gtfs.zip) | [waltti](https://api.digitransit.fi/routing/v2/routers/waltti/index/graphql)
| Salo | [Salo](https://api.digitransit.fi/routing-data/v3/waltti-alt/Salo-gtfs.zip) | To be included
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These to be included things can be replaced with the matching routing endpoint for the routing data endpoint on the same row, so for instance https://api.digitransit.fi/routing/v2/routers/waltti-alt/index/graphql on this row. They were to be included because there wasn't otp1 end point for these but for otp2 there is.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These end points (apart from the hsl-ticket-sales-map) have replacements with new URL structures + some more new endpoints. You can check what is available from https://github.com/HSLdevcom/OpenTripPlanner-data-container/blob/v3/hsl/router-config.json#L159-L240 in combination of how our UI uses these tile layers. Unfortunately, we can't cache things based on certain headers in our CDN we we also have different endpoints for different languages. The endpoints are described on some level in https://github.com/HSLdevcom/digitransit-proxy/blob/master/common.conf#L61 but it doesn't include the different layers, such as rentalStations, as it uses the same "location" for all of them.

Copy link
Member

@optionsome optionsome left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Under routing-api, there is a preview page. I think it can be removed. I think we should instead specify in the index of the routing-api that use of deprecated queries/parameters/fields should be avoided as it's not guaranteed they will return sensible information forever or they might be in a really experimental state.

I think maybe the fuzzyTrip section of the routes page should be moved to be inside high frequency positioning page as it's really specific to HSL's realtime.

In the stops page inside the routing api, there is an example of fetching routes that visit a stop. It's now possible to query the routes directly from stop type so the patterns stuff can be removed from the query example.

@@ -41,7 +41,7 @@ To run OpenTripPlanner with Docker, use command:
```
docker run --rm --name otp-hsl -p 9080:8080 -e ROUTER_NAME=hsl -e JAVA_OPTS=-Xmx5g -e ROUTER_DATA_CONTAINER_URL=https://api.digitransit.fi/routing-data/v2/hsl hsldevcom/opentripplanner:prod
```
After OpenTripPlanner has built the routing graph, the API can be accessed from `http://localhost:9080/otp/routers/hsl/index/graphql`
After OpenTripPlanner has built the routing graph, the API can be accessed from `http://localhost:9080/otp/routing/v2/hsl/gtfs/v1`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OTP's internal path is just /otp/gtfs/v1. This chapter needs to be updated due to the recent otp data refactoring but I can do that in a separate pr, so just update this path in this pr.

@@ -13,9 +13,11 @@ order: 20

### There are a few options for using GraphiQL:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The images in this file seem a bit outdated. You can take some new screenshots and replace the old ones and check if the instructions still follow the new look.

Comment on lines 23 to 24
Some vehicles might have real-time occupancy information available. This information can be accessed through `Trip` types `occupancy` field.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

type's


#### Plan an itinerary with boarding transit with your personal bike

* Note that **directOnly** must used to avoid itineraries using public transport
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

must be

### Contents of the endpoints

There both individual files and some of the files are zipped into collections that can be used
to either build the graph for OpenTripPlanner or to run it as a server.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix this sentence, makes no sense.


## OpenTripPlanner data and configuration files

We provide a data container for each router (finland, hsl, varely, waltti and waltti-alt). The currently
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

data service ?

product {
id
name
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add into product the complex part:
... on DefaultFareProduct {
price {
amount
}

@vesameskanen vesameskanen merged commit 82a5800 into master Nov 11, 2024
1 check passed
@vesameskanen vesameskanen deleted the DT-6111 branch November 11, 2024 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants