@deck.gl/geo-layers 8.9.22 → 8.10.0-alpha.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/geo-layers",
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
-  "version": "8.9.22",
+  "version": "8.10.0-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -45,7 +45,7 @@
     "@math.gl/culling": "^3.6.2",
     "@math.gl/web-mercator": "^3.6.2",
     "@types/geojson": "^7946.0.8",
-    "h3-js": "^3.7.0",
+    "h3-js": "^4.1.0",
     "long": "^3.2.0"
   },
   "peerDependencies": {
@@ -56,5 +56,5 @@
     "@loaders.gl/core": "^3.4.2",
     "@luma.gl/core": "^8.0.0"
   },
-  "gitHead": "cc0ff51f4f8b234c7b5015a0e0dced6217433a5b"
+  "gitHead": "888ee50db498da4b42697854e79e46cdbb881470"
 }

package/src/h3-layers/h3-cluster-layer.ts

@@ -1,8 +1,9 @@
-import {h3SetToMultiPolygon, H3IndexInput} from 'h3-js';
+import {cellsToMultiPolygon, H3IndexInput} from 'h3-js';
 
 import {AccessorFunction, createIterable, UpdateParameters, DefaultProps} from '@deck.gl/core';
 import {default as H3HexagonLayer} from './h3-hexagon-layer';
 import GeoCellLayer, {GeoCellLayerProps} from '../geo-cell-layer/GeoCellLayer';
