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

package/build/worker.js

@@ -5374,6 +5374,7 @@ 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
@@ -5391,15 +5392,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 Set(
-    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) {
@@ -5411,7 +5417,7 @@ function tileFeaturesRaster({
         }
       }
       if (cellDataExists) {
-        data.set(children[i], cellData);
+        data.set(tileSortedCells[i], cellData);
       }
     }
   }
@@ -5632,17 +5638,13 @@ function normalizeSortByOptions({
   });
 }
 
-// src/widget-sources/constants.ts
-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;
@@ -5660,23 +5662,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/utils/dateUtils.ts
@@ -6295,8 +6287,7 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
     joinOperation,
     filters,
     filterOwner,
-    spatialFilter,
-    othersThreshold
+    spatialFilter
   }) {
     const filteredFeatures = this._getFilteredFeatures(
       spatialFilter,
@@ -6312,8 +6303,7 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
       valuesColumns: normalizeColumns(operationColumn || column),
       joinOperation,
       keysColumn: column,
-      operation: operation2,
-      othersThreshold
+      operation: operation2
     });
     return groups || [];
   }