minotor 11.2.3 → 11.3.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.
Files changed (70) hide show
  1. package/CHANGELOG.md +3 -3
  2. package/README.md +27 -0
  3. package/dist/cli.mjs +300 -98
  4. package/dist/cli.mjs.map +1 -1
  5. package/dist/gtfs/parser.d.ts +3 -1
  6. package/dist/gtfs/routes.d.ts +1 -2
  7. package/dist/gtfs/trips.d.ts +2 -1
  8. package/dist/parser.cjs.js +225 -81
  9. package/dist/parser.cjs.js.map +1 -1
  10. package/dist/parser.d.ts +6 -2
  11. package/dist/parser.esm.js +224 -82
  12. package/dist/parser.esm.js.map +1 -1
  13. package/dist/router.cjs.js +1 -1
  14. package/dist/router.cjs.js.map +1 -1
  15. package/dist/router.d.ts +4 -3
  16. package/dist/router.esm.js +1 -1
  17. package/dist/router.esm.js.map +1 -1
  18. package/dist/router.umd.js +1 -1
  19. package/dist/router.umd.js.map +1 -1
  20. package/dist/routing/result.d.ts +1 -4
  21. package/dist/routing/route.d.ts +9 -5
  22. package/dist/timetable/route.d.ts +9 -5
  23. package/dist/timetable/timetable.d.ts +24 -3
  24. package/dist/transfers/__tests__/straightLineTransferGenerator.test.d.ts +1 -0
  25. package/dist/transfers/generator.d.ts +40 -0
  26. package/dist/transfers/straightLineTransferGenerator.d.ts +58 -0
  27. package/dist/utils/map.d.ts +10 -0
  28. package/package.json +1 -1
  29. package/src/__e2e__/router.test.ts +6 -2
  30. package/src/cli/minotor.ts +21 -1
  31. package/src/cli/repl.ts +6 -12
  32. package/src/gtfs/__tests__/parser.test.ts +29 -1
  33. package/src/gtfs/__tests__/routes.test.ts +4 -3
  34. package/src/gtfs/__tests__/transfers.test.ts +8 -8
  35. package/src/gtfs/__tests__/trips.test.ts +60 -24
  36. package/src/gtfs/parser.ts +50 -1
  37. package/src/gtfs/profiles/__tests__/extended.test.ts +2 -1
  38. package/src/gtfs/profiles/extended.ts +14 -14
  39. package/src/gtfs/profiles/standard.ts +11 -10
  40. package/src/gtfs/routes.ts +5 -2
  41. package/src/gtfs/transfers.ts +6 -5
  42. package/src/gtfs/trips.ts +7 -14
  43. package/src/parser.ts +20 -2
  44. package/src/router.ts +12 -6
  45. package/src/routing/__tests__/access.test.ts +14 -6
  46. package/src/routing/__tests__/plainRouter.test.ts +25 -23
  47. package/src/routing/__tests__/plotter.test.ts +8 -3
  48. package/src/routing/__tests__/rangeResult.test.ts +6 -2
  49. package/src/routing/__tests__/rangeRouter.test.ts +10 -6
  50. package/src/routing/__tests__/raptor.test.ts +15 -9
  51. package/src/routing/__tests__/result.test.ts +9 -4
  52. package/src/routing/__tests__/route.test.ts +3 -4
  53. package/src/routing/__tests__/router.test.ts +2 -1
  54. package/src/routing/access.ts +7 -4
  55. package/src/routing/plotter.ts +8 -3
  56. package/src/routing/raptor.ts +5 -5
  57. package/src/routing/result.ts +32 -14
  58. package/src/routing/route.ts +13 -10
  59. package/src/routing/state.ts +1 -1
  60. package/src/timetable/__tests__/io.test.ts +22 -10
  61. package/src/timetable/__tests__/route.test.ts +18 -24
  62. package/src/timetable/__tests__/timetable.test.ts +17 -11
  63. package/src/timetable/io.ts +30 -28
  64. package/src/timetable/route.ts +14 -7
  65. package/src/timetable/timetable.ts +77 -28
  66. package/src/transfers/README.md +97 -0
  67. package/src/transfers/__tests__/straightLineTransferGenerator.test.ts +204 -0
  68. package/src/transfers/generator.ts +45 -0
  69. package/src/transfers/straightLineTransferGenerator.ts +143 -0
  70. package/src/utils/map.ts +22 -0
@@ -3,9 +3,13 @@ import { Readable } from 'node:stream';
3
3
  import { describe, it } from 'node:test';
