@deck.gl/geo-layers 9.0.0-beta.1 → 9.0.0-beta.10

package/dist/mesh-layer/mesh-layer-fragment.glsl.js

@@ -0,0 +1,33 @@
+export default `#version 300 es
+#define SHADER_NAME simple-mesh-layer-fs
+precision highp float;
+uniform bool hasTexture;
+uniform sampler2D sampler;
+uniform bool flatShading;
+uniform float opacity;
+in vec2 vTexCoord;
+in vec3 cameraPosition;
+in vec3 normals_commonspace;
+in vec4 position_commonspace;
+in vec4 vColor;
+out vec4 fragColor;
+void main(void) {
+#ifdef MODULE_PBR
+fragColor = vColor * pbr_filterColor(vec4(0));
+geometry.uv = pbr_vUV;
+fragColor.a *= opacity;
+#else
+geometry.uv = vTexCoord;
+vec3 normal;
+if (flatShading) {
+normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
+} else {
+normal = normals_commonspace;
+}
+vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;
+vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);
+fragColor = vec4(lightColor, color.a * opacity);
+#endif
+DECKGL_FILTER_COLOR(fragColor, geometry);
+}
+`;

package/dist/mesh-layer/mesh-layer-vertex.glsl.js

@@ -0,0 +1,63 @@
+export default `#version 300 es
+#define SHADER_NAME simple-mesh-layer-vs
+uniform float sizeScale;
+uniform bool composeModelMatrix;
+uniform bool pickFeatureIds;
+in vec3 positions;
+in vec3 normals;
+in vec3 colors;
+in vec2 texCoords;
+in vec4 uvRegions;
+in vec3 featureIdsPickingColors;
+in vec4 instanceColors;
+in vec3 instancePickingColors;
+in vec3 instanceModelMatrixCol0;
+in vec3 instanceModelMatrixCol1;
+in vec3 instanceModelMatrixCol2;
+out vec2 vTexCoord;
+out vec3 cameraPosition;
+out vec3 normals_commonspace;
+out vec4 position_commonspace;
+out vec4 vColor;
+vec2 applyUVRegion(vec2 uv) {
+#ifdef HAS_UV_REGIONS
+return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;
+#else
+return uv;
+#endif
+}
+void main(void) {
+vec2 uv = applyUVRegion(texCoords);
+geometry.uv = uv;
+if (pickFeatureIds) {
+geometry.pickingColor = featureIdsPickingColors;
+} else {
+geometry.pickingColor = instancePickingColors;
+}
+mat3 instanceModelMatrix = mat3(instanceModelMatrixCol0, instanceModelMatrixCol1, instanceModelMatrixCol2);
+vTexCoord = uv;
+cameraPosition = project_uCameraPosition;
+vColor = vec4(colors * instanceColors.rgb, instanceColors.a);
+vec3 pos = (instanceModelMatrix * positions) * sizeScale;
+vec3 projectedPosition = project_position(positions);
+position_commonspace = vec4(projectedPosition, 1.0);
+gl_Position = project_common_position_to_clipspace(position_commonspace);
+geometry.position = position_commonspace;
+normals_commonspace = project_normal(instanceModelMatrix * normals);
+geometry.normal = normals_commonspace;
+DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+#ifdef MODULE_PBR
+pbr_vPosition = geometry.position.xyz;
+#ifdef HAS_NORMALS
+pbr_vNormal = geometry.normal;
+#endif
+#ifdef HAS_UV
+pbr_vUV = uv;
+#else
+pbr_vUV = vec2(0., 0.);
+#endif
+geometry.uv = pbr_vUV;
+#endif
+DECKGL_FILTER_COLOR(vColor, geometry);
+}
+`;

