@golemio/pid 2.11.6-dev.1155946299 → 2.11.6-dev.1157466489

package/db/example/17_blocked_trains.sql

@@ -1,14 +1,11 @@
 INSERT INTO vehiclepositions_trips (cis_line_id,cis_trip_number,run_number,cis_line_short_name,created_at,gtfs_route_id,gtfs_route_short_name,gtfs_trip_id,id,updated_at,start_cis_stop_id,start_cis_stop_platform_code,start_time,start_timestamp,vehicle_type_id,wheelchair_accessible,create_batch_id,created_by,update_batch_id,updated_by,agency_name_scheduled,origin_route_name,agency_name_real,vehicle_registration_number,gtfs_trip_headsign,start_asw_stop_id,gtfs_route_type,gtfs_block_id,last_position_id,is_canceled,end_timestamp,gtfs_trip_short_name,last_position_context,internal_run_number,internal_route_name,gtfs_date,provider_source_type,gtfs_direction_id) VALUES
-	 ('none',2525,NULL,'none','2024-01-08 07:49:43.246','L1302','S2','1302_2525_231211','2024-01-08T06:46:00Z_2525','2024-01-08 10:37:23.534',5454014,NULL,'07:46:00','2024-01-08 07:58:00.000',0,true,NULL,NULL,NULL,NULL,'ČESKÉ DRÁHY',NULL,NULL,NULL,'Benešov u Prahy',NULL,2,'1320_2525_231211',498803385,false,'2024-01-08 08:38:00.000','Os 2525','{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":1704699500000,"firstPositionDelay":200},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"arrival_delay":null,"departure_time":null,"departure_delay":null},"lastPositionDelay":null,"lastPositionId":"498803385","lastPositionOriginTimestamp":1704706558000,"lastPositionTracking":{"type":"Feature","properties":{"bearing":279,"delay":169,"id":"498012125","lat":50.1953964,"lng":14.843792,"origin_time":"08:40:42","origin_timestamp":"2024-01-08T07:40:42.000Z","scheduled_timestamp":null,"shape_dist_traveled":39.085,"is_tracked":true,"is_canceled":false,"state_position":"on_track","state_process":"processed","tcp_event":null,"last_stop_sequence":18,"last_stop_id":"U2801Z301","last_stop_arrival_time":"2024-01-08T07:35:00.000Z","last_stop_departure_time":"2024-01-08T07:35:00.000Z","next_stop_arrival_time":"2024-01-08T07:38:00.000Z","next_stop_departure_time":"2024-01-08T07:38:00.000Z","next_stop_id":"U2432Z301","next_stop_sequence":19,"next_stop_name":"Lysá nad Labem","last_stop_name":"Ostrá","valid_to":"2024-01-08T07:45:42.000Z"},"geometry":{"type":"Point","coordinates":[14.843792,50.1953964]}},"lastPositionCanceled":false,"lastPositionBeforeTrackDelayed":null,"lastPositionState":"duplicate","tripId":"2024-01-08T06:46:00Z_2525"}',NULL,NULL,NULL,'1',0),
-	 ('none',2525,NULL,'S20','2024-01-08 07:49:44.974','L1309','S9','1309_2525_231211','2024-01-08T06:46:00Z_2525_gtfs_trip_id_1309_2525_231211','2024-01-08 10:37:23.534',5454014,NULL,'07:46:00','2024-01-08 08:40:00.000',0,true,NULL,NULL,NULL,NULL,'ČESKÉ DRÁHY',NULL,NULL,NULL,'Benešov u Prahy',NULL,2,'1320_2525_231211',2002,false,'2024-01-08 10:23:00.000','Os 2525','{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":1704706243000,"firstPositionDelay":883},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"arrival_delay":null,"departure_time":null,"departure_delay":null},"lastPositionDelay":null,"lastPositionId":"2002","lastPositionOriginTimestamp":1704706558000,"lastPositionTracking":{"type":"Feature","properties":{"bearing":160,"delay":774,"id":"498802588","lat":49.7809639,"lng":14.68199,"origin_time":"10:35:46","origin_timestamp":"2024-01-08T09:35:46.000Z","scheduled_timestamp":null,"shape_dist_traveled":86.352,"is_tracked":true,"is_canceled":false,"state_position":"on_track","state_process":"processed","tcp_event":null,"last_stop_sequence":36,"last_stop_id":"U1592Z301","last_stop_arrival_time":"2024-01-08T09:16:00.000Z","last_stop_departure_time":"2024-01-08T09:16:00.000Z","next_stop_arrival_time":"2024-01-08T09:23:00.000Z","next_stop_departure_time":"2024-01-08T09:23:00.000Z","next_stop_id":"U1384Z301","next_stop_sequence":37,"next_stop_name":"Benešov u Prahy","last_stop_name":"Mrač","valid_to":"2024-01-08T09:40:46.000Z"},"geometry":{"type":"Point","coordinates":[14.68199,49.7809639]}},"lastPositionCanceled":false,"lastPositionBeforeTrackDelayed":null,"lastPositionState":"duplicate","tripId":"2024-01-08T06:46:00Z_2525_gtfs_trip_id_1309_2525_231211"}',NULL,NULL,NULL,'0',1),
-	 ('none',2525,NULL,'S20','2024-01-08 07:49:44.980','L1320','S20','1320_2525_231211','2024-01-08T06:46:00Z_2525_gtfs_trip_id_1320_2525_231211','2024-01-08 10:37:23.534',5454014,NULL,'07:46:00','2024-01-08 07:46:00.000',0,true,NULL,NULL,NULL,NULL,'ČESKÉ DRÁHY',NULL,NULL,NULL,'Benešov u Prahy',NULL,2,'1320_2525_231211',498803569,false,'2024-01-08 07:56:00.000','Os 2525','{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":1704696660000,"firstPositionDelay":120},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"arrival_delay":null,"departure_time":null,"departure_delay":null},"lastPositionDelay":null,"lastPositionId":"498803569","lastPositionOriginTimestamp":1704706558000,"lastPositionTracking":{"type":"Feature","properties":{"bearing":308,"delay":137,"id":"497615354","lat":50.0242424,"lng":15.2179174,"origin_time":"07:58:05","origin_timestamp":"2024-01-08T06:58:05.000Z","scheduled_timestamp":null,"shape_dist_traveled":10.375,"is_tracked":true,"is_canceled":false,"state_position":"on_track","state_process":"processed","tcp_event":null,"last_stop_sequence":3,"last_stop_id":"T58007","last_stop_arrival_time":"2024-01-08T06:55:00.000Z","last_stop_departure_time":"2024-01-08T06:55:00.000Z","next_stop_arrival_time":"2024-01-08T06:56:00.000Z","next_stop_departure_time":"2024-01-08T06:56:00.000Z","next_stop_id":"U2816Z301","next_stop_sequence":4,"next_stop_name":"Kolín","last_stop_name":"Kolín seř.n.","valid_to":"2024-01-08T07:03:05.000Z"},"geometry":{"type":"Point","coordinates":[15.2179174,50.0242424]}},"lastPositionCanceled":false,"lastPositionBeforeTrackDelayed":null,"lastPositionState":"duplicate","tripId":"2024-01-08T06:46:00Z_2525_gtfs_trip_id_1320_2525_231211"}',NULL,NULL,NULL,'0',0);
+	 ('none',2525,NULL,'none','2024-01-08T07:49:43.246Z','L1302','S2','1302_2525_231211','2024-01-08T06:46:00Z_2525','2024-01-08T10:37:23.534Z',5454014,NULL,'07:46:00','2024-01-08T07:58:00.000Z',0,true,NULL,NULL,NULL,NULL,'ČESKÉ DRÁHY',NULL,NULL,NULL,'Benešov u Prahy',NULL,2,'1320_2525_231211',498803385,false,'2024-01-08T08:38:00.000Z','Os 2525','{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":1704699500000,"firstPositionDelay":200},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"arrival_delay":null,"departure_time":null,"departure_delay":null},"lastPositionDelay":null,"lastPositionId":"498803385","lastPositionOriginTimestamp":1704706558000,"lastPositionTracking":{"type":"Feature","properties":{"bearing":279,"delay":169,"id":"498012125","lat":50.1953964,"lng":14.843792,"origin_time":"08:40:42","origin_timestamp":"2024-01-08T07:40:42.000Z","scheduled_timestamp":null,"shape_dist_traveled":39.085,"is_tracked":true,"is_canceled":false,"state_position":"on_track","state_process":"processed","tcp_event":null,"last_stop_sequence":18,"last_stop_id":"U2801Z301","last_stop_arrival_time":"2024-01-08T07:35:00.000Z","last_stop_departure_time":"2024-01-08T07:35:00.000Z","next_stop_arrival_time":"2024-01-08T07:38:00.000Z","next_stop_departure_time":"2024-01-08T07:38:00.000Z","next_stop_id":"U2432Z301","next_stop_sequence":19,"next_stop_name":"Lysá nad Labem","last_stop_name":"Ostrá","valid_to":"2024-01-08T07:45:42.000Z"},"geometry":{"type":"Point","coordinates":[14.843792,50.1953964]}},"lastPositionCanceled":false,"lastPositionBeforeTrackDelayed":null,"lastPositionState":"duplicate","tripId":"2024-01-08T06:46:00Z_2525"}',NULL,NULL,NULL,'1',0),
+	 ('none',2525,NULL,'S20','2024-01-08T07:49:44.974Z','L1309','S9','1309_2525_231211','2024-01-08T06:46:00Z_2525_gtfs_trip_id_1309_2525_231211','2024-01-08T10:37:23.534Z',5454014,NULL,'07:46:00','2024-01-08T08:40:00.000Z',0,true,NULL,NULL,NULL,NULL,'ČESKÉ DRÁHY',NULL,NULL,NULL,'Benešov u Prahy',NULL,2,'1320_2525_231211',2002,false,'2024-01-08T10:23:00.000Z','Os 2525','{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":1704706243000,"firstPositionDelay":883},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"arrival_delay":null,"departure_time":null,"departure_delay":null},"lastPositionDelay":null,"lastPositionId":"2002","lastPositionOriginTimestamp":1704706558000,"lastPositionTracking":{"type":"Feature","properties":{"bearing":160,"delay":774,"id":"498802588","lat":49.7809639,"lng":14.68199,"origin_time":"10:35:46","origin_timestamp":"2024-01-08T09:35:46.000Z","scheduled_timestamp":null,"shape_dist_traveled":86.352,"is_tracked":true,"is_canceled":false,"state_position":"on_track","state_process":"processed","tcp_event":null,"last_stop_sequence":36,"last_stop_id":"U1592Z301","last_stop_arrival_time":"2024-01-08T09:16:00.000Z","last_stop_departure_time":"2024-01-08T09:16:00.000Z","next_stop_arrival_time":"2024-01-08T09:23:00.000Z","next_stop_departure_time":"2024-01-08T09:23:00.000Z","next_stop_id":"U1384Z301","next_stop_sequence":37,"next_stop_name":"Benešov u Prahy","last_stop_name":"Mrač","valid_to":"2024-01-08T09:40:46.000Z"},"geometry":{"type":"Point","coordinates":[14.68199,49.7809639]}},"lastPositionCanceled":false,"lastPositionBeforeTrackDelayed":null,"lastPositionState":"duplicate","tripId":"2024-01-08T06:46:00Z_2525_gtfs_trip_id_1309_2525_231211"}',NULL,NULL,NULL,'0',1),
+	 ('none',2525,NULL,'S20','2024-01-08T07:49:44.980Z','L1320','S20','1320_2525_231211','2024-01-08T06:46:00Z_2525_gtfs_trip_id_1320_2525_231211','2024-01-08T10:37:23.534Z',5454014,NULL,'07:46:00','2024-01-08T07:46:00.000Z',0,true,NULL,NULL,NULL,NULL,'ČESKÉ DRÁHY',NULL,NULL,NULL,'Benešov u Prahy',NULL,2,'1320_2525_231211',498803569,false,'2024-01-08T07:56:00.000Z','Os 2525','{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":1704696660000,"firstPositionDelay":120},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"arrival_delay":null,"departure_time":null,"departure_delay":null},"lastPositionDelay":null,"lastPositionId":"498803569","lastPositionOriginTimestamp":1704706558000,"lastPositionTracking":{"type":"Feature","properties":{"bearing":308,"delay":137,"id":"497615354","lat":50.0242424,"lng":15.2179174,"origin_time":"07:58:05","origin_timestamp":"2024-01-08T06:58:05.000Z","scheduled_timestamp":null,"shape_dist_traveled":10.375,"is_tracked":true,"is_canceled":false,"state_position":"on_track","state_process":"processed","tcp_event":null,"last_stop_sequence":3,"last_stop_id":"T58007","last_stop_arrival_time":"2024-01-08T06:55:00.000Z","last_stop_departure_time":"2024-01-08T06:55:00.000Z","next_stop_arrival_time":"2024-01-08T06:56:00.000Z","next_stop_departure_time":"2024-01-08T06:56:00.000Z","next_stop_id":"U2816Z301","next_stop_sequence":4,"next_stop_name":"Kolín","last_stop_name":"Kolín seř.n.","valid_to":"2024-01-08T07:03:05.000Z"},"geometry":{"type":"Point","coordinates":[15.2179174,50.0242424]}},"lastPositionCanceled":false,"lastPositionBeforeTrackDelayed":null,"lastPositionState":"duplicate","tripId":"2024-01-08T06:46:00Z_2525_gtfs_trip_id_1320_2525_231211"}',NULL,NULL,NULL,'0',0);
 
 -- 1302_2525_231211
 INSERT INTO vehiclepositions_positions (id,created_at,delay,delay_stop_arrival,delay_stop_departure,next_stop_id,shape_dist_traveled,is_canceled,lat,lng,origin_time,origin_timestamp,is_tracked,trips_id,create_batch_id,created_by,update_batch_id,updated_at,updated_by,bearing,cis_last_stop_id,cis_last_stop_sequence,last_stop_id,last_stop_sequence,next_stop_sequence,speed,last_stop_arrival_time,last_stop_departure_time,next_stop_arrival_time,next_stop_departure_time,asw_last_stop_id,state_process,state_position,this_stop_id,this_stop_sequence,tcp_event,last_stop_headsign,last_stop_name,next_stop_name,this_stop_name,valid_to,scheduled_timestamp) VALUES
