@golemio/pid 2.11.6-dev.1158774210 → 2.11.6-rc.1169330401
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/db/example/15_vehicle_descriptors.sql +4 -2
- package/db/example/16_preset_logs.sql +3 -1
- package/db/example/redis/publicDelayCompObjectMock.json +308 -0
- package/db/example/redis/publicStopTimesMock.json +37 -0
- package/db/example/redis/publicVehiclePositionsMock.json +36 -28
- package/dist/integration-engine/data-retention/helpers/SelectRepositoryFactory.d.ts +7 -0
- package/dist/integration-engine/data-retention/helpers/SelectRepositoryFactory.js +49 -0
- package/dist/integration-engine/data-retention/helpers/SelectRepositoryFactory.js.map +1 -0
- package/dist/integration-engine/data-retention/workers/DataRetentionWorker.js +2 -0
- package/dist/integration-engine/data-retention/workers/DataRetentionWorker.js.map +1 -1
- package/dist/integration-engine/data-retention/workers/constants/RepositoryTableNameEnum.d.ts +9 -0
- package/dist/integration-engine/data-retention/workers/constants/RepositoryTableNameEnum.js +14 -0
- package/dist/integration-engine/data-retention/workers/constants/RepositoryTableNameEnum.js.map +1 -0
- package/dist/integration-engine/{vehicle-positions/workers/vehicle-positions → data-retention/workers}/tasks/DeleteDataTask.d.ts +3 -4
- package/dist/integration-engine/{vehicle-positions/workers/vehicle-positions → data-retention/workers}/tasks/DeleteDataTask.js +7 -8
- package/dist/integration-engine/data-retention/workers/tasks/DeleteDataTask.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.js +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/interfaces/TripModelInterfaces.d.ts +2 -0
- package/dist/integration-engine/ropid-gtfs/workers/presets/PresetWorker.js +0 -2
- package/dist/integration-engine/ropid-gtfs/workers/presets/PresetWorker.js.map +1 -1
- package/dist/integration-engine/shared/interfaces/IDataDeletionParams.d.ts +2 -0
- package/dist/integration-engine/shared/schema/DataDeletionSchema.d.ts +2 -0
- package/dist/integration-engine/shared/schema/DataDeletionSchema.js +6 -0
- package/dist/integration-engine/shared/schema/DataDeletionSchema.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/ioc/Di.js +0 -2
- package/dist/integration-engine/vehicle-positions/ioc/Di.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/RunsWorker.js +0 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/RunsWorker.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/DescriptorWorker.js +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/DescriptorWorker.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/VPWorker.js +0 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/VPWorker.js.map +1 -1
- package/dist/output-gateway/public/domain/PublicApiDetailedTripInterfaces.d.ts +1 -0
- package/dist/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.d.ts +1 -0
- package/dist/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.js +8 -0
- package/dist/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/redis/interfaces/IDelayComputationDto.d.ts +2 -0
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/DelayComputationDtoSchema.js +2 -1
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/DelayComputationDtoSchema.js.map +1 -1
- package/docs/implementation_documentation.md +9 -63
- package/docs/openapi-output.yaml +32 -14
- package/package.json +3 -3
- package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/DeleteLogsTask.d.ts +0 -11
- package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/DeleteLogsTask.js +0 -32
- package/dist/integration-engine/ropid-gtfs/workers/presets/tasks/DeleteLogsTask.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/DeleteDataTask.d.ts +0 -13
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/DeleteDataTask.js +0 -37
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/DeleteDataTask.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/tasks/DeleteDataTask.d.ts +0 -12
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/tasks/DeleteDataTask.js +0 -50
- package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/tasks/DeleteDataTask.js.map +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/DeleteDataTask.js.map +0 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GtfsStopWheelchairBoardingEnum } from "../../../helpers/AccessibilityEnums";
|
|
1
2
|
export interface IShape {
|
|
2
3
|
shape_dist_traveled: number;
|
|
3
4
|
shape_id: string;
|
|
@@ -11,6 +12,7 @@ export interface IStop {
|
|
|
11
12
|
stop_lon: number;
|
|
12
13
|
stop_name: string;
|
|
13
14
|
zone_id: string | null;
|
|
15
|
+
wheelchair_boarding: GtfsStopWheelchairBoardingEnum | null;
|
|
14
16
|
}
|
|
15
17
|
export interface IStopTime {
|
|
16
18
|
arrival_time_seconds: number;
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PresetWorker = void 0;
|
|
4
4
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
5
5
|
const CollectAndSaveLogsTask_1 = require("./tasks/CollectAndSaveLogsTask");
|
|
6
|
-
const DeleteLogsTask_1 = require("./tasks/DeleteLogsTask");
|
|
7
6
|
const ProcessAndSendLogsTask_1 = require("./tasks/ProcessAndSendLogsTask");
|
|
8
7
|
const SavePresetsDataTask_1 = require("./tasks/SavePresetsDataTask");
|
|
9
8
|
class PresetWorker extends workers_1.AbstractWorker {
|
|
@@ -14,7 +13,6 @@ class PresetWorker extends workers_1.AbstractWorker {
|
|
|
14
13
|
this.registerTask(new SavePresetsDataTask_1.SavePresetsDataTask(this.getQueuePrefix()));
|
|
15
14
|
this.registerTask(new CollectAndSaveLogsTask_1.CollectAndSaveLogsTask(this.getQueuePrefix()));
|
|
16
15
|
this.registerTask(new ProcessAndSendLogsTask_1.ProcessAndSendLogsTask(this.getQueuePrefix()));
|
|
17
|
-
this.registerTask(new DeleteLogsTask_1.DeleteLogsTask(this.getQueuePrefix()));
|
|
18
16
|
}
|
|
19
17
|
}
|
|
20
18
|
exports.PresetWorker = PresetWorker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PresetWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/workers/presets/PresetWorker.ts"],"names":[],"mappings":";;;AAAA,2EAA+E;AAC/E,2EAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"PresetWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/workers/presets/PresetWorker.ts"],"names":[],"mappings":";;;AAAA,2EAA+E;AAC/E,2EAAwE;AACxE,2EAAwE;AACxE,qEAAkE;AAElE,MAAa,YAAa,SAAQ,wBAAc;IAG5C;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,cAAc,CAAC;QAK5B,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,IAAI,yCAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,YAAY,CAAC,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,YAAY,CAAC,IAAI,+CAAsB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC;CACJ;AAXD,oCAWC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
import { RepositoryTableName } from "../../data-retention/workers/constants/RepositoryTableNameEnum";
|
|
1
2
|
import { IDataDeletionParams } from "../interfaces/IDataDeletionParams";
|
|
2
3
|
export declare class DataDeletionValidationSchema implements IDataDeletionParams {
|
|
3
4
|
targetHours: number;
|
|
5
|
+
repoName: RepositoryTableName;
|
|
4
6
|
}
|
|
@@ -10,6 +10,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.DataDeletionValidationSchema = void 0;
|
|
13
|
+
const RepositoryTableNameEnum_1 = require("../../data-retention/workers/constants/RepositoryTableNameEnum");
|
|
13
14
|
const class_validator_1 = require("@golemio/core/dist/shared/class-validator");
|
|
14
15
|
class DataDeletionValidationSchema {
|
|
15
16
|
}
|
|
@@ -19,4 +20,9 @@ __decorate([
|
|
|
19
20
|
(0, class_validator_1.Min)(8, { message: "Data newer than 8 hours cannot be deleted" }),
|
|
20
21
|
__metadata("design:type", Number)
|
|
21
22
|
], DataDeletionValidationSchema.prototype, "targetHours", void 0);
|
|
23
|
+
__decorate([
|
|
24
|
+
(0, class_validator_1.IsString)(),
|
|
25
|
+
(0, class_validator_1.IsEnum)(RepositoryTableNameEnum_1.RepositoryTableName),
|
|
26
|
+
__metadata("design:type", String)
|
|
27
|
+
], DataDeletionValidationSchema.prototype, "repoName", void 0);
|
|
22
28
|
//# sourceMappingURL=DataDeletionSchema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataDeletionSchema.js","sourceRoot":"","sources":["../../../../src/integration-engine/shared/schema/DataDeletionSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"DataDeletionSchema.js","sourceRoot":"","sources":["../../../../src/integration-engine/shared/schema/DataDeletionSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4GAAmG;AACnG,+EAAyF;AAGzF,MAAa,4BAA4B;CAQxC;AARD,oEAQC;AALG;IAFC,IAAA,uBAAK,GAAE;IACP,IAAA,qBAAG,EAAC,CAAC,EAAE,EAAE,OAAO,EAAE,2CAA2C,EAAE,CAAC;;iEAC5C;AAIrB;IAFC,IAAA,0BAAQ,GAAE;IACV,IAAA,wBAAM,EAAC,6CAAmB,CAAC;;8DACG"}
|
|
@@ -17,7 +17,6 @@ const DescriptorRepository_1 = require("../workers/vehicle-descriptors/data-acce
|
|
|
17
17
|
const DescriptorDataSourceFactory_1 = require("../workers/vehicle-descriptors/datasources/DescriptorDataSourceFactory");
|
|
18
18
|
const SeznamAutobusuDataSourceProvider_1 = require("../workers/vehicle-descriptors/datasources/seznam-autobusu/SeznamAutobusuDataSourceProvider");
|
|
19
19
|
const DescriptorFilter_1 = require("../workers/vehicle-descriptors/helpers/DescriptorFilter");
|
|
20
|
-
const DeleteDataTask_1 = require("../workers/vehicle-descriptors/tasks/DeleteDataTask");
|
|
21
20
|
const RefreshDescriptorsTask_1 = require("../workers/vehicle-descriptors/tasks/RefreshDescriptorsTask");
|
|
22
21
|
const DescriptorTransformation_1 = require("../workers/vehicle-descriptors/transformations/DescriptorTransformation");
|
|
23
22
|
const PublicApiCacheRepository_1 = require("../workers/vehicle-positions/data-access/cache/PublicApiCacheRepository");
|
|
@@ -59,7 +58,6 @@ VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.RegionalBusRun
|
|
|
59
58
|
//#endregion
|
|
60
59
|
//#region Tasks
|
|
61
60
|
VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.RefreshDescriptorsTask, RefreshDescriptorsTask_1.RefreshDescriptorsTask);
|
|
62
|
-
VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.DeleteDataTask, DeleteDataTask_1.DeleteDataTask);
|
|
63
61
|
VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.SaveArrivaCityRunsToDBTask, SaveArrivaCityRunsToDBTask_1.SaveArrivaCityRunsToDBTask);
|
|
64
62
|
VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.ProcessRegionalBusRunMessagesTask, ProcessRegionalBusRunMessagesTask_1.ProcessRegionalBusRunMessagesTask);
|
|
65
63
|
VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.RefreshPublicTripCacheTask, RefreshPublicTripCacheTask_1.RefreshPublicTripCacheTask);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAE1C,qHAAkH;AAClH,mHAAgH;AAChH,qHAAkH;AAClH,4FAAyF;AACzF,8FAA2F;AAC3F,4GAAyG;AACzG,sGAAmG;AACnG,kGAA+F;AAC/F,+GAA4G;AAC5G,iGAA8F;AAC9F,iIAA8H;AAC9H,0GAAuG;AACvG,wHAAqH;AACrH,kJAA+I;AAC/I,8FAA2F;AAC3F,
|
|
1
|
+
{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/ioc/Di.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ const Di_1 = require("../../ioc/Di");
|
|
|
5
5
|
const VPContainerToken_1 = require("../../ioc/VPContainerToken");
|
|
6
6
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
7
7
|
const constants_1 = require("./constants");
|
|
8
|
-
const DeleteDataTask_1 = require("./tasks/DeleteDataTask");
|
|
9
8
|
const ProcessMetroRunMessagesTask_1 = require("./tasks/ProcessMetroRunMessagesTask");
|
|
10
9
|
const SaveBusRunsToDBTask_1 = require("./tasks/SaveBusRunsToDBTask");
|
|
11
10
|
const SaveMetroRunsToDBTask_1 = require("./tasks/SaveMetroRunsToDBTask");
|
|
@@ -25,7 +24,6 @@ class RunsWorker extends workers_1.AbstractWorker {
|
|
|
25
24
|
this.registerTask(new SaveTramRunsToDBTask_1.SaveTramRunsToDBTask(this.getQueuePrefix()));
|
|
26
25
|
this.registerTask(new SaveMetroRunsToDBTask_1.SaveMetroRunsToDBTask(this.getQueuePrefix()));
|
|
27
26
|
this.registerTask(new ProcessMetroRunMessagesTask_1.ProcessMetroRunMessagesTask(this.getQueuePrefix()));
|
|
28
|
-
this.registerTask(new DeleteDataTask_1.DeleteDataTask(this.getQueuePrefix()));
|
|
29
27
|
}
|
|
30
28
|
}
|
|
31
29
|
exports.RunsWorker = RunsWorker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RunsWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/workers/runs/RunsWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,iEAA8E;AAC9E,2EAA6F;AAC7F,2CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"RunsWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/workers/runs/RunsWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,iEAA8E;AAC9E,2EAA6F;AAC7F,2CAA0C;AAC1C,qFAAkF;AAClF,qEAAkE;AAClE,yEAAsE;AACtE,uEAAoE;AAEpE,MAAa,UAAW,SAAQ,wBAAc;IAG1C;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QActB,iBAAY,GAAG,CAAC,IAAuB,EAAQ,EAAE;YACpD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAZE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,gBAAW,CAAC,OAAO,CAAC,mCAAgB,CAAC,0BAA0B,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,YAAY,CAAC,gBAAW,CAAC,OAAO,CAAC,mCAAgB,CAAC,iCAAiC,CAAC,CAAC,CAAC;QAC3F,IAAI,CAAC,YAAY,CAAC,IAAI,yCAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,YAAY,CAAC,IAAI,2CAAoB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,IAAI,6CAAqB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACpE,IAAI,CAAC,YAAY,CAAC,IAAI,yDAA2B,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC;CAMJ;AAnBD,gCAmBC"}
|
package/dist/integration-engine/vehicle-positions/workers/vehicle-descriptors/DescriptorWorker.js
CHANGED
|
@@ -15,7 +15,6 @@ class DescriptorWorker extends integration_engine_1.AbstractWorker {
|
|
|
15
15
|
};
|
|
16
16
|
// Register tasks
|
|
17
17
|
this.registerTask(Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.RefreshDescriptorsTask));
|
|
18
|
-
this.registerTask(Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.DeleteDataTask));
|
|
19
18
|
}
|
|
20
19
|
}
|
|
21
20
|
exports.DescriptorWorker = DescriptorWorker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DescriptorWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/DescriptorWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,iEAA8E;AAC9E,8EAAqF;AACrF,2CAA0C;
|
|
1
|
+
{"version":3,"file":"DescriptorWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/workers/vehicle-descriptors/DescriptorWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,iEAA8E;AAC9E,8EAAqF;AACrF,2CAA0C;AAG1C,MAAa,gBAAiB,SAAQ,mCAAc;IAGhD;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QAStB,iBAAY,GAAG,CAAC,IAAuB,EAAQ,EAAE;YACpD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAPE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,gBAAW,CAAC,OAAO,CAAyB,mCAAgB,CAAC,sBAAsB,CAAC,CAAC,CAAC;IAC5G,CAAC;CAMJ;AAdD,4CAcC"}
|
|
@@ -6,7 +6,6 @@ const VPContainerToken_1 = require("../../ioc/VPContainerToken");
|
|
|
6
6
|
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
7
7
|
const constants_1 = require("./constants");
|
|
8
8
|
const DataRetentionTask_1 = require("./tasks/DataRetentionTask");
|
|
9
|
-
const DeleteDataTask_1 = require("./tasks/DeleteDataTask");
|
|
10
9
|
const ProcessRegionalBusPositionsTask_1 = require("./tasks/ProcessRegionalBusPositionsTask");
|
|
11
10
|
const PropagateDelayTask_1 = require("./tasks/PropagateDelayTask");
|
|
12
11
|
const PropagateTrainDelayTask_1 = require("./tasks/PropagateTrainDelayTask");
|
|
@@ -35,7 +34,6 @@ class VPWorker extends workers_1.AbstractWorker {
|
|
|
35
34
|
this.registerTask(new PropagateTrainDelayTask_1.PropagateTrainDelayTask(this.getQueuePrefix()));
|
|
36
35
|
this.registerTask(new RefreshGtfsTripDataTask_1.RefreshGtfsTripDataTask(this.getQueuePrefix()));
|
|
37
36
|
this.registerTask(new DataRetentionTask_1.DataRetentionTask(this.getQueuePrefix()));
|
|
38
|
-
this.registerTask(new DeleteDataTask_1.DeleteDataTask(this.getQueuePrefix()));
|
|
39
37
|
}
|
|
40
38
|
}
|
|
41
39
|
exports.VPWorker = VPWorker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VPWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/VPWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,iEAA8E;AAC9E,2EAA6F;AAC7F,2CAA0C;AAC1C,iEAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"VPWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/VPWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,iEAA8E;AAC9E,2EAA6F;AAC7F,2CAA0C;AAC1C,iEAA8D;AAC9D,6FAA0F;AAC1F,mEAAgE;AAChE,6EAA0E;AAC1E,6EAA0E;AAC1E,+DAA4D;AAC5D,6DAA0D;AAC1D,uEAAoE;AACpE,+EAA4E;AAE5E,MAAa,QAAS,SAAQ,wBAAc;IAGxC;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QAmBtB,iBAAY,GAAG,CAAC,IAAuB,EAAQ,EAAE;YACpD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAjBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,gBAAW,CAAC,OAAO,CAAC,mCAAgB,CAAC,0BAA0B,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,YAAY,CAAC,gBAAW,CAAC,OAAO,CAAC,mCAAgB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,YAAY,CAAC,IAAI,mCAAgB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,CAAC,IAAI,2CAAoB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,IAAI,mDAAwB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,IAAI,iCAAe,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,YAAY,CAAC,IAAI,iEAA+B,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,YAAY,CAAC,IAAI,uCAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,YAAY,CAAC,IAAI,iDAAuB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,CAAC,IAAI,iDAAuB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,CAAC,IAAI,qCAAiB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;CAMJ;AAxBD,4BAwBC"}
|
|
@@ -20,6 +20,7 @@ export interface IPublicApiDetailedTripScopeInfo {
|
|
|
20
20
|
export interface IPublicApiDetailedTripScopeStopTimesProps {
|
|
21
21
|
stop_name: string;
|
|
22
22
|
zone_id: string | null;
|
|
23
|
+
is_wheelchair_accessible: boolean | null;
|
|
23
24
|
shape_dist_traveled: number;
|
|
24
25
|
arrival_time: string;
|
|
25
26
|
departure_time: string;
|
|
@@ -4,4 +4,5 @@ import { IGeoJSONFeature } from "@golemio/core/dist/output-gateway";
|
|
|
4
4
|
export declare class PublicVPTripStopTimesTransformation extends AbstractTransformation<IStopTime, IGeoJSONFeature> {
|
|
5
5
|
name: string;
|
|
6
6
|
protected transformInternal: ({ stop, ...stopTime }: IStopTime) => IGeoJSONFeature;
|
|
7
|
+
private isStopWheelchairAccessible;
|
|
7
8
|
}
|
|
@@ -12,6 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
12
12
|
};
|
|
13
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
14
|
exports.PublicVPTripStopTimesTransformation = void 0;
|
|
15
|
+
const AccessibilityEnums_1 = require("../../../../../helpers/AccessibilityEnums");
|
|
15
16
|
const AbstractTransformation_1 = require("@golemio/core/dist/helpers/transformation/AbstractTransformation");
|
|
16
17
|
const output_gateway_1 = require("@golemio/core/dist/output-gateway");
|
|
17
18
|
const luxon_1 = require("@golemio/core/dist/shared/luxon");
|
|
@@ -25,6 +26,7 @@ class PublicVPTripStopTimesTransformation extends AbstractTransformation_1.Abstr
|
|
|
25
26
|
const properties = {
|
|
26
27
|
stop_name: stop.stop_name,
|
|
27
28
|
zone_id: stop.zone_id,
|
|
29
|
+
is_wheelchair_accessible: this.isStopWheelchairAccessible(stop),
|
|
28
30
|
shape_dist_traveled: stopTime.shape_dist_traveled,
|
|
29
31
|
arrival_time: startDateTime.plus({ seconds: stopTime.arrival_time_seconds }).toFormat("HH:mm:ss"),
|
|
30
32
|
departure_time: startDateTime.plus({ seconds: stopTime.departure_time_seconds }).toFormat("HH:mm:ss"),
|
|
@@ -35,6 +37,12 @@ class PublicVPTripStopTimesTransformation extends AbstractTransformation_1.Abstr
|
|
|
35
37
|
};
|
|
36
38
|
return (0, output_gateway_1.buildGeojsonFeature)(properties, "lng", "lat", true);
|
|
37
39
|
};
|
|
40
|
+
this.isStopWheelchairAccessible = ({ wheelchair_boarding }) => {
|
|
41
|
+
if (wheelchair_boarding === null || wheelchair_boarding === AccessibilityEnums_1.GtfsStopWheelchairBoardingEnum.NoInformation) {
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
return wheelchair_boarding === AccessibilityEnums_1.GtfsStopWheelchairBoardingEnum.AccessibleStation;
|
|
45
|
+
};
|
|
38
46
|
}
|
|
39
47
|
}
|
|
40
48
|
exports.PublicVPTripStopTimesTransformation = PublicVPTripStopTimesTransformation;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicVPTripStopTimesTransformation.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"PublicVPTripStopTimesTransformation.js","sourceRoot":"","sources":["../../../../../../src/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kFAA6E;AAG7E,6GAA0G;AAC1G,sEAAyF;AACzF,2DAA2D;AAE3D,MAAa,mCAAoC,SAAQ,+CAAkD;IAA3G;;QACW,SAAI,GAAG,6BAA6B,CAAC;QAElC,sBAAiB,GAAG,CAAC,EAAgC,EAAE,EAAE;gBAApC,EAAE,IAAI,OAA0B,EAArB,QAAQ,cAAnB,QAAqB,CAAF;YAC9C,MAAM,aAAa,GAAG,gBAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,UAAU,GAA6E;gBACzF,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,wBAAwB,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC;gBAC/D,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB;gBACjD,YAAY,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACjG,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,sBAAsB,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACrG,qBAAqB,EAAE,IAAI;gBAC3B,uBAAuB,EAAE,IAAI;gBAC7B,GAAG,EAAE,IAAI,CAAC,QAAQ;gBAClB,GAAG,EAAE,IAAI,CAAC,QAAQ;aACrB,CAAC;YAEF,OAAO,IAAA,oCAAmB,EAAC,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC/D,CAAC,CAAC;QAEM,+BAA0B,GAAG,CAAC,EAAE,mBAAmB,EAAS,EAAkB,EAAE;YACpF,IAAI,mBAAmB,KAAK,IAAI,IAAI,mBAAmB,KAAK,mDAA8B,CAAC,aAAa,EAAE;gBACtG,OAAO,IAAI,CAAC;aACf;YAED,OAAO,mBAAmB,KAAK,mDAA8B,CAAC,iBAAiB,CAAC;QACpF,CAAC,CAAC;IACN,CAAC;CAAA;AA5BD,kFA4BC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GtfsStopWheelchairBoardingEnum } from "../../../../helpers/AccessibilityEnums";
|
|
1
2
|
export interface IShapePoint {
|
|
2
3
|
index: number;
|
|
3
4
|
at_stop: boolean;
|
|
@@ -16,6 +17,7 @@ export interface IStop {
|
|
|
16
17
|
stop_lon: number;
|
|
17
18
|
stop_name: string;
|
|
18
19
|
zone_id: string | null;
|
|
20
|
+
wheelchair_boarding: GtfsStopWheelchairBoardingEnum | null;
|
|
19
21
|
}
|
|
20
22
|
export interface IStopTime {
|
|
21
23
|
arrival_time: string;
|
|
@@ -28,8 +28,9 @@ const delayComputationDtoSchema = {
|
|
|
28
28
|
stop_lon: { type: "number" },
|
|
29
29
|
stop_name: { type: "string" },
|
|
30
30
|
zone_id: { oneOf: [{ type: "string" }, { type: "null", nullable: true }] },
|
|
31
|
+
wheelchair_boarding: { oneOf: [{ type: "integer" }, { type: "null", nullable: true }] },
|
|
31
32
|
},
|
|
32
|
-
required: ["stop_id", "stop_lat", "stop_lon", "stop_name", "zone_id"],
|
|
33
|
+
required: ["stop_id", "stop_lat", "stop_lon", "stop_name", "zone_id", "wheelchair_boarding"],
|
|
33
34
|
},
|
|
34
35
|
},
|
|
35
36
|
required: [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DelayComputationDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/redis/schemas/DelayComputationDtoSchema.ts"],"names":[],"mappings":";;;AAGA,MAAM,yBAAyB,GAAyC;IACpE,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,2BAA2B;IAClC,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;QAC3B,UAAU,EAAE;YACR,IAAI,EAAE,OAAO;YACb,KAAK,EAAE;gBACH,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACR,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAChC,cAAc,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAClC,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACvC,aAAa,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;oBAChF,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;oBAC3B,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBAClC,oBAAoB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBACzC,sBAAsB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;oBAC3C,IAAI,EAAE;wBACF,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACR,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;4BAC3B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;4BAC5B,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;4BAC5B,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;4BAC7B,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"DelayComputationDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/redis/schemas/DelayComputationDtoSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -598,22 +598,6 @@ Worker má na starost aktualizaci presets číselníků
|
|
|
598
598
|
- RopidDeparturesPresetsModel `ropid_departures_presets`
|
|
599
599
|
- PresetLogModel `ropid_departures_preset_logs`
|
|
600
600
|
|
|
601
|
-
#### _task: DeleteLogsTask_
|
|
602
|
-
|
|
603
|
-
- vstupní rabbitmq fronta
|
|
604
|
-
- název: vehicle-positions.ropidpresets.deleteLogs
|
|
605
|
-
- TTL: 1 hodina
|
|
606
|
-
- parametry: `{ targetHours }`
|
|
607
|
-
- validační schéma: [DataDeletionSchema](../src/integration-engine/shared/schema/DataDeletionSchema.ts)
|
|
608
|
-
- závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
|
|
609
|
-
- žádné
|
|
610
|
-
- datové zdroje
|
|
611
|
-
- Loki
|
|
612
|
-
- transformace
|
|
613
|
-
- žádné
|
|
614
|
-
- data modely
|
|
615
|
-
- PresetLogModel `ropid_departures_preset_logs`
|
|
616
|
-
|
|
617
601
|
### _RailtrackWorker_
|
|
618
602
|
|
|
619
603
|
Worker má na starost aktualizaci kolejových obvodů
|
|
@@ -808,26 +792,6 @@ Worker má na starost zpracování a transformaci polohových dat, výpočet zpo
|
|
|
808
792
|
- popis
|
|
809
793
|
- propaguje zpoždění pro následující blokové spoje
|
|
810
794
|
|
|
811
|
-
#### _task: DeleteDataTask_
|
|
812
|
-
|
|
813
|
-
- vstupní rabbitmq fronta
|
|
814
|
-
- název: vehicle-positions.vehiclepositions.deleteData
|
|
815
|
-
- TTL: 1 hodina
|
|
816
|
-
- parametry: `{ targetHours }`
|
|
817
|
-
- validační schéma: [DataDeletionSchema](../src/integration-engine/shared/schema/DataDeletionSchema.ts)
|
|
818
|
-
- závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
|
|
819
|
-
- žádné
|
|
820
|
-
- datové zdroje
|
|
821
|
-
- MPVNET, CHAPS TCP
|
|
822
|
-
- transformace
|
|
823
|
-
- žádné
|
|
824
|
-
- data modely
|
|
825
|
-
- VPPositionsModel `vehiclepositions_positions`
|
|
826
|
-
- VPTripsModel `vehiclepositions_trips`
|
|
827
|
-
- (in-progress) o odmazání history modelů se stará historizační služba (parquet)
|
|
828
|
-
- VPPositionsHistoryModel `vehiclepositions_positions_history`
|
|
829
|
-
- VPTripsHistoryModel `vehiclepositions_trips_history`
|
|
830
|
-
|
|
831
795
|
#### _task: DataRetentionTask_
|
|
832
796
|
|
|
833
797
|
- vstupní rabbitmq fronta
|
|
@@ -991,24 +955,6 @@ Worker má na starost zpracování a transformaci TCP oběhů
|
|
|
991
955
|
- VPPositionsModel `vehiclepositions_positions`
|
|
992
956
|
- VPTripsModel `vehiclepositions_trips`
|
|
993
957
|
|
|
994
|
-
#### _task: DeleteDataTask_
|
|
995
|
-
|
|
996
|
-
- vstupní rabbitmq fronta
|
|
997
|
-
- název: vehicle-positions.vehiclepositionsruns.deleteData
|
|
998
|
-
- TTL: 1 hodina
|
|
999
|
-
- parametry: `{ targetHours }`
|
|
1000
|
-
- validační schéma: [DataDeletionSchema](../src/integration-engine/shared/schema/DataDeletionSchema.ts)
|
|
1001
|
-
- závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
|
|
1002
|
-
- žádné
|
|
1003
|
-
- datové zdroje
|
|
1004
|
-
- CHAPS TCP
|
|
1005
|
-
- transformace
|
|
1006
|
-
- žádné
|
|
1007
|
-
- data modely
|
|
1008
|
-
- CommonRunsModel `vehiclepositions_runs`
|
|
1009
|
-
- CommonRunsMessagesModel `vehiclepositions_runs_messages`
|
|
1010
|
-
- MetroRunsMessagesModel `vehiclepositions_metro_runs_messages`
|
|
1011
|
-
|
|
1012
958
|
### _GtfsRealTimeWorker_
|
|
1013
959
|
|
|
1014
960
|
Worker má na starost generování souborů s realtime daty pro `gtfsrt` endpointy
|
|
@@ -1081,25 +1027,25 @@ Worker má na starost stahování informací o vozidlech (např. dostupnost klim
|
|
|
1081
1027
|
- data modely
|
|
1082
1028
|
- VehicleDescriptorModel `vehiclepositions_vehicle_descriptors`
|
|
1083
1029
|
|
|
1030
|
+
### _DataRetentionWorker_
|
|
1031
|
+
|
|
1032
|
+
Worker má na starost retenci dat tabulek Azure Table Storage
|
|
1033
|
+
|
|
1084
1034
|
#### _task: DeleteDataTask_
|
|
1085
1035
|
|
|
1086
1036
|
- vstupní rabbitmq fronta
|
|
1087
|
-
- název: vehicle-positions.
|
|
1088
|
-
- TTL:
|
|
1089
|
-
- parametry: `{ targetHours }`
|
|
1037
|
+
- název: vehicle-positions.dataretention.deleteData
|
|
1038
|
+
- TTL: 15 minut
|
|
1039
|
+
- parametry: `{ targetHours, repoName }`
|
|
1090
1040
|
- validační schéma: [DataDeletionSchema](../src/integration-engine/shared/schema/DataDeletionSchema.ts)
|
|
1091
1041
|
- závislé fronty (do kterých jsou odesílány zprávy z metody workeru)
|
|
1092
1042
|
- žádné
|
|
1093
1043
|
- datové zdroje
|
|
1094
|
-
-
|
|
1044
|
+
- podle [RepositoryTableNameEnum](../src/integration-engine/data-retention/workers/constants/RepositoryTableNameEnum.ts)
|
|
1095
1045
|
- transformace
|
|
1096
1046
|
- žádné
|
|
1097
1047
|
- data modely
|
|
1098
|
-
-
|
|
1099
|
-
|
|
1100
|
-
### _DataRetentionWorker_
|
|
1101
|
-
|
|
1102
|
-
Worker má na starost retenci dat tabulek Azure Table Storage
|
|
1048
|
+
- žádné
|
|
1103
1049
|
|
|
1104
1050
|
#### _task: TableStorageRetentionTask_
|
|
1105
1051
|
|
package/docs/openapi-output.yaml
CHANGED
|
@@ -1033,23 +1033,18 @@ paths:
|
|
|
1033
1033
|
- vehicle_descriptor
|
|
1034
1034
|
description: "Choose which scopes to include in response."
|
|
1035
1035
|
required: true
|
|
1036
|
+
example: ["info"]
|
|
1036
1037
|
responses:
|
|
1037
1038
|
200:
|
|
1038
1039
|
description: OK
|
|
1039
1040
|
content:
|
|
1040
1041
|
application/json; charset=utf-8:
|
|
1041
1042
|
schema:
|
|
1042
|
-
|
|
1043
|
-
-
|
|
1044
|
-
|
|
1045
|
-
|
|
1046
|
-
|
|
1047
|
-
- $ref: "#/components/schemas/ScopeVehicleDescriptor"
|
|
1048
|
-
- anyOf:
|
|
1049
|
-
- $ref: "#/components/schemas/ScopeInfo"
|
|
1050
|
-
- $ref: "#/components/schemas/ScopeStopTimes"
|
|
1051
|
-
- $ref: "#/components/schemas/ScopeShapes"
|
|
1052
|
-
- $ref: "#/components/schemas/ScopeVehicleDescriptor"
|
|
1043
|
+
allOf:
|
|
1044
|
+
- $ref: "#/components/schemas/ScopeInfo"
|
|
1045
|
+
- $ref: "#/components/schemas/ScopeStopTimes"
|
|
1046
|
+
- $ref: "#/components/schemas/ScopeShapes"
|
|
1047
|
+
- $ref: "#/components/schemas/ScopeVehicleDescriptor"
|
|
1053
1048
|
|
|
1054
1049
|
401:
|
|
1055
1050
|
$ref: "#/components/responses/UnauthorizedError"
|
|
@@ -2072,42 +2067,53 @@ components:
|
|
|
2072
2067
|
properties:
|
|
2073
2068
|
gtfs_trip_id:
|
|
2074
2069
|
type: string
|
|
2070
|
+
nullable: false
|
|
2075
2071
|
example: "115_107_180501"
|
|
2076
2072
|
route_type:
|
|
2077
2073
|
type: string
|
|
2074
|
+
nullable: false
|
|
2078
2075
|
enum: ["tram", "metro", "train", "bus", "ferry", "funicular", "trolleybus", "ext_miscellaneous"]
|
|
2079
2076
|
example: "bus"
|
|
2080
2077
|
route_short_name:
|
|
2081
2078
|
type: string
|
|
2079
|
+
nullable: false
|
|
2082
2080
|
example: "22"
|
|
2083
2081
|
shape_id:
|
|
2084
2082
|
type: string
|
|
2083
|
+
nullable: true
|
|
2085
2084
|
example: "L22V3"
|
|
2086
2085
|
origin_route_name:
|
|
2087
2086
|
type: string
|
|
2087
|
+
nullable: true
|
|
2088
2088
|
example: "22"
|
|
2089
2089
|
run_number:
|
|
2090
2090
|
type: integer
|
|
2091
|
+
nullable: true
|
|
2091
2092
|
example: 1
|
|
2092
2093
|
trip_headsign:
|
|
2093
2094
|
type: string
|
|
2095
|
+
nullable: true
|
|
2094
2096
|
example: "Bílá Hora"
|
|
2095
2097
|
geometry:
|
|
2096
2098
|
$ref: "#/components/schemas/GeometryPoint"
|
|
2097
2099
|
shape_dist_traveled:
|
|
2098
2100
|
type: number
|
|
2101
|
+
nullable: true
|
|
2099
2102
|
description: "Distance travelled from the first stop of the trip."
|
|
2100
2103
|
example: 22.804
|
|
2101
2104
|
bearing:
|
|
2102
2105
|
type: integer
|
|
2106
|
+
nullable: true
|
|
2103
2107
|
description: "Bearing of the vehicle in degrees (0-360)."
|
|
2104
2108
|
example: 45
|
|
2105
2109
|
delay:
|
|
2106
2110
|
type: integer
|
|
2111
|
+
nullable: true
|
|
2107
2112
|
description: "Delay of the vehicle in seconds."
|
|
2108
2113
|
example: 10
|
|
2109
2114
|
state_position:
|
|
2110
2115
|
type: string
|
|
2116
|
+
nullable: false
|
|
2111
2117
|
example: at_stop
|
|
2112
2118
|
enum:
|
|
2113
2119
|
- before_track
|
|
@@ -2119,10 +2125,12 @@ components:
|
|
|
2119
2125
|
- unknown
|
|
2120
2126
|
last_stop_sequence:
|
|
2121
2127
|
type: integer
|
|
2128
|
+
nullable: true
|
|
2122
2129
|
description: index of last stop passed by the vehicle
|
|
2123
2130
|
example: 3
|
|
2124
2131
|
origin_timestamp:
|
|
2125
2132
|
type: string
|
|
2133
|
+
nullable: true
|
|
2126
2134
|
description: "time when vehicle send last update"
|
|
2127
2135
|
example: "2023-12-06T12:00:00+01:00"
|
|
2128
2136
|
|
|
@@ -2203,6 +2211,7 @@ components:
|
|
|
2203
2211
|
properties:
|
|
2204
2212
|
shape_dist_traveled:
|
|
2205
2213
|
type: number
|
|
2214
|
+
nullable: false
|
|
2206
2215
|
description: "Distance from the first stop of the trip."
|
|
2207
2216
|
example: 0
|
|
2208
2217
|
type:
|
|
@@ -2228,31 +2237,40 @@ components:
|
|
|
2228
2237
|
properties:
|
|
2229
2238
|
stop_name:
|
|
2230
2239
|
type: string
|
|
2240
|
+
nullable: false
|
|
2231
2241
|
example: "Nádraží Veleslavín"
|
|
2232
2242
|
zone_id:
|
|
2233
2243
|
type: string
|
|
2244
|
+
nullable: true
|
|
2234
2245
|
example: "P"
|
|
2246
|
+
is_wheelchair_accessible:
|
|
2247
|
+
type: boolean
|
|
2248
|
+
nullable: true
|
|
2249
|
+
example: true
|
|
2235
2250
|
shape_dist_traveled:
|
|
2236
2251
|
type: number
|
|
2252
|
+
nullable: false
|
|
2237
2253
|
example: 0
|
|
2238
2254
|
arrival_time:
|
|
2239
2255
|
type: string
|
|
2256
|
+
nullable: false
|
|
2240
2257
|
description: "Time for arrival to the stop according to trip schedule."
|
|
2241
2258
|
example: "12:00:00"
|
|
2242
2259
|
departure_time:
|
|
2243
2260
|
type: string
|
|
2261
|
+
nullable: false
|
|
2244
2262
|
description: "Time for departure from the stop according to trip schedule."
|
|
2245
|
-
example: "12:00:
|
|
2263
|
+
example: "12:00:10"
|
|
2246
2264
|
realtime_arrival_time:
|
|
2247
2265
|
type: string
|
|
2248
2266
|
nullable: true
|
|
2249
2267
|
description: "Time for arrival to the stop according to realtime data or prediction based on current delay."
|
|
2250
|
-
example: "12:00:
|
|
2268
|
+
example: "12:00:20"
|
|
2251
2269
|
realtime_departure_time:
|
|
2252
2270
|
type: string
|
|
2253
2271
|
nullable: true
|
|
2254
2272
|
description: "Time for departure from the stop according to realtime data or prediction based on current delay."
|
|
2255
|
-
example: "12:00:
|
|
2273
|
+
example: "12:00:25"
|
|
2256
2274
|
type:
|
|
2257
2275
|
type: string
|
|
2258
2276
|
example: Feature
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.11.6-
|
|
3
|
+
"version": "2.11.6-rc.1169330401",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"@commitlint/cli": "^11.0.0",
|
|
39
39
|
"@commitlint/config-conventional": "^11.0.0",
|
|
40
40
|
"@golemio/cli": "1.5.0",
|
|
41
|
-
"@golemio/core": "1.9.
|
|
41
|
+
"@golemio/core": "1.9.10",
|
|
42
42
|
"@golemio/db-common": "1.1.3",
|
|
43
43
|
"@golemio/eslint-config": "1.1.1",
|
|
44
44
|
"@types/amqplib": "^0.5.17",
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"@golemio/core": ">=1.7.0"
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@golemio/ovapi-gtfs-realtime-bindings": "1.2.
|
|
80
|
+
"@golemio/ovapi-gtfs-realtime-bindings": "1.2.0",
|
|
81
81
|
"@turf/turf": "^6.5.0",
|
|
82
82
|
"cheap-ruler": "^3.0.2",
|
|
83
83
|
"csv-parser": "^3.0.0",
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
import { IDataDeletionParams } from "../../../../shared/interfaces/IDataDeletionParams";
|
|
2
|
-
import { DataDeletionValidationSchema } from "../../../../shared/schema/DataDeletionSchema";
|
|
3
|
-
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
4
|
-
export declare class DeleteLogsTask extends AbstractTask<IDataDeletionParams> {
|
|
5
|
-
readonly queueName = "deleteLogs";
|
|
6
|
-
readonly queueTtl: number;
|
|
7
|
-
readonly schema: typeof DataDeletionValidationSchema;
|
|
8
|
-
private logRepository;
|
|
9
|
-
constructor(queuePrefix: string);
|
|
10
|
-
protected execute(data: IDataDeletionParams): Promise<void>;
|
|
11
|
-
}
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.DeleteLogsTask = void 0;
|
|
13
|
-
const Di_1 = require("../../../../ioc/Di");
|
|
14
|
-
const ModuleContainerToken_1 = require("../../../../ioc/ModuleContainerToken");
|
|
15
|
-
const DataDeletionSchema_1 = require("../../../../shared/schema/DataDeletionSchema");
|
|
16
|
-
const workers_1 = require("@golemio/core/dist/integration-engine/workers");
|
|
17
|
-
class DeleteLogsTask extends workers_1.AbstractTask {
|
|
18
|
-
constructor(queuePrefix) {
|
|
19
|
-
super(queuePrefix);
|
|
20
|
-
this.queueName = "deleteLogs";
|
|
21
|
-
this.queueTtl = 1 * 60 * 60 * 1000; // 1 hour
|
|
22
|
-
this.schema = DataDeletionSchema_1.DataDeletionValidationSchema;
|
|
23
|
-
this.logRepository = Di_1.PidContainer.resolve(ModuleContainerToken_1.ModuleContainerToken.PresetLogRepository);
|
|
24
|
-
}
|
|
25
|
-
execute(data) {
|
|
26
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
yield this.logRepository.deleteNHoursOldData(data.targetHours);
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
exports.DeleteLogsTask = DeleteLogsTask;
|
|
32
|
-
//# sourceMappingURL=DeleteLogsTask.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeleteLogsTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/ropid-gtfs/workers/presets/tasks/DeleteLogsTask.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA0C;AAC1C,+EAAoE;AAEpE,qFAAoF;AACpF,2EAA6E;AAG7E,MAAa,cAAe,SAAQ,sBAAiC;IAOjE,YAAY,WAAmB;QAC3B,KAAK,CAAC,WAAW,CAAC,CAAC;QAPP,cAAS,GAAG,YAAY,CAAC;QACzB,aAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,SAAS;QACxC,WAAM,GAAG,iDAA4B,CAAC;QAMlD,IAAI,CAAC,aAAa,GAAG,iBAAY,CAAC,OAAO,CAAuB,2CAAoB,CAAC,mBAAmB,CAAC,CAAC;IAC9G,CAAC;IAEe,OAAO,CAAC,IAAyB;;YAC7C,MAAM,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnE,CAAC;KAAA;CACJ;AAfD,wCAeC"}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import { IDataDeletionParams } from "../../../../shared/interfaces/IDataDeletionParams";
|
|
2
|
-
import { DataDeletionValidationSchema } from "../../../../shared/schema/DataDeletionSchema";
|
|
3
|
-
import { AbstractTask } from "@golemio/core/dist/integration-engine/workers";
|
|
4
|
-
export declare class DeleteDataTask extends AbstractTask<IDataDeletionParams> {
|
|
5
|
-
readonly queueName = "deleteData";
|
|
6
|
-
readonly queueTtl: number;
|
|
7
|
-
readonly schema: typeof DataDeletionValidationSchema;
|
|
8
|
-
private readonly commonRunsRepository;
|
|
9
|
-
private readonly metroMessagesRepository;
|
|
10
|
-
private readonly regionalBusMessageRepository;
|
|
11
|
-
constructor(queuePrefix: string);
|
|
12
|
-
protected execute(data: IDataDeletionParams): Promise<void>;
|
|
13
|
-
}
|