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

package/dist/index.cjs

@@ -63,29 +63,45 @@ var import_geo_layers3 = require("@deck.gl/geo-layers");
 // dist/layers/h3-tileset-2d.js
 var import_geo_layers = require("@deck.gl/geo-layers");
 var import_h3_js = require("h3-js");
+var MAX_LATITUDE = 85.051128;
+function padBoundingBox({ west, north, east, south }, resolution) {
+  const corners = [
+    [north, east],
+    [south, east],
+    [south, west],
+    [north, west]
+  ];
+  const cornerCells = corners.map((c) => (0, import_h3_js.latLngToCell)(c[0], c[1], resolution));
+  const cornerEdgeLengths = cornerCells.map((c) => Math.max(...(0, import_h3_js.originToDirectedEdges)(c).map((e) => (0, import_h3_js.edgeLength)(e, import_h3_js.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) {
     const nSegments = Math.ceil(longitudeSpan / 180);
-    let h3Indices2 = [];
+    let h3Indices = [];
     for (let s = 0; s < nSegments; s++) {
-      const segmentEast = east + s * 180;
-      const segmentWest = Math.min(segmentEast + 179.9999999, west);
-      h3Indices2 = h3Indices2.concat(getHexagonsInBoundingBox({ west: segmentWest, north, east: segmentEast, south }, resolution));
+      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(h3Indices2)];
-  }
-  const oversample = 2;
-  const h3Indices = (0, import_h3_js.polygonToCells)([
-    [
-      [west, north],
-      [west, south],
-      [east, south],
-      [east, north],
-      [west, north]
-    ]
-  ], resolution + oversample, true);
-  return oversample ? [...new Set(h3Indices.map((i) => (0, import_h3_js.cellToParent)(i, resolution)))] : h3Indices;
+    return [...new Set(h3Indices)];
+  }
+  const polygon = [
+    [north, east],
+    [south, east],
+    [south, west],
+    [north, west],
+    [north, east]
+  ];
+  return (0, import_h3_js.polygonToCells)(polygon, resolution);
 }
 function tileToBoundingBox(index) {
   const coordinates = (0, import_h3_js.cellToBoundary)(index);
@@ -98,8 +114,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));
 }
@@ -107,8 +124,9 @@ var H3Tileset2D = class extends import_geo_layers._Tileset2D {
   getTileIndices({ viewport, minZoom, maxZoom }) {
     if (viewport.latitude === void 0)
       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) {
       return [];
@@ -118,7 +136,8 @@ var H3Tileset2D = class extends import_geo_layers._Tileset2D {
       const center = (0, import_h3_js.latLngToCell)(viewport.latitude, viewport.longitude, maxZoom);
       indices = (0, import_h3_js.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 }));
   }
@@ -245,7 +264,7 @@ function scaleIdentity() {
 }
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION = true ? "9.0.0-beta.9" : "latest";
+var VERSION = true ? "9.0.0-beta.11" : "latest";
 var id = "cartoRasterTile";
 var DEFAULT_OPTIONS = {
   cartoRasterTile: {
@@ -516,7 +535,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION2 = true ? "9.0.0-beta.9" : "latest";
+var VERSION2 = true ? "9.0.0-beta.11" : "latest";
 var id2 = "cartoSpatialTile";
 var DEFAULT_OPTIONS2 = {
   cartoSpatialTile: {
@@ -721,10 +740,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 +1287,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-beta.9" : "latest";
+var VERSION3 = true ? "9.0.0-beta.11" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -1585,12 +1604,14 @@ function formatErrorKey(key) {
 }
 
 // dist/api/common.js
+var import_core11 = require("@deck.gl/core");
 var DEFAULT_API_BASE_URL = "https://gcp-us-east1.api.carto.com";
 var DEFAULT_CLIENT = "deck-gl-carto";
 var V3_MINOR_VERSION = "3.4";
 var MAX_GET_LENGTH = 8192;
 var DEFAULT_PARAMETERS = {
-  v: V3_MINOR_VERSION
+  v: V3_MINOR_VERSION,
+  deckglVersion: import_core11.VERSION
 };
 var DEFAULT_HEADERS = {
   Accept: "application/json",
@@ -1625,7 +1646,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 +1662,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 +1719,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,
@@ -1887,7 +1908,7 @@ var vectorTilesetSource = async function(options) {
 
 // dist/api/parse-map.js
 var import_constants12 = require("@luma.gl/constants");
-var import_core11 = require("@deck.gl/core");
+var import_core12 = require("@deck.gl/core");
 
 // dist/api/layer-map.js
 var import_d3_array = require("d3-array");
@@ -2278,7 +2299,7 @@ function parseMap(json) {
           ...createLoadOptions(token)
         });
       } catch (e) {
-        import_core11.log.error(e.message)();
+        import_core12.log.error(e.message)();
         return void 0;
       }
     })