-	 (2001,'2024-01-08 08:40:58.686',169,180,240,'U2432Z301',39.085,false,50.1953964,14.843792,'08:40:42','2024-01-08 08:40:42.000',true,'2024-01-08T06:46:00Z_2525',NULL,NULL,NULL,'2024-01-08 08:40:59.136',NULL,279,5453134,11,'U2801Z301',18,19,NULL,'2024-01-08 08:35:00.000','2024-01-08 08:35:00.000','2024-01-08 08:38:00.000','2024-01-08 08:38:00.000',NULL,'processed','on_track',NULL,NULL,NULL,NULL,'Ostrá',NULL,NULL,'2024-01-08 08:45:42.000',NULL);
+	 (2001,'2024-01-08T08:40:58.686Z',169,180,240,'U2432Z301',39.085,false,50.1953964,14.843792,'08:40:42','2024-01-08T08:40:42.000Z',true,'2024-01-08T06:46:00Z_2525',NULL,NULL,NULL,'2024-01-08T08:40:59.136Z',NULL,279,5453134,11,'U2801Z301',18,19,NULL,'2024-01-08T08:35:00.000Z','2024-01-08T08:35:00.000Z','2024-01-08T08:38:00.000Z','2024-01-08T08:38:00.000Z',NULL,'processed','on_track',NULL,NULL,NULL,NULL,'Ostrá',NULL,NULL,'2024-01-08T08:45:42.000Z',NULL);
 -- 1309_2525_231211
 INSERT INTO vehiclepositions_positions (id,created_at,delay,delay_stop_arrival,delay_stop_departure,next_stop_id,shape_dist_traveled,is_canceled,lat,lng,origin_time,origin_timestamp,is_tracked,trips_id,create_batch_id,created_by,update_batch_id,updated_at,updated_by,bearing,cis_last_stop_id,cis_last_stop_sequence,last_stop_id,last_stop_sequence,next_stop_sequence,speed,last_stop_arrival_time,last_stop_departure_time,next_stop_arrival_time,next_stop_departure_time,asw_last_stop_id,state_process,state_position,this_stop_id,this_stop_sequence,tcp_event,last_stop_headsign,last_stop_name,next_stop_name,this_stop_name,valid_to,scheduled_timestamp) VALUES
