@carto/api-client 0.5.28 → 0.5.30-alpha.143d135.117

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Unreleased
 
+### 0.5.30
+
+- feat(widgetSources): support `SpatialIndexFilter` (H3/Quadbin cell selection) on `spatialFilter` (#296)
+
+### 0.5.29
+
+- feat(sources): Support featureBbox parameter (#289)
+
 ### 0.5.28
 
 - feat(fetchMap): Support zoom-dependent point styling (#287)

package/build/api-client.cjs

@@ -185,6 +185,7 @@ __export(src_exports, {
   h3TilesetSource: () => h3TilesetSource,
   hasFilter: () => hasFilter,
   histogram: () => histogram,
+  isSpatialIndexFilter: () => isSpatialIndexFilter,
   makeIntervalComplete: () => makeIntervalComplete,
   negateAccessor: () => negateAccessor,
   opacityToAlpha: () => opacityToAlpha,
@@ -5801,6 +5802,9 @@ var SchemaFieldType = /* @__PURE__ */ ((SchemaFieldType2) => {
   SchemaFieldType2["Unknown"] = "unknown";
   return SchemaFieldType2;
 })(SchemaFieldType || {});
+function isSpatialIndexFilter(spatialFilter) {
+  return Array.isArray(spatialFilter.indexes);
+}
 
 // src/utils.ts
 var FILTER_TYPES = new Set(Object.values(FilterType));
@@ -7666,16 +7670,17 @@ var WidgetTilesetSourceImpl = class extends WidgetSource {
     this._features.length = 0;
   }
   _extractTileFeatures(spatialFilter) {
+    const geometryFilter = spatialFilter && !isSpatialIndexFilter(spatialFilter) ? spatialFilter : void 0;
     const prevInputs = this._tileFeatureExtractPreviousInputs;
-    if (this._features.length && spatialFilterEquals(prevInputs.spatialFilter, spatialFilter)) {
+    if (this._features.length && spatialFilterEquals(prevInputs.spatialFilter, geometryFilter)) {
       return;
     }
     this._features = tileFeatures({
       ...assignOptional({}, this.props, this._tileFeatureExtractOptions),
       tiles: this._tiles,
-      spatialFilter
+      spatialFilter: geometryFilter
     });
-    prevInputs.spatialFilter = spatialFilter;
+    prevInputs.spatialFilter = geometryFilter;
   }
   /**
    * Loads features as GeoJSON (used for testing).
@@ -8564,7 +8569,8 @@ var vectorQuerySource = async function(options) {
     sqlQuery,
     tileResolution = DEFAULT_TILE_RESOLUTION,
     queryParameters,
-    aggregationExp
+    aggregationExp,
+    featureBbox
   } = options;
   const spatialDataType = "geo";
   const urlParameters = {
@@ -8585,6 +8591,9 @@ var vectorQuerySource = async function(options) {
   if (aggregationExp) {
     urlParameters.aggregationExp = aggregationExp;
   }
+  if (featureBbox) {
+    urlParameters.featureBbox = true;
+  }
   return baseSource("query", options, urlParameters).then(
     (result) => ({
       ...result,
@@ -8608,7 +8617,8 @@ var vectorTableSource = async function(options) {
     spatialDataColumn = DEFAULT_GEO_COLUMN,
     tableName,
     tileResolution = DEFAULT_TILE_RESOLUTION,
-    aggregationExp
+    aggregationExp,
+    featureBbox
   } = options;
   const spatialDataType = "geo";
   const urlParameters = {
@@ -8626,6 +8636,9 @@ var vectorTableSource = async function(options) {
   if (aggregationExp) {
     urlParameters.aggregationExp = aggregationExp;
   }
+  if (featureBbox) {
+    urlParameters.featureBbox = true;
+  }
   return baseSource("table", options, urlParameters).then(
     (result) => ({
       ...result,
@@ -11216,11 +11229,13 @@ function configureSource({
     tileResolution,
     ...queryParameters && { queryParameters }
   };
+  const { featureBbox } = dataset;
   const vectorOptions = {
     spatialDataColumn,
     ...columns && { columns },
     ...filters && { filters },
-    ...aggregationExp && { aggregationExp }
+    ...aggregationExp && { aggregationExp },
+    ...featureBbox && { featureBbox }
   };
   if (type === "raster") {
     return rasterSource({
@@ -11504,6 +11519,21 @@ async function fetchMap({
       }
     }
   });
+  const layers = map.keplerMapConfig.config.visState.layers;
+  const datasetsWithLabels = /* @__PURE__ */ new Set();
+  for (const layer of layers) {
+    const hasTextLabel = layer.config?.textLabel?.some(
+      (t) => t.field?.name
+    );
+    if (hasTextLabel) {
+      datasetsWithLabels.add(layer.config.dataId);
+    }
+  }
+  map.datasets.forEach((dataset) => {
+    if (datasetsWithLabels.has(dataset.id) && (dataset.type === "table" || dataset.type === "query")) {
+      dataset.featureBbox = true;
+    }
+  });
   const [basemap] = await Promise.all([
     fetchBasemapProps({ config: map.keplerMapConfig.config, errorContext }),
     // Mutates map.datasets so that dataset.data contains data
@@ -11810,6 +11840,7 @@ function hashBuckets(initialCount) {
   h3TilesetSource,
   hasFilter,
   histogram,
+  isSpatialIndexFilter,
   makeIntervalComplete,
   negateAccessor,
   opacityToAlpha,