@golemio/pid 2.2.1-dev.520392716 → 2.2.1-dev.526966885

package/db/migrations/postgresql/20220322111111-valid-to-attribute.js

@@ -0,0 +1,50 @@
+"use strict";
+
+var dbm;
+var type;
+var seed;
+var fs = require("fs");
+var path = require("path");
+var Promise;
+
+/**
+ * We receive the dbmigrate dependency from dbmigrate initially.
+ * This enables us to not have to rely on NODE_PATH.
+ */
+exports.setup = function (options, seedLink) {
+    dbm = options.dbmigrate;
+    type = dbm.dataType;
+    seed = seedLink;
+    Promise = options.Promise;
+};
+
+exports.up = function (db) {
+    var filePath = path.join(__dirname, "sqls", "20220322111111-valid-to-attribute-up.sql");
+    return new Promise(function (resolve, reject) {
+        fs.readFile(filePath, { encoding: "utf-8" }, function (err, data) {
+            if (err) return reject(err);
+            console.log("received data: " + data);
+            resolve(data);
+        });
+    }).then(function (data) {
+        return db.runSql(data);
+    });
+};
+
+exports.down = function (db) {
+    var filePath = path.join(__dirname, "sqls", "20220322111111-valid-to-attribute-down.sql");
+    return new Promise(function (resolve, reject) {
+        fs.readFile(filePath, { encoding: "utf-8" }, function (err, data) {
+            if (err) return reject(err);
+            console.log("received data: " + data);
+
+            resolve(data);
+        });
+    }).then(function (data) {
+        return db.runSql(data);
+    });
+};
+
+exports._meta = {
+    version: 1,
+};

package/db/migrations/postgresql/sqls/20220322111111-valid-to-attribute-down.sql

@@ -0,0 +1 @@
+ALTER TABLE vehiclepositions_positions DROP COLUMN IF EXISTS valid_to;

package/db/migrations/postgresql/sqls/20220322111111-valid-to-attribute-up.sql

@@ -0,0 +1 @@
+ALTER TABLE vehiclepositions_positions ADD COLUMN valid_to bigint;

package/dist/integration-engine/vehicle-positions/VehiclePositionsInterfaces.d.ts