-	 (2002,'2024-01-08 08:40:58.686',NULL,180,240,'U2432Z301',0,false,50.1953964,14.843792,'08:40:42','2024-01-08 08:40:42.000',false,'2024-01-08T06:46:00Z_2525_gtfs_trip_id_1309_2525_231211',NULL,NULL,NULL,'2024-01-08 08:40:59.136',NULL,NULL,5453134,11,NULL,NULL,1,NULL,NULL,NULL,'2024-01-08 08:40:00.000','2024-01-08 08:40:00.000',NULL,'input','before_track',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-01-08 08:45:42.000',NULL);
-
-
-
+	 (2002,'2024-01-08T08:40:58.686Z',NULL,180,240,'U2432Z301',0,false,50.1953964,14.843792,'08:40:42','2024-01-08T08:40:42.000Z',false,'2024-01-08T06:46:00Z_2525_gtfs_trip_id_1309_2525_231211',NULL,NULL,NULL,'2024-01-08T08:40:59.136Z',NULL,NULL,5453134,11,NULL,NULL,1,NULL,NULL,NULL,'2024-01-08T08:40:00.000Z','2024-01-08T08:40:00.000Z',NULL,'input','before_track',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2024-01-08T08:45:42.000Z',NULL);

package/db/example/redis/publicVehiclePositionsMock.json

@@ -1,24 +1,42 @@
 [
     {
         "gtfs_trip_id": "705_735_231002",
-        "gtfs_route_type": 3,
+        "route_type": 3,
         "gtfs_route_short_name": "705",
-        "run_number": 29,
-        "vehicle_registration_number": 8585,
         "lat": 49.90276,
         "lng": 15.4047,
         "bearing": 221,
-        "delay": null
+        "delay": null,
+        "vehicle_id": "service-3-8585",
+        "state_position": "on_track",
+        "detailed_info": {
+            "origin_route_name": "705",
+            "shape_id": null,
+            "run_number": 29,
+            "trip_headsign": "Nádraží 1",
+            "shape_dist_traveled": 7.035025,
+            "last_stop_sequence": 3,
+            "origin_timestamp": "2024-03-23T14:00:00.000Z"
+        }
     },
     {
         "gtfs_trip_id": "781_4_231030",
-        "gtfs_route_type": 3,
+        "route_type": 3,
         "gtfs_route_short_name": "781",
-        "run_number": 19,
-        "vehicle_registration_number": 7630,
         "lat": 49.92452,
         "lng": 15.4669,
         "bearing": 305,
-        "delay": 211
+        "delay": 211,
+        "vehicle_id": "service-3-7630",
+        "state_position": "on_track",
+        "detailed_info": {
+            "origin_route_name": "781",
+            "shape_id": null,
+            "run_number": 19,
+            "trip_headsign": "Nádraží 2",
+            "shape_dist_traveled": 8.035025,
+            "last_stop_sequence": 4,
+            "origin_timestamp": "2024-03-23T14:00:20.000Z"
+        }
     }
 ]

package/db/migrations/postgresql/20240122141600-public-api-detailed-endpoint.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', '20240122141600-public-api-detailed-endpoint-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', '20240122141600-public-api-detailed-endpoint-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/20240122141600-public-api-detailed-endpoint-down.sql

@@ -0,0 +1,16 @@
+-- vehicle type trolleybus
+delete from vehiclepositions_vehicle_types where id = 18; -- see MPVRouteTypesEnum.TROLLEYBUS
+
+-- shape id
+alter table vehiclepositions_trips drop column gtfs_shape_id;
+alter table vehiclepositions_trips_history drop column gtfs_shape_id;
+alter table ropidgtfs_precomputed_trip_schedule drop column shape_id;
+
+-- combined view
+drop view v_public_vehiclepositions_combined_stop_times;
+
+-- history view
+drop view v_public_vehiclepositions_past_stop_times;
+
+-- prediction view
+drop view v_public_vehiclepositions_future_stop_times;

package/db/migrations/postgresql/sqls/20240122141600-public-api-detailed-endpoint-up.sql

@@ -0,0 +1,137 @@
+-- vehicle type trolleybus
+insert into vehiclepositions_vehicle_types (id, abbreviation, description_cs, description_en) VALUES
+    (18, 'Trolejbus', 'trolejbus', 'trolleybus'); -- see MPVRouteTypesEnum.TROLLEYBUS
+
+
+-- shape id
+alter table ropidgtfs_precomputed_trip_schedule add column shape_id varchar(15);
+alter table vehiclepositions_trips add column gtfs_shape_id varchar(15);
+alter table vehiclepositions_trips_history add column gtfs_shape_id varchar(15);
+
+
+-- 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
+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;

package/dist/integration-engine/ioc/Di.d.ts

@@ -1,2 +1,3 @@
-declare const PidContainer: import("tsyringe").DependencyContainer;
+import { DependencyContainer } from "@golemio/core/dist/shared/tsyringe";
+declare const PidContainer: DependencyContainer;
 export { PidContainer };

package/dist/integration-engine/ioc/Di.js.map

@@ -1 +1 @@
-{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../src/integration-engine/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,iFAAyE;AACzE,qGAAmG;AACnG,6HAA2H;AAC3H,uGAAqG;AACrG,qHAAmH;AACnH,wIAAsI;AACtI,+EAA6E;AAC7E,yGAAuG;AACvG,mHAAiH;AACjH,qEAA0F;AAC1F,iEAA8D;AAE9D,wBAAwB;AACxB,MAAM,YAAY,GAAG,+BAA0B,CAAC,oBAAoB,EAAE,CAAC;AAwB9D,oCAAY;AAvBrB,YAAY;AAEZ,iBAAiB;AACjB,YAAY,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,oBAAoB,EAAE,2CAAoB,CAAC,CAAC;AAChG,YAAY,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,eAAe,EAAE,qBAAS,CAAC,CAAC;AAChF,YAAY,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AACpG,YAAY;AAEZ,qBAAqB;AACrB,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AACzG,YAAY,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AAC5G,YAAY;AAEZ,qBAAqB;AACrB,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AACnG,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AACrF,YAAY;AAEZ,yBAAyB;AACzB,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,oCAAoC,EAAE,2EAAoC,CAAC,CAAC;AACvH,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC"}
+{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../src/integration-engine/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,iFAAyE;AACzE,qGAAmG;AACnG,6HAA2H;AAC3H,uGAAqG;AACrG,qHAAmH;AACnH,wIAAsI;AACtI,+EAA6E;AAC7E,yGAAuG;AACvG,mHAAiH;AACjH,qEAA0F;AAE1F,iEAA8D;AAE9D,wBAAwB;AACxB,MAAM,YAAY,GAAwB,+BAA0B,CAAC,oBAAoB,EAAE,CAAC;AAwBnF,oCAAY;AAvBrB,YAAY;AAEZ,iBAAiB;AACjB,YAAY,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,oBAAoB,EAAE,2CAAoB,CAAC,CAAC;AAChG,YAAY,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,eAAe,EAAE,qBAAS,CAAC,CAAC;AAChF,YAAY,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AACpG,YAAY;AAEZ,qBAAqB;AACrB,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AACzG,YAAY,CAAC,iBAAiB,CAAC,2CAAoB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AAC5G,YAAY;AAEZ,qBAAqB;AACrB,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AACnG,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AACrF,YAAY;AAEZ,yBAAyB;AACzB,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,oCAAoC,EAAE,2EAAoC,CAAC,CAAC;AACvH,YAAY,CAAC,QAAQ,CAAC,2CAAoB,CAAC,uBAAuB,EAAE,iDAAuB,CAAC,CAAC"}

package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.js

@@ -47,7 +47,7 @@ class RopidGTFSTripsModel extends models_1.PostgresModel {
                         model: this.modelGTFSStopTimes.sequelizeModel,
                         include: [
                             {
-                                attributes: ["stop_id", "stop_lat", "stop_lon", "stop_name"],
+                                attributes: ["stop_id", "stop_lat", "stop_lon", "stop_name", "zone_id"],
                                 as: "stop",
                                 model: this.modelGTFSStops.sequelizeModel,
                                 required: true,

package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.js.map

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

package/dist/integration-engine/ropid-gtfs/data-access/cache/DelayComputationRedisRepository.d.ts

@@ -2,4 +2,5 @@ import { RedisModel } from "@golemio/core/dist/integration-engine/models/RedisMo
 export declare class DelayComputationRedisRepository extends RedisModel {
     static NAMESPACE_PREFIX: string;
     constructor();
+    expire(keys: string[], ttlInSeconds: number, data?: any): Promise<void>;
 }

package/dist/integration-engine/ropid-gtfs/data-access/cache/DelayComputationRedisRepository.js

@@ -1,8 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DelayComputationRedisRepository = void 0;
 const DelayComputationDtoSchema_1 = require("../../../../schema-definitions/ropid-gtfs/redis/schemas/DelayComputationDtoSchema");
+const const_1 = require("../../../../schema-definitions/vehicle-positions/redis/const");
 const RedisModel_1 = require("@golemio/core/dist/integration-engine/models/RedisModel");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
 class DelayComputationRedisRepository extends RedisModel_1.RedisModel {
     constructor() {
@@ -13,7 +24,22 @@ class DelayComputationRedisRepository extends RedisModel_1.RedisModel {
             prefix: DelayComputationRedisRepository.NAMESPACE_PREFIX,
         }, new golemio_validator_1.JSONSchemaValidator("GTFSDelayComputationRedisRepositoryValidator", DelayComputationDtoSchema_1.DelayComputationDtoSchema));
     }
+    expire(keys, ttlInSeconds, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const pipeline = this.connection.pipeline();
+            for (const key of keys) {
+                const redisKey = `${this.prefix}:${this["buildKey"](key, data)}`;
+                pipeline.expire(redisKey, ttlInSeconds);
+            }
+            try {
+                yield pipeline.exec();
+            }
+            catch (err) {
+                throw new golemio_errors_1.GeneralError("Error while expiring keys in Redis", this.constructor.name, err);
+            }
+        });
+    }
 }
 exports.DelayComputationRedisRepository = DelayComputationRedisRepository;
-DelayComputationRedisRepository.NAMESPACE_PREFIX = "gtfsTripDelayComputation";
+DelayComputationRedisRepository.NAMESPACE_PREFIX = const_1.GTFS_DELAY_COMPUTATION_NAMESPACE_PREFIX;
 //# sourceMappingURL=DelayComputationRedisRepository.js.map

package/dist/integration-engine/ropid-gtfs/data-access/cache/DelayComputationRedisRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"DelayComputationRedisRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/cache/DelayComputationRedisRepository.ts"],"names":[],"mappings":";;;AAAA,iIAAoG;AACpG,wFAAqF;AACrF,mFAAkF;AAElF,MAAa,+BAAgC,SAAQ,uBAAU;IAG3D;QACI,KAAK,CACD,qCAAqC,EACrC;YACI,kBAAkB,EAAE,IAAI,CAAC,KAAK;YAC9B,oBAAoB,EAAE,IAAI,CAAC,SAAS;YACpC,wBAAwB,EAAE,IAAI;YAC9B,MAAM,EAAE,+BAA+B,CAAC,gBAAgB;SAC3D,EACD,IAAI,uCAAmB,CAAC,8CAA8C,EAAE,qDAAyB,CAAC,CACrG,CAAC;IACN,CAAC;;AAdL,0EAeC;AAdiB,gDAAgB,GAAG,0BAA0B,CAAC"}
+{"version":3,"file":"DelayComputationRedisRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/cache/DelayComputationRedisRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iIAAoG;AACpG,wFAA6F;AAC7F,wFAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAElF,MAAa,+BAAgC,SAAQ,uBAAU;IAG3D;QACI,KAAK,CACD,qCAAqC,EACrC;YACI,kBAAkB,EAAE,IAAI,CAAC,KAAK;YAC9B,oBAAoB,EAAE,IAAI,CAAC,SAAS;YACpC,wBAAwB,EAAE,IAAI;YAC9B,MAAM,EAAE,+BAA+B,CAAC,gBAAgB;SAC3D,EACD,IAAI,uCAAmB,CAAC,8CAA8C,EAAE,qDAAyB,CAAC,CACrG,CAAC;IACN,CAAC;IAEY,MAAM,CAAC,IAAc,EAAE,YAAoB,EAAE,IAAU;;YAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC5C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;gBACpB,MAAM,QAAQ,GAAG,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC;gBACjE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;aAC3C;YAED,IAAI;gBACA,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;aACzB;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,6BAAY,CAAC,oCAAoC,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;aAC5F;QACL,CAAC;KAAA;;AA5BL,0EA6BC;AA5BiB,gDAAgB,GAAG,+CAAuC,CAAC"}

package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js

@@ -96,7 +96,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
                 right(t0.origin_route_id, -1) as origin_route_name,
                 t0.trip_number,
                 t0.route_licence_number,
-                t0.direction_id
+                t0.direction_id,
+                t0.shape_id
             FROM (
                 SELECT
                     t1.route_id AS origin_route_id,
@@ -120,7 +121,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
                     t6.stop_id AS last_stop_id,
                     t1.trip_number,
                     t1.route_licence_number,
-                    t8.direction_id
+                    t8.direction_id,
+                    t8.shape_id
                 FROM "${const_1.PG_SCHEMA}".ropidgtfs_run_numbers${sourceTableSuffix} t1
                 INNER JOIN "${const_1.PG_SCHEMA}".ropidgtfs_precomputed_services_calendar_tmp t3 ON t1.service_id = t3.service_id
                 INNER JOIN "${const_1.PG_SCHEMA}".ropidgtfs_precomputed_minmax_stop_sequences_tmp t4 ON t1.trip_id = t4.trip_id

package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"TripScheduleRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAuC;AACvC,0EAA4C;AAE5C,2EAAoE;AACpE,yEAAqF;AACrF,mFAAkF;AAElF,+EAA4E;AAE5E,MAAa,sBAAuB,SAAQ,sBAAa;IACrD;QACI,KAAK,CACD,wBAAwB,EACxB;YACI,yBAAyB,EAAE,sBAAS,CAAC,YAAY,CAAC,yBAAyB;YAC3E,WAAW,EAAE,sBAAS,CAAC,YAAY,CAAC,WAAW;YAC/C,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;SACzD,EACD,IAAI,uCAAmB,CAAC,iCAAiC,EAAE,sBAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC,CACtG,CAAC;QAGC,YAAO,GAAG,CAAC,OAAoB,EAA2B,EAAE;YAC/D,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,iBAAG,GAAG,EAAE,IAAI,IAAK,OAAO,EAAG,CAAC;QAClE,CAAC,CAAC;QAEK,aAAQ,GAAG,CAAO,iBAAwC,EAAiB,EAAE;YAChF,4BAA4B;YAC5B,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBA2FI,iBAAS,0BAA0B,iBAAiB;8BAC9C,iBAAS;8BACT,iBAAS;6BACV,iBAAS,oBAAoB,iBAAiB;6BAC9C,iBAAS,qBAAqB,iBAAiB;6BAC/C,iBAAS,yBAAyB,iBAAiB;6BACnD,iBAAS,yBAAyB,iBAAiB;;SAEvE,CAAC;YACF,2BAA2B;YAE3B,IAAI;gBACA,MAAM,QAAQ,GAAG,sBAAS,CAAC,YAAY,CAAC,WAAW,GAAG,6CAAqB,CAAC,GAAG,CAAC;gBAEhF,MAAM,IAAI,CAAC,cAAc,CAAC,SAAU,CAAC,KAAK,CAAC,gBAAgB,iBAAS,KAAK,QAAQ,IAAI,GAAG,GAAG,CAAC,CAAC;aAChG;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,GAAG,CAAC;aACb;QACL,CAAC,CAAA,CAAC;IAtHF,CAAC;CAuHJ;AApID,wDAoIC"}
+{"version":3,"file":"TripScheduleRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAuC;AACvC,0EAA4C;AAE5C,2EAAoE;AACpE,yEAAqF;AACrF,mFAAkF;AAElF,+EAA4E;AAE5E,MAAa,sBAAuB,SAAQ,sBAAa;IACrD;QACI,KAAK,CACD,wBAAwB,EACxB;YACI,yBAAyB,EAAE,sBAAS,CAAC,YAAY,CAAC,yBAAyB;YAC3E,WAAW,EAAE,sBAAS,CAAC,YAAY,CAAC,WAAW;YAC/C,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;SACzD,EACD,IAAI,uCAAmB,CAAC,iCAAiC,EAAE,sBAAS,CAAC,YAAY,CAAC,gBAAgB,CAAC,CACtG,CAAC;QAGC,YAAO,GAAG,CAAC,OAAoB,EAA2B,EAAE;YAC/D,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,iBAAG,GAAG,EAAE,IAAI,IAAK,OAAO,EAAG,CAAC;QAClE,CAAC,CAAC;QAEK,aAAQ,GAAG,CAAO,iBAAwC,EAAiB,EAAE;YAChF,4BAA4B;YAC5B,MAAM,GAAG,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBA6FI,iBAAS,0BAA0B,iBAAiB;8BAC9C,iBAAS;8BACT,iBAAS;6BACV,iBAAS,oBAAoB,iBAAiB;6BAC9C,iBAAS,qBAAqB,iBAAiB;6BAC/C,iBAAS,yBAAyB,iBAAiB;6BACnD,iBAAS,yBAAyB,iBAAiB;;SAEvE,CAAC;YACF,2BAA2B;YAE3B,IAAI;gBACA,MAAM,QAAQ,GAAG,sBAAS,CAAC,YAAY,CAAC,WAAW,GAAG,6CAAqB,CAAC,GAAG,CAAC;gBAEhF,MAAM,IAAI,CAAC,cAAc,CAAC,SAAU,CAAC,KAAK,CAAC,gBAAgB,iBAAS,KAAK,QAAQ,IAAI,GAAG,GAAG,CAAC,CAAC;aAChG;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,GAAG,CAAC;aACb;QACL,CAAC,CAAA,CAAC;IAxHF,CAAC;CAyHJ;AAtID,wDAsIC"}

package/dist/integration-engine/ropid-gtfs/interfaces/TripModelInterfaces.d.ts

@@ -10,6 +10,7 @@ export interface IStop {
     stop_lat: number;
     stop_lon: number;
     stop_name: string;
+    zone_id: string;
 }
 export interface IStopTime {
     arrival_time_seconds: number;

package/dist/integration-engine/vehicle-positions/ioc/Di.js

@@ -21,7 +21,10 @@ const DeleteDataTask_1 = require("../workers/vehicle-descriptors/tasks/DeleteDat
 const RefreshDescriptorsTask_1 = require("../workers/vehicle-descriptors/tasks/RefreshDescriptorsTask");
 const DescriptorTransformation_1 = require("../workers/vehicle-descriptors/transformations/DescriptorTransformation");
 const PublicApiCacheRepository_1 = require("../workers/vehicle-positions/data-access/cache/PublicApiCacheRepository");
-const RefreshPublicCacheTask_1 = require("../workers/vehicle-positions/tasks/RefreshPublicCacheTask");
+const PublicStopTimeCacheRepository_1 = require("../workers/vehicle-positions/data-access/cache/PublicStopTimeCacheRepository");
+const PublicStopTimeRepository_1 = require("../workers/vehicle-positions/data-access/views/PublicStopTimeRepository");
+const RefreshPublicStopTimeCacheTask_1 = require("../workers/vehicle-positions/tasks/RefreshPublicStopTimeCacheTask");
+const RefreshPublicTripCacheTask_1 = require("../workers/vehicle-positions/tasks/RefreshPublicTripCacheTask");
 const PublicApiTripTransformation_1 = require("../workers/vehicle-positions/transformations/PublicApiTripTransformation");
 const VPContainerToken_1 = require("./VPContainerToken");
 //#region Initialization
@@ -37,7 +40,9 @@ VPContainer.register(VPContainerToken_1.VPContainerToken.DescriptorRepository, D
 VPContainer.register(VPContainerToken_1.VPContainerToken.RegionalBusCisCacheRepository, RegionalBusCisCacheRepository_1.RegionalBusCisCacheRepository);
 VPContainer.register(VPContainerToken_1.VPContainerToken.RegionalBusGtfsCacheRepository, RegionalBusGtfsCacheRepository_1.RegionalBusGtfsCacheRepository);
 VPContainer.register(VPContainerToken_1.VPContainerToken.RegionalBusRunsMessagesRepository, RegionalBusRunsMessagesRepository_1.RegionalBusRunsMessagesRepository);
+VPContainer.register(VPContainerToken_1.VPContainerToken.PublicStopTimeRepository, PublicStopTimeRepository_1.PublicStopTimeRepository);
 VPContainer.register(VPContainerToken_1.VPContainerToken.PublicApiCacheRepository, PublicApiCacheRepository_1.PublicApiCacheRepository);
+VPContainer.register(VPContainerToken_1.VPContainerToken.PublicStopTimeCacheRepository, PublicStopTimeCacheRepository_1.PublicStopTimeCacheRepository);
 //#endregion
 //#region Transformations
 VPContainer.register(VPContainerToken_1.VPContainerToken.DescriptorTransformation, DescriptorTransformation_1.DescriptorTransformation);
@@ -57,5 +62,6 @@ VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.RefreshDescrip
 VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.DeleteDataTask, DeleteDataTask_1.DeleteDataTask);
 VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.SaveArrivaCityRunsToDBTask, SaveArrivaCityRunsToDBTask_1.SaveArrivaCityRunsToDBTask);
 VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.ProcessRegionalBusRunMessagesTask, ProcessRegionalBusRunMessagesTask_1.ProcessRegionalBusRunMessagesTask);
-VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.RefreshPublicCacheTask, RefreshPublicCacheTask_1.RefreshPublicCacheTask);
+VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.RefreshPublicTripCacheTask, RefreshPublicTripCacheTask_1.RefreshPublicTripCacheTask);
+VPContainer.registerSingleton(VPContainerToken_1.VPContainerToken.RefreshPublicStopTimeCacheTask, RefreshPublicStopTimeCacheTask_1.RefreshPublicStopTimeCacheTask);
 //# sourceMappingURL=Di.js.map

