@deck.gl/carto 9.0.0-beta.10 → 9.0.0-beta.11

package/dist/layers/h3-tile-layer.js

@@ -41,10 +41,10 @@ export default class H3TileLayer extends CompositeLayer {
         // Convert Mercator zooms provided in props into H3 res levels
         // and clip into valid range provided from the tilejson
         if (this.props.minZoom) {
-            minresolution = Math.max(minresolution, getHexagonResolution({ zoom: this.props.minZoom, latitude: 0 }));
+            minresolution = Math.max(minresolution, getHexagonResolution({ zoom: this.props.minZoom, latitude: 0 }, this.props.tileSize));
         }
         if (this.props.maxZoom) {
-            maxresolution = Math.min(maxresolution, getHexagonResolution({ zoom: this.props.maxZoom, latitude: 0 }));
+            maxresolution = Math.min(maxresolution, getHexagonResolution({ zoom: this.props.maxZoom, latitude: 0 }, this.props.tileSize));
         }
         // The naming is unfortunate, but minZoom & maxZoom in the context
         // of a Tileset2D refer to the resolution levels, not the Mercator zooms

package/dist/layers/h3-tileset-2d.d.ts

@@ -2,7 +2,10 @@ import { _Tileset2D as Tileset2D, GeoBoundingBox } from '@deck.gl/geo-layers';
 export type H3TileIndex = {
     i: string;
 };
-export declare function getHexagonResolution(viewport: any): number;
+export declare function getHexagonResolution(viewport: {
+    zoom: number;
+    latitude: number;
+}, tileSize: number): number;
 export default class H3Tileset2D extends Tileset2D {
     /**
      * Returns all tile indices in the current viewport. If the current zoom level is smaller

package/dist/layers/h3-tileset-2d.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-tileset-2d.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tileset-2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,IAAI,SAAS,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAU5E,MAAM,MAAM,WAAW,GAAG;IAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AA0DtC,wBAAgB,oBAAoB,CAAC,QAAQ,KAAA,GAAG,MAAM,CAMrD;AAED,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD;;;;OAIG;IAEH,cAAc,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAC;;;;KAAA,GAAG,WAAW,EAAE;IAyB3D,SAAS,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW,GAAG,MAAM;IAKnC,eAAe,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW;;;IAKhC,WAAW,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW,GAAG,MAAM;IAKrC,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,WAAW;CAKhD"}
+{"version":3,"file":"h3-tileset-2d.d.ts","sourceRoot":"","sources":["../../src/layers/h3-tileset-2d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,IAAI,SAAS,EAAE,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAa5E,MAAM,MAAM,WAAW,GAAG;IAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AA6EtC,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAC,EAC1C,QAAQ,EAAE,MAAM,GACf,MAAM,CASR;AAED,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAS;IAChD;;;;OAIG;IAEH,cAAc,CAAC,EAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAC;;;;KAAA,GAAG,WAAW,EAAE;IA2B3D,SAAS,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW,GAAG,MAAM;IAKnC,eAAe,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW;;;IAKhC,WAAW,CAAC,EAAC,CAAC,EAAC,EAAE,WAAW,GAAG,MAAM;IAKrC,cAAc,CAAC,KAAK,EAAE,WAAW,GAAG,WAAW;CAKhD"}

package/dist/layers/h3-tileset-2d.js

@@ -1,5 +1,26 @@
 import { _Tileset2D as Tileset2D } from '@deck.gl/geo-layers';
-import { polygonToCells, latLngToCell, getResolution, cellToBoundary, cellToParent, gridDisk } from 'h3-js';
+import { polygonToCells, latLngToCell, getResolution, cellToBoundary, cellToParent, gridDisk, edgeLength, UNITS, originToDirectedEdges } from 'h3-js';
+const MAX_LATITUDE = 85.051128;
+// `polygonToCells()` fills based on hexagon center, this function will
+// pad the bounds such that all cells that overlap the bounds will be included
+function padBoundingBox({ west, north, east, south }, resolution) {
+    const corners = [
+        [north, east],
+        [south, east],
+        [south, west],
+        [north, west]
+    ];
+    const cornerCells = corners.map(c => latLngToCell(c[0], c[1], resolution));
+    const cornerEdgeLengths = cornerCells.map(c => (Math.max(...originToDirectedEdges(c).map(e => edgeLength(e, UNITS.rads))) * 180) / Math.PI);
+    const bufferLat = Math.max(...cornerEdgeLengths);
+    const bufferLon = Math.min(180, bufferLat / Math.cos((((north + south) / 2) * Math.PI) / 180));
+    return {
+        north: Math.min(north + bufferLat, MAX_LATITUDE),
+        east: east + bufferLon,
+        south: Math.max(south - bufferLat, -MAX_LATITUDE),
+        west: west - bufferLon
+    };
+}
 function getHexagonsInBoundingBox({ west, north, east, south }, resolution) {
     const longitudeSpan = Math.abs(east - west);
     if (longitudeSpan > 180) {
@@ -8,25 +29,20 @@ function getHexagonsInBoundingBox({ west, north, east, south }, resolution) {
         const nSegments = Math.ceil(longitudeSpan / 180);
         let h3Indices = [];
         for (let s = 0; s < nSegments; s++) {
-            const segmentEast = east + s * 180;
-            const segmentWest = Math.min(segmentEast + 179.9999999, west);
+            const segmentWest = west + s * 180;
+            const segmentEast = Math.min(segmentWest + 179.9999999, east);
             h3Indices = h3Indices.concat(getHexagonsInBoundingBox({ west: segmentWest, north, east: segmentEast, south }, resolution));
         }
         return [...new Set(h3Indices)];
     }
-    // `polygonToCells()` fills based on hexagon center, which means tiles vanish
-    // prematurely. Get more accurate coverage by oversampling
-    const oversample = 2;
-    const h3Indices = polygonToCells([
-        [
-            [west, north],
-            [west, south],
-            [east, south],
-            [east, north],
-            [west, north]
-        ]
-    ], resolution + oversample, true);
-    return oversample ? [...new Set(h3Indices.map(i => cellToParent(i, resolution)))] : h3Indices;
+    const polygon = [
+        [north, east],
+        [south, east],
+        [south, west],
+        [north, west],
+        [north, east]
+    ];
+    return polygonToCells(polygon, resolution);
 }
 function tileToBoundingBox(index) {
     const coordinates = cellToBoundary(index);
@@ -43,8 +59,11 @@ function tileToBoundingBox(index) {
 // similar
 // Relative scale factor (0 = no biasing, 2 = a few hexagons cover view)
 const BIAS = 2;
-export function getHexagonResolution(viewport) {
-    const hexagonScaleFactor = (2 / 3) * viewport.zoom;
+export function getHexagonResolution(viewport, tileSize) {
+    // Difference in given tile size compared to deck's internal 512px tile size,
+    // expressed as an offset to the viewport zoom.
+    const zoomOffset = Math.log2(tileSize / 512);
+    const hexagonScaleFactor = (2 / 3) * (viewport.zoom - zoomOffset);
     const latitudeScaleFactor = Math.log(1 / Math.cos((Math.PI * viewport.latitude) / 180));
     // Clip and bias
     return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));
@@ -59,8 +78,9 @@ export default class H3Tileset2D extends Tileset2D {
     getTileIndices({ viewport, minZoom, maxZoom }) {
         if (viewport.latitude === undefined)
             return [];
-        const [east, south, west, north] = viewport.getBounds();
-        let z = getHexagonResolution(viewport);
+        const [west, south, east, north] = viewport.getBounds();
+        const { tileSize } = this.opts;
+        let z = getHexagonResolution(viewport, tileSize);
         let indices;
         if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
             // TODO support `extent` prop
@@ -74,7 +94,8 @@ export default class H3Tileset2D extends Tileset2D {
             indices = gridDisk(center, 1);
         }
         else {
-            indices = getHexagonsInBoundingBox({ west, north, east, south }, z);
+            const paddedBounds = padBoundingBox({ west, north, east, south }, z);
+            indices = getHexagonsInBoundingBox(paddedBounds, z);
         }
         return indices.map(i => ({ i }));
     }

package/dist/layers/schema/carto-raster-tile-loader.js

@@ -1,7 +1,7 @@
 import { TileReader } from "./carto-raster-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
-const VERSION = typeof "9.0.0-beta.9" !== 'undefined' ? "9.0.0-beta.9" : 'latest';
+const VERSION = typeof "9.0.0-beta.11" !== 'undefined' ? "9.0.0-beta.11" : 'latest';
 const id = 'cartoRasterTile';
 const DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/layers/schema/carto-spatial-tile-loader.js

@@ -2,7 +2,7 @@ import { TileReader } from "./carto-spatial-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
 import { binaryToSpatialjson } from "./spatialjson-utils.js";
-const VERSION = typeof "9.0.0-beta.9" !== 'undefined' ? "9.0.0-beta.9" : 'latest';
+const VERSION = typeof "9.0.0-beta.11" !== 'undefined' ? "9.0.0-beta.11" : 'latest';
 const id = 'cartoSpatialTile';
 const DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/layers/schema/carto-vector-tile-loader.js

@@ -2,7 +2,7 @@ import earcut from 'earcut';
 import { TileReader } from "./carto-tile.js";
 import { parsePbf } from "./tile-loader-utils.js";
 import { getWorkerUrl } from "../../utils.js";
-const VERSION = typeof "9.0.0-beta.9" !== 'undefined' ? "9.0.0-beta.9" : 'latest';
+const VERSION = typeof "9.0.0-beta.11" !== 'undefined' ? "9.0.0-beta.11" : 'latest';
 const id = 'cartoVectorTile';
 const DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/layers/vector-tile-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAK7C,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAWrD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,kBAAkB,GAAG,OAAO,IAAI,qBAAqB,GACpF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;AAElD,2CAA2C;AAC3C,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,kBAAkB,GAAG,GAAG,EACxB,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC;IAClF,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,KAAK,EAAG,QAAQ,CAAC,OAAO,CAAC,GAAG;QAC1B,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;gBAEU,GAAG,WAAW,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,EAAE;IAMtE,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,UAAU,KAAA;IAWtB,cAAc,IAAI,GAAG;IAQf,WAAW,CAAC,IAAI,EAAE,aAAa;IAoCrC,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAuBtB,cAAc,CAAC,MAAM,KAAA;CAYtB"}
+{"version":3,"file":"vector-tile-layer.d.ts","sourceRoot":"","sources":["../../src/layers/vector-tile-layer.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,OAAO,EACL,QAAQ,EACR,aAAa,EACb,SAAS,EAET,aAAa,EACb,cAAc,IAAI,aAAa,EAChC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAK7C,OAAO,KAAK,EAAC,cAAc,EAAC,4BAAyB;AAWrD,mDAAmD;AACnD,MAAM,MAAM,oBAAoB,CAAC,kBAAkB,GAAG,OAAO,IAAI,qBAAqB,GACpF,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC,CAAC;AAElD,2CAA2C;AAC3C,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,IAAI,GAAG,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;CACvD,CAAC;AAGF,MAAM,CAAC,OAAO,OAAO,eAAe,CAClC,kBAAkB,GAAG,GAAG,EACxB,UAAU,SAAS,EAAE,GAAG,EAAE,CAC1B,SAAQ,QAAQ,CAAC,kBAAkB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,GAAG,UAAU,CAAC;IAClF,MAAM,CAAC,SAAS,SAAqB;IACrC,MAAM,CAAC,YAAY,8CAAgB;IAEnC,KAAK,EAAG,QAAQ,CAAC,OAAO,CAAC,GAAG;QAC1B,GAAG,EAAE,OAAO,CAAC;KACd,CAAC;gBAEU,GAAG,WAAW,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,EAAE;IAMtE,eAAe,IAAI,IAAI;IAKvB,WAAW,CAAC,UAAU,KAAA;IAWtB,cAAc,IAAI,GAAG;IASf,WAAW,CAAC,IAAI,EAAE,aAAa;IAqCrC,eAAe,CACb,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,GAAG;QAC1B,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,GAAG,CAAC;QACV,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,aAAa,CAAC;KACrB,GACA,YAAY,GAAG,IAAI;IAuBtB,cAAc,CAAC,MAAM,KAAA;CAYtB"}

package/dist/layers/vector-tile-layer.js

@@ -43,6 +43,7 @@ export default class VectorTileLayer extends MVTLayer {
         loadOptions.gis = { format: 'binary' }; // Use binary for MVT loading
         return loadOptions;
     }
+    /* eslint-disable camelcase */
     async getTileData(tile) {
         const tileJSON = this.props.data;
         const { tiles, properties_tiles } = tileJSON;
@@ -73,6 +74,7 @@ export default class VectorTileLayer extends MVTLayer {
             return null;
         return attributes ? mergeBoundaryData(geometry, attributes) : geometry;
     }
+    /* eslint-enable camelcase */
     renderSubLayers(props) {
         if (props.data === null) {
             return null;

package/dist/sources/base-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-source.d.ts","sourceRoot":"","sources":["../../src/sources/base-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAkB,OAAO,EAAC,wBAAqB;AAC3D,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,qBAAqB,EACrB,qBAAqB,EAErB,cAAc,EACf,mBAAgB;AAEjB,eAAO,MAAM,eAAe,EAAE,qBAK7B,CAAC;AAEF,wBAAsB,UAAU,CAAC,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3E,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,EAC/D,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,cAAc,GAAG,aAAa,GAAG,UAAU,CAAC,CA8CtD"}
+{"version":3,"file":"base-source.d.ts","sourceRoot":"","sources":["../../src/sources/base-source.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAkB,OAAO,EAAC,wBAAqB;AAC3D,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,qBAAqB,EACrB,qBAAqB,EAErB,cAAc,EACf,mBAAgB;AAEjB,eAAO,MAAM,eAAe,EAAE,qBAK7B,CAAC;AAEF,wBAAsB,UAAU,CAAC,aAAa,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3E,QAAQ,EAAE,OAAO,EACjB,OAAO,EAAE,OAAO,CAAC,qBAAqB,CAAC,GAAG,qBAAqB,EAC/D,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,cAAc,GAAG,aAAa,GAAG,UAAU,CAAC,CAiDtD"}

package/dist/sources/base-source.js

@@ -38,12 +38,15 @@ export async function baseSource(endpoint, options, urlParameters) {
     }
     errorContext.requestType = 'Map data';
     if (format === 'tilejson') {
-        return await requestWithParameters({
-            accessToken,
+        const json = await requestWithParameters({
             baseUrl: dataUrl,
             headers,
             errorContext
         });
+        if (accessToken) {
+            json.accessToken = accessToken;
+        }
+        return json;
     }
     return await requestWithParameters({
         baseUrl: dataUrl,