package/{typed → dist}/mesh-layer/mesh-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAmB,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAElE,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AAEtC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAK3E,MAAM,MAAM,IAAI,GAAG;IACjB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAoBF,6CAA6C;AAC7C,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,OAAO,IAAI,eAAe,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAE5F,qCAAqC;AACrC,KAAK,eAAe,GAAG;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,eAAe,CAC7F,KAAK,EACL,QAAQ,CAAC,eAAe,CAAC,GAAG,UAAU,CACvC;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,wCAAgB;IAEnC,UAAU;IAOV,eAAe;IAmBf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,IAAI,CAAC,IAAI,KAAA;IAeT,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK;IAwBrC,yBAAyB,CAAC,WAAW,KAAA;IAYrC,aAAa,CAAC,WAAW,KAAA,EAAE,IAAI,EAAE,IAAI,GAAG,iBAAiB;IAiBzD,gCAAgC,CAAC,SAAS,KAAA;IAiB1C,aAAa,CAAC,OAAO,EAAE,YAAY;CAKpC"}
+{"version":3,"file":"mesh-layer.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAmB,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAElE,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAE,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAChF,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAK3E,MAAM,MAAM,IAAI,GAAG;IACjB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAoBF,6CAA6C;AAC7C,MAAM,MAAM,cAAc,CAAC,KAAK,GAAG,OAAO,IAAI,eAAe,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAE5F,qCAAqC;AACrC,KAAK,eAAe,GAAG;IACrB;;OAEG;IACH,WAAW,CAAC,EAAE,GAAG,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,YAAY,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,SAAS,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,eAAe,CAC7F,KAAK,EACL,QAAQ,CAAC,eAAe,CAAC,GAAG,UAAU,CACvC;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,wCAAgB;IAEnC,UAAU;IAOV,eAAe;IAmBf,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC;IAS1C,IAAI,CAAC,IAAI,KAAA;IAeT,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK;IAwBrC,yBAAyB,CAAC,WAAW,KAAA;IAYrC,aAAa,CAAC,WAAW,KAAA,EAAE,IAAI,EAAE,IAAI,GAAG,iBAAiB;IAiBzD,gCAAgC,CAAC,SAAS,KAAA;IAiB1C,aAAa,CAAC,OAAO,EAAE,YAAY;CAKpC"}

package/dist/mesh-layer/mesh-layer.js

