@deck.gl/carto 8.8.0-alpha.6 → 8.8.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.8.0-alpha.6",
+  "version": "8.8.0-beta.3",
   "publishConfig": {
     "access": "public"
   },
@@ -32,23 +32,23 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
   },
   "dependencies": {
-    "@loaders.gl/gis": "^3.2.0-alpha.4",
-    "@loaders.gl/loader-utils": "^3.2.0-alpha.4",
-    "@loaders.gl/mvt": "^3.2.0-alpha.4",
-    "@loaders.gl/tiles": "^3.2.0-alpha.4",
-    "@luma.gl/constants": "^8.5.13",
-    "@math.gl/web-mercator": "3.6.0-alpha.8",
+    "@loaders.gl/gis": "^3.2.0",
+    "@loaders.gl/loader-utils": "^3.2.0",
+    "@loaders.gl/mvt": "^3.2.0",
+    "@loaders.gl/tiles": "^3.2.0",
+    "@luma.gl/constants": "^8.5.14",
+    "@math.gl/web-mercator": "^3.6.0",
     "cartocolor": "^4.0.2",
     "d3-array": "^2.8.0",
     "d3-color": "^2.0.0",
     "d3-format": "^2.0.0",
     "d3-scale": "^3.2.3",
-    "h3-js": "^3.6.0",
+    "h3-js": "^3.7.0",
     "moment-timezone": "^0.5.33",
     "pbf": "^3.2.1"
   },
   "devDependencies": {
-    "@loaders.gl/schema": "^3.2.0-alpha.4",
+    "@loaders.gl/schema": "^3.2.0",
     "@types/d3-array": "^3.0.2",
     "@types/d3-color": "^1.4.2",
     "@types/d3-scale": "^3.0.0"
@@ -61,5 +61,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.0.0"
   },
-  "gitHead": "6885ccab01c91a7632385f566c9377f8ae387e7c"
+  "gitHead": "bb459e1b4a4e3674ee9832d775d39211541d17b4"
 }

package/src/layers/carto-layer.ts

@@ -1,4 +1,11 @@
-import {CompositeLayer, Layer, log} from '@deck.gl/core';
+import {
+  CompositeLayer,
+  Layer,
+  log,
+  CompositeLayerProps,
+  LayerProps,
+  ChangeFlags
+} from '@deck.gl/core';
 import CartoTileLayer from './carto-tile-layer';
 import H3TileLayer from './h3-tile-layer';
 import QuadkeyTileLayer from './quadkey-tile-layer';
@@ -21,8 +28,6 @@ import {
   Credentials,
   getDefaultCredentials
 } from '../config';
-import {CompositeLayerProps, LayerProps} from 'modules/core/src/types/layer-props';
-import {ChangeFlags} from 'modules/core/src/lib/layer-state';
 import {FetchLayerDataResult} from '../api/maps-v3-client';
 import {assert} from '../utils';
 
@@ -151,6 +156,12 @@ type _CartoLayerProps = {
   onDataError?: (err: unknown) => void;
 
   clientId?: string;
+
+  /** Aggregration SQL expression. Only used for spatial index datasets **/
+  aggregationExp?: string;
+
+  /** Aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3. **/
+  aggregationResLevel?: number;
 };
 
 export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
@@ -222,6 +233,8 @@ export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
     this._checkProps(props);
     const shouldUpdateData =
       changeFlags.dataChanged ||
+      props.aggregationExp !== oldProps.aggregationExp ||
+      props.aggregationResLevel !== oldProps.aggregationResLevel ||
       props.connection !== oldProps.connection ||
       props.geoColumn !== oldProps.geoColumn ||
       props.format !== oldProps.format ||

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

@@ -1,6 +1,6 @@
 /* global TextDecoder */
 import Protobuf from 'pbf';
