minotor 11.2.3 → 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/CHANGELOG.md +3 -3
- package/README.md +27 -0
- package/dist/cli.mjs +310 -102
- package/dist/cli.mjs.map +1 -1
- package/dist/gtfs/parser.d.ts +3 -1
- package/dist/gtfs/routes.d.ts +1 -2
- package/dist/gtfs/transfers.d.ts +7 -3
- package/dist/gtfs/trips.d.ts +2 -1
- package/dist/parser.cjs.js +235 -85
- package/dist/parser.cjs.js.map +1 -1
- package/dist/parser.d.ts +6 -2
- package/dist/parser.esm.js +234 -86
- package/dist/parser.esm.js.map +1 -1
- package/dist/router.cjs.js +1 -1
- package/dist/router.cjs.js.map +1 -1
- package/dist/router.d.ts +4 -3
- package/dist/router.esm.js +1 -1
- package/dist/router.esm.js.map +1 -1
- package/dist/router.umd.js +1 -1
- package/dist/router.umd.js.map +1 -1
- package/dist/routing/result.d.ts +1 -4
- package/dist/routing/route.d.ts +9 -5
- package/dist/timetable/route.d.ts +9 -5
- package/dist/timetable/timetable.d.ts +24 -3
- package/dist/transfers/__tests__/straightLineTransferGenerator.test.d.ts +1 -0
- package/dist/transfers/generator.d.ts +40 -0
- package/dist/transfers/straightLineTransferGenerator.d.ts +58 -0
- package/dist/utils/map.d.ts +10 -0
- package/package.json +1 -1
- package/src/__e2e__/router.test.ts +6 -2
- package/src/cli/minotor.ts +21 -1
- package/src/cli/repl.ts +6 -12
- package/src/gtfs/__tests__/parser.test.ts +29 -1
- package/src/gtfs/__tests__/routes.test.ts +4 -3
- package/src/gtfs/__tests__/transfers.test.ts +108 -21
- package/src/gtfs/__tests__/trips.test.ts +60 -24
- package/src/gtfs/parser.ts +51 -2
- package/src/gtfs/profiles/__tests__/extended.test.ts +2 -1
- package/src/gtfs/profiles/extended.ts +14 -14
- package/src/gtfs/profiles/standard.ts +11 -10
- package/src/gtfs/routes.ts +5 -2
- package/src/gtfs/transfers.ts +20 -7
- package/src/gtfs/trips.ts +7 -14
- package/src/parser.ts +20 -2
- package/src/router.ts +12 -6
- package/src/routing/__tests__/access.test.ts +14 -6
- package/src/routing/__tests__/plainRouter.test.ts +25 -23
- package/src/routing/__tests__/plotter.test.ts +8 -3
- package/src/routing/__tests__/rangeResult.test.ts +6 -2
- package/src/routing/__tests__/rangeRouter.test.ts +10 -6
- package/src/routing/__tests__/raptor.test.ts +15 -9
- package/src/routing/__tests__/result.test.ts +9 -4
- package/src/routing/__tests__/route.test.ts +3 -4
- package/src/routing/__tests__/router.test.ts +2 -1
- package/src/routing/access.ts +7 -4
- package/src/routing/plotter.ts +8 -3
- package/src/routing/raptor.ts +5 -5
- package/src/routing/result.ts +32 -14
- package/src/routing/route.ts +13 -10
- package/src/routing/state.ts +1 -1
- package/src/timetable/__tests__/io.test.ts +22 -10
- package/src/timetable/__tests__/route.test.ts +18 -24
- package/src/timetable/__tests__/timetable.test.ts +17 -11
- package/src/timetable/io.ts +30 -28
- package/src/timetable/route.ts +14 -7
- package/src/timetable/timetable.ts +77 -28
- package/src/transfers/README.md +97 -0
- package/src/transfers/__tests__/straightLineTransferGenerator.test.ts +204 -0
- package/src/transfers/generator.ts +45 -0
- package/src/transfers/straightLineTransferGenerator.ts +143 -0
- package/src/utils/map.ts +22 -0
|
@@ -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
|
|
8
|
+
return RouteTypes.TRAM;
|
|
8
9
|
case 1:
|
|
9
|
-
return
|
|
10
|
+
return RouteTypes.SUBWAY;
|
|
10
11
|
case 2:
|
|
11
|
-
return
|
|
12
|
+
return RouteTypes.RAIL;
|
|
12
13
|
case 3:
|
|
13
|
-
return
|
|
14
|
+
return RouteTypes.BUS;
|
|
14
15
|
case 4:
|
|
15
|
-
return
|
|
16
|
+
return RouteTypes.FERRY;
|
|
16
17
|
case 5:
|
|
17
|
-
return
|
|
18
|
+
return RouteTypes.CABLE_TRAM;
|
|
18
19
|
case 6:
|
|
19
|
-
return
|
|
20
|
+
return RouteTypes.AERIAL_LIFT;
|
|
20
21
|
case 7:
|
|
21
|
-
return
|
|
22
|
+
return RouteTypes.FUNICULAR;
|
|
22
23
|
case 11:
|
|
23
|
-
return
|
|
24
|
+
return RouteTypes.TROLLEYBUS;
|
|
24
25
|
case 12:
|
|
25
|
-
return
|
|
26
|
+
return RouteTypes.MONORAIL;
|
|
26
27
|
default:
|
|
27
28
|
return undefined;
|
|
28
29
|
}
|
package/src/gtfs/routes.ts
CHANGED
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import log from 'loglevel';
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
|
|
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';
|
package/src/gtfs/transfers.ts
CHANGED
|
@@ -8,10 +8,12 @@ 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';
|
|
14
15
|
import { encode } from '../timetable/tripStopId.js';
|
|
16
|
+
import { ServiceId, ServiceIds } from './services.js';
|
|
15
17
|
import { GtfsStopsMap } from './stops.js';
|
|
16
18
|
import { GtfsTripId, TripsMapping } from './trips.js';
|
|
17
19
|
import { parseCsv } from './utils.js';
|
|
@@ -40,6 +42,7 @@ export type TransferEntry = {
|
|
|
40
42
|
to_trip_id?: GtfsTripId;
|
|
41
43
|
from_route_id?: ServiceRouteId;
|
|
42
44
|
to_route_id?: ServiceRouteId;
|
|
45
|
+
service_id?: ServiceId;
|
|
43
46
|
transfer_type: GtfsTransferType;
|
|
44
47
|
min_transfer_time?: number;
|
|
45
48
|
};
|
|
@@ -121,7 +124,7 @@ const processGuaranteedStopTransfer = (
|
|
|
121
124
|
|
|
122
125
|
const transfer: Transfer = {
|
|
123
126
|
destination: toStop,
|
|
124
|
-
type:
|
|
127
|
+
type: TransferTypes.GUARANTEED,
|
|
125
128
|
...(transferEntry.min_transfer_time !== undefined && {
|
|
126
129
|
minTransferTime: durationFromSeconds(transferEntry.min_transfer_time),
|
|
127
130
|
}),
|
|
@@ -179,12 +182,15 @@ const processStopToStopTransfer = (
|
|
|
179
182
|
/**
|
|
180
183
|
* Parses the transfers.txt file from a GTFS feed.
|
|
181
184
|
*
|
|
182
|
-
* @param
|
|
183
|
-
* @
|
|
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.
|
|
184
189
|
*/
|
|
185
190
|
export const parseTransfers = async (
|
|
186
191
|
transfersStream: NodeJS.ReadableStream,
|
|
187
192
|
stopsMap: GtfsStopsMap,
|
|
193
|
+
activeServiceIds: ServiceIds,
|
|
188
194
|
): Promise<{
|
|
189
195
|
transfers: TransfersMap;
|
|
190
196
|
tripContinuations: GtfsTripTransfer[];
|
|
@@ -200,6 +206,13 @@ export const parseTransfers = async (
|
|
|
200
206
|
])) {
|
|
201
207
|
const transferEntry = rawLine as TransferEntry;
|
|
202
208
|
|
|
209
|
+
if (
|
|
210
|
+
transferEntry.service_id &&
|
|
211
|
+
!activeServiceIds.has(transferEntry.service_id)
|
|
212
|
+
) {
|
|
213
|
+
continue;
|
|
214
|
+
}
|
|
215
|
+
|
|
203
216
|
if (
|
|
204
217
|
transferEntry.transfer_type === 3 ||
|
|
205
218
|
transferEntry.transfer_type === 5
|
|
@@ -404,12 +417,12 @@ const parseGtfsTransferType = (
|
|
|
404
417
|
switch (gtfsTransferType) {
|
|
405
418
|
case 0:
|
|
406
419
|
default:
|
|
407
|
-
return
|
|
420
|
+
return TransferTypes.RECOMMENDED;
|
|
408
421
|
case 1:
|
|
409
|
-
return
|
|
422
|
+
return TransferTypes.GUARANTEED;
|
|
410
423
|
case 2:
|
|
411
|
-
return
|
|
424
|
+
return TransferTypes.REQUIRES_MINIMAL_TIME;
|
|
412
425
|
case 4:
|
|
413
|
-
return
|
|
426
|
+
return TransferTypes.IN_SEAT;
|
|
414
427
|
}
|
|
415
428
|
};
|
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
|
-
|
|
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 {
|
|
7
|
-
|
|
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 {
|
|
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
|
-
|
|
19
|
-
|
|
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
|
-
{
|
|
24
|
-
|
|
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:
|
|
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: [
|
|
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:
|
|
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:
|
|
178
|
+
type: TransferTypes.REQUIRES_MINIMAL_TIME,
|
|
171
179
|
minTransferTime: 3,
|
|
172
180
|
},
|
|
173
181
|
],
|
|
@@ -6,9 +6,11 @@ import { StopsIndex } from '../../stops/stopsIndex.js';
|
|
|
6
6
|
import { Route } from '../../timetable/route.js';
|
|
7
7
|
import { durationFromSeconds, timeFromHM } from '../../timetable/time.js';
|
|
8
8
|
import {
|
|
9
|
+
RouteTypes,
|
|
9
10
|
ServiceRoute,
|
|
10
11
|
StopAdjacency,
|
|
11
12
|
Timetable,
|
|
13
|
+
TransferTypes,
|
|
12
14
|
TripTransfers,
|
|
13
15
|
} from '../../timetable/timetable.js';
|
|
14
16
|
import { encode } from '../../timetable/tripStopId.js';
|
|
@@ -63,7 +65,7 @@ describe('PlainRouter', () => {
|
|
|
63
65
|
|
|
64
66
|
const routes: ServiceRoute[] = [
|
|
65
67
|
{
|
|
66
|
-
type:
|
|
68
|
+
type: RouteTypes.BUS,
|
|
67
69
|
name: 'Line 1',
|
|
68
70
|
routes: [0],
|
|
69
71
|
},
|
|
@@ -246,12 +248,12 @@ describe('PlainRouter', () => {
|
|
|
246
248
|
|
|
247
249
|
const routes: ServiceRoute[] = [
|
|
248
250
|
{
|
|
249
|
-
type:
|
|
251
|
+
type: RouteTypes.BUS,
|
|
250
252
|
name: 'Line 1',
|
|
251
253
|
routes: [0],
|
|
252
254
|
},
|
|
253
255
|
{
|
|
254
|
-
type:
|
|
256
|
+
type: RouteTypes.RAIL,
|
|
255
257
|
name: 'Line 2',
|
|
256
258
|
routes: [1],
|
|
257
259
|
},
|
|
@@ -360,7 +362,7 @@ describe('PlainRouter', () => {
|
|
|
360
362
|
transfers: [
|
|
361
363
|
{
|
|
362
364
|
destination: 4,
|
|
363
|
-
type:
|
|
365
|
+
type: TransferTypes.REQUIRES_MINIMAL_TIME,
|
|
364
366
|
minTransferTime: durationFromSeconds(300), // 5 minutes walking
|
|
365
367
|
},
|
|
366
368
|
],
|
|
@@ -429,12 +431,12 @@ describe('PlainRouter', () => {
|
|
|
429
431
|
|
|
430
432
|
const routes: ServiceRoute[] = [
|
|
431
433
|
{
|
|
432
|
-
type:
|
|
434
|
+
type: RouteTypes.BUS,
|
|
433
435
|
name: 'Line 1',
|
|
434
436
|
routes: [0],
|
|
435
437
|
},
|
|
436
438
|
{
|
|
437
|
-
type:
|
|
439
|
+
type: RouteTypes.RAIL,
|
|
438
440
|
name: 'Line 2',
|
|
439
441
|
routes: [1],
|
|
440
442
|
},
|
|
@@ -633,17 +635,17 @@ describe('PlainRouter', () => {
|
|
|
633
635
|
|
|
634
636
|
const routes: ServiceRoute[] = [
|
|
635
637
|
{
|
|
636
|
-
type:
|
|
638
|
+
type: RouteTypes.BUS,
|
|
637
639
|
name: 'Line 1',
|
|
638
640
|
routes: [0],
|
|
639
641
|
},
|
|
640
642
|
{
|
|
641
|
-
type:
|
|
643
|
+
type: RouteTypes.RAIL,
|
|
642
644
|
name: 'Line 2',
|
|
643
645
|
routes: [1],
|
|
644
646
|
},
|
|
645
647
|
{
|
|
646
|
-
type:
|
|
648
|
+
type: RouteTypes.FERRY,
|
|
647
649
|
name: 'Line 3',
|
|
648
650
|
routes: [2],
|
|
649
651
|
},
|
|
@@ -795,12 +797,12 @@ describe('PlainRouter', () => {
|
|
|
795
797
|
|
|
796
798
|
const routes: ServiceRoute[] = [
|
|
797
799
|
{
|
|
798
|
-
type:
|
|
800
|
+
type: RouteTypes.BUS,
|
|
799
801
|
name: 'Line 1',
|
|
800
802
|
routes: [0],
|
|
801
803
|
},
|
|
802
804
|
{
|
|
803
|
-
type:
|
|
805
|
+
type: RouteTypes.BUS,
|
|
804
806
|
name: 'Line 2',
|
|
805
807
|
routes: [1],
|
|
806
808
|
},
|
|
@@ -959,12 +961,12 @@ describe('PlainRouter', () => {
|
|
|
959
961
|
|
|
960
962
|
const routes: ServiceRoute[] = [
|
|
961
963
|
{
|
|
962
|
-
type:
|
|
964
|
+
type: RouteTypes.BUS,
|
|
963
965
|
name: 'Line 1',
|
|
964
966
|
routes: [0],
|
|
965
967
|
},
|
|
966
968
|
{
|
|
967
|
-
type:
|
|
969
|
+
type: RouteTypes.BUS,
|
|
968
970
|
name: 'Line 2',
|
|
969
971
|
routes: [1],
|
|
970
972
|
},
|
|
@@ -1123,12 +1125,12 @@ describe('PlainRouter', () => {
|
|
|
1123
1125
|
|
|
1124
1126
|
const routes: ServiceRoute[] = [
|
|
1125
1127
|
{
|
|
1126
|
-
type:
|
|
1128
|
+
type: RouteTypes.BUS,
|
|
1127
1129
|
name: 'Line 1',
|
|
1128
1130
|
routes: [0],
|
|
1129
1131
|
},
|
|
1130
1132
|
{
|
|
1131
|
-
type:
|
|
1133
|
+
type: RouteTypes.BUS,
|
|
1132
1134
|
name: 'Line 2',
|
|
1133
1135
|
routes: [1],
|
|
1134
1136
|
},
|
|
@@ -1281,9 +1283,9 @@ describe('PlainRouter', () => {
|
|
|
1281
1283
|
];
|
|
1282
1284
|
|
|
1283
1285
|
const routes: ServiceRoute[] = [
|
|
1284
|
-
{ type:
|
|
1285
|
-
{ type:
|
|
1286
|
-
{ type:
|
|
1286
|
+
{ type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
|
|
1287
|
+
{ type: RouteTypes.BUS, name: 'Line 2', routes: [1] },
|
|
1288
|
+
{ type: RouteTypes.BUS, name: 'Line 3', routes: [2] },
|
|
1287
1289
|
];
|
|
1288
1290
|
|
|
1289
1291
|
timetable = new Timetable(stopsAdjacency, routesAdjacency, routes);
|
|
@@ -1440,8 +1442,8 @@ describe('PlainRouter', () => {
|
|
|
1440
1442
|
];
|
|
1441
1443
|
|
|
1442
1444
|
const routes: ServiceRoute[] = [
|
|
1443
|
-
{ type:
|
|
1444
|
-
{ type:
|
|
1445
|
+
{ type: RouteTypes.BUS, name: 'Bus Line', routes: [0] },
|
|
1446
|
+
{ type: RouteTypes.RAIL, name: 'Rail Line', routes: [1] },
|
|
1445
1447
|
];
|
|
1446
1448
|
|
|
1447
1449
|
timetable = new Timetable(stopsAdjacency, routesAdjacency, routes);
|
|
@@ -1491,7 +1493,7 @@ describe('PlainRouter', () => {
|
|
|
1491
1493
|
.from(0)
|
|
1492
1494
|
.to(1)
|
|
1493
1495
|
.departureTime(timeFromHM(8, 0))
|
|
1494
|
-
.transportModes(new Set([
|
|
1496
|
+
.transportModes(new Set([RouteTypes.BUS] as const))
|
|
1495
1497
|
.build();
|
|
1496
1498
|
|
|
1497
1499
|
const result: Result = router.route(query);
|
|
@@ -1505,7 +1507,7 @@ describe('PlainRouter', () => {
|
|
|
1505
1507
|
.from(0)
|
|
1506
1508
|
.to(1)
|
|
1507
1509
|
.departureTime(timeFromHM(8, 0))
|
|
1508
|
-
.transportModes(new Set([
|
|
1510
|
+
.transportModes(new Set([RouteTypes.FERRY] as const)) // Neither route is a ferry
|
|
1509
1511
|
.build();
|
|
1510
1512
|
|
|
1511
1513
|
const result: Result = router.route(query);
|
|
@@ -1567,7 +1569,7 @@ describe('PlainRouter', () => {
|
|
|
1567
1569
|
];
|
|
1568
1570
|
|
|
1569
1571
|
const routes: ServiceRoute[] = [
|
|
1570
|
-
{ type:
|
|
1572
|
+
{ type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
|
|
1571
1573
|
];
|
|
1572
1574
|
|
|
1573
1575
|
timetable = new Timetable(stopsAdjacency, routesAdjacency, routes);
|
|
@@ -6,7 +6,12 @@ import { Stop } from '../../stops/stops.js';
|
|
|
6
6
|
import { StopsIndex } from '../../stops/stopsIndex.js';
|
|
7
7
|
import { Route } from '../../timetable/route.js';
|
|
8
8
|
import { timeFromHMS, timeFromString } from '../../timetable/time.js';
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
RouteTypes,
|
|
11
|
+
ServiceRoute,
|
|
12
|
+
StopAdjacency,
|
|
13
|
+
TransferTypes,
|
|
14
|
+
} from '../../timetable/timetable.js';
|
|
10
15
|
import { Plotter } from '../plotter.js';
|
|
11
16
|
import { Query } from '../query.js';
|
|
12
17
|
import { Result } from '../result.js';
|
|
@@ -58,7 +63,7 @@ describe('Plotter', () => {
|
|
|
58
63
|
|
|
59
64
|
const routes: ServiceRoute[] = [
|
|
60
65
|
{
|
|
61
|
-
type:
|
|
66
|
+
type: RouteTypes.RAIL,
|
|
62
67
|
name: 'IC 1',
|
|
63
68
|
routes: [0],
|
|
64
69
|
},
|
|
@@ -192,7 +197,7 @@ describe('Plotter', () => {
|
|
|
192
197
|
from: 0,
|
|
193
198
|
to: 1,
|
|
194
199
|
arrival: timeFromHMS(8, 45, 0),
|
|
195
|
-
type:
|
|
200
|
+
type: TransferTypes.RECOMMENDED,
|
|
196
201
|
minTransferTime: 5,
|
|
197
202
|
},
|
|
198
203
|
],
|
|
@@ -6,7 +6,11 @@ import { Stop, StopId } from '../../stops/stops.js';
|
|
|
6
6
|
import { StopsIndex } from '../../stops/stopsIndex.js';
|
|
7
7
|
import { Route } from '../../timetable/route.js';
|
|
8
8
|
import { timeFromHM } from '../../timetable/time.js';
|
|
9
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
RouteTypes,
|
|
11
|
+
ServiceRoute,
|
|
12
|
+
StopAdjacency,
|
|
13
|
+
} from '../../timetable/timetable.js';
|
|
10
14
|
import { ParetoRun, RangeResult } from '../rangeResult.js';
|
|
11
15
|
import { Result } from '../result.js';
|
|
12
16
|
import { RoutingState, VehicleEdge } from '../router.js';
|
|
@@ -74,7 +78,7 @@ const routesAdjacency = [
|
|
|
74
78
|
}),
|
|
75
79
|
];
|
|
76
80
|
const serviceRoutes: ServiceRoute[] = [
|
|
77
|
-
{ type:
|
|
81
|
+
{ type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
|
|
78
82
|
];
|
|
79
83
|
const timetable = new Timetable(stopsAdjacency, routesAdjacency, serviceRoutes);
|
|
80
84
|
|
|
@@ -6,9 +6,11 @@ import { StopsIndex } from '../../stops/stopsIndex.js';
|
|
|
6
6
|
import { Route } from '../../timetable/route.js';
|
|
7
7
|
import { durationFromSeconds, timeFromHM } from '../../timetable/time.js';
|
|
8
8
|
import {
|
|
9
|
+
RouteTypes,
|
|
9
10
|
ServiceRoute,
|
|
10
11
|
StopAdjacency,
|
|
11
12
|
Timetable,
|
|
13
|
+
TransferTypes,
|
|
12
14
|
} from '../../timetable/timetable.js';
|
|
13
15
|
import { AccessFinder } from '../access.js';
|
|
14
16
|
import { RangeQuery } from '../query.js';
|
|
@@ -24,7 +26,9 @@ describe('RangeRouter', () => {
|
|
|
24
26
|
const stopsAdjacency: StopAdjacency[] = [
|
|
25
27
|
{
|
|
26
28
|
routes: [],
|
|
27
|
-
transfers: [
|
|
29
|
+
transfers: [
|
|
30
|
+
{ destination: 1, type: TransferTypes.REQUIRES_MINIMAL_TIME },
|
|
31
|
+
],
|
|
28
32
|
},
|
|
29
33
|
{ routes: [0] },
|
|
30
34
|
{ routes: [0] },
|
|
@@ -54,7 +58,7 @@ describe('RangeRouter', () => {
|
|
|
54
58
|
];
|
|
55
59
|
|
|
56
60
|
const serviceRoutes: ServiceRoute[] = [
|
|
57
|
-
{ type:
|
|
61
|
+
{ type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
|
|
58
62
|
];
|
|
59
63
|
|
|
60
64
|
const timetable = new Timetable(
|
|
@@ -174,7 +178,7 @@ describe('RangeRouter', () => {
|
|
|
174
178
|
];
|
|
175
179
|
|
|
176
180
|
const serviceRoutes: ServiceRoute[] = [
|
|
177
|
-
{ type:
|
|
181
|
+
{ type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
|
|
178
182
|
];
|
|
179
183
|
|
|
180
184
|
timetable = new Timetable(stopsAdjacency, routesAdjacency, serviceRoutes);
|
|
@@ -276,7 +280,7 @@ describe('RangeRouter', () => {
|
|
|
276
280
|
];
|
|
277
281
|
|
|
278
282
|
const serviceRoutes: ServiceRoute[] = [
|
|
279
|
-
{ type:
|
|
283
|
+
{ type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
|
|
280
284
|
];
|
|
281
285
|
|
|
282
286
|
const dominatingTimetable = new Timetable(
|
|
@@ -423,7 +427,7 @@ describe('RangeRouter', () => {
|
|
|
423
427
|
];
|
|
424
428
|
|
|
425
429
|
const serviceRoutes: ServiceRoute[] = [
|
|
426
|
-
{ type:
|
|
430
|
+
{ type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
|
|
427
431
|
];
|
|
428
432
|
|
|
429
433
|
const timetable = new Timetable(
|
|
@@ -544,7 +548,7 @@ describe('RangeRouter', () => {
|
|
|
544
548
|
];
|
|
545
549
|
|
|
546
550
|
const serviceRoutes: ServiceRoute[] = [
|
|
547
|
-
{ type:
|
|
551
|
+
{ type: RouteTypes.BUS, name: 'Line 1', routes: [0] },
|
|
548
552
|
];
|
|
549
553
|
|
|
550
554
|
const timetable = new Timetable(
|
|
@@ -6,9 +6,11 @@ import { Route } from '../../timetable/route.js';
|
|
|
6
6
|
import { timeFromHM } from '../../timetable/time.js';
|
|
7
7
|
import {
|
|
8
8
|
ALL_TRANSPORT_MODES,
|
|
9
|
+
RouteTypes,
|
|
9
10
|
ServiceRoute,
|
|
10
11
|
StopAdjacency,
|
|
11
12
|
Timetable,
|
|
13
|
+
TransferTypes,
|
|
12
14
|
TripTransfers,
|
|
13
15
|
} from '../../timetable/timetable.js';
|
|
14
16
|
import { encode } from '../../timetable/tripStopId.js';
|
|
@@ -73,8 +75,8 @@ const stopsAdjacency: StopAdjacency[] = [
|
|
|
73
75
|
];
|
|
74
76
|
|
|
75
77
|
const serviceRoutes: ServiceRoute[] = [
|
|
76
|
-
{ type:
|
|
77
|
-
{ type:
|
|
78
|
+
{ type: RouteTypes.BUS, name: 'Route 0', routes: [0] },
|
|
79
|
+
{ type: RouteTypes.BUS, name: 'Route 1', routes: [1] },
|
|
78
80
|
];
|
|
79
81
|
|
|
80
82
|
// ─── Extended fixture: slower direct route 0→2 ────────────────────────────────
|
|
@@ -108,9 +110,9 @@ const stopsAdjacencyWithDirectRoute: StopAdjacency[] = [
|
|
|
108
110
|
];
|
|
109
111
|
|
|
110
112
|
const serviceRoutesWithDirectRoute: ServiceRoute[] = [
|
|
111
|
-
{ type:
|
|
112
|
-
{ type:
|
|
113
|
-
{ type:
|
|
113
|
+
{ type: RouteTypes.BUS, name: 'Route 0', routes: [0] },
|
|
114
|
+
{ type: RouteTypes.BUS, name: 'Route 1', routes: [1] },
|
|
115
|
+
{ type: RouteTypes.BUS, name: 'Route 2', routes: [2] },
|
|
114
116
|
];
|
|
115
117
|
|
|
116
118
|
// ─── Extended fixture: walking transfer from stop 1 to stop 2 ─────────────────
|
|
@@ -121,7 +123,11 @@ const stopsAdjacencyWithTransfer: StopAdjacency[] = [
|
|
|
121
123
|
{
|
|
122
124
|
routes: [0],
|
|
123
125
|
transfers: [
|
|
124
|
-
{
|
|
126
|
+
{
|
|
127
|
+
destination: 2,
|
|
128
|
+
type: TransferTypes.REQUIRES_MINIMAL_TIME,
|
|
129
|
+
minTransferTime: 5,
|
|
130
|
+
},
|
|
125
131
|
],
|
|
126
132
|
},
|
|
127
133
|
{ routes: [] },
|
|
@@ -131,8 +137,8 @@ const stopsAdjacencyWithTransfer: StopAdjacency[] = [
|
|
|
131
137
|
// Route 0 is BUS, route 1 is RAIL — used to verify mode filtering.
|
|
132
138
|
|
|
133
139
|
const mixedModeServiceRoutes: ServiceRoute[] = [
|
|
134
|
-
{ type:
|
|
135
|
-
{ type:
|
|
140
|
+
{ type: RouteTypes.BUS, name: 'Route 0', routes: [0] },
|
|
141
|
+
{ type: RouteTypes.RAIL, name: 'Route 1', routes: [1] },
|
|
136
142
|
];
|
|
137
143
|
|
|
138
144
|
// ─── Extended fixture: in-seat trip continuation ──────────────────────────────
|
|
@@ -468,7 +474,7 @@ describe('Raptor', () => {
|
|
|
468
474
|
const options: QueryOptions = {
|
|
469
475
|
maxTransfers: 5,
|
|
470
476
|
minTransferTime: 2,
|
|
471
|
-
transportModes: new Set([
|
|
477
|
+
transportModes: new Set([RouteTypes.RAIL]),
|
|
472
478
|
};
|
|
473
479
|
raptor.run(options, state);
|
|
474
480
|
assert.strictEqual(state.getArrival(1), undefined);
|