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

package/build/api-client.cjs

@@ -103,11 +103,11 @@ __export(src_exports, {
   ApiVersion: () => ApiVersion,
   BASEMAP: () => basemap_styles_default,
   CartoAPIError: () => CartoAPIError,
+  CellSet: () => CellSet,
   DEFAULT_API_BASE_URL: () => DEFAULT_API_BASE_URL,
   FEATURE_GEOM_PROPERTY: () => FEATURE_GEOM_PROPERTY,
   FilterType: () => FilterType,
   OPACITY_MAP: () => OPACITY_MAP,
-  OTHERS_CATEGORY_NAME: () => OTHERS_CATEGORY_NAME,
   Provider: () => Provider,
   SOURCE_DEFAULTS: () => SOURCE_DEFAULTS,
   SchemaFieldType: () => SchemaFieldType,
@@ -5664,15 +5664,20 @@ function tileFeaturesRaster({
   const tileResolution = (0, import_quadbin2.getResolution)(tiles[0].index.q);
   const tileBlockSize = tiles[0].data.blockSize;
   const cellResolution = tileResolution + BigInt(Math.log2(tileBlockSize));
-  const spatialFilterCells = new Set(
-    (0, import_quadbin2.geometryToCells)(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 = (0, import_quadbin2.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((0, import_quadbin2.geometryToCells)(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) {
@@ -5684,7 +5689,7 @@ function tileFeaturesRaster({
         }
       }
       if (cellDataExists) {
-        data.set(children[i], cellData);
+        data.set(tileSortedCells[i], cellData);
       }
     }
   }
@@ -6529,7 +6534,7 @@ var WidgetRemoteSource = class extends WidgetSource {
       spatialFiltersMode,
       ...params
     } = options;
-    const { column, operation: operation2, operationColumn, operationExp, othersThreshold } = params;
+    const { column, operation: operation2, operationColumn, operationExp } = params;
     if (operation2 === AggregationTypes.Custom) {
       assert2(operationExp, "operationExp is required for custom operation");
     }
@@ -6544,8 +6549,7 @@ var WidgetRemoteSource = class extends WidgetSource {
         column,
         operation: operation2,
         operationExp,
-        operationColumn: operationColumn || column,
-        othersThreshold
+        operationColumn: operationColumn || column
       },
       opts: { signal, headers: this.props.headers }
     }).then((res) => normalizeObjectKeys(res.rows));
@@ -6948,19 +6952,12 @@ function normalizeSortByOptions({
 
 // src/operations/groupBy.ts
 init_cjs_shims();
-
-// src/widget-sources/constants.ts
-init_cjs_shims();
-var OTHERS_CATEGORY_NAME = "_carto_others";
-
-// src/operations/groupBy.ts
 function groupValuesByColumn({
   data,
   valuesColumns,
   joinOperation,
   keysColumn,
-  operation: operation2,
-  othersThreshold
+  operation: operation2
 }) {
   if (Array.isArray(data) && data.length === 0) {
     return null;
@@ -6978,23 +6975,13 @@ function groupValuesByColumn({
     return accumulator;
   }, /* @__PURE__ */ new Map());
   const targetOperation = aggregationFunctions[operation2];
-  if (!targetOperation) {
-    return [];
-  }
-  const allCategories = Array.from(groups).map(([name, value]) => ({
-    name,
-    value: targetOperation(value)
-  }));
-  allCategories.sort((a, b) => b.value - a.value);
-  if (othersThreshold && allCategories.length > othersThreshold) {
-    const otherNames = allCategories.map((entry) => entry.name).slice(othersThreshold);
-    const otherValue = otherNames.flatMap((name) => groups.get(name));
-    allCategories.push({
-      name: OTHERS_CATEGORY_NAME,
-      value: targetOperation(otherValue)
-    });
+  if (targetOperation) {
+    return Array.from(groups).map(([name, value]) => ({
+      name,
+      value: targetOperation(value)
+    }));
   }
-  return allCategories;
+  return [];
 }
 
 // src/operations/groupByDate.ts
@@ -7568,8 +7555,7 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
     joinOperation,
     filters,
     filterOwner,
-    spatialFilter,
-    othersThreshold
+    spatialFilter
   }) {
     const filteredFeatures = this._getFilteredFeatures(
       spatialFilter,
@@ -7585,8 +7571,7 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
       valuesColumns: normalizeColumns(operationColumn || column),
       joinOperation,
       keysColumn: column,
-      operation: operation2,
-      othersThreshold
+      operation: operation2
     });
     return groups || [];
   }
@@ -10309,17 +10294,74 @@ function _getHexagonResolution(viewport, tileSize) {
     Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS)
   );
 }
+
+// src/utils/CellSet.ts
+init_cjs_shims();
+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;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AggregationTypes,
   ApiVersion,
   BASEMAP,
   CartoAPIError,
+  CellSet,
   DEFAULT_API_BASE_URL,
   FEATURE_GEOM_PROPERTY,
   FilterType,
   OPACITY_MAP,
-  OTHERS_CATEGORY_NAME,
   Provider,
   SOURCE_DEFAULTS,
   SchemaFieldType,