@golemio/pid 5.15.4-dev.2628805546 → 5.15.4-dev.2636697155
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/gtfs-rt/helpers/DisplayAlertsGenerator.js +3 -2
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/DisplayAlertsGenerator.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/transformations/JISInfotextsGtfsRtTransformation.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/transformations/JISInfotextsGtfsRtTransformation.js +3 -4
- package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/transformations/JISInfotextsGtfsRtTransformation.js.map +1 -1
- package/docs/openapi-output.yaml +3 -1
- package/package.json +1 -1
package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/DisplayAlertsGenerator.js
CHANGED
|
@@ -30,9 +30,10 @@ class DisplayAlertsGenerator {
|
|
|
30
30
|
const eventIds = [...new Set(filteredInfotexts.map((infotext) => infotext.jis_event_id))];
|
|
31
31
|
const eventsMap = await this.jisEventsRepository.findByIds(eventIds);
|
|
32
32
|
const infotextsWithResolvedEvent = filteredInfotexts.filter((infotext) => eventsMap.has(infotext.jis_event_id));
|
|
33
|
-
const inputs = infotextsWithResolvedEvent.
|
|
33
|
+
const inputs = infotextsWithResolvedEvent.map((infotext) => {
|
|
34
34
|
const event = eventsMap.get(infotext.jis_event_id);
|
|
35
|
-
|
|
35
|
+
const stopIds = (infotext.stops ?? []).map((stop) => (0, getJISStopId_1.getJISStopId)(stop));
|
|
36
|
+
return { infotext, stopIds, event };
|
|
36
37
|
});
|
|
37
38
|
const alerts = this.transformation.transformArray(inputs);
|
|
38
39
|
for (const alert of alerts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DisplayAlertsGenerator.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/DisplayAlertsGenerator.ts"],"names":[],"mappings":";;;AAAA,kHAAiG;AACjG,0EAAyD;AACzD,wEAAuD;AAIvD,6EAAwE;AACxE,wFAAyF;AAGzF,0GAAuG;AAEvG,MAAa,sBAAsB;IAI/B,YACqB,qBAA4C,EAC5C,sBAA8C,EAC9C,mBAAwC,EACxC,MAAe;QAHf,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,WAAM,GAAN,MAAM,CAAS;QAEhC,IAAI,CAAC,cAAc,GAAG,IAAI,mEAAgC,EAAE,CAAC;QAC7D,IAAI,CAAC,iBAAiB,GAAG,IAAI,mEAAgC,EAAE,CAAC;IACpE,CAAC;IAEM,KAAK,CAAC,qBAAqB,CAAC,UAAuB;QACtD,MAAM,WAAW,GAAG,+CAAY,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAE5E,MAAM,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAE,UAAU,CAAC,SAAoB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;QAElG,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QAE7E,MAAM,WAAW,GAAG,6BAAa,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACzD,MAAM,uBAAuB,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChE,IAAI,CAAC,QAAQ,CAAC,cAAc;gBAAE,OAAO,IAAI,CAAC;YAC1C,OAAO,6BAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,iBAAiB,EAAE,QAAQ,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC;QACjH,CAAC,CAAC,CAAC;QAEH,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,uBAAuB,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;QAEpH,MAAM,QAAQ,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAsB,CAAC,CAAC,CAAC,CAAC;QACpG,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QAErE,MAAM,0BAA0B,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAsB,CAAC,CAAC,CAAC;QAC1H,MAAM,MAAM,GAAG,0BAA0B,CAAC,
|
|
1
|
+
{"version":3,"file":"DisplayAlertsGenerator.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/DisplayAlertsGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,12 @@ import { JISInfotextsModel } from "../../../../../schema-definitions/jis/models/
|
|
|
4
4
|
import { AbstractTransformation } from "@golemio/core/dist/helpers/transformation/AbstractTransformation";
|
|
5
5
|
type TransformInput = {
|
|
6
6
|
infotext: JISInfotextsModel;
|
|
7
|
-
|
|
7
|
+
stopIds: string[];
|
|
8
8
|
event: JISEventsModel | undefined;
|
|
9
9
|
};
|
|
10
10
|
export declare class JISInfotextsGtfsRtTransformation extends AbstractTransformation<TransformInput, IGtfsRtAlert> {
|
|
11
11
|
name: string;
|
|
12
|
-
protected transformInternal: ({ infotext,
|
|
12
|
+
protected transformInternal: ({ infotext, stopIds, event }: TransformInput) => IGtfsRtAlert;
|
|
13
13
|
private static buildTranslations;
|
|
14
14
|
}
|
|
15
15
|
export {};
|
|
@@ -9,12 +9,11 @@ class JISInfotextsGtfsRtTransformation extends AbstractTransformation_1.Abstract
|
|
|
9
9
|
constructor() {
|
|
10
10
|
super(...arguments);
|
|
11
11
|
this.name = "JISInfotextsGtfsRtTransformation";
|
|
12
|
-
this.transformInternal = ({ infotext,
|
|
13
|
-
const eventId = event?.id ?? infotext.id;
|
|
12
|
+
this.transformInternal = ({ infotext, stopIds, event }) => {
|
|
14
13
|
const severityLevel = infotext.display_type === "INLINE" ? AlertsInterfaces_1.GtfsAlertSeverityLevelEnum.WARNING : AlertsInterfaces_1.GtfsAlertSeverityLevelEnum.SEVERE;
|
|
15
14
|
const eventCsUrl = event?.url?.cs !== "nevyplněno" ? event?.url?.cs : `${PID_WEB_EVENTS_URL}${event.id}`;
|
|
16
15
|
return {
|
|
17
|
-
id: `alert-${
|
|
16
|
+
id: `alert-${infotext.id}`,
|
|
18
17
|
alert: {
|
|
19
18
|
activePeriod: [
|
|
20
19
|
{
|
|
@@ -24,7 +23,7 @@ class JISInfotextsGtfsRtTransformation extends AbstractTransformation_1.Abstract
|
|
|
24
23
|
: {}),
|
|
25
24
|
},
|
|
26
25
|
],
|
|
27
|
-
informedEntity:
|
|
26
|
+
informedEntity: stopIds.map((stopId) => ({ stopId })),
|
|
28
27
|
cause: (event?.cause ?? "UNKNOWN_CAUSE"),
|
|
29
28
|
causeDetail: {
|
|
30
29
|
translation: JISInfotextsGtfsRtTransformation.buildTranslations(event?.cause_detail?.cs, event?.cause_detail?.en),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JISInfotextsGtfsRtTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/transformations/JISInfotextsGtfsRtTransformation.ts"],"names":[],"mappings":";;;AAAA,0FAAyE;AAGzE,qEAI2E;AAG3E,6GAA0G;AAE1G,MAAM,kBAAkB,GAAG,mCAAmC,CAAC;AAQ/D,MAAa,gCAAiC,SAAQ,+CAAoD;IAA1G;;QACW,SAAI,GAAG,kCAAkC,CAAC;QAEvC,sBAAiB,GAAG,CAAC,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"JISInfotextsGtfsRtTransformation.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/transformations/JISInfotextsGtfsRtTransformation.ts"],"names":[],"mappings":"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"}
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -24,6 +24,8 @@ tags:
|
|
|
24
24
|
|
|
25
25
|
- name: 🗺 GTFS Realtime (v2)
|
|
26
26
|
description: <img src="https://img.shields.io/badge/opendata-available-green" alt="golemioapi-opendata-badge" /> Protobuf feeds of GTFS Realtime data. The feeds are updated every 20 seconds. Proto definitions can be found at [gtfs-realtime-OVapi.proto](https://gitlab.com/operator-ict/golemio/code/ovapi-gtfs-realtime-bindings/-/blob/master/src/gtfs-realtime-OVapi.proto). You can inspect the data in human-readable form using the [GTFS Realtime Inspector](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/tree/master/toolkit/gtfs-realtime-inspector).
|
|
27
|
+
- name: 🗺 GTFS Realtime (v2) - internal
|
|
28
|
+
description: Endpoints for internal use
|
|
27
29
|
|
|
28
30
|
- name: 🛤 PID Realtime Positions (v2)
|
|
29
31
|
description: <img src="https://img.shields.io/badge/opendata-available-green" alt="golemioapi-opendata-badge" /> Realtime positions of vehicles in custom GeoJSON format.
|
|
@@ -883,7 +885,7 @@ paths:
|
|
|
883
885
|
summary: GET GTFS-RT Display Alerts Feed
|
|
884
886
|
description: "Experimental feed with infotext alerts targeted at specific stops for e-paper displays. Uses stopId in informedEntity instead of routeId."
|
|
885
887
|
tags:
|
|
886
|
-
- 🗺 GTFS Realtime (v2)
|
|
888
|
+
- 🗺 GTFS Realtime (v2) - internal
|
|
887
889
|
responses:
|
|
888
890
|
"200":
|
|
889
891
|
description: successful operation
|