@deck.gl/geo-layers 9.0.0-alpha.7 → 9.0.0-beta.10

package/package.json

@@ -2,7 +2,8 @@
   "name": "@deck.gl/geo-layers",
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
-  "version": "9.0.0-alpha.7",
+  "type": "module",
+  "version": "9.0.0-beta.10",
   "publishConfig": {
     "access": "public"
   },
@@ -16,13 +17,19 @@
     "type": "git",
     "url": "https://github.com/visgl/deck.gl.git"
   },
-  "main": "dist/es5/index.js",
-  "module": "dist/esm/index.js",
-  "types": "typed/index.d.ts",
+  "types": "dist/index.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    }
+  },
   "files": [
     "dist",
     "src",
-    "typed",
     "dist.min.js"
   ],
   "sideEffects": false,
@@ -31,16 +38,16 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@babel/runtime": "^7.0.0",
-    "@loaders.gl/3d-tiles": "4.1.0-alpha.9",
-    "@loaders.gl/gis": "4.1.0-alpha.9",
-    "@loaders.gl/loader-utils": "4.1.0-alpha.9",
-    "@loaders.gl/mvt": "4.1.0-alpha.9",
-    "@loaders.gl/schema": "4.1.0-alpha.9",
-    "@loaders.gl/terrain": "4.1.0-alpha.9",
-    "@loaders.gl/tiles": "4.1.0-alpha.9",
-    "@loaders.gl/wms": "4.1.0-alpha.9",
-    "@luma.gl/core": "9.0.0-alpha.53",
+    "@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.4",
+    "@luma.gl/shadertools": "^9.0.4",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/web-mercator": "^4.0.0",
@@ -49,13 +56,13 @@
     "long": "^3.2.0"
   },
   "peerDependencies": {
-    "@deck.gl/core": "^9.0.0-alpha",
-    "@deck.gl/extensions": "^9.0.0-alpha",
-    "@deck.gl/layers": "^9.0.0-alpha",
-    "@deck.gl/mesh-layers": "^9.0.0-alpha",
-    "@loaders.gl/core": "4.1.0-alpha.9",
-    "@luma.gl/core": "9.0.0-alpha.53",
-    "@luma.gl/shadertools": "9.0.0-alpha.53"
+    "@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.1.4",
+    "@luma.gl/core": "^9.0.4",
+    "@luma.gl/engine": "^9.0.4"
   },
-  "gitHead": "de061268077ab74e163792162efbc07be95d10f5"
+  "gitHead": "6c44f602069374cd21268ff279c5bf818c905ff7"
 }

package/src/index.ts

@@ -40,19 +40,19 @@ 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
 
-export type {GeoBoundingBox, NonGeoBoundingBox} from './tileset-2d';
-export type {TileLoadProps as _TileLoadProps} from './tileset-2d';
+export type {GeoBoundingBox, NonGeoBoundingBox} from './tileset-2d/index';
+export type {TileLoadProps as _TileLoadProps} from './tileset-2d/index';
 
-export {getURLFromTemplate as _getURLFromTemplate} from './tileset-2d';
-export {Tileset2D as _Tileset2D} from './tileset-2d';
-export {Tile2DHeader as _Tile2DHeader} from './tileset-2d';
+export {getURLFromTemplate as _getURLFromTemplate} from './tileset-2d/index';
+export {Tileset2D as _Tileset2D} from './tileset-2d/index';
+export {Tile2DHeader as _Tile2DHeader} from './tileset-2d/index';

package/src/mesh-layer/mesh-layer-fragment.glsl.ts

