gtfs 4.3.0 → 4.3.2

package/CHANGELOG.md

@@ -5,6 +5,23 @@ 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.3.2] - 2023-06-14
+
+### Updated
+
+- Dependency updates
+- node-csv `relax_quotes` config
+
+## [4.3.1] - 2023-06-06
+
+### Added
+
+- Ignore system directories within zip file
+
+### Updated
+
+- Dependency updates
+
 ## [4.3.0] - 2023-05-04
 
 ### Updated

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

@@ -264,7 +264,9 @@ const readFiles = async (task) => {
       // If no .txt files in this directory, check for subdirectories and copy them here
       if (textFiles.length === 0) {
         const files = await readdir(task.downloadDir);
+        // Ignore system directories within zip file
         const folders = files
+          .filter((filename) => !['__MACOSX'].includes(filename))
           .map((filename) => path.join(task.downloadDir, filename))
           .filter((source) => lstatSync(source).isDirectory());
 
@@ -528,7 +530,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtfs",
-  "version": "4.3.0",
+  "version": "4.3.2",
   "description": "Import GTFS transit data into SQLite and query routes, stops, times, fares and more",
   "keywords": [
     "transit",
@@ -74,9 +74,9 @@
   },
   "dependencies": {
     "@turf/helpers": "^6.5.0",
-    "better-sqlite3": "^8.3.0",
-    "csv-parse": "^5.3.8",
-    "csv-stringify": "^6.3.2",
+    "better-sqlite3": "^8.4.0",
+    "csv-parse": "^5.4.0",
+    "csv-stringify": "^6.4.0",
     "gtfs-realtime-bindings": "^1.1.1",
     "lodash-es": "^4.17.21",
     "long": "^5.2.3",
@@ -90,14 +90,14 @@
     "sqlstring-sqlite": "^0.1.1",
     "strip-bom-stream": "^5.0.0",
     "tmp-promise": "^3.0.3",
-    "untildify": "^4.0.0",
-    "yargs": "^17.7.1",
+    "untildify": "^5.0.0",
+    "yargs": "^17.7.2",
     "yoctocolors": "^1.0.0"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.4",
     "dtslint": "^4.2.1",
-    "eslint": "^8.39.0",
+    "eslint": "^8.42.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-xo": "^0.43.1",
     "husky": "^8.0.3",

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) {