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

package/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## 0.5
 
+## 0.5.8
+
+- feat(widgets): Add othersThreshold to WidgetSource.getCategories (#194)
+- perf(rasters): Improve performance of raster widget spatial filtering (#207)
+
 ### 0.5.7
 
 - feat(widgets): Allow local widget calculations without spatial filter (#204)

package/build/api-client.cjs

@@ -159,7 +159,6 @@ __export(src_exports, {
   getLayerProps: () => getLayerProps,
   getMaxMarkerSize: () => getMaxMarkerSize,
   getSizeAccessor: () => getSizeAccessor,
-  getSorter: () => getSorter,
   getSpatialIndexFromGeoColumn: () => getSpatialIndexFromGeoColumn,
   getTextAccessor: () => getTextAccessor,
   groupValuesByColumn: () => groupValuesByColumn,
@@ -5717,7 +5716,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;
@@ -5745,17 +5744,19 @@ function isRasterTile(tile) {
 function isRasterTileVisible(tile) {
   return !!(tile.isVisible && tile.data?.cells?.numericProps);
 }
-function cellToChildrenSorted(parent, resolution) {
-  return (0, import_quadbin3.cellToChildren)(parent, resolution).sort(
-    (cellA, cellB) => {
-      const tileA = (0, import_quadbin3.cellToTile)(cellA);
-      const tileB = (0, import_quadbin3.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 = (0, import_quadbin3.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((0, import_quadbin3.tileToCell)({ x, y, z: childZ }));
+  }
+  return cells;
 }
 function isValidBandValue(value, nodata) {
   return Number.isNaN(value) ? false : nodata !== value;
@@ -6082,7 +6083,8 @@ async function requestWithParameters({
   headers: customHeaders = {},
   errorContext,
   maxLengthURL = DEFAULT_MAX_LENGTH_URL,
-  localCache
+  localCache,
+  signal
 }) {
   parameters = {
     v: V3_MINOR_VERSION,
@@ -6105,8 +6107,9 @@ async function requestWithParameters({
   const fetchPromise = url.length > maxLengthURL ? fetch(baseUrl, {
     method: "POST",
     body: JSON.stringify(parameters),
-    headers
-  }) : fetch(url, { headers });
+    headers,
+    signal
+  }) : fetch(url, { headers, signal });
   let response;
   let responseJson;
   const jsonPromise = fetchPromise.then((_response) => {
@@ -6205,7 +6208,7 @@ async function baseSource(endpoint, options, urlParameters) {
     Authorization: `Bearer ${options.accessToken}`,
     ...options.headers
   };
-  const parameters = { client: clientId, ...urlParameters };
+  const parameters = { client: clientId, ...options.tags, ...urlParameters };
   const errorContext = {
     requestType: "Map instantiation",
     connection: options.connectionName,
@@ -6426,7 +6429,8 @@ function executeModel(props) {
     filtersLogicalOperator = "and",
     spatialDataType = "geo",
     spatialDataColumn = DEFAULT_GEO_COLUMN,
-    spatialFiltersMode = "intersects"
+    spatialFiltersMode = "intersects",
+    tags
   } = source;
   const queryParams = {
     type,
@@ -6435,7 +6439,8 @@ function executeModel(props) {
     params,
     queryParameters: source.queryParameters || "",
     filters,
-    filtersLogicalOperator
+    filtersLogicalOperator,
+    tags
   };
   queryParams.spatialDataType = spatialDataType;
   queryParams.spatialDataColumn = spatialDataColumn;
@@ -6570,7 +6575,8 @@ var WidgetRemoteSource = class extends WidgetSource {
       filters: getApplicableFilters(filterOwner, filters || props.filters),
       filtersLogicalOperator: props.filtersLogicalOperator,
       spatialDataType: props.spatialDataType,
-      spatialDataColumn: props.spatialDataColumn
+      spatialDataColumn: props.spatialDataColumn,
+      tags: props.tags
     };
   }
   async getCategories(options) {
@@ -6583,14 +6589,7 @@ var WidgetRemoteSource = class extends WidgetSource {
       rawResult,
       ...params
     } = options;
-    const {
-      column,
-      operation: operation2,
-      operationColumn,
-      operationExp,
-      othersThreshold,
-      orderBy
-    } = params;
+    const { column, operation: operation2, operationColumn, operationExp, othersThreshold } = params;
     if (operation2 === AggregationTypes.Custom) {
       assert2(operationExp, "operationExp is required for custom operation");
     }
@@ -6606,8 +6605,7 @@ var WidgetRemoteSource = class extends WidgetSource {
         operation: operation2,
         operationExp,
         operationColumn: operationColumn || column,
-        othersThreshold,
-        orderBy
+        othersThreshold
       },
       opts: { signal, headers: this.props.headers }
     });
@@ -7027,8 +7025,7 @@ function groupValuesByColumn({
   joinOperation,
   keysColumn,
   operation: operation2,
-  othersThreshold,
-  orderBy = "frequency_desc"
+  othersThreshold
 }) {
   if (Array.isArray(data) && data.length === 0) {
     return { rows: null };
@@ -7052,7 +7049,7 @@ 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));
     return {
@@ -7066,21 +7063,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/operations/groupByDate.ts
 init_cjs_shims();
@@ -7655,7 +7637,6 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
     filterOwner,
     spatialFilter,
     othersThreshold,
-    orderBy = "frequency_desc",
     rawResult
   }) {
     const filteredFeatures = this._getFilteredFeatures(
@@ -7673,8 +7654,7 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
       joinOperation,
       keysColumn: column,
       operation: operation2,
-      othersThreshold,
-      orderBy
+      othersThreshold
     });
     if (rawResult) {
       return result;
@@ -8409,7 +8389,8 @@ var query = async function(options) {
     localCache,
     connectionName,
     sqlQuery,
-    queryParameters
+    queryParameters,
+    internalParameters
   } = options;
   const urlParameters = { q: sqlQuery };
   if (queryParameters) {
@@ -8420,7 +8401,12 @@ var query = async function(options) {
     Authorization: `Bearer ${options.accessToken}`,
     ...options.headers
   };
-  const parameters = { client: clientId, ...urlParameters };
+  const parameters = {
+    client: clientId,
+    ...options.tags,
+    ...internalParameters,
+    ...urlParameters
+  };
   const errorContext = {
     requestType: "SQL",
     connection: options.connectionName,
@@ -8433,7 +8419,8 @@ var query = async function(options) {
     headers,
     errorContext,
     maxLengthURL,
-    localCache
+    localCache,
+    signal: options.signal
   });
 };
 
@@ -10529,7 +10516,6 @@ function hashBuckets(initialCount) {
   getLayerProps,
   getMaxMarkerSize,
   getSizeAccessor,
-  getSorter,
   getSpatialIndexFromGeoColumn,
   getTextAccessor,
   groupValuesByColumn,