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

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/geo-layers",
   "description": "deck.gl layers supporting geospatial use cases and GIS formats",
   "license": "MIT",
-  "version": "8.9.0-alpha.5",
+  "version": "8.9.0-beta.2",
   "publishConfig": {
     "access": "public"
   },
@@ -26,17 +26,17 @@
   ],
   "sideEffects": false,
   "scripts": {
-    "build-bundle": "webpack --config ../../scripts/bundle.config.js",
-    "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env.dev"
+    "build-bundle": "ocular-bundle ./bundle.ts",
+    "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@loaders.gl/3d-tiles": "^3.2.10",
-    "@loaders.gl/gis": "^3.2.10",
-    "@loaders.gl/loader-utils": "^3.2.10",
-    "@loaders.gl/mvt": "^3.2.10",
-    "@loaders.gl/schema": "^3.2.10",
-    "@loaders.gl/terrain": "^3.2.10",
-    "@loaders.gl/tiles": "^3.2.10",
+    "@loaders.gl/3d-tiles": "^3.3.1",
+    "@loaders.gl/gis": "^3.3.1",
+    "@loaders.gl/loader-utils": "^3.3.1",
+    "@loaders.gl/mvt": "^3.3.1",
+    "@loaders.gl/schema": "^3.3.1",
+    "@loaders.gl/terrain": "^3.3.1",
+    "@loaders.gl/tiles": "^3.3.1",
     "@luma.gl/constants": "^8.5.16",
     "@luma.gl/experimental": "^8.5.16",
     "@math.gl/core": "^3.6.2",
@@ -54,5 +54,5 @@
     "@loaders.gl/core": "^3.0.0",
     "@luma.gl/core": "^8.0.0"
   },
-  "gitHead": "36330f8ca588055b11ed8032dc68ced641cb258b"
+  "gitHead": "5dae086e4f3eb46c30d8e761f9d600be4f68e949"
 }

package/src/geo-cell-layer/GeoCellLayer.ts