@@ -72,6 +72,7 @@ export interface IPositionToUpdate {
     this_stop_sequence?: number;
     this_stop_name?: string;
     tcp_event?: string | null;
+    valid_to: number;
 }
 export interface IProcessedPositions {
     context: IPositionsContext;
@@ -83,6 +84,7 @@ export interface IUpdatePositionsIteratorOptions {
     startDayTimestamp: number;
     context: IPositionsContext;
     computedPositions: IPositionToUpdate[];
+    gtfsRouteType: GTFSRouteTypeEnum;
 }
 export interface IShapeGeometryAnchorPoint {
     index: number;

package/dist/integration-engine/vehicle-positions/VehiclePositionsUtils.d.ts

@@ -1,7 +1,12 @@
+import { Message as AMQPMessage } from "amqplib";
 import { PositionTrackingEnum } from "../../const";
 import { IUpdateDelayRunTripsData, IUpdateDelayTripsIdsData } from "./models";
-import { IPositionTransformationResult } from "./transformations";
+import { IPositionTransformationResult, IVehiclePositionsRunInput } from "./transformations";
 import { TripStopsSchedule } from "./VehiclePositionsInterfaces";
+interface IParsedRunsMessageData {
+    data: IVehiclePositionsRunInput;
+    timestamp: number;
+}
 export declare class VehiclePositionsUtils {
     static TRIP_STOPS_CACHE_TTL: number;
     static RUN_TRIPS_CACHE_TTL: number;
@@ -9,7 +14,7 @@ export declare class VehiclePositionsUtils {
     /**
      * Determine whether to create new position and its tracking status (trains only for now)
      *
-     * @param {TripStopsSchedule | undefined} tripStopSchedule - Cached trip stops for given block id (see Redis)
+     * @par  {TripStopsSchedule | undefined} tripStopSchedule - Cached trip stops for given block id (see Redis)
      * @param {IUpdateDelayRunTripsData | IUpdateDelayTripsIdsData} trip - New trip
      * @param {IPositionTransformationResult} position - Current position
      */
@@ -22,4 +27,14 @@ export declare class VehiclePositionsUtils {
      * @param {IPositionTransformationResult} position - Current position
      */
     static determineTrackingStatus: (gtfsTripId: string, tripStopSchedule: TripStopsSchedule | undefined, position: IPositionTransformationResult) => PositionTrackingEnum;
+    /**
+     * Calculate default valid_to attribute
+     * return 5min + `origin_timestamp`
+     */
+    static getDefaultValidToAttribute: (origin_timestamp: number) => number;
+    /**
+     * Parse runs data from amqp message
+     */
+    static parseRunsMessageData: (msg: AMQPMessage) => IParsedRunsMessageData;
 }
+export {};

package/dist/integration-engine/vehicle-positions/VehiclePositionsUtils.js

@@ -2,6 +2,7 @@
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VehiclePositionsUtils = void 0;
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const const_1 = require("../../const");
 const models_1 = require("./models");
 class VehiclePositionsUtils {
@@ -14,7 +15,7 @@ VehiclePositionsUtils.DELAY_COMPUTATION_CACHE_TTL = 7200; // 2 hours
 /**
  * Determine whether to create new position and its tracking status (trains only for now)
  *
- * @param {TripStopsSchedule | undefined} tripStopSchedule - Cached trip stops for given block id (see Redis)
+ * @par  {TripStopsSchedule | undefined} tripStopSchedule - Cached trip stops for given block id (see Redis)
  * @param {IUpdateDelayRunTripsData | IUpdateDelayTripsIdsData} trip - New trip
  * @param {IPositionTransformationResult} position - Current position
  */
@@ -43,4 +44,30 @@ VehiclePositionsUtils.determineTrackingStatus = (gtfsTripId, tripStopSchedule, p
     const shouldBeTracking = cisLastStopIndex > -1;
     return shouldBeTracking ? const_1.PositionTrackingEnum.TRACKING : const_1.PositionTrackingEnum.NOT_TRACKING;
 };
+/**
+ * Calculate default valid_to attribute
+ * return 5min + `origin_timestamp`
+ */
+VehiclePositionsUtils.getDefaultValidToAttribute = (origin_timestamp) => {
+    return origin_timestamp + 5 * 60 * 60 * 1000;
+};
+/**
+ * Parse runs data from amqp message
+ */
+VehiclePositionsUtils.parseRunsMessageData = (msg) => {
+    var _b;
+    let data;
+    let timestamp;
+    try {
+        timestamp = msg.properties.timestamp;
+        data = JSON.parse(msg.content.toString());
+        if (!((_b = data === null || data === void 0 ? void 0 : data.M) === null || _b === void 0 ? void 0 : _b.V)) {
+            throw new Error(`Unexpected runs message format: ${JSON.stringify(data)}`);
+        }
+    }
+    catch (err) {
+        throw new golemio_errors_1.CustomError("Error parsing message data.", true, _a.constructor.name, 2004, err);
+    }
+    return { data, timestamp };
+};
 //# sourceMappingURL=VehiclePositionsUtils.js.map

package/dist/integration-engine/vehicle-positions/VehiclePositionsUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"VehiclePositionsUtils.js","sourceRoot":"","sources":["../../../src/integration-engine/vehicle-positions/VehiclePositionsUtils.ts"],"names":[],"mappings":";;;;AAAA,uCAAiD;AACjD,qCAAiG;AAIjG,MAAa,qBAAqB;;AAAlC,sDA+CC;;AA9CiB,0CAAoB,GAAG,KAAM,CAAA,CAAC,UAAU;AACxC,yCAAmB,GAAG,KAAM,CAAA,CAAC,UAAU;AACvC,iDAA2B,GAAG,IAAK,CAAA,CAAC,UAAU;AAE5D;;;;;;GAMG;AACW,kDAA4B,GAAG,CACzC,gBAA+C,EAC/C,IAAyD,EACzD,QAAuC,EACnB,EAAE;IACtB,IAAI,cAAc,GAAG,QAAQ,CAAC,QAAS,CAAC;IACxC,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,eAAe,IAAI,0BAAiB,CAAC,KAAK,EAAE;QAC9F,OAAO,cAAc,CAAC;KACzB;IAED,cAAc,GAAG,EAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IAC7F,OAAO,cAAc,CAAC;AAC1B,CAAE,CAAA;AAEF;;;;;;GAMG;AACW,6CAAuB,GAAG,CACpC,UAAkB,EAClB,gBAA+C,EAC/C,QAAuC,EACnB,EAAE;;IACtB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,UAAU,CAAC,mCAAI,EAAE,CAAC;IACvE,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,QAAQ,CAAC,QAAS,CAAC;KAC7B;IAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC/F,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,CAAC,CAAC,CAAC;IAC/C,OAAO,gBAAgB,CAAC,CAAC,CAAC,4BAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,4BAAoB,CAAC,YAAY,CAAC;AAChG,CAAE,CAAA"}
+{"version":3,"file":"VehiclePositionsUtils.js","sourceRoot":"","sources":["../../../src/integration-engine/vehicle-positions/VehiclePositionsUtils.ts"],"names":[],"mappings":";;;;AACA,6EAAuE;AACvE,uCAAiD;AACjD,qCAAiG;AASjG,MAAa,qBAAqB;;AAAlC,sDA0EC;;AAzEiB,0CAAoB,GAAG,KAAM,CAAA,CAAC,UAAU;AACxC,yCAAmB,GAAG,KAAM,CAAA,CAAC,UAAU;AACvC,iDAA2B,GAAG,IAAK,CAAA,CAAC,UAAU;AAE5D;;;;;;GAMG;AACW,kDAA4B,GAAG,CACzC,gBAA+C,EAC/C,IAAyD,EACzD,QAAuC,EACnB,EAAE;IACtB,IAAI,cAAc,GAAG,QAAQ,CAAC,QAAS,CAAC;IACxC,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,eAAe,IAAI,0BAAiB,CAAC,KAAK,EAAE;QAC9F,OAAO,cAAc,CAAC;KACzB;IAED,cAAc,GAAG,EAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IAC7F,OAAO,cAAc,CAAC;AAC1B,CAAE,CAAA;AAEF;;;;;;GAMG;AACW,6CAAuB,GAAG,CACpC,UAAkB,EAClB,gBAA+C,EAC/C,QAAuC,EACnB,EAAE;;IACtB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAG,UAAU,CAAC,mCAAI,EAAE,CAAC;IACvE,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,QAAQ,CAAC,QAAS,CAAC;KAC7B;IAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC/F,MAAM,gBAAgB,GAAG,gBAAgB,GAAG,CAAC,CAAC,CAAC;IAC/C,OAAO,gBAAgB,CAAC,CAAC,CAAC,4BAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,4BAAoB,CAAC,YAAY,CAAC;AAChG,CAAE,CAAA;AAEF;;;GAGG;AACW,gDAA0B,GAAG,CAAC,gBAAwB,EAAU,EAAE;IAC5E,OAAO,gBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AACjD,CAAE,CAAA;AAEF;;GAEG;AACW,0CAAoB,GAAG,CAAC,GAAgB,EAA0B,EAAE;;IAC9E,IAAI,IAA+B,CAAC;IACpC,IAAI,SAAiB,CAAC;IACtB,IAAI;QACA,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;QACrC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,CAAC,0CAAE,CAAC,CAAA,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC9E;KACJ;IAAC,OAAO,GAAG,EAAE;QACV,MAAM,IAAI,4BAAW,CAAC,6BAA6B,EAAE,IAAI,EAAE,EAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;KAChG;IAED,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;AAC/B,CAAE,CAAA"}

package/dist/integration-engine/vehicle-positions/VehiclePositionsWorker.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+import { Message as AMQPMessage } from "amqplib";
 import { BaseWorker } from "@golemio/core/dist/integration-engine/workers";
 import { IVehiclePositionsRunCommon } from "./transformations";
 import type { IPropagateDelay } from "./VehiclePositionsInterfaces";
@@ -18,32 +18,27 @@ export declare class VehiclePositionsWorker extends BaseWorker {
     private upsertTripsFQ;
     private readonly queuePrefix;
     constructor();
-    saveDataToDB: (msg: {
-        content: Buffer;
-    }) => Promise<void>;
-    saveStopsToDB: (msg: {
-        content: Buffer;
-    }) => Promise<void>;
-    updateGTFSTripId: (msg: {
-        content: Buffer;
-    }) => Promise<void>;
+    saveDataToDB: (msg: AMQPMessage) => Promise<void>;
+    saveStopsToDB: (msg: AMQPMessage) => Promise<void>;
+    updateGTFSTripId: (msg: AMQPMessage) => Promise<void>;
     generateGtfsRt: () => Promise<void>;
     private isUpdateDelayRunTripsIdsData;
     private mapDelayedPositionsToRunTrips;
     propagateDelayForGtfsTrip: (data: IPropagateDelay) => Promise<void>;
-    propagateDelay: (msg: {
-        content: Buffer;
-    }) => Promise<void>;
-    updateDelay: (msg: {
-        content: Buffer;
-    }) => Promise<void>;
+    propagateDelay: (msg: AMQPMessage) => Promise<void>;
+    updateDelay: (msg: AMQPMessage) => Promise<void>;
     /**
-     * Queue listener method - triggers processing of TCP input gateway runs data
+     * Queue listener method - triggers processing of TCP input gateway tram runs data
      *
-     * @param {object} msg - xml->json parsed run message
-     * @returns {void}
+     * @param {AMQPMessage} msg - xml->json parsed run message
      */
-    saveRunsToDB: (msg: Record<string, any>) => Promise<void>;
+    saveTramRunsToDB: (msg: AMQPMessage) => Promise<void>;
+    /**
+     * Queue listener method - triggers processing of TCP input gateway bus runs data
+     *
+     * @param {AMQPMessage} msg - xml->json parsed run message
+     */
+    saveBusRunsToDB: (msg: AMQPMessage) => Promise<void>;
     /**
      * Process not public trips from runs data
      *
@@ -54,18 +49,18 @@ export declare class VehiclePositionsWorker extends BaseWorker {
     /**
      * Queue listener method -  processing trips from runs data
      *
-     * @param {object} msg
+     * @param {AMQPMessage} msg
      * @returns {void}
      */
-    updateRunsGTFSTripId: (msg: {
-        content: Buffer;
-    }) => Promise<void>;
+    updateRunsGTFSTripId: (msg: AMQPMessage) => Promise<void>;
     /**
      * Queue listener method - delete old data
      */
-    deleteOldVehiclePositionsData: (msg: {
-        content: Buffer;
-    }) => Promise<void>;
+    deleteOldVehiclePositionsData: (msg: AMQPMessage) => Promise<void>;
+    /**
+     * Create/update and process transformed run
+     */
+    private processTransformedRun;
     /**
      * Helper runs method to search all trips that PT link can travel
      *
@@ -205,4 +200,12 @@ export declare class VehiclePositionsWorker extends BaseWorker {
      * @returns {ISegmentShape[]} - Result array of new shape points
      */
     private divideSegmentLine;
+    /**
+     * Calculates valid_to attribute value for updateDelay worker
+     *
+     * @param {number} i - Position index
+     * @param {ITripPositionsWithGTFS} tripPositions - Trip positions with shape anchors data
+     * @param {GTFSRouteTypeEnum} gtfsRouteType - Route Type Enum
+     */
+    private getValidToAttribute;
 }

package/dist/integration-engine/vehicle-positions/VehiclePositionsWorker.js

@@ -471,36 +471,32 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
             }
         });
         /**
-         * Queue listener method - triggers processing of TCP input gateway runs data
+         * Queue listener method - triggers processing of TCP input gateway tram runs data
          *
-         * @param {object} msg - xml->json parsed run message
-         * @returns {void}
+         * @param {AMQPMessage} msg - xml->json parsed run message
          */
-        this.saveRunsToDB = (msg) => __awaiter(this, void 0, void 0, function* () {
-            var _d;
-            let data;
-            let timestamp;
-            try {
-                timestamp = msg.properties.timestamp;
-                data = JSON.parse(msg.content.toString());
-                if (!((_d = data === null || data === void 0 ? void 0 : data.M) === null || _d === void 0 ? void 0 : _d.V)) {
-                    throw new Error(`Unexpected saveRunsToDB message format: ${JSON.stringify(data)}`);
-                }
-            }
-            catch (err) {
-                throw new golemio_errors_1.CustomError("Error parsing message data.", true, this.constructor.name, 2004, err);
+        this.saveTramRunsToDB = (msg) => __awaiter(this, void 0, void 0, function* () {
+            const { data, timestamp } = VehiclePositionsUtils_1.VehiclePositionsUtils.parseRunsMessageData(msg);
+            const transformedData = yield this.transformationRuns.transform({ data: data.M.V, timestamp });
+            for (const element of transformedData) {
+                yield this.processTransformedRun(element);
             }
+        });
+        /**
+         * Queue listener method - triggers processing of TCP input gateway bus runs data
+         *
+         * @param {AMQPMessage} msg - xml->json parsed run message
+         */
+        this.saveBusRunsToDB = (msg) => __awaiter(this, void 0, void 0, function* () {
+            var _d;
+            const { data, timestamp } = VehiclePositionsUtils_1.VehiclePositionsUtils.parseRunsMessageData(msg);
             const transformedData = yield this.transformationRuns.transform({ data: data.M.V, timestamp });
             for (const element of transformedData) {
-                const record = yield this.modelRuns.getRunRecordForUpdate(element.run);
-                let outputMsg;
-                if (record) {
-                    outputMsg = yield this.modelRuns.updateAndAssociate(element, record.id);
-                }
-                else {
-                    outputMsg = yield this.modelRuns.createAndAssociate(element);
+                // Internal bus lines should not interfere with tram runs
+                if (((_d = element.run.route_id) === null || _d === void 0 ? void 0 : _d.length) < 3) {
+                    continue;
                 }
-                yield this.sendMessageToExchange("workers." + this.queuePrefix + ".updateRunsGTFSTripId", JSON.stringify(outputMsg));
+                yield this.processTransformedRun(element);
             }
         });
         /**
@@ -519,7 +515,7 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
         /**
          * Queue listener method -  processing trips from runs data
          *
-         * @param {object} msg
+         * @param {AMQPMessage} msg
          * @returns {void}
          */
         this.updateRunsGTFSTripId = (msg) => __awaiter(this, void 0, void 0, function* () {
@@ -608,6 +604,20 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
             yield this.modelStops.deleteNHoursOldData(targetHours);
             yield this.modelPositions.deleteNHoursOldData(targetHours);
         });
+        /**
+         * Create/update and process transformed run
+         */
+        this.processTransformedRun = (element) => __awaiter(this, void 0, void 0, function* () {
+            const record = yield this.modelRuns.getRunRecordForUpdate(element.run);
+            let outputMsg;
+            if (record) {
+                outputMsg = yield this.modelRuns.updateAndAssociate(element, record.id);
+            }
+            else {
+                outputMsg = yield this.modelRuns.createAndAssociate(element);
+            }
+            yield this.sendMessageToExchange("workers." + this.queuePrefix + ".updateRunsGTFSTripId", JSON.stringify(outputMsg));
+        });
         /**
          * Helper runs method to search all trips that PT link can travel
          *
@@ -696,6 +706,7 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
         this.computePositions = (tripPositions) => __awaiter(this, void 0, void 0, function* () {
             const startTimestamp = parseInt(tripPositions.start_timestamp, 10);
             const startDayTimestamp = this.getStartDayTimestamp(startTimestamp, tripPositions.gtfsData.shapes_anchor_points[0].time_scheduled_seconds);
+            const gtfsRouteType = tripPositions.gtfs_route_type;
             return new Promise((resolve) => {
                 const context = {
                     atStopStreak: {
@@ -719,7 +730,7 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
                     tripId: tripPositions.id,
                 };
                 const computedPositions = [];
-                this.updatePositionsIterator(0, { tripPositions, startTimestamp, startDayTimestamp, context, computedPositions }, () => {
+                this.updatePositionsIterator(0, { tripPositions, startTimestamp, startDayTimestamp, context, computedPositions, gtfsRouteType }, () => {
                     resolve({
                         context,
                         positions: computedPositions,
@@ -775,7 +786,7 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
          * @returns {void} - void
          */
         this.updatePositionsIterator = (i, options, cb) => __awaiter(this, void 0, void 0, function* () {
-            const { tripPositions, startDayTimestamp, startTimestamp, context, computedPositions } = options;
+            const { tripPositions, startDayTimestamp, startTimestamp, context, computedPositions, gtfsRouteType } = options;
             if (i === tripPositions.positions.length) {
                 return cb();
             }
@@ -791,6 +802,7 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
                         tcp_event: position.tcp_event,
                     });
                     positionToUpdate = yield this.getEstimatedPoint(tripPositions.gtfsData, currentPosition, context, startDayTimestamp, tripPositions.gtfs_route_type);
+                    positionToUpdate.valid_to = this.getValidToAttribute(i, tripPositions, gtfsRouteType);
                     break;
                 case PositionHandlerEnum.NOT_TRACKING:
                     // if there is no previous positions with tracking status, set position as before_track
@@ -803,9 +815,9 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
                         // if there is no delay to duplicate and DPP trip is far from start then invisible
                         const setAsInvisible = !canDuplicatePropagatedDelay &&
                             this.isDPPTripAndFarFromItsTrack(tripPositions.agency_name_scheduled, position.origin_timestamp, startTimestamp, [position.lng, position.lat], firstShapesAnchorPoint.coordinates);
-                        positionToUpdate = Object.assign({ id: position.id, next_stop_arrival_time: startDayTimestamp + firstStopTime.arrival_time_seconds * 1000, next_stop_departure_time: startDayTimestamp + firstStopTime.departure_time_seconds * 1000, next_stop_id: firstStopTime.stop_id, next_stop_sequence: firstStopTime.stop_sequence, next_stop_name: firstStopTime.stop.stop_name, shape_dist_traveled: firstStopTime.shape_dist_traveled, state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : const_1.StatePositionEnum.BEFORE_TRACK, state_process: const_1.StateProcessEnum.PROCESSED }, (firstStopTime.stop_headsign && {
+                        positionToUpdate = Object.assign(Object.assign({ id: position.id, next_stop_arrival_time: startDayTimestamp + firstStopTime.arrival_time_seconds * 1000, next_stop_departure_time: startDayTimestamp + firstStopTime.departure_time_seconds * 1000, next_stop_id: firstStopTime.stop_id, next_stop_sequence: firstStopTime.stop_sequence, next_stop_name: firstStopTime.stop.stop_name, shape_dist_traveled: firstStopTime.shape_dist_traveled, state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : const_1.StatePositionEnum.BEFORE_TRACK, state_process: const_1.StateProcessEnum.PROCESSED }, (firstStopTime.stop_headsign && {
                             last_stop_headsign: firstStopTime.stop_headsign,
-                        }));
+                        })), { valid_to: this.getValidToAttribute(i, tripPositions, gtfsRouteType) });
                         if (!setAsInvisible && canDuplicatePropagatedDelay) {
                             positionToUpdate.delay = context.lastPositionBeforeTrackDelayed.delay;
                         }
@@ -819,9 +831,9 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
                         const lastStopTime = tripPositions.gtfsData.stop_times[tripPositions.gtfsData.stop_times.length - 1];
                         // set as invisible if there are some AFTER_TRACK before
                         const setAsInvisible = context.isLastPositionAfterTrack && statePosition === const_1.StatePositionEnum.AFTER_TRACK;
-                        positionToUpdate = Object.assign({ id: position.id, last_stop_arrival_time: startDayTimestamp + lastShapesAnchorPoint.time_scheduled_seconds * 1000, last_stop_departure_time: startDayTimestamp + lastShapesAnchorPoint.time_scheduled_seconds * 1000, last_stop_id: lastStopTime.stop_id, last_stop_sequence: lastShapesAnchorPoint.last_stop_sequence, shape_dist_traveled: lastShapesAnchorPoint.shape_dist_traveled, state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : statePosition, state_process: const_1.StateProcessEnum.PROCESSED }, (lastStopTime.stop_headsign && {
+                        positionToUpdate = Object.assign(Object.assign({ id: position.id, last_stop_arrival_time: startDayTimestamp + lastShapesAnchorPoint.time_scheduled_seconds * 1000, last_stop_departure_time: startDayTimestamp + lastShapesAnchorPoint.time_scheduled_seconds * 1000, last_stop_id: lastStopTime.stop_id, last_stop_sequence: lastShapesAnchorPoint.last_stop_sequence, shape_dist_traveled: lastShapesAnchorPoint.shape_dist_traveled, state_position: setAsInvisible ? const_1.StatePositionEnum.INVISIBLE : statePosition, state_process: const_1.StateProcessEnum.PROCESSED }, (lastStopTime.stop_headsign && {
                             last_stop_headsign: lastStopTime.stop_headsign,
-                        }));
+                        })), { valid_to: this.getValidToAttribute(i, tripPositions, gtfsRouteType) });
                     }
                     break;
                 case PositionHandlerEnum.CANCELED:
@@ -829,6 +841,7 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
                         id: position.id,
                         state_position: const_1.StatePositionEnum.CANCELED,
                         state_process: const_1.StateProcessEnum.PROCESSED,
+                        valid_to: this.getValidToAttribute(i, tripPositions, gtfsRouteType),
                     };
                     break;
                 case PositionHandlerEnum.DO_NOTHING:
@@ -1119,6 +1132,7 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
                         last_stop_headsign: tripStopTimes[thisClosestPoint.last_stop_sequence - 1].stop_headsign || undefined,
                         state_position: statePosition,
                         state_process: const_1.StateProcessEnum.PROCESSED,
+                        valid_to: VehiclePositionsUtils_1.VehiclePositionsUtils.getDefaultValidToAttribute(currentPosition.properties.origin_timestamp),
                     };
                 }
                 // next step
@@ -1145,7 +1159,7 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
             // init radius around GPS position ( 200 meters radius, 16 points polygon aka circle)
             const radius = turf.circle(currentPosition, 0.2, { steps: 16 });
             //Initial value
-            let estimatedPoint = Object.assign({ id: currentPosition.properties.id, state_position: const_1.StatePositionEnum.OFF_TRACK, state_process: const_1.StateProcessEnum.PROCESSED, tcp_event: currentPosition.properties.tcp_event }, (context &&
+            let estimatedPoint = Object.assign({ id: currentPosition.properties.id, state_position: const_1.StatePositionEnum.OFF_TRACK, state_process: const_1.StateProcessEnum.PROCESSED, tcp_event: currentPosition.properties.tcp_event, valid_to: VehiclePositionsUtils_1.VehiclePositionsUtils.getDefaultValidToAttribute(currentPosition.properties.origin_timestamp) }, (context &&
                 ((_e = context.lastPositionTracking) === null || _e === void 0 ? void 0 : _e.properties.last_stop_sequence) && {
                 shape_dist_traveled: (_f = context.lastPositionTracking) === null || _f === void 0 ? void 0 : _f.properties.shape_dist_traveled,
                 last_stop_arrival_time: (_g = context.lastPositionTracking) === null || _g === void 0 ? void 0 : _g.properties.last_stop_arrival_time,
@@ -1391,6 +1405,41 @@ class VehiclePositionsWorker extends workers_1.BaseWorker {
             }
             return resultSegmentPoints;
         };
+        /**
+         * Calculates valid_to attribute value for updateDelay worker
+         *
+         * @param {number} i - Position index
+         * @param {ITripPositionsWithGTFS} tripPositions - Trip positions with shape anchors data
+         * @param {GTFSRouteTypeEnum} gtfsRouteType - Route Type Enum
+         */
+        this.getValidToAttribute = (positionIndex, tripPositions, gtfsRouteType) => {
+            const position = tripPositions.positions[positionIndex];
+            // For TRAM only:
+            if (gtfsRouteType === models_2.GTFSRouteTypeEnum.TRAM) {
+                // For all real stops:
+                // return default valid to attribute + the time difference between departure and arrival
+                if (position.state_position == "at_stop" &&
+                    position.last_stop_arrival_time != position.last_stop_departure_time &&
+                    position.last_stop_arrival_time &&
+                    position.last_stop_departure_time) {
+                    return (VehiclePositionsUtils_1.VehiclePositionsUtils.getDefaultValidToAttribute(position.origin_timestamp) +
+                        (position.last_stop_departure_time - position.last_stop_arrival_time));
+                }
+                // For final positions:
+                // return default valid to attribute + the time difference between (next trip departure) and arrival
+                /*
+                if (position.state_position == "after_track" && position.last_stop_arrival_time) {
+                    return VehiclePositionsUtils.getDefaultValidToAttribute(position.origin_timestamp) +
+                    (
+                        //implement here: time difference between (next trip departure) and arrival
+                    )
+                     - position.last_stop_arrival_time;
+                }
+                */
+            }
+            // For all other positions:
+            return VehiclePositionsUtils_1.VehiclePositionsUtils.getDefaultValidToAttribute(position.origin_timestamp);
+        };
         this.modelPositions = new models_2.VehiclePositionsPositionsModel();
         this.modelStops = new models_2.VehiclePositionsStopsModel();
         this.modelRuns = new models_2.VehiclePositionsRunsModel();