@carto/api-client 0.5.8-alpha-others-orderby.1 → 0.5.8

package/build/worker.js

@@ -5414,11 +5414,7 @@ var DEFAULT_AGGREGATION_EXP_ALIAS = "__aggregationValue";
 var DEFAULT_AGGREGATION_EXP = `1 AS ${DEFAULT_AGGREGATION_EXP_ALIAS}`;
 
 // src/filters/tileFeaturesRaster.ts
-import {
-  cellToChildren as _cellToChildren,
-  cellToTile,
-  getResolution as getResolution2
-} from "quadbin";
+import { cellToTile, getResolution as getResolution2, tileToCell } from "quadbin";
 function tileFeaturesRaster({
   tiles,
   ...options
@@ -5441,7 +5437,7 @@ function tileFeaturesRaster({
       options.spatialFilter
     );
     if (intersection3 === false) continue;
-    const tileSortedCells = cellToChildrenSorted(parent, cellResolution);
+    const tileSortedCells = cellToChildrenRaster(parent, cellResolution);
     for (let i = 0; i < tileSortedCells.length; i++) {
       if (intersection3 !== true && !intersection3.has(tileSortedCells[i])) {
         continue;
@@ -5469,17 +5465,19 @@ function isRasterTile(tile) {
 function isRasterTileVisible(tile) {
   return !!(tile.isVisible && tile.data?.cells?.numericProps);
 }
-function cellToChildrenSorted(parent, resolution) {
-  return _cellToChildren(parent, resolution).sort(
-    (cellA, cellB) => {
-      const tileA = cellToTile(cellA);
-      const tileB = cellToTile(cellB);
-      if (tileA.y !== tileB.y) {
-        return tileA.y > tileB.y ? 1 : -1;
-      }
-      return tileA.x > tileB.x ? 1 : -1;
-    }
-  );
+function cellToChildrenRaster(parent, resolution) {
+  const parentTile = cellToTile(parent);
+  const childZ = Number(resolution);
+  const blockSize = 2 ** (childZ - parentTile.z);
+  const childBaseX = parentTile.x * blockSize;
+  const childBaseY = parentTile.y * blockSize;
+  const cells = [];
+  for (let i = 0, il = blockSize ** 2; i < il; i++) {
+    const x = childBaseX + i % blockSize;
+    const y = childBaseY + Math.floor(i / blockSize);
+    cells.push(tileToCell({ x, y, z: childZ }));
+  }
+  return cells;
 }
 function isValidBandValue(value, nodata) {
   return Number.isNaN(value) ? false : nodata !== value;
@@ -5678,9 +5676,6 @@ function normalizeSortByOptions({
   });
 }
 
-// src/widget-sources/constants.ts
-var OTHERS_CATEGORY_NAME = "_carto_others";
-
 // src/operations/groupBy.ts
 function groupValuesByColumn({
   data,
@@ -5688,8 +5683,7 @@ function groupValuesByColumn({
   joinOperation,
   keysColumn,
   operation: operation2,
-  othersThreshold,
-  orderBy = "frequency_desc"
+  othersThreshold
 }) {
   if (Array.isArray(data) && data.length === 0) {
     return { rows: null };
@@ -5713,13 +5707,9 @@ function groupValuesByColumn({
   const allCategories = Array.from(groups).map(([name, value]) => ({
     name,
     value: targetOperation(value)
-  })).sort(getSorter(orderBy));
+  })).sort((a, b) => b.value - a.value);
   if (othersThreshold && allCategories.length > othersThreshold) {
     const otherValue = allCategories.slice(othersThreshold).flatMap(({ name }) => groups.get(name));
-    allCategories.push({
-      name: OTHERS_CATEGORY_NAME,
-      value: targetOperation(otherValue)
-    });
     return {
       rows: allCategories,
       metadata: {
@@ -5731,21 +5721,6 @@ function groupValuesByColumn({
     rows: allCategories
   };
 }
-function getSorter(orderBy) {
-  switch (orderBy) {
-    case "frequency_asc":
-      return (a, b) => a.value - b.value || localeCompare(a.name, b.name);
-    case "frequency_desc":
-      return (a, b) => b.value - a.value || localeCompare(a.name, b.name);
-    case "alphabetical_asc":
-      return (a, b) => localeCompare(a.name, b.name) || b.value - a.value;
-    case "alphabetical_desc":
-      return (a, b) => localeCompare(b.name, a.name) || b.value - a.value;
-  }
-}
-function localeCompare(a, b) {
-  return (a ?? "null").localeCompare(b ?? "null");
-}
 
 // src/utils/dateUtils.ts
 function getUTCMonday(date) {
@@ -6249,6 +6224,9 @@ function getApplicableFilters(owner, filters) {
   return applicableFilters;
 }
 
+// src/widget-sources/constants.ts
+var OTHERS_CATEGORY_NAME = "_carto_others";
+
 // src/widget-sources/widget-tileset-source-impl.ts
 var WidgetTilesetSourceImpl = class extends WidgetSource {
   constructor() {
@@ -6365,7 +6343,6 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
     filterOwner,
     spatialFilter,
     othersThreshold,
-    orderBy = "frequency_desc",
     rawResult
   }) {
     const filteredFeatures = this._getFilteredFeatures(
@@ -6383,8 +6360,7 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
       joinOperation,
       keysColumn: column,
       operation: operation2,
-      othersThreshold,
-      orderBy
+      othersThreshold
     });
     if (rawResult) {
       return result;