gtfs 4.3.1 → 4.4.0

package/CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [4.4.0] - 2023-06-16
+
+### Changed
+
+- Pad leading zeros of timestamp columns
+
+## [4.3.2] - 2023-06-14
+
+### Updated
+
+- Dependency updates
+- node-csv `relax_quotes` config
+
 ## [4.3.1] - 2023-06-06
 
 ### Added

package/lib/gtfs/shapes.js

@@ -22,10 +22,10 @@ function buildTripSubquery(query) {
 }
 
 /*
- * Returns array of shapes that match the query parameters. A `route_id`
- * query parameter may be passed to find all shapes for a route. A `trip_id`
- * query parameter may be passed to find all shapes for a trip. A
- * `direction_id` query parameter may be passed to find all shapes for a direction.
+ * Returns array of shapes that match the query parameters. A `route_id` query
+ * parameter may be passed to find all shapes for a route. A `trip_id` query
+ * parameter may be passed to find all shapes for a trip. A `direction_id`
+ * query parameter may be passed to find all shapes for a direction.
  */
 export function getShapes(query = {}, fields = [], orderBy = [], options = {}) {
   const db = options.db ?? openDb();
@@ -68,7 +68,9 @@ export function getShapes(query = {}, fields = [], orderBy = [], options = {}) {
 
 /*
  * Returns geoJSON of the shapes that match the query parameters. A `route_id`
- * query parameter may be passed to find all shapes for a route.
+ * query parameter may be passed to find all shapes for a route. A `trip_id`
+ * query parameter may be passed to find all shapes for a trip. A
+ * `direction_id` query parameter may be passed to find all shapes for a direction.
  */
 export function getShapesAsGeoJSON(query = {}, options = {}) {
   const agencies = getAgencies({}, [], [], options);

package/lib/gtfs/stops.js

@@ -29,7 +29,8 @@ function buildStoptimeSubquery(query) {
  * Returns an array of stops that match the query parameters. A `route_id`
  * query parameter may be passed to find all shapes for a route. A `trip_id`
  * query parameter may be passed to find all shapes for a trip. A
- * `direction_id` query parameter may be passed to find all shapes for a direction.
+ * `direction_id` query parameter may be passed to find all shapes for a
+ * direction.
  */
 export function getStops(query = {}, fields = [], orderBy = [], options = {}) {
   const db = options.db ?? openDb();
@@ -73,8 +74,10 @@ export function getStops(query = {}, fields = [], orderBy = [], options = {}) {
 }
 
 /*
- * Returns geoJSON with stops for the `agencyKey` specified, optionally limited
- * to the `stopIds` specified
+ * Returns geoJSON with stops.  A `route_id` query parameter may be passed to
+ * find all shapes for a route. A `trip_id` query parameter may be passed to
+ * find all shapes for a trip. A `direction_id` query parameter may be passed
+ * to find all shapes for a direction.
  */
 export function getStopsAsGeoJSON(query = {}, options = {}) {
   const db = options.db ?? openDb();

package/lib/import.js

@@ -25,6 +25,7 @@ import {
   setDefaultConfig,
   validateConfigForImport,
   convertLongTimeToDate,
+  padLeadingZeros,
 } from './utils.js';
 
 const downloadFiles = async (task) => {
@@ -434,6 +435,11 @@ const formatLine = (line, model, totalLineCount) => {
     if (formattedLine[timestampColumnName]) {
       formattedLine[`${timestampColumnName}stamp`] =
         calculateSecondsFromMidnight(formattedLine[timestampColumnName]);
+
+      // Ensure leading zeros for time columns
+      formattedLine[timestampColumnName] = padLeadingZeros(
+        formattedLine[timestampColumnName]
+      );
     }
   }
 
@@ -530,7 +536,7 @@ const importFiles = (task) =>
         const maxInsertVariables = 800;
         const parser = parse({
           columns: true,
-          relax: true,
+          relax_quotes: true,
           trim: true,
           skip_empty_lines: true,
           ...task.csvOptions,

package/lib/utils.js

@@ -52,6 +52,18 @@ export function calculateSecondsFromMidnight(time) {
   return split[0] * 3600 + split[1] * 60 + split[2];
 }
 
+/*
+ * Adds leading zeros to HH:mm:ss timestamps
+ */
+export function padLeadingZeros(time) {
+  const split = time.split(':').map((d) => String(Number(d)).padStart(2, '0'));
+  if (split.length !== 3) {
+    return null;
+  }
+
+  return split.join(':');
+}
+
 export function formatSelectClause(fields) {
   if (Array.isArray(fields)) {
     const selectItem =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.3.1",
+  "version": "4.4.0",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -56,7 +56,8 @@
     "Mike Brocks",
     "Matt Moran",
     "Daniel Sörlöv",
-    "Ali Zarghami <alizarghami@gmail.com>"
+    "Ali Zarghami <alizarghami@gmail.com>",
+    "David Abell"
   ],
   "type": "module",
   "main": "index.js",
@@ -90,7 +91,7 @@
     "sqlstring-sqlite": "^0.1.1",
     "strip-bom-stream": "^5.0.0",
     "tmp-promise": "^3.0.3",
-    "untildify": "^4.0.0",
+    "untildify": "^5.0.0",
     "yargs": "^17.7.2",
     "yoctocolors": "^1.0.0"
   },

package/test/mocha/advanced-query.js

@@ -57,14 +57,14 @@ describe('advancedQuery():', () => {
     const results = advancedQuery('stop_times', advancedQueryOptions);
 
     const expectedResults = [
-      { trip_id: '329', arrival_time: '7:56:00' },
-      { trip_id: '329', arrival_time: '8:03:00' },
-      { trip_id: '329', arrival_time: '8:16:00' },
-      { trip_id: '329', arrival_time: '8:27:00' },
-      { trip_id: '329', arrival_time: '8:35:00' },
-      { trip_id: '329', arrival_time: '8:44:00' },
-      { trip_id: '329', arrival_time: '8:52:00' },
-      { trip_id: '329', arrival_time: '9:09:00' },
+      { trip_id: '329', arrival_time: '07:56:00' },
+      { trip_id: '329', arrival_time: '08:03:00' },
+      { trip_id: '329', arrival_time: '08:16:00' },
+      { trip_id: '329', arrival_time: '08:27:00' },
+      { trip_id: '329', arrival_time: '08:35:00' },
+      { trip_id: '329', arrival_time: '08:44:00' },
+      { trip_id: '329', arrival_time: '08:52:00' },
+      { trip_id: '329', arrival_time: '09:09:00' },
     ];
 
     should.exist(results);

package/test/mocha/export-gtfs.js

@@ -65,8 +65,9 @@ describe('exportGtfs():', function () {
           const parser = parse(
             {
               columns: true,
-              relax: true,
+              relax_quotes: true,
               trim: true,
+              skip_empty_lines: true,
             },
             (error, data) => {
               if (error) {
@@ -121,8 +122,9 @@ describe('exportGtfs():', function () {
         const parser = parse(
           {
             columns: true,
-            relax: true,
+            relax_quotes: true,
             trim: true,
+            skip_empty_lines: true,
           },
           (error, data) => {
             if (error) {

package/test/mocha/import-gtfs.js

@@ -125,8 +125,9 @@ describe('importGtfs():', function () {
           const parser = parse(
             {
               columns: true,
-              relax: true,
+              relax_quotes: true,
               trim: true,
+              skip_empty_lines: true,
             },
             (error, data) => {
               if (error) {