Skip to content

Commit

Permalink
filter out of system transfer MTA-69
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbsalvatore
mbsalvatore committed Jan 8, 2024
1 parent 4bcc069 commit 166d366
Showing 1 changed file with 63 additions and 17 deletions.
80 changes: 63 additions & 17 deletions src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package org.opentripplanner.routing.algorithm;

import java.time.Instant;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.*;
import javax.annotation.Nullable;
import org.opentripplanner.ext.flex.FlexAccessEgress;
import org.opentripplanner.model.Stop;
import org.opentripplanner.model.TransitMode;
import org.opentripplanner.model.plan.Itinerary;
import org.opentripplanner.routing.algorithm.filterchain.ItineraryFilter;
import org.opentripplanner.routing.algorithm.mapping.RaptorPathToItineraryMapper;
Expand All @@ -26,6 +24,7 @@
import org.opentripplanner.routing.algorithm.raptor.transit.mappers.RaptorRequestMapper;
import org.opentripplanner.routing.algorithm.raptor.transit.request.RaptorRoutingRequestTransitData;
import org.opentripplanner.routing.algorithm.raptor.transit.request.RoutingRequestTransitDataProviderFilter;
import org.opentripplanner.routing.algorithm.raptor.transit.request.TransferWithDuration;
import org.opentripplanner.routing.algorithm.raptor.transit.request.TransitDataProviderFilter;
import org.opentripplanner.routing.algorithm.transferoptimization.configure.TransferOptimizationServiceConfigurator;
import org.opentripplanner.routing.api.request.RoutingRequest;
Expand All @@ -35,16 +34,21 @@
import org.opentripplanner.routing.api.response.RoutingErrorCode;
import org.opentripplanner.routing.api.response.RoutingResponse;
import org.opentripplanner.routing.api.response.TripSearchMetadata;
import org.opentripplanner.routing.core.State;
import org.opentripplanner.routing.edgetype.StreetTransitEntranceLink;
import org.opentripplanner.routing.error.RoutingValidationException;
import org.opentripplanner.routing.framework.DebugTimingAggregator;
import org.opentripplanner.routing.graph.Edge;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.routing.graph.GraphIndex;
import org.opentripplanner.routing.graph.Vertex;
import org.opentripplanner.routing.graphfinder.NearbyStop;
import org.opentripplanner.routing.services.FareService;
import org.opentripplanner.routing.vertextype.TransitStopVertex;
import org.opentripplanner.standalone.server.Router;
import org.opentripplanner.transit.raptor.RaptorService;
import org.opentripplanner.transit.raptor.api.path.Path;
import org.opentripplanner.transit.raptor.api.path.PathLeg;
import org.opentripplanner.transit.raptor.api.request.RaptorRequest;
import org.opentripplanner.transit.raptor.api.response.RaptorResponse;
import org.opentripplanner.transit.raptor.rangeraptor.configure.RaptorConfig;
Expand Down Expand Up @@ -252,20 +256,22 @@ private Collection<Itinerary> routeTransit(Router router) {
// TODO
for (Path<TripSchedule> path : paths) {
// Convert the Raptor/Astar paths to OTP API Itineraries
Itinerary itinerary = null;
try {
itinerary = itineraryMapper.createItinerary(path);
} catch(Exception e) {
e.printStackTrace();
}

// Decorate the Itineraries with fare information.
// Itinerary and Leg are API model classes, lacking internal object references needed for effective
// fare calculation. We derive the fares from the internal Path objects and add them to the itinerary.
if (fareService != null) {
itinerary.fare = fareService.getCost(path, transitLayer);
Itinerary itinerary = null;
if (subwayHasNoOutOfSystemTransfer(path)) {
try {
itinerary = itineraryMapper.createItinerary(path);
} catch (Exception e) {
e.printStackTrace();
}

// Decorate the Itineraries with fare information.
// Itinerary and Leg are API model classes, lacking internal object references needed for effective
// fare calculation. We derive the fares from the internal Path objects and add them to the itinerary.
if (fareService != null) {
itinerary.fare = fareService.getCost(path, transitLayer);
}
itineraries.add(itinerary);
}
itineraries.add(itinerary);
}

checkIfTransitConnectionExists(transitResponse);
Expand All @@ -284,6 +290,46 @@ private Collection<Itinerary> routeTransit(Router router) {
return itineraries;
}

private boolean subwayHasNoOutOfSystemTransfer(Path<TripSchedule> path) {

boolean enteredSubway = false;
boolean exitedSubway = false;

if (path.accessLeg().access() instanceof AccessEgress) {
AccessEgress ae = ((AccessEgress)path.accessLeg().access());
State s = ae.getLastState();
if (s.getVertex() instanceof TransitStopVertex) {
TransitStopVertex tsv = (TransitStopVertex) s.getVertex();
if (tsv.getModes().contains(TransitMode.SUBWAY)) {
enteredSubway = true;
}
}
}

PathLeg<TripSchedule> leg = path.accessLeg();

while (!leg.nextLeg().isEgressLeg()) {
leg = leg.nextLeg();
if (leg.isTransitLeg()) {
if (leg.asTransitLeg().trip().getOriginalTripPattern().getMode() == TransitMode.SUBWAY) {
enteredSubway = true;
}
}
if (leg.isTransferLeg()) {
List<Edge> edges = ((TransferWithDuration) leg.asTransferLeg().transfer()).transfer().getEdges();
for (Edge e : edges) {
if (e instanceof StreetTransitEntranceLink && enteredSubway) {
if (exitedSubway)
//CANNOT RE-ENTER SUBWAY!
return false;
exitedSubway = true;
}
}
}
}
return true;
}

private RaptorRoutingRequestTransitData createRequestTransitDataProvider(
TransitLayer transitLayer,
Graph graph
Expand Down

0 comments on commit 166d366

Please sign in to comment.