@golemio/pid 2.8.11-dev.992864378 → 2.9.0

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.
Files changed (43) hide show
  1. package/db/example/03_ropidgtfs_dump.sql +2 -2
  2. package/db/example/12_metro_line_A_gtfs_trips.sql +12 -7
  3. package/db/example/13_http-propagate-delay.sql +5 -5
  4. package/db/migrations/postgresql/20230831141134-trip-number.js +53 -0
  5. package/db/migrations/postgresql/sqls/20230831141134-trip-number-down.sql +3 -0
  6. package/db/migrations/postgresql/sqls/20230831141134-trip-number-up.sql +3 -0
  7. package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js +4 -2
  8. package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js.map +1 -1
  9. package/dist/integration-engine/ropid-gtfs/workers/railtrack/tasks/SaveMetroRailtrackDataToDBTask.js +0 -4
  10. package/dist/integration-engine/ropid-gtfs/workers/railtrack/tasks/SaveMetroRailtrackDataToDBTask.js.map +1 -1
  11. package/dist/integration-engine/ropid-gtfs/workers/railtrack/tasks/data-access/MetroRailtrackGPSRepository.js +3 -16
  12. package/dist/integration-engine/ropid-gtfs/workers/railtrack/tasks/data-access/MetroRailtrackGPSRepository.js.map +1 -1
  13. package/dist/integration-engine/vehicle-positions/ioc/Di.js +0 -8
  14. package/dist/integration-engine/vehicle-positions/ioc/Di.js.map +1 -1
  15. package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.d.ts +0 -3
  16. package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js +0 -9
  17. package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js.map +1 -1
  18. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/MetroRouteHelper.d.ts +0 -3
  19. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/MetroRouteHelper.js +0 -12
  20. package/dist/integration-engine/vehicle-positions/workers/runs/helpers/MetroRouteHelper.js.map +1 -1
  21. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.d.ts +0 -3
  22. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js +117 -113
  23. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js.map +1 -1
  24. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/VPInterfaces.d.ts +2 -0
  25. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.d.ts +0 -1
  26. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js +1 -8
  27. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map +1 -1
  28. package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.js +1 -5
  29. package/dist/output-gateway/vehicle-positions/VehiclePositionsRouter.js.map +1 -1
  30. package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.d.ts +3 -0
  31. package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js +4 -0
  32. package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
  33. package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.d.ts +7 -0
  34. package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.js +10 -0
  35. package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.js.map +1 -1
  36. package/package.json +2 -2
  37. package/db/example/17_metroRailtrack.sql +0 -357
  38. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/metro/CachedMetroRailtrackLookup.d.ts +0 -9
  39. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/metro/CachedMetroRailtrackLookup.js +0 -59
  40. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/metro/CachedMetroRailtrackLookup.js.map +0 -1
  41. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.d.ts +0 -11
  42. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.js +0 -117
  43. package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.js.map +0 -1
