@golemio/pid 2.2.5-dev.550917067 → 2.2.6-dev.553203229
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/gtfsrt-alerts/transformations/GtfsEffectMapper.d.ts +4 -0
- package/dist/integration-engine/gtfsrt-alerts/transformations/GtfsEffectMapper.js +28 -31
- package/dist/integration-engine/gtfsrt-alerts/transformations/GtfsEffectMapper.js.map +1 -1
- package/dist/integration-engine/gtfsrt-alerts/transformations/GtfsRtAlertTransformation.js +2 -1
- package/dist/integration-engine/gtfsrt-alerts/transformations/GtfsRtAlertTransformation.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/VehiclePositionsUtils.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/VehiclePositionsUtils.js +7 -6
- package/dist/integration-engine/vehicle-positions/VehiclePositionsUtils.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,2 +1,6 @@
|
|
|
1
1
|
import { GtfsEffect } from "../../../schema-definitions/gtfsrt-alerts/GtfsRtAlert";
|
|
2
|
+
/**
|
|
3
|
+
* Mapuje eventType na dopravní efekt. EventType může být i součet několika čísel RopidVyMiEventType.
|
|
4
|
+
* @param eventType number
|
|
5
|
+
*/
|
|
2
6
|
export declare function getGtfsEffectByEventType(eventType: number): GtfsEffect;
|
|
@@ -18,39 +18,36 @@ const RopidVyMiEventType = {
|
|
|
18
18
|
EFF_NEOBSLOUZENI_ZASTAVKY: 1 << 21,
|
|
19
19
|
EFF_NAHRADNI_DOPRAVA: 1 << 23,
|
|
20
20
|
};
|
|
21
|
+
/**
|
|
22
|
+
* Mapuje eventType na dopravní efekt. EventType může být i součet několika čísel RopidVyMiEventType.
|
|
23
|
+
* @param eventType number
|
|
24
|
+
*/
|
|
21
25
|
function getGtfsEffectByEventType(eventType) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
return GtfsRtAlert_1.GtfsEffect.REDUCED_SERVICE;
|
|
25
|
-
case RopidVyMiEventType.EFF_PROVOZ_OMEZEN:
|
|
26
|
-
return GtfsRtAlert_1.GtfsEffect.REDUCED_SERVICE;
|
|
27
|
-
case RopidVyMiEventType.EFF_PROVOZ_OBNOVEN:
|
|
28
|
-
return GtfsRtAlert_1.GtfsEffect.OTHER_EFFECT;
|
|
29
|
-
case RopidVyMiEventType.EFF_NEODJETI_SPOJE:
|
|
30
|
-
return GtfsRtAlert_1.GtfsEffect.REDUCED_SERVICE;
|
|
31
|
-
case RopidVyMiEventType.EFF_ZPOZDENI_SPOJE:
|
|
32
|
-
return GtfsRtAlert_1.GtfsEffect.REDUCED_SERVICE;
|
|
33
|
-
case RopidVyMiEventType.EFF_ZPOZDENI_SPOJU:
|
|
34
|
-
return GtfsRtAlert_1.GtfsEffect.REDUCED_SERVICE;
|
|
35
|
-
case RopidVyMiEventType.EFF_STANICE_UZAVRENA:
|
|
36
|
-
return GtfsRtAlert_1.GtfsEffect.NO_SERVICE;
|
|
37
|
-
case RopidVyMiEventType.EFF_PRISTUP_OMEZEN:
|
|
38
|
-
return GtfsRtAlert_1.GtfsEffect.OTHER_EFFECT;
|
|
39
|
-
case RopidVyMiEventType.EFF_POSILENI_SPOJU:
|
|
40
|
-
return GtfsRtAlert_1.GtfsEffect.ADDITIONAL_SERVICE;
|
|
41
|
-
case RopidVyMiEventType.EFF_ROZVAZANI_PRESTUP:
|
|
42
|
-
return GtfsRtAlert_1.GtfsEffect.MODIFIED_SERVICE;
|
|
43
|
-
case RopidVyMiEventType.EFF_OSTATNI:
|
|
44
|
-
return GtfsRtAlert_1.GtfsEffect.OTHER_EFFECT;
|
|
45
|
-
case RopidVyMiEventType.EFF_ODKLON:
|
|
46
|
-
return GtfsRtAlert_1.GtfsEffect.DETOUR;
|
|
47
|
-
case RopidVyMiEventType.EFF_NEOBSLOUZENI_ZASTAVKY:
|
|
48
|
-
return GtfsRtAlert_1.GtfsEffect.NO_SERVICE;
|
|
49
|
-
case RopidVyMiEventType.EFF_NAHRADNI_DOPRAVA:
|
|
50
|
-
return GtfsRtAlert_1.GtfsEffect.MODIFIED_SERVICE;
|
|
51
|
-
default:
|
|
52
|
-
return GtfsRtAlert_1.GtfsEffect.UNKNOWN_EFFECT;
|
|
26
|
+
if (eventType & RopidVyMiEventType.EFF_ODKLON || eventType & RopidVyMiEventType.EFF_NEOBSLOUZENI_ZASTAVKY) {
|
|
27
|
+
return GtfsRtAlert_1.GtfsEffect.DETOUR;
|
|
53
28
|
}
|
|
29
|
+
if (eventType & RopidVyMiEventType.EFF_PROVOZ_ZASTAVEN ||
|
|
30
|
+
eventType & RopidVyMiEventType.EFF_PROVOZ_OMEZEN ||
|
|
31
|
+
eventType & RopidVyMiEventType.EFF_ZPOZDENI_SPOJE ||
|
|
32
|
+
eventType & RopidVyMiEventType.EFF_NEODJETI_SPOJE ||
|
|
33
|
+
eventType & RopidVyMiEventType.EFF_ZPOZDENI_SPOJU) {
|
|
34
|
+
return GtfsRtAlert_1.GtfsEffect.REDUCED_SERVICE;
|
|
35
|
+
}
|
|
36
|
+
if (eventType & RopidVyMiEventType.EFF_ROZVAZANI_PRESTUP || eventType & RopidVyMiEventType.EFF_NAHRADNI_DOPRAVA) {
|
|
37
|
+
return GtfsRtAlert_1.GtfsEffect.MODIFIED_SERVICE;
|
|
38
|
+
}
|
|
39
|
+
if (eventType & RopidVyMiEventType.EFF_POSILENI_SPOJU) {
|
|
40
|
+
return GtfsRtAlert_1.GtfsEffect.ADDITIONAL_SERVICE;
|
|
41
|
+
}
|
|
42
|
+
if (eventType & RopidVyMiEventType.EFF_OSTATNI ||
|
|
43
|
+
eventType & RopidVyMiEventType.EFF_PROVOZ_OBNOVEN ||
|
|
44
|
+
eventType & RopidVyMiEventType.EFF_PRISTUP_OMEZEN) {
|
|
45
|
+
return GtfsRtAlert_1.GtfsEffect.OTHER_EFFECT;
|
|
46
|
+
}
|
|
47
|
+
if (eventType & RopidVyMiEventType.EFF_STANICE_UZAVRENA) {
|
|
48
|
+
return GtfsRtAlert_1.GtfsEffect.NO_SERVICE;
|
|
49
|
+
}
|
|
50
|
+
return GtfsRtAlert_1.GtfsEffect.UNKNOWN_EFFECT;
|
|
54
51
|
}
|
|
55
52
|
exports.getGtfsEffectByEventType = getGtfsEffectByEventType;
|
|
56
53
|
//# sourceMappingURL=GtfsEffectMapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GtfsEffectMapper.js","sourceRoot":"","sources":["../../../../src/integration-engine/gtfsrt-alerts/transformations/GtfsEffectMapper.ts"],"names":[],"mappings":";;;AAAA,uFAA4D;AAE5D,MAAM,kBAAkB,GAAG;IACvB,mBAAmB,EAAE,CAAC,IAAI,CAAC;IAC3B,iBAAiB,EAAE,CAAC,IAAI,CAAC;IACzB,kBAAkB,EAAE,CAAC,IAAI,CAAC;IAC1B,kBAAkB,EAAE,CAAC,IAAI,CAAC;IAC1B,kBAAkB,EAAE,CAAC,IAAI,EAAE;IAC3B,kBAAkB,EAAE,CAAC,IAAI,EAAE;IAC3B,oBAAoB,EAAE,CAAC,IAAI,EAAE;IAC7B,kBAAkB,EAAE,CAAC,IAAI,EAAE;IAC3B,kBAAkB,EAAE,CAAC,IAAI,EAAE;IAC3B,qBAAqB,EAAE,CAAC,IAAI,EAAE;IAC9B,WAAW,EAAE,CAAC,IAAI,EAAE;IACpB,UAAU,EAAE,CAAC,IAAI,EAAE;IACnB,yBAAyB,EAAE,CAAC,IAAI,EAAE;IAClC,oBAAoB,EAAE,CAAC,IAAI,EAAE;CAChC,CAAC;AAEF,SAAgB,wBAAwB,CAAC,SAAiB;IACtD,
|
|
1
|
+
{"version":3,"file":"GtfsEffectMapper.js","sourceRoot":"","sources":["../../../../src/integration-engine/gtfsrt-alerts/transformations/GtfsEffectMapper.ts"],"names":[],"mappings":";;;AAAA,uFAA4D;AAE5D,MAAM,kBAAkB,GAAG;IACvB,mBAAmB,EAAE,CAAC,IAAI,CAAC;IAC3B,iBAAiB,EAAE,CAAC,IAAI,CAAC;IACzB,kBAAkB,EAAE,CAAC,IAAI,CAAC;IAC1B,kBAAkB,EAAE,CAAC,IAAI,CAAC;IAC1B,kBAAkB,EAAE,CAAC,IAAI,EAAE;IAC3B,kBAAkB,EAAE,CAAC,IAAI,EAAE;IAC3B,oBAAoB,EAAE,CAAC,IAAI,EAAE;IAC7B,kBAAkB,EAAE,CAAC,IAAI,EAAE;IAC3B,kBAAkB,EAAE,CAAC,IAAI,EAAE;IAC3B,qBAAqB,EAAE,CAAC,IAAI,EAAE;IAC9B,WAAW,EAAE,CAAC,IAAI,EAAE;IACpB,UAAU,EAAE,CAAC,IAAI,EAAE;IACnB,yBAAyB,EAAE,CAAC,IAAI,EAAE;IAClC,oBAAoB,EAAE,CAAC,IAAI,EAAE;CAChC,CAAC;AAEF;;;GAGG;AACH,SAAgB,wBAAwB,CAAC,SAAiB;IACtD,IAAI,SAAS,GAAG,kBAAkB,CAAC,UAAU,IAAI,SAAS,GAAG,kBAAkB,CAAC,yBAAyB,EAAE;QACvG,OAAO,wBAAU,CAAC,MAAM,CAAC;KAC5B;IAED,IACI,SAAS,GAAG,kBAAkB,CAAC,mBAAmB;QAClD,SAAS,GAAG,kBAAkB,CAAC,iBAAiB;QAChD,SAAS,GAAG,kBAAkB,CAAC,kBAAkB;QACjD,SAAS,GAAG,kBAAkB,CAAC,kBAAkB;QACjD,SAAS,GAAG,kBAAkB,CAAC,kBAAkB,EACnD;QACE,OAAO,wBAAU,CAAC,eAAe,CAAC;KACrC;IACD,IAAI,SAAS,GAAG,kBAAkB,CAAC,qBAAqB,IAAI,SAAS,GAAG,kBAAkB,CAAC,oBAAoB,EAAE;QAC7G,OAAO,wBAAU,CAAC,gBAAgB,CAAC;KACtC;IAED,IAAI,SAAS,GAAG,kBAAkB,CAAC,kBAAkB,EAAE;QACnD,OAAO,wBAAU,CAAC,kBAAkB,CAAC;KACxC;IAED,IACI,SAAS,GAAG,kBAAkB,CAAC,WAAW;QAC1C,SAAS,GAAG,kBAAkB,CAAC,kBAAkB;QACjD,SAAS,GAAG,kBAAkB,CAAC,kBAAkB,EACnD;QACE,OAAO,wBAAU,CAAC,YAAY,CAAC;KAClC;IAED,IAAI,SAAS,GAAG,kBAAkB,CAAC,oBAAoB,EAAE;QACrD,OAAO,wBAAU,CAAC,UAAU,CAAC;KAChC;IAED,OAAO,wBAAU,CAAC,cAAc,CAAC;AACrC,CAAC;AAnCD,4DAmCC"}
|
|
@@ -83,12 +83,13 @@ class GtfsRtAlertTransformation extends transformations_1.BaseTransformation {
|
|
|
83
83
|
this.eventsRoutesModel = eventsRoutesModel;
|
|
84
84
|
}
|
|
85
85
|
getAffectedRoutes(alertEntity) {
|
|
86
|
+
var _a;
|
|
86
87
|
return __awaiter(this, void 0, void 0, function* () {
|
|
87
88
|
const affectedRotues = yield this.eventsRoutesModel.findByEventId(alertEntity.vymi_id);
|
|
88
89
|
const routeNames = [];
|
|
89
90
|
for (const route of affectedRotues) {
|
|
90
91
|
routeNames.push({
|
|
91
|
-
routeId: route.name,
|
|
92
|
+
routeId: (_a = route.gtfs_route_id) !== null && _a !== void 0 ? _a : route.name,
|
|
92
93
|
});
|
|
93
94
|
}
|
|
94
95
|
return routeNames;
|
package/dist/integration-engine/gtfsrt-alerts/transformations/GtfsRtAlertTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GtfsRtAlertTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/gtfsrt-alerts/transformations/GtfsRtAlertTransformation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GtfsRtAlertTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/gtfsrt-alerts/transformations/GtfsRtAlertTransformation.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export declare class VehiclePositionsUtils {
|
|
|
11
11
|
/**
|
|
12
12
|
* Determine whether to create new position and its tracking status (trains only for now)
|
|
13
13
|
*
|
|
14
|
-
* @
|
|
14
|
+
* @param {TripStopsSchedule | undefined} tripStopSchedule - Cached trip stops for given block id (see Redis)
|
|
15
15
|
* @param {IUpdateDelayRunTripsData | IUpdateDelayTripsIdsData} trip - New trip
|
|
16
16
|
* @param {IPositionTransformationResult} position - Current position
|
|
17
17
|
*/
|
|
@@ -3,7 +3,6 @@ var _a;
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.VehiclePositionsUtils = void 0;
|
|
5
5
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
6
|
-
const luxon_1 = require("@golemio/core/dist/shared/luxon");
|
|
7
6
|
const config_1 = require("@golemio/core/dist/integration-engine/config");
|
|
8
7
|
const Logger_1 = require("@golemio/core/dist/integration-engine/helpers/Logger");
|
|
9
8
|
const const_1 = require("../../const");
|
|
@@ -15,7 +14,7 @@ _a = VehiclePositionsUtils;
|
|
|
15
14
|
/**
|
|
16
15
|
* Determine whether to create new position and its tracking status (trains only for now)
|
|
17
16
|
*
|
|
18
|
-
* @
|
|
17
|
+
* @param {TripStopsSchedule | undefined} tripStopSchedule - Cached trip stops for given block id (see Redis)
|
|
19
18
|
* @param {IUpdateDelayRunTripsData | IUpdateDelayTripsIdsData} trip - New trip
|
|
20
19
|
* @param {IPositionTransformationResult} position - Current position
|
|
21
20
|
*/
|
|
@@ -83,10 +82,12 @@ VehiclePositionsUtils.getNextExpireTimestamp = () => {
|
|
|
83
82
|
Logger_1.log.error(`[VehiclePositionsUtils] Unable to parse '${config_1.config.vehiclePositions.redisExpireTime}'. Redis keys won't expire.`);
|
|
84
83
|
return;
|
|
85
84
|
}
|
|
86
|
-
const localDateTime =
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
85
|
+
const localDateTime = new Date();
|
|
86
|
+
localDateTime.setMinutes(localDateTime.getMinutes() + 2);
|
|
87
|
+
const expireDateTime = new Date();
|
|
88
|
+
expireDateTime.setHours(timeObject.hour, timeObject.minute, 0, 0);
|
|
89
|
+
if (expireDateTime.valueOf() < localDateTime.valueOf()) {
|
|
90
|
+
expireDateTime.setDate(expireDateTime.getDate() + 1);
|
|
90
91
|
}
|
|
91
92
|
return expireDateTime.valueOf();
|
|
92
93
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VehiclePositionsUtils.js","sourceRoot":"","sources":["../../../src/integration-engine/vehicle-positions/VehiclePositionsUtils.ts"],"names":[],"mappings":";;;;AACA,6EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"VehiclePositionsUtils.js","sourceRoot":"","sources":["../../../src/integration-engine/vehicle-positions/VehiclePositionsUtils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.6-dev.553203229",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"build-minimal": "run-s 'build --sourceMap false --declaration false'",
|
|
10
10
|
"build-watch": "run-s 'build --watch --preserveWatchOutput'",
|
|
11
11
|
"pretest": "golemio import-db-data --postgres",
|
|
12
|
-
"test": "cross-env NODE_ENV=test TS_NODE_COMPILER='ttypescript' mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r dotenv/config 'test/**/*.test.ts'",
|
|
12
|
+
"test": "cross-env NODE_ENV='test' TS_NODE_COMPILER='ttypescript' TZ='UTC' mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r dotenv/config 'test/**/*.test.ts'",
|
|
13
13
|
"test-debug": "run-s 'test --inspect-brk=9230'",
|
|
14
14
|
"code-coverage": "nyc run-s 'test -r source-map-support/register'",
|
|
15
15
|
"generate-docs": "typedoc --out docs/typedoc src",
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
"@commitlint/cli": "^11.0.0",
|
|
29
29
|
"@commitlint/config-conventional": "^11.0.0",
|
|
30
30
|
"@golemio/cli": "1.2.2",
|
|
31
|
-
"@golemio/core": "1.2.11
|
|
31
|
+
"@golemio/core": "1.2.11",
|
|
32
32
|
"@golemio/db-common": "1.0.1",
|
|
33
33
|
"@golemio/eslint-config": "^1.1.0",
|
|
34
34
|
"@ovos-media/ts-transform-paths": "^1.7.18-1",
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"typescript": "4.6.4"
|
|
66
66
|
},
|
|
67
67
|
"peerDependencies": {
|
|
68
|
-
"@golemio/core": "^1.
|
|
68
|
+
"@golemio/core": "^1.2.11"
|
|
69
69
|
},
|
|
70
70
|
"dependencies": {
|
|
71
71
|
"@turf/turf": "^6.5.0",
|