@golemio/pid 2.10.1 → 2.10.2-dev.1102508158
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/db/migrations/postgresql/20231207135833-vp-gtfs-direction-id.js +53 -0
- package/db/migrations/postgresql/sqls/20231207135833-vp-gtfs-direction-id-down.sql +36 -0
- package/db/migrations/postgresql/sqls/20231207135833-vp-gtfs-direction-id-up.sql +147 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js +4 -2
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.d.ts +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.js +4 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.js +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/interfaces/TripRepositoryInterfaces.d.ts +2 -0
- package/dist/output-gateway/vehicle-positions/data-access/TripRepository.js +2 -1
- package/dist/output-gateway/vehicle-positions/data-access/TripRepository.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.d.ts +3 -0
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js +4 -0
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.d.ts +1 -0
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js +4 -0
- package/dist/schema-definitions/vehicle-positions/models/VPTripsModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IVPTripsModel.d.ts +1 -0
- package/dist/schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto.d.ts +1 -0
- package/dist/schema-definitions/vehicle-positions/redis/schemas/GtfsRunTripCacheDtoSchema.js +1 -0
- package/dist/schema-definitions/vehicle-positions/redis/schemas/GtfsRunTripCacheDtoSchema.js.map +1 -1
- package/docs/assets/pid_vp_st_hist_erd.png +0 -0
- package/docs/implementation_documentation.md +6 -5
- package/package.json +2 -2
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var dbm;
|
|
4
|
+
var type;
|
|
5
|
+
var seed;
|
|
6
|
+
var fs = require('fs');
|
|
7
|
+
var path = require('path');
|
|
8
|
+
var Promise;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* We receive the dbmigrate dependency from dbmigrate initially.
|
|
12
|
+
* This enables us to not have to rely on NODE_PATH.
|
|
13
|
+
*/
|
|
14
|
+
exports.setup = function(options, seedLink) {
|
|
15
|
+
dbm = options.dbmigrate;
|
|
16
|
+
type = dbm.dataType;
|
|
17
|
+
seed = seedLink;
|
|
18
|
+
Promise = options.Promise;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
exports.up = function(db) {
|
|
22
|
+
var filePath = path.join(__dirname, 'sqls', '20231207135833-vp-gtfs-direction-id-up.sql');
|
|
23
|
+
return new Promise( function( resolve, reject ) {
|
|
24
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
25
|
+
if (err) return reject(err);
|
|
26
|
+
console.log('received data: ' + data);
|
|
27
|
+
|
|
28
|
+
resolve(data);
|
|
29
|
+
});
|
|
30
|
+
})
|
|
31
|
+
.then(function(data) {
|
|
32
|
+
return db.runSql(data);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
exports.down = function(db) {
|
|
37
|
+
var filePath = path.join(__dirname, 'sqls', '20231207135833-vp-gtfs-direction-id-down.sql');
|
|
38
|
+
return new Promise( function( resolve, reject ) {
|
|
39
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
40
|
+
if (err) return reject(err);
|
|
41
|
+
console.log('received data: ' + data);
|
|
42
|
+
|
|
43
|
+
resolve(data);
|
|
44
|
+
});
|
|
45
|
+
})
|
|
46
|
+
.then(function(data) {
|
|
47
|
+
return db.runSql(data);
|
|
48
|
+
});
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
exports._meta = {
|
|
52
|
+
"version": 1
|
|
53
|
+
};
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
CREATE or replace PROCEDURE vehiclepositions_data_retention(inout numberOfRows int, in dataRetentionMinutes int)
|
|
2
|
+
LANGUAGE plpgsql
|
|
3
|
+
AS $procedure$
|
|
4
|
+
declare
|
|
5
|
+
idsForDelete varchar(255)[];
|
|
6
|
+
begin
|
|
7
|
+
select array_agg(t.id) from pid.vehiclepositions_trips t
|
|
8
|
+
left join pid.vehiclepositions_positions p on
|
|
9
|
+
p.id = t.last_position_id
|
|
10
|
+
where
|
|
11
|
+
p.valid_to < (NOW() - (dataRetentionMinutes || ' minutes')::interval)
|
|
12
|
+
or (gtfs_trip_id is null and p.created_at < NOW() - (dataRetentionMinutes || ' minutes')::interval) -- entries with valid to is null
|
|
13
|
+
into idsForDelete;
|
|
14
|
+
|
|
15
|
+
INSERT INTO pid.vehiclepositions_trips_history
|
|
16
|
+
select * from pid.vehiclepositions_trips where id = ANY(idsForDelete)
|
|
17
|
+
on conflict do nothing;
|
|
18
|
+
|
|
19
|
+
INSERT INTO pid.vehiclepositions_positions_history
|
|
20
|
+
select * from pid.vehiclepositions_positions where trips_id = ANY(idsForDelete)
|
|
21
|
+
on conflict do nothing;
|
|
22
|
+
|
|
23
|
+
delete from pid.vehiclepositions_positions where trips_id = ANY(idsForDelete);
|
|
24
|
+
delete from pid.vehiclepositions_trips where id = ANY(idsForDelete);
|
|
25
|
+
|
|
26
|
+
select array_length(idsForDelete,1) into numberOfRows;
|
|
27
|
+
end;
|
|
28
|
+
$procedure$;
|
|
29
|
+
|
|
30
|
+
drop view v_vehiclepositions_past_stop_times;
|
|
31
|
+
drop table vehiclepositions_stop_times_history;
|
|
32
|
+
|
|
33
|
+
alter table vehiclepositions_trips drop column gtfs_direction_id;
|
|
34
|
+
alter table vehiclepositions_trips_history drop column gtfs_direction_id;
|
|
35
|
+
|
|
36
|
+
alter table ropidgtfs_precomputed_trip_schedule drop column direction_id;
|
|
@@ -0,0 +1,147 @@
|
|
|
1
|
+
alter table ropidgtfs_precomputed_trip_schedule add column direction_id smallint;
|
|
2
|
+
|
|
3
|
+
alter table vehiclepositions_trips add column gtfs_direction_id smallint;
|
|
4
|
+
alter table vehiclepositions_trips_history add column gtfs_direction_id smallint;
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
create table vehiclepositions_stop_times_history (
|
|
8
|
+
rt_trip_id varchar(100) not null,
|
|
9
|
+
gtfs_date date,
|
|
10
|
+
gtfs_trip_id varchar(50),
|
|
11
|
+
gtfs_direction_id smallint,
|
|
12
|
+
gtfs_route_short_name varchar(20),
|
|
13
|
+
gtfs_route_type int,
|
|
14
|
+
run_number int,
|
|
15
|
+
vehicle_registration_number int,
|
|
16
|
+
gtfs_stop_sequence smallint not null,
|
|
17
|
+
gtfs_stop_id varchar(20),
|
|
18
|
+
current_stop_arrival timestamp with time zone,
|
|
19
|
+
current_stop_departure timestamp with time zone,
|
|
20
|
+
current_stop_arr_delay int,
|
|
21
|
+
current_stop_dep_delay int,
|
|
22
|
+
|
|
23
|
+
-- audit fields
|
|
24
|
+
create_batch_id bigint,
|
|
25
|
+
created_at timestamp with time zone,
|
|
26
|
+
created_by varchar(150),
|
|
27
|
+
update_batch_id bigint,
|
|
28
|
+
updated_at timestamp with time zone,
|
|
29
|
+
updated_by varchar(150),
|
|
30
|
+
|
|
31
|
+
constraint vehiclepositions_stop_times_history_pkey primary key (rt_trip_id, gtfs_stop_sequence)
|
|
32
|
+
);
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
create view v_vehiclepositions_past_stop_times as
|
|
36
|
+
select
|
|
37
|
+
trips_id as rt_trip_id,
|
|
38
|
+
last_stop_sequence as stop_sequence,
|
|
39
|
+
last_stop_id as stop_id,
|
|
40
|
+
last_stop_arrival_time as stop_arrival,
|
|
41
|
+
last_stop_departure_time as stop_departure,
|
|
42
|
+
min(delay_stop_arrival) as stop_arr_delay,
|
|
43
|
+
max(delay_stop_departure) as stop_dep_delay
|
|
44
|
+
from (
|
|
45
|
+
select
|
|
46
|
+
trips_id,
|
|
47
|
+
last_stop_sequence,
|
|
48
|
+
last_stop_id,
|
|
49
|
+
last_stop_arrival_time,
|
|
50
|
+
last_stop_departure_time,
|
|
51
|
+
delay_stop_arrival,
|
|
52
|
+
delay_stop_departure,
|
|
53
|
+
row_number() over seq as rn
|
|
54
|
+
from
|
|
55
|
+
vehiclepositions_positions rt_position
|
|
56
|
+
where
|
|
57
|
+
(delay_stop_arrival is not null or delay_stop_departure is not null)
|
|
58
|
+
and state_position in ('on_track', 'at_stop', 'after_track')
|
|
59
|
+
window
|
|
60
|
+
seq as (partition by trips_id, last_stop_sequence, state_position order by id)
|
|
61
|
+
) as sub
|
|
62
|
+
where
|
|
63
|
+
rn = 1
|
|
64
|
+
group by
|
|
65
|
+
trips_id,
|
|
66
|
+
last_stop_arrival_time,
|
|
67
|
+
last_stop_departure_time,
|
|
68
|
+
last_stop_sequence,
|
|
69
|
+
last_stop_id
|
|
70
|
+
order by
|
|
71
|
+
trips_id,
|
|
72
|
+
last_stop_sequence;
|
|
73
|
+
|
|
74
|
+
|
|
75
|
+
CREATE or replace PROCEDURE vehiclepositions_data_retention(inout numberOfRows int, in dataRetentionMinutes int)
|
|
76
|
+
LANGUAGE plpgsql
|
|
77
|
+
SET search_path FROM CURRENT
|
|
78
|
+
AS $procedure$
|
|
79
|
+
declare
|
|
80
|
+
idsForDelete varchar(255)[];
|
|
81
|
+
begin
|
|
82
|
+
select array_agg(t.id) from vehiclepositions_trips t
|
|
83
|
+
left join vehiclepositions_positions p on
|
|
84
|
+
p.id = t.last_position_id
|
|
85
|
+
where
|
|
86
|
+
p.valid_to < (NOW() - (dataRetentionMinutes || ' minutes')::interval)
|
|
87
|
+
or (gtfs_trip_id is null and p.created_at < NOW() - (dataRetentionMinutes || ' minutes')::interval) -- entries with valid to is null
|
|
88
|
+
into idsForDelete;
|
|
89
|
+
|
|
90
|
+
INSERT INTO vehiclepositions_trips_history
|
|
91
|
+
select * from vehiclepositions_trips where id = ANY(idsForDelete)
|
|
92
|
+
on conflict do nothing;
|
|
93
|
+
|
|
94
|
+
INSERT INTO vehiclepositions_positions_history
|
|
95
|
+
select * from vehiclepositions_positions where trips_id = ANY(idsForDelete)
|
|
96
|
+
on conflict do nothing;
|
|
97
|
+
|
|
98
|
+
insert into vehiclepositions_stop_times_history (
|
|
99
|
+
rt_trip_id,
|
|
100
|
+
gtfs_date,
|
|
101
|
+
gtfs_trip_id,
|
|
102
|
+
gtfs_direction_id,
|
|
103
|
+
gtfs_route_short_name,
|
|
104
|
+
gtfs_route_type,
|
|
105
|
+
run_number,
|
|
106
|
+
vehicle_registration_number,
|
|
107
|
+
gtfs_stop_id,
|
|
108
|
+
gtfs_stop_sequence,
|
|
109
|
+
current_stop_arrival,
|
|
110
|
+
current_stop_departure,
|
|
111
|
+
current_stop_arr_delay,
|
|
112
|
+
current_stop_dep_delay,
|
|
113
|
+
created_at,
|
|
114
|
+
updated_at
|
|
115
|
+
)
|
|
116
|
+
select
|
|
117
|
+
rt_trip.id,
|
|
118
|
+
rt_trip.gtfs_date,
|
|
119
|
+
rt_trip.gtfs_trip_id,
|
|
120
|
+
rt_trip.gtfs_direction_id,
|
|
121
|
+
rt_trip.gtfs_route_short_name,
|
|
122
|
+
rt_trip.gtfs_route_type,
|
|
123
|
+
rt_trip.run_number,
|
|
124
|
+
rt_trip.vehicle_registration_number,
|
|
125
|
+
stop_time.stop_id,
|
|
126
|
+
stop_time.stop_sequence,
|
|
127
|
+
stop_time.stop_arrival,
|
|
128
|
+
stop_time.stop_departure,
|
|
129
|
+
stop_time.stop_arr_delay,
|
|
130
|
+
stop_time.stop_dep_delay,
|
|
131
|
+
now(),
|
|
132
|
+
now()
|
|
133
|
+
from
|
|
134
|
+
vehiclepositions_trips rt_trip
|
|
135
|
+
join
|
|
136
|
+
v_vehiclepositions_past_stop_times stop_time on stop_time.rt_trip_id = rt_trip.id
|
|
137
|
+
where
|
|
138
|
+
rt_trip.id = ANY(idsForDelete)
|
|
139
|
+
on conflict do nothing;
|
|
140
|
+
|
|
141
|
+
|
|
142
|
+
delete from vehiclepositions_positions where trips_id = ANY(idsForDelete);
|
|
143
|
+
delete from vehiclepositions_trips where id = ANY(idsForDelete);
|
|
144
|
+
|
|
145
|
+
select array_length(idsForDelete,1) into numberOfRows;
|
|
146
|
+
end;
|
|
147
|
+
$procedure$;
|
package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js
CHANGED
|
@@ -95,7 +95,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
|
|
|
95
95
|
t0.last_stop_id,
|
|
96
96
|
right(t0.origin_route_id, -1) as origin_route_name,
|
|
97
97
|
t0.trip_number,
|
|
98
|
-
t0.route_licence_number
|
|
98
|
+
t0.route_licence_number,
|
|
99
|
+
t0.direction_id
|
|
99
100
|
FROM (
|
|
100
101
|
SELECT
|
|
101
102
|
t1.route_id AS origin_route_id,
|
|
@@ -118,7 +119,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
|
|
|
118
119
|
t5.stop_id AS first_stop_id,
|
|
119
120
|
t6.stop_id AS last_stop_id,
|
|
120
121
|
t1.trip_number,
|
|
121
|
-
t1.route_licence_number
|
|
122
|
+
t1.route_licence_number,
|
|
123
|
+
t8.direction_id
|
|
122
124
|
FROM "${const_1.PG_SCHEMA}".ropidgtfs_run_numbers${sourceTableSuffix} t1
|
|
123
125
|
INNER JOIN "${const_1.PG_SCHEMA}".ropidgtfs_precomputed_services_calendar_tmp t3 ON t1.service_id = t3.service_id
|
|
124
126
|
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
CHANGED
|
@@ -1 +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
|
|
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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
export declare class RawQueryProvider {
|
|
2
|
-
static getCheckExistingTripQuery(tripId: string): string;
|
|
3
2
|
static getFindAssociatedTripsQuery(): string;
|
|
4
3
|
static getFindGtfsCommonTripsQuery(startDateDayName: string, startDateDayBeforeDayName: string): string;
|
|
5
4
|
static getFindGtfsTrainTripsQuery(): string;
|
|
@@ -8,9 +8,6 @@ const TripWithLastPositionModel_1 = require("../../../../../../schema-definition
|
|
|
8
8
|
const const_2 = require("../../../../../../const");
|
|
9
9
|
const DateTimeUtils_1 = require("../../helpers/DateTimeUtils");
|
|
10
10
|
class RawQueryProvider {
|
|
11
|
-
static getCheckExistingTripQuery(tripId) {
|
|
12
|
-
return `SELECT EXISTS(SELECT 1 FROM "${const_1.PG_SCHEMA}".${VPTripsModel_1.VPTripsModel.TABLE_NAME} WHERE id='${tripId}') AS "exists";`;
|
|
13
|
-
}
|
|
14
11
|
static getFindAssociatedTripsQuery() {
|
|
15
12
|
return `
|
|
16
13
|
SELECT id,
|
|
@@ -28,6 +25,7 @@ class RawQueryProvider {
|
|
|
28
25
|
return `
|
|
29
26
|
SELECT DISTINCT
|
|
30
27
|
"${const_1.PG_SCHEMA}".ropidgtfs_trips.trip_id as gtfs_trip_id,
|
|
28
|
+
"${const_1.PG_SCHEMA}".ropidgtfs_trips.direction_id as gtfs_direction_id,
|
|
31
29
|
"${const_1.PG_SCHEMA}".ropidgtfs_precomputed_trip_schedule.date as gtfs_date,
|
|
32
30
|
"${const_1.PG_SCHEMA}".ropidgtfs_trips.trip_headsign as gtfs_trip_headsign,
|
|
33
31
|
"${const_1.PG_SCHEMA}".ropidgtfs_routes.route_id as gtfs_route_id,
|
|
@@ -118,6 +116,7 @@ class RawQueryProvider {
|
|
|
118
116
|
LIMIT 1)
|
|
119
117
|
SELECT DISTINCT
|
|
120
118
|
"${const_1.PG_SCHEMA}".ropidgtfs_trips.trip_id as gtfs_trip_id,
|
|
119
|
+
"${const_1.PG_SCHEMA}".ropidgtfs_trips.direction_id as gtfs_direction_id,
|
|
121
120
|
"${const_1.PG_SCHEMA}".ropidgtfs_precomputed_trip_schedule.date as gtfs_date,
|
|
122
121
|
"${const_1.PG_SCHEMA}".ropidgtfs_trips.block_id as gtfs_block_id,
|
|
123
122
|
"${const_1.PG_SCHEMA}".ropidgtfs_trips.trip_headsign as gtfs_trip_headsign,
|
|
@@ -203,6 +202,7 @@ class RawQueryProvider {
|
|
|
203
202
|
gtfs_route_short_name = trip_with_gtfs_data.gtfs_route_short_name,
|
|
204
203
|
gtfs_route_type = trip_with_gtfs_data.gtfs_route_type,
|
|
205
204
|
gtfs_trip_headsign = trip_with_gtfs_data.gtfs_trip_headsign,
|
|
205
|
+
gtfs_direction_id = trip_with_gtfs_data.gtfs_direction_id,
|
|
206
206
|
start_time = trip_with_gtfs_data.start_time,
|
|
207
207
|
start_timestamp = trip_with_gtfs_data.start_timestamp,
|
|
208
208
|
end_timestamp = trip_with_gtfs_data.end_timestamp,
|
|
@@ -217,6 +217,7 @@ class RawQueryProvider {
|
|
|
217
217
|
gtfs_trip.route_short_name as gtfs_route_short_name,
|
|
218
218
|
gtfs_trip.route_type as gtfs_route_type,
|
|
219
219
|
gtfs_trip.trip_headsign as gtfs_trip_headsign,
|
|
220
|
+
gtfs_trip.direction_id as gtfs_direction_id,
|
|
220
221
|
gtfs_trip.start_timestamp::time at time zone '${DateTimeUtils_1.DateTimeUtils.TIMEZONE}' as start_time,
|
|
221
222
|
gtfs_trip.start_timestamp,
|
|
222
223
|
gtfs_trip.end_timestamp,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RawQueryProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.ts"],"names":[],"mappings":";;;AAAA,sEAAuC;AACvC,+GAA4E;AAC5E,6GAA0E;AAC1E,6IAA0G;AAC1G,mDAA8C;AAC9C,+DAA4D;AAE5D,MAAa,gBAAgB;IAClB,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"RawQueryProvider.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/RawQueryProvider.ts"],"names":[],"mappings":";;;AAAA,sEAAuC;AACvC,+GAA4E;AAC5E,6GAA0E;AAC1E,6IAA0G;AAC1G,mDAA8C;AAC9C,+DAA4D;AAE5D,MAAa,gBAAgB;IAClB,MAAM,CAAC,2BAA2B;QACrC,OAAO;;;;;;;oBAOK,iBAAS,KAAK,2BAAY,CAAC,UAAU;;SAEhD,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,2BAA2B,CAAC,gBAAwB,EAAE,yBAAiC;QACjG,4BAA4B;QAC5B,OAAO;;mBAEI,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;oBACR,iBAAS;0BACH,iBAAS,0BAA0B,iBAAS;0BAC5C,iBAAS,8BAA8B,iBAAS;yBACjD,iBAAS;sBACZ,iBAAS;;yBAEN,iBAAS,qDAAqD,iBAAS;;iBAE/E,iBAAS;;wBAEF,iBAAS;;;mBAGd,iBAAS;qCACS,iBAAS;;kEAEoB,iBAAS;;oCAEvC,iBAAS;;;;;;;;;;;;;;uBActB,iBAAS;8CACc,iBAAS;4BAC3B,gBAAgB;;;oDAGQ,iBAAS;;;qDAGR,iBAAS;;;;;uBAKvC,iBAAS;8CACc,iBAAS;4BAC3B,yBAAyB;;;oDAGD,iBAAS;;;qDAGR,iBAAS;;;;;;;SAOrD,CAAC;QACF,2BAA2B;IAC/B,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,4BAA4B;QAC5B,OAAO;;;;;;;;;;;oBAWK,iBAAS;;;;mBAIV,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;;mBAET,iBAAS;mBACT,iBAAS;mBACT,iBAAS;mBACT,iBAAS;oBACR,iBAAS;;0BAEH,iBAAS,0BAA0B,iBAAS;0BAC5C,iBAAS,8BAA8B,iBAAS;yBACjD,iBAAS;sBACZ,iBAAS;;yBAEN,iBAAS,qDAAqD,iBAAS,8BAA8B,iBAAS;;mBAEpH,iBAAS;uBACL,iBAAS;;;2BAGL,iBAAS;kDACc,iBAAS;;;;;;;;;;;;;;wDAcH,iBAAS;;;yDAGR,iBAAS;;;;;2BAKvC,iBAAS;kDACc,iBAAS;;;;;;;;;;;;;;wDAcH,iBAAS;;;yDAGR,iBAAS;;;;;;;SAOzD,CAAC;QACF,2BAA2B;IAC/B,CAAC;IAEM,MAAM,CAAC,0BAA0B;QACpC,OAAO;sBACO,iBAAS,KAAK,2BAAY,CAAC,UAAU;;;;;;;;;;;;;;;;;;;;;;;oEAuBS,6BAAa,CAAC,QAAQ;;;;;wBAKlE,iBAAS,KAAK,qDAAyB,CAAC,SAAS;8BAC3C,iBAAS,KAAK,2CAAoB,CAAC,YAAY,CAAC,WAAW;;;iEAGxB,yBAAiB,CAAC,WAAW;;;SAGrF,CAAC;IACN,CAAC;CACJ;AApOD,4CAoOC"}
|
|
@@ -85,6 +85,7 @@ class TripsMapper {
|
|
|
85
85
|
gtfs_trip_headsign: gtfsTrip.trip_headsign,
|
|
86
86
|
gtfs_trip_id: gtfsTrip.trip_id,
|
|
87
87
|
gtfs_date: gtfsTrip.date,
|
|
88
|
+
gtfs_direction_id: gtfsTrip.direction_id,
|
|
88
89
|
start_time: DateTimeUtils_1.DateTimeUtils.parseUTCTimeFromISO(gtfsTrip.start_timestamp),
|
|
89
90
|
start_timestamp: new Date(gtfsTrip.start_timestamp),
|
|
90
91
|
end_timestamp: new Date(gtfsTrip.end_timestamp),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripsMapper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TripsMapper.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/TripsMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export interface IUpdateDelayTripsIdsData {
|
|
|
6
6
|
gtfs_trip_id?: string;
|
|
7
7
|
gtfs_block_id?: string;
|
|
8
8
|
gtfs_route_type?: number;
|
|
9
|
+
gtfs_direction_id?: number;
|
|
9
10
|
start_timestamp: string;
|
|
10
11
|
end_timestamp?: string;
|
|
11
12
|
run_number?: number | null;
|
|
@@ -33,6 +34,7 @@ export interface IFoundGTFSTripData {
|
|
|
33
34
|
gtfs_trip_headsign: string;
|
|
34
35
|
gtfs_route_id: string;
|
|
35
36
|
gtfs_route_short_name: string;
|
|
37
|
+
gtfs_direction_id: number;
|
|
36
38
|
min_stop_time: string;
|
|
37
39
|
max_stop_time: string;
|
|
38
40
|
gtfs_block_id?: string;
|
|
@@ -9,9 +9,10 @@ class TripRepository extends models_2.SequelizeModel {
|
|
|
9
9
|
super("VPTripsRepository", models_1.VPTripsModel.TABLE_NAME, models_1.VPTripsModel.attributeModel, {
|
|
10
10
|
schema: const_1.PG_SCHEMA,
|
|
11
11
|
});
|
|
12
|
-
//
|
|
12
|
+
// some attributes should never be consumed by API users
|
|
13
13
|
this.sequelizeModel.removeAttribute("last_position_context");
|
|
14
14
|
this.sequelizeModel.removeAttribute("provider_source_type");
|
|
15
|
+
this.sequelizeModel.removeAttribute("gtfs_direction_id");
|
|
15
16
|
}
|
|
16
17
|
GetAll() {
|
|
17
18
|
throw new Error("Not implemented");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/vehicle-positions/data-access/TripRepository.ts"],"names":[],"mappings":";;;AAAA,6DAAuC;AACvC,iFAA6D;AAC7D,qEAA0E;AAG1E,MAAa,cAAe,SAAQ,uBAAc;IAG9C;QACI,KAAK,CAAC,mBAAmB,EAAE,qBAAY,CAAC,UAAU,EAAE,qBAAY,CAAC,cAAc,EAAE;YAC7E,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;QAEH,
|
|
1
|
+
{"version":3,"file":"TripRepository.js","sourceRoot":"","sources":["../../../../src/output-gateway/vehicle-positions/data-access/TripRepository.ts"],"names":[],"mappings":";;;AAAA,6DAAuC;AACvC,iFAA6D;AAC7D,qEAA0E;AAG1E,MAAa,cAAe,SAAQ,uBAAc;IAG9C;QACI,KAAK,CAAC,mBAAmB,EAAE,qBAAY,CAAC,UAAU,EAAE,qBAAY,CAAC,cAAc,EAAE;YAC7E,MAAM,EAAE,iBAAS;SACpB,CAAC,CAAC;QAEH,wDAAwD;QACxD,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,uBAAuB,CAAC,CAAC;QAC7D,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;IAC7D,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;IAEM,MAAM;QACT,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACvC,CAAC;CACJ;AArBD,wCAqBC"}
|
|
@@ -54,6 +54,7 @@ const outputTripScheduleSDMA = {
|
|
|
54
54
|
origin_route_id: sequelize_1.DataTypes.STRING,
|
|
55
55
|
trip_id: sequelize_1.DataTypes.STRING,
|
|
56
56
|
service_id: sequelize_1.DataTypes.STRING,
|
|
57
|
+
direction_id: sequelize_1.DataTypes.SMALLINT,
|
|
57
58
|
run_number: sequelize_1.DataTypes.INTEGER,
|
|
58
59
|
date: sequelize_1.DataTypes.STRING,
|
|
59
60
|
route_id: sequelize_1.DataTypes.STRING,
|
|
@@ -91,6 +92,9 @@ const outputTripScheduleJsonSchema = {
|
|
|
91
92
|
service_id: {
|
|
92
93
|
type: "string",
|
|
93
94
|
},
|
|
95
|
+
direction_id: {
|
|
96
|
+
type: "integer",
|
|
97
|
+
},
|
|
94
98
|
run_number: {
|
|
95
99
|
type: "string",
|
|
96
100
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export declare class VPTripsModel extends Model<VPTripsModel> implements IVPTrip
|
|
|
15
15
|
gtfs_route_short_name: string;
|
|
16
16
|
gtfs_trip_id: string;
|
|
17
17
|
gtfs_date: string | null;
|
|
18
|
+
gtfs_direction_id: number | null;
|
|
18
19
|
id: string;
|
|
19
20
|
start_cis_stop_id: number;
|
|
20
21
|
start_cis_stop_platform_code: string;
|
|
@@ -22,6 +22,7 @@ VPTripsModel.attributeModel = {
|
|
|
22
22
|
gtfs_trip_short_name: sequelize_1.DataTypes.STRING,
|
|
23
23
|
gtfs_trip_id: sequelize_1.DataTypes.STRING,
|
|
24
24
|
gtfs_date: sequelize_1.DataTypes.DATEONLY,
|
|
25
|
+
gtfs_direction_id: sequelize_1.DataTypes.SMALLINT,
|
|
25
26
|
// ⬐ hash(start_timestamp, cis_id, cis_short_name, cis_number);
|
|
26
27
|
id: {
|
|
27
28
|
primaryKey: true,
|
|
@@ -94,6 +95,9 @@ VPTripsModel.jsonSchema = {
|
|
|
94
95
|
gtfs_date: {
|
|
95
96
|
type: ["string", "null"],
|
|
96
97
|
},
|
|
98
|
+
gtfs_direction_id: {
|
|
99
|
+
type: ["number", "null"],
|
|
100
|
+
},
|
|
97
101
|
id: {
|
|
98
102
|
type: "string",
|
|
99
103
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VPTripsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/VPTripsModel.ts"],"names":[],"mappings":";;;AAAA,8EAA6E;AAE7E,mEAA6G;AAK7G,MAAa,YAAa,SAAQ,iBAAmB;;AAArD,
|
|
1
|
+
{"version":3,"file":"VPTripsModel.js","sourceRoot":"","sources":["../../../../src/schema-definitions/vehicle-positions/models/VPTripsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export interface IVPTripsModel {
|
|
|
10
10
|
gtfs_route_short_name: string | null;
|
|
11
11
|
gtfs_trip_id: string | null;
|
|
12
12
|
gtfs_date: string | null;
|
|
13
|
+
gtfs_direction_id: number | null;
|
|
13
14
|
id: string;
|
|
14
15
|
start_cis_stop_id: number | null;
|
|
15
16
|
start_cis_stop_platform_code: string | null;
|
package/dist/schema-definitions/vehicle-positions/redis/schemas/GtfsRunTripCacheDtoSchema.js
CHANGED
|
@@ -13,6 +13,7 @@ const gtfsRunTripCacheDtoSchema = {
|
|
|
13
13
|
properties: {
|
|
14
14
|
trip_id: { type: "string" },
|
|
15
15
|
service_id: { type: "string" },
|
|
16
|
+
direction_id: { oneOf: [{ type: "number" }, { type: "null", nullable: true }] },
|
|
16
17
|
date: { type: "string" },
|
|
17
18
|
route_id: { type: "string" },
|
|
18
19
|
route_type: { type: "integer" },
|
package/dist/schema-definitions/vehicle-positions/redis/schemas/GtfsRunTripCacheDtoSchema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GtfsRunTripCacheDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/redis/schemas/GtfsRunTripCacheDtoSchema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"GtfsRunTripCacheDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/vehicle-positions/redis/schemas/GtfsRunTripCacheDtoSchema.ts"],"names":[],"mappings":"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"}
|
|
Binary file
|
|
@@ -811,7 +811,7 @@ Worker má na starost zpracování a transformaci polohových dat, výpočet zpo
|
|
|
811
811
|
- data modely
|
|
812
812
|
- VPPositionsModel `vehiclepositions_positions`
|
|
813
813
|
- VPTripsModel `vehiclepositions_trips`
|
|
814
|
-
-
|
|
814
|
+
- (in-progress) o odmazání history modelů se stará historizační služba (parquet)
|
|
815
815
|
- VPPositionsHistoryModel `vehiclepositions_positions_history`
|
|
816
816
|
- VPTripsHistoryModel `vehiclepositions_trips_history`
|
|
817
817
|
|
|
@@ -849,7 +849,6 @@ Worker má na starost zpracování a transformaci polohových dat, výpočet zpo
|
|
|
849
849
|
- VPPositionsModel `vehiclepositions_positions`
|
|
850
850
|
- VPTripsModel `vehiclepositions_trips`
|
|
851
851
|
|
|
852
|
-
|
|
853
852
|
### _RunsWorker_
|
|
854
853
|
|
|
855
854
|
Worker má na starost zpracování a transformaci TCP oběhů
|
|
@@ -1105,6 +1104,8 @@ Worker má na starost retenci dat tabulek Azure Table Storage
|
|
|
1105
1104
|
|
|
1106
1105
|
- Polohy vozů (views) <br/>
|
|
1107
1106
|
|
|
1107
|
+
- Polohy vozů (historie spojů podle projetých zastávek) <br/>
|
|
1108
|
+
|
|
1108
1109
|
- Popis vozidel<br/>
|
|
1109
1110
|
|
|
1110
1111
|
|
|
@@ -1261,6 +1262,6 @@ Worker má na starost retenci dat tabulek Azure Table Storage
|
|
|
1261
1262
|
|
|
1262
1263
|
#### _/public/vehiclepositions_
|
|
1263
1264
|
|
|
1264
|
-
-
|
|
1265
|
-
-
|
|
1266
|
-
-
|
|
1265
|
+
- načte aktuální polohy vozidel z redisu a vrátí je ve formátu geojson
|
|
1266
|
+
- možno filtrovat dle bouding box na straně redisu
|
|
1267
|
+
- podle typu vozidla a gtfs route number na klientské straně
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/pid",
|
|
3
|
-
"version": "2.10.
|
|
3
|
+
"version": "2.10.2-dev.1102508158",
|
|
4
4
|
"description": "Golemio PID Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"@golemio/core": ">=1.7.0"
|
|
78
78
|
},
|
|
79
79
|
"dependencies": {
|
|
80
|
-
"@golemio/ovapi-gtfs-realtime-bindings": "1.2.
|
|
80
|
+
"@golemio/ovapi-gtfs-realtime-bindings": "1.2.1-dev.943774882",
|
|
81
81
|
"@turf/turf": "^6.5.0",
|
|
82
82
|
"cheap-ruler": "^2.5.1",
|
|
83
83
|
"csv-parser": "^3.0.0",
|