@deck.gl/geo-layers 8.9.9 → 8.9.10

package/typed/tile-layer/utils.js

@@ -0,0 +1,197 @@
+import { getOSMTileIndices } from './tile-2d-traversal';
+const TILE_SIZE = 512;
+const DEFAULT_EXTENT = [-Infinity, -Infinity, Infinity, Infinity];
+export const urlType = {
+    type: 'url',
+    value: null,
+    validate: (value, propType) => (propType.optional && value === null) ||
+        typeof value === 'string' ||
+        (Array.isArray(value) && value.every(url => typeof url === 'string')),
+    equals: (value1, value2) => {
+        if (value1 === value2) {
+            return true;
+        }
+        if (!Array.isArray(value1) || !Array.isArray(value2)) {
+            return false;
+        }
+        const len = value1.length;
+        if (len !== value2.length) {
+            return false;
+        }
+        for (let i = 0; i < len; i++) {
+            if (value1[i] !== value2[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+};
+function transformBox(bbox, modelMatrix) {
+    const transformedCoords = [
+        // top-left
+        modelMatrix.transformAsPoint([bbox[0], bbox[1]]),
+        // top-right
+        modelMatrix.transformAsPoint([bbox[2], bbox[1]]),
+        // bottom-left
+        modelMatrix.transformAsPoint([bbox[0], bbox[3]]),
+        // bottom-right
+        modelMatrix.transformAsPoint([bbox[2], bbox[3]])
+    ];
+    const transformedBox = [
+        // Minimum x coord
+        Math.min(...transformedCoords.map(i => i[0])),
+        // Minimum y coord
+        Math.min(...transformedCoords.map(i => i[1])),
+        // Max x coord
+        Math.max(...transformedCoords.map(i => i[0])),
+        // Max y coord
+        Math.max(...transformedCoords.map(i => i[1]))
+    ];
+    return transformedBox;
+}
+function stringHash(s) {
+    return Math.abs(s.split('').reduce((a, b) => ((a << 5) - a + b.charCodeAt(0)) | 0, 0));
+}
+export function getURLFromTemplate(template, tile) {
+    if (!template || !template.length) {
+        return null;
+    }
+    const { index, id } = tile;
+    if (Array.isArray(template)) {
+        const i = stringHash(id) % template.length;
+        template = template[i];
+    }
+    let url = template;
+    for (const key of Object.keys(index)) {
+        const regex = new RegExp(`{${key}}`, 'g');
+        url = url.replace(regex, String(index[key]));
+    }
+    // Back-compatible support for {-y}
+    if (Number.isInteger(index.y) && Number.isInteger(index.z)) {
+        url = url.replace(/\{-y\}/g, String(Math.pow(2, index.z) - index.y - 1));
+    }
+    return url;
+}
+/**
+ * gets the bounding box of a viewport
+ */
+function getBoundingBox(viewport, zRange, extent) {
+    let bounds;
+    if (zRange && zRange.length === 2) {
+        const [minZ, maxZ] = zRange;
+        const bounds0 = viewport.getBounds({ z: minZ });
+        const bounds1 = viewport.getBounds({ z: maxZ });
+        bounds = [
+            Math.min(bounds0[0], bounds1[0]),
+            Math.min(bounds0[1], bounds1[1]),
+            Math.max(bounds0[2], bounds1[2]),
+            Math.max(bounds0[3], bounds1[3])
+        ];
+    }
+    else {
+        bounds = viewport.getBounds();
+    }
+    if (!viewport.isGeospatial) {
+        return [
+            // Top corner should not be more then bottom corner in either direction
+            Math.max(Math.min(bounds[0], extent[2]), extent[0]),
+            Math.max(Math.min(bounds[1], extent[3]), extent[1]),
+            // Bottom corner should not be less then top corner in either direction
+            Math.min(Math.max(bounds[2], extent[0]), extent[2]),
+            Math.min(Math.max(bounds[3], extent[1]), extent[3])
+        ];
+    }
+    return [
+        Math.max(bounds[0], extent[0]),
+        Math.max(bounds[1], extent[1]),
+        Math.min(bounds[2], extent[2]),
+        Math.min(bounds[3], extent[3])
+    ];
+}
+function getIndexingCoords(bbox, scale, modelMatrixInverse) {
+    if (modelMatrixInverse) {
+        const transformedTileIndex = transformBox(bbox, modelMatrixInverse).map(i => (i * scale) / TILE_SIZE);
+        return transformedTileIndex;
+    }
+    return bbox.map(i => (i * scale) / TILE_SIZE);
+}
+function getScale(z, tileSize) {
+    return (Math.pow(2, z) * TILE_SIZE) / tileSize;
+}
+// https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Lon..2Flat._to_tile_numbers_2
+export function osmTile2lngLat(x, y, z) {
+    const scale = getScale(z, TILE_SIZE);
+    const lng = (x / scale) * 360 - 180;
+    const n = Math.PI - (2 * Math.PI * y) / scale;
+    const lat = (180 / Math.PI) * Math.atan(0.5 * (Math.exp(n) - Math.exp(-n)));
+    return [lng, lat];
+}
+function tile2XY(x, y, z, tileSize) {
+    const scale = getScale(z, tileSize);
+    return [(x / scale) * TILE_SIZE, (y / scale) * TILE_SIZE];
+}
+export function tileToBoundingBox(viewport, x, y, z, tileSize = TILE_SIZE) {
+    if (viewport.isGeospatial) {
+        const [west, north] = osmTile2lngLat(x, y, z);
+        const [east, south] = osmTile2lngLat(x + 1, y + 1, z);
+        return { west, north, east, south };
+    }
+    const [left, top] = tile2XY(x, y, z, tileSize);
+    const [right, bottom] = tile2XY(x + 1, y + 1, z, tileSize);
+    return { left, top, right, bottom };
+}
+function getIdentityTileIndices(viewport, z, tileSize, extent, modelMatrixInverse) {
+    const bbox = getBoundingBox(viewport, null, extent);
+    const scale = getScale(z, tileSize);
+    const [minX, minY, maxX, maxY] = getIndexingCoords(bbox, scale, modelMatrixInverse);
+    const indices = [];
+    /*
+        |  TILE  |  TILE  |  TILE  |
+          |(minX)            |(maxX)
+     */
+    for (let x = Math.floor(minX); x < maxX; x++) {
+        for (let y = Math.floor(minY); y < maxY; y++) {
+            indices.push({ x, y, z });
+        }
+    }
+    return indices;
+}
+/**
+ * Returns all tile indices in the current viewport. If the current zoom level is smaller
+ * than minZoom, return an empty array. If the current zoom level is greater than maxZoom,
+ * return tiles that are on maxZoom.
+ */
+// eslint-disable-next-line complexity
+export function getTileIndices({ viewport, maxZoom, minZoom, zRange, extent, tileSize = TILE_SIZE, modelMatrix, modelMatrixInverse, zoomOffset = 0 }) {
+    let z = viewport.isGeospatial
+        ? Math.round(viewport.zoom + Math.log2(TILE_SIZE / tileSize)) + zoomOffset
+        : Math.ceil(viewport.zoom) + zoomOffset;
+    if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
+        if (!extent) {
+            return [];
+        }
+        z = minZoom;
+    }
+    if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {
+        z = maxZoom;
+    }
+    let transformedExtent = extent;
+    if (modelMatrix && modelMatrixInverse && extent && !viewport.isGeospatial) {
+        transformedExtent = transformBox(extent, modelMatrix);
+    }
+    return viewport.isGeospatial
+        ? getOSMTileIndices(viewport, z, zRange, extent)
+        : getIdentityTileIndices(viewport, z, tileSize, transformedExtent || DEFAULT_EXTENT, modelMatrixInverse);
+}
+/**
+ * Returns true if s is a valid URL template
+ */
+export function isURLTemplate(s) {
+    return /(?=.*{z})(?=.*{x})(?=.*({y}|{-y}))/.test(s);
+}
+export function isGeoBoundingBox(v) {
+    return (Number.isFinite(v.west) &&
+        Number.isFinite(v.north) &&
+        Number.isFinite(v.east) &&
+        Number.isFinite(v.south));
+}

package/typed/trips-layer/trips-layer.js

@@ -0,0 +1,92 @@
+// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// 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 { PathLayer } from '@deck.gl/layers';
+const defaultProps = {
+    fadeTrail: true,
+    trailLength: { type: 'number', value: 120, min: 0 },
+    currentTime: { type: 'number', value: 0, min: 0 },
+    getTimestamps: { type: 'accessor', value: null }
+};
+export default class TripsLayer extends PathLayer {
+    getShaders() {
+        const shaders = super.getShaders();
+        shaders.inject = {
+            'vs:#decl': `\
+uniform float trailLength;
+attribute float instanceTimestamps;
+attribute float instanceNextTimestamps;
+varying float vTime;
+`,
+            // Timestamp of the vertex
+            'vs:#main-end': `\
+vTime = instanceTimestamps + (instanceNextTimestamps - instanceTimestamps) * vPathPosition.y / vPathLength;
+`,
+            'fs:#decl': `\
+uniform bool fadeTrail;
+uniform float trailLength;
+uniform float currentTime;
+varying float vTime;
+`,
+            // Drop the segments outside of the time window
+            'fs:#main-start': `\
+if(vTime > currentTime || (fadeTrail && (vTime < currentTime - trailLength))) {
+  discard;
+}
+`,
+            // Fade the color (currentTime - 100%, end of trail - 0%)
+            'fs:DECKGL_FILTER_COLOR': `\
+if(fadeTrail) {
+  color.a *= 1.0 - (currentTime - vTime) / trailLength;
+}
+`
+        };
+        return shaders;
+    }
+    initializeState() {
+        super.initializeState();
+        const attributeManager = this.getAttributeManager();
+        attributeManager.addInstanced({
+            timestamps: {
+                size: 1,
+                accessor: 'getTimestamps',
+                shaderAttributes: {
+                    instanceTimestamps: {
+                        vertexOffset: 0
+                    },
+                    instanceNextTimestamps: {
+                        vertexOffset: 1
+                    }
+                }
+            }
+        });
+    }
+    draw(params) {
+        const { fadeTrail, trailLength, currentTime } = this.props;
+        params.uniforms = {
+            ...params.uniforms,
+            fadeTrail,
+            trailLength,
+            currentTime
+        };
+        super.draw(params);
+    }
+}
+TripsLayer.layerName = 'TripsLayer';
+TripsLayer.defaultProps = defaultProps;

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

@@ -34,8 +34,12 @@ export declare class WMSLayer<ExtraPropsT extends {} = {}> extends CompositeLaye
         };
         lastRequestId: number;
         _nextRequestId: number;
+        /** TODO: Change any => setTimeout return type. Different between Node and browser... */
         _timeoutId: any;
+        loadCounter: number;
     };
+    /** Returns true if all async resources are loaded */
+    get isLoaded(): boolean;
     /** Lets deck.gl know that we want viewport change events */
     shouldUpdateState(): boolean;
     initializeState(): void;

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

@@ -1 +1 @@
-{"version":3,"file":"wms-layer.d.ts","sourceRoot":"","sources":["../../src/wms-layer/wms-layer.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,KAAK,EACL,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,QAAQ,EAGT,MAAM,eAAe,CAAC;AAEvB,OAAO,KAAK,EAAC,mBAAmB,EAAE,SAAS,EAAE,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACtF,OAAO,EAAC,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAG/D,2CAA2C;AAC3C,oBAAY,aAAa,GAAG,mBAAmB,GAAG,cAAc,CAAC;AAEjE,mCAAmC;AACnC,aAAK,cAAc,GAAG;IACpB,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IAC3B,WAAW,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,GAAG,CAAC,EAAE,WAAW,GAAG,WAAW,GAAG,MAAM,CAAC;IACzC,cAAc,CAAC,EAAE,CAAC,QAAQ,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACzD,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAC7C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAChD,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3C,gBAAgB,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAC/D,CAAC;AAqBF;;GAEG;AACH,qBAAa,QAAQ,CAAC,WAAW,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CACvE,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,CACvC;IACC,MAAM,CAAC,SAAS,SAAc;IAC9B,MAAM,CAAC,YAAY,EAAE,YAAY,CAAgB;IAEjD,KAAK,EAAG;QACN,WAAW,EAAE,WAAW,CAAC;QACzB,KAAK,EAAE,SAAS,CAAC;QACjB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QACzC,qBAAqB,EAAE;YACrB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACvC,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,GAAG,EAAE,WAAW,GAAG,WAAW,CAAC;YAC/B,KAAK,EAAE,MAAM,CAAC;YACd,MAAM,EAAE,MAAM,CAAC;SAChB,CAAC;QACF,aAAa,EAAE,MAAM,CAAC;QAEtB,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,GAAG,CAAC;KACjB,CAAC;IAEF,4DAA4D;IACnD,iBAAiB,IAAI,OAAO;IAI5B,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,EAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAgBzE,aAAa,IAAI,IAAI;IAIrB,YAAY,IAAI,KAAK;IAmBxB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgBtE,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,WAAW;IAgBrD,6CAA6C;IACvC,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,oBAAoB;IACd,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAqDlE,oDAAoD;IACpD,OAAO,CAAC,YAAY;IAIpB,8FAA8F;IAC9F,OAAO,CAAC,QAAQ;CAIjB"}
+{"version":3,"file":"wms-layer.d.ts","sourceRoot":"","sources":["../../src/wms-layer/wms-layer.ts"],"names":[],"mappings":"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"}

package/typed/tile-3d-layer/utils.d.ts

@@ -1,3 +0,0 @@
-import type { Tile3D } from '@loaders.gl/tiles';
-export declare function wrapTile(tile: Tile3D): Tile3D;
-//# sourceMappingURL=utils.d.ts.map

package/typed/tile-3d-layer/utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/tile-3d-layer/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,mBAAmB,CAAC;AAK9C,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAM7C"}