gtfs 4.13.4 → 4.14.1

package/dist/bin/gtfs-import.js

@@ -765,11 +765,6 @@ var fareTransferRules = {
       min: -1,
       primary: true
     },
-    {
-      name: "transfer_id",
-      type: "text",
-      prefix: true
-    },
     {
       name: "duration_limit",
       type: "integer",
@@ -3285,6 +3280,7 @@ function closeDb(db = null) {
 // src/lib/geojson-utils.ts
 import {
   cloneDeep,
+  compact,
   filter,
   groupBy,
   last,
@@ -3350,31 +3346,34 @@ function padLeadingZeros(time) {
 
 // src/lib/import.ts
 var downloadFiles = async (task) => {
-  task.log(`Downloading GTFS from ${task.agency_url}`);
+  task.log(`Downloading GTFS from ${task.url}`);
   task.path = `${task.downloadDir}/gtfs.zip`;
-  const response = await fetch(task.agency_url, {
+  const response = await fetch(task.url, {
     method: "GET",
     headers: task.headers || {},
     signal: task.downloadTimeout ? AbortSignal.timeout(task.downloadTimeout) : void 0
   });
   if (response.status !== 200) {
-    throw new Error(`Unable to download GTFS from ${task.agency_url}`);
+    throw new Error(`Unable to download GTFS from ${task.url}`);
   }
   const buffer = await response.arrayBuffer();
   await writeFile(task.path, Buffer.from(buffer));
   task.log("Download successful");
 };
-var downloadGtfsRealtimeData = async (url, task) => {
-  const response = await fetch(url, {
+var downloadGtfsRealtimeData = async (urlAndHeaders, task) => {
+  task.log(`Downloading GTFS-Realtime from ${urlAndHeaders.url}`);
+  const response = await fetch(urlAndHeaders.url, {
     method: "GET",
     headers: {
-      ...task.realtime_headers || {},
+      ...urlAndHeaders.headers ?? {},
       "Accept-Encoding": "gzip"
     },
     signal: task.downloadTimeout ? AbortSignal.timeout(task.downloadTimeout) : void 0
   });
   if (response.status !== 200) {
-    task.logWarning(`Unable to download GTFS-Realtime from ${url}`);
+    task.logWarning(
+      `Unable to download GTFS-Realtime from ${urlAndHeaders.url}`
+    );
     return null;
   }
   const buffer = await response.arrayBuffer();
@@ -3434,48 +3433,70 @@ var prepareRealtimeValue = (entity, column, task) => {
   );
 };
 var updateRealtimeData = async (task) => {
-  if (!task.realtime_urls) {
+  if (task.realtimeAlerts === void 0 && task.realtimeTripUpdates === void 0 && task.realtimeVehiclePositions === void 0) {
     return;
   }
   const db = openDb({
     sqlitePath: task.sqlitePath
   });
-  task.log(
-    `Starting GTFS-Realtime import from ${task.realtime_urls.length} urls`
-  );
-  for (const realtimeUrl of task.realtime_urls) {
-    task.log(`Downloading GTFS-Realtime from ${realtimeUrl}`);
-    const gtfsRealtimeData = await downloadGtfsRealtimeData(realtimeUrl, task);
-    if (!gtfsRealtimeData?.entity) {
-      continue;
-    }
-    task.log(`Download successful`);
-    let totalLineCount = 0;
-    for (const entity of gtfsRealtimeData.entity) {
-      let model;
-      if (entity.vehicle) {
-        model = vehiclePositions;
-      }
-      if (entity.tripUpdate) {
-        model = tripUpdates;
-      }
-      if (entity.alert) {
-        model = serviceAlerts;
-      }
-      if (!model) {
-        break;
-      }
-      const fieldValues = model.schema.map(
-        (column) => prepareRealtimeValue(entity, column, task)
-      );
-      try {
-        db.prepare(
-          `REPLACE INTO ${model.filenameBase} (${model.schema.map((column) => column.name).join(", ")}) VALUES (${fieldValues.join(", ")})`
-        ).run();
-      } catch (error) {
-        task.logWarning("Import error: " + error.message);
+  if (task.realtimeAlerts?.url) {
+    const gtfsRealtimeData = await downloadGtfsRealtimeData(
+      task.realtimeAlerts,
+      task
+    );
+    if (gtfsRealtimeData?.entity) {
+      task.log(`Download successful`);
+      let totalLineCount = 0;
+      for (const entity of gtfsRealtimeData.entity) {
+        const fieldValues = serviceAlerts.schema.map(
+          (column) => prepareRealtimeValue(entity, column, task)
+        );
+        try {
+          db.prepare(
+            `REPLACE INTO ${serviceAlerts.filenameBase} (${serviceAlerts.schema.map((column) => column.name).join(", ")}) VALUES (${fieldValues.join(", ")})`
+          ).run();
+        } catch (error) {
+          task.logWarning("Import error: " + error.message);
+        }
+        const alertTargetArray = [];
+        for (const informedEntity of entity.alert.informedEntity) {
+          informedEntity.parent = entity;
+          const subValues = serviceAlertTargets.schema.map(
+            (column) => prepareRealtimeValue(informedEntity, column, task)
+          );
+          alertTargetArray.push(`(${subValues.join(", ")})`);
+          totalLineCount++;
+        }
+        try {
+          db.prepare(
+            `REPLACE INTO ${serviceAlertTargets.filenameBase} (${serviceAlertTargets.schema.map((column) => column.name).join(", ")}) VALUES ${alertTargetArray.join(", ")}`
+          ).run();
+        } catch (error) {
+          task.logWarning("Import error: " + error.message);
+        }
+        task.log(`Importing - ${totalLineCount++} entries imported\r`, true);
       }
-      if (entity.tripUpdate) {
+    }
+  }
+  if (task.realtimeTripUpdates?.url) {
+    const gtfsRealtimeData = await downloadGtfsRealtimeData(
+      task.realtimeTripUpdates,
+      task
+    );
+    if (gtfsRealtimeData?.entity) {
+      task.log(`Download successful`);
+      let totalLineCount = 0;
+      for (const entity of gtfsRealtimeData.entity) {
+        const fieldValues = tripUpdates.schema.map(
+          (column) => prepareRealtimeValue(entity, column, task)
+        );
+        try {
+          db.prepare(
+            `REPLACE INTO ${tripUpdates.filenameBase} (${tripUpdates.schema.map((column) => column.name).join(", ")}) VALUES (${fieldValues.join(", ")})`
+          ).run();
+        } catch (error) {
+          task.logWarning("Import error: " + error.message);
+        }
         const stopTimeUpdateArray = [];
         for (const stopTimeUpdate of entity.tripUpdate.stopTimeUpdate) {
           stopTimeUpdate.parent = entity;
@@ -3492,26 +3513,31 @@ var updateRealtimeData = async (task) => {
         } catch (error) {
           task.logWarning("Import error: " + error.message);
         }
+        task.log(`Importing - ${totalLineCount++} entries imported\r`, true);
       }
-      if (entity.alert) {
-        const alertTargetArray = [];
-        for (const informedEntity of entity.alert.informedEntity) {
-          informedEntity.parent = entity;
-          const subValues = serviceAlertTargets.schema.map(
-            (column) => prepareRealtimeValue(informedEntity, column, task)
-          );
-          alertTargetArray.push(`(${subValues.join(", ")})`);
-          totalLineCount++;
-        }
+    }
+  }
+  if (task.realtimeVehiclePositions?.url) {
+    const gtfsRealtimeData = await downloadGtfsRealtimeData(
+      task.realtimeVehiclePositions,
+      task
+    );
+    if (gtfsRealtimeData?.entity) {
+      task.log(`Download successful`);
+      let totalLineCount = 0;
+      for (const entity of gtfsRealtimeData.entity) {
+        const fieldValues = tripUpdates.schema.map(
+          (column) => prepareRealtimeValue(entity, column, task)
+        );
         try {
           db.prepare(
-            `REPLACE INTO ${serviceAlertTargets.filenameBase} (${serviceAlertTargets.schema.map((column) => column.name).join(", ")}) VALUES ${alertTargetArray.join(", ")}`
+            `REPLACE INTO ${tripUpdates.filenameBase} (${tripUpdates.schema.map((column) => column.name).join(", ")}) VALUES (${fieldValues.join(", ")})`
           ).run();
         } catch (error) {
           task.logWarning("Import error: " + error.message);
         }
+        task.log(`Importing - ${totalLineCount++} entries imported\r`, true);
       }
-      task.log(`Importing - ${totalLineCount++} entries imported\r`, true);
     }
   }
   task.log(`GTFS-Realtime data import complete`);
@@ -3823,10 +3849,11 @@ async function importGtfs(initialConfig) {
         const tempPath = temporaryDirectory();
         const task = {
           exclude: agency2.exclude,
-          agency_url: agency2.url,
+          url: agency2.url,
           headers: agency2.headers,
-          realtime_headers: agency2.realtimeHeaders,
-          realtime_urls: agency2.realtimeUrls,
+          realtimeAlerts: agency2.realtimeAlerts,
+          realtimeTripUpdates: agency2.realtimeTripUpdates,
+          realtimeVehiclePositions: agency2.realtimeVehiclePositions,
           downloadDir: tempPath,
           downloadTimeout: config.downloadTimeout,
           gtfsRealtimeExpirationSeconds: config.gtfsRealtimeExpirationSeconds,
@@ -3841,7 +3868,7 @@ async function importGtfs(initialConfig) {
           logError: logError2
         };
         try {
-          if (task.agency_url) {
+          if (task.url) {
             await downloadFiles(task);
           }
           await readFiles(task);
@@ -3872,7 +3899,7 @@ async function importGtfs(initialConfig) {
 }
 
 // src/lib/export.ts
-import { without, compact } from "lodash-es";
+import { without, compact as compact2 } from "lodash-es";
 import pluralize2 from "pluralize";
 import { stringify } from "csv-stringify";
 import sqlString3 from "sqlstring-sqlite";
@@ -3886,7 +3913,7 @@ import sqlString4 from "sqlstring-sqlite";
 import { omit as omit3, pick } from "lodash-es";
 
 // src/lib/gtfs/shapes.ts
-import { compact as compact2, omit as omit4, pick as pick2 } from "lodash-es";
+import { compact as compact3, omit as omit4, pick as pick2 } from "lodash-es";
 import { featureCollection as featureCollection2 } from "@turf/helpers";
 
 // src/lib/gtfs/stops.ts