@deck.gl/geo-layers 8.10.0-alpha.7 → 9.0.0-alpha.3

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.10.0-alpha.7",
+  "version": "9.0.0-alpha.3",
   "publishConfig": {
     "access": "public"
   },
@@ -31,16 +31,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.0.0",
-    "@loaders.gl/3d-tiles": "^4.0.1",
-    "@loaders.gl/gis": "^4.0.1",
-    "@loaders.gl/loader-utils": "^4.0.1",
-    "@loaders.gl/mvt": "^4.0.1",
-    "@loaders.gl/schema": "^4.0.1",
-    "@loaders.gl/terrain": "^4.0.1",
-    "@loaders.gl/tiles": "^4.0.1",
-    "@loaders.gl/wms": "^4.0.1",
-    "@luma.gl/constants": "^8.5.20",
-    "@luma.gl/experimental": "^8.5.20",
+    "@loaders.gl/3d-tiles": "4.0.3",
+    "@loaders.gl/gis": "4.0.3",
+    "@loaders.gl/loader-utils": "4.0.3",
+    "@loaders.gl/mvt": "4.0.3",
+    "@loaders.gl/schema": "4.0.3",
+    "@loaders.gl/terrain": "4.0.3",
+    "@loaders.gl/tiles": "4.0.3",
+    "@loaders.gl/wms": "4.0.3",
+    "@luma.gl/core": "9.0.0-alpha.42",
     "@math.gl/core": "^4.0.0",
     "@math.gl/culling": "^4.0.0",
     "@math.gl/web-mercator": "^4.0.0",
@@ -53,8 +52,9 @@
     "@deck.gl/extensions": "^8.0.0",
     "@deck.gl/layers": "^8.0.0",
     "@deck.gl/mesh-layers": "^8.0.0",
-    "@loaders.gl/core": "^4.0.1",
-    "@luma.gl/core": "^8.0.0"
+    "@loaders.gl/core": "4.0.3",
+    "@luma.gl/core": "9.0.0-alpha.42",
+    "@luma.gl/shadertools": "9.0.0-alpha.42"
   },
-  "gitHead": "1c62a9eec914019afd3969bc0c59f1488e491207"
+  "gitHead": "51dfb88f9168ccf478d01b28a2c5ada7bd8281c7"
 }

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

@@ -6,7 +6,7 @@ const defaultProps: DefaultProps<GeoCellLayerProps> = {
 };
 
 /** All properties supported by GeoCellLayer. */
-export type GeoCellLayerProps<DataT = any> = PolygonLayerProps<DataT>;
+export type GeoCellLayerProps<DataT = unknown> = PolygonLayerProps<DataT>;
 
 export default class GeoCellLayer<DataT = any, ExtraProps extends {} = {}> extends CompositeLayer<
   Required<GeoCellLayerProps<DataT>> & ExtraProps

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

@@ -3,13 +3,13 @@ import GeoCellLayer from '../geo-cell-layer/GeoCellLayer';
 import {getGeohashPolygon} from './geohash-utils';
 
 const defaultProps: DefaultProps<GeohashLayerProps> = {
-  getGeohash: {type: 'accessor', value: d => d.geohash}
+  getGeohash: {type: 'accessor', value: (d: any) => d.geohash}
 };
 
 /**
  * Properties of `GeohashLayer`.
  */
