gtfs 4.11.2 → 4.11.3

package/.github/workflows/nodejs.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ 20, 21 ]
+        node: [ 20, 22 ]
     name: Use Node.js ${{ matrix.node }}
     steps:
       - uses: actions/checkout@v4

package/CHANGELOG.md

@@ -5,6 +5,13 @@ 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.11.3] - 2024-06-13
+
+### Fixed
+
+- Better tests for locations.geojson
+- Handle unknown filename extensions in models
+
 ## [4.11.2] - 2024-06-13
 
 ### Added

package/lib/export.js

@@ -117,6 +117,10 @@ const exportGtfs = async (initialConfig) => {
     } else if (model.filenameExtension === 'geojson') {
       const fileText = lines?.[0].geojson ?? '';
       await writeFile(filePath, fileText);
+    } else {
+      throw new Error(
+        `Unexpected filename extension: ${model.filenameExtension}`,
+      );
     }
 
     log(`Exporting - ${model.filenameBase}.${model.filenameExtension}\r`);

package/lib/import.js

@@ -604,8 +604,46 @@ const importFiles = (task) =>
           `Importing - ${model.filenameBase}.${model.filenameExtension}\r`,
         );
 
-        // Handle geojson files
-        if (model.filenameExtension === 'geojson') {
+        if (model.filenameExtension === 'txt') {
+          const parser = parse({
+            columns: true,
+            relax_quotes: true,
+            trim: true,
+            skip_empty_lines: true,
+            ...task.csvOptions,
+          });
+
+          parser.on('readable', () => {
+            let record;
+
+            while ((record = parser.read())) {
+              try {
+                totalLineCount += 1;
+                lines.push(formatLine(record, model, totalLineCount));
+                // If we have a bunch of lines ready to insert, then do it
+                if (lines.length >= maxInsertVariables / model.schema.length) {
+                  importLines(task, lines, model, totalLineCount);
+                }
+              } catch (error) {
+                reject(error);
+              }
+            }
+          });
+
+          parser.on('end', () => {
+            try {
+              // Insert all remaining lines
+              importLines(task, lines, model, totalLineCount);
+            } catch (error) {
+              reject(error);
+            }
+            resolve();
+          });
+
+          parser.on('error', reject);
+
+          createReadStream(filepath).pipe(stripBomStream()).pipe(parser);
+        } else if (model.filenameExtension === 'geojson') {
           readFile(filepath, 'utf8')
             .then((data) => {
               if (isValidJSON(data) === false) {
@@ -620,46 +658,11 @@ const importFiles = (task) =>
               resolve();
             })
             .catch(reject);
+        } else {
+          reject(
+            new Error(`Unsupported file type: ${model.filenameExtension}`),
+          );
         }
-
-        const parser = parse({
-          columns: true,
-          relax_quotes: true,
-          trim: true,
-          skip_empty_lines: true,
-          ...task.csvOptions,
-        });
-
-        parser.on('readable', () => {
-          let record;
-
-          while ((record = parser.read())) {
-            try {
-              totalLineCount += 1;
-              lines.push(formatLine(record, model, totalLineCount));
-              // If we have a bunch of lines ready to insert, then do it
-              if (lines.length >= maxInsertVariables / model.schema.length) {
-                importLines(task, lines, model, totalLineCount);
-              }
-            } catch (error) {
-              reject(error);
-            }
-          }
-        });
-
-        parser.on('end', () => {
-          try {
-            // Insert all remaining lines
-            importLines(task, lines, model, totalLineCount);
-          } catch (error) {
-            reject(error);
-          }
-          resolve();
-        });
-
-        parser.on('error', reject);
-
-        createReadStream(filepath).pipe(stripBomStream()).pipe(parser);
       }),
   );
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.11.2",
+  "version": "4.11.3",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",

package/test/mocha/get-locations.js

@@ -17,7 +17,6 @@ const locationsConfig = {
     },
   ],
   verbose: false,
-  sqlitePath: '/tmp/locations',
 };
 
 describe('getLocations():', () => {
@@ -25,7 +24,6 @@ describe('getLocations():', () => {
     openDb(locationsConfig);
 
     // Add locations.geojson to test GTFS dataset
-    const temporaryDir = path.join(import.meta.dirname, '../fixture/tmp2/');
     await prepDirectory(temporaryDir);
     await unzip(config.agencies[0].path, temporaryDir);