@@ -0,0 +1,128 @@
+import { parsePBRMaterial } from '@luma.gl/gltf';
+import { pbr } from '@luma.gl/shadertools';
+import { Model } from '@luma.gl/engine';
+import { SimpleMeshLayer } from '@deck.gl/mesh-layers';
+import vs from "./mesh-layer-vertex.glsl.js";
+import fs from "./mesh-layer-fragment.glsl.js";
+function validateGeometryAttributes(attributes) {
+    const positionAttribute = attributes.positions || attributes.POSITION;
+    const vertexCount = positionAttribute.value.length / positionAttribute.size;
+    const hasColorAttribute = attributes.COLOR_0 || attributes.colors;
+    if (!hasColorAttribute) {
+        attributes.colors = {
+            size: 4,
+            value: new Uint8Array(vertexCount * 4).fill(255),
+            normalized: true
+        };
+    }
+}
+const defaultProps = {
+    pbrMaterial: { type: 'object', value: null },
+    featureIds: { type: 'array', value: null, optional: true }
+};
+export default class MeshLayer extends SimpleMeshLayer {
+    static { this.layerName = 'MeshLayer'; }
+    static { this.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: 'uint8',
+                    size: 3,
+                    noAlloc: true,
+                    // eslint-disable-next-line @typescript-eslint/unbound-method
+                    update: this.calculateFeatureIdsPickingColors
+                }
+            });
+        }
+    }
+    updateState(params) {
+        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.uniforms.project_uCameraPosition,
+            pickFeatureIds: Boolean(featureIds)
+        });
+        super.draw(opts);
+    }
+    getModel(mesh) {
+        const { id, pbrMaterial } = this.props;
+        const parsedPBRMaterial = this.parseMaterial(pbrMaterial, mesh);
+        // Keep material to explicitly remove textures
+        this.setState({ parsedPBRMaterial });
+        const shaders = this.getShaders();
+        validateGeometryAttributes(mesh.attributes);
+        const model = new Model(this.context.device, {
+            ...this.getShaders(),
+            id,
+            geometry: mesh,
+            bufferLayout: this.getAttributeManager().getBufferLayouts(),
+            defines: {
+                ...shaders.defines,
+                ...parsedPBRMaterial?.defines,
+                HAS_UV_REGIONS: mesh.attributes.uvRegions ? 1 : 0
+            },
+            parameters: parsedPBRMaterial?.parameters,
+            isInstanced: true
+        });
+        return model;
+    }
+    updatePbrMaterialUniforms(pbrMaterial) {
+        const { model } = this.state;
+        if (model) {
+            const { mesh } = this.props;
+            const parsedPBRMaterial = this.parseMaterial(pbrMaterial, mesh);
+            // Keep material to explicitly remove textures
+            this.setState({ parsedPBRMaterial });
+            model.setBindings(parsedPBRMaterial.bindings);
+            model.setUniforms(parsedPBRMaterial.uniforms);
+        }
+    }
+    parseMaterial(pbrMaterial, mesh) {
+        const unlit = Boolean(pbrMaterial.pbrMetallicRoughness && pbrMaterial.pbrMetallicRoughness.baseColorTexture);
+        return parsePBRMaterial(this.context.device, { unlit, ...pbrMaterial }, { NORMAL: mesh.attributes.normals, TEXCOORD_0: mesh.attributes.texCoords }, {
+            pbrDebug: false,
+            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) {
+        super.finalizeState(context);
+        this.state.parsedPBRMaterial?.generatedTextures.forEach(texture => texture.destroy());
+        this.setState({ parsedPBRMaterial: null });
+    }
+}

package/{typed → dist}/mvt-layer/coordinate-transform.d.ts

@@ -1,4 +1,4 @@
 import { Viewport } from '@deck.gl/core';
-import { GeoBoundingBox } from '../tileset-2d';
+import { GeoBoundingBox } from "../tileset-2d/index.js";
 export declare function transform(geometry: any, bbox: GeoBoundingBox, viewport: Viewport): any;
 //# sourceMappingURL=coordinate-transform.d.ts.map

package/{typed → dist}/mvt-layer/coordinate-transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coordinate-transform.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/coordinate-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,eAAe,CAAC;AA0C7C,wBAAgB,SAAS,CAAC,QAAQ,KAAA,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,OAa3E"}
+{"version":3,"file":"coordinate-transform.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/coordinate-transform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAC,cAAc,EAAC,+BAA4B;AA0CnD,wBAAgB,SAAS,CAAC,QAAQ,KAAA,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,OAa3E"}

package/dist/mvt-layer/coordinate-transform.js

@@ -0,0 +1,41 @@
+import { lerp } from '@math.gl/core';
+const availableTransformations = {
+    Point,
+    MultiPoint,
+    LineString,
+    MultiLineString,
+    Polygon,
+    MultiPolygon
+};
+function Point([pointX, pointY], [nw, se], viewport) {
+    const x = lerp(nw[0], se[0], pointX);
+    const y = lerp(nw[1], se[1], pointY);
+    return viewport.unprojectFlat([x, y]);
+}
+function getPoints(geometry, bbox, viewport) {
+    return geometry.map(g => Point(g, bbox, viewport));
+}
+function MultiPoint(multiPoint, bbox, viewport) {
+    return getPoints(multiPoint, bbox, viewport);
+}
+function LineString(line, bbox, viewport) {
+    return getPoints(line, bbox, viewport);
+}
+function MultiLineString(multiLineString, bbox, viewport) {
+    return multiLineString.map(lineString => LineString(lineString, bbox, viewport));
+}
+function Polygon(polygon, bbox, viewport) {
+    return polygon.map(polygonRing => getPoints(polygonRing, bbox, viewport));
+}
+function MultiPolygon(multiPolygon, bbox, viewport) {
+    return multiPolygon.map(polygon => Polygon(polygon, bbox, viewport));
+}
+export function transform(geometry, bbox, viewport) {
+    const nw = viewport.projectFlat([bbox.west, bbox.north]);
+    const se = viewport.projectFlat([bbox.east, bbox.south]);
+    const projectedBbox = [nw, se];
+    return {
+        ...geometry,
+        coordinates: availableTransformations[geometry.type](geometry.coordinates, projectedBbox, viewport)
+    };
+}

package/dist/mvt-layer/find-index-binary.d.ts

@@ -0,0 +1,11 @@
+import type { BinaryFeatureCollection } from '@loaders.gl/schema';
+/**
+ * Return the index of feature (numericProps or featureIds) for given feature id
+ * Example: findIndexBinary(data, 'id', 33) will return the index in the array of numericProps
+ * of the feature 33.
+ */
+export default function findIndexBinary(data: BinaryFeatureCollection, // The data in binary format
+uniqueIdProperty: string, // Name of the unique id property
+featureId: string | number, // feature id to find
+layerName: string | null): number;
+//# sourceMappingURL=find-index-binary.d.ts.map

package/dist/mvt-layer/find-index-binary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"find-index-binary.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/find-index-binary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EAIxB,MAAM,oBAAoB,CAAC;AAK5B;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,eAAe,CACrC,IAAI,EAAE,uBAAuB,EAAE,4BAA4B;AAC3D,gBAAgB,EAAE,MAAM,EAAE,iCAAiC;AAC3D,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,qBAAqB;AACjD,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,MAAM,CASR"}

