@deck.gl/geo-layers 9.0.0-beta.8 → 9.0.0

package/package.json

@@ -3,7 +3,7 @@
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.8",
+  "version": "9.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -38,16 +38,16 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^4.2.0-alpha.5",
-    "@loaders.gl/gis": "^4.2.0-alpha.5",
-    "@loaders.gl/loader-utils": "^4.2.0-alpha.5",
-    "@loaders.gl/mvt": "^4.2.0-alpha.5",
-    "@loaders.gl/schema": "^4.2.0-alpha.5",
-    "@loaders.gl/terrain": "^4.2.0-alpha.5",
-    "@loaders.gl/tiles": "^4.2.0-alpha.5",
-    "@loaders.gl/wms": "^4.2.0-alpha.5",
-    "@luma.gl/gltf": "9.0.0-beta.10",
-    "@luma.gl/shadertools": "9.0.0-beta.10",
+    "@loaders.gl/3d-tiles": "^4.1.4",
+    "@loaders.gl/gis": "^4.1.4",
+    "@loaders.gl/loader-utils": "^4.1.4",
+    "@loaders.gl/mvt": "^4.1.4",
+    "@loaders.gl/schema": "^4.1.4",
+    "@loaders.gl/terrain": "^4.1.4",
+    "@loaders.gl/tiles": "^4.1.4",
+    "@loaders.gl/wms": "^4.1.4",
+    "@luma.gl/gltf": "^9.0.6",
+    "@luma.gl/shadertools": "^9.0.6",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/web-mercator": "^4.0.0",
@@ -56,13 +56,13 @@
     "long": "^3.2.0"
   },
   "peerDependencies": {
-    "@deck.gl/core": "^9.0.0-beta",
-    "@deck.gl/extensions": "^9.0.0-beta",
-    "@deck.gl/layers": "^9.0.0-beta",
-    "@deck.gl/mesh-layers": "^9.0.0-beta",
-    "@loaders.gl/core": "^4.2.0-alpha.5",
-    "@luma.gl/core": "9.0.0-beta.10",
-    "@luma.gl/engine": "9.0.0-beta.10"
+    "@deck.gl/core": "^9.0.0",
+    "@deck.gl/extensions": "^9.0.0",
+    "@deck.gl/layers": "^9.0.0",
+    "@deck.gl/mesh-layers": "^9.0.0",
+    "@loaders.gl/core": "^4.1.0",
+    "@luma.gl/core": "^9.0.0",
+    "@luma.gl/engine": "^9.0.0"
   },
-  "gitHead": "8867a1047c2693d44e4af9507c296cf7ab61f9e8"
+  "gitHead": "fcb5ccf0a899e651949b24986488211e278e9321"
 }

package/src/index.ts

@@ -40,12 +40,12 @@ export type {H3ClusterLayerProps} from './h3-layers/h3-cluster-layer';
 export type {H3HexagonLayerProps} from './h3-layers/h3-hexagon-layer';
 export type {GreatCircleLayerProps} from './great-circle-layer/great-circle-layer';
 export type {S2LayerProps} from './s2-layer/s2-layer';
-export type {TileLayerProps} from './tile-layer/tile-layer';
+export type {TileLayerProps, TileLayerPickingInfo} from './tile-layer/tile-layer';
 export type {TripsLayerProps} from './trips-layer/trips-layer';
 export type {QuadkeyLayerProps} from './quadkey-layer/quadkey-layer';
 export type {TerrainLayerProps} from './terrain-layer/terrain-layer';
 export type {Tile3DLayerProps} from './tile-3d-layer/tile-3d-layer';
-export type {MVTLayerProps} from './mvt-layer/mvt-layer';
+export type {MVTLayerProps, MVTLayerPickingInfo} from './mvt-layer/mvt-layer';
 export type {GeoCellLayerProps as _GeoCellLayerProps} from './geo-cell-layer/GeoCellLayer';
 
 // Tileset2D

package/src/mvt-layer/mvt-layer.ts

