@deck.gl/carto 9.0.6 → 9.0.8

package/dist/dist.dev.js

@@ -7800,7 +7800,7 @@ var __exports__ = (() => {
         if (moment2.version === void 0 && moment2.default) {
           moment2 = moment2.default;
         }
-        var VERSION4 = "0.5.45", zones = {}, links = {}, countries = {}, names = {}, guesses = {}, cachedGuess;
+        var VERSION5 = "0.5.45", zones = {}, links = {}, countries = {}, names = {}, guesses = {}, cachedGuess;
         if (!moment2 || typeof moment2.version !== "string") {
           logError("Moment Timezone requires Moment.js. See https://momentjs.com/timezone/docs/#/use-it/browser/");
         }
@@ -8204,7 +8204,7 @@ var __exports__ = (() => {
           out.tz(name);
           return out;
         }
-        tz.version = VERSION4;
+        tz.version = VERSION5;
         tz.dataVersion = "";
         tz._zones = zones;
         tz._links = links;
@@ -9231,35 +9231,49 @@ var __exports__ = (() => {
   // src/layers/h3-tileset-2d.ts
   var import_geo_layers = __toESM(require_geo_layers(), 1);
   var import_h3_js = __toESM(require_h3_js(), 1);
+  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(
+        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);
@@ -9282,7 +9296,7 @@ var __exports__ = (() => {
     getTileIndices({ viewport, minZoom, maxZoom }) {
       if (viewport.latitude === void 0)
         return [];
-      const [east, south, west, north] = viewport.getBounds();
+      const [west, south, east, north] = viewport.getBounds();
       const { tileSize } = this.opts;
       let z = getHexagonResolution(viewport, tileSize);
       let indices;
@@ -9294,7 +9308,8 @@ var __exports__ = (() => {
         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 }));
     }
@@ -10638,11 +10653,11 @@ void main(void) {
 
   // ../../node_modules/@loaders.gl/gis/dist/lib/binary-features/binary-to-geojson.js
   function binaryToGeojson(data, options) {
-    const globalFeatureId = options === null || options === void 0 ? void 0 : options.globalFeatureId;
+    const globalFeatureId = options?.globalFeatureId;
     if (globalFeatureId !== void 0) {
       return getSingleFeature(data, globalFeatureId);
     }
-    return parseFeatures(data, options === null || options === void 0 ? void 0 : options.type);
+    return parseFeatures(data, options?.type);
   }
   function getSingleFeature(data, globalFeatureId) {
     const dataArray = normalizeInput(data);
@@ -10680,7 +10695,7 @@ void main(void) {
         return polygonToGeoJson(data, startIndex, endIndex);
       default:
         const unexpectedInput = data;
-        throw new Error(`Unsupported geometry type: ${unexpectedInput === null || unexpectedInput === void 0 ? void 0 : unexpectedInput.type}`);
+        throw new Error(`Unsupported geometry type: ${unexpectedInput?.type}`);
     }
   }
   function normalizeInput(data, type) {
@@ -10724,33 +10739,20 @@ void main(void) {
     const geometry = binaryToGeometry(data, startIndex, endIndex);
     const properties = parseProperties(data, startIndex, endIndex);
     const fields = parseFields(data, startIndex, endIndex);
-    return {
-      type: "Feature",
-      geometry,
-      properties,
-      ...fields
-    };
+    return { type: "Feature", geometry, properties, ...fields };
   }
-  function parseFields(data) {
-    let startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-    let endIndex = arguments.length > 2 ? arguments[2] : void 0;
+  function parseFields(data, startIndex = 0, endIndex) {
     return data.fields && data.fields[data.featureIds.value[startIndex]];
   }
-  function parseProperties(data) {
-    let startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : 0;
-    let endIndex = arguments.length > 2 ? arguments[2] : void 0;
+  function parseProperties(data, startIndex = 0, endIndex) {
     const properties = Object.assign({}, data.properties[data.featureIds.value[startIndex]]);
     for (const key in data.numericProps) {
       properties[key] = data.numericProps[key].value[startIndex];
     }
     return properties;
   }
-  function polygonToGeoJson(data) {
-    let startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : -Infinity;
-    let endIndex = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : Infinity;
-    const {
-      positions
-    } = data;
+  function polygonToGeoJson(data, startIndex = -Infinity, endIndex = Infinity) {
+    const { positions } = data;
     const polygonIndices = data.polygonIndices.value.filter((x) => x >= startIndex && x <= endIndex);
     const primitivePolygonIndices = data.primitivePolygonIndices.value.filter((x) => x >= startIndex && x <= endIndex);
     const multi = polygonIndices.length > 2;
@@ -10762,10 +10764,7 @@ void main(void) {
         const ringCoordinates = ringToGeoJson(positions, startRingIndex, endRingIndex);
         coordinates2.push(ringCoordinates);
       }
-      return {
-        type: "Polygon",
-        coordinates: coordinates2
-      };
+      return { type: "Polygon", coordinates: coordinates2 };
     }
     const coordinates = [];
     for (let i = 0; i < polygonIndices.length - 1; i++) {
@@ -10774,52 +10773,31 @@ void main(void) {
       const polygonCoordinates = polygonToGeoJson(data, startPolygonIndex, endPolygonIndex).coordinates;
       coordinates.push(polygonCoordinates);
     }
-    return {
-      type: "MultiPolygon",
-      coordinates
-    };
+    return { type: "MultiPolygon", coordinates };
   }
-  function lineStringToGeoJson(data) {
-    let startIndex = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : -Infinity;
-    let endIndex = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : Infinity;
-    const {
-      positions
-    } = data;
+  function lineStringToGeoJson(data, startIndex = -Infinity, endIndex = Infinity) {
+    const { positions } = data;
     const pathIndices = data.pathIndices.value.filter((x) => x >= startIndex && x <= endIndex);
     const multi = pathIndices.length > 2;
     if (!multi) {
       const coordinates2 = ringToGeoJson(positions, pathIndices[0], pathIndices[1]);
-      return {
-        type: "LineString",
-        coordinates: coordinates2
-      };
+      return { type: "LineString", coordinates: coordinates2 };
     }
     const coordinates = [];
     for (let i = 0; i < pathIndices.length - 1; i++) {
       const ringCoordinates = ringToGeoJson(positions, pathIndices[i], pathIndices[i + 1]);
       coordinates.push(ringCoordinates);
     }
-    return {
-      type: "MultiLineString",
-      coordinates
-    };
+    return { type: "MultiLineString", coordinates };
   }
   function pointToGeoJson(data, startIndex, endIndex) {
-    const {
-      positions
-    } = data;
+    const { positions } = data;
     const coordinates = ringToGeoJson(positions, startIndex, endIndex);
     const multi = coordinates.length > 1;
     if (multi) {
-      return {
-        type: "MultiPoint",
-        coordinates
-      };
+      return { type: "MultiPoint", coordinates };
     }
-    return {
-      type: "Point",
-      coordinates: coordinates[0]
-    };
+    return { type: "Point", coordinates: coordinates[0] };
   }
   function ringToGeoJson(positions, startIndex, endIndex) {
     startIndex = startIndex || 0;
@@ -12995,12 +12973,14 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   }
 
   // src/api/common.ts
+  var import_core11 = __toESM(require_core(), 1);
   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",
@@ -14012,7 +13992,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   })(GLEnum || (GLEnum = {}));
 
   // src/api/parse-map.ts
-  var import_core11 = __toESM(require_core(), 1);
+  var import_core12 = __toESM(require_core(), 1);
 
   // src/api/layer-map.ts
   var import_moment_timezone = __toESM(require_moment_timezone2(), 1);
@@ -14406,7 +14386,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
             ...createLoadOptions(token)
           });
         } catch (e) {
-          import_core11.log.error(e.message)();
+          import_core12.log.error(e.message)();
           return void 0;
         }
       })

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);
@@ -108,7 +124,7 @@ 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();
+    const [west, south, east, north] = viewport.getBounds();
     const { tileSize } = this.opts;
     let z = getHexagonResolution(viewport, tileSize);
     let indices;
@@ -120,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 }));
   }
@@ -247,7 +264,7 @@ function scaleIdentity() {
 }
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION = true ? "9.0.6" : "latest";
+var VERSION = true ? "9.0.8" : "latest";
 var id = "cartoRasterTile";
 var DEFAULT_OPTIONS = {
   cartoRasterTile: {
@@ -518,7 +535,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION2 = true ? "9.0.6" : "latest";
+var VERSION2 = true ? "9.0.8" : "latest";
 var id2 = "cartoSpatialTile";
 var DEFAULT_OPTIONS2 = {
   cartoSpatialTile: {
@@ -1270,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.6" : "latest";
+var VERSION3 = true ? "9.0.8" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -1587,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",
@@ -1889,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");
@@ -2280,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;
       }
     })