ogcopenapis 0.0.12 → 1.0.0

package/lib/OgcOpenApiFeatureStore.js

@@ -1,244 +1,200 @@
-import { EventedSupport } from '@luciad/ria/util/EventedSupport';
-import { createBounds } from '@luciad/ria/shape/ShapeFactory';
-import { getReference } from "@luciad/ria/reference/ReferenceProvider";
-import { createTransformation } from "@luciad/ria/transformation/TransformationFactory";
-import { OgcOpenApiCrsTools } from "./OgcOpenApiCrsTools";
-import { GeoJsonCodec } from "@luciad/ria/model/codec/GeoJsonCodec";
-import { GMLCodec } from "@luciad/ria/model/codec/GMLCodec";
-import { OgcOpenApiFetchTools } from "./OgcOpenApiFetchTools";
-export class OgcOpenApiFeatureStore {
-    constructor(options) {
-        // console.log(options);
-        this.swapAxes = options.swapAxes;
-        this.useCrs84Bounds = typeof options.useCrs84Bounds !== "undefined" ? options.useCrs84Bounds : false;
-        this.dataUrl = options.dataUrl;
-        this.outputFormat = options.outputFormat;
-        const predictedFeatureUrl = this.dataUrl.replace(/\.[^/.]+$/, "");
-        this.featureUrl = options.featureUrl ? OgcOpenApiFeatureStore.cleanUrl(options.featureUrl, true) : OgcOpenApiFeatureStore.cleanUrl(predictedFeatureUrl, true);
-        this.baseUrl = OgcOpenApiFeatureStore.cleanUrl(this.dataUrl);
-        this.dataFormat = OgcOpenApiFeatureStore.dataFormatInQuery(this.dataUrl);
-        this.customCrs = options.crs === "http://www.opengis.net/def/crs/OGC/1.3/CRS84" ? undefined : options.crs;
-        this.codec = options.codec;
-        this.eventedSupport = new EventedSupport();
-        this.requestHeaders = options.requestHeaders ? options.requestHeaders : {};
-        const referenceName = OgcOpenApiCrsTools.getReferenceName(options.crs);
-        this.reference = getReference(referenceName);
-        this.proxy = options.proxify;
-        this.credentials = options.credentials;
-        this.serverOptions = OgcOpenApiFetchTools.createFetchOptions({ originalUrl: this.dataUrl, proxify: options.proxify });
-        if (options.extent &&
-            options.extent.spatial &&
-            options.extent.spatial.bbox &&
-            options.extent.spatial.bbox.length > 0) {
-            const bbox = options.extent.spatial.bbox[0];
-            const WGS84 = getReference("CRS:84");
-            const tmpBounds = createBounds(WGS84, [
-                bbox[0],
-                bbox[2] - bbox[0],
-                bbox[1],
-                bbox[3] - bbox[1],
-            ]);
-            this.bounds = OgcOpenApiFeatureStore.targetBounds(tmpBounds, this.reference);
-        }
-    }
-    on(event, callback, context, options) {
-        return this.eventedSupport.on(event, callback, context, options);
-    }
-    get(id, optionsInput) {
-        return new Promise((resolve) => {
-            const options = optionsInput ? Object.assign({}, optionsInput) : {};
-            options.query = (options.query ? options.query : {});
-            options.query.f = options.query.f ? options.query.f : this.dataFormat;
-            options.query.crs = options.query.crs ? options.query.crs : this.customCrs;
-            // Mod starta
-            const itemsAccept = typeof this.requestHeaders.accept !== 'undefined'
-                ? this.requestHeaders.accept.split(';')
-                : typeof this.requestHeaders.Accept !== 'undefined'
-                    ? this.requestHeaders.Accept.split(';')
-                    : [];
-            itemsAccept.push(this.outputFormat);
-            const accept = itemsAccept.join(';');
-            // Mod end
-            let request = this.featureUrl + id;
-            const simpleQuery = [];
-            if (options.query.f)
-                simpleQuery.push("f");
-            if (options.query.crs)
-                simpleQuery.push("crs");
-            if (simpleQuery.length > 0) {
-                const queryString = simpleQuery.map(k => "" + k + "=" + options.query[k]).join("&");
-                request += "?" + queryString;
-            }
-            const headers = Object.assign(Object.assign({}, this.requestHeaders), { Accept: accept });
-            OgcOpenApiFetchTools.fetch(request, {
-                method: 'GET',
-                credentials: this.credentials ? "same-origin" : "omit",
-                headers,
-            }, this.serverOptions).then((response) => {
-                if (response.status === 200) {
-                    response.text().then((content) => {
-                        let contentType = response.headers.get('Content-Type');
-                        const contentCrs = response.headers.get('content-crs') ? response.headers.get('content-crs') : this.customCrs;
-                        const contentLengthStr = response.headers.get('Content-Length');
-                        const contentLength = Number(contentLengthStr);
-                        contentType = contentType ? contentType : 'text/plain';
-                        content = content
-                            .split('http://www.opengis.net/def/crs/OGC/1.3/CRS84')
-                            .join('urn:ogc:def:crs:OGC:1.3:CRS84');
-                        const codecOptions = {
-                            content, contentType, contentCrs, contentLength
-                        };
-                        let cursor = null;
-                        if (this.codec instanceof GeoJsonCodec || this.codec instanceof GMLCodec) {
-                            cursor = this.codec.decode(Object.assign(Object.assign({}, codecOptions), { reference: getReference(OgcOpenApiCrsTools.getReferenceName(contentCrs)) }));
-                        }
-                        else {
-                            cursor = this.codec.decode(codecOptions);
-                        }
-                        if (cursor && cursor.hasNext()) {
-                            const feaure = cursor.next();
-                            resolve(feaure);
-                        }
-                        else {
-                            resolve(null);
-                        }
-                    });
-                }
-            });
-        });
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    query(receivedQuery, options) {
-        return new Promise((resolve, reject) => {
-            const query = receivedQuery ? Object.assign({}, receivedQuery) : {};
-            query.f = query.f ? query.f : this.dataFormat;
-            query.crs = query.crs ? query.crs : this.customCrs;
-            query.limit = query.limit ? query.limit : undefined;
-            let request = this.baseUrl;
-            // Mod starta
-            const itemsAccept = typeof this.requestHeaders.accept !== 'undefined'
-                ? this.requestHeaders.accept.split(';')
-                : typeof this.requestHeaders.Accept !== 'undefined'
-                    ? this.requestHeaders.Accept.split(';')
-                    : [];
-            itemsAccept.push(this.outputFormat);
-            const accept = itemsAccept.join(';');
-            // Mod end
-            const allKeys = Object.keys(query);
-            if (allKeys.length > 0) {
-                const filteredKeys = allKeys.filter(e => (typeof query[e] !== "undefined" && query[e] !== null));
-                const indexOfFormat = filteredKeys.indexOf("f");
-                if (indexOfFormat > -1) {
-                    filteredKeys.splice(indexOfFormat, 1);
-                    filteredKeys.unshift("f");
-                }
-                const queryString = filteredKeys.map(k => "" + k + "=" + query[k]).join("&");
-                request += "?" + queryString;
-            }
-            const headers = Object.assign(Object.assign({}, this.requestHeaders), { Accept: accept });
-            // const headers = { ...this.requestHeaders };
-            OgcOpenApiFetchTools.fetch(request, {
-                method: 'GET',
-                credentials: this.credentials ? "same-origin" : "omit",
-                headers,
-            }, this.serverOptions).then((response) => {
-                if (response.status === 200) {
-                    response.text().then((content) => {
-                        let contentType = response.headers.get('Content-Type');
-                        const contentCrs = response.headers.get('content-crs') ? response.headers.get('content-crs') : this.customCrs;
-                        const contentLengthStr = response.headers.get('Content-Length');
-                        const contentLength = Number(contentLengthStr);
-                        contentType = contentType ? contentType : 'text/plain';
-                        content = content
-                            .split('srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"')
-                            .join('srsName="urn:ogc:def:crs:OGC:1.3:CRS84"');
-                        const codecOptions = {
-                            content, contentType, contentCrs, contentLength
-                        };
-                        if (this.codec instanceof GeoJsonCodec || this.codec instanceof GMLCodec) {
-                            const cursor = this.codec.decode(Object.assign(Object.assign({}, codecOptions), { reference: getReference(OgcOpenApiCrsTools.getReferenceName(contentCrs)) }));
-                            resolve(cursor);
-                        }
-                        else {
-                            const cursor = this.codec.decode(codecOptions);
-                            resolve(cursor);
-                        }
-                    });
-                }
-                else {
-                    reject();
-                }
-            }).catch(() => {
-                reject();
-            });
-        });
-    }
-    spatialQuery(bounds, receivedQuery, options) {
-        const query = (receivedQuery ? Object.assign({}, receivedQuery) : {});
-        delete query.bbox;
-        query.limit = query.limit ? query.limit : undefined;
-        if (bounds) {
-            if (this.useCrs84Bounds) {
-                const crs84Bounds = OgcOpenApiFeatureStore.getCRS84BoundingBox(bounds);
-                query.bbox = query.bbox
-                    ? query.bbox
-                    : [
-                        crs84Bounds.x,
-                        crs84Bounds.y,
-                        crs84Bounds.x + crs84Bounds.width,
-                        crs84Bounds.y + crs84Bounds.height,
-                    ];
-            }
-            else {
-                query.bbox = query.bbox
-                    ? query.bbox
-                    : [
-                        bounds.x,
-                        bounds.y,
-                        bounds.x + bounds.width,
-                        bounds.y + bounds.height,
-                    ];
-                if (this.customCrs) {
-                    query["bbox-crs"] = this.customCrs;
-                }
-                const referenceName = OgcOpenApiCrsTools.getReferenceName(this.customCrs);
-                if (this.swapAxes && this.swapAxes.findIndex(f => f === referenceName) > -1) {
-                    query.bbox = [query.bbox[1], query.bbox[0], query.bbox[3], query.bbox[2]];
-                }
-            }
-        }
-        return this.query(query, options);
-    }
-    static getCRS84BoundingBox(shape) {
-        const WGS84 = getReference("CRS:84");
-        const bounds = shape.bounds;
-        const toWgs84 = createTransformation(bounds.reference, WGS84);
-        const newBounds = toWgs84.transformBounds(bounds);
-        return newBounds;
-    }
-    static targetBounds(bounds, targetReferenceBounds) {
-        const WGS84 = getReference("CRS:84");
-        const toTargetReference = createTransformation(WGS84, targetReferenceBounds);
-        const newBounds = toTargetReference.transformBounds(bounds);
-        return newBounds;
-    }
-    static cleanUrl(dataUrl, addSlash = false) {
-        const parts = dataUrl.split('?');
-        return parts[0].endsWith('/') ? parts[0] : (addSlash ? parts[0] + '/' : parts[0]);
-    }
-    static dataFormatInQuery(dataUrl) {
-        let format;
-        const parts = dataUrl.split('?');
-        if (parts.length > 1) {
-            const query = parts[1];
-            const qs = query.split('&');
-            for (const q of qs) {
-                if (q.startsWith('f=')) {
-                    format = q.substr(2);
-                    return format;
-                }
-            }
-        }
-        return format;
-    }
-}
+import { Store } from '@luciad/ria/model/store/Store.js';
+import { Feature } from '@luciad/ria/model/feature/Feature.js';
+import { Bounds } from '@luciad/ria/shape/Bounds.js';
+import { Codec } from '@luciad/ria/model/codec/Codec.js';
+import { createBounds } from '@luciad/ria/shape/ShapeFactory.js';
+import { CoordinateReference } from '@luciad/ria/reference/CoordinateReference.js';
+import { getReference } from "@luciad/ria/reference/ReferenceProvider.js";
+import { createTransformation } from "@luciad/ria/transformation/TransformationFactory.js";
+import { OgcOpenApiCrsTools } from "./OgcOpenApiCrsTools.js";
+import { GeoJsonCodec } from "@luciad/ria/model/codec/GeoJsonCodec.js";
+import { GMLCodec } from "@luciad/ria/model/codec/GMLCodec.js";
+import { OgcOpenApiFetchTools } from "./OgcOpenApiFetchTools.js";
+export class OgcOpenApiFeatureStore extends Store {
+    constructor(options) {
+        super();
+        // console.log(options);
+        this.swapAxes = options.swapAxes;
+        this.useCrs84Bounds = typeof options.useCrs84Bounds !== "undefined" ? options.useCrs84Bounds : false;
+        this.dataUrl = options.dataUrl;
+        this.outputFormat = options.outputFormat;
+        const predictedFeatureUrl = this.dataUrl.replace(/\.[^/.]+$/, "");
+        this.featureUrl = options.featureUrl ? OgcOpenApiFeatureStore.cleanUrl(options.featureUrl, true) : OgcOpenApiFeatureStore.cleanUrl(predictedFeatureUrl, true);
+        this.baseUrl = OgcOpenApiFeatureStore.cleanUrl(this.dataUrl);
+        this.dataFormat = OgcOpenApiFeatureStore.dataFormatInQuery(this.dataUrl);
+        this.customCrs = options.crs === "http://www.opengis.net/def/crs/OGC/1.3/CRS84" ? undefined : options.crs;
+        this.codec = options.codec;
+        this.requestHeaders = options.requestHeaders ? options.requestHeaders : {};
+        const referenceName = OgcOpenApiCrsTools.getReferenceName(options.crs);
+        this.reference = getReference(referenceName);
+        this.proxy = options.proxify;
+        this.credentials = options.credentials;
+        this.serverOptions = OgcOpenApiFetchTools.createFetchOptions({ originalUrl: this.dataUrl, proxify: options.proxify });
+        if (options.extent &&
+            options.extent.spatial &&
+            options.extent.spatial.bbox &&
+            options.extent.spatial.bbox.length > 0) {
+            const bbox = options.extent.spatial.bbox[0];
+            const WGS84 = getReference("CRS:84");
+            const tmpBounds = createBounds(WGS84, [
+                bbox[0],
+                bbox[2] - bbox[0],
+                bbox[1],
+                bbox[3] - bbox[1],
+            ]);
+            this.dataBounds = OgcOpenApiFeatureStore.targetBounds(tmpBounds, this.reference);
+        }
+    }
+    // Store defines bounds as a getter, the extent is kept in dataBounds
+    get bounds() {
+        return this.dataBounds;
+    }
+    isOperationSupported(methodName) {
+        return methodName === "get" || methodName === "spatialQuery";
+    }
+    get(id, optionsInput) {
+        const options = optionsInput ? { ...optionsInput } : {};
+        options.query = (options.query ? options.query : {});
+        options.query.f = options.query.f ? options.query.f : this.dataFormat;
+        options.query.crs = options.query.crs ? options.query.crs : this.customCrs;
+        let request = this.featureUrl + id;
+        const simpleQuery = [];
+        if (options.query.f)
+            simpleQuery.push("f");
+        if (options.query.crs)
+            simpleQuery.push("crs");
+        if (simpleQuery.length > 0) {
+            const queryString = simpleQuery.map(k => "" + k + "=" + options.query[k]).join("&");
+            request += "?" + queryString;
+        }
+        return this.fetchFeatures(request, options.abortSignal).then(cursor => cursor && cursor.hasNext() ? cursor.next() : null);
+    }
+    query(receivedQuery, options) {
+        const query = receivedQuery ? { ...receivedQuery } : {};
+        query.f = query.f ? query.f : this.dataFormat;
+        query.crs = query.crs ? query.crs : this.customCrs;
+        query.limit = query.limit ? query.limit : undefined;
+        let request = this.baseUrl;
+        const allKeys = Object.keys(query);
+        if (allKeys.length > 0) {
+            const filteredKeys = allKeys.filter(e => (typeof query[e] !== "undefined" && query[e] !== null));
+            const indexOfFormat = filteredKeys.indexOf("f");
+            if (indexOfFormat > -1) {
+                filteredKeys.splice(indexOfFormat, 1);
+                filteredKeys.unshift("f");
+            }
+            const queryString = filteredKeys.map(k => "" + k + "=" + query[k]).join("&");
+            request += "?" + queryString;
+        }
+        return this.fetchFeatures(request, options?.abortSignal);
+    }
+    // Fetches and decodes features. The promise always settles: it rejects with the reason when the request,
+    // the response or the decoding fails, and when LuciadRIA aborts the request through abortSignal.
+    fetchFeatures(request, abortSignal) {
+        // Mod starta
+        const itemsAccept = typeof this.requestHeaders.accept !== 'undefined'
+            ? this.requestHeaders.accept.split(';')
+            : typeof this.requestHeaders.Accept !== 'undefined'
+                ? this.requestHeaders.Accept.split(';')
+                : [];
+        itemsAccept.push(this.outputFormat);
+        const accept = itemsAccept.join(';');
+        // Mod end
+        const headers = { ...this.requestHeaders, Accept: accept };
+        return OgcOpenApiFetchTools.fetch(request, {
+            method: 'GET',
+            credentials: this.credentials ? "same-origin" : "omit",
+            headers,
+            signal: abortSignal,
+        }, this.serverOptions).then((response) => {
+            if (response.status !== 200) {
+                throw new Error("Invalid response: " + response.status + " for " + request);
+            }
+            return response.text().then((content) => {
+                let contentType = response.headers.get('Content-Type');
+                const contentCrs = response.headers.get('content-crs') ? response.headers.get('content-crs') : this.customCrs;
+                const contentLengthStr = response.headers.get('Content-Length');
+                const contentLength = Number(contentLengthStr);
+                contentType = contentType ? contentType : 'text/plain';
+                // GeoJsonCodec reads the CRS84 URI, GML is given the URN
+                content = content
+                    .split('srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"')
+                    .join('srsName="urn:ogc:def:crs:OGC:1.3:CRS84"');
+                const codecOptions = {
+                    content, contentType, contentCrs, contentLength
+                };
+                if (this.codec instanceof GeoJsonCodec || this.codec instanceof GMLCodec) {
+                    return this.codec.decode({ ...codecOptions, reference: getReference(OgcOpenApiCrsTools.getReferenceName(contentCrs)) });
+                }
+                return this.codec.decode(codecOptions);
+            });
+        });
+    }
+    spatialQuery(bounds, receivedQuery, options) {
+        const query = (receivedQuery ? { ...receivedQuery } : {});
+        delete query.bbox;
+        query.limit = query.limit ? query.limit : undefined;
+        if (bounds) {
+            if (this.useCrs84Bounds) {
+                const crs84Bounds = OgcOpenApiFeatureStore.getCRS84BoundingBox(bounds);
+                query.bbox = query.bbox
+                    ? query.bbox
+                    : [
+                        crs84Bounds.x,
+                        crs84Bounds.y,
+                        crs84Bounds.x + crs84Bounds.width,
+                        crs84Bounds.y + crs84Bounds.height,
+                    ];
+            }
+            else {
+                query.bbox = query.bbox
+                    ? query.bbox
+                    : [
+                        bounds.x,
+                        bounds.y,
+                        bounds.x + bounds.width,
+                        bounds.y + bounds.height,
+                    ];
+                if (this.customCrs) {
+                    query["bbox-crs"] = this.customCrs;
+                }
+                const referenceName = OgcOpenApiCrsTools.getReferenceName(this.customCrs);
+                if (this.swapAxes && this.swapAxes.findIndex(f => f === referenceName) > -1) {
+                    query.bbox = [query.bbox[1], query.bbox[0], query.bbox[3], query.bbox[2]];
+                }
+            }
+        }
+        return this.query(query, options);
+    }
+    static getCRS84BoundingBox(shape) {
+        const WGS84 = getReference("CRS:84");
+        const bounds = shape.bounds;
+        const toWgs84 = createTransformation(bounds.reference, WGS84);
+        return toWgs84.transformBounds(bounds);
+    }
+    static targetBounds(bounds, targetReferenceBounds) {
+        const WGS84 = getReference("CRS:84");
+        const toTargetReference = createTransformation(WGS84, targetReferenceBounds);
+        return toTargetReference.transformBounds(bounds);
+    }
+    static cleanUrl(dataUrl, addSlash = false) {
+        const parts = dataUrl.split('?');
+        return parts[0].endsWith('/') ? parts[0] : (addSlash ? parts[0] + '/' : parts[0]);
+    }
+    static dataFormatInQuery(dataUrl) {
+        let format;
+        const parts = dataUrl.split('?');
+        if (parts.length > 1) {
+            const query = parts[1];
+            const qs = query.split('&');
+            for (const q of qs) {
+                if (q.startsWith('f=')) {
+                    format = q.slice(2);
+                    return format;
+                }
+            }
+        }
+        return format;
+    }
+}
+//# sourceMappingURL=OgcOpenApiFeatureStore.js.map

package/lib/OgcOpenApiFeatureStore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OgcOpenApiFeatureStore.js","sourceRoot":"","sources":["../src/OgcOpenApiFeatureStore.ts"],"names":[],"mappings":"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"}

package/lib/OgcOpenApiFetchTools.d.ts

@@ -1,30 +1,37 @@
-import { ProxifyFunction } from "./OgcOpenApiGetCapabilities";
-interface ExtFetchOptions {
-    originalUrl: string;
-    complete?: (url: string) => string;
-    proxify?: ProxifyFunction;
-}
-export interface FetchServerOptions {
-    proxy: (url: string, fetchOptions: any) => {
-        fetchOptions: any;
-        url: string;
-    };
-    hostname: string;
-    complete: (url: string) => string;
-}
-declare class OgcOpenApiFetchTools {
-    static createFetchOptions(options: ExtFetchOptions): {
-        hostname: string;
-        complete: (url: string) => string;
-        proxy: (url: string, fetchOptions: any) => {
-            url: string;
-            fetchOptions: any;
-        };
-    };
-    static fetch(input: string, options: RequestInit, serverOptions: FetchServerOptions): Promise<Response>;
-    static addHostURL(url: string, HostUrl?: string): string;
-    static cleanUrl(inputUrl: string): string;
-    static cleanUrlToAsset(inputUrl: string): string;
-    static getHostURL(fullUrl: string): string;
-}
-export { OgcOpenApiFetchTools };
+import type { ProxifyFunction } from "./OgcOpenApiGetCapabilities.js";
+interface ExtFetchOptions {
+    originalUrl: string;
+    complete?: (url: string) => string;
+    proxify?: ProxifyFunction;
+}
+export interface FetchServerOptions {
+    proxy: (url: string, fetchOptions: any) => {
+        fetchOptions: any;
+        url: string;
+    };
+    hostname: string;
+    complete: (url: string) => string;
+}
+declare class OgcOpenApiFetchTools {
+    static createFetchOptions(options: ExtFetchOptions): {
+        hostname: string;
+        complete: (url: string) => string;
+        proxy: (url: string, fetchOptions: any) => {
+            url: string;
+            fetchOptions: any;
+        };
+    };
+    static fetch(input: string, options: RequestInit, serverOptions: FetchServerOptions): Promise<Response>;
+    /**
+     * A link of a document, resolved against the URL of that document (RFC 3986): ./x, ../x, x, /x and //host/x.
+     * Absolute links are kept as they are. Without an absolute document URL, as behind a relative proxy path, the link
+     * is completed with the host of the server.
+     */
+    static resolveUrl(href: string, documentUrl: string, serverOptions: FetchServerOptions): string;
+    static addHostURL(url: string, HostUrl?: string): string;
+    static cleanUrl(inputUrl: string): string;
+    static cleanUrlToAsset(inputUrl: string): string;
+    static getHostURL(fullUrl: string): string;
+}
+export { OgcOpenApiFetchTools };
+//# sourceMappingURL=OgcOpenApiFetchTools.d.ts.map

package/lib/OgcOpenApiFetchTools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"OgcOpenApiFetchTools.d.ts","sourceRoot":"","sources":["../src/OgcOpenApiFetchTools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,gCAAgC,CAAC;AAEpE,UAAU,eAAe;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACnC,OAAO,CAAC,EAAE,eAAe,CAAA;CAC5B;AACD,MAAM,WAAW,kBAAkB;IAC/B,KAAK,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,KAAA,KAAK;QAAE,YAAY,EAAE,GAAG,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAA;CACpC;AAMD,cAAM,oBAAoB;WAER,kBAAkB,CAAC,OAAO,EAAE,eAAe;;wBAfxC,MAAM,KAAK,MAAM;qBAsB6C,MAAM;;;;;WAOvE,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,kBAAkB;IAM1F;;;;OAIG;WACW,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB;WAQ/E,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;WAYxC,QAAQ,CAAC,QAAQ,EAAC,MAAM;WAIxB,eAAe,CAAC,QAAQ,EAAC,MAAM;WAI/B,UAAU,CAAC,OAAO,EAAE,MAAM;CAO3C;AAED,OAAO,EACH,oBAAoB,EACvB,CAAA"}