@golemio/pid 2.8.5 → 2.8.6-dev.953248025
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/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js +14 -7
- package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js +8 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.d.ts +16 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.js +41 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.d.ts +10 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.js +3 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.js.map +1 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.d.ts +2 -0
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js +18 -13
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.js +88 -89
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/PropagateDelayTask.js +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js +99 -72
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.d.ts +1 -1
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.js +2 -1
- package/dist/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/ICommonRunsMessagesModel.d.ts +2 -2
- package/package.json +1 -1
package/dist/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.js
CHANGED
|
@@ -76,12 +76,19 @@ class CommonRunsRepository extends models_2.PostgresModel {
|
|
|
76
76
|
this.getRunRecordForUpdate = (run) => {
|
|
77
77
|
return this.sequelizeModel.findOne({
|
|
78
78
|
where: {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
79
|
+
[sequelize_1.default.Op.or]: [
|
|
80
|
+
{
|
|
81
|
+
id: run.id,
|
|
82
|
+
},
|
|
83
|
+
{
|
|
84
|
+
route_id: run.route_id,
|
|
85
|
+
run_number: run.run_number,
|
|
86
|
+
registration_number: run.registration_number,
|
|
87
|
+
msg_last_timestamp: {
|
|
88
|
+
[sequelize_1.Op.gt]: sequelize_1.default.literal("NOW() - INTERVAL '3 HOURS'"),
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
],
|
|
85
92
|
},
|
|
86
93
|
order: [["msg_last_timestamp", "DESC"]],
|
|
87
94
|
raw: true,
|
|
@@ -107,7 +114,7 @@ class CommonRunsRepository extends models_2.PostgresModel {
|
|
|
107
114
|
}
|
|
108
115
|
catch (err) {
|
|
109
116
|
yield t.rollback();
|
|
110
|
-
throw
|
|
117
|
+
throw err;
|
|
111
118
|
}
|
|
112
119
|
});
|
|
113
120
|
this.updateAndAssociate = ({ run, run_message }, runId) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gFAAgF;AAChF,mEAAuC;AACvC,uFAAgE;AAIhE,iFAAqF;AACrF,yEAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iFAAoE;AACpE,iFAA8E;AAE9E,MAAa,oBAAqB,SAAQ,sBAAa;IAgBnD;QACI,KAAK,CACD,sBAAsB,EACtB;YACI,WAAW,EAAE,wBAAe,CAAC,UAAU;YACvC,QAAQ,EAAE,iBAAS;YACnB,yBAAyB,EAAE,wBAAe,CAAC,cAAc;YACzD,UAAU,EAAE,YAAY;YACxB,2BAA2B,EAAE;gBACzB,OAAO,EAAE;oBACL;wBACI,MAAM,EAAE,CAAC,IAAI,CAAC;wBACd,IAAI,EAAE,4BAA4B;qBACrC;oBACD;wBACI,MAAM,EAAE,CAAC,UAAU,EAAE,YAAY,EAAE,qBAAqB,EAAE,qBAAqB,CAAC;wBAChF,IAAI,EAAE,2BAA2B;qBACpC;iBACJ;aACJ;SACJ,EACD,IAAI,uCAAmB,CAAC,+BAA+B,EAAE,wBAAe,CAAC,UAAU,CAAC,CACvF,CAAC;QAiBC,0BAAqB,GAAG,CAAC,GAAqB,EAAoC,EAAE;YACvF,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC/B,KAAK,EAAE;oBACH,QAAQ,EAAE,GAAG,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"CommonRunsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/data-access/CommonRunsRepository.ts"],"names":[],"mappings":"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"}
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js
CHANGED
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.CommonMessageProcessor = void 0;
|
|
13
13
|
const vehicle_positions_1 = require("../../../../../schema-definitions/vehicle-positions");
|
|
14
14
|
const config_1 = require("@golemio/core/dist/integration-engine/config");
|
|
15
|
+
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
15
16
|
const queueprocessors_1 = require("@golemio/core/dist/integration-engine/queueprocessors");
|
|
16
17
|
const const_1 = require("../../../../../const");
|
|
17
18
|
class CommonMessageProcessor {
|
|
@@ -34,7 +35,13 @@ class CommonMessageProcessor {
|
|
|
34
35
|
outputMsg = yield this.runsRepository.updateAndAssociate(element, record.id);
|
|
35
36
|
}
|
|
36
37
|
else {
|
|
37
|
-
|
|
38
|
+
try {
|
|
39
|
+
outputMsg = yield this.runsRepository.createAndAssociate(element);
|
|
40
|
+
}
|
|
41
|
+
catch (e) {
|
|
42
|
+
helpers_1.log.error(e);
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
38
45
|
}
|
|
39
46
|
yield queueprocessors_1.QueueManager.sendMessageToExchange(`${config_1.config.RABBIT_EXCHANGE_NAME}.${vehicle_positions_1.VehiclePositions.name.toLowerCase()}`, "updateRunsGTFSTripId", outputMsg);
|
|
40
47
|
});
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonMessageProcessor.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAA0D;AAE1D,yEAAsE;AACtE,2FAAqF;AACrF,gDAAyE;AAGzE,MAAa,sBAAsB;IAC/B,YAA6B,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;QAEjE;;WAEG;QACI,0BAAqB,GAAG,CAAO,OAAiC,EAAiB,EAAE;YACtF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAE5E,IAAI,SAAmC,CAAC;YACxC,IAAI,MAAM,EAAE;gBACR,IACI,CAAC,OAAO,CAAC,WAAW,CAAC,+BAA+B;oBACpD,CAAC,yCAAiC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAC9E;oBACE,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACxG,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,+BAA+B;wBAAE,OAAO;oBACrF,OAAO,CAAC,WAAW,CAAC,+BAA+B,GAAG,iBAAiB,CAAC,+BAA+B,CAAC;iBAC3G;gBAED,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;aAChF;iBAAM;gBACH,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"CommonMessageProcessor.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/CommonMessageProcessor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAA0D;AAE1D,yEAAsE;AACtE,2EAAoE;AACpE,2FAAqF;AACrF,gDAAyE;AAGzE,MAAa,sBAAsB;IAC/B,YAA6B,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;QAEjE;;WAEG;QACI,0BAAqB,GAAG,CAAO,OAAiC,EAAiB,EAAE;YACtF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAE5E,IAAI,SAAmC,CAAC;YACxC,IAAI,MAAM,EAAE;gBACR,IACI,CAAC,OAAO,CAAC,WAAW,CAAC,+BAA+B;oBACpD,CAAC,yCAAiC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAC9E;oBACE,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,wBAAwB,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACxG,IAAI,CAAC,iBAAiB,IAAI,CAAC,iBAAiB,CAAC,+BAA+B;wBAAE,OAAO;oBACrF,OAAO,CAAC,WAAW,CAAC,+BAA+B,GAAG,iBAAiB,CAAC,+BAA+B,CAAC;iBAC3G;gBAED,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;aAChF;iBAAM;gBACH,IAAI;oBACA,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;iBACrE;gBAAC,OAAO,CAAC,EAAE;oBACR,aAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBACb,OAAO;iBACV;aACJ;YAED,MAAM,8BAAY,CAAC,qBAAqB,CACpC,GAAG,eAAM,CAAC,oBAAoB,IAAI,oCAAgB,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,EACvE,sBAAsB,EACtB,SAAS,CACZ,CAAC;QACN,CAAC,CAAA,CAAC;IAlCkE,CAAC;CAmCxE;AApCD,wDAoCC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { ICommonRunsMessageProperties } from "../interfaces/CommonRunsMessageInterfaces";
|
|
2
|
+
import { ICommonRunHelper, ICommonRunIdentifiers } from "./interfaces/ICommonRunHelper";
|
|
3
|
+
export declare class CommonRunHelper implements ICommonRunHelper {
|
|
4
|
+
private logger;
|
|
5
|
+
constructor();
|
|
6
|
+
/**
|
|
7
|
+
* @returns {ICommonRunIdentifiers | null} commonRunIdentifiers
|
|
8
|
+
* { runId: "123_456_789_2020-01-01T00:00:00Z", routeId: "123", runNumber: "456" }
|
|
9
|
+
*/
|
|
10
|
+
getRunIdentifiers(properties: ICommonRunsMessageProperties, msgTimestamp: string): ICommonRunIdentifiers | null;
|
|
11
|
+
/**
|
|
12
|
+
* @param {string} utcTimestamp - "2022-03-27T12:04:38"
|
|
13
|
+
* @returns {Date | null} dateObject - Date(2022-03-27T12:04:38.000Z)
|
|
14
|
+
*/
|
|
15
|
+
parseDateFromRunInput(utcTimestamp: string): Date | null;
|
|
16
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CommonRunHelper = void 0;
|
|
4
|
+
const Di_1 = require("../../../ioc/Di");
|
|
5
|
+
const ioc_1 = require("@golemio/core/dist/integration-engine/ioc");
|
|
6
|
+
class CommonRunHelper {
|
|
7
|
+
constructor() {
|
|
8
|
+
this.logger = Di_1.VPContainer.resolve(ioc_1.ContainerToken.Logger);
|
|
9
|
+
}
|
|
10
|
+
/**
|
|
11
|
+
* @returns {ICommonRunIdentifiers | null} commonRunIdentifiers
|
|
12
|
+
* { runId: "123_456_789_2020-01-01T00:00:00Z", routeId: "123", runNumber: "456" }
|
|
13
|
+
*/
|
|
14
|
+
getRunIdentifiers(properties, msgTimestamp) {
|
|
15
|
+
const { turnus, evc } = properties;
|
|
16
|
+
let identifiers = null;
|
|
17
|
+
const [routeIdFromTurnus, runNumberFromTurnus] = turnus.split("/");
|
|
18
|
+
if (routeIdFromTurnus && runNumberFromTurnus) {
|
|
19
|
+
identifiers = {
|
|
20
|
+
runId: `${routeIdFromTurnus}_${runNumberFromTurnus}_${evc}_${msgTimestamp}`,
|
|
21
|
+
routeId: routeIdFromTurnus,
|
|
22
|
+
runNumber: runNumberFromTurnus,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
return identifiers;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* @param {string} utcTimestamp - "2022-03-27T12:04:38"
|
|
29
|
+
* @returns {Date | null} dateObject - Date(2022-03-27T12:04:38.000Z)
|
|
30
|
+
*/
|
|
31
|
+
parseDateFromRunInput(utcTimestamp) {
|
|
32
|
+
const date = new Date(utcTimestamp + "Z");
|
|
33
|
+
if (date.toString() === "Invalid Date") {
|
|
34
|
+
this.logger.info(`parseDateFromRunInput: unable to parse date from ${utcTimestamp + "Z"}`);
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
return date;
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
exports.CommonRunHelper = CommonRunHelper;
|
|
41
|
+
//# sourceMappingURL=CommonRunHelper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CommonRunHelper.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/CommonRunHelper.ts"],"names":[],"mappings":";;;AAAA,wCAA2D;AAE3D,mEAA2E;AAI3E,MAAa,eAAe;IAGxB;QACI,IAAI,CAAC,MAAM,GAAG,gBAAW,CAAC,OAAO,CAAU,oBAAc,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACI,iBAAiB,CAAC,UAAwC,EAAE,YAAoB;QACnF,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;QACnC,IAAI,WAAW,GAAiC,IAAI,CAAC;QAErD,MAAM,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnE,IAAI,iBAAiB,IAAI,mBAAmB,EAAE;YAC1C,WAAW,GAAG;gBACV,KAAK,EAAE,GAAG,iBAAiB,IAAI,mBAAmB,IAAI,GAAG,IAAI,YAAY,EAAE;gBAC3E,OAAO,EAAE,iBAAiB;gBAC1B,SAAS,EAAE,mBAAmB;aACjC,CAAC;SACL;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;IAED;;;OAGG;IACI,qBAAqB,CAAC,YAAoB;QAC7C,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,YAAY,GAAG,GAAG,CAAC,CAAC;QAC1C,IAAI,IAAI,CAAC,QAAQ,EAAE,KAAK,cAAc,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oDAAoD,YAAY,GAAG,GAAG,EAAE,CAAC,CAAC;YAC3F,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AAxCD,0CAwCC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { ICommonRunsMessageProperties } from "../../interfaces/CommonRunsMessageInterfaces";
|
|
2
|
+
export interface ICommonRunIdentifiers {
|
|
3
|
+
runId: string;
|
|
4
|
+
routeId: string;
|
|
5
|
+
runNumber: string;
|
|
6
|
+
}
|
|
7
|
+
export interface ICommonRunHelper {
|
|
8
|
+
getRunIdentifiers(properties: ICommonRunsMessageProperties, msgTimestamp: string): ICommonRunIdentifiers | null;
|
|
9
|
+
parseDateFromRunInput(utcTimestamp: string): Date | null;
|
|
10
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ICommonRunHelper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/interfaces/ICommonRunHelper.ts"],"names":[],"mappings":""}
|
|
@@ -3,6 +3,8 @@ import { BaseTransformation, ITransformation } from "@golemio/core/dist/integrat
|
|
|
3
3
|
import { ICommonRunsInputData, ICommonRunsInputElement } from "../interfaces/CommonRunsMessageInterfaces";
|
|
4
4
|
export declare class CommonRunsMessagesTransformation extends BaseTransformation implements ITransformation {
|
|
5
5
|
name: string;
|
|
6
|
+
private readonly commonRunHelper;
|
|
7
|
+
constructor();
|
|
6
8
|
/**
|
|
7
9
|
* Overrides BaseTransformation::transform
|
|
8
10
|
*/
|
|
@@ -16,9 +16,10 @@ exports.CommonRunsMessagesTransformation = void 0;
|
|
|
16
16
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
17
17
|
const transformations_1 = require("@golemio/core/dist/integration-engine/transformations");
|
|
18
18
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
19
|
+
const CommonRunHelper_1 = require("../helpers/CommonRunHelper");
|
|
19
20
|
class CommonRunsMessagesTransformation extends transformations_1.BaseTransformation {
|
|
20
21
|
constructor() {
|
|
21
|
-
super(
|
|
22
|
+
super();
|
|
22
23
|
this.name = "CommonRunsMessagesTransformation";
|
|
23
24
|
/**
|
|
24
25
|
* Overrides BaseTransformation::transform
|
|
@@ -35,25 +36,28 @@ class CommonRunsMessagesTransformation extends transformations_1.BaseTransformat
|
|
|
35
36
|
res.push(elementTransformed);
|
|
36
37
|
}
|
|
37
38
|
catch (err) {
|
|
38
|
-
helpers_1.log.verbose(`${this.name}: run
|
|
39
|
+
helpers_1.log.verbose(`${this.name}: invalid run parameters: ${JSON.stringify(element).substring(0, 2000)}`);
|
|
39
40
|
}
|
|
40
41
|
}
|
|
41
42
|
return res;
|
|
42
43
|
});
|
|
43
44
|
this.transformElement = (element, isTram = false) => __awaiter(this, void 0, void 0, function* () {
|
|
44
45
|
const attributes = element.data.$;
|
|
45
|
-
|
|
46
|
-
const uniqueKey = `${route_id}` + `_${run_number}` + `_${attributes.evc}` + `_${element.timestamp}`;
|
|
47
|
-
if (attributes.takt === "" || attributes.tm === "")
|
|
46
|
+
if (!isTram && !attributes.tjr) {
|
|
48
47
|
return Promise.reject();
|
|
49
|
-
|
|
48
|
+
}
|
|
49
|
+
const identifiers = this.commonRunHelper.getRunIdentifiers(attributes, element.timestamp);
|
|
50
|
+
const realStopTimestampDate = this.commonRunHelper.parseDateFromRunInput(attributes.takt);
|
|
51
|
+
const messageTimestampDate = this.commonRunHelper.parseDateFromRunInput(attributes.tm);
|
|
52
|
+
if (!identifiers || !realStopTimestampDate || !messageTimestampDate) {
|
|
50
53
|
return Promise.reject();
|
|
51
|
-
|
|
54
|
+
}
|
|
55
|
+
const scheduledStopTimestampDate = attributes.tjr ? this.commonRunHelper.parseDateFromRunInput(attributes.tjr) : null;
|
|
52
56
|
return {
|
|
53
57
|
run: {
|
|
54
|
-
id:
|
|
55
|
-
route_id,
|
|
56
|
-
run_number:
|
|
58
|
+
id: identifiers.runId,
|
|
59
|
+
route_id: identifiers.routeId,
|
|
60
|
+
run_number: identifiers.runNumber,
|
|
57
61
|
line_short_name: attributes.line,
|
|
58
62
|
registration_number: attributes.evc,
|
|
59
63
|
msg_start_timestamp: element.timestamp,
|
|
@@ -66,15 +70,16 @@ class CommonRunsMessagesTransformation extends transformations_1.BaseTransformat
|
|
|
66
70
|
lat: +attributes.lat,
|
|
67
71
|
lng: +attributes.lng,
|
|
68
72
|
actual_stop_asw_id: attributes.akt,
|
|
69
|
-
actual_stop_timestamp_real:
|
|
70
|
-
actual_stop_timestamp_scheduled:
|
|
73
|
+
actual_stop_timestamp_real: realStopTimestampDate,
|
|
74
|
+
actual_stop_timestamp_scheduled: scheduledStopTimestampDate,
|
|
71
75
|
last_stop_asw_id: attributes.konc,
|
|
72
76
|
packet_number: attributes.pkt,
|
|
73
|
-
msg_timestamp:
|
|
77
|
+
msg_timestamp: messageTimestampDate,
|
|
74
78
|
events: attributes.events,
|
|
75
79
|
},
|
|
76
80
|
};
|
|
77
81
|
});
|
|
82
|
+
this.commonRunHelper = new CommonRunHelper_1.CommonRunHelper();
|
|
78
83
|
}
|
|
79
84
|
}
|
|
80
85
|
exports.CommonRunsMessagesTransformation = CommonRunsMessagesTransformation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2EAAoE;AACpE,2FAA4G;AAC5G,gGAA+D;
|
|
1
|
+
{"version":3,"file":"CommonRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/CommonRunsMessagesTransformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,7 @@ const config_1 = require("@golemio/core/dist/integration-engine/config");
|
|
|
37
37
|
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
38
38
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
39
39
|
const turf = __importStar(require("@turf/turf"));
|
|
40
|
+
const monitoring_1 = require("@golemio/core/dist/monitoring");
|
|
40
41
|
class DelayComputationManager {
|
|
41
42
|
constructor(gtfsTripsRepository) {
|
|
42
43
|
this.gtfsTripsRepository = gtfsTripsRepository;
|
|
@@ -47,99 +48,97 @@ class DelayComputationManager {
|
|
|
47
48
|
* @returns {IComputationTrip} - Result with shape anchor points
|
|
48
49
|
*/
|
|
49
50
|
this.getComputationObject = (tripId) => __awaiter(this, void 0, void 0, function* () {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
shapePoints[i - 1].bearing = shapePointBearing;
|
|
78
|
-
// for the last shapePoint copy the bearing from last one
|
|
79
|
-
if (shapesGeometryAnchorPoints.length - 1 === i) {
|
|
80
|
-
bearing = shapePoints[i - 1].bearing;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
// init values
|
|
84
|
-
let thisStopSequence = null;
|
|
85
|
-
let lastStopSequence = shapesGeometryAnchorPoints[i].last_stop_sequence;
|
|
86
|
-
let nextStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
|
|
87
|
-
// these are origin stop_times shape point fron shapes table, clearly at stops points
|
|
88
|
-
if (shapesGeometryAnchorPoints[i].this_stop_sequence) {
|
|
89
|
-
thisStopSequence = shapesGeometryAnchorPoints[i].this_stop_sequence;
|
|
90
|
-
}
|
|
91
|
-
// if is shape anchor point in close distance AFTER LAST stop, then set it also AT STOP
|
|
92
|
-
else if (i > 0 &&
|
|
93
|
-
shapesGeometryAnchorPoints[i].shape_dist_traveled -
|
|
94
|
-
stopTimes.stop_times[shapesGeometryAnchorPoints[i].last_stop_sequence - 1].shape_dist_traveled <=
|
|
95
|
-
distanceAfter) {
|
|
96
|
-
thisStopSequence = shapesGeometryAnchorPoints[i].last_stop_sequence;
|
|
51
|
+
const computationObjectSpan = (0, monitoring_1.createChildSpan)("Task.UpdateDelay.GetComputationObject");
|
|
52
|
+
const stopTimes = yield this.gtfsTripsRepository.findByIdWithStopTimes(tripId);
|
|
53
|
+
const shapes = yield this.gtfsTripsRepository.findByIdWithShapes(tripId);
|
|
54
|
+
if (!shapes || !shapes.shape_id || !shapes.shapes || shapes.shapes.length === 0) {
|
|
55
|
+
computationObjectSpan === null || computationObjectSpan === void 0 ? void 0 : computationObjectSpan.end();
|
|
56
|
+
throw new golemio_errors_1.GeneralError(`"trip.shape_id" or "trip.shapes" was not found for id ${tripId}.`);
|
|
57
|
+
}
|
|
58
|
+
if (!stopTimes || !stopTimes.stop_times || stopTimes.stop_times.length === 0) {
|
|
59
|
+
computationObjectSpan === null || computationObjectSpan === void 0 ? void 0 : computationObjectSpan.end();
|
|
60
|
+
throw new golemio_errors_1.GeneralError(`"trip.stop_times" was not found for id ${tripId}.`);
|
|
61
|
+
}
|
|
62
|
+
const shapesGeometryAnchorPoints = this.getShapesGeometryAnchorPoints(stopTimes.shape_id, shapes.shapes, stopTimes.stop_times);
|
|
63
|
+
// MAKING COPY
|
|
64
|
+
const shapePoints = [];
|
|
65
|
+
// const to determine shape points of stops (in meters)
|
|
66
|
+
const distanceBefore = 0.1;
|
|
67
|
+
const distanceAfter = 0.05;
|
|
68
|
+
for (let i = 0; i < shapesGeometryAnchorPoints.length; i++) {
|
|
69
|
+
let bearing = 0;
|
|
70
|
+
// add bearing from shape computed for previous shapePoint
|
|
71
|
+
if (i > 0) {
|
|
72
|
+
// compute bearing from two shape points
|
|
73
|
+
let shapePointBearing = Math.round(turf.bearing(turf.point(shapesGeometryAnchorPoints[i - 1].coordinates), turf.point(shapesGeometryAnchorPoints[i].coordinates)));
|
|
74
|
+
// turf.bearing returns -180 to 180, when 0 is north
|
|
75
|
+
// we need 0 to 359, for negative value we substract from 360
|
|
76
|
+
if (shapePointBearing < 0) {
|
|
77
|
+
shapePointBearing = 360 - Math.abs(shapePointBearing);
|
|
97
78
|
}
|
|
98
|
-
//
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
thisStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
|
|
104
|
-
lastStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
|
|
105
|
-
nextStopSequence = Math.min(shapesGeometryAnchorPoints[i].next_stop_sequence + 1, stopTimes.stop_times.length);
|
|
79
|
+
// save bearing
|
|
80
|
+
shapePoints[i - 1].bearing = shapePointBearing;
|
|
81
|
+
// for the last shapePoint copy the bearing from last one
|
|
82
|
+
if (shapesGeometryAnchorPoints.length - 1 === i) {
|
|
83
|
+
bearing = shapePoints[i - 1].bearing;
|
|
106
84
|
}
|
|
107
|
-
const distanceFromLastStop = Math.round((shapesGeometryAnchorPoints[i].shape_dist_traveled -
|
|
108
|
-
stopTimes.stop_times[lastStopSequence - 1].shape_dist_traveled) *
|
|
109
|
-
1000) / 1000;
|
|
110
|
-
// if is trip at stop than set departure by this stop
|
|
111
|
-
// between stops do linear interpolation from departure from last stop and arrival of next stop
|
|
112
|
-
const timeScheduledSeconds = thisStopSequence !== null
|
|
113
|
-
? stopTimes.stop_times[lastStopSequence - 1].arrival_time_seconds
|
|
114
|
-
: stopTimes.stop_times[lastStopSequence - 1].departure_time_seconds +
|
|
115
|
-
Math.round(((stopTimes.stop_times[nextStopSequence - 1].arrival_time_seconds -
|
|
116
|
-
stopTimes.stop_times[lastStopSequence - 1].departure_time_seconds) *
|
|
117
|
-
distanceFromLastStop) /
|
|
118
|
-
(stopTimes.stop_times[nextStopSequence - 1].shape_dist_traveled -
|
|
119
|
-
stopTimes.stop_times[lastStopSequence - 1].shape_dist_traveled));
|
|
120
|
-
shapePoints.push({
|
|
121
|
-
index: i,
|
|
122
|
-
at_stop: thisStopSequence !== null,
|
|
123
|
-
bearing,
|
|
124
|
-
coordinates: shapesGeometryAnchorPoints[i].coordinates,
|
|
125
|
-
distance_from_last_stop: distanceFromLastStop,
|
|
126
|
-
last_stop_sequence: lastStopSequence,
|
|
127
|
-
next_stop_sequence: nextStopSequence,
|
|
128
|
-
shape_dist_traveled: Math.round(shapesGeometryAnchorPoints[i].shape_dist_traveled * 100000) / 100000,
|
|
129
|
-
this_stop_sequence: thisStopSequence,
|
|
130
|
-
time_scheduled_seconds: timeScheduledSeconds,
|
|
131
|
-
});
|
|
132
85
|
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
86
|
+
// init values
|
|
87
|
+
let thisStopSequence = null;
|
|
88
|
+
let lastStopSequence = shapesGeometryAnchorPoints[i].last_stop_sequence;
|
|
89
|
+
let nextStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
|
|
90
|
+
// these are origin stop_times shape point fron shapes table, clearly at stops points
|
|
91
|
+
if (shapesGeometryAnchorPoints[i].this_stop_sequence) {
|
|
92
|
+
thisStopSequence = shapesGeometryAnchorPoints[i].this_stop_sequence;
|
|
93
|
+
}
|
|
94
|
+
// if is shape anchor point in close distance AFTER LAST stop, then set it also AT STOP
|
|
95
|
+
else if (i > 0 &&
|
|
96
|
+
shapesGeometryAnchorPoints[i].shape_dist_traveled -
|
|
97
|
+
stopTimes.stop_times[shapesGeometryAnchorPoints[i].last_stop_sequence - 1].shape_dist_traveled <=
|
|
98
|
+
distanceAfter) {
|
|
99
|
+
thisStopSequence = shapesGeometryAnchorPoints[i].last_stop_sequence;
|
|
100
|
+
}
|
|
101
|
+
// if is shape anchor point in close distance BEFORE NEXT stop, then set it also AT STOP
|
|
102
|
+
else if (i < shapesGeometryAnchorPoints.length - 1 &&
|
|
103
|
+
stopTimes.stop_times[shapesGeometryAnchorPoints[i].next_stop_sequence - 1].shape_dist_traveled -
|
|
104
|
+
shapesGeometryAnchorPoints[i].shape_dist_traveled <=
|
|
105
|
+
distanceBefore) {
|
|
106
|
+
thisStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
|
|
107
|
+
lastStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
|
|
108
|
+
nextStopSequence = Math.min(shapesGeometryAnchorPoints[i].next_stop_sequence + 1, stopTimes.stop_times.length);
|
|
109
|
+
}
|
|
110
|
+
const distanceFromLastStop = Math.round((shapesGeometryAnchorPoints[i].shape_dist_traveled -
|
|
111
|
+
stopTimes.stop_times[lastStopSequence - 1].shape_dist_traveled) *
|
|
112
|
+
1000) / 1000;
|
|
113
|
+
// if is trip at stop than set departure by this stop
|
|
114
|
+
// between stops do linear interpolation from departure from last stop and arrival of next stop
|
|
115
|
+
const timeScheduledSeconds = thisStopSequence !== null
|
|
116
|
+
? stopTimes.stop_times[lastStopSequence - 1].arrival_time_seconds
|
|
117
|
+
: stopTimes.stop_times[lastStopSequence - 1].departure_time_seconds +
|
|
118
|
+
Math.round(((stopTimes.stop_times[nextStopSequence - 1].arrival_time_seconds -
|
|
119
|
+
stopTimes.stop_times[lastStopSequence - 1].departure_time_seconds) *
|
|
120
|
+
distanceFromLastStop) /
|
|
121
|
+
(stopTimes.stop_times[nextStopSequence - 1].shape_dist_traveled -
|
|
122
|
+
stopTimes.stop_times[lastStopSequence - 1].shape_dist_traveled));
|
|
123
|
+
shapePoints.push({
|
|
124
|
+
index: i,
|
|
125
|
+
at_stop: thisStopSequence !== null,
|
|
126
|
+
bearing,
|
|
127
|
+
coordinates: shapesGeometryAnchorPoints[i].coordinates,
|
|
128
|
+
distance_from_last_stop: distanceFromLastStop,
|
|
129
|
+
last_stop_sequence: lastStopSequence,
|
|
130
|
+
next_stop_sequence: nextStopSequence,
|
|
131
|
+
shape_dist_traveled: Math.round(shapesGeometryAnchorPoints[i].shape_dist_traveled * 100000) / 100000,
|
|
132
|
+
this_stop_sequence: thisStopSequence,
|
|
133
|
+
time_scheduled_seconds: timeScheduledSeconds,
|
|
134
|
+
});
|
|
142
135
|
}
|
|
136
|
+
computationObjectSpan === null || computationObjectSpan === void 0 ? void 0 : computationObjectSpan.end();
|
|
137
|
+
return {
|
|
138
|
+
trip_id: tripId,
|
|
139
|
+
stop_times: stopTimes.stop_times,
|
|
140
|
+
shapes_anchor_points: shapePoints,
|
|
141
|
+
};
|
|
143
142
|
});
|
|
144
143
|
/**
|
|
145
144
|
* Return geometry of anchor points with distance from start along trip track shape
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DelayComputationManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yEAAsE;AACtE,2EAAoE;AACpE,6EAAwE;AACxE,iDAAmC;
|
|
1
|
+
{"version":3,"file":"DelayComputationManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTFSTripCommonRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,8EAA4D;AAC5D,gGAA2E;AAC3E,mDAAyC;AACzC,6EAA+D;AAE/D,6EAA0E;AAG1E,MAAa,wBAAyB,SAAQ,uDAA0B;IACvD,gBAAgB,CAAC,QAAwB,EAAE,KAA+B;;YACnF,MAAM,kBAAkB,GAAG,IAAA,yBAAM,EAAC,KAAK,CAAC,WAAW,CAAC,+BAA+B,CAAC,CAAC;YACrF,MAAM,WAAW,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;YAC5E,IAAI,QAAQ,GAAkB;gBAC1B,YAAY,EAAE,EAAE;gBAChB,SAAS,EAAE,EAAE;gBACb,QAAQ;aACX,CAAC;YAEF,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE;gBACtB,QAAQ,GAAG,MAAM,IAAI,CAAC,+BAA+B,CAAC,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;aAC3G;iBAAM;gBACH,wBAAG,CAAC,OAAO,CAAC,qEAAqE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aAC7G;YAED,8BAA8B;YAC9B,OAAO,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,kBAAkB,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACjH,CAAC;KAAA;IAES,yBAAyB;QAC/B,OAAO;YACH,wBAAwB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAC1C,qFAAqF,EACrF,EAAE,CACK;YACX,sBAAsB,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CACxC,mFAAmF,EACnF,EAAE,CACK;SACd,CAAC;IACN,CAAC;IAEa,+BAA+B,CACzC,QAAuB,EACvB,eAA6B,EAC7B,kBAA0B,EAC1B,KAA+B;;YAE/B,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC;YACrD,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC;YACvC,MAAM,qBAAqB,GAAG,IAAI,CAAC,qBAAqB,CAAC,eAAe,EAAE,KAAK,EAAE,kBAAkB,EAAE,YAAY,CAAC,CAAC;YACnH,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,eAAe,EAAE,qBAAqB,CAAC,CAAC;YAEhG,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,IAAI,CAAC,QAAQ;gBAAE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAErD,OAAO,QAAQ,CAAC;QACpB,CAAC;KAAA;IAEO,qBAAqB,CACzB,eAA6B,EAC7B,KAAmB,EACnB,kBAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"GTFSTripCommonRunManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,7 @@ class PropagateDelayTask extends workers_1.AbstractTask {
|
|
|
92
92
|
return this.isCurrentGtfsTrip(trip, gtfs_trip_id, positionTripWeekDay);
|
|
93
93
|
});
|
|
94
94
|
if (!gtfsCurrentTrip) {
|
|
95
|
-
helpers_1.log.
|
|
95
|
+
helpers_1.log.info(`${this.queueName}: could not determine GTFS trip from run trips data: ` +
|
|
96
96
|
JSON.stringify(delayedPositions.trip).substring(0, 2000));
|
|
97
97
|
continue;
|
|
98
98
|
}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js
CHANGED
|
@@ -27,6 +27,7 @@ const PositionsManager_1 = __importDefault(require("../helpers/PositionsManager"
|
|
|
27
27
|
const TripStopsManager_1 = require("../helpers/TripStopsManager");
|
|
28
28
|
const VPUtils_1 = require("../helpers/VPUtils");
|
|
29
29
|
const UpdateDelaySchema_1 = require("../schema/UpdateDelaySchema");
|
|
30
|
+
const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
|
|
30
31
|
class UpdateDelayTask extends workers_1.AbstractTask {
|
|
31
32
|
constructor(queuePrefix) {
|
|
32
33
|
super(queuePrefix);
|
|
@@ -40,17 +41,26 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
40
41
|
* @returns {Object[]} - Arrays of inserted/updated positions and array of (inserted)/updated trips
|
|
41
42
|
*/
|
|
42
43
|
this.updateComputedPositionsAndTrips = (computedResult) => __awaiter(this, void 0, void 0, function* () {
|
|
43
|
-
const
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
44
|
+
const updateSpan = (0, trace_provider_1.createChildSpan)("Task.UpdateDelay.UpdateComputedPositionsAndTrips");
|
|
45
|
+
updateSpan === null || updateSpan === void 0 ? void 0 : updateSpan.setAttribute("updateComputedTrips", computedResult.length);
|
|
46
|
+
try {
|
|
47
|
+
const positions = computedResult.flatMap((e) => e.positions);
|
|
48
|
+
updateSpan === null || updateSpan === void 0 ? void 0 : updateSpan.setAttribute("updateComputedPositions", positions.length);
|
|
49
|
+
const positionsUpdated = yield this.positionsRepository.bulkUpdate(positions);
|
|
50
|
+
const tripsUpdated = yield this.tripsRepository.bulkUpdate(computedResult.map((e) => ({
|
|
51
|
+
id: e.context.tripId,
|
|
52
|
+
last_position_id: e.context.lastPositionId,
|
|
53
|
+
last_position_context: e.context,
|
|
54
|
+
is_canceled: e.context.lastPositionCanceled,
|
|
55
|
+
})));
|
|
56
|
+
return {
|
|
57
|
+
positionsUpdated,
|
|
58
|
+
tripsUpdated,
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
finally {
|
|
62
|
+
updateSpan === null || updateSpan === void 0 ? void 0 : updateSpan.end();
|
|
63
|
+
}
|
|
54
64
|
});
|
|
55
65
|
this.tripsRepository = new TripsRepository_1.TripsRepository();
|
|
56
66
|
this.positionsRepository = new PositionsRepository_1.PositionsRepository();
|
|
@@ -66,73 +76,82 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
66
76
|
return __awaiter(this, void 0, void 0, function* () {
|
|
67
77
|
const tripIds = data.updatedTrips.map((trip) => trip.id);
|
|
68
78
|
if (((_a = data.positions) === null || _a === void 0 ? void 0 : _a.length) > 0) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
// unique block_ids and its parent gtfs_trip_id in key-value structure
|
|
77
|
-
let blockIdToTripIdsDict = {};
|
|
78
|
-
for (const trip of data.updatedTrips) {
|
|
79
|
-
if (!trip.gtfs_block_id) {
|
|
80
|
-
continue;
|
|
81
|
-
}
|
|
82
|
-
if (!tripsIdsByBlockIds[trip.gtfs_block_id]) {
|
|
83
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] = trip.id;
|
|
84
|
-
}
|
|
85
|
-
else {
|
|
86
|
-
// save only the shorter trip_id (it is the raw input id with no suffixes)
|
|
87
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] =
|
|
88
|
-
tripsIdsByBlockIds[trip.gtfs_block_id] > trip.id ? trip.id : tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
89
|
-
}
|
|
90
|
-
if (!blockIdToTripIdsDict[trip.gtfs_block_id]) {
|
|
91
|
-
blockIdToTripIdsDict[trip.gtfs_block_id] = new Set();
|
|
92
|
-
}
|
|
93
|
-
if (trip.gtfs_trip_id) {
|
|
94
|
-
blockIdToTripIdsDict[trip.gtfs_block_id].add(trip.gtfs_trip_id);
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
// Get cached schedule for each unique block_id
|
|
98
|
-
const blockIdToTripStopScheduleDict = yield Object.entries(blockIdToTripIdsDict).reduce((acc, [blockId, gtfsTripIds]) => __awaiter(this, void 0, void 0, function* () {
|
|
99
|
-
const tripStops = yield acc;
|
|
100
|
-
try {
|
|
101
|
-
const schedule = yield this.tripStopsManager.setAndReturnTripStopsSchedule(blockId, [...gtfsTripIds]);
|
|
102
|
-
tripStops[blockId] = schedule;
|
|
103
|
-
}
|
|
104
|
-
catch (err) {
|
|
105
|
-
helpers_1.IntegrationErrorHandler.handle(err);
|
|
79
|
+
const positionSpan = (0, trace_provider_1.createChildSpan)("Task.UpdateDelay.positions");
|
|
80
|
+
positionSpan === null || positionSpan === void 0 ? void 0 : positionSpan.setAttribute("positions", data.positions.length);
|
|
81
|
+
try {
|
|
82
|
+
// unique ids in input data in key-value (id-positions) structure
|
|
83
|
+
let tripIdToPositionDict = {};
|
|
84
|
+
for (const position of data.positions) {
|
|
85
|
+
tripIdToPositionDict[position.trips_id] = position;
|
|
106
86
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
if (trip.gtfs_block_id) {
|
|
113
|
-
|
|
114
|
-
|
|
87
|
+
// unique block_ids and its parent input trips_id in key-value structure
|
|
88
|
+
let tripsIdsByBlockIds = {};
|
|
89
|
+
// unique block_ids and its parent gtfs_trip_id in key-value structure
|
|
90
|
+
let blockIdToTripIdsDict = {};
|
|
91
|
+
for (const trip of data.updatedTrips) {
|
|
92
|
+
if (!trip.gtfs_block_id) {
|
|
93
|
+
continue;
|
|
94
|
+
}
|
|
95
|
+
if (!tripsIdsByBlockIds[trip.gtfs_block_id]) {
|
|
96
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] = trip.id;
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
// save only the shorter trip_id (it is the raw input id with no suffixes)
|
|
100
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] =
|
|
101
|
+
tripsIdsByBlockIds[trip.gtfs_block_id] > trip.id ? trip.id : tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
102
|
+
}
|
|
103
|
+
if (!blockIdToTripIdsDict[trip.gtfs_block_id]) {
|
|
104
|
+
blockIdToTripIdsDict[trip.gtfs_block_id] = new Set();
|
|
105
|
+
}
|
|
106
|
+
if (trip.gtfs_trip_id) {
|
|
107
|
+
blockIdToTripIdsDict[trip.gtfs_block_id].add(trip.gtfs_trip_id);
|
|
115
108
|
}
|
|
116
|
-
continue;
|
|
117
109
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
110
|
+
// Get cached schedule for each unique block_id
|
|
111
|
+
const blockIdToTripStopScheduleDict = yield Object.entries(blockIdToTripIdsDict).reduce((acc, [blockId, gtfsTripIds]) => __awaiter(this, void 0, void 0, function* () {
|
|
112
|
+
const tripStops = yield acc;
|
|
113
|
+
try {
|
|
114
|
+
const schedule = yield this.tripStopsManager.setAndReturnTripStopsSchedule(blockId, [...gtfsTripIds]);
|
|
115
|
+
tripStops[blockId] = schedule;
|
|
116
|
+
}
|
|
117
|
+
catch (err) {
|
|
118
|
+
helpers_1.IntegrationErrorHandler.handle(err);
|
|
119
|
+
}
|
|
120
|
+
return acc;
|
|
121
|
+
}), Promise.resolve({}));
|
|
122
|
+
// duplicate positions for trips with block_ids
|
|
123
|
+
for (const trip of data.updatedTrips) {
|
|
124
|
+
if (tripIdToPositionDict[trip.id]) {
|
|
125
|
+
if (trip.gtfs_block_id) {
|
|
126
|
+
// Determine current position tracking status
|
|
127
|
+
tripIdToPositionDict[trip.id].tracking = VPUtils_1.VPUtils.determineTrackingStatus(trip.gtfs_trip_id, blockIdToTripStopScheduleDict[trip.gtfs_block_id], tripIdToPositionDict[trip.id]);
|
|
128
|
+
}
|
|
129
|
+
continue;
|
|
130
|
+
}
|
|
131
|
+
const currentPosition = data.positions.find((position) => {
|
|
132
|
+
return position.trips_id === tripsIdsByBlockIds[trip.gtfs_block_id];
|
|
133
|
+
});
|
|
134
|
+
if (!currentPosition) {
|
|
135
|
+
continue;
|
|
136
|
+
}
|
|
137
|
+
// Determine position duplication and new position tracking status
|
|
138
|
+
const newPositionTrackingStatus = VPUtils_1.VPUtils.determineNewPositionTracking(blockIdToTripStopScheduleDict[trip.gtfs_block_id], trip, currentPosition);
|
|
139
|
+
// duplicate position with new created trip for second trip
|
|
140
|
+
const newPosition = Object.assign({}, currentPosition);
|
|
141
|
+
newPosition.trips_id = trip.id;
|
|
142
|
+
newPosition.tracking = newPositionTrackingStatus;
|
|
143
|
+
data.positions.push(newPosition);
|
|
123
144
|
}
|
|
124
|
-
//
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
newPosition.tracking = newPositionTrackingStatus;
|
|
130
|
-
data.positions.push(newPosition);
|
|
145
|
+
// save all new positions
|
|
146
|
+
yield this.positionsRepository.save(data.positions);
|
|
147
|
+
}
|
|
148
|
+
finally {
|
|
149
|
+
positionSpan === null || positionSpan === void 0 ? void 0 : positionSpan.end();
|
|
131
150
|
}
|
|
132
|
-
// save all new positions
|
|
133
|
-
yield this.positionsRepository.save(data.positions);
|
|
134
151
|
}
|
|
135
152
|
if (((_b = data.updatedTrips) === null || _b === void 0 ? void 0 : _b.length) > 0) {
|
|
153
|
+
const tripsSpan = (0, trace_provider_1.createChildSpan)("Task.UpdateDelay.updatedTrips");
|
|
154
|
+
tripsSpan === null || tripsSpan === void 0 ? void 0 : tripsSpan.setAttribute("updatedTrips", data.updatedTrips.length);
|
|
136
155
|
try {
|
|
137
156
|
// Get all positions for each trip
|
|
138
157
|
const tripsPositionsToUpdate = yield this.positionsRepository.getPositionsForUpdateDelay(tripIds);
|
|
@@ -152,7 +171,12 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
152
171
|
trip.gtfsData = gtfsComputationData;
|
|
153
172
|
}
|
|
154
173
|
catch (err) {
|
|
155
|
-
|
|
174
|
+
if (err instanceof golemio_errors_1.GeneralError) {
|
|
175
|
+
helpers_1.log.warn(err);
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
helpers_1.log.error(new golemio_errors_1.GeneralError("Error while getting delay computation data for trip " + trip.gtfs_trip_id, this.constructor.name, err));
|
|
179
|
+
}
|
|
156
180
|
return;
|
|
157
181
|
}
|
|
158
182
|
}
|
|
@@ -168,6 +192,9 @@ class UpdateDelayTask extends workers_1.AbstractTask {
|
|
|
168
192
|
catch (err) {
|
|
169
193
|
throw new golemio_errors_1.GeneralError(`Error while updating delay. For trip ids:${tripIds.slice(0, 10).join(",")}`, this.constructor.name, err);
|
|
170
194
|
}
|
|
195
|
+
finally {
|
|
196
|
+
tripsSpan === null || tripsSpan === void 0 ? void 0 : tripsSpan.end();
|
|
197
|
+
}
|
|
171
198
|
}
|
|
172
199
|
});
|
|
173
200
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UpdateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4FAAiF;AACjF,oFAAyE;AACzE,oEAA8G;AAC9G,2EAA6F;AAC7F,2FAAqF;AACrF,2EAA6E;AAC7E,6EAAwE;AACxE,4EAAyF;AACzF,oEAAiE;AACjE,gFAA6E;AAC7E,mFAA2D;AAC3D,kEAA+D;AAC/D,gDAA6C;AAU7C,mEAA0E;
|
|
1
|
+
{"version":3,"file":"UpdateDelayTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export declare class CommonRunsMessagesModel extends Model<CommonRunsMessagesMod
|
|
|
13
13
|
actual_stop_timestamp_scheduled?: Date;
|
|
14
14
|
last_stop_asw_id: string;
|
|
15
15
|
packet_number: string;
|
|
16
|
-
msg_timestamp:
|
|
16
|
+
msg_timestamp: Date;
|
|
17
17
|
events: TCPEventEnum;
|
|
18
18
|
static attributeModel: ModelAttributes<CommonRunsMessagesModel>;
|
|
19
19
|
static arrayJsonSchema: JSONSchemaType<ICommonRunsMessagesModel[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CommonRunsMessagesModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAIxF,MAAa,uBAAwB,SAAQ,iBAA8B;;AAA3E,
|
|
1
|
+
{"version":3,"file":"CommonRunsMessagesModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/CommonRunsMessagesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AAIxF,MAAa,uBAAwB,SAAQ,iBAA8B;;AAA3E,0DAmFC;AAlFiB,kCAAU,GAAG,gCAAgC,CAAC;AAc9C,sCAAc,GAA6C;IACrE,EAAE,EAAE;QACA,UAAU,EAAE,IAAI;QAChB,IAAI,EAAE,qBAAS,CAAC,MAAM;QACtB,aAAa,EAAE,IAAI;KACtB;IACD,OAAO,EAAE,qBAAS,CAAC,MAAM;IACzB,GAAG,EAAE,qBAAS,CAAC,OAAO;IACtB,GAAG,EAAE,qBAAS,CAAC,OAAO;IACtB,kBAAkB,EAAE,qBAAS,CAAC,MAAM;IACpC,0BAA0B,EAAE,qBAAS,CAAC,IAAI;IAC1C,+BAA+B,EAAE,qBAAS,CAAC,IAAI;IAC/C,gBAAgB,EAAE,qBAAS,CAAC,MAAM;IAClC,aAAa,EAAE,qBAAS,CAAC,MAAM;IAC/B,aAAa,EAAE,qBAAS,CAAC,IAAI;IAC7B,MAAM,EAAE,qBAAS,CAAC,MAAM;CAC3B,CAAC;AAEY,uCAAe,GAA+C;IACxE,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,EAAE,EAAE;gBACA,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE,IAAI;aACjB;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACjB;YACD,GAAG,EAAE;gBACD,IAAI,EAAE,QAAQ;aACjB;YACD,GAAG,EAAE;gBACD,IAAI,EAAE,QAAQ;aACjB;YACD,kBAAkB,EAAE;gBAChB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACjB;YACD,0BAA0B,EAAE;gBACxB,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;YACD,+BAA+B,EAAE;gBAC7B,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;gBACzB,QAAQ,EAAE,IAAI;aACjB;YACD,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACjB;YACD,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;aACjB;YACD,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,CAAC,aAAa,CAAC;aAC5B;YACD,MAAM,EAAE;gBACJ,IAAI,EAAE,QAAQ;aACjB;SACJ;QACD,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,4BAA4B,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,CAAC;KACrG;CACJ,CAAC"}
|
package/dist/schema-definitions/vehicle-positions/models/interfaces/ICommonRunsMessagesModel.d.ts
CHANGED
|
@@ -6,9 +6,9 @@ export interface ICommonRunsMessagesModel {
|
|
|
6
6
|
lng: number;
|
|
7
7
|
actual_stop_asw_id?: string;
|
|
8
8
|
actual_stop_timestamp_real: Date;
|
|
9
|
-
actual_stop_timestamp_scheduled?: Date;
|
|
9
|
+
actual_stop_timestamp_scheduled?: Date | null;
|
|
10
10
|
last_stop_asw_id?: string;
|
|
11
11
|
packet_number: string;
|
|
12
|
-
msg_timestamp:
|
|
12
|
+
msg_timestamp: Date;
|
|
13
13
|
events: TCPEventEnum;
|
|
14
14
|
}
|