Merge pull request #4493 from entur/otp2_flex_patterns

Remove filtering of flex patterns in NeTEX import
opentripplanner · Oct 4, 2022 · ffe9990 · ffe9990
2 parents 3d31c0f + bcf6806
commit ffe9990
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/...java/org/opentripplanner/ext/transmodelapi/model/timetable/TimetabledPassingTimeType.java b/...java/org/opentripplanner/ext/transmodelapi/model/timetable/TimetabledPassingTimeType.java
@@ -10,6 +10,7 @@
 import graphql.schema.GraphQLTypeReference;
 import org.opentripplanner.ext.transmodelapi.support.GqlUtil;
 import org.opentripplanner.model.PickDrop;
+import org.opentripplanner.model.StopTime;
 import org.opentripplanner.model.TripTimeOnDate;
 
 public class TimetabledPassingTimeType {
@@ -44,7 +45,7 @@ public static GraphQLObjectType create(
           .type(gqlUtil.timeScalar)
           .description("Scheduled time of arrival at quay")
           .dataFetcher(environment ->
-            ((TripTimeOnDate) environment.getSource()).getScheduledArrival()
+            missingValueToNull(((TripTimeOnDate) environment.getSource()).getScheduledArrival())
           )
           .build()
       )
@@ -55,7 +56,7 @@ public static GraphQLObjectType create(
           .type(gqlUtil.timeScalar)
           .description("Scheduled time of departure from quay")
           .dataFetcher(environment ->
-            ((TripTimeOnDate) environment.getSource()).getScheduledDeparture()
+            missingValueToNull(((TripTimeOnDate) environment.getSource()).getScheduledDeparture())
           )
           .build()
       )
@@ -145,4 +146,16 @@ public static GraphQLObjectType create(
       )
       .build();
   }
+
+  /**
+   * Generally the missing values are removed during the graph build. However, for flex trips they
+   * are not and have to be converted to null here.
+   */
+  private static Integer missingValueToNull(int value) {
+    if (value == StopTime.MISSING_VALUE) {
+      return null;
+    } else {
+      return value;
+    }
+  }
 }
diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java
@@ -204,17 +204,6 @@ TripPatternMapperResult mapTripPattern(JourneyPattern journeyPattern) {
       return result;
     }
 
-    // TODO OTP2 - Trips containing AreaStops are not added to StopPatterns until support
-    //           - for this is added.
-    if (
-      result.tripStopTimes
-        .get(trips.get(0))
-        .stream()
-        .anyMatch(t -> t.getStop() instanceof AreaStop || t.getStop() instanceof GroupStop)
-    ) {
-      return result;
-    }
-
     // Create StopPattern from any trip (since they are part of the same JourneyPattern)
     StopPattern stopPattern = deduplicator.deduplicateObject(
       StopPattern.class,