@deck.gl/carto 9.0.1 → 9.0.3

package/dist/api/request-with-parameters.d.ts

@@ -1,6 +1,5 @@
 import type { APIErrorContext } from "./types.js";
-export declare function requestWithParameters<T = any>({ accessToken, baseUrl, parameters, headers: customHeaders, errorContext }: {
-    accessToken?: string;
+export declare function requestWithParameters<T = any>({ baseUrl, parameters, headers: customHeaders, errorContext }: {
     baseUrl: string;
     parameters?: Record<string, string>;
     headers: Record<string, string>;

package/dist/api/request-with-parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-with-parameters.d.ts","sourceRoot":"","sources":["../../src/api/request-with-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,eAAe,EAAC,mBAAgB;AAU7C,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,EACnD,WAAW,EACX,OAAO,EACP,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,EACb,EAAE;IACD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,EAAE,eAAe,CAAC;CAC/B,GAAG,OAAO,CAAC,CAAC,CAAC,CAqCb"}
+{"version":3,"file":"request-with-parameters.d.ts","sourceRoot":"","sources":["../../src/api/request-with-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,eAAe,EAAC,mBAAgB;AAU7C,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,EACnD,OAAO,EACP,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,EACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,EAAE,eAAe,CAAC;CAC/B,GAAG,OAAO,CAAC,CAAC,CAAC,CAkCb"}

package/dist/api/request-with-parameters.js

@@ -7,7 +7,7 @@ function encodeParameter(name, value) {
     return `${name}=${encodeURIComponent(value)}`;
 }
 const REQUEST_CACHE = new Map();
-export async function requestWithParameters({ accessToken, baseUrl, parameters, headers: customHeaders, errorContext }) {
+export async function requestWithParameters({ baseUrl, parameters, headers: customHeaders, errorContext }) {
     const key = createCacheKey(baseUrl, parameters || {}, customHeaders || {});
     if (REQUEST_CACHE.has(key)) {
         return REQUEST_CACHE.get(key);
@@ -28,9 +28,6 @@ export async function requestWithParameters({ accessToken, baseUrl, parameters,
         if (!response || !response.ok) {
             throw new Error(json.error);
         }
-        if (accessToken) {
-            json.accessToken = accessToken;
-        }
         return json;
     })
         .catch((error) => {

package/dist/cartoRasterTile-worker.js

@@ -1041,7 +1041,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.1" : "latest";
+  var VERSION = true ? "9.0.3" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/cartoSpatialTile-worker.js

@@ -1430,7 +1430,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.0.1" : "latest";
+  var VERSION = true ? "9.0.3" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -1658,7 +1658,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.0.1" : "latest";
+  var VERSION = true ? "9.0.3" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/dist.dev.js

@@ -9272,8 +9272,9 @@ var __exports__ = (() => {
     return { west, south, east, north };
   }
   var BIAS = 2;
-  function getHexagonResolution(viewport) {
-    const hexagonScaleFactor = 2 / 3 * viewport.zoom;
+  function getHexagonResolution(viewport, tileSize) {
+    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));
     return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));
   }
@@ -9282,7 +9283,8 @@ var __exports__ = (() => {
       if (viewport.latitude === void 0)
         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) {
         return [];
@@ -9967,13 +9969,13 @@ var __exports__ = (() => {
       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)
         );
       }
       return [
@@ -13050,7 +13052,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   }
   var REQUEST_CACHE = /* @__PURE__ */ new Map();
   async function requestWithParameters({
-    accessToken,
     baseUrl: baseUrl2,
     parameters,
     headers: customHeaders,
@@ -13071,9 +13072,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       if (!response || !response.ok) {
         throw new Error(json.error);
       }
-      if (accessToken) {
-        json.accessToken = accessToken;
-      }
       return json;
     }).catch((error) => {
       REQUEST_CACHE.delete(key);
@@ -13133,12 +13131,15 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     }
     errorContext.requestType = "Map data";
     if (format2 === "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,

package/dist/index.cjs

@@ -98,8 +98,9 @@ function tileToBoundingBox(index) {
   return { west, south, east, north };
 }
 var BIAS = 2;
-function getHexagonResolution(viewport) {
-  const hexagonScaleFactor = 2 / 3 * viewport.zoom;
+function getHexagonResolution(viewport, tileSize) {
+  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));
   return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));
 }
@@ -108,7 +109,8 @@ var H3Tileset2D = class extends import_geo_layers._Tileset2D {
     if (viewport.latitude === void 0)
       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) {
       return [];
@@ -245,7 +247,7 @@ function scaleIdentity() {
 }
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION = true ? "9.0.0" : "latest";
+var VERSION = true ? "9.0.2" : "latest";
 var id = "cartoRasterTile";
 var DEFAULT_OPTIONS = {
   cartoRasterTile: {
@@ -516,7 +518,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION2 = true ? "9.0.0" : "latest";
+var VERSION2 = true ? "9.0.2" : "latest";
 var id2 = "cartoSpatialTile";
 var DEFAULT_OPTIONS2 = {
   cartoSpatialTile: {
@@ -721,10 +723,10 @@ var _H3TileLayer = class extends import_core5.CompositeLayer {
     const { tiles: data } = tileJSON;
     let { minresolution, maxresolution } = 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));
     }
     return [
       new SpatialIndexTileLayer(this.props, {
@@ -1268,7 +1270,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION3 = true ? "9.0.0" : "latest";
+var VERSION3 = true ? "9.0.2" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -1625,7 +1627,7 @@ function encodeParameter(name, value) {
   return `${name}=${encodeURIComponent(value)}`;
 }
 var REQUEST_CACHE = /* @__PURE__ */ new Map();
-async function requestWithParameters({ accessToken, baseUrl: baseUrl2, parameters, headers: customHeaders, errorContext }) {
+async function requestWithParameters({ baseUrl: baseUrl2, parameters, headers: customHeaders, errorContext }) {
   const key = createCacheKey(baseUrl2, parameters || {}, customHeaders || {});
   if (REQUEST_CACHE.has(key)) {
     return REQUEST_CACHE.get(key);
@@ -1641,9 +1643,6 @@ async function requestWithParameters({ accessToken, baseUrl: baseUrl2, parameter
     if (!response || !response.ok) {
       throw new Error(json.error);
     }
-    if (accessToken) {
-      json.accessToken = accessToken;
-    }
     return json;
   }).catch((error) => {
     REQUEST_CACHE.delete(key);
@@ -1701,12 +1700,15 @@ 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,