forked from opentripplanner/OpenTripPlanner
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #177 from ibi-group/upstream-merge-2023-07-19
Upstream merge 2023-07-19
- Loading branch information
Showing
35 changed files
with
344 additions
and
166 deletions.
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
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
88 changes: 88 additions & 0 deletions
88
src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java
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,88 @@ | ||
| package org.opentripplanner.ext.flex; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.junit.jupiter.api.DynamicTest.dynamicTest; | ||
| import static org.opentripplanner._support.geometry.Coordinates.BERLIN; | ||
| import static org.opentripplanner._support.geometry.Coordinates.HAMBURG; | ||
| import static org.opentripplanner.street.model.StreetTraversalPermission.ALL; | ||
| import static org.opentripplanner.street.model.StreetTraversalPermission.BICYCLE_AND_CAR; | ||
| import static org.opentripplanner.street.model.StreetTraversalPermission.CAR; | ||
| import static org.opentripplanner.street.model.StreetTraversalPermission.PEDESTRIAN; | ||
| import static org.opentripplanner.street.model.StreetTraversalPermission.PEDESTRIAN_AND_CAR; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Set; | ||
| import java.util.stream.Stream; | ||
| import org.junit.jupiter.api.DynamicTest; | ||
| import org.junit.jupiter.api.TestFactory; | ||
| import org.locationtech.jts.geom.Coordinate; | ||
| import org.opentripplanner._support.geometry.Polygons; | ||
| import org.opentripplanner.routing.graph.Graph; | ||
| import org.opentripplanner.street.model.StreetTraversalPermission; | ||
| import org.opentripplanner.street.model._data.StreetModelForTest; | ||
| import org.opentripplanner.transit.model._data.TransitModelForTest; | ||
| import org.opentripplanner.transit.model.framework.Deduplicator; | ||
| import org.opentripplanner.transit.model.site.AreaStop; | ||
| import org.opentripplanner.transit.service.StopModel; | ||
| import org.opentripplanner.transit.service.TransitModel; | ||
|
|
||
| class AreaStopsToVerticesMapperTest { | ||
|
|
||
| private static final AreaStop BERLIN_AREA_STOP = TransitModelForTest.areaStopForTest( | ||
| "berlin", | ||
| Polygons.BERLIN | ||
| ); | ||
| public static final StopModel STOP_MODEL = StopModel | ||
| .of() | ||
| .withAreaStop(AreaStopsToVerticesMapperTest.BERLIN_AREA_STOP) | ||
| .build(); | ||
|
|
||
| public static final TransitModel TRANSIT_MODEL = new TransitModel(STOP_MODEL, new Deduplicator()); | ||
|
|
||
| private final List<TestCase> testCases = List.of( | ||
| new TestCase(BERLIN, ALL, Set.of(BERLIN_AREA_STOP)), | ||
| new TestCase(BERLIN, PEDESTRIAN_AND_CAR, Set.of(BERLIN_AREA_STOP)), | ||
| new TestCase(BERLIN, BICYCLE_AND_CAR, Set.of()), | ||
| new TestCase(HAMBURG, ALL, Set.of()), | ||
| new TestCase(BERLIN, PEDESTRIAN, Set.of()), | ||
| new TestCase(HAMBURG, PEDESTRIAN, Set.of()), | ||
| new TestCase(BERLIN, CAR, Set.of()) | ||
| ); | ||
|
|
||
| @TestFactory | ||
| Stream<DynamicTest> mapAreaStopsInVertex() { | ||
| return testCases | ||
| .stream() | ||
| .map(tc -> | ||
| dynamicTest( | ||
| tc.toString(), | ||
| () -> { | ||
| var graph = new Graph(); | ||
|
|
||
| var fromVertex = StreetModelForTest.intersectionVertex(tc.coordinate); | ||
| var toVertex = StreetModelForTest.intersectionVertex(tc.coordinate); | ||
|
|
||
| var edge = StreetModelForTest.streetEdge(fromVertex, toVertex); | ||
| edge.setPermission(tc.permission); | ||
| fromVertex.addOutgoing(edge); | ||
|
|
||
| graph.addVertex(fromVertex); | ||
| assertTrue(fromVertex.areaStops().isEmpty()); | ||
|
|
||
| var mapper = new AreaStopsToVerticesMapper(graph, TRANSIT_MODEL); | ||
|
|
||
| mapper.buildGraph(); | ||
|
|
||
| assertEquals(tc.expectedAreaStops, fromVertex.areaStops()); | ||
| } | ||
| ) | ||
| ); | ||
| } | ||
|
|
||
| private record TestCase( | ||
| Coordinate coordinate, | ||
| StreetTraversalPermission permission, | ||
| Set<AreaStop> expectedAreaStops | ||
| ) {} | ||
| } |
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
103 changes: 103 additions & 0 deletions
103
src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java
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,103 @@ | ||
| package org.opentripplanner.ext.flex; | ||
|
|
||
| import com.google.common.collect.ImmutableListMultimap; | ||
| import com.google.common.collect.ImmutableMultimap; | ||
| import jakarta.inject.Inject; | ||
| import java.util.stream.Stream; | ||
| import javax.annotation.Nonnull; | ||
| import org.locationtech.jts.geom.Point; | ||
| import org.opentripplanner.framework.geometry.GeometryUtils; | ||
| import org.opentripplanner.framework.logging.ProgressTracker; | ||
| import org.opentripplanner.graph_builder.model.GraphBuilderModule; | ||
| import org.opentripplanner.routing.graph.Graph; | ||
| import org.opentripplanner.routing.graph.index.StreetIndex; | ||
| import org.opentripplanner.street.model.vertex.StreetVertex; | ||
| import org.opentripplanner.transit.model.site.AreaStop; | ||
| import org.opentripplanner.transit.service.TransitModel; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * Iterates over all area stops in the stop model and adds them to vertices that are suitable for | ||
| * boarding flex trips. | ||
| */ | ||
| public class AreaStopsToVerticesMapper implements GraphBuilderModule { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(AreaStopsToVerticesMapper.class); | ||
|
|
||
| private final Graph graph; | ||
| private final TransitModel transitModel; | ||
|
|
||
| @Inject | ||
| public AreaStopsToVerticesMapper(Graph graph, TransitModel transitModel) { | ||
| this.graph = graph; | ||
| this.transitModel = transitModel; | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("Convert2MethodRef") | ||
| public void buildGraph() { | ||
| if (!transitModel.getStopModel().hasAreaStops()) { | ||
| return; | ||
| } | ||
|
|
||
| StreetIndex streetIndex = graph.getStreetIndexSafe(transitModel.getStopModel()); | ||
|
|
||
| ProgressTracker progress = ProgressTracker.track( | ||
| "Add flex locations to street vertices", | ||
| 1, | ||
| transitModel.getStopModel().listAreaStops().size() | ||
| ); | ||
|
|
||
| LOG.info(progress.startMessage()); | ||
| var results = transitModel | ||
| .getStopModel() | ||
| .listAreaStops() | ||
| .parallelStream() | ||
| .flatMap(areaStop -> { | ||
| var matchedVertices = matchingVerticesForStop(streetIndex, areaStop); | ||
| // Keep lambda! A method-ref would cause incorrect class and line number to be logged | ||
| progress.step(m -> LOG.info(m)); | ||
| return matchedVertices; | ||
| }); | ||
|
|
||
| ImmutableMultimap<StreetVertex, AreaStop> mappedResults = results.collect( | ||
| ImmutableListMultimap.<MatchResult, StreetVertex, AreaStop>flatteningToImmutableListMultimap( | ||
| MatchResult::vertex, | ||
| mr -> Stream.of(mr.stop()) | ||
| ) | ||
| ); | ||
|
|
||
| mappedResults | ||
| .keySet() | ||
| .forEach(vertex -> { | ||
| vertex.addAreaStops(mappedResults.get(vertex)); | ||
| }); | ||
|
|
||
| LOG.info(progress.completeMessage()); | ||
| } | ||
|
|
||
| @Nonnull | ||
| private static Stream<MatchResult> matchingVerticesForStop( | ||
| StreetIndex streetIndex, | ||
| AreaStop areaStop | ||
| ) { | ||
| return streetIndex | ||
| .getVerticesForEnvelope(areaStop.getGeometry().getEnvelopeInternal()) | ||
| .stream() | ||
| .filter(StreetVertex.class::isInstance) | ||
| .map(StreetVertex.class::cast) | ||
| .filter(StreetVertex::isEligibleForCarPickupDropoff) | ||
| .filter(vertx -> { | ||
| // The street index overselects, so need to check for exact geometry inclusion | ||
| Point p = GeometryUtils.getGeometryFactory().createPoint(vertx.getCoordinate()); | ||
| return areaStop.getGeometry().intersects(p); | ||
| }) | ||
| .map(vertx -> new MatchResult(vertx, areaStop)); | ||
| } | ||
|
|
||
| /** | ||
| * The result of an area stop being matched with a vertex. | ||
| */ | ||
| private record MatchResult(StreetVertex vertex, AreaStop stop) {} | ||
| } |
82 changes: 0 additions & 82 deletions
82
src/ext/java/org/opentripplanner/ext/flex/FlexLocationsToStreetEdgesMapper.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.