ol 7.4.1-dev.1686166152921 → 7.4.1-dev.1686296564657

package/layer/Heatmap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Heatmap.d.ts","sourceRoot":"","sources":["Heatmap.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA+B8B,OAAO,eAAe,EAAE,OAAO,KAAE,MAAM;;;;;;;;;;;;AAuBrE;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,2CAqCC;IA1BC;;;OAGG;IACH,kBAAqB;IAYnB,uCAEC;IAUL;;;;;OAKG;IACH,WAJY,MAAM,CAMjB;IAED;;;;;OAKG;IACH,eAJY,MAAM,MAAM,CAAC,CAMxB;IAED;;;;;OAKG;IACH,aAJY,MAAM,CAMjB;IAED;;OAEG;IACH,+BAEC;IAED;;;;;OAKG;IACH,cAJW,MAAM,QAMhB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,MAAM,CAAC,QAMvB;IAED;;;;;OAKG;IACH,kBAJW,MAAM,QAMhB;IAED,sBAoIC;IAED,wBAAoB;CACrB;qCAlToC,kCAAkC;uBADhD,iBAAiB"}
+{"version":3,"file":"Heatmap.d.ts","sourceRoot":"","sources":["Heatmap.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;8BA+B8B,OAAO,eAAe,EAAE,OAAO,KAAE,MAAM;;;;;;;;;;;;AAuBrE;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,2CAqCC;IA1BC;;;OAGG;IACH,kBAAqB;IAYnB,uCAEC;IAUL;;;;;OAKG;IACH,WAJY,MAAM,CAMjB;IAED;;;;;OAKG;IACH,eAJY,MAAM,MAAM,CAAC,CAMxB;IAED;;;;;OAKG;IACH,aAJY,MAAM,CAMjB;IAED;;OAEG;IACH,+BAEC;IAED;;;;;OAKG;IACH,cAJW,MAAM,QAMhB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,MAAM,CAAC,QAMvB;IAED;;;;;OAKG;IACH,kBAJW,MAAM,QAMhB;IAED,sBAmGC;IAED,wBAAoB;CACrB;qCAjRoC,kCAAkC;uBADhD,iBAAiB"}

package/layer/Heatmap.js

@@ -185,6 +185,7 @@ class Heatmap extends BaseVector {
           },
         },
       ],
+      hitDetectionEnabled: true,
       vertexShader: `
         precision mediump float;
         uniform mat4 u_projectionMatrix;
@@ -193,43 +194,6 @@ class Heatmap extends BaseVector {
         attribute vec2 a_position;
         attribute float a_index;
         attribute float a_weight;
-
-        varying vec2 v_texCoord;
-        varying float v_weight;
-
-        void main(void) {
-          mat4 offsetMatrix = u_offsetScaleMatrix;
-          float offsetX = a_index == 0.0 || a_index == 3.0 ? -u_size / 2.0 : u_size / 2.0;
-          float offsetY = a_index == 0.0 || a_index == 1.0 ? -u_size / 2.0 : u_size / 2.0;
-          vec4 offsets = offsetMatrix * vec4(offsetX, offsetY, 0.0, 0.0);
-          gl_Position = u_projectionMatrix * vec4(a_position, 0.0, 1.0) + offsets;
-          float u = a_index == 0.0 || a_index == 3.0 ? 0.0 : 1.0;
-          float v = a_index == 0.0 || a_index == 1.0 ? 0.0 : 1.0;
-          v_texCoord = vec2(u, v);
-          v_weight = a_weight;
-        }`,
-      fragmentShader: `
-        precision mediump float;
-        uniform float u_blurSlope;
-
-        varying vec2 v_texCoord;
-        varying float v_weight;
-
-        void main(void) {
-          vec2 texCoord = v_texCoord * 2.0 - vec2(1.0, 1.0);
-          float sqRadius = texCoord.x * texCoord.x + texCoord.y * texCoord.y;
-          float value = (1.0 - sqrt(sqRadius)) * u_blurSlope;
-          float alpha = smoothstep(0.0, 1.0, value) * v_weight;
-          gl_FragColor = vec4(alpha, alpha, alpha, alpha);
-        }`,
-      hitVertexShader: `
-        precision mediump float;
-        uniform mat4 u_projectionMatrix;
-        uniform mat4 u_offsetScaleMatrix;
-        uniform float u_size;
-        attribute vec2 a_position;
-        attribute float a_index;
-        attribute float a_weight;
         attribute vec4 a_hitColor;
 
         varying vec2 v_texCoord;
@@ -248,9 +212,10 @@ class Heatmap extends BaseVector {
           v_hitColor = a_hitColor;
           v_weight = a_weight;
         }`,
