gtfs 4.13.4 → 4.14.1

package/dist/index.js

@@ -634,11 +634,6 @@ var fareTransferRules = {
       min: -1,
       primary: true
     },
-    {
-      name: "transfer_id",
-      type: "text",
-      prefix: true
-    },
     {
       name: "duration_limit",
       type: "integer",
@@ -3192,6 +3187,7 @@ function generateFolderName(folderName) {
 // src/lib/geojson-utils.ts
 import {
   cloneDeep,
+  compact,
   filter,
   groupBy,
   last,
@@ -3220,14 +3216,14 @@ function isValidLineString(lineString) {
   }
   return true;
 }
-function consolidateShapes(shapes2) {
+function consolidateShapes(shapeGroups) {
   const keys = /* @__PURE__ */ new Set();
-  const segmentsArray = shapes2.map(
-    (shape) => shape.reduce(
+  const segmentsArray = shapeGroups.map(
+    (shapes2) => shapes2.reduce(
       (memo, point, idx) => {
         if (idx > 0) {
           memo.push([
-            [shape[idx - 1].shape_pt_lon, shape[idx - 1].shape_pt_lat],
+            [shapes2[idx - 1].shape_pt_lon, shapes2[idx - 1].shape_pt_lat],
             [point.shape_pt_lon, point.shape_pt_lat]
           ]);
         }
@@ -3296,15 +3292,18 @@ function shapesToGeoJSONFeature(shapes2, properties = {}) {
   );
 }
 function stopsToGeoJSONFeatureCollection(stops2) {
-  const features = stops2.map(
-    (stop) => feature(
+  const features = compact(stops2.map((stop) => {
+    if (!stop.stop_lon || !stop.stop_lat) {
+      return;
+    }
+    return feature(
       {
         type: "Point",
         coordinates: [stop.stop_lon, stop.stop_lat]
       },
       formatProperties(omit2(stop, ["stop_lat", "stop_lon"]))
-    )
-  );
+    );
+  }));
   return featureCollection(features);
 }
 
@@ -3480,31 +3479,34 @@ function formatOrderByClause(orderBy2) {
 
 // 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();
@@ -3585,48 +3587,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;
@@ -3643,26 +3667,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`);
@@ -3974,10 +4003,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,
@@ -3992,7 +4022,7 @@ async function importGtfs(initialConfig) {
           logError: logError2
         };
         try {
-          if (task.agency_url) {
+          if (task.url) {
             await downloadFiles(task);
           }
           await readFiles(task);
@@ -4040,12 +4070,10 @@ async function updateGtfsRealtime(initialConfig) {
     deleteExpiredRealtimeData(config);
     await Promise.all(
       config.agencies.map(async (agency2) => {
-        if (agency2.realtimeUrls === void 0) {
-          return;
-        }
         const task = {
-          realtime_headers: agency2.realtimeHeaders,
-          realtime_urls: agency2.realtimeUrls,
+          realtimeAlerts: agency2.realtimeAlerts,
+          realtimeTripUpdates: agency2.realtimeTripUpdates,
+          realtimeVehiclePositions: agency2.realtimeVehiclePositions,
           downloadTimeout: config.downloadTimeout,
           gtfsRealtimeExpirationSeconds: config.gtfsRealtimeExpirationSeconds,
           sqlitePath: config.sqlitePath,
@@ -4068,7 +4096,7 @@ async function updateGtfsRealtime(initialConfig) {
   } catch (error) {
     if (error?.code === "SQLITE_CANTOPEN") {
       logError2(
-        `Unae to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
+        `Unable to open sqlite database "${config.sqlitePath}" defined as \`sqlitePath\` config.json. Ensure the parent directory exists or remove \`sqlitePath\` from config.json.`
       );
     }
     throw error;
@@ -4078,7 +4106,7 @@ async function updateGtfsRealtime(initialConfig) {
 // src/lib/export.ts
 import path2 from "node:path";
 import { writeFile as writeFile2 } from "node:fs/promises";
-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";
@@ -4185,7 +4213,7 @@ var exportGtfs = async (initialConfig) => {
       return `${model.filenameBase}.${model.filenameExtension}`;
     }
   );
-  if (compact(exportedFiles).length === 0) {
+  if (compact2(exportedFiles).length === 0) {
     log2("No GTFS data exported. Be sure to first import data into SQLite.");
     return;
   }
@@ -4515,7 +4543,7 @@ function getRoutes(query = {}, fields = [], orderBy2 = [], options = {}) {
 }
 
 // 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-plus/route-attributes.ts
@@ -4565,7 +4593,7 @@ function getShapesAsGeoJSON(query = {}, options = {}) {
   const agencies = getAgencies2({}, [], [], options);
   const routeQuery = pick2(query, ["route_id"]);
   const routes2 = getRoutes(routeQuery, [], [], options);
-  const features = compact2(
+  const features = compact3(
     routes2.map((route) => {
       const shapeQuery = {
         route_id: route.route_id,
@@ -4692,14 +4720,14 @@ function getStopsAsGeoJSON(query = {}, options = {}) {
     const routeSubquery = "SELECT DISTINCT route_id FROM trips WHERE trip_id IN (SELECT DISTINCT trip_id FROM stop_times WHERE stop_id = ?)";
     const routes2 = db.prepare(`SELECT * FROM routes WHERE route_id IN (${routeSubquery})`).all(stop.stop_id);
     const stopAttributes2 = getStopAttributes({ stop_id: stop.stop_id });
-    stop.routes = orderBy(
-      routes2,
-      (route) => route?.route_short_name ? Number.parseInt(route.route_short_name, 10) : 0
-    );
-    stop.agency_name = agencies[0].agency_name;
     return {
       ...stop,
-      ...stopAttributes2?.[0] || []
+      ...stopAttributes2?.[0] || [],
+      routes: orderBy(
+        routes2,
+        (route) => route?.route_short_name ? Number.parseInt(route.route_short_name, 10) : 0
+      ),
+      agency_name: agencies[0].agency_name
     };
   });
   const filteredStops = preparedStops.filter((stop) => stop.routes.length > 0);