@golemio/parkings 1.0.9-dev.402747448 → 1.0.9-dev.414583561
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/CHANGELOG.md +10 -0
- package/db/example/sql_dump.sql +6 -6
- package/dist/integration-engine/TSKParkingTransformation.js +2 -0
- package/dist/integration-engine/TSKParkingTransformation.js.map +1 -1
- package/dist/output-gateway/ParkingsRouter.d.ts +1 -0
- package/dist/output-gateway/ParkingsRouter.js +9 -2
- package/dist/output-gateway/ParkingsRouter.js.map +1 -1
- package/dist/output-gateway/models/ParkingsModel.d.ts +1 -0
- package/dist/output-gateway/models/ParkingsModel.js +7 -2
- package/dist/output-gateway/models/ParkingsModel.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
ADDED
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
# Changelog
|
|
2
|
+
|
|
3
|
+
All notable changes to this project will be documented in this file.
|
|
4
|
+
|
|
5
|
+
## [Unreleased]
|
|
6
|
+
|
|
7
|
+
### Added
|
|
8
|
+
|
|
9
|
+
- Category query filter ([parkings#2](https://gitlab.com/operator-ict/golemio/code/modules/parkings/-/issues/2))
|
|
10
|
+
- Parking zones prague payment_url ([parkings#4](https://gitlab.com/operator-ict/golemio/code/modules/parkings/-/issues/4))
|
package/db/example/sql_dump.sql
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
INSERT INTO public.parkings (id, source, source_id, data_provider, name, category, date_modified, address, location, area_served, payment_url, total_spot_number, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by, valid_from, valid_to, tariff_id) VALUES
|
|
2
|
-
(1, 'korid', '10', 'www.korid.cz', 'Na Perštýně',
|
|
3
|
-
(2, 'korid', '20', 'www.korid.cz', 'Husova (u nemocnice)',
|
|
4
|
-
(3, 'korid', '21', 'www.korid.cz', 'Purkyňova ulice',
|
|
5
|
-
(4, 'korid', '22', 'www.korid.cz', '1. máje',
|
|
6
|
-
(5, 'korid', '54', 'www.korid.cz', 'Masarykova ulice',
|
|
7
|
-
(6, 'korid', '66', 'www.korid.cz', 'Bedřichov Maliník',
|
|
2
|
+
(1, 'korid', '10', 'www.korid.cz', 'Na Perštýně', 'park_and_ride', 1614184206236, NULL, 'SRID=4326;POLYGON ((15.058477079866359 50.764621453945274, 15.058514693959768 50.76462152563487, 15.058554180179613 50.764621900783574, 15.058626283309321 50.7646226347964, 15.058701346853194 50.76462159520064, 15.058776737298384 50.764618026799006, 15.058812775811438 50.76461469133624, 15.058822912718657 50.76465695203623, 15.058783838664894 50.76466082677318, 15.058743117269795 50.76466323629539, 15.058704375227238 50.76466458542137, 15.05866541610514 50.76466515003736, 15.058626559240858 50.76466567766573, 15.058587617997263 50.76466539596825, 15.058513079923348 50.764664631419066, 15.05847584612631 50.76466436351429, 15.058477079866359 50.764621453945274, 15.058477079866359 50.764621453945274))'::geometry, NULL, NULL, 9, NULL, '2020-09-07 14:51:40.307', NULL, NULL, '2021-02-24 17:37:14.371', NULL, NULL, NULL, 'b184865e-5a5e-5465-abc1-4fab6bc56a77'),
|
|
3
|
+
(2, 'korid', '20', 'www.korid.cz', 'Husova (u nemocnice)', 'park_and_ride', 1614184206236, NULL, 'SRID=4326;POLYGON ((15.062502659291217 50.770489928646725, 15.062502659291217 50.770489928646725, 15.062514877513413 50.770475464787815, 15.062581794635213 50.77049826073106, 15.062649860572028 50.77051945225214, 15.062721314704385 50.77053616989129, 15.062866130284114 50.77056691550288, 15.062858059655783 50.77058240811945, 15.062712703761884 50.77055201164475, 15.062639428783918 50.77053457887742, 15.062570095936087 50.770512962386164, 15.062502659291217 50.770489928646725), (15.063333627169191 50.77068339655547, 15.06334151399964 50.77066874944876, 15.063552868836394 50.77071451523553, 15.063544982051344 50.77072916234581, 15.063333627169191 50.77068339655547), (15.06402203793059 50.77082695501542, 15.064028816089055 50.77081205354126, 15.064389053210448 50.77087794685548, 15.064382275155646 50.770892848349554, 15.06402203793059 50.77082695501542))'::geometry, NULL, NULL, 13, NULL, '2020-09-07 14:51:40.308', NULL, NULL, '2021-02-24 17:37:14.372', NULL, NULL, NULL, 'b184865e-5a5e-5465-abc1-4fab6bc56a77'),
|
|
4
|
+
(3, 'korid', '21', 'www.korid.cz', 'Purkyňova ulice', 'park_and_ride', 1614184206236, NULL, 'SRID=4326;POLYGON ((15.073535465794144 50.777867143328834, 15.074364650303988 50.77813579123175, 15.074351908646097 50.77815160179682, 15.073522723931404 50.77788295380698, 15.073535465794144 50.777867143328834), (15.074416914065177 50.77817503753822, 15.074429497702463 50.77815935612828, 15.074877094523854 50.77830375040025, 15.07486451099657 50.77831943185654, 15.074416914065177 50.77817503753822), (15.075650733190733 50.77868651870031, 15.075650733190733 50.77868651870031, 15.075564634987378 50.77861045467845, 15.07554201324507 50.77862087663137, 15.075499118355399 50.77858247914091, 15.075484187776214 50.77858944482163, 15.075439271486093 50.778550497382035, 15.075419840628033 50.77855937822567, 15.07537695602758 50.77852084116626, 15.075367120753475 50.778525311406675, 15.075303564462287 50.778468503035036, 15.075300595898385 50.77846615599911, 15.075300381548084 50.77846626713369, 15.075300234820142 50.77846634207723, 15.075281186802224 50.778474938792975, 15.075239435968914 50.77843771729444, 15.075290246614136 50.77841473660306, 15.075335124012991 50.778454153668214, 15.075354558422568 50.7784452488684, 15.075419494920078 50.77850296000166, 15.075429096512892 50.77849851290845, 15.075472261228347 50.778537033865646, 15.075491718741654 50.77852840732294, 15.075535754974565 50.77856669175267, 15.075550961185778 50.77856003875174, 15.075592711076746 50.778597264182665, 15.075594228650798 50.77859843531407, 15.075616936041953 50.77858819748631, 15.075701590126364 50.778663498184564, 15.075650733190733 50.77868651870031), (15.07560156777543 50.778786780162434, 15.075555472608372 50.77876012088723, 15.075653399037733 50.778692051930335, 15.075699494193103 50.77871871116814, 15.07560156777543 50.778786780162434))'::geometry, NULL, NULL, 36, NULL, '2020-09-07 14:51:40.308', NULL, NULL, '2021-02-24 17:37:14.372', NULL, NULL, NULL, NULL),
|
|
5
|
+
(4, 'korid', '22', 'www.korid.cz', '1. máje', 'park_and_ride', 1614184206236, NULL, 'SRID=4326;POLYGON ((15.048722595067447 50.7628457146645, 15.048722595067447 50.7628457146645, 15.048716367962248 50.762775507841255, 15.048714333981806 50.76275172992911, 15.048708229671679 50.7627273495386, 15.048702773889246 50.76270523464775, 15.04868944177133 50.762682678960275, 15.04867244079242 50.76266133636074, 15.04865023927992 50.76264190854471, 15.048649402627722 50.76264118626388, 15.048623574726843 50.762625199920016, 15.048596683892479 50.76261077980552, 15.04859384730661 50.76260985825769, 15.048561836071121 50.76259896923075, 15.0485601909124 50.76259868552474, 15.048489675092718 50.76258643560388, 15.048453440099811 50.76258008299823, 15.048471025844593 50.76253882873844, 15.048578026434075 50.76255720127448, 15.048594207710732 50.76256107058631, 15.048625684902126 50.76257199494989, 15.04866886409942 50.76259326854139, 15.048696211394889 50.76260996068015, 15.048704793973265 50.76261659348581, 15.048726266686511 50.76263471221044, 15.048732389247313 50.76264098464028, 15.048748953217547 50.762661821774046, 15.048752747631736 50.762666098660354, 15.048767166826684 50.76268976425888, 15.048768226638888 50.762692496329485, 15.048782164668745 50.76274633176619, 15.048789999980308 50.76284334276083, 15.048722595067447 50.7628457146645), (15.049380440528726 50.76344758984489, 15.048898232808483 50.763099770866226, 15.048918567269727 50.763088430051425, 15.04940077503638 50.76343624894975, 15.049380440528726 50.76344758984489), (15.050030797711324 50.76391444180497, 15.049437157489526 50.76348812537081, 15.049457464142574 50.76347675036433, 15.050051104402723 50.76390306669833, 15.050030797711324 50.76391444180497), (15.049543289349549 50.76375586697499, 15.04895132968074 50.76333211903317, 15.048971598131555 50.76332072886077, 15.049563557837509 50.76374447670289, 15.049543289349549 50.76375586697499), (15.049969473187774 50.764062225545175, 15.049647751202544 50.76383206153527, 15.049668054031324 50.76382064542361, 15.049989776036675 50.76405080937923, 15.049969473187774 50.764062225545175), (15.051079857038813 50.76466958394885, 15.050704013715515 50.76440055939813, 15.050724440719415 50.76438907978244, 15.05110028407871 50.76465810427945, 15.051079857038813 50.76466958394885))'::geometry, NULL, NULL, 59, NULL, '2020-09-07 14:51:40.308', NULL, NULL, '2021-02-24 17:37:14.373', NULL, NULL, NULL, 'f4de50d9-1f5f-5d76-81a6-e5e8a2aa6d44'),
|
|
6
|
+
(5, 'korid', '54', 'www.korid.cz', 'Masarykova ulice', 'park_paid_private', 1614184206236, NULL, 'SRID=4326;POLYGON ((15.074568223409903 50.77590827454969, 15.074585370561389 50.77586811775529, 15.074947701396539 50.775930320848644, 15.07493055452721 50.7759704777025, 15.074568223409903 50.77590827454969))'::geometry, NULL, NULL, 10, NULL, '2020-09-07 14:51:40.308', NULL, NULL, '2021-02-24 17:37:14.383', NULL, NULL, NULL, NULL),
|
|
7
|
+
(6, 'korid', '66', 'www.korid.cz', 'Bedřichov Maliník', 'park_paid_private', 1614184206236, NULL, 'SRID=4326;POLYGON ((15.12984438981548 50.79081757392241, 15.12984438981548 50.79081757392241, 15.13037179413462 50.790730250342165, 15.130753864365996 50.79092958629554, 15.130713357525435 50.791100395437105, 15.130553614214087 50.79105491924561, 15.13047129608269 50.791119029561514, 15.12984438981548 50.79081757392241))'::geometry, NULL, NULL, 150, NULL, '2020-09-07 14:51:40.309', NULL, NULL, '2021-02-24 17:37:14.383', NULL, NULL, NULL, NULL);
|
|
8
8
|
|
|
9
9
|
INSERT INTO public.parkings_measurements (id, source, source_id, available_spot_number, closed_spot_number, occupied_spot_number, total_spot_number, date_modified, create_batch_id, created_at, created_by, update_batch_id, updated_at, updated_by) VALUES
|
|
10
10
|
(1, 'korid', '20', 5, 0, 8, 13, 1614341086191, NULL, '2021-02-26 13:05:31.484', NULL, NULL, '2021-02-26 13:05:31.484', NULL),
|
|
@@ -16,6 +16,7 @@ exports.TSKParkingTransformation = void 0;
|
|
|
16
16
|
const integration_engine_1 = require("@golemio/core/dist/integration-engine");
|
|
17
17
|
const _sch_1 = require("../schema-definitions");
|
|
18
18
|
const uuid_by_string_1 = __importDefault(require("uuid-by-string"));
|
|
19
|
+
const config_1 = require("@golemio/core/dist/integration-engine/config");
|
|
19
20
|
const ZoneType = {
|
|
20
21
|
RES: "zone_residential",
|
|
21
22
|
MIX: "zone_mixed",
|
|
@@ -40,6 +41,7 @@ class TSKParkingTransformation extends integration_engine_1.BaseTransformation {
|
|
|
40
41
|
data_provider: "www.tsk-praha.cz",
|
|
41
42
|
location: element.geometry,
|
|
42
43
|
total_spot_number: element.properties.ps_zps_celkem,
|
|
44
|
+
payment_url: config_1.config.PARKING_ZONES_PAYMENT_URL + "?shortname=" + element.properties.tarifTab,
|
|
43
45
|
name: element.properties.ulice,
|
|
44
46
|
category: ZoneType[element.properties.typZony],
|
|
45
47
|
tariff_id: (0, uuid_by_string_1.default)(this.dataSource + element.properties.CTARIF),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TSKParkingTransformation.js","sourceRoot":"","sources":["../../src/integration-engine/TSKParkingTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8EAA4F;AAC5F,gDAAgC;AAChC,oEAA6C;
|
|
1
|
+
{"version":3,"file":"TSKParkingTransformation.js","sourceRoot":"","sources":["../../src/integration-engine/TSKParkingTransformation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8EAA4F;AAC5F,gDAAgC;AAChC,oEAA6C;AAE7C,yEAAsE;AAEtE,MAAM,QAAQ,GAAG;IACb,GAAG,EAAE,kBAAkB;IACvB,GAAG,EAAE,YAAY;IACjB,GAAG,EAAE,eAAe;IACpB,GAAG,EAAE,YAAY;CACpB,CAAC;AAEF,MAAa,wBAAyB,SAAQ,uCAAkB;IAI5D;QACI,KAAK,EAAE,CAAC;QAKL,cAAS,GAAG,CAAO,IAAS,EAA+B,EAAE;YAChE,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,KAAK,MAAM,OAAO,IAAI,IAAI,EAAE;gBACxB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;aAC/C;YACD,OAAO,MAAM,CAAC;QAClB,CAAC,CAAA,CAAC;QAEQ,qBAAgB,GAAG,CAAC,OAAY,EAAoB,EAAE;YAC5D,OAAO;gBACH,oBAAoB;gBACpB,MAAM,EAAE,IAAI,CAAC,UAAU;gBACvB,SAAS,EAAE,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ;gBAC3C,aAAa,EAAE,kBAAkB;gBACjC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa;gBACnD,WAAW,EAAE,eAAM,CAAC,yBAAyB,GAAG,aAAa,GAAG,OAAO,CAAC,UAAU,CAAC,QAAQ;gBAC3F,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK;gBAC9B,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,OAAgC,CAAC;gBACvE,SAAS,EAAE,IAAA,wBAAe,EAAC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;gBACvE,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU;gBACzC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU;aAC1C,CAAC;QACN,CAAC,CAAC;QA3BE,IAAI,CAAC,IAAI,GAAG,eAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;IAC5B,CAAC;CA0BJ;AAlCD,4DAkCC"}
|
|
@@ -43,10 +43,11 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
43
43
|
};
|
|
44
44
|
this.getLocations = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
45
45
|
try {
|
|
46
|
-
const { latlng, range, limit, offset, source, sourceId } = req.query;
|
|
46
|
+
const { latlng, range, limit, offset, source, sourceId, category } = req.query;
|
|
47
47
|
const coords = yield (0, output_gateway_1.parseCoordinates)(latlng, range);
|
|
48
48
|
const options = Object.assign(Object.assign({}, coords), { source,
|
|
49
|
-
sourceId,
|
|
49
|
+
sourceId,
|
|
50
|
+
category, limit: limit ? Number(limit) : undefined, offset: offset ? Number(offset) : 0 });
|
|
50
51
|
const data = yield this.ParkingsModel.GetAll(options);
|
|
51
52
|
const collection = this.buildFeatureCollection(data);
|
|
52
53
|
res.status(200).send(collection);
|
|
@@ -175,6 +176,12 @@ class ParkingsRouter extends BaseRouter_1.BaseRouter {
|
|
|
175
176
|
(0, express_validator_1.query)("range").optional().isNumeric(),
|
|
176
177
|
(0, express_validator_1.query)("source").optional().isString(),
|
|
177
178
|
(0, express_validator_1.query)("sourceId").optional().isNumeric(),
|
|
179
|
+
(0, express_validator_1.query)("category")
|
|
180
|
+
.optional()
|
|
181
|
+
.customSanitizer((value) => {
|
|
182
|
+
return Array.isArray(value) ? value : [value];
|
|
183
|
+
}),
|
|
184
|
+
(0, express_validator_1.query)("category.*").isString(),
|
|
178
185
|
], output_gateway_1.pagination, output_gateway_1.checkErrors, (0, output_gateway_1.paginationLimitMiddleware)("ParkingsRouter"), (0, output_gateway_1.useCacheMiddleware)(expire), this.getLocations);
|
|
179
186
|
};
|
|
180
187
|
this.ParkingsModel = models_1.models.ParkingsModel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingsRouter.js","sourceRoot":"","sources":["../../src/output-gateway/ParkingsRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA,mFAA2E;AAC3E,oFAAiF;AACjF,sEAS2C;AAC3C,qCAAoC;AAUpC,6EAAuE;
|
|
1
|
+
{"version":3,"file":"ParkingsRouter.js","sourceRoot":"","sources":["../../src/output-gateway/ParkingsRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
21
21
|
constructor() {
|
|
22
22
|
super(index_1.Parkings.name, index_1.Parkings.pg.pgTableName, index_1.Parkings.pg.outputSequelizeAttributes);
|
|
23
23
|
this.GetAll = (options = {}) => __awaiter(this, void 0, void 0, function* () {
|
|
24
|
-
const { lat, lng, range, source, sourceId, limit, offset } = options;
|
|
24
|
+
const { lat, lng, range, source, sourceId, category, limit, offset } = options;
|
|
25
25
|
const order = [];
|
|
26
26
|
let where = {};
|
|
27
27
|
let attributes = { include: [], exclude: [] };
|
|
@@ -32,7 +32,7 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
32
32
|
attributes.include.push([distance, "distance"]);
|
|
33
33
|
order.push([sequelize_1.default.literal("distance"), "asc"]);
|
|
34
34
|
if (range) {
|
|
35
|
-
where = sequelize_1.default.where(sequelize_1.default.fn("ST_DWithin", location, sequelize_1.default.literal("location"), range, true), "true");
|
|
35
|
+
where.range = sequelize_1.default.where(sequelize_1.default.fn("ST_DWithin", location, sequelize_1.default.literal("location"), range, true), "true");
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
if (source) {
|
|
@@ -41,6 +41,11 @@ class ParkingsModel extends output_gateway_1.SequelizeModel {
|
|
|
41
41
|
if (sourceId) {
|
|
42
42
|
where.source_id = sourceId;
|
|
43
43
|
}
|
|
44
|
+
if (category) {
|
|
45
|
+
where.category = {
|
|
46
|
+
[sequelize_1.default.Op.in]: category,
|
|
47
|
+
};
|
|
48
|
+
}
|
|
44
49
|
return yield this.sequelizeModel.findAll({
|
|
45
50
|
attributes,
|
|
46
51
|
limit,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParkingsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sEAAmE;AACnE,0DAAsC;AACtC,4CAA8C;AAC9C,oFAA4D;
|
|
1
|
+
{"version":3,"file":"ParkingsModel.js","sourceRoot":"","sources":["../../../src/output-gateway/models/ParkingsModel.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,sEAAmE;AACnE,0DAAsC;AACtC,4CAA8C;AAC9C,oFAA4D;AAiC5D,MAAa,aAAc,SAAQ,+BAAc;IAC7C;QACI,KAAK,CAAC,gBAAQ,CAAC,IAAI,EAAE,gBAAQ,CAAC,EAAE,CAAC,WAAW,EAAE,gBAAQ,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC;QAGlF,WAAM,GAAG,CAAO,UAAgC,EAAE,EAAgC,EAAE;YACvF,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAC/E,MAAM,KAAK,GAAoB,EAAE,CAAC;YAClC,IAAI,KAAK,GAA2B,EAAE,CAAC;YACvC,IAAI,UAAU,GAAmC,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;YAE9E,IAAI;gBACA,IAAI,GAAG,IAAI,GAAG,EAAE;oBACZ,MAAM,QAAQ,GAAG,mBAAS,CAAC,EAAE,CAAC,YAAY,EAAE,mBAAS,CAAC,OAAO,CAAC,0BAA0B,GAAG,IAAI,GAAG,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;oBAChH,MAAM,QAAQ,GAAG,mBAAS,CAAC,EAAE,CAAC,aAAa,EAAE,mBAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;oBAE5F,UAAU,CAAC,OAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;oBACjD,KAAK,CAAC,IAAI,CAAC,CAAC,mBAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;oBAEnD,IAAI,KAAK,EAAE;wBACP,KAAK,CAAC,KAAK,GAAG,mBAAS,CAAC,KAAK,CACzB,mBAAS,CAAC,EAAE,CAAC,YAAY,EAAE,QAAQ,EAAE,mBAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,EAChF,MAAM,CACT,CAAC;qBACL;iBACJ;gBAED,IAAI,MAAM,EAAE;oBACR,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;iBACzB;gBAED,IAAI,QAAQ,EAAE;oBACV,KAAK,CAAC,SAAS,GAAG,QAAQ,CAAC;iBAC9B;gBAED,IAAI,QAAQ,EAAE;oBACV,KAAK,CAAC,QAAQ,GAAG;wBACb,CAAC,mBAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ;qBAC9B,CAAC;iBACL;gBAED,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;oBACrC,UAAU;oBACV,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,GAAG,EAAE,IAAI;oBACT,KAAK;iBACR,CAAC,CAAC;aACN;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,oBAAW,CAAC,gBAAgB,EAAE,IAAI,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;aAC5E;QACL,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAO,EAAU,EAA8B,EAAE;YAC7D,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,CAAC,CAAA,CAAC;IArDF,CAAC;CAsDJ;AAzDD,sCAyDC"}
|