@@ -1,117 +0,0 @@
1
- "use strict";
2
- var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
- var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
- if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
- else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
- return c > 3 && r && Object.defineProperty(target, key, r), r;
7
- };
8
- var __metadata = (this && this.__metadata) || function (k, v) {
9
- if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
10
- };
11
- var __param = (this && this.__param) || function (paramIndex, decorator) {
12
- return function (target, key) { decorator(target, key, paramIndex); }
13
- };
14
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
15
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
16
- return new (P || (P = Promise))(function (resolve, reject) {
17
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
18
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
19
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
20
- step((generator = generator.apply(thisArg, _arguments || [])).next());
21
- });
22
- };
23
- var __importDefault = (this && this.__importDefault) || function (mod) {
24
- return (mod && mod.__esModule) ? mod : { "default": mod };
25
- };
26
- Object.defineProperty(exports, "__esModule", { value: true });
27
- exports.MetroShapePointsFixer = void 0;
28
- const VPContainerToken_1 = require("../../../../ioc/VPContainerToken");
29
- const MetroRouteHelper_1 = require("../../../runs/helpers/MetroRouteHelper");
30
- const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
31
- const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
32
- const cheap_ruler_1 = __importDefault(require("cheap-ruler"));
33
- const CachedMetroRailtrackLookup_1 = require("../../data-access/metro/CachedMetroRailtrackLookup");
34
- let MetroShapePointsFixer = exports.MetroShapePointsFixer = class MetroShapePointsFixer {
35
- constructor(cachedMetroRailTrackLookup) {
36
- this.cachedMetroRailTrackLookup = cachedMetroRailTrackLookup;
37
- this.ruler = (0, cheap_ruler_1.default)(50, "meters");
38
- }
39
- fix(data) {
40
- return __awaiter(this, void 0, void 0, function* () {
41
- try {
42
- const clonedData = structuredClone(data);
43
- // load metro obvody
44
- const metroRailtrackLookup = yield this.cachedMetroRailTrackLookup.getAllByRouteName(MetroRouteHelper_1.MetroRouteHelper.getRouteName(data.trip_id));
45
- let lastKnownStopSequence = null;
46
- const maxStopSequence = clonedData.stop_times.length;
47
- for (let index = 0; index < clonedData.shapes_anchor_points.length; index++) {
48
- const shape = clonedData.shapes_anchor_points[index];
49
- const possibleStops = this.getPossibleStops(clonedData.stop_times, lastKnownStopSequence);
50
- const closestMetroRailtrack = this.getClosestMetroRailtrack(shape, metroRailtrackLookup, possibleStops);
51
- const thisStopSequence = this.getSequenceByStopId(closestMetroRailtrack.gtfs_stop_id, clonedData.stop_times);
52
- if (thisStopSequence) {
53
- lastKnownStopSequence = thisStopSequence;
54
- }
55
- shape.at_stop = closestMetroRailtrack.gtfs_stop_id && thisStopSequence ? true : false;
56
- shape.this_stop_sequence = thisStopSequence;
57
- shape.next_stop_sequence = lastKnownStopSequence ? Math.min(lastKnownStopSequence + 1, maxStopSequence) : 2;
58
- shape.last_stop_sequence = lastKnownStopSequence && lastKnownStopSequence > 1 ? lastKnownStopSequence : 1;
59
- if (shape.at_stop) {
60
- shape.last_stop_sequence = shape.this_stop_sequence;
61
- }
62
- }
63
- return clonedData;
64
- }
65
- catch (err) {
66
- throw new golemio_errors_1.GeneralError("Unable to fix metro shape points: " + err.message, this.constructor.name, err);
67
- }
68
- });
69
- }
70
- getSequenceByStopId(gtfs_stop_id, stop_times) {
71
- var _a, _b, _c;
72
- const regex = /U(?<node>.*)Z/;
73
- const node = (_b = (_a = regex.exec(gtfs_stop_id || "")) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.node;
74
- if (node && node.length > 0) {
75
- return ((_c = stop_times.find((stop_time) => { var _a, _b; return ((_b = (_a = regex.exec(stop_time.stop_id)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.node) === node; })) === null || _c === void 0 ? void 0 : _c.stop_sequence) || null;
76
- }
77
- else {
78
- return null;
79
- }
80
- }
81
- getClosestMetroRailtrack(shape, metroRailtrackLookup, possibleStops) {
82
- // find closest metroRailtrack for shape.coordinates
83
- const result = metroRailtrackLookup
84
- .map((metroRailtrack) => {
85
- return Object.assign(Object.assign({}, metroRailtrack), { distance: this.ruler.distance(shape.coordinates, metroRailtrack.coordinates.coordinates) });
86
- })
87
- .sort((a, b) => a.distance - b.distance);
88
- const maxClosestRailTracks = shape.this_stop_sequence === 1 ? 4 : 3;
89
- for (let i = 0; i < maxClosestRailTracks; i++) {
90
- if (result[i] && possibleStops.some((el) => el === result[i].gtfs_stop_id)) {
91
- return result[i];
92
- }
93
- }
94
- return result[0];
95
- }
96
- getPossibleStops(stopTimes, lastKnownStopSequence) {
97
- // since we dont know direction for railtrack data, we check concrete stops in one direction
98
- // to ensure proper matching with shape
99
- const result = [];
100
- if (lastKnownStopSequence === null) {
101
- result.push(stopTimes[0].stop_id);
102
- }
103
- else {
104
- result.push(stopTimes[lastKnownStopSequence - 1].stop_id);
105
- if (lastKnownStopSequence < stopTimes.length) {
106
- result.push(stopTimes[lastKnownStopSequence].stop_id);
107
- }
108
- }
109
- return result;
110
- }
111
- };
112
- exports.MetroShapePointsFixer = MetroShapePointsFixer = __decorate([
113
- (0, tsyringe_1.injectable)(),
114
- __param(0, (0, tsyringe_1.inject)(VPContainerToken_1.VPContainerToken.CachedMetroRailTrackLookup)),
115
- __metadata("design:paramtypes", [CachedMetroRailtrackLookup_1.CachedMetroRailTrackLookup])
116
- ], MetroShapePointsFixer);
117
- //# sourceMappingURL=MetroShapePointsFixer.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"MetroShapePointsFixer.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.ts"],"names":[],"mappings":"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"}