@golemio/pid 2.8.11-dev.991090172 → 2.8.11-dev.991735776
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/vehicle-positions/helpers/metro/MetroShapePointsFixer.d.ts +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.js +20 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.js.map +1 -1
- package/package.json +1 -1
|
@@ -27,10 +27,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
27
27
|
exports.MetroShapePointsFixer = void 0;
|
|
28
28
|
const VPContainerToken_1 = require("../../../../ioc/VPContainerToken");
|
|
29
29
|
const MetroRouteHelper_1 = require("../../../runs/helpers/MetroRouteHelper");
|
|
30
|
+
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
30
31
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
31
32
|
const cheap_ruler_1 = __importDefault(require("cheap-ruler"));
|
|
32
33
|
const CachedMetroRailtrackLookup_1 = require("../../data-access/metro/CachedMetroRailtrackLookup");
|
|
33
|
-
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
34
34
|
let MetroShapePointsFixer = exports.MetroShapePointsFixer = class MetroShapePointsFixer {
|
|
35
35
|
constructor(cachedMetroRailTrackLookup) {
|
|
36
36
|
this.cachedMetroRailTrackLookup = cachedMetroRailTrackLookup;
|
|
@@ -46,7 +46,8 @@ let MetroShapePointsFixer = exports.MetroShapePointsFixer = class MetroShapePoin
|
|
|
46
46
|
const maxStopSequence = clonedData.stop_times.length;
|
|
47
47
|
for (let index = 0; index < clonedData.shapes_anchor_points.length; index++) {
|
|
48
48
|
const shape = clonedData.shapes_anchor_points[index];
|
|
49
|
-
const
|
|
49
|
+
const possibleStops = this.getPossibleStops(clonedData.stop_times, lastKnownStopSequence);
|
|
50
|
+
const closestMetroRailtrack = this.getClosestMetroRailtrack(shape, metroRailtrackLookup, possibleStops);
|
|
50
51
|
const thisStopSequence = this.getSequenceByStopId(closestMetroRailtrack.gtfs_stop_id, clonedData.stop_times);
|
|
51
52
|
if (thisStopSequence) {
|
|
52
53
|
lastKnownStopSequence = thisStopSequence;
|
|
@@ -77,7 +78,7 @@ let MetroShapePointsFixer = exports.MetroShapePointsFixer = class MetroShapePoin
|
|
|
77
78
|
return null;
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
|
-
getClosestMetroRailtrack(shape, metroRailtrackLookup) {
|
|
81
|
+
getClosestMetroRailtrack(shape, metroRailtrackLookup, possibleStops) {
|
|
81
82
|
// find closest metroRailtrack for shape.coordinates
|
|
82
83
|
const result = metroRailtrackLookup
|
|
83
84
|
.map((metroRailtrack) => {
|
|
@@ -86,12 +87,27 @@ let MetroShapePointsFixer = exports.MetroShapePointsFixer = class MetroShapePoin
|
|
|
86
87
|
.sort((a, b) => a.distance - b.distance);
|
|
87
88
|
const maxClosestRailTracks = shape.this_stop_sequence === 1 ? 4 : 3;
|
|
88
89
|
for (let i = 0; i < maxClosestRailTracks; i++) {
|
|
89
|
-
if (result[i] && result[i].gtfs_stop_id) {
|
|
90
|
+
if (result[i] && possibleStops.some((el) => el === result[i].gtfs_stop_id)) {
|
|
90
91
|
return result[i];
|
|
91
92
|
}
|
|
92
93
|
}
|
|
93
94
|
return result[0];
|
|
94
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
|
+
}
|
|
95
111
|
};
|
|
96
112
|
exports.MetroShapePointsFixer = MetroShapePointsFixer = __decorate([
|
|
97
113
|
(0, tsyringe_1.injectable)(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroShapePointsFixer.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/metro/MetroShapePointsFixer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uEAA8E;AAC9E,6EAA+F;AAE/F,iEAAwE;AACxE,8DAAqC;AACrC,mGAAgG;
|
|
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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"}
|