If configured, add subway station entrances from OSM to walk steps #6076
+622
−172
Use existing entrance class for walk steps
commit e10e0a2fae17e16cfebb1e888652a531e7fef493
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -21,5 +21,6 @@ public enum ApiRelativeDirection { | ||
| UTURN_RIGHT, | ||
| ENTER_STATION, | ||
| EXIT_STATION, | ||
| ENTER_OR_EXIT_STATION, | ||
| FOLLOW_SIGNS, | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package org.opentripplanner.apis.gtfs.datafetchers; | ||
|
|
||
| import graphql.schema.DataFetcher; | ||
| import graphql.schema.DataFetchingEnvironment; | ||
| import org.opentripplanner.apis.gtfs.GraphQLUtils; | ||
| import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; | ||
| import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; | ||
| import org.opentripplanner.transit.model.site.Entrance; | ||
|
|
||
| public class EntranceImpl implements GraphQLDataFetchers.GraphQLEntrance { | ||
|
|
||
| @Override | ||
| public DataFetcher<String> code() { | ||
| return environment -> { | ||
| Entrance entrance = getEntrance(environment); | ||
| return entrance != null && entrance.getCode() != null ? entrance.getCode() : null; | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public DataFetcher<String> gtfsId() { | ||
| return environment -> { | ||
| Entrance entrance = getEntrance(environment); | ||
| return entrance != null && entrance.getId() != null ? entrance.getId().toString() : null; | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public DataFetcher<String> name() { | ||
| return environment -> { | ||
| Entrance entrance = getEntrance(environment); | ||
| return entrance != null && entrance.getName() != null ? entrance.getName().toString() : null; | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public DataFetcher<GraphQLTypes.GraphQLWheelchairBoarding> wheelchairAccessible() { | ||
| return environment -> { | ||
| Entrance entrance = getEntrance(environment); | ||
| return entrance != null | ||
| ? GraphQLUtils.toGraphQL(entrance.getWheelchairAccessibility()) | ||
| : null; | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Helper method to retrieve the Entrance object from the DataFetchingEnvironment. | ||
| */ | ||
| private Entrance getEntrance(DataFetchingEnvironment environment) { | ||
| Object source = environment.getSource(); | ||
| return source instanceof Entrance ? (Entrance) source : null; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -8,9 +8,9 @@ | ||
| import org.opentripplanner.framework.i18n.I18NString; | ||
| import org.opentripplanner.framework.lang.DoubleUtils; | ||
| import org.opentripplanner.framework.tostring.ToStringBuilder; | ||
| import org.opentripplanner.street.model.edge.Edge; | ||
| import org.opentripplanner.street.model.note.StreetNote; | ||
| import org.opentripplanner.transit.model.site.Entrance; | ||
|
|
||
| /** | ||
| * Represents one instruction in walking directions. Three examples from New York City: | ||
| @@ -45,7 +45,7 @@ public final class WalkStep { | ||
| private final boolean walkingBike; | ||
|
|
||
| private final String exit; | ||
| private final Entrance entrance; | ||
| private final ElevationProfile elevationProfile; | ||
| private final boolean stayOn; | ||
|
|
||
| @@ -58,7 +58,7 @@ public final class WalkStep { | ||
| I18NString directionText, | ||
| Set<StreetNote> streetNotes, | ||
| String exit, | ||
| Entrance entrance, | ||
| ElevationProfile elevationProfile, | ||
| boolean bogusName, | ||
| boolean walkingBike, | ||
| @@ -79,7 +79,7 @@ public final class WalkStep { | ||
| this.walkingBike = walkingBike; | ||
| this.area = area; | ||
| this.exit = exit; | ||
| this.entrance = entrance; | ||
| this.elevationProfile = elevationProfile; | ||
| this.stayOn = stayOn; | ||
| this.edges = List.copyOf(Objects.requireNonNull(edges)); | ||
| @@ -135,10 +135,10 @@ public String getExit() { | ||
| } | ||
|
|
||
| /** | ||
| * Get information about building entrance or exit. | ||
| */ | ||
| public Entrance getEntrance() { | ||
| return entrance; | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. I would like to se a diagram with boxes - forget about the class design for a moment and just draw the things we want to add in the future (next 1- 2 years). Then we can discuss how to group them and map the relationship. Return an There was a problem hiding this comment. I drew some sort of a process diagram with boxes together with @HenrikSundell.
There was a problem hiding this comment. I think this method should probably still return StepEntity instead of Object but I think the step impl must return an Object for the entity which is then handled by StepEntityTypeResolver. It's possible that instead of doing the instanceof checks that are currently done to return correct schema types, we could cast the object to a StepEntity and then check if entrance field is non-null, or escalator field is non-null etc., but I'm not sure how much cleaner that solution is. There was a problem hiding this comment. I just quickly tested and seems like it's possible to define a class that is used for an union from GraphQL (through codegen configuration). So with this current setup where the different entity types would have a shared base class, you could use that for the union. However, if they don't, then you need to return an Object from the |
||
| /** | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we should say "subway stations's entrance" instead of building here. Also since there is already
getExithere, maybe rename this and the highway exit rename methods so it's really clear that one is for highways, and the other is for stations.