@golemio/pid 5.4.2-dev.2276050736 → 5.4.2
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/00_clear_test_data.sql +0 -1
- package/db/example/03_ropidgtfs_dump.sql +38 -43
- package/db/example/14_nightDelays.sql +8 -17
- package/db/example/redis/publicDelayCompObjectMock.json +0 -7
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopTimesModel.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopTimesModel.js +0 -8
- package/dist/integration-engine/ropid-gtfs/RopidGTFSStopTimesModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.d.ts +0 -2
- package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.js +6 -4
- package/dist/integration-engine/ropid-gtfs/RopidGTFSTripsModel.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/RopidGtfsFacade.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/RopidGtfsFacade.js +0 -2
- package/dist/integration-engine/ropid-gtfs/RopidGtfsFacade.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js +1 -9
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.js +0 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/interfaces/IPublicDepartureDto.d.ts +0 -5
- package/dist/integration-engine/ropid-gtfs/interfaces/TripModelInterfaces.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/transformations/PublicDepartureCacheTransformation.js +0 -5
- package/dist/integration-engine/ropid-gtfs/transformations/PublicDepartureCacheTransformation.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/PrecomputedTablesFacade.d.ts +0 -1
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/PrecomputedTablesFacade.js +0 -4
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/PrecomputedTablesFacade.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.d.ts +0 -1
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js +0 -13
- package/dist/integration-engine/vehicle-positions/workers/vehicle-positions/data-access/TripsRepository.js.map +1 -1
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js +3 -1
- package/dist/output-gateway/pid/controllers/v4/V4TransferBoardsController.js.map +1 -1
- package/dist/output-gateway/pid/helpers/TransferBoardIconsResolver.d.ts +3 -1
- package/dist/output-gateway/pid/helpers/TransferBoardIconsResolver.js +33 -5
- package/dist/output-gateway/pid/helpers/TransferBoardIconsResolver.js.map +1 -1
- package/dist/output-gateway/pid/interfaces/IV4TransferDto.d.ts +1 -4
- package/dist/output-gateway/pid/service/facade/TransferFacade.js +1 -2
- package/dist/output-gateway/pid/service/facade/TransferFacade.js.map +1 -1
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.d.ts +1 -1
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js +1 -2
- package/dist/output-gateway/pid/service/transformations/TransferDepartureCacheTransformation.js.map +1 -1
- package/dist/output-gateway/public/service/transformations/scopes/PublicVPTripStopTimesTransformation.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.d.ts +0 -32
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js +0 -34
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.d.ts +0 -2
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js +0 -17
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel.d.ts +0 -6
- package/dist/schema-definitions/ropid-gtfs/redis/interfaces/IDelayComputationDto.d.ts +0 -1
- package/dist/schema-definitions/ropid-gtfs/redis/interfaces/IPublicGtfsDepartureCacheDto.d.ts +0 -5
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/DelayComputationDtoSchema.js +0 -2
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/DelayComputationDtoSchema.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/PublicGtfsDepartureDtoSchema.js +0 -31
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/PublicGtfsDepartureDtoSchema.js.map +1 -1
- package/docs/assets/pid_precomputed_erd.png +0 -0
- package/docs/assets/pid_preset_logs_erd.png +0 -0
- package/docs/implementation_documentation.md +4 -4
- package/docs/openapi-output.yaml +0 -2
- package/package.json +3 -3
- package/db/migrations/postgresql/20251229142106-use-gtfs-icons-in-transferboards.js +0 -53
- package/db/migrations/postgresql/20260119180905-add-precomputed-trip-connections.js +0 -53
- package/db/migrations/postgresql/sqls/20251229142106-use-gtfs-icons-in-transferboards-down.sql +0 -1
- package/db/migrations/postgresql/sqls/20251229142106-use-gtfs-icons-in-transferboards-up.sql +0 -1
- package/db/migrations/postgresql/sqls/20260119180905-add-precomputed-trip-connections-down.sql +0 -72
- package/db/migrations/postgresql/sqls/20260119180905-add-precomputed-trip-connections-up.sql +0 -91
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.d.ts +0 -6
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.js +0 -46
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.js.map +0 -1
- package/docs/assets/pid_preset_logs_and_static_erd.png +0 -0
|
@@ -38,7 +38,6 @@ TRUNCATE
|
|
|
38
38
|
"ropidgtfs_precomputed_services_calendar_actual",
|
|
39
39
|
"ropidgtfs_precomputed_minmax_stop_sequences_actual",
|
|
40
40
|
"ropidgtfs_precomputed_departures",
|
|
41
|
-
"ropidgtfs_precomputed_trip_connections",
|
|
42
41
|
"ropid_departures_presets_ropidgtfs_stops";
|
|
43
42
|
|
|
44
43
|
ALTER SEQUENCE ropid_departures_directions_id_seq RESTART;
|
|
@@ -6,7 +6,7 @@ WITH init_values AS (SELECT NOW()::DATE AS now_date)
|
|
|
6
6
|
INSERT INTO ropidgtfs_calendar_actual (end_date, friday, monday, saturday, service_id, start_date, sunday, thursday, tuesday, wednesday, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by)
|
|
7
7
|
VALUES
|
|
8
8
|
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '7 days','YYYYMMDD'), 1, 1, 1, '1111111-1', TO_CHAR((SELECT now_date FROM init_values)-INTERVAL '1 days','YYYYMMDD'), 1, 1, 1, 1, NULL, '2019-05-27 03:20:15.632+00', NULL, NULL, '2019-05-27 03:20:15.632+00', NULL),
|
|
9
|
-
|
|
9
|
+
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '7 days','YYYYMMDD'), 1, 1, 1, '1111100-1', TO_CHAR((SELECT now_date FROM init_values)-INTERVAL '1 days','YYYYMMDD'), 1, 1, 1, 1, -1, '2022-10-24 10:18:51.362+02',NULL,-1,'2022-10-24 10:18:51.362+02',NULL);
|
|
10
10
|
|
|
11
11
|
INSERT INTO ropidgtfs_routes_actual (agency_id, is_night, is_regional, is_substitute_transport, route_color, route_desc, route_id, route_long_name, route_short_name, route_text_color, route_type, route_url, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by)
|
|
12
12
|
VALUES ('99', '0', '0', '0', '00A562', NULL, 'L991', 'Nemocnice Motol - Petřiny - Skalka - Depo Hostivař', 'A', 'FFFFFF', '1', 'https://pid.cz/linka/A', NULL, '2019-05-27 03:20:15.738+00', NULL, NULL, '2019-05-27 03:20:15.738+00', NULL);
|
|
@@ -54,7 +54,7 @@ INSERT INTO ropidgtfs_stops_actual ("location_type", "parent_station", "platform
|
|
|
54
54
|
INSERT INTO ropidgtfs_stops_actual ("location_type", "parent_station", "platform_code", "stop_id", "stop_lat", "stop_lon", "stop_name", "stop_url", "wheelchair_boarding", "zone_id", "create_batch_id", "created_at", "created_by", "update_batch_id", "updated_at", "updated_by", "level_id", "stop_code", "stop_desc", "stop_timezone") VALUES (1, '', '', 'U306S1', 50.07541, 14.34152, 'Nemocnice Motol', '', 1, 'P', -1, '2020-12-04 12:30:26.312286+01', 'integration-engine', NULL, NULL, NULL, '', NULL, NULL, NULL);
|
|
55
55
|
|
|
56
56
|
INSERT INTO ropidgtfs_cis_stop_groups_actual (avg_jtsk_x,avg_jtsk_y,avg_lat,avg_lon,cis,district_code,full_name,idos_category,idos_name,municipality,name,node,unique_name,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
57
|
-
|
|
57
|
+
(-739208.1,-1044513.56,50.0785027,14.4739637,27902,'AB','Želivského','301003','Želivského','Praha','Želivského',921,'Želivského',NULL,'2024-10-31 05:23:06.850',NULL,NULL,'2024-10-31 05:23:06.850',NULL);
|
|
58
58
|
|
|
59
59
|
INSERT INTO ropidgtfs_trips_actual (bikes_allowed, block_id, direction_id, exceptional, route_id, service_id, shape_id, trip_headsign, trip_id, wheelchair_accessible, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, trip_operation_type, trip_short_name) VALUES (1, '', 0, 0, 'L991', '1111111-1', 'L991V1', 'Nemocnice Motol', '991_1151_190107', 1, NULL, '2019-05-27 03:20:24.44+00', NULL, NULL, '2019-05-27 03:20:24.44+00', NULL, 1, '');
|
|
60
60
|
INSERT INTO ropidgtfs_trips_actual (bikes_allowed, block_id, direction_id, exceptional, route_id, service_id, shape_id, trip_headsign, trip_id, wheelchair_accessible, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, trip_operation_type, trip_short_name) VALUES (1, '', 1, 0, 'L991', '1111111-1', 'L991V2', 'Depo Hostivař', '991_4_190107', 1, NULL, '2019-05-27 03:20:24.44+00', NULL, NULL, '2019-05-27 03:20:24.44+00', NULL, 1, '');
|
|
@@ -68,48 +68,43 @@ INSERT INTO ropidgtfs_trips_actual (bikes_allowed, block_id, direction_id, excep
|
|
|
68
68
|
INSERT INTO ropidgtfs_trips_actual (bikes_allowed, block_id, direction_id, exceptional, route_id, service_id, shape_id, trip_headsign, trip_id, wheelchair_accessible, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, trip_operation_type, trip_short_name) VALUES (1, '', 1, 0, 'L991', '1111111-1', 'L991V2', 'Depo Hostivař', '991_12_180709', 1, NULL, '2019-05-27 03:20:24.44+00', NULL, NULL, '2019-05-27 03:20:24.44+00', NULL, 1, '');
|
|
69
69
|
|
|
70
70
|
INSERT INTO ropidgtfs_transfers_actual (from_stop_id,to_stop_id,from_trip_id,to_trip_id,transfer_type,min_transfer_time,max_waiting_time,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
('U873Z2P','U873Z1P','94_922_230320','94_979_230320','1'::ropidgtfs_transfer_type,NULL,180,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL),
|
|
79
|
-
('U461Z1P','U461Z2P','133_7777_241029','103_1237_241029','1'::ropidgtfs_transfer_type,NULL,300,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL),
|
|
80
|
-
('U461Z2P','U461Z1P','103_1237_241029','133_7777_241029','1'::ropidgtfs_transfer_type,NULL,300,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL),
|
|
81
|
-
('U476Z1P','U476Z301','133_7777_241029','1309_9127_231211','1'::ropidgtfs_transfer_type,NULL,180,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL),
|
|
82
|
-
('U1071Z3P','U1071Z3P','909_271_251110','916_175_260101','1'::ropidgtfs_transfer_type,NULL,180,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL);
|
|
71
|
+
('U1383Z301','U1383Z301',NULL,NULL,'2'::ropidgtfs_transfer_type,120,0,NULL,'2026-01-19 14:26:06.239969+01',NULL,NULL,'2026-01-19 14:26:06.239969+01',NULL),
|
|
72
|
+
('U458Z9P','U458Z301',NULL,NULL,'2'::ropidgtfs_transfer_type,180,0,NULL,'2026-01-19 14:26:06.239969+01',NULL,NULL,'2026-01-19 14:26:06.239969+01',NULL),
|
|
73
|
+
('U651Z2P','U651Z5P','93_1656_251110','903_101_251112','1'::ropidgtfs_transfer_type,NULL,600,NULL,'2026-01-19 14:26:06.239969+01',NULL,NULL,'2026-01-19 14:26:06.239969+01',NULL),
|
|
74
|
+
('U97Z1P','U97Z2P','109_1121_241216','163_1154_260101','1'::ropidgtfs_transfer_type,NULL,120,NULL,'2026-01-19 14:26:06.239969+01',NULL,NULL,'2026-01-19 14:26:06.239969+01',NULL),
|
|
75
|
+
('U97Z1P','U97Z2P','109_241_251004','163_1154_260101','1'::ropidgtfs_transfer_type,NULL,120,NULL,'2026-01-19 14:26:06.239969+01',NULL,NULL,'2026-01-19 14:26:06.239969+01',NULL),
|
|
76
|
+
('U28Z1P','U28Z1P','221_2169_260112','163_1154_260101','1'::ropidgtfs_transfer_type,NULL,180,NULL,'2026-01-19 14:26:06.239969+01',NULL,NULL,'2026-01-19 14:26:06.239969+01',NULL),
|
|
77
|
+
('U1071Z3P','U1071Z3P','909_271_251110','916_175_260101','1'::ropidgtfs_transfer_type,NULL,180,NULL,'2026-01-19 14:26:06.239969+01',NULL,NULL,'2026-01-19 14:26:06.239969+01',NULL);
|
|
83
78
|
|
|
84
79
|
WITH init_values AS (SELECT NOW()::DATE AS now_date)
|
|
85
80
|
INSERT INTO ropidgtfs_calendar_dates_actual (date, exception_type, service_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by)
|
|
86
|
-
VALUES (TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '2 days','YYYYMMDD'),
|
|
87
|
-
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '14 days','YYYYMMDD'),
|
|
81
|
+
VALUES (TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '2 days','YYYYMMDD'), 2, '1111111-1', NULL, NULL, NULL, NULL, NULL, NULL),
|
|
82
|
+
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '14 days','YYYYMMDD'), 1, '1111111-1', NULL, NULL, NULL, NULL, NULL, NULL);
|
|
88
83
|
|
|
89
84
|
|
|
90
85
|
-- >>> FOR STOPS ASW & CIS PARAMS TESTS
|
|
91
86
|
|
|
92
87
|
INSERT INTO "ropidgtfs_stops_actual" ("location_type", "parent_station", "platform_code", "stop_id", "stop_lat", "stop_lon", "stop_name", "stop_url", "wheelchair_boarding", "zone_id", "create_batch_id", "created_at", "created_by", "update_batch_id", "updated_at", "updated_by", "level_id", "stop_code", "stop_desc", "stop_timezone", "asw_node_id", "asw_stop_id") VALUES
|
|
93
|
-
(0,
|
|
94
|
-
(0,
|
|
95
|
-
(0,
|
|
96
|
-
(0,
|
|
97
|
-
(0,
|
|
98
|
-
(0,
|
|
99
|
-
(0,
|
|
100
|
-
(0,
|
|
101
|
-
(0,
|
|
88
|
+
(0, '', 'A', 'U286Z1P', 50.03046, 14.52744, 'Háje', '', 0, 'P', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, '', NULL, NULL, NULL, 286, 1),
|
|
89
|
+
(0, '', 'B', 'U286Z2P', 50.03045, 14.527, 'Háje', '', 0, 'P', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, '', NULL, NULL, NULL, 286, 2),
|
|
90
|
+
(0, '', 'C', 'U286Z3P', 50.03038, 14.52585, 'Háje', '', 0, 'P', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, '', NULL, NULL, NULL, 286, 3),
|
|
91
|
+
(0, '', 'D', 'U286Z4', 50.03036, 14.52538, 'Háje', '', 0, '0', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, '', NULL, NULL, NULL, 286, 4),
|
|
92
|
+
(0, '', 'E', 'U286Z5P', 50.03028, 14.52752, 'Háje', '', 0, 'P', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, '', NULL, NULL, NULL, 286, 5),
|
|
93
|
+
(0, '', 'C', 'U286Z13P', 50.03038, 14.52585, 'Háje', '', 0, 'P', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, '', NULL, NULL, NULL, 286, 13),
|
|
94
|
+
(0, '', 'B', 'U286Z72', 50.03045, 14.527, 'Háje', '', 0, '0', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, '', NULL, NULL, NULL, 286, 72),
|
|
95
|
+
(0, 'U286S1', '1', 'U286Z101P', 50.03083, 14.52696, 'Háje', '', 1, 'P', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, 'U286L2', NULL, NULL, NULL, 286, 101),
|
|
96
|
+
(0, 'U286S1', '2', 'U286Z102P', 50.03074, 14.52698, 'Háje', '', 1, 'P', -1, '2020-11-19 12:30:36.671771+01', 'integration-engine', NULL, NULL, NULL, 'U286L2', NULL, NULL, NULL, 286, 102);
|
|
102
97
|
|
|
103
98
|
INSERT INTO "ropidgtfs_cis_stops_actual" ("alt_idos_name", "cis", "id", "jtsk_x", "jtsk_y", "lat", "lon", "platform", "created_at", "wheelchair_access", "zone", "create_batch_id", "created_by", "update_batch_id", "updated_at", "updated_by") VALUES
|
|
104
|
-
('Háje (ul. Opatovská)',
|
|
105
|
-
('Háje',
|
|
106
|
-
('Háje',
|
|
107
|
-
('Háje',
|
|
108
|
-
('Háje (ul. Opatovská)',
|
|
109
|
-
('Háje',
|
|
110
|
-
('Háje',
|
|
111
|
-
('Háje',
|
|
112
|
-
('Háje',
|
|
99
|
+
('Háje (ul. Opatovská)', 55083, '286/1', -736136.5, -1050325.75, 50.03046, 14.527442, 'A', '2020-11-20 12:30:11.942+01', 'unknown', 'P', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL),
|
|
100
|
+
('Háje', 55083, '286/2', -736168.4, -1050322.63, 50.03045, 14.5269957, 'B', '2020-11-20 12:30:11.942+01', 'unknown', 'P,0', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL),
|
|
101
|
+
('Háje', 55083, '286/3', -736250.9, -1050318.63, 50.0303841, 14.5258474, 'C', '2020-11-20 12:30:11.942+01', 'unknown', 'P', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL),
|
|
102
|
+
('Háje', 55083, '286/4', -736284.5, -1050316.5, 50.03036, 14.5253782, 'D', '2020-11-20 12:30:11.942+01', 'unknown', 'P,0', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL),
|
|
103
|
+
('Háje (ul. Opatovská)', 55083, '286/5', -736133.438, -1050346.13, 50.03028, 14.527523, 'E', '2020-11-20 12:30:11.942+01', 'unknown', 'P,0', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL),
|
|
104
|
+
('Háje', 55083, '286/13', -736250.9, -1050318.63, 50.0303841, 14.5258474, 'C', '2020-11-20 12:30:11.942+01', 'unknown', 'P', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL),
|
|
105
|
+
('Háje', 55083, '286/72', -736168.4, -1050322.63, 50.03045, 14.5269957, 'B', '2020-11-20 12:30:11.942+01', 'unknown', '0', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL),
|
|
106
|
+
('Háje', 55083, '286/101', -736215.063, -1050281.63, 50.0307579, 14.5262728, 'M1', '2020-11-20 12:30:11.942+01', 'possible', 'P', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL),
|
|
107
|
+
('Háje', 55083, '286/102', -736114.75, -1050289.25, 50.03081, 14.5276747, 'M2', '2020-11-20 12:30:11.942+01', 'possible', 'P', NULL, NULL, NULL, '2020-11-20 12:30:11.942+01', NULL);
|
|
113
108
|
|
|
114
109
|
-- <<<
|
|
115
110
|
|
|
@@ -117,14 +112,14 @@ INSERT INTO "ropidgtfs_cis_stops_actual" ("alt_idos_name", "cis", "id", "jtsk_x"
|
|
|
117
112
|
-- first origin, second with suffix _DATE in stop_id with changed attribute, i.e. stop_name
|
|
118
113
|
|
|
119
114
|
INSERT INTO "ropidgtfs_cis_stops_actual" ("alt_idos_name", "cis", "id", "jtsk_x", "jtsk_y", "lat", "lon", "platform", "created_at", "wheelchair_access", "zone", "create_batch_id", "created_by", "update_batch_id", "updated_at", "updated_by") VALUES
|
|
120
|
-
('Fučíkova',
|
|
121
|
-
('Fučíkova',
|
|
115
|
+
('Fučíkova', 27878, '115/101', -741166.3, -1040788.06, 50.1092949, 14.4397736, 'M1', '2020-11-26 12:30:18.675+01', 'possible', 'P', NULL, NULL, NULL, '2020-11-26 12:30:18.675+01', NULL),
|
|
116
|
+
('Fučíkova', 27878, '115/102', -741135.438, -1040877.69, 50.1085358, 14.4403725, 'M2', '2020-11-26 12:30:18.675+01', 'possible', 'P', NULL, NULL, NULL, '2020-11-26 12:30:18.675+01', NULL);
|
|
122
117
|
|
|
123
118
|
INSERT INTO "ropidgtfs_stops_actual" ("location_type", "parent_station", "platform_code", "stop_id", "stop_lat", "stop_lon", "stop_name", "stop_url", "wheelchair_boarding", "zone_id", "create_batch_id", "created_at", "created_by", "update_batch_id", "updated_at", "updated_by", "level_id", "stop_code", "stop_desc", "stop_timezone", "asw_node_id", "asw_stop_id") VALUES
|
|
124
|
-
(0,
|
|
125
|
-
(0,
|
|
126
|
-
(0,
|
|
127
|
-
(0,
|
|
119
|
+
(0, 'U115S1', '1', 'U115Z101P', 50.10896, 14.44016, 'Fučíkova', '', 1, 'P', -1, '2020-11-24 12:30:42.560064+01', 'integration-engine', NULL, NULL, NULL, 'U115L1', NULL, NULL, NULL, 115, 101),
|
|
120
|
+
(0, 'U115S1', '2', 'U115Z102P', 50.10892, 14.44002, 'Fučíkova', '', 1, 'P', -1, '2020-11-24 12:30:42.560064+01', 'integration-engine', NULL, NULL, NULL, 'U115L1', NULL, NULL, NULL, 115, 102),
|
|
121
|
+
(0, 'U115S1', '1', 'U115Z101P_900222', 50.10896, 14.44016, 'Nádraží Holešovice', '', 1, 'P', -1, '2020-11-24 12:30:42.560064+01', 'integration-engine', NULL, NULL, NULL, 'U115L1', NULL, NULL, NULL, 115, 101),
|
|
122
|
+
(0, 'U115S1', '2', 'U115Z102P_900222', 50.10892, 14.44002, 'Nádraží Holešovice', '', 1, 'P', -1, '2020-11-24 12:30:42.560064+01', 'integration-engine', NULL, NULL, NULL, 'U115L1', NULL, NULL, NULL, 115, 102);
|
|
128
123
|
|
|
129
124
|
-- <<<
|
|
130
125
|
|
|
@@ -558,11 +553,11 @@ VALUES
|
|
|
558
553
|
(E'L991',1,E'1111100-1',E'991_1_210419',3,NULL,E'2021-05-19 05:35:04.963+02',NULL,NULL,NULL,E'2021-05-19 05:35:04.963+02',NULL);
|
|
559
554
|
|
|
560
555
|
INSERT INTO ropidgtfs_trips_actual (trip_id,bikes_allowed,block_id,direction_id,exceptional,route_id,service_id,shape_id,trip_headsign,trip_operation_type,trip_short_name,wheelchair_accessible,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
561
|
-
|
|
556
|
+
('991_1_210419',1,NULL,0,0,'L991','0000001-1','L991V2','Nemocnice Motol',NULL,NULL,1,NULL,'2023-04-09 05:27:39.626',NULL,NULL,'2023-04-09 05:27:39.626',NULL);
|
|
562
557
|
|
|
563
558
|
INSERT INTO ropidgtfs_stop_times_actual (trip_id,stop_sequence,arrival_time,arrival_time_seconds,departure_time,departure_time_seconds,drop_off_type,pickup_type,shape_dist_traveled,stop_headsign,stop_id,timepoint,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
564
|
-
|
|
565
|
-
|
|
559
|
+
('991_1_210419',1,'22:45:10',NULL,'22:45:10',NULL,'0','0',0.0,NULL,'U476Z102P',NULL,NULL,'2023-04-09 05:27:39.626',NULL,NULL,'2023-04-09 05:27:39.626',NULL),
|
|
560
|
+
('991_1_210419',2,'22:46:20',NULL,'22:46:50',NULL,'0','0',0.80665,NULL,'U400Z102P',NULL,NULL,'2023-04-09 05:27:39.626',NULL,NULL,'2023-04-09 05:27:39.626',NULL);
|
|
566
561
|
|
|
567
562
|
-- <<<
|
|
568
563
|
|
|
@@ -4,35 +4,26 @@ update vehiclepositions_trips set gtfs_date = start_timestamp::DATE;
|
|
|
4
4
|
/* test data for night delay */
|
|
5
5
|
INSERT INTO vehiclepositions_trips
|
|
6
6
|
(cis_line_id, cis_trip_number, run_number, cis_line_short_name, created_at, gtfs_route_id, gtfs_route_short_name, gtfs_trip_id, id, updated_at, start_cis_stop_id, start_cis_stop_platform_code, start_time, start_timestamp, vehicle_type_id, wheelchair_accessible, create_batch_id, created_by, update_batch_id, updated_by, agency_name_scheduled, origin_route_name, agency_name_real, vehicle_registration_number, gtfs_trip_headsign, start_asw_stop_id, gtfs_route_type, gtfs_block_id, last_position_id, is_canceled, end_timestamp, gtfs_trip_short_name, last_position_context, internal_run_number, internal_route_name,gtfs_date)
|
|
7
|
-
VALUES(NULL, NULL, 65, NULL, '2023-03-21 00:00:15.399', 'L94', '94', '94_979_230320', '2023-03-21T01:30:00+01:00_94_979_230320_8388', '2023-03-21 02:44:25.833', NULL, NULL, '01:30:00', '2023-03-21T00:30:00.000Z', 6, false, NULL, NULL, NULL, NULL, 'DP PRAHA', '94', 'DP PRAHA', 8388, 'Sídliště Barrandov', NULL, 0, NULL, 554214346, NULL, '2023-03-21T01:40:00.000Z', NULL, NULL, 65, '94',current_date - interval '1 day')
|
|
8
|
-
(NULL, NULL, 65, NULL, '2023-03-21 00:00:15.565', 'L94', '94', '94_922_230320', '2023-03-21T01:30:00+01:00_94_922_230320_8229', '2023-03-21 02:44:26.122', NULL, NULL, '01:30:00', '2023-03-21T00:30:00.000Z', 6, false, NULL, NULL, NULL, NULL, 'DP PRAHA', '94', 'DP PRAHA', 8229, 'Sídliště Barrandov', NULL, 0, NULL, 554214347, NULL, '2023-03-21T01:40:00.000Z', NULL, NULL, 65, '94',current_date - interval '1 day');
|
|
7
|
+
VALUES(NULL, NULL, 65, NULL, '2023-03-21 00:00:15.399', 'L94', '94', '94_979_230320', '2023-03-21T01:30:00+01:00_94_979_230320_8388', '2023-03-21 02:44:25.833', NULL, NULL, '01:30:00', '2023-03-21T00:30:00.000Z', 6, false, NULL, NULL, NULL, NULL, 'DP PRAHA', '94', 'DP PRAHA', 8388, 'Sídliště Barrandov', NULL, 0, NULL, 554214346, NULL, '2023-03-21T01:40:00.000Z', NULL, NULL, 65, '94',current_date - interval '1 day');
|
|
9
8
|
|
|
10
9
|
INSERT INTO vehiclepositions_positions
|
|
11
10
|
(created_at, delay, delay_stop_arrival, delay_stop_departure, next_stop_id, shape_dist_traveled, is_canceled, lat, lng, origin_time, origin_timestamp, is_tracked, trips_id, create_batch_id, created_by, update_batch_id, updated_at, updated_by, 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, scheduled_timestamp)
|
|
12
|
-
VALUES('2023-03-21 02:44:25.787', 10, NULL, NULL, 'U1019Z2P', 22.263, NULL, 50.03141, 14.36749, '02:44:20', '2023-03-21T01:44:20.000Z', true, '2023-03-21T01:30:00+01:00_94_979_230320_8388', NULL, NULL, NULL, '2023-03-21 02:44:25.822', NULL, 554214346, 257, NULL, NULL, 'U1019Z2P', 8, 8, NULL, '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '10190002', 'processed', 'on_track', '10190002', NULL, 'V', NULL, 'Sídliště Barrandov', NULL, NULL, NULL, '2023-03-21T01:40:00.000Z')
|
|
13
|
-
('2023-03-21 02:44:26.135', 20, NULL, NULL, 'U1019Z1P', 22.263, NULL, 50.03141, 14.36749, '02:44:23', '2023-03-21T01:44:23.000Z', true, '2023-03-21T01:30:00+01:00_94_922_230320_8229', NULL, NULL, NULL, '2023-03-21 02:44:25.822', NULL, 554214347, 257, NULL, NULL, 'U1019Z1P', 8, 8, NULL, '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '10190001', 'processed', 'on_track', '10190001', NULL, 'V', NULL, 'Sídliště Barrandov', NULL, NULL, NULL, '2023-03-21T01:40:00.000Z');
|
|
11
|
+
VALUES('2023-03-21 02:44:25.787', 10, NULL, NULL, 'U1019Z2P', 22.263, NULL, 50.03141, 14.36749, '02:44:20', '2023-03-21T01:44:20.000Z', true, '2023-03-21T01:30:00+01:00_94_979_230320_8388', NULL, NULL, NULL, '2023-03-21 02:44:25.822', NULL, 554214346, 257, NULL, NULL, 'U1019Z2P', 8, 8, NULL, '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '2023-03-21T01:40:00.000Z', '10190002', 'processed', 'on_track', '10190002', NULL, 'V', NULL, 'Sídliště Barrandov', NULL, NULL, NULL, '2023-03-21T01:40:00.000Z');
|
|
14
12
|
|
|
15
13
|
WITH init_values AS (SELECT NOW()::DATE AS now_date)
|
|
16
14
|
INSERT INTO ropidgtfs_calendar_actual (end_date,friday,monday,saturday,service_id,start_date,sunday,thursday,tuesday,wednesday,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
17
|
-
|
|
18
|
-
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '7 days','YYYYMMDD'),1,1,1,'1111111-4',TO_CHAR((SELECT now_date FROM init_values)-INTERVAL '1 days','YYYYMMDD'),1,1,1,1,-1,'2022-10-24 10:18:51.362+02',NULL,-1,'2022-10-24 10:18:51.362+02',NULL);
|
|
15
|
+
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '7 days','YYYYMMDD'),1,1,1,'1111111-3',TO_CHAR((SELECT now_date FROM init_values)-INTERVAL '1 days','YYYYMMDD'),1,1,1,1,-1,'2022-10-24 10:18:51.362+02',NULL,-1,'2022-10-24 10:18:51.362+02',NULL);
|
|
19
16
|
|
|
20
17
|
INSERT INTO ropidgtfs_stops_actual
|
|
21
18
|
(location_type, parent_station, platform_code, stop_id, stop_lat, stop_lon, stop_name, stop_url, wheelchair_boarding, zone_id, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, level_id, stop_code, stop_desc, stop_timezone, asw_node_id, asw_stop_id)
|
|
22
|
-
VALUES(0, NULL, 'A', 'U873Z1P', 50.110622, 14.508335, 'Poštovská', NULL, 1, 'P', NULL, '2023-03-21 05:47:11.042', NULL, NULL, '2023-03-21 05:47:11.042', NULL, NULL, NULL, NULL, NULL, 873, 1)
|
|
23
|
-
(0, NULL, 'B', 'U873Z2P', 50.110620, 14.508330, 'Poštovská', NULL, 1, 'P', NULL, '2023-03-21 05:47:11.042', NULL, NULL, '2023-03-21 05:47:11.042', NULL, NULL, NULL, NULL, NULL, 873, 2),
|
|
24
|
-
(0, NULL, 'B', 'U1019Z2P', 50.0314636, 14.3677835, 'Sídliště Barrandov', NULL, 1, 'P', NULL, '2023-03-21 05:47:11.042', NULL, NULL, '2023-03-21 05:47:11.042', NULL, NULL, NULL, NULL, NULL, 1019, 2),
|
|
25
|
-
(0, NULL, 'A', 'U1019Z1P', 50.0315, 14.3684816, 'Sídliště Barrandov', NULL, 1, 'P', NULL, '2023-03-21 05:47:11.042', NULL, NULL, '2023-03-21 05:47:11.042', NULL, NULL, NULL, NULL, NULL, 1019, 2);
|
|
19
|
+
VALUES(0, NULL, 'A', 'U873Z1P', 50.110622, 14.508335, 'Poštovská', NULL, 1, 'P', NULL, '2023-03-21 05:47:11.042', NULL, NULL, '2023-03-21 05:47:11.042', NULL, NULL, NULL, NULL, NULL, 873, 1);
|
|
26
20
|
|
|
27
21
|
INSERT INTO ropidgtfs_stop_times_actual (arrival_time,arrival_time_seconds,departure_time,departure_time_seconds,drop_off_type,pickup_type,shape_dist_traveled,stop_headsign,stop_id,stop_sequence,timepoint,trip_id,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
28
|
-
|
|
29
|
-
('25:39:00',NULL,'25:39:00',NULL,'3','3',0.0,NULL,NULL,9,NULL,'94_979_230320',-1,'2022-10-24 10:21:13.104+02',NULL,-1,'2022-10-24 10:21:13.104+02',NULL)
|
|
30
|
-
('25:39:00',NULL,'25:39:00',NULL,'3','3',0.0,NULL,'U873Z2P',8,NULL,'94_922_230320',-1,'2022-10-24 10:21:13.104+02',NULL,-1,'2022-10-24 10:21:13.104+02',NULL),
|
|
31
|
-
('25:39:00',NULL,'25:39:00',NULL,'3','3',0.0,NULL,NULL,9,NULL,'94_922_230320',-1,'2022-10-24 10:21:13.104+02',NULL,-1,'2022-10-24 10:21:13.104+02',NULL);
|
|
22
|
+
('25:38:00',NULL,'25:38:00',NULL,'3','3',0.0,NULL,'U873Z1P',8,NULL,'94_979_230320',-1,'2022-10-24 10:21:13.104+02',NULL,-1,'2022-10-24 10:21:13.104+02',NULL),
|
|
23
|
+
('25:39:00',NULL,'25:39:00',NULL,'3','3',0.0,NULL,NULL,9,NULL,'94_979_230320',-1,'2022-10-24 10:21:13.104+02',NULL,-1,'2022-10-24 10:21:13.104+02',NULL);
|
|
32
24
|
|
|
33
25
|
INSERT INTO ropidgtfs_routes_actual (agency_id,is_night,is_regional,is_substitute_transport,route_color,route_desc,route_id,route_long_name,route_short_name,route_text_color,route_type,route_url,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
34
|
-
|
|
26
|
+
('99','0','0','0','00A562',NULL,'L94','Dummy','94','FFFFFF','1','',-1,'2022-10-24 10:18:51.722+02',NULL,-1,'2022-10-24 10:18:51.722+02',NULL);
|
|
35
27
|
|
|
36
28
|
INSERT INTO ropidgtfs_trips_actual (bikes_allowed,block_id,direction_id,exceptional,route_id,service_id,shape_id,trip_headsign,trip_id,trip_operation_type,trip_short_name,wheelchair_accessible,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
37
|
-
|
|
38
|
-
(1,NULL,1,0,'L94','1111111-4','L94VX','Sídliště Barrandov','94_922_230320',NULL,NULL,1,-1,'2022-10-24 10:22:47.459+02',NULL,-1,'2022-10-24 10:22:47.459+02',NULL);
|
|
29
|
+
(1,NULL,1,0,'L94','1111111-3','L94VX','Sídliště Barrandov','94_979_230320',NULL,NULL,1,-1,'2022-10-24 10:22:47.459+02',NULL,-1,'2022-10-24 10:22:47.459+02',NULL);
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
"stop_sequence": 1,
|
|
10
10
|
"arrival_time_seconds": 60780,
|
|
11
11
|
"departure_time_seconds": 60780,
|
|
12
|
-
"stop_icons": "Mb",
|
|
13
12
|
"stop": {
|
|
14
13
|
"stop_id": "U1040Z19P",
|
|
15
14
|
"stop_lat": 50.068737,
|
|
@@ -28,7 +27,6 @@
|
|
|
28
27
|
"stop_sequence": 2,
|
|
29
28
|
"arrival_time_seconds": 60900,
|
|
30
29
|
"departure_time_seconds": 60900,
|
|
31
|
-
"stop_icons": null,
|
|
32
30
|
"stop": {
|
|
33
31
|
"stop_id": "U638Z1P",
|
|
34
32
|
"stop_lat": 50.066711,
|
|
@@ -47,7 +45,6 @@
|
|
|
47
45
|
"stop_sequence": 3,
|
|
48
46
|
"arrival_time_seconds": 61020,
|
|
49
47
|
"departure_time_seconds": 61020,
|
|
50
|
-
"stop_icons": null,
|
|
51
48
|
"stop": {
|
|
52
49
|
"stop_id": "U835Z1P",
|
|
53
50
|
"stop_lat": 50.065201,
|
|
@@ -66,7 +63,6 @@
|
|
|
66
63
|
"stop_sequence": 4,
|
|
67
64
|
"arrival_time_seconds": 61140,
|
|
68
65
|
"departure_time_seconds": 61140,
|
|
69
|
-
"stop_icons": null,
|
|
70
66
|
"stop": {
|
|
71
67
|
"stop_id": "U363Z1P",
|
|
72
68
|
"stop_lat": 50.064968,
|
|
@@ -85,7 +81,6 @@
|
|
|
85
81
|
"stop_sequence": 5,
|
|
86
82
|
"arrival_time_seconds": 61200,
|
|
87
83
|
"departure_time_seconds": 61200,
|
|
88
|
-
"stop_icons": null,
|
|
89
84
|
"stop": {
|
|
90
85
|
"stop_id": "U815Z1P",
|
|
91
86
|
"stop_lat": 50.062717,
|
|
@@ -104,7 +99,6 @@
|
|
|
104
99
|
"stop_sequence": 6,
|
|
105
100
|
"arrival_time_seconds": 61260,
|
|
106
101
|
"departure_time_seconds": 61260,
|
|
107
|
-
"stop_icons": null,
|
|
108
102
|
"stop": {
|
|
109
103
|
"stop_id": "U116Z1P",
|
|
110
104
|
"stop_lat": 50.060677,
|
|
@@ -123,7 +117,6 @@
|
|
|
123
117
|
"stop_sequence": 7,
|
|
124
118
|
"arrival_time_seconds": 61320,
|
|
125
119
|
"departure_time_seconds": 61320,
|
|
126
|
-
"stop_icons": null,
|
|
127
120
|
"stop": {
|
|
128
121
|
"stop_id": "U396Z3P",
|
|
129
122
|
"stop_lat": 50.058533,
|
|
@@ -21,7 +21,6 @@ export declare class RopidGTFSStopTimesModel extends PostgresModel implements IM
|
|
|
21
21
|
protected validator: IValidator;
|
|
22
22
|
/** Type/Strategy of saving the data */
|
|
23
23
|
protected savingType: "insertOnly" | "insertOrUpdate";
|
|
24
|
-
private modelGTFSStops;
|
|
25
24
|
constructor();
|
|
26
25
|
findTripStops: (tripIds: string[]) => Promise<ITripStopsResult[]>;
|
|
27
26
|
}
|
|
@@ -12,7 +12,6 @@ const connectors_1 = require("@golemio/core/dist/integration-engine/connectors")
|
|
|
12
12
|
const golemio_errors_1 = require("@golemio/core/dist/shared/golemio-errors");
|
|
13
13
|
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
14
14
|
const sequelize_1 = __importDefault(require("@golemio/core/dist/shared/sequelize"));
|
|
15
|
-
const RopidGTFSStopsModel_1 = require("./RopidGTFSStopsModel");
|
|
16
15
|
class RopidGTFSStopTimesModel extends integration_engine_1.PostgresModel {
|
|
17
16
|
constructor() {
|
|
18
17
|
super(ropid_gtfs_1.RopidGTFS.stop_times.name + "Model", {
|
|
@@ -40,13 +39,6 @@ class RopidGTFSStopTimesModel extends integration_engine_1.PostgresModel {
|
|
|
40
39
|
throw new golemio_errors_1.GeneralError("Cannot find trip stops", this.name, err);
|
|
41
40
|
}
|
|
42
41
|
};
|
|
43
|
-
this.modelGTFSStops = new RopidGTFSStopsModel_1.RopidGTFSStopsModel();
|
|
44
|
-
this.sequelizeModel.hasOne(this.modelGTFSStops.sequelizeModel, {
|
|
45
|
-
as: "stop",
|
|
46
|
-
foreignKey: "stop_id",
|
|
47
|
-
sourceKey: "stop_id",
|
|
48
|
-
constraints: false,
|
|
49
|
-
});
|
|
50
42
|
}
|
|
51
43
|
}
|
|
52
44
|
exports.RopidGTFSStopTimesModel = RopidGTFSStopTimesModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,6EAAwE;AACxE,mFAA8F;AAC9F,oFAA4D;
|
|
1
|
+
{"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,6EAAwE;AACxE,mFAA8F;AAC9F,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,KAAK,EAAE,OAAiB,EAA+B,EAAE;YAC5E,MAAM,UAAU,GAAG,8BAAiB,CAAC,aAAa,EAAE,CAAC;YACrD,IAAI,CAAC;gBACD,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;YACN,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,IAAI,6BAAY,CAAC,wBAAwB,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACrE,CAAC;QACL,CAAC,CAAC;IAtBF,CAAC;CAuBJ;AA9CD,0DA8CC"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
|
|
2
|
-
import Sequelize from "@golemio/core/dist/shared/sequelize";
|
|
3
2
|
import { ITripWithShapesAndStopTimes } from "./interfaces/TripModelInterfaces";
|
|
4
3
|
export declare class RopidGTFSTripsModel extends PostgresModel implements IModel {
|
|
5
4
|
private modelGTFSShapes;
|
|
6
5
|
private modelGTFSStopTimes;
|
|
7
6
|
private modelGTFSStops;
|
|
8
|
-
get publicSequelizeModel(): Sequelize.ModelCtor<any>;
|
|
9
7
|
constructor();
|
|
10
8
|
findByIdForDelayComputation: (tripId: string) => Promise<ITripWithShapesAndStopTimes | null>;
|
|
11
9
|
}
|
|
@@ -14,9 +14,6 @@ const RopidGTFSShapesModel_1 = require("./RopidGTFSShapesModel");
|
|
|
14
14
|
const RopidGTFSStopsModel_1 = require("./RopidGTFSStopsModel");
|
|
15
15
|
const RopidGTFSStopTimesModel_1 = require("./RopidGTFSStopTimesModel");
|
|
16
16
|
class RopidGTFSTripsModel extends models_1.PostgresModel {
|
|
17
|
-
get publicSequelizeModel() {
|
|
18
|
-
return this.sequelizeModel;
|
|
19
|
-
}
|
|
20
17
|
constructor() {
|
|
21
18
|
super(ropid_gtfs_1.RopidGTFS.trips.name + "Model", {
|
|
22
19
|
outputSequelizeAttributes: ropid_gtfs_1.RopidGTFS.trips.outputSequelizeAttributes,
|
|
@@ -42,7 +39,6 @@ class RopidGTFSTripsModel extends models_1.PostgresModel {
|
|
|
42
39
|
sequelize_1.default.literal(`CASE when drop_off_type = '1' and pickup_type = '1' then true else false END`),
|
|
43
40
|
"is_no_stop_waypoint",
|
|
44
41
|
],
|
|
45
|
-
"stop_icons",
|
|
46
42
|
],
|
|
47
43
|
as: "stop_times",
|
|
48
44
|
model: this.modelGTFSStopTimes.sequelizeModel,
|
|
@@ -81,6 +77,12 @@ class RopidGTFSTripsModel extends models_1.PostgresModel {
|
|
|
81
77
|
sourceKey: "trip_id",
|
|
82
78
|
constraints: false,
|
|
83
79
|
});
|
|
80
|
+
this.modelGTFSStopTimes.sequelizeModel.hasOne(this.modelGTFSStops.sequelizeModel, {
|
|
81
|
+
as: "stop",
|
|
82
|
+
foreignKey: "stop_id",
|
|
83
|
+
sourceKey: "stop_id",
|
|
84
|
+
constraints: false,
|
|
85
|
+
});
|
|
84
86
|
this.sequelizeModel.hasMany(this.modelGTFSShapes.sequelizeModel, {
|
|
85
87
|
as: "shapes",
|
|
86
88
|
foreignKey: "shape_id",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidGTFSTripsModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSTripsModel.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAuC;AACvC,oEAA4C;AAC5C,gFAAyD;AACzD,yEAAqF;AACrF,mFAAkF;AAClF,oFAA4D;AAE5D,iEAA8D;AAC9D,+DAA4D;AAC5D,uEAAoE;AAEpE,MAAa,mBAAoB,SAAQ,sBAAa;IAKlD
|
|
1
|
+
{"version":3,"file":"RopidGTFSTripsModel.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGTFSTripsModel.ts"],"names":[],"mappings":";;;;;;AAAA,0DAAuC;AACvC,oEAA4C;AAC5C,gFAAyD;AACzD,yEAAqF;AACrF,mFAAkF;AAClF,oFAA4D;AAE5D,iEAA8D;AAC9D,+DAA4D;AAC5D,uEAAoE;AAEpE,MAAa,mBAAoB,SAAQ,sBAAa;IAKlD;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;QAyBC,gCAA2B,GAAG,KAAK,EAAE,MAAc,EAA+C,EAAE;YACvG,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBACrD,UAAU,EAAE,CAAC,UAAU,CAAC;gBACxB,OAAO,EAAE;oBACL;wBACI,UAAU,EAAE;4BACR,cAAc;4BACd,gBAAgB;4BAChB,qBAAqB;4BACrB,eAAe;4BACf,SAAS;4BACT,eAAe;4BACf,CAAC,mBAAS,CAAC,OAAO,CAAC,mDAAmD,CAAC,EAAE,sBAAsB,CAAC;4BAChG,CAAC,mBAAS,CAAC,OAAO,CAAC,qDAAqD,CAAC,EAAE,wBAAwB,CAAC;4BACpG;gCACI,mBAAS,CAAC,OAAO,CAAC,8EAA8E,CAAC;gCACjG,qBAAqB;6BACxB;yBACJ;wBACD,EAAE,EAAE,YAAY;wBAChB,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,cAAc;wBAC7C,OAAO,EAAE;4BACL;gCACI,UAAU,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,EAAE,qBAAqB,CAAC;gCAC9F,EAAE,EAAE,MAAM;gCACV,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,cAAc;gCACzC,QAAQ,EAAE,IAAI;6BACjB;yBACJ;qBACJ;oBACD;wBACI,EAAE,EAAE,QAAQ;wBACZ,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,cAAc;wBAC1C,UAAU,EAAE,CAAC,qBAAqB,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAE,mBAAmB,CAAC;qBACvG;iBACJ;gBACD,KAAK,EAAE;oBACH,CAAC,YAAY,EAAE,eAAe,EAAE,KAAK,CAAC;oBACtC,CAAC,QAAQ,EAAE,mBAAmB,EAAE,KAAK,CAAC;iBACzC;gBACD,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE;aAC7B,CAAC,CAAC;YAEH,IAAI,CAAC,cAAc,EAAE,CAAC;gBAClB,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC;QACnC,CAAC,CAAC;QAxEE,IAAI,CAAC,kBAAkB,GAAG,IAAI,iDAAuB,EAAE,CAAC;QACxD,IAAI,CAAC,cAAc,GAAG,IAAI,yCAAmB,EAAE,CAAC;QAChD,IAAI,CAAC,eAAe,GAAG,IAAI,2CAAoB,EAAE,CAAC;QAElD,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,EAAE;YAChE,EAAE,EAAE,YAAY;YAChB,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,SAAS;YACpB,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;QACH,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE;YAC9E,EAAE,EAAE,MAAM;YACV,UAAU,EAAE,SAAS;YACrB,SAAS,EAAE,SAAS;YACpB,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;QACH,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,cAAc,EAAE;YAC7D,EAAE,EAAE,QAAQ;YACZ,UAAU,EAAE,UAAU;YACtB,SAAS,EAAE,UAAU;YACrB,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;IACP,CAAC;CAmDJ;AAzFD,kDAyFC"}
|
|
@@ -11,7 +11,6 @@ export declare class RopidGtfsFacade {
|
|
|
11
11
|
private name;
|
|
12
12
|
/** Precomputed data repositories */
|
|
13
13
|
private minMaxStopSequencesRepository;
|
|
14
|
-
private tripConnectionsRepository;
|
|
15
14
|
private tripScheduleRepository;
|
|
16
15
|
private servicesCalendarRepository;
|
|
17
16
|
constructor(ropidGtfsRepository: RopidGtfsRepository, ropidGtfsMetadataRepository: RopidGtfsMetadataRepository, departureRepository: DeparturesRepository, databaseConnector: IDatabaseConnector);
|
|
@@ -115,13 +115,11 @@ let RopidGtfsFacade = class RopidGtfsFacade {
|
|
|
115
115
|
await this.ropidGtfsRepository.replaceAllTable([
|
|
116
116
|
this.servicesCalendarRepository["tableName"],
|
|
117
117
|
this.minMaxStopSequencesRepository["tableName"],
|
|
118
|
-
this.tripConnectionsRepository["tableName"],
|
|
119
118
|
this.tripScheduleRepository["tableName"],
|
|
120
119
|
], t);
|
|
121
120
|
await this.departureRepository.replaceByTmp(t);
|
|
122
121
|
};
|
|
123
122
|
this.minMaxStopSequencesRepository = new precomputed_1.MinMaxStopSequencesRepository();
|
|
124
|
-
this.tripConnectionsRepository = new precomputed_1.TripConnectionsRepository();
|
|
125
123
|
this.tripScheduleRepository = new precomputed_1.TripScheduleRepository();
|
|
126
124
|
this.servicesCalendarRepository = new precomputed_1.ServicesCalendarRepository();
|
|
127
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidGtfsFacade.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGtfsFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"RopidGtfsFacade.js","sourceRoot":"","sources":["../../../src/integration-engine/ropid-gtfs/RopidGtfsFacade.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,12 +70,7 @@ let DeparturesRepository = class DeparturesRepository extends models_1.PostgresM
|
|
|
70
70
|
t6.stop_id AS next_stop_id,
|
|
71
71
|
t7.stop_sequence AS last_stop_sequence,
|
|
72
72
|
t7.stop_id AS last_stop_id,
|
|
73
|
-
cis_stop.cis AS cis_stop_group_id
|
|
74
|
-
CASE
|
|
75
|
-
WHEN t.stop_headsign IS NOT NULL THEN t.headsign_icons
|
|
76
|
-
ELSE t2.headsign_icons
|
|
77
|
-
END AS trip_headsign_icons,
|
|
78
|
-
t8."connections" AS trip_connections
|
|
73
|
+
cis_stop.cis AS cis_stop_group_id
|
|
79
74
|
FROM ropidgtfs_stop_times${sourceTableSuffix} t
|
|
80
75
|
LEFT JOIN ropidgtfs_stops${sourceTableSuffix} t0 ON t.stop_id = t0.stop_id
|
|
81
76
|
LEFT JOIN ropidgtfs_trips${sourceTableSuffix} t2 ON t.trip_id = t2.trip_id
|
|
@@ -86,7 +81,6 @@ let DeparturesRepository = class DeparturesRepository extends models_1.PostgresM
|
|
|
86
81
|
LEFT JOIN ropidgtfs_stop_times${sourceTableSuffix} t6 ON t.trip_id = t6.trip_id AND t6.stop_sequence = t.stop_sequence + 1
|
|
87
82
|
LEFT JOIN ropidgtfs_stop_times${sourceTableSuffix} t7 ON t.trip_id = t7.trip_id AND t7.stop_sequence = t.stop_sequence - 1
|
|
88
83
|
LEFT JOIN ropidgtfs_cis_stops cis_stop on cis_stop.id = t0.computed_cis_stop_id
|
|
89
|
-
LEFT JOIN ropidgtfs_precomputed_trip_connections_tmp t8 ON t8.to_trip_id = t2.trip_id AND t8.to_stop_id = t.stop_id
|
|
90
84
|
${timeConstraintLiteral}`;
|
|
91
85
|
/* eslint-enable max-len */
|
|
92
86
|
try {
|
|
@@ -143,8 +137,6 @@ let DeparturesRepository = class DeparturesRepository extends models_1.PostgresM
|
|
|
143
137
|
"platform_code",
|
|
144
138
|
"trip_headsign",
|
|
145
139
|
"stop_headsign",
|
|
146
|
-
"trip_headsign_icons",
|
|
147
|
-
"trip_connections",
|
|
148
140
|
],
|
|
149
141
|
where: {
|
|
150
142
|
departure_datetime: {
|
package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,uEAA4D;AAG5D,gEAAuC;AACvC,8FAAqE;AAErE,wEAAqE;AAErE,yEAAqF;AACrF,6EAAwE;AACxE,mFAAkF;AAClF,mEAAiF;AACjF,iEAAwE;AACxE,+EAA4E;AAGrE,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,sBAAa;IACnD,YACoC,MAA6B,EACnC,MAAuB;QAEjD,KAAK,CACD,sBAAsB,EACtB;YACI,WAAW,EAAE,6BAAe,CAAC,UAAU;YACvC,QAAQ,EAAE,iBAAS;YACnB,yBAAyB,EAAE,6BAAe,CAAC,cAAc;YACzD,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;YACtD,UAAU,EAAE,YAAY;SAC3B,EACD,IAAI,uCAAmB,CAAC,sBAAsB,EAAE,6BAAe,CAAC,UAAU,CAAC,CAC9E,CAAC;QAbsC,WAAM,GAAN,MAAM,CAAe;QAC3B,WAAM,GAAN,MAAM,CAAS;QAe9C,sBAAiB,GAAG,KAAK,EAAE,iBAAwC,EAAiB,EAAE;YACzF,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;YACpE,MAAM,qBAAqB,GACvB,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,4EAA4E,CAAC,CAAC,CAAC,EAAE,CAAC;YAE3G,4BAA4B;YAC5B,MAAM,GAAG,GAAG
|
|
1
|
+
{"version":3,"file":"DeparturesRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,5 +18,4 @@ __exportStar(require("./TripScheduleRepository"), exports);
|
|
|
18
18
|
__exportStar(require("./ServicesCalendarRepository"), exports);
|
|
19
19
|
__exportStar(require("./MinMaxStopSequencesRepository"), exports);
|
|
20
20
|
__exportStar(require("./DeparturesRepository"), exports);
|
|
21
|
-
__exportStar(require("./TripConnectionsRepository"), exports);
|
|
22
21
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,+DAA6C;AAC7C,kEAAgD;AAChD,yDAAuC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,+DAA6C;AAC7C,kEAAgD;AAChD,yDAAuC"}
|
|
@@ -10,9 +10,4 @@ export interface IPublicDepartureDto {
|
|
|
10
10
|
platform_code: string | null;
|
|
11
11
|
trip_headsign: string;
|
|
12
12
|
stop_headsign: string | null;
|
|
13
|
-
trip_headsign_icons?: string | null;
|
|
14
|
-
trip_connections?: Array<{
|
|
15
|
-
from_trip_id: string;
|
|
16
|
-
max_wait_sec: number;
|
|
17
|
-
}> | null;
|
|
18
13
|
}
|
package/dist/integration-engine/ropid-gtfs/transformations/PublicDepartureCacheTransformation.js
CHANGED
|
@@ -24,11 +24,6 @@ let PublicDepartureCacheTransformation = class PublicDepartureCacheTransformatio
|
|
|
24
24
|
stop_sequence: inputDto.stop_sequence,
|
|
25
25
|
platform_code: inputDto.platform_code,
|
|
26
26
|
trip_headsign: inputDto.stop_headsign ?? inputDto.trip_headsign,
|
|
27
|
-
// TODO: One day, when we resolve issues around ajv's handling of undefined/null type unions,
|
|
28
|
-
// refactor this to only include the property if it's non-nullish, to save Valkey memory
|
|
29
|
-
// (see <https://golemiocz.slack.com/archives/C03H9T45QTA/p1767640758044149>).
|
|
30
|
-
trip_headsign_icons: inputDto.trip_headsign_icons ?? null,
|
|
31
|
-
connections: inputDto.trip_connections ?? null,
|
|
32
27
|
};
|
|
33
28
|
return outputDto;
|
|
34
29
|
};
|
package/dist/integration-engine/ropid-gtfs/transformations/PublicDepartureCacheTransformation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicDepartureCacheTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/transformations/PublicDepartureCacheTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,6GAA0G;AAC1G,iEAAgE;AAIzD,IAAM,kCAAkC,GAAxC,MAAM,kCAAmC,SAAQ,+CAGvD;IAHM;;QAII,SAAI,GAAG,oCAAoC,CAAC;QAEzC,sBAAiB,GAAG,CAAC,QAA6B,EAAE,EAAE;YAC5D,MAAM,SAAS,GAAiC;gBAC5C,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,WAAW,EAAE;gBAC7D,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB,EAAE,WAAW,EAAE,IAAI,IAAI;gBAClE,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;gBAC3C,UAAU,EAAE,QAAQ,CAAC,UAAU;gBAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,aAAa,EAAE,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa;
|
|
1
|
+
{"version":3,"file":"PublicDepartureCacheTransformation.js","sourceRoot":"","sources":["../../../../src/integration-engine/ropid-gtfs/transformations/PublicDepartureCacheTransformation.ts"],"names":[],"mappings":";;;;;;;;;AACA,6GAA0G;AAC1G,iEAAgE;AAIzD,IAAM,kCAAkC,GAAxC,MAAM,kCAAmC,SAAQ,+CAGvD;IAHM;;QAII,SAAI,GAAG,oCAAoC,CAAC;QAEzC,sBAAiB,GAAG,CAAC,QAA6B,EAAE,EAAE;YAC5D,MAAM,SAAS,GAAiC;gBAC5C,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,WAAW,EAAE;gBAC7D,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB,EAAE,WAAW,EAAE,IAAI,IAAI;gBAClE,gBAAgB,EAAE,QAAQ,CAAC,gBAAgB;gBAC3C,UAAU,EAAE,QAAQ,CAAC,UAAU;gBAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,aAAa,EAAE,QAAQ,CAAC,aAAa;gBACrC,aAAa,EAAE,QAAQ,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa;aAClE,CAAC;YAEF,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AArBY,gFAAkC;6CAAlC,kCAAkC;IAD9C,IAAA,qBAAU,GAAE;GACA,kCAAkC,CAqB9C"}
|
|
@@ -9,7 +9,6 @@ export declare class PrecomputedTablesFacade {
|
|
|
9
9
|
/** Precomputed data repositories */
|
|
10
10
|
private minMaxStopSequencesRepository;
|
|
11
11
|
private tripScheduleRepository;
|
|
12
|
-
private tripConnectionsRepository;
|
|
13
12
|
private servicesCalendarRepository;
|
|
14
13
|
constructor(logger: ILogger, ropidGtfsRepository: RopidGtfsRepository, departureRepository: DeparturesRepository);
|
|
15
14
|
createAndPopulatePrecomputedTmpTables: (sourceTableSuffix: SourceTableSuffixEnum) => Promise<void>;
|