-type GeohashLayerProps<DataT = any> = {
+type GeohashLayerProps<DataT = unknown> = {
   /**
    * Called for each data object to retrieve the geohash string identifier.
    *

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

@@ -26,7 +26,7 @@ const defaultProps: DefaultProps<ArcLayerProps> = {
 };
 
 /** All properties supported by GreatCircleLayer. */
-export type GreatCircleLayerProps<DataT = any> = ArcLayerProps<DataT>;
+export type GreatCircleLayerProps<DataT = unknown> = ArcLayerProps<DataT>;
 
 // This layer has been merged into the core ArcLayer
 // Keeping for backward-compatibility

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

@@ -6,11 +6,11 @@ import GeoCellLayer, {GeoCellLayerProps} from '../geo-cell-layer/GeoCellLayer';
 import {normalizeLongitudes} from './h3-utils';
 
 const defaultProps: DefaultProps<H3ClusterLayerProps> = {
-  getHexagons: {type: 'accessor', value: d => d.hexagons}
+  getHexagons: {type: 'accessor', value: (d: any) => d.hexagons}
 };
 
 /** All properties supported by H3ClusterLayer. */
-export type H3ClusterLayerProps<DataT = any> = _H3ClusterLayerProps<DataT> &
+export type H3ClusterLayerProps<DataT = unknown> = _H3ClusterLayerProps<DataT> &
   GeoCellLayerProps<DataT>;
 
 /** Properties added by H3ClusterLayer. */
@@ -30,6 +30,10 @@ export default class H3ClusterLayer<DataT = any, ExtraProps extends {} = {}> ext
   static layerName = 'H3ClusterLayer';
   static defaultProps = defaultProps;
 
+  state!: {
+    polygons: {polygon: number[][][]}[];
+  };
+
   initializeState(): void {
     H3HexagonLayer._checkH3Lib();
   }

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

@@ -42,12 +42,12 @@ const defaultProps: DefaultProps<H3HexagonLayerProps> = {
   highPrecision: 'auto',
   coverage: {type: 'number', min: 0, max: 1, value: 1},
   centerHexagon: null,
-  getHexagon: {type: 'accessor', value: x => x.hexagon},
+  getHexagon: {type: 'accessor', value: (x: any) => x.hexagon},
   extruded: true
 };
 
 /** All properties supported by H3HexagonLayer */
-export type H3HexagonLayerProps<DataT = any> = _H3HexagonLayerProps<DataT> &
+export type H3HexagonLayerProps<DataT = unknown> = _H3HexagonLayerProps<DataT> &
   PolygonLayerProps<DataT>;
 
 /** Props added by the H3HexagonLayer */

package/src/index.ts

@@ -27,7 +27,8 @@ export {default as TileLayer} from './tile-layer/tile-layer';
 export {default as TripsLayer} from './trips-layer/trips-layer';
 export {default as H3ClusterLayer} from './h3-layers/h3-cluster-layer';
 export {default as H3HexagonLayer} from './h3-layers/h3-hexagon-layer';
-export {default as Tile3DLayer} from './tile-3d-layer/tile-3d-layer';
+// TODO v9 layers that depend on luma glTF code
+// export {default as Tile3DLayer} from './tile-3d-layer/tile-3d-layer';
 export {default as TerrainLayer} from './terrain-layer/terrain-layer';
 export {default as MVTLayer} from './mvt-layer/mvt-layer';
 export {default as GeohashLayer} from './geohash-layer/geohash-layer';
@@ -43,8 +44,9 @@ export type {S2LayerProps} from './s2-layer/s2-layer';
 export type {TileLayerProps} from './tile-layer/tile-layer';
 export type {TripsLayerProps} from './trips-layer/trips-layer';
 export type {QuadkeyLayerProps} from './quadkey-layer/quadkey-layer';
+// TODO v9 layers that depend on luma glTF code
 export type {TerrainLayerProps} from './terrain-layer/terrain-layer';
-export type {Tile3DLayerProps} from './tile-3d-layer/tile-3d-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';
 

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

@@ -0,0 +1,176 @@
+import type {NumericArray} from '@math.gl/core';
+import {GLTFMaterialParser} from '@luma.gl/experimental';
+import {pbr} from '@luma.gl/shadertools';
+import {Model} from '@luma.gl/engine';
+import {GL} from '@luma.gl/constants';
+import type {MeshAttribute, MeshAttributes} from '@loaders.gl/schema';
+import type {UpdateParameters, DefaultProps, LayerContext} from '@deck.gl/core';
+import {SimpleMeshLayer, SimpleMeshLayerProps} from '@deck.gl/mesh-layers';
+
+import vs from './mesh-layer-vertex.glsl';
+import fs from './mesh-layer-fragment.glsl';
+
+export type Mesh = {
+  attributes: MeshAttributes;
+  indices?: MeshAttribute;
+};
+
+function validateGeometryAttributes(attributes) {
+  const hasColorAttribute = attributes.COLOR_0 || attributes.colors;
+  if (!hasColorAttribute) {
+    attributes.colors = {constant: true, value: new Float32Array([1, 1, 1])};
+  }
+}
+
+const defaultProps: DefaultProps<MeshLayerProps> = {
+  pbrMaterial: {type: 'object', value: null},
+  featureIds: {type: 'array', value: null, optional: true}
+};
+
+/** All properties supported by MeshLayer. */
+export type MeshLayerProps<DataT = unknown> = _MeshLayerProps & SimpleMeshLayerProps<DataT>;
+
+/** Properties added by MeshLayer. */
+type _MeshLayerProps = {
+  /**
+   * PBR material object. _lighting must be pbr for this to work
+   */
+  pbrMaterial?: any; // TODO add type when converting Tile3DLayer
+
+  /**
+   * List of feature ids.
+   */
+  featureIds?: NumericArray | null;
+};
+
+export default class MeshLayer<DataT = any, ExtraProps extends {} = {}> extends SimpleMeshLayer<
+  DataT,
+  Required<_MeshLayerProps> & ExtraProps
+> {
+  static layerName = 'MeshLayer';
+  static defaultProps = defaultProps;
+
+  getShaders() {
+    const shaders = super.getShaders();
+    const modules = shaders.modules;
+    modules.push(pbr);
+    return {...shaders, vs, fs};
+  }
+
+  initializeState() {
+    const {featureIds} = this.props;
+    super.initializeState();
+
+    const attributeManager = this.getAttributeManager();
+    if (featureIds) {
+      // attributeManager is always defined in a primitive layer
+      attributeManager.add({
+        featureIdsPickingColors: {
+          type: GL.UNSIGNED_BYTE,
+          size: 3,
+          noAlloc: true,
+          // eslint-disable-next-line @typescript-eslint/unbound-method
+          update: this.calculateFeatureIdsPickingColors
+        }
+      });
+    }
+  }
+
+  updateState(params: UpdateParameters<this>) {
+    super.updateState(params);
+
+    const {props, oldProps} = params;
+    if (props.pbrMaterial !== oldProps.pbrMaterial) {
+      this.updatePbrMaterialUniforms(props.pbrMaterial);
+    }
+  }
+
+  draw(opts) {
+    const {featureIds} = this.props;
+    if (!this.state.model) {
+      return;
+    }
+    this.state.model.setUniforms({
+      // Needed for PBR (TODO: find better way to get it)
+      // eslint-disable-next-line camelcase
+      u_Camera: this.state.model.getUniforms().project_uCameraPosition,
+      pickFeatureIds: Boolean(featureIds)
+    });
+
+    super.draw(opts);
+  }
+
+  protected getModel(mesh: Mesh): Model {
+    const {id, pbrMaterial} = this.props;
+    const materialParser = this.parseMaterial(pbrMaterial, mesh);
+    // Keep material parser to explicitly remove textures
+    this.setState({materialParser});
+    const shaders = this.getShaders();
+    validateGeometryAttributes(mesh.attributes);
+    const model = new Model(this.context.device, {
+      ...this.getShaders(),
+      id,
+      geometry: mesh,
+      defines: {
+        ...shaders.defines,
+        ...materialParser?.defines,
+        HAS_UV_REGIONS: mesh.attributes.uvRegions
+      },
+      parameters: materialParser?.parameters,
+      isInstanced: true
+    });
+
+    return model;
+  }
+
+  updatePbrMaterialUniforms(pbrMaterial) {
+    const {model} = this.state;
+    if (model) {
+      const {mesh} = this.props;
+      const materialParser = this.parseMaterial(pbrMaterial, mesh);
+      // Keep material parser to explicitly remove textures
+      this.setState({materialParser});
+      model.setUniforms(materialParser.uniforms);
+    }
+  }
+
+  parseMaterial(pbrMaterial, mesh) {
+    const unlit = Boolean(
+      pbrMaterial.pbrMetallicRoughness && pbrMaterial.pbrMetallicRoughness.baseColorTexture
+    );
+
+    this.state.materialParser?.delete();
+
+    return new GLTFMaterialParser(this.context.device, {
+      attributes: {NORMAL: mesh.attributes.normals, TEXCOORD_0: mesh.attributes.texCoords},
+      material: {unlit, ...pbrMaterial},
+      pbrDebug: false,
+      imageBasedLightingEnvironment: null,
+      lights: true,
+      useTangents: false
+    });
+  }
+
+  calculateFeatureIdsPickingColors(attribute) {
+    // This updater is only called if featureIds is not null
+    const featureIds = this.props.featureIds;
+    const value = new Uint8ClampedArray(featureIds.length * attribute.size);
+
+    const pickingColor = [];
+    for (let index = 0; index < featureIds.length; index++) {
+      this.encodePickingColor(featureIds[index], pickingColor);
+
+      value[index * 3] = pickingColor[0];
+      value[index * 3 + 1] = pickingColor[1];
+      value[index * 3 + 2] = pickingColor[2];
+    }
+
+    attribute.value = value;
+  }
+
+  finalizeState(context: LayerContext) {
+    super.finalizeState(context);
+    this.state.materialParser?.delete();
+    this.setState({materialParser: null});
+  }
+}

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

@@ -31,6 +31,7 @@ import {
   Tileset2D,
   Tile2DHeader,
   getURLFromTemplate,
+  URLTemplate,
   isGeoBoundingBox,
   isURLTemplate
 } from '../tileset-2d';
@@ -102,6 +103,15 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
   static layerName = 'MVTLayer';
   static defaultProps = defaultProps;
 
+  state!: TileLayer<ParsedMvtTile>['state'] & {
+    binary: boolean;
+    data: URLTemplate;
+    tileJSON: any;
+    highlightColor: number[];
+    hoveredFeatureId: number | string | null;
+    hoveredFeatureLayerName: string | null;
+  };
+
   initializeState(): void {
     super.initializeState();
     // GlobeView doesn't work well with binary data
@@ -114,7 +124,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
   }
 
   get isLoaded(): boolean {
-    return this.state && this.state.data && this.state.tileset && super.isLoaded;
+    return Boolean(this.state && this.state.data && this.state.tileset && super.isLoaded);
   }
 
   updateState({props, oldProps, context, changeFlags}: UpdateParameters<this>) {
@@ -169,14 +179,14 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
 
     if (tileJSON) {
       if (Number.isFinite(tileJSON.minzoom) && (tileJSON.minzoom as number) > (minZoom as number)) {
-        opts.minZoom = tileJSON.minzoom as number;
+        opts.minZoom = tileJSON.minzoom;
       }
 
       if (
         Number.isFinite(tileJSON.maxzoom) &&
         (!Number.isFinite(maxZoom) || (tileJSON.maxzoom as number) < (maxZoom as number))
       ) {
-        opts.maxZoom = tileJSON.maxzoom as number;
+        opts.maxZoom = tileJSON.maxzoom;
       }
     }
     return opts;
@@ -340,8 +350,8 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
       return findIndexBinary(
         data,
         uniqueIdProperty,
-        featureIdToHighlight,
-        isHighlighted ? '' : hoveredFeatureLayerName
+        featureIdToHighlight!,
+        isHighlighted ? '' : hoveredFeatureLayerName!
       );
     }
 
@@ -382,7 +392,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<
 
   private _setWGS84PropertyForTiles(): void {
     const propName = 'dataInWGS84';
-    const tileset: Tileset2D = this.state.tileset;
+    const tileset: Tileset2D = this.state.tileset!;
 
     // @ts-expect-error selectedTiles are always initialized when tile is being processed
     tileset.selectedTiles.forEach((tile: Tile2DHeader & ContentWGS84Cache) => {

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

@@ -3,11 +3,12 @@ import GeoCellLayer, {GeoCellLayerProps} from '../geo-cell-layer/GeoCellLayer';
 import {getQuadkeyPolygon} from './quadkey-utils';
 
 const defaultProps: DefaultProps<QuadkeyLayerProps> = {
-  getQuadkey: {type: 'accessor', value: d => d.quadkey}
+  getQuadkey: {type: 'accessor', value: (d: any) => d.quadkey}
 };
 
 /** All properties supported by QuadkeyLayer. */
-export type QuadkeyLayerProps<DataT = any> = _QuadkeyLayerProps<DataT> & GeoCellLayerProps<DataT>;
+export type QuadkeyLayerProps<DataT = unknown> = _QuadkeyLayerProps<DataT> &
+  GeoCellLayerProps<DataT>;
 
 /** Properties added by QuadkeyLayer. */
 type _QuadkeyLayerProps<DataT> = {

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

@@ -23,11 +23,11 @@ import GeoCellLayer, {GeoCellLayerProps} from '../geo-cell-layer/GeoCellLayer';
 import {getS2Polygon} from './s2-utils';
 
 const defaultProps: DefaultProps<S2LayerProps> = {
-  getS2Token: {type: 'accessor', value: d => d.token}
+  getS2Token: {type: 'accessor', value: (d: any) => d.token}
 };
 
 /** All properties supported by S2Layer. */
-export type S2LayerProps<DataT = any> = _S2LayerProps<DataT> & GeoCellLayerProps<DataT>;
+export type S2LayerProps<DataT = unknown> = _S2LayerProps<DataT> & GeoCellLayerProps<DataT>;
 
 /** Properties added by S2Layer. */
 type _S2LayerProps<DataT> = {

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

@@ -27,7 +27,7 @@ import {
   LayersList,
   log,
   Material,
-  Texture,
+  TextureSource,
   UpdateParameters
 } from '@deck.gl/core';
 import {SimpleMeshLayer} from '@deck.gl/mesh-layers';
@@ -88,7 +88,7 @@ type TerrainLoadProps = {
   signal?: AbortSignal;
 };
 
-type MeshAndTexture = [MeshAttributes | null, Texture | null];
+type MeshAndTexture = [MeshAttributes | null, TextureSource | null];
 
 /** All properties supported by TerrainLayer */
 export type TerrainLayerProps = _TerrainLayerProps &