@vcmap/core 5.0.0-rc.8 → 5.0.0

package/dist/src/layer/geojsonHelpers.js

@@ -0,0 +1,339 @@
+import GeoJSON from 'ol/format/GeoJSON.js';
+import Polygon from 'ol/geom/Polygon.js';
+import MultiPolygon from 'ol/geom/MultiPolygon.js';
+import Feature from 'ol/Feature.js';
+import Point from 'ol/geom/Point.js';
+import Circle from 'ol/geom/Circle.js';
+import { parseNumber } from '@vcsuite/parsers';
+import { getDistance as haversineDistance } from 'ol/sphere.js';
+import Projection, { mercatorProjection, wgs84Projection, } from '../util/projection.js';
+import VectorStyleItem, { defaultVectorStyle, vectorStyleSymbol, } from '../style/vectorStyleItem.js';
+import { parseColor } from '../style/styleHelpers.js';
+import { featureStoreStateSymbol } from './featureStoreLayerState.js';
+import { embedIconsInStyle } from '../style/writeStyle.js';
+import DeclarativeStyleItem from '../style/declarativeStyleItem.js';
+import { vcsMetaVersion } from './vectorProperties.js';
+import Extent3D from '../util/featureconverter/extent3D.js';
+import { circleFromCenterRadius, enforceEndingVertex, removeEndingVertexFromGeometry, } from '../util/geometryHelpers.js';
+import { alreadyTransformedToMercator } from './vectorSymbols.js';
+const featureProjection = 'EPSG:3857';
+let format;
+function getFormat() {
+    if (!format) {
+        format = new GeoJSON();
+    }
+    return format;
+}
+export function getEPSGCodeFromGeojson(geojson) {
+    const { crs } = geojson;
+    if (crs) {
+        if (crs.type === 'name') {
+            return crs.properties.name;
+        }
+        else if (crs.type === 'EPSG') {
+            // 'EPSG' is not part of the GeojsonLayer specification, but is generated by
+            // GeoServer.
+            // TODO: remove this when http://jira.codehaus.org/browse/GEOS-5996
+            // is fixed and widely deployed.
+            return `EPSG:${crs.properties.code}`;
+        }
+    }
+    return null;
+}
+/**
+ * updates legacy features to the new olcesium namespaceing olcs_
+ * @param  feature
+ */
+export function updateLegacyFeature(feature) {
+    // these changes can be done silently, because the features haven't been added to any layer
+    if (feature.get('altitudeMode')) {
+        feature.set('olcs_altitudeMode', feature.get('altitudeMode'), true);
+        feature.unset('altitudeMode', true);
+    }
+    if (feature.get('extrudedHeight')) {
+        if (feature.get('drawingType')) {
+            feature.set('olcs_extrudedHeight', feature.get('extrudedHeight'), true);
+        }
+        else {
+            const extent = Extent3D.fromGeometry(feature.getGeometry());
+            const minHeight = Number.isFinite(extent.minZ) ? extent.minZ : 0;
+            feature.set('olcs_extrudedHeight', feature.get('extrudedHeight') - minHeight, true);
+        }
+        feature.unset('extrudedHeight', true);
+    }
+    if (feature.get('skirt')) {
+        feature.set('olcs_skirt', feature.get('skirt'), true);
+        feature.unset('skirt', true);
+    }
+    if (feature.get('radius')) {
+        feature.unset('radius', true);
+    }
+}
+function readGeometry(geometryObj, options) {
+    const geometry = getFormat().readGeometry(geometryObj, options.formatOptions);
+    if (String(options.formatOptions?.featureProjection) === 'EPSG:3857') {
+        geometry[alreadyTransformedToMercator] = true;
+    }
+    removeEndingVertexFromGeometry(geometry);
+    return new Feature({ geometry });
+}
+function setEmbeddedIcons(object, options) {
+    if (object.image && object.image.src && /^:\d+$/.test(object.image.src)) {
+        if (options.embeddedIcons) {
+            object.image.src =
+                options.embeddedIcons[Number(object.image.src.substring(1))];
+        }
+        else {
+            delete object.image.src;
+        }
+    }
+    return object;
+}
+function parseLegacyStyleOptions(properties, geometryType) {
+    const color = properties.color
+        ? parseColor(properties.color)
+        : false;
+    const width = parseNumber(properties.width, 1.25);
+    const radius = parseNumber(properties.pointRadius, 5);
+    const opacity = parseNumber(properties.opacity, 0.8);
+    delete properties.color;
+    delete properties.width;
+    delete properties.pointRadius;
+    delete properties.opacity;
+    if (geometryType === 'Polygon' || geometryType === 'Circle') {
+        const fillColor = color ? color.slice() : [255, 255, 255, 0.4];
+        fillColor[3] = opacity;
+        return {
+            fill: { color: fillColor },
+            stroke: {
+                color: color || parseColor('#3399CC'),
+                width,
+            },
+        };
+    }
+    if (geometryType === 'LineString') {
+        return {
+            stroke: {
+                color: color || parseColor('#3399CC'),
+                width,
+            },
+        };
+    }
+    if (geometryType === 'Point') {
+        return {
+            image: {
+                fill: {
+                    color: [255, 255, 255, 0.4],
+                },
+                radius,
+                stroke: {
+                    color: color || parseColor('#3399CC'),
+                    width: 1,
+                },
+            },
+        };
+    }
+    return undefined;
+}
+function readFeature(featureObj, options) {
+    if (!featureObj.geometry) {
+        return null;
+    }
+    const radius = featureObj.geometry.olcs_radius;
+    let geometry = getFormat().readGeometry(featureObj.geometry, options.formatOptions);
+    if (featureObj.radius && geometry instanceof Point) {
+        const coordinates = geometry.getCoordinates();
+        if (coordinates.length === 2) {
+            coordinates.push(0);
+        }
+        geometry = new Circle(coordinates, featureObj.radius, 'XYZ');
+    }
+    if (radius && geometry instanceof Point) {
+        const coordinates = geometry.getCoordinates();
+        if (coordinates.length === 2) {
+            coordinates.push(0);
+        }
+        geometry = circleFromCenterRadius(coordinates, radius);
+    }
+    if (String(options.formatOptions?.featureProjection) === 'EPSG:3857') {
+        geometry[alreadyTransformedToMercator] = true;
+    }
+    featureObj.vcsMeta = featureObj.vcsMeta || {};
+    const { properties } = featureObj;
+    if (properties &&
+        options.readLegacyStyleOptions &&
+        !featureObj.vcsMeta.style) {
+        featureObj.vcsMeta.style = parseLegacyStyleOptions(properties, geometry.getType());
+    }
+    removeEndingVertexFromGeometry(geometry);
+    const feature = new Feature({ ...properties, geometry });
+    if (featureObj.id) {
+        feature.setId(featureObj.id);
+    }
+    if (featureObj.state) {
+        feature[featureStoreStateSymbol] = featureObj.state;
+    }
+    if (featureObj.vcsMeta.style && !options.dontReadStyle) {
+        featureObj.vcsMeta.style = setEmbeddedIcons(featureObj.vcsMeta.style, options);
+        let styleItem;
+        if (options.defaultStyle) {
+            styleItem = options.defaultStyle
+                .clone()
+                .assign(new VectorStyleItem(featureObj.vcsMeta.style));
+            if (styleItem.label != null) {
+                geometry.set('_vcsGeomType', 'Label');
+            }
+        }
+        else {
+            styleItem = new VectorStyleItem(featureObj.vcsMeta.style);
+        }
+        feature[vectorStyleSymbol] = styleItem;
+        feature.setStyle(styleItem.style);
+    }
+    updateLegacyFeature(feature);
+    return feature;
+}
+/**
+ * parses a string to GeojsonLayer
+ */
+export function parseGeoJSON(input, readOptions = {}) {
+    const geoJSON = (typeof input === 'string' ? JSON.parse(input) : input);
+    const epsgCode = getEPSGCodeFromGeojson(geoJSON);
+    const defaultDataProjection = epsgCode
+        ? { epsg: epsgCode }
+        : readOptions.dataProjection;
+    const options = {
+        formatOptions: {
+            dataProjection: defaultDataProjection
+                ? defaultDataProjection.epsg
+                : wgs84Projection.epsg,
+            featureProjection: readOptions.targetProjection
+                ? readOptions.targetProjection.epsg
+                : mercatorProjection.epsg,
+        },
+        dontReadStyle: readOptions.dontReadStyle,
+        readLegacyStyleOptions: readOptions.readLegacyStyleOptions,
+        defaultStyle: readOptions.defaultStyle,
+    };
+    if (readOptions.dynamicStyle && !options.defaultStyle) {
+        options.defaultStyle = defaultVectorStyle;
+    }
+    if (geoJSON.type === 'FeatureCollection') {
+        geoJSON.vcsMeta =
+            geoJSON.vcsMeta ||
+                {
+                    embeddedIcons: geoJSON.vcsEmbeddedIcons,
+                };
+        let style;
+        if (geoJSON.vcsMeta.embeddedIcons) {
+            options.embeddedIcons = geoJSON.vcsMeta.embeddedIcons;
+        }
+        if (geoJSON.vcsMeta.style && readOptions.dynamicStyle) {
+            if (geoJSON.vcsMeta.style.type === DeclarativeStyleItem.className) {
+                style = new DeclarativeStyleItem(geoJSON.vcsMeta.style);
+            }
+            else {
+                geoJSON.vcsMeta.style = setEmbeddedIcons(geoJSON.vcsMeta.style, options);
+                options.defaultStyle = (options.defaultStyle ?? defaultVectorStyle)
+                    .clone()
+                    .assign(new VectorStyleItem(geoJSON.vcsMeta.style));
+                style = options.defaultStyle;
+            }
+        }
+        return {
+            features: geoJSON.features
+                .map((f) => readFeature(f, options))
+                .filter((f) => f),
+            style: geoJSON.vcsMeta.style ? style : undefined,
+            vcsMeta: geoJSON.vcsMeta ? geoJSON.vcsMeta : undefined,
+        };
+    }
+    else if (geoJSON.type === 'Feature') {
+        const feature = readFeature(geoJSON, options);
+        return {
+            features: feature ? [feature] : [],
+            vcsMeta: geoJSON.vcsMeta ? geoJSON.vcsMeta : undefined,
+        };
+    }
+    else if (geoJSON.type != null) {
+        return { features: [readGeometry(geoJSON, options)] };
+    }
+    return { features: [] };
+}
+/**
+ * @param  feature
+ * @param  options
+ * @param  embeddedIcons
+ */
+export function writeGeoJSONFeature(feature, options = {}, embeddedIcons = []) {
+    let geometry = feature.getGeometry();
+    if (!geometry) {
+        throw new Error('Cannot write geometry less feature to geojson');
+    }
+    let radius = null;
+    if (geometry instanceof Circle) {
+        const coordinates = geometry.getCoordinates();
+        radius = haversineDistance(Projection.mercatorToWgs84(coordinates[0], true), Projection.mercatorToWgs84(coordinates[1], true));
+        geometry = new Point(geometry.getCenter());
+    }
+    else if (geometry instanceof Polygon) {
+        const coordinates = geometry.getCoordinates();
+        coordinates.forEach((ring) => {
+            enforceEndingVertex(ring);
+        });
+        geometry.setCoordinates(coordinates);
+    }
+    else if (geometry instanceof MultiPolygon) {
+        const coordinates = geometry.getCoordinates();
+        coordinates.forEach((poly) => {
+            poly.forEach((ring) => {
+                enforceEndingVertex(ring);
+            });
+        });
+        geometry.setCoordinates(coordinates);
+    }
+    const geojsonGeometry = getFormat().writeGeometryObject(geometry, {
+        featureProjection,
+        rightHanded: true,
+    });
+    const properties = feature.getProperties();
+    delete properties[feature.getGeometryName()];
+    delete properties.style;
+    delete properties.olcs_allowPicking;
+    const featureObject = {
+        type: 'Feature',
+        properties,
+        geometry: geojsonGeometry,
+    };
+    if (options.writeId) {
+        featureObject.id = feature.getId();
+    }
+    if (radius) {
+        featureObject.geometry.olcs_radius = radius;
+    }
+    featureObject.vcsMeta = {
+        version: vcsMetaVersion,
+    };
+    if (options.writeStyle && feature[vectorStyleSymbol]) {
+        featureObject.vcsMeta.style = embedIconsInStyle(feature[vectorStyleSymbol].getOptionsForFeature(feature), embeddedIcons);
+    }
+    return featureObject;
+}
+/**
+ * Writes all the features of the current layer to GeojsonLayer
+ */
+export function writeGeoJSON(data, options = {}) {
+    // how to handel embedded icons when they are not set on the vcsMeta but options is true?
+    const vcsMeta = data.vcsMeta || { version: vcsMetaVersion };
+    vcsMeta.version = vcsMetaVersion;
+    const featureObjs = data.features.map((feature) => writeGeoJSONFeature(feature, options, vcsMeta.embeddedIcons));
+    const obj = {
+        type: 'FeatureCollection',
+        features: featureObjs,
+        vcsMeta,
+    };
+    return options.asObject
+        ? obj
+        : JSON.stringify(obj, undefined, options.prettyPrint ? 2 : undefined);
+}
+//# sourceMappingURL=geojsonHelpers.js.map

