@golemio/pid 2.12.11 → 2.13.0-rc.1284379387

package/db/example/12_metro_line_A_gtfs_trips.sql

@@ -97,8 +97,7 @@ INSERT INTO ropidgtfs_run_numbers_actual (route_id,run_number,service_id,trip_id
 	 ('L991',5,'1111111-1','991_78_220321',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
 	 ('L991',5,'1111111-1','991_124_201230',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
 	 ('L991',8,'1111111-3','991_124_201230',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
-	 ('L991',9,'1111111-1','991_294_220901',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
-	 ('L991',17,'1111111-3','991_294_220901',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL);
+	 ('L991',9,'1111111-1','991_294_220901',3,NULL,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL);
 
 WITH init_values AS (
     SELECT CAST(current_date - INTERVAL '1 day' + INTERVAL '10 hour' AS TIMESTAMP WITH TIME ZONE) AT TIME ZONE 'Europe/Prague' AS origin_datetime

package/db/migrations/postgresql/20240418133218-detailed-stop-times.js

@@ -0,0 +1,53 @@
+'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', '20240418133218-detailed-stop-times-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', '20240418133218-detailed-stop-times-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/20240418133218-detailed-stop-times-down.sql

@@ -0,0 +1,263 @@
+drop view v_public_vehiclepositions_combined_stop_times;
+
+drop view v_public_vehiclepositions_future_stop_times;
+
+drop view v_public_vehiclepositions_past_stop_times;
+
+-- history view
+create view v_public_vehiclepositions_past_stop_times as
+select
+    trips_id as rt_trip_id,
+    last_stop_sequence as stop_sequence,
+    min(delay_stop_arrival) as stop_arr_delay,
+    max(delay_stop_departure) as stop_dep_delay
+from
+    (
+        select
+            trips_id,
+            last_stop_sequence,
+            delay_stop_arrival,
+            delay_stop_departure,
+            row_number() over seq as rn
+        from
+            vehiclepositions_positions rt_position
+        where
+            (
+                delay_stop_arrival is not null
+                or delay_stop_departure is not null
+            )
+            and state_position in ('on_track', 'at_stop', 'after_track') window seq as (
+                partition by trips_id,
+                last_stop_sequence,
+                state_position
+                order by
+                    id
+            )
+    ) as sub
+where
+    rn = 1
+group by
+    trips_id,
+    last_stop_sequence
+order by
+    trips_id,
+    last_stop_sequence;
+
+-- prediction view
+create view v_public_vehiclepositions_future_stop_times as with recursive stop_times as (
+    select
+        rst.trip_id,
+        vt.id as trips_id,
+        vt.provider_source_type,
+        vp.delay,
+        coalesce(vp.last_stop_sequence, 1) as initial_stop_sequence,
+        vp.state_position,
+        rst.stop_sequence,
+        rst.computed_dwell_time_seconds,
+        case
+            when vp.last_stop_sequence is null then vp.delay
+            else vp.delay_stop_arrival
+        end as arrival_delay_seconds,
+        case
+            when vp.last_stop_sequence is null then predict_delay_seconds(
+                vp.delay,
+                rst.computed_dwell_time_seconds,
+                vt.provider_source_type
+            )
+            when vp.state_position = 'at_stop' then case
+                when vt.provider_source_type = '1' then greatest(0, vp.delay)
+                else vp.delay
+            end
+            else vp.delay_stop_departure
+        end as departure_delay_seconds
+    from
+        ropidgtfs_stop_times rst
+        join vehiclepositions_trips vt on vt.gtfs_trip_id = rst.trip_id
+        join vehiclepositions_positions vp on vp.id = vt.last_position_id
+        and (
+            vp.valid_to is null
+            or vp.valid_to >= now()
+        )
+        and vp.state_position in ('on_track', 'at_stop')
+    where
+        vt.gtfs_trip_id is not null
+        and rst.stop_sequence = coalesce(vp.last_stop_sequence, 1)
+    union
+    all
+    select
+        rst.trip_id,
+        previous_row.trips_id as trips_id,
+        previous_row.provider_source_type,
+        previous_row.delay,
+        previous_row.initial_stop_sequence,
+        previous_row.state_position,
+        rst.stop_sequence,
+        rst.computed_dwell_time_seconds,
+        case
+            when rst.stop_sequence - previous_row.initial_stop_sequence = 1
+            and previous_row.state_position != 'at_stop' then previous_row.delay
+            else previous_row.departure_delay_seconds
+        end as arrival_delay_seconds,
+        predict_delay_seconds(
+            case
+                when rst.stop_sequence - previous_row.initial_stop_sequence = 1
+                and previous_row.state_position != 'at_stop' then previous_row.delay
+                else previous_row.departure_delay_seconds
+            end,
+            rst.computed_dwell_time_seconds,
+            previous_row.provider_source_type
+        ) as departure_delay_seconds
+    from
+        stop_times previous_row
+        join ropidgtfs_stop_times rst on rst.trip_id = previous_row.trip_id
+        and rst.stop_sequence = previous_row.stop_sequence + 1
+)
+select
+    trips_id as rt_trip_id,
+    stop_sequence,
+    coalesce(arrival_delay_seconds, 0) as stop_arr_delay,
+    coalesce(departure_delay_seconds, 0) as stop_dep_delay
+from
+    stop_times
+order by
+    trip_id,
+    stop_sequence;
+
+-- combined view
+create view v_public_vehiclepositions_combined_stop_times as
+select
+    distinct on (rt_trip_id, stop_sequence) stop_times.rt_trip_id,
+    vt.gtfs_trip_id,
+    stop_times.stop_sequence,
+    stop_times.stop_arr_delay,
+    stop_times.stop_dep_delay,
+    vt.gtfs_route_type,
+    vt.gtfs_route_short_name,
+    vt.run_number,
+    vt.internal_run_number,
+    vt.provider_source_type,
+    vt.cis_trip_number,
+    vt.vehicle_registration_number
+from
+    (
+        select
+            *
+        from
+            v_public_vehiclepositions_future_stop_times prediction
+        union
+        all
+        select
+            *
+        from
+            v_public_vehiclepositions_past_stop_times history
+    ) as stop_times
+    join vehiclepositions_trips vt on vt.id = stop_times.rt_trip_id
+    join vehiclepositions_positions vp on vt.last_position_id = vp.id
+    and (
+        vp.valid_to is null
+        or vp.valid_to >= now()
+    )
+    and vp.state_position != 'after_track'
+order by
+    rt_trip_id,
+    stop_sequence;
+
+-- old view
+create view v_vehiclepositions_stop_time_delay_prediction as with recursive stop_times as (
+    select
+        vt.id,
+        rst.trip_id,
+        vt.provider_source_type,
+        vp.delay,
+        coalesce(vp.last_stop_sequence, 1) as initial_stop_sequence,
+        vp.state_position,
+        rst.stop_sequence,
+        rst.stop_id,
+        rs.platform_code,
+        vcs.cis_stop_platform_code,
+        rst.computed_dwell_time_seconds,
+        case
+            when vp.last_stop_sequence is null then vp.delay
+            else vp.delay_stop_arrival
+        end as arrival_delay_seconds,
+        case
+            when vp.last_stop_sequence is null then predict_delay_seconds(
+                vp.delay,
+                rst.computed_dwell_time_seconds,
+                vt.provider_source_type
+            )
+            when vp.state_position = 'at_stop' then case
+                when vt.provider_source_type = '1' then greatest(0, vp.delay)
+                else vp.delay
+            end
+            else vp.delay_stop_departure
+        end as departure_delay_seconds
+    from
+        ropidgtfs_stop_times rst
+        inner join vehiclepositions_trips vt on vt.gtfs_trip_id = rst.trip_id
+        inner join vehiclepositions_positions vp on vp.id = vt.last_position_id
+        and (
+            vp.valid_to is null
+            or vp.valid_to >= now()
+        )
+        left join ropidgtfs_stops rs on rs.stop_id = rst.stop_id
+        left join ropidgtfs_cis_stops rcs on rcs.id = rs.computed_cis_stop_id
+        left join vehiclepositions_cis_stops vcs on vcs.rt_trip_id = vt.id
+        and vcs.cis_stop_group_id = rcs.cis
+    where
+        vt.gtfs_trip_id is not null
+        and rst.stop_sequence = coalesce(vp.last_stop_sequence, 1)
+    union
+    all
+    select
+        previous_row.id,
+        rst.trip_id,
+        previous_row.provider_source_type,
+        previous_row.delay,
+        previous_row.initial_stop_sequence,
+        previous_row.state_position,
+        rst.stop_sequence,
+        rst.stop_id,
+        rs.platform_code,
+        vcs.cis_stop_platform_code,
+        rst.computed_dwell_time_seconds,
+        case
+            when rst.stop_sequence - previous_row.initial_stop_sequence = 1
+            and previous_row.state_position != 'at_stop' then previous_row.delay
+            else previous_row.departure_delay_seconds
+        end as arrival_delay_seconds,
+        predict_delay_seconds(
+            case
+                when rst.stop_sequence - previous_row.initial_stop_sequence = 1
+                and previous_row.state_position != 'at_stop' then previous_row.delay
+                else previous_row.departure_delay_seconds
+            end,
+            rst.computed_dwell_time_seconds,
+            previous_row.provider_source_type
+        ) as departure_delay_seconds
+    from
+        stop_times previous_row
+        inner join ropidgtfs_stop_times rst on rst.trip_id = previous_row.trip_id
+        and rst.stop_sequence = previous_row.stop_sequence + 1
+        left join ropidgtfs_stops rs on rs.stop_id = rst.stop_id
+        left join ropidgtfs_cis_stops rcs on rcs.id = rs.computed_cis_stop_id
+        left join vehiclepositions_cis_stops vcs on vcs.rt_trip_id = previous_row.id
+        and vcs.cis_stop_group_id = rcs.cis
+)
+select
+    trip_id,
+    stop_sequence,
+    stop_id,
+    platform_code,
+    cis_stop_platform_code,
+    arrival_delay_seconds,
+    departure_delay_seconds
+from
+    stop_times
+order by
+    trip_id,
+    stop_sequence;
+
+comment on view v_vehiclepositions_stop_time_delay_prediction is '
+This view contains the predicted delay of a vehicle at each stop.
+';

package/db/migrations/postgresql/sqls/20240418133218-detailed-stop-times-up.sql

@@ -0,0 +1,174 @@
+-- history view
+create
+or replace view v_public_vehiclepositions_past_stop_times as
+select
+    trips_id as rt_trip_id,
+    last_stop_sequence as stop_sequence,
+    min(delay_stop_arrival) as stop_arr_delay,
+    max(delay_stop_departure) as stop_dep_delay,
+    last_stop_id as stop_id
+from
+    (
+        select
+            trips_id,
+            last_stop_id,
+            last_stop_sequence,
+            delay_stop_arrival,
+            delay_stop_departure,
+            row_number() over seq as rn
+        from
+            vehiclepositions_positions rt_position
+        where
+            (
+                delay_stop_arrival is not null
+                or delay_stop_departure is not null
+            )
+            and state_position in ('on_track', 'at_stop', 'after_track') window seq as (
+                partition by trips_id,
+                last_stop_sequence,
+                state_position
+                order by
+                    id
+            )
+    ) as sub
+where
+    rn = 1
+group by
+    trips_id,
+    last_stop_sequence,
+    last_stop_id
+order by
+    trips_id,
+    last_stop_sequence;
+
+-- prediction view
+create
+or replace view v_public_vehiclepositions_future_stop_times as with recursive stop_times as (
+    select
+        rst.trip_id,
+        vt.id as trips_id,
+        vt.provider_source_type,
+        vp.delay,
+        coalesce(vp.last_stop_sequence, 1) as initial_stop_sequence,
+        vp.state_position,
+        rst.stop_id,
+        rst.stop_sequence,
+        rst.computed_dwell_time_seconds,
+        case
+            when vp.last_stop_sequence is null then vp.delay
+            else vp.delay_stop_arrival
+        end as arrival_delay_seconds,
+        case
+            when vp.last_stop_sequence is null then predict_delay_seconds(
+                vp.delay,
+                rst.computed_dwell_time_seconds,
+                vt.provider_source_type
+            )
+            when vp.state_position = 'at_stop' then case
+                when vt.provider_source_type = '1' then greatest(0, vp.delay)
+                else vp.delay
+            end
+            else vp.delay_stop_departure
+        end as departure_delay_seconds
+    from
+        ropidgtfs_stop_times rst
+        join vehiclepositions_trips vt on vt.gtfs_trip_id = rst.trip_id
+        join vehiclepositions_positions vp on vp.id = vt.last_position_id
+        and (
+            vp.valid_to is null
+            or vp.valid_to >= now()
+        )
+        and vp.state_position in ('on_track', 'at_stop')
+    where
+        vt.gtfs_trip_id is not null
+        and rst.stop_sequence = coalesce(vp.last_stop_sequence, 1)
+    union
+    all
+    select
+        rst.trip_id,
+        previous_row.trips_id as trips_id,
+        previous_row.provider_source_type,
+        previous_row.delay,
+        previous_row.initial_stop_sequence,
+        previous_row.state_position,
+        rst.stop_id,
+        rst.stop_sequence,
+        rst.computed_dwell_time_seconds,
+        case
+            when rst.stop_sequence - previous_row.initial_stop_sequence = 1
+            and previous_row.state_position != 'at_stop' then previous_row.delay
+            else previous_row.departure_delay_seconds
+        end as arrival_delay_seconds,
+        predict_delay_seconds(
+            case
+                when rst.stop_sequence - previous_row.initial_stop_sequence = 1
+                and previous_row.state_position != 'at_stop' then previous_row.delay
+                else previous_row.departure_delay_seconds
+            end,
+            rst.computed_dwell_time_seconds,
+            previous_row.provider_source_type
+        ) as departure_delay_seconds
+    from
+        stop_times previous_row
+        join ropidgtfs_stop_times rst on rst.trip_id = previous_row.trip_id
+        and rst.stop_sequence = previous_row.stop_sequence + 1
+)
+select
+    trips_id as rt_trip_id,
+    stop_sequence,
+    coalesce(arrival_delay_seconds, 0) as stop_arr_delay,
+    coalesce(departure_delay_seconds, 0) as stop_dep_delay,
+    stop_id
+from
+    stop_times
+order by
+    trip_id,
+    stop_sequence;
+
+-- combined view
+create
+or replace view v_public_vehiclepositions_combined_stop_times as
+select
+    distinct on (rt_trip_id, stop_sequence) stop_times.rt_trip_id,
+    vt.gtfs_trip_id,
+    stop_times.stop_sequence,
+    stop_times.stop_arr_delay,
+    stop_times.stop_dep_delay,
+    vt.gtfs_route_type,
+    vt.gtfs_route_short_name,
+    vt.run_number,
+    vt.internal_run_number,
+    vt.provider_source_type,
+    vt.cis_trip_number,
+    vt.vehicle_registration_number,
+    stop_times.stop_id,
+    vcs.cis_stop_platform_code,
+    rs.platform_code
+from
+    (
+        select
+            *
+        from
+            v_public_vehiclepositions_future_stop_times prediction
+        union
+        all
+        select
+            *
+        from
+            v_public_vehiclepositions_past_stop_times history
+    ) as stop_times
+    join vehiclepositions_trips vt on vt.id = stop_times.rt_trip_id
+    join vehiclepositions_positions vp on vt.last_position_id = vp.id
+    and (
+        vp.valid_to is null
+        or vp.valid_to >= now()
+    )
+    and vp.state_position != 'after_track'
+    left join ropidgtfs_stops rs on rs.stop_id = stop_times.stop_id
+    left join vehiclepositions_cis_stops vcs on vcs.rt_trip_id = stop_times.rt_trip_id
+order by
+    rt_trip_id,
+    stop_sequence;
+
+-- old view
+drop view v_vehiclepositions_stop_time_delay_prediction;

package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.d.ts

@@ -1,7 +1,5 @@
 import { IGtfsRtTripDto } from "../../../../../schema-definitions/vehicle-positions/models/interfaces/IGtfsRtTripDto";
 import { IVehicleDescriptor } from "../interfaces/GtfsRealtimeInterfaces";
 export declare class VehicleDescriptor {
-    private vehicleIdGenerator;
-    constructor();
     getVehicleDescriptor(tripRecord: IGtfsRtTripDto): IVehicleDescriptor;
 }

package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.js

@@ -3,12 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VehicleDescriptor = void 0;
 const VehicleIdGenerator_1 = require("./VehicleIdGenerator");
 class VehicleDescriptor {
-    constructor() {
-        this.vehicleIdGenerator = new VehicleIdGenerator_1.VehicleIdGenerator();
-    }
     getVehicleDescriptor(tripRecord) {
         var _a;
-        return Object.assign(Object.assign({ id: this.vehicleIdGenerator.getVehicleId(tripRecord.id, tripRecord.gtfs_route_type, tripRecord.provider_source_type, tripRecord.gtfs_route_short_name, tripRecord.cis_trip_number, tripRecord.vehicle_registration_number, tripRecord.run_number, tripRecord.internal_run_number) }, (tripRecord.vehicle_registration_number && {
+        return Object.assign(Object.assign({ id: VehicleIdGenerator_1.VehicleIdGenerator.getVehicleId(tripRecord.id, tripRecord.gtfs_route_type, tripRecord.provider_source_type, tripRecord.gtfs_route_short_name, tripRecord.cis_trip_number, tripRecord.vehicle_registration_number, tripRecord.run_number, tripRecord.internal_run_number) }, (tripRecord.vehicle_registration_number && {
             label: tripRecord.vehicle_registration_number.toString(),
         })), { ".transit_realtime.ovapiVehicleDescriptor": {
                 wheelchairAccessible: (_a = tripRecord.wheelchair_accessible) !== null && _a !== void 0 ? _a : undefined,

package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"VehicleDescriptor.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.ts"],"names":[],"mappings":";;;AAEA,6DAA0D;AAE1D,MAAa,iBAAiB;IAE1B;QACI,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,EAAE,CAAC;IACvD,CAAC;IACM,oBAAoB,CAAC,UAA0B;;QAClD,qCACI,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,YAAY,CACpC,UAAU,CAAC,EAAE,EACb,UAAU,CAAC,eAAe,EAC1B,UAAU,CAAC,oBAAoB,EAC/B,UAAU,CAAC,qBAAqB,EAChC,UAAU,CAAC,eAAe,EAC1B,UAAU,CAAC,2BAA2B,EACtC,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,mBAAmB,CACjC,IACE,CAAC,UAAU,CAAC,2BAA2B,IAAI;YAC1C,KAAK,EAAE,UAAU,CAAC,2BAA2B,CAAC,QAAQ,EAAE;SAC3D,CAAC,KACF,0CAA0C,EAAE;gBACxC,oBAAoB,EAAE,MAAA,UAAU,CAAC,qBAAqB,mCAAI,SAAS;gBACnE,WAAW,EAAE,UAAU,CAAC,kBAAkB;oBACtC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;oBACtF,CAAC,CAAC,SAAS;aAClB,IACH;IACN,CAAC;CACJ;AA5BD,8CA4BC"}
+{"version":3,"file":"VehicleDescriptor.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleDescriptor.ts"],"names":[],"mappings":";;;AAEA,6DAA0D;AAE1D,MAAa,iBAAiB;IACnB,oBAAoB,CAAC,UAA0B;;QAClD,qCACI,EAAE,EAAE,uCAAkB,CAAC,YAAY,CAC/B,UAAU,CAAC,EAAE,EACb,UAAU,CAAC,eAAe,EAC1B,UAAU,CAAC,oBAAoB,EAC/B,UAAU,CAAC,qBAAqB,EAChC,UAAU,CAAC,eAAe,EAC1B,UAAU,CAAC,2BAA2B,EACtC,UAAU,CAAC,UAAU,EACrB,UAAU,CAAC,mBAAmB,CACjC,IACE,CAAC,UAAU,CAAC,2BAA2B,IAAI;YAC1C,KAAK,EAAE,UAAU,CAAC,2BAA2B,CAAC,QAAQ,EAAE;SAC3D,CAAC,KACF,0CAA0C,EAAE;gBACxC,oBAAoB,EAAE,MAAA,UAAU,CAAC,qBAAqB,mCAAI,SAAS;gBACnE,WAAW,EAAE,UAAU,CAAC,kBAAkB;oBACtC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;oBACtF,CAAC,CAAC,SAAS;aAClB,IACH;IACN,CAAC;CACJ;AAxBD,8CAwBC"}

package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleIdGenerator.d.ts

@@ -1,5 +1,5 @@
 import { GTFSRouteTypeEnum } from "../../../../../helpers/RouteTypeEnums";
 import { ProviderSourceTypeEnum } from "../../vehicle-positions/helpers/ProviderSourceTypeEnum";
 export declare class VehicleIdGenerator {
-    getVehicleId(trip_id: string, gtfs_route_type: GTFSRouteTypeEnum | null, provider_source_type: ProviderSourceTypeEnum, gtfs_route_short_name: string | null, cis_trip_number: number | null, vehicle_registration_number: number | null, run_number: number | null, internal_run_number: number | null): string;
+    static getVehicleId(trip_id: string, gtfs_route_type: GTFSRouteTypeEnum | null, provider_source_type: ProviderSourceTypeEnum, gtfs_route_short_name: string | null, cis_trip_number: number | null, vehicle_registration_number: number | null, run_number: number | null, internal_run_number: number | null): string;
 }

package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleIdGenerator.js

@@ -4,7 +4,7 @@ exports.VehicleIdGenerator = void 0;
 const RouteTypeEnums_1 = require("../../../../../helpers/RouteTypeEnums");
 const ProviderSourceTypeEnum_1 = require("../../vehicle-positions/helpers/ProviderSourceTypeEnum");
 class VehicleIdGenerator {
-    getVehicleId(trip_id, gtfs_route_type, provider_source_type, gtfs_route_short_name, cis_trip_number, vehicle_registration_number, run_number, internal_run_number) {
+    static getVehicleId(trip_id, gtfs_route_type, provider_source_type, gtfs_route_short_name, cis_trip_number, vehicle_registration_number, run_number, internal_run_number) {
         if (gtfs_route_type === RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN) {
             return "train-" + cis_trip_number;
         }

package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleIdGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"VehicleIdGenerator.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleIdGenerator.ts"],"names":[],"mappings":";;;AAAA,0EAA+D;AAC/D,mGAAwH;AAExH,MAAa,kBAAkB;IACpB,YAAY,CACf,OAAe,EACf,eAAyC,EACzC,oBAA4C,EAC5C,qBAAoC,EACpC,eAA8B,EAC9B,2BAA0C,EAC1C,UAAyB,EACzB,mBAAkC;QAElC,IAAI,eAAe,KAAK,kCAAiB,CAAC,KAAK,EAAE;YAC7C,OAAO,QAAQ,GAAG,eAAe,CAAC;SACrC;QAED,IAAI,eAAe,KAAK,kCAAiB,CAAC,KAAK,EAAE;YAC7C,OAAO,SAAS,qBAAqB,IAAI,mBAAmB,IAAI,UAAU,EAAE,CAAC;SAChF;QAED,IAAI,oBAAoB,KAAK,+CAAsB,CAAC,cAAc,EAAE;YAChE,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;YAClD,OAAO,WAAW,eAAe,IAAI,cAAc,EAAE,CAAC;SACzD;QAED,OAAO,UAAU,GAAG,eAAe,GAAG,GAAG,GAAG,2BAA2B,CAAC;IAC5E,CAAC;CACJ;AA1BD,gDA0BC"}
+{"version":3,"file":"VehicleIdGenerator.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/gtfs-rt/helpers/VehicleIdGenerator.ts"],"names":[],"mappings":";;;AAAA,0EAA+D;AAC/D,mGAAwH;AAExH,MAAa,kBAAkB;IACpB,MAAM,CAAC,YAAY,CACtB,OAAe,EACf,eAAyC,EACzC,oBAA4C,EAC5C,qBAAoC,EACpC,eAA8B,EAC9B,2BAA0C,EAC1C,UAAyB,EACzB,mBAAkC;QAElC,IAAI,eAAe,KAAK,kCAAiB,CAAC,KAAK,EAAE;YAC7C,OAAO,QAAQ,GAAG,eAAe,CAAC;SACrC;QAED,IAAI,eAAe,KAAK,kCAAiB,CAAC,KAAK,EAAE;YAC7C,OAAO,SAAS,qBAAqB,IAAI,mBAAmB,IAAI,UAAU,EAAE,CAAC;SAChF;QAED,IAAI,oBAAoB,KAAK,+CAAsB,CAAC,cAAc,EAAE;YAChE,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC;YAClD,OAAO,WAAW,eAAe,IAAI,cAAc,EAAE,CAAC;SACzD;QAED,OAAO,UAAU,GAAG,eAAe,GAAG,GAAG,GAAG,2BAA2B,CAAC;IAC5E,CAAC;CACJ;AA1BD,gDA0BC"}

package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.d.ts

@@ -3,6 +3,7 @@ export declare class GenerateFilesTask extends AbstractEmptyTask {
     readonly queueName = "generateFiles";
     readonly queueTtl: number;
     private readonly logger;
+    private readonly stopTimeRepository;
     private readonly tripsRepository;
     private readonly gtfsRtRedisRepository;
     private readonly alertsGenerator;

package/dist/integration-engine/vehicle-positions/workers/gtfs-rt/tasks/GenerateFilesTask.js

@@ -24,9 +24,11 @@ exports.GenerateFilesTask = void 0;
 const RouteTypeEnums_1 = require("../../../../../helpers/RouteTypeEnums");
 const ropid_vymi_1 = require("../../../../ropid-vymi");
 const Di_1 = require("../../../ioc/Di");
+const VPContainerToken_1 = require("../../../ioc/VPContainerToken");
 const TripsRepository_1 = require("../../vehicle-positions/data-access/TripsRepository");
 const ioc_1 = require("@golemio/core/dist/integration-engine/ioc");
 const workers_1 = require("@golemio/core/dist/integration-engine/workers");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const ovapi_gtfs_realtime_bindings_1 = require("@golemio/ovapi-gtfs-realtime-bindings");
 const GtfsRtRedisRepository_1 = require("../data-access/GtfsRtRedisRepository");
 const AlertsGenerator_1 = require("../helpers/AlertsGenerator");
@@ -38,6 +40,7 @@ class GenerateFilesTask extends workers_1.AbstractEmptyTask {
         this.queueName = "generateFiles";
         this.queueTtl = 20 * 1000; // 20 seconds
         this.logger = Di_1.VPContainer.resolve(ioc_1.ContainerToken.Logger);
+        this.stopTimeRepository = Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.PublicStopTimeCacheRepository);
         this.tripsRepository = new TripsRepository_1.TripsRepository();
         this.gtfsRtRedisRepository = new GtfsRtRedisRepository_1.GtfsRtRedisRepository();
         const vymiEventsRepository = new ropid_vymi_1.RopidVYMIEventsModel();
@@ -47,13 +50,22 @@ class GenerateFilesTask extends workers_1.AbstractEmptyTask {
     }
     execute() {
         return __awaiter(this, void 0, void 0, function* () {
-            const tripData = yield this.tripsRepository.findAllForGTFSRt();
+            const startDateTime = new Date();
+            const tripData = yield this.tripsRepository.findAllForGTFSRt(startDateTime);
             const feedHeader = this.createFeedHeader();
             const updatesMessage = ovapi_gtfs_realtime_bindings_1.transit_realtime.FeedMessage.create({ header: feedHeader });
             const positionsMessage = ovapi_gtfs_realtime_bindings_1.transit_realtime.FeedMessage.create({ header: feedHeader });
             const pidFeedMessage = ovapi_gtfs_realtime_bindings_1.transit_realtime.FeedMessage.create({ header: feedHeader });
+            const vehicleDescriptors = tripData.map((tripRecord) => this.vehicleDescriptor.getVehicleDescriptor(tripRecord));
+            const vehicleIds = [];
+            for (const { id } of vehicleDescriptors) {
+                if (typeof id === "string") {
+                    vehicleIds.push(id);
+                }
+            }
+            const stopTimes = yield this.stopTimeRepository.getPublicStopTimeCache(vehicleIds);
             const gtfsTripIdMap = {};
-            for (const tripRecord of Object.values(tripData)) {
+            for (const tripRecord of tripData) {
                 const tripDescriptor = {
                     scheduleRelationship: tripRecord.last_position.is_canceled
                         ? ovapi_gtfs_realtime_bindings_1.transit_realtime.TripDescriptor.ScheduleRelationship.CANCELED
@@ -85,7 +97,14 @@ class GenerateFilesTask extends workers_1.AbstractEmptyTask {
                 positionsMessage.entity.push(positionsMessageEntity);
                 // single feed for trip updates and vehicle positions
                 const feedMessageEntity = structuredClone(positionsMessageEntity);
-                const stopTimeUpdates = this.generateStopTimeUpdate(tripRecord.stop_times, tripRecord.gtfs_route_type);
+                let stopTimeUpdates = [];
+                if (typeof vehicleDescriptor.id === "string") {
+                    const stopTimesForVehicle = stopTimes.get(vehicleDescriptor.id);
+                    stopTimeUpdates = this.generateStopTimeUpdate(tripRecord.gtfs_route_type, stopTimesForVehicle);
+                }
+                else {
+                    this.logger.error(new golemio_errors_1.GeneralError(`Cannot get stopTimeUpdates for trip with unknown vehicleId and gtfsTripId '${tripRecord.gtfs_trip_id}'`, this.constructor.name, undefined, undefined, "pid"));
+                }
                 const shouldSkipTripUpdate = stopTimeUpdates.every((el) => el.scheduleRelationship === ovapi_gtfs_realtime_bindings_1.transit_realtime.TripUpdate.StopTimeUpdate.ScheduleRelationship.NO_DATA ||
                     gtfsTripIdMap[tripRecord.gtfs_trip_id]);
                 if (!shouldSkipTripUpdate) {
@@ -176,22 +195,23 @@ class GenerateFilesTask extends workers_1.AbstractEmptyTask {
         }
         return entity;
     }
-    generateStopTimeUpdate(stopTimeEvents, routeType) {
+    generateStopTimeUpdate(routeType, stopTimes) {
+        var _a, _b;
         const stopTimeUpdates = [];
-        for (const stopTimeEvent of stopTimeEvents) {
-            const scheduledTrack = stopTimeEvent.platform_code;
-            let actualTrack = stopTimeEvent.platform_code;
+        for (const stopTime of stopTimes) {
+            const scheduledTrack = stopTime.platform_code;
+            let actualTrack = stopTime.platform_code;
             if (routeType === RouteTypeEnums_1.GTFSRouteTypeEnum.TRAIN) {
-                actualTrack = stopTimeEvent.cis_stop_platform_code;
+                actualTrack = stopTime.cis_stop_platform_code;
             }
             stopTimeUpdates.push(Object.assign(Object.assign({ arrival: {
-                    delay: stopTimeEvent.arrival_delay_seconds,
+                    delay: (_a = stopTime.arr_delay) !== null && _a !== void 0 ? _a : stopTime.dep_delay,
                 }, departure: {
-                    delay: stopTimeEvent.departure_delay_seconds,
-                } }, (stopTimeEvent.arrival_delay_seconds === null &&
-                stopTimeEvent.departure_delay_seconds === null && {
+                    delay: (_b = stopTime.dep_delay) !== null && _b !== void 0 ? _b : stopTime.arr_delay,
+                } }, (stopTime.arr_delay === null &&
+                stopTime.dep_delay === null && {
                 scheduleRelationship: ovapi_gtfs_realtime_bindings_1.transit_realtime.TripUpdate.StopTimeUpdate.ScheduleRelationship.NO_DATA,
-            })), { stopSequence: stopTimeEvent.stop_sequence, stopId: stopTimeEvent.stop_id, ".transit_realtime.ovapiStopTimeUpdate": Object.assign(Object.assign({}, (scheduledTrack && { scheduledTrack })), (actualTrack && { actualTrack })) }));
+            })), { stopSequence: stopTime.sequence, stopId: stopTime.stop_id, ".transit_realtime.ovapiStopTimeUpdate": Object.assign(Object.assign({}, (scheduledTrack && { scheduledTrack })), (actualTrack && { actualTrack })) }));
         }
         return stopTimeUpdates;
     }