gtfs 4.15.7 → 4.15.9

package/dist/bin/gtfs-export.js

@@ -346,12 +346,7 @@ var bookingRules = {
     },
     {
       name: "prior_notice_last_time",
-      type: "text"
-    },
-    {
-      name: "prior_notice_last_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "prior_notice_start_day",
@@ -360,12 +355,7 @@ var bookingRules = {
     },
     {
       name: "prior_notice_start_time",
-      type: "text"
-    },
-    {
-      name: "prior_notice_start_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "prior_notice_service_id",
@@ -831,23 +821,15 @@ var frequencies = {
     },
     {
       name: "start_time",
-      type: "text",
+      type: "time",
       required: true,
       primary: true
     },
-    {
-      name: "start_timestamp",
-      type: "integer"
-    },
     {
       name: "end_time",
-      type: "text",
+      type: "time",
       required: true
     },
-    {
-      name: "end_timestamp",
-      type: "integer"
-    },
     {
       name: "headway_secs",
       type: "integer",
@@ -1214,21 +1196,11 @@ var stopTimes = {
     },
     {
       name: "arrival_time",
-      type: "text"
-    },
-    {
-      name: "arrival_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "departure_time",
-      type: "text"
-    },
-    {
-      name: "departure_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "location_group_id",
@@ -1263,12 +1235,7 @@ var stopTimes = {
     },
     {
       name: "start_pickup_drop_off_window",
-      type: "text"
-    },
-    {
-      name: "start_pickup_drop_off_window_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "pickup_type",
@@ -1418,12 +1385,12 @@ var timeframes = {
     },
     {
       name: "start_time",
-      type: "text",
+      type: "time",
       primary: true
     },
     {
       name: "end_time",
-      type: "text",
+      type: "time",
       primary: true
     },
     {
@@ -1696,19 +1663,11 @@ var timetables = {
     },
     {
       name: "start_time",
-      type: "text"
-    },
-    {
-      name: "start_timestamp",
-      type: "integer"
+      type: "time"
     },
     {
       name: "end_time",
-      type: "text"
-    },
-    {
-      name: "end_timestamp",
-      type: "integer"
+      type: "time"
     },
     {
       name: "timetable_label",
@@ -2148,21 +2107,11 @@ var boardAlight = {
     },
     {
       name: "service_arrival_time",
-      type: "text"
-    },
-    {
-      name: "service_arrival_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "service_departure_time",
-      type: "text"
-    },
-    {
-      name: "service_departure_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "source",
@@ -2229,21 +2178,11 @@ var riderTrip = {
     },
     {
       name: "boarding_time",
-      type: "text"
-    },
-    {
-      name: "boarding_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "alighting_time",
-      type: "text"
-    },
-    {
-      name: "alighting_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "rider_type",
@@ -2317,21 +2256,11 @@ var ridership = {
     },
     {
       name: "ridership_start_time",
-      type: "text"
-    },
-    {
-      name: "ridership_start_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "ridership_end_time",
-      type: "text"
-    },
-    {
-      name: "ridership_end_timestamp",
-      type: "integer",
-      index: true
+      type: "time"
     },
     {
       name: "service_id",
@@ -2510,7 +2439,7 @@ var tripUpdates = {
   extension: "gtfs-realtime",
   schema: [
     {
-      name: "update_id",
+      name: "id",
       type: "text",
       required: true,
       primary: true,
@@ -2674,7 +2603,7 @@ var vehiclePositions = {
   extension: "gtfs-realtime",
   schema: [
     {
-      name: "update_id",
+      name: "id",
       type: "text",
       required: true,
       primary: true,
@@ -2913,39 +2842,24 @@ var deadheadTimes = {
   nonstandard: true,
   extension: "ods",
   schema: [
-    {
-      name: "id",
-      type: "integer",
-      primary: true,
-      prefix: true
-    },
     {
       name: "deadhead_id",
       type: "text",
       required: true,
       index: true,
+      primary: true,
       prefix: true
     },
     {
       name: "arrival_time",
-      type: "text",
+      type: "time",
       required: true
     },
-    {
-      name: "arrival_timestamp",
-      type: "integer",
-      index: true
-    },
     {
       name: "departure_time",
-      type: "text",
+      type: "time",
       required: true
     },
-    {
-      name: "departure_timestamp",
-      type: "integer",
-      index: true
-    },
     {
       name: "ops_location_id",
       type: "text",
@@ -2960,6 +2874,7 @@ var deadheadTimes = {
       name: "location_sequence",
       type: "integer",
       required: true,
+      primary: true,
       min: 0,
       index: true
     },
@@ -3279,21 +3194,15 @@ function setDefaultConfig(initialConfig) {
     ...initialConfig
   };
 }
-
-// src/lib/import-gtfs.ts
-var TIME_COLUMN_NAMES = [
-  "start_time",
-  "end_time",
-  "arrival_time",
-  "departure_time",
-  "prior_notice_last_time",
-  "prior_notice_start_time",
-  "start_pickup_drop_off_window"
-];
-var TIME_COLUMN_PAIRS = TIME_COLUMN_NAMES.map((name) => [
-  name,
-  name.endsWith("time") ? `${name}stamp` : `${name}_timestamp`
-]);
+function formatCurrency(value, currency) {
+  const parts = new Intl.NumberFormat(void 0, {
+    style: "currency",
+    currency
+  }).formatToParts(value);
+  const integerPart = parts.find((part) => part.type === "integer")?.value ?? "0";
+  const fractionPart = parts.find((part) => part.type === "fraction")?.value ?? "";
+  return `${integerPart}${fractionPart !== "" ? `.${fractionPart}` : ""}`;
+}
 
 // src/lib/export.ts
 import path2 from "node:path";
@@ -3364,19 +3273,7 @@ var exportGtfs = async (initialConfig) => {
         return;
       }
       if (model.filenameExtension === "txt") {
-        const excludeColumns = [
-          "id",
-          "arrival_timestamp",
-          "departure_timestamp",
-          "start_timestamp",
-          "end_timestamp",
-          "service_arrival_timestamp",
-          "service_departure_timestamp",
-          "boarding_timestamp",
-          "alighting_timestamp",
-          "ridership_start_timestamp",
-          "ridership_end_timestamp"
-        ];
+        const excludeColumns = [];
         if (model.filenameBase === "routes") {
           const routesWithAgencyId = db.prepare(
             "SELECT agency_id FROM routes WHERE agency_id IS NOT NULL;"
@@ -3384,6 +3281,14 @@ var exportGtfs = async (initialConfig) => {
           if (!routesWithAgencyId || routesWithAgencyId.length === 0) {
             excludeColumns.push("agency_id");
           }
+        } else if (model.filenameBase === "fare_attributes") {
+          for (const line of lines) {
+            line.price = formatCurrency(line.price, line.currency_type);
+          }
+        } else if (model.filenameBase === "fare_products") {
+          for (const line of lines) {
+            line.amount = formatCurrency(line.amount, line.currency);
+          }
         }
         const columns = without(
           model.schema.map((column) => column.name),