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
package/dist/gtfs/parser.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { StopsIndex } from '../stops/stopsIndex.js';
|
|
2
2
|
import { RouteType, Timetable } from '../timetable/timetable.js';
|
|
3
|
+
import { TransferGenerator } from '../transfers/generator.js';
|
|
3
4
|
import { Maybe } from './utils.js';
|
|
4
5
|
export type GtfsProfile = {
|
|
5
6
|
routeTypeParser: (routeType: number) => Maybe<RouteType>;
|
|
@@ -7,7 +8,8 @@ export type GtfsProfile = {
|
|
|
7
8
|
export declare class GtfsParser {
|
|
8
9
|
private path;
|
|
9
10
|
private profile;
|
|
10
|
-
|
|
11
|
+
private transferGenerator?;
|
|
12
|
+
constructor(path: string, profile?: GtfsProfile, transferGenerator?: TransferGenerator);
|
|
11
13
|
/**
|
|
12
14
|
* Parses a GTFS feed to extract all the data relevant to a given day in a transit-planner friendly format.
|
|
13
15
|
*
|
package/dist/gtfs/routes.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { RouteType } from '../
|
|
2
|
-
import { ServiceRoute, ServiceRouteId } from '../timetable/timetable.js';
|
|
1
|
+
import { RouteType, ServiceRoute, ServiceRouteId } from '../timetable/timetable.js';
|
|
3
2
|
import { GtfsProfile } from './parser.js';
|
|
4
3
|
export type GtfsRouteType = number;
|
|
5
4
|
export type GtfsRouteId = string;
|
package/dist/gtfs/transfers.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { SourceStopId, StopId } from '../stops/stops.js';
|
|
2
2
|
import { ServiceRouteId, Timetable, Transfer, TripTransfers as TripTransfers } from '../timetable/timetable.js';
|
|
3
|
+
import { ServiceId, ServiceIds } from './services.js';
|
|
3
4
|
import { GtfsStopsMap } from './stops.js';
|
|
4
5
|
import { GtfsTripId, TripsMapping } from './trips.js';
|
|
5
6
|
export type GtfsTransferType = 0 | 1 | 2 | 3 | 4 | 5;
|
|
@@ -17,16 +18,19 @@ export type TransferEntry = {
|
|
|
17
18
|
to_trip_id?: GtfsTripId;
|
|
18
19
|
from_route_id?: ServiceRouteId;
|
|
19
20
|
to_route_id?: ServiceRouteId;
|
|
21
|
+
service_id?: ServiceId;
|
|
20
22
|
transfer_type: GtfsTransferType;
|
|
21
23
|
min_transfer_time?: number;
|
|
22
24
|
};
|
|
23
25
|
/**
|
|
24
26
|
* Parses the transfers.txt file from a GTFS feed.
|
|
25
27
|
*
|
|
26
|
-
* @param
|
|
27
|
-
* @
|
|
28
|
+
* @param transfersStream The readable stream containing the transfers data.
|
|
29
|
+
* @param stopsMap The parsed GTFS stops indexed by their source IDs.
|
|
30
|
+
* @param activeServiceIds The service IDs active for the requested date.
|
|
31
|
+
* @returns Parsed stop transfers, trip continuations, and guaranteed trip transfers.
|
|
28
32
|
*/
|
|
29
|
-
export declare const parseTransfers: (transfersStream: NodeJS.ReadableStream, stopsMap: GtfsStopsMap) => Promise<{
|
|
33
|
+
export declare const parseTransfers: (transfersStream: NodeJS.ReadableStream, stopsMap: GtfsStopsMap, activeServiceIds: ServiceIds) => Promise<{
|
|
30
34
|
transfers: TransfersMap;
|
|
31
35
|
tripContinuations: GtfsTripTransfer[];
|
|
32
36
|
guaranteedTripTransfers: GtfsTripTransfer[];
|
package/dist/gtfs/trips.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { StopId } from '../stops/stops.js';
|
|
2
|
-
import {
|
|
2
|
+
import type { RouteId, TripRouteIndex } from '../timetable/route.js';
|
|
3
|
+
import { Route } from '../timetable/route.js';
|
|
3
4
|
import { ServiceRoute, ServiceRouteId, StopAdjacency } from '../timetable/timetable.js';
|
|
4
5
|
import { FrequenciesMap } from './frequencies.js';
|
|
5
6
|
import { GtfsRouteId, GtfsRoutesMap } from './routes.js';
|
package/dist/parser.cjs.js
CHANGED
|
@@ -10999,6 +10999,11 @@ function haverSinDist(lng1, lat1, lng2, lat2, cosLat1) {
|
|
|
10999
10999
|
return haverSinDistPartial(haverSinDLng, cosLat1, lat1, lat2);
|
|
11000
11000
|
}
|
|
11001
11001
|
|
|
11002
|
+
function distance(lng1, lat1, lng2, lat2) {
|
|
11003
|
+
const h = haverSinDist(lng1, lat1, lng2, lat2, Math.cos(lat1 * rad));
|
|
11004
|
+
return 2 * earthRadius * Math.asin(Math.sqrt(h));
|
|
11005
|
+
}
|
|
11006
|
+
|
|
11002
11007
|
function vertexLat(lat, haverSinDLng) {
|
|
11003
11008
|
const cosDLng = 1 - 2 * haverSinDLng;
|
|
11004
11009
|
if (cosDLng <= 0) return lat > 0 ? 90 : -90;
|
|
@@ -12744,10 +12749,12 @@ const timeFromHMS = (hours, minutes, seconds) => {
|
|
|
12744
12749
|
*/
|
|
12745
12750
|
const durationFromSeconds = (seconds) => Math.round(seconds / 60);
|
|
12746
12751
|
|
|
12747
|
-
const
|
|
12748
|
-
|
|
12749
|
-
|
|
12750
|
-
|
|
12752
|
+
const PickUpDropOffTypes = {
|
|
12753
|
+
REGULAR: 0,
|
|
12754
|
+
NOT_AVAILABLE: 1,
|
|
12755
|
+
MUST_PHONE_AGENCY: 2,
|
|
12756
|
+
MUST_COORDINATE_WITH_DRIVER: 3,
|
|
12757
|
+
};
|
|
12751
12758
|
/**
|
|
12752
12759
|
* A route identifies all trips of a given service route sharing the same list of stops.
|
|
12753
12760
|
*/
|
|
@@ -12827,8 +12834,8 @@ class Route {
|
|
|
12827
12834
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
12828
12835
|
const stop = trip.stops[stopIndex];
|
|
12829
12836
|
const globalIndex = tripIndex * numStops + stopIndex;
|
|
12830
|
-
const pickUp = (_a = stop.pickUpType) !== null && _a !== void 0 ? _a : REGULAR;
|
|
12831
|
-
const dropOff = (_b = stop.dropOffType) !== null && _b !== void 0 ? _b : REGULAR;
|
|
12837
|
+
const pickUp = (_a = stop.pickUpType) !== null && _a !== void 0 ? _a : PickUpDropOffTypes.REGULAR;
|
|
12838
|
+
const dropOff = (_b = stop.dropOffType) !== null && _b !== void 0 ? _b : PickUpDropOffTypes.REGULAR;
|
|
12832
12839
|
const byteIndex = Math.floor(globalIndex / 2);
|
|
12833
12840
|
const isSecondPair = globalIndex % 2 === 1;
|
|
12834
12841
|
if (isSecondPair) {
|
|
@@ -13262,26 +13269,26 @@ const parseTransferType = (type) => {
|
|
|
13262
13269
|
case TransferType.TRANSFER_TYPE_UNSPECIFIED:
|
|
13263
13270
|
throw new Error('Unspecified protobuf transfer type.');
|
|
13264
13271
|
case TransferType.TRANSFER_TYPE_RECOMMENDED_TRANSFER_POINT:
|
|
13265
|
-
return
|
|
13272
|
+
return TransferTypes.RECOMMENDED;
|
|
13266
13273
|
case TransferType.TRANSFER_TYPE_TIMED_TRANSFER:
|
|
13267
|
-
return
|
|
13274
|
+
return TransferTypes.GUARANTEED;
|
|
13268
13275
|
case TransferType.TRANSFER_TYPE_REQUIRES_MINIMAL_TIME:
|
|
13269
|
-
return
|
|
13276
|
+
return TransferTypes.REQUIRES_MINIMAL_TIME;
|
|
13270
13277
|
case TransferType.TRANSFER_TYPE_IN_SEAT_TRANSFER:
|
|
13271
|
-
return
|
|
13278
|
+
return TransferTypes.IN_SEAT;
|
|
13272
13279
|
case TransferType.UNRECOGNIZED:
|
|
13273
13280
|
throw new Error('Unrecognized protobuf transfer type.');
|
|
13274
13281
|
}
|
|
13275
13282
|
};
|
|
13276
13283
|
const serializeTransferType = (type) => {
|
|
13277
13284
|
switch (type) {
|
|
13278
|
-
case
|
|
13285
|
+
case TransferTypes.RECOMMENDED:
|
|
13279
13286
|
return TransferType.TRANSFER_TYPE_RECOMMENDED_TRANSFER_POINT;
|
|
13280
|
-
case
|
|
13287
|
+
case TransferTypes.GUARANTEED:
|
|
13281
13288
|
return TransferType.TRANSFER_TYPE_TIMED_TRANSFER;
|
|
13282
|
-
case
|
|
13289
|
+
case TransferTypes.REQUIRES_MINIMAL_TIME:
|
|
13283
13290
|
return TransferType.TRANSFER_TYPE_REQUIRES_MINIMAL_TIME;
|
|
13284
|
-
case
|
|
13291
|
+
case TransferTypes.IN_SEAT:
|
|
13285
13292
|
return TransferType.TRANSFER_TYPE_IN_SEAT_TRANSFER;
|
|
13286
13293
|
}
|
|
13287
13294
|
};
|
|
@@ -13290,25 +13297,25 @@ const parseRouteType = (type) => {
|
|
|
13290
13297
|
case RouteType.ROUTE_TYPE_UNSPECIFIED:
|
|
13291
13298
|
throw new Error('Unspecified protobuf route type.');
|
|
13292
13299
|
case RouteType.ROUTE_TYPE_TRAM:
|
|
13293
|
-
return
|
|
13300
|
+
return RouteTypes.TRAM;
|
|
13294
13301
|
case RouteType.ROUTE_TYPE_SUBWAY:
|
|
13295
|
-
return
|
|
13302
|
+
return RouteTypes.SUBWAY;
|
|
13296
13303
|
case RouteType.ROUTE_TYPE_RAIL:
|
|
13297
|
-
return
|
|
13304
|
+
return RouteTypes.RAIL;
|
|
13298
13305
|
case RouteType.ROUTE_TYPE_BUS:
|
|
13299
|
-
return
|
|
13306
|
+
return RouteTypes.BUS;
|
|
13300
13307
|
case RouteType.ROUTE_TYPE_FERRY:
|
|
13301
|
-
return
|
|
13308
|
+
return RouteTypes.FERRY;
|
|
13302
13309
|
case RouteType.ROUTE_TYPE_CABLE_TRAM:
|
|
13303
|
-
return
|
|
13310
|
+
return RouteTypes.CABLE_TRAM;
|
|
13304
13311
|
case RouteType.ROUTE_TYPE_AERIAL_LIFT:
|
|
13305
|
-
return
|
|
13312
|
+
return RouteTypes.AERIAL_LIFT;
|
|
13306
13313
|
case RouteType.ROUTE_TYPE_FUNICULAR:
|
|
13307
|
-
return
|
|
13314
|
+
return RouteTypes.FUNICULAR;
|
|
13308
13315
|
case RouteType.ROUTE_TYPE_TROLLEYBUS:
|
|
13309
|
-
return
|
|
13316
|
+
return RouteTypes.TROLLEYBUS;
|
|
13310
13317
|
case RouteType.ROUTE_TYPE_MONORAIL:
|
|
13311
|
-
return
|
|
13318
|
+
return RouteTypes.MONORAIL;
|
|
13312
13319
|
case RouteType.UNRECOGNIZED:
|
|
13313
13320
|
default:
|
|
13314
13321
|
throw new Error('Unrecognized protobuf route type.');
|
|
@@ -13316,25 +13323,25 @@ const parseRouteType = (type) => {
|
|
|
13316
13323
|
};
|
|
13317
13324
|
const serializeRouteType = (type) => {
|
|
13318
13325
|
switch (type) {
|
|
13319
|
-
case
|
|
13326
|
+
case RouteTypes.TRAM:
|
|
13320
13327
|
return RouteType.ROUTE_TYPE_TRAM;
|
|
13321
|
-
case
|
|
13328
|
+
case RouteTypes.SUBWAY:
|
|
13322
13329
|
return RouteType.ROUTE_TYPE_SUBWAY;
|
|
13323
|
-
case
|
|
13330
|
+
case RouteTypes.RAIL:
|
|
13324
13331
|
return RouteType.ROUTE_TYPE_RAIL;
|
|
13325
|
-
case
|
|
13332
|
+
case RouteTypes.BUS:
|
|
13326
13333
|
return RouteType.ROUTE_TYPE_BUS;
|
|
13327
|
-
case
|
|
13334
|
+
case RouteTypes.FERRY:
|
|
13328
13335
|
return RouteType.ROUTE_TYPE_FERRY;
|
|
13329
|
-
case
|
|
13336
|
+
case RouteTypes.CABLE_TRAM:
|
|
13330
13337
|
return RouteType.ROUTE_TYPE_CABLE_TRAM;
|
|
13331
|
-
case
|
|
13338
|
+
case RouteTypes.AERIAL_LIFT:
|
|
13332
13339
|
return RouteType.ROUTE_TYPE_AERIAL_LIFT;
|
|
13333
|
-
case
|
|
13340
|
+
case RouteTypes.FUNICULAR:
|
|
13334
13341
|
return RouteType.ROUTE_TYPE_FUNICULAR;
|
|
13335
|
-
case
|
|
13342
|
+
case RouteTypes.TROLLEYBUS:
|
|
13336
13343
|
return RouteType.ROUTE_TYPE_TROLLEYBUS;
|
|
13337
|
-
case
|
|
13344
|
+
case RouteTypes.MONORAIL:
|
|
13338
13345
|
return RouteType.ROUTE_TYPE_MONORAIL;
|
|
13339
13346
|
}
|
|
13340
13347
|
};
|
|
@@ -13376,18 +13383,25 @@ const deserializeTripTransfers = (protoTripTransfer) => {
|
|
|
13376
13383
|
};
|
|
13377
13384
|
|
|
13378
13385
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
13379
|
-
const
|
|
13380
|
-
|
|
13381
|
-
|
|
13382
|
-
|
|
13383
|
-
|
|
13384
|
-
|
|
13385
|
-
|
|
13386
|
-
|
|
13387
|
-
|
|
13388
|
-
|
|
13389
|
-
|
|
13390
|
-
|
|
13386
|
+
const TransferTypes = {
|
|
13387
|
+
RECOMMENDED: 1,
|
|
13388
|
+
GUARANTEED: 2,
|
|
13389
|
+
REQUIRES_MINIMAL_TIME: 3,
|
|
13390
|
+
IN_SEAT: 4,
|
|
13391
|
+
};
|
|
13392
|
+
const RouteTypes = {
|
|
13393
|
+
TRAM: 1,
|
|
13394
|
+
SUBWAY: 2,
|
|
13395
|
+
RAIL: 3,
|
|
13396
|
+
BUS: 4,
|
|
13397
|
+
FERRY: 5,
|
|
13398
|
+
CABLE_TRAM: 6,
|
|
13399
|
+
AERIAL_LIFT: 7,
|
|
13400
|
+
FUNICULAR: 8,
|
|
13401
|
+
TROLLEYBUS: 9,
|
|
13402
|
+
MONORAIL: 10,
|
|
13403
|
+
};
|
|
13404
|
+
const ALL_TRANSPORT_MODES = new Set(Object.values(RouteTypes));
|
|
13391
13405
|
const EMPTY_TRIP_BOARDINGS = [];
|
|
13392
13406
|
/**
|
|
13393
13407
|
* The internal transit timetable format.
|
|
@@ -13612,7 +13626,7 @@ class Timetable {
|
|
|
13612
13626
|
const nbTrips = route.getNbTrips();
|
|
13613
13627
|
for (let t = earliestTrip; t < (beforeTrip !== null && beforeTrip !== void 0 ? beforeTrip : nbTrips); t++) {
|
|
13614
13628
|
const pickup = route.pickUpTypeFrom(stopIndex, t);
|
|
13615
|
-
if (pickup === NOT_AVAILABLE) {
|
|
13629
|
+
if (pickup === PickUpDropOffTypes.NOT_AVAILABLE) {
|
|
13616
13630
|
continue;
|
|
13617
13631
|
}
|
|
13618
13632
|
if (fromTripStop === undefined) {
|
|
@@ -13652,6 +13666,25 @@ class Timetable {
|
|
|
13652
13666
|
}
|
|
13653
13667
|
}
|
|
13654
13668
|
|
|
13669
|
+
/**
|
|
13670
|
+
* Returns the value stored under `key`, inserting and returning `defaultValue`
|
|
13671
|
+
* when the key is absent. Mirrors the TC39 `Map.prototype.getOrInsert`
|
|
13672
|
+
* proposal.
|
|
13673
|
+
*
|
|
13674
|
+
* TODO: remove this helper and call `map.getOrInsert(key, defaultValue)`
|
|
13675
|
+
* directly once we only target Node 26+ (where the method is built in).
|
|
13676
|
+
* @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/getOrInsert
|
|
13677
|
+
*/
|
|
13678
|
+
const getOrInsert = (map, key, defaultValue) => {
|
|
13679
|
+
if (map.has(key)) {
|
|
13680
|
+
// Key is present, so `get` returns the stored value (which may itself be a
|
|
13681
|
+
// legitimately-stored `undefined`).
|
|
13682
|
+
return map.get(key);
|
|
13683
|
+
}
|
|
13684
|
+
map.set(key, defaultValue);
|
|
13685
|
+
return defaultValue;
|
|
13686
|
+
};
|
|
13687
|
+
|
|
13655
13688
|
const toGtfsDate = (date) => {
|
|
13656
13689
|
return parseInt(date.toFormat('yyyyLLdd'));
|
|
13657
13690
|
};
|
|
@@ -15663,25 +15696,25 @@ const standardGtfsProfile = {
|
|
|
15663
15696
|
routeTypeParser: (routeType) => {
|
|
15664
15697
|
switch (routeType) {
|
|
15665
15698
|
case 0:
|
|
15666
|
-
return
|
|
15699
|
+
return RouteTypes.TRAM;
|
|
15667
15700
|
case 1:
|
|
15668
|
-
return
|
|
15701
|
+
return RouteTypes.SUBWAY;
|
|
15669
15702
|
case 2:
|
|
15670
|
-
return
|
|
15703
|
+
return RouteTypes.RAIL;
|
|
15671
15704
|
case 3:
|
|
15672
|
-
return
|
|
15705
|
+
return RouteTypes.BUS;
|
|
15673
15706
|
case 4:
|
|
15674
|
-
return
|
|
15707
|
+
return RouteTypes.FERRY;
|
|
15675
15708
|
case 5:
|
|
15676
|
-
return
|
|
15709
|
+
return RouteTypes.CABLE_TRAM;
|
|
15677
15710
|
case 6:
|
|
15678
|
-
return
|
|
15711
|
+
return RouteTypes.AERIAL_LIFT;
|
|
15679
15712
|
case 7:
|
|
15680
|
-
return
|
|
15713
|
+
return RouteTypes.FUNICULAR;
|
|
15681
15714
|
case 11:
|
|
15682
|
-
return
|
|
15715
|
+
return RouteTypes.TROLLEYBUS;
|
|
15683
15716
|
case 12:
|
|
15684
|
-
return
|
|
15717
|
+
return RouteTypes.MONORAIL;
|
|
15685
15718
|
default:
|
|
15686
15719
|
return undefined;
|
|
15687
15720
|
}
|
|
@@ -15955,7 +15988,7 @@ const processGuaranteedStopTransfer = (transferEntry, fromStop, toStop, transfer
|
|
|
15955
15988
|
log.warn(`Unsupported transfer of type ${transferEntry.transfer_type} between routes ${transferEntry.from_route_id} and ${transferEntry.to_route_id}.`);
|
|
15956
15989
|
return;
|
|
15957
15990
|
}
|
|
15958
|
-
const transfer = Object.assign({ destination: toStop, type:
|
|
15991
|
+
const transfer = Object.assign({ destination: toStop, type: TransferTypes.GUARANTEED }, (transferEntry.min_transfer_time !== undefined && {
|
|
15959
15992
|
minTransferTime: durationFromSeconds(transferEntry.min_transfer_time),
|
|
15960
15993
|
}));
|
|
15961
15994
|
const fromStopTransfers = transfers.get(fromStop) || [];
|
|
@@ -15988,10 +16021,12 @@ const processStopToStopTransfer = (transferEntry, fromStop, toStop, transfers) =
|
|
|
15988
16021
|
/**
|
|
15989
16022
|
* Parses the transfers.txt file from a GTFS feed.
|
|
15990
16023
|
*
|
|
15991
|
-
* @param
|
|
15992
|
-
* @
|
|
16024
|
+
* @param transfersStream The readable stream containing the transfers data.
|
|
16025
|
+
* @param stopsMap The parsed GTFS stops indexed by their source IDs.
|
|
16026
|
+
* @param activeServiceIds The service IDs active for the requested date.
|
|
16027
|
+
* @returns Parsed stop transfers, trip continuations, and guaranteed trip transfers.
|
|
15993
16028
|
*/
|
|
15994
|
-
const parseTransfers = (transfersStream, stopsMap) => __awaiter(void 0, void 0, void 0, function* () {
|
|
16029
|
+
const parseTransfers = (transfersStream, stopsMap, activeServiceIds) => __awaiter(void 0, void 0, void 0, function* () {
|
|
15995
16030
|
var _a, e_1, _b, _c;
|
|
15996
16031
|
const transfers = new Map();
|
|
15997
16032
|
const tripContinuations = [];
|
|
@@ -16005,6 +16040,10 @@ const parseTransfers = (transfersStream, stopsMap) => __awaiter(void 0, void 0,
|
|
|
16005
16040
|
_d = false;
|
|
16006
16041
|
const rawLine = _c;
|
|
16007
16042
|
const transferEntry = rawLine;
|
|
16043
|
+
if (transferEntry.service_id &&
|
|
16044
|
+
!activeServiceIds.has(transferEntry.service_id)) {
|
|
16045
|
+
continue;
|
|
16046
|
+
}
|
|
16008
16047
|
if (transferEntry.transfer_type === 3 ||
|
|
16009
16048
|
transferEntry.transfer_type === 5) {
|
|
16010
16049
|
continue;
|
|
@@ -16145,13 +16184,13 @@ const parseGtfsTransferType = (gtfsTransferType) => {
|
|
|
16145
16184
|
switch (gtfsTransferType) {
|
|
16146
16185
|
case 0:
|
|
16147
16186
|
default:
|
|
16148
|
-
return
|
|
16187
|
+
return TransferTypes.RECOMMENDED;
|
|
16149
16188
|
case 1:
|
|
16150
|
-
return
|
|
16189
|
+
return TransferTypes.GUARANTEED;
|
|
16151
16190
|
case 2:
|
|
16152
|
-
return
|
|
16191
|
+
return TransferTypes.REQUIRES_MINIMAL_TIME;
|
|
16153
16192
|
case 4:
|
|
16154
|
-
return
|
|
16193
|
+
return TransferTypes.IN_SEAT;
|
|
16155
16194
|
}
|
|
16156
16195
|
};
|
|
16157
16196
|
|
|
@@ -16500,15 +16539,15 @@ const parseStopTimes = (stopTimesStream, stopsMap, activeTripIds, activeStopIds,
|
|
|
16500
16539
|
const parsePickupDropOffType = (gtfsType) => {
|
|
16501
16540
|
switch (gtfsType) {
|
|
16502
16541
|
default:
|
|
16503
|
-
return REGULAR;
|
|
16542
|
+
return PickUpDropOffTypes.REGULAR;
|
|
16504
16543
|
case '0':
|
|
16505
|
-
return REGULAR;
|
|
16544
|
+
return PickUpDropOffTypes.REGULAR;
|
|
16506
16545
|
case '1':
|
|
16507
|
-
return NOT_AVAILABLE;
|
|
16546
|
+
return PickUpDropOffTypes.NOT_AVAILABLE;
|
|
16508
16547
|
case '2':
|
|
16509
|
-
return MUST_PHONE_AGENCY;
|
|
16548
|
+
return PickUpDropOffTypes.MUST_PHONE_AGENCY;
|
|
16510
16549
|
case '3':
|
|
16511
|
-
return MUST_COORDINATE_WITH_DRIVER;
|
|
16550
|
+
return PickUpDropOffTypes.MUST_COORDINATE_WITH_DRIVER;
|
|
16512
16551
|
}
|
|
16513
16552
|
};
|
|
16514
16553
|
|
|
@@ -16521,10 +16560,11 @@ const STOP_TIMES_FILE = 'stop_times.txt';
|
|
|
16521
16560
|
const STOPS_FILE = 'stops.txt';
|
|
16522
16561
|
const TRANSFERS_FILE = 'transfers.txt';
|
|
16523
16562
|
class GtfsParser {
|
|
16524
|
-
constructor(path, profile = standardGtfsProfile) {
|
|
16563
|
+
constructor(path, profile = standardGtfsProfile, transferGenerator) {
|
|
16525
16564
|
// TODO: support input from multiple sources
|
|
16526
16565
|
this.path = path;
|
|
16527
16566
|
this.profile = profile;
|
|
16567
|
+
this.transferGenerator = transferGenerator;
|
|
16528
16568
|
}
|
|
16529
16569
|
/**
|
|
16530
16570
|
* Parses a GTFS feed to extract all the data relevant to a given day in a transit-planner friendly format.
|
|
@@ -16581,7 +16621,7 @@ class GtfsParser {
|
|
|
16581
16621
|
log.info(`Parsing ${TRANSFERS_FILE}`);
|
|
16582
16622
|
const transfersStart = performance.now();
|
|
16583
16623
|
const transfersStream = yield zip.stream(TRANSFERS_FILE);
|
|
16584
|
-
const { transfers: parsedTransfers, tripContinuations: parsedTripContinuations, guaranteedTripTransfers: parsedGuaranteedTripTransfers, } = yield parseTransfers(transfersStream, parsedStops);
|
|
16624
|
+
const { transfers: parsedTransfers, tripContinuations: parsedTripContinuations, guaranteedTripTransfers: parsedGuaranteedTripTransfers, } = yield parseTransfers(transfersStream, parsedStops, activeServiceIds);
|
|
16585
16625
|
transfers = parsedTransfers;
|
|
16586
16626
|
tripContinuationsList = parsedTripContinuations;
|
|
16587
16627
|
guaranteedTripTransfersList = parsedGuaranteedTripTransfers;
|
|
@@ -16604,6 +16644,35 @@ class GtfsParser {
|
|
|
16604
16644
|
const serviceRoutes = indexRoutes(validGtfsRoutes, serviceRoutesMap);
|
|
16605
16645
|
const stopTimesEnd = performance.now();
|
|
16606
16646
|
log.info(`${routes.length} valid unique routes. (${(stopTimesEnd - stopTimesStart).toFixed(2)}ms)`);
|
|
16647
|
+
if (this.transferGenerator) {
|
|
16648
|
+
log.info('Generating virtual transfers');
|
|
16649
|
+
const virtualTransfersStart = performance.now();
|
|
16650
|
+
// Only route-served stops with coordinates are worth connecting: a
|
|
16651
|
+
// transfer to a stop no route calls at is a dead end for the router.
|
|
16652
|
+
const originStops = Array.from(parsedStops.values()).filter((stop) => activeStopIds.has(stop.id) &&
|
|
16653
|
+
stop.lat !== undefined &&
|
|
16654
|
+
stop.lon !== undefined);
|
|
16655
|
+
const stopsIndex = new StopsIndex(Array.from(parsedStops.values()));
|
|
16656
|
+
const generatedTransfers = yield this.transferGenerator.generate(originStops, stopsIndex);
|
|
16657
|
+
let addedTransfers = 0;
|
|
16658
|
+
for (const [fromStop, newTransfers] of generatedTransfers) {
|
|
16659
|
+
const existing = getOrInsert(transfers, fromStop, []);
|
|
16660
|
+
// Deduplicate per directed pair against existing (feed) transfers, and
|
|
16661
|
+
// only keep transfers into stops a route actually calls at.
|
|
16662
|
+
const connected = new Set(existing.map((t) => t.destination));
|
|
16663
|
+
for (const transfer of newTransfers) {
|
|
16664
|
+
if (!activeStopIds.has(transfer.destination) ||
|
|
16665
|
+
connected.has(transfer.destination)) {
|
|
16666
|
+
continue;
|
|
16667
|
+
}
|
|
16668
|
+
connected.add(transfer.destination);
|
|
16669
|
+
existing.push(transfer);
|
|
16670
|
+
addedTransfers += 1;
|
|
16671
|
+
}
|
|
16672
|
+
}
|
|
16673
|
+
const virtualTransfersEnd = performance.now();
|
|
16674
|
+
log.info(`${addedTransfers} virtual transfers added. (${(virtualTransfersEnd - virtualTransfersStart).toFixed(2)}ms)`);
|
|
16675
|
+
}
|
|
16607
16676
|
log.info('Building stops adjacency structure');
|
|
16608
16677
|
const stopsAdjacencyStart = performance.now();
|
|
16609
16678
|
const stopsAdjacency = buildStopsAdjacencyStructure(serviceRoutes, routes, transfers, parsedStops.size, activeStopIds);
|
|
@@ -16676,7 +16745,7 @@ const routeTypeParser = (routeType) => {
|
|
|
16676
16745
|
case 115: // Vehicle Transport Rail Service
|
|
16677
16746
|
case 116: // Rack and Pinion Railway (Rochers de Naye, Dolderbahn)
|
|
16678
16747
|
case 117: // Additional Rail Service
|
|
16679
|
-
return
|
|
16748
|
+
return RouteTypes.RAIL;
|
|
16680
16749
|
// Coach Service (200-299)
|
|
16681
16750
|
case 200: // Coach Service
|
|
16682
16751
|
case 201: // International Coach Service (EuroLine, Touring)
|
|
@@ -16688,16 +16757,16 @@ const routeTypeParser = (routeType) => {
|
|
|
16688
16757
|
case 207: // Tourist Coach Service
|
|
16689
16758
|
case 208: // Commuter Coach Service
|
|
16690
16759
|
case 209: // All Coach Services
|
|
16691
|
-
return
|
|
16760
|
+
return RouteTypes.BUS;
|
|
16692
16761
|
// Urban Railway Service (400-499)
|
|
16693
16762
|
case 400: // Urban Railway Service
|
|
16694
16763
|
case 401: // Metro Service (Métro de Paris)
|
|
16695
16764
|
case 402: // Underground Service (London Underground, U-Bahn)
|
|
16696
16765
|
case 403: // Urban Railway Service
|
|
16697
16766
|
case 404: // All Urban Railway Services
|
|
16698
|
-
return
|
|
16767
|
+
return RouteTypes.SUBWAY;
|
|
16699
16768
|
case 405: // Monorail
|
|
16700
|
-
return
|
|
16769
|
+
return RouteTypes.MONORAIL;
|
|
16701
16770
|
// Bus Service (700-799)
|
|
16702
16771
|
case 700: // Bus Service
|
|
16703
16772
|
case 701: // Regional Bus Service (Eastbourne-Maidstone)
|
|
@@ -16716,10 +16785,10 @@ const routeTypeParser = (routeType) => {
|
|
|
16716
16785
|
case 714: // Rail Replacement Bus Service
|
|
16717
16786
|
case 715: // Demand and Response Bus Service
|
|
16718
16787
|
case 716: // All Bus Services
|
|
16719
|
-
return
|
|
16788
|
+
return RouteTypes.BUS;
|
|
16720
16789
|
// Trolleybus Service (800-899)
|
|
16721
16790
|
case 800: // Trolleybus Service
|
|
16722
|
-
return
|
|
16791
|
+
return RouteTypes.TROLLEYBUS;
|
|
16723
16792
|
// Tram Service (900-999)
|
|
16724
16793
|
case 900: // Tram Service
|
|
16725
16794
|
case 901: // City Tram Service
|
|
@@ -16728,16 +16797,16 @@ const routeTypeParser = (routeType) => {
|
|
|
16728
16797
|
case 904: // Sightseeing Tram Service (Blackpool Seafront)
|
|
16729
16798
|
case 905: // Shuttle Tram Service
|
|
16730
16799
|
case 906: // All Tram Services
|
|
16731
|
-
return
|
|
16800
|
+
return RouteTypes.TRAM;
|
|
16732
16801
|
// Water Transport Service (1000-1099)
|
|
16733
16802
|
case 1000: // Water Transport Service
|
|
16734
|
-
return
|
|
16803
|
+
return RouteTypes.FERRY;
|
|
16735
16804
|
// Air Service (1100-1199)
|
|
16736
16805
|
case 1100: // Air Service
|
|
16737
16806
|
return undefined;
|
|
16738
16807
|
// Ferry Service (1200-1299)
|
|
16739
16808
|
case 1200: // Ferry Service
|
|
16740
|
-
return
|
|
16809
|
+
return RouteTypes.FERRY;
|
|
16741
16810
|
// Aerial Lift Service (1300-1399)
|
|
16742
16811
|
case 1300: // Aerial Lift Service (Telefèric de Montjuïc, Roosevelt Island Tramway)
|
|
16743
16812
|
case 1301: // Telecabin Service
|
|
@@ -16746,10 +16815,10 @@ const routeTypeParser = (routeType) => {
|
|
|
16746
16815
|
case 1305: // Drag Lift Service
|
|
16747
16816
|
case 1306: // Small Telecabin Service
|
|
16748
16817
|
case 1307: // All Telecabin Services
|
|
16749
|
-
return
|
|
16818
|
+
return RouteTypes.AERIAL_LIFT;
|
|
16750
16819
|
case 1303: // Elevator Service (Ascenseur, Aufzug)
|
|
16751
16820
|
case 1400: // Funicular Service (Rigiblick)
|
|
16752
|
-
return
|
|
16821
|
+
return RouteTypes.FUNICULAR;
|
|
16753
16822
|
// Taxi Service (1500-1599)
|
|
16754
16823
|
case 1500: // Taxi Service
|
|
16755
16824
|
case 1502: // Water Taxi Service
|
|
@@ -16760,12 +16829,12 @@ const routeTypeParser = (routeType) => {
|
|
|
16760
16829
|
case 1507: // All Taxi Services
|
|
16761
16830
|
return undefined;
|
|
16762
16831
|
case 1501: // Communal Taxi Service (Marshrutka, dolmuş)
|
|
16763
|
-
return
|
|
16832
|
+
return RouteTypes.BUS;
|
|
16764
16833
|
// Miscellaneous Service (1700-1799)
|
|
16765
16834
|
case 1700: // Miscellaneous Service / Unknown mode
|
|
16766
16835
|
return undefined;
|
|
16767
16836
|
case 1702: // Horse-drawn Carriage
|
|
16768
|
-
return
|
|
16837
|
+
return RouteTypes.BUS;
|
|
16769
16838
|
default:
|
|
16770
16839
|
return undefined;
|
|
16771
16840
|
}
|
|
@@ -16774,7 +16843,88 @@ const extendedGtfsProfile = {
|
|
|
16774
16843
|
routeTypeParser,
|
|
16775
16844
|
};
|
|
16776
16845
|
|
|
16846
|
+
const DEFAULT_MAX_DISTANCE_METERS = 500;
|
|
16847
|
+
const DEFAULT_WALKING_SPEED_KMH = 4;
|
|
16848
|
+
const DEFAULT_DETOUR_FACTOR = 1.3;
|
|
16849
|
+
const DEFAULT_CHANGE_PENALTY_MINUTES = 3;
|
|
16850
|
+
/**
|
|
16851
|
+
* A {@link TransferGenerator} that connects geographically close stops with
|
|
16852
|
+
* virtual walking transfers.
|
|
16853
|
+
*
|
|
16854
|
+
* The transfer time is derived from the straight-line (great-circle / haversine)
|
|
16855
|
+
* distance between two stops, scaled up by a detour factor to approximate the
|
|
16856
|
+
* real walking path and divided by an assumed walking speed. This is a
|
|
16857
|
+
* deliberately crude heuristic meant to fill in footpaths for feeds that
|
|
16858
|
+
* under-specify `transfers.txt` (e.g. large interchanges where subway, tram and
|
|
16859
|
+
* bus stops sit close together but are left unconnected).
|
|
16860
|
+
*
|
|
16861
|
+
* Generated transfers use {@link TransferTypes.REQUIRES_MINIMAL_TIME} so they
|
|
16862
|
+
* are treated as walking connections by both the router's transfer step and
|
|
16863
|
+
* its access/egress computation. Each origin is connected to its nearby stops
|
|
16864
|
+
* with a single directed edge; the reverse edge is produced when the neighbor
|
|
16865
|
+
* is itself visited as an origin.
|
|
16866
|
+
*
|
|
16867
|
+
* On top of the walking time, a flat `changePenaltyMinutes` is added for the
|
|
16868
|
+
* general overhead of any change. It is symmetric, so the two directions of a
|
|
16869
|
+
* transfer share the same minimum time.
|
|
16870
|
+
*/
|
|
16871
|
+
class StraightLineTransferGenerator {
|
|
16872
|
+
constructor(options = {}) {
|
|
16873
|
+
var _a, _b, _c, _d;
|
|
16874
|
+
this.maxDistanceMeters =
|
|
16875
|
+
(_a = options.maxDistanceMeters) !== null && _a !== void 0 ? _a : DEFAULT_MAX_DISTANCE_METERS;
|
|
16876
|
+
this.walkingSpeedKmh = (_b = options.walkingSpeedKmh) !== null && _b !== void 0 ? _b : DEFAULT_WALKING_SPEED_KMH;
|
|
16877
|
+
this.detourFactor = (_c = options.detourFactor) !== null && _c !== void 0 ? _c : DEFAULT_DETOUR_FACTOR;
|
|
16878
|
+
this.changePenaltyMinutes =
|
|
16879
|
+
(_d = options.changePenaltyMinutes) !== null && _d !== void 0 ? _d : DEFAULT_CHANGE_PENALTY_MINUTES;
|
|
16880
|
+
}
|
|
16881
|
+
generate(originStops, stops) {
|
|
16882
|
+
const generated = new Map();
|
|
16883
|
+
const maxDistanceKm = this.maxDistanceMeters / 1000;
|
|
16884
|
+
for (const origin of originStops) {
|
|
16885
|
+
const { id, lat, lon } = origin;
|
|
16886
|
+
if (lat === undefined || lon === undefined) {
|
|
16887
|
+
continue;
|
|
16888
|
+
}
|
|
16889
|
+
const neighbors = stops.findStopsByLocation(lat, lon, Infinity, maxDistanceKm);
|
|
16890
|
+
for (const neighbor of neighbors) {
|
|
16891
|
+
const { id: neighborId, lat: neighborLat, lon: neighborLon } = neighbor;
|
|
16892
|
+
if (neighborId === id ||
|
|
16893
|
+
neighborLat === undefined ||
|
|
16894
|
+
neighborLon === undefined) {
|
|
16895
|
+
continue;
|
|
16896
|
+
}
|
|
16897
|
+
const walkingTime = this.walkingDuration(lon, lat, neighborLon, neighborLat);
|
|
16898
|
+
// Emit a single directed edge; the reverse edge is emitted when the
|
|
16899
|
+
// neighbor is itself visited as an origin. The penalty is symmetric, so
|
|
16900
|
+
// both directions end up with the same minimum time.
|
|
16901
|
+
const minTransferTime = walkingTime + this.changePenaltyMinutes;
|
|
16902
|
+
this.addTransfer(generated, id, neighborId, minTransferTime);
|
|
16903
|
+
}
|
|
16904
|
+
}
|
|
16905
|
+
return generated;
|
|
16906
|
+
}
|
|
16907
|
+
addTransfer(transfers, from, to, minTransferTime) {
|
|
16908
|
+
const transfer = {
|
|
16909
|
+
destination: to,
|
|
16910
|
+
type: TransferTypes.REQUIRES_MINIMAL_TIME,
|
|
16911
|
+
minTransferTime,
|
|
16912
|
+
};
|
|
16913
|
+
getOrInsert(transfers, from, []).push(transfer);
|
|
16914
|
+
}
|
|
16915
|
+
/**
|
|
16916
|
+
* Estimates the walking time between two coordinates, in whole minutes.
|
|
16917
|
+
*/
|
|
16918
|
+
walkingDuration(lon1, lat1, lon2, lat2) {
|
|
16919
|
+
const straightLineKm = distance(lon1, lat1, lon2, lat2);
|
|
16920
|
+
const walkingKm = straightLineKm * this.detourFactor;
|
|
16921
|
+
return Math.round((walkingKm / this.walkingSpeedKmh) * 60);
|
|
16922
|
+
}
|
|
16923
|
+
}
|
|
16924
|
+
|
|
16777
16925
|
exports.GtfsParser = GtfsParser;
|
|
16926
|
+
exports.StraightLineTransferGenerator = StraightLineTransferGenerator;
|
|
16927
|
+
exports.TransferTypes = TransferTypes;
|
|
16778
16928
|
exports.extendedGtfsProfile = extendedGtfsProfile;
|
|
16779
16929
|
exports.standardGtfsProfile = standardGtfsProfile;
|
|
16780
16930
|
//# sourceMappingURL=parser.cjs.js.map
|