@carto/api-client 0.5.3 → 0.5.4-alpha.0

package/package.json

@@ -8,7 +8,7 @@
   "homepage": "https://github.com/CartoDB/carto-api-client#readme",
   "author": "Don McCurdy <donmccurdy@carto.com>",
   "packageManager": "yarn@4.3.1",
-  "version": "0.5.3",
+  "version": "0.5.4-alpha.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -128,5 +128,6 @@
   "resolutions": {
     "@carto/api-client": "portal:./",
     "rollup": "^4.20.0"
-  }
+  },
+  "stableVersion": "0.5.3"
 }

package/src/sources/h3-query-source.ts

@@ -3,6 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {DEFAULT_AGGREGATION_RES_LEVEL_H3} from '../constants-internal.js';
+import {getWidgetSpatialDataType} from '../utils.js';
 import {
   WidgetQuerySource,
   type WidgetQuerySourceResult,
@@ -72,7 +73,11 @@ export const h3QuerySource = async function (
         ...options,
         // NOTE: Parameters with default values above must be explicitly passed here.
         spatialDataColumn,
-        spatialDataType,
+        spatialDataType: getWidgetSpatialDataType(
+          spatialDataType,
+          spatialDataColumn,
+          result.schema
+        ),
       }),
     })
   );

package/src/sources/h3-table-source.ts

@@ -3,6 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {DEFAULT_AGGREGATION_RES_LEVEL_H3} from '../constants-internal.js';
+import {getWidgetSpatialDataType} from '../utils.js';
 import {
   WidgetTableSource,
   type WidgetTableSourceResult,
@@ -67,7 +68,11 @@ export const h3TableSource = async function (
         ...options,
         // NOTE: Parameters with default values above must be explicitly passed here.
         spatialDataColumn,
-        spatialDataType,
+        spatialDataType: getWidgetSpatialDataType(
+          spatialDataType,
+          spatialDataColumn,
+          result.schema
+        ),
       }),
     })
   );

package/src/sources/quadbin-query-source.ts

@@ -3,6 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN} from '../constants-internal.js';
+import {getWidgetSpatialDataType} from '../utils.js';
 import {
   WidgetQuerySource,
   type WidgetQuerySourceResult,
@@ -73,7 +74,11 @@ export const quadbinQuerySource = async function (
         ...options,
         // NOTE: Parameters with default values above must be explicitly passed here.
         spatialDataColumn,
-        spatialDataType,
+        spatialDataType: getWidgetSpatialDataType(
+          spatialDataType,
+          spatialDataColumn,
+          result.schema
+        ),
       }),
     })
   );

package/src/sources/quadbin-table-source.ts

@@ -3,6 +3,7 @@
 // Copyright (c) vis.gl contributors
 
 import {DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN} from '../constants-internal.js';
+import {getWidgetSpatialDataType} from '../utils.js';
 import {
   WidgetTableSource,
   type WidgetTableSourceResult,
@@ -68,7 +69,11 @@ export const quadbinTableSource = async function (
         ...options,
         // NOTE: Parameters with default values above must be explicitly passed here.
         spatialDataColumn,
-        spatialDataType,
+        spatialDataType: getWidgetSpatialDataType(
+          spatialDataType,
+          spatialDataColumn,
+          result.schema
+        ),
       }),
     })
   );

package/src/utils.ts

@@ -1,5 +1,6 @@
-import type {Filter} from './types.js';
+import {SchemaFieldType, type Filter, type SchemaField} from './types.js';
 import {FilterType} from './constants.js';
+import type {SpatialDataType} from './sources/types.js';
 
 const FILTER_TYPES = new Set(Object.values(FilterType));
 const isFilterType = (type: string): type is FilterType =>
@@ -127,3 +128,21 @@ export function assignOptional<T extends object, U>(
   }
   return target as T & U;
 }
+
+/**
+ * Returns the spatialDataType expected for widget operations, given layer source props. The
+ * spatialDataType used in widget operations may be different from that of the layer. For
+ * dynamically aggregated point datasets, widgets use type 'geo', not the aggregation type.
+ */
+export function getWidgetSpatialDataType(
+  spatialDataType: SpatialDataType,
+  spatialDataColumn: string,
+  schema: SchemaField[]
+): SpatialDataType {
+  const field = schema.find((field) => field.name === spatialDataColumn);
+  if (field && field.type === SchemaFieldType.Geometry) {
+    return 'geo';
+  }
+
+  return spatialDataType;
+}