Skipped stops should always have PickDrop = CANCELLED

regardless of the original PickDrop specified in the MFDZ extension
Jnction · Aug 31, 2024 · 837cd56 · 837cd56
1 parent 495d0c0
commit 837cd56
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/src/main/java/org/opentripplanner/updater/trip/AddedStopTime.java b/src/main/java/org/opentripplanner/updater/trip/AddedStopTime.java
@@ -35,19 +35,22 @@ PickDrop dropOff() {
   }
 
   static AddedStopTime ofStopTime(GtfsRealtime.TripUpdate.StopTimeUpdate props) {
-    if (props.getStopTimeProperties().hasExtension(MfdzRealtimeExtensions.stopTimeProperties)) {
+    final var scheduleRelationship = props.getScheduleRelationship();
+    var pickupType = toPickDrop(scheduleRelationship);
+    var dropOffType = pickupType;
+    if (
+      scheduleRelationship != GtfsRealtime.TripUpdate.StopTimeUpdate.ScheduleRelationship.SKIPPED &&
+      props.getStopTimeProperties().hasExtension(MfdzRealtimeExtensions.stopTimeProperties)
+    ) {
       var ext = props
         .getStopTimeProperties()
         .getExtension(MfdzRealtimeExtensions.stopTimeProperties);
       var pickup = ext.getPickupType();
       var dropOff = ext.getDropoffType();
-      var dropOffType = PickDropMapper.map(dropOff.getNumber());
-      var pickupType = PickDropMapper.map(pickup.getNumber());
-      return new AddedStopTime(pickupType, dropOffType);
-    } else {
-      var pickDrop = toPickDrop(props.getScheduleRelationship());
-      return new AddedStopTime(pickDrop, pickDrop);
+      dropOffType = PickDropMapper.map(dropOff.getNumber());
+      pickupType = PickDropMapper.map(pickup.getNumber());
     }
+    return new AddedStopTime(pickupType, dropOffType);
   }
 
   private static PickDrop toPickDrop(