@deck.gl/carto 9.1.11 → 9.1.13

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.1.11",
+  "version": "9.1.13",
   "publishConfig": {
     "access": "public"
   },
@@ -75,5 +75,5 @@
     "@loaders.gl/core": "^4.2.0",
     "@luma.gl/core": "^9.1.5"
   },
-  "gitHead": "13816c3da4f7deab1538dbc590d5267349a512e2"
+  "gitHead": "2befca58db3a98e84739804f74806f3cbe94ce38"
 }

package/src/api/fetch-map.ts

@@ -30,6 +30,7 @@ import {ParseMapResult, parseMap} from './parse-map';
 import {assert} from '../utils';
 import type {Basemap} from './types';
 import {fetchBasemapProps} from './basemap';
+import {DEFAULT_AGGREGATION_EXP} from '../constants';
 
 type Dataset = {
   id: string;
@@ -88,14 +89,24 @@ async function _fetchMapDataset(dataset: Dataset, context: _FetchMapContext) {
         });
       }
     } else if (spatialDataType === 'h3') {
-      const options = {...globalOptions, aggregationExp, aggregationResLevel, spatialDataColumn};
+      const options = {
+        ...globalOptions,
+        aggregationExp: aggregationExp || DEFAULT_AGGREGATION_EXP,
+        aggregationResLevel,
+        spatialDataColumn
+      };
       if (type === 'table') {
         dataset.data = await h3TableSource({...options, tableName: source});
       } else if (type === 'query') {
         dataset.data = await h3QuerySource({...options, sqlQuery: source, queryParameters});
       }
     } else if (spatialDataType === 'quadbin') {
-      const options = {...globalOptions, aggregationExp, aggregationResLevel, spatialDataColumn};
+      const options = {
+        ...globalOptions,
+        aggregationExp: aggregationExp || DEFAULT_AGGREGATION_EXP,
+        aggregationResLevel,
+        spatialDataColumn
+      };
       if (type === 'table') {
         dataset.data = await quadbinTableSource({...options, tableName: source});
       } else if (type === 'query') {

package/src/constants.ts

@@ -3,3 +3,6 @@
 // Copyright (c) vis.gl contributors
 
 export const DEFAULT_TILE_SIZE = 512;
+
+export const DEFAULT_AGGREGATION_EXP_ALIAS = '__aggregationValue';
+export const DEFAULT_AGGREGATION_EXP = `1 AS ${DEFAULT_AGGREGATION_EXP_ALIAS}`;

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

@@ -19,11 +19,19 @@ export type H3TileIndex = {i: string};
 
 const MAX_LATITUDE = 85.051128;
 
-// `polygonToCells()` fills based on hexagon center, this function will
-// pad the bounds such that all cells that overlap the bounds will be included
+/**
+ * `polygonToCells()` fills based on hexagon center, this function will
+ * pad the bounds such that all cells that overlap the bounds will be included.
+ *
+ * @param bbox - The bounding box to pad.
+ * @param resolution - The resolution of the hexagons.
+ * @param scale - The scale of the buffer. 1 is to pad by the max edge length of the tile cell.
+ * @returns The padded bounding box.
+ */
 function padBoundingBox(
   {west, north, east, south}: GeoBoundingBox,
-  resolution: number
+  resolution: number,
+  scale: number = 1.0
 ): GeoBoundingBox {
   const corners = [
     [north, east],
@@ -35,7 +43,7 @@ function padBoundingBox(
   const cornerEdgeLengths = cornerCells.map(
     c => (Math.max(...originToDirectedEdges(c).map(e => edgeLength(e, UNITS.rads))) * 180) / Math.PI
   );
-  const bufferLat = Math.max(...cornerEdgeLengths);
+  const bufferLat = Math.max(...cornerEdgeLengths) * scale;
   const bufferLon = Math.min(180, bufferLat / Math.cos((((north + south) / 2) * Math.PI) / 180));
 
   return {
@@ -84,7 +92,12 @@ function tileToBoundingBox(index: string): GeoBoundingBox {
   const south = Math.min(...latitudes);
   const east = Math.max(...longitudes);
   const north = Math.max(...latitudes);
-  return {west, south, east, north};
+  const bbox = {west, south, east, north};
+
+  // H3 child cells extend beyond their parent's boundary forming a "snowflake"
+  // fractal pattern. The required buffer is approximately 10% of the
+  // edge length of the tile cell, add a bit more to be safe.
+  return padBoundingBox(bbox, getResolution(index), 0.12);
 }
 
 // Resolution conversion function. Takes a WebMercatorViewport and returns