@deck.gl/carto 8.9.34 → 8.9.36-alpha.0

package/package.json

@@ -2,9 +2,10 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
-  "version": "8.9.34",
+  "version": "8.9.36-alpha.0",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "tag": "v8"
   },
   "keywords": [
     "carto",
@@ -65,5 +66,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.4.13"
   },
-  "gitHead": "8bc9e5fe32fa835caad70dd65ba00016a6958940"
+  "gitHead": "3a0ac5cb74324ca9eb22a582d153f6051a5b2840"
 }

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

@@ -5,7 +5,7 @@ import CartoSpatialTileLoader from './schema/carto-spatial-tile-loader';
 registerLoaders([CartoRasterTileLoader, CartoSpatialTileLoader]);
 
 import {PickingInfo} from '@deck.gl/core';
-import {TileLayer, _Tile2DHeader as Tile2DHeader} from '@deck.gl/geo-layers';
+import {TileLayer, _Tile2DHeader as Tile2DHeader, TileLayerProps} from '@deck.gl/geo-layers';
 
 function isFeatureIdDefined(value: unknown): boolean {
   return value !== undefined && value !== null && value !== '';
@@ -17,7 +17,7 @@ const defaultProps: DefaultProps<SpatialIndexTileLayerProps> = {
 
 /** All properties supported by SpatialIndexTileLayer. */
 export type SpatialIndexTileLayerProps<DataT = any> = _SpatialIndexTileLayerProps<DataT> &
-  TileLayer<DataT>;
+  TileLayerProps<DataT>;
 
 /** Properties added by SpatialIndexTileLayer. */
 type _SpatialIndexTileLayerProps<DataT = any> = {
@@ -31,6 +31,12 @@ export default class SpatialIndexTileLayer<
   static layerName = 'SpatialIndexTileLayer';
   static defaultProps = defaultProps;
 
+  state!: TileLayer<DataT>['state'] & {
+    // TODO: tileset: Tileset2D should be generic for either H3Tileset2D or QuadbinTileset2D
+    hoveredFeatureId: BigInt | number | null;
+    highlightColor?: number[];
+  };
+
   updateState(params: UpdateParameters<this>) {
     const {props, oldProps} = params;
     if (props.aggregationResLevel !== oldProps.aggregationResLevel) {
@@ -44,7 +50,7 @@ export default class SpatialIndexTileLayer<
   protected _updateAutoHighlight(info: PickingInfo): void {
     const {hoveredFeatureId} = this.state;
     const hoveredFeature = info.object;
-    let newHoveredFeatureId;
+    let newHoveredFeatureId: BigInt | number | null = null;
 
     if (hoveredFeature) {
       newHoveredFeatureId = hoveredFeature.id;
@@ -79,7 +85,7 @@ export default class SpatialIndexTileLayer<
       !isFeatureIdPresent ||
       !Array.isArray(data) ||
       // Quick check for whether id is within tile. data.findIndex is expensive
-      !this._featureInTile(tile, hoveredFeatureId)
+      !this._featureInTile(tile, hoveredFeatureId!)
     ) {
       return -1;
     }
@@ -88,15 +94,17 @@ export default class SpatialIndexTileLayer<
   }
 
   _featureInTile(tile: Tile2DHeader, featureId: BigInt | number) {
-    const {getTileZoom, getParentIndex} = this.state.tileset;
-    const tileZoom = getTileZoom(tile.index);
+    // TODO: Tile2DHeader index should be generic for H3TileIndex or QuadbinTileIndex
+    const tileset = this.state.tileset!;
+    const tileZoom = tileset.getTileZoom(tile.index);
     // @ts-ignore
     const KEY = tile.index.q ? 'q' : 'i';
-    let featureIndex = {[KEY]: featureId};
-    let featureZoom = getTileZoom(featureIndex);
+    // TODO - Tileset2D methods expect tile index in the shape of {x, y, z}
+    let featureIndex: any = {[KEY]: featureId};
+    let featureZoom = tileset.getTileZoom(featureIndex);
     while (!(featureZoom <= tileZoom)) {
-      featureIndex = getParentIndex(featureIndex);
-      featureZoom = getTileZoom(featureIndex);
+      featureIndex = tileset.getParentIndex(featureIndex);
+      featureZoom = tileset.getTileZoom(featureIndex);
     }
 
     return featureIndex[KEY] === tile.index[KEY];

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

@@ -1,8 +1,8 @@
 import { DefaultProps, UpdateParameters } from '@deck.gl/core/typed';
 import { PickingInfo } from '@deck.gl/core/typed';
-import { TileLayer, _Tile2DHeader as Tile2DHeader } from '@deck.gl/geo-layers/typed';
+import { TileLayer, _Tile2DHeader as Tile2DHeader, TileLayerProps } from '@deck.gl/geo-layers/typed';
 /** All properties supported by SpatialIndexTileLayer. */
-export declare type SpatialIndexTileLayerProps<DataT = any> = _SpatialIndexTileLayerProps<DataT> & TileLayer<DataT>;
+export declare type SpatialIndexTileLayerProps<DataT = any> = _SpatialIndexTileLayerProps<DataT> & TileLayerProps<DataT>;
 /** Properties added by SpatialIndexTileLayer. */
 declare type _SpatialIndexTileLayerProps<DataT = any> = {
     aggregationResLevel?: number;
@@ -10,11 +10,15 @@ declare type _SpatialIndexTileLayerProps<DataT = any> = {
 export default class SpatialIndexTileLayer<DataT = any, ExtraProps extends {} = {}> extends TileLayer<DataT, ExtraProps & Required<_SpatialIndexTileLayerProps<DataT>>> {
     static layerName: string;
     static defaultProps: DefaultProps<SpatialIndexTileLayerProps<any>>;
+    state: TileLayer<DataT>['state'] & {
+        hoveredFeatureId: BigInt | number | null;
+        highlightColor?: number[];
+    };
     updateState(params: UpdateParameters<this>): void;
     protected _updateAutoHighlight(info: PickingInfo): void;
     getSubLayerPropsByTile(tile: Tile2DHeader): {
         highlightedObjectIndex: number;
-        highlightColor: any;
+        highlightColor: number[] | undefined;
     };
     getHighlightedObjectIndex(tile: Tile2DHeader): number;
     _featureInTile(tile: Tile2DHeader, featureId: BigInt | number): boolean;

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;AAK7D,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAE,aAAa,IAAI,YAAY,EAAC,MAAM,qBAAqB,CAAC;AAU7E,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,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAU1C,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAsBvD,sBAAsB,CAAC,IAAI,EAAE,YAAY;;;;IAOzC,yBAAyB,CAAC,IAAI,EAAE,YAAY;IAiB5C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;CAc9D"}
+{"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;AAK7D,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAE,aAAa,IAAI,YAAY,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAU7F,yDAAyD;AACzD,oBAAY,0BAA0B,CAAC,KAAK,GAAG,GAAG,IAAI,2BAA2B,CAAC,KAAK,CAAC,GACtF,cAAc,CAAC,KAAK,CAAC,CAAC;AAExB,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,KAAK,EAAG,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG;QAElC,gBAAgB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;QACzC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;KAC3B,CAAC;IAEF,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAU1C,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAsBvD,sBAAsB,CAAC,IAAI,EAAE,YAAY;;;;IAOzC,yBAAyB,CAAC,IAAI,EAAE,YAAY;IAiB5C,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM;CAgB9D"}