@golemio/pid 2.9.4 → 2.9.5-dev.1041140998
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/example/02_pid_line_example_115.sql +5 -5
- package/db/example/03_ropidgtfs_dump.sql +5 -5
- package/db/example/05_vehicle_positions_dump.sql +22 -22
- package/db/example/08_update_delay_dump.sql +100 -100
- package/db/example/10_cancelledTrip_example.sql +2 -2
- package/db/example/12_metro_line_A_gtfs_trips.sql +9 -9
- package/db/example/13_http-propagate-delay.sql +15 -15
- package/db/example/14_nightDelays.sql +2 -2
- package/db/migrations/postgresql/20231009141316-positions-tracked.js +53 -0
- package/db/migrations/postgresql/20231012143145-route-licence-number.js +53 -0
- package/db/migrations/postgresql/sqls/20231009141316-positions-tracked-down.sql +191 -0
- package/db/migrations/postgresql/sqls/20231009141316-positions-tracked-up.sql +191 -0
- package/db/migrations/postgresql/sqls/20231012143145-route-licence-number-down.sql +8 -0
- package/db/migrations/postgresql/sqls/20231012143145-route-licence-number-up.sql +8 -0
- package/dist/const.d.ts +0 -4
- package/dist/const.js +1 -6
- package/dist/const.js.map +1 -1
- 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/runs/helpers/regional-bus/RegionalBusMessageFilter.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.js +6 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/TripScheduleManager.d.ts +3 -3
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/TripScheduleManager.js +14 -12
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/TripScheduleManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/interfaces/ITripScheduleManager.d.ts +2 -2
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.js +10 -10
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.js +17 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/PositionsMapper.js +14 -8
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/helpers/PositionsMapper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.js +4 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/DPPUtils.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.d.ts +1 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js +45 -49
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/PositionsManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/VPUtils.d.ts +2 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/VPUtils.js +3 -4
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/VPUtils.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/AbstractDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/CommonDelayAtStop.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/CommonDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/MetroDelayAtStop.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/compute-positions/strategy/MetroDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.js +3 -7
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/gtfs-trip-run/GTFSTripCommonRunManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/RegionalBusPositionsManager.d.ts +1 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/RegionalBusPositionsManager.js +43 -25
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/RegionalBusPositionsManager.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/compute-positions/strategy/BusDelayAtStop.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/helpers/regional-bus/compute-positions/strategy/BusDelayAtStop.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/TransformationInterfaces.d.ts +11 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/interfaces/VPInterfaces.d.ts +7 -29
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/ProcessRegionalBusPositionsTask.d.ts +8 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/ProcessRegionalBusPositionsTask.js +15 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/ProcessRegionalBusPositionsTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.d.ts +8 -0
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js +17 -3
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateDelayTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js +2 -2
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/tasks/UpdateGtfsTripIdTask.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PositionsTransformation.d.ts +3 -14
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PositionsTransformation.js +12 -5
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/transformations/PositionsTransformation.js.map +1 -1
- package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.js +1 -2
- package/dist/output-gateway/vehicle-positions/data-access/helpers/PositionOutputMapper.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/ropid-gtfs/RopidGTFSRunNumbers.d.ts +7 -0
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.js +10 -0
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSRunNumbers.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.js +39 -14
- package/dist/schema-definitions/vehicle-positions/models/PositionDto.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IPositionDto.d.ts +13 -13
- package/dist/schema-definitions/vehicle-positions/models/interfaces/IVPTripsPositionAttributes.d.ts +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/TripWithLastPositionModel.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/models/views/TripWithLastPositionModel.js +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/TripWithLastPositionModel.js.map +1 -1
- package/dist/schema-definitions/vehicle-positions/models/views/interfaces/ITripWithLastPositionDto.d.ts +2 -2
- package/dist/schema-definitions/vehicle-positions/redis/interfaces/IGtfsRunTripCacheDto.d.ts +1 -0
- package/dist/schema-definitions/vehicle-positions/redis/schemas/GtfsRunTripCacheDtoSchema.js +2 -0
- package/dist/schema-definitions/vehicle-positions/redis/schemas/GtfsRunTripCacheDtoSchema.js.map +1 -1
- package/package.json +2 -2
- package/dist/integration-engine/ropid-gtfs/data-access/RunNumberRepository.d.ts +0 -4
- package/dist/integration-engine/ropid-gtfs/data-access/RunNumberRepository.js +0 -19
- package/dist/integration-engine/ropid-gtfs/data-access/RunNumberRepository.js.map +0 -1
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
drop view v_vehiclepositions_alerts_last_position;
|
|
2
|
+
drop view v_vehiclepositions_all_trips_with_last_position;
|
|
3
|
+
drop view v_vehiclepositions_trip_position_vehicle_info;
|
|
4
|
+
|
|
5
|
+
alter table vehiclepositions_positions rename column tracking to is_tracked;
|
|
6
|
+
alter table vehiclepositions_positions alter column is_tracked type boolean using is_tracked::boolean;
|
|
7
|
+
|
|
8
|
+
alter table vehiclepositions_positions_history rename column tracking to is_tracked;
|
|
9
|
+
alter table vehiclepositions_positions_history alter column is_tracked type boolean using is_tracked::boolean;
|
|
10
|
+
|
|
11
|
+
-- recreate views
|
|
12
|
+
create view v_vehiclepositions_alerts_last_position as
|
|
13
|
+
SELECT t2.created_at,
|
|
14
|
+
t2.updated_at,
|
|
15
|
+
t2.delay,
|
|
16
|
+
t2.delay_stop_arrival,
|
|
17
|
+
t2.delay_stop_departure,
|
|
18
|
+
t2.next_stop_id,
|
|
19
|
+
t2.shape_dist_traveled,
|
|
20
|
+
t2.is_canceled,
|
|
21
|
+
t2.lat,
|
|
22
|
+
t2.lng,
|
|
23
|
+
t2.origin_time,
|
|
24
|
+
t2.origin_timestamp,
|
|
25
|
+
t2.is_tracked,
|
|
26
|
+
t2.trips_id,
|
|
27
|
+
t2.create_batch_id,
|
|
28
|
+
t2.created_by,
|
|
29
|
+
t2.update_batch_id,
|
|
30
|
+
t2.updated_by,
|
|
31
|
+
t2.id,
|
|
32
|
+
t2.bearing,
|
|
33
|
+
t2.cis_last_stop_id,
|
|
34
|
+
t2.cis_last_stop_sequence,
|
|
35
|
+
t2.last_stop_id,
|
|
36
|
+
t2.last_stop_sequence,
|
|
37
|
+
t2.next_stop_sequence,
|
|
38
|
+
t2.speed,
|
|
39
|
+
t2.last_stop_arrival_time,
|
|
40
|
+
t2.last_stop_departure_time,
|
|
41
|
+
t2.next_stop_arrival_time,
|
|
42
|
+
t2.next_stop_departure_time,
|
|
43
|
+
t2.asw_last_stop_id,
|
|
44
|
+
t1.gtfs_route_id,
|
|
45
|
+
t1.gtfs_route_short_name,
|
|
46
|
+
t1.gtfs_route_type,
|
|
47
|
+
t1.gtfs_trip_id,
|
|
48
|
+
t1.gtfs_trip_headsign,
|
|
49
|
+
t1.vehicle_type_id,
|
|
50
|
+
t1.wheelchair_accessible
|
|
51
|
+
FROM (vehiclepositions_trips t1
|
|
52
|
+
LEFT JOIN vehiclepositions_positions t2 ON ((t1.last_position_id = t2.id)))
|
|
53
|
+
WHERE ((t2.updated_at > (now() - '00:10:00'::interval)) AND ((t2.state_position)::text = ANY (ARRAY[('on_track'::character varying)::text, ('off_track'::character varying)::text, ('at_stop'::character varying)::text, ('before_track'::character varying)::text, ('after_track'::character varying)::text, ('canceled'::character varying)::text])))
|
|
54
|
+
ORDER BY t2.trips_id, t2.updated_at DESC;
|
|
55
|
+
|
|
56
|
+
comment on view v_vehiclepositions_alerts_last_position is '
|
|
57
|
+
Used only for alerting purposes.
|
|
58
|
+
';
|
|
59
|
+
|
|
60
|
+
create view v_vehiclepositions_all_trips_with_last_position as
|
|
61
|
+
select
|
|
62
|
+
vt.id,
|
|
63
|
+
vt.agency_name_real,
|
|
64
|
+
vt.agency_name_scheduled,
|
|
65
|
+
vt.cis_line_id,
|
|
66
|
+
vt.cis_trip_number,
|
|
67
|
+
vt.gtfs_route_id,
|
|
68
|
+
vt.gtfs_route_short_name,
|
|
69
|
+
vt.gtfs_route_type,
|
|
70
|
+
vt.gtfs_trip_headsign,
|
|
71
|
+
vt.gtfs_trip_short_name,
|
|
72
|
+
vt.gtfs_trip_id,
|
|
73
|
+
vt.origin_route_name,
|
|
74
|
+
vt.run_number,
|
|
75
|
+
vt.vehicle_registration_number,
|
|
76
|
+
vt.vehicle_type_id,
|
|
77
|
+
vt.wheelchair_accessible,
|
|
78
|
+
vt.updated_at,
|
|
79
|
+
convert_timestamptz_to_iso_string(vt.start_timestamp) as start_timestamp_isostring,
|
|
80
|
+
vp.bearing,
|
|
81
|
+
vp.delay,
|
|
82
|
+
vp.delay_stop_arrival,
|
|
83
|
+
vp.delay_stop_departure,
|
|
84
|
+
vp.is_canceled,
|
|
85
|
+
vp.last_stop_id,
|
|
86
|
+
vp.last_stop_sequence,
|
|
87
|
+
vp.last_stop_headsign,
|
|
88
|
+
vp.lat,
|
|
89
|
+
vp.lng,
|
|
90
|
+
vp.next_stop_id,
|
|
91
|
+
vp.next_stop_sequence,
|
|
92
|
+
vp.shape_dist_traveled,
|
|
93
|
+
vp.speed,
|
|
94
|
+
vp.state_position,
|
|
95
|
+
vp.is_tracked,
|
|
96
|
+
convert_timestamptz_to_iso_string(vp.last_stop_arrival_time) as last_stop_arrival_time_isostring,
|
|
97
|
+
convert_timestamptz_to_iso_string(vp.last_stop_departure_time) as last_stop_departure_time_isostring,
|
|
98
|
+
convert_timestamptz_to_iso_string(vp.next_stop_arrival_time) as next_stop_arrival_time_isostring,
|
|
99
|
+
convert_timestamptz_to_iso_string(vp.next_stop_departure_time) as next_stop_departure_time_isostring,
|
|
100
|
+
convert_timestamptz_to_iso_string(vp.origin_timestamp) as origin_timestamp_isostring
|
|
101
|
+
from
|
|
102
|
+
vehiclepositions_trips vt
|
|
103
|
+
inner join vehiclepositions_positions vp on
|
|
104
|
+
vt.last_position_id = vp.id
|
|
105
|
+
and (vp.valid_to is null
|
|
106
|
+
or vp.valid_to >= now())
|
|
107
|
+
and vp.state_process = 'processed';
|
|
108
|
+
|
|
109
|
+
comment on view v_vehiclepositions_all_trips_with_last_position is '
|
|
110
|
+
View of all trips with last processed position. Used for serving data to the vehiclepositions output API.
|
|
111
|
+
';
|
|
112
|
+
|
|
113
|
+
create view v_vehiclepositions_trip_position_vehicle_info as
|
|
114
|
+
select
|
|
115
|
+
"trip->last_position"."delay" as "delay_seconds",
|
|
116
|
+
"trip"."wheelchair_accessible" as "real_wheelchair_accessible",
|
|
117
|
+
"trip->last_position"."is_canceled" as "is_canceled",
|
|
118
|
+
"trip"."agency_name_real" as "trip.agency_name_real",
|
|
119
|
+
"trip"."agency_name_scheduled" as "trip.agency_name_scheduled",
|
|
120
|
+
"trip"."cis_line_id" as "trip.cis_line_id",
|
|
121
|
+
"trip"."cis_line_short_name" as "trip.cis_line_short_name",
|
|
122
|
+
"trip"."cis_trip_number" as "trip.cis_trip_number",
|
|
123
|
+
"trip"."gtfs_block_id" as "trip.gtfs_block_id",
|
|
124
|
+
"trip"."gtfs_route_id" as "trip.gtfs_route_id",
|
|
125
|
+
"trip"."gtfs_route_short_name" as "trip.gtfs_route_short_name",
|
|
126
|
+
"trip"."gtfs_route_type" as "trip.gtfs_route_type",
|
|
127
|
+
"trip"."gtfs_trip_headsign" as "trip.gtfs_trip_headsign",
|
|
128
|
+
"trip"."gtfs_trip_short_name" as "trip.gtfs_trip_short_name",
|
|
129
|
+
"trip"."gtfs_trip_id" as "trip.gtfs_trip_id",
|
|
130
|
+
"trip"."gtfs_date" as "trip.gtfs_date",
|
|
131
|
+
"trip"."id" as "trip.id",
|
|
132
|
+
"trip"."is_canceled" as "trip.is_canceled",
|
|
133
|
+
"trip"."last_position_id" as "trip.last_position_id",
|
|
134
|
+
"trip"."origin_route_name" as "trip.origin_route_name",
|
|
135
|
+
"trip"."run_number" as "trip.run_number",
|
|
136
|
+
"trip"."start_asw_stop_id" as "trip.start_asw_stop_id",
|
|
137
|
+
"trip"."start_cis_stop_id" as "trip.start_cis_stop_id",
|
|
138
|
+
"trip"."start_cis_stop_platform_code" as "trip.start_cis_stop_platform_code",
|
|
139
|
+
"trip"."start_time" as "trip.start_time",
|
|
140
|
+
"trip"."start_timestamp" as "trip.start_timestamp",
|
|
141
|
+
"trip"."end_timestamp" as "trip.end_timestamp",
|
|
142
|
+
"trip"."vehicle_registration_number" as "trip.vehicle_registration_number",
|
|
143
|
+
"trip"."vehicle_type_id" as "trip.vehicle_type_id",
|
|
144
|
+
"trip"."wheelchair_accessible" as "trip.wheelchair_accessible",
|
|
145
|
+
"trip"."internal_route_name" as "trip.internal_route_name",
|
|
146
|
+
"trip"."internal_run_number" as "trip.internal_run_number",
|
|
147
|
+
"trip->last_position"."asw_last_stop_id" as "trip.last_position.asw_last_stop_id",
|
|
148
|
+
"trip->last_position"."bearing" as "trip.last_position.bearing",
|
|
149
|
+
"trip->last_position"."cis_last_stop_id" as "trip.last_position.cis_last_stop_id",
|
|
150
|
+
"trip->last_position"."cis_last_stop_sequence" as "trip.last_position.cis_last_stop_sequence",
|
|
151
|
+
"trip->last_position"."delay" as "trip.last_position.delay",
|
|
152
|
+
"trip->last_position"."delay_stop_arrival" as "trip.last_position.delay_stop_arrival",
|
|
153
|
+
"trip->last_position"."delay_stop_departure" as "trip.last_position.delay_stop_departure",
|
|
154
|
+
"trip->last_position"."id" as "trip.last_position.id",
|
|
155
|
+
"trip->last_position"."is_canceled" as "trip.last_position.is_canceled",
|
|
156
|
+
"trip->last_position"."last_stop_arrival_time" as "trip.last_position.last_stop_arrival_time",
|
|
157
|
+
"trip->last_position"."last_stop_departure_time" as "trip.last_position.last_stop_departure_time",
|
|
158
|
+
"trip->last_position"."last_stop_id" as "trip.last_position.last_stop_id",
|
|
159
|
+
"trip->last_position"."last_stop_sequence" as "trip.last_position.last_stop_sequence",
|
|
160
|
+
"trip->last_position"."lat" as "trip.last_position.lat",
|
|
161
|
+
"trip->last_position"."lng" as "trip.last_position.lng",
|
|
162
|
+
"trip->last_position"."next_stop_arrival_time" as "trip.last_position.next_stop_arrival_time",
|
|
163
|
+
"trip->last_position"."next_stop_departure_time" as "trip.last_position.next_stop_departure_time",
|
|
164
|
+
"trip->last_position"."next_stop_id" as "trip.last_position.next_stop_id",
|
|
165
|
+
"trip->last_position"."next_stop_sequence" as "trip.last_position.next_stop_sequence",
|
|
166
|
+
"trip->last_position"."origin_time" as "trip.last_position.origin_time",
|
|
167
|
+
"trip->last_position"."origin_timestamp" as "trip.last_position.origin_timestamp",
|
|
168
|
+
"trip->last_position"."shape_dist_traveled" as "trip.last_position.shape_dist_traveled",
|
|
169
|
+
"trip->last_position"."speed" as "trip.last_position.speed",
|
|
170
|
+
"trip->last_position"."state_position" as "trip.last_position.state_position",
|
|
171
|
+
"trip->last_position"."state_process" as "trip.last_position.state_process",
|
|
172
|
+
"trip->last_position"."this_stop_id" as "trip.last_position.this_stop_id",
|
|
173
|
+
"trip->last_position"."this_stop_sequence" as "trip.last_position.this_stop_sequence",
|
|
174
|
+
"trip->last_position"."is_tracked" as "trip.last_position.is_tracked",
|
|
175
|
+
"trip->last_position"."trips_id" as "trip.last_position.trips_id",
|
|
176
|
+
"trip->last_position"."tcp_event" as "trip.last_position.tcp_event",
|
|
177
|
+
"trip->last_position"."last_stop_headsign" as "trip.last_position.last_stop_headsign",
|
|
178
|
+
"trip->last_position"."last_stop_name" as "trip.last_position.last_stop_name",
|
|
179
|
+
"trip->last_position"."valid_to" as "trip.last_position.valid_to",
|
|
180
|
+
"trip->last_position"."scheduled_timestamp" as "trip.last_position.scheduled_timestamp",
|
|
181
|
+
"trip->vehicle_descriptor"."id" as "trip.vehicle_descriptor.id",
|
|
182
|
+
"trip->vehicle_descriptor"."is_air_conditioned" as "trip.vehicle_descriptor.is_air_conditioned"
|
|
183
|
+
from
|
|
184
|
+
"vehiclepositions_trips" as "trip"
|
|
185
|
+
inner join "vehiclepositions_positions" as "trip->last_position" on
|
|
186
|
+
"trip"."last_position_id" = "trip->last_position"."id"
|
|
187
|
+
and ("trip->last_position"."valid_to" is null or "trip->last_position"."valid_to" >= current_timestamp)
|
|
188
|
+
and "trip->last_position"."state_position" in ('at_stop', 'before_track', 'before_track_delayed', 'canceled', 'off_track', 'on_track')
|
|
189
|
+
left outer join "vehiclepositions_vehicle_descriptors" as "trip->vehicle_descriptor" on
|
|
190
|
+
"trip"."vehicle_registration_number" = "trip->vehicle_descriptor"."registration_number"
|
|
191
|
+
and trip.gtfs_route_type = "trip->vehicle_descriptor".gtfs_route_type;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
alter table ropidgtfs_run_numbers DROP COLUMN IF EXISTS route_licence_number;
|
|
2
|
+
alter table ropidgtfs_precomputed_trip_schedule DROP COLUMN IF EXISTS route_licence_number;
|
|
3
|
+
|
|
4
|
+
drop index if exists ropidgtfs_precomputed_trip_schedule_lookup_idx;
|
|
5
|
+
drop index if exists ropidgtfs_precomputed_trip_schedule_lookup_actual_idx;
|
|
6
|
+
|
|
7
|
+
create index if not exists ropidgtfs_run_numbers_lookup_idx on ropidgtfs_run_numbers (route_id, trip_number);
|
|
8
|
+
create index if not exists ropidgtfs_run_numbers_lookup_actual_idx on ropidgtfs_run_numbers_actual (route_id, trip_number);
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
alter table ropidgtfs_run_numbers ADD COLUMN route_licence_number INT;
|
|
2
|
+
alter table ropidgtfs_precomputed_trip_schedule ADD COLUMN route_licence_number INT;
|
|
3
|
+
|
|
4
|
+
drop index if exists ropidgtfs_run_numbers_lookup_idx;
|
|
5
|
+
drop index if exists ropidgtfs_run_numbers_lookup_actual_idx;
|
|
6
|
+
|
|
7
|
+
create index ropidgtfs_precomputed_trip_schedule_lookup_idx on ropidgtfs_precomputed_trip_schedule (route_licence_number, trip_number);
|
|
8
|
+
create index ropidgtfs_precomputed_trip_schedule_lookup_actual_idx on ropidgtfs_precomputed_trip_schedule_actual (route_licence_number, trip_number);
|
package/dist/const.d.ts
CHANGED
|
@@ -27,9 +27,5 @@ export declare enum TCPEventEnum {
|
|
|
27
27
|
export declare enum RegionalBusEventEnum {
|
|
28
28
|
DEPARTURED = "R"
|
|
29
29
|
}
|
|
30
|
-
export declare enum PositionTrackingEnum {
|
|
31
|
-
NOT_TRACKING = 0,
|
|
32
|
-
TRACKING = 2
|
|
33
|
-
}
|
|
34
30
|
export declare const ArrayNotPublicRegistrationNumbers: string[];
|
|
35
31
|
export declare const DATA_RETENTION_IN_MINUTES = 30;
|
package/dist/const.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.DATA_RETENTION_IN_MINUTES = exports.ArrayNotPublicRegistrationNumbers = exports.
|
|
3
|
+
exports.DATA_RETENTION_IN_MINUTES = exports.ArrayNotPublicRegistrationNumbers = exports.RegionalBusEventEnum = exports.TCPEventEnum = exports.StateProcessEnum = exports.StatePositionEnum = void 0;
|
|
4
4
|
var StatePositionEnum;
|
|
5
5
|
(function (StatePositionEnum) {
|
|
6
6
|
StatePositionEnum["OFF_TRACK"] = "off_track";
|
|
@@ -34,11 +34,6 @@ var RegionalBusEventEnum;
|
|
|
34
34
|
(function (RegionalBusEventEnum) {
|
|
35
35
|
RegionalBusEventEnum["DEPARTURED"] = "R";
|
|
36
36
|
})(RegionalBusEventEnum || (exports.RegionalBusEventEnum = RegionalBusEventEnum = {}));
|
|
37
|
-
var PositionTrackingEnum;
|
|
38
|
-
(function (PositionTrackingEnum) {
|
|
39
|
-
PositionTrackingEnum[PositionTrackingEnum["NOT_TRACKING"] = 0] = "NOT_TRACKING";
|
|
40
|
-
PositionTrackingEnum[PositionTrackingEnum["TRACKING"] = 2] = "TRACKING";
|
|
41
|
-
})(PositionTrackingEnum || (exports.PositionTrackingEnum = PositionTrackingEnum = {}));
|
|
42
37
|
exports.ArrayNotPublicRegistrationNumbers = ["2210", "5572"];
|
|
43
38
|
exports.DATA_RETENTION_IN_MINUTES = 30;
|
|
44
39
|
//# sourceMappingURL=const.js.map
|
package/dist/const.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"const.js","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBAaX;AAbD,WAAY,iBAAiB;IACzB,4CAAuB,CAAA;IACvB,wCAAmB,CAAA;IACnB,0CAAqB,CAAA;IACrB,kDAA6B,CAAA;IAC7B,gDAA2B,CAAA;IAC3B,0CAAqB,CAAA;IACrB,4CAAuB,CAAA;IACvB,wCAAmB,CAAA;IACnB,kEAA6C,CAAA;IAC7C,4CAAuB,CAAA;IACvB,8CAAyB,CAAA;IACzB,8CAAyB,CAAA;AAC7B,CAAC,EAbW,iBAAiB,iCAAjB,iBAAiB,QAa5B;AAED,IAAY,gBAKX;AALD,WAAY,gBAAgB;IACxB,2CAAuB,CAAA;IACvB,2CAAuB,CAAA;IACvB,mCAAe,CAAA;IACf,2CAAuB,CAAA;AAC3B,CAAC,EALW,gBAAgB,gCAAhB,gBAAgB,QAK3B;AAED,IAAY,YAKX;AALD,WAAY,YAAY;IACpB,uCAAuB,CAAA;IACvB,gCAAgB,CAAA;IAChB,gCAAgB,CAAA;IAChB,0BAAU,CAAA;AACd,CAAC,EALW,YAAY,4BAAZ,YAAY,QAKvB;AAED,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC5B,wCAAgB,CAAA;AACpB,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B;
|
|
1
|
+
{"version":3,"file":"const.js","sourceRoot":"","sources":["../src/const.ts"],"names":[],"mappings":";;;AAAA,IAAY,iBAaX;AAbD,WAAY,iBAAiB;IACzB,4CAAuB,CAAA;IACvB,wCAAmB,CAAA;IACnB,0CAAqB,CAAA;IACrB,kDAA6B,CAAA;IAC7B,gDAA2B,CAAA;IAC3B,0CAAqB,CAAA;IACrB,4CAAuB,CAAA;IACvB,wCAAmB,CAAA;IACnB,kEAA6C,CAAA;IAC7C,4CAAuB,CAAA;IACvB,8CAAyB,CAAA;IACzB,8CAAyB,CAAA;AAC7B,CAAC,EAbW,iBAAiB,iCAAjB,iBAAiB,QAa5B;AAED,IAAY,gBAKX;AALD,WAAY,gBAAgB;IACxB,2CAAuB,CAAA;IACvB,2CAAuB,CAAA;IACvB,mCAAe,CAAA;IACf,2CAAuB,CAAA;AAC3B,CAAC,EALW,gBAAgB,gCAAhB,gBAAgB,QAK3B;AAED,IAAY,YAKX;AALD,WAAY,YAAY;IACpB,uCAAuB,CAAA;IACvB,gCAAgB,CAAA;IAChB,gCAAgB,CAAA;IAChB,0BAAU,CAAA;AACd,CAAC,EALW,YAAY,4BAAZ,YAAY,QAKvB;AAED,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC5B,wCAAgB,CAAA;AACpB,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B;AAEY,QAAA,iCAAiC,GAAa,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE/D,QAAA,yBAAyB,GAAG,EAAE,CAAC"}
|
package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripScheduleRepository.js
CHANGED
|
@@ -94,7 +94,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
|
|
|
94
94
|
t0.first_stop_id,
|
|
95
95
|
t0.last_stop_id,
|
|
96
96
|
right(t0.origin_route_id, -1) as origin_route_name,
|
|
97
|
-
t0.trip_number
|
|
97
|
+
t0.trip_number,
|
|
98
|
+
t0.route_licence_number
|
|
98
99
|
FROM (
|
|
99
100
|
SELECT
|
|
100
101
|
t1.route_id AS origin_route_id,
|
|
@@ -116,7 +117,8 @@ class TripScheduleRepository extends models_1.PostgresModel {
|
|
|
116
117
|
GREATEST(t6.arrival_time::INTERVAL, t6.departure_time::INTERVAL) AS max_stop_time,
|
|
117
118
|
t5.stop_id AS first_stop_id,
|
|
118
119
|
t6.stop_id AS last_stop_id,
|
|
119
|
-
t1.trip_number
|
|
120
|
+
t1.trip_number,
|
|
121
|
+
t1.route_licence_number
|
|
120
122
|
FROM "${const_1.PG_SCHEMA}".ropidgtfs_run_numbers${sourceTableSuffix} t1
|
|
121
123
|
INNER JOIN "${const_1.PG_SCHEMA}".ropidgtfs_precomputed_services_calendar_tmp t3 ON t1.service_id = t3.service_id
|
|
122
124
|
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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wBAyFI,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;IApHF,CAAC;CAqHJ;AAlID,wDAkIC"}
|
|
@@ -10,5 +10,5 @@ export declare class RegionalBusMessageFilter implements IRegionalBusMessageFilt
|
|
|
10
10
|
* Get messages that are valid for processing
|
|
11
11
|
*/
|
|
12
12
|
getFilteredMessages(messages: IRegionalBusRunsMessagesModel[]): IRegionalBusRunsMessagesModel[];
|
|
13
|
-
private get
|
|
13
|
+
private get regNumberWhitelist();
|
|
14
14
|
}
|
|
@@ -27,8 +27,10 @@ let RegionalBusMessageFilter = exports.RegionalBusMessageFilter = class Regional
|
|
|
27
27
|
let filteredMessages = [];
|
|
28
28
|
for (const message of messages) {
|
|
29
29
|
if (message.cis_line_id && message.cis_trip_number && message.registration_number && message.events !== "") {
|
|
30
|
-
if (this.
|
|
31
|
-
this.logger.verbose(
|
|
30
|
+
if (this.regNumberWhitelist && !this.regNumberWhitelist.includes(message.registration_number.toString())) {
|
|
31
|
+
this.logger.verbose(
|
|
32
|
+
// eslint-disable-next-line max-len
|
|
33
|
+
`getFilteredMessages: message with registration_number=${message.registration_number} is not in whitelist, skipping`);
|
|
32
34
|
continue;
|
|
33
35
|
}
|
|
34
36
|
filteredMessages.push(message);
|
|
@@ -39,8 +41,8 @@ let RegionalBusMessageFilter = exports.RegionalBusMessageFilter = class Regional
|
|
|
39
41
|
}
|
|
40
42
|
return filteredMessages;
|
|
41
43
|
}
|
|
42
|
-
get
|
|
43
|
-
const valuePath = "old.datasources.pid.vehicle-positions.
|
|
44
|
+
get regNumberWhitelist() {
|
|
45
|
+
const valuePath = "old.datasources.pid.vehicle-positions.regNumberWhitelist.regionalBus";
|
|
44
46
|
const whitelistDict = this.config.getValue(valuePath, {});
|
|
45
47
|
const whitelist = Object.values(whitelistDict);
|
|
46
48
|
if (whitelist[0] !== "*") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RegionalBusMessageFilter.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,wEAAqE;AAErE,iEAAwE;AAIjE,IAAM,wBAAwB,sCAA9B,MAAM,wBAAwB;IACjC,YAC4C,MAAqB,EAC3B,MAAe;QADT,WAAM,GAAN,MAAM,CAAe;QAC3B,WAAM,GAAN,MAAM,CAAS;IAClD,CAAC;IAEJ;;OAEG;IACI,mBAAmB,CAAC,QAAyC;QAChE,IAAI,gBAAgB,GAAoC,EAAE,CAAC;QAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,EAAE;gBACxG,IAAI,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"RegionalBusMessageFilter.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/RegionalBusMessageFilter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,wEAAqE;AAErE,iEAAwE;AAIjE,IAAM,wBAAwB,sCAA9B,MAAM,wBAAwB;IACjC,YAC4C,MAAqB,EAC3B,MAAe;QADT,WAAM,GAAN,MAAM,CAAe;QAC3B,WAAM,GAAN,MAAM,CAAS;IAClD,CAAC;IAEJ;;OAEG;IACI,mBAAmB,CAAC,QAAyC;QAChE,IAAI,gBAAgB,GAAoC,EAAE,CAAC;QAC3D,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,MAAM,KAAK,EAAE,EAAE;gBACxG,IAAI,IAAI,CAAC,kBAAkB,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC,EAAE;oBACtG,IAAI,CAAC,MAAM,CAAC,OAAO;oBACf,mCAAmC;oBACnC,yDAAyD,OAAO,CAAC,mBAAmB,gCAAgC,CACvH,CAAC;oBACF,SAAS;iBACZ;gBAED,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAClC;SACJ;QAED,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,uDAAuD,CAAC,CAAC;SAChF;QAED,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IAED,IAAY,kBAAkB;QAC1B,MAAM,SAAS,GAAG,sEAAsE,CAAC;QACzF,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAyB,SAAS,EAAE,EAAE,CAAC,CAAC;QAClF,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAE/C,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACtB,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ,CAAA;mCA3CY,wBAAwB;IADpC,IAAA,qBAAU,GAAE;IAGJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,YAAY,CAAC,CAAA;IAC9B,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;;GAHpB,wBAAwB,CA2CpC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RouteSubAgencyDto } from "../../../../../../schema-definitions/ropid-gtfs/models/RouteSubAgencyDto";
|
|
2
2
|
import { DescriptorModel } from "../../../../../../schema-definitions/vehicle-descriptors/models";
|
|
3
3
|
import { IProcessRegionalBusRunMessage } from "../../interfaces/IProcessRegionalBusRunMessagesInput";
|
|
4
4
|
import { IExtendedScheduleWithExternalId } from "./interfaces/IExtendedSchedule";
|
|
5
5
|
import { ITripScheduleManager } from "./interfaces/ITripScheduleManager";
|
|
6
6
|
export declare class TripScheduleManager implements ITripScheduleManager {
|
|
7
|
-
private readonly
|
|
7
|
+
private readonly tripScheduleRepository;
|
|
8
8
|
constructor();
|
|
9
|
-
getScheduleInput(
|
|
9
|
+
getScheduleInput(message: IProcessRegionalBusRunMessage, subAgencyEntities: RouteSubAgencyDto[], descriptorEntities: DescriptorModel[]): Promise<IExtendedScheduleWithExternalId | null>;
|
|
10
10
|
}
|
|
@@ -19,36 +19,38 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
19
19
|
};
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.TripScheduleManager = void 0;
|
|
22
|
-
const
|
|
22
|
+
const TripScheduleRepository_1 = require("../../../../../ropid-gtfs/data-access/precomputed/TripScheduleRepository");
|
|
23
|
+
const sequelize_1 = require("@golemio/core/dist/shared/sequelize");
|
|
23
24
|
const tsyringe_1 = require("@golemio/core/dist/shared/tsyringe");
|
|
24
25
|
let TripScheduleManager = exports.TripScheduleManager = class TripScheduleManager {
|
|
25
26
|
constructor() {
|
|
26
|
-
this.
|
|
27
|
+
this.tripScheduleRepository = new TripScheduleRepository_1.TripScheduleRepository();
|
|
27
28
|
}
|
|
28
|
-
getScheduleInput(
|
|
29
|
+
getScheduleInput(message, subAgencyEntities, descriptorEntities) {
|
|
29
30
|
var _a;
|
|
30
31
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
const
|
|
32
|
-
if (!
|
|
32
|
+
const subAgencyEntity = subAgencyEntities.find((subAgency) => subAgency.route_licence_number && subAgency.route_licence_number.toString() === message.cis_line_id);
|
|
33
|
+
if (!subAgencyEntity) {
|
|
33
34
|
return null;
|
|
34
35
|
}
|
|
35
36
|
const descriptorEntity = descriptorEntities.find((descriptor) => descriptor.registration_number === message.registration_number);
|
|
36
|
-
const
|
|
37
|
+
const gtfsScheduleData = yield this.tripScheduleRepository.findOne({
|
|
37
38
|
where: {
|
|
38
|
-
|
|
39
|
+
route_licence_number: message.cis_line_id,
|
|
39
40
|
trip_number: message.cis_trip_number,
|
|
41
|
+
[sequelize_1.Op.and]: [sequelize_1.Sequelize.literal("start_timestamp::date = current_date")],
|
|
40
42
|
},
|
|
41
43
|
});
|
|
42
|
-
if (!
|
|
44
|
+
if (!gtfsScheduleData) {
|
|
43
45
|
return null;
|
|
44
46
|
}
|
|
45
47
|
return {
|
|
46
48
|
cache_lookup_key: `${message.cis_line_id}_${message.cis_trip_number}`,
|
|
47
|
-
route_id:
|
|
48
|
-
run_number:
|
|
49
|
+
route_id: gtfsScheduleData.route_id.slice(1),
|
|
50
|
+
run_number: gtfsScheduleData.run_number,
|
|
49
51
|
msg_last_timestamp: message.vehicle_timestamp,
|
|
50
|
-
gtfs_trip_id:
|
|
51
|
-
agency_name:
|
|
52
|
+
gtfs_trip_id: gtfsScheduleData.trip_id,
|
|
53
|
+
agency_name: subAgencyEntity.sub_agency_name,
|
|
52
54
|
is_wheelchair_accessible: (_a = descriptorEntity === null || descriptorEntity === void 0 ? void 0 : descriptorEntity.is_wheelchair_accessible) !== null && _a !== void 0 ? _a : null,
|
|
53
55
|
};
|
|
54
56
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TripScheduleManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/TripScheduleManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"TripScheduleManager.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/helpers/regional-bus/TripScheduleManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,qHAAuG;AAIvG,mEAAoE;AACpE,iEAAgE;AAMzD,IAAM,mBAAmB,iCAAzB,MAAM,mBAAmB;IAG5B;QACI,IAAI,CAAC,sBAAsB,GAAG,IAAI,+CAAsB,EAAE,CAAC;IAC/D,CAAC;IAEY,gBAAgB,CACzB,OAAsC,EACtC,iBAAsC,EACtC,kBAAqC;;;YAErC,MAAM,eAAe,GAAG,iBAAiB,CAAC,IAAI,CAC1C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,oBAAoB,IAAI,SAAS,CAAC,oBAAoB,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,WAAW,CACrH,CAAC;YAEF,IAAI,CAAC,eAAe,EAAE;gBAClB,OAAO,IAAI,CAAC;aACf;YAED,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAC5C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,mBAAmB,KAAK,OAAO,CAAC,mBAAmB,CACjF,CAAC;YAEF,MAAM,gBAAgB,GAAwB,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC;gBACpF,KAAK,EAAE;oBACH,oBAAoB,EAAE,OAAO,CAAC,WAAW;oBACzC,WAAW,EAAE,OAAO,CAAC,eAAe;oBACpC,CAAC,cAAE,CAAC,GAAG,CAAC,EAAE,CAAC,qBAAS,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAC;iBACxE;aACJ,CAAC,CAAC;YAEH,IAAI,CAAC,gBAAgB,EAAE;gBACnB,OAAO,IAAI,CAAC;aACf;YAED,OAAO;gBACH,gBAAgB,EAAE,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,eAAe,EAAE;gBACrE,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC5C,UAAU,EAAE,gBAAgB,CAAC,UAAU;gBACvC,kBAAkB,EAAE,OAAO,CAAC,iBAA2B;gBACvD,YAAY,EAAE,gBAAgB,CAAC,OAAO;gBACtC,WAAW,EAAE,eAAe,CAAC,eAAe;gBAC5C,wBAAwB,EAAE,MAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,wBAAwB,mCAAI,IAAI;aAC/E,CAAC;;KACL;CACJ,CAAA;8BA9CY,mBAAmB;IAD/B,IAAA,qBAAU,GAAE;;GACA,mBAAmB,CA8C/B"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { RouteSubAgencyDto } from "../../../../../../../schema-definitions/ropid-gtfs/models/RouteSubAgencyDto";
|
|
2
2
|
import { DescriptorModel } from "../../../../../../../schema-definitions/vehicle-descriptors/models";
|
|
3
3
|
import { IProcessRegionalBusRunMessage } from "../../../interfaces/IProcessRegionalBusRunMessagesInput";
|
|
4
4
|
import { IExtendedScheduleWithExternalId } from "./IExtendedSchedule";
|
|
5
5
|
export interface ITripScheduleManager {
|
|
6
|
-
getScheduleInput(
|
|
6
|
+
getScheduleInput(message: IProcessRegionalBusRunMessage, subAgencyEntities: RouteSubAgencyDto[], descriptorEntities: DescriptorModel[]): Promise<IExtendedScheduleWithExternalId | null>;
|
|
7
7
|
}
|
|
@@ -97,17 +97,17 @@ let ProcessRegionalBusRunMessagesTask = exports.ProcessRegionalBusRunMessagesTas
|
|
|
97
97
|
}
|
|
98
98
|
getGtfsTripsFromDb(messages) {
|
|
99
99
|
return __awaiter(this, void 0, void 0, function* () {
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
const
|
|
103
|
-
|
|
100
|
+
let cisLineIds = new Set();
|
|
101
|
+
let registrationNumbers = new Set();
|
|
102
|
+
for (const message of messages) {
|
|
103
|
+
cisLineIds.add(message.cis_line_id);
|
|
104
|
+
registrationNumbers.add(message.registration_number);
|
|
105
|
+
}
|
|
106
|
+
const subAgencyEntities = yield this.routeSubAgencyRepository.findSubAgenciesByCisLineIds(Array.from(cisLineIds));
|
|
107
|
+
const descriptorEntities = yield this.descriptorRepository.findAccessDescByRegistrationNumbers(Array.from(registrationNumbers), RouteTypeEnums_1.GTFSRouteTypeEnum.BUS);
|
|
104
108
|
let scheduleInputData = [];
|
|
105
|
-
for (const
|
|
106
|
-
const
|
|
107
|
-
if (subAgency.route_licence_number === null) {
|
|
108
|
-
continue;
|
|
109
|
-
}
|
|
110
|
-
const scheduleInputItem = yield this.tripScheduleManager.getScheduleInput(subAgency, messages, descriptorEntities);
|
|
109
|
+
for (const message of messages) {
|
|
110
|
+
const scheduleInputItem = yield this.tripScheduleManager.getScheduleInput(message, subAgencyEntities, descriptorEntities);
|
|
111
111
|
if (!scheduleInputItem) {
|
|
112
112
|
continue;
|
|
113
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessRegionalBusRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ProcessRegionalBusRunMessagesTask.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/ProcessRegionalBusRunMessagesTask.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,7 +111,7 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
111
111
|
"origin_timestamp",
|
|
112
112
|
"scheduled_timestamp",
|
|
113
113
|
"delay",
|
|
114
|
-
"
|
|
114
|
+
"is_tracked",
|
|
115
115
|
"id",
|
|
116
116
|
"shape_dist_traveled",
|
|
117
117
|
"is_canceled",
|
|
@@ -124,16 +124,23 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
124
124
|
"last_stop_id",
|
|
125
125
|
"last_stop_arrival_time",
|
|
126
126
|
"last_stop_departure_time",
|
|
127
|
+
"next_stop_arrival_time",
|
|
128
|
+
"next_stop_departure_time",
|
|
129
|
+
"next_stop_id",
|
|
130
|
+
"next_stop_sequence",
|
|
131
|
+
"next_stop_name",
|
|
127
132
|
],
|
|
128
133
|
model: this.sequelizeModel,
|
|
129
134
|
where: {
|
|
135
|
+
lat: { [sequelize_1.default.Op.not]: null },
|
|
136
|
+
lng: { [sequelize_1.default.Op.not]: null },
|
|
130
137
|
state_process: { [sequelize_1.default.Op.ne]: const_2.StateProcessEnum.PROCESSED },
|
|
131
138
|
},
|
|
132
139
|
},
|
|
133
140
|
],
|
|
134
141
|
order: [
|
|
135
142
|
[{ model: this.sequelizeModel, as: "position" }, "created_at", "ASC"],
|
|
136
|
-
[{ model: this.sequelizeModel, as: "position" }, "
|
|
143
|
+
[{ model: this.sequelizeModel, as: "position" }, "is_tracked", "DESC"],
|
|
137
144
|
],
|
|
138
145
|
raw: true,
|
|
139
146
|
where: {
|
|
@@ -165,13 +172,13 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
165
172
|
bearing: c["vehiclepositions_positions.bearing"],
|
|
166
173
|
delay: c["vehiclepositions_positions.delay"],
|
|
167
174
|
id: c["vehiclepositions_positions.id"],
|
|
168
|
-
lat: parseFloat(c["vehiclepositions_positions.lat"]),
|
|
169
|
-
lng: parseFloat(c["vehiclepositions_positions.lng"]),
|
|
175
|
+
lat: parseFloat(c["vehiclepositions_positions.lat"]) || null,
|
|
176
|
+
lng: parseFloat(c["vehiclepositions_positions.lng"]) || null,
|
|
170
177
|
origin_time: c["vehiclepositions_positions.origin_time"],
|
|
171
178
|
origin_timestamp: c["vehiclepositions_positions.origin_timestamp"],
|
|
172
179
|
scheduled_timestamp: (_a = c["vehiclepositions_positions.scheduled_timestamp"]) !== null && _a !== void 0 ? _a : null,
|
|
173
180
|
shape_dist_traveled: parseFloat(c["vehiclepositions_positions.shape_dist_traveled"]) || null,
|
|
174
|
-
|
|
181
|
+
is_tracked: c["vehiclepositions_positions.is_tracked"],
|
|
175
182
|
is_canceled: c["vehiclepositions_positions.is_canceled"],
|
|
176
183
|
state_position: c["vehiclepositions_positions.state_position"],
|
|
177
184
|
state_process: c["vehiclepositions_positions.state_process"],
|
|
@@ -182,6 +189,11 @@ class PositionsRepository extends models_2.PostgresModel {
|
|
|
182
189
|
last_stop_id: c["vehiclepositions_positions.last_stop_id"],
|
|
183
190
|
last_stop_arrival_time: c["vehiclepositions_positions.last_stop_arrival_time"],
|
|
184
191
|
last_stop_departure_time: c["vehiclepositions_positions.last_stop_departure_time"],
|
|
192
|
+
next_stop_arrival_time: c["vehiclepositions_positions.next_stop_arrival_time"],
|
|
193
|
+
next_stop_departure_time: c["vehiclepositions_positions.next_stop_departure_time"],
|
|
194
|
+
next_stop_id: c["vehiclepositions_positions.next_stop_id"],
|
|
195
|
+
next_stop_sequence: c["vehiclepositions_positions.next_stop_sequence"],
|
|
196
|
+
next_stop_name: c["vehiclepositions_positions.next_stop_name"],
|
|
185
197
|
});
|
|
186
198
|
return p;
|
|
187
199
|
}, []);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PositionsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mEAAuC;AACvC,2FAA0D;AAC1D,uFAA6D;AAC7D,wGAAwE;AAIxE,iFAAqF;AACrF,yEAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,iFAAoE;AACpE,gDAAgE;AAGhE,gFAAwD;AAGxD,MAAa,mBAAoB,SAAQ,sBAAa;IAGlD;QACI,KAAK,CACD,uBAAuB,EACvB;YACI,yBAAyB,EAAE,yBAAW,CAAC,cAAc;YACrD,WAAW,EAAE,oCAAgB,CAAC,SAAS,CAAC,WAAW;YACnD,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,gBAAgB;YAC5B,2BAA2B,EAAE;gBACzB,OAAO,EAAE;oBACL;wBACI,MAAM,EAAE,CAAC,UAAU,CAAC;wBACpB,IAAI,EAAE,qCAAqC;qBAC9C;oBACD;wBACI,MAAM,EAAE,CAAC,aAAa,CAAC;wBACvB,IAAI,EAAE,wCAAwC;qBACjD;iBACJ;aACJ;SACJ,EACD,IAAI,uCAAmB,CAAC,oCAAgB,CAAC,SAAS,CAAC,IAAI,GAAG,gBAAgB,EAAE,yBAAW,CAAC,UAAU,CAAC,CACtG,CAAC;QAON;;;;;;;;;;;;;;WAcG;QACI,+BAA0B,GAAG,CAAO,OAAiB,EAA6B,EAAE;YACvF,oEAAoE;YACpE,yEAAyE;YAEzE,wCAAwC;YACxC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;gBACtB,OAAO,EAAsB,CAAC;aACjC;YACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC1C,UAAU,EAAE;oBACR,8EAA8E;oBAC9E,IAAI;oBACJ,cAAc;oBACd,iBAAiB;oBACjB,iBAAiB;oBACjB,eAAe;oBACf,uBAAuB;oBACvB,mBAAmB;oBACnB,uBAAuB;iBAC1B;gBACD,OAAO,EAAE;oBACL;wBACI,UAAU,EAAE;4BACR,SAAS;4BACT,KAAK;4BACL,KAAK;4BACL,aAAa;4BACb,kBAAkB;4BAClB,qBAAqB;4BACrB,OAAO;4BACP,
|
|
1
|
+
{"version":3,"file":"PositionsRepository.js","sourceRoot":"","sources":["../../../../../../src/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/PositionsRepository.ts"],"names":[],"mappings":"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"}
|