Merge pull request #360 from HSLdevcom/DT-4113

DT-4113 OTP cancel certain departures in Oulu
HSLdevcom · Jun 14, 2021 · 8cef2dc · 8cef2dc
2 parents 9fa30a0 + 1886299
commit 8cef2dc
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/src/main/java/org/opentripplanner/routing/edgetype/Timetable.java b/src/main/java/org/opentripplanner/routing/edgetype/Timetable.java
@@ -615,14 +615,10 @@ public TripTimes createUpdatedTripTimes(TripUpdate tripUpdate, TimeZone timeZone
                                 LOG.error("Arrival time at index {} is erroneous.", i);
                                 return null;
                             }
-                        } else {
-                            if (delay == null) {
-                                newTimes.cancelArrivalTime(i);
-                            } else {
-                                newTimes.updateArrivalDelay(i, delay);
-                                if (newTimes.isCanceledArrival(i)) {
-                                    newTimes.unCancelArrivalTime(i);
-                                }
+                        } else if (delay != null) {
+                            newTimes.updateArrivalDelay(i, delay);
+                            if (newTimes.isCanceledArrival(i)) {
+                                newTimes.unCancelArrivalTime(i);
                             }
                         }
 
@@ -645,14 +641,10 @@ public TripTimes createUpdatedTripTimes(TripUpdate tripUpdate, TimeZone timeZone
                                 LOG.error("Departure time at index {} is erroneous.", i);
                                 return null;
                             }
-                        } else {
-                            if (delay == null) {
-                                newTimes.cancelDepartureTime(i);
-                            } else {
-                                newTimes.updateDepartureDelay(i, delay);
-                                if (newTimes.isCanceledDeparture(i)) {
-                                    newTimes.unCancelDepartureTime(i);
-                                }
+                        } else if (delay != null) {
+                            newTimes.updateDepartureDelay(i, delay);
+                            if (newTimes.isCanceledDeparture(i)) {
+                                newTimes.unCancelDepartureTime(i);
                             }
                         }
                     }