@deck.gl/carto 9.0.1 → 9.0.3

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;AAU5E,MAAM,MAAM,WAAW,GAAG;IAAC,CAAC,EAAE,MAAM,CAAA;CAAC,CAAC;AA0DtC,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;IA0B3D,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

@@ -43,8 +43,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));
@@ -60,7 +63,8 @@ export default class H3Tileset2D extends Tileset2D {
         if (viewport.latitude === undefined)
             return [];
         const [east, south, west, north] = viewport.getBounds();
-        let z = getHexagonResolution(viewport);
+        const { tileSize } = this.opts;
+        let z = getHexagonResolution(viewport, tileSize);
         let indices;
         if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
             // TODO support `extent` prop

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" !== 'undefined' ? "9.0.0" : 'latest';
+const VERSION = typeof "9.0.2" !== 'undefined' ? "9.0.2" : '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" !== 'undefined' ? "9.0.0" : 'latest';
+const VERSION = typeof "9.0.2" !== 'undefined' ? "9.0.2" : '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" !== 'undefined' ? "9.0.0" : 'latest';
+const VERSION = typeof "9.0.2" !== 'undefined' ? "9.0.2" : 'latest';
 const id = 'cartoVectorTile';
 const DEFAULT_OPTIONS = {
     cartoVectorTile: {

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,