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

package/typed/mvt-layer/mvt-layer.js

@@ -0,0 +1,297 @@
+import { log, COORDINATE_SYSTEM } from '@deck.gl/core';
+import { GeoJsonLayer } from '@deck.gl/layers';
+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 TileLayer from '../tile-layer/tile-layer';
+import { getURLFromTemplate, isGeoBoundingBox, isURLTemplate } from '../tile-layer/utils';
+import { transform } from './coordinate-transform';
+import findIndexBinary from './find-index-binary';
+const WORLD_SIZE = 512;
+const defaultProps = {
+    ...GeoJsonLayer.defaultProps,
+    uniqueIdProperty: { type: 'string', value: '' },
+    highlightedFeatureId: null,
+    loaders: [MVTWorkerLoader],
+    binary: true
+};
+export default class MVTLayer extends TileLayer {
+    initializeState() {
+        super.initializeState();
+        // GlobeView doesn't work well with binary data
+        const binary = this.context.viewport.resolution !== undefined ? false : this.props.binary;
+        this.setState({
+            binary,
+            data: null,
+            tileJSON: null
+        });
+    }
+    get isLoaded() {
+        return this.state && this.state.data && this.state.tileset && super.isLoaded;
+    }
+    updateState({ props, oldProps, context, changeFlags }) {
+        if (changeFlags.dataChanged) {
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            this._updateTileData();
+        }
+        if (this.state?.data) {
+            super.updateState({ props, oldProps, context, changeFlags });
+            this._setWGS84PropertyForTiles();
+        }
+        const { highlightColor } = props;
+        if (highlightColor !== oldProps.highlightColor && Array.isArray(highlightColor)) {
+            this.setState({ highlightColor });
+        }
+    }
+    /* eslint-disable complexity */
+    async _updateTileData() {
+        let data = this.props.data;
+        let tileJSON = null;
+        if (typeof data === 'string' && !isURLTemplate(data)) {
+            const { onDataLoad, fetch } = this.props;
+            this.setState({ data: null, tileJSON: null });
+            try {
+                tileJSON = await fetch(data, { propName: 'data', layer: this, loaders: [] });
+            }
+            catch (error) {
+                this.raiseError(error, 'loading TileJSON');
+                data = null;
+            }
+            if (onDataLoad) {
+                onDataLoad(tileJSON, { propName: 'data', layer: this });
+            }
+        }
+        else if (data.tilejson) {
+            tileJSON = data;
+        }
+        if (tileJSON) {
+            data = tileJSON.tiles;
+        }
+        this.setState({ data, tileJSON });
+    }
+    _getTilesetOptions() {
+        const opts = super._getTilesetOptions();
+        const tileJSON = this.state.tileJSON;
+        const { minZoom, maxZoom } = this.props;
+        if (tileJSON) {
+            if (Number.isFinite(tileJSON.minzoom) && tileJSON.minzoom > minZoom) {
+                opts.minZoom = tileJSON.minzoom;
+            }
+            if (Number.isFinite(tileJSON.maxzoom) &&
+                (!Number.isFinite(maxZoom) || tileJSON.maxzoom < maxZoom)) {
+                opts.maxZoom = tileJSON.maxzoom;
+            }
+        }
+        return opts;
+    }
+    /* eslint-disable complexity */
+    renderLayers() {
+        if (!this.state?.data)
+            return null;
+        return super.renderLayers();
+    }
+    getTileData(loadProps) {
+        const { data, binary } = this.state;
+        const { index, signal } = loadProps;
+        const url = getURLFromTemplate(data, loadProps);
+        if (!url) {
+            return Promise.reject('Invalid URL');
+        }
+        let loadOptions = this.getLoadOptions();
+        const { fetch } = this.props;
+        loadOptions = {
+            ...loadOptions,
+            mimeType: 'application/x-protobuf',
+            mvt: {
+                ...loadOptions?.mvt,
+                coordinates: this.context.viewport.resolution ? 'wgs84' : 'local',
+                tileIndex: index
+                // Local worker debug
+                // workerUrl: `modules/mvt/dist/mvt-loader.worker.js`
+                // Set worker to null to skip web workers
+                // workerUrl: null
+            },
+            gis: binary ? { format: 'binary' } : {}
+        };
+        return fetch(url, { propName: 'data', layer: this, loadOptions, signal });
+    }
+    renderSubLayers(props) {
+        const { x, y, z } = props.tile.index;
+        const worldScale = Math.pow(2, z);
+        const xScale = WORLD_SIZE / worldScale;
+        const yScale = -xScale;
+        const xOffset = (WORLD_SIZE * x) / worldScale;
+        const yOffset = WORLD_SIZE * (1 - y / worldScale);
+        const modelMatrix = new Matrix4().scale([xScale, yScale, 1]);
+        props.autoHighlight = false;
+        if (!this.context.viewport.resolution) {
+            props.modelMatrix = modelMatrix;
+            props.coordinateOrigin = [xOffset, yOffset, 0];
+            props.coordinateSystem = COORDINATE_SYSTEM.CARTESIAN;
+            props.extensions = [...(props.extensions || []), new ClipExtension()];
+        }
+        const subLayers = super.renderSubLayers(props);
+        if (this.state.binary && !(subLayers instanceof GeoJsonLayer)) {
+            log.warn('renderSubLayers() must return GeoJsonLayer when using binary:true')();
+        }
+        return subLayers;
+    }
+    _updateAutoHighlight(info) {
+        const { uniqueIdProperty } = this.props;
+        const { hoveredFeatureId, hoveredFeatureLayerName } = this.state;
+        const hoveredFeature = info.object;
+        let newHoveredFeatureId;
+        let newHoveredFeatureLayerName;
+        if (hoveredFeature) {
+            newHoveredFeatureId = getFeatureUniqueId(hoveredFeature, uniqueIdProperty);
+            newHoveredFeatureLayerName = getFeatureLayerName(hoveredFeature);
+        }
+        let { highlightColor } = this.props;
+        if (typeof highlightColor === 'function') {
+            highlightColor = highlightColor(info);
+        }
+        if (hoveredFeatureId !== newHoveredFeatureId ||
+            hoveredFeatureLayerName !== newHoveredFeatureLayerName) {
+            this.setState({
+                highlightColor,
+                hoveredFeatureId: newHoveredFeatureId,
+                hoveredFeatureLayerName: newHoveredFeatureLayerName
+            });
+        }
+    }
+    getPickingInfo(params) {
+        const info = super.getPickingInfo(params);
+        const isWGS84 = Boolean(this.context.viewport.resolution);
+        if (this.state.binary && info.index !== -1) {
+            const { data } = params.sourceLayer.props;
+            info.object = binaryToGeojson(data, { globalFeatureId: info.index });
+        }
+        if (info.object && !isWGS84) {
+            info.object = transformTileCoordsToWGS84(info.object, info.tile.bbox, this.context.viewport);
+        }
+        return info;
+    }
+    getSubLayerPropsByTile(tile) {
+        return {
+            highlightedObjectIndex: this.getHighlightedObjectIndex(tile),
+            highlightColor: this.state.highlightColor
+        };
+    }
+    getHighlightedObjectIndex(tile) {
+        const { hoveredFeatureId, hoveredFeatureLayerName, binary } = this.state;
+        const { uniqueIdProperty, highlightedFeatureId } = this.props;
+        const data = tile.content;
+        const isHighlighted = isFeatureIdDefined(highlightedFeatureId);
+        const isFeatureIdPresent = isFeatureIdDefined(hoveredFeatureId) || isHighlighted;
+        if (!isFeatureIdPresent) {
+            return -1;
+        }
+        const featureIdToHighlight = isHighlighted ? highlightedFeatureId : hoveredFeatureId;
+        // Iterable data
+        if (Array.isArray(data)) {
+            return data.findIndex(feature => {
+                const isMatchingId = getFeatureUniqueId(feature, uniqueIdProperty) === featureIdToHighlight;
+                const isMatchingLayer = isHighlighted || getFeatureLayerName(feature) === hoveredFeatureLayerName;
+                return isMatchingId && isMatchingLayer;
+            });
+            // Non-iterable data
+        }
+        else if (data && binary) {
+            // Get the feature index of the selected item to highlight
+            return findIndexBinary(data, uniqueIdProperty, featureIdToHighlight, isHighlighted ? '' : hoveredFeatureLayerName);
+        }
+        return -1;
+    }
+    _pickObjects(maxObjects) {
+        const { deck, viewport } = this.context;
+        const width = viewport.width;
+        const height = viewport.height;
+        const x = viewport.x;
+        const y = viewport.y;
+        const layerIds = [this.id];
+        return deck.pickObjects({ x, y, width, height, layerIds, maxObjects });
+    }
+    /** Get the rendered features in the current viewport. */
+    getRenderedFeatures(maxFeatures = null) {
+        const features = this._pickObjects(maxFeatures);
+        const featureCache = new Set();
+        const renderedFeatures = [];
+        for (const f of features) {
+            const featureId = getFeatureUniqueId(f.object, this.props.uniqueIdProperty);
+            if (featureId === undefined) {
+                // we have no id for the feature, we just add to the list
+                renderedFeatures.push(f.object);
+            }
+            else if (!featureCache.has(featureId)) {
+                // Add removing duplicates
+                featureCache.add(featureId);
+                renderedFeatures.push(f.object);
+            }
+        }
+        return renderedFeatures;
+    }
+    _setWGS84PropertyForTiles() {
+        const propName = 'dataInWGS84';
+        const tileset = this.state.tileset;
+        // @ts-expect-error selectedTiles are always initialized when tile is being processed
+        tileset.selectedTiles.forEach((tile) => {
+            if (!tile.hasOwnProperty(propName)) {
+                // eslint-disable-next-line accessor-pairs
+                Object.defineProperty(tile, propName, {
+                    get: () => {
+                        // Still loading or encountered an error
+                        if (!tile.content) {
+                            return null;
+                        }
+                        if (this.state.binary && Array.isArray(tile.content) && !tile.content.length) {
+                            // TODO: @loaders.gl/mvt returns [] when no content. It should return a valid empty binary.
+                            // https://github.com/visgl/loaders.gl/pull/1137
+                            return [];
+                        }
+                        const { bbox } = tile;
+                        if (tile._contentWGS84 === undefined && isGeoBoundingBox(bbox)) {
+                            // Create a cache to transform only once
+                            const content = this.state.binary ? binaryToGeojson(tile.content) : tile.content;
+                            tile._contentWGS84 = content.map(feature => transformTileCoordsToWGS84(feature, bbox, this.context.viewport));
+                        }
+                        return tile._contentWGS84;
+                    }
+                });
+            }
+        });
+    }
+}
+MVTLayer.layerName = 'MVTLayer';
+MVTLayer.defaultProps = defaultProps;
+function getFeatureUniqueId(feature, uniqueIdProperty) {
+    if (feature.properties && uniqueIdProperty) {
+        return feature.properties[uniqueIdProperty];
+    }
+    if ('id' in feature) {
+        return feature.id;
+    }
+    return undefined;
+}
+function getFeatureLayerName(feature) {
+    return feature.properties?.layerName || null;
+}
+function isFeatureIdDefined(value) {
+    return value !== undefined && value !== null && value !== '';
+}
+function transformTileCoordsToWGS84(object, bbox, viewport) {
+    const feature = {
+        ...object,
+        geometry: {
+            type: object.geometry.type
+        }
+    };
+    // eslint-disable-next-line accessor-pairs
+    Object.defineProperty(feature.geometry, 'coordinates', {
+        get: () => {
+            const wgs84Geom = transform(object.geometry, bbox, viewport);
+            return wgs84Geom.coordinates;
+        }
+    });
+    return feature;
+}

