@deck.gl/geo-layers 8.8.0-beta.1 → 8.8.0-beta.4

package/typed/h3-layers/h3-cluster-layer.d.ts

@@ -1,16 +1,23 @@
-declare class H3ClusterLayer extends GeoCellLayer<any, any> {
-    constructor(...propObjects: Partial<any>[]);
-}
-declare namespace H3ClusterLayer {
-    export { defaultProps };
-    export const layerName: string;
-}
-export default H3ClusterLayer;
-import GeoCellLayer from "../geo-cell-layer/GeoCellLayer";
-declare namespace defaultProps {
-    namespace getHexagons {
-        const type: string;
-        function value(d: any): any;
-    }
+import { H3IndexInput } from 'h3-js';
+import { AccessorFunction, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
+import GeoCellLayer, { GeoCellLayerProps } from '../geo-cell-layer/GeoCellLayer';
+/** All properties supported by H3ClusterLayer. */
+export declare type H3ClusterLayerProps<DataT = any> = _H3ClusterLayerProps<DataT> & GeoCellLayerProps<DataT>;
+/** Properties added by H3ClusterLayer. */
+declare type _H3ClusterLayerProps<DataT> = {
+    /**
+     * Called for each data object to retrieve the hexagon identifiers.
+     *
+     * By default, it reads `hexagons` property of data object.
+     */
+    getHexagons?: AccessorFunction<DataT, H3IndexInput[]>;
+};
+export default class H3ClusterLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<DataT, Required<_H3ClusterLayerProps<DataT>> & ExtraProps> {
+    static layerName: string;
+    static defaultProps: DefaultProps<H3ClusterLayerProps<any>>;
+    initializeState(): void;
+    updateState({ props, changeFlags }: UpdateParameters<this>): void;
+    indexToBounds(): Partial<GeoCellLayer['props']>;
 }
+export {};
 //# sourceMappingURL=h3-cluster-layer.d.ts.map

package/typed/h3-layers/h3-cluster-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-cluster-layer.js"],"names":[],"mappings":"AASA;IASuC,4CACP;CAoB/B;;;;;;;;;;QAjCwC,4BAAe"}
+{"version":3,"file":"h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-cluster-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAC,MAAM,OAAO,CAAC;AAExD,OAAO,EAAC,gBAAgB,EAAkB,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAE/F,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AAM/E,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,0CAA0C;AAC1C,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;;OAIG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,YAAY,CACpF,KAAK,EACL,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACnD;IACC,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAuB/D,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;CAMhD"}

package/typed/h3-layers/h3-hexagon-layer.d.ts

@@ -1,5 +1,38 @@
-export function normalizeLongitudes(vertices: any, refLng: any): void;
-export function scalePolygon(hexId: any, vertices: any, factor: any): void;
+import { H3Index } from 'h3-js';
+import { AccessorFunction, CompositeLayer, CompositeLayerProps, Layer, LayersList, UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
+import { PolygonLayerProps } from '@deck.gl/layers/typed';
+export declare function normalizeLongitudes(vertices: number[][], refLng?: number): void;
+export declare function scalePolygon(hexId: H3Index, vertices: number[][], factor: number): void;
+/** All properties supported by H3HexagonLayer */
+export declare type H3HexagonLayerProps<DataT = any> = _H3HexagonLayerProps<DataT> & PolygonLayerProps<DataT> & CompositeLayerProps<DataT>;
+/** Props added by the H3HexagonLayer */
+declare type _H3HexagonLayerProps<DataT> = {
+    /**
+     * Whether or not draw hexagons with high precision.
+     * @default 'auto'
+     */
+    highPrecision?: boolean | 'auto';
+    /**
+     * Coverage of hexagon in cell.
+     * @default 1
+     */
+    coverage?: number;
+    /**
+     * Center hexagon that best represents the shape of the set. If not specified, the hexagon closest to the center of the viewport is used.
+     */
+    centerHexagon?: H3Index | null;
+    /**
+     * Called for each data object to retrieve the quadkey string identifier.
+     *
+     * By default, it reads `hexagon` property of data object.
+     */
+    getHexagon?: AccessorFunction<DataT, string>;
+    /**
+     * Whether to extrude polygons.
+     * @default true
+     */
+    extruded?: boolean;
+};
 /**
  * A subclass of HexagonLayer that uses H3 hexagonIds in data objects
  * rather than centroid lat/longs. The shape of each hexagon is determined
@@ -11,97 +44,28 @@ export function scalePolygon(hexId: any, vertices: any, factor: any): void;
  * even when no corresponding hexagon is in the data set. You can check
  * index !== -1 to see if picking matches an actual object.
  */
-declare class H3HexagonLayer extends CompositeLayer<any> {
-    constructor(...propObjects: Partial<any>[]);
-    _calculateH3DataProps(props: any): {
-        resolution: number;
+export default class H3HexagonLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<ExtraPropsT & Required<_H3HexagonLayerProps<DataT> & Required<PolygonLayerProps<DataT>>>> {
+    static defaultProps: DefaultProps<H3HexagonLayerProps<any>>;
+    static layerName: string;
+    static _checkH3Lib: () => void;
+    initializeState(): void;
+    state: {
+        centerHex?: H3Index;
         edgeLengthKM: number;
-        hasMultipleRes: boolean;
-        hasPentagon: boolean;
-    };
-    _shouldUseHighPrecision(): any;
-    _updateVertices(viewport: any): void;
-    _getForwardProps(): {
-        elevationScale: any;
-        extruded: any;
-        coverage: any;
-        wireframe: any;
-        stroked: any;
-        filled: any;
-        lineWidthUnits: any;
-        lineWidthScale: any;
-        lineWidthMinPixels: any;
-        lineWidthMaxPixels: any;
-        material: any;
-        getElevation: any;
-        getFillColor: any;
-        getLineColor: any;
-        getLineWidth: any;
-        transitions: any;
-        updateTriggers: {
-            getFillColor: any;
-            getElevation: any;
-            getLineColor: any;
-            getLineWidth: any;
-        };
+        hasMultipleRes?: boolean;
+        hasPentagon?: boolean;
+        resolution: number;
+        vertices?: number[][];
     };
-    _renderPolygonLayer(): PolygonLayer<any, {}>;
-    _renderColumnLayer(): ColumnLayer<any, {}>;
+    shouldUpdateState({ changeFlags }: UpdateParameters<this>): boolean;
+    updateState({ props, changeFlags }: UpdateParameters<this>): void;
+    private _calculateH3DataProps;
+    private _shouldUseHighPrecision;
+    private _updateVertices;
+    renderLayers(): Layer | null | LayersList;
+    private _getForwardProps;
+    private _renderPolygonLayer;
+    private _renderColumnLayer;
 }
-declare namespace H3HexagonLayer {
-    export { defaultProps };
-    export const layerName: string;
-}
-export default H3HexagonLayer;
-import { CompositeLayer } from '@deck.gl/core/typed';
-import { PolygonLayer } from '@deck.gl/layers/typed';
-import { ColumnLayer } from '@deck.gl/layers/typed';
-declare const defaultProps: {
-    highPrecision: string;
-    coverage: {
-        type: string;
-        min: number;
-        max: number;
-        value: number;
-    };
-    centerHexagon: null;
-    getHexagon: {
-        type: string;
-        value: (x: any) => any;
-    };
-    extruded: boolean;
-    stroked: boolean;
-    filled: boolean;
-    elevationScale: number;
-    wireframe: boolean;
-    _normalize: boolean;
-    _windingOrder: string;
-    lineWidthUnits: string;
-    lineWidthScale: number;
-    lineWidthMinPixels: number;
-    lineWidthMaxPixels: number;
-    lineJointRounded: boolean;
-    lineMiterLimit: number;
-    getPolygon: {
-        type: string;
-        value: (f: any) => any;
-    };
-    getFillColor: {
-        type: string;
-        value: number[];
-    };
-    getLineColor: {
-        type: string;
-        value: number[];
-    };
-    getLineWidth: {
-        type: string;
-        value: number;
-    };
-    getElevation: {
-        type: string;
-        value: number;
-    };
-    material: boolean;
-};
+export {};
 //# sourceMappingURL=h3-hexagon-layer.d.ts.map

package/typed/h3-layers/h3-hexagon-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.js"],"names":[],"mappings":"AAoBA,sEAUC;AAGD,2EAcC;AAwDD;;;;;;;;;;GAUG;AACH;IAjGoB,4CAEmB;IAmHrC;;;;;MA8BC;IAED,+BAUC;IAED,qCAqCC;IAMD;;;;;;;;;;;;;;;;;;;;;;;MA6CC;IAED,6CAyBC;IAED,2CAsBC;CACF;;;;;;;;;AAnOD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAOE"}
+{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EAEnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQ7E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAU/E;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAcvF;AAqDD,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,GACxB,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE7B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,GAAG,EAAE,CAAE,SAAQ,cAAc,CACvF,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CACzF;IACC,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IAuCvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}

package/typed/index.d.ts

@@ -8,12 +8,19 @@ export { default as H3HexagonLayer } from './h3-layers/h3-hexagon-layer';
 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';
 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';
+export type { H3ClusterLayerProps } from './h3-layers/h3-cluster-layer';
+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 } 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';
 //# sourceMappingURL=index.d.ts.map

package/typed/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EAAC,kBAAkB,IAAI,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAGrE,YAAY,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,YAAY,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACvD,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,aAAa,IAAI,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACxE,YAAY,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAC,OAAO,IAAI,gBAAgB,EAAC,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAC,OAAO,IAAI,OAAO,EAAC,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,cAAc,EAAC,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAC,OAAO,IAAI,WAAW,EAAC,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAC,OAAO,IAAI,QAAQ,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,+BAA+B,CAAC;AAEtE,OAAO,EAAC,kBAAkB,IAAI,mBAAmB,EAAC,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,6BAA6B,CAAC;AAGrE,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAC,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AACtE,YAAY,EAAC,qBAAqB,EAAC,MAAM,yCAAyC,CAAC;AACnF,YAAY,EAAC,YAAY,EAAC,MAAM,qBAAqB,CAAC;AACtD,YAAY,EAAC,cAAc,EAAC,MAAM,yBAAyB,CAAC;AAC5D,YAAY,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACvD,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,aAAa,IAAI,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACxE,YAAY,EAAC,iBAAiB,EAAC,MAAM,+BAA+B,CAAC;AACrE,YAAY,EAAC,gBAAgB,EAAC,MAAM,+BAA+B,CAAC;AACpE,YAAY,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC"}

package/typed/mesh-layer/mesh-layer-fragment.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "#version 300 es\n#define SHADER_NAME simple-mesh-layer-fs\n\nprecision highp float;\n\nuniform bool hasTexture;\nuniform sampler2D sampler;\nuniform bool flatShading;\nuniform float opacity;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\n\nout vec4 fragColor;\n\nvoid main(void) {\n  \n#ifdef MODULE_PBR\n\n  fragColor = vColor * pbr_filterColor(vec4(0));\n  geometry.uv = pbr_vUV;\n  fragColor.a *= opacity;\n\n#else\n\n  geometry.uv = vTexCoord;\n\n  vec3 normal;\n  if (flatShading) {\n\n// NOTE(Tarek): This is necessary because\n// headless.gl reports the extension as\n// available but does not support it in\n// the shader.\n#ifdef DERIVATIVES_AVAILABLE\n    normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n#else\n    normal = vec3(0.0, 0.0, 1.0);\n#endif\n  } else {\n    normal = normals_commonspace;\n  }\n\n  vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;\n  vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n  fragColor = vec4(lightColor, color.a * opacity);\n\n#endif\n\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME simple-mesh-layer-fs\n\nprecision highp float;\n\nuniform bool hasTexture;\nuniform sampler2D sampler;\nuniform bool flatShading;\nuniform float opacity;\n\nin vec2 vTexCoord;\nin vec3 cameraPosition;\nin vec3 normals_commonspace;\nin vec4 position_commonspace;\nin vec4 vColor;\n\nout vec4 fragColor;\n\nvoid main(void) {\n  \n#ifdef MODULE_PBR\n\n  fragColor = vColor * pbr_filterColor(vec4(0));\n  geometry.uv = pbr_vUV;\n  fragColor.a *= opacity;\n\n#else\n\n  geometry.uv = vTexCoord;\n\n  vec3 normal;\n  if (flatShading) {\n\n// NOTE(Tarek): This is necessary because\n// headless.gl reports the extension as\n// available but does not support it in\n// the shader.\n#ifdef DERIVATIVES_AVAILABLE\n    normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));\n#else\n    normal = vec3(0.0, 0.0, 1.0);\n#endif\n  } else {\n    normal = normals_commonspace;\n  }\n\n  vec4 color = hasTexture ? texture(sampler, vTexCoord) : vColor;\n  vec3 lightColor = lighting_getLightColor(color.rgb, cameraPosition, position_commonspace.xyz, normal);\n  fragColor = vec4(lightColor, color.a * opacity);\n\n#endif\n\n  DECKGL_FILTER_COLOR(fragColor, geometry);\n}\n";
 export default _default;
 //# sourceMappingURL=mesh-layer-fragment.glsl.d.ts.map

package/typed/mesh-layer/mesh-layer-fragment.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-fragment.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"mesh-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-fragment.glsl.ts"],"names":[],"mappings":";AAAA,wBAsDE"}

package/typed/mesh-layer/mesh-layer-vertex.glsl.d.ts

@@ -1,3 +1,3 @@
-declare var _default: "#version 300 es\n#define SHADER_NAME simple-mesh-layer-vs\n\n// Scale the model\nuniform float sizeScale;\nuniform bool composeModelMatrix;\nuniform bool u_pickFeatureIds;\n\n// Primitive attributes\nin vec3 positions;\nin vec3 normals;\nin vec3 colors;\nin vec2 texCoords;\nin vec4 uvRegions;\nin vec3 featureIdsPickingColors;\n\n// Instance attributes\nin vec4 instanceColors;\nin vec3 instancePickingColors;\nin mat3 instanceModelMatrix;\n\n// Outputs to fragment shader\nout vec2 vTexCoord;\nout vec3 cameraPosition;\nout vec3 normals_commonspace;\nout vec4 position_commonspace;\nout vec4 vColor;\n\nvec2 applyUVRegion(vec2 uv) {\n  #ifdef HAS_UV_REGIONS\n    // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md\n    return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;\n  #else\n    return uv;\n  #endif\n}\n\nvoid main(void) {\n  vec2 uv = applyUVRegion(texCoords);\n  geometry.uv = uv;\n\n  if (u_pickFeatureIds) {\n    geometry.pickingColor = featureIdsPickingColors;\n  } else {\n    geometry.pickingColor = instancePickingColors;\n  }\n\n  vTexCoord = uv;\n  cameraPosition = project_uCameraPosition;\n  vColor = vec4(colors * instanceColors.rgb, instanceColors.a);\n\n  vec3 pos = (instanceModelMatrix * positions) * sizeScale;\n  vec3 projectedPosition = project_position(positions);\n  position_commonspace = vec4(projectedPosition, 1.0);\n  gl_Position = project_common_position_to_clipspace(position_commonspace);\n\n  geometry.position = position_commonspace;\n  normals_commonspace = project_normal(instanceModelMatrix * normals);\n  geometry.normal = normals_commonspace;\n\n  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n  #ifdef MODULE_PBR\n    // set PBR data\n    pbr_vPosition = geometry.position.xyz;\n    #ifdef HAS_NORMALS\n      pbr_vNormal = geometry.normal;\n    #endif\n\n    #ifdef HAS_UV\n      pbr_vUV = uv;\n    #else\n      pbr_vUV = vec2(0., 0.);\n    #endif\n    geometry.uv = pbr_vUV;\n  #endif\n\n  DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME simple-mesh-layer-vs\n\n// Scale the model\nuniform float sizeScale;\nuniform bool composeModelMatrix;\nuniform bool pickFeatureIds;\n\n// Primitive attributes\nin vec3 positions;\nin vec3 normals;\nin vec3 colors;\nin vec2 texCoords;\nin vec4 uvRegions;\nin vec3 featureIdsPickingColors;\n\n// Instance attributes\nin vec4 instanceColors;\nin vec3 instancePickingColors;\nin mat3 instanceModelMatrix;\n\n// Outputs to fragment shader\nout vec2 vTexCoord;\nout vec3 cameraPosition;\nout vec3 normals_commonspace;\nout vec4 position_commonspace;\nout vec4 vColor;\n\nvec2 applyUVRegion(vec2 uv) {\n  #ifdef HAS_UV_REGIONS\n    // https://github.com/Esri/i3s-spec/blob/master/docs/1.7/geometryUVRegion.cmn.md\n    return fract(uv) * (uvRegions.zw - uvRegions.xy) + uvRegions.xy;\n  #else\n    return uv;\n  #endif\n}\n\nvoid main(void) {\n  vec2 uv = applyUVRegion(texCoords);\n  geometry.uv = uv;\n\n  if (pickFeatureIds) {\n    geometry.pickingColor = featureIdsPickingColors;\n  } else {\n    geometry.pickingColor = instancePickingColors;\n  }\n\n  vTexCoord = uv;\n  cameraPosition = project_uCameraPosition;\n  vColor = vec4(colors * instanceColors.rgb, instanceColors.a);\n\n  vec3 pos = (instanceModelMatrix * positions) * sizeScale;\n  vec3 projectedPosition = project_position(positions);\n  position_commonspace = vec4(projectedPosition, 1.0);\n  gl_Position = project_common_position_to_clipspace(position_commonspace);\n\n  geometry.position = position_commonspace;\n  normals_commonspace = project_normal(instanceModelMatrix * normals);\n  geometry.normal = normals_commonspace;\n\n  DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n  #ifdef MODULE_PBR\n    // set PBR data\n    pbr_vPosition = geometry.position.xyz;\n    #ifdef HAS_NORMALS\n      pbr_vNormal = geometry.normal;\n    #endif\n\n    #ifdef HAS_UV\n      pbr_vUV = uv;\n    #else\n      pbr_vUV = vec2(0., 0.);\n    #endif\n    geometry.uv = pbr_vUV;\n  #endif\n\n  DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
 export default _default;
 //# sourceMappingURL=mesh-layer-vertex.glsl.d.ts.map

package/typed/mesh-layer/mesh-layer-vertex.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-vertex.glsl.js"],"names":[],"mappings":""}
+{"version":3,"file":"mesh-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer-vertex.glsl.ts"],"names":[],"mappings":";AAAA,wBA+EE"}

package/typed/mesh-layer/mesh-layer.d.ts

@@ -1,27 +1,37 @@
-declare class _MeshLayer extends SimpleMeshLayer<any, any> {
-    constructor(...propObjects: Partial<any>[]);
+import type { NumericArray } from '@math.gl/core';
+import { GLTFMaterialParser } from '@luma.gl/experimental';
+import { Model } from '@luma.gl/core';
+import type { MeshAttribute, MeshAttributes } from '@loaders.gl/schema';
+import type { UpdateParameters, DefaultProps } from '@deck.gl/core/typed';
+import { SimpleMeshLayer, SimpleMeshLayerProps } from '@deck.gl/mesh-layers/typed';
+export declare type Mesh = {
+    attributes: MeshAttributes;
+    indices?: MeshAttribute;
+};
+/** All properties supported by MeshLayer. */
+export declare type MeshLayerProps<DataT = any> = _MeshLayerProps<DataT> & SimpleMeshLayerProps<DataT>;
+/** Properties added by MeshLayer. */
+declare type _MeshLayerProps<DataT> = {
+    /**
+     * PBR material object. _lighting must be pbr for this to work
+     */
+    pbrMaterial?: any;
+    /**
+     * List of feature ids.
+     */
+    featureIds?: NumericArray | null;
+};
+export default class MeshLayer<DataT = any, ExtraProps = {}> extends SimpleMeshLayer<DataT, Required<_MeshLayerProps<DataT>> & ExtraProps> {
+    static layerName: string;
+    static defaultProps: DefaultProps<MeshLayerProps<any>>;
+    getShaders(): any;
+    initializeState(): void;
+    updateState(params: UpdateParameters<this>): void;
+    draw(opts: any): void;
+    protected getModel(mesh: Mesh): Model;
     updatePbrMaterialUniforms(pbrMaterial: any): void;
     parseMaterial(pbrMaterial: any, mesh: any): GLTFMaterialParser;
     calculateFeatureIdsPickingColors(attribute: any): void;
 }
-declare namespace _MeshLayer {
-    export const layerName: string;
-    export { defaultProps };
-}
-export default _MeshLayer;
-import { SimpleMeshLayer } from '@deck.gl/mesh-layers/typed';
-import { GLTFMaterialParser } from "@luma.gl/experimental";
-declare namespace defaultProps {
-    namespace pbrMaterial {
-        const type: string;
-        const value: null;
-    }
-    namespace featureIds {
-        const type_1: string;
-        export { type_1 as type };
-        const value_1: null;
-        export { value_1 as value };
-        export const optional: boolean;
-    }
-}
+export {};
 //# sourceMappingURL=mesh-layer.d.ts.map

package/typed/mesh-layer/mesh-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mesh-layer.d.ts","sourceRoot":"","sources":["../../src/mesh-layer/mesh-layer.js"],"names":[],"mappings":"AAqBA;IALyC,4CACb;IAsE1B,kDAOC;IAED,+DAaC;IAED,uDAcC;CACF"}
+{"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,EAAC,kBAAkB,EAAC,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAC,KAAK,EAAM,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACtE,OAAO,KAAK,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAClE,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAK3E,oBAAY,IAAI,GAAG;IACjB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,CAAC,EAAE,aAAa,CAAC;CACzB,CAAC;AAcF,6CAA6C;AAC7C,oBAAY,cAAc,CAAC,KAAK,GAAG,GAAG,IAAI,eAAe,CAAC,KAAK,CAAC,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAE/F,qCAAqC;AACrC,aAAK,eAAe,CAAC,KAAK,IAAI;IAC5B;;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,GAAG,EAAE,CAAE,SAAQ,eAAe,CAClF,KAAK,EACL,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAC9C;IACC,MAAM,CAAC,SAAS,SAAe;IAC/B,MAAM,CAAC,YAAY,oCAAgB;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;IAqBrC,yBAAyB,CAAC,WAAW,KAAA;IASrC,aAAa,CAAC,WAAW,KAAA,EAAE,IAAI,KAAA;IAe/B,gCAAgC,CAAC,SAAS,KAAA;CAgB3C"}

package/typed/mvt-layer/mvt-layer.d.ts

@@ -1,4 +1,4 @@
-import { Layer, LayersList, PickingInfo, UpdateParameters, GetPickingInfoParams } from '@deck.gl/core/typed';
+import { Layer, LayersList, PickingInfo, UpdateParameters, GetPickingInfoParams, DefaultProps } from '@deck.gl/core/typed';
 import { GeoJsonLayerProps } from '@deck.gl/layers/typed';
 import type { Loader } from '@loaders.gl/loader-utils';
 import type { BinaryFeatures } from '@loaders.gl/schema';
@@ -43,39 +43,7 @@ export declare type _MVTLayerProps = {
 };
 export default class MVTLayer<DataT extends Feature = Feature, ExtraProps = {}> extends TileLayer<ParsedMvtTile, Required<_MVTLayerProps> & ExtraProps> {
     static layerName: string;
-    static defaultProps: {
-        uniqueIdProperty: {
-            type: string;
-            value: string;
-        };
-        highlightedFeatureId: null;
-        loaders: Loader[];
-        binary: boolean;
-        stroked: boolean;
-        filled: boolean;
-        extruded: boolean;
-        wireframe: boolean;
-        iconAtlas: {
-            type: string;
-            value: null;
-        };
-        iconMapping: {
-            type: string;
-            value: {};
-        };
-        getIcon: {
-            type: string;
-            value: (f: any) => any;
-        };
-        getText: {
-            type: string;
-            value: (f: any) => any;
-        };
-        pointType: string;
-        getRadius: {
-            deprecatedFor: string;
-        };
-    };
+    static defaultProps: DefaultProps<MVTLayerProps<Feature<import("geojson").Geometry, import("geojson").GeoJsonProperties>>>;
     initializeState(): void;
     get isLoaded(): boolean;
     updateState({ props, oldProps, context, changeFlags }: UpdateParameters<this>): void;

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

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

package/typed/quadkey-layer/quadkey-layer.d.ts

@@ -1,9 +1,9 @@
-import { AccessorFunction } from '@deck.gl/core/typed';
+import { AccessorFunction, DefaultProps } from '@deck.gl/core/typed';
 import GeoCellLayer, { GeoCellLayerProps } from '../geo-cell-layer/GeoCellLayer';
 /** All properties supported by QuadkeyLayer. */
 export declare type QuadkeyLayerProps<DataT = any> = _QuadkeyLayerProps<DataT> & GeoCellLayerProps<DataT>;
 /** Properties added by QuadkeyLayer. */
-declare type _QuadkeyLayerProps<DataT = any> = {
+declare type _QuadkeyLayerProps<DataT> = {
     /**
      * Called for each data object to retrieve the quadkey string identifier.
      *
@@ -11,9 +11,9 @@ declare type _QuadkeyLayerProps<DataT = any> = {
      */
     getQuadkey?: AccessorFunction<DataT, string>;
 };
-export default class QuadkeyLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<DataT, Required<_QuadkeyLayerProps> & ExtraProps> {
+export default class QuadkeyLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<DataT, Required<_QuadkeyLayerProps<DataT>> & ExtraProps> {
     static layerName: string;
-    static defaultProps: any;
+    static defaultProps: DefaultProps<QuadkeyLayerProps<any>>;
     indexToBounds(): Partial<GeoCellLayer['props']> | null;
 }
 export {};

package/typed/quadkey-layer/quadkey-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"quadkey-layer.d.ts","sourceRoot":"","sources":["../../src/quadkey-layer/quadkey-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAC/C,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AAO/E,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAElG,wCAAwC;AACxC,aAAK,kBAAkB,CAAC,KAAK,GAAG,GAAG,IAAI;IACrC;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,YAAY,CAClF,KAAK,EACL,QAAQ,CAAC,kBAAkB,CAAC,GAAG,UAAU,CAC1C;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAgB;IAExC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAWvD"}
+{"version":3,"file":"quadkey-layer.d.ts","sourceRoot":"","sources":["../../src/quadkey-layer/quadkey-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AAO/E,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,kBAAkB,CAAC,KAAK,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAElG,wCAAwC;AACxC,aAAK,kBAAkB,CAAC,KAAK,IAAI;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,YAAY,CAClF,KAAK,EACL,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACjD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAWvD"}

package/typed/s2-layer/s2-geometry.d.ts

@@ -1,11 +1,11 @@
-export function IJToST(ij: any, order: any, offsets: any): number[];
-export function STToUV(st: any): number[];
-export function FaceUVToXYZ(face: any, [u, v]: [any, any]): any[];
-export function XYZToLngLat([x, y, z]: [any, any, any]): number[];
-export function toHilbertQuadkey(idS: any): string;
-export function FromHilbertQuadKey(hilbertQuadkey: any): {
+export declare function IJToST(ij: [number, number], order: number, offsets: [number, number]): [number, number];
+export declare function STToUV(st: [number, number]): [number, number];
+export declare function FaceUVToXYZ(face: number, [u, v]: [number, number]): [number, number, number];
+export declare function XYZToLngLat([x, y, z]: [number, number, number]): [number, number];
+export declare function toHilbertQuadkey(idS: string): string;
+export declare function FromHilbertQuadKey(hilbertQuadkey: string): {
     face: number;
-    ij: number[];
-    level: number | undefined;
+    ij: [number, number];
+    level: number;
 };
 //# sourceMappingURL=s2-geometry.d.ts.map

package/typed/s2-layer/s2-geometry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s2-geometry.d.ts","sourceRoot":"","sources":["../../src/s2-layer/s2-geometry.js"],"names":[],"mappings":"AAuBA,oEAIC;AASD,0CAEC;AAED,kEAiBC;AAED,kEAKC;AAED,mDA0BC;AAeD;;;;EAoCC"}
+{"version":3,"file":"s2-geometry.d.ts","sourceRoot":"","sources":["../../src/s2-layer/s2-geometry.ts"],"names":[],"mappings":"AAuBA,wBAAgB,MAAM,CACpB,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EACpB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GACxB,CAAC,MAAM,EAAE,MAAM,CAAC,CAIlB;AASD,wBAAgB,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAE7D;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAiB5F;AAED,wBAAgB,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAKjF;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CA0BpD;AAeD,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf,CAoCA"}

package/typed/s2-layer/s2-layer.d.ts

@@ -1,16 +1,20 @@
-declare class S2Layer extends GeoCellLayer<any, any> {
-    constructor(...propObjects: Partial<any>[]);
-}
-declare namespace S2Layer {
-    export const layerName: string;
-    export { defaultProps };
-}
-export default S2Layer;
-import GeoCellLayer from "../geo-cell-layer/GeoCellLayer";
-declare namespace defaultProps {
-    namespace getS2Token {
-        const type: string;
-        function value(d: any): any;
-    }
+import { AccessorFunction, DefaultProps } from '@deck.gl/core/typed';
+import GeoCellLayer, { GeoCellLayerProps } from '../geo-cell-layer/GeoCellLayer';
+/** All properties supported by S2Layer. */
+export declare type S2LayerProps<DataT = any> = _S2LayerProps<DataT> & GeoCellLayerProps<DataT>;
+/** Properties added by S2Layer. */
+declare type _S2LayerProps<DataT> = {
+    /**
+     * Called for each data object to retrieve the quadkey string identifier.
+     *
+     * By default, it reads `token` property of data object.
+     */
+    getS2Token?: AccessorFunction<DataT, string>;
+};
+export default class S2Layer<DataT = any, ExtraProps = {}> extends GeoCellLayer<DataT, Required<_S2LayerProps<DataT>> & ExtraProps> {
+    static layerName: string;
+    static defaultProps: DefaultProps<S2LayerProps<any>>;
+    indexToBounds(): Partial<GeoCellLayer['props']> | null;
 }
+export {};
 //# sourceMappingURL=s2-layer.d.ts.map

package/typed/s2-layer/s2-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s2-layer.d.ts","sourceRoot":"","sources":["../../src/s2-layer/s2-layer.js"],"names":[],"mappings":"AA2BA;IAlBmE,4CAC1B;CA4BxC;;;;;;;;;;QAduC,4BAAY"}
+{"version":3,"file":"s2-layer.d.ts","sourceRoot":"","sources":["../../src/s2-layer/s2-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AAO/E,2CAA2C;AAC3C,oBAAY,YAAY,CAAC,KAAK,GAAG,GAAG,IAAI,aAAa,CAAC,KAAK,CAAC,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAExF,mCAAmC;AACnC,aAAK,aAAa,CAAC,KAAK,IAAI;IAC1B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,YAAY,CAC7E,KAAK,EACL,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAC5C;IACC,MAAM,CAAC,SAAS,SAAa;IAC7B,MAAM,CAAC,YAAY,kCAAgB;IAEnC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAUvD"}

package/typed/s2-layer/s2-utils.d.ts

@@ -1,10 +1,9 @@
-export function getS2QuadKey(token: any): string;
+export declare function getS2QuadKey(token: string | number): string;
 /**
  * Get a polygon with corner coordinates for an s2 cell
  * @param {*} cell - This can be an S2 key or token
- * @return {Array} - a simple polygon in array format: [[lng, lat], ...]
- *   - each coordinate is an array [lng, lat]
+ * @return {Float64Array} - a simple polygon in flat array format: [lng0, lat0, lng1, lat1, ...]
  *   - the polygon is closed, i.e. last coordinate is a copy of the first coordinate
  */
-export function getS2Polygon(token: any): any[];
+export declare function getS2Polygon(token: string | number): Float64Array;
 //# sourceMappingURL=s2-utils.d.ts.map

package/typed/s2-layer/s2-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s2-utils.d.ts","sourceRoot":"","sources":["../../src/s2-layer/s2-utils.js"],"names":[],"mappings":"AAgFA,iDAWC;AAED;;;;;;GAMG;AACH,gDAKC"}
+{"version":3,"file":"s2-utils.d.ts","sourceRoot":"","sources":["../../src/s2-layer/s2-utils.ts"],"names":[],"mappings":"AAwFA,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAW3D;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,YAAY,CAKjE"}

package/typed/terrain-layer/terrain-layer.d.ts

@@ -1,28 +1,63 @@
-/**
- * state: {
- *   isTiled: True renders TileLayer of many SimpleMeshLayers, false renders one SimpleMeshLayer
- *   terrain: Mesh object. Only defined when isTiled is false.
- * }
- */
-declare class TerrainLayer extends CompositeLayer<any> {
-    constructor(...propObjects: Partial<any>[]);
-    loadTerrain({ elevationData, bounds, elevationDecoder, meshMaxError, signal }: {
-        elevationData: any;
-        bounds: any;
-        elevationDecoder: any;
-        meshMaxError: any;
-        signal: any;
-    }): any;
-    getTiledTerrainData(tile: any): Promise<[any, any]>;
-    renderSubLayers(props: any): SimpleMeshLayer<any, {}> | null;
-    onViewportLoad(tiles: any): void;
-}
-declare namespace TerrainLayer {
-    export const layerName: string;
-    export { defaultProps };
-}
-export default TerrainLayer;
-import { CompositeLayer } from '@deck.gl/core/typed';
+import { Color, CompositeLayer, CompositeLayerProps, DefaultProps, Layer, LayersList, Material, Texture, UpdateParameters } from '@deck.gl/core/typed';
 import { SimpleMeshLayer } from '@deck.gl/mesh-layers/typed';
-declare const defaultProps: any;
+import type { MeshAttributes } from '@loaders.gl/schema';
+import { TileLayerProps } from '../tile-layer/tile-layer';
+import Tile2DHeader from '../tile-layer/tile-2d-header';
+import { Bounds, TileLoadProps, ZRange } from '../tile-layer/types';
+declare type URLTemplate = string | string[];
+declare type ElevationDecoder = {
+    rScaler: number;
+    gScaler: number;
+    bScaler: number;
+    offset: number;
+};
+declare type TerrainLoadProps = {
+    bounds: Bounds;
+    elevationData: string | null;
+    elevationDecoder: ElevationDecoder;
+    meshMaxError: number;
+    signal?: AbortSignal;
+};
+declare type MeshAndTexture = [MeshAttributes | null, Texture | null];
+/** All properties supported by TerrainLayer */
+export declare type TerrainLayerProps = _TerrainLayerProps & TileLayerProps<MeshAndTexture> & CompositeLayerProps;
+/** Props added by the TerrainLayer */
+declare type _TerrainLayerProps = {
+    /** Image url that encodes height data. **/
+    elevationData: URLTemplate;
+    /** Image url to use as texture. **/
+    texture?: URLTemplate | null;
+    /** Martini error tolerance in meters, smaller number -> more detailed mesh. **/
+    meshMaxError?: number;
+    /** Bounding box of the terrain image, [minX, minY, maxX, maxY] in world coordinates. **/
+    bounds?: Bounds | null;
+    /** Color to use if texture is unavailable. **/
+    color?: Color;
+    /** Object to decode height data, from (r, g, b) to height in meters. **/
+    elevationDecoder?: ElevationDecoder;
+    /** Whether to render the mesh in wireframe mode. **/
+    wireframe?: boolean;
+    /** Material props for lighting effect. **/
+    material?: Material;
+};
+export default class TerrainLayer<ExtraPropsT = {}> extends CompositeLayer<ExtraPropsT & Required<_TerrainLayerProps & Required<TileLayerProps<MeshAndTexture>>>> {
+    static defaultProps: DefaultProps<TerrainLayerProps>;
+    static layerName: string;
+    state: {
+        isTiled?: boolean;
+        terrain: MeshAttributes;
+        zRange?: ZRange | null;
+    };
+    updateState({ props, oldProps }: UpdateParameters<this>): void;
+    loadTerrain({ elevationData, bounds, elevationDecoder, meshMaxError, signal }: TerrainLoadProps): Promise<MeshAttributes> | null;
+    getTiledTerrainData(tile: TileLoadProps): Promise<MeshAndTexture>;
+    renderSubLayers(props: TileLayerProps<MeshAndTexture> & {
+        id: string;
+        data: MeshAndTexture;
+        tile: Tile2DHeader<MeshAndTexture>;
+    }): SimpleMeshLayer<any, {}> | null;
+    onViewportLoad(tiles?: Tile2DHeader<MeshAndTexture>[]): void;
+    renderLayers(): Layer | null | LayersList;
+}
+export {};
 //# sourceMappingURL=terrain-layer.d.ts.map

package/typed/terrain-layer/terrain-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terrain-layer.d.ts","sourceRoot":"","sources":["../../src/terrain-layer/terrain-layer.js"],"names":[],"mappings":"AAoEA;;;;;GAKG;AACH;IAjEmE,4CAC1B;IA8FvC;;;;;;YAiBC;IAED,oDA4BC;IAED,6DAmBC;IAGD,iCAsBC;CA6EF;;;;;;;;AArPD,gCA6BE"}
+{"version":3,"file":"terrain-layer.d.ts","sourceRoot":"","sources":["../../src/terrain-layer/terrain-layer.ts"],"names":[],"mappings":"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"}