package/dist/src/layer/geojsonHelpers.js.map

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

package/dist/src/layer/geojsonLayer.d.ts

@@ -0,0 +1,29 @@
+import type { GeoJSONFeature } from 'ol/format/GeoJSON.js';
+import VectorLayer, { VectorOptions } from './vectorLayer.js';
+export type GeoJSONOptions = VectorOptions & {
+    features?: GeoJSONFeature[];
+};
+/**
+ * indicates, that this feature is part of the options
+ */
+export declare const featureFromOptions: unique symbol;
+/**
+ * @group Layer
+ */
+declare class GeoJSONLayer extends VectorLayer {
+    static get className(): string;
+    static getDefaultOptions(): GeoJSONOptions;
+    private _dataFetchedPromise;
+    private _featuresToLoad;
+    constructor(options: GeoJSONOptions);
+    initialize(): Promise<void>;
+    reload(): Promise<void>;
+    /**
+     * Fetches the data for the layer. If data is already fetched returns a resolved Promise
+     */
+    fetchData(): Promise<void>;
+    private _parseGeojsonData;
+    toJSON(): GeoJSONOptions;
+    destroy(): void;
+}
+export default GeoJSONLayer;

package/dist/src/layer/geojsonLayer.js

@@ -0,0 +1,121 @@
+import VectorLayer from './vectorLayer.js';
+import { parseGeoJSON, writeGeoJSONFeature } from './geojsonHelpers.js';
+import Projection, { wgs84Projection } from '../util/projection.js';
+import { layerClassRegistry } from '../classRegistry.js';
+import { requestJson } from '../util/fetch.js';
+/**
+ * indicates, that this feature is part of the options
+ */
+export const featureFromOptions = Symbol('featureFromOptions');
+/**
+ * @group Layer
+ */
+class GeoJSONLayer extends VectorLayer {
+    static get className() {
+        return 'GeoJSONLayer';
+    }
+    static getDefaultOptions() {
+        return {
+            ...VectorLayer.getDefaultOptions(),
+            projection: wgs84Projection.toJSON(),
+            features: undefined,
+        };
+    }
+    _dataFetchedPromise = null;
+    _featuresToLoad;
+    constructor(options) {
+        const defaultOptions = GeoJSONLayer.getDefaultOptions();
+        options.projection = options.projection || defaultOptions.projection;
+        super(options);
+        this._featuresToLoad = options.features || defaultOptions.features;
+    }
+    async initialize() {
+        if (!this.initialized) {
+            await this.fetchData();
+        }
+        return super.initialize();
+    }
+    async reload() {
+        if (this._dataFetchedPromise) {
+            const configFeatures = this.getFeatures().filter((f) => f[featureFromOptions]);
+            this.removeAllFeatures();
+            this.source.addFeatures(configFeatures);
+            this._dataFetchedPromise = null;
+            await this.fetchData();
+        }
+        return super.reload();
+    }
+    /**
+     * Fetches the data for the layer. If data is already fetched returns a resolved Promise
+     */
+    fetchData() {
+        if (this._dataFetchedPromise) {
+            return this._dataFetchedPromise;
+        }
+        if (Array.isArray(this._featuresToLoad)) {
+            this._parseGeojsonData({
+                type: 'FeatureCollection',
+                features: this._featuresToLoad,
+            });
+            this.getFeatures().forEach((f) => {
+                f[featureFromOptions] = true;
+            });
+            this._featuresToLoad = undefined;
+        }
+        if (this.url) {
+            this._dataFetchedPromise = requestJson(this.url)
+                .then((data) => this._parseGeojsonData(data))
+                .catch((err) => {
+                this.getLogger().warning(`Could not send request for loading layer content (${String(err)})`);
+                return Promise.reject(err);
+            });
+        }
+        else {
+            this._dataFetchedPromise = Promise.resolve();
+        }
+        return this._dataFetchedPromise;
+    }
+    _parseGeojsonData(obj) {
+        const data = parseGeoJSON(obj, {
+            dataProjection: this.projection,
+            dynamicStyle: true,
+        });
+        this.addFeatures(data.features);
+        if (data.style) {
+            this.setStyle(data.style);
+        }
+        if (data.vcsMeta) {
+            // configured layer vectorProperties trumps vectorProperties from geojson file;
+            const meta = { ...data.vcsMeta, ...this.vectorProperties.getVcsMeta() };
+            this.setVcsMeta(meta);
+        }
+    }
+    toJSON() {
+        const config = super.toJSON();
+        const defaultOptions = GeoJSONLayer.getDefaultOptions();
+        const defaultProjection = new Projection(defaultOptions.projection);
+        if (!this.projection.equals(defaultProjection)) {
+            config.projection = this.projection.toJSON();
+        }
+        else {
+            delete config.projection;
+        }
+        if (Array.isArray(this._featuresToLoad)) {
+            config.features = this._featuresToLoad.slice();
+        }
+        else {
+            const features = this.getFeatures().filter((f) => f[featureFromOptions]);
+            if (features.length > 0) {
+                config.features = features.map((f) => writeGeoJSONFeature(f, { writeStyle: true, writeId: true }));
+            }
+        }
+        return config;
+    }
+    destroy() {
+        super.destroy();
+        this._featuresToLoad = [];
+    }
+}
+layerClassRegistry.registerClass(GeoJSONLayer.className, GeoJSONLayer);
+export default GeoJSONLayer;
+//# sourceMappingURL=geojsonLayer.js.map

