minotor 11.3.0 → 11.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "minotor",
3
- "version": "11.3.0",
3
+ "version": "11.4.0",
4
4
  "description": "A lightweight client-side transit routing library.",
5
5
  "keywords": [
6
6
  "minotor",
@@ -67,7 +67,7 @@ describe('GTFS transfers parser', () => {
67
67
  ],
68
68
  ]);
69
69
 
70
- const result = await parseTransfers(mockedStream, stopsMap);
70
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
71
71
 
72
72
  const expectedTransfers = new Map([
73
73
  [
@@ -148,7 +148,7 @@ describe('GTFS transfers parser', () => {
148
148
  ],
149
149
  ]);
150
150
 
151
- const result = await parseTransfers(mockedStream, stopsMap);
151
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
152
152
 
153
153
  assert.deepEqual(result.transfers, new Map());
154
154
  assert.deepEqual(result.tripContinuations, []);
@@ -186,7 +186,7 @@ describe('GTFS transfers parser', () => {
186
186
  ],
187
187
  ]);
188
188
 
189
- const result = await parseTransfers(mockedStream, stopsMap);
189
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
190
190
 
191
191
  assert.deepEqual(result.transfers, new Map());
192
192
  assert.deepEqual(result.tripContinuations, []);
@@ -244,7 +244,7 @@ describe('GTFS transfers parser', () => {
244
244
  ],
245
245
  ]);
246
246
 
247
- const result = await parseTransfers(mockedStream, stopsMap);
247
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
248
248
 
249
249
  const expectedTripContinuations = [
250
250
  {
@@ -318,7 +318,7 @@ describe('GTFS transfers parser', () => {
318
318
  ],
319
319
  ]);
320
320
 
321
- const result = await parseTransfers(mockedStream, stopsMap);
321
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
322
322
 
323
323
  const expectedGuaranteedTripTransfers = [
324
324
  {
@@ -398,7 +398,7 @@ describe('GTFS transfers parser', () => {
398
398
  ],
399
399
  ]);
400
400
 
401
- const result = await parseTransfers(mockedStream, stopsMap);
401
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
402
402
 
403
403
  // Type 1 with trip IDs -> guaranteedTripTransfers
404
404
  const expectedGuaranteedTripTransfers = [
@@ -486,7 +486,7 @@ describe('GTFS transfers parser', () => {
486
486
  ],
487
487
  ]);
488
488
 
489
- const result = await parseTransfers(mockedStream, stopsMap);
489
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
490
490
 
491
491
  assert.deepEqual(result.transfers, new Map());
492
492
  assert.deepEqual(result.tripContinuations, []);
@@ -523,7 +523,7 @@ describe('GTFS transfers parser', () => {
523
523
  ],
524
524
  ]);
525
525
 
526
- const result = await parseTransfers(mockedStream, stopsMap);
526
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
527
527
 
528
528
  assert.deepEqual(result.transfers, new Map());
529
529
  assert.deepEqual(result.tripContinuations, []);
@@ -560,7 +560,7 @@ describe('GTFS transfers parser', () => {
560
560
  ],
561
561
  ]);
562
562
 
563
- const result = await parseTransfers(mockedStream, stopsMap);
563
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
564
564
 
565
565
  assert.deepEqual(result.transfers, new Map());
566
566
  assert.deepEqual(result.tripContinuations, []);
@@ -618,7 +618,7 @@ describe('GTFS transfers parser', () => {
618
618
  ],
619
619
  ]);
620
620
 
621
- const result = await parseTransfers(mockedStream, stopsMap);
621
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
622
622
 