package/dist/integration-engine/vehicle-positions/ioc/Di.js.map

@@ -1 +1 @@
-{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/ioc/Di.ts"],"names":[],"mappings":";;;AAAA,qCAA0C;AAE1C,qHAAkH;AAClH,mHAAgH;AAChH,qHAAkH;AAClH,4FAAyF;AACzF,8FAA2F;AAC3F,4GAAyG;AACzG,sGAAmG;AACnG,kGAA+F;AAC/F,+GAA4G;AAC5G,iGAA8F;AAC9F,iIAA8H;AAC9H,0GAAuG;AACvG,wHAAqH;AACrH,kJAA+I;AAC/I,8FAA2F;AAC3F,wFAAqF;AACrF,wGAAqG;AACrG,sHAAmH;AACnH,sHAAmH;AACnH,sGAAmG;AACnG,0HAAuH;AACvH,yDAAsD;AAEtD,wBAAwB;AACxB,MAAM,WAAW,GAAwB,iBAAY,CAAC,oBAAoB,EAAE,CAAC;AAuCpE,kCAAW;AAtCpB,YAAY;AAEZ,qBAAqB;AACrB,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,gCAAgC,EAAE,mEAAgC,CAAC,CAAC;AAC1G,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AACzG,YAAY;AAEZ,sBAAsB;AACtB,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,oBAAoB,EAAE,2CAAoB,CAAC,CAAC;AAClF,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,6BAA6B,EAAE,6DAA6B,CAAC,CAAC;AACpG,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,8BAA8B,EAAE,+DAA8B,CAAC,CAAC;AACtG,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,iCAAiC,EAAE,qEAAiC,CAAC,CAAC;AAC5G,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AAC1F,YAAY;AAEZ,yBAAyB;AACzB,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AAC1F,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,qCAAqC,EAAE,6EAAqC,CAAC,CAAC;AACpH,WAAW,CAAC,QAAQ,CAAC,mCAAgB,CAAC,2BAA2B,EAAE,yDAA2B,CAAC,CAAC;AAChG,YAAY;AAEZ,iBAAiB;AACjB,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,gBAAgB,EAAE,mCAAgB,CAAC,CAAC;AACnF,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,gBAAgB,EAAE,mCAAgB,CAAC,CAAC;AACnF,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,iBAAiB,EAAE,qCAAiB,CAAC,CAAC;AACrF,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,mBAAmB,EAAE,yCAAmB,CAAC,CAAC;AACzF,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,wBAAwB,EAAE,mDAAwB,CAAC,CAAC;AACnG,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,qBAAqB,EAAE,6CAAqB,CAAC,CAAC;AAC7F,YAAY;AAEZ,eAAe;AACf,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC;AAC/F,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,cAAc,EAAE,+BAAc,CAAC,CAAC;AAC/E,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,0BAA0B,EAAE,uDAA0B,CAAC,CAAC;AACvG,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,iCAAiC,EAAE,qEAAiC,CAAC,CAAC;AACrH,WAAW,CAAC,iBAAiB,CAAC,mCAAgB,CAAC,sBAAsB,EAAE,+CAAsB,CAAC,CAAC"}
+{"version":3,"file":"Di.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/ioc/Di.ts"],"names":[],"mappings":"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"}