-import {log} from '@deck.gl/core';
+import {log, DefaultProps} from '@deck.gl/core';
 import {ClipExtension} from '@deck.gl/extensions';
 import {
   MVTLayer,
@@ -79,7 +79,7 @@ const CartoTileLoader: LoaderWithParser = {
   }
 };
 
-const defaultProps = {
+const defaultProps: DefaultProps<CartoTileLayerProps> = {
   ...MVTLayer.defaultProps,
   formatTiles: defaultTileFormat,
   loaders: [CartoTileLoader]

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

@@ -3,7 +3,8 @@ import {
   CompositeLayerProps,
   Layer,
   LayersList,
-  UpdateParameters
+  UpdateParameters,
+  DefaultProps
 } from '@deck.gl/core';
 import {H3HexagonLayer} from '@deck.gl/geo-layers';
 import H3Tileset2D from './h3-tileset-2d';
@@ -21,7 +22,7 @@ const renderSubLayers = props => {
   });
 };
 
-const defaultProps = {
+const defaultProps: DefaultProps<H3HexagonLayerProps> = {
   aggregationResLevel: 4
 };
 
@@ -33,7 +34,7 @@ export type H3TileLayerProps<DataT = any> = _H3TileLayerProps<DataT> & Composite
 type H3HexagonLayerProps<DataT = any> = Record<string, any>;
 
 /** Properties added by H3TileLayer. */
-type _H3TileLayerProps<DataT = any> = H3HexagonLayerProps<DataT> & {
+type _H3TileLayerProps<DataT> = H3HexagonLayerProps<DataT> & {
   aggregationResLevel?: number;
 };
 

package/src/layers/h3-tileset-2d.ts

@@ -1,13 +1,5 @@
 import {_Tileset2D as Tileset2D, GeoBoundingBox} from '@deck.gl/geo-layers';
-import {
-  polyfill,
-  getRes0Indexes,
-  geoToH3,
-  h3GetResolution,
-  h3ToGeoBoundary,
-  h3ToParent,
-  kRing
-} from 'h3-js';
+import {polyfill, geoToH3, h3GetResolution, h3ToGeoBoundary, h3ToParent, kRing} from 'h3-js';
 
 export type H3TileIndex = {i: string};
 
@@ -15,15 +7,16 @@ function getHexagonsInBoundingBox(
   {west, north, east, south}: GeoBoundingBox,
   resolution: number
 ): string[] {
-  if (resolution === 0) {
-    return getRes0Indexes();
-  }
-  if (east - west > 180) {
+  if (Math.abs(east - west) > 180) {
     // This is a known issue in h3-js: polyfill does not work correctly
     // when longitude span is larger than 180 degrees.
-    return getHexagonsInBoundingBox({west, north, east: 0, south}, resolution).concat(
-      getHexagonsInBoundingBox({west: 0, north, east, south}, resolution)
-    );
+    return [
+      ...new Set(
+        getHexagonsInBoundingBox({west, north, east: 0, south}, resolution).concat(
+          getHexagonsInBoundingBox({west: 0, north, east, south}, resolution)
+        )
+      )
+    ];
   }
 
   // `polyfill()` fills based on hexagon center, which means tiles vanish

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

@@ -3,7 +3,8 @@ import {
   CompositeLayerProps,
   Layer,
   LayersList,
-  UpdateParameters
+  UpdateParameters,
+  DefaultProps
 } from '@deck.gl/core';
 import {QuadkeyLayer, QuadkeyLayerProps} from '@deck.gl/geo-layers';
 import QuadkeyTileset2D from './quadkey-tileset-2d';
@@ -15,7 +16,7 @@ const renderSubLayers = props => {
   return new QuadkeyLayer(props, {getQuadkey: d => d.id});
 };
 
-const defaultProps = {
+const defaultProps: DefaultProps<QuadkeyTileLayerProps> = {
   aggregationResLevel: 6
 };
 

package/src/layers/quadkey-tileset-2d.ts

@@ -13,6 +13,23 @@ function tileToQuadkey(tile): QuadkeyTileIndex {
   return {i: index};
 }
 
+function quadkeyToTile(index: QuadkeyTileIndex) {
+  const quadkey = index.i;
+  const tile = {x: 0, y: 0, z: quadkey.length};
+
+  for (let i = tile.z; i > 0; i--) {
+    const mask = 1 << (i - 1);
+    const q = Number(quadkey[tile.z - i]);
+    if (q === 1) tile.x |= mask;
+    if (q === 2) tile.y |= mask;
+    if (q === 3) {
+      tile.x |= mask;
+      tile.y |= mask;
+    }
+  }
+  return tile;
+}
+
 export default class QuadkeyTileset2D extends Tileset2D {
   // @ts-expect-error for spatial indices, TileSet2d should be parametrized by TileIndexT
   getTileIndices(opts): QuadkeyTileIndex[] {
@@ -24,8 +41,9 @@ export default class QuadkeyTileset2D extends Tileset2D {
     return i;
   }
 
-  getTileMetadata() {
-    return {};
+  // @ts-expect-error TileIndex must be generic
+  getTileMetadata(index: QuadkeyTileIndex) {
+    return super.getTileMetadata(quadkeyToTile(index));
   }
 
   // @ts-expect-error TileIndex must be generic

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

@@ -6,6 +6,8 @@ function isFeatureIdDefined(value: unknown): boolean {
 }
 
 export default class SpatialIndexTileLayer<ExtraProps = {}> extends TileLayer<any, ExtraProps> {
+  static layerName = 'SpatialIndexTileLayer';
+
   protected _updateAutoHighlight(info: PickingInfo): void {
     const {hoveredFeatureId} = this.state;
     const hoveredFeature = info.object;

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

@@ -39,7 +39,7 @@ export declare function fetchMap({ cartoMapId, clientId, credentials, autoRefres
     updatedAt: any;
     initialViewState: any;
     mapStyle: any;
-    layers: (import("@deck.gl/core").Layer<any> | undefined)[];
+    layers: (import("@deck.gl/core").Layer<{}> | undefined)[];
 }>;
 export {};
 //# sourceMappingURL=maps-v3-client.d.ts.map

package/typed/api/parseMap.d.ts

@@ -6,6 +6,6 @@ export declare function parseMap(json: any): {
     updatedAt: any;
     initialViewState: any;
     mapStyle: any;
-    layers: (import("@deck.gl/core").Layer<any> | undefined)[];
+    layers: (import("@deck.gl/core").Layer<{}> | undefined)[];
 };
 //# sourceMappingURL=parseMap.d.ts.map

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

@@ -1,8 +1,6 @@
-import { CompositeLayer, Layer } from '@deck.gl/core/typed';
+import { CompositeLayer, Layer, CompositeLayerProps, LayerProps, ChangeFlags } from '@deck.gl/core/typed';
 import { Format, MapType, TileFormat } from '../api/maps-api-common';
 import { Credentials } from '../config';
-import { CompositeLayerProps, LayerProps } from 'modules/core/src/types/layer-props';
-import { ChangeFlags } from 'modules/core/src/lib/layer-state';
 /** All properties supported by CartoLayer. */
 export declare type CartoLayerProps<DataT = any> = _CartoLayerProps & CompositeLayerProps<DataT>;
 /** Properties added by CartoLayer. */
@@ -77,6 +75,10 @@ declare type _CartoLayerProps = {
      */
     onDataError?: (err: unknown) => void;
     clientId?: string;
+    /** Aggregration SQL expression. Only used for spatial index datasets **/
+    aggregationExp?: string;
+    /** Aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3. **/
+    aggregationResLevel?: number;
 };
 export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<Required<_CartoLayerProps> & ExtraProps> {
     static layerName: string;

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,EAAC,cAAc,EAAE,KAAK,EAAM,MAAM,eAAe,CAAC;AAOzD,OAAO,EAEL,MAAM,EAGN,OAAO,EAEP,UAAU,EAEX,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAGL,WAAW,EAEZ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAC,mBAAmB,EAAE,UAAU,EAAC,MAAM,oCAAoC,CAAC;AACnF,OAAO,EAAC,WAAW,EAAC,MAAM,kCAAkC,CAAC;AA4C7D,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,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;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,OAAO,KAAK,IAAI,CAAC;IAErC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,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,EACV,KAAK,EACL,QAAQ,EACR,WAAW,EACZ,EAAE;QACD,KAAK,EAAE,eAAe,CAAC;QACvB,QAAQ,EAAE,eAAe,CAAC;QAC1B,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;KAC1B,GAAG,IAAI;IAmBF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAqClC,oBAAoB,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC;IAqCzC,YAAY,IAAI,KAAK,GAAG,IAAI;CAqB7B"}
+{"version":3,"file":"carto-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,KAAK,EAEL,mBAAmB,EACnB,UAAU,EACV,WAAW,EACZ,MAAM,eAAe,CAAC;AAOvB,OAAO,EAEL,MAAM,EAGN,OAAO,EAEP,UAAU,EAEX,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAGL,WAAW,EAEZ,MAAM,WAAW,CAAC;AA4CnB,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,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;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,OAAO,KAAK,IAAI,CAAC;IAErC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,yEAAyE;IACzE,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,kHAAkH;IAClH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,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,EACV,KAAK,EACL,QAAQ,EACR,WAAW,EACZ,EAAE;QACD,KAAK,EAAE,eAAe,CAAC;QACvB,QAAQ,EAAE,eAAe,CAAC;QAC1B,OAAO,EAAE,GAAG,CAAC;QACb,WAAW,EAAE,WAAW,CAAC;KAC1B,GAAG,IAAI;IAqBF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAqClC,oBAAoB,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC;IAqCzC,YAAY,IAAI,KAAK,GAAG,IAAI;CAqB7B"}

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

@@ -1,7 +1,7 @@
+import { DefaultProps } from '@deck.gl/core/typed';
 import { MVTLayer, MVTLayerProps, TileLayer, _Tile2DHeader, _TileLoadProps as TileLoadProps } from '@deck.gl/geo-layers/typed';
 import { GeoJsonLayer } from '@deck.gl/layers/typed';
 import { TileFormat } from '../api/maps-api-common';
-import { LoaderWithParser } from '@loaders.gl/loader-utils';
 import type { Feature } from 'geojson';
 /** All properties supported by CartoTileLayer. */
 export declare type CartoTileLayerProps<DataT extends Feature = Feature> = _CartoTileLayerProps & MVTLayerProps<DataT>;
@@ -17,40 +17,7 @@ declare type _CartoTileLayerProps = {
 };
 export default class CartoTileLayer<DataT extends Feature = Feature, ExtraProps = {}> extends MVTLayer<DataT, Required<_CartoTileLayerProps> & ExtraProps> {
     static layerName: string;
-    static defaultProps: {
-        formatTiles: "binary";
-        loaders: LoaderWithParser[];
-        uniqueIdProperty: {
-            type: string;
-            value: string;
-        };
-        highlightedFeatureId: null;
-        binary: boolean;
-        stroked: boolean;
-        filled: boolean;
-        extruded: boolean;
-        wireframe: boolean;
-        iconAtlas: {
-            type: string;
-            value: null;
-        };
-        iconMapping: {
-            type: string;
-            value: {};
-        };
-        getIcon: {
-            type: string;
-            value: (f: any) => any;
-        };
-        getText: {
-            type: string;
-            value: (f: any) => any;
-        };
-        pointType: string;
-        getRadius: {
-            deprecatedFor: string;
-        };
-    };
+    static defaultProps: DefaultProps<CartoTileLayerProps<Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>>>;
     getTileData(tile: TileLoadProps): any;
     renderSubLayers(props: TileLayer['props'] & {
         id: string;

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,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,EAAgB,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAEzE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAqErC,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAgB;IAEnC,WAAW,CAAC,IAAI,EAAE,aAAa;IA0B/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;CAkBvB"}
+{"version":3,"file":"carto-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/carto-tile-layer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAM,YAAY,EAAC,MAAM,eAAe,CAAC;AAEhD,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;AAGhE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,SAAS,CAAC;AAqErC,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,WAAW,CAAC,IAAI,EAAE,aAAa;IA0B/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;CAkBvB"}

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

@@ -1,16 +1,14 @@
-import { CompositeLayer, CompositeLayerProps, Layer, LayersList, UpdateParameters } from '@deck.gl/core/typed';
+import { CompositeLayer, CompositeLayerProps, Layer, LayersList, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
 /** All properties supported by H3TileLayer. */
 export declare type H3TileLayerProps<DataT = any> = _H3TileLayerProps<DataT> & CompositeLayerProps<DataT>;
 declare type H3HexagonLayerProps<DataT = any> = Record<string, any>;
 /** Properties added by H3TileLayer. */
-declare type _H3TileLayerProps<DataT = any> = H3HexagonLayerProps<DataT> & {
+declare type _H3TileLayerProps<DataT> = H3HexagonLayerProps<DataT> & {
     aggregationResLevel?: number;
 };
 export default class H3TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<ExtraPropsT & Required<_H3TileLayerProps<DataT>>> {
     static layerName: string;
-    static defaultProps: {
-        aggregationResLevel: number;
-    };
+    static defaultProps: DefaultProps<H3HexagonLayerProps<any>>;
     state: {
         tileJSON: any;
         data: any;

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,EACjB,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,GAAG,GAAG,IAAI,mBAAmB,CAAC,KAAK,CAAC,GAAG;IACjE,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;;MAAgB;IAEnC,KAAK,EAAG;QACN,QAAQ,EAAE,GAAG,CAAC;QACd,IAAI,EAAE,GAAG,CAAC;KACX,CAAC;IAEF,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAc1C"}
+{"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;IAIvB,WAAW,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IASxD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CAc1C"}

package/typed/layers/h3-tileset-2d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-tileset-2d.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tileset-2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,IAAI,SAAS,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAW5E,oBAAY,WAAW,GAAG;IAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AA6DtC,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAEhD,cAAc,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAC;;;;KAAA,GAAG,WAAW,EAAE;IAuB3D,SAAS,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW,GAAG,MAAM;IAKnC,eAAe,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW;;;IAKhC,WAAW,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW,GAAG,MAAM;IAKrC,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,WAAW;CAKhD"}
+{"version":3,"file":"h3-tileset-2d.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tileset-2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,IAAI,SAAS,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAG5E,oBAAY,WAAW,GAAG;IAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AA8DtC,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAEhD,cAAc,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAC;;;;KAAA,GAAG,WAAW,EAAE;IAuB3D,SAAS,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW,GAAG,MAAM;IAKnC,eAAe,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW;;;IAKhC,WAAW,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW,GAAG,MAAM;IAKrC,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,WAAW;CAKhD"}

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

@@ -1,4 +1,4 @@
-import { CompositeLayer, CompositeLayerProps, Layer, LayersList, UpdateParameters } from '@deck.gl/core/typed';
+import { CompositeLayer, CompositeLayerProps, Layer, LayersList, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
 import { QuadkeyLayerProps } from '@deck.gl/geo-layers/typed';
 /** All properties supported by QuadkeyTileLayer. */
 export declare type QuadkeyTileLayerProps<DataT = any> = _QuadkeyTileLayerProps<DataT> & CompositeLayerProps<DataT>;
@@ -8,9 +8,7 @@ declare type _QuadkeyTileLayerProps<DataT> = QuadkeyLayerProps<DataT> & {
 };
 export default class QuadkeyTileLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<ExtraProps & Required<_QuadkeyTileLayerProps<DataT>>> {
     static layerName: string;
-    static defaultProps: {
-        aggregationResLevel: number;
-    };
+    static defaultProps: DefaultProps<QuadkeyTileLayerProps<any>>;
     state: {
         tileJSON: any;
         data: any;

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

@@ -1 +1 @@
-{"version":3,"file":"quadkey-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadkey-tile-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,KAAK,EACL,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAe,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAcpE,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;;MAAgB;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;CAc1C"}
+{"version":3,"file":"quadkey-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/quadkey-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,EAAe,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AAcpE,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;CAc1C"}

package/typed/layers/quadkey-tileset-2d.d.ts

@@ -5,7 +5,7 @@ declare type QuadkeyTileIndex = {
 export default class QuadkeyTileset2D extends Tileset2D {
     getTileIndices(opts: any): QuadkeyTileIndex[];
     getTileId({ i }: QuadkeyTileIndex): string;
-    getTileMetadata(): {};
+    getTileMetadata(index: QuadkeyTileIndex): Record<string, any>;
     getTileZoom({ i }: QuadkeyTileIndex): number;
     getParentIndex(index: QuadkeyTileIndex): {
         i: string;

package/typed/layers/quadkey-tileset-2d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quadkey-tileset-2d.d.ts","sourceRoot":"","sources":["../../src/layers/quadkey-tileset-2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,IAAI,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE5D,aAAK,gBAAgB,GAAG;IAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AAapC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,SAAS;IAErD,cAAc,CAAC,IAAI,KAAA,GAAG,gBAAgB,EAAE;IAKxC,SAAS,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB;IAI/B,eAAe;IAKf,WAAW,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB;IAKjC,cAAc,CAAC,KAAK,EAAE,gBAAgB;;;CAIvC"}
+{"version":3,"file":"quadkey-tileset-2d.d.ts","sourceRoot":"","sources":["../../src/layers/quadkey-tileset-2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,IAAI,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAE5D,aAAK,gBAAgB,GAAG;IAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AA8BpC,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,SAAS;IAErD,cAAc,CAAC,IAAI,KAAA,GAAG,gBAAgB,EAAE;IAKxC,SAAS,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB;IAK/B,eAAe,CAAC,KAAK,EAAE,gBAAgB;IAKvC,WAAW,CAAC,EAAC,CAAC,EAAC,EAAE,gBAAgB;IAKjC,cAAc,CAAC,KAAK,EAAE,gBAAgB;;;CAIvC"}

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

@@ -1,6 +1,7 @@
 import { PickingInfo } from '@deck.gl/core/typed';
 import { TileLayer, _Tile2DHeader as Tile2DHeader } from '@deck.gl/geo-layers/typed';
 export default class SpatialIndexTileLayer<ExtraProps = {}> extends TileLayer<any, ExtraProps> {
+    static layerName: string;
     protected _updateAutoHighlight(info: PickingInfo): void;
     getSubLayerPropsByTile(tile: Tile2DHeader): {
         highlightedObjectIndex: number;

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":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAE,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAM7E,MAAM,CAAC,OAAO,OAAO,qBAAqB,CAAC,UAAU,GAAG,EAAE,CAAE,SAAQ,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC5F,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":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAE,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAM7E,MAAM,CAAC,OAAO,OAAO,qBAAqB,CAAC,UAAU,GAAG,EAAE,CAAE,SAAQ,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC;IAC5F,MAAM,CAAC,SAAS,SAA2B;IAE3C,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAsBvD,sBAAsB,CAAC,IAAI,EAAE,YAAY;;;;IAOzC,yBAAyB,CAAC,IAAI,EAAE,YAAY;CAW7C"}