-      hitFragmentShader: `
+      fragmentShader: `
         precision mediump float;
         uniform float u_blurSlope;
+        uniform mediump int u_hitDetection;
 
         varying vec2 v_texCoord;
         varying float v_weight;
@@ -261,12 +226,14 @@ class Heatmap extends BaseVector {
           float sqRadius = texCoord.x * texCoord.x + texCoord.y * texCoord.y;
           float value = (1.0 - sqrt(sqRadius)) * u_blurSlope;
           float alpha = smoothstep(0.0, 1.0, value) * v_weight;
-          if (alpha < 0.05) {
-            discard;
+          gl_FragColor = vec4(alpha, alpha, alpha, alpha);
+          if (u_hitDetection > 0) {
+            if (alpha < 0.05) {
+              discard;
+            }
+            gl_FragColor = v_hitColor;
           }
-
-          gl_FragColor = v_hitColor;
-        }`,
+      }`,
       uniforms: {
         u_size: () => {
           return (this.get(Property.RADIUS) + this.get(Property.BLUR)) * 2;

package/layer/WebGLPoints.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebGLPoints.d.ts","sourceRoot":"","sources":["WebGLPoints.js"],"names":[],"mappings":";;;;;WAUc,OAAO,qBAAqB,EAAE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAHxD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH;IACE;;OAEG;IACH,qBAFW,QAAQ,gBAAgB,CAAC,EAwBnC;IAjBC;;;OAGG;IACH,qBAAoD;IAEpD;;;OAGG;IACH,wBAAoD;IAEpD;;;OAGG;IACH,8BAA0D;IAG5D,sBAsBC;IAED;;;OAGG;IACH;YAFkB,MAAM,GAAE,MAAM;aAK/B;CACF;qCAjIoC,kCAAkC;kBADrD,YAAY"}
+{"version":3,"file":"WebGLPoints.d.ts","sourceRoot":"","sources":["WebGLPoints.js"],"names":[],"mappings":";;;;;WAUc,OAAO,qBAAqB,EAAE,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAHxD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH;IACE;;OAEG;IACH,qBAFW,QAAQ,gBAAgB,CAAC,EAwBnC;IAjBC;;;OAGG;IACH,qBAAoD;IAEpD;;;OAGG;IACH,wBAAoD;IAEpD;;;OAGG;IACH,8BAA0D;IAG5D,sBAiBC;IAED;;;OAGG;IACH;YAFkB,MAAM,GAAE,MAAM;aAK/B;CACF;qCA5HoC,kCAAkC;kBADrD,YAAY"}

package/layer/WebGLPoints.js

@@ -109,12 +109,7 @@ class WebGLPointsLayer extends Layer {
     return new WebGLPointsLayerRenderer(this, {
       vertexShader: this.parseResult_.builder.getSymbolVertexShader(),
       fragmentShader: this.parseResult_.builder.getSymbolFragmentShader(),
-      hitVertexShader:
-        !this.hitDetectionDisabled_ &&
-        this.parseResult_.builder.getSymbolVertexShader(true),
-      hitFragmentShader:
-        !this.hitDetectionDisabled_ &&
-        this.parseResult_.builder.getSymbolFragmentShader(true),
+      hitDetectionEnabled: !this.hitDetectionDisabled_,
       uniforms: this.parseResult_.uniforms,
       attributes:
         /** @type {Array<import('../renderer/webgl/PointsLayer.js').CustomAttribute>} */ (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "7.4.1-dev.1686166152921",
+  "version": "7.4.1-dev.1686296564657",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/renderer/Layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":";AAQA;;GAEG;AACH;IACE;;OAEG;IACH,mBAFW,SAAS,EAwBnB;IAnBC;;;OAGG;IACH,OAFU,OAAO,CAEA;IAEjB,eAAe;IACf,gCAAiE;IAEjE;;;OAGG;IACH,kBAFU,SAAS,CAEA;IAEnB;;OAEG;IACH,wBAFU,OAAO,gCAAgC,EAAE,OAAO,CAExB;IAGpC;;;;;OAKG;IACH,mBAJW,OAAO,aAAa,EAAE,KAAK,GAC1B,QAAQ,MAAM,OAAO,YAAY,EAAE,WAAW,CAAC,CAAC,CAK3D;IAED;;;OAGG;IACH,eAHW,OAAO,aAAa,EAAE,KAAK,GAC1B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,GAAC,IAAI,CAIlE;IAED;;;;;OAKG;IACH,yBAHW,OAAO,WAAW,EAAE,UAAU,GAC7B,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,wBAJW,OAAO,WAAW,EAAE,UAAU,UAC9B,WAAW,GACV,WAAW,CAItB;IAED;;;;;OAKG;IACH;YALkB,MAAM;gBAAS,MAAM,GAAE,OAAO,YAAY,EAAE,OAAO;;aAC1D,MAAM,QACN,OAAO,YAAY,EAAE,OAAO,GAC3B,OAAO,GAAC,IAAI,CAQvB;IAED;;;;;;;;OAQG;IACH,yCAPW,OAAO,mBAAmB,EAAE,OAAO,cACnC,OAAO,uBAAuB,EAAE,OAAO;YAChC,MAAM;gBAAS,MAAM,GAAE,OAAO,YAAY,EAAE,OAAO;;eAChD,MAAM,QAAE,OAAO,iBAAiB,EAAE,OAAO,KAAE,OAAO,CAgBtE;IACD;;;;;;;;;OASG;IACH,0CARW,OAAO,kBAAkB,EAAE,UAAU,cACrC,OAAO,WAAW,EAAE,UAAU,gBAC9B,MAAM,gHAchB;IAED;;OAEG;IACH,YAFY,SAAS,CAIpB;IAED;;;OAGG;IACH,2BAAuB;IAEvB;;;;OAIG;IACH,2BAKC;IAED;;;;;;OAMG;IACH,2BAJW,OAAO,iBAAiB,EAAE,OAAO,GAChC,OAAO,CAalB;IAED;;OAEG;IACH,0CAKC;CASF;uBA9LsB,kBAAkB"}
+{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":";AAQA;;GAEG;AACH;IACE;;OAEG;IACH,mBAFW,SAAS,EAwBnB;IAnBC;;;OAGG;IACH,OAFU,OAAO,CAEA;IAEjB,eAAe;IACf,gCAAiE;IAEjE;;;OAGG;IACH,kBAFU,SAAS,CAEA;IAEnB;;OAEG;IACH,wBAFU,OAAO,gCAAgC,EAAE,OAAO,CAExB;IAGpC;;;;;OAKG;IACH,mBAJW,OAAO,aAAa,EAAE,KAAK,GAC1B,QAAQ,MAAM,OAAO,YAAY,EAAE,WAAW,CAAC,CAAC,CAK3D;IAED;;;OAGG;IACH,eAHW,OAAO,aAAa,EAAE,KAAK,GAC1B,iBAAiB,GAAC,UAAU,GAAC,YAAY,GAAC,QAAQ,GAAC,IAAI,CAIlE;IAED;;;;;OAKG;IACH,yBAHW,OAAO,WAAW,EAAE,UAAU,GAC7B,OAAO,CAIlB;IAED;;;;;;OAMG;IACH,wBAJW,OAAO,WAAW,EAAE,UAAU,UAC9B,WAAW,GACV,WAAW,CAItB;IAED;;;;;OAKG;IACH;YALkB,MAAM;gBAAS,MAAM,GAAE,OAAO,YAAY,EAAE,OAAO;;aAC1D,MAAM,QACN,OAAO,YAAY,EAAE,OAAO,GAC3B,OAAO,GAAC,IAAI,CAQvB;IAED;;;;;;;;OAQG;IACH,yCAPW,OAAO,mBAAmB,EAAE,OAAO,cACnC,OAAO,uBAAuB,EAAE,OAAO;YAChC,MAAM;gBAAS,MAAM,GAAE,OAAO,YAAY,EAAE,OAAO;;eAChD,MAAM,QAAE,OAAO,iBAAiB,EAAE,OAAO,KAAE,OAAO,CAgBtE;IACD;;;;;;;;;OASG;IACH,0CARW,OAAO,kBAAkB,EAAE,UAAU,cACrC,OAAO,WAAW,EAAE,UAAU,gBAC9B,MAAM,gHAchB;IAED;;OAEG;IACH,YAFY,SAAS,CAIpB;IAED;;;OAGG;IACH,2BAAuB;IAEvB;;;;OAIG;IACH,2BAQC;IAED;;;;;;OAMG;IACH,2BAJW,OAAO,iBAAiB,EAAE,OAAO,GAChC,OAAO,CAalB;IAED;;OAEG;IACH,0CAKC;CASF;uBAjMsB,kBAAkB"}

package/renderer/Layer.js

@@ -152,7 +152,10 @@ class LayerRenderer extends Observable {
    */
   handleImageChange_(event) {
     const image = /** @type {import("../Image.js").default} */ (event.target);
-    if (image.getState() === ImageState.LOADED) {
+    if (
+      image.getState() === ImageState.LOADED ||
+      image.getState() === ImageState.ERROR
+    ) {
       this.renderIfReadyAndVisible();
     }
   }

package/renderer/webgl/PointsLayer.d.ts

@@ -58,13 +58,9 @@ export type Options = {
      */
     fragmentShader: string;
     /**
-     * Vertex shader source for hit detection rendering.
+     * Whether shader is hit detection aware.
      */
-    hitVertexShader?: string | undefined;
-    /**
-     * Fragment shader source for hit detection rendering.
-     */
-    hitFragmentShader?: string | undefined;
+    hitDetectionEnabled?: boolean | undefined;
     /**
      * Uniform definitions for the post process steps
      * Please note that `u_texture` is reserved for the main texture slot and `u_opacity` is reserved for the layer opacity.
@@ -101,8 +97,7 @@ export type Options = {
  * Please note that these can only be numerical values.
  * @property {string} vertexShader Vertex shader source, mandatory.
  * @property {string} fragmentShader Fragment shader source, mandatory.
- * @property {string} [hitVertexShader] Vertex shader source for hit detection rendering.
- * @property {string} [hitFragmentShader] Fragment shader source for hit detection rendering.
+ * @property {boolean} [hitDetectionEnabled] Whether shader is hit detection aware.
  * @property {Object<string,import("../../webgl/Helper").UniformValue>} [uniforms] Uniform definitions for the post process steps
  * Please note that `u_texture` is reserved for the main texture slot and `u_opacity` is reserved for the layer opacity.
  * @property {Array<import("./Layer").PostProcessesOptions>} [postProcesses] Post-processes definitions
@@ -178,7 +173,6 @@ declare class WebGLPointsLayerRenderer extends WebGLLayerRenderer<any> {
     constructor(layer: import("../../layer/Layer.js").default, options: Options);
     sourceRevision_: number;
     verticesBuffer_: WebGLArrayBuffer;
-    hitVerticesBuffer_: WebGLArrayBuffer;
     indicesBuffer_: WebGLArrayBuffer;
     /**
      * @private
@@ -198,30 +192,12 @@ declare class WebGLPointsLayerRenderer extends WebGLLayerRenderer<any> {
      * @private
      */
     private hitDetectionEnabled_;
-    /**
-     * @private
-     */
-    private hitVertexShader_;
-    /**
-     * @private
-     */
-    private hitFragmentShader_;
-    /**
-     * @type {WebGLProgram}
-     * @private
-     */
-    private hitProgram_;
     /**
      * A list of attributes used by the renderer. By default only the position and
      * index of the vertex (0 to 3) are required.
      * @type {Array<import('../../webgl/Helper.js').AttributeDescription>}
      */
     attributes: Array<import('../../webgl/Helper.js').AttributeDescription>;
-    /**
-     * A list of attributes used for hit detection.
-     * @type {Array<import('../../webgl/Helper.js').AttributeDescription>}
-     */
-    hitDetectionAttributes: Array<import('../../webgl/Helper.js').AttributeDescription>;
     customAttributes: CustomAttribute[];
     previousExtent_: import("../../extent.js").Extent;
     /**
@@ -248,12 +224,6 @@ declare class WebGLPointsLayerRenderer extends WebGLLayerRenderer<any> {
      * @private
      */
     private renderInstructions_;
-    /**
-     * These instructions are used for hit detection
-     * @type {Float32Array}
-     * @private
-     */
-    private hitRenderInstructions_;
     /**
      * @type {WebGLRenderTarget}
      * @private
@@ -307,6 +277,13 @@ declare class WebGLPointsLayerRenderer extends WebGLLayerRenderer<any> {
      * @return {HTMLElement} The rendered element.
      */
     renderFrame(frameState: import("../../Map.js").FrameState): HTMLElement;
+    /**
+     * Compute world params
+     * @private
+     * @param {import("../../Map.js").FrameState} frameState Frame state.
+     * @return {Array<number>} The world start, end and width.
+     */
+    private getWorldParameters_;
     /**
      * Rebuild internal webgl buffers based on current view extent; costly, should not be called too much
      * @param {import("../../Map").FrameState} frameState Frame state.
@@ -314,13 +291,14 @@ declare class WebGLPointsLayerRenderer extends WebGLLayerRenderer<any> {
      */
     private rebuildBuffers_;
     /**
-     * Render the hit detection data to the corresponding render target
+     * Render the world, either to the main framebuffer or to the hit framebuffer
      * @param {import("../../Map.js").FrameState} frameState current frame state
+     * @param {boolean} forHitDetection whether the rendering is for hit detection
      * @param {number} startWorld the world to render in the first iteration
      * @param {number} endWorld the last world to render
      * @param {number} worldWidth the width of the worlds being rendered
      */
-    renderHitDetection(frameState: import("../../Map.js").FrameState, startWorld: number, endWorld: number, worldWidth: number): void;
+    renderWorlds(frameState: import("../../Map.js").FrameState, forHitDetection: boolean, startWorld: number, endWorld: number, worldWidth: number): void;
 }
 import WebGLLayerRenderer from './Layer.js';
 import WebGLArrayBuffer from '../../webgl/Buffer.js';

package/renderer/webgl/PointsLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PointsLayer.d.ts","sourceRoot":"","sources":["PointsLayer.js"],"names":[],"mappings":";;;;;;;;;UA6Bc,MAAM;;;;;qBACG,OAAO,eAAe,EAAE,OAAO;YAAS,MAAM;UAAM,MAAM;;;;;;;;;;aAOnE,OAAO,eAAe,EAAE,OAAO;;;;;YACxB,MAAM;;;;;cACb,OAAO,YAAY,EAAE,QAAQ;;;;;;;;;;;;;;;;;;kBAW7B,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;;;;;AAzBpB;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;;GAeG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAuQjB;IA3PC,wBAAyB;IAEzB,kCAAuE;IACvE,qCAA0E;IAC1E,iCAGC;IAED;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,iBAAa;IAEb;;;OAGG;IACH,6BACqE;IAErE;;OAEG;IACH,yBAA+C;IAE/C;;OAEG;IACH,2BAAmD;IAEnD;;;OAGG;IACH,oBAAgB;IAYhB;;;;OAIG;IACH,YAFU,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAa3C;IAE1B;;;OAGG;IACH,wBAFU,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAuB3C;IAE1B,oCAAoE;IAEpE,kDAAoC;IAEpC;;;;;;OAMG;IACH,0BAAkD;IAElD;;;;OAIG;IACH,yBAAyC;IAEzC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,4BAA8C;IAE9C;;;;OAIG;IACH,+BAAiD;IAEjD;;;OAGG;IACH,yBAAqB;IAErB;;;;OAIG;IACH,mBAAmB;IAEnB;;OAEG;IACH,gBAAkC;IA4ClC;;;;OAIG;IACH,sBAAuB;IAEvB;;;;OAIG;IACH,sBAAsB;IAGtB,yDAyBC;IA2BH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,oCAOC;IAED;;;OAGG;IACH,mCAIC;IAED;;OAEG;IACH,kCAGC;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CAmDtB;IA6CD;;;;OAIG;IACH,wBA6GC;IA0CD;;;;;;OAMG;IACH,+BALW,OAAO,cAAc,EAAE,UAAU,cACjC,MAAM,YACN,MAAM,cACN,MAAM,QAmChB;CAcF;+BAjvB8B,YAAY;6BADd,uBAAuB"}
+{"version":3,"file":"PointsLayer.d.ts","sourceRoot":"","sources":["PointsLayer.js"],"names":[],"mappings":";;;;;;;;;UA6Bc,MAAM;;;;;qBACG,OAAO,eAAe,EAAE,OAAO;YAAS,MAAM;UAAM,MAAM;;;;;;;;;;aAOnE,OAAO,eAAe,EAAE,OAAO;;;;;YACxB,MAAM;;;;;cACb,OAAO,YAAY,EAAE,QAAQ;;;;;;;;;;;;;;;;;;kBAW7B,MAAM;;;;oBACN,MAAM;;;;;;;;;;;;;;;;;AAzBpB;;;;;;GAMG;AAEH;;;;;;GAMG;AAEH;;;;;;;;;;;;;;GAcG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AACH;IACE;;;OAGG;IACH,mBAHW,OAAO,sBAAsB,EAAE,OAAO,WACtC,OAAO,EAqNjB;IAzMC,wBAAyB;IAEzB,kCAAuE;IACvE,iCAGC;IAED;;OAEG;IACH,sBAAyC;IAEzC;;OAEG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,iBAAa;IAEb;;;OAGG;IACH,6BAA+D;IAY/D;;;;OAIG;IACH,YAFU,MAAM,OAAO,uBAAuB,EAAE,oBAAoB,CAAC,CAapE;IAgBD,oCAAoE;IAEpE,kDAAoC;IAEpC;;;;;;OAMG;IACH,0BAAkD;IAElD;;;;OAIG;IACH,yBAAyC;IAEzC;;;OAGG;IACH,+BAA+C;IAE/C;;;OAGG;IACH,4BAA8C;IAE9C;;;OAGG;IACH,yBAAqB;IAErB;;;;OAIG;IACH,mBAAmB;IAEnB;;OAEG;IACH,gBAAkC;IAgClC;;;;OAIG;IACH,sBAAuB;IAEvB;;;;OAIG;IACH,sBAAsB;IAGtB,yDAyBC;IAsBH;;;OAGG;IACH,kCAQC;IAED;;;OAGG;IACH,oCAOC;IAED;;;OAGG;IACH,mCAIC;IAED;;OAEG;IACH,kCAGC;IAED;;;;OAIG;IACH,wBAHW,OAAO,cAAc,EAAE,UAAU,GAChC,WAAW,CA2BtB;IAED;;;;;OAKG;IACH,4BAmBC;IA6CD;;;;OAIG;IACH,wBAqEC;IA0CD;;;;;;;OAOG;IACH,yBANW,OAAO,cAAc,EAAE,UAAU,mBACjC,OAAO,cACP,MAAM,YACN,MAAM,cACN,MAAM,QAgChB;CAcF;+BAlpB8B,YAAY;6BADd,uBAAuB"}