4
4
 
5
5
  import { StopId } from '../../stops/stops.js';
6
- import { REGULAR, Route } from '../../timetable/route.js';
6
+ import { PickUpDropOffTypes, Route } from '../../timetable/route.js';
7
7
  import { timeFromHMS } from '../../timetable/time.js';
8
- import { ServiceRoute } from '../../timetable/timetable.js';
8
+ import {
9
+ RouteTypes,
10
+ ServiceRoute,
11
+ TransferTypes,
12
+ } from '../../timetable/timetable.js';
9
13
  import { GtfsRoutesMap } from '../routes.js';
10
14
  import { ServiceIds } from '../services.js';
11
15
  import { GtfsStopsMap } from '../stops.js';
@@ -44,11 +48,11 @@ describe('buildStopsAdjacencyStructure', () => {
44
48
  }),
45
49
  ];
46
50
  const transfersMap: TransfersMap = new Map([
47
- [0, [{ destination: 1, type: 'RECOMMENDED' }]],
51
+ [0, [{ destination: 1, type: TransferTypes.RECOMMENDED }]],
48
52
  ]);
49
53
 
50
54
  const serviceRoutes: ServiceRoute[] = [
51
- { type: 'BUS', name: 'B1', routes: [] },
55
+ { type: RouteTypes.BUS, name: 'B1', routes: [] },
52
56
  ];
53
57
 
