@webviz/subsurface-viewer 1.11.0 → 1.11.1

package/dist/layers/well_markers/wellMarkersLayer.d.ts

@@ -1,9 +1,8 @@
 import { Model } from "@luma.gl/engine";
-import type { Accessor, Color, LayerContext, Position, PickingInfo, UpdateParameters, LayerProps, Unit } from "@deck.gl/core";
+import type { Accessor, Color, Position, PickingInfo, UpdateParameters, Unit } from "@deck.gl/core";
 import { Layer } from "@deck.gl/core";
-import type { UniformValue } from "@luma.gl/core";
 import type { ExtendedLayerProps, LayerPickInfo } from "../utils/layerTools";
-export type WellMarkersLayerProps = _WellMarkersLayerProps & LayerProps;
+export type WellMarkersLayerProps = _WellMarkersLayerProps;
 /**
  * Input data of the layer.
  */
@@ -80,11 +79,7 @@ export default class WellMarkersLayer extends Layer<WellMarkersLayerProps> {
     initializeState(): void;
     updateState(params: UpdateParameters<Layer<WellMarkersLayerProps>>): void;
     getModels(): Model[];
-    draw(args: {
-        moduleParameters?: unknown;
-        uniforms: Record<string, UniformValue>;
-        context: LayerContext;
-    }): void;
+    draw(args: any): void;
     getPickingInfo({ info }: {
         info: PickingInfo;
     }): LayerPickInfo;

package/dist/layers/well_markers/wellMarkersLayer.js

@@ -1,4 +1,3 @@
-//import { GL } from "@luma.gl/constants";
 import { Geometry, Model } from "@luma.gl/engine";
 import { Layer, project, picking, UNIT } from "@deck.gl/core";
 import { createPropertyData } from "../utils/layerTools";
@@ -146,18 +145,26 @@ export default class WellMarkersLayer extends Layer {
         }
         return [];
     }
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     draw(args) {
         if (!this.state["shapeModel"]) {
             return;
         }
-        const { uniforms } = args;
         const models = this.getModels();
         if (models.length && models.length < 2) {
             return;
         }
-        models[0].setUniforms(Object.assign(Object.assign({}, uniforms), { sizeUnits: UNIT[this.props.sizeUnits], ZIncreasingDownwards: this.props.ZIncreasingDownwards }));
+        models[0].shaderInputs.setProps(Object.assign(Object.assign({}, args.uniforms), { wellMarkers: {
+                useOutlineColor: false,
+                sizeUnits: UNIT[this.props.sizeUnits],
+                ZIncreasingDownwards: this.props.ZIncreasingDownwards,
+            } }));
         models[0].draw(args.context.renderPass);
-        models[1].setUniforms(Object.assign(Object.assign({}, uniforms), { ZIncreasingDownwards: this.props.ZIncreasingDownwards, sizeUnits: UNIT[this.props.sizeUnits] }));
+        models[1].shaderInputs.setProps(Object.assign(Object.assign({}, args.uniforms), { wellMarkers: {
+                useOutlineColor: true,
+                sizeUnits: UNIT[this.props.sizeUnits],
+                ZIncreasingDownwards: this.props.ZIncreasingDownwards,
+            } }));
         models[1].draw(args.context.renderPass);
     }
     getPickingInfo({ info }) {
@@ -183,14 +190,18 @@ export default class WellMarkersLayer extends Layer {
         return super.getShaders({
             vs: vsShader,
             fs: fsShader,
-            modules: [project, picking, utilities],
+            modules: [project, picking, utilities, wellMarkersUniforms],
         });
     }
     initShapes() {
         const triangle_positions = [
             -1.0, -1.0, 0.0, 1.0, -1.0, 0.0, 0.0, 1.0, 0.0,
         ];
-        const circle_positions = [0.0, 0.0, 0.0];
+        const triangle_outline = [
+            -1.0, -1.0, 0.0, 1.0, -1.0, 0.0, 0.0, 1.0, 0.0, -1.0, -1.0, 0.0,
+        ];
+        const circle_positions = [];
+        const circle_outline = [];
         const N = 32;
         const R = 1.0;
         for (let i = 0; i <= N; ++i) {
@@ -198,22 +209,30 @@ export default class WellMarkersLayer extends Layer {
             circle_positions.push(R * Math.cos(angle));
             circle_positions.push(R * Math.sin(angle));
             circle_positions.push(0.0);
+            // push center again to represent a circle with a triangle strip
+            circle_positions.push(0.0);
+            circle_positions.push(0.0);
+            circle_positions.push(0.0);
+            circle_outline.push(R * Math.cos(angle));
+            circle_outline.push(R * Math.sin(angle));
+            circle_outline.push(0.0);
         }
         const square_positions = [
             -1.0, 1.0, 0.0, 1.0, 1.0, 0.0, -1.0, -1.0, 0.0, 1.0, -1.0, 0.0,
         ];
         const square_outline = [
             -1.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, -1.0, 0.0, -1.0, -1.0, 0.0,
+            -1.0, 1.0, 0.0,
         ];
         this.shapes.set("triangle", {
             drawMode: "triangle-list",
             positions: new Float32Array(triangle_positions),
-            outline: new Float32Array(triangle_positions),
+            outline: new Float32Array(triangle_outline),
         });
         this.shapes.set("circle", {
-            drawMode: "triangle-fan-webgl",
+            drawMode: "triangle-strip",
             positions: new Float32Array(circle_positions),
-            outline: new Float32Array(circle_positions.slice(3)),
+            outline: new Float32Array(circle_outline),
         });
         this.shapes.set("square", {
             drawMode: "triangle-strip",
@@ -233,17 +252,13 @@ export default class WellMarkersLayer extends Layer {
                 attributes: {
                     positions: { size: 3, value: shape.positions },
                 },
-            }), uniforms: {
-                useOutlineColor: false,
-            }, isInstanced: true, instanceCount: this.getNumInstances() }));
+            }), isInstanced: true, instanceCount: this.getNumInstances() }));
         const outlineModel = new Model(device, Object.assign(Object.assign({ id: `${this.props.id}-outline` }, shaders), { bufferLayout: this.getAttributeManager().getBufferLayouts(), geometry: new Geometry({
-                topology: "line-loop-webgl",
+                topology: "line-strip",
                 attributes: {
                     positions: { size: 3, value: shape.outline },
                 },
-            }), uniforms: {
-                useOutlineColor: true,
-            }, isInstanced: true, instanceCount: this.getNumInstances() }));
+            }), isInstanced: true, instanceCount: this.getNumInstances() }));
         return [shapeModel, outlineModel];
     }
     _createEmptyModels() {
@@ -265,6 +280,24 @@ export default class WellMarkersLayer extends Layer {
         ];
     }
 }