package/dist/src/layer/geojsonLayer.js.map

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

package/dist/src/layer/globalHider.d.ts

@@ -0,0 +1,31 @@
+import { HighlightableFeature, FeatureVisibilityEvent } from './featureVisibility.js';
+import VcsEvent from '../vcsEvent.js';
+/**
+ * GlobalHider globally hides features existing within a layer of a {@link LayerCollection}.
+ * Features can be defined as hidden by {@link VcsModuleConfig} or {@link LayerOptions}.
+ * Hiding will be performed, when a {@link VcsModule} is loaded, a {@link Layer} is activated or GlobalHider API is called.
+ * A feature can be hidden multiple times by different actors, e.g. modules, layers, which is handled by this class.
+ * A feature will be shown again, when a {@link VcsModule} is removed, a {@link Layer} is deactivated or GlobalHider API is called.
+ */
+declare class GlobalHider {
+    hiddenObjects: Record<string, number>;
+    private _hiddenObjectFeatures;
+    lastUpdated: number;
+    /**
+     * An event raised when the hidden ids change. Is called with
+     * {@link FeatureVisibilityEvent} as its only argument
+     */
+    changed: VcsEvent<FeatureVisibilityEvent>;
+    /**
+     * Add a tick to the hide count, hidding the features if they are not already hidden
+     */
+    hideObjects(uuids: string[]): void;
+    /**
+     * Subtract from the hide count for an Array of ids. If the array reaches 0, features with said UUID will be shown
+     */
+    showObjects(uuids: string[]): void;
+    addFeature(uuid: number | string, feature: HighlightableFeature): void;
+    hasFeature(uuid: string | number, feature: HighlightableFeature): boolean;
+    destroy(): void;
+}
+export default GlobalHider;