623
623
  const expectedTransfers = new Map([
624
624
  [
@@ -698,7 +698,7 @@ describe('GTFS transfers parser', () => {
698
698
  ],
699
699
  ]);
700
700
 
701
- const result = await parseTransfers(mockedStream, stopsMap);
701
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
702
702
 
703
703
  const expectedTransfers = new Map([
704
704
  [
@@ -726,6 +726,93 @@ describe('GTFS transfers parser', () => {
726
726
  assert.deepEqual(result.tripContinuations, expectedTripContinuations);
727
727
  });
728
728
 
729
+ it('should filter service-scoped transfers by active service regardless of type', async () => {
730
+ const mockedStream = new Readable();
731
+ mockedStream.push(
732
+ 'from_stop_id,to_stop_id,from_trip_id,to_trip_id,service_id,transfer_type,min_transfer_time\n',
733
+ );
734
+ mockedStream.push('"from","to","","","","0",""\n');
735
+ mockedStream.push('"from","to","","","","2","120"\n');
736
+ mockedStream.push('"from","to","","","active","1",""\n');
737
+ mockedStream.push('"from","to","","","inactive","2","180"\n');
738
+ mockedStream.push('"from","to","tripA","tripB","active","1",""\n');
739
+ mockedStream.push('"from","to","tripC","tripD","inactive","1",""\n');
740
+ mockedStream.push('"from","to","tripE","tripF","active","4",""\n');
741
+ mockedStream.push('"from","to","tripG","tripH","inactive","4",""\n');
742
+ mockedStream.push(null);
743
+
744
+ const stopsMap: GtfsStopsMap = new Map([
745
+ [
746
+ 'from',
747
+ {
748
+ id: 0,
749
+ sourceStopId: 'from',
750
+ name: 'From',
751
+ children: [],
752
+ locationType: 'SIMPLE_STOP_OR_PLATFORM',
753
+ },
754
+ ],
755
+ [
756
+ 'to',
757
+ {
758
+ id: 1,
759
+ sourceStopId: 'to',
760
+ name: 'To',
761
+ children: [],
762
+ locationType: 'SIMPLE_STOP_OR_PLATFORM',
763
+ },
764
+ ],
765
+ ]);
766
+
767
+ const result = await parseTransfers(
768
+ mockedStream,
769
+ stopsMap,
770
+ new Set(['active']),
771
+ );
772
+
773
+ assert.deepEqual(
774
+ result.transfers,
775
+ new Map([
776
+ [
777
+ 0,
778
+ [
779
+ {
780
+ destination: 1,
781
+ type: TransferTypes.RECOMMENDED,
782
+ minTransferTime: durationFromSeconds(0),
783
+ },
784
+ {
785
+ destination: 1,
786
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
787
+ minTransferTime: durationFromSeconds(120),
788
+ },
789
+ {
790
+ destination: 1,
791
+ type: TransferTypes.GUARANTEED,
792
+ minTransferTime: durationFromSeconds(0),
793
+ },
794
+ ],
795
+ ],
796
+ ]),
797
+ );
798
+ assert.deepEqual(result.guaranteedTripTransfers, [
799
+ {
800
+ fromStop: 0,
801
+ fromTrip: 'tripA',
802
+ toStop: 1,
803
+ toTrip: 'tripB',
804
+ },
805
+ ]);
806
+ assert.deepEqual(result.tripContinuations, [
807
+ {
808
+ fromStop: 0,
809
+ fromTrip: 'tripE',
810
+ toStop: 1,
811
+ toTrip: 'tripF',
812
+ },
813
+ ]);
814
+ });
815
+
729
816
  it('should handle empty transfers file', async () => {
730
817
  const mockedStream = new Readable();
731
818
  mockedStream.push(
@@ -735,7 +822,7 @@ describe('GTFS transfers parser', () => {
735
822
 
736
823
  const stopsMap: GtfsStopsMap = new Map();
737
824
 
738
- const result = await parseTransfers(mockedStream, stopsMap);
825
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
739
826
 
740
827
  assert.deepEqual(result.transfers, new Map());
741
828
  assert.deepEqual(result.tripContinuations, []);
@@ -774,7 +861,7 @@ describe('GTFS transfers parser', () => {
774
861
  ],
775
862
  ]);
776
863
 
777
- const result = await parseTransfers(mockedStream, stopsMap);
864
+ const result = await parseTransfers(mockedStream, stopsMap, new Set());
778
865
 
779
866
  const expectedTransfers = new Map([
780
867
  [
@@ -133,7 +133,7 @@ export class GtfsParser {
133
133
  transfers: parsedTransfers,
134
134
  tripContinuations: parsedTripContinuations,
135
135
  guaranteedTripTransfers: parsedGuaranteedTripTransfers,
136
- } = await parseTransfers(transfersStream, parsedStops);
136
+ } = await parseTransfers(transfersStream, parsedStops, activeServiceIds);
137
137
  transfers = parsedTransfers;
138
138
  tripContinuationsList = parsedTripContinuations;
139
139
  guaranteedTripTransfersList = parsedGuaranteedTripTransfers;
@@ -13,6 +13,7 @@ import {
13
13
  TripTransfers as TripTransfers,
14
14
  } from '../timetable/timetable.js';
15
15
  import { encode } from '../timetable/tripStopId.js';
16
+ import { ServiceId, ServiceIds } from './services.js';
16
17
  import { GtfsStopsMap } from './stops.js';
17
18
  import { GtfsTripId, TripsMapping } from './trips.js';
18
19
  import { parseCsv } from './utils.js';
@@ -41,6 +42,7 @@ export type TransferEntry = {
41
42
  to_trip_id?: GtfsTripId;
42
43
  from_route_id?: ServiceRouteId;
43
44
  to_route_id?: ServiceRouteId;
45
+ service_id?: ServiceId;
44
46
  transfer_type: GtfsTransferType;
45
47
  min_transfer_time?: number;
46
48
  };
@@ -180,12 +182,15 @@ const processStopToStopTransfer = (
180
182
  /**
181
183
  * Parses the transfers.txt file from a GTFS feed.
182
184
  *
183
- * @param stopsStream The readable stream containing the stops data.
184
- * @return A mapping of stop IDs to corresponding stop details.
185
+ * @param transfersStream The readable stream containing the transfers data.
186
+ * @param stopsMap The parsed GTFS stops indexed by their source IDs.
187
+ * @param activeServiceIds The service IDs active for the requested date.
188
+ * @returns Parsed stop transfers, trip continuations, and guaranteed trip transfers.
185
189
  */
186
190
  export const parseTransfers = async (
187
191
  transfersStream: NodeJS.ReadableStream,
188
192
  stopsMap: GtfsStopsMap,
193
+ activeServiceIds: ServiceIds,
189
194
  ): Promise<{
190
195
  transfers: TransfersMap;
191
196
  tripContinuations: GtfsTripTransfer[];
@@ -201,6 +206,13 @@ export const parseTransfers = async (
201
206
  ])) {
202
207
  const transferEntry = rawLine as TransferEntry;
203
208
 
209
+ if (
210
+ transferEntry.service_id &&
211
+ !activeServiceIds.has(transferEntry.service_id)
212
+ ) {
213
+ continue;
214
+ }
215
+
204
216
  if (
205
217
  transferEntry.transfer_type === 3 ||
206
218
  transferEntry.transfer_type === 5