@deck.gl/geo-layers 9.3.0-alpha.5 → 9.3.0-beta.1

package/dist/index.cjs

@@ -1067,8 +1067,8 @@ function getIdentityTileIndices(viewport, z, tileSize, extent, modelMatrixInvers
   }
   return indices;
 }
-function getTileIndices({ viewport, maxZoom, minZoom, zRange, extent, tileSize = TILE_SIZE3, modelMatrix, modelMatrixInverse, zoomOffset = 0 }) {
-  let z = viewport.isGeospatial ? Math.round(viewport.zoom + Math.log2(TILE_SIZE3 / tileSize)) + zoomOffset : Math.ceil(viewport.zoom) + zoomOffset;
+function getTileIndices({ viewport, maxZoom, minZoom, zRange, extent, tileSize = TILE_SIZE3, modelMatrix, modelMatrixInverse, zoomOffset = 0, visibleMinZoom, visibleMaxZoom }) {
+  let z = viewport.isGeospatial ? Math.round(viewport.zoom + Math.log2(TILE_SIZE3 / tileSize) + zoomOffset) : Math.ceil(viewport.zoom + zoomOffset);
   if (typeof minZoom === "number" && Number.isFinite(minZoom) && z < minZoom) {
     if (!extent) {
       return [];
@@ -1078,6 +1078,12 @@ function getTileIndices({ viewport, maxZoom, minZoom, zRange, extent, tileSize =
   if (typeof maxZoom === "number" && Number.isFinite(maxZoom) && z > maxZoom) {
     z = maxZoom;
   }
+  if (visibleMinZoom != null && viewport.zoom < visibleMinZoom) {
+    return [];
+  }
+  if (visibleMaxZoom != null && viewport.zoom > visibleMaxZoom) {
+    return [];
+  }
   let transformedExtent = extent;
   if (modelMatrix && modelMatrixInverse && extent && !viewport.isGeospatial) {
     transformedExtent = transformBox(extent, modelMatrix);
@@ -1150,6 +1156,8 @@ var DEFAULT_TILESET2D_PROPS = {
   maxRequests: 6,
   debounceTime: 0,
   zoomOffset: 0,
+  visibleMinZoom: null,
+  visibleMaxZoom: null,
   // onTileLoad: (tile: Tile2DHeader) => void,  // onTileUnload: (tile: Tile2DHeader) => void,  // onTileError: (error: any, tile: Tile2DHeader) => void,  /** Called when all tiles in the current viewport are loaded. */
   // onViewportLoad: ((tiles: Tile2DHeader<DataT>[]) => void) | null,
   onTileLoad: () => {
@@ -1213,6 +1221,7 @@ var Tileset2D = class {
     if (Number.isFinite(opts.minZoom)) {
       this._minZoom = Math.ceil(opts.minZoom);
     }
+    this._viewport = null;
   }
   // Clean up any outstanding tile requests.
   finalize() {
@@ -1312,7 +1321,7 @@ var Tileset2D = class {
   /* Public interface for subclassing */
   /** Returns array of tile indices in the current viewport */
   getTileIndices({ viewport, maxZoom, minZoom, zRange, modelMatrix, modelMatrixInverse }) {
-    const { tileSize, extent, zoomOffset } = this.opts;
+    const { tileSize, extent, zoomOffset, visibleMinZoom, visibleMaxZoom } = this.opts;
     return getTileIndices({
       viewport,
       maxZoom,
@@ -1322,7 +1331,9 @@ var Tileset2D = class {
       extent,
       modelMatrix,
       modelMatrixInverse,
-      zoomOffset
+      zoomOffset,
+      visibleMinZoom,
+      visibleMaxZoom
     });
   }
   /** Returns unique string key for a tile index */
@@ -1551,7 +1562,9 @@ var defaultProps7 = {
   zRange: null,
   maxRequests: 6,
   debounceTime: 0,
-  zoomOffset: 0
+  zoomOffset: 0,
+  visibleMinZoom: null,
+  visibleMaxZoom: null
 };
 var TileLayer = class extends import_core7.CompositeLayer {
   initializeState() {
@@ -1596,7 +1609,7 @@ var TileLayer = class extends import_core7.CompositeLayer {
     this._updateTileset();
   }
   _getTilesetOptions() {
-    const { tileSize, maxCacheSize, maxCacheByteSize, refinementStrategy, extent, maxZoom, minZoom, maxRequests, debounceTime, zoomOffset } = this.props;
+    const { tileSize, maxCacheSize, maxCacheByteSize, refinementStrategy, extent, maxZoom, minZoom, maxRequests, debounceTime, zoomOffset, visibleMinZoom, visibleMaxZoom } = this.props;
     return {
       maxCacheSize,
       maxCacheByteSize,
@@ -1608,6 +1621,8 @@ var TileLayer = class extends import_core7.CompositeLayer {
       maxRequests,
       debounceTime,
       zoomOffset,
+      visibleMinZoom,
+      visibleMaxZoom,
       getTileData: this.getTileData.bind(this),
       onTileLoad: this._onTileLoad.bind(this),
       onTileError: this._onTileError.bind(this),
@@ -1683,6 +1698,15 @@ var TileLayer = class extends import_core7.CompositeLayer {
     info.sourceTileSubLayer.updateAutoHighlight(info);
   }
   renderLayers() {
+    const { visibleMinZoom, visibleMaxZoom, minZoom, extent } = this.props;
+    const zoom = this.context.viewport.zoom;
+    const hidden = visibleMinZoom != null && zoom < visibleMinZoom || visibleMaxZoom != null && zoom > visibleMaxZoom || minZoom != null && !extent && zoom < minZoom;
+    if (hidden) {
+      for (const tile of this.state.tileset.tiles) {
+        tile.layers = null;
+      }
+      return [];
+    }
     return this.state.tileset.tiles.map((tile) => {
       const subLayerProps = this.getSubLayerPropsByTile(tile);
       if (!tile.isLoaded && !tile.content) {
@@ -2114,11 +2138,12 @@ pbr_vPosition = geometry.position.xyz;
 pbr_vNormal = geometry.normal;
 #endif
 #ifdef HAS_UV
-pbr_vUV = uv;
+pbr_vUV0 = uv;
 #else
-pbr_vUV = vec2(0., 0.);
+pbr_vUV0 = vec2(0., 0.);
 #endif
-geometry.uv = pbr_vUV;
+pbr_vUV1 = vec2(0., 0.);
+geometry.uv = pbr_vUV0;
 #endif
 DECKGL_FILTER_COLOR(vColor, geometry);
 }
@@ -2138,7 +2163,7 @@ out vec4 fragColor;
 void main(void) {
 #ifdef MODULE_PBRMATERIAL
 fragColor = vColor * pbr_filterColor(vec4(0));
-geometry.uv = pbr_vUV;
+geometry.uv = pbr_vUV0;
 fragColor.a *= layer.opacity;
 #else
 geometry.uv = vTexCoord;