@golemio/pid 3.17.0-rc.1925436440 → 3.17.0-rc.1927908760
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/helpers/BusMessageFilter.d.ts +6 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.js +13 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.js.map +1 -1
- package/docs/implementation_documentation.md +1 -0
- package/docs/openapi-output.yaml +2 -1
- package/package.json +1 -1
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.d.ts
CHANGED
|
@@ -2,15 +2,19 @@ import { ICommonRunWithMessageDto } from "../../../../../schema-definitions/vehi
|
|
|
2
2
|
import { ILogger } from "@golemio/core/dist/helpers/logger";
|
|
3
3
|
import { ICommonMessageFilter } from "./interfaces/ICommonMessageFilter";
|
|
4
4
|
import { TimestampValidator } from "./TimestampValidator";
|
|
5
|
+
import { ISimpleConfig } from "@golemio/core/dist/helpers/configuration/ISimpleConfig";
|
|
5
6
|
export declare class BusMessageFilter implements ICommonMessageFilter {
|
|
6
7
|
private logger;
|
|
7
8
|
private timestampValidator;
|
|
8
|
-
|
|
9
|
+
private config;
|
|
10
|
+
private dppTestingBuses;
|
|
11
|
+
constructor(logger: ILogger, timestampValidator: TimestampValidator, config: ISimpleConfig);
|
|
9
12
|
/**
|
|
10
|
-
* Yield messages that are valid for processing (filter out internal bus lines)
|
|
13
|
+
* Yield messages that are valid for processing (filter out internal bus lines and testing buses)
|
|
11
14
|
* - route id is a string of length 3 or more
|
|
12
15
|
* - route id is a number in range of bus and trolleybus lines
|
|
13
16
|
* - route id >= 100 (bus) ∪ [50, 69] (trolleybus)
|
|
14
17
|
*/
|
|
15
18
|
yieldFilteredMessages(messages: ICommonRunWithMessageDto[], timestamp: number): Generator<ICommonRunWithMessageDto>;
|
|
19
|
+
private isTestingBus;
|
|
16
20
|
}
|
|
@@ -21,12 +21,14 @@ const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
|
21
21
|
const TROLLEYBUS_ROUTE_ID_MIN = 50;
|
|
22
22
|
const TROLLEYBUS_ROUTE_ID_MAX = 69;
|
|
23
23
|
let BusMessageFilter = exports.BusMessageFilter = class BusMessageFilter {
|
|
24
|
-
constructor(logger, timestampValidator) {
|
|
24
|
+
constructor(logger, timestampValidator, config) {
|
|
25
25
|
this.logger = logger;
|
|
26
26
|
this.timestampValidator = timestampValidator;
|
|
27
|
+
this.config = config;
|
|
28
|
+
this.dppTestingBuses = this.config.getValue("module.pid.vehicle-positions.dppTestingBuses.*", []);
|
|
27
29
|
}
|
|
28
30
|
/**
|
|
29
|
-
* Yield messages that are valid for processing (filter out internal bus lines)
|
|
31
|
+
* Yield messages that are valid for processing (filter out internal bus lines and testing buses)
|
|
30
32
|
* - route id is a string of length 3 or more
|
|
31
33
|
* - route id is a number in range of bus and trolleybus lines
|
|
32
34
|
* - route id >= 100 (bus) ∪ [50, 69] (trolleybus)
|
|
@@ -41,6 +43,10 @@ let BusMessageFilter = exports.BusMessageFilter = class BusMessageFilter {
|
|
|
41
43
|
continue;
|
|
42
44
|
}
|
|
43
45
|
if (run.route_id.length > 2) {
|
|
46
|
+
if (this.isTestingBus(message.run.registration_number)) {
|
|
47
|
+
this.logger.info(`Testing bus ${message.run.registration_number} was filterd out`);
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
44
50
|
yield message;
|
|
45
51
|
continue;
|
|
46
52
|
}
|
|
@@ -53,11 +59,15 @@ let BusMessageFilter = exports.BusMessageFilter = class BusMessageFilter {
|
|
|
53
59
|
yield message;
|
|
54
60
|
}
|
|
55
61
|
}
|
|
62
|
+
isTestingBus(reqNumber) {
|
|
63
|
+
return this.dppTestingBuses.includes(reqNumber);
|
|
64
|
+
}
|
|
56
65
|
};
|
|
57
66
|
exports.BusMessageFilter = BusMessageFilter = __decorate([
|
|
58
67
|
(0, tsyringe_1.injectable)(),
|
|
59
68
|
__param(0, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.Logger)),
|
|
60
69
|
__param(1, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.TimestampValidator)),
|
|
61
|
-
|
|
70
|
+
__param(2, (0, tsyringe_1.inject)(CoreToken_1.CoreToken.SimpleConfig)),
|
|
71
|
+
__metadata("design:paramtypes", [Object, TimestampValidator_1.TimestampValidator, Object])
|
|
62
72
|
], BusMessageFilter);
|
|
63
73
|
//# sourceMappingURL=BusMessageFilter.js.map
|
package/dist/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BusMessageFilter.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,wEAAqE;AAErE,iEAAwE;AAExE,oEAA8E;AAC9E,6DAA0D;AAC1D,6EAAwE;
|
|
1
|
+
{"version":3,"file":"BusMessageFilter.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/BusMessageFilter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,wEAAqE;AAErE,iEAAwE;AAExE,oEAA8E;AAC9E,6DAA0D;AAC1D,6EAAwE;AAGxE,MAAM,uBAAuB,GAAG,EAAE,CAAC;AACnC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAG5B,IAAM,gBAAgB,8BAAtB,MAAM,gBAAgB;IAEzB,YACsC,MAAe,EACI,kBAAsC,EACnD,MAAqB;QAF3B,WAAM,GAAN,MAAM,CAAS;QACI,uBAAkB,GAAlB,kBAAkB,CAAoB;QACnD,WAAM,GAAN,MAAM,CAAe;QAE7D,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gDAAgD,EAAE,EAAE,CAAa,CAAC;IAClH,CAAC;IAED;;;;;OAKG;IACI,CAAC,qBAAqB,CAAC,QAAoC,EAAE,SAAiB;QACjF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;YAExB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,0BAA0B,CAAC,QAAQ,EAAE,CAAC,EAAE;gBACjH,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,IAAI,6BAAY,CACZ,mCAAmC;oBAC/B,OAAO,CAAC,WAAW,CAAC,0BAA0B,CAAC,WAAW,EAAE;oBAC5D,yBAAyB,OAAO,CAAC,GAAG,CAAC,eAAe,SAAS,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,EACzF,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,SAAS,EACT,SAAS,EACT,KAAK,CACR,CACJ,CAAC;gBACF,SAAS;aACZ;YACD,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,EAAE;oBACpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,OAAO,CAAC,GAAG,CAAC,mBAAmB,kBAAkB,CAAC,CAAC;oBACnF,SAAS;iBACZ;gBACD,MAAM,OAAO,CAAC;gBACd,SAAS;aACZ;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,OAAO,GAAG,uBAAuB,IAAI,OAAO,GAAG,uBAAuB,EAAE;gBACjG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,cAAc,OAAO,6BAA6B,CAAC,CAAC;gBAC7F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC3B,SAAS;aACZ;YAED,MAAM,OAAO,CAAC;SACjB;IACL,CAAC;IAEO,YAAY,CAAC,SAAiB;QAClC,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;CACJ,CAAA;2BAzDY,gBAAgB;IAD5B,IAAA,qBAAU,GAAE;IAIJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,mCAAgB,CAAC,kBAAkB,CAAC,CAAA;IAC3C,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;6CAD0C,uCAAkB;GAJtF,gBAAgB,CAyD5B"}
|
|
@@ -1315,6 +1315,7 @@ Worker má na starost stahování VYMI (JIS) událostí a infotextů, jejich tra
|
|
|
1315
1315
|
- `vehiclepositions_vehicle_descriptors`
|
|
1316
1316
|
- dodatečná transformace: Feature collection
|
|
1317
1317
|
- je použit `CompressionByDefaultMiddleware` a odpovědi jsou tak na output gateway komprimovány i pokud klient explicitně nepovolí komprimaci vhodnou hodnotou hlavičky `Accept-Encoding` (lze však komprimaci explicitně zakázat hodnotou `identity`)
|
|
1318
|
+
- Default limit je nastaven pro vsechny role na 100 v admin panelu
|
|
1318
1319
|
|
|
1319
1320
|
#### _/v2/vehiclepositions/{gtfsTripId}_
|
|
1320
1321
|
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -602,12 +602,13 @@ paths:
|
|
|
602
602
|
parameters:
|
|
603
603
|
- name: limit
|
|
604
604
|
in: query
|
|
605
|
-
description: Limits number of retrieved items. The maximum is 10000
|
|
605
|
+
description: Limits number of retrieved items. The maximum is 10000.
|
|
606
606
|
required: false
|
|
607
607
|
schema:
|
|
608
608
|
type: number
|
|
609
609
|
format: int64
|
|
610
610
|
example: 10
|
|
611
|
+
default: 100
|
|
611
612
|
- name: offset
|
|
612
613
|
in: query
|
|
613
614
|
description: Number of the first items that are skipped.
|