@@ -31,15 +31,7 @@ void main(void) {
   vec3 normal;
   if (flatShading) {
 
-// NOTE(Tarek): This is necessary because
-// headless.gl reports the extension as
-// available but does not support it in
-// the shader.
-#ifdef DERIVATIVES_AVAILABLE
-    normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
-#else
-    normal = vec3(0.0, 0.0, 1.0);
-#endif
+  normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
   } else {
     normal = normals_commonspace;
   }

package/src/mesh-layer/mesh-layer.ts

@@ -2,7 +2,6 @@ import type {NumericArray} from '@math.gl/core';
 import {parsePBRMaterial, ParsedPBRMaterial} from '@luma.gl/gltf';
 import {pbr} from '@luma.gl/shadertools';
 import {Model} from '@luma.gl/engine';
-import {GL} from '@luma.gl/constants';
 import type {MeshAttribute, MeshAttributes} from '@loaders.gl/schema';
 import type {UpdateParameters, DefaultProps, LayerContext} from '@deck.gl/core';
 import {SimpleMeshLayer, SimpleMeshLayerProps} from '@deck.gl/mesh-layers';
@@ -72,7 +71,7 @@ export default class MeshLayer<DataT = any, ExtraProps extends {} = {}> extends
       // attributeManager is always defined in a primitive layer
       attributeManager!.add({
         featureIdsPickingColors: {
-          type: GL.UNSIGNED_BYTE,
+          type: 'uint8',
           size: 3,
           noAlloc: true,
           // eslint-disable-next-line @typescript-eslint/unbound-method

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

@@ -1,6 +1,6 @@
 import {Viewport} from '@deck.gl/core';
 import {lerp} from '@math.gl/core';
-import {GeoBoundingBox} from '../tileset-2d';
+import {GeoBoundingBox} from '../tileset-2d/index';
 
 const availableTransformations = {
   Point,

package/src/mvt-layer/find-index-binary.ts

@@ -12,16 +12,12 @@ const GEOM_TYPES = ['points', 'lines', 'polygons'];
  * Return the index of feature (numericProps or featureIds) for given feature id
  * Example: findIndexBinary(data, 'id', 33) will return the index in the array of numericProps
  * of the feature 33.
- * @param {Object} data - The data in binary format
- * @param {String} uniqueIdProperty - Name of the unique id property
- * @param {Number|String} featureId - feature id to find
- * @param {String} layerName - the layer to search in
  */
 export default function findIndexBinary(
-  data: BinaryFeatureCollection,
-  uniqueIdProperty: string,
-  featureId: string | number,
-  layerName: string
+  data: BinaryFeatureCollection, // The data in binary format
+  uniqueIdProperty: string, // Name of the unique id property
+  featureId: string | number, // feature id to find
+  layerName: string | null // the layer to search in
 ): number {
   for (const gt of GEOM_TYPES) {
     const index = data[gt] && findIndexByType(data[gt], uniqueIdProperty, featureId, layerName);
@@ -37,7 +33,7 @@ function findIndexByType(
   geomData: FeatureTypes,
   uniqueIdProperty: string,
   featureId: string | number,
-  layerName: string
+  layerName: string | null
 ): number {
   const featureIds = geomData.featureIds.value;
 

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

@@ -18,14 +18,14 @@ 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';
+import type {Tileset2DProps, TileLoadProps, GeoBoundingBox} from '../tileset-2d/index';
 import {
   urlType,
   Tileset2D,
@@ -34,7 +34,7 @@ import {
   URLTemplate,
   isGeoBoundingBox,
   isURLTemplate
-} from '../tileset-2d';
+} from '../tileset-2d/index';
 
 const WORLD_SIZE = 512;
 
@@ -62,13 +62,22 @@ 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'> &
-  TileLayerProps<ParsedMvtTile>;
+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. */
   onDataLoad?: ((tilejson: TileJson | null) => void) | null;
 
@@ -96,18 +105,18 @@ 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;
 
   state!: TileLayer<ParsedMvtTile>['state'] & {
     binary: boolean;
     data: URLTemplate;
-    tileJSON: any;
-    highlightColor: number[];
+    tileJSON: TileJson | null;
+    highlightColor?: number[];
     hoveredFeatureId: number | string | null;
     hoveredFeatureLayerName: string | null;
   };
@@ -119,12 +128,14 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
     this.setState({
       binary,
       data: null,
-      tileJSON: null
+      tileJSON: null,
+      hoveredFeatureId: null,
+      hoveredFeatureLayerName: null
     });
   }
 
   get isLoaded(): boolean {
-    return Boolean(this.state && this.state.data && this.state.tileset && super.isLoaded);
+    return Boolean(this.state?.data && super.isLoaded);
   }
 
   updateState({props, oldProps, context, changeFlags}: UpdateParameters<this>) {
@@ -145,8 +156,8 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
 
   /* eslint-disable complexity */
   private async _updateTileData(): Promise<void> {
-    let data: any = this.props.data;
-    let tileJSON: any = null;
+    let data = this.props.data;
+    let tileJSON: TileJson | null = null;
 
     if (typeof data === 'string' && !isURLTemplate(data)) {
       const {onDataLoad, fetch} = this.props;
@@ -161,7 +172,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
       if (onDataLoad) {
         onDataLoad(tileJSON, {propName: 'data', layer: this});
       }
-    } else if (data.tilejson) {
+    } else if (data && typeof data === 'object' && 'tilejson' in data) {
       tileJSON = data;
     }
 
@@ -174,7 +185,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
 
   _getTilesetOptions(): Tileset2DProps {
     const opts = super._getTilesetOptions();
-    const tileJSON: TileJson | null | undefined = this.state.tileJSON;
+    const tileJSON: TileJson | null = this.state.tileJSON;
     const {minZoom, maxZoom} = this.props;
 
     if (tileJSON) {
@@ -268,8 +279,8 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
 
     const {hoveredFeatureId, hoveredFeatureLayerName} = this.state;
     const hoveredFeature = info.object;
-    let newHoveredFeatureId;
-    let newHoveredFeatureLayerName;
+    let newHoveredFeatureId: string | number | null = null;
+    let newHoveredFeatureLayerName: string | null = null;
 
     if (hoveredFeature) {
       newHoveredFeatureId = getFeatureUniqueId(hoveredFeature, uniqueIdProperty);
@@ -292,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);
@@ -333,7 +344,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
       return -1;
     }
 
-    const featureIdToHighlight = isHighlighted ? highlightedFeatureId : hoveredFeatureId;
+    const featureIdToHighlight = isHighlighted ? highlightedFeatureId! : hoveredFeatureId!;
 
     // Iterable data
     if (Array.isArray(data)) {
@@ -350,7 +361,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
       return findIndexBinary(
         data,
         uniqueIdProperty,
-        featureIdToHighlight!,
+        featureIdToHighlight,
         isHighlighted ? '' : hoveredFeatureLayerName!
       );
     }

package/src/terrain-layer/terrain-layer.ts

@@ -35,8 +35,14 @@ import {COORDINATE_SYSTEM} from '@deck.gl/core';
 import type {MeshAttributes} from '@loaders.gl/schema';
 import {TerrainWorkerLoader} from '@loaders.gl/terrain';
 import TileLayer, {TileLayerProps} from '../tile-layer/tile-layer';
-import type {Bounds, GeoBoundingBox, TileBoundingBox, TileLoadProps, ZRange} from '../tileset-2d';
-import {Tile2DHeader, urlType, getURLFromTemplate, URLTemplate} from '../tileset-2d';
+import type {
+  Bounds,
+  GeoBoundingBox,
+  TileBoundingBox,
+  TileLoadProps,
+  ZRange
+} from '../tileset-2d/index';
+import {Tile2DHeader, urlType, getURLFromTemplate, URLTemplate} from '../tileset-2d/index';
 
 const DUMMY_DATA = [1];
 
@@ -136,7 +142,7 @@ export default class TerrainLayer<ExtraPropsT extends {} = {}> extends Composite
 
   state!: {
     isTiled?: boolean;
-    terrain: MeshAttributes;
+    terrain?: MeshAttributes;
     zRange?: ZRange | null;
   };
 
@@ -343,6 +349,10 @@ export default class TerrainLayer<ExtraPropsT extends {} = {}> extends Composite
       );
     }
 
+    if (!elevationData) {
+      return null;
+    }
+
     const SubLayerClass = this.getSubLayerClass('mesh', SimpleMeshLayer);
     return new SubLayerClass(
       this.getSubLayerProps({

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

@@ -1,4 +1,3 @@
-import {GL} from '@luma.gl/constants';
 import {Geometry} from '@luma.gl/engine';
 
 import {
@@ -255,7 +254,7 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT extends {} = {}> exten
       return null;
     }
 
-    switch (tileHeader.type) {
+    switch (tileHeader.type as TILE_TYPE) {
       case TILE_TYPE.POINTCLOUD:
         return this._makePointCloudLayer(tileHeader, oldLayer as PointCloudLayer<DataT>);
       case TILE_TYPE.SCENEGRAPH:

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

@@ -13,15 +13,15 @@ import {
 import {GeoJsonLayer} from '@deck.gl/layers';
 import {LayersList} from '@deck.gl/core';
 
-import type {TileLoadProps, ZRange} from '../tileset-2d';
+import type {TileLoadProps, ZRange} from '../tileset-2d/index';
 import {
   Tileset2D,
   Tile2DHeader,
   RefinementStrategy,
   STRATEGY_DEFAULT,
   Tileset2DProps
-} from '../tileset-2d';
-import {urlType, URLTemplate, getURLFromTemplate} from '../tileset-2d';
+} from '../tileset-2d/index';
+import {urlType, URLTemplate, getURLFromTemplate} from '../tileset-2d/index';
 
 const defaultProps: DefaultProps<TileLayerProps> = {
   TilesetClass: Tileset2D,
@@ -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>;
 };
 
 /**
@@ -171,12 +185,11 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
   }
 
   get isLoaded(): boolean {
-    const selectedTiles = this.state?.tileset?.selectedTiles;
-    return selectedTiles
-      ? selectedTiles.every(
-          tile => tile.isLoaded && tile.layers && tile.layers.every(layer => layer.isLoaded)
-        )
-      : false;
+    return Boolean(
+      this.state?.tileset?.selectedTiles?.every(
+        tile => tile.isLoaded && tile.layers && tile.layers.every(layer => layer.isLoaded)
+      )
+    );
   }
 
   shouldUpdateState({changeFlags}): boolean {
@@ -222,6 +235,7 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
       maxZoom,
       minZoom,
       maxRequests,
+      debounceTime,
       zoomOffset
     } = this.props;
 
@@ -234,6 +248,7 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
       refinementStrategy,
       extent,
       maxRequests,
+      debounceTime,
       zoomOffset,
 
       getTileData: this.getTileData.bind(this),
@@ -325,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/tile-2d-header.ts

@@ -1,6 +1,7 @@
 /* eslint-env browser */
 import {RequestScheduler} from '@loaders.gl/loader-utils';
 import {TileBoundingBox, TileIndex, TileLoadProps} from './types';
+import type {Layer} from '@deck.gl/core';
 
 export type TileLoadDataProps<DataT = any> = {
   requestScheduler: RequestScheduler;
@@ -17,7 +18,7 @@ export class Tile2DHeader<DataT = any> {
   children: Tile2DHeader[] | null;
   content: DataT | null;
   state?: number;
-  layers?: any[] | null; // Layer[] | null
+  layers?: Layer[] | null;
 
   id!: string; // assigned _always_ with result of `getTileId`
   zoom!: number; // assigned _always_ with result of `getTileZoom`

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

@@ -183,7 +183,7 @@ class OSMNode {
 export function getOSMTileIndices(
   viewport: Viewport,
   maxZ: number,
-  zRange?: ZRange | null,
+  zRange: ZRange | null,
   bounds?: Bounds
 ): TileIndex[] {
   const project: ((xyz: number[]) => number[]) | null =

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. */
@@ -123,7 +126,7 @@ export class Tileset2D {
 
   private _cacheByteSize: number;
   private _viewport: Viewport | null;
-  private _zRange?: ZRange | null;
+  private _zRange: ZRange | null;
   private _selectedTiles: Tile2DHeader[] | null;
   private _frameNumber: number;
   private _modelMatrix: Matrix4;
@@ -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
@@ -162,13 +167,12 @@ export class Tileset2D {
 
     // Cache the last processed viewport
     this._viewport = null;
+    this._zRange = null;
     this._selectedTiles = null;
     this._frameNumber = 0;
 
     this._modelMatrix = new Matrix4();
     this._modelMatrixInverse = new Matrix4();
-
-    this.setOptions(opts);
   }
 
   /* Public API */
@@ -226,7 +230,10 @@ export class Tileset2D {
    */
   update(
     viewport: Viewport,
-    {zRange, modelMatrix}: {zRange?: ZRange | null; modelMatrix?: NumericArray | null} = {}
+    {zRange, modelMatrix}: {zRange: ZRange | null; modelMatrix: NumericArray | null} = {
+      zRange: null,
+      modelMatrix: null
+    }
   ): number {
     const modelMatrixAsMatrix4 = modelMatrix ? new Matrix4(modelMatrix) : new Matrix4();
     const isModelMatrixNew = !modelMatrixAsMatrix4.equals(this._modelMatrix);
@@ -326,7 +333,7 @@ export class Tileset2D {
     viewport: Viewport;
     maxZoom?: number;
     minZoom?: number;
-    zRange?: ZRange | null;
+    zRange: ZRange | null;
     tileSize?: number;
     modelMatrix?: Matrix4;
     modelMatrixInverse?: Matrix4;

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

@@ -138,7 +138,7 @@ export function getCullBounds({
   /** Current viewport */
   viewport: Viewport;
   /** Current z range */
-  z?: ZRange | number | null;
+  z: ZRange | number | null;
   /** Culling rectangle in screen space */
   cullRect: {x: number; y: number; width: number; height: number};
 }): [number, number, number, number][] {
@@ -273,7 +273,7 @@ export function getTileIndices({
   viewport: Viewport;
   maxZoom?: number;
   minZoom?: number;
-  zRange?: ZRange | null;
+  zRange: ZRange | null;
   extent?: Bounds;
   tileSize?: number;
   modelMatrix?: Matrix4;

package/src/trips-layer/trips-layer.ts

@@ -58,7 +58,7 @@ type _TripsLayerProps<DataT = unknown> = {
 /** Render animated paths that represent vehicle trips. */
 export default class TripsLayer<DataT = any, ExtraProps extends {} = {}> extends PathLayer<
   DataT,
-  Required<_TripsLayerProps> & ExtraProps
+  Required<_TripsLayerProps<DataT>> & ExtraProps
 > {
   static layerName = 'TripsLayer';
   static defaultProps = defaultProps;

package/src/wms-layer/wms-layer.ts

@@ -86,7 +86,7 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
   /** Returns true if all async resources are loaded */
   get isLoaded(): boolean {
     // Track the explicit loading done by this layer
-    return Boolean(this.state) && this.state.loadCounter === 0 && super.isLoaded;
+    return this.state?.loadCounter === 0 && super.isLoaded;
   }
 
   /** Lets deck.gl know that we want viewport change events */