package/dist/src/layer/globalHider.js

@@ -0,0 +1,93 @@
+import { check } from '@vcsuite/check';
+import { globalHidden, hideFeature, cacheOriginalStyle, showFeature, FeatureVisibilityAction, } from './featureVisibility.js';
+import VcsEvent from '../vcsEvent.js';
+/**
+ * GlobalHider globally hides features existing within a layer of a {@link LayerCollection}.
+ * Features can be defined as hidden by {@link VcsModuleConfig} or {@link LayerOptions}.
+ * Hiding will be performed, when a {@link VcsModule} is loaded, a {@link Layer} is activated or GlobalHider API is called.
+ * A feature can be hidden multiple times by different actors, e.g. modules, layers, which is handled by this class.
+ * A feature will be shown again, when a {@link VcsModule} is removed, a {@link Layer} is deactivated or GlobalHider API is called.
+ */
+class GlobalHider {
+    hiddenObjects = {};
+    _hiddenObjectFeatures = {};
+    lastUpdated = Date.now();
+    /**
+     * An event raised when the hidden ids change. Is called with
+     * {@link FeatureVisibilityEvent} as its only argument
+     */
+    changed = new VcsEvent();
+    /**
+     * Add a tick to the hide count, hidding the features if they are not already hidden
+     */
+    hideObjects(uuids) {
+        check(uuids, [String]);
+        const updatedIds = [];
+        uuids.forEach((uuid) => {
+            if (!this.hiddenObjects[uuid]) {
+                updatedIds.push(uuid);
+                this.hiddenObjects[uuid] = 0;
+            }
+            this.hiddenObjects[uuid] += 1;
+        });
+        if (updatedIds.length > 0) {
+            this.lastUpdated = Date.now();
+            this.changed.raiseEvent({
+                action: FeatureVisibilityAction.HIDE,
+                ids: updatedIds,
+            });
+        }
+    }
+    /**
+     * Subtract from the hide count for an Array of ids. If the array reaches 0, features with said UUID will be shown
+     */
+    showObjects(uuids) {
+        check(uuids, [String]);
+        const updatedIds = [];
+        uuids.forEach((uuid) => {
+            if (this.hiddenObjects[uuid]) {
+                this.hiddenObjects[uuid] -= 1;
+                if (this.hiddenObjects[uuid] === 0) {
+                    if (this._hiddenObjectFeatures[uuid]) {
+                        this._hiddenObjectFeatures[uuid].forEach((f) => {
+                            showFeature(f, globalHidden);
+                        });
+                        this._hiddenObjectFeatures[uuid].clear();
+                    }
+                    delete this.hiddenObjects[uuid];
+                    updatedIds.push(uuid);
+                }
+            }
+        });
+        if (updatedIds.length > 0) {
+            this.changed.raiseEvent({
+                action: FeatureVisibilityAction.SHOW,
+                ids: updatedIds,
+            });
+        }
+    }
+    addFeature(uuid, feature) {
+        if (!this._hiddenObjectFeatures[uuid]) {
+            this._hiddenObjectFeatures[uuid] = new Set();
+        }
+        cacheOriginalStyle(feature);
+        this._hiddenObjectFeatures[uuid].add(feature);
+        feature[globalHidden] = true;
+        hideFeature(feature);
+    }
+    hasFeature(uuid, feature) {
+        return this._hiddenObjectFeatures[uuid]
+            ? this._hiddenObjectFeatures[uuid].has(feature)
+            : false;
+    }
+    destroy() {
+        this.hiddenObjects = {};
+        Object.values(this._hiddenObjectFeatures).forEach((set) => {
+            set.clear();
+        });
+        this._hiddenObjectFeatures = {};
+        this.changed.destroy();
+    }
+}
+export default GlobalHider;
+//# sourceMappingURL=globalHider.js.map

