@golemio/pid 5.4.2-dev.2271726153 → 5.4.2-dev.2274112976
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 +1 -0
- package/db/example/03_ropidgtfs_dump.sql +40 -38
- package/db/example/14_nightDelays.sql +17 -8
- package/db/migrations/postgresql/20260119180905-add-precomputed-trip-connections.js +53 -0
- package/db/migrations/postgresql/sqls/20260119180905-add-precomputed-trip-connections-down.sql +72 -0
- package/db/migrations/postgresql/sqls/20260119180905-add-precomputed-trip-connections-up.sql +91 -0
- package/dist/integration-engine/ropid-gtfs/RopidGtfsFacade.d.ts +1 -0
- package/dist/integration-engine/ropid-gtfs/RopidGtfsFacade.js +2 -0
- package/dist/integration-engine/ropid-gtfs/RopidGtfsFacade.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js +3 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/DeparturesRepository.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.d.ts +6 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.js +46 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.js.map +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.d.ts +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.js +1 -0
- package/dist/integration-engine/ropid-gtfs/data-access/precomputed/index.js.map +1 -1
- package/dist/integration-engine/ropid-gtfs/interfaces/IPublicDepartureDto.d.ts +4 -0
- package/dist/integration-engine/ropid-gtfs/transformations/PublicDepartureCacheTransformation.js +1 -0
- 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 +1 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/PrecomputedTablesFacade.js +4 -0
- package/dist/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/PrecomputedTablesFacade.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.d.ts +32 -0
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js +34 -0
- package/dist/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.js.map +1 -1
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.d.ts +1 -0
- package/dist/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.js +13 -0
- 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 +6 -0
- package/dist/schema-definitions/ropid-gtfs/redis/interfaces/IPublicGtfsDepartureCacheDto.d.ts +4 -0
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/PublicGtfsDepartureDtoSchema.js +20 -0
- package/dist/schema-definitions/ropid-gtfs/redis/schemas/PublicGtfsDepartureDtoSchema.js.map +1 -1
- package/package.json +1 -1
|
@@ -38,6 +38,7 @@ 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",
|
|
41
42
|
"ropid_departures_presets_ropidgtfs_stops";
|
|
42
43
|
|
|
43
44
|
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,43 +68,45 @@ 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
|
-
|
|
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.000+01',NULL),
|
|
72
|
+
('U458Z9P','U458Z301',NULL,NULL,'2'::ropidgtfs_transfer_type,180,0,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL),
|
|
73
|
+
('U651Z2P','U651Z5P','93_1656_251110','903_101_251112','1'::ropidgtfs_transfer_type,NULL,600,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL),
|
|
74
|
+
('U97Z1P','U97Z2P','109_1121_241216','163_1154_260101','1'::ropidgtfs_transfer_type,NULL,120,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL),
|
|
75
|
+
('U97Z1P','U97Z2P','109_241_251004','163_1154_260101','1'::ropidgtfs_transfer_type,NULL,120,NULL,'2026-01-19 14:26:06.000+01',NULL,NULL,'2026-01-19 14:26:06.000+01',NULL),
|
|
76
|
+
('U28Z1P','U28Z1P','221_2169_260112','163_1154_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),
|
|
77
|
+
('U873Z1P','U873Z2P','94_979_230320','94_922_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),
|
|
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
|
+
('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);
|
|
78
80
|
|
|
79
81
|
WITH init_values AS (SELECT NOW()::DATE AS now_date)
|
|
80
82
|
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)
|
|
81
|
-
VALUES (TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '2 days','YYYYMMDD'),
|
|
82
|
-
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '14 days','YYYYMMDD'),
|
|
83
|
+
VALUES (TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '2 days','YYYYMMDD'), 2, '1111111-1', NULL, NULL, NULL, NULL, NULL, NULL),
|
|
84
|
+
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '14 days','YYYYMMDD'), 1, '1111111-1', NULL, NULL, NULL, NULL, NULL, NULL);
|
|
83
85
|
|
|
84
86
|
|
|
85
87
|
-- >>> FOR STOPS ASW & CIS PARAMS TESTS
|
|
86
88
|
|
|
87
89
|
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
|
|
88
|
-
(0,
|
|
89
|
-
(0,
|
|
90
|
-
(0,
|
|
91
|
-
(0,
|
|
92
|
-
(0,
|
|
93
|
-
(0,
|
|
94
|
-
(0,
|
|
95
|
-
(0,
|
|
96
|
-
(0,
|
|
90
|
+
(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),
|
|
91
|
+
(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),
|
|
92
|
+
(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),
|
|
93
|
+
(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),
|
|
94
|
+
(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),
|
|
95
|
+
(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),
|
|
96
|
+
(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),
|
|
97
|
+
(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),
|
|
98
|
+
(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);
|
|
97
99
|
|
|
98
100
|
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
|
|
99
|
-
('Háje (ul. Opatovská)',
|
|
100
|
-
('Háje',
|
|
101
|
-
('Háje',
|
|
102
|
-
('Háje',
|
|
103
|
-
('Háje (ul. Opatovská)',
|
|
104
|
-
('Háje',
|
|
105
|
-
('Háje',
|
|
106
|
-
('Háje',
|
|
107
|
-
('Háje',
|
|
101
|
+
('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),
|
|
102
|
+
('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),
|
|
103
|
+
('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),
|
|
104
|
+
('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),
|
|
105
|
+
('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),
|
|
106
|
+
('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),
|
|
107
|
+
('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),
|
|
108
|
+
('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),
|
|
109
|
+
('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);
|
|
108
110
|
|
|
109
111
|
-- <<<
|
|
110
112
|
|
|
@@ -112,14 +114,14 @@ INSERT INTO "ropidgtfs_cis_stops_actual" ("alt_idos_name", "cis", "id", "jtsk_x"
|
|
|
112
114
|
-- first origin, second with suffix _DATE in stop_id with changed attribute, i.e. stop_name
|
|
113
115
|
|
|
114
116
|
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
|
|
115
|
-
('Fučíkova',
|
|
116
|
-
('Fučíkova',
|
|
117
|
+
('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),
|
|
118
|
+
('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);
|
|
117
119
|
|
|
118
120
|
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
|
|
119
|
-
(0,
|
|
120
|
-
(0,
|
|
121
|
-
(0,
|
|
122
|
-
(0,
|
|
121
|
+
(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),
|
|
122
|
+
(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),
|
|
123
|
+
(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),
|
|
124
|
+
(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);
|
|
123
125
|
|
|
124
126
|
-- <<<
|
|
125
127
|
|
|
@@ -553,11 +555,11 @@ VALUES
|
|
|
553
555
|
(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);
|
|
554
556
|
|
|
555
557
|
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
|
|
556
|
-
|
|
558
|
+
('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);
|
|
557
559
|
|
|
558
560
|
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
|
|
559
|
-
|
|
560
|
-
|
|
561
|
+
('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),
|
|
562
|
+
('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);
|
|
561
563
|
|
|
562
564
|
-- <<<
|
|
563
565
|
|
|
@@ -4,26 +4,35 @@ 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')
|
|
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');
|
|
8
9
|
|
|
9
10
|
INSERT INTO vehiclepositions_positions
|
|
10
11
|
(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)
|
|
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')
|
|
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');
|
|
12
14
|
|
|
13
15
|
WITH init_values AS (SELECT NOW()::DATE AS now_date)
|
|
14
16
|
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
|
|
15
|
-
|
|
17
|
+
(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),
|
|
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);
|
|
16
19
|
|
|
17
20
|
INSERT INTO ropidgtfs_stops_actual
|
|
18
21
|
(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)
|
|
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)
|
|
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);
|
|
20
26
|
|
|
21
27
|
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
|
|
22
|
-
|
|
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)
|
|
28
|
+
('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),
|
|
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);
|
|
24
32
|
|
|
25
33
|
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
|
|
26
|
-
|
|
34
|
+
('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);
|
|
27
35
|
|
|
28
36
|
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
|
|
29
|
-
|
|
37
|
+
(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),
|
|
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);
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var dbm;
|
|
4
|
+
var type;
|
|
5
|
+
var seed;
|
|
6
|
+
var fs = require('fs');
|
|
7
|
+
var path = require('path');
|
|
8
|
+
var Promise;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* We receive the dbmigrate dependency from dbmigrate initially.
|
|
12
|
+
* This enables us to not have to rely on NODE_PATH.
|
|
13
|
+
*/
|
|
14
|
+
exports.setup = function(options, seedLink) {
|
|
15
|
+
dbm = options.dbmigrate;
|
|
16
|
+
type = dbm.dataType;
|
|
17
|
+
seed = seedLink;
|
|
18
|
+
Promise = options.Promise;
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
exports.up = function(db) {
|
|
22
|
+
var filePath = path.join(__dirname, 'sqls', '20260119180905-add-precomputed-trip-connections-up.sql');
|
|
23
|
+
return new Promise( function( resolve, reject ) {
|
|
24
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
25
|
+
if (err) return reject(err);
|
|
26
|
+
console.log('received data: ' + data);
|
|
27
|
+
|
|
28
|
+
resolve(data);
|
|
29
|
+
});
|
|
30
|
+
})
|
|
31
|
+
.then(function(data) {
|
|
32
|
+
return db.runSql(data);
|
|
33
|
+
});
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
exports.down = function(db) {
|
|
37
|
+
var filePath = path.join(__dirname, 'sqls', '20260119180905-add-precomputed-trip-connections-down.sql');
|
|
38
|
+
return new Promise( function( resolve, reject ) {
|
|
39
|
+
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
|
|
40
|
+
if (err) return reject(err);
|
|
41
|
+
console.log('received data: ' + data);
|
|
42
|
+
|
|
43
|
+
resolve(data);
|
|
44
|
+
});
|
|
45
|
+
})
|
|
46
|
+
.then(function(data) {
|
|
47
|
+
return db.runSql(data);
|
|
48
|
+
});
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
exports._meta = {
|
|
52
|
+
"version": 1
|
|
53
|
+
};
|
package/db/migrations/postgresql/sqls/20260119180905-add-precomputed-trip-connections-down.sql
ADDED
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
ALTER TABLE ropidgtfs_precomputed_departures DROP COLUMN trip_connections;
|
|
2
|
+
|
|
3
|
+
-- Update procedures for working with tmp tables
|
|
4
|
+
|
|
5
|
+
CREATE OR REPLACE PROCEDURE ropidgtfs_cleanoldtables()
|
|
6
|
+
LANGUAGE plpgsql
|
|
7
|
+
SET search_path from CURRENT
|
|
8
|
+
AS $procedure$
|
|
9
|
+
begin
|
|
10
|
+
drop table if exists "ropidgtfs_agency_old";
|
|
11
|
+
drop table if exists "ropidgtfs_calendar_old";
|
|
12
|
+
drop table if exists "ropidgtfs_calendar_dates_old";
|
|
13
|
+
drop table if exists "ropidgtfs_shapes_old";
|
|
14
|
+
drop table if exists "ropidgtfs_stop_times_old";
|
|
15
|
+
drop table if exists "ropidgtfs_stops_old";
|
|
16
|
+
drop table if exists "ropidgtfs_routes_old";
|
|
17
|
+
drop table if exists "ropidgtfs_route_sub_agencies_old";
|
|
18
|
+
drop table if exists "ropidgtfs_transfers_old";
|
|
19
|
+
drop table if exists "ropidgtfs_trips_old";
|
|
20
|
+
drop table if exists "ropidgtfs_cis_stops_old";
|
|
21
|
+
drop table if exists "ropidgtfs_cis_stop_groups_old";
|
|
22
|
+
drop table if exists "ropidgtfs_run_numbers_old";
|
|
23
|
+
drop table if exists "ropidgtfs_ois_old";
|
|
24
|
+
drop table if exists "ropidgtfs_precomputed_services_calendar_old";
|
|
25
|
+
drop table if exists "ropidgtfs_precomputed_minmax_stop_sequences_old";
|
|
26
|
+
drop table if exists "ropidgtfs_precomputed_trip_schedule_old";
|
|
27
|
+
end
|
|
28
|
+
$procedure$
|
|
29
|
+
;
|
|
30
|
+
|
|
31
|
+
CREATE OR REPLACE PROCEDURE ropidgtfs_cleantmptables()
|
|
32
|
+
LANGUAGE plpgsql
|
|
33
|
+
SET search_path from CURRENT
|
|
34
|
+
AS $procedure$
|
|
35
|
+
begin
|
|
36
|
+
drop table if exists "ropidgtfs_agency_tmp";
|
|
37
|
+
drop table if exists "ropidgtfs_calendar_tmp";
|
|
38
|
+
drop table if exists "ropidgtfs_calendar_dates_tmp";
|
|
39
|
+
drop table if exists "ropidgtfs_shapes_tmp";
|
|
40
|
+
drop table if exists "ropidgtfs_stop_times_tmp";
|
|
41
|
+
drop table if exists "ropidgtfs_stops_tmp";
|
|
42
|
+
drop table if exists "ropidgtfs_routes_tmp";
|
|
43
|
+
drop table if exists "ropidgtfs_route_sub_agencies_tmp";
|
|
44
|
+
drop table if exists "ropidgtfs_transfers_tmp";
|
|
45
|
+
drop table if exists "ropidgtfs_trips_tmp";
|
|
46
|
+
drop table if exists "ropidgtfs_cis_stops_tmp";
|
|
47
|
+
drop table if exists "ropidgtfs_cis_stop_groups_tmp";
|
|
48
|
+
drop table if exists "ropidgtfs_run_numbers_tmp";
|
|
49
|
+
drop table if exists "ropidgtfs_ois_tmp";
|
|
50
|
+
drop table if exists "ropidgtfs_precomputed_services_calendar_tmp";
|
|
51
|
+
drop table if exists "ropidgtfs_precomputed_minmax_stop_sequences_tmp";
|
|
52
|
+
drop table if exists "ropidgtfs_precomputed_trip_schedule_tmp";
|
|
53
|
+
end
|
|
54
|
+
$procedure$
|
|
55
|
+
;
|
|
56
|
+
|
|
57
|
+
CREATE OR REPLACE PROCEDURE ropidgtfs_preparePrecomputedTmpTables()
|
|
58
|
+
LANGUAGE plpgsql
|
|
59
|
+
SET search_path FROM CURRENT
|
|
60
|
+
AS $procedure$
|
|
61
|
+
begin
|
|
62
|
+
create table "ropidgtfs_precomputed_services_calendar_tmp" (like "ropidgtfs_precomputed_services_calendar" including all);
|
|
63
|
+
create table "ropidgtfs_precomputed_minmax_stop_sequences_tmp" (like "ropidgtfs_precomputed_minmax_stop_sequences" including all);
|
|
64
|
+
create table "ropidgtfs_precomputed_trip_schedule_tmp" (like "ropidgtfs_precomputed_trip_schedule" including all);
|
|
65
|
+
end
|
|
66
|
+
$procedure$;
|
|
67
|
+
|
|
68
|
+
-- Drop created tables (along with their constraints and indexes)
|
|
69
|
+
|
|
70
|
+
DROP TABLE IF EXISTS ropidgtfs_precomputed_trip_connections_actual;
|
|
71
|
+
DROP TABLE IF EXISTS ropidgtfs_precomputed_trip_connections_tmp;
|
|
72
|
+
DROP TABLE IF EXISTS ropidgtfs_precomputed_trip_connections;
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
ALTER TABLE ropidgtfs_precomputed_departures ADD COLUMN trip_connections JSONB NULL;
|
|
2
|
+
|
|
3
|
+
-- Create parent table for precomputed trip connection at one stop with indexes
|
|
4
|
+
|
|
5
|
+
CREATE TABLE ropidgtfs_precomputed_trip_connections (
|
|
6
|
+
to_stop_id varchar(255) NOT NULL,
|
|
7
|
+
to_trip_id varchar(255) NOT NULL,
|
|
8
|
+
connections jsonb NOT NULL,
|
|
9
|
+
CONSTRAINT ropidgtfs_precomputed_trip_connections_pk PRIMARY KEY (to_stop_id, to_trip_id)
|
|
10
|
+
);
|
|
11
|
+
|
|
12
|
+
CREATE INDEX ropidgtfs_precomputed_trip_connections_to_stop_id_idx ON ropidgtfs_precomputed_trip_connections USING btree (to_stop_id);
|
|
13
|
+
CREATE INDEX ropidgtfs_precomputed_trip_connections_to_trip_id_idx ON ropidgtfs_precomputed_trip_connections USING btree (to_trip_id);
|
|
14
|
+
|
|
15
|
+
-- Create child (actual) table for precomputed stop/trip connections
|
|
16
|
+
|
|
17
|
+
CREATE TABLE ropidgtfs_precomputed_trip_connections_actual (
|
|
18
|
+
LIKE ropidgtfs_precomputed_trip_connections INCLUDING ALL
|
|
19
|
+
) INHERITS (ropidgtfs_precomputed_trip_connections);
|
|
20
|
+
|
|
21
|
+
-- Update procedures for working with tmp tables
|
|
22
|
+
|
|
23
|
+
CREATE OR REPLACE PROCEDURE ropidgtfs_preparePrecomputedTmpTables()
|
|
24
|
+
LANGUAGE plpgsql
|
|
25
|
+
SET search_path FROM CURRENT
|
|
26
|
+
AS $procedure$
|
|
27
|
+
begin
|
|
28
|
+
create table "ropidgtfs_precomputed_services_calendar_tmp" (like "ropidgtfs_precomputed_services_calendar" including all);
|
|
29
|
+
create table "ropidgtfs_precomputed_minmax_stop_sequences_tmp" (like "ropidgtfs_precomputed_minmax_stop_sequences" including all);
|
|
30
|
+
create table "ropidgtfs_precomputed_trip_schedule_tmp" (like "ropidgtfs_precomputed_trip_schedule" including all);
|
|
31
|
+
create table "ropidgtfs_precomputed_trip_connections_tmp" (like "ropidgtfs_precomputed_trip_connections" including all);
|
|
32
|
+
end
|
|
33
|
+
$procedure$;
|
|
34
|
+
|
|
35
|
+
-- Update procedures for working with old tables
|
|
36
|
+
|
|
37
|
+
CREATE OR REPLACE PROCEDURE ropidgtfs_cleanoldtables()
|
|
38
|
+
LANGUAGE plpgsql
|
|
39
|
+
SET search_path from CURRENT
|
|
40
|
+
AS $procedure$
|
|
41
|
+
begin
|
|
42
|
+
drop table if exists "ropidgtfs_agency_old";
|
|
43
|
+
drop table if exists "ropidgtfs_calendar_old";
|
|
44
|
+
drop table if exists "ropidgtfs_calendar_dates_old";
|
|
45
|
+
drop table if exists "ropidgtfs_shapes_old";
|
|
46
|
+
drop table if exists "ropidgtfs_stop_times_old";
|
|
47
|
+
drop table if exists "ropidgtfs_stops_old";
|
|
48
|
+
drop table if exists "ropidgtfs_routes_old";
|
|
49
|
+
drop table if exists "ropidgtfs_route_sub_agencies_old";
|
|
50
|
+
drop table if exists "ropidgtfs_transfers_old";
|
|
51
|
+
drop table if exists "ropidgtfs_trips_old";
|
|
52
|
+
drop table if exists "ropidgtfs_cis_stops_old";
|
|
53
|
+
drop table if exists "ropidgtfs_cis_stop_groups_old";
|
|
54
|
+
drop table if exists "ropidgtfs_run_numbers_old";
|
|
55
|
+
drop table if exists "ropidgtfs_ois_old";
|
|
56
|
+
drop table if exists "ropidgtfs_precomputed_services_calendar_old";
|
|
57
|
+
drop table if exists "ropidgtfs_precomputed_minmax_stop_sequences_old";
|
|
58
|
+
drop table if exists "ropidgtfs_precomputed_trip_connections_old";
|
|
59
|
+
drop table if exists "ropidgtfs_precomputed_trip_schedule_old";
|
|
60
|
+
end
|
|
61
|
+
$procedure$
|
|
62
|
+
;
|
|
63
|
+
|
|
64
|
+
-- Update procedures for working with tmp tables
|
|
65
|
+
|
|
66
|
+
CREATE OR REPLACE PROCEDURE ropidgtfs_cleantmptables()
|
|
67
|
+
LANGUAGE plpgsql
|
|
68
|
+
SET search_path from CURRENT
|
|
69
|
+
AS $procedure$
|
|
70
|
+
begin
|
|
71
|
+
drop table if exists "ropidgtfs_agency_tmp";
|
|
72
|
+
drop table if exists "ropidgtfs_calendar_tmp";
|
|
73
|
+
drop table if exists "ropidgtfs_calendar_dates_tmp";
|
|
74
|
+
drop table if exists "ropidgtfs_shapes_tmp";
|
|
75
|
+
drop table if exists "ropidgtfs_stop_times_tmp";
|
|
76
|
+
drop table if exists "ropidgtfs_stops_tmp";
|
|
77
|
+
drop table if exists "ropidgtfs_routes_tmp";
|
|
78
|
+
drop table if exists "ropidgtfs_route_sub_agencies_tmp";
|
|
79
|
+
drop table if exists "ropidgtfs_transfers_tmp";
|
|
80
|
+
drop table if exists "ropidgtfs_trips_tmp";
|
|
81
|
+
drop table if exists "ropidgtfs_cis_stops_tmp";
|
|
82
|
+
drop table if exists "ropidgtfs_cis_stop_groups_tmp";
|
|
83
|
+
drop table if exists "ropidgtfs_run_numbers_tmp";
|
|
84
|
+
drop table if exists "ropidgtfs_ois_tmp";
|
|
85
|
+
drop table if exists "ropidgtfs_precomputed_services_calendar_tmp";
|
|
86
|
+
drop table if exists "ropidgtfs_precomputed_minmax_stop_sequences_tmp";
|
|
87
|
+
drop table if exists "ropidgtfs_precomputed_trip_connections_tmp";
|
|
88
|
+
drop table if exists "ropidgtfs_precomputed_trip_schedule_tmp";
|
|
89
|
+
end
|
|
90
|
+
$procedure$
|
|
91
|
+
;
|
|
@@ -11,6 +11,7 @@ export declare class RopidGtfsFacade {
|
|
|
11
11
|
private name;
|
|
12
12
|
/** Precomputed data repositories */
|
|
13
13
|
private minMaxStopSequencesRepository;
|
|
14
|
+
private tripConnectionsRepository;
|
|
14
15
|
private tripScheduleRepository;
|
|
15
16
|
private servicesCalendarRepository;
|
|
16
17
|
constructor(ropidGtfsRepository: RopidGtfsRepository, ropidGtfsMetadataRepository: RopidGtfsMetadataRepository, departureRepository: DeparturesRepository, databaseConnector: IDatabaseConnector);
|
|
@@ -115,11 +115,13 @@ let RopidGtfsFacade = class RopidGtfsFacade {
|
|
|
115
115
|
await this.ropidGtfsRepository.replaceAllTable([
|
|
116
116
|
this.servicesCalendarRepository["tableName"],
|
|
117
117
|
this.minMaxStopSequencesRepository["tableName"],
|
|
118
|
+
this.tripConnectionsRepository["tableName"],
|
|
118
119
|
this.tripScheduleRepository["tableName"],
|
|
119
120
|
], t);
|
|
120
121
|
await this.departureRepository.replaceByTmp(t);
|
|
121
122
|
};
|
|
122
123
|
this.minMaxStopSequencesRepository = new precomputed_1.MinMaxStopSequencesRepository();
|
|
124
|
+
this.tripConnectionsRepository = new precomputed_1.TripConnectionsRepository();
|
|
123
125
|
this.tripScheduleRepository = new precomputed_1.TripScheduleRepository();
|
|
124
126
|
this.servicesCalendarRepository = new precomputed_1.ServicesCalendarRepository();
|
|
125
127
|
}
|
|
@@ -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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"}
|
|
@@ -74,7 +74,8 @@ let DeparturesRepository = class DeparturesRepository extends models_1.PostgresM
|
|
|
74
74
|
CASE
|
|
75
75
|
WHEN t.stop_headsign IS NOT NULL THEN t.headsign_icons
|
|
76
76
|
ELSE t2.headsign_icons
|
|
77
|
-
END AS trip_headsign_icons
|
|
77
|
+
END AS trip_headsign_icons,
|
|
78
|
+
t8."connections" AS trip_connections
|
|
78
79
|
FROM ropidgtfs_stop_times${sourceTableSuffix} t
|
|
79
80
|
LEFT JOIN ropidgtfs_stops${sourceTableSuffix} t0 ON t.stop_id = t0.stop_id
|
|
80
81
|
LEFT JOIN ropidgtfs_trips${sourceTableSuffix} t2 ON t.trip_id = t2.trip_id
|
|
@@ -85,6 +86,7 @@ let DeparturesRepository = class DeparturesRepository extends models_1.PostgresM
|
|
|
85
86
|
LEFT JOIN ropidgtfs_stop_times${sourceTableSuffix} t6 ON t.trip_id = t6.trip_id AND t6.stop_sequence = t.stop_sequence + 1
|
|
86
87
|
LEFT JOIN ropidgtfs_stop_times${sourceTableSuffix} t7 ON t.trip_id = t7.trip_id AND t7.stop_sequence = t.stop_sequence - 1
|
|
87
88
|
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
|
|
88
90
|
${timeConstraintLiteral}`;
|
|
89
91
|
/* eslint-enable max-len */
|
|
90
92
|
try {
|
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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"}
|
package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.d.ts
ADDED
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { IModel, PostgresModel } from "@golemio/core/dist/integration-engine/models";
|
|
2
|
+
import { SourceTableSuffixEnum } from "../../helpers/SourceTableSuffixEnum";
|
|
3
|
+
export declare class TripConnectionsRepository extends PostgresModel implements IModel {
|
|
4
|
+
constructor();
|
|
5
|
+
populate: (sourceTableSuffix: SourceTableSuffixEnum) => Promise<void>;
|
|
6
|
+
}
|
package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.js
ADDED
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.TripConnectionsRepository = void 0;
|
|
4
|
+
const const_1 = require("../../../../schema-definitions/const");
|
|
5
|
+
const ropid_gtfs_1 = require("../../../../schema-definitions/ropid-gtfs");
|
|
6
|
+
const helpers_1 = require("@golemio/core/dist/integration-engine/helpers");
|
|
7
|
+
const models_1 = require("@golemio/core/dist/integration-engine/models");
|
|
8
|
+
const golemio_validator_1 = require("@golemio/core/dist/shared/golemio-validator");
|
|
9
|
+
const SourceTableSuffixEnum_1 = require("../../helpers/SourceTableSuffixEnum");
|
|
10
|
+
class TripConnectionsRepository extends models_1.PostgresModel {
|
|
11
|
+
constructor() {
|
|
12
|
+
super("TripConnectionsRepository", {
|
|
13
|
+
outputSequelizeAttributes: ropid_gtfs_1.RopidGTFS.tripConnections.outputSequelizeAttributes,
|
|
14
|
+
pgTableName: ropid_gtfs_1.RopidGTFS.tripConnections.pgTableName,
|
|
15
|
+
pgSchema: const_1.PG_SCHEMA,
|
|
16
|
+
savingType: "insertOnly",
|
|
17
|
+
attributesToRemove: ["id", "created_at", "updated_at"],
|
|
18
|
+
}, new golemio_validator_1.JSONSchemaValidator("TripConnectionsRepositoryValidator", ropid_gtfs_1.RopidGTFS.tripConnections.outputJsonSchema));
|
|
19
|
+
this.populate = async (sourceTableSuffix) => {
|
|
20
|
+
const sql = `
|
|
21
|
+
SELECT
|
|
22
|
+
to_stop_id,
|
|
23
|
+
to_trip_id,
|
|
24
|
+
JSONB_AGG(
|
|
25
|
+
JSON_BUILD_OBJECT(
|
|
26
|
+
'from_trip_id', from_trip_id,
|
|
27
|
+
'max_wait_sec', max_waiting_time
|
|
28
|
+
)
|
|
29
|
+
) AS "connections"
|
|
30
|
+
FROM "${const_1.PG_SCHEMA}".ropidgtfs_transfers${sourceTableSuffix}
|
|
31
|
+
WHERE "transfer_type" = '1'
|
|
32
|
+
GROUP BY "to_stop_id", "to_trip_id"
|
|
33
|
+
`;
|
|
34
|
+
try {
|
|
35
|
+
const tmpTable = ropid_gtfs_1.RopidGTFS.tripConnections.pgTableName + SourceTableSuffixEnum_1.SourceTableSuffixEnum.Tmp;
|
|
36
|
+
await this.sequelizeModel.sequelize.query(`INSERT INTO "${const_1.PG_SCHEMA}"."${tmpTable}" ${sql};`);
|
|
37
|
+
}
|
|
38
|
+
catch (err) {
|
|
39
|
+
helpers_1.log.error(err);
|
|
40
|
+
throw err;
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
exports.TripConnectionsRepository = TripConnectionsRepository;
|
|
46
|
+
//# sourceMappingURL=TripConnectionsRepository.js.map
|
package/dist/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TripConnectionsRepository.js","sourceRoot":"","sources":["../../../../../src/integration-engine/ropid-gtfs/data-access/precomputed/TripConnectionsRepository.ts"],"names":[],"mappings":";;;AAAA,gEAAuC;AACvC,0EAA4C;AAC5C,2EAAoE;AACpE,yEAAqF;AACrF,mFAAkF;AAClF,+EAA4E;AAE5E,MAAa,yBAA0B,SAAQ,sBAAa;IACxD;QACI,KAAK,CACD,2BAA2B,EAC3B;YACI,yBAAyB,EAAE,sBAAS,CAAC,eAAe,CAAC,yBAAyB;YAC9E,WAAW,EAAE,sBAAS,CAAC,eAAe,CAAC,WAAW;YAClD,QAAQ,EAAE,iBAAS;YACnB,UAAU,EAAE,YAAY;YACxB,kBAAkB,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,YAAY,CAAC;SACzD,EACD,IAAI,uCAAmB,CAAC,oCAAoC,EAAE,sBAAS,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAC5G,CAAC;QAGC,aAAQ,GAAG,KAAK,EAAE,iBAAwC,EAAiB,EAAE;YAChF,MAAM,GAAG,GAAG;;;;;;;;;;oBAUA,iBAAS,wBAAwB,iBAAiB;;;SAG7D,CAAC;YAEF,IAAI,CAAC;gBACD,MAAM,QAAQ,GAAG,sBAAS,CAAC,eAAe,CAAC,WAAW,GAAG,6CAAqB,CAAC,GAAG,CAAC;gBAEnF,MAAM,IAAI,CAAC,cAAc,CAAC,SAAU,CAAC,KAAK,CAAC,gBAAgB,iBAAS,MAAM,QAAQ,KAAK,GAAG,GAAG,CAAC,CAAC;YACnG,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACf,MAAM,GAAG,CAAC;YACd,CAAC;QACL,CAAC,CAAC;IA1BF,CAAC;CA2BJ;AAxCD,8DAwCC"}
|
|
@@ -18,4 +18,5 @@ __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);
|
|
21
22
|
//# 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;AACvC,8DAA4C"}
|
package/dist/integration-engine/ropid-gtfs/transformations/PublicDepartureCacheTransformation.js
CHANGED
|
@@ -28,6 +28,7 @@ let PublicDepartureCacheTransformation = class PublicDepartureCacheTransformatio
|
|
|
28
28
|
// refactor this to only include the property if it's non-nullish, to save Valkey memory
|
|
29
29
|
// (see <https://golemiocz.slack.com/archives/C03H9T45QTA/p1767640758044149>).
|
|
30
30
|
trip_headsign_icons: inputDto.trip_headsign_icons ?? null,
|
|
31
|
+
connections: inputDto.connections ?? null,
|
|
31
32
|
};
|
|
32
33
|
return outputDto;
|
|
33
34
|
};
|
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;gBAC/D,6FAA6F;gBAC7F,wFAAwF;gBACxF,8EAA8E;gBAC9E,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB,IAAI,IAAI;
|
|
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;gBAC/D,6FAA6F;gBAC7F,wFAAwF;gBACxF,8EAA8E;gBAC9E,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB,IAAI,IAAI;gBACzD,WAAW,EAAE,QAAQ,CAAC,WAAW,IAAI,IAAI;aAC5C,CAAC;YAEF,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC;IACN,CAAC;CAAA,CAAA;AA1BY,gFAAkC;6CAAlC,kCAAkC;IAD9C,IAAA,qBAAU,GAAE;GACA,kCAAkC,CA0B9C"}
|
|
@@ -9,6 +9,7 @@ export declare class PrecomputedTablesFacade {
|
|
|
9
9
|
/** Precomputed data repositories */
|
|
10
10
|
private minMaxStopSequencesRepository;
|
|
11
11
|
private tripScheduleRepository;
|
|
12
|
+
private tripConnectionsRepository;
|
|
12
13
|
private servicesCalendarRepository;
|
|
13
14
|
constructor(logger: ILogger, ropidGtfsRepository: RopidGtfsRepository, departureRepository: DeparturesRepository);
|
|
14
15
|
createAndPopulatePrecomputedTmpTables: (sourceTableSuffix: SourceTableSuffixEnum) => Promise<void>;
|
|
@@ -16,6 +16,7 @@ exports.PrecomputedTablesFacade = void 0;
|
|
|
16
16
|
const RopidGtfsRepository_1 = require("../../../../data-access/RopidGtfsRepository");
|
|
17
17
|
const DeparturesRepository_1 = require("../../../../data-access/precomputed/DeparturesRepository");
|
|
18
18
|
const MinMaxStopSequencesRepository_1 = require("../../../../data-access/precomputed/MinMaxStopSequencesRepository");
|
|
19
|
+
const TripConnectionsRepository_1 = require("../../../../data-access/precomputed/TripConnectionsRepository");
|
|
19
20
|
const ServicesCalendarRepository_1 = require("../../../../data-access/precomputed/ServicesCalendarRepository");
|
|
20
21
|
const TripScheduleRepository_1 = require("../../../../data-access/precomputed/TripScheduleRepository");
|
|
21
22
|
const SourceTableSuffixEnum_1 = require("../../../../helpers/SourceTableSuffixEnum");
|
|
@@ -35,6 +36,8 @@ let PrecomputedTablesFacade = class PrecomputedTablesFacade {
|
|
|
35
36
|
await this.minMaxStopSequencesRepository.populate(sourceTableSuffix);
|
|
36
37
|
this.logger.info(`Datasets: populating temp table ${this.tripScheduleRepository["tableName"]}${SourceTableSuffixEnum_1.SourceTableSuffixEnum.Tmp}`);
|
|
37
38
|
await this.tripScheduleRepository.populate(sourceTableSuffix);
|
|
39
|
+
this.logger.info(`Datasets: populating temp table ${this.tripConnectionsRepository["tableName"]}${SourceTableSuffixEnum_1.SourceTableSuffixEnum.Tmp}`);
|
|
40
|
+
await this.tripConnectionsRepository.populate(sourceTableSuffix);
|
|
38
41
|
this.logger.info(`Datasets: populating temp table ${this.departureRepository["tableName"]}${SourceTableSuffixEnum_1.SourceTableSuffixEnum.Tmp}`);
|
|
39
42
|
await this.departureRepository.createAndPopulate(sourceTableSuffix);
|
|
40
43
|
this.logger.info(`Datasets: running analyze on ${this.departureRepository["tableName"]}${SourceTableSuffixEnum_1.SourceTableSuffixEnum.Tmp}`);
|
|
@@ -42,6 +45,7 @@ let PrecomputedTablesFacade = class PrecomputedTablesFacade {
|
|
|
42
45
|
};
|
|
43
46
|
/** Precomputed data repositories */
|
|
44
47
|
this.minMaxStopSequencesRepository = new MinMaxStopSequencesRepository_1.MinMaxStopSequencesRepository();
|
|
48
|
+
this.tripConnectionsRepository = new TripConnectionsRepository_1.TripConnectionsRepository();
|
|
45
49
|
this.tripScheduleRepository = new TripScheduleRepository_1.TripScheduleRepository();
|
|
46
50
|
this.servicesCalendarRepository = new ServicesCalendarRepository_1.ServicesCalendarRepository();
|
|
47
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PrecomputedTablesFacade.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/PrecomputedTablesFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qFAAqF;AACrF,mGAAmG;AACnG,qHAAqH;AACrH,+GAA+G;AAC/G,uGAAuG;AACvG,qFAAqF;AACrF,qFAAqF;AACrF,wEAAqE;AAErE,iEAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;
|
|
1
|
+
{"version":3,"file":"PrecomputedTablesFacade.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/ropid-gtfs/workers/timetables/tasks/helpers/PrecomputedTablesFacade.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qFAAqF;AACrF,mGAAmG;AACnG,qHAAqH;AACrH,6GAA6G;AAC7G,+GAA+G;AAC/G,uGAAuG;AACvG,qFAAqF;AACrF,qFAAqF;AACrF,wEAAqE;AAErE,iEAAwE;AAGjE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAOhC,YAC8B,MAAgC,EACL,mBAAyD,EACzD,mBAA0D;QAFpE,WAAM,GAAN,MAAM,CAAS;QACY,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,wBAAmB,GAAnB,mBAAmB,CAAsB;QAS5G,0CAAqC,GAAG,KAAK,EAAE,iBAAwC,EAAiB,EAAE;YAC7G,MAAM,IAAI,CAAC,mBAAmB,CAAC,0BAA0B,EAAE,CAAC;YAE5D,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,mCAAmC,IAAI,CAAC,0BAA0B,CAAC,WAAW,CAAC,GAAG,6CAAqB,CAAC,GAAG,EAAE,CAChH,CAAC;YACF,MAAM,IAAI,CAAC,0BAA0B,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAElE,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,mCAAmC,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,GAAG,6CAAqB,CAAC,GAAG,EAAE,CACnH,CAAC;YACF,MAAM,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAErE,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,mCAAmC,IAAI,CAAC,sBAAsB,CAAC,WAAW,CAAC,GAAG,6CAAqB,CAAC,GAAG,EAAE,CAC5G,CAAC;YACF,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAE9D,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,mCAAmC,IAAI,CAAC,yBAAyB,CAAC,WAAW,CAAC,GAAG,6CAAqB,CAAC,GAAG,EAAE,CAC/G,CAAC;YACF,MAAM,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;YAEjE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,GAAG,6CAAqB,CAAC,GAAG,EAAE,CAAC,CAAC;YACzH,MAAM,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;YAEpE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,GAAG,6CAAqB,CAAC,GAAG,EAAE,CAAC,CAAC;YACvH,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;QAC7C,CAAC,CAAC;QAnCE,oCAAoC;QACpC,IAAI,CAAC,6BAA6B,GAAG,IAAI,6DAA6B,EAAE,CAAC;QACzE,IAAI,CAAC,yBAAyB,GAAG,IAAI,qDAAyB,EAAE,CAAC;QACjE,IAAI,CAAC,sBAAsB,GAAG,IAAI,+CAAsB,EAAE,CAAC;QAC3D,IAAI,CAAC,0BAA0B,GAAG,IAAI,uDAA0B,EAAE,CAAC;IACvE,CAAC;CA+BJ,CAAA;AAhDY,0DAAuB;kCAAvB,uBAAuB;IADnC,IAAA,qBAAU,GAAE;IASJ,WAAA,IAAA,iBAAM,EAAC,qBAAS,CAAC,MAAM,CAAC,CAAA;IACxB,WAAA,IAAA,iBAAM,EAAC,iDAAuB,CAAC,mBAAmB,CAAC,CAAA;IACnD,WAAA,IAAA,iBAAM,EAAC,iDAAuB,CAAC,mBAAmB,CAAC,CAAA;6CADuC,yCAAmB;QACnB,2CAAoB;GAV1G,uBAAuB,CAgDnC"}
|
|
@@ -132,4 +132,36 @@ export declare const RopidGTFSPrecomputed: {
|
|
|
132
132
|
outputSequelizeAttributes: ModelAttributes<any, any>;
|
|
133
133
|
pgTableName: string;
|
|
134
134
|
};
|
|
135
|
+
tripConnections: {
|
|
136
|
+
outputJsonSchema: {
|
|
137
|
+
type: string;
|
|
138
|
+
properties: {
|
|
139
|
+
to_stop_id: {
|
|
140
|
+
type: string;
|
|
141
|
+
};
|
|
142
|
+
to_trip_id: {
|
|
143
|
+
type: string;
|
|
144
|
+
};
|
|
145
|
+
connections: {
|
|
146
|
+
type: string;
|
|
147
|
+
items: {
|
|
148
|
+
type: string;
|
|
149
|
+
properties: {
|
|
150
|
+
from_trip_id: {
|
|
151
|
+
type: string;
|
|
152
|
+
};
|
|
153
|
+
max_wait_sec: {
|
|
154
|
+
type: string;
|
|
155
|
+
};
|
|
156
|
+
};
|
|
157
|
+
additionalProperties: boolean;
|
|
158
|
+
required: string[];
|
|
159
|
+
};
|
|
160
|
+
};
|
|
161
|
+
};
|
|
162
|
+
required: string[];
|
|
163
|
+
};
|
|
164
|
+
outputSequelizeAttributes: ModelAttributes<any, any>;
|
|
165
|
+
pgTableName: string;
|
|
166
|
+
};
|
|
135
167
|
};
|
|
@@ -171,6 +171,35 @@ const outputTripScheduleJsonSchema = {
|
|
|
171
171
|
},
|
|
172
172
|
required: ["route_type"],
|
|
173
173
|
};
|
|
174
|
+
const outputTripConnectionsSDMA = {
|
|
175
|
+
to_stop_id: sequelize_1.DataTypes.STRING(255),
|
|
176
|
+
to_trip_id: sequelize_1.DataTypes.STRING(255),
|
|
177
|
+
connections: sequelize_1.DataTypes.JSONB,
|
|
178
|
+
};
|
|
179
|
+
const outputTripConnectionsJsonSchema = {
|
|
180
|
+
type: "object",
|
|
181
|
+
properties: {
|
|
182
|
+
to_stop_id: {
|
|
183
|
+
type: "string",
|
|
184
|
+
},
|
|
185
|
+
to_trip_id: {
|
|
186
|
+
type: "string",
|
|
187
|
+
},
|
|
188
|
+
connections: {
|
|
189
|
+
type: "array",
|
|
190
|
+
items: {
|
|
191
|
+
type: "object",
|
|
192
|
+
properties: {
|
|
193
|
+
from_trip_id: { type: "string" },
|
|
194
|
+
max_wait_sec: { type: "number" },
|
|
195
|
+
},
|
|
196
|
+
additionalProperties: false,
|
|
197
|
+
required: ["from_trip_id", "max_wait_sec"],
|
|
198
|
+
},
|
|
199
|
+
},
|
|
200
|
+
},
|
|
201
|
+
required: ["to_stop_id", "to_trip_id", "connections"],
|
|
202
|
+
};
|
|
174
203
|
exports.RopidGTFSPrecomputed = {
|
|
175
204
|
servicesCalendar: {
|
|
176
205
|
outputJsonSchema: outputServicesCalendarJsonSchema,
|
|
@@ -187,5 +216,10 @@ exports.RopidGTFSPrecomputed = {
|
|
|
187
216
|
outputSequelizeAttributes: outputTripScheduleSDMA,
|
|
188
217
|
pgTableName: "ropidgtfs_precomputed_trip_schedule",
|
|
189
218
|
},
|
|
219
|
+
tripConnections: {
|
|
220
|
+
outputJsonSchema: outputTripConnectionsJsonSchema,
|
|
221
|
+
outputSequelizeAttributes: outputTripConnectionsSDMA,
|
|
222
|
+
pgTableName: "ropidgtfs_precomputed_trip_connections",
|
|
223
|
+
},
|
|
190
224
|
};
|
|
191
225
|
//# sourceMappingURL=RopidGTFSPrecomputed.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"RopidGTFSPrecomputed.js","sourceRoot":"","sources":["../../../src/schema-definitions/ropid-gtfs/RopidGTFSPrecomputed.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,6 +36,7 @@ export declare class DeparturesModel extends Model<DeparturesModel> implements I
|
|
|
36
36
|
last_stop_id: string | null;
|
|
37
37
|
cis_stop_group_id: number | null;
|
|
38
38
|
trip_headsign_icons: string | null;
|
|
39
|
+
trip_connections: IDeparturesModel["trip_connections"];
|
|
39
40
|
static attributeModel: ModelAttributes<DeparturesModel>;
|
|
40
41
|
static jsonSchema: JSONSchemaType<IDeparturesModel>;
|
|
41
42
|
}
|
|
@@ -56,6 +56,7 @@ DeparturesModel.attributeModel = {
|
|
|
56
56
|
last_stop_id: sequelize_1.DataTypes.STRING(30),
|
|
57
57
|
cis_stop_group_id: sequelize_1.DataTypes.INTEGER,
|
|
58
58
|
trip_headsign_icons: sequelize_1.DataTypes.TEXT,
|
|
59
|
+
trip_connections: sequelize_1.DataTypes.JSONB,
|
|
59
60
|
};
|
|
60
61
|
DeparturesModel.jsonSchema = {
|
|
61
62
|
type: "object",
|
|
@@ -158,6 +159,18 @@ DeparturesModel.jsonSchema = {
|
|
|
158
159
|
trip_headsign_icons: {
|
|
159
160
|
type: "string",
|
|
160
161
|
},
|
|
162
|
+
trip_connections: {
|
|
163
|
+
type: "array",
|
|
164
|
+
items: {
|
|
165
|
+
type: "object",
|
|
166
|
+
properties: {
|
|
167
|
+
from_trip_id: { type: "string" },
|
|
168
|
+
max_wait_sec: { type: "number" },
|
|
169
|
+
},
|
|
170
|
+
additionalProperties: false,
|
|
171
|
+
required: ["from_trip_id", "max_wait_sec"],
|
|
172
|
+
},
|
|
173
|
+
},
|
|
161
174
|
},
|
|
162
175
|
required: ["stop_sequence", "stop_id", "trip_id", "trip_headsign"],
|
|
163
176
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeparturesModel.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.ts"],"names":[],"mappings":";;;AACA,mEAAwF;AACxF,uEAA+D;AAG/D,MAAa,eAAgB,SAAQ,iBAAsB;;AAA3D,
|
|
1
|
+
{"version":3,"file":"DeparturesModel.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/models/precomputed/DeparturesModel.ts"],"names":[],"mappings":"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"}
|
package/dist/schema-definitions/ropid-gtfs/models/precomputed/interfaces/IDeparturesModel.d.ts
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { GtfsStopWheelchairBoardingEnum, GtfsTripWheelchairAccessEnum } from "../../../../../helpers/AccessibilityEnums";
|
|
2
2
|
import { GTFSRouteTypeEnum } from "../../../../../helpers/RouteTypeEnums";
|
|
3
|
+
export interface ITripConnection {
|
|
4
|
+
from_trip_id: string;
|
|
5
|
+
max_wait_sec: number;
|
|
6
|
+
}
|
|
3
7
|
export interface IDeparturesModel {
|
|
4
8
|
stop_sequence: number;
|
|
5
9
|
stop_headsign: string | null;
|
|
@@ -32,4 +36,6 @@ export interface IDeparturesModel {
|
|
|
32
36
|
last_stop_sequence: number | null;
|
|
33
37
|
last_stop_id: string | null;
|
|
34
38
|
cis_stop_group_id: number | null;
|
|
39
|
+
trip_headsign_icons: string | null;
|
|
40
|
+
trip_connections: ITripConnection[] | null;
|
|
35
41
|
}
|
|
@@ -62,6 +62,26 @@ const publicGtfsDepartureDtoSchema = {
|
|
|
62
62
|
},
|
|
63
63
|
],
|
|
64
64
|
},
|
|
65
|
+
connections: {
|
|
66
|
+
oneOf: [
|
|
67
|
+
{
|
|
68
|
+
type: "array",
|
|
69
|
+
items: {
|
|
70
|
+
type: "object",
|
|
71
|
+
properties: {
|
|
72
|
+
from_trip_id: { type: "string" },
|
|
73
|
+
max_wait_sec: { type: "number" },
|
|
74
|
+
},
|
|
75
|
+
additionalProperties: false,
|
|
76
|
+
required: ["from_trip_id", "max_wait_sec"],
|
|
77
|
+
},
|
|
78
|
+
},
|
|
79
|
+
{
|
|
80
|
+
type: "null",
|
|
81
|
+
nullable: true,
|
|
82
|
+
},
|
|
83
|
+
],
|
|
84
|
+
},
|
|
65
85
|
},
|
|
66
86
|
required: [
|
|
67
87
|
"stop_id",
|
package/dist/schema-definitions/ropid-gtfs/redis/schemas/PublicGtfsDepartureDtoSchema.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PublicGtfsDepartureDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/redis/schemas/PublicGtfsDepartureDtoSchema.ts"],"names":[],"mappings":";;;AAGA,MAAM,4BAA4B,GAAmD;IACjF,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,wBAAwB;IAC/B,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;aACjB;YACD,kBAAkB,EAAE;gBAChB,IAAI,EAAE,QAAQ;aACjB;YACD,gBAAgB,EAAE;gBACd,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;aACjB;YACD,UAAU,EAAE;gBACR,IAAI,EAAE,QAAQ;aACjB;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;aACjB;YACD,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;aACjB;YACD,aAAa,EAAE;gBACX,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;aACjB;YACD,mBAAmB,EAAE;gBACjB,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;SACJ;QACD,QAAQ,EAAE;YACN,SAAS;YACT,oBAAoB;YACpB,kBAAkB;YAClB,kBAAkB;YAClB,YAAY;YACZ,SAAS;YACT,eAAe;YACf,eAAe;YACf,eAAe;SAClB;KACJ;CACJ,CAAC;AACuC,oEAA4B"}
|
|
1
|
+
{"version":3,"file":"PublicGtfsDepartureDtoSchema.js","sourceRoot":"","sources":["../../../../../src/schema-definitions/ropid-gtfs/redis/schemas/PublicGtfsDepartureDtoSchema.ts"],"names":[],"mappings":";;;AAGA,MAAM,4BAA4B,GAAmD;IACjF,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,wBAAwB;IAC/B,IAAI,EAAE,OAAO;IACb,KAAK,EAAE;QACH,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;aACjB;YACD,kBAAkB,EAAE;gBAChB,IAAI,EAAE,QAAQ;aACjB;YACD,gBAAgB,EAAE;gBACd,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,gBAAgB,EAAE;gBACd,IAAI,EAAE,QAAQ;aACjB;YACD,UAAU,EAAE;gBACR,IAAI,EAAE,QAAQ;aACjB;YACD,OAAO,EAAE;gBACL,IAAI,EAAE,QAAQ;aACjB;YACD,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;aACjB;YACD,aAAa,EAAE;gBACX,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,aAAa,EAAE;gBACX,IAAI,EAAE,QAAQ;aACjB;YACD,mBAAmB,EAAE;gBACjB,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,QAAQ;qBACjB;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;YACD,WAAW,EAAE;gBACT,KAAK,EAAE;oBACH;wBACI,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE;4BACH,IAAI,EAAE,QAAQ;4BACd,UAAU,EAAE;gCACR,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;gCAChC,YAAY,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;6BACnC;4BACD,oBAAoB,EAAE,KAAK;4BAC3B,QAAQ,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;yBAC7C;qBACJ;oBACD;wBACI,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAI;qBACjB;iBACJ;aACJ;SACJ;QACD,QAAQ,EAAE;YACN,SAAS;YACT,oBAAoB;YACpB,kBAAkB;YAClB,kBAAkB;YAClB,YAAY;YACZ,SAAS;YACT,eAAe;YACf,eAAe;YACf,eAAe;SAClB;KACJ;CACJ,CAAC;AACuC,oEAA4B"}
|