package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.d.ts

@@ -1,7 +1,10 @@
 declare const VPContainerToken: {
+    PublicStopTimeRepository: symbol;
     PublicApiCacheRepository: symbol;
+    PublicStopTimeCacheRepository: symbol;
     PublicApiTripTransformation: symbol;
-    RefreshPublicCacheTask: symbol;
+    RefreshPublicTripCacheTask: symbol;
+    RefreshPublicStopTimeCacheTask: symbol;
     RegionalBusCisCacheRepository: symbol;
     RegionalBusGtfsCacheRepository: symbol;
     RegionalBusRunsMessagesRepository: symbol;

package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VPContainerToken = void 0;
 const VPContainerToken = {
     //#region Vehicle Positions
+    PublicStopTimeRepository: Symbol(),
     PublicApiCacheRepository: Symbol(),
+    PublicStopTimeCacheRepository: Symbol(),
     PublicApiTripTransformation: Symbol(),
-    RefreshPublicCacheTask: Symbol(),
+    RefreshPublicTripCacheTask: Symbol(),
+    RefreshPublicStopTimeCacheTask: Symbol(),
     //#endregion
     //#region Runs
     RegionalBusCisCacheRepository: Symbol(),

package/dist/integration-engine/vehicle-positions/ioc/VPContainerToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"VPContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/ioc/VPContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,gBAAgB,GAAG;IACrB,2BAA2B;IAC3B,wBAAwB,EAAE,MAAM,EAAE;IAClC,2BAA2B,EAAE,MAAM,EAAE;IACrC,sBAAsB,EAAE,MAAM,EAAE;IAChC,YAAY;IAEZ,cAAc;IACd,6BAA6B,EAAE,MAAM,EAAE;IACvC,8BAA8B,EAAE,MAAM,EAAE;IACxC,iCAAiC,EAAE,MAAM,EAAE;IAC3C,qCAAqC,EAAE,MAAM,EAAE;IAC/C,gBAAgB,EAAE,MAAM,EAAE;IAC1B,iBAAiB,EAAE,MAAM,EAAE;IAC3B,mBAAmB,EAAE,MAAM,EAAE;IAC7B,wBAAwB,EAAE,MAAM,EAAE;IAClC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,0BAA0B,EAAE,MAAM,EAAE;IACpC,iCAAiC,EAAE,MAAM,EAAE;IAC3C,YAAY;IAEZ,6BAA6B;IAC7B,gCAAgC,EAAE,MAAM,EAAE;IAC1C,2BAA2B,EAAE,MAAM,EAAE;IACrC,oBAAoB,EAAE,MAAM,EAAE;IAC9B,wBAAwB,EAAE,MAAM,EAAE;IAClC,gBAAgB,EAAE,MAAM,EAAE;IAC1B,sBAAsB,EAAE,MAAM,EAAE;IAChC,cAAc,EAAE,MAAM,EAAE;IACxB,YAAY;CACf,CAAC;AAEO,4CAAgB"}
+{"version":3,"file":"VPContainerToken.js","sourceRoot":"","sources":["../../../../src/integration-engine/vehicle-positions/ioc/VPContainerToken.ts"],"names":[],"mappings":";;;AAAA,MAAM,gBAAgB,GAAG;IACrB,2BAA2B;IAC3B,wBAAwB,EAAE,MAAM,EAAE;IAClC,wBAAwB,EAAE,MAAM,EAAE;IAClC,6BAA6B,EAAE,MAAM,EAAE;IACvC,2BAA2B,EAAE,MAAM,EAAE;IACrC,0BAA0B,EAAE,MAAM,EAAE;IACpC,8BAA8B,EAAE,MAAM,EAAE;IACxC,YAAY;IAEZ,cAAc;IACd,6BAA6B,EAAE,MAAM,EAAE;IACvC,8BAA8B,EAAE,MAAM,EAAE;IACxC,iCAAiC,EAAE,MAAM,EAAE;IAC3C,qCAAqC,EAAE,MAAM,EAAE;IAC/C,gBAAgB,EAAE,MAAM,EAAE;IAC1B,iBAAiB,EAAE,MAAM,EAAE;IAC3B,mBAAmB,EAAE,MAAM,EAAE;IAC7B,wBAAwB,EAAE,MAAM,EAAE;IAClC,qBAAqB,EAAE,MAAM,EAAE;IAC/B,0BAA0B,EAAE,MAAM,EAAE;IACpC,iCAAiC,EAAE,MAAM,EAAE;IAC3C,YAAY;IAEZ,6BAA6B;IAC7B,gCAAgC,EAAE,MAAM,EAAE;IAC1C,2BAA2B,EAAE,MAAM,EAAE;IACrC,oBAAoB,EAAE,MAAM,EAAE;IAC9B,wBAAwB,EAAE,MAAM,EAAE;IAClC,gBAAgB,EAAE,MAAM,EAAE;IAC1B,sBAAsB,EAAE,MAAM,EAAE;IAChC,cAAc,EAAE,MAAM,EAAE;IACxB,YAAY;CACf,CAAC;AAEO,4CAAgB"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/VPWorker.js

@@ -24,7 +24,8 @@ class VPWorker extends workers_1.AbstractWorker {
             task.queuePrefix = this.getQueuePrefix();
         };
         // Register tasks
-        this.registerTask(Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.RefreshPublicCacheTask));
+        this.registerTask(Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.RefreshPublicTripCacheTask));
+        this.registerTask(Di_1.VPContainer.resolve(VPContainerToken_1.VPContainerToken.RefreshPublicStopTimeCacheTask));
         this.registerTask(new SaveDataToDBTask_1.SaveDataToDBTask(this.getQueuePrefix()));
         this.registerTask(new UpdateGtfsTripIdTask_1.UpdateGtfsTripIdTask(this.getQueuePrefix()));
         this.registerTask(new UpdateRunsGtfsTripIdTask_1.UpdateRunsGtfsTripIdTask(this.getQueuePrefix()));

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/VPWorker.js.map

