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

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.7",
+  "version": "9.0.0-beta.9",
   "publishConfig": {
     "access": "public"
   },
@@ -38,16 +38,16 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^4.1.0",
-    "@loaders.gl/gis": "^4.1.0",
-    "@loaders.gl/loader-utils": "^4.1.0",
-    "@loaders.gl/mvt": "^4.1.0",
-    "@loaders.gl/schema": "^4.1.0",
-    "@loaders.gl/terrain": "^4.1.0",
-    "@loaders.gl/tiles": "^4.1.0",
-    "@loaders.gl/wms": "^4.1.0",
-    "@luma.gl/gltf": "9.0.0-beta.8",
-    "@luma.gl/shadertools": "9.0.0-beta.8",
+    "@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",
+    "@luma.gl/shadertools": "^9.0.0",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/web-mercator": "^4.0.0",
@@ -60,9 +60,9 @@
     "@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.0",
-    "@luma.gl/core": "9.0.0-beta.8",
-    "@luma.gl/engine": "9.0.0-beta.8"
+    "@loaders.gl/core": "^4.2.0-alpha.5",
+    "@luma.gl/core": "^9.0.0",
+    "@luma.gl/engine": "^9.0.0"
   },
-  "gitHead": "1676f8d6f7534259996bf58a7b7e1fba6f3af9ae"
+  "gitHead": "44cfc784310d1c6ac7766ff80e0df8c364f97354"
 }

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

@@ -63,12 +63,14 @@ export type TileJson = {
 type ParsedMvtTile = Feature[] | BinaryFeatureCollection;
 
 /** 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 +100,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 +116,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

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.
    *
@@ -221,6 +229,7 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
       maxZoom,
       minZoom,
       maxRequests,
+      debounceTime,
       zoomOffset
     } = this.props;
 
@@ -233,6 +242,7 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
       refinementStrategy,
       extent,
       maxRequests,
+      debounceTime,
       zoomOffset,
 
       getTileData: this.getTileData.bind(this),

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 */