minotor 11.5.2 → 12.0.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.
@@ -1,11 +1,8 @@
1
1
  import { Stop } from '../stops/stops.js';
2
- import type { PickUpDropOffTypeString } from '../timetable/route.js';
2
+ import type { PickUpDropOffType } from '../timetable/route.js';
3
3
  import { Duration, Time } from '../timetable/time.js';
4
- import type { RouteTypeString, TransferTypeString } from '../timetable/timetable.js';
5
- export type ServiceRouteInfo = {
6
- type: RouteTypeString;
7
- name: string;
8
- };
4
+ import type { ServiceRouteInfo, TransferType } from '../timetable/timetable.js';
5
+ export type { ServiceRouteInfo } from '../timetable/timetable.js';
9
6
  export type BaseLeg = {
10
7
  from: Stop;
11
8
  to: Stop;
@@ -15,14 +12,14 @@ export type Access = BaseLeg & {
15
12
  };
16
13
  export type Transfer = BaseLeg & {
17
14
  minTransferTime?: Duration;
18
- type: TransferTypeString;
15
+ type: TransferType;
19
16
  };
20
17
  export type VehicleLeg = BaseLeg & {
21
18
  route: ServiceRouteInfo;
22
19
  departureTime: Time;
23
20
  arrivalTime: Time;
24
- pickUpType: PickUpDropOffTypeString;
25
- dropOffType: PickUpDropOffTypeString;
21
+ pickUpType: PickUpDropOffType;
22
+ dropOffType: PickUpDropOffType;
26
23
  };
27
24
  export type Leg = Transfer | Access | VehicleLeg;
28
25
  /**
@@ -17,7 +17,8 @@ export declare const PickUpDropOffTypes: {
17
17
  };
18
18
  export type PickUpDropOffType = (typeof PickUpDropOffTypes)[keyof typeof PickUpDropOffTypes];
19
19
  export type PickUpDropOffTypeString = keyof typeof PickUpDropOffTypes;
20
- export type RawPickUpDropOffType = PickUpDropOffType;
20
+ /** Returns the identifier name for a pickup/drop-off type. */
21
+ export declare const pickUpDropOffTypeToString: (type: PickUpDropOffType) => PickUpDropOffTypeString;
21
22
  export type TripRouteIndex = number;
22
23
  export type StopRouteIndex = number;
23
24
  /**
@@ -156,7 +157,7 @@ export declare class Route {
156
157
  * @param offset - Precomputed value from {@link tripStopOffset}.
157
158
  * @returns The drop-off type at the specified stop.
158
159
  */
159
- dropOffTypeAtOffset(stopIndex: StopRouteIndex, offset: number): RawPickUpDropOffType;
160
+ dropOffTypeAtOffset(stopIndex: StopRouteIndex, offset: number): PickUpDropOffType;
160
161
  /**
161
162
  * Retrieves the departure time at a specific stop for a given trip.
162
163
  *
@@ -172,7 +173,7 @@ export declare class Route {
172
173
  * @param tripIndex - The index of the trip.
173
174
  * @returns The pick-up type at the specified stop and trip.
174
175
  */
175
- pickUpTypeFrom(stopIndex: StopRouteIndex, tripIndex: TripRouteIndex): RawPickUpDropOffType;
176
+ pickUpTypeFrom(stopIndex: StopRouteIndex, tripIndex: TripRouteIndex): PickUpDropOffType;
176
177
  /**
177
178
  * Retrieves the drop-off type for a specific stop and trip.
178
179
  *
@@ -180,7 +181,7 @@ export declare class Route {
180
181
  * @param tripIndex - The index of the trip.
181
182
  * @returns The drop-off type at the specified stop and trip.
182
183
  */
183
- dropOffTypeAt(stopIndex: StopRouteIndex, tripIndex: TripRouteIndex): RawPickUpDropOffType;
184
+ dropOffTypeAt(stopIndex: StopRouteIndex, tripIndex: TripRouteIndex): PickUpDropOffType;
184
185
  /**
185
186
  * Finds the earliest trip that can be taken from a specific stop on a given route,
186
187
  * optionally constrained by a latest trip index and a time before which the trip
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "minotor",
3
- "version": "11.5.2",
3
+ "version": "12.0.0",
4
4
  "description": "A lightweight client-side transit routing library.",
5
5
  "keywords": [
6
6
  "minotor",
@@ -3,18 +3,17 @@ import { describe, it } from 'node:test';
3
3
 
4
4
  import fs from 'fs';
5
5
 
6
- import type {
7
- ServiceRouteInfo,
8
- TransferType as TransferTypeString,
9
- } from '../router.js';
6
+ import type { ServiceRouteInfo, TransferType } from '../router.js';
10
7
  import {
11
8
  Query,
12
9
  RangeQuery,
13
10
  Route,
14
11
  Router,
12
+ RouteTypes,
15
13
  Stop,
16
14
  StopsIndex,
17
15
  Timetable,
16
+ TransferTypes,
18
17
  } from '../router.js';
19
18
  import { timeFromString, timeToString } from '../timetable/time.js';
20
19
 
@@ -31,7 +30,7 @@ type ExpectedVehicleLeg = {
31
30
  type ExpectedTransferLeg = {
32
31
  from: StopRef;
33
32
  to: StopRef;
34
- type: TransferTypeString;
33
+ type: TransferType;
35
34
  minTransferTime?: number;
36
35
  };
37
36
 
@@ -121,12 +120,12 @@ const pointRoutes: {
121
120
  to: { name: 'Bulle', platform: '2' },
122
121
  departure: '08:34',
123
122
  arrival: '09:10',
124
- route: { type: 'RAIL', name: 'RE2' },
123
+ route: { type: RouteTypes.RAIL, name: 'RE2' },
125
124
  },
126
125
  {
127
126
  from: { name: 'Bulle', platform: '2' },
128
127
  to: { name: 'Bulle', platform: '4' },
129
- type: 'REQUIRES_MINIMAL_TIME',
128
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
130
129
  minTransferTime: 3,
131
130
  },
132
131
  {
@@ -134,12 +133,12 @@ const pointRoutes: {
134
133
  to: { name: 'Gruyères', platform: '1' },
135
134
  departure: '09:20',
136
135
  arrival: '09:28',
137
- route: { type: 'RAIL', name: 'S51' },
136
+ route: { type: RouteTypes.RAIL, name: 'S51' },
138
137
  },
139
138
  {
140
139
  from: { name: 'Gruyères', platform: '1' },
141
140
  to: { name: 'Gruyères, gare', platform: 'B' },
142
- type: 'REQUIRES_MINIMAL_TIME',
141
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
143
142
  minTransferTime: 2,
144
143
  },
145
144
  {
@@ -147,7 +146,7 @@ const pointRoutes: {
147
146
  to: { name: 'Moléson-sur-Gruyères' },
148
147
  departure: '09:33',
149
148
  arrival: '09:44',
150
- route: { type: 'BUS', name: '263' },
149
+ route: { type: RouteTypes.BUS, name: '263' },
151
150
  },
152
151
  ],
153
152
  },
@@ -161,12 +160,12 @@ const pointRoutes: {
161
160
  to: { name: 'Zürich HB', platform: '33' },
162
161
  departure: '12:31',
163
162
  arrival: '13:28',
164
- route: { type: 'RAIL', name: 'IC1' },
163
+ route: { type: RouteTypes.RAIL, name: 'IC1' },
165
164
  },
166
165
  {
167
166
  from: { name: 'Zürich HB', platform: '33' },
168
167
  to: { name: 'Zürich HB', platform: '6' },
169
- type: 'REQUIRES_MINIMAL_TIME',
168
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
170
169
  minTransferTime: 7,
171
170
  },
172
171
  {
@@ -174,12 +173,12 @@ const pointRoutes: {
174
173
  to: { name: 'Chur', platform: '9' },
175
174
  departure: '13:38',
176
175
  arrival: '14:52',
177
- route: { type: 'RAIL', name: 'IC3' },
176
+ route: { type: RouteTypes.RAIL, name: 'IC3' },
178
177
  },
179
178
  {
180
179
  from: { name: 'Chur', platform: '9' },
181
180
  to: { name: 'Chur', platform: '10' },
182
- type: 'REQUIRES_MINIMAL_TIME',
181
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
183
182
  minTransferTime: 3,
184
183
  },
185
184
  {
@@ -187,7 +186,7 @@ const pointRoutes: {
187
186
  to: { name: 'St. Moritz', platform: '1' },
188
187
  departure: '14:58',
189
188
  arrival: '16:55',
190
- route: { type: 'RAIL', name: 'IR38' },
189
+ route: { type: RouteTypes.RAIL, name: 'IR38' },
191
190
  },
192
191
  ],
193
192
  },
@@ -201,14 +200,14 @@ const pointRoutes: {
201
200
  to: { name: 'Saint-Louis (Haut-Rhin)' },
202
201
  departure: '17:08',
203
202
  arrival: '17:16',
204
- route: { type: 'RAIL', name: 'TER' },
203
+ route: { type: RouteTypes.RAIL, name: 'TER' },
205
204
  },
206
205
  {
207
206
  from: { name: 'Saint-Louis (Haut-Rhin)' },
208
207
  to: { name: 'Strasbourg' },
209
208
  departure: '17:30',
210
209
  arrival: '18:39',
211
- route: { type: 'RAIL', name: 'K200' },
210
+ route: { type: RouteTypes.RAIL, name: 'K200' },
212
211
  },
213
212
  ],
214
213
  },
@@ -222,12 +221,12 @@ const pointRoutes: {
222
221
  to: { name: 'Bern', platform: '10' },
223
222
  departure: '08:33',
224
223
  arrival: '08:56',
225
- route: { type: 'RAIL', name: 'IR15' },
224
+ route: { type: RouteTypes.RAIL, name: 'IR15' },
226
225
  },
227
226
  {
228
227
  from: { name: 'Bern', platform: '10' },
229
228
  to: { name: 'Bern', platform: '2' },
230
- type: 'REQUIRES_MINIMAL_TIME',
229
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
231
230
  minTransferTime: 6,
232
231
  },
233
232
  {
@@ -235,12 +234,12 @@ const pointRoutes: {
235
234
  to: { name: 'Zürich HB', platform: '34' },
236
235
  departure: '09:02',
237
236
  arrival: '09:58',
238
- route: { type: 'RAIL', name: 'IC81' },
237
+ route: { type: RouteTypes.RAIL, name: 'IC81' },
239
238
  },
240
239
  {
241
240
  from: { name: 'Zürich HB', platform: '34' },
242
241
  to: { name: 'Zürich HB', platform: '10' },
243
- type: 'REQUIRES_MINIMAL_TIME',
242
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
244
243
  minTransferTime: 7,
245
244
  },
246
245
  {
@@ -248,12 +247,12 @@ const pointRoutes: {
248
247
  to: { name: 'Landquart', platform: '2' },
249
248
  departure: '10:07',
250
249
  arrival: '11:11',
251
- route: { type: 'RAIL', name: 'IC3' },
250
+ route: { type: RouteTypes.RAIL, name: 'IC3' },
252
251
  },
253
252
  {
254
253
  from: { name: 'Landquart', platform: '2' },
255
254
  to: { name: 'Landquart', platform: '6' },
256
- type: 'REQUIRES_MINIMAL_TIME',
255
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
257
256
  minTransferTime: 4,
258
257
  },
259
258
  {
@@ -261,7 +260,7 @@ const pointRoutes: {
261
260
  to: { name: 'Davos Platz', platform: '2' },
262
261
  departure: '11:20',
263
262
  arrival: '12:27',
264
- route: { type: 'RAIL', name: 'RE13' },
263
+ route: { type: RouteTypes.RAIL, name: 'RE13' },
265
264
  },
266
265
  ],
267
266
  },
@@ -275,12 +274,12 @@ const pointRoutes: {
275
274
  to: { name: 'Bulle', platform: '2' },
276
275
  departure: '09:04',
277
276
  arrival: '09:40',
278
- route: { type: 'RAIL', name: 'RE3' },
277
+ route: { type: RouteTypes.RAIL, name: 'RE3' },
279
278
  },
280
279
  {
281
280
  from: { name: 'Bulle', platform: '2' },
282
281
  to: { name: 'Bulle', platform: '4' },
283
- type: 'REQUIRES_MINIMAL_TIME',
282
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
284
283
  minTransferTime: 3,
285
284
  },
286
285
  {
@@ -288,12 +287,12 @@ const pointRoutes: {
288
287
  to: { name: 'Gruyères', platform: '2' },
289
288
  departure: '09:50',
290
289
  arrival: '09:57',
291
- route: { type: 'RAIL', name: 'S50' },
290
+ route: { type: RouteTypes.RAIL, name: 'S50' },
292
291
  },
293
292
  {
294
293
  from: { name: 'Gruyères', platform: '2' },
295
294
  to: { name: 'Gruyères, gare', platform: 'B' },
296
- type: 'REQUIRES_MINIMAL_TIME',
295
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
297
296
  minTransferTime: 2,
298
297
  },
299
298
  {
@@ -301,12 +300,12 @@ const pointRoutes: {
301
300
  to: { name: 'Moléson-sur-Gruyères' },
302
301
  departure: '10:33',
303
302
  arrival: '10:44',
304
- route: { type: 'BUS', name: '263' },
303
+ route: { type: RouteTypes.BUS, name: '263' },
305
304
  },
306
305
  {
307
306
  from: { name: 'Moléson-sur-Gruyères' },
308
307
  to: { name: 'Moléson-sur-Gruyères (funi)' },
309
- type: 'REQUIRES_MINIMAL_TIME',
308
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
310
309
  minTransferTime: 2,
311
310
  },
312
311
  {
@@ -314,7 +313,7 @@ const pointRoutes: {
314
313
  to: { name: 'Plan-Francey' },
315
314
  departure: '11:00',
316
315
  arrival: '11:05',
317
- route: { type: 'FUNICULAR', name: 'FUN' },
316
+ route: { type: RouteTypes.FUNICULAR, name: 'FUN' },
318
317
  },
319
318
  ],
320
319
  },
@@ -342,12 +341,12 @@ const rangeRoutes: {
342
341
  to: { name: 'Bulle', platform: '2' },
343
342
  departure: '09:34',
344
343
  arrival: '10:10',
345
- route: { type: 'RAIL', name: 'RE2' },
344
+ route: { type: RouteTypes.RAIL, name: 'RE2' },
346
345
  },
347
346
  {
348
347
  from: { name: 'Bulle', platform: '2' },
349
348
  to: { name: 'Bulle', platform: '4' },
350
- type: 'REQUIRES_MINIMAL_TIME',
349
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
351
350
  minTransferTime: 3,
352
351
  },
353
352
  {
@@ -355,12 +354,12 @@ const rangeRoutes: {
355
354
  to: { name: 'Gruyères', platform: '1' },
356
355
  departure: '10:20',
357
356
  arrival: '10:28',
358
- route: { type: 'RAIL', name: 'S51' },
357
+ route: { type: RouteTypes.RAIL, name: 'S51' },
359
358
  },
360
359
  {
361
360
  from: { name: 'Gruyères', platform: '1' },
362
361
  to: { name: 'Gruyères, gare', platform: 'B' },
363
- type: 'REQUIRES_MINIMAL_TIME',
362
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
364
363
  minTransferTime: 2,
365
364
  },
366
365
  {
@@ -368,7 +367,7 @@ const rangeRoutes: {
368
367
  to: { name: 'Moléson-sur-Gruyères' },
369
368
  departure: '10:33',
370
369
  arrival: '10:44',
371
- route: { type: 'BUS', name: '263' },
370
+ route: { type: RouteTypes.BUS, name: '263' },
372
371
  },
373
372
  ],
374
373
  },
@@ -380,12 +379,12 @@ const rangeRoutes: {
380
379
  to: { name: 'Bulle', platform: '2' },
381
380
  departure: '08:34',
382
381
  arrival: '09:10',
383
- route: { type: 'RAIL', name: 'RE2' },
382
+ route: { type: RouteTypes.RAIL, name: 'RE2' },
384
383
  },
385
384
  {
386
385
  from: { name: 'Bulle', platform: '2' },
387
386
  to: { name: 'Bulle', platform: '4' },
388
- type: 'REQUIRES_MINIMAL_TIME',
387
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
389
388
  minTransferTime: 3,
390
389
  },
391
390
  {
@@ -393,12 +392,12 @@ const rangeRoutes: {
393
392
  to: { name: 'Gruyères', platform: '1' },
394
393
  departure: '09:20',
395
394
  arrival: '09:28',
396
- route: { type: 'RAIL', name: 'S51' },
395
+ route: { type: RouteTypes.RAIL, name: 'S51' },
397
396
  },
398
397
  {
399
398
  from: { name: 'Gruyères', platform: '1' },
400
399
  to: { name: 'Gruyères, gare', platform: 'B' },
401
- type: 'REQUIRES_MINIMAL_TIME',
400
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
402
401
  minTransferTime: 2,
403
402
  },
404
403
  {
@@ -406,7 +405,7 @@ const rangeRoutes: {
406
405
  to: { name: 'Moléson-sur-Gruyères' },
407
406
  departure: '09:33',
408
407
  arrival: '09:44',
409
- route: { type: 'BUS', name: '263' },
408
+ route: { type: RouteTypes.BUS, name: '263' },
410
409
  },
411
410
  ],
412
411
  },
@@ -426,7 +425,7 @@ const rangeRoutes: {
426
425
  to: { name: 'Strasbourg' },
427
426
  departure: '17:21',
428
427
  arrival: '18:39',
429
- route: { type: 'RAIL', name: 'TER' },
428
+ route: { type: RouteTypes.RAIL, name: 'TER' },
430
429
  },
431
430
  ],
432
431
  },
@@ -438,14 +437,14 @@ const rangeRoutes: {
438
437
  to: { name: 'Saint-Louis (Haut-Rhin)' },
439
438
  departure: '16:38',
440
439
  arrival: '16:46',
441
- route: { type: 'RAIL', name: 'TER' },
440
+ route: { type: RouteTypes.RAIL, name: 'TER' },
442
441
  },
443
442
  {
444
443
  from: { name: 'Saint-Louis (Haut-Rhin)' },
445
444
  to: { name: 'Strasbourg' },
446
445
  departure: '16:54',
447
446
  arrival: '18:09',
448
- route: { type: 'RAIL', name: 'K200' },
447
+ route: { type: RouteTypes.RAIL, name: 'K200' },
449
448
  },
450
449
  ],
451
450
  },
@@ -465,12 +464,12 @@ const rangeRoutes: {
465
464
  to: { name: 'Bern', platform: '10' },
466
465
  departure: '08:33',
467
466
  arrival: '08:56',
468
- route: { type: 'RAIL', name: 'IR15' },
467
+ route: { type: RouteTypes.RAIL, name: 'IR15' },
469
468
  },
470
469
  {
471
470
  from: { name: 'Bern', platform: '10' },
472
471
  to: { name: 'Bern', platform: '2' },
473
- type: 'REQUIRES_MINIMAL_TIME',
472
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
474
473
  minTransferTime: 6,
475
474
  },
476
475
  {
@@ -478,12 +477,12 @@ const rangeRoutes: {
478
477
  to: { name: 'Zürich HB', platform: '34' },
479
478
  departure: '09:02',
480
479
  arrival: '09:58',
481
- route: { type: 'RAIL', name: 'IC81' },
480
+ route: { type: RouteTypes.RAIL, name: 'IC81' },
482
481
  },
483
482
  {
484
483
  from: { name: 'Zürich HB', platform: '34' },
485
484
  to: { name: 'Zürich HB', platform: '10' },
486
- type: 'REQUIRES_MINIMAL_TIME',
485
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
487
486
  minTransferTime: 7,
488
487
  },
489
488
  {
@@ -491,12 +490,12 @@ const rangeRoutes: {
491
490
  to: { name: 'Landquart', platform: '2' },
492
491
  departure: '10:07',
493
492
  arrival: '11:11',
494
- route: { type: 'RAIL', name: 'IC3' },
493
+ route: { type: RouteTypes.RAIL, name: 'IC3' },
495
494
  },
496
495
  {
497
496
  from: { name: 'Landquart', platform: '2' },
498
497
  to: { name: 'Landquart', platform: '6' },
499
- type: 'REQUIRES_MINIMAL_TIME',
498
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
500
499
  minTransferTime: 4,
501
500
  },
502
501
  {
@@ -504,7 +503,7 @@ const rangeRoutes: {
504
503
  to: { name: 'Davos Platz', platform: '2' },
505
504
  departure: '11:20',
506
505
  arrival: '12:27',
507
- route: { type: 'RAIL', name: 'RE13' },
506
+ route: { type: RouteTypes.RAIL, name: 'RE13' },
508
507
  },
509
508
  ],
510
509
  },
@@ -516,12 +515,12 @@ const rangeRoutes: {
516
515
  to: { name: 'Zürich HB', platform: '33' },
517
516
  departure: '08:03',
518
517
  arrival: '09:28',
519
- route: { type: 'RAIL', name: 'IC1' },
518
+ route: { type: RouteTypes.RAIL, name: 'IC1' },
520
519
  },
521
520
  {
522
521
  from: { name: 'Zürich HB', platform: '33' },
523
522
  to: { name: 'Zürich HB', platform: '4' },
524
- type: 'REQUIRES_MINIMAL_TIME',
523
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
525
524
  minTransferTime: 7,
526
525
  },
527
526
  {
@@ -529,12 +528,12 @@ const rangeRoutes: {
529
528
  to: { name: 'Landquart', platform: '2' },
530
529
  departure: '09:38',
531
530
  arrival: '10:41',
532
- route: { type: 'RAIL', name: 'IC3' },
531
+ route: { type: RouteTypes.RAIL, name: 'IC3' },
533
532
  },
534
533
  {
535
534
  from: { name: 'Landquart', platform: '2' },
536
535
  to: { name: 'Landquart', platform: '6' },
537
- type: 'REQUIRES_MINIMAL_TIME',
536
+ type: TransferTypes.REQUIRES_MINIMAL_TIME,
538
537
  minTransferTime: 4,
539
538
  },
540
539
  {
@@ -542,7 +541,7 @@ const rangeRoutes: {
542
541
  to: { name: 'Davos Platz', platform: '1' },
543
542
  departure: '10:49',
544
543
  arrival: '12:03',
545
- route: { type: 'RAIL', name: 'RE24' },
544
+ route: { type: RouteTypes.RAIL, name: 'RE24' },
546
545
  },
547
546
  ],
548
547
  },
package/src/cli/repl.ts CHANGED
@@ -4,9 +4,13 @@ import fs from 'fs';
4
4
 
5
5
  import { Query, RangeQuery, Router, StopsIndex, Timetable } from '../router.js';
6
6
  import type { Stop } from '../stops/stops.js';
7
- import type { RawPickUpDropOffType } from '../timetable/route.js';
7
+ import type { PickUpDropOffType } from '../timetable/route.js';
8
8
  import { PickUpDropOffTypes, Route } from '../timetable/route.js';
9
9
  import { timeFromString, timeToString } from '../timetable/time.js';
10
+ import {
11
+ routeTypeToString,
12
+ transferTypeToString,
13
+ } from '../timetable/timetable.js';
10
14
  import { plotGraphToDotFile } from './utils.js';
11
15
 
12
16
  export const startRepl = (stopsPath: string, timetablePath: string) => {
@@ -298,7 +302,7 @@ export const startRepl = (stopsPath: string, timetablePath: string) => {
298
302
  },
299
303
  });
300
304
 
301
- const formatPickupDropoffType = (type: RawPickUpDropOffType): string => {
305
+ const formatPickupDropoffType = (type: PickUpDropOffType): string => {
302
306
  switch (type) {
303
307
  case PickUpDropOffTypes.REGULAR:
304
308
  return 'R';
@@ -351,7 +355,7 @@ export const startRepl = (stopsPath: string, timetablePath: string) => {
351
355
 
352
356
  const serviceRouteInfo = timetable.getServiceRouteInfo(route);
353
357
  const routeName = serviceRouteInfo.name;
354
- const routeType = serviceRouteInfo.type;
358
+ const routeType = routeTypeToString(serviceRouteInfo.type);
355
359
 
356
360
  console.log(`\n=== Route ${routeId} ===`);
357
361
  console.log(`Service Route: ${routeName}`);
@@ -450,7 +454,7 @@ export const startRepl = (stopsPath: string, timetablePath: string) => {
450
454
  routes.forEach((route, index) => {
451
455
  const serviceRouteInfo = timetable.getServiceRouteInfo(route);
452
456
  console.log(
453
- `${index + 1}. Route ${route.id}: ${serviceRouteInfo.name} (${serviceRouteInfo.type})`,
457
+ `${index + 1}. Route ${route.id}: ${serviceRouteInfo.name} (${routeTypeToString(serviceRouteInfo.type)})`,
454
458
  );
455
459
  });
456
460
  }
@@ -469,7 +473,7 @@ export const startRepl = (stopsPath: string, timetablePath: string) => {
469
473
  ? ` (min: ${transfer.minTransferTime}min)`
470
474
  : '';
471
475
  console.log(
472
- `${index + 1}. ${transfer.type} to ${destStop?.name ?? 'Unknown'}${platform} (${transfer.destination}, ${destStop?.sourceStopId ?? 'N/A'})${minTime}`,
476
+ `${index + 1}. ${transferTypeToString(transfer.type)} to ${destStop?.name ?? 'Unknown'}${platform} (${transfer.destination}, ${destStop?.sourceStopId ?? 'N/A'})${minTime}`,
473
477
  );
474
478
  });
475
479
  }
package/src/router.ts CHANGED
@@ -18,16 +18,25 @@ import { RangeResult, Router } from './routing/router.js';
18
18
  import type { LocationType, SourceStopId, StopId } from './stops/stops.js';
19
19
  import type { Stop } from './stops/stops.js';
20
20
  import { StopsIndex } from './stops/stopsIndex.js';
21
- import type { PickUpDropOffTypeString } from './timetable/route.js';
21
+ import type { PickUpDropOffType } from './timetable/route.js';
22
+ import {
23
+ PickUpDropOffTypes,
24
+ pickUpDropOffTypeToString,
25
+ } from './timetable/route.js';
22
26
  import type { Duration, Time } from './timetable/time.js';
23
- import type {
24
- RouteTypeString,
25
- TransferTypeString,
27
+ import type { RouteType, TransferType } from './timetable/timetable.js';
28
+ import {
29
+ RouteTypes,
30
+ routeTypeToString,
31
+ Timetable,
32
+ TransferTypes,
33
+ transferTypeToString,
26
34
  } from './timetable/timetable.js';
27
- import { Timetable } from './timetable/timetable.js';
28
35
 
29
36
  export {
30
37
  Duration,
38
+ PickUpDropOffTypes,
39
+ pickUpDropOffTypeToString,
31
40
  Plotter,
32
41
  Query,
33
42
  RangeQuery,
@@ -35,9 +44,13 @@ export {
35
44
  Result,
36
45
  Route,
37
46
  Router,
47
+ RouteTypes,
48
+ routeTypeToString,
38
49
  StopsIndex,
39
50
  Time,
40
51
  Timetable,
52
+ TransferTypes,
53
+ transferTypeToString,
41
54
  };
42
55
 
43
56
  export type {
@@ -46,15 +59,15 @@ export type {
46
59
  Leg,
47
60
  LocationType,
48
61
  ParetoRun,
49
- PickUpDropOffTypeString as PickUpDropOffType,
62
+ PickUpDropOffType,
50
63
  QueryOptions,
51
64
  RangeQueryOptions,
52
- RouteTypeString as RouteType,
65
+ RouteType,
53
66
  ServiceRouteInfo,
54
67
  SourceStopId,
55
68
  Stop,
56
69
  StopId,
57
70
  Transfer,
58
- TransferTypeString as TransferType,
71
+ TransferType,
59
72
  VehicleLeg,
60
73
  };
@@ -1029,7 +1029,7 @@ describe('PlainRouter', () => {
1029
1029
 
1030
1030
  // Should find a route with 3 legs:
1031
1031
  // 1. Vehicle leg (route 0)
1032
- // 2. Guaranteed transfer leg (shown as type: 'GUARANTEED')
1032
+ // 2. Guaranteed transfer leg (shown as type: TransferTypes.GUARANTEED)
1033
1033
  // 3. Vehicle leg (route 1)
1034
1034
  assert.ok(bestRoute);
1035
1035
  assert.strictEqual(bestRoute.legs.length, 3);
@@ -1037,7 +1037,7 @@ describe('PlainRouter', () => {
1037
1037
  // The middle leg should be the guaranteed transfer
1038
1038
  const transferLeg = bestRoute.legs[1];
1039
1039
  assert.ok(transferLeg && 'type' in transferLeg);
1040
- assert.strictEqual(transferLeg.type, 'GUARANTEED');
1040
+ assert.strictEqual(transferLeg.type, TransferTypes.GUARANTEED);
1041
1041
 
1042
1042
  // Should arrive at 08:40 because the guaranteed transfer allows catching
1043
1043
  // the 08:21 departure despite only having 1 minute of transfer time
@@ -635,7 +635,7 @@ describe('Result', () => {
635
635
  assert.strictEqual(transferLeg.to.id, 2);
636
636
  assert('type' in transferLeg);
637
637
  assert('minTransferTime' in transferLeg);
638
- assert.strictEqual(transferLeg.type, 'RECOMMENDED');
638
+ assert.strictEqual(transferLeg.type, TransferTypes.RECOMMENDED);
639
639
 
640
640
  assert.strictEqual(thirdLeg.from.id, 2);
641
641
  assert.strictEqual(thirdLeg.to.id, 3);