+const wellMarkersUniformsBlock = /*glsl*/ `\
+uniform wellMarkersUniforms {
+   int sizeUnits;
+   bool useOutlineColor;
+   bool ZIncreasingDownwards;
+} wellMarkers;
+`;
+// NOTE: this must exactly the same name than in the uniform block
+const wellMarkersUniforms = {
+    name: "wellMarkers",
+    vs: wellMarkersUniformsBlock,
+    fs: undefined,
+    uniformTypes: {
+        sizeUnits: "f32",
+        useOutlineColor: "u32",
+        ZIncreasingDownwards: "u32",
+    },
+};
 WellMarkersLayer.layerName = "WellMarkersLayer";
 WellMarkersLayer.defaultProps = defaultProps;
 //# sourceMappingURL=wellMarkersLayer.js.map

package/dist/layers/well_markers/wellMarkersLayer.js.map

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

package/dist/views/intersectionView.d.ts

@@ -1,7 +1,6 @@
-import type { OrthographicViewState } from "@deck.gl/core";
+import type { OrthographicViewState, Viewport, _ConstructorOf } from "@deck.gl/core";
 import { View } from "@deck.gl/core";
 import type { CommonViewProps } from "@deck.gl/core/dist/views/view";
-import IntersectionViewport from "../viewports/intersectionViewport";
 export type IntersectionViewState = OrthographicViewState;
 type IntersectionViewProps = CommonViewProps<IntersectionViewState> & {
     /** Distance of near clipping plane. Default `0.1`. */
@@ -14,7 +13,8 @@ type IntersectionViewProps = CommonViewProps<IntersectionViewState> & {
 export default class IntersectionView extends View<IntersectionViewState, IntersectionViewProps> {
     static displayName: string;
     constructor(props: IntersectionViewProps);
-    get ViewportType(): typeof IntersectionViewport;
+    getViewportType(_viewState: OrthographicViewState): _ConstructorOf<Viewport>;
+    get ViewportType(): _ConstructorOf<Viewport>;
     get ControllerType(): never;
 }
 export {};

package/dist/views/intersectionView.js

@@ -6,6 +6,11 @@ class IntersectionView extends View {
                 target: [275, 0, -500],
             } }));
     }