+import {normalizeLongitudes} from './h3-utils';
 
 const defaultProps: DefaultProps<H3ClusterLayerProps> = {
   getHexagons: {type: 'accessor', value: d => d.hexagons}
@@ -45,9 +46,13 @@ export default class H3ClusterLayer<DataT = any, ExtraProps extends {} = {}> ext
       for (const object of iterable) {
         objectInfo.index++;
         const hexagons = getHexagons(object, objectInfo);
-        const multiPolygon = h3SetToMultiPolygon(hexagons, true);
+        const multiPolygon = cellsToMultiPolygon(hexagons, true);
 
         for (const polygon of multiPolygon) {
+          // Normalize polygons to prevent wrapping over the anti-meridian
+          for (const ring of polygon) {
+            normalizeLongitudes(ring);
+          }
           polygons.push(this.getSubLayerRow({polygon}, object, objectInfo.index));
         }
       }

package/src/h3-layers/h3-hexagon-layer.ts

@@ -1,14 +1,12 @@
 import {
-  h3ToGeoBoundary,
-  h3GetResolution,
-  h3ToGeo,
-  geoToH3,
-  h3IsPentagon,
-  h3Distance,
-  edgeLength,
+  getResolution,
+  cellToLatLng,
+  latLngToCell,
+  isPentagon,
+  gridDistance,
+  getHexagonEdgeLengthAvg,
   H3Index
 } from 'h3-js';
-import {lerp} from '@math.gl/core';
 import {
   AccessorFunction,
   CompositeLayer,
@@ -20,72 +18,13 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {ColumnLayer, PolygonLayer, PolygonLayerProps} from '@deck.gl/layers';
+import {flattenPolygon, getHexagonCentroid, h3ToPolygon} from './h3-utils';
 
 // There is a cost to updating the instanced geometries when using highPrecision: false
 // This constant defines the distance between two hexagons that leads to "significant
 // distortion." Smaller value makes the column layer more sensitive to viewport change.
 const UPDATE_THRESHOLD_KM = 10;
 
-// normalize longitudes w.r.t center (refLng), when not provided first vertex
-export function normalizeLongitudes(vertices: number[][], refLng?: number): void {
-  refLng = refLng === undefined ? vertices[0][0] : refLng;
-  for (const pt of vertices) {
-    const deltaLng = pt[0] - refLng;
-    if (deltaLng > 180) {
-      pt[0] -= 360;
-    } else if (deltaLng < -180) {
-      pt[0] += 360;
-    }
-  }
-}
-
-// scale polygon vertices w.r.t center (hexId)
-export function scalePolygon(hexId: H3Index, vertices: number[][], factor: number): void {
-  const [lat, lng] = h3ToGeo(hexId);
-  const actualCount = vertices.length;
-
-  // normalize with respect to center
-  normalizeLongitudes(vertices, lng);
-
-  // `h3ToGeoBoundary` returns same array object for first and last vertex (closed polygon),
-  // if so skip scaling the last vertex
-  const vertexCount = vertices[0] === vertices[actualCount - 1] ? actualCount - 1 : actualCount;
-  for (let i = 0; i < vertexCount; i++) {
-    vertices[i][0] = lerp(lng, vertices[i][0], factor);
-    vertices[i][1] = lerp(lat, vertices[i][1], factor);
-  }
-}
-
-function getHexagonCentroid(getHexagon, object, objectInfo) {
-  const hexagonId = getHexagon(object, objectInfo);
-  const [lat, lng] = h3ToGeo(hexagonId);
-  return [lng, lat];
-}
-
-function h3ToPolygon(hexId: H3Index, coverage: number = 1): number[][] {
-  const vertices = h3ToGeoBoundary(hexId, true);
-
-  if (coverage !== 1) {
-    // scale and normalize vertices w.r.t to center
-    scalePolygon(hexId, vertices, coverage);
-  } else {
-    // normalize w.r.t to start vertex
-    normalizeLongitudes(vertices);
-  }
-
-  return vertices;
-}
-
-function flattenPolygon(vertices: number[][]): Float64Array {
-  const positions = new Float64Array(vertices.length * 2);
-  let i = 0;
-  for (const pt of vertices) {
-    positions[i++] = pt[0];
-    positions[i++] = pt[1];
-  }
-  return positions;
-}
-
 function mergeTriggers(getHexagon, coverage) {
   let trigger;
   if (getHexagon === undefined || getHexagon === null) {
@@ -199,7 +138,7 @@ export default class H3HexagonLayer<
       objectInfo.index++;
       const hexId = this.props.getHexagon(object, objectInfo);
       // Take the resolution of the first hex
-      const hexResolution = h3GetResolution(hexId);
+      const hexResolution = getResolution(hexId);
       if (resolution < 0) {
         resolution = hexResolution;
         if (!this.props.highPrecision) break;
@@ -207,7 +146,7 @@ export default class H3HexagonLayer<
         hasMultipleRes = true;
         break;
       }
-      if (h3IsPentagon(hexId)) {
+      if (isPentagon(hexId)) {
         hasPentagon = true;
         break;
       }
@@ -215,7 +154,7 @@ export default class H3HexagonLayer<
 
     return {
       resolution,
-      edgeLengthKM: resolution >= 0 ? edgeLength(resolution, 'km') : 0,
+      edgeLengthKM: resolution >= 0 ? getHexagonEdgeLengthAvg(resolution, 'km') : 0,
       hasMultipleRes,
       hasPentagon
     };
@@ -245,23 +184,26 @@ export default class H3HexagonLayer<
       return;
     }
     const hex =
-      this.props.centerHexagon || geoToH3(viewport.latitude, viewport.longitude, resolution);
+      this.props.centerHexagon || latLngToCell(viewport.latitude, viewport.longitude, resolution);
     if (centerHex === hex) {
       return;
     }
     if (centerHex) {
-      const distance = h3Distance(centerHex, hex);
-      // h3Distance returns a negative number if the distance could not be computed
-      // due to the two indexes very far apart or on opposite sides of a pentagon.
-      if (distance >= 0 && distance * edgeLengthKM < UPDATE_THRESHOLD_KM) {
-        return;
+      try {
+        const distance = gridDistance(centerHex, hex);
+        if (distance * edgeLengthKM < UPDATE_THRESHOLD_KM) {
+          return;
+        }
+      } catch {
+        // gridDistance throws if the distance could not be computed
+        // due to the two indexes very far apart or on opposite sides of a pentagon.
       }
     }
 
     const {unitsPerMeter} = viewport.distanceScales;
 
     let vertices = h3ToPolygon(hex);
-    const [centerLat, centerLng] = h3ToGeo(hex);
+    const [centerLat, centerLng] = cellToLatLng(hex);
 
     const [centerX, centerY] = viewport.projectFlat([centerLng, centerLat]);
     vertices = vertices.map(p => {

package/src/h3-layers/h3-utils.ts

@@ -0,0 +1,63 @@
+import {CoordPair, H3IndexInput, cellToBoundary, cellToLatLng} from 'h3-js';
+import {lerp} from '@math.gl/core';
+
+// normalize longitudes w.r.t center (refLng), when not provided first vertex
+export function normalizeLongitudes(vertices: CoordPair[], refLng?: number): void {
+  refLng = refLng === undefined ? vertices[0][0] : refLng;
+  for (const pt of vertices) {
+    const deltaLng = pt[0] - refLng;
+    if (deltaLng > 180) {
+      pt[0] -= 360;
+    } else if (deltaLng < -180) {
+      pt[0] += 360;
+    }
+  }
+}
+
+// scale polygon vertices w.r.t center (hexId)
+export function scalePolygon(hexId: H3IndexInput, vertices: CoordPair[], factor: number): void {
+  const [lat, lng] = cellToLatLng(hexId);
+  const actualCount = vertices.length;
+
+  // normalize with respect to center
+  normalizeLongitudes(vertices, lng);
+
+  // `cellToBoundary` returns same array object for first and last vertex (closed polygon),
+  // if so skip scaling the last vertex
+  const vertexCount = vertices[0] === vertices[actualCount - 1] ? actualCount - 1 : actualCount;
+  for (let i = 0; i < vertexCount; i++) {
+    vertices[i][0] = lerp(lng, vertices[i][0], factor);
+    vertices[i][1] = lerp(lat, vertices[i][1], factor);
+  }
+}
+
+// gets hexagon centroid
+export function getHexagonCentroid(getHexagon, object, objectInfo) {
+  const hexagonId = getHexagon(object, objectInfo);
+  const [lat, lng] = cellToLatLng(hexagonId);
+  return [lng, lat];
+}
+
+export function h3ToPolygon(hexId: H3IndexInput, coverage: number = 1): number[][] {
+  const vertices = cellToBoundary(hexId, true);
+
+  if (coverage !== 1) {
+    // scale and normalize vertices w.r.t to center
+    scalePolygon(hexId, vertices, coverage);
+  } else {
+    // normalize w.r.t to start vertex
+    normalizeLongitudes(vertices);
+  }
+
+  return vertices;
+}
+
+export function flattenPolygon(vertices: number[][]): Float64Array {
+  const positions = new Float64Array(vertices.length * 2);
+  let i = 0;
+  for (const pt of vertices) {
+    positions[i++] = pt[0];
+    positions[i++] = pt[1];
+  }
+  return positions;
+}

package/typed/h3-layers/h3-cluster-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-cluster-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAC,MAAM,OAAO,CAAC;AAExD,OAAO,EAAC,gBAAgB,EAAkB,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAE/F,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AAM/E,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,0CAA0C;AAC1C,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;;OAIG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,YAAY,CAC/F,KAAK,EACL,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACnD;IACC,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAuB/D,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;CAahD"}
+{"version":3,"file":"h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-cluster-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAC,MAAM,OAAO,CAAC;AAExD,OAAO,EAAC,gBAAgB,EAAkB,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAE/F,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AAO/E,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,0CAA0C;AAC1C,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;;OAIG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,YAAY,CAC/F,KAAK,EACL,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACnD;IACC,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IA2B/D,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;CAahD"}

package/typed/h3-layers/h3-hexagon-layer.d.ts

@@ -1,8 +1,6 @@
 import { H3Index } from 'h3-js';
 import { AccessorFunction, CompositeLayer, Layer, LayersList, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
 import { PolygonLayerProps } from '@deck.gl/layers/typed';
-export declare function normalizeLongitudes(vertices: number[][], refLng?: number): void;
-export declare function scalePolygon(hexId: H3Index, vertices: number[][], factor: number): void;
 /** All properties supported by H3HexagonLayer */
 export declare type H3HexagonLayerProps<DataT = any> = _H3HexagonLayerProps<DataT> & PolygonLayerProps<DataT>;
 /** Props added by the H3HexagonLayer */

package/typed/h3-layers/h3-hexagon-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQ7E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAU/E;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAcvF;AAqDD,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IAuCvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}
+{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,OAAO,EACR,MAAM,OAAO,CAAC;AACf,OAAO,EACL,gBAAgB,EAChB,cAAc,EAEd,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AA6B7E,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1E,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IA0CvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}

package/typed/h3-layers/h3-utils.d.ts

@@ -0,0 +1,7 @@
+import { CoordPair, H3IndexInput } from 'h3-js';
+export declare function normalizeLongitudes(vertices: CoordPair[], refLng?: number): void;
+export declare function scalePolygon(hexId: H3IndexInput, vertices: CoordPair[], factor: number): void;
+export declare function getHexagonCentroid(getHexagon: any, object: any, objectInfo: any): number[];
+export declare function h3ToPolygon(hexId: H3IndexInput, coverage?: number): number[][];
+export declare function flattenPolygon(vertices: number[][]): Float64Array;
+//# sourceMappingURL=h3-utils.d.ts.map

package/typed/h3-layers/h3-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"h3-utils.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,YAAY,EAA+B,MAAM,OAAO,CAAC;AAI5E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAUhF;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAc7F;AAGD,wBAAgB,kBAAkB,CAAC,UAAU,KAAA,EAAE,MAAM,KAAA,EAAE,UAAU,KAAA,YAIhE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,YAAY,EAAE,QAAQ,GAAE,MAAU,GAAG,MAAM,EAAE,EAAE,CAYjF;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,YAAY,CAQjE"}