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/cli.mjs
CHANGED
|
@@ -15310,6 +15310,11 @@ function haverSinDist(lng1, lat1, lng2, lat2, cosLat1) {
|
|
|
15310
15310
|
return haverSinDistPartial(haverSinDLng, cosLat1, lat1, lat2);
|
|
15311
15311
|
}
|
|
15312
15312
|
|
|
15313
|
+
function distance(lng1, lat1, lng2, lat2) {
|
|
15314
|
+
const h = haverSinDist(lng1, lat1, lng2, lat2, Math.cos(lat1 * rad));
|
|
15315
|
+
return 2 * earthRadius * Math.asin(Math.sqrt(h));
|
|
15316
|
+
}
|
|
15317
|
+
|
|
15313
15318
|
function vertexLat(lat, haverSinDLng) {
|
|
15314
15319
|
const cosDLng = 1 - 2 * haverSinDLng;
|
|
15315
15320
|
if (cosDLng <= 0) return lat > 0 ? 90 : -90;
|
|
@@ -17109,10 +17114,12 @@ const durationToString = (duration) => {
|
|
|
17109
17114
|
}
|
|
17110
17115
|
};
|
|
17111
17116
|
|
|
17112
|
-
const
|
|
17113
|
-
|
|
17114
|
-
|
|
17115
|
-
|
|
17117
|
+
const PickUpDropOffTypes = {
|
|
17118
|
+
REGULAR: 0,
|
|
17119
|
+
NOT_AVAILABLE: 1,
|
|
17120
|
+
MUST_PHONE_AGENCY: 2,
|
|
17121
|
+
MUST_COORDINATE_WITH_DRIVER: 3,
|
|
17122
|
+
};
|
|
17116
17123
|
/**
|
|
17117
17124
|
* A route identifies all trips of a given service route sharing the same list of stops.
|
|
17118
17125
|
*/
|
|
@@ -17192,8 +17199,8 @@ let Route$1 = class Route {
|
|
|
17192
17199
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
17193
17200
|
const stop = trip.stops[stopIndex];
|
|
17194
17201
|
const globalIndex = tripIndex * numStops + stopIndex;
|
|
17195
|
-
const pickUp = (_a = stop.pickUpType) !== null && _a !== void 0 ? _a : REGULAR;
|
|
17196
|
-
const dropOff = (_b = stop.dropOffType) !== null && _b !== void 0 ? _b : REGULAR;
|
|
17202
|
+
const pickUp = (_a = stop.pickUpType) !== null && _a !== void 0 ? _a : PickUpDropOffTypes.REGULAR;
|
|
17203
|
+
const dropOff = (_b = stop.dropOffType) !== null && _b !== void 0 ? _b : PickUpDropOffTypes.REGULAR;
|
|
17197
17204
|
const byteIndex = Math.floor(globalIndex / 2);
|
|
17198
17205
|
const isSecondPair = globalIndex % 2 === 1;
|
|
17199
17206
|
if (isSecondPair) {
|
|
@@ -17627,26 +17634,26 @@ const parseTransferType = (type) => {
|
|
|
17627
17634
|
case TransferType.TRANSFER_TYPE_UNSPECIFIED:
|
|
17628
17635
|
throw new Error('Unspecified protobuf transfer type.');
|
|
17629
17636
|
case TransferType.TRANSFER_TYPE_RECOMMENDED_TRANSFER_POINT:
|
|
17630
|
-
return
|
|
17637
|
+
return TransferTypes.RECOMMENDED;
|
|
17631
17638
|
case TransferType.TRANSFER_TYPE_TIMED_TRANSFER:
|
|
17632
|
-
return
|
|
17639
|
+
return TransferTypes.GUARANTEED;
|
|
17633
17640
|
case TransferType.TRANSFER_TYPE_REQUIRES_MINIMAL_TIME:
|
|
17634
|
-
return
|
|
17641
|
+
return TransferTypes.REQUIRES_MINIMAL_TIME;
|
|
17635
17642
|
case TransferType.TRANSFER_TYPE_IN_SEAT_TRANSFER:
|
|
17636
|
-
return
|
|
17643
|
+
return TransferTypes.IN_SEAT;
|
|
17637
17644
|
case TransferType.UNRECOGNIZED:
|
|
17638
17645
|
throw new Error('Unrecognized protobuf transfer type.');
|
|
17639
17646
|
}
|
|
17640
17647
|
};
|
|
17641
17648
|
const serializeTransferType = (type) => {
|
|
17642
17649
|
switch (type) {
|
|
17643
|
-
case
|
|
17650
|
+
case TransferTypes.RECOMMENDED:
|
|
17644
17651
|
return TransferType.TRANSFER_TYPE_RECOMMENDED_TRANSFER_POINT;
|
|
17645
|
-
case
|
|
17652
|
+
case TransferTypes.GUARANTEED:
|
|
17646
17653
|
return TransferType.TRANSFER_TYPE_TIMED_TRANSFER;
|
|
17647
|
-
case
|
|
17654
|
+
case TransferTypes.REQUIRES_MINIMAL_TIME:
|
|
17648
17655
|
return TransferType.TRANSFER_TYPE_REQUIRES_MINIMAL_TIME;
|
|
17649
|
-
case
|
|
17656
|
+
case TransferTypes.IN_SEAT:
|
|
17650
17657
|
return TransferType.TRANSFER_TYPE_IN_SEAT_TRANSFER;
|
|
17651
17658
|
}
|
|
17652
17659
|
};
|
|
@@ -17655,25 +17662,25 @@ const parseRouteType = (type) => {
|
|
|
17655
17662
|
case RouteType.ROUTE_TYPE_UNSPECIFIED:
|
|
17656
17663
|
throw new Error('Unspecified protobuf route type.');
|
|
17657
17664
|
case RouteType.ROUTE_TYPE_TRAM:
|
|
17658
|
-
return
|
|
17665
|
+
return RouteTypes.TRAM;
|
|
17659
17666
|
case RouteType.ROUTE_TYPE_SUBWAY:
|
|
17660
|
-
return
|
|
17667
|
+
return RouteTypes.SUBWAY;
|
|
17661
17668
|
case RouteType.ROUTE_TYPE_RAIL:
|
|
17662
|
-
return
|
|
17669
|
+
return RouteTypes.RAIL;
|
|
17663
17670
|
case RouteType.ROUTE_TYPE_BUS:
|
|
17664
|
-
return
|
|
17671
|
+
return RouteTypes.BUS;
|
|
17665
17672
|
case RouteType.ROUTE_TYPE_FERRY:
|
|
17666
|
-
return
|
|
17673
|
+
return RouteTypes.FERRY;
|
|
17667
17674
|
case RouteType.ROUTE_TYPE_CABLE_TRAM:
|
|
17668
|
-
return
|
|
17675
|
+
return RouteTypes.CABLE_TRAM;
|
|
17669
17676
|
case RouteType.ROUTE_TYPE_AERIAL_LIFT:
|
|
17670
|
-
return
|
|
17677
|
+
return RouteTypes.AERIAL_LIFT;
|
|
17671
17678
|
case RouteType.ROUTE_TYPE_FUNICULAR:
|
|
17672
|
-
return
|
|
17679
|
+
return RouteTypes.FUNICULAR;
|
|
17673
17680
|
case RouteType.ROUTE_TYPE_TROLLEYBUS:
|
|
17674
|
-
return
|
|
17681
|
+
return RouteTypes.TROLLEYBUS;
|
|
17675
17682
|
case RouteType.ROUTE_TYPE_MONORAIL:
|
|
17676
|
-
return
|
|
17683
|
+
return RouteTypes.MONORAIL;
|
|
17677
17684
|
case RouteType.UNRECOGNIZED:
|
|
17678
17685
|
default:
|
|
17679
17686
|
throw new Error('Unrecognized protobuf route type.');
|
|
@@ -17681,25 +17688,25 @@ const parseRouteType = (type) => {
|
|
|
17681
17688
|
};
|
|
17682
17689
|
const serializeRouteType = (type) => {
|
|
17683
17690
|
switch (type) {
|
|
17684
|
-
case
|
|
17691
|
+
case RouteTypes.TRAM:
|
|
17685
17692
|
return RouteType.ROUTE_TYPE_TRAM;
|
|
17686
|
-
case
|
|
17693
|
+
case RouteTypes.SUBWAY:
|
|
17687
17694
|
return RouteType.ROUTE_TYPE_SUBWAY;
|
|
17688
|
-
case
|
|
17695
|
+
case RouteTypes.RAIL:
|
|
17689
17696
|
return RouteType.ROUTE_TYPE_RAIL;
|
|
17690
|
-
case
|
|
17697
|
+
case RouteTypes.BUS:
|
|
17691
17698
|
return RouteType.ROUTE_TYPE_BUS;
|
|
17692
|
-
case
|
|
17699
|
+
case RouteTypes.FERRY:
|
|
17693
17700
|
return RouteType.ROUTE_TYPE_FERRY;
|
|
17694
|
-
case
|
|
17701
|
+
case RouteTypes.CABLE_TRAM:
|
|
17695
17702
|
return RouteType.ROUTE_TYPE_CABLE_TRAM;
|
|
17696
|
-
case
|
|
17703
|
+
case RouteTypes.AERIAL_LIFT:
|
|
17697
17704
|
return RouteType.ROUTE_TYPE_AERIAL_LIFT;
|
|
17698
|
-
case
|
|
17705
|
+
case RouteTypes.FUNICULAR:
|
|
17699
17706
|
return RouteType.ROUTE_TYPE_FUNICULAR;
|
|
17700
|
-
case
|
|
17707
|
+
case RouteTypes.TROLLEYBUS:
|
|
17701
17708
|
return RouteType.ROUTE_TYPE_TROLLEYBUS;
|
|
17702
|
-
case
|
|
17709
|
+
case RouteTypes.MONORAIL:
|
|
17703
17710
|
return RouteType.ROUTE_TYPE_MONORAIL;
|
|
17704
17711
|
}
|
|
17705
17712
|
};
|
|
@@ -17741,18 +17748,25 @@ const deserializeTripTransfers = (protoTripTransfer) => {
|
|
|
17741
17748
|
};
|
|
17742
17749
|
|
|
17743
17750
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
17744
|
-
const
|
|
17745
|
-
|
|
17746
|
-
|
|
17747
|
-
|
|
17748
|
-
|
|
17749
|
-
|
|
17750
|
-
|
|
17751
|
-
|
|
17752
|
-
|
|
17753
|
-
|
|
17754
|
-
|
|
17755
|
-
|
|
17751
|
+
const TransferTypes = {
|
|
17752
|
+
RECOMMENDED: 1,
|
|
17753
|
+
GUARANTEED: 2,
|
|
17754
|
+
REQUIRES_MINIMAL_TIME: 3,
|
|
17755
|
+
IN_SEAT: 4,
|
|
17756
|
+
};
|
|
17757
|
+
const RouteTypes = {
|
|
17758
|
+
TRAM: 1,
|
|
17759
|
+
SUBWAY: 2,
|
|
17760
|
+
RAIL: 3,
|
|
17761
|
+
BUS: 4,
|
|
17762
|
+
FERRY: 5,
|
|
17763
|
+
CABLE_TRAM: 6,
|
|
17764
|
+
AERIAL_LIFT: 7,
|
|
17765
|
+
FUNICULAR: 8,
|
|
17766
|
+
TROLLEYBUS: 9,
|
|
17767
|
+
MONORAIL: 10,
|
|
17768
|
+
};
|
|
17769
|
+
const ALL_TRANSPORT_MODES = new Set(Object.values(RouteTypes));
|
|
17756
17770
|
const EMPTY_TRIP_BOARDINGS = [];
|
|
17757
17771
|
/**
|
|
17758
17772
|
* The internal transit timetable format.
|
|
@@ -17977,7 +17991,7 @@ class Timetable {
|
|
|
17977
17991
|
const nbTrips = route.getNbTrips();
|
|
17978
17992
|
for (let t = earliestTrip; t < (beforeTrip !== null && beforeTrip !== void 0 ? beforeTrip : nbTrips); t++) {
|
|
17979
17993
|
const pickup = route.pickUpTypeFrom(stopIndex, t);
|
|
17980
|
-
if (pickup === NOT_AVAILABLE) {
|
|
17994
|
+
if (pickup === PickUpDropOffTypes.NOT_AVAILABLE) {
|
|
17981
17995
|
continue;
|
|
17982
17996
|
}
|
|
17983
17997
|
if (fromTripStop === undefined) {
|
|
@@ -18016,6 +18030,61 @@ class Timetable {
|
|
|
18016
18030
|
return guaranteedTripTransfers;
|
|
18017
18031
|
}
|
|
18018
18032
|
}
|
|
18033
|
+
const routeTypeToString = (type) => {
|
|
18034
|
+
switch (type) {
|
|
18035
|
+
case RouteTypes.TRAM:
|
|
18036
|
+
return 'TRAM';
|
|
18037
|
+
case RouteTypes.SUBWAY:
|
|
18038
|
+
return 'SUBWAY';
|
|
18039
|
+
case RouteTypes.RAIL:
|
|
18040
|
+
return 'RAIL';
|
|
18041
|
+
case RouteTypes.BUS:
|
|
18042
|
+
return 'BUS';
|
|
18043
|
+
case RouteTypes.FERRY:
|
|
18044
|
+
return 'FERRY';
|
|
18045
|
+
case RouteTypes.CABLE_TRAM:
|
|
18046
|
+
return 'CABLE_TRAM';
|
|
18047
|
+
case RouteTypes.AERIAL_LIFT:
|
|
18048
|
+
return 'AERIAL_LIFT';
|
|
18049
|
+
case RouteTypes.FUNICULAR:
|
|
18050
|
+
return 'FUNICULAR';
|
|
18051
|
+
case RouteTypes.TROLLEYBUS:
|
|
18052
|
+
return 'TROLLEYBUS';
|
|
18053
|
+
case RouteTypes.MONORAIL:
|
|
18054
|
+
return 'MONORAIL';
|
|
18055
|
+
}
|
|
18056
|
+
};
|
|
18057
|
+
const transferTypeToString = (type) => {
|
|
18058
|
+
switch (type) {
|
|
18059
|
+
case TransferTypes.RECOMMENDED:
|
|
18060
|
+
return 'RECOMMENDED';
|
|
18061
|
+
case TransferTypes.GUARANTEED:
|
|
18062
|
+
return 'GUARANTEED';
|
|
18063
|
+
case TransferTypes.REQUIRES_MINIMAL_TIME:
|
|
18064
|
+
return 'REQUIRES_MINIMAL_TIME';
|
|
18065
|
+
case TransferTypes.IN_SEAT:
|
|
18066
|
+
return 'IN_SEAT';
|
|
18067
|
+
}
|
|
18068
|
+
};
|
|
18069
|
+
|
|
18070
|
+
/**
|
|
18071
|
+
* Returns the value stored under `key`, inserting and returning `defaultValue`
|
|
18072
|
+
* when the key is absent. Mirrors the TC39 `Map.prototype.getOrInsert`
|
|
18073
|
+
* proposal.
|
|
18074
|
+
*
|
|
18075
|
+
* TODO: remove this helper and call `map.getOrInsert(key, defaultValue)`
|
|
18076
|
+
* directly once we only target Node 26+ (where the method is built in).
|
|
18077
|
+
* @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/getOrInsert
|
|
18078
|
+
*/
|
|
18079
|
+
const getOrInsert = (map, key, defaultValue) => {
|
|
18080
|
+
if (map.has(key)) {
|
|
18081
|
+
// Key is present, so `get` returns the stored value (which may itself be a
|
|
18082
|
+
// legitimately-stored `undefined`).
|
|
18083
|
+
return map.get(key);
|
|
18084
|
+
}
|
|
18085
|
+
map.set(key, defaultValue);
|
|
18086
|
+
return defaultValue;
|
|
18087
|
+
};
|
|
18019
18088
|
|
|
18020
18089
|
const toGtfsDate = (date) => {
|
|
18021
18090
|
return parseInt(date.toFormat('yyyyLLdd'));
|
|
@@ -20028,25 +20097,25 @@ const standardGtfsProfile = {
|
|
|
20028
20097
|
routeTypeParser: (routeType) => {
|
|
20029
20098
|
switch (routeType) {
|
|
20030
20099
|
case 0:
|
|
20031
|
-
return
|
|
20100
|
+
return RouteTypes.TRAM;
|
|
20032
20101
|
case 1:
|
|
20033
|
-
return
|
|
20102
|
+
return RouteTypes.SUBWAY;
|
|
20034
20103
|
case 2:
|
|
20035
|
-
return
|
|
20104
|
+
return RouteTypes.RAIL;
|
|
20036
20105
|
case 3:
|
|
20037
|
-
return
|
|
20106
|
+
return RouteTypes.BUS;
|
|
20038
20107
|
case 4:
|
|
20039
|
-
return
|
|
20108
|
+
return RouteTypes.FERRY;
|
|
20040
20109
|
case 5:
|
|
20041
|
-
return
|
|
20110
|
+
return RouteTypes.CABLE_TRAM;
|
|
20042
20111
|
case 6:
|
|
20043
|
-
return
|
|
20112
|
+
return RouteTypes.AERIAL_LIFT;
|
|
20044
20113
|
case 7:
|
|
20045
|
-
return
|
|
20114
|
+
return RouteTypes.FUNICULAR;
|
|
20046
20115
|
case 11:
|
|
20047
|
-
return
|
|
20116
|
+
return RouteTypes.TROLLEYBUS;
|
|
20048
20117
|
case 12:
|
|
20049
|
-
return
|
|
20118
|
+
return RouteTypes.MONORAIL;
|
|
20050
20119
|
default:
|
|
20051
20120
|
return undefined;
|
|
20052
20121
|
}
|
|
@@ -20320,7 +20389,7 @@ const processGuaranteedStopTransfer = (transferEntry, fromStop, toStop, transfer
|
|
|
20320
20389
|
log.warn(`Unsupported transfer of type ${transferEntry.transfer_type} between routes ${transferEntry.from_route_id} and ${transferEntry.to_route_id}.`);
|
|
20321
20390
|
return;
|
|
20322
20391
|
}
|
|
20323
|
-
const transfer = Object.assign({ destination: toStop, type:
|
|
20392
|
+
const transfer = Object.assign({ destination: toStop, type: TransferTypes.GUARANTEED }, (transferEntry.min_transfer_time !== undefined && {
|
|
20324
20393
|
minTransferTime: durationFromSeconds(transferEntry.min_transfer_time),
|
|
20325
20394
|
}));
|
|
20326
20395
|
const fromStopTransfers = transfers.get(fromStop) || [];
|
|
@@ -20353,10 +20422,12 @@ const processStopToStopTransfer = (transferEntry, fromStop, toStop, transfers) =
|
|
|
20353
20422
|
/**
|
|
20354
20423
|
* Parses the transfers.txt file from a GTFS feed.
|
|
20355
20424
|
*
|
|
20356
|
-
* @param
|
|
20357
|
-
* @
|
|
20425
|
+
* @param transfersStream The readable stream containing the transfers data.
|
|
20426
|
+
* @param stopsMap The parsed GTFS stops indexed by their source IDs.
|
|
20427
|
+
* @param activeServiceIds The service IDs active for the requested date.
|
|
20428
|
+
* @returns Parsed stop transfers, trip continuations, and guaranteed trip transfers.
|
|
20358
20429
|
*/
|
|
20359
|
-
const parseTransfers = (transfersStream, stopsMap) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20430
|
+
const parseTransfers = (transfersStream, stopsMap, activeServiceIds) => __awaiter(void 0, void 0, void 0, function* () {
|
|
20360
20431
|
var _a, e_1, _b, _c;
|
|
20361
20432
|
const transfers = new Map();
|
|
20362
20433
|
const tripContinuations = [];
|
|
@@ -20370,6 +20441,10 @@ const parseTransfers = (transfersStream, stopsMap) => __awaiter(void 0, void 0,
|
|
|
20370
20441
|
_d = false;
|
|
20371
20442
|
const rawLine = _c;
|
|
20372
20443
|
const transferEntry = rawLine;
|
|
20444
|
+
if (transferEntry.service_id &&
|
|
20445
|
+
!activeServiceIds.has(transferEntry.service_id)) {
|
|
20446
|
+
continue;
|
|
20447
|
+
}
|
|
20373
20448
|
if (transferEntry.transfer_type === 3 ||
|
|
20374
20449
|
transferEntry.transfer_type === 5) {
|
|
20375
20450
|
continue;
|
|
@@ -20510,13 +20585,13 @@ const parseGtfsTransferType = (gtfsTransferType) => {
|
|
|
20510
20585
|
switch (gtfsTransferType) {
|
|
20511
20586
|
case 0:
|
|
20512
20587
|
default:
|
|
20513
|
-
return
|
|
20588
|
+
return TransferTypes.RECOMMENDED;
|
|
20514
20589
|
case 1:
|
|
20515
|
-
return
|
|
20590
|
+
return TransferTypes.GUARANTEED;
|
|
20516
20591
|
case 2:
|
|
20517
|
-
return
|
|
20592
|
+
return TransferTypes.REQUIRES_MINIMAL_TIME;
|
|
20518
20593
|
case 4:
|
|
20519
|
-
return
|
|
20594
|
+
return TransferTypes.IN_SEAT;
|
|
20520
20595
|
}
|
|
20521
20596
|
};
|
|
20522
20597
|
|
|
@@ -20865,15 +20940,15 @@ const parseStopTimes = (stopTimesStream, stopsMap, activeTripIds, activeStopIds,
|
|
|
20865
20940
|
const parsePickupDropOffType = (gtfsType) => {
|
|
20866
20941
|
switch (gtfsType) {
|
|
20867
20942
|
default:
|
|
20868
|
-
return REGULAR;
|
|
20943
|
+
return PickUpDropOffTypes.REGULAR;
|
|
20869
20944
|
case '0':
|
|
20870
|
-
return REGULAR;
|
|
20945
|
+
return PickUpDropOffTypes.REGULAR;
|
|
20871
20946
|
case '1':
|
|
20872
|
-
return NOT_AVAILABLE;
|
|
20947
|
+
return PickUpDropOffTypes.NOT_AVAILABLE;
|
|
20873
20948
|
case '2':
|
|
20874
|
-
return MUST_PHONE_AGENCY;
|
|
20949
|
+
return PickUpDropOffTypes.MUST_PHONE_AGENCY;
|
|
20875
20950
|
case '3':
|
|
20876
|
-
return MUST_COORDINATE_WITH_DRIVER;
|
|
20951
|
+
return PickUpDropOffTypes.MUST_COORDINATE_WITH_DRIVER;
|
|
20877
20952
|
}
|
|
20878
20953
|
};
|
|
20879
20954
|
|
|
@@ -20886,10 +20961,11 @@ const STOP_TIMES_FILE = 'stop_times.txt';
|
|
|
20886
20961
|
const STOPS_FILE = 'stops.txt';
|
|
20887
20962
|
const TRANSFERS_FILE = 'transfers.txt';
|
|
20888
20963
|
class GtfsParser {
|
|
20889
|
-
constructor(path, profile = standardGtfsProfile) {
|
|
20964
|
+
constructor(path, profile = standardGtfsProfile, transferGenerator) {
|
|
20890
20965
|
// TODO: support input from multiple sources
|
|
20891
20966
|
this.path = path;
|
|
20892
20967
|
this.profile = profile;
|
|
20968
|
+
this.transferGenerator = transferGenerator;
|
|
20893
20969
|
}
|
|
20894
20970
|
/**
|
|
20895
20971
|
* Parses a GTFS feed to extract all the data relevant to a given day in a transit-planner friendly format.
|
|
@@ -20946,7 +21022,7 @@ class GtfsParser {
|
|
|
20946
21022
|
log.info(`Parsing ${TRANSFERS_FILE}`);
|
|
20947
21023
|
const transfersStart = performance.now();
|
|
20948
21024
|
const transfersStream = yield zip.stream(TRANSFERS_FILE);
|
|
20949
|
-
const { transfers: parsedTransfers, tripContinuations: parsedTripContinuations, guaranteedTripTransfers: parsedGuaranteedTripTransfers, } = yield parseTransfers(transfersStream, parsedStops);
|
|
21025
|
+
const { transfers: parsedTransfers, tripContinuations: parsedTripContinuations, guaranteedTripTransfers: parsedGuaranteedTripTransfers, } = yield parseTransfers(transfersStream, parsedStops, activeServiceIds);
|
|
20950
21026
|
transfers = parsedTransfers;
|
|
20951
21027
|
tripContinuationsList = parsedTripContinuations;
|
|
20952
21028
|
guaranteedTripTransfersList = parsedGuaranteedTripTransfers;
|
|
@@ -20969,6 +21045,35 @@ class GtfsParser {
|
|
|
20969
21045
|
const serviceRoutes = indexRoutes(validGtfsRoutes, serviceRoutesMap);
|
|
20970
21046
|
const stopTimesEnd = performance.now();
|
|
20971
21047
|
log.info(`${routes.length} valid unique routes. (${(stopTimesEnd - stopTimesStart).toFixed(2)}ms)`);
|
|
21048
|
+
if (this.transferGenerator) {
|
|
21049
|
+
log.info('Generating virtual transfers');
|
|
21050
|
+
const virtualTransfersStart = performance.now();
|
|
21051
|
+
// Only route-served stops with coordinates are worth connecting: a
|
|
21052
|
+
// transfer to a stop no route calls at is a dead end for the router.
|
|
21053
|
+
const originStops = Array.from(parsedStops.values()).filter((stop) => activeStopIds.has(stop.id) &&
|
|
21054
|
+
stop.lat !== undefined &&
|
|
21055
|
+
stop.lon !== undefined);
|
|
21056
|
+
const stopsIndex = new StopsIndex(Array.from(parsedStops.values()));
|
|
21057
|
+
const generatedTransfers = yield this.transferGenerator.generate(originStops, stopsIndex);
|
|
21058
|
+
let addedTransfers = 0;
|
|
21059
|
+
for (const [fromStop, newTransfers] of generatedTransfers) {
|
|
21060
|
+
const existing = getOrInsert(transfers, fromStop, []);
|
|
21061
|
+
// Deduplicate per directed pair against existing (feed) transfers, and
|
|
21062
|
+
// only keep transfers into stops a route actually calls at.
|
|
21063
|
+
const connected = new Set(existing.map((t) => t.destination));
|
|
21064
|
+
for (const transfer of newTransfers) {
|
|
21065
|
+
if (!activeStopIds.has(transfer.destination) ||
|
|
21066
|
+
connected.has(transfer.destination)) {
|
|
21067
|
+
continue;
|
|
21068
|
+
}
|
|
21069
|
+
connected.add(transfer.destination);
|
|
21070
|
+
existing.push(transfer);
|
|
21071
|
+
addedTransfers += 1;
|
|
21072
|
+
}
|
|
21073
|
+
}
|
|
21074
|
+
const virtualTransfersEnd = performance.now();
|
|
21075
|
+
log.info(`${addedTransfers} virtual transfers added. (${(virtualTransfersEnd - virtualTransfersStart).toFixed(2)}ms)`);
|
|
21076
|
+
}
|
|
20972
21077
|
log.info('Building stops adjacency structure');
|
|
20973
21078
|
const stopsAdjacencyStart = performance.now();
|
|
20974
21079
|
const stopsAdjacency = buildStopsAdjacencyStructure(serviceRoutes, routes, transfers, parsedStops.size, activeStopIds);
|
|
@@ -21041,7 +21146,7 @@ const routeTypeParser = (routeType) => {
|
|
|
21041
21146
|
case 115: // Vehicle Transport Rail Service
|
|
21042
21147
|
case 116: // Rack and Pinion Railway (Rochers de Naye, Dolderbahn)
|
|
21043
21148
|
case 117: // Additional Rail Service
|
|
21044
|
-
return
|
|
21149
|
+
return RouteTypes.RAIL;
|
|
21045
21150
|
// Coach Service (200-299)
|
|
21046
21151
|
case 200: // Coach Service
|
|
21047
21152
|
case 201: // International Coach Service (EuroLine, Touring)
|
|
@@ -21053,16 +21158,16 @@ const routeTypeParser = (routeType) => {
|
|
|
21053
21158
|
case 207: // Tourist Coach Service
|
|
21054
21159
|
case 208: // Commuter Coach Service
|
|
21055
21160
|
case 209: // All Coach Services
|
|
21056
|
-
return
|
|
21161
|
+
return RouteTypes.BUS;
|
|
21057
21162
|
// Urban Railway Service (400-499)
|
|
21058
21163
|
case 400: // Urban Railway Service
|
|
21059
21164
|
case 401: // Metro Service (Métro de Paris)
|
|
21060
21165
|
case 402: // Underground Service (London Underground, U-Bahn)
|
|
21061
21166
|
case 403: // Urban Railway Service
|
|
21062
21167
|
case 404: // All Urban Railway Services
|
|
21063
|
-
return
|
|
21168
|
+
return RouteTypes.SUBWAY;
|
|
21064
21169
|
case 405: // Monorail
|
|
21065
|
-
return
|
|
21170
|
+
return RouteTypes.MONORAIL;
|
|
21066
21171
|
// Bus Service (700-799)
|
|
21067
21172
|
case 700: // Bus Service
|
|
21068
21173
|
case 701: // Regional Bus Service (Eastbourne-Maidstone)
|
|
@@ -21081,10 +21186,10 @@ const routeTypeParser = (routeType) => {
|
|
|
21081
21186
|
case 714: // Rail Replacement Bus Service
|
|
21082
21187
|
case 715: // Demand and Response Bus Service
|
|
21083
21188
|
case 716: // All Bus Services
|
|
21084
|
-
return
|
|
21189
|
+
return RouteTypes.BUS;
|
|
21085
21190
|
// Trolleybus Service (800-899)
|
|
21086
21191
|
case 800: // Trolleybus Service
|
|
21087
|
-
return
|
|
21192
|
+
return RouteTypes.TROLLEYBUS;
|
|
21088
21193
|
// Tram Service (900-999)
|
|
21089
21194
|
case 900: // Tram Service
|
|
21090
21195
|
case 901: // City Tram Service
|
|
@@ -21093,16 +21198,16 @@ const routeTypeParser = (routeType) => {
|
|
|
21093
21198
|
case 904: // Sightseeing Tram Service (Blackpool Seafront)
|
|
21094
21199
|
case 905: // Shuttle Tram Service
|
|
21095
21200
|
case 906: // All Tram Services
|
|
21096
|
-
return
|
|
21201
|
+
return RouteTypes.TRAM;
|
|
21097
21202
|
// Water Transport Service (1000-1099)
|
|
21098
21203
|
case 1000: // Water Transport Service
|
|
21099
|
-
return
|
|
21204
|
+
return RouteTypes.FERRY;
|
|
21100
21205
|
// Air Service (1100-1199)
|
|
21101
21206
|
case 1100: // Air Service
|
|
21102
21207
|
return undefined;
|
|
21103
21208
|
// Ferry Service (1200-1299)
|
|
21104
21209
|
case 1200: // Ferry Service
|
|
21105
|
-
return
|
|
21210
|
+
return RouteTypes.FERRY;
|
|
21106
21211
|
// Aerial Lift Service (1300-1399)
|
|
21107
21212
|
case 1300: // Aerial Lift Service (Telefèric de Montjuïc, Roosevelt Island Tramway)
|
|
21108
21213
|
case 1301: // Telecabin Service
|
|
@@ -21111,10 +21216,10 @@ const routeTypeParser = (routeType) => {
|
|
|
21111
21216
|
case 1305: // Drag Lift Service
|
|
21112
21217
|
case 1306: // Small Telecabin Service
|
|
21113
21218
|
case 1307: // All Telecabin Services
|
|
21114
|
-
return
|
|
21219
|
+
return RouteTypes.AERIAL_LIFT;
|
|
21115
21220
|
case 1303: // Elevator Service (Ascenseur, Aufzug)
|
|
21116
21221
|
case 1400: // Funicular Service (Rigiblick)
|
|
21117
|
-
return
|
|
21222
|
+
return RouteTypes.FUNICULAR;
|
|
21118
21223
|
// Taxi Service (1500-1599)
|
|
21119
21224
|
case 1500: // Taxi Service
|
|
21120
21225
|
case 1502: // Water Taxi Service
|
|
@@ -21125,12 +21230,12 @@ const routeTypeParser = (routeType) => {
|
|
|
21125
21230
|
case 1507: // All Taxi Services
|
|
21126
21231
|
return undefined;
|
|
21127
21232
|
case 1501: // Communal Taxi Service (Marshrutka, dolmuş)
|
|
21128
|
-
return
|
|
21233
|
+
return RouteTypes.BUS;
|
|
21129
21234
|
// Miscellaneous Service (1700-1799)
|
|
21130
21235
|
case 1700: // Miscellaneous Service / Unknown mode
|
|
21131
21236
|
return undefined;
|
|
21132
21237
|
case 1702: // Horse-drawn Carriage
|
|
21133
|
-
return
|
|
21238
|
+
return RouteTypes.BUS;
|
|
21134
21239
|
default:
|
|
21135
21240
|
return undefined;
|
|
21136
21241
|
}
|
|
@@ -21139,6 +21244,85 @@ const extendedGtfsProfile = {
|
|
|
21139
21244
|
routeTypeParser,
|
|
21140
21245
|
};
|
|
21141
21246
|
|
|
21247
|
+
const DEFAULT_MAX_DISTANCE_METERS = 500;
|
|
21248
|
+
const DEFAULT_WALKING_SPEED_KMH = 4;
|
|
21249
|
+
const DEFAULT_DETOUR_FACTOR = 1.3;
|
|
21250
|
+
const DEFAULT_CHANGE_PENALTY_MINUTES = 3;
|
|
21251
|
+
/**
|
|
21252
|
+
* A {@link TransferGenerator} that connects geographically close stops with
|
|
21253
|
+
* virtual walking transfers.
|
|
21254
|
+
*
|
|
21255
|
+
* The transfer time is derived from the straight-line (great-circle / haversine)
|
|
21256
|
+
* distance between two stops, scaled up by a detour factor to approximate the
|
|
21257
|
+
* real walking path and divided by an assumed walking speed. This is a
|
|
21258
|
+
* deliberately crude heuristic meant to fill in footpaths for feeds that
|
|
21259
|
+
* under-specify `transfers.txt` (e.g. large interchanges where subway, tram and
|
|
21260
|
+
* bus stops sit close together but are left unconnected).
|
|
21261
|
+
*
|
|
21262
|
+
* Generated transfers use {@link TransferTypes.REQUIRES_MINIMAL_TIME} so they
|
|
21263
|
+
* are treated as walking connections by both the router's transfer step and
|
|
21264
|
+
* its access/egress computation. Each origin is connected to its nearby stops
|
|
21265
|
+
* with a single directed edge; the reverse edge is produced when the neighbor
|
|
21266
|
+
* is itself visited as an origin.
|
|
21267
|
+
*
|
|
21268
|
+
* On top of the walking time, a flat `changePenaltyMinutes` is added for the
|
|
21269
|
+
* general overhead of any change. It is symmetric, so the two directions of a
|
|
21270
|
+
* transfer share the same minimum time.
|
|
21271
|
+
*/
|
|
21272
|
+
class StraightLineTransferGenerator {
|
|
21273
|
+
constructor(options = {}) {
|
|
21274
|
+
var _a, _b, _c, _d;
|
|
21275
|
+
this.maxDistanceMeters =
|
|
21276
|
+
(_a = options.maxDistanceMeters) !== null && _a !== void 0 ? _a : DEFAULT_MAX_DISTANCE_METERS;
|
|
21277
|
+
this.walkingSpeedKmh = (_b = options.walkingSpeedKmh) !== null && _b !== void 0 ? _b : DEFAULT_WALKING_SPEED_KMH;
|
|
21278
|
+
this.detourFactor = (_c = options.detourFactor) !== null && _c !== void 0 ? _c : DEFAULT_DETOUR_FACTOR;
|
|
21279
|
+
this.changePenaltyMinutes =
|
|
21280
|
+
(_d = options.changePenaltyMinutes) !== null && _d !== void 0 ? _d : DEFAULT_CHANGE_PENALTY_MINUTES;
|
|
21281
|
+
}
|
|
21282
|
+
generate(originStops, stops) {
|
|
21283
|
+
const generated = new Map();
|
|
21284
|
+
const maxDistanceKm = this.maxDistanceMeters / 1000;
|
|
21285
|
+
for (const origin of originStops) {
|
|
21286
|
+
const { id, lat, lon } = origin;
|
|
21287
|
+
if (lat === undefined || lon === undefined) {
|
|
21288
|
+
continue;
|
|
21289
|
+
}
|
|
21290
|
+
const neighbors = stops.findStopsByLocation(lat, lon, Infinity, maxDistanceKm);
|
|
21291
|
+
for (const neighbor of neighbors) {
|
|
21292
|
+
const { id: neighborId, lat: neighborLat, lon: neighborLon } = neighbor;
|
|
21293
|
+
if (neighborId === id ||
|
|
21294
|
+
neighborLat === undefined ||
|
|
21295
|
+
neighborLon === undefined) {
|
|
21296
|
+
continue;
|
|
21297
|
+
}
|
|
21298
|
+
const walkingTime = this.walkingDuration(lon, lat, neighborLon, neighborLat);
|
|
21299
|
+
// Emit a single directed edge; the reverse edge is emitted when the
|
|
21300
|
+
// neighbor is itself visited as an origin. The penalty is symmetric, so
|
|
21301
|
+
// both directions end up with the same minimum time.
|
|
21302
|
+
const minTransferTime = walkingTime + this.changePenaltyMinutes;
|
|
21303
|
+
this.addTransfer(generated, id, neighborId, minTransferTime);
|
|
21304
|
+
}
|
|
21305
|
+
}
|
|
21306
|
+
return generated;
|
|
21307
|
+
}
|
|
21308
|
+
addTransfer(transfers, from, to, minTransferTime) {
|
|
21309
|
+
const transfer = {
|
|
21310
|
+
destination: to,
|
|
21311
|
+
type: TransferTypes.REQUIRES_MINIMAL_TIME,
|
|
21312
|
+
minTransferTime,
|
|
21313
|
+
};
|
|
21314
|
+
getOrInsert(transfers, from, []).push(transfer);
|
|
21315
|
+
}
|
|
21316
|
+
/**
|
|
21317
|
+
* Estimates the walking time between two coordinates, in whole minutes.
|
|
21318
|
+
*/
|
|
21319
|
+
walkingDuration(lon1, lat1, lon2, lat2) {
|
|
21320
|
+
const straightLineKm = distance(lon1, lat1, lon2, lat2);
|
|
21321
|
+
const walkingKm = straightLineKm * this.detourFactor;
|
|
21322
|
+
return Math.round((walkingKm / this.walkingSpeedKmh) * 60);
|
|
21323
|
+
}
|
|
21324
|
+
}
|
|
21325
|
+
|
|
21142
21326
|
/**
|
|
21143
21327
|
* Configuration for DOT graph styling.
|
|
21144
21328
|
*/
|
|
@@ -21393,7 +21577,7 @@ class Plotter {
|
|
|
21393
21577
|
const routeOvalId = this.vehicleEdgeNodeId(fromStopId, toStopId, edge.routeId, round);
|
|
21394
21578
|
const serviceRouteInfo = this.result.timetable.getServiceRouteInfo(route);
|
|
21395
21579
|
const routeName = serviceRouteInfo.name;
|
|
21396
|
-
const routeType = serviceRouteInfo.type;
|
|
21580
|
+
const routeType = routeTypeToString(serviceRouteInfo.type);
|
|
21397
21581
|
const departureTime = timeToString(route.departureFrom(edge.stopIndex, edge.tripIndex));
|
|
21398
21582
|
const arrivalTime = timeToString(edge.arrival);
|
|
21399
21583
|
const escapedRouteName = this.escapeDotString(routeName);
|
|
@@ -21465,8 +21649,12 @@ class Plotter {
|
|
|
21465
21649
|
: null;
|
|
21466
21650
|
const fromRouteName = (_a = fromServiceRouteInfo === null || fromServiceRouteInfo === void 0 ? void 0 : fromServiceRouteInfo.name) !== null && _a !== void 0 ? _a : `Route ${String(fromEdge.routeId)}`;
|
|
21467
21651
|
const toRouteName = (_b = toServiceRouteInfo === null || toServiceRouteInfo === void 0 ? void 0 : toServiceRouteInfo.name) !== null && _b !== void 0 ? _b : `Route ${String(toEdge.routeId)}`;
|
|
21468
|
-
const fromRouteType =
|
|
21469
|
-
|
|
21652
|
+
const fromRouteType = fromServiceRouteInfo
|
|
21653
|
+
? routeTypeToString(fromServiceRouteInfo.type)
|
|
21654
|
+
: 'UNKNOWN';
|
|
21655
|
+
const toRouteType = toServiceRouteInfo
|
|
21656
|
+
? routeTypeToString(toServiceRouteInfo.type)
|
|
21657
|
+
: 'UNKNOWN';
|
|
21470
21658
|
const fromArrivalTime = timeToString(fromEdge.arrival);
|
|
21471
21659
|
const toDepartureTime = toRoute
|
|
21472
21660
|
? timeToString(toRoute.departureFrom(toEdge.stopIndex, toEdge.tripIndex))
|
|
@@ -21821,6 +22009,9 @@ class Route {
|
|
|
21821
22009
|
}
|
|
21822
22010
|
}
|
|
21823
22011
|
|
|
22012
|
+
/**
|
|
22013
|
+
* Details about the pickup and drop-off modalities at each stop in each trip of a route.
|
|
22014
|
+
*/
|
|
21824
22015
|
const pickUpDropOffTypeMap = [
|
|
21825
22016
|
'REGULAR',
|
|
21826
22017
|
'NOT_AVAILABLE',
|
|
@@ -21832,7 +22023,7 @@ const pickUpDropOffTypeMap = [
|
|
|
21832
22023
|
* into its corresponding string representation.
|
|
21833
22024
|
*
|
|
21834
22025
|
* @param numericalType - The numerical value representing the pick-up/drop-off type.
|
|
21835
|
-
* @returns The corresponding
|
|
22026
|
+
* @returns The corresponding PickUpDropOffTypeString as a string.
|
|
21836
22027
|
* @throws An error if the numerical type is invalid.
|
|
21837
22028
|
*/
|
|
21838
22029
|
const toPickupDropOffType = (rawType) => {
|
|
@@ -21988,6 +22179,13 @@ class Result {
|
|
|
21988
22179
|
}
|
|
21989
22180
|
return new Route(route.reverse());
|
|
21990
22181
|
}
|
|
22182
|
+
buildServiceRouteInfo(route) {
|
|
22183
|
+
const serviceRouteInfo = this.timetable.getServiceRouteInfo(route);
|
|
22184
|
+
return {
|
|
22185
|
+
type: routeTypeToString(serviceRouteInfo.type),
|
|
22186
|
+
name: serviceRouteInfo.name,
|
|
22187
|
+
};
|
|
22188
|
+
}
|
|
21991
22189
|
/**
|
|
21992
22190
|
* Builds a vehicle leg from a chain of vehicle edges.
|
|
21993
22191
|
*
|
|
@@ -22015,7 +22213,7 @@ class Result {
|
|
|
22015
22213
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
22016
22214
|
to: this.stopsIndex.findStopById(lastRoute.stopId(lastEdge.hopOffStopIndex)),
|
|
22017
22215
|
// The route info comes from the first boarded route in case of continuous trips
|
|
22018
|
-
route: this.
|
|
22216
|
+
route: this.buildServiceRouteInfo(firstRoute),
|
|
22019
22217
|
departureTime: firstRoute.departureFrom(firstEdge.stopIndex, firstEdge.tripIndex),
|
|
22020
22218
|
arrivalTime: lastEdge.arrival,
|
|
22021
22219
|
pickUpType: toPickupDropOffType(firstRoute.pickUpTypeFrom(firstEdge.stopIndex, firstEdge.tripIndex)),
|
|
@@ -22035,7 +22233,7 @@ class Result {
|
|
|
22035
22233
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
22036
22234
|
to: this.stopsIndex.findStopById(edge.to),
|
|
22037
22235
|
minTransferTime: edge.minTransferTime,
|
|
22038
|
-
type: edge.type,
|
|
22236
|
+
type: transferTypeToString(edge.type),
|
|
22039
22237
|
};
|
|
22040
22238
|
}
|
|
22041
22239
|
/**
|
|
@@ -22072,7 +22270,7 @@ class Result {
|
|
|
22072
22270
|
from: this.stopsIndex.findStopById(fromStopId),
|
|
22073
22271
|
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
22074
22272
|
to: this.stopsIndex.findStopById(toStopId),
|
|
22075
|
-
type:
|
|
22273
|
+
type: transferTypeToString(TransferTypes.GUARANTEED),
|
|
22076
22274
|
};
|
|
22077
22275
|
}
|
|
22078
22276
|
/**
|
|
@@ -22154,7 +22352,7 @@ class AccessFinder {
|
|
|
22154
22352
|
});
|
|
22155
22353
|
}
|
|
22156
22354
|
for (const transfer of this.timetable.getTransfers(origin)) {
|
|
22157
|
-
if (transfer.type ===
|
|
22355
|
+
if (transfer.type === TransferTypes.REQUIRES_MINIMAL_TIME) {
|
|
22158
22356
|
const duration = (_a = transfer.minTransferTime) !== null && _a !== void 0 ? _a : fallbackMinTransferTime;
|
|
22159
22357
|
const existingAccess = accessPaths.get(transfer.destination);
|
|
22160
22358
|
// Keep the shortest walk to maximize the set of reachable trips.
|
|
@@ -22207,7 +22405,8 @@ class AccessFinder {
|
|
|
22207
22405
|
const dep = route.departureFrom(stopIndex, tripIndex);
|
|
22208
22406
|
if (dep > searchTo)
|
|
22209
22407
|
break;
|
|
22210
|
-
if (route.pickUpTypeFrom(stopIndex, tripIndex) !==
|
|
22408
|
+
if (route.pickUpTypeFrom(stopIndex, tripIndex) !==
|
|
22409
|
+
PickUpDropOffTypes.NOT_AVAILABLE) {
|
|
22211
22410
|
const t = dep - path.duration;
|
|
22212
22411
|
let paths = slotMap.get(t);
|
|
22213
22412
|
if (paths === undefined) {
|
|
@@ -23069,7 +23268,7 @@ class Raptor {
|
|
|
23069
23268
|
const currentStop = route.stops[currentStopIndex];
|
|
23070
23269
|
const arrivalTime = route.arrivalAtOffset(currentStopIndex, tripStopOffset);
|
|
23071
23270
|
const dropOffType = route.dropOffTypeAtOffset(currentStopIndex, tripStopOffset);
|
|
23072
|
-
if (dropOffType !== NOT_AVAILABLE &&
|
|
23271
|
+
if (dropOffType !== PickUpDropOffTypes.NOT_AVAILABLE &&
|
|
23073
23272
|
arrivalTime <= state.maxArrivalTime &&
|
|
23074
23273
|
arrivalTime < state.improvementBound(round, currentStop) &&
|
|
23075
23274
|
arrivalTime < state.destinationBest) {
|
|
@@ -23117,7 +23316,7 @@ class Raptor {
|
|
|
23117
23316
|
if (activeTripIndex !== undefined) {
|
|
23118
23317
|
const arrivalTime = route.arrivalAtOffset(currentStopIndex, activeTripStopOffset);
|
|
23119
23318
|
const dropOffType = route.dropOffTypeAtOffset(currentStopIndex, activeTripStopOffset);
|
|
23120
|
-
if (dropOffType !== NOT_AVAILABLE &&
|
|
23319
|
+
if (dropOffType !== PickUpDropOffTypes.NOT_AVAILABLE &&
|
|
23121
23320
|
arrivalTime <= state.maxArrivalTime &&
|
|
23122
23321
|
arrivalTime < state.improvementBound(round, currentStop) &&
|
|
23123
23322
|
arrivalTime < state.destinationBest) {
|
|
@@ -23196,7 +23395,7 @@ class Raptor {
|
|
|
23196
23395
|
if (transfer.minTransferTime) {
|
|
23197
23396
|
transferTime = transfer.minTransferTime;
|
|
23198
23397
|
}
|
|
23199
|
-
else if (transfer.type ===
|
|
23398
|
+
else if (transfer.type === TransferTypes.IN_SEAT) {
|
|
23200
23399
|
transferTime = DURATION_ZERO;
|
|
23201
23400
|
}
|
|
23202
23401
|
else {
|
|
@@ -23830,13 +24029,13 @@ const startRepl = (stopsPath, timetablePath) => {
|
|
|
23830
24029
|
});
|
|
23831
24030
|
const formatPickupDropoffType = (type) => {
|
|
23832
24031
|
switch (type) {
|
|
23833
|
-
case REGULAR:
|
|
24032
|
+
case PickUpDropOffTypes.REGULAR:
|
|
23834
24033
|
return 'R';
|
|
23835
|
-
case NOT_AVAILABLE:
|
|
24034
|
+
case PickUpDropOffTypes.NOT_AVAILABLE:
|
|
23836
24035
|
return 'N';
|
|
23837
|
-
case MUST_PHONE_AGENCY:
|
|
24036
|
+
case PickUpDropOffTypes.MUST_PHONE_AGENCY:
|
|
23838
24037
|
return 'A';
|
|
23839
|
-
case MUST_COORDINATE_WITH_DRIVER:
|
|
24038
|
+
case PickUpDropOffTypes.MUST_COORDINATE_WITH_DRIVER:
|
|
23840
24039
|
return 'D';
|
|
23841
24040
|
default:
|
|
23842
24041
|
return '?';
|
|
@@ -24062,6 +24261,7 @@ program
|
|
|
24062
24261
|
.option('-t, --timetableOutputPath <path>', 'Path to output timetable file', '/tmp/timetable')
|
|
24063
24262
|
.option('-s, --stopsOutputPath <path>', 'Path to output stops file', '/tmp/stops')
|
|
24064
24263
|
.option('-p, --profileName <name>', 'Profile name for GTFS config', 'extended')
|
|
24264
|
+
.option('--virtual-transfers-radius <meters>', 'Generate virtual walking transfers between stops within this radius (in meters). Disabled when omitted.')
|
|
24065
24265
|
.option('-v, --verbose', 'Verbose mode', false)
|
|
24066
24266
|
.action((gtfsPath, options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24067
24267
|
if (options.verbose) {
|
|
@@ -24070,7 +24270,15 @@ program
|
|
|
24070
24270
|
else {
|
|
24071
24271
|
log.setDefaultLevel(log.levels.ERROR);
|
|
24072
24272
|
}
|
|
24073
|
-
const
|
|
24273
|
+
const radiusMeters = options.virtualTransfersRadius !== undefined
|
|
24274
|
+
? parseInt(options.virtualTransfersRadius, 10)
|
|
24275
|
+
: undefined;
|
|
24276
|
+
const transferGenerator = radiusMeters !== undefined && Number.isFinite(radiusMeters)
|
|
24277
|
+
? new StraightLineTransferGenerator({
|
|
24278
|
+
maxDistanceMeters: radiusMeters,
|
|
24279
|
+
})
|
|
24280
|
+
: undefined;
|
|
24281
|
+
const parser = new GtfsParser(gtfsPath, profiles[options.profileName], transferGenerator);
|
|
24074
24282
|
const stopsIndex = yield parser.parseStops();
|
|
24075
24283
|
fs.writeFileSync(options.stopsOutputPath, stopsIndex.serialize());
|
|
24076
24284
|
const timetable = yield parser.parseTimetable(new Date(options.date));
|