gtfs 4.16.0 → 4.17.0

package/dist/index.js

@@ -54,7 +54,7 @@ __export(models_exports, {
   routes: () => routes,
   runEvents: () => runEvents,
   runsPieces: () => runsPieces,
-  serviceAlertTargets: () => serviceAlertTargets,
+  serviceAlertInformedEntities: () => serviceAlertInformedEntities,
   serviceAlerts: () => serviceAlerts,
   shapes: () => shapes,
   stopAreas: () => stopAreas,
@@ -2761,9 +2761,9 @@ var serviceAlerts = {
   ]
 };
 
-// src/models/gtfs-realtime/service-alert-targets.ts
-var serviceAlertTargets = {
-  filenameBase: "service_alert_targets",
+// src/models/gtfs-realtime/service-alert-informed_entities.ts
+var serviceAlertInformedEntities = {
+  filenameBase: "service_alert_informed_entities",
   extension: "gtfs-realtime",
   schema: [
     {
@@ -2787,6 +2787,27 @@ var serviceAlertTargets = {
       source: "routeId",
       default: null
     },
+    {
+      name: "route_type",
+      type: "integer",
+      index: true,
+      source: "routeType",
+      default: null
+    },
+    {
+      name: "trip_id",
+      type: "text",
+      index: true,
+      source: "trip.tripId",
+      default: null
+    },
+    {
+      name: "direction_id",
+      type: "integer",
+      index: true,
+      source: "directionId",
+      default: null
+    },
     {
       name: "created_timestamp",
       type: "integer",
@@ -3581,7 +3602,7 @@ async function fetchGtfsRealtimeData(urlConfig, task) {
     enums: String,
     longs: String,
     bytes: String,
-    defaults: true,
+    defaults: false,
     arrays: true,
     objects: true,
     oneofs: true
@@ -3603,7 +3624,7 @@ function removeExpiredRealtimeData(config) {
     `DELETE FROM service_alerts WHERE expiration_timestamp <= strftime('%s','now')`
   ).run();
   db.prepare(
-    `DELETE FROM service_alert_targets WHERE expiration_timestamp <= strftime('%s','now')`
+    `DELETE FROM service_alert_informed_entities WHERE expiration_timestamp <= strftime('%s','now')`
   ).run();
   log(config)(`Removed expired GTFS-Realtime data\r`, true);
 }
@@ -3639,18 +3660,18 @@ async function processRealtimeAlerts(db, gtfsRealtimeData, task) {
         `Import error: No informed entities found for alert id=${entity.id}`
       );
     } else {
-      const alertTargetArray = [];
+      const informedEntities = [];
       for (const informedEntity of entity.alert.informedEntity) {
         informedEntity.parent = entity;
-        const subValues = serviceAlertTargets.schema.map(
+        const subValues = serviceAlertInformedEntities.schema.map(
           (column) => prepareRealtimeFieldValue(informedEntity, column, task)
         );
-        alertTargetArray.push(`(${subValues.join(", ")})`);
+        informedEntities.push(`(${subValues.join(", ")})`);
         totalLineCount++;
       }
       try {
         db.prepare(
-          `REPLACE INTO ${serviceAlertTargets.filenameBase} (${serviceAlertTargets.schema.map((column) => column.name).join(", ")}) VALUES ${alertTargetArray.join(", ")}`
+          `REPLACE INTO ${serviceAlertInformedEntities.filenameBase} (${serviceAlertInformedEntities.schema.map((column) => column.name).join(", ")}) VALUES ${informedEntities.join(", ")}`
         ).run();
       } catch (error) {
         task.logWarning(`Import error: ${error.message}`);
@@ -5195,7 +5216,7 @@ function getVehiclePositions(query = {}, fields = [], orderBy2 = [], options = {
 function getServiceAlerts(query = {}, fields = [], orderBy2 = [], options = {}) {
   const db = options.db ?? openDb();
   const tableName = "service_alerts";
-  const joinTableName = "service_alert_targets";
+  const joinTableName = "service_alert_informed_entities";
   const selectClause = formatSelectClause(fields);
   const whereClause = formatWhereClauses(query);
   const orderByClause = formatOrderByClause(orderBy2);