package/dist/mvt-layer/find-index-binary.js

@@ -0,0 +1,96 @@
+const GEOM_TYPES = ['points', 'lines', 'polygons'];
+/**
+ * Return the index of feature (numericProps or featureIds) for given feature id
+ * Example: findIndexBinary(data, 'id', 33) will return the index in the array of numericProps
+ * of the feature 33.
+ */
+export default function findIndexBinary(data, // The data in binary format
+uniqueIdProperty, // Name of the unique id property
+featureId, // feature id to find
+layerName // the layer to search in
+) {
+    for (const gt of GEOM_TYPES) {
+        const index = data[gt] && findIndexByType(data[gt], uniqueIdProperty, featureId, layerName);
+        if (index >= 0) {
+            return index;
+        }
+    }
+    return -1;
+}
+function findIndexByType(geomData, uniqueIdProperty, featureId, layerName) {
+    const featureIds = geomData.featureIds.value;
+    if (!featureIds.length) {
+        return -1;
+    }
+    let startFeatureIndex = 0;
+    let endFeatureIndex = featureIds[featureIds.length - 1] + 1;
+    if (layerName) {
+        const layerRange = getLayerRange(geomData, layerName);
+        if (layerRange) {
+            startFeatureIndex = layerRange[0];
+            endFeatureIndex = layerRange[1] + 1;
+        }
+        else {
+            return -1;
+        }
+    }
+    // Look for the uniqueIdProperty
+    let featureIndex = -1;
+    if (uniqueIdProperty in geomData.numericProps) {
+        const vertexIndex = geomData.numericProps[uniqueIdProperty].value.findIndex((x, i) => x === featureId && featureIds[i] >= startFeatureIndex && featureIds[i] < endFeatureIndex);
+        return vertexIndex >= 0 ? geomData.globalFeatureIds.value[vertexIndex] : -1;
+    }
+    else if (uniqueIdProperty) {
+        featureIndex = findIndex(geomData.properties, elem => elem[uniqueIdProperty] === featureId, startFeatureIndex, endFeatureIndex);
+    }
+    else if (geomData.fields) {
+        featureIndex = findIndex(geomData.fields, (elem) => elem.id === featureId, startFeatureIndex, endFeatureIndex);
+    }
+    return featureIndex >= 0 ? getGlobalFeatureId(geomData, featureIndex) : -1;
+}
+// Returns [firstFeatureIndex, lastFeatureIndex]
+// MVTLoader parses tiles layer-by-layer, so each layer is a continuous range
+function getLayerRange(geomData, layerName) {
+    if (!geomData.__layers) {
+        // Cache a map from properties.layerName to index ranges
+        const layerNames = {};
+        const { properties } = geomData;
+        for (let i = 0; i < properties.length; i++) {
+            const { layerName: key } = properties[i];
+            if (!key) {
+                // ignore
+            }
+            else if (layerNames[key]) {
+                layerNames[key][1] = i;
+            }
+            else {
+                layerNames[key] = [i, i];
+            }
+        }
+        geomData.__layers = layerNames;
+    }
+    return geomData.__layers[layerName];
+}
+// Returns global feature id
+function getGlobalFeatureId(geomData, featureIndex) {
+    if (!geomData.__ids) {
+        // Cache a map from featureId to globalFeatureId
+        const result = [];
+        const featureIds = geomData.featureIds.value;
+        const globalFeatureIds = geomData.globalFeatureIds.value;
+        for (let i = 0; i < featureIds.length; i++) {
+            result[featureIds[i]] = globalFeatureIds[i];
+        }
+        geomData.__ids = result;
+    }
+    return geomData.__ids[featureIndex];
+}
+// Like array.findIndex, but only search within a range
+function findIndex(array, predicate, startIndex, endIndex) {
+    for (let i = startIndex; i < endIndex; i++) {
+        if (predicate(array[i], i)) {
+            return i;
+        }
+    }
+    return -1;
+}

