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

package/package.json

@@ -3,7 +3,7 @@
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
   "type": "module",
-  "version": "9.3.0-alpha.2",
+  "version": "9.3.0-alpha.5",
   "publishConfig": {
     "access": "public"
   },
@@ -46,8 +46,8 @@
     "@loaders.gl/terrain": "^4.4.0-alpha.18",
     "@loaders.gl/tiles": "^4.4.0-alpha.18",
     "@loaders.gl/wms": "^4.4.0-alpha.18",
-    "@luma.gl/gltf": "^9.3.0-alpha.6",
-    "@luma.gl/shadertools": "^9.3.0-alpha.6",
+    "@luma.gl/gltf": "^9.3.0-alpha.10",
+    "@luma.gl/shadertools": "^9.3.0-alpha.10",
     "@math.gl/core": "^4.1.0",
     "@math.gl/culling": "^4.1.0",
     "@math.gl/web-mercator": "^4.1.0",
@@ -57,13 +57,13 @@
     "long": "^3.2.0"
   },
   "peerDependencies": {
-    "@deck.gl/core": "~9.2.0",
-    "@deck.gl/extensions": "~9.2.0",
-    "@deck.gl/layers": "~9.2.0",
-    "@deck.gl/mesh-layers": "~9.2.0",
+    "@deck.gl/core": "~9.3.0-alpha.1",
+    "@deck.gl/extensions": "~9.3.0-alpha.1",
+    "@deck.gl/layers": "~9.3.0-alpha.1",
+    "@deck.gl/mesh-layers": "~9.3.0-alpha.1",
     "@loaders.gl/core": "^4.4.0-alpha.18",
-    "@luma.gl/core": "~9.3.0-alpha.6",
-    "@luma.gl/engine": "~9.3.0-alpha.6"
+    "@luma.gl/core": "~9.3.0-alpha.10",
+    "@luma.gl/engine": "~9.3.0-alpha.10"
   },
-  "gitHead": "135d329f4a4b596ae2c16e4eb801eda30252f3bc"
+  "gitHead": "c3ad1cee357af674cc31df37979d61325baf9d7a"
 }

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

@@ -5,7 +5,7 @@
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = `\
-uniform meshUniforms {
+layout(std140) uniform meshUniforms {
   bool pickFeatureIds;
 } mesh;
 `;

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

@@ -226,17 +226,20 @@ export default class MVTLayer<
     const {fetch} = this.props;
     loadOptions = {
       ...loadOptions,
-      mimeType: 'application/x-protobuf',
+      core: {
+        ...loadOptions?.core,
+        mimeType: 'application/x-protobuf'
+      },
       mvt: {
         ...loadOptions?.mvt,
+        shape: binary ? 'binary' : 'geojson',
         coordinates: this.context.viewport.resolution ? 'wgs84' : 'local',
         tileIndex: index
         // Local worker debug
         // workerUrl: `modules/mvt/dist/mvt-loader.worker.js`
         // Set worker to null to skip web workers
         // workerUrl: null
-      },
-      gis: binary ? {format: 'binary'} : {}
+      }
     };
     return fetch(url, {propName: 'data', layer: this, loadOptions, signal});
   }

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

@@ -18,7 +18,8 @@ import {
   PickingInfo,
   UpdateParameters,
   Viewport,
-  DefaultProps
+  DefaultProps,
+  LayerContext
 } from '@deck.gl/core';
 import {PointCloudLayer} from '@deck.gl/layers';
 import {ScenegraphLayer} from '@deck.gl/mesh-layers';
@@ -138,6 +139,15 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT extends {} = {}> exten
     }
   }
 
+  finalizeState(context: LayerContext): void {
+    this.state.tileset3d?.destroy();
+    this.state.tileset3d = null;
+    this.state.layerMap = {};
+    this.state.activeViewports = {};
+    this.state.lastUpdatedViewports = null;
+    super.finalizeState(context);
+  }
+
   activateViewport(viewport: Viewport): void {
     const {activeViewports, lastUpdatedViewports} = this.state;
     this.internalState!.viewport = viewport;
@@ -160,11 +170,29 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT extends {} = {}> exten
     return info;
   }
 
-  filterSubLayer({layer, viewport}: FilterContext): boolean {
+  filterSubLayer({layer, viewport, cullRect, isPicking}: FilterContext): boolean {
     // All sublayers will have a tile prop
     const {tile} = layer.props as unknown as {tile: Tile3D};
     const {id: viewportId} = viewport;
-    return tile.selected && tile.viewportIds.includes(viewportId);
+    if (!tile.selected || !tile.viewportIds.includes(viewportId)) {
+      return false;
+    }
+
+    // When picking, skip tiles whose content center is far from the
+    // pick point on screen. Avoids unnecessary draw calls.
+    if (isPicking && cullRect && tile.content?.cartographicOrigin) {
+      const [sx, sy] = viewport.project(tile.content.cartographicOrigin);
+      const cx = cullRect.x + cullRect.width / 2;
+      const cy = cullRect.y + cullRect.height / 2;
+      const threshold = Math.max(viewport.width, viewport.height) / 4;
+      const dx = sx - cx;
+      const dy = sy - cy;
+      if (dx * dx + dy * dy > threshold * threshold) {
+        return false;
+      }
+    }
+
+    return true;
   }
 
   protected _updateAutoHighlight(info: PickingInfo): void {

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

@@ -194,7 +194,12 @@ export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends
   get isLoaded(): boolean {
     return Boolean(
       this.state?.tileset?.selectedTiles?.every(
-        tile => tile.isLoaded && tile.layers && tile.layers.every(layer => layer.isLoaded)
+        tile =>
+          // Error / empty tiles resolve to `content === null`. Once Tile2DHeader marks those
+          // requests as loaded, do not wait for generated sublayers because there is nothing to
+          // render for that tile and `tile.layers` will remain null.
+          tile.isLoaded &&
+          (!tile.content || !tile.layers || tile.layers.every(layer => layer.isLoaded))
       )
     );
   }

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

@@ -148,7 +148,8 @@ export class Tile2DHeader<DataT = any> {
     // Clear the `isLoading` flag
     this._loader = undefined;
     // Rewrite tile content with the result of getTileData if successful, or `null` in case of
-    // error or cancellation
+    // error or cancellation. A `null` tile is still a terminal result for the request: the tile
+    // should stop blocking viewport loading even if the source returned 404 / empty content.
     this.content = tileData;
     // If cancelled, do not invoke the callbacks
     // Consider it loaded if we tried to cancel but `getTileData` still returned data
@@ -156,6 +157,9 @@ export class Tile2DHeader<DataT = any> {
       this._isLoaded = false;
       return;
     }
+    // Errors are reported via onError below, but the request itself has completed. Mark the tile
+    // as loaded so higher-level layers can treat expected missing tiles as settled instead of
+    // waiting forever for content or sublayers that will never exist.
     this._isLoaded = true;
     this._isCancelled = false;
 

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

@@ -5,7 +5,7 @@
 import type {ShaderModule} from '@luma.gl/shadertools';
 
 const uniformBlock = `\
-uniform tripsUniforms {
+layout(std140) uniform tripsUniforms {
   bool fadeTrail;
   float trailLength;
   float currentTime;