@golemio/pid 2.9.1-dev.995838980 → 2.9.1-dev.996165718
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/transformations/RegionalBusRunsMessagesTransformation.js +3 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/transformations/RegionalBusRunsMessagesTransformation.js.map +1 -1
- package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js +1 -4
- package/dist/output-gateway/pid/models/PIDDepartureBoardsModel.js.map +1 -1
- package/package.json +1 -1
|
@@ -7,19 +7,18 @@ class RegionalBusRunsMessagesTransformation extends AbstractTransformation_1.Abs
|
|
|
7
7
|
super(...arguments);
|
|
8
8
|
this.name = "RegionalBusRunsMessagesTransformation";
|
|
9
9
|
this.transformInternal = (data) => {
|
|
10
|
-
var _a, _b;
|
|
11
10
|
const messageData = data.$;
|
|
12
11
|
return {
|
|
13
12
|
external_trip_id: messageData.imei,
|
|
14
|
-
cis_route_id:
|
|
15
|
-
cis_trip_id:
|
|
13
|
+
cis_route_id: messageData.line && messageData.line !== "0" ? messageData.line : null,
|
|
14
|
+
cis_trip_id: messageData.conn && messageData.conn !== "0" ? messageData.conn : null,
|
|
16
15
|
events: messageData.events,
|
|
17
16
|
coordinates: {
|
|
18
17
|
type: "Point",
|
|
19
18
|
coordinates: [Number.parseFloat(messageData.lng), Number.parseFloat(messageData.lat)],
|
|
20
19
|
},
|
|
21
20
|
vehicle_timestamp: new Date(messageData.tm + "Z"),
|
|
22
|
-
registration_number: messageData.evc ? Number.parseInt(messageData.evc) : null,
|
|
21
|
+
registration_number: messageData.evc && messageData.evc !== "0" ? Number.parseInt(messageData.evc) : null,
|
|
23
22
|
speed_kmh: Number.parseInt(messageData.rych),
|
|
24
23
|
bearing: Number.parseInt(messageData.smer),
|
|
25
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegionalBusRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/RegionalBusRunsMessagesTransformation.ts"],"names":[],"mappings":";;;AACA,6GAA0G;AAM1G,MAAa,qCAAsC,SAAQ,+CAAiD;IAA5G;;QACW,SAAI,GAAG,uCAAuC,CAAC;QAE5C,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE
|
|
1
|
+
{"version":3,"file":"RegionalBusRunsMessagesTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/transformations/RegionalBusRunsMessagesTransformation.ts"],"names":[],"mappings":";;;AACA,6GAA0G;AAM1G,MAAa,qCAAsC,SAAQ,+CAAiD;IAA5G;;QACW,SAAI,GAAG,uCAAuC,CAAC;QAE5C,sBAAiB,GAAG,CAAC,IAAiB,EAAgB,EAAE;YAC9D,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC;YAE3B,OAAO;gBACH,gBAAgB,EAAE,WAAW,CAAC,IAAI;gBAClC,YAAY,EAAE,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;gBACpF,WAAW,EAAE,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;gBACnF,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,WAAW,EAAE;oBACT,IAAI,EAAE,OAAO;oBACb,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;iBACxF;gBACD,iBAAiB,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,EAAE,GAAG,GAAG,CAAC;gBACjD,mBAAmB,EAAE,WAAW,CAAC,GAAG,IAAI,WAAW,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI;gBACzG,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC5C,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC;aAC7C,CAAC;QACN,CAAC,CAAC;IACN,CAAC;CAAA;AArBD,sFAqBC"}
|
|
@@ -17,7 +17,6 @@ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
|
17
17
|
const moment_timezone_1 = __importDefault(require("@golemio/core/dist/shared/moment-timezone"));
|
|
18
18
|
const models_1 = require("../../ropid-gtfs/models");
|
|
19
19
|
const _1 = require(".");
|
|
20
|
-
const __1 = require("..");
|
|
21
20
|
const data_access_1 = require("../data-access");
|
|
22
21
|
const trace_provider_1 = require("@golemio/core/dist/monitoring/opentelemetry/trace-provider");
|
|
23
22
|
const PIDDepartureModel_1 = __importDefault(require("./helpers/PIDDepartureModel"));
|
|
@@ -32,8 +31,6 @@ class PIDDepartureBoardsModel {
|
|
|
32
31
|
var _a, _b;
|
|
33
32
|
const currentMoment = (0, moment_timezone_1.default)();
|
|
34
33
|
const minutesOffset = options.timeFrom ? options.timeFrom.diff(currentMoment, "minutes") : 0;
|
|
35
|
-
// Combination of ?minutesBefore > 0 and ?skip=atStop is not supported, fall back to 0
|
|
36
|
-
const minutesBefore = options.skip.includes(__1.DepartureSkip.AT_STOP) && options.minutesBefore > 0 ? 0 : options.minutesBefore;
|
|
37
34
|
const spanStops = (0, trace_provider_1.createChildSpan)("PIDRouter.DB.stops");
|
|
38
35
|
spanStops === null || spanStops === void 0 ? void 0 : spanStops.setAttributes(Object.assign(Object.assign({}, options), { timeFrom: (_a = options.timeFrom) === null || _a === void 0 ? void 0 : _a.toString() }));
|
|
39
36
|
const stopsToInclude = yield models_1.models.GTFSStopModel.GetAll({
|
|
@@ -77,7 +74,7 @@ class PIDDepartureBoardsModel {
|
|
|
77
74
|
const results = yield this.departuresRepository.GetAll({
|
|
78
75
|
currentMoment,
|
|
79
76
|
minutesAfter: options.minutesAfter,
|
|
80
|
-
minutesBefore,
|
|
77
|
+
minutesBefore: options.minutesBefore,
|
|
81
78
|
minutesOffset,
|
|
82
79
|
stopsIds,
|
|
83
80
|
mode: options.mode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6EAAwE;AACxE,gGAA2E;AAC3E,oDAA+C;AAC/C,wBAA8E;
|
|
1
|
+
{"version":3,"file":"PIDDepartureBoardsModel.js","sourceRoot":"","sources":["../../../../src/output-gateway/pid/models/PIDDepartureBoardsModel.ts"],"names":[],"mappings":"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"}
|