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.

Sign up for GitHub

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

Jump to bottom

Add metadata to public transportation legs. #2708

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Add metadata to public transportation legs. #2708

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b0a944f
Add more metadata to pt leg.
ainar Dec 7, 2022
feb2701
Check route exists in GTFS before extracting infos
ainar Dec 7, 2022
0e40f0d
Merge branch 'graphhopper:master' into pt_metadata
ainar Dec 9, 2022
ae546da
Merge branch 'graphhopper:master' into pt_metadata
ainar Jan 4, 2023
d5cac86
Merge branch 'graphhopper:master' into pt_metadata
ainar Jan 17, 2023
331d1bd
Merge branch 'graphhopper:master' into pt_metadata
ainar Jan 22, 2023
3449a4d
Merge branch 'graphhopper:master' into pt_metadata
ainar Feb 3, 2023
9522daa
Merge branch 'graphhopper:master' into pt_metadata
ainar Feb 11, 2023
d3a58b4
Merge branch 'graphhopper:master' into pt_metadata
ainar Apr 19, 2023
886d33f
Merge branch 'graphhopper:master' into pt_metadata
ainar May 14, 2023
7c65b09
Merge branch 'graphhopper:master' into pt_metadata
ainar Jun 7, 2023
6c4ffa0
Merge branch 'graphhopper:master' into pt_metadata
ainar Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions reader-gtfs/src/main/java/com/graphhopper/gtfs/TripFromLabel.java
View file
Open in desktop
Expand Up @@ -21,6 +21,7 @@
import com.conveyal.gtfs.GTFSFeed;
import com.conveyal.gtfs.model.Stop;
import com.conveyal.gtfs.model.StopTime;
import com.conveyal.gtfs.model.Route;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
Expand Down Expand Up @@ -363,11 +364,28 @@ private List<Trip.Leg> parsePartitionToLegs(List<Label.Transition> path, Graph g
.forEach(stopsFromBoardHopDwellEdges::next);
stopsFromBoardHopDwellEdges.finish();
List<Trip.Stop> stops = stopsFromBoardHopDwellEdges.stops;
GTFSFeed gtfsFeed = gtfsStorage.getGtfsFeeds().get(feedId);

int routeType = -1;
String routeUrl = null;
String routeShortName = "";
String routeLongName = "";
Route route = gtfsFeed.routes.get(tripDescriptor.getRouteId());
if (route != null) {
Copy link
Member

Choose a reason for hiding this comment

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

Can it be null though?

routeType = route.route_type;
routeUrl = route.route_url == null ? "" : route.route_url.toString();
routeShortName = route.route_short_name;
routeLongName = route.route_long_name;
}

result.add(new Trip.PtLeg(
feedId, partition.get(0).edge.getTransfers() == 0,
tripDescriptor.getTripId(),
tripDescriptor.getRouteId(),
routeType,
routeUrl,
routeShortName,
routeLongName,
Optional.ofNullable(gtfsStorage.getGtfsFeeds().get(feedId).trips.get(tripDescriptor.getTripId())).map(t -> t.trip_headsign).orElse("extra"),
stops,
partition.stream().mapToDouble(t -> t.edge.getDistance()).sum(),
Expand Down
10 changes: 9 additions & 1 deletion web-api/src/main/java/com/graphhopper/Trip.java
View file
Open in desktop
Expand Up @@ -102,8 +102,12 @@ public static class PtLeg extends Leg {
public final List<Stop> stops;
public final String trip_id;
public final String route_id;
public final int route_type;
public final String route_url;
public final String route_short_name;
public final String route_long_name;

public PtLeg(String feedId, boolean isInSameVehicleAsPrevious, String tripId, String routeId, String headsign, List<Stop> stops, double distance, long travelTime, Geometry geometry) {
public PtLeg(String feedId, boolean isInSameVehicleAsPrevious, String tripId, String routeId, int routeType, String routeUrl, String routeShortName, String routeLongName, String headsign, List<Stop> stops, double distance, long travelTime, Geometry geometry) {
super("pt", stops.get(0).stop_name, geometry, distance);
this.feed_id = feedId;
this.isInSameVehicleAsPrevious = isInSameVehicleAsPrevious;
Expand All @@ -112,6 +116,10 @@ public PtLeg(String feedId, boolean isInSameVehicleAsPrevious, String tripId, St
this.trip_headsign = headsign;
this.travelTime = travelTime;
this.stops = stops;
this.route_type = routeType;
this.route_url = routeUrl;
this.route_short_name = routeShortName;
this.route_long_name = routeLongName;
}

@Override
Expand Down