@golemio/pid 2.6.8-dev.841816081 → 2.6.8-dev.844608904

package/db/example/03_ropidgtfs_dump.sql

@@ -180,9 +180,9 @@ VALUES
 (E'11:42:00',NULL,E'11:42:40',NULL,E'0',E'0',1.41799,NULL,E'U474Z4P',2,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
 (E'11:47:00',NULL,E'11:47:00',NULL,E'0',E'0',3.36004,NULL,E'U603Z3P',3,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
 (E'11:48:00',NULL,E'11:48:00',NULL,E'0',E'0',3.82975,NULL,E'U665Z2P',4,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
-(E'11:49:00',NULL,E'11:49:00',NULL,E'0',E'0',4.25536,NULL,E'U332Z2P',5,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
+(E'11:49:00',NULL,E'11:50:10',NULL,E'0',E'0',4.25536,NULL,E'U332Z2P',5,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
 (E'11:51:00',NULL,E'11:51:00',NULL,E'0',E'0',4.89398,NULL,E'U467Z2P',6,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
-(E'11:53:00',NULL,E'11:53:00',NULL,E'3',E'3',5.39679,NULL,E'U740Z3P',7,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
+(E'11:53:00',NULL,E'11:54:40',NULL,E'3',E'3',5.39679,NULL,E'U740Z3P',7,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
 (E'11:55:00',NULL,E'11:55:00',NULL,E'0',E'0',5.83914,NULL,E'U78Z3P',8,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
 (E'11:58:00',NULL,E'11:58:00',NULL,E'0',E'0',6.93061,NULL,E'U675Z3P',9,E'152_60_201230',-1,E'2021-04-14 05:41:11.186+02',NULL,-1,E'2021-04-14 05:41:11.186+02',NULL,NULL),
 
@@ -551,9 +551,9 @@ INSERT INTO ropidgtfs_stop_times_actual (trip_id,stop_sequence,arrival_time,arri
 
 -- TRIP AT STOP
 WITH init_values AS (SELECT NOW()::DATE AS now_date)
-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")
+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","provider_source_type")
 VALUES
-(E'100152',95,37,E'152',E'2019-05-26 10:43:16.991+02',E'L152',E'152',E'152_37_201230',E'2019-05-26T09:13:00Z_XX_152_37_201230',(SELECT CONCAT(now_date,'T11:37:10')::TIMESTAMP AT TIME ZONE 'Europe/Prague' FROM init_values),47178,E'B',E'11:34:00',(SELECT EXTRACT(EPOCH FROM (CONCAT(now_date,'T11:34:00')::TIMESTAMP AT TIME ZONE 'Europe/Prague')) * 1000 FROM init_values),3,TRUE,NULL,NULL,NULL,NULL,E'ARRIVA City',E'433',E'ARRIVA City',8582,NULL,NULL,3,NULL,100015);
+(E'100152',95,37,E'152',E'2019-05-26 10:43:16.991+02',E'L152',E'152',E'152_37_201230',E'2019-05-26T09:13:00Z_XX_152_37_201230',(SELECT CONCAT(now_date,'T11:37:10')::TIMESTAMP AT TIME ZONE 'Europe/Prague' FROM init_values),47178,E'B',E'11:34:00',(SELECT EXTRACT(EPOCH FROM (CONCAT(now_date,'T11:34:00')::TIMESTAMP AT TIME ZONE 'Europe/Prague')) * 1000 FROM init_values),3,TRUE,NULL,NULL,NULL,NULL,E'ARRIVA City',E'433',E'ARRIVA City',8582,NULL,NULL,3,NULL,100015,'1');
 
 WITH init_values AS (SELECT NOW()::DATE AS now_date)
 INSERT INTO "vehiclepositions_positions"("created_at","delay","delay_stop_arrival","delay_stop_departure","next_stop_id","shape_dist_traveled","is_canceled","lat","lng","origin_time","origin_timestamp","tracking","trips_id","create_batch_id","created_by","update_batch_id","updated_at","updated_by","id","bearing","cis_last_stop_id","cis_last_stop_sequence","last_stop_id","last_stop_sequence","last_stop_name","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")

package/db/example/12_metro_line_A_gtfs_trips.sql

@@ -110,11 +110,11 @@ INSERT INTO vehiclepositions_metro_runs_messages (route_name, message_timestamp,
     ('A', concat(CURRENT_DATE,'T08:20:08Z')::timestamp, '9', '9', '175', '1211', -15, concat(CURRENT_DATE,'T08:19:53Z')::timestamp, (SELECT origin_datetime FROM init_values), (SELECT origin_datetime FROM init_values)),
     ('A', concat(CURRENT_DATE,'T08:20:13Z')::timestamp, '9', '9', '175', '1209', -15, concat(CURRENT_DATE,'T08:19:58Z')::timestamp, (SELECT origin_datetime FROM init_values), (SELECT origin_datetime FROM init_values));
 
-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) VALUES
-	 (NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_78_220321',concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:32:35',extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Skalka',NULL,1,NULL,30,NULL,extract(epoch from concat(CURRENT_DATE,'T09:00:40Z')::timestamp)*1000,NULL,concat('{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":null,"firstPositionDelay":null},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"departure_time":null},"lastPositionDelay":null,"lastPositionId":null,"lastPositionOriginTimestamp":null,"lastPositionTracking":null,"lastPositionCanceled":null,"lastPositionBeforeTrackDelayed":null,"isLastPositionAfterTrack":false,"tripId":"', concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'), '"}')::json),
-	 (NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_77_220901',concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'09:55:10',extract(epoch from concat(CURRENT_DATE,'T07:55:10Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Nemocnice Motol',NULL,1,NULL,29,NULL,extract(epoch from concat(CURRENT_DATE,'T08:26:20Z')::timestamp)*1000,NULL,concat('{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":null,"firstPositionDelay":null},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"departure_time":null},"lastPositionDelay":null,"lastPositionId":null,"lastPositionOriginTimestamp":null,"lastPositionTracking":null,"lastPositionCanceled":null,"lastPositionBeforeTrackDelayed":null,"isLastPositionAfterTrack":false,"tripId":"', concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'), '"}')::json),
-	 (NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_124_201230',concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'11:02:40',extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Nemocnice Motol',NULL,1,NULL,31,NULL,extract(epoch from concat(CURRENT_DATE,'T09:31:20Z')::timestamp)*1000,NULL,concat('{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":null,"firstPositionDelay":null},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"departure_time":null},"lastPositionDelay":null,"lastPositionId":null,"lastPositionOriginTimestamp":null,"lastPositionTracking":null,"lastPositionCanceled":null,"lastPositionBeforeTrackDelayed":null,"isLastPositionAfterTrack":false,"tripId":"', concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'), '"}')::json),
-	 (NULL,NULL,9,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_294_220901',concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:04:35',extract(epoch from concat(CURRENT_DATE,'T08:04:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Skalka',NULL,1,NULL,32,NULL,extract(epoch from concat(CURRENT_DATE,'T08:32:40Z')::timestamp)*1000,NULL,concat('{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":null,"firstPositionDelay":null},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"departure_time":null},"lastPositionDelay":null,"lastPositionId":null,"lastPositionOriginTimestamp":null,"lastPositionTracking":null,"lastPositionCanceled":null,"lastPositionBeforeTrackDelayed":null,"isLastPositionAfterTrack":false,"tripId":"', concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'), '"}')::json);
+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,provider_source_type) VALUES
+	 (NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_78_220321',concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:32:35',extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Skalka',NULL,1,NULL,30,NULL,extract(epoch from concat(CURRENT_DATE,'T09:00:40Z')::timestamp)*1000,NULL,concat('{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":null,"firstPositionDelay":null},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"departure_time":null},"lastPositionDelay":null,"lastPositionId":null,"lastPositionOriginTimestamp":null,"lastPositionTracking":null,"lastPositionCanceled":null,"lastPositionBeforeTrackDelayed":null,"isLastPositionAfterTrack":false,"tripId":"', concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'), '"}')::json, '3'),
+	 (NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_77_220901',concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'09:55:10',extract(epoch from concat(CURRENT_DATE,'T07:55:10Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Nemocnice Motol',NULL,1,NULL,29,NULL,extract(epoch from concat(CURRENT_DATE,'T08:26:20Z')::timestamp)*1000,NULL,concat('{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":null,"firstPositionDelay":null},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"departure_time":null},"lastPositionDelay":null,"lastPositionId":null,"lastPositionOriginTimestamp":null,"lastPositionTracking":null,"lastPositionCanceled":null,"lastPositionBeforeTrackDelayed":null,"isLastPositionAfterTrack":false,"tripId":"', concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'), '"}')::json, '3'),
+	 (NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_124_201230',concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'11:02:40',extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Nemocnice Motol',NULL,1,NULL,31,NULL,extract(epoch from concat(CURRENT_DATE,'T09:31:20Z')::timestamp)*1000,NULL,concat('{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":null,"firstPositionDelay":null},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"departure_time":null},"lastPositionDelay":null,"lastPositionId":null,"lastPositionOriginTimestamp":null,"lastPositionTracking":null,"lastPositionCanceled":null,"lastPositionBeforeTrackDelayed":null,"isLastPositionAfterTrack":false,"tripId":"', concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'), '"}')::json, '3'),
+	 (NULL,NULL,9,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_294_220901',concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:04:35',extract(epoch from concat(CURRENT_DATE,'T08:04:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Skalka',NULL,1,NULL,32,NULL,extract(epoch from concat(CURRENT_DATE,'T08:32:40Z')::timestamp)*1000,NULL,concat('{"atStopStreak":{"stop_sequence":null,"firstPositionTimestamp":null,"firstPositionDelay":null},"lastPositionLastStop":{"id":null,"sequence":null,"arrival_time":null,"departure_time":null},"lastPositionDelay":null,"lastPositionId":null,"lastPositionOriginTimestamp":null,"lastPositionTracking":null,"lastPositionCanceled":null,"lastPositionBeforeTrackDelayed":null,"isLastPositionAfterTrack":false,"tripId":"', concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'), '"}')::json, '3');
 
 INSERT INTO vehiclepositions_positions (created_at,delay,delay_stop_arrival,delay_stop_departure,next_stop_id,shape_dist_traveled,is_canceled,lat,lng,origin_time,origin_timestamp,tracking,trips_id,create_batch_id,created_by,update_batch_id,updated_at,updated_by,id,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) VALUES
 	 (concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,NULL,NULL,'U306Z101P',0,NULL,50.09837,14.36282,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,26,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,NULL,'processed','before_track','U157Z102P',NULL,NULL,NULL,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),

package/db/migrations/postgresql/20230418184824-stop-time-delay-prediction.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', '20230418184824-stop-time-delay-prediction-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', '20230418184824-stop-time-delay-prediction-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/20230418184824-stop-time-delay-prediction-down.sql

@@ -0,0 +1,10 @@
+drop view v_vehiclepositions_stop_time_delay_prediction;
+
+alter table ropidgtfs_stop_times drop column computed_dwell_time_seconds;
+alter table ropidgtfs_stop_times_actual drop column computed_dwell_time_seconds;
+
+alter table vehiclepositions_trips drop column provider_source_type;
+alter table vehiclepositions_trips_history drop column provider_source_type;
+
+drop function calculate_dwell_time_seconds (varchar, varchar);
+drop function predict_delay_seconds (int, smallint, varchar);

package/db/migrations/postgresql/sqls/20230418184824-stop-time-delay-prediction-up.sql

@@ -0,0 +1,113 @@
+-- Functions
+create function calculate_dwell_time_seconds(arrival_time varchar, departure_time varchar) RETURNS int AS $$
+    select extract(epoch from departure_time::interval) - extract(epoch from arrival_time::interval)
+$$ LANGUAGE SQL IMMUTABLE;
+
+create function predict_delay_seconds(position_delay int, stop_dwell_time_seconds smallint, provider_source_type varchar) RETURNS int AS $$
+declare
+    result int;
+BEGIN
+    select
+        position_delay - least(greatest(0, position_delay), greatest(0, stop_dwell_time_seconds - 60))
+    into result;
+
+    if provider_source_type = '1' then -- http
+        return greatest(0, result);
+    else
+        return result;
+    end if;
+END;
+$$ LANGUAGE plpgsql;
+
+comment on function predict_delay_seconds is '
+Predicts the delay of a vehicle at a stop.
+If the provider source type is HTTP, the predicted delay should never be negative (ahead of schedule).
+';
+
+
+-- Tables
+alter table ropidgtfs_stop_times_actual
+    add column computed_dwell_time_seconds smallint not null GENERATED ALWAYS AS (calculate_dwell_time_seconds(arrival_time, departure_time)) stored;
+
+alter table ropidgtfs_stop_times
+    add column computed_dwell_time_seconds smallint;
+
+alter table vehiclepositions_trips
+    add column provider_source_type varchar(1) not null default '0';
+
+alter table vehiclepositions_trips_history
+    add column provider_source_type varchar(1) not null default '0';
+
+comment on column vehiclepositions_trips.provider_source_type is '
+0 - unknown
+1 - http
+2 - tcp common
+3 - tcp metro
+';
+
+update vehiclepositions_trips vt
+    set provider_source_type =
+        case when vp.tcp_event is not null
+            then '2' -- tcp common
+            when vp.tcp_event is null and vp.scheduled_timestamp is not null
+                then '3' -- tcp metro
+            else '1' -- http
+        end
+from vehiclepositions_positions vp
+where vp.id = vt.last_position_id;
+
+
+-- Views
+create view v_vehiclepositions_stop_time_delay_prediction as
+with recursive stop_times as (
+    select
+    	rst.trip_id,
+        vt.provider_source_type,
+    	vp.delay,
+    	coalesce(vp.last_stop_sequence, 1) as initial_stop_sequence,
+    	rst.stop_sequence,
+    	rst.stop_id,
+    	rst.computed_dwell_time_seconds,
+    	case when last_stop_sequence is null
+            then vp.delay
+            else vp.delay_stop_arrival
+        end as arrival_delay_seconds,
+    	case when last_stop_sequence is null
+            then predict_delay_seconds(vp.delay, rst.computed_dwell_time_seconds, vt.provider_source_type)
+            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 >= extract(epoch from now()) * 1000)
+    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.provider_source_type,
+    	previous_row.delay,
+    	previous_row.initial_stop_sequence,
+    	rst.stop_sequence,
+    	rst.stop_id,
+    	rst.computed_dwell_time_seconds,
+    	case when rst.stop_sequence - previous_row.initial_stop_sequence = 1
+            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 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
+)
+select trip_id, stop_sequence, stop_id, 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/ropid-gtfs/RopidGTFSMetadataModel.js

@@ -16,6 +16,7 @@ exports.RopidGTFSMetadataModel = exports.DatasetEnum = void 0;
 const precomputed_1 = require("./data-access/precomputed");
 const utils_1 = require("./utils");
 const shared_1 = require("../shared");
+const const_1 = require("../../schema-definitions/const");
 const ropid_gtfs_1 = require("../../schema-definitions/ropid-gtfs");
 const connectors_1 = require("@golemio/core/dist/integration-engine/connectors");
 const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
@@ -53,7 +54,7 @@ class RopidGTFSMetadataModel extends shared_1.RopidMetadataModel {
             WHERE table_schema NOT IN ('pg_catalog', 'information_schema')
                 AND table_type = 'BASE TABLE'
                 AND table_name in (${tablesArray.join(",")})
-                AND table_schema = '${ropid_gtfs_1.RopidGTFS.pgSchema}';
+                AND table_schema = '${const_1.PG_SCHEMA}';
             `, { type: sequelize_1.default.QueryTypes.SELECT });
             helpers_1.log.info(`Datasets: total rows for ${dataset}: ${JSON.stringify(result)}`);
             if (!result || !result.length || result.some((table) => table.total === 0)) {
@@ -179,19 +180,19 @@ class RopidGTFSMetadataModel extends shared_1.RopidMetadataModel {
                     ? (0, utils_1.buildAlterIndexQuery)(ropid_gtfs_1.RopidGTFS[table.dataValues.tn].modelIndexOptions)
                     : "";
                 yield connection.query(`
-                LOCK "${ropid_gtfs_1.RopidGTFS.pgSchema}".${pgTableName} IN EXCLUSIVE MODE;
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameActual} NO INHERIT "${ropid_gtfs_1.RopidGTFS.pgSchema}".${pgTableName};
+                LOCK "${const_1.PG_SCHEMA}".${pgTableName} IN EXCLUSIVE MODE;
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameActual} NO INHERIT "${const_1.PG_SCHEMA}".${pgTableName};
                 ${indexQuery}
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameTmp} ADD create_batch_id int8 NULL;
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameTmp} ADD COLUMN created_at timestamptz NULL DEFAULT now();
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameTmp} ADD created_by varchar(150) NULL;
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameTmp} ADD update_batch_id int8 NULL;
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameTmp} ADD COLUMN updated_at timestamptz NULL DEFAULT now();
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameTmp} ADD updated_by varchar(150) NULL;
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameActual} RENAME TO ${tableNameDrop};
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameTmp} RENAME TO ${tableNameActual};
-                ALTER TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameActual} INHERIT "${ropid_gtfs_1.RopidGTFS.pgSchema}".${pgTableName};
-                DROP TABLE "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tableNameDrop};
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameTmp} ADD create_batch_id int8 NULL;
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameTmp} ADD COLUMN created_at timestamptz NULL DEFAULT now();
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameTmp} ADD created_by varchar(150) NULL;
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameTmp} ADD update_batch_id int8 NULL;
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameTmp} ADD COLUMN updated_at timestamptz NULL DEFAULT now();
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameTmp} ADD updated_by varchar(150) NULL;
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameActual} RENAME TO ${tableNameDrop};
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameTmp} RENAME TO ${tableNameActual};
+                ALTER TABLE "${const_1.PG_SCHEMA}".${tableNameActual} INHERIT "${const_1.PG_SCHEMA}".${pgTableName};
+                DROP TABLE "${const_1.PG_SCHEMA}".${tableNameDrop};
                 `, { transaction: t });
             }
         });

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

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

package/dist/integration-engine/ropid-gtfs/RopidGTFSShapesModel.d.ts

@@ -1,6 +1,6 @@
 import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine";
-import Sequelize from "@golemio/core/dist/shared/sequelize";
 import { Validator } from "@golemio/core/dist/shared/golemio-validator";
+import Sequelize from "@golemio/core/dist/shared/sequelize";
 export declare class RopidGTFSShapesModel extends PostgresModel implements IModel {
     /** Model name */
     name: string;

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RopidGTFSShapesModel = void 0;
+const const_1 = require("../../schema-definitions/const");
 const ropid_gtfs_1 = require("../../schema-definitions/ropid-gtfs");
+const ShapeDto_1 = require("../../schema-definitions/ropid-gtfs/models/ShapeDto");
 const integration_engine_1 = require("@golemio/core/dist/integration-engine");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
-const ShapeDto_1 = require("../../schema-definitions/ropid-gtfs/models/ShapeDto");
 class RopidGTFSShapesModel extends integration_engine_1.PostgresModel {
     constructor() {
         super(ropid_gtfs_1.RopidGTFS.shapes.name + "Model", {
             outputSequelizeAttributes: ShapeDto_1.ShapeDto.attributeModel,
             pgTableName: ropid_gtfs_1.RopidGTFS.shapes.pgTableName,
-            pgSchema: ropid_gtfs_1.RopidGTFS.pgSchema,
+            pgSchema: const_1.PG_SCHEMA,
             savingType: "insertOnly",
         }, new golemio_validator_1.JSONSchemaValidator(ropid_gtfs_1.RopidGTFS.shapes.name + "ModelValidator", ShapeDto_1.ShapeDto.jsonSchema));
     }

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

@@ -1 +1 @@
-{"version":3,"file":"RopidGTFSShapesModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSShapesModel.ts"],"names":[],"mappings":";;;AAAA,oEAA4C;AAC5C,8EAA8E;AAE9E,mFAA6F;AAC7F,kFAA2D;AAE3D,MAAa,oBAAqB,SAAQ,kCAAa;IAYnD;QACI,KAAK,CACD,sBAAS,CAAC,MAAM,CAAC,IAAI,GAAG,OAAO,EAC/B;YACI,yBAAyB,EAAE,mBAAQ,CAAC,cAAc;YAClD,WAAW,EAAE,sBAAS,CAAC,MAAM,CAAC,WAAW;YACzC,QAAQ,EAAE,sBAAS,CAAC,QAAQ;YAC5B,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,uCAAmB,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,GAAG,gBAAgB,EAAE,mBAAQ,CAAC,UAAU,CAAC,CACzF,CAAC;IACN,CAAC;CACJ;AAxBD,oDAwBC"}
+{"version":3,"file":"RopidGTFSShapesModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSShapesModel.ts"],"names":[],"mappings":";;;AAAA,0DAAuC;AACvC,oEAA4C;AAC5C,kFAA2D;AAC3D,8EAA8E;AAC9E,mFAA6F;AAG7F,MAAa,oBAAqB,SAAQ,kCAAa;IAYnD;QACI,KAAK,CACD,sBAAS,CAAC,MAAM,CAAC,IAAI,GAAG,OAAO,EAC/B;YACI,yBAAyB,EAAE,mBAAQ,CAAC,cAAc;YAClD,WAAW,EAAE,sBAAS,CAAC,MAAM,CAAC,WAAW;YACzC,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,uCAAmB,CAAC,sBAAS,CAAC,MAAM,CAAC,IAAI,GAAG,gBAAgB,EAAE,mBAAQ,CAAC,UAAU,CAAC,CACzF,CAAC;IACN,CAAC;CACJ;AAxBD,oDAwBC"}

package/dist/integration-engine/ropid-gtfs/RopidGTFSStopTimesModel.d.ts

@@ -1,6 +1,6 @@
 import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine";
-import Sequelize from "@golemio/core/dist/shared/sequelize";
 import { Validator } from "@golemio/core/dist/shared/golemio-validator";
+import Sequelize from "@golemio/core/dist/shared/sequelize";
 export interface ITripStopsResult {
     trip_id: string;
     trip_stops: ITripStop[];

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

@@ -13,19 +13,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RopidGTFSStopTimesModel = void 0;
+const const_1 = require("../../schema-definitions/const");
 const ropid_gtfs_1 = require("../../schema-definitions/ropid-gtfs");
+const StopTimesDto_1 = require("../../schema-definitions/ropid-gtfs/models/StopTimesDto");
 const integration_engine_1 = require("@golemio/core/dist/integration-engine");
-const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
-const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const connectors_1 = require("@golemio/core/dist/integration-engine/connectors");
+const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
-const StopTimesDto_1 = require("../../schema-definitions/ropid-gtfs/models/StopTimesDto");
+const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
 class RopidGTFSStopTimesModel extends integration_engine_1.PostgresModel {
     constructor() {
         super(ropid_gtfs_1.RopidGTFS.stop_times.name + "Model", {
             outputSequelizeAttributes: ropid_gtfs_1.RopidGTFS.stop_times.outputSequelizeAttributes,
             pgTableName: ropid_gtfs_1.RopidGTFS.stop_times.pgTableName,
-            pgSchema: ropid_gtfs_1.RopidGTFS.pgSchema,
+            pgSchema: const_1.PG_SCHEMA,
             savingType: "insertOnly",
         }, new golemio_validator_1.JSONSchemaValidator(ropid_gtfs_1.RopidGTFS.stop_times.name + "ModelValidator", StopTimesDto_1.StopTimesDto.jsonSchema));
         this.findTripStops = (tripIds) => __awaiter(this, void 0, void 0, function* () {
@@ -36,8 +37,8 @@ class RopidGTFSStopTimesModel extends integration_engine_1.PostgresModel {
                         json_build_object('stop_id', t1.stop_id, 'stop_sequence', t1.stop_sequence, 'cis', t2.cis)
                             ORDER BY t1.stop_sequence
                     )) as trip_stops
-                    FROM ${ropid_gtfs_1.RopidGTFS.pgSchema}."${this.tableName}" t1
-                    LEFT JOIN ${ropid_gtfs_1.RopidGTFS.pgSchema}."${ropid_gtfs_1.RopidGTFS.cis_stops.pgTableName}" t2
+                    FROM ${const_1.PG_SCHEMA}."${this.tableName}" t1
+                    LEFT JOIN ${const_1.PG_SCHEMA}."${ropid_gtfs_1.RopidGTFS.cis_stops.pgTableName}" t2
                         on t1.stop_id = CONCAT('U',REPLACE(id,'/','Z'))
                     WHERE t1.trip_id in (${tripIds.map((tripId) => "'" + tripId + "'").join(",")})
                     GROUP BY t1.trip_id

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

@@ -1 +1 @@
-{"version":3,"file":"RopidGTFSStopTimesModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSStopTimesModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oEAA4C;AAC5C,8EAA8E;AAC9E,oFAA4D;AAC5D,6EAAuE;AACvE,iFAAqF;AACrF,mFAA6F;AAC7F,0FAAmE;AAanE,MAAa,uBAAwB,SAAQ,kCAAa;IAYtD;QACI,KAAK,CACD,sBAAS,CAAC,UAAU,CAAC,IAAI,GAAG,OAAO,EACnC;YACI,yBAAyB,EAAE,sBAAS,CAAC,UAAU,CAAC,yBAAyB;YACzE,WAAW,EAAE,sBAAS,CAAC,UAAU,CAAC,WAAW;YAC7C,QAAQ,EAAE,sBAAS,CAAC,QAAQ;YAC5B,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,uCAAmB,CAAC,sBAAS,CAAC,UAAU,CAAC,IAAI,GAAG,gBAAgB,EAAE,2BAAY,CAAC,UAAU,CAAC,CACjG,CAAC;QAGC,kBAAa,GAAG,CAAO,OAAiB,EAA+B,EAAE;YAC5E,MAAM,UAAU,GAAG,8BAAiB,CAAC,aAAa,EAAE,CAAC;YACrD,IAAI;gBACA,OAAO,MAAM,UAAU,CAAC,KAAK,CACzB;;;;;2BAKW,sBAAS,CAAC,QAAQ,KAAK,IAAI,CAAC,SAAS;gCAChC,sBAAS,CAAC,QAAQ,KAAK,sBAAS,CAAC,SAAS,CAAC,WAAW;;2CAE3C,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;iBAE/E,EACD,EAAE,IAAI,EAAE,mBAAS,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,CACnD,CAAC;aACL;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,4BAAW,CAAC,wBAAwB,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;aACpF;QACL,CAAC,CAAA,CAAC;IAtBF,CAAC;CAuBJ;AA9CD,0DA8CC"}
+{"version":3,"file":"RopidGTFSStopTimesModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSStopTimesModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,0DAAuC;AACvC,oEAA4C;AAC5C,0FAAmE;AACnE,8EAA8E;AAC9E,iFAAqF;AACrF,6EAAuE;AACvE,mFAA6F;AAC7F,oFAA4D;AAa5D,MAAa,uBAAwB,SAAQ,kCAAa;IAYtD;QACI,KAAK,CACD,sBAAS,CAAC,UAAU,CAAC,IAAI,GAAG,OAAO,EACnC;YACI,yBAAyB,EAAE,sBAAS,CAAC,UAAU,CAAC,yBAAyB;YACzE,WAAW,EAAE,sBAAS,CAAC,UAAU,CAAC,WAAW;YAC7C,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,uCAAmB,CAAC,sBAAS,CAAC,UAAU,CAAC,IAAI,GAAG,gBAAgB,EAAE,2BAAY,CAAC,UAAU,CAAC,CACjG,CAAC;QAGC,kBAAa,GAAG,CAAO,OAAiB,EAA+B,EAAE;YAC5E,MAAM,UAAU,GAAG,8BAAiB,CAAC,aAAa,EAAE,CAAC;YACrD,IAAI;gBACA,OAAO,MAAM,UAAU,CAAC,KAAK,CACzB;;;;;2BAKW,iBAAS,KAAK,IAAI,CAAC,SAAS;gCACvB,iBAAS,KAAK,sBAAS,CAAC,SAAS,CAAC,WAAW;;2CAElC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;;iBAE/E,EACD,EAAE,IAAI,EAAE,mBAAS,CAAC,UAAU,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,CACnD,CAAC;aACL;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,4BAAW,CAAC,wBAAwB,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;aACpF;QACL,CAAC,CAAA,CAAC;IAtBF,CAAC;CAuBJ;AA9CD,0DA8CC"}

package/dist/integration-engine/ropid-gtfs/RopidGTFSStopsModel.d.ts

@@ -1,6 +1,6 @@
 import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine";
-import Sequelize from "@golemio/core/dist/shared/sequelize";
 import { Validator } from "@golemio/core/dist/shared/golemio-validator";
+import Sequelize from "@golemio/core/dist/shared/sequelize";
 export declare class RopidGTFSStopsModel extends PostgresModel implements IModel {
     /** Model name */
     name: string;

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

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RopidGTFSStopsModel = void 0;
+const const_1 = require("../../schema-definitions/const");
 const ropid_gtfs_1 = require("../../schema-definitions/ropid-gtfs");
+const StopDto_1 = require("../../schema-definitions/ropid-gtfs/models/StopDto");
 const integration_engine_1 = require("@golemio/core/dist/integration-engine");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
-const StopDto_1 = require("../../schema-definitions/ropid-gtfs/models/StopDto");
 class RopidGTFSStopsModel extends integration_engine_1.PostgresModel {
     constructor() {
         super(ropid_gtfs_1.RopidGTFS.stops.name + "Model", {
             outputSequelizeAttributes: ropid_gtfs_1.RopidGTFS.stops.outputSequelizeAttributes,
             pgTableName: ropid_gtfs_1.RopidGTFS.stops.pgTableName,
-            pgSchema: ropid_gtfs_1.RopidGTFS.pgSchema,
+            pgSchema: const_1.PG_SCHEMA,
             savingType: "insertOnly",
         }, new golemio_validator_1.JSONSchemaValidator(ropid_gtfs_1.RopidGTFS.stops.name + "ModelValidator", StopDto_1.StopDto.jsonSchema));
     }

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

@@ -1 +1 @@
-{"version":3,"file":"RopidGTFSStopsModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSStopsModel.ts"],"names":[],"mappings":";;;AAAA,oEAA4C;AAC5C,8EAA8E;AAE9E,mFAA6F;AAC7F,gFAAyD;AAEzD,MAAa,mBAAoB,SAAQ,kCAAa;IAYlD;QACI,KAAK,CACD,sBAAS,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,EAC9B;YACI,yBAAyB,EAAE,sBAAS,CAAC,KAAK,CAAC,yBAAyB;YACpE,WAAW,EAAE,sBAAS,CAAC,KAAK,CAAC,WAAW;YACxC,QAAQ,EAAE,sBAAS,CAAC,QAAQ;YAC5B,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,uCAAmB,CAAC,sBAAS,CAAC,KAAK,CAAC,IAAI,GAAG,gBAAgB,EAAE,iBAAO,CAAC,UAAU,CAAC,CACvF,CAAC;IACN,CAAC;CACJ;AAxBD,kDAwBC"}
+{"version":3,"file":"RopidGTFSStopsModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSStopsModel.ts"],"names":[],"mappings":";;;AAAA,0DAAuC;AACvC,oEAA4C;AAC5C,gFAAyD;AACzD,8EAA8E;AAC9E,mFAA6F;AAG7F,MAAa,mBAAoB,SAAQ,kCAAa;IAYlD;QACI,KAAK,CACD,sBAAS,CAAC,KAAK,CAAC,IAAI,GAAG,OAAO,EAC9B;YACI,yBAAyB,EAAE,sBAAS,CAAC,KAAK,CAAC,yBAAyB;YACpE,WAAW,EAAE,sBAAS,CAAC,KAAK,CAAC,WAAW;YACxC,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,uCAAmB,CAAC,sBAAS,CAAC,KAAK,CAAC,IAAI,GAAG,gBAAgB,EAAE,iBAAO,CAAC,UAAU,CAAC,CACvF,CAAC;IACN,CAAC;CACJ;AAxBD,kDAwBC"}

package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.d.ts

@@ -1,6 +1,6 @@
+import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
 import { Validator } from "@golemio/core/dist/shared/golemio-validator";
 import Sequelize from "@golemio/core/dist/shared/sequelize";
-import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
 export interface ITripsShapes {
     bikes_allowed: number;
     block_id: string;

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

@@ -13,18 +13,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RopidGTFSTripsModel = void 0;
+const const_1 = require("../../schema-definitions/const");
+const ropid_gtfs_1 = require("../../schema-definitions/ropid-gtfs");
+const TripDto_1 = require("../../schema-definitions/ropid-gtfs/models/TripDto");
+const models_1 = require("@golemio/core/dist/integration-engine/models");
 const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
 const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
-const models_1 = require("@golemio/core/dist/integration-engine/models");
-const ropid_gtfs_1 = require("../../schema-definitions/ropid-gtfs");
 const _1 = require(".");
-const TripDto_1 = require("../../schema-definitions/ropid-gtfs/models/TripDto");
 class RopidGTFSTripsModel extends models_1.PostgresModel {
     constructor() {
         super(ropid_gtfs_1.RopidGTFS.trips.name + "Model", {
             outputSequelizeAttributes: ropid_gtfs_1.RopidGTFS.trips.outputSequelizeAttributes,
             pgTableName: ropid_gtfs_1.RopidGTFS.trips.pgTableName,
-            pgSchema: ropid_gtfs_1.RopidGTFS.pgSchema,
+            pgSchema: const_1.PG_SCHEMA,
             savingType: "insertOnly",
         }, new golemio_validator_1.JSONSchemaValidator(ropid_gtfs_1.RopidGTFS.trips.name + "ModelValidator", TripDto_1.TripDto.jsonSchema));
         this.findByIdWithStopTimes = (tripId) => __awaiter(this, void 0, void 0, function* () {

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/RopidGTFSWorker.js

@@ -27,6 +27,7 @@ exports.RopidGTFSWorker = exports.datasetFileModelMap = void 0;
 const RopidGTFSOisTransformation_1 = require("./transformations/RopidGTFSOisTransformation");
 const utils_1 = require("./utils");
 const shared_1 = require("../shared");
+const const_1 = require("../../schema-definitions/const");
 const ropid_departures_presets_1 = require("../../schema-definitions/ropid-departures-presets");
 const ropid_gtfs_1 = require("../../schema-definitions/ropid-gtfs");
 const config_1 = require("@golemio/core/dist/integration-engine/config");
@@ -451,7 +452,7 @@ class RopidGTFSWorker extends workers_1.BaseWorker {
             // copy transformed data to tmp table by stream
             yield new Promise((resolve, reject) => {
                 const stream = client
-                    .query((0, pg_copy_streams_1.from)(`COPY "${ropid_gtfs_1.RopidGTFS.pgSchema}".${tmpTableName} FROM STDIN DELIMITER ',' CSV HEADER;`))
+                    .query((0, pg_copy_streams_1.from)(`COPY "${const_1.PG_SCHEMA}".${tmpTableName} FROM STDIN DELIMITER ',' CSV HEADER;`))
                     .on("error", (err) => __awaiter(this, void 0, void 0, function* () {
                     helpers_1.log.error(`Datasets: copying to tmp error (${modelName}): ${err.toString()}`);
                     yield connection.connectionManager.releaseConnection(client);
@@ -473,7 +474,7 @@ class RopidGTFSWorker extends workers_1.BaseWorker {
             const model = new models_1.PostgresModel(modelDef.name + "Tmp" + "Model", {
                 hasTmpTable: false,
                 outputSequelizeAttributes: modelDef.outputSequelizeAttributes,
-                pgSchema: ropid_gtfs_1.RopidGTFS.pgSchema,
+                pgSchema: const_1.PG_SCHEMA,
                 pgTableName: modelDef.pgTableName + SourceTableSuffixEnum_1.SourceTableSuffixEnum.Tmp,
                 savingType: "insertOnly",
                 sequelizeAdditionalSettings: Object.assign({ timestamps: false }, (modelDef.modelIndexOptions &&
@@ -490,7 +491,7 @@ class RopidGTFSWorker extends workers_1.BaseWorker {
             if (ropid_gtfs_1.RopidGTFS[name].modelIndexOptions) {
                 yield model.query((0, utils_1.buildDropIndexQuery)(ropid_gtfs_1.RopidGTFS[name].modelIndexOptions));
             }
-            yield model.sync({ force: true, schema: ropid_gtfs_1.RopidGTFS.pgSchema });
+            yield model.sync({ force: true, schema: const_1.PG_SCHEMA });
             return model;
         });
         this.createAndPopulatePrecomputedTmpTables = (sourceTableSuffix) => __awaiter(this, void 0, void 0, function* () {
@@ -527,7 +528,7 @@ class RopidGTFSWorker extends workers_1.BaseWorker {
             hasTmpTable: true,
             outputSequelizeAttributes: ropid_departures_presets_1.RopidDeparturesPresets.outputSequelizeAttributes,
             pgTableName: ropid_departures_presets_1.RopidDeparturesPresets.pgTableName,
-            pgSchema: ropid_departures_presets_1.RopidDeparturesPresets.pgSchema,
+            pgSchema: const_1.PG_SCHEMA,
             savingType: "insertOnly",
             addAuditAttributes: true,
         }, new golemio_validator_1.JSONSchemaValidator(ropid_departures_presets_1.RopidDeparturesPresets.name + "ModelValidator", ropid_departures_presets_1.RopidDeparturesPresets.outputJsonSchema));