@@ -18,12 +18,12 @@ import {binaryToGeojson} from '@loaders.gl/gis';
 
 import type {Loader} from '@loaders.gl/loader-utils';
 import type {BinaryFeatureCollection} from '@loaders.gl/schema';
-import type {Feature} from 'geojson';
+import type {Feature, Geometry} from 'geojson';
 
 import {transform} from './coordinate-transform';
 import findIndexBinary from './find-index-binary';
 
-import TileLayer, {TiledPickingInfo, TileLayerProps} from '../tile-layer/tile-layer';
+import TileLayer, {TileLayerPickingInfo, TileLayerProps} from '../tile-layer/tile-layer';
 
 import type {Tileset2DProps, TileLoadProps, GeoBoundingBox} from '../tileset-2d/index';
 import {
@@ -62,13 +62,20 @@ export type TileJson = {
 
 type ParsedMvtTile = Feature[] | BinaryFeatureCollection;
 
+export type MVTLayerPickingInfo<FeaturePropertiesT = {}> = TileLayerPickingInfo<
+  ParsedMvtTile,
+  PickingInfo<Feature<Geometry, FeaturePropertiesT>>
+>;
+
 /** All props supported by the MVTLayer */
-export type MVTLayerProps = _MVTLayerProps &
-  Omit<GeoJsonLayerProps, 'data'> &
+export type MVTLayerProps<FeaturePropertiesT = unknown> = _MVTLayerProps<FeaturePropertiesT> &
   Omit<TileLayerProps<ParsedMvtTile>, 'data'>;
 
 /** Props added by the MVTLayer  */
-export type _MVTLayerProps = {
+export type _MVTLayerProps<FeaturePropertiesT> = Omit<
+  GeoJsonLayerProps<FeaturePropertiesT>,
+  'data'
+> & {
   data: TileJson | URLTemplate;
 
   /** Called if `data` is a TileJSON URL when it is successfully fetched. */
@@ -98,10 +105,10 @@ export type _MVTLayerProps = {
 type ContentWGS84Cache = {_contentWGS84?: Feature[]};
 
 /** Render data formatted as [Mapbox Vector Tiles](https://docs.mapbox.com/vector-tiles/specification/). */
-export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
-  ParsedMvtTile,
-  Required<_MVTLayerProps> & ExtraProps
-> {
+export default class MVTLayer<
+  FeaturePropertiesT = any,
+  ExtraProps extends {} = {}
+> extends TileLayer<ParsedMvtTile, Required<_MVTLayerProps<FeaturePropertiesT>> & ExtraProps> {
   static layerName = 'MVTLayer';
   static defaultProps = defaultProps;
 
@@ -114,12 +121,6 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
     hoveredFeatureLayerName: string | null;
   };
 
-  constructor(...propObjects: MVTLayerProps[]) {
-    // Force externally visible props type, as it is not possible modify via extension
-    // @ts-ignore
-    super(...propObjects);
-  }
-
   initializeState(): void {
     super.initializeState();
     // GlobeView doesn't work well with binary data
@@ -302,7 +303,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
     }
   }
 
-  getPickingInfo(params: GetPickingInfoParams): TiledPickingInfo {
+  getPickingInfo(params: GetPickingInfoParams): MVTLayerPickingInfo<FeaturePropertiesT> {
     const info = super.getPickingInfo(params);
 
     const isWGS84 = Boolean(this.context.viewport.resolution);

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

@@ -44,6 +44,7 @@ const defaultProps: DefaultProps<TileLayerProps> = {
   refinementStrategy: STRATEGY_DEFAULT,
   zRange: null,
   maxRequests: 6,
+  debounceTime: 0,
   zoomOffset: 0
 };
 
@@ -128,6 +129,13 @@ type _TileLayerProps<DataT> = {
    */
   maxRequests?: number;
 
+  /**
+   * Queue tile requests until no new tiles have been requested for at least `debounceTime` milliseconds.
+   *
+   * @default 0
+   */
+  debounceTime?: number;
+
   /**
    * This offset changes the zoom level at which the tiles are fetched.
    *
@@ -138,8 +146,14 @@ type _TileLayerProps<DataT> = {
   zoomOffset?: number;
 };
 
-export type TiledPickingInfo<DataT = any> = PickingInfo & {
+export type TileLayerPickingInfo<
+  DataT = any,
+  SubLayerPickingInfo = PickingInfo
+> = SubLayerPickingInfo & {
+  /** The picked tile */
   tile?: Tile2DHeader<DataT>;
+  /** the tile that emitted the picking event */
+  sourceTile: Tile2DHeader<DataT>;
 };
 
 /**
@@ -221,6 +235,7 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
       maxZoom,
       minZoom,
       maxRequests,
+      debounceTime,
       zoomOffset
     } = this.props;
 
@@ -233,6 +248,7 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
       refinementStrategy,
       extent,
       maxRequests,
+      debounceTime,
       zoomOffset,
 
       getTileData: this.getTileData.bind(this),
@@ -324,12 +340,13 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
     return null;
   }
 
-  getPickingInfo({info, sourceLayer}: GetPickingInfoParams): TiledPickingInfo<DataT> {
-    const sourceTile = (sourceLayer as any).props.tile;
+  getPickingInfo(params: GetPickingInfoParams): TileLayerPickingInfo<DataT> {
+    const sourceTile: Tile2DHeader<DataT> = (params.sourceLayer as any).props.tile;
+    const info = params.info as TileLayerPickingInfo<DataT>;
     if (info.picked) {
-      (info as any).tile = sourceTile;
+      info.tile = sourceTile;
     }
-    (info as any).sourceTile = sourceTile;
+    info.sourceTile = sourceTile;
     return info;
   }
 

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

@@ -73,6 +73,8 @@ export type Tileset2DProps<DataT = any> = {
   zRange?: ZRange | null;
   /** The maximum number of concurrent getTileData calls. @default 6 */
   maxRequests?: number;
+  /** Queue tile requests until no new tiles have been requested for at least `debounceTime` milliseconds. @default 0 */
+  debounceTime?: number;
   /** Changes the zoom level at which the tiles are fetched. Needs to be an integer. @default 0 */
   zoomOffset?: number;
 
@@ -101,6 +103,7 @@ export const DEFAULT_TILESET2D_PROPS: Omit<Required<Tileset2DProps>, 'getTileDat
   refinementStrategy: 'best-available',
   zRange: null,
   maxRequests: 6,
+  debounceTime: 0,
   zoomOffset: 0,
 
   // onTileLoad: (tile: Tile2DHeader) => void,  // onTileUnload: (tile: Tile2DHeader) => void,  // onTileError: (error: any, tile: Tile2DHeader) => void,  /** Called when all tiles in the current viewport are loaded. */
@@ -140,6 +143,7 @@ export class Tileset2D {
    */
   constructor(opts: Tileset2DProps) {
     this.opts = {...DEFAULT_TILESET2D_PROPS, ...opts};
+    this.setOptions(this.opts);
 
     this.onTileLoad = tile => {
       this.opts.onTileLoad?.(tile);
@@ -150,8 +154,9 @@ export class Tileset2D {
     };
 
     this._requestScheduler = new RequestScheduler({
-      maxRequests: opts.maxRequests,
-      throttleRequests: Boolean(opts.maxRequests && opts.maxRequests > 0)
+      throttleRequests: this.opts.maxRequests > 0 || this.opts.debounceTime > 0,
+      maxRequests: this.opts.maxRequests,
+      debounceTime: this.opts.debounceTime
     });
 
     // Maps tile id in string {z}-{x}-{y} to a Tile object
@@ -168,8 +173,6 @@ export class Tileset2D {
 
     this._modelMatrix = new Matrix4();
     this._modelMatrixInverse = new Matrix4();
-
-    this.setOptions(opts);
   }
 
   /* Public API */