package/typed/package.json

@@ -0,0 +1,6 @@
+{
+  "internal": true,
+  "main": "../dist/es5/index.js",
+  "module": "../dist/esm/index.js",
+  "types": "index.d.ts"
+}

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

@@ -0,0 +1,20 @@
+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> = {
+    /**
+     * Called for each data object to retrieve the quadkey string identifier.
+     *
+     * By default, it reads `quadkey` property of data object.
+     */
+    getQuadkey?: AccessorFunction<DataT, string>;
+};
+export default class QuadkeyLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<DataT, Required<_QuadkeyLayerProps<DataT>> & ExtraProps> {
+    static layerName: string;
+    static defaultProps: DefaultProps<QuadkeyLayerProps<any>>;
+    indexToBounds(): Partial<GeoCellLayer['props']> | null;
+}
+export {};
+//# sourceMappingURL=quadkey-layer.d.ts.map

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

@@ -0,0 +1 @@
+{"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/quadkey-layer/quadkey-layer.js

@@ -0,0 +1,18 @@
+import GeoCellLayer from '../geo-cell-layer/GeoCellLayer';
+import { getQuadkeyPolygon } from './quadkey-utils';
+const defaultProps = {
+    getQuadkey: { type: 'accessor', value: d => d.quadkey }
+};
+export default class QuadkeyLayer extends GeoCellLayer {
+    indexToBounds() {
+        const { data, getQuadkey } = this.props;
+        return {
+            data,
+            _normalize: false,
+            positionFormat: 'XY',
+            getPolygon: (x, objectInfo) => getQuadkeyPolygon(getQuadkey(x, objectInfo))
+        };
+    }
+}
+QuadkeyLayer.layerName = 'QuadkeyLayer';
+QuadkeyLayer.defaultProps = defaultProps;

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

@@ -0,0 +1,3 @@
+export declare function quadkeyToWorldBounds(quadkey: string): [number[], number[]];
+export declare function getQuadkeyPolygon(quadkey: string): number[];
+//# sourceMappingURL=quadkey-utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"quadkey-utils.d.ts","sourceRoot":"","sources":["../../src/quadkey-layer/quadkey-utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAgB1E;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAK3D"}

package/typed/quadkey-layer/quadkey-utils.js

@@ -0,0 +1,26 @@
+import { worldToLngLat } from '@math.gl/web-mercator';
+const TILE_SIZE = 512;
+export function quadkeyToWorldBounds(quadkey) {
+    let x = 0;
+    let y = 0;
+    let mask = 1 << quadkey.length;
+    const scale = mask / TILE_SIZE;
+    for (let i = 0; i < quadkey.length; i++) {
+        mask >>= 1;
+        const q = parseInt(quadkey[i]);
+        if (q % 2)
+            x |= mask;
+        if (q > 1)
+            y |= mask;
+    }
+    return [
+        [x / scale, TILE_SIZE - y / scale],
+        [(x + 0.99) / scale, TILE_SIZE - (y + 0.99) / scale]
+    ];
+}
+export function getQuadkeyPolygon(quadkey) {
+    const [topLeft, bottomRight] = quadkeyToWorldBounds(quadkey);
+    const [w, n] = worldToLngLat(topLeft);
+    const [e, s] = worldToLngLat(bottomRight);
+    return [e, n, e, s, w, s, w, n, e, n];
+}

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

@@ -0,0 +1,11 @@
+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, number];
+    level: number;
+};
+//# sourceMappingURL=s2-geometry.d.ts.map

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