package/dist/src/layer/globalHider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"globalHider.js","sourceRoot":"","sources":["../../../src/layer/globalHider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,WAAW,EACX,uBAAuB,GAGxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAEtC;;;;;;GAMG;AACH,MAAM,WAAW;IACf,aAAa,GAA2B,EAAE,CAAC;IAEnC,qBAAqB,GAA8C,EAAE,CAAC;IAE9E,WAAW,GAAW,IAAI,CAAC,GAAG,EAAE,CAAC;IAEjC;;;OAGG;IACH,OAAO,GAAqC,IAAI,QAAQ,EAAE,CAAC;IAE3D;;OAEG;IACH,WAAW,CAAC,KAAe;QACzB,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAEvB,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;gBAC7B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC9B;YACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBACtB,MAAM,EAAE,uBAAuB,CAAC,IAAI;gBACpC,GAAG,EAAE,UAAU;aAChB,CAAC,CAAC;SACJ;IACH,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,KAAe;QACzB,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAEvB,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;gBAC5B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9B,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBAClC,IAAI,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE;wBACpC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;4BAC7C,WAAW,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;wBAC/B,CAAC,CAAC,CAAC;wBACH,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;qBAC1C;oBACD,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBAChC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACvB;aACF;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;YACzB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;gBACtB,MAAM,EAAE,uBAAuB,CAAC,IAAI;gBACpC,GAAG,EAAE,UAAU;aAChB,CAAC,CAAC;SACJ;IACH,CAAC;IAED,UAAU,CAAC,IAAqB,EAAE,OAA6B;QAC7D,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE;YACrC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,EAAE,CAAC;SAC9C;QACD,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC;QAC7B,WAAW,CAAC,OAAO,CAAC,CAAC;IACvB,CAAC;IAED,UAAU,CAAC,IAAqB,EAAE,OAA6B;QAC7D,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC;YACrC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;YAC/C,CAAC,CAAC,KAAK,CAAC;IACZ,CAAC;IAED,OAAO;QACL,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxD,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,qBAAqB,GAAG,EAAE,CAAC;QAChC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}