npm - @golemio/pid - Versions diffs - 4.2.0-rc.2113470662 → 4.2.1-dev.2113429421 - Mend

@golemio/pid 4.2.0-rc.2113470662 → 4.2.1-dev.2113429421

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 (22) hide show

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.js CHANGED Viewed

@@ -34,257 +34,309 @@ class DelayComputationManager {
     constructor(gtfsTripsRepository) {
         this.gtfsTripsRepository = gtfsTripsRepository;
         this.METRO_TRIP_PREFIX_REGEX = /^(991|992|993)/;
-        /**
-         * Return shape anchor points along trip track shape with stop times parameters
-         *
-         * @param {string} tripId - Internal DB trip id
-         * @returns {IComputationTrip} - Result with shape anchor points
-         */
-        this.getComputationObject = async (tripId) => {
-            const gtfsTrip = await this.gtfsTripsRepository.findByIdForDelayComputation(tripId);
-            if (!gtfsTrip) {
-                helpers_1.log.info(`getComputationObject: GTFS trip ${tripId} was not found`);
-                return null;
+        const simpleConfig = ioc_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.SimpleConfig);
+        this.stepBetweenPoints = config_1.config.vehiclePositions.stepBetweenPoints;
+        this.stepBetweenPointsforMetro = Number(simpleConfig.getValue("module.pid.vehicle-positions.shapes.metro.stepBetweenPointsForMetro", "0.05"));
+    }
+    /**
+     * Return shape anchor points along trip track shape with stop times parameters
+     *
+     * @param {string} tripId - Internal DB trip id
+     * @returns {IComputationTrip} - Result with shape anchor points
+     */
+    async getComputationObject(tripId) {
+        const gtfsTrip = await this.gtfsTripsRepository.findByIdForDelayComputation(tripId);
+        if (!gtfsTrip) {
+            helpers_1.log.info(`getComputationObject: GTFS trip ${tripId} was not found`);
+            return null;
+        }
+        const { shape_id, shapes, stop_times } = gtfsTrip;
+        if (!shapes?.length) {
+            throw new golemio_errors_1.GeneralError(`getComputationObject: GTFS trip ${tripId} has no shapes`, this.constructor.name);
+        }
+        else if (!stop_times?.length) {
+            throw new golemio_errors_1.GeneralError(`getComputationObject: GTFS trip ${tripId} has no stop_times`, this.constructor.name);
+        }
+        const isMetro = this.METRO_TRIP_PREFIX_REGEX.test(tripId);
+        const shapesGeometryAnchorPoints = this.getShapesGeometryAnchorPoints(shape_id, shapes, stop_times, isMetro);
+        // MAKING COPY
+        const shapePoints = [];
+        const lastPointIndex = shapesGeometryAnchorPoints.length - 1;
+        // const to determine shape points of stops (in meters)
+        const distanceBefore = 0.1;
+        const distanceAfter = 0.05;
+        for (let i = 0; i < shapesGeometryAnchorPoints.length; i++) {
+            const isLastPoint = i === lastPointIndex;
+            const bearing = this.setupBearingBetweenPoints(i, shapesGeometryAnchorPoints, shapePoints, isLastPoint);
+            // init values
+            let thisStopSequence = null;
+            let lastStopSequence = shapesGeometryAnchorPoints[i].last_stop_sequence;
+            let nextStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
+            // these are origin stop_times shape point fron shapes table, clearly at stops points
+            if (shapesGeometryAnchorPoints[i].this_stop_sequence) {
+                thisStopSequence = shapesGeometryAnchorPoints[i].this_stop_sequence;
             }
-            const { shape_id, shapes, stop_times } = gtfsTrip;
-            if (!shapes?.length) {
-                throw new golemio_errors_1.GeneralError(`getComputationObject: GTFS trip ${tripId} has no shapes`, this.constructor.name);
+            // if is shape anchor point in close distance AFTER LAST stop, then set it also AT STOP
+            else if (i > 0 &&
+                shapesGeometryAnchorPoints[i].shape_dist_traveled -
+                    stop_times[shapesGeometryAnchorPoints[i].last_stop_sequence - 1].shape_dist_traveled <=
+                    distanceAfter) {
+                thisStopSequence = shapesGeometryAnchorPoints[i].last_stop_sequence;
             }
-            else if (!stop_times?.length) {
-                throw new golemio_errors_1.GeneralError(`getComputationObject: GTFS trip ${tripId} has no stop_times`, this.constructor.name);
+            // if is shape anchor point in close distance BEFORE NEXT stop, then set it also AT STOP
+            else if (i < shapesGeometryAnchorPoints.length - 1 &&
+                stop_times[shapesGeometryAnchorPoints[i].next_stop_sequence - 1].shape_dist_traveled -
+                    shapesGeometryAnchorPoints[i].shape_dist_traveled <=
+                    distanceBefore) {
+                thisStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
+                lastStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
+                nextStopSequence = Math.min(shapesGeometryAnchorPoints[i].next_stop_sequence + 1, stop_times.length);
             }
-            const isMetro = this.METRO_TRIP_PREFIX_REGEX.test(tripId);
-            const shapesGeometryAnchorPoints = this.getShapesGeometryAnchorPoints(shape_id, shapes, stop_times, isMetro);
-            // MAKING COPY
-            const shapePoints = [];
-            // const to determine shape points of stops (in meters)
-            const distanceBefore = 0.1;
-            const distanceAfter = 0.05;
-            for (let i = 0; i < shapesGeometryAnchorPoints.length; i++) {
-                let bearing = 0;
-                // add bearing from shape computed for previous shapePoint
-                if (i > 0) {
-                    // compute bearing from two shape points
-                    let shapePointBearing = Math.round(turf.bearing(turf.point(shapesGeometryAnchorPoints[i - 1].coordinates), turf.point(shapesGeometryAnchorPoints[i].coordinates)));
-                    // turf.bearing returns -180 to 180, when 0 is north
-                    // we need 0 to 359, for negative value we substract from 360
-                    if (shapePointBearing < 0) {
-                        shapePointBearing = 360 - Math.abs(shapePointBearing);
-                    }
-                    // save bearing
-                    shapePoints[i - 1].bearing = shapePointBearing;
-                    // for the last shapePoint copy the bearing from last one
-                    if (shapesGeometryAnchorPoints.length - 1 === i) {
-                        bearing = shapePoints[i - 1].bearing;
-                    }
-                }
-                // init values
-                let thisStopSequence = null;
-                let lastStopSequence = shapesGeometryAnchorPoints[i].last_stop_sequence;
-                let nextStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
-                // these are origin stop_times shape point fron shapes table, clearly at stops points
-                if (shapesGeometryAnchorPoints[i].this_stop_sequence) {
-                    thisStopSequence = shapesGeometryAnchorPoints[i].this_stop_sequence;
-                }
-                // if is shape anchor point in close distance AFTER LAST stop, then set it also AT STOP
-                else if (i > 0 &&
-                    shapesGeometryAnchorPoints[i].shape_dist_traveled -
-                        stop_times[shapesGeometryAnchorPoints[i].last_stop_sequence - 1].shape_dist_traveled <=
-                        distanceAfter) {
-                    thisStopSequence = shapesGeometryAnchorPoints[i].last_stop_sequence;
-                }
-                // if is shape anchor point in close distance BEFORE NEXT stop, then set it also AT STOP
-                else if (i < shapesGeometryAnchorPoints.length - 1 &&
-                    stop_times[shapesGeometryAnchorPoints[i].next_stop_sequence - 1].shape_dist_traveled -
-                        shapesGeometryAnchorPoints[i].shape_dist_traveled <=
-                        distanceBefore) {
-                    thisStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
-                    lastStopSequence = shapesGeometryAnchorPoints[i].next_stop_sequence;
-                    nextStopSequence = Math.min(shapesGeometryAnchorPoints[i].next_stop_sequence + 1, stop_times.length);
-                }
-                let shapeDistTraveled = shapesGeometryAnchorPoints[i].shape_dist_traveled;
-                let distanceFromLastStop;
-                // fallback to shape_dist_traveled from GTFS stop_times, if the vehicle is at stop
-                // and set distance from last stop to 0 (the stop is literally at stop)
-                if (thisStopSequence !== null) {
-                    shapeDistTraveled = stop_times[thisStopSequence - 1].shape_dist_traveled;
-                    distanceFromLastStop = 0;
-                }
-                else {
-                    distanceFromLastStop =
-                        Math.round((shapeDistTraveled - stop_times[lastStopSequence - 1].shape_dist_traveled) * 1000) / 1000;
-                }
-                // if is trip at stop than set departure by this stop
-                // between stops do linear interpolation from departure from last stop and arrival of next stop
-                const timeScheduledSeconds = thisStopSequence !== null
-                    ? stop_times[lastStopSequence - 1].arrival_time_seconds
-                    : stop_times[lastStopSequence - 1].departure_time_seconds +
-                        Math.round(((stop_times[nextStopSequence - 1].arrival_time_seconds -
-                            stop_times[lastStopSequence - 1].departure_time_seconds) *
-                            distanceFromLastStop) /
-                            (stop_times[nextStopSequence - 1].shape_dist_traveled -
-                                stop_times[lastStopSequence - 1].shape_dist_traveled));
-                shapePoints.push({
-                    index: i,
-                    at_stop: thisStopSequence !== null,
-                    bearing,
-                    coordinates: shapesGeometryAnchorPoints[i].coordinates,
-                    distance_from_last_stop: distanceFromLastStop,
-                    last_stop_sequence: lastStopSequence,
-                    next_stop_sequence: nextStopSequence,
-                    shape_dist_traveled: shapeDistTraveled,
-                    this_stop_sequence: thisStopSequence,
-                    time_scheduled_seconds: timeScheduledSeconds,
-                });
+            let shapeDistTraveled = shapesGeometryAnchorPoints[i].shape_dist_traveled;
+            let distanceFromLastStop;
+            // fallback to shape_dist_traveled from GTFS stop_times, if the vehicle is at stop
+            // and set distance from last stop to 0 (the stop is literally at stop)
+            if (thisStopSequence !== null) {
+                shapeDistTraveled = stop_times[thisStopSequence - 1].shape_dist_traveled;
+                distanceFromLastStop = 0;
             }
-            return {
-                trip_id: tripId,
-                stop_times: stop_times,
-                shapes_anchor_points: shapePoints,
-                shapes: this.mapGtfsShapesToTripShapes(shapes),
-            };
+            else {
+                distanceFromLastStop = this.roundToDecimals(shapeDistTraveled - stop_times[lastStopSequence - 1].shape_dist_traveled, 1000);
+            }
+            // if is trip at stop than set departure by this stop
+            // between stops do linear interpolation from departure from last stop and arrival of next stop
+            const timeScheduledSeconds = thisStopSequence !== null
+                ? stop_times[lastStopSequence - 1].arrival_time_seconds
+                : stop_times[lastStopSequence - 1].departure_time_seconds +
+                    Math.round(((stop_times[nextStopSequence - 1].arrival_time_seconds -
+                        stop_times[lastStopSequence - 1].departure_time_seconds) *
+                        distanceFromLastStop) /
+                        (stop_times[nextStopSequence - 1].shape_dist_traveled -
+                            stop_times[lastStopSequence - 1].shape_dist_traveled));
+            shapePoints.push({
+                index: i,
+                at_stop: thisStopSequence !== null,
+                bearing,
+                coordinates: shapesGeometryAnchorPoints[i].coordinates,
+                distance_from_last_stop: distanceFromLastStop,
+                last_stop_sequence: lastStopSequence,
+                next_stop_sequence: nextStopSequence,
+                shape_dist_traveled: shapeDistTraveled,
+                this_stop_sequence: thisStopSequence,
+                time_scheduled_seconds: timeScheduledSeconds,
+            });
+        }
+        return {
+            trip_id: tripId,
+            stop_times: stop_times,
+            shapes_anchor_points: shapePoints,
+            shapes: this.mapGtfsShapesToTripShapes(shapes),
         };
-        /**
-         * Return geometry of anchor points with distance from start along trip track shape
-         *
-         * @param {string} shapeId - GTFS shape id
-         * @param {ITransformedTripShape[]} shapes - GTFS shape points
-         * @param {IStopTime[]} stops
-         * @returns {IShapeGeometryAnchorPoint[]} - Result array of geometry points along trip track shape
-         */
-        this.getShapesGeometryAnchorPoints = (shapeId, shapes, stops, isMetro = false) => {
-            try {
-                let segmentShapes = [];
-                // Splits shapes array to multiple arrays "delimited" by stops
-                for (let st = 0; st < stops.length; st++) {
-                    let currentSegment = [];
-                    for (let sh = 0; sh < shapes.length; sh++) {
-                        let shapePoint = { ...shapes[sh], shape_at_stop: false };
-                        if (stops[st].shape_dist_traveled === shapes[sh].shape_dist_traveled) {
-                            shapePoint.shape_at_stop = true;
-                        }
-                        if (st < stops.length - 1 &&
-                            shapePoint.shape_dist_traveled >= stops[st].shape_dist_traveled &&
-                            shapePoint.shape_dist_traveled <= stops[st + 1].shape_dist_traveled) {
-                            currentSegment.push(shapePoint);
-                        }
+    }
+    roundToDecimals(n, fraction = 100000) {
+        return Math.round(n * fraction) / fraction;
+    }
+    shouldReadCoordsFromPrevPoint(points, i) {
+        if (i <= 1) {
+            return false;
+        }
+        return (points[i].coordinates[0] === points[i - 1].coordinates[0] && points[i].coordinates[1] === points[i - 1].coordinates[1]);
+    }
+    setupBearingBetweenPoints(index, source, target, isLast) {
+        // add bearing from shape computed for previous shapePoint
+        if (index === 0) {
+            return 0;
+        }
+        let bearing;
+        if (index > 1 && source[index - 1].this_stop_sequence && !source[index].this_stop_sequence) {
+            // Was the previous point at_stop? We'll ignore any bearing computation,
+            // it would point possibly to the after stop segment, usually behind a cross
+            // or after a curve. Thus we'll use the at_stop's incoming (prev point) bearing,
+            // because vehicle stays at_stop for some time, then it starts moving
+            // and we compute bearing in the 1st point after the stop in next iteration
+            return target[index - 1].bearing;
+        }
+        if (this.shouldReadCoordsFromPrevPoint(source, index)) {
+            // take bearing of the previous point (i - 1),
+            // as long as current point and prev. point have same coords
+            // ... to be saved into previous point (i - 1)
+            bearing = target[index - 1].bearing;
+        }
+        else {
+            // compute bearing from two shape points
+            bearing = turf.bearing(turf.point(source[index - 1].coordinates), turf.point(source[index].coordinates));
+        }
+        // turf.bearing returns -180 to 180, when 0 is north
+        // we need 0 to 359 => modulo 360
+        bearing = Math.round((360 + bearing) % 360);
+        // save bearing
+        target[index - 1].bearing = bearing;
+        // for the last shapePoint copy the bearing from last computed one
+        if (isLast) {
+            bearing = target[index - 1].bearing;
+        }
+        return bearing;
+    }
+    shapePointCompareDistance(point, currentStop, nextStop) {
+        if (currentStop.shape_dist_traveled === point.shape_dist_traveled) {
+            point.shape_at_stop = true;
+        }
+        if (nextStop) {
+            if (point.shape_dist_traveled >= currentStop.shape_dist_traveled &&
+                point.shape_dist_traveled <= nextStop.shape_dist_traveled) {
+                // current segment
+                return 0;
+            }
+            else if (point.shape_dist_traveled > nextStop.shape_dist_traveled) {
+                // future segment
+                return 1;
+            }
+        }
+        // previous stop segment OR missing nextStop (currentStop is last stop)
+        return -1;
+    }
+    /**
+     * Return geometry of anchor points with distance from start along trip track shape
+     *
+     * @param {string} shapeId - GTFS shape id
+     * @param {ITransformedTripShape[]} shapes - GTFS shape points
+     * @param {IStopTime[]} stops
+     * @returns {IShapeGeometryAnchorPoint[]} - Result array of geometry points along trip track shape
+     */
+    getShapesGeometryAnchorPoints(shapeId, shapes, stops, isMetro = false) {
+        try {
+            let segmentShapes = [];
+            // Splits shapes array to multiple arrays "delimited" by stops
+            let startShapeIndex = 0;
+            for (let st = 0; st < stops.length; st++) {
+                const currentSegment = [];
+                for (let sh = startShapeIndex; sh < shapes.length; sh++) {
+                    const shapePoint = { ...shapes[sh], shape_at_stop: false };
+                    const shapePointSituation = this.shapePointCompareDistance(shapePoint, stops[st], stops[st + 1]);
+                    if (shapePointSituation === 0) {
+                        // next stop iteration (outer for-cycle) can be shorter
+                        startShapeIndex = sh;
+                        // each segment starts with "at_stop=true" point
+                        currentSegment.push(shapePoint);
                     }
-                    if (currentSegment.length) {
-                        segmentShapes.push(currentSegment);
+                    else if (shapePointSituation === 1) {
+                        // no need to iterate over all future stops segments
+                        break;
                     }
                 }
-                let segmentArr = [];
-                // concat arrays of stop divided segments with distributed shape points
-                for (const segment of segmentShapes) {
-                    segmentArr = [
-                        ...segmentArr,
-                        ...this.divideSegmentLine(segment, isMetro ? this.stepBetweenPointsforMetro : this.stepBetweenPoints),
-                    ];
+                if (currentSegment.length) {
+                    segmentShapes.push(currentSegment);
                 }
-                // Make initial shapesGeometryAnchorPoints
-                let stopCounter = 0;
-                const resultArr = segmentArr.map((segment, index) => {
-                    let this_stop_sequence;
-                    let last_stop_sequence;
-                    let next_stop_sequence;
-                    if (segment.shape_at_stop) {
-                        stopCounter++;
-                        this_stop_sequence = stopCounter;
-                    }
-                    else {
-                        this_stop_sequence = null;
-                    }
-                    last_stop_sequence = stopCounter;
-                    next_stop_sequence = stopCounter + 1;
-                    return {
-                        index,
-                        coordinates: [
-                            Math.round(segment.shape_pt_lon * 100000) / 100000,
-                            Math.round(segment.shape_pt_lat * 100000) / 100000,
-                        ],
-                        last_stop_sequence,
-                        next_stop_sequence,
-                        shape_dist_traveled: Math.round(segment.shape_dist_traveled * 1000) / 1000,
-                        this_stop_sequence,
-                    };
-                });
-                stopCounter++;
-                // and lastly shape point for last stop as there is no segment for last stop
-                resultArr.push({
-                    index: resultArr.length,
-                    coordinates: [
-                        Math.round(shapes[shapes.length - 1].shape_pt_lon * 100000) / 100000,
-                        Math.round(shapes[shapes.length - 1].shape_pt_lat * 100000) / 100000,
-                    ],
-                    last_stop_sequence: stopCounter,
-                    next_stop_sequence: stopCounter,
-                    shape_dist_traveled: Math.round(shapes[shapes.length - 1].shape_dist_traveled * 1000) / 1000,
-                    this_stop_sequence: stopCounter,
-                });
-                return resultArr;
             }
-            catch (err) {
-                helpers_1.log.error(err);
-                helpers_1.log.error(shapeId);
-                return [];
+            let segmentArr = [];
+            // concat arrays of stop divided segments with distributed shape points
+            for (const segment of segmentShapes) {
+                const line = this.divideSegmentLine(segment, isMetro ? this.stepBetweenPointsforMetro : this.stepBetweenPoints);
+                segmentArr.push(...line);
             }
-        };
-        /**
-         * Generate new shape points from segment of trip shape along original one
-         *   - preserving start and end shape points belonging to stops
-         *   - creates new set of shape points between stops to get same point distance along original shape
-         *
-         * @param {ISegmentShape[]} segmentsArr - Original shape points segment between two stops
-         * @param {number} distance - Minimal distance for two consequent shape points
-         * @returns {ISegmentShape[]} - Result array of new shape points
-         */
-        this.divideSegmentLine = (segmentArr, distance = config_1.config.vehiclePositions.stepBetweenPoints) => {
-            const shapeId = segmentArr[0].shape_id;
-            const shapeCount = segmentArr.length;
-            const startShapeDistTraveled = segmentArr[0].shape_dist_traveled;
-            const endShapeDistTraveled = segmentArr[shapeCount - 1].shape_dist_traveled;
-            const shapeDistLength = endShapeDistTraveled - startShapeDistTraveled;
-            const segmentLine = turf.lineString(segmentArr.map((s) => {
-                return [s.shape_pt_lon, s.shape_pt_lat];
-            }));
-            // because we dont believe source shape distances, rather compute length with turf.js
-            const segmentLength = turf.length(segmentLine);
-            const middlePointsCount = Math.floor(segmentLength / distance);
-            const distanceOffset = (segmentLength - distance * middlePointsCount) / 2;
-            // put first shape point
-            const resultSegmentPoints = [
-                {
-                    ...segmentArr[0],
-                    shape_pt_sequence: 1,
-                },
-            ];
-            // for each middle point create acording shape point with interpolated origin shape dist traveled
-            for (let i = 0; i < middlePointsCount; i++) {
-                const currentDistance = i * distance + distanceOffset;
-                const currentDistDistance = (shapeDistLength / segmentLength) * currentDistance;
-                const newPoint = turf.along(segmentLine, i * distance + distanceOffset);
-                resultSegmentPoints.push({
-                    shape_id: shapeId,
-                    shape_at_stop: false,
-                    shape_pt_sequence: resultSegmentPoints.length + 1,
-                    shape_pt_lat: newPoint.geometry.coordinates[1],
-                    shape_pt_lon: newPoint.geometry.coordinates[0],
-                    shape_dist_traveled: startShapeDistTraveled + currentDistDistance,
-                });
-            }
-            return resultSegmentPoints;
-        };
-        this.mapGtfsShapesToTripShapes = (shapes) => {
-            return shapes.map((shape) => {
+            // Make initial shapesGeometryAnchorPoints
+            let stopCounter = 0;
+            const resultArr = segmentArr.map((segment, index) => {
+                let this_stop_sequence;
+                if (segment.shape_at_stop) {
+                    stopCounter++;
+                    this_stop_sequence = stopCounter;
+                }
+                else {
+                    this_stop_sequence = null;
+                }
                 return {
-                    dist: shape.shape_dist_traveled,
-                    coords: [shape.shape_pt_lon, shape.shape_pt_lat],
+                    index,
+                    ...this.getAnchorPointProps(segment.shape_pt_lon, segment.shape_pt_lat, stopCounter, stopCounter + 1, segment.shape_dist_traveled),
+                    this_stop_sequence,
                 };
             });
+            stopCounter++;
+            // and lastly shape point for last stop as there is no segment for last stop
+            resultArr.push({
+                index: resultArr.length,
+                ...this.getAnchorPointProps(shapes[shapes.length - 1].shape_pt_lon, shapes[shapes.length - 1].shape_pt_lat, stopCounter, stopCounter, shapes[shapes.length - 1].shape_dist_traveled),
+                this_stop_sequence: stopCounter,
+            });
+            return resultArr;
+        }
+        catch (err) {
+            helpers_1.log.error(err);
+            helpers_1.log.error(shapeId);
+            return [];
+        }
+    }
+    getAnchorPointProps(lon, lat, last, next, dist) {
+        return {
+            coordinates: [this.roundToDecimals(lon), this.roundToDecimals(lat)],
+            last_stop_sequence: last,
+            next_stop_sequence: next,
+            shape_dist_traveled: this.roundToDecimals(dist, 1000),
         };
-        const simpleConfig = ioc_1.IntegrationEngineContainer.resolve(CoreToken_1.CoreToken.SimpleConfig);
-        this.stepBetweenPoints = config_1.config.vehiclePositions.stepBetweenPoints;
-        this.stepBetweenPointsforMetro = Number(simpleConfig.getValue("module.pid.vehicle-positions.shapes.metro.stepBetweenPointsForMetro", "0.025"));
+    }
+    /**
+     * Generate new shape points from segment of trip shape along original one
+     *   - preserving start and end shape points belonging to stops
+     *   - creates new set of shape points between stops to get same point distance along original shape
+     *
+     * @param {ISegmentShape[]} segmentsArr - Original shape points segment between two stops
+     * @param {number} distance - Minimal distance for two consequent shape points
+     * @returns {ISegmentShape[]} - Result array of new shape points
+     */
+    divideSegmentLine(segmentArr, distance = config_1.config.vehiclePositions.stepBetweenPoints) {
+        const shapeId = segmentArr[0].shape_id;
+        const shapeCount = segmentArr.length;
+        const startShapeDistTraveled = segmentArr[0].shape_dist_traveled;
+        const endShapeDistTraveled = segmentArr[shapeCount - 1].shape_dist_traveled;
+        const shapeDistLength = endShapeDistTraveled - startShapeDistTraveled;
+        const segmentLine = turf.lineString(segmentArr.map((s) => {
+            return [s.shape_pt_lon, s.shape_pt_lat];
+        }));
+        // because we dont believe source shape distances, rather compute length with turf.js
+        const segmentLength = turf.length(segmentLine);
+        const middlePointsCount = Math.floor(segmentLength / distance);
+        const distanceOffset = (segmentLength - distance * middlePointsCount) / 2;
+        // put first shape point
+        const resultSegmentPoints = [
+            {
+                ...segmentArr[0],
+                shape_pt_sequence: 1,
+            },
+        ];
+        // for each middle point create acording shape point with interpolated origin shape dist traveled
+        for (let i = 0; i < middlePointsCount; i++) {
+            const currentDistance = i * distance + distanceOffset;
+            const currentDistDistance = (shapeDistLength / segmentLength) * currentDistance;
+            // There was an idea to skip possibly really small remaining shape distance
+            // to the first computed segment point... but it created possibly more issues
+            // with trams/buses having stops at crossings and having bearing into next point
+            // behind the crossing. Possibly investigate an option to compute points
+            // dynamically on a distance +- 50 meters apart between stops, not just shapes
+            // between stops (excluding next stop)
+            // const minimalDistanceLimit = distance / 10;
+            // if (currentDistDistance < minimalDistanceLimit) {
+            //     // point would be too close, skip it
+            //     // continue;
+            // }
+            const newPoint = turf.along(segmentLine, i * distance + distanceOffset);
+            resultSegmentPoints.push({
+                shape_id: shapeId,
+                shape_at_stop: false,
+                shape_pt_sequence: resultSegmentPoints.length + 1,
+                shape_pt_lat: this.roundToDecimals(newPoint.geometry.coordinates[1]),
+                shape_pt_lon: this.roundToDecimals(newPoint.geometry.coordinates[0]),
+                shape_dist_traveled: this.roundToDecimals(startShapeDistTraveled + currentDistDistance, 1000),
+            });
+        }
+        return resultSegmentPoints;
+    }
+    mapGtfsShapesToTripShapes(shapes) {
+        return shapes.map((shape) => {
+            return {
+                dist: shape.shape_dist_traveled,
+                coords: [shape.shape_pt_lon, shape.shape_pt_lat],
+            };
+        });
     }
 }
 exports.DelayComputationManager = DelayComputationManager;

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DelayComputationManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"DelayComputationManager.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DelayComputationManager.ts"],"names":[],"mappings":"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"}

package/dist/output-gateway/pid/index.d.ts CHANGED Viewed

@@ -45,6 +45,7 @@ export interface IPIDDeparture {
     "trip.last_position.this_stop_sequence": number | null;
     "trip.cis_stop_platform_code": string | null;
     "trip.vehicle_descriptor.is_air_conditioned"?: boolean | null;
+    "trip.last_position.state_position"?: string | null;
     planned_start_timestamp: string | null;
 }
 export interface ITransferAccessibility {

package/dist/output-gateway/pid/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAQA,4CAA0B;AAC1B,2CAAyB;~~AA6KzB~~,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,0CAAyB,CAAA;IACzB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;AACnB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,yCAAuB,CAAA;AAC3B,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED,IAAY,eAQX;AARD,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,2CAAwB,CAAA;IACxB,0DAAuC,CAAA;IACvC,oDAAiC,CAAA;IACjC,mEAAgD,CAAA;IAChD,qEAAkD,CAAA;IAClD,8EAA2D,CAAA;AAC/D,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAED,IAAY,aAMX;AAND,WAAY,aAAa;IACrB,wCAAuB,CAAA;IACvB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,mCAAkB,CAAA;IAClB,8BAA8B;AAClC,CAAC,EANW,aAAa,6BAAb,aAAa,QAMxB"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/output-gateway/pid/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAQA,4CAA0B;AAC1B,2CAAyB;AA8KzB,IAAY,aAIX;AAJD,WAAY,aAAa;IACrB,0CAAyB,CAAA;IACzB,sCAAqB,CAAA;IACrB,gCAAe,CAAA;AACnB,CAAC,EAJW,aAAa,6BAAb,aAAa,QAIxB;AAED,IAAY,cAGX;AAHD,WAAY,cAAc;IACtB,+BAAa,CAAA;IACb,yCAAuB,CAAA;AAC3B,CAAC,EAHW,cAAc,8BAAd,cAAc,QAGzB;AAED,IAAY,eAQX;AARD,WAAY,eAAe;IACvB,gCAAa,CAAA;IACb,2CAAwB,CAAA;IACxB,0DAAuC,CAAA;IACvC,oDAAiC,CAAA;IACjC,mEAAgD,CAAA;IAChD,qEAAkD,CAAA;IAClD,8EAA2D,CAAA;AAC/D,CAAC,EARW,eAAe,+BAAf,eAAe,QAQ1B;AAED,IAAY,aAMX;AAND,WAAY,aAAa;IACrB,wCAAuB,CAAA;IACvB,oCAAmB,CAAA;IACnB,sCAAqB,CAAA;IACrB,mCAAkB,CAAA;IAClB,8BAA8B;AAClC,CAAC,EANW,aAAa,6BAAb,aAAa,QAMxB"}

package/dist/output-gateway/pid/models/helpers/SkipHelper.js CHANGED Viewed

@@ -24,7 +24,12 @@ class SkipHelper {
         return !!lastNumber && lastNumber === tripNumber;
     }
     static hasNoDelayInfo(departure) {
-        return !departure.is_delay_available;
+        if (!("arrival_datetime" in departure)) {
+            return true;
+        }
+        const statePosition = departure["trip.last_position.state_position"];
+        const isFinished = statePosition === "after_track" || statePosition === "after_track_delayed";
+        return !departure.is_delay_available || isFinished;
     }
     /**
      * Used exclusively in departure boards when skip[]=missing is requested (without untracked)
@@ -99,10 +104,12 @@ class SkipHelper {
         if (!("arrival_datetime" in departure)) {
             return false;
         }
+        const statePosition = departure["trip.last_position.state_position"];
         const isAtStop = departure.stop_sequence === departure["trip.last_position.this_stop_sequence"];
         const isPassStop = !!departure["trip.last_position.last_stop_sequence"] &&
             departure.stop_sequence <= departure["trip.last_position.last_stop_sequence"];
-        return isAtStop || isPassStop;
+        const isFinished = statePosition === "after_track" || statePosition === "after_track_delayed";
+        return isAtStop || isPassStop || isFinished;
     }
     static isOutsideStartThreshold(minutesToStart, routeType) {
         const isMetro = routeType === RouteTypeEnums_1.GTFSRouteTypeEnum.METRO;