@golemio/pid 5.9.1-dev.2457825323 → 5.9.1-dev.2470905594
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/dist/integration-engine/ropid-gtfs/data-access/cache/GtfsTripStopsCacheRepository.d.ts +10 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/GtfsTripStopsCacheRepository.js +79 -0
- package/dist/integration-engine/ropid-gtfs/data-access/cache/GtfsTripStopsCacheRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.d.ts +4 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js +28 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/ioc/Di.js +4 -0
- package/dist/integration-engine/ropid-gtfs/ioc/Di.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.d.ts +2 -0
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js +2 -0
- package/dist/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.js +1 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js +1 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/EnsureCacheTask.js +1 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/EnsureCacheTask.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsTripStopsCacheTask.d.ts +13 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsTripStopsCacheTask.js +48 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsTripStopsCacheTask.js.map +1 -0
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js +4 -15
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.d.ts +23 -3
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.js +227 -43
- package/dist/output-gateway/pid/helpers/JISInfotextStopSuppressionFilter.js.map +1 -1
- package/dist/output-gateway/pid/ioc/Di.js +2 -0
- package/dist/output-gateway/pid/ioc/Di.js.map +1 -1
- package/dist/output-gateway/pid/ioc/OgPidToken.d.ts +1 -0
- package/dist/output-gateway/pid/ioc/OgPidToken.js +1 -0
- package/dist/output-gateway/pid/ioc/OgPidToken.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/InfotextFacade.d.ts +1 -1
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js +3 -3
- package/dist/output-gateway/pid/service/facade/InfotextFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/facade/TransferFacade.d.ts +4 -2
- package/dist/output-gateway/pid/service/facade/TransferFacade.js +25 -34
- package/dist/output-gateway/pid/service/facade/TransferFacade.js.map +1 -1
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsTripStopsRepository.d.ts +9 -0
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsTripStopsRepository.js +56 -0
- package/dist/output-gateway/ropid-gtfs/data-access/redis/GtfsTripStopsRepository.js.map +1 -0
- package/dist/schema-definitions/ropid-gtfs/redis/const.d.ts +1 -0
- package/dist/schema-definitions/ropid-gtfs/redis/const.js +2 -1
- package/dist/schema-definitions/ropid-gtfs/redis/const.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/redis/interfaces/IGtfsTripStopsCacheDto.d.ts +3 -0
- package/dist/schema-definitions/ropid-gtfs/redis/interfaces/IGtfsTripStopsCacheDto.js +3 -0
- package/dist/schema-definitions/ropid-gtfs/redis/interfaces/IGtfsTripStopsCacheDto.js.map +1 -0
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/GtfsTripStopsCacheDtoSchema.d.ts +4 -0
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/GtfsTripStopsCacheDtoSchema.js +22 -0
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/GtfsTripStopsCacheDtoSchema.js.map +1 -0
- package/docs/asyncapi.yaml +15 -0
- package/docs/cache/types/redis.md +16 -3
- package/docs/implementation_documentation.md +4 -2
- package/docs/processing/transferboards_filtering.md +5 -4
- package/package.json +8 -8
package/dist/integration-engine/ropid-gtfs/data-access/cache/GtfsTripStopsCacheRepository.d.ts
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { IGtfsTripStopsCacheDto } from "../../../../schema-definitions/ropid-gtfs/redis/interfaces/IGtfsTripStopsCacheDto";
|
|
2
|
+
import { ILogger } from "@golemio/core/dist/helpers";
|
|
3
|
+
import { RedisModel } from "@golemio/core/dist/integration-engine/models/RedisModel";
|
|
4
|
+
export declare class GtfsTripStopsCacheRepository extends RedisModel {
|
|
5
|
+
private log;
|
|
6
|
+
static NAMESPACE_PREFIX: string;
|
|
7
|
+
constructor(log: ILogger);
|
|
8
|
+
saveMultipleTripStops(tripStops: Map<string, IGtfsTripStopsCacheDto>): Promise<void>;
|
|
9
|
+
private validateAndRemoveInvalid;
|
|
10
|
+
}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
var GtfsTripStopsCacheRepository_1;
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.GtfsTripStopsCacheRepository = void 0;
|
|
17
|
+
const const_1 = require("../../../../schema-definitions/ropid-gtfs/redis/const");
|
|
18
|
+
const GtfsTripStopsCacheDtoSchema_1 = require("../../../../schema-definitions/ropid-gtfs/redis/schemas/GtfsTripStopsCacheDtoSchema");
|
|
19
|
+
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
20
|
+
const RedisModel_1 = require("@golemio/core/dist/integration-engine/models/RedisModel");
|
|
21
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
22
|
+
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
23
|
+
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
24
|
+
// TTL must exceed max trip duration (~3.5h) + task interval (1h) to keep running trips in cache.
|
|
25
|
+
// Task refreshes every ~1h with a -1h...+2h query window, so a trip gets refreshed up to 1h after start.
|
|
26
|
+
// 6h TTL ensures data survives until well after the longest trip ends.
|
|
27
|
+
const CACHE_TTL_SECONDS = 6 * 3600;
|
|
28
|
+
let GtfsTripStopsCacheRepository = GtfsTripStopsCacheRepository_1 = class GtfsTripStopsCacheRepository extends RedisModel_1.RedisModel {
|
|
29
|
+
constructor(log) {
|
|
30
|
+
super("GtfsTripStopsCacheRepository", {
|
|
31
|
+
isKeyConstructedFromData: false,
|
|
32
|
+
prefix: GtfsTripStopsCacheRepository_1.NAMESPACE_PREFIX,
|
|
33
|
+
}, new golemio_validator_1.JSONSchemaValidator("GtfsTripStopsCacheRepositoryValidator", GtfsTripStopsCacheDtoSchema_1.GtfsTripStopsCacheDtoSchema));
|
|
34
|
+
this.log = log;
|
|
35
|
+
}
|
|
36
|
+
async saveMultipleTripStops(tripStops) {
|
|
37
|
+
const BATCH_SIZE = 200;
|
|
38
|
+
await this.validateAndRemoveInvalid(tripStops);
|
|
39
|
+
try {
|
|
40
|
+
let pipeline = this.connection.pipeline();
|
|
41
|
+
for (const [tripId, dto] of tripStops.entries()) {
|
|
42
|
+
const key = `${GtfsTripStopsCacheRepository_1.NAMESPACE_PREFIX}:${tripId}`;
|
|
43
|
+
pipeline.set(key, JSON.stringify(dto), "EX", CACHE_TTL_SECONDS);
|
|
44
|
+
if (pipeline.length >= BATCH_SIZE) {
|
|
45
|
+
await pipeline.exec();
|
|
46
|
+
pipeline = this.connection.pipeline();
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
if (pipeline.length > 0) {
|
|
50
|
+
await pipeline.exec();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
catch (err) {
|
|
54
|
+
throw new golemio_errors_1.GeneralError("Error while saving trip stops to cache", this.constructor.name, err);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
async validateAndRemoveInvalid(tripStops) {
|
|
58
|
+
for (const [tripId, dto] of tripStops.entries()) {
|
|
59
|
+
try {
|
|
60
|
+
await this.validator.Validate(dto);
|
|
61
|
+
}
|
|
62
|
+
catch (exc) {
|
|
63
|
+
this.log.error(`${this.constructor.name}: Invalid trip stops for trip ${tripId}`, {
|
|
64
|
+
...exc,
|
|
65
|
+
stops: dto.stops,
|
|
66
|
+
});
|
|
67
|
+
tripStops.delete(tripId);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
exports.GtfsTripStopsCacheRepository = GtfsTripStopsCacheRepository;
|
|
73
|
+
GtfsTripStopsCacheRepository.NAMESPACE_PREFIX = const_1.GTFS_TRIP_STOPS_NAMESPACE_PREFIX;
|
|
74
|
+
exports.GtfsTripStopsCacheRepository = GtfsTripStopsCacheRepository = GtfsTripStopsCacheRepository_1 = __decorate([
|
|
75
|
+
(0, tsyringe_1.injectable)(),
|
|
76
|
+
__param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
77
|
+
__metadata("design:paramtypes", [Object])
|
|
78
|
+
], GtfsTripStopsCacheRepository);
|
|
79
|
+
//# sourceMappingURL=GtfsTripStopsCacheRepository.js.map
|
package/dist/integration-engine/ropid-gtfs/data-access/cache/GtfsTripStopsCacheRepository.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"GtfsTripStopsCacheRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/cache/GtfsTripStopsCacheRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,iFAA+E;AAC/E,qIAAwG;AAExG,wEAAqE;AACrE,wFAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iEAAwE;AAExE,iGAAiG;AACjG,yGAAyG;AACzG,uEAAuE;AACvE,MAAM,iBAAiB,GAAG,CAAC,GAAG,IAAI,CAAC;AAG5B,IAAM,4BAA4B,oCAAlC,MAAM,4BAA6B,SAAQ,uBAAU;IAGxD,YAA8C,GAAY;QACtD,KAAK,CACD,8BAA8B,EAC9B;YACI,wBAAwB,EAAE,KAAK;YAC/B,MAAM,EAAE,8BAA4B,CAAC,gBAAgB;SACxD,EACD,IAAI,uCAAmB,CAAC,uCAAuC,EAAE,yDAA2B,CAAC,CAChG,CAAC;QARwC,QAAG,GAAH,GAAG,CAAS;IAS1D,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,SAA8C;QAC7E,MAAM,UAAU,GAAG,GAAG,CAAC;QAEvB,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;QAE/C,IAAI,CAAC;YACD,IAAI,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAE1C,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;gBAC9C,MAAM,GAAG,GAAG,GAAG,8BAA4B,CAAC,gBAAgB,IAAI,MAAM,EAAE,CAAC;gBACzE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;gBAEhE,IAAI,QAAQ,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;oBAChC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;oBACtB,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC1C,CAAC;YACL,CAAC;YAED,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC1B,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,IAAI,6BAAY,CAAC,wCAAwC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACjG,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,SAA8C;QACjF,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,EAAE,CAAC;YAC9C,IAAI,CAAC;gBACD,MAAM,IAAI,CAAC,SAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,iCAAiC,MAAM,EAAE,EAAE;oBAC9E,GAAG,GAAG;oBACN,KAAK,EAAE,GAAG,CAAC,KAAK;iBACnB,CAAC,CAAC;gBACH,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7B,CAAC;QACL,CAAC;IACL,CAAC;;AApDQ,oEAA4B;AACvB,6CAAgB,GAAG,wCAAgC,AAAnC,CAAoC;uCADzD,4BAA4B;IADxC,IAAA,qBAAU,GAAE;IAII,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GAH5B,4BAA4B,CAqDxC"}
|
package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { IPublicDepartureDto } from "../../interfaces/IPublicDepartureDto";
|
|
2
2
|
import { IRefreshPublicDepartureParams } from "../../workers/timetables/tasks/interfaces/IRefreshPublicDepartureParams";
|
|
3
|
+
import { IGtfsTripStopsCacheDto } from "../../../../schema-definitions/ropid-gtfs/redis/interfaces/IGtfsTripStopsCacheDto";
|
|
3
4
|
import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
|
|
4
5
|
import { ILogger } from "@golemio/core/dist/helpers/logger";
|
|
5
6
|
import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
|
|
@@ -13,5 +14,8 @@ export declare class DeparturesRepository extends PostgresModel implements IMode
|
|
|
13
14
|
countDeparturesForPublicCache: (intervalParams: Required<IRefreshPublicDepartureParams>) => Promise<number>;
|
|
14
15
|
getDepaturesForPublicCache: (page: number, pageSize: number, intervalParams: Required<IRefreshPublicDepartureParams>) => Promise<IPublicDepartureDto[]>;
|
|
15
16
|
replaceByTmp: (transaction: Transaction) => Promise<void>;
|
|
17
|
+
getTripStopsForCache: () => Promise<Array<{
|
|
18
|
+
trip_id: string;
|
|
19
|
+
} & IGtfsTripStopsCacheDto>>;
|
|
16
20
|
analyze: () => Promise<void>;
|
|
17
21
|
}
|
|
@@ -218,6 +218,34 @@ let DeparturesRepository = class DeparturesRepository extends models_1.PostgresM
|
|
|
218
218
|
throw err;
|
|
219
219
|
}
|
|
220
220
|
};
|
|
221
|
+
this.getTripStopsForCache = async () => {
|
|
222
|
+
const nodeEnv = this.config.getValue("env.NODE_ENV", "development");
|
|
223
|
+
const departureTimeFilter = nodeEnv !== "test"
|
|
224
|
+
? `AND date BETWEEN (now() - interval '1 day')::date AND (now() + interval '1 day')::date
|
|
225
|
+
AND departure_datetime BETWEEN now() - interval '1 hour' AND now() + interval '2 hours'`
|
|
226
|
+
: "";
|
|
227
|
+
try {
|
|
228
|
+
const [results] = await this.sequelizeModel.sequelize.query(`
|
|
229
|
+
SELECT
|
|
230
|
+
pd.trip_id,
|
|
231
|
+
json_agg(json_build_array(stop_id, stop_name) ORDER BY stop_sequence) as stops
|
|
232
|
+
FROM ${const_1.PG_SCHEMA}.${precomputed_1.DeparturesModel.TABLE_NAME} AS pd
|
|
233
|
+
INNER JOIN (
|
|
234
|
+
SELECT date, trip_id
|
|
235
|
+
FROM ${const_1.PG_SCHEMA}.${precomputed_1.DeparturesModel.TABLE_NAME}
|
|
236
|
+
WHERE stop_sequence = 1
|
|
237
|
+
${departureTimeFilter}
|
|
238
|
+
) AS target
|
|
239
|
+
ON pd.date = target.date AND pd.trip_id = target.trip_id
|
|
240
|
+
WHERE pd.stop_id IS NOT NULL
|
|
241
|
+
GROUP BY pd.date, pd.trip_id;
|
|
242
|
+
`);
|
|
243
|
+
return results;
|
|
244
|
+
}
|
|
245
|
+
catch (err) {
|
|
246
|
+
throw new golemio_errors_1.GeneralError("Error while getting trip stops for cache", this.constructor.name, err);
|
|
247
|
+
}
|
|
248
|
+
};
|
|
221
249
|
this.analyze = async () => {
|
|
222
250
|
try {
|
|
223
251
|
await this.sequelizeModel.sequelize.query(`analyze ${const_1.PG_SCHEMA}.${precomputed_1.DeparturesModel.TABLE_NAME}${SourceTableSuffixEnum_1.SourceTableSuffixEnum.Tmp};`);
|
package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA4D;AAG5D,gEAAuC;
|
|
1
|
+
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ const RopidGTFSRoutesRepository_1 = require("../data-access/RopidGTFSRoutesRepos
|
|
|
13
13
|
const RopidGtfsRepository_1 = require("../data-access/RopidGtfsRepository");
|
|
14
14
|
const BlockStopsRedisRepository_1 = require("../data-access/cache/BlockStopsRedisRepository");
|
|
15
15
|
const NotPublicVehiclesRedisRepository_1 = require("../data-access/cache/NotPublicVehiclesRedisRepository");
|
|
16
|
+
const GtfsTripStopsCacheRepository_1 = require("../data-access/cache/GtfsTripStopsCacheRepository");
|
|
16
17
|
const PublicGtfsDepartureRepository_1 = require("../data-access/cache/PublicGtfsDepartureRepository");
|
|
17
18
|
const StaticFileRedisRepository_1 = require("../data-access/cache/StaticFileRedisRepository");
|
|
18
19
|
const precomputed_1 = require("../data-access/precomputed");
|
|
@@ -35,6 +36,7 @@ const CheckSavedRowsAndReplaceTablesTask_1 = require("../workers/timetables/task
|
|
|
35
36
|
const DownloadDatasetsTask_1 = require("../workers/timetables/tasks/DownloadDatasetsTask");
|
|
36
37
|
const RefreshGtfsStopsCacheTask_1 = require("../workers/timetables/tasks/RefreshGtfsStopsCacheTask");
|
|
37
38
|
const RefreshPrecomputedTablesTask_1 = require("../workers/timetables/tasks/RefreshPrecomputedTablesTask");
|
|
39
|
+
const RefreshGtfsTripStopsCacheTask_1 = require("../workers/timetables/tasks/RefreshGtfsTripStopsCacheTask");
|
|
38
40
|
const RefreshPublicGtfsDepartureCacheTask_1 = require("../workers/timetables/tasks/RefreshPublicGtfsDepartureCacheTask");
|
|
39
41
|
const SaveStaticDataTask_1 = require("../workers/timetables/tasks/SaveStaticDataTask");
|
|
40
42
|
const TransformAndSaveDataTask_1 = require("../workers/timetables/tasks/TransformAndSaveDataTask");
|
|
@@ -87,6 +89,7 @@ RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContaine
|
|
|
87
89
|
//#endregion
|
|
88
90
|
//#region Tasks
|
|
89
91
|
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RefreshGtfsStopsCacheTask, RefreshGtfsStopsCacheTask_1.RefreshGtfsStopsCacheTask);
|
|
92
|
+
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RefreshGtfsTripStopsCacheTask, RefreshGtfsTripStopsCacheTask_1.RefreshGtfsTripStopsCacheTask);
|
|
90
93
|
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RefreshPublicGtfsDepartureCacheTask, RefreshPublicGtfsDepartureCacheTask_1.RefreshPublicGtfsDepartureCacheTask);
|
|
91
94
|
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.DownloadDeparturesPresetsTask, DownloadDeparturesPresetsTask_1.DownloadDeparturesPresetsTask);
|
|
92
95
|
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.CheckForNewDeparturesPresetsTask, CheckForNewDeparturesPresetsTask_1.CheckForNewDeparturesPresetsTask);
|
|
@@ -105,4 +108,5 @@ RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContaine
|
|
|
105
108
|
//#endregion
|
|
106
109
|
//#region Cache
|
|
107
110
|
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.GtfsStopsRedisRepository, GtfsStopsRedisRepository_1.GtfsStopsRedisRepository);
|
|
111
|
+
RopidGtfsContainer.registerSingleton(RopidGtfsContainerToken_1.RopidGtfsContainerToken.GtfsTripStopsCacheRepository, GtfsTripStopsCacheRepository_1.GtfsTripStopsCacheRepository);
|
|
108
112
|
//# sourceMappingURL=Di.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,0IAAqI;AACrI,uEAA4C;AAC5C,qFAA8F;AAC9F,iEAAoF;AACpF,gEAA6D;AAC7D,wDAAqD;AACrD,gFAA6E;AAC7E,wFAAqF;AACrF,4EAAyE;AACzE,8FAA2F;AAC3F,4GAAyG;AACzG,sGAAmG;AACnG,8FAA2F;AAC3F,4DAAkE;AAClE,oFAAiF;AACjF,4HAAyH;AACzH,kHAA+G;AAC/G,wHAAqH;AACrH,6EAA0E;AAC1E,8GAA2G;AAC3G,wFAAqF;AACrF,4GAAyG;AACzG,gHAA6G;AAC7G,4FAAyF;AACzF,0GAAuG;AACvG,iFAA8E;AAC9E,4FAAyF;AACzF,sFAAmF;AACnF,yFAAsF;AACtF,uHAAoH;AACpH,2FAAwF;AACxF,qGAAkG;AAClG,2GAAwG;AACxG,yHAAsH;AACtH,uFAAoF;AACpF,mGAAgG;AAChG,yHAAsH;AACtH,qHAAkH;AAClH,yGAAsG;AACtG,2FAAwF;AACxF,qIAAkI;AAClI,mIAAgI;AAChI,uEAAoE;AACpE,qHAAkH;AAClH,sEAAmE;AAEnE,wBAAwB;AACxB,MAAM,kBAAkB,GAAwB,iBAAY,CAAC,oBAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAC1C,0IAAqI;AACrI,uEAA4C;AAC5C,qFAA8F;AAC9F,iEAAoF;AACpF,gEAA6D;AAC7D,wDAAqD;AACrD,gFAA6E;AAC7E,wFAAqF;AACrF,4EAAyE;AACzE,8FAA2F;AAC3F,4GAAyG;AACzG,oGAAiG;AACjG,sGAAmG;AACnG,8FAA2F;AAC3F,4DAAkE;AAClE,oFAAiF;AACjF,4HAAyH;AACzH,kHAA+G;AAC/G,wHAAqH;AACrH,6EAA0E;AAC1E,8GAA2G;AAC3G,wFAAqF;AACrF,4GAAyG;AACzG,gHAA6G;AAC7G,4FAAyF;AACzF,0GAAuG;AACvG,iFAA8E;AAC9E,4FAAyF;AACzF,sFAAmF;AACnF,yFAAsF;AACtF,uHAAoH;AACpH,2FAAwF;AACxF,qGAAkG;AAClG,2GAAwG;AACxG,6GAA0G;AAC1G,yHAAsH;AACtH,uFAAoF;AACpF,mGAAgG;AAChG,yHAAsH;AACtH,qHAAkH;AAClH,yGAAsG;AACtG,2FAAwF;AACxF,qIAAkI;AAClI,mIAAgI;AAChI,uEAAoE;AACpE,qHAAkH;AAClH,sEAAmE;AAEnE,wBAAwB;AACxB,MAAM,kBAAkB,GAAwB,iBAAY,CAAC,oBAAoB,EAAE,CAAC;AA4F3E,gDAAkB;AA3F3B,YAAY;AAEZ,qBAAqB;AACrB,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC,CAAC;AACnH,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AACjI,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AACvH,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AAC/G,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AACjI,kBAAkB,CAAC,iBAAiB,CAChC,iDAAuB,CAAC,qCAAqC,EAC7D,6EAAqC,CACxC,CAAC;AACF,kBAAkB,CAAC,iBAAiB,CAChC,iDAAuB,CAAC,mCAAmC,EAC3D,yEAAmC,CACtC,CAAC;AACF,YAAY;AAEZ,sBAAsB;AACtB,kBAAkB,CAAC,iBAAiB,CAChC,iDAAuB,CAAC,yBAAyB,EACjD,qDAAyB,CAC5B,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AACtF,kBAAkB,CAAC,QAAQ,CAAC,iDAAuB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAC9G,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC,CAAC;AACnH,kBAAkB,CAAC,QAAQ,CAAC,iDAAuB,CAAC,mBAAmB,EAAE,kCAAoB,CAAC,CAAC;AAC/F,kBAAkB,CAAC,QAAQ,CAAC,iDAAuB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAClH,kBAAkB,CAAC,QAAQ,CAAC,iDAAuB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AAC9F,kBAAkB,CAAC,QAAQ,CACvB,iDAAuB,CAAC,8CAA8C,EACtE,+FAA8C,CACjD,CAAC;AACF,kBAAkB,CAAC,QAAQ,CAAC,iDAAuB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAClH,kBAAkB,CAAC,QAAQ,CAAC,iDAAuB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AACpG,YAAY;AAEZ,yBAAyB;AACzB,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC;AAC/G,kBAAkB,CAAC,iBAAiB,CAChC,iDAAuB,CAAC,kCAAkC,EAC1D,uEAAkC,CACrC,CAAC;AACF,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AACjI,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AACvH,kBAAkB,CAAC,iBAAiB,CAChC,iDAAuB,CAAC,iCAAiC,EACzD,qEAAiC,CACpC,CAAC;AACF,YAAY;AAEZ,gBAAgB;AAChB,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,eAAe,EAAE,iCAAe,CAAC,CAAC;AAC/F,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC;KACzG,QAAQ,CAAC,iDAAuB,CAAC,gBAAgB,EAAE,mCAAgB,EAAE,EAAE,SAAS,EAAE,oBAAS,CAAC,SAAS,EAAE,CAAC;KACxG,gBAAgB,CAAC,iDAAuB,CAAC,kBAAkB,EAAE,IAAI,2BAAkB,CAAC,sBAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AAE1G,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AAC7G,YAAY;AAEZ,eAAe;AACf,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,yBAAyB,EAAE,qDAAyB,CAAC,CAAC;AACnH,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAC3H,kBAAkB,CAAC,iBAAiB,CAChC,iDAAuB,CAAC,mCAAmC,EAC3D,yEAAmC,CACtC,CAAC;AACF,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AAC3H,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AACjI,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,kBAAkB,EAAE,uCAAkB,CAAC,CAAC;AACrG,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,eAAe,EAAE,iCAAe,CAAC,CAAC;AAC/F,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,oBAAoB,EAAE,2CAAoB,CAAC,CAAC;AACzG,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AACvG,kBAAkB,CAAC,iBAAiB,CAChC,iDAAuB,CAAC,kCAAkC,EAC1D,uEAAkC,CACrC,CAAC;AACF,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC;AACzH,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AACjH,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AAC7G,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AAC7G,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AACvG,YAAY;AAEZ,iBAAiB;AACjB,YAAY;AAEZ,eAAe;AACf,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AACjH,kBAAkB,CAAC,iBAAiB,CAAC,iDAAuB,CAAC,4BAA4B,EAAE,2DAA4B,CAAC,CAAC"}
|
|
@@ -32,6 +32,7 @@ declare const RopidGtfsContainerToken: {
|
|
|
32
32
|
DeparturesDirectionTransformation: symbol;
|
|
33
33
|
RopidDeparturesPresetsRopidGTFSStopsRepository: symbol;
|
|
34
34
|
GtfsStopsRedisRepository: symbol;
|
|
35
|
+
GtfsTripStopsCacheRepository: symbol;
|
|
35
36
|
RopidGTFSCisStopsModel: symbol;
|
|
36
37
|
EnsureCacheTask: symbol;
|
|
37
38
|
DownloadDatasetsTask: symbol;
|
|
@@ -42,5 +43,6 @@ declare const RopidGtfsContainerToken: {
|
|
|
42
43
|
CollectAndSaveLogsTask: symbol;
|
|
43
44
|
ProcessAndSendLogsTask: symbol;
|
|
44
45
|
SavePresetsDataTask: symbol;
|
|
46
|
+
RefreshGtfsTripStopsCacheTask: symbol;
|
|
45
47
|
};
|
|
46
48
|
export { RopidGtfsContainerToken };
|
|
@@ -35,6 +35,7 @@ const RopidGtfsContainerToken = {
|
|
|
35
35
|
DeparturesDirectionTransformation: Symbol("DeparturesDirectionTransformation"),
|
|
36
36
|
RopidDeparturesPresetsRopidGTFSStopsRepository: Symbol("RopidDeparturesPresetsRopidGTFSStopsRepository"),
|
|
37
37
|
GtfsStopsRedisRepository: Symbol("GtfsStopsRedisRepository"),
|
|
38
|
+
GtfsTripStopsCacheRepository: Symbol("GtfsTripStopsCacheRepository"),
|
|
38
39
|
RopidGTFSCisStopsModel: Symbol("RopidGTFSCisStopsModel"),
|
|
39
40
|
EnsureCacheTask: Symbol("EnsureCacheTask"),
|
|
40
41
|
DownloadDatasetsTask: Symbol("DownloadDatasetsTask"),
|
|
@@ -45,6 +46,7 @@ const RopidGtfsContainerToken = {
|
|
|
45
46
|
CollectAndSaveLogsTask: Symbol("CollectAndSaveLogsTask"),
|
|
46
47
|
ProcessAndSendLogsTask: Symbol("ProcessAndSendLogsTask"),
|
|
47
48
|
SavePresetsDataTask: Symbol("SavePresetsDataTask"),
|
|
49
|
+
RefreshGtfsTripStopsCacheTask: Symbol("RefreshGtfsTripStopsCacheTask"),
|
|
48
50
|
};
|
|
49
51
|
exports.RopidGtfsContainerToken = RopidGtfsContainerToken;
|
|
50
52
|
//# sourceMappingURL=RopidGtfsContainerToken.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidGtfsContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,uBAAuB,GAAG;IAC5B,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC;IAC9D,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,2BAA2B,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAClE,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC;IAC9D,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC;IAC9D,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,kCAAkC,EAAE,MAAM,CAAC,oCAAoC,CAAC;IAChF,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC;IAC5C,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC;IAC1C,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC;IAC9D,mCAAmC,EAAE,MAAM,CAAC,qCAAqC,CAAC;IAClF,2BAA2B,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAClE,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,2BAA2B,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAClE,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,qCAAqC,EAAE,MAAM,CAAC,uCAAuC,CAAC;IACtF,mCAAmC,EAAE,MAAM,CAAC,qCAAqC,CAAC;IAClF,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,iCAAiC,EAAE,MAAM,CAAC,mCAAmC,CAAC;IAC9E,8CAA8C,EAAE,MAAM,CAAC,gDAAgD,CAAC;IACxG,wBAAwB,EAAE,MAAM,CAAC,0BAA0B,CAAC;IAC5D,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC;IAC1C,oBAAoB,EAAE,MAAM,CAAC,sBAAsB,CAAC;IACpD,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,kCAAkC,EAAE,MAAM,CAAC,oCAAoC,CAAC;IAChF,4BAA4B,EAAE,MAAM,CAAC,8BAA8B,CAAC;IACpE,wBAAwB,EAAE,MAAM,CAAC,0BAA0B,CAAC;IAC5D,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"RopidGtfsContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/ioc/RopidGtfsContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,uBAAuB,GAAG;IAC5B,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC;IAC9D,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,2BAA2B,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAClE,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC;IAC9D,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC;IAC9D,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,kCAAkC,EAAE,MAAM,CAAC,oCAAoC,CAAC;IAChF,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,CAAC;IAC5C,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC;IAC1C,yBAAyB,EAAE,MAAM,CAAC,2BAA2B,CAAC;IAC9D,mCAAmC,EAAE,MAAM,CAAC,qCAAqC,CAAC;IAClF,2BAA2B,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAClE,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,uBAAuB,EAAE,MAAM,CAAC,yBAAyB,CAAC;IAC1D,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;IACtE,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,2BAA2B,EAAE,MAAM,CAAC,6BAA6B,CAAC;IAClE,gCAAgC,EAAE,MAAM,CAAC,kCAAkC,CAAC;IAC5E,qCAAqC,EAAE,MAAM,CAAC,uCAAuC,CAAC;IACtF,mCAAmC,EAAE,MAAM,CAAC,qCAAqC,CAAC;IAClF,kBAAkB,EAAE,MAAM,CAAC,oBAAoB,CAAC;IAChD,iCAAiC,EAAE,MAAM,CAAC,mCAAmC,CAAC;IAC9E,8CAA8C,EAAE,MAAM,CAAC,gDAAgD,CAAC;IACxG,wBAAwB,EAAE,MAAM,CAAC,0BAA0B,CAAC;IAC5D,4BAA4B,EAAE,MAAM,CAAC,8BAA8B,CAAC;IACpE,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,eAAe,EAAE,MAAM,CAAC,iBAAiB,CAAC;IAC1C,oBAAoB,EAAE,MAAM,CAAC,sBAAsB,CAAC;IACpD,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,kCAAkC,EAAE,MAAM,CAAC,oCAAoC,CAAC;IAChF,4BAA4B,EAAE,MAAM,CAAC,8BAA8B,CAAC;IACpE,wBAAwB,EAAE,MAAM,CAAC,0BAA0B,CAAC;IAC5D,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,sBAAsB,EAAE,MAAM,CAAC,wBAAwB,CAAC;IACxD,mBAAmB,EAAE,MAAM,CAAC,qBAAqB,CAAC;IAClD,6BAA6B,EAAE,MAAM,CAAC,+BAA+B,CAAC;CACzE,CAAC;AAEO,0DAAuB"}
|
|
@@ -16,6 +16,7 @@ class TimetableWorker extends workers_1.AbstractWorker {
|
|
|
16
16
|
// Register tasks
|
|
17
17
|
this.registerTask(Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RefreshGtfsStopsCacheTask));
|
|
18
18
|
this.registerTask(Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RefreshPublicGtfsDepartureCacheTask));
|
|
19
|
+
this.registerTask(Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.RefreshGtfsTripStopsCacheTask));
|
|
19
20
|
this.registerTask(Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.CheckForNewDataTask));
|
|
20
21
|
this.registerTask(Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.CheckSavedRowsAndReplaceTablesTask));
|
|
21
22
|
this.registerTask(Di_1.RopidGtfsContainer.resolve(RopidGtfsContainerToken_1.RopidGtfsContainerToken.DownloadDatasetsTask));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TimetableWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,+EAAqF;AACrF,2EAA6F;AAC7F,2CAAoD;
|
|
1
|
+
{"version":3,"file":"TimetableWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/workers/timetables/TimetableWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,+EAAqF;AACrF,2EAA6F;AAC7F,2CAAoD;AAYpD,MAAa,eAAgB,SAAQ,wBAAc;IAG/C;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,iCAAqB,CAAC;QAgChC,iBAAY,GAAG,CAAC,IAAuB,EAAQ,EAAE;YACpD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QA9BE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CACb,uBAAkB,CAAC,OAAO,CAA4B,iDAAuB,CAAC,yBAAyB,CAAC,CAC3G,CAAC;QACF,IAAI,CAAC,YAAY,CACb,uBAAkB,CAAC,OAAO,CACtB,iDAAuB,CAAC,mCAAmC,CAC9D,CACJ,CAAC;QACF,IAAI,CAAC,YAAY,CACb,uBAAkB,CAAC,OAAO,CAAgC,iDAAuB,CAAC,6BAA6B,CAAC,CACnH,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAsB,iDAAuB,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAChH,IAAI,CAAC,YAAY,CACb,uBAAkB,CAAC,OAAO,CACtB,iDAAuB,CAAC,kCAAkC,CAC7D,CACJ,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAuB,iDAAuB,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,YAAY,CACb,uBAAkB,CAAC,OAAO,CAA+B,iDAAuB,CAAC,4BAA4B,CAAC,CACjH,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAA2B,iDAAuB,CAAC,wBAAwB,CAAC,CAAC,CAAC;QAC1H,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAqB,iDAAuB,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC9G,IAAI,CAAC,YAAY,CAAC,uBAAkB,CAAC,OAAO,CAAkB,iDAAuB,CAAC,eAAe,CAAC,CAAC,CAAC;IAC5G,CAAC;CAMJ;AArCD,0CAqCC"}
|
|
@@ -68,6 +68,7 @@ let CheckSavedRowsAndReplaceTablesTask = class CheckSavedRowsAndReplaceTablesTas
|
|
|
68
68
|
// so that the new data is available in the public (Lítačka) API
|
|
69
69
|
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshPublicGtfsDepartureCache", {}),
|
|
70
70
|
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshGtfsStopsCache", {}),
|
|
71
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshGtfsTripStopsCache", {}),
|
|
71
72
|
]);
|
|
72
73
|
}
|
|
73
74
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckSavedRowsAndReplaceTablesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CheckSavedRowsAndReplaceTablesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/CheckSavedRowsAndReplaceTablesTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,7 @@ let EnsureCacheTask = class EnsureCacheTask extends integration_engine_1.Abstrac
|
|
|
36
36
|
integration_engine_1.QueueManager.sendMessageToExchange(`${rabbitExchangeName}.${constants_1.WORKER_NAME.toLowerCase()}`, "refreshGTFSTripData", {}),
|
|
37
37
|
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshPublicGtfsDepartureCache", {}),
|
|
38
38
|
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshGtfsStopsCache", {}),
|
|
39
|
+
integration_engine_1.QueueManager.sendMessageToExchange(this.queuePrefix, "refreshGtfsTripStopsCache", {}),
|
|
39
40
|
integration_engine_1.QueueManager.sendMessageToExchange(`${rabbitExchangeName}.${constants_2.JIS_WORKER_NAME.toLowerCase()}`, "refreshJISInfotextsCache", {}),
|
|
40
41
|
]);
|
|
41
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnsureCacheTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/EnsureCacheTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iGAA0G;AAC1G,iEAA4D;AAE5D,wEAAqE;AACrE,8EAAwF;AACxF,iEAAwE;AACxE,4CAAqD;AACrD,6EAAwE;AAGjE,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,sCAAiB;IAIlD,YAA4C,MAAsC;QAC9E,KAAK,CAAC,iCAAqB,CAAC,CAAC;QAD4B,WAAM,GAAN,MAAM,CAAe;QAHlE,cAAS,GAAG,aAAa,CAAC;QAC1B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;IAItD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,0BAA0B,CAAC,CAAC;QAEpF,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtB,MAAM,IAAI,6BAAY,CAAC,6DAA6D,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,iCAAY,CAAC,qBAAqB,CAC9B,GAAG,kBAAkB,IAAI,uBAAc,CAAC,WAAW,EAAE,EAAE,EACvD,qBAAqB,EACrB,EAAE,CACL;YACD,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,iCAAiC,EAAE,EAAE,CAAC;YAC3F,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,EAAE,EAAE,CAAC;YACjF,iCAAY,CAAC,qBAAqB,CAC9B,GAAG,kBAAkB,IAAI,2BAAe,CAAC,WAAW,EAAE,EAAE,EACxD,0BAA0B,EAC1B,EAAE,CACL;SACJ,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;
|
|
1
|
+
{"version":3,"file":"EnsureCacheTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/EnsureCacheTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,iGAA0G;AAC1G,iEAA4D;AAE5D,wEAAqE;AACrE,8EAAwF;AACxF,iEAAwE;AACxE,4CAAqD;AACrD,6EAAwE;AAGjE,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,sCAAiB;IAIlD,YAA4C,MAAsC;QAC9E,KAAK,CAAC,iCAAqB,CAAC,CAAC;QAD4B,WAAM,GAAN,MAAM,CAAe;QAHlE,cAAS,GAAG,aAAa,CAAC;QAC1B,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,YAAY;IAItD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,kBAAkB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAS,0BAA0B,CAAC,CAAC;QAEpF,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACtB,MAAM,IAAI,6BAAY,CAAC,6DAA6D,CAAC,CAAC;QAC1F,CAAC;QAED,MAAM,OAAO,CAAC,GAAG,CAAC;YACd,iCAAY,CAAC,qBAAqB,CAC9B,GAAG,kBAAkB,IAAI,uBAAc,CAAC,WAAW,EAAE,EAAE,EACvD,qBAAqB,EACrB,EAAE,CACL;YACD,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,iCAAiC,EAAE,EAAE,CAAC;YAC3F,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,uBAAuB,EAAE,EAAE,CAAC;YACjF,iCAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,2BAA2B,EAAE,EAAE,CAAC;YACrF,iCAAY,CAAC,qBAAqB,CAC9B,GAAG,kBAAkB,IAAI,2BAAe,CAAC,WAAW,EAAE,EAAE,EACxD,0BAA0B,EAC1B,EAAE,CACL;SACJ,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA/BY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,qBAAU,GAAE;IAKI,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;;GAJlC,eAAe,CA+B3B"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { GtfsTripStopsCacheRepository } from "../../../data-access/cache/GtfsTripStopsCacheRepository";
|
|
2
|
+
import { DeparturesRepository } from "../../../data-access/precomputed";
|
|
3
|
+
import { ILogger } from "@golemio/core/dist/helpers";
|
|
4
|
+
import { AbstractEmptyTask } from "@golemio/core/dist/integration-engine";
|
|
5
|
+
export declare class RefreshGtfsTripStopsCacheTask extends AbstractEmptyTask {
|
|
6
|
+
private gtfsTripStopsCacheRepository;
|
|
7
|
+
private departureRepository;
|
|
8
|
+
private log;
|
|
9
|
+
readonly queueName = "refreshGtfsTripStopsCache";
|
|
10
|
+
readonly queueTtl: number;
|
|
11
|
+
constructor(gtfsTripStopsCacheRepository: GtfsTripStopsCacheRepository, departureRepository: DeparturesRepository, log: ILogger);
|
|
12
|
+
protected execute(): Promise<void>;
|
|
13
|
+
}
|
package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsTripStopsCacheTask.js
ADDED
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.RefreshGtfsTripStopsCacheTask = void 0;
|
|
16
|
+
const GtfsTripStopsCacheRepository_1 = require("../../../data-access/cache/GtfsTripStopsCacheRepository");
|
|
17
|
+
const precomputed_1 = require("../../../data-access/precomputed");
|
|
18
|
+
const RopidGtfsContainerToken_1 = require("../../../ioc/RopidGtfsContainerToken");
|
|
19
|
+
const CoreToken_1 = require("@golemio/core/dist/helpers/ioc/CoreToken");
|
|
20
|
+
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
21
|
+
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
22
|
+
const constants_1 = require("../constants");
|
|
23
|
+
let RefreshGtfsTripStopsCacheTask = class RefreshGtfsTripStopsCacheTask extends integration_engine_1.AbstractEmptyTask {
|
|
24
|
+
constructor(gtfsTripStopsCacheRepository, departureRepository, log) {
|
|
25
|
+
super(constants_1.TIMETABLE_WORKER_NAME);
|
|
26
|
+
this.gtfsTripStopsCacheRepository = gtfsTripStopsCacheRepository;
|
|
27
|
+
this.departureRepository = departureRepository;
|
|
28
|
+
this.log = log;
|
|
29
|
+
this.queueName = "refreshGtfsTripStopsCache";
|
|
30
|
+
this.queueTtl = 59 * 60 * 1000; // 59 minutes
|
|
31
|
+
}
|
|
32
|
+
async execute() {
|
|
33
|
+
const tripStopsRows = await this.departureRepository.getTripStopsForCache();
|
|
34
|
+
this.log.info(`${this.constructor.name}: Refreshing cache for ${tripStopsRows.length} trips`);
|
|
35
|
+
const tripStopsMap = new Map(tripStopsRows.map((row) => [row.trip_id, { stops: row.stops }]));
|
|
36
|
+
await this.gtfsTripStopsCacheRepository.saveMultipleTripStops(tripStopsMap);
|
|
37
|
+
}
|
|
38
|
+
};
|
|
39
|
+
exports.RefreshGtfsTripStopsCacheTask = RefreshGtfsTripStopsCacheTask;
|
|
40
|
+
exports.RefreshGtfsTripStopsCacheTask = RefreshGtfsTripStopsCacheTask = __decorate([
|
|
41
|
+
(0, tsyringe_1.injectable)(),
|
|
42
|
+
__param(0, (0, tsyringe_1.inject)(RopidGtfsContainerToken_1.RopidGtfsContainerToken.GtfsTripStopsCacheRepository)),
|
|
43
|
+
__param(1, (0, tsyringe_1.inject)(RopidGtfsContainerToken_1.RopidGtfsContainerToken.DepartureRepository)),
|
|
44
|
+
__param(2, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
45
|
+
__metadata("design:paramtypes", [GtfsTripStopsCacheRepository_1.GtfsTripStopsCacheRepository,
|
|
46
|
+
precomputed_1.DeparturesRepository, Object])
|
|
47
|
+
], RefreshGtfsTripStopsCacheTask);
|
|
48
|
+
//# sourceMappingURL=RefreshGtfsTripStopsCacheTask.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RefreshGtfsTripStopsCacheTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/RefreshGtfsTripStopsCacheTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0GAA6G;AAC7G,kEAA8E;AAC9E,kFAAqF;AAErF,wEAAqE;AACrE,8EAA0E;AAC1E,iEAAwE;AACxE,4CAAqD;AAG9C,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,sCAAiB;IAIhE,YAEI,4BAAkE,EACb,mBAAiD,EAC5E,GAAoB;QAE9C,KAAK,CAAC,iCAAqB,CAAC,CAAC;QAJrB,iCAA4B,GAA5B,4BAA4B,CAA8B;QACL,wBAAmB,GAAnB,mBAAmB,CAAsB;QACpE,QAAG,GAAH,GAAG,CAAS;QAPlC,cAAS,GAAG,2BAA2B,CAAC;QACxC,aAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;IASxD,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,EAAE,CAAC;QAC5E,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,0BAA0B,aAAa,CAAC,MAAM,QAAQ,CAAC,CAAC;QAE9F,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9F,MAAM,IAAI,CAAC,4BAA4B,CAAC,qBAAqB,CAAC,YAAY,CAAC,CAAC;IAChF,CAAC;CACJ,CAAA;AApBY,sEAA6B;wCAA7B,6BAA6B;IADzC,IAAA,qBAAU,GAAE;IAMJ,WAAA,IAAA,iBAAM,EAAC,iDAAuB,CAAC,4BAA4B,CAAC,CAAA;IAE5D,WAAA,IAAA,iBAAM,EAAC,iDAAuB,CAAC,mBAAmB,CAAC,CAAA;IACnD,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;qCAFa,2DAA4B;QACgB,kCAAoB;GAPjG,6BAA6B,CAoBzC"}
|
|
@@ -117,25 +117,14 @@ let V4TransferBoardsController = V4TransferBoardsController_1 = class V4Transfer
|
|
|
117
117
|
const guaranteedTransferTripIds = new Set(TransferBoardFilter_1.TransferBoardFilter.havingConnectionFromTripId(transferCacheDto.currentTripId, transferCacheDto.transfers, transferCacheDto.delayedTimeFrom).flatMap((t) => t.departure.trip_id));
|
|
118
118
|
transferCacheDto.transfers = TransferBoardFilter_1.TransferBoardFilter.minimalTransferTime(transferCacheDto.transfers, transferCacheDto.delayedTimeFrom, guaranteedTransferTripIds);
|
|
119
119
|
transferCacheDto.transfers = TransferBoardFilter_1.TransferBoardFilter.sameStopNameTransfer(transferCacheDto.transfers, transferStop.stop_id, sameNameStopIds, guaranteedTransferTripIds, false);
|
|
120
|
-
const
|
|
120
|
+
const tripIdsToFilter = new Set(TransferBoardFilter_1.TransferBoardFilter.filterOutKeepAlwaysTransfer(transferCacheDto.transfers).map((transfer) => transfer.departure.trip_id));
|
|
121
121
|
for (const guaranteedTripId of guaranteedTransferTripIds) {
|
|
122
|
-
//
|
|
123
|
-
|
|
124
|
-
tripIdsToReadStopsUsingDelay.delete(guaranteedTripId);
|
|
122
|
+
// Guaranteed transfers are "show always" — no need to filter their stop-lines
|
|
123
|
+
tripIdsToFilter.delete(guaranteedTripId);
|
|
125
124
|
}
|
|
126
125
|
this.enhanceInPlaceWithGuaranteedTransfers(transferCacheDto, guaranteedTransferTripIds);
|
|
127
126
|
TransferBoardSorter_1.TransferBoardSorter.sortDepartures(transferCacheDto.transfers);
|
|
128
|
-
|
|
129
|
-
// but otherwise we fallback to reading from delayComputation Cache (a bit costly JSON traverse) by trip_id(s)
|
|
130
|
-
const stopTimeIdsTuples = transferCacheDto.transfers.reduce((prev, t) => {
|
|
131
|
-
if (tripIdsToReadStopsUsingDelay.has(t.departure.trip_id) && t.position?.vehicle_id != null) {
|
|
132
|
-
tripIdsToReadStopsUsingDelay.delete(t.departure.trip_id);
|
|
133
|
-
// tuples are for stopTime Cache
|
|
134
|
-
prev.push([t.position.vehicle_id, t.departure.trip_id]);
|
|
135
|
-
}
|
|
136
|
-
return prev;
|
|
137
|
-
}, []);
|
|
138
|
-
const tripIdsToKeep = new Set(await this.transferFacade.findRelevantTripIdsFromLines(tripIdsToReadStopsUsingDelay, transferCacheDto.currentStop, transferCacheDto.currentTripId, stopTimeIdsTuples, this.countPreviousStopsToAllow, this.isOppositeDirectionFilterStopNameStrict));
|
|
127
|
+
const tripIdsToKeep = new Set(await this.transferFacade.findRelevantTripIdsFromLines(tripIdsToFilter, transferCacheDto.currentStop, transferCacheDto.currentTripId, this.countPreviousStopsToAllow, this.isOppositeDirectionFilterStopNameStrict));
|
|
139
128
|
guaranteedTransferTripIds.forEach((guaranteedTripId) => {
|
|
140
129
|
tripIdsToKeep.add(guaranteedTripId);
|
|
141
130
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"V4TransferBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v4/V4TransferBoardsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,uEAAyD;AACzD,uEAA4D;AAE5D,8FAAwE;AACxE,2EAA0E;AAC1E,yFAAwF;AACxF,2EAA0E;AAM1E,qDAAoD;AACpD,wEAAuE;AACvE,gEAA+D;AAC/D,wEAAuE;AACvE,6HAA4H;AAC5H,4CAAmE;AAGnE,wEAAqE;AACrE,+FAA6F;AAE7F,mFAA0E;AAC1E,gGAA+D;AAE/D,iEAAwE;AAGxE,MAAM,yBAAyB,GAAG,IAAI,CAAC,CAAC,mEAAmE;AAC3G,MAAM,6BAA6B,GAAG,IAAI,CAAC,CAAC,oEAAoE;AAGzG,IAAM,0BAA0B,kCAAhC,MAAM,0BAA0B;IAYnC,YACoC,MAA6B,EAC9B,UAA8B,EAC1B,cAAsC,EACtC,cAAsC,EAChB,cAA4D;QAJ7E,WAAM,GAAN,MAAM,CAAe;QACtB,eAAU,GAAV,UAAU,CAAY;QAClB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,mBAAc,GAAd,cAAc,CAAgB;QACR,mBAAc,GAAd,cAAc,CAAsC;QATxG,+BAA0B,GAAG,CAAC,CAAC;QAqBzC,yBAAoB,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACnE,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,IAAA,gCAAe,EAAC,iDAAiD,CAAC,CAAC;YAChF,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;gBACzD,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEvG,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,QAAQ,GAAG,IAAI,CAAC;gBACpB,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;oBAC3B,QAAQ,GAAG,yBAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,yBAAgB,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;gBAC9E,CAAC;gBAED,oBAAoB;gBACpB,IAAI,OAAO,GAAa,EAAE,CAAC;gBAC3B,IAAI,gBAAgB,GAA0B,IAAI,CAAC;gBACnD,IAAI,kBAAkB,GAAmC,EAAE,CAAC;gBAE5D,IAAI,SAAS,GAAoB,EAAE,CAAC;gBACpC,IAAI,YAAuC,CAAC;gBAE5C,IAAI,gBAAwB,CAAC;gBAC7B,IAAI,eAAyB,CAAC;gBAE9B,IAAI,CAAC;oBACD,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACxD,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kCAAkC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACjF,2CAA2C;wBAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BACvB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,4BAA0B,CAAC,YAAY,CAAC,CAAC;wBACzE,CAAC;wBAED,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;wBAE1E,MAAM,gBAAgB,GAAG,+BAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACvE,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,+BAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,gBAAgB,CAAC,CAAC;wBAE5G,IAAI,CAAC,YAAY,EAAE,CAAC;4BAChB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,4BAA0B,CAAC,YAAY,CAAC,CAAC;wBACzE,CAAC;wBAED,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAAC;wBAC1C,4CAA4C;wBAC5C,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;wBAE9G,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAC5D,YAAY,CAAC,OAAO,EACpB,OAAO,EACP,MAAM,CAAC,KAAK,EACZ,QAAQ,CAAC,MAAM,CAAC,yBAAyB,IAAI,GAAG,EAAE,EAAE,CAAC,EACrD,MAAM,CAAC,SAAS,EAChB,QAAQ,IAAI,GAAG,EACf,eAAe,CAClB,CAAC;wBACF,gBAAgB,GAAG,aAAa,CAAC;wBACjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;wBAC3G,kBAAkB,GAAG,SAAS,CAAC;wBAC/B,YAAY;oBAChB,CAAC;yBAAM,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC/D,yBAAyB;wBACzB,iEAAiE;wBACjE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,0CAA0C,EAAE,CAAC,CAAC;oBACzF,CAAC;yBAAM,CAAC;wBACJ,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;4BACxB,OAAO,EAAE,4EAA4E;yBACxF,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;oBAC7B,MAAM,KAAK,CAAC;gBAChB,CAAC;gBACD,YAAY;gBAEZ,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;oBACtC,uFAAuF;oBACvF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACxB,SAAS,EAAE,YAAY,CAAC,SAAS;wBACjC,aAAa,EAAE,YAAY,CAAC,aAAa;wBACzC,KAAK,EAAE,EAAE;wBACT,UAAU,EAAE,EAAE;wBACd,SAAS,EAAE,kBAAkB;qBAChC,CAAC,CAAC;gBACP,CAAC;gBAED,qDAAqD;gBACrD,gDAAgD;gBAChD,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;gBAEhE,MAAM,yBAAyB,GAAgB,IAAI,GAAG,CAClD,yCAAmB,CAAC,0BAA0B,CAC1C,gBAAgB,CAAC,aAAuB,EACxC,gBAAgB,CAAC,SAAS,EAC1B,gBAAgB,CAAC,eAAe,CACnC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CACxC,CAAC;gBAEF,gBAAgB,CAAC,SAAS,GAAG,yCAAmB,CAAC,mBAAmB,CAChE,gBAAgB,CAAC,SAAS,EAC1B,gBAAgB,CAAC,eAAe,EAChC,yBAAyB,CAC5B,CAAC;gBAEF,gBAAgB,CAAC,SAAS,GAAG,yCAAmB,CAAC,oBAAoB,CACjE,gBAAgB,CAAC,SAAS,EAC1B,YAAY,CAAC,OAAO,EACpB,eAAe,EACf,yBAAyB,EACzB,KAAK,CACoB,CAAC;gBAE9B,MAAM,
|
|
1
|
+
{"version":3,"file":"V4TransferBoardsController.js","sourceRoot":"","sources":["../../../../../src/output-gateway/pid/controllers/v4/V4TransferBoardsController.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,uEAAyD;AACzD,uEAA4D;AAE5D,8FAAwE;AACxE,2EAA0E;AAC1E,yFAAwF;AACxF,2EAA0E;AAM1E,qDAAoD;AACpD,wEAAuE;AACvE,gEAA+D;AAC/D,wEAAuE;AACvE,6HAA4H;AAC5H,4CAAmE;AAGnE,wEAAqE;AACrE,+FAA6F;AAE7F,mFAA0E;AAC1E,gGAA+D;AAE/D,iEAAwE;AAGxE,MAAM,yBAAyB,GAAG,IAAI,CAAC,CAAC,mEAAmE;AAC3G,MAAM,6BAA6B,GAAG,IAAI,CAAC,CAAC,oEAAoE;AAGzG,IAAM,0BAA0B,kCAAhC,MAAM,0BAA0B;IAYnC,YACoC,MAA6B,EAC9B,UAA8B,EAC1B,cAAsC,EACtC,cAAsC,EAChB,cAA4D;QAJ7E,WAAM,GAAN,MAAM,CAAe;QACtB,eAAU,GAAV,UAAU,CAAY;QAClB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,mBAAc,GAAd,cAAc,CAAgB;QACR,mBAAc,GAAd,cAAc,CAAsC;QATxG,+BAA0B,GAAG,CAAC,CAAC;QAqBzC,yBAAoB,GAAmB,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACnE,MAAM,SAAS,GAAG,IAAA,+BAAW,EAAC,GAAG,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,IAAA,gCAAe,EAAC,iDAAiD,CAAC,CAAC;YAChF,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,CAAC;gBACzD,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEvG,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;gBACvB,IAAI,QAAQ,GAAG,IAAI,CAAC;gBACpB,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;oBAC3B,QAAQ,GAAG,yBAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,yBAAgB,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;gBAC9E,CAAC;gBAED,oBAAoB;gBACpB,IAAI,OAAO,GAAa,EAAE,CAAC;gBAC3B,IAAI,gBAAgB,GAA0B,IAAI,CAAC;gBACnD,IAAI,kBAAkB,GAAmC,EAAE,CAAC;gBAE5D,IAAI,SAAS,GAAoB,EAAE,CAAC;gBACpC,IAAI,YAAuC,CAAC;gBAE5C,IAAI,gBAAwB,CAAC;gBAC7B,IAAI,eAAyB,CAAC;gBAE9B,IAAI,CAAC;oBACD,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;wBACxD,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kCAAkC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACjF,2CAA2C;wBAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;4BACvB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,4BAA0B,CAAC,YAAY,CAAC,CAAC;wBACzE,CAAC;wBAED,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;wBAE1E,MAAM,gBAAgB,GAAG,+BAAc,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACvE,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,+BAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,gBAAgB,CAAC,CAAC;wBAE5G,IAAI,CAAC,YAAY,EAAE,CAAC;4BAChB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,4BAA0B,CAAC,YAAY,CAAC,CAAC;wBACzE,CAAC;wBAED,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAAC;wBAC1C,4CAA4C;wBAC5C,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;wBAE9G,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAC5D,YAAY,CAAC,OAAO,EACpB,OAAO,EACP,MAAM,CAAC,KAAK,EACZ,QAAQ,CAAC,MAAM,CAAC,yBAAyB,IAAI,GAAG,EAAE,EAAE,CAAC,EACrD,MAAM,CAAC,SAAS,EAChB,QAAQ,IAAI,GAAG,EACf,eAAe,CAClB,CAAC;wBACF,gBAAgB,GAAG,aAAa,CAAC;wBACjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,EAAE,aAAa,CAAC,eAAe,CAAC,CAAC;wBAC3G,kBAAkB,GAAG,SAAS,CAAC;wBAC/B,YAAY;oBAChB,CAAC;yBAAM,IAAI,OAAO,IAAI,MAAM,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;wBAC/D,yBAAyB;wBACzB,iEAAiE;wBACjE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,0CAA0C,EAAE,CAAC,CAAC;oBACzF,CAAC;yBAAM,CAAC;wBACJ,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;4BACxB,OAAO,EAAE,4EAA4E;yBACxF,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACb,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;oBAC7B,MAAM,KAAK,CAAC;gBAChB,CAAC;gBACD,YAAY;gBAEZ,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;oBACtC,uFAAuF;oBACvF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACxB,SAAS,EAAE,YAAY,CAAC,SAAS;wBACjC,aAAa,EAAE,YAAY,CAAC,aAAa;wBACzC,KAAK,EAAE,EAAE;wBACT,UAAU,EAAE,EAAE;wBACd,SAAS,EAAE,kBAAkB;qBAChC,CAAC,CAAC;gBACP,CAAC;gBAED,qDAAqD;gBACrD,gDAAgD;gBAChD,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;gBAEhE,MAAM,yBAAyB,GAAgB,IAAI,GAAG,CAClD,yCAAmB,CAAC,0BAA0B,CAC1C,gBAAgB,CAAC,aAAuB,EACxC,gBAAgB,CAAC,SAAS,EAC1B,gBAAgB,CAAC,eAAe,CACnC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CACxC,CAAC;gBAEF,gBAAgB,CAAC,SAAS,GAAG,yCAAmB,CAAC,mBAAmB,CAChE,gBAAgB,CAAC,SAAS,EAC1B,gBAAgB,CAAC,eAAe,EAChC,yBAAyB,CAC5B,CAAC;gBAEF,gBAAgB,CAAC,SAAS,GAAG,yCAAmB,CAAC,oBAAoB,CACjE,gBAAgB,CAAC,SAAS,EAC1B,YAAY,CAAC,OAAO,EACpB,eAAe,EACf,yBAAyB,EACzB,KAAK,CACoB,CAAC;gBAE9B,MAAM,eAAe,GAAgB,IAAI,GAAG,CACxC,yCAAmB,CAAC,2BAA2B,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC,GAAG,CAC3E,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAC3C,CACJ,CAAC;gBAEF,KAAK,MAAM,gBAAgB,IAAI,yBAAyB,EAAE,CAAC;oBACvD,8EAA8E;oBAC9E,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;gBAC7C,CAAC;gBAED,IAAI,CAAC,qCAAqC,CAAC,gBAAgB,EAAE,yBAAyB,CAAC,CAAC;gBAExF,yCAAmB,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;gBAE/D,MAAM,aAAa,GAAG,IAAI,GAAG,CACzB,MAAM,IAAI,CAAC,cAAc,CAAC,4BAA4B,CAClD,eAAe,EACf,gBAAgB,CAAC,WAAqB,EACtC,gBAAgB,CAAC,aAAuB,EACxC,IAAI,CAAC,yBAAyB,EAC9B,IAAI,CAAC,uCAAuC,CAC/C,CACJ,CAAC;gBAEF,yBAAyB,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;oBACnD,aAAa,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;gBAEH,gBAAgB,CAAC,SAAS,GAAG,yCAAmB,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;gBAEtH,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;gBAEvF,MAAM,YAAY,GAAG,yCAAmB,CAAC,gBAAgB,CACrD,eAAe,EACf,MAAM,CAAC,KAAK,EACZ,gBAAgB,CAAC,eAAe,CAAC,OAAO,EAAE,EAC1C,GAAG,CAAC,OAAO,EAAE,CAChB,CAAC;gBAEF,MAAM,MAAM,GAAyB;oBACjC,0DAA0D;oBAC1D,SAAS,EAAE,YAAY,CAAC,SAAS;oBACjC,aAAa,EAAE,YAAY,CAAC,aAAa;oBACzC,KAAK,EAAE,uDAA0B,CAAC,mBAAmB,CACjD,gBAAgB,CAAC,WAAW,EAAE,UAAU,EACxC,MAAM,CAAC,SAAS,EAChB,IAAI,CACP;oBACD,UAAU,EAAE,YAAY;oBACxB,SAAS,EAAE,kBAAkB;iBAChC,CAAC;gBAEF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,IAAI,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;oBAAS,CAAC;gBACP,IAAI,EAAE,GAAG,EAAE,CAAC;YAChB,CAAC;QACL,CAAC,CAAC;QAnLE,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CACjD,uEAAuE,EACvE,CAAC,CACM,CAAC;QACZ,IAAI,CAAC,uCAAuC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CACjE,qFAAqF,EACrF,IAAI,CACP,CAAC;IACN,CAAC;IA6KO,qBAAqB,CAAC,SAA0B;QACpD,MAAM,uBAAuB,GAAG,IAAI,GAAG,EAAE,CAAC;QAC1C,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;YAC/B,uBAAuB,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAChF,CAAC;QACD,OAAO,uBAAuB,CAAC;IACnC,CAAC;IAEO,6BAA6B,CAAC,gBAAgC,EAAE,SAA0B;QAC9F,MAAM,uBAAuB,GAAG,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;QAEtE,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAyB,EAAE,EAAE;YAC7D,MAAM,aAAa,GAA2B;gBAC1C,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,UAAU;gBAClC,qBAAqB,EAAE,CAAC,CAAC,SAAS,CAAC,qBAAqB,IAAI,IAAI;gBAChE,0BAA0B,EAAE,IAAI;gBAChC,mBAAmB,EAAE,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,IAAI;aAChF,CAAC;YAEF,gEAAgE;YAChE,4EAA4E;YAC5E,IAAI,CAAC,CAAC,SAAS,CAAC,UAAU,KAAK,kCAAiB,CAAC,KAAK,EAAE,CAAC;gBACrD,aAAa,CAAC,0BAA0B,GAAG,yBAAyB,CAAC;YACzE,CAAC;iBAAM,CAAC;gBACJ,aAAa,CAAC,0BAA0B;oBACpC,CAAC,CAAC,QAAQ,EAAE,aAAa,EAAE,wBAAwB,IAAI,6BAA6B,CAAC;YAC7F,CAAC;YAED,CAAC,CAAC,SAAS,CAAC,wBAAwB,GAAG,8BAAoB,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;YAEhG,CAAC,CAAC,SAAS,CAAC,sBAAsB,GAAG,4BAAmB,CAAC,yBAAyB,CAC9E,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,kBAAkB,CAAC,EACxC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,EAC5E,CAAC,CAAC,QAAQ,EAAE,KAAK,IAAI,IAAI,CAC5B,CAAC;YAEF,CAAC,CAAC,SAAS,CAAC,2BAA2B,GAAG,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,CAAC;QAC3F,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,qCAAqC,CAAC,gBAAgC,EAAE,OAAoB;QAChG,sGAAsG;QACtG,MAAM,oBAAoB,GAAG,IAAI,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;QACxE,MAAM,yBAAyB,GAAG,oBAAoB,CAAC,OAAO,EAAE,CAAC;QAEjE,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACrC,CAAC,CAAC,SAAS,CAAC,sBAAsB,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YACtE,IAAI,CAAC,CAAC,SAAS,CAAC,sBAAsB,EAAE,CAAC;gBACrC,2FAA2F;gBAC3F,gGAAgG;gBAChG,qFAAqF;gBACrF,4EAA4E;gBAC5E,IAAI,yBAAyB,GAAG,CAAC,CAAC,SAAS,CAAC,2BAA4B,EAAE,CAAC;oBACvE,CAAC,CAAC,SAAS,CAAC,sBAAsB,GAAG,oBAAoB,CAAC;oBAC1D,CAAC,CAAC,SAAS,CAAC,2BAA2B,GAAG,yBAAyB,CAAC;gBACxE,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,yBAAyB,CAAC,KAAe;QAC7C,OAAO;YACH,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAkB;YAC7C,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAA6B;YACxD,UAAU,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,IAAI,CAA6B;YAClE,yBAAyB,EAAE,CAAC,KAAK,CAAC,yBAAyB,IAAI,IAAI,CAAkB;YACrF,SAAS,EAAE,KAAK,CAAC,SAA8B;YAC/C,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAkB;YACnD,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,0BAA0B,CAAsB;SAC/E,CAAC;IACN,CAAC;;AA9QQ,gEAA0B;AACX,uCAAY,GAAG;IACnC,SAAS,EAAE,IAAI;IACf,aAAa,EAAE,IAAI;IACnB,KAAK,EAAE,EAAE;IACT,UAAU,EAAE,EAAE;IACd,SAAS,EAAE,EAAE;CAChB,AANmC,CAMlC;qCAPO,0BAA0B;IADtC,IAAA,qBAAU,GAAE;IAcJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;IAC9B,WAAA,IAAA,iBAAM,EAAC,uBAAU,CAAC,UAAU,CAAC,CAAA;IAC7B,WAAA,IAAA,iBAAM,EAAC,uBAAU,CAAC,cAAc,CAAC,CAAA;IACjC,WAAA,IAAA,iBAAM,EAAC,uBAAU,CAAC,cAAc,CAAC,CAAA;IACjC,WAAA,IAAA,iBAAM,EAAC,uBAAU,CAAC,oCAAoC,CAAC,CAAA;6CAHL,uBAAU;QACF,+BAAc;QACd,+BAAc;QACQ,2EAAoC;GAjBhH,0BAA0B,CA+QtC"}
|
|
@@ -2,8 +2,28 @@ import { JISInfotextsModel } from "../../../schema-definitions/jis/models/JISInf
|
|
|
2
2
|
import { IJISInfotextDto } from "../../../schema-definitions/jis/redis/interfaces/IJISInfotextDto";
|
|
3
3
|
type InfotextUnion = JISInfotextsModel | IJISInfotextDto;
|
|
4
4
|
export declare class JISInfotextStopSuppressionFilter {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
filterInfotexts<T extends InfotextUnion>(infotexts: T[], { includeFuture }: {
|
|
6
|
+
includeFuture: boolean;
|
|
7
|
+
}): T[];
|
|
8
|
+
private filterInfotextsExcludingFuture;
|
|
9
|
+
private getStopId;
|
|
10
|
+
private mapTopInfotextSeverityLevelByStopId;
|
|
11
|
+
private filterInfotextsIncludingFuture;
|
|
12
|
+
private createInfotextIntermediaries;
|
|
13
|
+
private mapInfotextsByStopId;
|
|
14
|
+
private filterStopInfotexts;
|
|
15
|
+
private segmentInfotexts;
|
|
16
|
+
private findSegmentationThreshold;
|
|
17
|
+
private addDay;
|
|
18
|
+
private segmentRepeatedInfotext;
|
|
19
|
+
private getMaxSegmentationDayForInfotext;
|
|
20
|
+
private getDatetimeFromRepeatTime;
|
|
21
|
+
private fitFiniteSegmentToInfotextTimeBounds;
|
|
22
|
+
private sortAndFilterSegments;
|
|
23
|
+
private isSegmentBLesserThanA;
|
|
24
|
+
private findUniqueInfotextsFromSegments;
|
|
25
|
+
private mapInfotextIdsByStopId;
|
|
26
|
+
private filterAllInfotexts;
|
|
27
|
+
private createInfotextsFromIntermediaries;
|
|
8
28
|
}
|
|
9
29
|
export {};
|