@@ -1 +1 @@
-{"version":3,"file":"VPWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/VPWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,iEAA8E;AAC9E,2EAA6F;AAC7F,2CAA0C;AAC1C,iEAA8D;AAC9D,2DAAwD;AACxD,6FAA0F;AAC1F,mEAAgE;AAChE,6EAA0E;AAC1E,6EAA0E;AAC1E,+DAA4D;AAC5D,6DAA0D;AAC1D,uEAAoE;AACpE,+EAA4E;AAE5E,MAAa,QAAS,SAAQ,wBAAc;IAGxC;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QAmBtB,iBAAY,GAAG,CAAC,IAAuB,EAAQ,EAAE;YACpD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAjBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,gBAAW,CAAC,OAAO,CAAC,mCAAgB,CAAC,sBAAsB,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,YAAY,CAAC,IAAI,mCAAgB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,CAAC,IAAI,2CAAoB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,IAAI,mDAAwB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,IAAI,iCAAe,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,YAAY,CAAC,IAAI,iEAA+B,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,YAAY,CAAC,IAAI,uCAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,YAAY,CAAC,IAAI,iDAAuB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,CAAC,IAAI,iDAAuB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,CAAC,IAAI,qCAAiB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,CAAC,IAAI,+BAAc,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACjE,CAAC;CAMJ;AAxBD,4BAwBC"}
+{"version":3,"file":"VPWorker.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/VPWorker.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,iEAA8E;AAC9E,2EAA6F;AAC7F,2CAA0C;AAC1C,iEAA8D;AAC9D,2DAAwD;AACxD,6FAA0F;AAC1F,mEAAgE;AAChE,6EAA0E;AAC1E,6EAA0E;AAC1E,+DAA4D;AAC5D,6DAA0D;AAC1D,uEAAoE;AACpE,+EAA4E;AAE5E,MAAa,QAAS,SAAQ,wBAAc;IAGxC;QACI,KAAK,EAAE,CAAC;QAHF,SAAI,GAAG,uBAAW,CAAC;QAoBtB,iBAAY,GAAG,CAAC,IAAuB,EAAQ,EAAE;YACpD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC7C,CAAC,CAAC;QAlBE,iBAAiB;QACjB,IAAI,CAAC,YAAY,CAAC,gBAAW,CAAC,OAAO,CAAC,mCAAgB,CAAC,0BAA0B,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,YAAY,CAAC,gBAAW,CAAC,OAAO,CAAC,mCAAgB,CAAC,8BAA8B,CAAC,CAAC,CAAC;QACxF,IAAI,CAAC,YAAY,CAAC,IAAI,mCAAgB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,YAAY,CAAC,IAAI,2CAAoB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,YAAY,CAAC,IAAI,mDAAwB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,IAAI,iCAAe,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC9D,IAAI,CAAC,YAAY,CAAC,IAAI,iEAA+B,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAC9E,IAAI,CAAC,YAAY,CAAC,IAAI,uCAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,YAAY,CAAC,IAAI,iDAAuB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,CAAC,IAAI,iDAAuB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,CAAC,IAAI,qCAAiB,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,CAAC,IAAI,+BAAc,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IACjE,CAAC;CAMJ;AAzBD,4BAyBC"}

