@golemio/pid 2.3.3-dev.685860908 → 2.3.3-dev.687350098
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/12_metro_line_A_gtfs_trips.sql +15 -16
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsIdGenerator.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsIdGenerator.js +1 -1
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsMapper.js +1 -1
- package/dist/integration-engine/vehicle-positions/models/helpers/VPTripsMapper.js.map +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/interfaces/IMetroRunInputForProcessing.d.ts +1 -1
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/transformations/MetroRunsMessageProcessingTransformation.js +4 -4
- package/dist/integration-engine/vehicle-positions/workers/runs/tasks/transformations/MetroRunsMessageProcessingTransformation.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
WITH init_values AS (SELECT NOW()::DATE AS now_date)
|
|
2
2
|
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
|
|
3
|
-
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '7 days','YYYYMMDD'),1,1,
|
|
4
|
-
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '7 days','YYYYMMDD'),1,1,0,'1111100-2',TO_CHAR((SELECT now_date FROM init_values)-INTERVAL '1 days','YYYYMMDD'),0,1,1,1,-1,'2022-10-24 10:18:51.362+02',NULL,-1,'2022-10-24 10:18:51.362+02',NULL);
|
|
3
|
+
(TO_CHAR((SELECT now_date FROM init_values)+INTERVAL '7 days','YYYYMMDD'),1,1,1,'1111111-2',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);
|
|
5
4
|
|
|
6
5
|
INSERT INTO ropidgtfs_stops_actual (level_id,location_type,parent_station,platform_code,stop_code,stop_desc,stop_id,stop_lat,stop_lon,stop_name,stop_timezone,stop_url,wheelchair_boarding,zone_id,asw_node_id,asw_stop_id,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
7
6
|
('U157L2',0,'U157S1','1',NULL,NULL,'U157Z101P',50.09831,14.36283,'Bořislavka',NULL,NULL,1,'P',157,101,-1,'2022-10-24 10:21:10.47+02',NULL,-1,'2022-10-24 10:21:10.47+02',NULL),
|
|
@@ -84,18 +83,18 @@ INSERT INTO ropidgtfs_routes_actual (agency_id,is_night,is_regional,is_substitut
|
|
|
84
83
|
ON CONFLICT DO NOTHING;
|
|
85
84
|
|
|
86
85
|
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
|
|
87
|
-
(1,NULL,1,0,'L991','
|
|
88
|
-
(1,NULL,0,0,'L991','
|
|
89
|
-
(1,NULL,1,0,'L991','
|
|
90
|
-
(1,NULL,0,0,'L991','
|
|
86
|
+
(1,NULL,1,0,'L991','1111111-2','L991V7','Skalka','991_294_220901',NULL,NULL,1,-1,'2022-10-24 10:22:47.459+02',NULL,-1,'2022-10-24 10:22:47.459+02',NULL),
|
|
87
|
+
(1,NULL,0,0,'L991','1111111-1','L991V8','Nemocnice Motol','991_77_220901',NULL,NULL,1,-1,'2022-10-24 10:22:47.459+02',NULL,-1,'2022-10-24 10:22:47.459+02',NULL),
|
|
88
|
+
(1,NULL,1,0,'L991','1111111-1','L991V6','Skalka','991_78_220321',NULL,NULL,1,-1,'2022-10-24 10:22:47.459+02',NULL,-1,'2022-10-24 10:22:47.459+02',NULL),
|
|
89
|
+
(1,NULL,0,0,'L991','1111111-2','L991V1','Nemocnice Motol','991_124_201230',NULL,NULL,1,-1,'2022-10-24 10:22:47.459+02',NULL,-1,'2022-10-24 10:22:47.459+02',NULL);
|
|
91
90
|
|
|
92
91
|
INSERT INTO ropidgtfs_run_numbers_actual (route_id,run_number,service_id,trip_id,vehicle_type,create_batch_id,created_at,created_by,update_batch_id,updated_at,updated_by) VALUES
|
|
93
|
-
('L991',5,'
|
|
94
|
-
('L991',5,'
|
|
95
|
-
('L991',5,'
|
|
96
|
-
('L991',8,'
|
|
97
|
-
('L991',9,'
|
|
98
|
-
('L991',17,'
|
|
92
|
+
('L991',5,'1111111-1','991_77_220901',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
|
|
93
|
+
('L991',5,'1111111-1','991_78_220321',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
|
|
94
|
+
('L991',5,'1111111-1','991_124_201230',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
|
|
95
|
+
('L991',8,'1111111-3','991_124_201230',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
|
|
96
|
+
('L991',9,'1111111-1','991_294_220901',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL),
|
|
97
|
+
('L991',17,'1111111-3','991_294_220901',3,NULL,'2022-10-24 10:23:04.722+02',NULL,NULL,'2022-10-24 10:23:04.722+02',NULL);
|
|
99
98
|
|
|
100
99
|
INSERT INTO ropidgtfs_metro_railtrack_gps (track_id, route_name, coordinates, gtfs_stop_id) VALUES
|
|
101
100
|
('1806', 'A', ST_PointFromText('POINT(14.36282 50.09837)', 4326), 'U157Z102P'),
|
|
@@ -112,10 +111,10 @@ INSERT INTO vehiclepositions_metro_runs_messages (route_name, message_timestamp,
|
|
|
112
111
|
('A', concat(CURRENT_DATE,'T08:20:13Z')::timestamp, '9', '9', '175', '1209', -15, concat(CURRENT_DATE,'T08:19:58Z')::timestamp, (SELECT origin_datetime FROM init_values), (SELECT origin_datetime FROM init_values));
|
|
113
112
|
|
|
114
113
|
INSERT INTO vehiclepositions_trips (cis_line_id,cis_trip_number,sequence_id,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) VALUES
|
|
115
|
-
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_78_220321',concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:32:35',extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','
|
|
116
|
-
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_77_220901',concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'09:55:10',extract(epoch from concat(CURRENT_DATE,'T07:55:10Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','
|
|
117
|
-
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_124_201230',concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'11:02:40',extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','
|
|
118
|
-
(NULL,NULL,9,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_294_220901',concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:04:35',extract(epoch from concat(CURRENT_DATE,'T08:04:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','
|
|
114
|
+
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_78_220321',concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:32:35',extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Skalka',NULL,1,NULL,30,NULL,extract(epoch from concat(CURRENT_DATE,'T09:00:40Z')::timestamp)*1000,NULL),
|
|
115
|
+
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_77_220901',concat(CURRENT_DATE,'T09:55:10+02:00_991_77_220901_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'09:55:10',extract(epoch from concat(CURRENT_DATE,'T07:55:10Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Nemocnice Motol',NULL,1,NULL,29,NULL,extract(epoch from concat(CURRENT_DATE,'T08:26:20Z')::timestamp)*1000,NULL),
|
|
116
|
+
(NULL,NULL,5,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_124_201230',concat(CURRENT_DATE,'T11:02:40+02:00_991_124_201230_5_5'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'11:02:40',extract(epoch from concat(CURRENT_DATE,'T09:02:40Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Nemocnice Motol',NULL,1,NULL,31,NULL,extract(epoch from concat(CURRENT_DATE,'T09:31:20Z')::timestamp)*1000,NULL),
|
|
117
|
+
(NULL,NULL,9,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,'L991','A','991_294_220901',concat(CURRENT_DATE,'T10:04:35+02:00_991_294_220901_9_9'),concat(CURRENT_DATE,'T09:14:51Z')::timestamp,NULL,NULL,'10:04:35',extract(epoch from concat(CURRENT_DATE,'T08:04:35Z')::timestamp)*1000,1,true,NULL,NULL,NULL,NULL,'DP PRAHA','991','DP PRAHA',NULL,'Skalka',NULL,1,NULL,32,NULL,extract(epoch from concat(CURRENT_DATE,'T08:32:40Z')::timestamp)*1000,NULL);
|
|
119
118
|
|
|
120
119
|
INSERT INTO vehiclepositions_positions (created_at,delay,delay_stop_arrival,delay_stop_departure,next_stop_id,shape_dist_traveled,is_canceled,lat,lng,origin_time,origin_timestamp,tracking,trips_id,create_batch_id,created_by,update_batch_id,updated_at,updated_by,id,bearing,cis_last_stop_id,cis_last_stop_sequence,last_stop_id,last_stop_sequence,next_stop_sequence,speed,last_stop_arrival_time,last_stop_departure_time,next_stop_arrival_time,next_stop_departure_time,asw_last_stop_id,state_process,state_position,this_stop_id,this_stop_sequence,tcp_event,last_stop_headsign,last_stop_name,next_stop_name,this_stop_name,valid_to) VALUES
|
|
121
120
|
(concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,NULL,NULL,'U306Z101P',0,NULL,50.09837,14.36282,'10:20:08',extract(epoch from concat(CURRENT_DATE,'T08:20:08Z')::timestamp)*1000,0,concat(CURRENT_DATE,'T10:32:35+02:00_991_78_220321_5_5'),NULL,NULL,NULL,concat(CURRENT_DATE,'T09:14:32Z')::timestamp,NULL,26,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,extract(epoch from concat(CURRENT_DATE,'T08:32:35Z')::timestamp)*1000,NULL,'processed','before_track','U157Z102P',NULL,NULL,NULL,NULL,NULL,NULL,extract(epoch from concat(CURRENT_DATE,'T09:40:00Z')::timestamp)*1000),
|
|
@@ -7,7 +7,7 @@ export default class VPTripsIdGenerator {
|
|
|
7
7
|
*/
|
|
8
8
|
static generateFromCommonRun(gtfsTrip: IGtfsRunTripCache, runInput: IVehiclePositionsRun): string;
|
|
9
9
|
/**
|
|
10
|
-
* @example 2022-11-04T12:37:35+01:
|
|
10
|
+
* @example 2022-11-04T12:37:35+01:00_991_416_220901_13_13
|
|
11
11
|
*/
|
|
12
12
|
static generateFromMetroRun(gtfsTrip: IGtfsRunTripCache, runInput: IMetroRunInputForProcessing): string;
|
|
13
13
|
}
|
|
@@ -10,7 +10,7 @@ class VPTripsIdGenerator {
|
|
|
10
10
|
return `${start_timestamp}_${trip_id}_${registration_number}`;
|
|
11
11
|
}
|
|
12
12
|
/**
|
|
13
|
-
* @example 2022-11-04T12:37:35+01:
|
|
13
|
+
* @example 2022-11-04T12:37:35+01:00_991_416_220901_13_13
|
|
14
14
|
*/
|
|
15
15
|
static generateFromMetroRun(gtfsTrip, runInput) {
|
|
16
16
|
const { start_timestamp, trip_id } = gtfsTrip;
|
|
@@ -12,7 +12,7 @@ class VPTripsMapper {
|
|
|
12
12
|
return Object.assign(Object.assign({}, this.getGTFSAttributes(gtfsTrip)), { id: VPTripsIdGenerator_1.default.generateFromCommonRun(gtfsTrip, runInput), origin_route_name: runInput.route_id, sequence_id: +runInput.run_number, vehicle_registration_number: runInput.registration_number, vehicle_type_id: this.getVehicleTypeId(+gtfsTrip.route_type, !!+gtfsTrip.is_night, !!+gtfsTrip.is_regional, !!+gtfsTrip.is_substitute_transport), wheelchair_accessible: runInput.wheelchair_accessible });
|
|
13
13
|
}
|
|
14
14
|
static mapMetroRunToDto(gtfsTrip, runInput) {
|
|
15
|
-
return Object.assign(Object.assign({}, this.getGTFSAttributes(gtfsTrip)), { id: VPTripsIdGenerator_1.default.generateFromMetroRun(gtfsTrip, runInput), origin_route_name: runInput.
|
|
15
|
+
return Object.assign(Object.assign({}, this.getGTFSAttributes(gtfsTrip)), { id: VPTripsIdGenerator_1.default.generateFromMetroRun(gtfsTrip, runInput), origin_route_name: runInput.routeId, sequence_id: runInput.runNumber, vehicle_type_id: VehiclePositionsTripsModel_1.MPVRouteTypesEnum.METRO, wheelchair_accessible: true });
|
|
16
16
|
}
|
|
17
17
|
static getGTFSAttributes(gtfsTrip) {
|
|
18
18
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"VPTripsMapper.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/models/helpers/VPTripsMapper.ts"],"names":[],"mappings":";;;;;AAEA,sEAA8D;AAC9D,+DAA4E;AAG5E,8EAAqF;AACrF,8EAAsD;AAEtD,MAAqB,aAAa;IACvB,MAAM,CAAC,iBAAiB,CAAC,QAA2B,EAAE,QAA8B;QACvF,uCACO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KACnC,EAAE,EAAE,4BAAkB,CAAC,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAChE,iBAAiB,EAAE,QAAQ,CAAC,QAAQ,EACpC,WAAW,EAAE,CAAC,QAAQ,CAAC,UAAU,EACjC,2BAA2B,EAAE,QAAQ,CAAC,mBAAmB,EACzD,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAClC,CAAC,QAAQ,CAAC,UAAU,EACpB,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EACpB,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,EACvB,CAAC,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CACtC,EACD,qBAAqB,EAAE,QAAQ,CAAC,qBAAqB,IACvD;IACN,CAAC;IAEM,MAAM,CAAC,gBAAgB,CAAC,QAA2B,EAAE,QAAqC;QAC7F,uCACO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KACnC,EAAE,EAAE,4BAAkB,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAC/D,iBAAiB,EAAE,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"VPTripsMapper.js","sourceRoot":"","sources":["../../../../../src/integration-engine/vehicle-positions/models/helpers/VPTripsMapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ class MetroRunsMessageProcessingTransformation extends transformations_1.BaseTra
|
|
|
22
22
|
if (!runSchedule) {
|
|
23
23
|
return;
|
|
24
24
|
}
|
|
25
|
-
const runInput = this.parseRunInputFromMessage(message, runSchedule
|
|
25
|
+
const runInput = this.parseRunInputFromMessage(message, runSchedule, gpsData);
|
|
26
26
|
if (runInput) {
|
|
27
27
|
return {
|
|
28
28
|
runSchedule,
|
|
@@ -55,7 +55,7 @@ class MetroRunsMessageProcessingTransformation extends transformations_1.BaseTra
|
|
|
55
55
|
msg_last_timestamp: message.message_timestamp,
|
|
56
56
|
};
|
|
57
57
|
}
|
|
58
|
-
parseRunInputFromMessage(message,
|
|
58
|
+
parseRunInputFromMessage(message, runSchedule, gpsData) {
|
|
59
59
|
var _a;
|
|
60
60
|
const coordinates = (_a = gpsData === null || gpsData === void 0 ? void 0 : gpsData.coordinates) === null || _a === void 0 ? void 0 : _a[message.track_id];
|
|
61
61
|
if (!coordinates) {
|
|
@@ -65,8 +65,8 @@ class MetroRunsMessageProcessingTransformation extends transformations_1.BaseTra
|
|
|
65
65
|
return {
|
|
66
66
|
messageTimestamp: message.message_timestamp,
|
|
67
67
|
timestampScheduled: message.actual_position_timestamp_scheduled,
|
|
68
|
-
|
|
69
|
-
runNumber: Number.parseInt(
|
|
68
|
+
routeId: runSchedule.route_id,
|
|
69
|
+
runNumber: Number.parseInt(runSchedule.run_number),
|
|
70
70
|
trainSetNumberScheduled: message.train_set_number_scheduled,
|
|
71
71
|
trainSetNumberReal: message.train_set_number_real,
|
|
72
72
|
trainNumber: message.train_number,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetroRunsMessageProcessingTransformation.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/transformations/MetroRunsMessageProcessingTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAA4G;AAC5G,2EAAoE;AAKpE,kEAA+D;AAY/D,MAAa,wCAAyC,SAAQ,oCAAkB;IAAhF;;QACW,SAAI,GAAG,2BAA2B,CAAC;QAEnC,cAAS,GAAG,CAAO,EAAE,OAAO,EAAE,OAAO,EAAwB,EAA8C,EAAE;YAChH,MAAM,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,WAAW,EAAE;gBACd,OAAO;aACV;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"MetroRunsMessageProcessingTransformation.js","sourceRoot":"","sources":["../../../../../../../src/integration-engine/vehicle-positions/workers/runs/tasks/transformations/MetroRunsMessageProcessingTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2FAA4G;AAC5G,2EAAoE;AAKpE,kEAA+D;AAY/D,MAAa,wCAAyC,SAAQ,oCAAkB;IAAhF;;QACW,SAAI,GAAG,2BAA2B,CAAC;QAEnC,cAAS,GAAG,CAAO,EAAE,OAAO,EAAE,OAAO,EAAwB,EAA8C,EAAE;YAChH,MAAM,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,WAAW,EAAE;gBACd,OAAO;aACV;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAC9E,IAAI,QAAQ,EAAE;gBACV,OAAO;oBACH,WAAW;oBACX,QAAQ;iBACX,CAAC;aACL;QACL,CAAC,CAAA,CAAC;QAEQ,qBAAgB,GAAG,GAAuB,EAAE,gDAAE,CAAC,CAAA,CAAC;IAgD9D,CAAC;IA9CW,2BAA2B,CAAC,OAAgC;QAChE,MAAM,OAAO,GAAG,mCAAgB,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAChE,IAAI,CAAC,OAAO,EAAE;YACV,aAAG,CAAC,IAAI,CAAC,mEAAmE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACvG,OAAO;SACV;QAED,IAAI,SAAiB,CAAC;QACtB,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,0BAA0B,CAAC,GAAG,CAAC,EAAE;YACzD,SAAS,GAAG,OAAO,CAAC,0BAA0B,CAAC;SAClD;aAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,GAAG,CAAC,EAAE;YAC3D,SAAS,GAAG,OAAO,CAAC,qBAAqB,CAAC;SAC7C;aAAM;YACH,aAAG,CAAC,IAAI,CAAC,kFAAkF,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACtH,OAAO;SACV;QAED,OAAO;YACH,QAAQ,EAAE,OAAO;YACjB,UAAU,EAAE,SAAS;YACrB,kBAAkB,EAAE,OAAO,CAAC,iBAAiB;SAChD,CAAC;IACN,CAAC;IAEO,wBAAwB,CAC5B,OAAgC,EAChC,WAAsC,EACtC,OAA2C;;QAE3C,MAAM,WAAW,GAAG,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,0CAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,WAAW,EAAE;YACd,aAAG,CAAC,IAAI,CAAC,iEAAiE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YACrG,OAAO;SACV;QAED,OAAO;YACH,gBAAgB,EAAE,OAAO,CAAC,iBAAiB;YAC3C,kBAAkB,EAAE,OAAO,CAAC,mCAAmC;YAC/D,OAAO,EAAE,WAAW,CAAC,QAAQ;YAC7B,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC;YAClD,uBAAuB,EAAE,OAAO,CAAC,0BAA0B;YAC3D,kBAAkB,EAAE,OAAO,CAAC,qBAAqB;YACjD,WAAW,EAAE,OAAO,CAAC,YAAY;YACjC,WAAW;SACd,CAAC;IACN,CAAC;CACJ;AAlED,4FAkEC"}
|