@deck.gl/carto 8.9.0-beta.1 → 8.9.0-beta.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
-  "version": "8.9.0-beta.1",
+  "version": "8.9.0-beta.3",
   "publishConfig": {
     "access": "public"
   },
@@ -32,10 +32,10 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@loaders.gl/gis": "^3.3.0-alpha.10",
-    "@loaders.gl/loader-utils": "^3.3.0-alpha.10",
-    "@loaders.gl/mvt": "^3.3.0-alpha.10",
-    "@loaders.gl/tiles": "^3.3.0-alpha.10",
+    "@loaders.gl/gis": "^3.3.1",
+    "@loaders.gl/loader-utils": "^3.3.1",
+    "@loaders.gl/mvt": "^3.3.1",
+    "@loaders.gl/tiles": "^3.3.1",
     "@luma.gl/constants": "^8.5.16",
     "@math.gl/web-mercator": "^3.6.2",
     "cartocolor": "^4.0.2",
@@ -49,7 +49,7 @@
     "quadbin": "^0.1.2"
   },
   "devDependencies": {
-    "@loaders.gl/schema": "^3.3.0-alpha.10",
+    "@loaders.gl/schema": "^3.3.1",
     "@types/d3-array": "^3.0.2",
     "@types/d3-color": "^1.4.2",
     "@types/d3-scale": "^3.0.0"
@@ -62,5 +62,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.0.0"
   },
-  "gitHead": "47223d1ea084c3f9b0c9f0f9736682850bb5db85"
+  "gitHead": "da509f9b00415a8d0700951663b65b59077c0cae"
 }

package/src/api/maps-v3-client.ts

@@ -131,6 +131,18 @@ type FetchLayerDataParams = {
   queryParameters?: QueryParameters;
 };
 
+type MapsAPIParameters = {
+  client: string;
+  v: string;
+  q?: string;
+  name?: string;
+  queryParameters?: QueryParameters;
+  geo_column?: string;
+  columns?: string;
+  aggregationExp?: string;
+  aggregationResLevel?: number;
+};
+
 /**
  * Build a URL with all required parameters
  */
@@ -143,34 +155,36 @@ function getParameters({
   aggregationExp,
   aggregationResLevel,
   queryParameters
-}: Omit<FetchLayerDataParams, 'connection' | 'credentials'>) {
-  const parameters = [encodeParameter('client', clientId || DEFAULT_CLIENT)];
-  parameters.push(encodeParameter('v', V3_MINOR_VERSION));
+}: Omit<FetchLayerDataParams, 'connection' | 'credentials'>): MapsAPIParameters {
+  const parameters: MapsAPIParameters = {
+    client: clientId || DEFAULT_CLIENT,
+    v: V3_MINOR_VERSION
+  };
 
   const sourceName = type === MAP_TYPES.QUERY ? 'q' : 'name';
-  parameters.push(encodeParameter(sourceName, source));
+  parameters[sourceName] = source;
 
   if (queryParameters) {
-    parameters.push(encodeParameter('queryParameters', JSON.stringify(queryParameters)));
+    parameters.queryParameters = queryParameters;
   }
 
   if (geoColumn) {
-    parameters.push(encodeParameter('geo_column', geoColumn));
+    parameters.geo_column = geoColumn;
   }
   if (columns) {
-    parameters.push(encodeParameter('columns', columns.join(',')));
+    parameters.columns = columns.join(',');
   }
   if (aggregationExp) {
-    parameters.push(encodeParameter('aggregationExp', aggregationExp));
+    parameters.aggregationExp = aggregationExp;
   } else if (isSpatialIndexGeoColumn(geoColumn)) {
     // Default aggregationExp required for spatial index layers
-    parameters.push(encodeParameter('aggregationExp', '1 AS value'));
+    parameters.aggregationExp = '1 AS value';
   }
   if (aggregationResLevel) {
-    parameters.push(encodeParameter('aggregationResLevel', aggregationResLevel));
+    parameters.aggregationResLevel = aggregationResLevel;
   }
 
-  return parameters.join('&');
+  return parameters;
 }
 
 function isSpatialIndexGeoColumn(geoColumn: string | undefined) {
@@ -192,7 +206,7 @@ export async function mapInstantiation({
   queryParameters
 }: FetchLayerDataParams): Promise<MapInstantiation> {
   const baseUrl = `${credentials.mapsUrl}/${connection}/${type}`;
-  const url = `${baseUrl}?${getParameters({
+  const parameters = getParameters({
     type,
     source,
     geoColumn,
@@ -201,26 +215,24 @@ export async function mapInstantiation({
     aggregationResLevel,
     aggregationExp,
     queryParameters
-  })}`;
+  });
+  const encodedParameters = Object.entries(parameters).map(([key, value]) => {
+    if (typeof value !== 'string') {
+      value = JSON.stringify(value);
+    }
+    return encodeParameter(key, value);
+  });
+  const url = `${baseUrl}?${encodedParameters.join('&')}`;
   const {accessToken} = credentials;
 
   const errorContext = {requestType: REQUEST_TYPES.INSTANTIATION, connection, type, source};
   if (url.length > MAX_GET_LENGTH && type === MAP_TYPES.QUERY) {
-    // need to be a POST request
-    const body = JSON.stringify({
-      q: source,
-      client: clientId || DEFAULT_CLIENT,
-      aggregationResLevel,
-      aggregationExp,
-      geoColumn,
-      queryParameters
-    });
     return await requestJson({
       method: 'POST',
       url: baseUrl,
       headers,
       accessToken,
-      body,
+      body: JSON.stringify(parameters),
       errorContext
     });
   }