@@ -8,11 +8,11 @@ const defaultProps: DefaultProps<GeoCellLayerProps> = {
 /** All properties supported by GeoCellLayer. */
 export type GeoCellLayerProps<DataT = any> = PolygonLayerProps<DataT> & CompositeLayerProps<DataT>;
 
-export default class GeoCellLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<
+export default class GeoCellLayer<DataT = any, ExtraProps extends {} = {}> extends CompositeLayer<
   Required<GeoCellLayerProps<DataT>> & ExtraProps
 > {
   static layerName = 'GeoCellLayer';
-  static defaultProps = defaultProps;
+  static defaultProps: DefaultProps = defaultProps;
 
   /** Implement to generate props to create geometry. */
   indexToBounds(): Partial<GeoCellLayer['props']> | null {

package/src/geohash-layer/geohash-layer.ts

@@ -1,8 +1,8 @@
-import {AccessorFunction} from '@deck.gl/core';
+import {AccessorFunction, DefaultProps} from '@deck.gl/core';
 import GeoCellLayer from '../geo-cell-layer/GeoCellLayer';
 import {getGeohashPolygon} from './geohash-utils';
 
-const defaultProps = {
+const defaultProps: DefaultProps<GeohashLayerProps> = {
   getGeohash: {type: 'accessor', value: d => d.geohash}
 };
 
@@ -19,12 +19,12 @@ type GeohashLayerProps<DataT = any> = {
 };
 
 /** Render filled and/or stroked polygons based on the [Geohash](https://en.wikipedia.org/wiki/Geohash) geospatial indexing system. */
-export default class GeohashLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<
+export default class GeohashLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<
   DataT,
   Required<GeohashLayerProps> & ExtraProps
 > {
   static layerName = 'GeohashLayer';
-  static defaultProps: any = defaultProps;
+  static defaultProps = defaultProps;
 
   indexToBounds(): Partial<GeoCellLayer['props']> | null {
     const {data, getGeohash} = this.props;

package/src/great-circle-layer/great-circle-layer.ts

@@ -31,10 +31,10 @@ export type GreatCircleLayerProps<DataT = any> = ArcLayerProps<DataT>;
 // This layer has been merged into the core ArcLayer
 // Keeping for backward-compatibility
 /** @deprecated Use ArcLayer with `greatCircle: true` instead */
-export default class GreatCircleLayer<DataT = any, ExtraProps = {}> extends ArcLayer<
+export default class GreatCircleLayer<DataT = any, ExtraProps extends {} = {}> extends ArcLayer<
   DataT,
   ExtraProps
 > {
   static layerName = 'GreatCircleLayer';
-  static defaultProps: any = defaultProps;
+  static defaultProps = defaultProps;
 }

package/src/h3-layers/h3-cluster-layer.ts

@@ -1,7 +1,7 @@
 import {h3SetToMultiPolygon, H3IndexInput} from 'h3-js';
 
 import {AccessorFunction, createIterable, UpdateParameters, DefaultProps} from '@deck.gl/core';
-import {H3HexagonLayer} from '@deck.gl/geo-layers';
+import {default as H3HexagonLayer} from './h3-hexagon-layer';
 import GeoCellLayer, {GeoCellLayerProps} from '../geo-cell-layer/GeoCellLayer';
 
 const defaultProps: DefaultProps<H3ClusterLayerProps> = {
@@ -22,7 +22,7 @@ type _H3ClusterLayerProps<DataT> = {
   getHexagons?: AccessorFunction<DataT, H3IndexInput[]>;
 };
 
-export default class H3ClusterLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<
+export default class H3ClusterLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<
   DataT,
   Required<_H3ClusterLayerProps<DataT>> & ExtraProps
 > {

package/src/h3-layers/h3-hexagon-layer.ts

@@ -145,7 +145,10 @@ type _H3HexagonLayerProps<DataT> = {
 /**
  * Render hexagons from the [H3](https://h3geo.org/) geospatial indexing system.
  */
-export default class H3HexagonLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<
+export default class H3HexagonLayer<
+  DataT = any,
+  ExtraPropsT extends {} = {}
+> extends CompositeLayer<
   ExtraPropsT & Required<_H3HexagonLayerProps<DataT> & Required<PolygonLayerProps<DataT>>>
 > {
   static defaultProps = defaultProps;

package/src/index.ts

@@ -32,9 +32,6 @@ export {default as MVTLayer} from './mvt-layer/mvt-layer';
 export {default as GeohashLayer} from './geohash-layer/geohash-layer';
 
 export {default as _GeoCellLayer} from './geo-cell-layer/GeoCellLayer';
-export {getURLFromTemplate as _getURLFromTemplate} from './tile-layer/utils';
-export {default as _Tileset2D} from './tile-layer/tileset-2d';
-export {default as _Tile2DHeader} from './tile-layer/tile-2d-header';
 
 // Types
 export type {H3ClusterLayerProps} from './h3-layers/h3-cluster-layer';
@@ -42,10 +39,17 @@ 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 {GeoBoundingBox, NonGeoBoundingBox} from './tile-layer/types';
 export type {QuadkeyLayerProps} from './quadkey-layer/quadkey-layer';
-export type {TileLoadProps as _TileLoadProps} from './tile-layer/types';
 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 {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 {getURLFromTemplate as _getURLFromTemplate} from './tileset-2d';
+export {Tileset2D as _Tileset2D} from './tileset-2d';
+export {Tile2DHeader as _Tile2DHeader} from './tileset-2d';

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

@@ -42,7 +42,7 @@ type _MeshLayerProps<DataT> = {
   featureIds?: NumericArray | null;
 };
 
-export default class MeshLayer<DataT = any, ExtraProps = {}> extends SimpleMeshLayer<
+export default class MeshLayer<DataT = any, ExtraProps extends {} = {}> extends SimpleMeshLayer<
   DataT,
   Required<_MeshLayerProps<DataT>> & ExtraProps
 > {

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 '../tile-layer/types';
+import {GeoBoundingBox} from '../tileset-2d';
 
 const availableTransformations = {
   Point,

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

@@ -10,23 +10,30 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {GeoJsonLayer, GeoJsonLayerProps} from '@deck.gl/layers';
+import {ClipExtension} from '@deck.gl/extensions';
+
 import {Matrix4} from '@math.gl/core';
 import {MVTWorkerLoader} from '@loaders.gl/mvt';
 import {binaryToGeojson} from '@loaders.gl/gis';
-import {ClipExtension} from '@deck.gl/extensions';
 
 import type {Loader} from '@loaders.gl/loader-utils';
 import type {BinaryFeatures} from '@loaders.gl/schema';
 import type {Feature} from 'geojson';
 
-import TileLayer, {TiledPickingInfo, TileLayerProps} from '../tile-layer/tile-layer';
-import Tileset2D, {Tileset2DProps} from '../tile-layer/tileset-2d';
-import {getURLFromTemplate, isGeoBoundingBox, isURLTemplate} from '../tile-layer/utils';
-import {GeoBoundingBox, TileLoadProps} from '../tile-layer/types';
-import Tile2DHeader from '../tile-layer/tile-2d-header';
 import {transform} from './coordinate-transform';
 import findIndexBinary from './find-index-binary';
 
+import TileLayer, {TiledPickingInfo, TileLayerProps} from '../tile-layer/tile-layer';
+
+import type {Tileset2DProps, TileLoadProps, GeoBoundingBox} from '../tileset-2d';
+import {
+  Tileset2D,
+  Tile2DHeader,
+  getURLFromTemplate,
+  isGeoBoundingBox,
+  isURLTemplate
+} from '../tileset-2d';
+
 const WORLD_SIZE = 512;
 
 const defaultProps: DefaultProps<MVTLayerProps> = {
@@ -86,10 +93,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<DataT extends Feature = Feature, ExtraProps = {}> extends TileLayer<
-  ParsedMvtTile,
-  Required<_MVTLayerProps> & ExtraProps
-> {
+export default class MVTLayer<
+  DataT extends Feature = Feature,
+  ExtraProps extends {} = {}
+> extends TileLayer<ParsedMvtTile, Required<_MVTLayerProps> & ExtraProps> {
   static layerName = 'MVTLayer';
   static defaultProps = defaultProps;
 
@@ -285,7 +292,7 @@ export default class MVTLayer<DataT extends Feature = Feature, ExtraProps = {}>
     if (info.object && !isWGS84) {
       info.object = transformTileCoordsToWGS84(
         info.object,
-        info.tile!.bbox as GeoBoundingBox,
+        info.tile!.bbox as GeoBoundingBox, // eslint-disable-line
         this.context.viewport
       );
     }

package/src/quadkey-layer/quadkey-layer.ts

@@ -20,7 +20,7 @@ type _QuadkeyLayerProps<DataT> = {
 };
 
 /** Render filled and/or stroked polygons based on the [Quadkey](https://towardsdatascience.com/geospatial-indexing-with-quadkeys-d933dff01496) geospatial indexing system. */
-export default class QuadkeyLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<
+export default class QuadkeyLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<
   DataT,
   Required<_QuadkeyLayerProps<DataT>> & ExtraProps
 > {

package/src/s2-layer/s2-layer.ts

@@ -40,7 +40,7 @@ type _S2LayerProps<DataT> = {
 };
 
 /** Render filled and/or stroked polygons based on the [S2](http://s2geometry.io/) geospatial indexing system. */
-export default class S2Layer<DataT = any, ExtraProps = {}> extends GeoCellLayer<
+export default class S2Layer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<
   DataT,
   Required<_S2LayerProps<DataT>> & ExtraProps
 > {

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

@@ -35,9 +35,8 @@ 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 Tile2DHeader from '../tile-layer/tile-2d-header';
-import {Bounds, GeoBoundingBox, TileBoundingBox, TileLoadProps, ZRange} from '../tile-layer/types';
-import {urlType, getURLFromTemplate} from '../tile-layer/utils';
+import type {Bounds, GeoBoundingBox, TileBoundingBox, TileLoadProps, ZRange} from '../tileset-2d';
+import {Tile2DHeader, urlType, getURLFromTemplate, URLTemplate} from '../tileset-2d';
 
 const DUMMY_DATA = [1];
 
@@ -64,7 +63,7 @@ const defaultProps: DefaultProps<TerrainLayerProps> = {
     }
   },
   // Supply url to local terrain worker bundle. Only required if running offline and cannot access CDN.
-  workerUrl: {type: 'string', value: null},
+  workerUrl: '',
   // Same as SimpleMeshLayer wireframe
   wireframe: false,
   material: true,
@@ -72,10 +71,8 @@ const defaultProps: DefaultProps<TerrainLayerProps> = {
   loaders: [TerrainWorkerLoader]
 };
 
-type URLTemplate = string | string[];
-
 // Turns array of templates into a single string to work around shallow change
-function urlTemplateToUpdateTrigger(template: URLTemplate | null): string {
+function urlTemplateToUpdateTrigger(template: URLTemplate): string {
   if (Array.isArray(template)) {
     return template.join(';');
   }
@@ -104,7 +101,7 @@ type _TerrainLayerProps = {
   elevationData: URLTemplate;
 
   /** Image url to use as texture. **/
-  texture?: URLTemplate | null;
+  texture?: URLTemplate;
 
   /** Martini error tolerance in meters, smaller number -> more detailed mesh. **/
   meshMaxError?: number;
@@ -123,10 +120,15 @@ type _TerrainLayerProps = {
 
   /** Material props for lighting effect. **/
   material?: Material;
+
+  /**
+   * @deprecated Use `loadOptions.terrain.workerUrl` instead
+   */
+  workerUrl?: string;
 };
 
 /** Render mesh surfaces from height map images. */
-export default class TerrainLayer<ExtraPropsT = {}> extends CompositeLayer<
+export default class TerrainLayer<ExtraPropsT extends {} = {}> extends CompositeLayer<
   ExtraPropsT & Required<_TerrainLayerProps & Required<TileLayerProps<MeshAndTexture>>>
 > {
   static defaultProps = defaultProps;

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

@@ -76,10 +76,10 @@ type _Tile3DLayerProps<DataT> = {
 };
 
 /** Render 3d tiles data formatted according to the [3D Tiles Specification](https://www.opengeospatial.org/standards/3DTiles) and [`ESRI I3S`](https://github.com/Esri/i3s-spec) */
-export default class Tile3DLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<
+export default class Tile3DLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<
   ExtraPropsT & Required<_Tile3DLayerProps<DataT>>
 > {
-  static defaultProps = defaultProps as any;
+  static defaultProps = defaultProps;
   static layerName = 'Tile3DLayer';
 
   state!: {
@@ -114,6 +114,7 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT = {}> extends Composit
 
   updateState({props, oldProps, changeFlags}: UpdateParameters<this>): void {
     if (props.data && props.data !== oldProps.data) {
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
       this._loadTileset(props.data);
     }
 
@@ -147,14 +148,11 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT = {}> extends Composit
   }
 
   getPickingInfo({info, sourceLayer}: GetPickingInfoParams) {
-    const {layerMap} = this.state;
-    const layerId = sourceLayer && sourceLayer.id;
-    if (layerId) {
-      // layerId: this.id-[scenegraph|pointcloud]-tileId
-      const substr = layerId.substring(this.id.length + 1);
-      const tileId = substr.substring(substr.indexOf('-') + 1);
-      info.object = layerMap[tileId] && layerMap[tileId].tile;
+    const sourceTile = sourceLayer && (sourceLayer.props as any).tile;
+    if (info.picked) {
+      info.object = sourceTile;
     }
+    (info as any).sourceTile = sourceTile;
 
     return info;
   }
@@ -167,8 +165,10 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT = {}> extends Composit
   }
 
   protected _updateAutoHighlight(info: PickingInfo): void {
-    if (info.sourceLayer) {
-      info.sourceLayer.updateAutoHighlight(info);
+    const sourceTile = (info as any).sourceTile;
+    const layerCache = this.state.layerMap[sourceTile?.id];
+    if (layerCache && layerCache.layer) {
+      layerCache.layer.updateAutoHighlight(info);
     }
   }
 
@@ -235,6 +235,8 @@ export default class Tile3DLayer<DataT = any, ExtraPropsT = {}> extends Composit
     if (!timeline || !viewportsNumber || !tileset3d) {
       return;
     }
+
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     tileset3d.selectTiles(Object.values(viewports)).then(frameNumber => {
       const tilesetChanged = this.state.frameNumber !== frameNumber;
       if (tilesetChanged) {

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

@@ -12,16 +12,21 @@ import {
 } from '@deck.gl/core';
 import {GeoJsonLayer} from '@deck.gl/layers';
 import {LayersList} from '@deck.gl/core';
-import Tile2DHeader from './tile-2d-header';
 
-import Tileset2D, {RefinementStrategy, STRATEGY_DEFAULT, Tileset2DProps} from './tileset-2d';
-import {TileLoadProps, ZRange} from './types';
-import {urlType, getURLFromTemplate} from './utils';
+import type {TileLoadProps, ZRange} from '../tileset-2d';
+import {
+  Tileset2D,
+  Tile2DHeader,
+  RefinementStrategy,
+  STRATEGY_DEFAULT,
+  Tileset2DProps
+} from '../tileset-2d';
+import {urlType, getURLFromTemplate} from '../tileset-2d';
 
 const defaultProps: DefaultProps<TileLayerProps> = {
   TilesetClass: Tileset2D,
   data: {type: 'data', value: []},
-  dataComparator: urlType.equals,
+  dataComparator: urlType.equal,
   renderSubLayers: {type: 'function', value: props => new GeoJsonLayer(props), compare: false},
   getTileData: {type: 'function', optional: true, value: null, compare: false},
   // TODO - change to onViewportLoad to align with Tile3DLayer
@@ -77,7 +82,7 @@ type _TileLayerProps<DataT> = {
   onTileUnload?: (tile: Tile2DHeader<DataT>) => void;
 
   /** Called when a tile failed to load. */
-  onTileError?: (err: any) => void;
+  onTileError?: (err: any, tile?) => void;
 
   /** The bounding box of the layer's data. */
   extent?: number[] | null;
@@ -141,10 +146,10 @@ export type TiledPickingInfo<DataT = any> = PickingInfo & {
  *
  * Instead of fetching the entire dataset, it only loads and renders what's visible in the current viewport.
  */
-export default class TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<
+export default class TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<
   ExtraPropsT & Required<_TileLayerProps<DataT>>
 > {
-  static defaultProps = defaultProps as any;
+  static defaultProps: DefaultProps = defaultProps;
   static layerName = 'TileLayer';
 
   initializeState() {
@@ -310,13 +315,20 @@ export default class TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeL
   }
 
   getPickingInfo({info, sourceLayer}: GetPickingInfoParams): TiledPickingInfo<DataT> {
-    (info as any).tile = (sourceLayer as any).props.tile;
+    const sourceTile = (sourceLayer as any).props.tile;
+    if (info.picked) {
+      (info as any).tile = sourceTile;
+    }
+    (info as any).sourceTile = sourceTile;
     return info;
   }
 
   protected _updateAutoHighlight(info: PickingInfo): void {
-    if (info.sourceLayer) {
-      info.sourceLayer.updateAutoHighlight(info);
+    const sourceTile = (info as any).sourceTile as Tile2DHeader;
+    if (sourceTile && sourceTile.layers) {
+      for (const layer of sourceTile.layers) {
+        layer.updateAutoHighlight(info);
+      }
     }
   }
 

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

@@ -0,0 +1,25 @@
+// deck.gl, MIT license
+
+export type {
+  TileLoadProps,
+  Bounds,
+  ZRange,
+  GeoBoundingBox,
+  NonGeoBoundingBox,
+  TileBoundingBox
+} from './types';
+
+export type {Tileset2DProps, RefinementStrategy} from './tileset-2d';
+export {Tileset2D, STRATEGY_DEFAULT} from './tileset-2d';
+
+export {Tile2DHeader} from './tile-2d-header';
+
+export type {URLTemplate} from './utils';
+export {
+  isGeoBoundingBox,
+  isURLTemplate,
+  urlType,
+  getURLFromTemplate,
+  getTileIndices,
+  tileToBoundingBox
+} from './utils';

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

@@ -0,0 +1,45 @@
+// deck.gl, MIT license
+// @note - this is a duplicate of the deck.gl core export (because Tileset2D should be deck.gl independent)
+
+/**
+ * Speed up consecutive function calls by caching the result of calls with identical input
+ * https://en.wikipedia.org/wiki/Memoization
+ * @param compute - the function to be memoized
+ */
+export function memoize<In, Out>(compute: (args: In) => Out): (args: In) => Out {
+  let cachedArgs: any = {};
+  let cachedResult: Out;
+
+  return (args: In) => {
+    for (const key in args) {
+      if (!isEqual(args[key], cachedArgs[key])) {
+        cachedResult = compute(args);
+        cachedArgs = args;
+        break;
+      }
+    }
+    return cachedResult;
+  };
+}
+
+function isEqual(a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (Array.isArray(a)) {
+    // Special treatment for arrays: compare 1-level deep
+    // This is to support equality of matrix/coordinate props
+    const len = a.length;
+    if (!b || b.length !== len) {
+      return false;
+    }
+
+    for (let i = 0; i < len; i++) {
+      if (a[i] !== b[i]) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return false;
+}

package/src/{tile-layer → tileset-2d}/tile-2d-header.ts

@@ -1,5 +1,4 @@
 /* eslint-env browser */
-import {Layer, log} from '@deck.gl/core';
 import {RequestScheduler} from '@loaders.gl/loader-utils';
 import {TileBoundingBox, TileIndex, TileLoadProps} from './types';
 
@@ -10,7 +9,7 @@ export type TileLoadDataProps<DataT = any> = {
   onError: (error: any, tile: Tile2DHeader<DataT>) => void;
 };
 
-export default class Tile2DHeader<DataT = any> {
+export class Tile2DHeader<DataT = any> {
   index: TileIndex;
   isVisible: boolean;
   isSelected: boolean;
@@ -18,7 +17,7 @@ export default class Tile2DHeader<DataT = any> {
   children: Tile2DHeader[] | null;
   content: DataT | null;
   state?: number;
-  layers?: Layer[] | null;
+  layers?: any[] | null; // Layer[] | null
 
   id!: string; // assigned _always_ with result of `getTileId`
   bbox!: TileBoundingBox; // assigned _always_ with result of `getTileMetadata`
@@ -68,7 +67,8 @@ export default class Tile2DHeader<DataT = any> {
   get byteLength(): number {
     const result = this.content ? (this.content as any).byteLength : 0;
     if (!Number.isFinite(result)) {
-      log.error('byteLength not defined in tile data')();
+      // eslint-disable-next-line no-console
+      console.error('byteLength not defined in tile data');
     }
     return result;
   }

package/src/{tile-layer → tileset-2d}/tile-2d-traversal.ts

@@ -1,5 +1,5 @@
-/* eslint-disable complexity */
 import {Viewport, WebMercatorViewport, _GlobeViewport} from '@deck.gl/core';
+
 import {
   CullingVolume,
   Plane,
@@ -63,6 +63,7 @@ class OSMNode {
     return this._children;
   }
 
+  // eslint-disable-next-line complexity
   update(params: {
     viewport: Viewport;
     project: ((xyz: number[]) => number[]) | null;
@@ -178,6 +179,7 @@ class OSMNode {
   }
 }
 
+// eslint-disable-next-line complexity
 export function getOSMTileIndices(
   viewport: Viewport,
   maxZ: number,