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

package/package.json

@@ -3,7 +3,7 @@
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
   "type": "module",
-  "version": "9.2.11",
+  "version": "9.3.0-alpha.2",
   "publishConfig": {
     "access": "public"
   },
@@ -38,16 +38,16 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "~4.3.4",
-    "@loaders.gl/gis": "~4.3.4",
-    "@loaders.gl/loader-utils": "~4.3.4",
-    "@loaders.gl/mvt": "~4.3.4",
-    "@loaders.gl/schema": "~4.3.4",
-    "@loaders.gl/terrain": "~4.3.4",
-    "@loaders.gl/tiles": "~4.3.4",
-    "@loaders.gl/wms": "~4.3.4",
-    "@luma.gl/gltf": "~9.2.6",
-    "@luma.gl/shadertools": "~9.2.6",
+    "@loaders.gl/3d-tiles": "^4.4.0-alpha.18",
+    "@loaders.gl/gis": "^4.4.0-alpha.18",
+    "@loaders.gl/loader-utils": "^4.4.0-alpha.18",
+    "@loaders.gl/mvt": "^4.4.0-alpha.18",
+    "@loaders.gl/schema": "^4.4.0-alpha.18",
+    "@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",
     "@math.gl/core": "^4.1.0",
     "@math.gl/culling": "^4.1.0",
     "@math.gl/web-mercator": "^4.1.0",
@@ -61,9 +61,9 @@
     "@deck.gl/extensions": "~9.2.0",
     "@deck.gl/layers": "~9.2.0",
     "@deck.gl/mesh-layers": "~9.2.0",
-    "@loaders.gl/core": "~4.3.4",
-    "@luma.gl/core": "~9.2.6",
-    "@luma.gl/engine": "~9.2.6"
+    "@loaders.gl/core": "^4.4.0-alpha.18",
+    "@luma.gl/core": "~9.3.0-alpha.6",
+    "@luma.gl/engine": "~9.3.0-alpha.6"
   },
-  "gitHead": "35adca6c8646a5125517cbccb99ce1b733b02235"
+  "gitHead": "135d329f4a4b596ae2c16e4eb801eda30252f3bc"
 }

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

@@ -98,7 +98,7 @@ function getLayerRange(
     const layerNames: Record<string, LayerRange> = {};
     const {properties} = geomData;
     for (let i = 0; i < properties.length; i++) {
-      const {layerName: key} = properties[i] as Record<string, any>;
+      const {layerName: key} = properties[i];
       if (!key) {
         // ignore
       } else if (layerNames[key]) {

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

@@ -176,25 +176,31 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT extends {} = {}> exten
   }
 
   private async _loadTileset(tilesetUrl) {
-    const {loadOptions = {}} = this.props;
+    const loadOptions = this.props.loadOptions || {};
 
     // TODO: deprecate `loader` in v9.0
     // @ts-ignore
-    const loaders = this.props.loader || this.props.loaders;
+    const loaders = this.props.loaders?.length ? this.props.loaders : this.props.loader;
     const loader = Array.isArray(loaders) ? loaders[0] : loaders;
 
-    const options = {loadOptions: {...loadOptions}};
+    // Extract tileset-specific options so they are passed to the Tileset3D constructor
+    const {tileset: tilesetOptions, ...remainingLoadOptions} = loadOptions;
+
+    const options = {loadOptions: {...remainingLoadOptions}, ...tilesetOptions};
     let actualTilesetUrl = tilesetUrl;
-    if (loader.preload) {
+    if ('preload' in loader && typeof loader.preload === 'function') {
       const preloadOptions = await loader.preload(tilesetUrl, loadOptions);
       if (preloadOptions.url) {
         actualTilesetUrl = preloadOptions.url;
       }
 
       if (preloadOptions.headers) {
-        options.loadOptions.fetch = {
-          ...options.loadOptions.fetch,
-          headers: preloadOptions.headers
+        options.loadOptions.core = {
+          ...options.loadOptions.core,
+          fetch: {
+            ...options.loadOptions.core?.fetch,
+            headers: preloadOptions.headers
+          }
         };
       }
       Object.assign(options, preloadOptions);
@@ -205,6 +211,7 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT extends {} = {}> exten
       onTileLoad: this._onTileLoad.bind(this),
       onTileUnload: this._onTileUnload.bind(this),
       onTileError: this.props.onTileError,
+      onUpdate: () => this.setNeedsUpdate(),
       ...options
     });
 
@@ -219,6 +226,9 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT extends {} = {}> exten
 
   private _onTileLoad(tileHeader: Tile3D): void {
     const {lastUpdatedViewports} = this.state;
+    // Mark as not yet drawn so transition hold keeps previous tiles
+    // visible until this tile's sublayer renders for the first time
+    tileHeader.tileDrawn = false;
     this.props.onTileLoad(tileHeader);
     this._updateTileset(lastUpdatedViewports);
     this.setNeedsUpdate();
@@ -337,7 +347,10 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT extends {} = {}> exten
         modelMatrix,
         getTransformMatrix: instance => instance.modelMatrix,
         getPosition: [0, 0, 0],
-        _offset: 0
+        _offset: 0,
+        onFirstDraw: () => {
+          tileHeader.tileDrawn = true;
+        }
       }
     );
   }

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

@@ -21,8 +21,8 @@ import {
 } from '@deck.gl/core';
 import {BitmapLayer} from '@deck.gl/layers';
 import type {GetImageParameters, ImageSourceMetadata, ImageType} from '@loaders.gl/loader-utils';
-import type {ImageServiceType} from '@loaders.gl/wms';
-import {ImageSource, createImageSource} from '@loaders.gl/wms';
+import {createDataSource} from '@loaders.gl/core';
+import {ImageSource, WMSSource} from '@loaders.gl/wms';
 import {WGS84ToPseudoMercator} from './utils';
 
 /** All props supported by the TileLayer */
@@ -31,7 +31,7 @@ export type WMSLayerProps = CompositeLayerProps & _WMSLayerProps;
 /** Props added by the TileLayer */
 type _WMSLayerProps = {
   data: string | ImageSource;
-  serviceType?: ImageServiceType | 'auto';
+  serviceType?: 'wms' | 'auto';
   layers?: string[];
   srs?: 'EPSG:4326' | 'EPSG:3857' | 'auto';
   onMetadataLoad?: (metadata: ImageSourceMetadata) => void;
@@ -166,11 +166,12 @@ export class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
     }
 
     if (typeof props.data === 'string') {
-      return createImageSource({
-        url: props.data,
-        loadOptions: props.loadOptions,
-        type: props.serviceType
-      });
+      return createDataSource(props.data, [WMSSource], {
+        core: {
+          type: props.serviceType,
+          loadOptions: props.loadOptions
+        }
+      }) as ImageSource;
     }
 
     throw new Error('invalid image source in props.data');