@carto/api-client 0.5.7-alpha.5 → 0.5.7-alpha.6

package/build/api-client.js

@@ -5434,68 +5434,11 @@ var DEFAULT_AGGREGATION_EXP = `1 AS ${DEFAULT_AGGREGATION_EXP_ALIAS}`;
 // src/filters/tileFeaturesRaster.ts
 import {
   cellToChildren as _cellToChildren,
+  cellToBoundary,
   cellToTile,
   geometryToCells as geometryToCells2,
   getResolution as getResolution2
 } from "quadbin";
-
-// src/utils/CellSet.ts
-var EMPTY_U32 = 2 ** 32 - 1;
-var CellSet = class {
-  constructor(cells) {
-    /** List of cells stored by the set. Stored by reference, without copying. */
-    __publicField(this, "cells");
-    /** DataView representing a single cell ID. Pre-allocated to reduce memory during queries. */
-    __publicField(this, "cellView", new DataView(new ArrayBuffer(8)));
-    /** Hash table, mapping a hash index (computed) to an index in the 'cells' array. */
-    __publicField(this, "hashTable");
-    this.cells = cells;
-    this.hashTable = new Uint32Array(hashBuckets(cells.length)).fill(EMPTY_U32);
-    for (let cellIndex = 0; cellIndex < cells.length; cellIndex++) {
-      this.hashTable[this.hashLookup(cells[cellIndex])] = cellIndex;
-    }
-  }
-  has(cell) {
-    const hashIndex = this.hashLookup(cell);
-    return this.hashTable[hashIndex] !== EMPTY_U32;
-  }
-  hashLookup(cell) {
-    this.cellView.setBigUint64(0, cell);
-    const hashval = hash(this.cellView);
-    const hashmod = this.hashTable.length - 1;
-    let bucket = hashval & hashmod;
-    for (let probe = 0; probe <= hashmod; probe++) {
-      const cellIndex = this.hashTable[bucket];
-      if (cellIndex === EMPTY_U32 || cell === this.cells[cellIndex]) {
-        return bucket;
-      }
-      bucket = bucket + probe + 1 & hashmod;
-    }
-    throw new Error("Hash table full.");
-  }
-};
-function hash(view, h = 0) {
-  const m = 1540483477;
-  const r = 24;
-  for (let i = 0, il = view.byteLength / 4; i < il; i++) {
-    let k = view.getUint32(i * 4);
-    k = Math.imul(k, m) >>> 0;
-    k = (k ^ k >> r) >>> 0;
-    k = Math.imul(k, m) >>> 0;
-    h = Math.imul(h, m) >>> 0;
-    h = (h ^ k) >>> 0;
-  }
-  return h;
-}
-function hashBuckets(initialCount) {
-  let buckets = 1;
-  while (buckets < initialCount + initialCount / 4) {
-    buckets *= 2;
-  }
-  return buckets;
-}
-
-// src/filters/tileFeaturesRaster.ts
 function tileFeaturesRaster({
   tiles,
   ...options
@@ -5509,15 +5452,20 @@ function tileFeaturesRaster({
   const tileResolution = getResolution2(tiles[0].index.q);
   const tileBlockSize = tiles[0].data.blockSize;
   const cellResolution = tileResolution + BigInt(Math.log2(tileBlockSize));
-  const spatialFilterCells = new CellSet(
-    geometryToCells2(options.spatialFilter, cellResolution)
-  );
   const data = /* @__PURE__ */ new Map();
   for (const tile of tiles) {
     const parent = tile.index.q;
-    const children = cellToChildrenSorted(parent, cellResolution);
-    for (let i = 0; i < children.length; i++) {
-      if (!spatialFilterCells.has(children[i])) continue;
+    const tilePolygon = cellToBoundary(parent);
+    const tileFilter = turf_intersect_default(
+      featureCollection([feature(tilePolygon), feature(options.spatialFilter)])
+    );
+    const needsFilter = tileFilter ? !turf_boolean_within_default(tilePolygon, options.spatialFilter) : false;
+    const tileFilterCells = needsFilter ? new Set(geometryToCells2(tileFilter.geometry, cellResolution)) : null;
+    const tileSortedCells = cellToChildrenSorted(parent, cellResolution);
+    for (let i = 0; i < tileSortedCells.length; i++) {
+      if (needsFilter && !tileFilterCells.has(tileSortedCells[i])) {
+        continue;
+      }
       const cellData = {};
       let cellDataExists = false;
       for (const band in tile.data.cells.numericProps) {
@@ -5529,7 +5477,7 @@ function tileFeaturesRaster({
         }
       }
       if (cellDataExists) {
-        data.set(children[i], cellData);
+        data.set(tileSortedCells[i], cellData);
       }
     }
   }
@@ -10021,6 +9969,62 @@ function _getHexagonResolution(viewport, tileSize) {
     Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS)
   );
 }
+
+// src/utils/CellSet.ts
+var EMPTY_U32 = 2 ** 32 - 1;
+var CellSet = class {
+  constructor(cells) {
+    /** List of cells stored by the set. Stored by reference, without copying. */
+    __publicField(this, "cells");
+    /** DataView representing a single cell ID. Pre-allocated to reduce memory during queries. */
+    __publicField(this, "cellView", new DataView(new ArrayBuffer(8)));
+    /** Hash table, mapping a hash index (computed) to an index in the 'cells' array. */
+    __publicField(this, "hashTable");
+    this.cells = cells;
+    this.hashTable = new Uint32Array(hashBuckets(cells.length)).fill(EMPTY_U32);
+    for (let cellIndex = 0; cellIndex < cells.length; cellIndex++) {
+      this.hashTable[this.hashLookup(cells[cellIndex])] = cellIndex;
+    }
+  }
+  has(cell) {
+    const hashIndex = this.hashLookup(cell);
+    return this.hashTable[hashIndex] !== EMPTY_U32;
+  }
+  hashLookup(cell) {
+    this.cellView.setBigUint64(0, cell);
+    const hashval = hash(this.cellView);
+    const hashmod = this.hashTable.length - 1;
+    let bucket = hashval & hashmod;
+    for (let probe = 0; probe <= hashmod; probe++) {
+      const cellIndex = this.hashTable[bucket];
+      if (cellIndex === EMPTY_U32 || cell === this.cells[cellIndex]) {
+        return bucket;
+      }
+      bucket = bucket + probe + 1 & hashmod;
+    }
+    throw new Error("Hash table full.");
+  }
+};
+function hash(view, h = 0) {
+  const m = 1540483477;
+  const r = 24;
+  for (let i = 0, il = view.byteLength / 4; i < il; i++) {
+    let k = view.getUint32(i * 4);
+    k = Math.imul(k, m) >>> 0;
+    k = (k ^ k >> r) >>> 0;
+    k = Math.imul(k, m) >>> 0;
+    h = Math.imul(h, m) >>> 0;
+    h = (h ^ k) >>> 0;
+  }
+  return h;
+}
+function hashBuckets(initialCount) {
+  let buckets = 1;
+  while (buckets < initialCount + initialCount / 4) {
+    buckets *= 2;
+  }
+  return buckets;
+}
 export {
   AggregationTypes,
   ApiVersion,