package/src/layers/carto-layer.ts

@@ -165,11 +165,11 @@ type _CartoLayerProps = {
   queryParameters?: QueryParameters;
 };
 
-export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
+export default class CartoLayer<ExtraProps extends {} = {}> extends CompositeLayer<
   Required<_CartoLayerProps> & ExtraProps
 > {
   static layerName = 'CartoLayer';
-  static defaultProps = defaultProps as any;
+  static defaultProps = defaultProps;
 
   initializeState(): void {
     this.state = {

package/src/layers/carto-tile-layer.ts

@@ -42,7 +42,7 @@ type _CartoTileLayerProps = {
 
 export default class CartoTileLayer<
   DataT extends Feature = Feature,
-  ExtraProps = {}
+  ExtraProps extends {} = {}
 > extends MVTLayer<DataT, Required<_CartoTileLayerProps> & ExtraProps> {
   static layerName = 'CartoTileLayer';
   static defaultProps = defaultProps;

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

@@ -38,7 +38,7 @@ type _H3TileLayerProps<DataT> = H3HexagonLayerProps<DataT> & {
   aggregationResLevel?: number;
 };
 
-export default class H3TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<
+export default class H3TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<
   ExtraPropsT & Required<_H3TileLayerProps<DataT>>
 > {
   static layerName = 'H3TileLayer';

package/src/layers/quadbin-layer.ts

@@ -22,7 +22,7 @@ type _QuadbinLayerProps<DataT> = {
   getQuadbin?: AccessorFunction<DataT, bigint>;
 };
 
-export default class QuadbinLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<
+export default class QuadbinLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<
   DataT,
   Required<_QuadbinLayerProps<DataT>> & ExtraProps
 > {

package/src/layers/quadbin-tile-layer.ts

@@ -33,9 +33,10 @@ type _QuadbinTileLayerProps<DataT> = QuadbinLayerProps<DataT> & {
   aggregationResLevel?: number;
 };
 
-export default class QuadbinTileLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<
-  ExtraProps & Required<_QuadbinTileLayerProps<DataT>>
-> {
+export default class QuadbinTileLayer<
+  DataT = any,
+  ExtraProps extends {} = {}
+> extends CompositeLayer<ExtraProps & Required<_QuadbinTileLayerProps<DataT>>> {
   static layerName = 'QuadbinTileLayer';
   static defaultProps = defaultProps;
 

package/src/layers/spatial-index-tile-layer.ts

@@ -29,10 +29,10 @@ type _SpatialIndexTileLayerProps<DataT = any> = {
   aggregationResLevel?: number;
 };
 
-export default class SpatialIndexTileLayer<DataT = any, ExtraProps = {}> extends TileLayer<
-  DataT,
-  ExtraProps & Required<_SpatialIndexTileLayerProps<DataT>>
-> {
+export default class SpatialIndexTileLayer<
+  DataT = any,
+  ExtraProps extends {} = {}
+> extends TileLayer<DataT, ExtraProps & Required<_SpatialIndexTileLayerProps<DataT>>> {
   static layerName = 'SpatialIndexTileLayer';
   static defaultProps = defaultProps;
 

package/typed/api/maps-v3-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maps-v3-client.d.ts","sourceRoot":"","sources":["../../src/api/maps-v3-client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAIL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAIL,MAAM,EAGN,gBAAgB,EAChB,OAAO,EAEP,eAAe,EAEf,WAAW,EACX,UAAU,EAEX,MAAM,mBAAmB,CAAC;AAY3B,oBAAY,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAiF7C,aAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,sBAAsB,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAiDF,wBAAsB,gBAAgB,CAAC,EACrC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAoClD;AA+CD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AACD,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAuBtD;AA+MD,wBAAsB,QAAQ,CAAC,EAC7B,UAAU,EACV,QAAQ,EACR,WAAW,EACX,OAAO,EACP,WAAW,EACX,SAAS,EACV,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC;4BA+B6B,IAAI;;;;;;;;;;GAsCjC"}
+{"version":3,"file":"maps-v3-client.d.ts","sourceRoot":"","sources":["../../src/api/maps-v3-client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAIL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAIL,MAAM,EAGN,gBAAgB,EAChB,OAAO,EAEP,eAAe,EAEf,WAAW,EACX,UAAU,EAEX,MAAM,mBAAmB,CAAC;AAY3B,oBAAY,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAiF7C,aAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,sBAAsB,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AA+DF,wBAAsB,gBAAgB,CAAC,EACrC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkClD;AA+CD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AACD,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAuBtD;AA+MD,wBAAsB,QAAQ,CAAC,EAC7B,UAAU,EACV,QAAQ,EACR,WAAW,EACX,OAAO,EACP,WAAW,EACX,SAAS,EACV,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC;4BA+B6B,IAAI;;;;;;;;;;GAsCjC"}

package/typed/layers/carto-layer.d.ts

@@ -78,9 +78,44 @@ declare type _CartoLayerProps = {
     /** Query parameters to be sent to the server. **/
     queryParameters?: QueryParameters;
 };
-export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<Required<_CartoLayerProps> & ExtraProps> {
+export default class CartoLayer<ExtraProps extends {} = {}> extends CompositeLayer<Required<_CartoLayerProps> & ExtraProps> {
     static layerName: string;
-    static defaultProps: any;
+    static defaultProps: {
+        data: null;
+        type: null;
+        onDataLoad: {
+            type: string;
+            value: (data: any) => void;
+            compare: boolean;
+        };
+        onDataError: {
+            type: string;
+            value: null;
+            compare: boolean;
+            optional: boolean;
+        };
+        uniqueIdProperty: string;
+        credentials: null;
+        /*********************/
+        /**********************/
+        connection: null;
+        format: null;
+        formatTiles: null;
+        clientId: null;
+        geoColumn: null;
+        columns: {
+            type: string;
+            value: null;
+        };
+        headers: {
+            type: string;
+            value: {};
+            optional: boolean;
+        };
+        aggregationExp: null;
+        aggregationResLevel: null;
+        queryParameters: null;
+    };
     initializeState(): void;
     get isLoaded(): boolean;
     _checkProps(props: CartoLayerProps): void;

package/typed/layers/carto-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EAEV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAIL,OAAO,EAEP,UAAU,EACV,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAGL,WAAW,EAEZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAuB,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAiDpE,8CAA8C;AAC9C,oBAAY,eAAe,CAAC,KAAK,GAAG,GAAG,IAAI,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAEzF,sCAAsC;AACtC,aAAK,gBAAgB,GAAG;IACtB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;IAEzB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAE3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,wEAAwE;IACxE,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,iHAAiH;IACjH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,kDAAkD;IAClD,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,UAAU,GAAG,EAAE,CAAE,SAAQ,cAAc,CACrE,QAAQ,CAAC,gBAAgB,CAAC,GAAG,UAAU,CACxC;IACC,MAAM,CAAC,SAAS,SAAgB;IAChC,MAAM,CAAC,YAAY,MAAuB;IAE1C,eAAe,IAAI,IAAI;IAOvB,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAuCzC,WAAW,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAqB5D,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAsClC,oBAAoB,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC;IAuBzC,YAAY,IAAI,KAAK,GAAG,IAAI;CA4B7B"}
+{"version":3,"file":"carto-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EAEV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAIvB,OAAO,EAAC,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAIL,OAAO,EAEP,UAAU,EACV,eAAe,EAChB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAGL,WAAW,EAEZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAuB,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAiDpE,8CAA8C;AAC9C,oBAAY,eAAe,CAAC,KAAK,GAAG,GAAG,IAAI,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAEzF,sCAAsC;AACtC,aAAK,gBAAgB,GAAG;IACtB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;;;OAOG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;IAEzB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAE1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;OAIG;IACH,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,KAAK,IAAI,CAAC;IAE3C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,kEAAkE;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,wEAAwE;IACxE,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,iHAAiH;IACjH,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAE7B,kDAAkD;IAClD,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAChF,QAAQ,CAAC,gBAAgB,CAAC,GAAG,UAAU,CACxC;IACC,MAAM,CAAC,SAAS,SAAgB;IAChC,MAAM,CAAC,YAAY;;;;;;;;;;;;;;;;QAhInB,uBAAuB;QAEvB,wBAAwB;;;;;;;;;;;;;;;;;;MA8HW;IAEnC,eAAe,IAAI,IAAI;IAOvB,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,WAAW,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAuCzC,WAAW,CAAC,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAqB5D,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAsClC,oBAAoB,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC;IAuBzC,YAAY,IAAI,KAAK,GAAG,IAAI;CA4B7B"}

package/typed/layers/carto-tile-layer.d.ts

@@ -15,7 +15,7 @@ declare type _CartoTileLayerProps = {
      */
     formatTiles?: TileFormat;
 };
-export default class CartoTileLayer<DataT extends Feature = Feature, ExtraProps = {}> extends MVTLayer<DataT, Required<_CartoTileLayerProps> & ExtraProps> {
+export default class CartoTileLayer<DataT extends Feature = Feature, ExtraProps extends {} = {}> extends MVTLayer<DataT, Required<_CartoTileLayerProps> & ExtraProps> {
     static layerName: string;
     static defaultProps: DefaultProps<CartoTileLayerProps<Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>>>;
     initializeState(): void;

package/typed/layers/carto-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"carto-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,UAAU,EAAe,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AASrC,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,SAAS,OAAO,GAAG,OAAO,IAAI,oBAAoB,GACrF,aAAa,CAAC,KAAK,CAAC,CAAC;AAEvB,0CAA0C;AAC1C,aAAK,oBAAoB,GAAG;IAC1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,SAAS,OAAO,GAAG,OAAO,EAC/B,UAAU,GAAG,EAAE,CACf,SAAQ,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,UAAU,CAAC;IACpE,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,8GAAgB;IAEnC,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,IAAI,EAAE,aAAa;IAsB/B,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAmBtB,cAAc,CAAC,MAAM,KAAA;CAUtB"}
+{"version":3,"file":"carto-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-tile-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAG7C,OAAO,EAAC,UAAU,EAAe,MAAM,wBAAwB,CAAC;AAChE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AASrC,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,SAAS,OAAO,GAAG,OAAO,IAAI,oBAAoB,GACrF,aAAa,CAAC,KAAK,CAAC,CAAC;AAEvB,0CAA0C;AAC1C,aAAK,oBAAoB,GAAG;IAC1B;;;;;OAKG;IACH,WAAW,CAAC,EAAE,UAAU,CAAC;CAC1B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,SAAS,OAAO,GAAG,OAAO,EAC/B,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,GAAG,UAAU,CAAC;IACpE,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,8GAAgB;IAEnC,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,IAAI,EAAE,aAAa;IAsB/B,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAmBtB,cAAc,CAAC,MAAM,KAAA;CAUtB"}

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

@@ -6,7 +6,7 @@ declare type H3HexagonLayerProps<DataT = any> = Record<string, any>;
 declare type _H3TileLayerProps<DataT> = H3HexagonLayerProps<DataT> & {
     aggregationResLevel?: number;
 };
-export default class H3TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<ExtraPropsT & Required<_H3TileLayerProps<DataT>>> {
+export default class H3TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT & Required<_H3TileLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<H3HexagonLayerProps<any>>;
     state: {

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

@@ -1 +1 @@
-{"version":3,"file":"h3-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAqBvB,+CAA+C;AAC/C,oBAAY,gBAAgB,CAAC,KAAK,GAAG,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAIlG,aAAK,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE5D,uCAAuC;AACvC,aAAK,iBAAiB,CAAC,KAAK,IAAI,mBAAmB,CAAC,KAAK,CAAC,GAAG;IAC3D,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,GAAG,EAAE,CAAE,SAAQ,cAAc,CACpF,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CACjD;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IAEF,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAyC1C"}
+{"version":3,"file":"h3-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AAqBvB,+CAA+C;AAC/C,oBAAY,gBAAgB,CAAC,KAAK,GAAG,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAIlG,aAAK,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE5D,uCAAuC;AACvC,aAAK,iBAAiB,CAAC,KAAK,IAAI,mBAAmB,CAAC,KAAK,CAAC,GAAG;IAC3D,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,WAAW,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CACjD;IACC,MAAM,CAAC,SAAS,SAAiB;IACjC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IAEF,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAyC1C"}

package/typed/layers/quadbin-layer.d.ts

@@ -11,7 +11,7 @@ declare type _QuadbinLayerProps<DataT> = {
      */
     getQuadbin?: AccessorFunction<DataT, bigint>;
 };
-export default class QuadbinLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<DataT, Required<_QuadbinLayerProps<DataT>> & ExtraProps> {
+export default class QuadbinLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<DataT, Required<_QuadbinLayerProps<DataT>> & ExtraProps> {
     static layerName: string;
     static defaultProps: DefaultProps<QuadbinLayerProps<any>>;
     indexToBounds(): Partial<GeoCellLayer['props']> | null;

package/typed/layers/quadbin-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quadbin-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,EACL,aAAa,IAAI,YAAY,EAC7B,kBAAkB,IAAI,iBAAiB,EACxC,MAAM,qBAAqB,CAAC;AAO7B,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAElG,wCAAwC;AACxC,aAAK,kBAAkB,CAAC,KAAK,IAAI;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,YAAY,CAClF,KAAK,EACL,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACjD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAavD"}
+{"version":3,"file":"quadbin-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,EACL,aAAa,IAAI,YAAY,EAC7B,kBAAkB,IAAI,iBAAiB,EACxC,MAAM,qBAAqB,CAAC;AAO7B,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAElG,wCAAwC;AACxC,aAAK,kBAAkB,CAAC,KAAK,IAAI;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,YAAY,CAC7F,KAAK,EACL,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACjD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAavD"}

package/typed/layers/quadbin-tile-layer.d.ts

@@ -9,7 +9,7 @@ export declare type QuadbinTileLayerProps<DataT = any> = _QuadbinTileLayerProps<
 declare type _QuadbinTileLayerProps<DataT> = QuadbinLayerProps<DataT> & {
     aggregationResLevel?: number;
 };
-export default class QuadbinTileLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<ExtraProps & Required<_QuadbinTileLayerProps<DataT>>> {
+export default class QuadbinTileLayer<DataT = any, ExtraProps extends {} = {}> extends CompositeLayer<ExtraProps & Required<_QuadbinTileLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<QuadbinTileLayerProps<any>>;
     state: {

package/typed/layers/quadbin-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quadbin-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAKhE,eAAO,MAAM,eAAe;;SAO3B,CAAC;AAMF,oDAAoD;AACpD,oBAAY,qBAAqB,CAAC,KAAK,GAAG,GAAG,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAC5E,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE7B,4CAA4C;AAC5C,aAAK,sBAAsB,CAAC,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG;IAC9D,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAgB,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,cAAc,CACxF,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CACrD;IACC,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,2CAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IACF,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAoB1C"}
+{"version":3,"file":"quadbin-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadbin-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAKhE,eAAO,MAAM,eAAe;;SAO3B,CAAC;AAMF,oDAAoD;AACpD,oBAAY,qBAAqB,CAAC,KAAK,GAAG,GAAG,IAAI,sBAAsB,CAAC,KAAK,CAAC,GAC5E,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE7B,4CAA4C;AAC5C,aAAK,sBAAsB,CAAC,KAAK,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG;IAC9D,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,gBAAgB,CACnC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,cAAc,CAAC,UAAU,GAAG,QAAQ,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,2CAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IACF,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAoB1C"}

package/typed/layers/spatial-index-tile-layer.d.ts

@@ -7,7 +7,7 @@ export declare type SpatialIndexTileLayerProps<DataT = any> = _SpatialIndexTileL
 declare type _SpatialIndexTileLayerProps<DataT = any> = {
     aggregationResLevel?: number;
 };
-export default class SpatialIndexTileLayer<DataT = any, ExtraProps = {}> extends TileLayer<DataT, ExtraProps & Required<_SpatialIndexTileLayerProps<DataT>>> {
+export default class SpatialIndexTileLayer<DataT = any, ExtraProps extends {} = {}> extends TileLayer<DataT, ExtraProps & Required<_SpatialIndexTileLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<SpatialIndexTileLayerProps<any>>;
     getTileData(tile: TileLoadProps): any;

package/typed/layers/spatial-index-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spatial-index-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAI7D,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EACL,SAAS,EAET,aAAa,IAAI,YAAY,EAC7B,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAW7B,yDAAyD;AACzD,oBAAY,0BAA0B,CAAC,KAAK,GAAG,GAAG,IAAI,2BAA2B,CAAC,KAAK,CAAC,GACtF,SAAS,CAAC,KAAK,CAAC,CAAC;AAEnB,iDAAiD;AACjD,aAAK,2BAA2B,CAAC,KAAK,GAAG,GAAG,IAAI;IAC9C,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,qBAAqB,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,SAAS,CACxF,KAAK,EACL,UAAU,GAAG,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAC1D;IACC,MAAM,CAAC,SAAS,SAA2B;IAC3C,MAAM,CAAC,YAAY,gDAAgB;IAEnC,WAAW,CAAC,IAAI,EAAE,aAAa;IA8B/B,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAsBvD,sBAAsB,CAAC,IAAI,EAAE,YAAY;;;;IAOzC,yBAAyB,CAAC,IAAI,EAAE,YAAY;CAW7C"}
+{"version":3,"file":"spatial-index-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/spatial-index-tile-layer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAE,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAI7D,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EACL,SAAS,EAET,aAAa,IAAI,YAAY,EAC7B,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAW7B,yDAAyD;AACzD,oBAAY,0BAA0B,CAAC,KAAK,GAAG,GAAG,IAAI,2BAA2B,CAAC,KAAK,CAAC,GACtF,SAAS,CAAC,KAAK,CAAC,CAAC;AAEnB,iDAAiD;AACjD,aAAK,2BAA2B,CAAC,KAAK,GAAG,GAAG,IAAI;IAC9C,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,qBAAqB,CACxC,KAAK,GAAG,GAAG,EACX,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,SAAS,CAAC,KAAK,EAAE,UAAU,GAAG,QAAQ,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC;IACnF,MAAM,CAAC,SAAS,SAA2B;IAC3C,MAAM,CAAC,YAAY,gDAAgB;IAEnC,WAAW,CAAC,IAAI,EAAE,aAAa;IA8B/B,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAsBvD,sBAAsB,CAAC,IAAI,EAAE,YAAY;;;;IAOzC,yBAAyB,CAAC,IAAI,EAAE,YAAY;CAW7C"}