54
58
  const stopsAdjacency = buildStopsAdjacencyStructure(
@@ -67,7 +71,7 @@ describe('buildStopsAdjacencyStructure', () => {
67
71
  transfers: [
68
72
  {
69
73
  destination: 1,
70
- type: 'RECOMMENDED',
74
+ type: TransferTypes.RECOMMENDED,
71
75
  },
72
76
  ],
73
77
  },
@@ -107,10 +111,10 @@ describe('buildStopsAdjacencyStructure', () => {
107
111
  }),
108
112
  ];
109
113
  const transfersMap: TransfersMap = new Map([
110
- [3, [{ destination: 2, type: 'RECOMMENDED' }]],
114
+ [3, [{ destination: 2, type: TransferTypes.RECOMMENDED }]],
111
115
  ]);
112
116
  const serviceRoutes: ServiceRoute[] = [
113
- { type: 'BUS', name: 'B1', routes: [] },
117
+ { type: RouteTypes.BUS, name: 'B1', routes: [] },
114
118
  ];
115
119
 
116
120
  const stopsAdjacency = buildStopsAdjacencyStructure(
@@ -186,7 +190,7 @@ describe('buildStopsAdjacencyStructure', () => {
186
190
  ];
187
191
  const transfersMap: TransfersMap = new Map();
188
192
  const serviceRoutes: ServiceRoute[] = [
189
- { type: 'BUS', name: 'B1', routes: [] },
193
+ { type: RouteTypes.BUS, name: 'B1', routes: [] },
190
194
  ];
191
195
 
192
196
  const stopsAdjacency = buildStopsAdjacencyStructure(
@@ -234,7 +238,7 @@ describe('buildStopsAdjacencyStructure', () => {
234
238
  ];
235
239
  const transfersMap: TransfersMap = new Map();
236
240
  const serviceRoutes: ServiceRoute[] = [
237
- { type: 'BUS', name: 'B1', routes: [] },
241
+ { type: RouteTypes.BUS, name: 'B1', routes: [] },
238
242
  ];
239
243
 
240
244
  const stopsAdjacency = buildStopsAdjacencyStructure(
@@ -276,7 +280,7 @@ describe('buildStopsAdjacencyStructure', () => {
276
280
  ];
277
281
  const transfersMap: TransfersMap = new Map();
278
282
  const serviceRoutes: ServiceRoute[] = [
279
- { type: 'BUS', name: 'B1', routes: [] },
283
+ { type: RouteTypes.BUS, name: 'B1', routes: [] },
280
284
  ];
281
285
 
282
286
  const stopsAdjacency = buildStopsAdjacencyStructure(
@@ -325,8 +329,8 @@ describe('GTFS trips parser', () => {
325
329
 
326
330
  const validServiceIds: ServiceIds = new Set(['service1', 'service2']);
327
331
  const validRouteIds: GtfsRoutesMap = new Map([
328
- ['routeA', { type: 'BUS', name: 'B1' }],
329
- ['routeB', { type: 'TRAM', name: 'T1' }],
332
+ ['routeA', { type: RouteTypes.BUS, name: 'B1' }],
333
+ ['routeB', { type: RouteTypes.TRAM, name: 'T1' }],
330
334
  ]);
331
335
 
332
336
  const trips = await parseTrips(
@@ -352,8 +356,8 @@ describe('GTFS trips parser', () => {
352
356
 
353
357
  const validServiceIds: ServiceIds = new Set(['service1', 'service2']);
354
358
  const validRouteIds: GtfsRoutesMap = new Map([
355
- ['routeA', { type: 'BUS', name: 'B1' }],
356
- ['routeB', { type: 'TRAM', name: 'T1' }],
359
+ ['routeA', { type: RouteTypes.BUS, name: 'B1' }],
360
+ ['routeB', { type: RouteTypes.TRAM, name: 'T1' }],
357
361
  ]);
358
362
 
359
363
  const trips = await parseTrips(
@@ -373,8 +377,8 @@ describe('GTFS trips parser', () => {
373
377
 
374
378
  const validServiceIds: ServiceIds = new Set(['service1', 'service2']);
375
379
  const validRouteIds: GtfsRoutesMap = new Map([
376
- ['routeA', { type: 'BUS', name: 'B1' }],
377
- ['routeB', { type: 'TRAM', name: 'T1' }],
380
+ ['routeA', { type: RouteTypes.BUS, name: 'B1' }],
381
+ ['routeB', { type: RouteTypes.TRAM, name: 'T1' }],
378
382
  ]);
379
383
 
380
384
  const trips = await parseTrips(
@@ -439,7 +443,10 @@ describe('GTFS stop times parser', () => {
439
443
  timeFromHMS(8, 10, 0),
440
444
  timeFromHMS(8, 15, 0),
441
445
  ]),
442
- encodePickUpDropOffTypes([REGULAR, REGULAR], [REGULAR, REGULAR]),
446
+ encodePickUpDropOffTypes(
447
+ [PickUpDropOffTypes.REGULAR, PickUpDropOffTypes.REGULAR],
448
+ [PickUpDropOffTypes.REGULAR, PickUpDropOffTypes.REGULAR],
449
+ ),
443
450
  new Uint32Array([0, 1]),
444
451
  0,
445
452
  ),
@@ -509,8 +516,18 @@ describe('GTFS stop times parser', () => {
509
516
  timeFromHMS(9, 15, 0),
510
517
  ]),
511
518
  encodePickUpDropOffTypes(
512
- [REGULAR, REGULAR, REGULAR, REGULAR],
513
- [REGULAR, REGULAR, REGULAR, REGULAR],
519
+ [
520
+ PickUpDropOffTypes.REGULAR,
521
+ PickUpDropOffTypes.REGULAR,
522
+ PickUpDropOffTypes.REGULAR,
523
+ PickUpDropOffTypes.REGULAR,
524
+ ],
525
+ [
526
+ PickUpDropOffTypes.REGULAR,
527
+ PickUpDropOffTypes.REGULAR,
528
+ PickUpDropOffTypes.REGULAR,
529
+ PickUpDropOffTypes.REGULAR,
530
+ ],
514
531
  ),
515
532
  new Uint32Array([0, 1]),
516
533
  0,
@@ -584,8 +601,18 @@ describe('GTFS stop times parser', () => {
584
601
  timeFromHMS(9, 15, 0),
585
602
  ]),
586
603
  encodePickUpDropOffTypes(
587
- [REGULAR, REGULAR, REGULAR, REGULAR],
588
- [REGULAR, REGULAR, REGULAR, REGULAR],
604
+ [
605
+ PickUpDropOffTypes.REGULAR,
606
+ PickUpDropOffTypes.REGULAR,
607
+ PickUpDropOffTypes.REGULAR,
608
+ PickUpDropOffTypes.REGULAR,
609
+ ],
610
+ [
611
+ PickUpDropOffTypes.REGULAR,
612
+ PickUpDropOffTypes.REGULAR,
613
+ PickUpDropOffTypes.REGULAR,
614
+ PickUpDropOffTypes.REGULAR,
615
+ ],
589
616
  ),
590
617
  new Uint32Array([0, 1]),
591
618
  0,
@@ -646,14 +673,20 @@ describe('GTFS stop times parser', () => {
646
673
  timeFromHMS(8, 10, 0),
647
674
  timeFromHMS(8, 15, 0),
648
675
  ]),
649
- encodePickUpDropOffTypes([REGULAR, REGULAR], [REGULAR, REGULAR]),
676
+ encodePickUpDropOffTypes(
677
+ [PickUpDropOffTypes.REGULAR, PickUpDropOffTypes.REGULAR],
678
+ [PickUpDropOffTypes.REGULAR, PickUpDropOffTypes.REGULAR],
679
+ ),
650
680
  new Uint32Array([0, 1]),
651
681
  0,
652
682
  ),
653
683
  new Route(
654
684
  1,
655
685
  new Uint16Array([timeFromHMS(9, 0, 0), timeFromHMS(9, 15, 0)]),
656
- encodePickUpDropOffTypes([REGULAR], [REGULAR]),
686
+ encodePickUpDropOffTypes(
687
+ [PickUpDropOffTypes.REGULAR],
688
+ [PickUpDropOffTypes.REGULAR],
689
+ ),
657
690
  new Uint32Array([0]),
658
691
  0,
659
692
  ),
@@ -704,7 +737,10 @@ describe('GTFS stop times parser', () => {
704
737
  new Route(
705
738
  0,
706
739
  new Uint16Array([timeFromHMS(8, 0, 0), timeFromHMS(8, 5, 0)]),
707
- encodePickUpDropOffTypes([REGULAR], [REGULAR]),
740
+ encodePickUpDropOffTypes(
741
+ [PickUpDropOffTypes.REGULAR],
742
+ [PickUpDropOffTypes.REGULAR],
743
+ ),
708
744
  new Uint32Array([0]),
709
745
  0,
710
746
  ),
@@ -5,6 +5,8 @@ import StreamZip from 'node-stream-zip';
5
5
  import { StopId } from '../stops/stops.js';
6
6
  import { StopsIndex } from '../stops/stopsIndex.js';
7
7
  import { RouteType, Timetable } from '../timetable/timetable.js';
8
+ import { TransferGenerator } from '../transfers/generator.js';
9
+ import { getOrInsert } from '../utils/map.js';
8
10
  import { FrequenciesMap, parseFrequencies } from './frequencies.js';
9
11
  import { standardGtfsProfile } from './profiles/standard.js';
10
12
  import { indexRoutes, parseRoutes } from './routes.js';
@@ -39,11 +41,17 @@ export type GtfsProfile = {
39
41
  export class GtfsParser {
40
42
  private path: string;
41
43
  private profile: GtfsProfile;
44
+ private transferGenerator?: TransferGenerator;
42
45
 
43
- constructor(path: string, profile: GtfsProfile = standardGtfsProfile) {
46
+ constructor(
47
+ path: string,
48
+ profile: GtfsProfile = standardGtfsProfile,
49
+ transferGenerator?: TransferGenerator,
50
+ ) {
44
51
  // TODO: support input from multiple sources
45
52
  this.path = path;
46
53
  this.profile = profile;
54
+ this.transferGenerator = transferGenerator;
47
55
  }
48
56
 
49
57
  /**
@@ -165,6 +173,47 @@ export class GtfsParser {
165
173
  log.info(
166
174
  `${routes.length} valid unique routes. (${(stopTimesEnd - stopTimesStart).toFixed(2)}ms)`,
167
175
  );
176
+
177
+ if (this.transferGenerator) {
178
+ log.info('Generating virtual transfers');
179
+ const virtualTransfersStart = performance.now();
180
+ // Only route-served stops with coordinates are worth connecting: a
181
+ // transfer to a stop no route calls at is a dead end for the router.
182
+ const originStops = Array.from(parsedStops.values()).filter(
183
+ (stop) =>
184
+ activeStopIds.has(stop.id) &&
185
+ stop.lat !== undefined &&
186
+ stop.lon !== undefined,
187
+ );
188
+ const stopsIndex = new StopsIndex(Array.from(parsedStops.values()));
189
+ const generatedTransfers = await this.transferGenerator.generate(
190
+ originStops,
191
+ stopsIndex,
192
+ );
193
+ let addedTransfers = 0;
194
+ for (const [fromStop, newTransfers] of generatedTransfers) {
195
+ const existing = getOrInsert(transfers, fromStop, []);
196
+ // Deduplicate per directed pair against existing (feed) transfers, and
197
+ // only keep transfers into stops a route actually calls at.
198
+ const connected = new Set(existing.map((t) => t.destination));
199
+ for (const transfer of newTransfers) {
200
+ if (
201
+ !activeStopIds.has(transfer.destination) ||
202
+ connected.has(transfer.destination)
203
+ ) {
204
+ continue;
205
+ }
206
+ connected.add(transfer.destination);
207
+ existing.push(transfer);
208
+ addedTransfers += 1;
209
+ }
210
+ }
211
+ const virtualTransfersEnd = performance.now();
212
+ log.info(
213
+ `${addedTransfers} virtual transfers added. (${(virtualTransfersEnd - virtualTransfersStart).toFixed(2)}ms)`,
214
+ );
215
+ }
216
+
168
217
  log.info('Building stops adjacency structure');
169
218
  const stopsAdjacencyStart = performance.now();
170
219
  const stopsAdjacency = buildStopsAdjacencyStructure(
@@ -1,12 +1,13 @@
1
1
  import assert from 'node:assert';
2
2
  import { describe, it } from 'node:test';
3
3
 
4
+ import { RouteTypes } from '../../../timetable/timetable.js';
4
5
  import { extendedGtfsProfile } from '../extended.js';
5
6
 
6
7
  describe('The extended GTFS feed parser', () => {
7
8
  it('should convert the extended route type to GTFS route type', () => {
8
9
  assert.ok(extendedGtfsProfile.routeTypeParser);
9
- assert.equal(extendedGtfsProfile.routeTypeParser(106), 'RAIL');
10
+ assert.equal(extendedGtfsProfile.routeTypeParser(106), RouteTypes.RAIL);
10
11
  });
11
12
  it('should not convert an unknown extended route type', () => {
12
13
  assert.ok(extendedGtfsProfile.routeTypeParser);
@@ -1,4 +1,4 @@
1
- import { RouteType } from '../../timetable/timetable.js';
1
+ import { RouteType, RouteTypes } from '../../timetable/timetable.js';
2
2
  import { GtfsProfile } from '../parser.js';
3
3
  import { Maybe } from '../utils.js';
4
4
 
@@ -30,7 +30,7 @@ const routeTypeParser = (routeType: number): Maybe<RouteType> => {
30
30
  case 115: // Vehicle Transport Rail Service
31
31
  case 116: // Rack and Pinion Railway (Rochers de Naye, Dolderbahn)
32
32
  case 117: // Additional Rail Service
33
- return 'RAIL';
33
+ return RouteTypes.RAIL;
34
34
 
35
35
  // Coach Service (200-299)
36
36
  case 200: // Coach Service
@@ -43,7 +43,7 @@ const routeTypeParser = (routeType: number): Maybe<RouteType> => {
43
43
  case 207: // Tourist Coach Service
44
44
  case 208: // Commuter Coach Service
45
45
  case 209: // All Coach Services
46
- return 'BUS';
46
+ return RouteTypes.BUS;
47
47
 
48
48
  // Urban Railway Service (400-499)
49
49
  case 400: // Urban Railway Service
@@ -51,10 +51,10 @@ const routeTypeParser = (routeType: number): Maybe<RouteType> => {
51
51
  case 402: // Underground Service (London Underground, U-Bahn)
52
52
  case 403: // Urban Railway Service
53
53
  case 404: // All Urban Railway Services
54
- return 'SUBWAY';
54
+ return RouteTypes.SUBWAY;
55
55
 
56
56
  case 405: // Monorail
57
- return 'MONORAIL';
57
+ return RouteTypes.MONORAIL;
58
58
 
59
59
  // Bus Service (700-799)
60
60
  case 700: // Bus Service
@@ -74,11 +74,11 @@ const routeTypeParser = (routeType: number): Maybe<RouteType> => {
74
74
  case 714: // Rail Replacement Bus Service
75
75
  case 715: // Demand and Response Bus Service
76
76
  case 716: // All Bus Services
77
- return 'BUS';
77
+ return RouteTypes.BUS;
78
78
 
79
79
  // Trolleybus Service (800-899)
80
80
  case 800: // Trolleybus Service
81
- return 'TROLLEYBUS';
81
+ return RouteTypes.TROLLEYBUS;
82
82
 
83
83
  // Tram Service (900-999)
84
84
  case 900: // Tram Service
@@ -88,11 +88,11 @@ const routeTypeParser = (routeType: number): Maybe<RouteType> => {
88
88
  case 904: // Sightseeing Tram Service (Blackpool Seafront)
89
89
  case 905: // Shuttle Tram Service
90
90
  case 906: // All Tram Services
91
- return 'TRAM';
91
+ return RouteTypes.TRAM;
92
92
 
93
93
  // Water Transport Service (1000-1099)
94
94
  case 1000: // Water Transport Service
95
- return 'FERRY';
95
+ return RouteTypes.FERRY;
96
96
 
97
97
  // Air Service (1100-1199)
98
98
  case 1100: // Air Service
@@ -100,7 +100,7 @@ const routeTypeParser = (routeType: number): Maybe<RouteType> => {
100
100
 
101
101
  // Ferry Service (1200-1299)
102
102
  case 1200: // Ferry Service
103
- return 'FERRY';
103
+ return RouteTypes.FERRY;
104
104
 
105
105
  // Aerial Lift Service (1300-1399)
106
106
  case 1300: // Aerial Lift Service (Telefèric de Montjuïc, Roosevelt Island Tramway)
@@ -110,11 +110,11 @@ const routeTypeParser = (routeType: number): Maybe<RouteType> => {
110
110
  case 1305: // Drag Lift Service
111
111
  case 1306: // Small Telecabin Service
112
112
  case 1307: // All Telecabin Services
113
- return 'AERIAL_LIFT';
113
+ return RouteTypes.AERIAL_LIFT;
114
114
 
115
115
  case 1303: // Elevator Service (Ascenseur, Aufzug)
116
116
  case 1400: // Funicular Service (Rigiblick)
117
- return 'FUNICULAR';
117
+ return RouteTypes.FUNICULAR;
118
118
 
119
119
  // Taxi Service (1500-1599)
120
120
  case 1500: // Taxi Service
@@ -127,14 +127,14 @@ const routeTypeParser = (routeType: number): Maybe<RouteType> => {
127
127
  return undefined;
128
128
 
129
129
  case 1501: // Communal Taxi Service (Marshrutka, dolmuş)
130
- return 'BUS';
130
+ return RouteTypes.BUS;
131
131
 
132
132
  // Miscellaneous Service (1700-1799)
133
133
  case 1700: // Miscellaneous Service / Unknown mode
134
134
  return undefined;
135
135
 
136
136
  case 1702: // Horse-drawn Carriage
137
- return 'BUS';
137
+ return RouteTypes.BUS;
138
138
 
139
139
  default:
140
140
  return undefined;
@@ -1,28 +1,29 @@
1
+ import { RouteTypes } from '../../timetable/timetable.js';
1
2
  import { GtfsProfile } from '../parser.js';
2
3
 
3
4
  export const standardGtfsProfile: GtfsProfile = {
4
5
  routeTypeParser: (routeType: number) => {
5
6
  switch (routeType) {
6
7
  case 0:
7
- return 'TRAM';
8
+ return RouteTypes.TRAM;
8
9
  case 1:
9
- return 'SUBWAY';
10
+ return RouteTypes.SUBWAY;
10
11
  case 2:
11
- return 'RAIL';
12
+ return RouteTypes.RAIL;
12
13
  case 3:
13
- return 'BUS';
14
+ return RouteTypes.BUS;
14
15
  case 4:
15
- return 'FERRY';
16
+ return RouteTypes.FERRY;
16
17
  case 5:
17
- return 'CABLE_TRAM';
18
+ return RouteTypes.CABLE_TRAM;
18
19
  case 6:
19
- return 'AERIAL_LIFT';
20
+ return RouteTypes.AERIAL_LIFT;
20
21
  case 7:
21
- return 'FUNICULAR';
22
+ return RouteTypes.FUNICULAR;
22
23
  case 11:
23
- return 'TROLLEYBUS';
24
+ return RouteTypes.TROLLEYBUS;
24
25
  case 12:
25
- return 'MONORAIL';
26
+ return RouteTypes.MONORAIL;
26
27
  default:
27
28
  return undefined;
28
29
  }
@@ -1,7 +1,10 @@
1
1
  import log from 'loglevel';
2
2
 
3
- import { RouteType } from '../router.js';
4
- import { ServiceRoute, ServiceRouteId } from '../timetable/timetable.js';
3
+ import {
4
+ RouteType,
5
+ ServiceRoute,
6
+ ServiceRouteId,
7
+ } from '../timetable/timetable.js';
5
8
  import { GtfsProfile } from './parser.js';
6
9
  import { standardGtfsProfile } from './profiles/standard.js';
7
10
  import { parseCsv } from './utils.js';
@@ -8,6 +8,7 @@ import {
8
8
  Timetable,
9
9
  Transfer,
10
10
  TransferType,
11
+ TransferTypes,
11
12
  TripStop,
12
13
  TripTransfers as TripTransfers,
13
14
  } from '../timetable/timetable.js';
@@ -121,7 +122,7 @@ const processGuaranteedStopTransfer = (
121
122
 
122
123
  const transfer: Transfer = {
123
124
  destination: toStop,
124
- type: 'GUARANTEED',
125
+ type: TransferTypes.GUARANTEED,
125
126
  ...(transferEntry.min_transfer_time !== undefined && {
126
127
  minTransferTime: durationFromSeconds(transferEntry.min_transfer_time),
127
128
  }),
@@ -404,12 +405,12 @@ const parseGtfsTransferType = (
404
405
  switch (gtfsTransferType) {
405
406
  case 0:
406
407
  default:
407
- return 'RECOMMENDED';
408
+ return TransferTypes.RECOMMENDED;
408
409
  case 1:
409
- return 'GUARANTEED';
410
+ return TransferTypes.GUARANTEED;
410
411
  case 2:
411
- return 'REQUIRES_MINIMAL_TIME';
412
+ return TransferTypes.REQUIRES_MINIMAL_TIME;
412
413
  case 4:
413
- return 'IN_SEAT';
414
+ return TransferTypes.IN_SEAT;
414
415
  }
415
416
  };
package/src/gtfs/trips.ts CHANGED
@@ -2,15 +2,8 @@ import log from 'loglevel';
2
2
 
3
3
  import { SourceStopId, StopId } from '../stops/stops.js';
4
4
  import { SerializedRoute } from '../timetable/io.js';
5
- import {
6
- MUST_COORDINATE_WITH_DRIVER,
7
- MUST_PHONE_AGENCY,
8
- NOT_AVAILABLE,
9
- REGULAR,
10
- Route,
11
- RouteId,
12
- TripRouteIndex,
13
- } from '../timetable/route.js';
5
+ import type { RouteId, TripRouteIndex } from '../timetable/route.js';
6
+ import { PickUpDropOffTypes, Route } from '../timetable/route.js';
14
7
  import {
15
8
  ServiceRoute,
16
9
  ServiceRouteId,
@@ -470,14 +463,14 @@ const parsePickupDropOffType = (
470
463
  ): SerializedPickUpDropOffType => {
471
464
  switch (gtfsType) {
472
465
  default:
473
- return REGULAR;
466
+ return PickUpDropOffTypes.REGULAR;
474
467
  case '0':
475
- return REGULAR;
468
+ return PickUpDropOffTypes.REGULAR;
476
469
  case '1':
477
- return NOT_AVAILABLE;
470
+ return PickUpDropOffTypes.NOT_AVAILABLE;
478
471
  case '2':
479
- return MUST_PHONE_AGENCY;
472
+ return PickUpDropOffTypes.MUST_PHONE_AGENCY;
480
473
  case '3':
481
- return MUST_COORDINATE_WITH_DRIVER;
474
+ return PickUpDropOffTypes.MUST_COORDINATE_WITH_DRIVER;
482
475
  }
483
476
  };
package/src/parser.ts CHANGED
@@ -2,6 +2,24 @@ import type { GtfsProfile } from './gtfs/parser.js';
2
2
  import { GtfsParser } from './gtfs/parser.js';
3
3
  import { extendedGtfsProfile } from './gtfs/profiles/extended.js';
4
4
  import { standardGtfsProfile } from './gtfs/profiles/standard.js';
5
+ import { TransferTypes } from './timetable/timetable.js';
6
+ import type {
7
+ GeneratedTransfers,
8
+ TransferGenerator,
9
+ } from './transfers/generator.js';
10
+ import type { StraightLineTransferGeneratorOptions } from './transfers/straightLineTransferGenerator.js';
11
+ import { StraightLineTransferGenerator } from './transfers/straightLineTransferGenerator.js';
5
12
 
6
- export { extendedGtfsProfile, GtfsParser, standardGtfsProfile };
7
- export type { GtfsProfile };
13
+ export {
14
+ extendedGtfsProfile,
15
+ GtfsParser,
16
+ standardGtfsProfile,
17
+ StraightLineTransferGenerator,
18
+ TransferTypes,
19
+ };
20
+ export type {
21
+ GeneratedTransfers,
22
+ GtfsProfile,
23
+ StraightLineTransferGeneratorOptions,
24
+ TransferGenerator,
25
+ };
package/src/router.ts CHANGED
@@ -2,7 +2,12 @@ import { Plotter } from './routing/plotter.js';
2
2
  import type { QueryOptions, RangeQueryOptions } from './routing/query.js';
3
3
  import { Query, RangeQuery } from './routing/query.js';
4
4
  import { Result } from './routing/result.js';
5
- import type { Leg, Transfer, VehicleLeg } from './routing/route.js';
5
+ import type {
6
+ Leg,
7
+ ServiceRouteInfo,
8
+ Transfer,
9
+ VehicleLeg,
10
+ } from './routing/route.js';
6
11
  import { Route } from './routing/route.js';
7
12
  import type {
8
13
  Arrival,
@@ -13,11 +18,11 @@ import { RangeResult, Router } from './routing/router.js';
13
18
  import type { LocationType, SourceStopId, StopId } from './stops/stops.js';
14
19
  import type { Stop } from './stops/stops.js';
15
20
  import { StopsIndex } from './stops/stopsIndex.js';
21
+ import type { PickUpDropOffTypeString } from './timetable/route.js';
16
22
  import type { Duration, Time } from './timetable/time.js';
17
23
  import type {
18
- RouteType,
19
- ServiceRouteInfo,
20
- TransferType,
24
+ RouteTypeString,
25
+ TransferTypeString,
21
26
  } from './timetable/timetable.js';
22
27
  import { Timetable } from './timetable/timetable.js';
23
28
 
@@ -41,14 +46,15 @@ export type {
41
46
  Leg,
42
47
  LocationType,
43
48
  ParetoRun,
49
+ PickUpDropOffTypeString as PickUpDropOffType,
44
50
  QueryOptions,
45
51
  RangeQueryOptions,
46
- RouteType,
52
+ RouteTypeString as RouteType,
47
53
  ServiceRouteInfo,
48
54
  SourceStopId,
49
55
  Stop,
50
56
  StopId,
51
57
  Transfer,
52
- TransferType,
58
+ TransferTypeString as TransferType,
53
59
  VehicleLeg,
54
60
  };
@@ -7,9 +7,11 @@ import { StopsIndex } from '../../stops/stopsIndex.js';
7
7
  import { Route } from '../../timetable/route.js';
8
8
  import { timeFromHM } from '../../timetable/time.js';
9
9
  import {
10
+ RouteTypes,
10
11
  ServiceRoute,
11
12
  StopAdjacency,
12
13
  Timetable,
14
+ TransferTypes,
13
15
  } from '../../timetable/timetable.js';
14
16
  import { AccessFinder, AccessPoint } from '../access.js';
15
17
 
@@ -20,8 +22,12 @@ import { AccessFinder, AccessPoint } from '../access.js';
20
22
  const stopsAdjacency: StopAdjacency[] = [
21
23
  {
22
24
  transfers: [
23
- { destination: 1, type: 'REQUIRES_MINIMAL_TIME', minTransferTime: 5 },
24
- { destination: 2, type: 'GUARANTEED' },
25
+ {
26
+ destination: 1,
27
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
28
+ minTransferTime: 5,
29
+ },
30
+ { destination: 2, type: TransferTypes.GUARANTEED },
25
31
  ],
26
32
  routes: [],
27
33
  },
@@ -67,7 +73,7 @@ const routesAdjacency = [
67
73
  ];
68
74
 
69
75
  const serviceRoutes: ServiceRoute[] = [
70
- { type: 'BUS', name: 'Line 1', routes: [0] },
76
+ { type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
71
77
  ];
72
78
 
73
79
  const stops: Stop[] = [
@@ -125,7 +131,9 @@ describe('AccessFinder', () => {
125
131
  // Temporarily use a timetable where the transfer has no minTransferTime.
126
132
  const adj: StopAdjacency[] = [
127
133
  {
128
- transfers: [{ destination: 1, type: 'REQUIRES_MINIMAL_TIME' }],
134
+ transfers: [
135
+ { destination: 1, type: TransferTypes.REQUIRES_MINIMAL_TIME },
136
+ ],
129
137
  routes: [],
130
138
  },
131
139
  { routes: [0] },
@@ -157,7 +165,7 @@ describe('AccessFinder', () => {
157
165
  transfers: [
158
166
  {
159
167
  destination: 1,
160
- type: 'REQUIRES_MINIMAL_TIME',
168
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
161
169
  minTransferTime: 8,
162
170
  },
163
171
  ],
@@ -167,7 +175,7 @@ describe('AccessFinder', () => {
167
175
  transfers: [
168
176
  {
169
177
  destination: 1,
170
- type: 'REQUIRES_MINIMAL_TIME',
178
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
171
179
  minTransferTime: 3,
172
180
  },
173
181
  ],