@@ -0,0 +1 @@
+{"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-geometry.js

@@ -0,0 +1,123 @@
+/*
+Adapted from s2-geometry
+
+ISC License (ISC)
+
+Copyright (c) 2012-2016, Jon Atkins <github@jonatkins.com>
+Copyright (c) 2016, AJ ONeal <aj@daplie.com>
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+import Long from 'long';
+//
+// Functional Style
+//
+const FACE_BITS = 3;
+const MAX_LEVEL = 30;
+const POS_BITS = 2 * MAX_LEVEL + 1; // 61 (60 bits of data, 1 bit lsb marker)
+const RADIAN_TO_DEGREE = 180 / Math.PI;
+export function IJToST(ij, order, offsets) {
+    const maxSize = 1 << order;
+    return [(ij[0] + offsets[0]) / maxSize, (ij[1] + offsets[1]) / maxSize];
+}
+function singleSTtoUV(st) {
+    if (st >= 0.5) {
+        return (1 / 3.0) * (4 * st * st - 1);
+    }
+    return (1 / 3.0) * (1 - 4 * (1 - st) * (1 - st));
+}
+export function STToUV(st) {
+    return [singleSTtoUV(st[0]), singleSTtoUV(st[1])];
+}
+export function FaceUVToXYZ(face, [u, v]) {
+    switch (face) {
+        case 0:
+            return [1, u, v];
+        case 1:
+            return [-u, 1, v];
+        case 2:
+            return [-u, -v, 1];
+        case 3:
+            return [-1, -v, -u];
+        case 4:
+            return [v, -1, -u];
+        case 5:
+            return [v, u, -1];
+        default:
+            throw new Error('Invalid face');
+    }
+}
+export function XYZToLngLat([x, y, z]) {
+    const lat = Math.atan2(z, Math.sqrt(x * x + y * y));
+    const lng = Math.atan2(y, x);
+    return [lng * RADIAN_TO_DEGREE, lat * RADIAN_TO_DEGREE];
+}
+export function toHilbertQuadkey(idS) {
+    let bin = Long.fromString(idS, true, 10).toString(2);
+    while (bin.length < FACE_BITS + POS_BITS) {
+        // eslint-disable-next-line prefer-template
+        bin = '0' + bin;
+    }
+    // MUST come AFTER binstr has been left-padded with '0's
+    const lsbIndex = bin.lastIndexOf('1');
+    // substr(start, len)
+    // substring(start, end) // includes start, does not include end
+    const faceB = bin.substring(0, 3);
+    // posB will always be a multiple of 2 (or it's invalid)
+    const posB = bin.substring(3, lsbIndex);
+    const levelN = posB.length / 2;
+    const faceS = Long.fromString(faceB, true, 2).toString(10);
+    let posS = Long.fromString(posB, true, 2).toString(4);
+    while (posS.length < levelN) {
+        // eslint-disable-next-line prefer-template
+        posS = '0' + posS;
+    }
+    return `${faceS}/${posS}`;
+}
+function rotateAndFlipQuadrant(n, point, rx, ry) {
+    if (ry === 0) {
+        if (rx === 1) {
+            point[0] = n - 1 - point[0];
+            point[1] = n - 1 - point[1];
+        }
+        const x = point[0];
+        point[0] = point[1];
+        point[1] = x;
+    }
+}
+export function FromHilbertQuadKey(hilbertQuadkey) {
+    const parts = hilbertQuadkey.split('/');
+    const face = parseInt(parts[0], 10);
+    const position = parts[1];
+    const maxLevel = position.length;
+    const point = [0, 0];
+    let level;
+    for (let i = maxLevel - 1; i >= 0; i--) {
+        level = maxLevel - i;
+        const bit = position[i];
+        let rx = 0;
+        let ry = 0;
+        if (bit === '1') {
+            ry = 1;
+        }
+        else if (bit === '2') {
+            rx = 1;
+            ry = 1;
+        }
+        else if (bit === '3') {
+            rx = 1;
+        }
+        const val = Math.pow(2, level - 1);
+        rotateAndFlipQuadrant(val, point, rx, ry);
+        point[0] += val * rx;
+        point[1] += val * ry;
+    }
+    if (face % 2 === 1) {
+        const t = point[0];
+        point[0] = point[1];
+        point[1] = t;
+    }
+    return { face, ij: point, level };
+}

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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1 @@
+{"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/{src → typed}/s2-layer/s2-layer.js

@@ -17,26 +17,21 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 import GeoCellLayer from '../geo-cell-layer/GeoCellLayer';
-import {getS2Polygon} from './s2-utils';
-
+import { getS2Polygon } from './s2-utils';
 const defaultProps = {
-  getS2Token: {type: 'accessor', value: d => d.token}
+    getS2Token: { type: 'accessor', value: d => d.token }
 };
-
 export default class S2Layer extends GeoCellLayer {
-  indexToBounds() {
-    const {data, getS2Token} = this.props;
-
-    return {
-      data,
-      _normalize: false,
-      positionFormat: 'XY',
-      getPolygon: (x, objectInfo) => getS2Polygon(getS2Token(x, objectInfo))
-    };
-  }
+    indexToBounds() {
+        const { data, getS2Token } = this.props;
+        return {
+            data,
+            _normalize: false,
+            positionFormat: 'XY',
+            getPolygon: (x, objectInfo) => getS2Polygon(getS2Token(x, objectInfo))
+        };
+    }
 }
-
 S2Layer.layerName = 'S2Layer';
 S2Layer.defaultProps = defaultProps;

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

@@ -0,0 +1,9 @@
+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 {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 declare function getS2Polygon(token: string | number): Float64Array;
+//# sourceMappingURL=s2-utils.d.ts.map

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

@@ -0,0 +1 @@
+{"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"}