Re-enable file loader for SIRI-SX

opentripplanner · Dec 18, 2024 · de1e23d · de1e23d
1 parent defdf5f
commit de1e23d
Showing 1 changed file with 19 additions and 14 deletions.
diff --git a/...n/src/main/java/org/opentripplanner/updater/siri/updater/configure/SiriUpdaterModule.java b/...n/src/main/java/org/opentripplanner/updater/siri/updater/configure/SiriUpdaterModule.java
@@ -43,7 +43,26 @@ public static SiriSXUpdater createSiriSXUpdater(
     return new SiriSXUpdater(params, timetableRepository, createLoader(params));
   }
 
+  private static EstimatedTimetableSource createSource(SiriETUpdater.Parameters params) {
+    return switch (params) {
+      case SiriETUpdaterParameters p -> new SiriETHttpTripUpdateSource(
+        p.sourceParameters(),
+        createLoader(params)
+      );
+      case SiriETLiteUpdaterParameters p -> new SiriETLiteHttpTripUpdateSource(
+        p.sourceParameters(),
+        createLoader(params)
+      );
+      default -> throw new IllegalArgumentException("Unexpected value: " + params);
+    };
+  }
+
   private static SiriLoader createLoader(SiriSXUpdater.Parameters params) {
+    // Load real-time updates from a file.
+    if (SiriFileLoader.matchesUrl(params.url())) {
+      return new SiriFileLoader(params.url());
+    }
+    // Fallback to default loader
     return switch (params) {
       case SiriSXUpdaterParameters p -> new SiriHttpLoader(
         p.url(),
@@ -59,20 +78,6 @@ private static SiriLoader createLoader(SiriSXUpdater.Parameters params) {
     };
   }
 
-  private static EstimatedTimetableSource createSource(SiriETUpdater.Parameters params) {
-    return switch (params) {
-      case SiriETUpdaterParameters p -> new SiriETHttpTripUpdateSource(
-        p.sourceParameters(),
-        createLoader(params)
-      );
-      case SiriETLiteUpdaterParameters p -> new SiriETLiteHttpTripUpdateSource(
-        p.sourceParameters(),
-        createLoader(params)
-      );
-      default -> throw new IllegalArgumentException("Unexpected value: " + params);
-    };
-  }
-
   private static SiriLoader createLoader(SiriETUpdater.Parameters params) {
     // Load real-time updates from a file.
     if (SiriFileLoader.matchesUrl(params.url())) {