@deck.gl/carto 9.0.0 → 9.0.2

package/package.json

@@ -3,7 +3,7 @@
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "publishConfig": {
     "access": "public"
   },
@@ -47,7 +47,7 @@
     "@loaders.gl/mvt": "^4.1.4",
     "@loaders.gl/schema": "^4.1.4",
     "@loaders.gl/tiles": "^4.1.4",
-    "@luma.gl/constants": "^9.0.6",
+    "@luma.gl/constants": "^9.0.7",
     "@math.gl/web-mercator": "^4.0.0",
     "@types/d3-array": "^3.0.2",
     "@types/d3-color": "^1.4.2",
@@ -72,5 +72,5 @@
     "@loaders.gl/core": "^4.1.0",
     "@luma.gl/core": "^9.0.0"
   },
-  "gitHead": "fcb5ccf0a899e651949b24986488211e278e9321"
+  "gitHead": "4f17a7e9b7a68187990b0cfb0239ad9a186df0f6"
 }

package/src/api/request-with-parameters.ts

@@ -11,13 +11,11 @@ function encodeParameter(name: string, value: string | boolean | number): string
 
 const REQUEST_CACHE = new Map<string, Promise<unknown>>();
 export async function requestWithParameters<T = any>({
-  accessToken,
   baseUrl,
   parameters,
   headers: customHeaders,
   errorContext
 }: {
-  accessToken?: string;
   baseUrl: string;
   parameters?: Record<string, string>;
   headers: Record<string, string>;
@@ -47,9 +45,6 @@ export async function requestWithParameters<T = any>({
       if (!response || !response.ok) {
         throw new Error(json.error);
       }
-      if (accessToken) {
-        json.accessToken = accessToken;
-      }
       return json;
     })
     .catch((error: Error) => {

package/src/layers/h3-tile-layer.ts

@@ -61,13 +61,13 @@ export default class H3TileLayer<DataT = any, ExtraPropsT extends {} = {}> exten
     if (this.props.minZoom) {
       minresolution = Math.max(
         minresolution,
-        getHexagonResolution({zoom: this.props.minZoom, latitude: 0})
+        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})
+        getHexagonResolution({zoom: this.props.maxZoom, latitude: 0}, this.props.tileSize)
       );
     }
 

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

@@ -66,8 +66,14 @@ function tileToBoundingBox(index: string): GeoBoundingBox {
 // similar
 // Relative scale factor (0 = no biasing, 2 = a few hexagons cover view)
 const BIAS = 2;
-export function getHexagonResolution(viewport): number {
-  const hexagonScaleFactor = (2 / 3) * viewport.zoom;
+export function getHexagonResolution(
+  viewport: {zoom: number; latitude: number},
+  tileSize: number
+): number {
+  // 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
@@ -84,8 +90,9 @@ export default class H3Tileset2D extends Tileset2D {
   getTileIndices({viewport, minZoom, maxZoom}): H3TileIndex[] {
     if (viewport.latitude === undefined) return [];
     const [east, south, west, north] = viewport.getBounds();
+    const {tileSize} = this.opts;
 
-    let z = getHexagonResolution(viewport);
+    let z = getHexagonResolution(viewport, tileSize);
     let indices: string[];
     if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
       // TODO support `extent` prop

package/src/sources/base-source.ts

@@ -56,12 +56,15 @@ export async function baseSource<UrlParameters extends Record<string, string>>(
   errorContext.requestType = 'Map data';
 
   if (format === 'tilejson') {
-    return await requestWithParameters<TilejsonResult>({
-      accessToken,
+    const json = await requestWithParameters<TilejsonResult>({
       baseUrl: dataUrl,
       headers,
       errorContext
     });
+    if (accessToken) {
+      json.accessToken = accessToken;
+    }
+    return json;
   }
 
   return await requestWithParameters<GeojsonResult | JsonResult>({