+    getViewportType(
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _viewState) {
+        return IntersectionViewport;
+    }
     get ViewportType() {
         return IntersectionViewport;
     }

package/dist/views/intersectionView.js.map

@@ -1 +1 @@
-{"version":3,"file":"intersectionView.js","sourceRoot":"","sources":["../../src/views/intersectionView.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,oBAAoB,MAAM,mCAAmC,CAAC;AAcrE,MAAqB,gBAAiB,SAAQ,IAG7C;IAEG,YAAY,KAA4B;QACpC,KAAK,iCACE,KAAK,KACR,UAAU,EAAE,KAAK,EACjB,SAAS,EAAE;gBACP,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;aACzB,IACH,CAAC;IACP,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAED,IAAI,cAAc;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;;AAjBM,4BAAW,GAAG,kBAAkB,CAAC;eAJvB,gBAAgB"}
+{"version":3,"file":"intersectionView.js","sourceRoot":"","sources":["../../src/views/intersectionView.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAErC,OAAO,oBAAoB,MAAM,mCAAmC,CAAC;AAcrE,MAAqB,gBAAiB,SAAQ,IAG7C;IAEG,YAAY,KAA4B;QACpC,KAAK,iCACE,KAAK,KACR,UAAU,EAAE,KAAK,EACjB,SAAS,EAAE;gBACP,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC;aACzB,IACH,CAAC;IACP,CAAC;IAED,eAAe;IACX,6DAA6D;IAC7D,UAAiC;QAEjC,OAAO,oBAAoB,CAAC;IAChC,CAAC;IACD,IAAI,YAAY;QACZ,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAED,IAAI,cAAc;QACd,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;;AAvBM,4BAAW,GAAG,kBAAkB,CAAC;eAJvB,gBAAgB"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webviz/subsurface-viewer",
-    "version": "1.11.0",
+    "version": "1.11.1",
     "description": "3D visualization component for subsurface reservoir data",
     "keywords": [
         "subsurface",
@@ -33,15 +33,15 @@
     "author": "Equinor <opensource@equinor.com>",
     "license": "MPL-2.0",
     "dependencies": {
-        "@deck.gl-community/editable-layers": "9.0.3",
-        "@deck.gl/aggregation-layers": "9.0.40",
-        "@deck.gl/core": "9.0.40",
-        "@deck.gl/extensions": "9.0.40",
-        "@deck.gl/geo-layers": "9.0.40",
-        "@deck.gl/json": "9.0.40",
-        "@deck.gl/layers": "9.0.40",
-        "@deck.gl/mesh-layers": "9.0.40",
-        "@deck.gl/react": "9.0.40",
+        "@deck.gl-community/editable-layers": "^9.1.0-beta.4",
+        "@deck.gl/aggregation-layers": "^9.1.11",
+        "@deck.gl/core": "^9.1.11",
+        "@deck.gl/extensions": "^9.1.11",
+        "@deck.gl/geo-layers": "^9.1.11",
+        "@deck.gl/json": "^9.1.11",
+        "@deck.gl/layers": "^9.1.11",
+        "@deck.gl/mesh-layers": "^9.1.11",
+        "@deck.gl/react": "^9.1.11",
         "@emerson-eps/color-tables": "^0.4.92",
         "@equinor/eds-core-react": "^0.36.0",
         "@equinor/eds-icons": "^0.21.0",
@@ -55,7 +55,7 @@
         "d3-format": "^3.1.0",
         "gl-matrix": "^3.4.3",
         "lodash": "^4.17.21",
-        "math.gl": "^4.0.1",
+        "math.gl": "^4.1.0",
         "mathjs": "^13.2.0",
         "merge-refs": "^1.2.2",
         "static-kdtree": "^1.0.2",

package/dist/layers/map/fragment.fs.glsl.d.ts

@@ -1,2 +0,0 @@
-declare const fsShader = "#version 300 es\n#define SHADER_NAME terrainmap-shader\n\nprecision highp float;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\n\nflat in int vertexIndex;\n\nin vec3 worldPos;\nin float property;\n\nout vec4 fragColor;\n\nuniform sampler2D colormap;\n\nuniform bool isContoursDepth;\nuniform float contourReferencePoint;\nuniform float contourInterval;\n\nuniform float valueRangeMin;\nuniform float valueRangeMax;\nuniform float colorMapRangeMin;\nuniform float colorMapRangeMax;\n\nuniform vec3 colorMapClampColor;\nuniform bool isClampColor;\nuniform bool isColorMapClampColorTransparent;\nuniform bool smoothShading;\n\nvoid main(void) { \n   geometry.uv = vTexCoord;\n\n   vec3 normal = normals_commonspace;\n\n   if (!smoothShading || (normal[0] == 0.0 && normal[1] == 0.0 && normal[2] == 0.0)) {\n      normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n   }\n\n   //Picking pass.\n   if (picking.isActive > 0.5 && !(picking.isAttribute > 0.5)) {\n      fragColor = encodeVertexIndexToRGB(vertexIndex);\n      return;\n   }\n\n   vec4 color = vec4(1.0, 1.0, 1.0,  1.0);\n   float propertyValue = property;\n\n   // This may happen due to GPU interpolation precision causing color artifacts.\n   propertyValue = clamp(propertyValue, valueRangeMin, valueRangeMax);\n\n   float x = (propertyValue - colorMapRangeMin) / (colorMapRangeMax - colorMapRangeMin);\n   if (x < 0.0 || x > 1.0) {\n      // Out of range. Use clampcolor.\n      if (isClampColor) {\n         color = vec4(colorMapClampColor.rgb, 1.0);\n\n      }\n      else if (isColorMapClampColorTransparent) {\n         discard;\n         return;\n      }\n      else {\n         // Use min/max color to clamp.\n         x = max(0.0, x);\n         x = min(1.0, x);\n\n         color = texture(colormap, vec2(x, 0.5));\n      }\n   }\n   else {\n      color = texture(colormap, vec2(x, 0.5));\n   }\n\n   bool is_contours = contourReferencePoint != -1.0 && contourInterval != -1.0;\n   if (is_contours) {\n      float val = isContoursDepth ? (abs(worldPos.z) - contourReferencePoint) / contourInterval\n                                  : (propertyValue - contourReferencePoint) / contourInterval;\n\n      float f  = fract(val);\n      float df = fwidth(val);\n\n      // keep: float c = smoothstep(df * 1.0, df * 2.0, f); // smootstep from/to no of pixels distance fronm contour line.\n      float c = smoothstep(0.0, df * 2.0, f);\n\n      color = color * vec4(c, c, c, 1.0);\n   }\n\n   // Use two sided phong lighting. This has no effect if \"material\" property is not set.\n   vec3 lightColor = getPhongLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n   fragColor = vec4(lightColor, 1.0);\n   DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
-export default fsShader;

package/dist/layers/map/fragment.fs.glsl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"fragment.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/map/fragment.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiGhB,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/layers/shader_modules/lighting.fs.glsl.d.ts

@@ -1 +0,0 @@
-export declare const fs = "\n// Note: modification of luma.gl's functions to get two sided phong lighting.\n// Ref original file modules/shadertools/src/modules/phong-lighting/phong-lighting.glsl.ts in luma source.\n\nvec3 getPhongLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {\n    \n  vec3 halfway_direction = normalize(light_direction + view_direction);   \n  float lambertian = abs(dot(light_direction, normal_worldspace));\n\n  float specular_angle = abs(dot(normal_worldspace, halfway_direction));\n\n  float specular = pow(specular_angle, lighting_uShininess);       \n  return (lambertian * lighting_uDiffuse * surfaceColor + specular * lighting_uSpecularColor) * color;    \n}\n\nvec3 getPhongLightColor(vec3 surfaceColor,vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {\n\n vec3 lightColor = surfaceColor;\n\n if (lighting_uEnabled) {\n   vec3 view_direction = normalize(cameraPosition - position_worldspace);\n   lightColor = lighting_uAmbient * surfaceColor * lighting_uAmbientLight.color;\n\n   for (int i = 0; i < MAX_LIGHTS; i++) {\n     if (i >= lighting_uPointLightCount) {\n       break;\n     }\n     PointLight pointLight = lighting_uPointLight[i];\n     vec3 light_position_worldspace = pointLight.position;\n     vec3 light_direction = normalize(light_position_worldspace - position_worldspace);\n     lightColor += getPhongLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);\n   }\n\n   for (int i = 0; i < MAX_LIGHTS; i++) {\n     if (i >= lighting_uDirectionalLightCount) {\n       break;\n     }\n     DirectionalLight directionalLight = lighting_uDirectionalLight[i];\n     lightColor += getPhongLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);\n   }\n }\n return lightColor;\n}\n";

package/dist/layers/shader_modules/lighting.fs.glsl.js

@@ -1,45 +0,0 @@
-export const fs = `
-// Note: modification of luma.gl's functions to get two sided phong lighting.
-// Ref original file modules/shadertools/src/modules/phong-lighting/phong-lighting.glsl.ts in luma source.
-
-vec3 getPhongLightColor(vec3 surfaceColor, vec3 light_direction, vec3 view_direction, vec3 normal_worldspace, vec3 color) {
-    
-  vec3 halfway_direction = normalize(light_direction + view_direction);   
-  float lambertian = abs(dot(light_direction, normal_worldspace));
-
-  float specular_angle = abs(dot(normal_worldspace, halfway_direction));
-
-  float specular = pow(specular_angle, lighting_uShininess);       
-  return (lambertian * lighting_uDiffuse * surfaceColor + specular * lighting_uSpecularColor) * color;    
-}
-
-vec3 getPhongLightColor(vec3 surfaceColor,vec3 cameraPosition, vec3 position_worldspace, vec3 normal_worldspace) {
-
- vec3 lightColor = surfaceColor;
-
- if (lighting_uEnabled) {
-   vec3 view_direction = normalize(cameraPosition - position_worldspace);
-   lightColor = lighting_uAmbient * surfaceColor * lighting_uAmbientLight.color;
-
-   for (int i = 0; i < MAX_LIGHTS; i++) {
-     if (i >= lighting_uPointLightCount) {
-       break;
-     }
-     PointLight pointLight = lighting_uPointLight[i];
-     vec3 light_position_worldspace = pointLight.position;
-     vec3 light_direction = normalize(light_position_worldspace - position_worldspace);
-     lightColor += getPhongLightColor(surfaceColor, light_direction, view_direction, normal_worldspace, pointLight.color);
-   }
-
-   for (int i = 0; i < MAX_LIGHTS; i++) {
-     if (i >= lighting_uDirectionalLightCount) {
-       break;
-     }
-     DirectionalLight directionalLight = lighting_uDirectionalLight[i];
-     lightColor += getPhongLightColor(surfaceColor, -directionalLight.direction, view_direction, normal_worldspace, directionalLight.color);
-   }
- }
- return lightColor;
-}
-`;
-//# sourceMappingURL=lighting.fs.glsl.js.map

package/dist/layers/shader_modules/lighting.fs.glsl.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"lighting.fs.glsl.js","sourceRoot":"","sources":["../../../src/layers/shader_modules/lighting.fs.glsl.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,EAAE,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2CjB,CAAC"}

package/dist/layers/shader_modules/localPhongLighting.d.ts

@@ -1,23 +0,0 @@
-export declare const localPhongLighting: {
-    name: string;
-    fs: string;
-    dependencies: {
-        name: string;
-        dependencies: {
-            name: string;
-            vs: string;
-            fs: string;
-            getUniforms: (opts?: import("@luma.gl/shadertools/dist/modules-webgl1/lighting/lights/lights").LightsOptions | undefined) => Record<string, any>;
-            defines: {
-                MAX_LIGHTS: number;
-            };
-        }[];
-        fs: string;
-        defines: {
-            LIGHTING_FRAGMENT: number;
-        };
-        getUniforms: (opts?: {
-            material?: import("@luma.gl/shadertools/dist/modules-webgl1/lighting/phong-lighting/phong-lighting").PhongLightingProps | undefined;
-        } | undefined) => Record<string, any>;
-    }[];
-};

package/dist/layers/shader_modules/localPhongLighting.js

@@ -1,8 +0,0 @@
-import { fs } from "./lighting.fs.glsl";
-import { phongLighting } from "@luma.gl/shadertools";
-export const localPhongLighting = {
-    name: "localPhongLighting",
-    fs,
-    dependencies: [phongLighting],
-};
-//# sourceMappingURL=localPhongLighting.js.map

package/dist/layers/shader_modules/localPhongLighting.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"localPhongLighting.js","sourceRoot":"","sources":["../../../src/layers/shader_modules/localPhongLighting.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAC9B,IAAI,EAAE,oBAAoB;IAC1B,EAAE;IACF,YAAY,EAAE,CAAC,aAAa,CAAC;CAChC,CAAC"}