package/{typed → dist}/mvt-layer/mvt-layer.d.ts

@@ -2,10 +2,10 @@ import { Layer, LayersList, PickingInfo, UpdateParameters, GetPickingInfoParams,
 import { GeoJsonLayerProps } from '@deck.gl/layers';
 import type { Loader } from '@loaders.gl/loader-utils';
 import type { BinaryFeatureCollection } from '@loaders.gl/schema';
-import type { Feature } from 'geojson';
-import TileLayer, { TiledPickingInfo, TileLayerProps } from '../tile-layer/tile-layer';
-import type { Tileset2DProps, TileLoadProps } from '../tileset-2d';
-import { Tile2DHeader, URLTemplate } from '../tileset-2d';
+import type { Feature, Geometry } from 'geojson';
+import TileLayer, { TileLayerPickingInfo, TileLayerProps } from "../tile-layer/tile-layer.js";
+import type { Tileset2DProps, TileLoadProps } from "../tileset-2d/index.js";
+import { Tile2DHeader, URLTemplate } from "../tileset-2d/index.js";
 export type TileJson = {
     tilejson: string;
     tiles: string[];
@@ -17,10 +17,12 @@ export type TileJson = {
     version?: string;
 };
 type ParsedMvtTile = Feature[] | BinaryFeatureCollection;
+export type MVTLayerPickingInfo<FeaturePropertiesT = {}> = TileLayerPickingInfo<ParsedMvtTile, PickingInfo<Feature<Geometry, FeaturePropertiesT>>>;
 /** All props supported by the MVTLayer */
-export type MVTLayerProps = _MVTLayerProps & Omit<GeoJsonLayerProps, 'data'> & TileLayerProps<ParsedMvtTile>;
+export type MVTLayerProps<FeaturePropertiesT = unknown> = _MVTLayerProps<FeaturePropertiesT> & Omit<TileLayerProps<ParsedMvtTile>, 'data'>;
 /** Props added by the MVTLayer  */
-export type _MVTLayerProps = {
+export type _MVTLayerProps<FeaturePropertiesT> = Omit<GeoJsonLayerProps<FeaturePropertiesT>, 'data'> & {
+    data: TileJson | URLTemplate;
     /** Called if `data` is a TileJSON URL when it is successfully fetched. */
     onDataLoad?: ((tilejson: TileJson | null) => void) | null;
     /** Needed for highlighting a feature split across two or more tiles. */
@@ -41,14 +43,14 @@ export type _MVTLayerProps = {
     loaders?: Loader[];
 };
 /** Render data formatted as [Mapbox Vector Tiles](https://docs.mapbox.com/vector-tiles/specification/). */
-export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<ParsedMvtTile, Required<_MVTLayerProps> & ExtraProps> {
+export default class MVTLayer<FeaturePropertiesT = any, ExtraProps extends {} = {}> extends TileLayer<ParsedMvtTile, Required<_MVTLayerProps<FeaturePropertiesT>> & ExtraProps> {
     static layerName: string;
-    static defaultProps: DefaultProps<MVTLayerProps>;
+    static defaultProps: DefaultProps<MVTLayerProps<unknown>>;
     state: TileLayer<ParsedMvtTile>['state'] & {
         binary: boolean;
         data: URLTemplate;
-        tileJSON: any;
-        highlightColor: number[];
+        tileJSON: TileJson | null;
+        highlightColor?: number[];
         hoveredFeatureId: number | string | null;
         hoveredFeatureLayerName: string | null;
     };
@@ -66,7 +68,7 @@ export default class MVTLayer<ExtraProps extends {} = {}> extends TileLayer<Pars
         tile: Tile2DHeader<ParsedMvtTile>;
     }): Layer | null | LayersList;
     protected _updateAutoHighlight(info: PickingInfo): void;
-    getPickingInfo(params: GetPickingInfoParams): TiledPickingInfo;
+    getPickingInfo(params: GetPickingInfoParams): MVTLayerPickingInfo<FeaturePropertiesT>;
     getSubLayerPropsByTile(tile: Tile2DHeader<ParsedMvtTile>): Record<string, any>;
     private getHighlightedObjectIndex;
     private _pickObjects;

package/dist/mvt-layer/mvt-layer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"mvt-layer.d.ts","sourceRoot":"","sources":["../../src/mvt-layer/mvt-layer.ts"],"names":[],"mappings":"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"}