@golemio/pid 2.12.10-dev.1265884842 → 2.12.10-dev.1266077057

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/20240424122841-delay-at-past-stops-release-part-1.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', '20240424122841-delay-at-past-stops-release-part-1-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', '20240424122841-delay-at-past-stops-release-part-1-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/db/migrations/postgresql/sqls/20240424122841-delay-at-past-stops-release-part-1-down.sql

@@ -0,0 +1 @@
+drop view v_vehiclepositions_stop_time_delay_prediction;

package/db/migrations/postgresql/sqls/20240424122841-delay-at-past-stops-release-part-1-up.sql

@@ -0,0 +1,98 @@
+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/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;