Not allowed transfers and support for GTFS transfer points

pom.xml

@@ -22,7 +22,7 @@
     </scm>
 
     <properties>
-        <otp.serialization.version.id>15</otp.serialization.version.id>
+        <otp.serialization.version.id>16</otp.serialization.version.id>
         <!-- Lib versions - keep list sorted on property name -->
         <geotools.version>25.2</geotools.version>
         <jackson.version>2.12.5</jackson.version>

src/ext-test/java/org/opentripplanner/ext/flex/ScheduledDeviatedTripTest.java

@@ -203,7 +203,7 @@ public void shouldNotInterpolateFlexTimes() {
         var feedId = graph.getFeedIds().iterator().next();
         var pattern = graph.tripPatternForId.get(new FeedScopedId(feedId, "090z:0:01"));
 
-        assertEquals(3, pattern.getStops().size());
+        assertEquals(3, pattern.numberOfStops());
 
         var tripTimes = pattern.getScheduledTimetable().getTripTimes(0);
         var arrivalTime = tripTimes.getArrivalTime(1);

src/ext-test/java/org/opentripplanner/ext/flex/UnscheduledTripTest.java

@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
-import java.net.URISyntaxException;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;

src/ext/java/org/opentripplanner/ext/reportapi/model/CsvReportBuilder.java

@@ -6,7 +6,7 @@
 /**
  * A very simple CSV builder to create CSV reports.
  * <p>
- * This class helps formatting common types like time, duration and enums.
+ * This class helps to format common types like time, duration and enums.
  */
 class CsvReportBuilder {
     private final String sep;
@@ -51,12 +51,12 @@ void addText(String text) {
     }
 
     void addNumber(Number num) {
-        buf.append(num.toString());
+        buf.append(num == null ? "" : num.toString());
         sep();
     }
 
     void addBoolean(Boolean b) {
-        buf.append(b.toString());
+        buf.append(b == null ? "" : b.toString());
         sep();
     }
 

src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java

@@ -4,22 +4,31 @@
 import static org.opentripplanner.util.time.DurationUtils.durationToStr;
 
 import java.util.List;
-import org.locationtech.jts.geom.Coordinate;
 import org.opentripplanner.common.geometry.SphericalDistanceLibrary;
-import org.opentripplanner.model.Stop;
+import org.opentripplanner.model.Station;
+import org.opentripplanner.model.StopLocation;
+import org.opentripplanner.model.Trip;
+import org.opentripplanner.model.TripPattern;
+import org.opentripplanner.model.WgsCoordinate;
 import org.opentripplanner.model.transfer.ConstrainedTransfer;
+import org.opentripplanner.model.transfer.RouteStationTransferPoint;
+import org.opentripplanner.model.transfer.RouteStopTransferPoint;
+import org.opentripplanner.model.transfer.StationTransferPoint;
 import org.opentripplanner.model.transfer.StopTransferPoint;
 import org.opentripplanner.model.transfer.TransferPoint;
+import org.opentripplanner.model.transfer.TripTransferPoint;
 import org.opentripplanner.routing.graph.GraphIndex;
 
 
 /**
  * This class is used to export transfers for human verification to a CSV file. This is useful
  * when trying to debug the rather complicated NeTEx data format or to get the GTFS transfers in a
- * more human readable form. It can also be used to test transfer functionality, since it is easy
+ * more human-readable form. It can also be used to test transfer functionality, since it is easy
  * to read and find special test-cases when needed.
  */
 public class TransfersReport {
+    private static final boolean BOARD = true;
+    private static final boolean ALIGHT = false;
     private static final int NOT_SET = -1;
 
 
@@ -41,32 +50,42 @@ public static String export(List<ConstrainedTransfer> transfers, GraphIndex inde
 
     String export() {
         buf.addHeader(
-                "Id", "Operator", "FromTripId", "FromTrip", "FromStop",
-                "ToTripId", "ToTrip", "ToStop", "ArrivalTime", "DepartureTime", "TransferTime",
-                "Walk", "Priority", "MaxWaitTime", "StaySeated", "Guaranteed"
+                "Id", "Operator", "From", "FromId", "FromRoute", "FromTrip", "FromStop",
+                "FromSpecificity", "To", "ToId", "ToRoute", "ToTrip", "ToStop", "ToSpecificity",
+                "ArrivalTime", "DepartureTime", "TransferTime", "Walk", "Priority", "MaxWaitTime",
+                "StaySeated", "Guaranteed"
         );
 
         transfers.forEach(t -> {
-            var from = pointInfo(t.getFrom(), true);
-            var to = pointInfo(t.getTo(), false);
-            var dist = (from.c == null || to.c == null)
+            var from = pointInfo(t.getFrom(), ALIGHT);
+            var to = pointInfo(t.getTo(), BOARD);
+            var dist = (from.coordinate == null || to.coordinate == null)
                     ? ""
                     : String.format(
                             "%.0fm",
-                            SphericalDistanceLibrary.fastDistance(from.c, to.c)
+                            SphericalDistanceLibrary.fastDistance(
+                                    from.coordinate.asJtsCoordinate(),
+                                    to.coordinate.asJtsCoordinate()
+                            )
                     );
             var duration = (from.time == NOT_SET || to.time == NOT_SET)
                     ? "" : durationToStr(to.time - from.time);
             var c = t.getTransferConstraint();
 
             buf.addText(t.getId() == null ? "" : t.getId().getId());
-            buf.addText(t.getFrom().getTrip().getOperator().getId().getId());
-            buf.addText(from.tripId);
+            buf.addText((from.operator.isEmpty() ? to : from).operator);
+            buf.addText(from.type);
+            buf.addText(from.entityId);
+            buf.addText(from.route);
             buf.addText(from.trip);
-            buf.addText(from.loc);
-            buf.addText(to.tripId);
+            buf.addText(from.location());
+            buf.addNumber(from.specificity);
+            buf.addText(to.type);
+            buf.addText(to.entityId);
+            buf.addText(to.route);
             buf.addText(to.trip);
-            buf.addText(to.loc);
+            buf.addText(to.location());
+            buf.addNumber(to.specificity);
             buf.addTime(from.time, NOT_SET);
             buf.addTime(to.time, NOT_SET);
             buf.addText(duration);
@@ -80,47 +99,106 @@ String export() {
         return buf.toString();
     }
 
-    private TxPoint pointInfo(
-            TransferPoint p,
-            boolean arrival
-    ) {
+    private TxPoint pointInfo(TransferPoint p, boolean boarding) {
         var r = new TxPoint();
-        if (p instanceof StopTransferPoint) {
-            r.loc = p.getStop().getName();
-            return r;
-        }
-        var ptn = index.getPatternForTrip().get(p.getTrip());
-        var trip = p.getTrip();
-        var route = trip.getRoute();
-
-        r.tripId = trip.getId().getId();
-        r.trip = route.getName() + " " + route.getMode() + " " + route.getLongName()
-                + " " + trip.getTripHeadsign();
-        r.c = null;
 
+        if(p instanceof TripTransferPoint) {
+            var tp = (TripTransferPoint)p;
+            var trip = tp.getTrip();
+            var route = trip.getRoute();
+            var ptn = index.getPatternForTrip().get(trip);
+            r.operator = trip.getOperator().getId().getId();
+            r.type = "Trip";
+            r.entityId = trip.getId().getId();
+            r.route = route.getName() + " " + route.getMode() + " " + route.getLongName();
+            r.trip = trip.getTripHeadsign();
+            var stop = ptn.getStop(tp.getStopPositionInPattern());
+            addLocation(r, ptn, stop, trip, boarding);
+        }
+        else if(p instanceof RouteStopTransferPoint) {
+            var rp = (RouteStopTransferPoint)p;
+            var route = rp.getRoute();
+            var ptn = index.getPatternsForRoute().get(route).stream().findFirst().orElse(null);
+            r.operator = route.getOperator().getId().getId();
+            r.type = "Route";
+            r.entityId = route.getId().getId();
+            r.route = route.getName() + " " + route.getMode() + " " + route.getLongName();
+            addLocation(r, ptn, rp.getStop(), null, boarding);
+        }
+        else if(p instanceof RouteStationTransferPoint) {
+            var rp = (RouteStationTransferPoint)p;
+            var route = rp.getRoute();
+            r.operator = route.getOperator().getId().getId();
+            r.type = "Route";
+            r.entityId = route.getId().getId();
+            r.route = route.getName() + " " + route.getMode() + " " + route.getLongName();
+            r.loc += rp.getStation().getName();
+            r.coordinate = rp.getStation().getCoordinate();
+        }
+        else if(p instanceof StopTransferPoint) {
+            var sp = (StopTransferPoint)p;
+            StopLocation stop = sp.getStop();
+            r.type = "Stop";
+            r.entityId = stop.getId().getId();
+            r.loc = stop.getName();
+            r.coordinate = stop.getCoordinate();
+        }
+        else if(p instanceof StationTransferPoint) {
+            var sp = (StationTransferPoint)p;
+            Station station = sp.getStation();
+            r.type = "Station";
+            r.entityId = station.getId().getId();
+            r.loc = station.getName();
+            r.coordinate = station.getCoordinate();
+        }
 
+        r.specificity = p.getSpecificityRanking();
+        r.coordinate = null;
+        return r;
+    }
 
+    private static void addLocation(
+            TxPoint r,
+            TripPattern pattern,
+            StopLocation stop,
+            Trip trip,
+            boolean boarding
+    ) {
+        if(pattern == null) {
+            r.loc += stop.getName() + " [Pattern no found]";
+            return;
+        }
+        int stopPosition = pattern.findStopPosition(stop);
+        r.coordinate = stop.getCoordinate();
 
-        if (ptn.getStops().size() > p.getStopPosition()) {
-            int pos = p.getStopPosition();
-            var stop = ptn.getStops().get(pos);
-            var tt = ptn.getScheduledTimetable().getTripTimes(trip);
-            r.loc += stop.getName() + " [" + pos + "]" +  " " + stop.getCoordinate();
-            r.time = arrival ? tt.getScheduledArrivalTime(pos) : tt.getScheduledDepartureTime(pos);
-            r.c = stop.getCoordinate().asJtsCoordinate();
+        if(stopPosition<0) {
+            r.loc += "[Stop not found in pattern: " + stop.getName() + "]";
+            return;
         }
-        else {
-            r.loc += "[Stop index not found: " + p.getStopPosition() + "]";
+        r.loc += stop.getName() + " [" + stopPosition + "]";
+
+        if(trip != null) {
+            var tt = pattern.getScheduledTimetable().getTripTimes(trip);
+            r.time = boarding
+                    ? tt.getScheduledDepartureTime(stopPosition)
+                    : tt.getScheduledArrivalTime(stopPosition)
+            ;
         }
-        r.loc += " " + p.getSpecificityRanking();
-        return r;
     }
 
     static class TxPoint {
+        private String operator = "";
+        private String type = "";
+        private String entityId = "";
         private String loc = "";
-        private String tripId = "";
         private String trip = "";
-        private Coordinate c = null;
+        private String route = "";
+        private Integer specificity = null;
+        private WgsCoordinate coordinate = null;
         private int time = NOT_SET;
+
+        String location() {
+            return coordinate == null ? loc : loc + " " + coordinate;
+        }
     }
 }

src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java

@@ -1,12 +1,12 @@
 package org.opentripplanner.ext.siri;
 
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.ArrayList;
 import org.opentripplanner.model.FeedScopedId;
 import org.opentripplanner.model.Route;
 import org.opentripplanner.model.Station;
@@ -234,7 +234,7 @@ private static void initCache(RoutingService index) {
                         }
                     }
                 }
-                String lastStopId = tripPattern.getStops().get(tripPattern.getStops().size()-1).getId().getId();
+                String lastStopId = tripPattern.lastStop().getId().getId();
 
                 TripTimes tripTimes = tripPattern.getScheduledTimetable().getTripTimes(trip);
                 if (tripTimes != null) {
@@ -385,7 +385,7 @@ public int getTripArrivalTime(FeedScopedId tripId) {
      * Returns a match of tripIds that match the provided values.
      */
     public List<FeedScopedId> getTripIdForInternalPlanningCodeServiceDateAndMode(
-            String internalPlanningCode, 
+            String internalPlanningCode,
             ServiceDate serviceDate,
             TransitMode mode,
             String transportSubmode

src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java

@@ -1,6 +1,21 @@
 package org.opentripplanner.ext.siri;
 
+import static org.opentripplanner.ext.siri.TimetableHelper.createModifiedStopTimes;
+import static org.opentripplanner.ext.siri.TimetableHelper.createModifiedStops;
+import static org.opentripplanner.ext.siri.TimetableHelper.createUpdatedTripTimes;
+import static org.opentripplanner.model.PickDrop.NONE;
+import static org.opentripplanner.model.PickDrop.SCHEDULED;
+
 import com.google.common.base.Preconditions;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.concurrent.locks.ReentrantLock;
 import org.opentripplanner.common.model.T2;
 import org.opentripplanner.model.Agency;
 import org.opentripplanner.model.FeedScopedId;
@@ -787,7 +802,7 @@ private boolean handleModifiedTrip(Graph graph, String feedId, EstimatedVehicleJ
         for (TripTimes tripTimes : times) {
             Trip trip = tripTimes.getTrip();
             for (TripPattern pattern : patterns) {
-                if (tripTimes.getNumStops() == pattern.getStopPattern().getStops().length) {
+                if (tripTimes.getNumStops() == pattern.numberOfStops()) {
                     if (!tripTimes.isCanceled()) {
                         /*
                           UPDATED and MODIFIED tripTimes should be handled the same way to always allow latest realtime-update
@@ -1015,7 +1030,7 @@ private Set<TripPattern> getPatternsForTrip(Set<Trip> matches, VehicleActivitySt
             }
 
             var firstStop = tripPattern.getStop(0);
-            var lastStop = tripPattern.getStop(tripPattern.getStops().size() - 1);
+            var lastStop = tripPattern.lastStop();
 
             String siriOriginRef = monitoredVehicleJourney.getOriginRef().getValue();
 
@@ -1130,8 +1145,8 @@ private TripPattern getPatternForTrip(Trip trip, EstimatedVehicleJourney journey
         }
 
 
-        var firstStop = tripPattern.getStop(0);
-        var lastStop = tripPattern.getStop(tripPattern.getStops().size() - 1);
+        var firstStop = tripPattern.firstStop();
+        var lastStop = tripPattern.lastStop();
 
         if (serviceDates.contains(journeyDate)) {
             boolean firstStopIsMatch = firstStop.getId().getId().equals(journeyFirstStopId);
@@ -1256,9 +1271,9 @@ private Set<Trip> getTripForJourney(Set<Trip> trips, EstimatedVehicleJourney jou
 
                 TripPattern pattern = routingService.getPatternForTrip().get(trip);
 
-                if (stopNumber < pattern.getStopPattern().getStops().length) {
+                if (stopNumber < pattern.numberOfStops()) {
                     boolean firstReportedStopIsFound = false;
-                    var stop = pattern.getStopPattern().getStops()[stopNumber - 1];
+                    var stop = pattern.getStop(stopNumber - 1);
                     if (firstStopId.equals(stop.getId().getId())) {
                         firstReportedStopIsFound = true;
                     }