package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js

@@ -345,27 +345,35 @@ class TripsRepository extends models_2.PostgresModel {
             try {
                 return this.sequelizeModel.findAll({
                     attributes: [
-                        // Workaround for distinct selection
-                        [
-                            sequelize_1.default.literal(`DISTINCT ON(gtfs_route_type, coalesce(vehicle_registration_number::text, gtfs_trip_id)) gtfs_trip_id`),
-                            "gtfs_trip_id",
-                        ],
-                        "cis_trip_number",
+                        "gtfs_trip_id",
                         "gtfs_route_type",
                         "gtfs_route_short_name",
-                        "run_number",
-                        "vehicle_registration_number",
+                        "cis_trip_number",
                         [sequelize_1.default.literal("last_position.lat"), "lat"],
                         [sequelize_1.default.literal("last_position.lng"), "lng"],
                         [sequelize_1.default.literal("last_position.bearing"), "bearing"],
                         [sequelize_1.default.literal("last_position.delay"), "delay"],
                         [sequelize_1.default.literal("last_position.state_position"), "state_position"],
+                        "updated_at",
+                        // Additional properties for detailed vehiclepositions in public API
+                        "wheelchair_accessible",
+                        "run_number",
+                        "vehicle_registration_number",
+                        "agency_name_real",
+                        "vehicle_type_id",
+                        "origin_route_name",
+                        "gtfs_shape_id",
+                        "gtfs_trip_headsign",
+                        [sequelize_1.default.literal("last_position.shape_dist_traveled"), "shape_dist_traveled"],
+                        [sequelize_1.default.literal("last_position.last_stop_sequence"), "last_stop_sequence"],
+                        [sequelize_1.default.literal("last_position.origin_timestamp"), "origin_timestamp"],
                     ],
                     include: [
                         {
                             as: "last_position",
                             model: this.positionsRepository["sequelizeModel"],
                             attributes: [],
+                            required: true,
                             where: {
                                 state_position: {
                                     [sequelize_1.default.Op.in]: [
@@ -392,8 +400,6 @@ class TripsRepository extends models_2.PostgresModel {
                         },
                     },
                     order: [
-                        ["gtfs_route_type", "ASC"],
-                        [sequelize_1.default.literal("coalesce(vehicle_registration_number::text, gtfs_trip_id)"), "ASC"],
                         ["updated_at", "DESC"],
                         ["id", "ASC"],
                     ],