@carto/api-client 0.5.7-alpha-optional-spatial-filter.0 → 0.5.7-alpha-optional-spatial-filter.1

package/build/api-client.js

@@ -4937,10 +4937,7 @@ import {
   cellToBoundary as quadbinCellToBoundary,
   geometryToCells as quadbinGeometryToCells
 } from "quadbin";
-import {
-  cellToBoundary as h3CellToBoundary,
-  polygonToCells as h3PolygonToCells
-} from "h3-js";
+import { polygonToCells as h3PolygonToCells } from "h3-js";
 
 // node_modules/@turf/bbox-clip/dist/esm/index.js
 function lineclip(points, bbox2, result) {
@@ -5096,27 +5093,18 @@ function intersectTileQuadbin(parent, cellResolution, spatialFilter) {
 }
 var BBOX_WEST = [-180, -90, 0, 90];
 var BBOX_EAST = [0, -90, 180, 90];
-function intersectTileH3(parent, cellResolution, spatialFilter) {
-  const tilePolygon = {
-    type: "Polygon",
-    coordinates: [h3CellToBoundary(parent, true)]
-  };
-  if (!spatialFilter || turf_boolean_within_default(tilePolygon, spatialFilter)) {
+function intersectTileH3(cellResolution, spatialFilter) {
+  if (!spatialFilter) {
     return true;
   }
-  const clippedSpatialFilter = turf_intersect_default(
-    featureCollection([feature(tilePolygon), feature(spatialFilter)])
-  );
-  if (!clippedSpatialFilter) {
-    return false;
-  }
+  const spatialFilterFeature = feature(spatialFilter);
   const cellsWest = h3PolygonToCells(
-    turf_bbox_clip_default(clippedSpatialFilter, BBOX_WEST).geometry.coordinates,
+    turf_bbox_clip_default(spatialFilterFeature, BBOX_WEST).geometry.coordinates,
     cellResolution,
     true
   );
   const cellsEast = h3PolygonToCells(
-    turf_bbox_clip_default(clippedSpatialFilter, BBOX_EAST).geometry.coordinates,
+    turf_bbox_clip_default(spatialFilterFeature, BBOX_EAST).geometry.coordinates,
     cellResolution,
     true
   );
@@ -5420,20 +5408,22 @@ function tileFeaturesSpatialIndex({
   if (!cellResolution) {
     return [];
   }
+  let intersection3;
+  if (spatialIndex === "h3" /* H3 */) {
+    intersection3 = intersectTileH3(cellResolution, spatialFilter);
+  }
   for (const tile of tiles) {
     if (tile.isVisible === false || !tile.data) {
       continue;
     }
-    const parent = getTileIndex(tile, spatialIndex);
-    const intersection3 = spatialIndex === "quadbin" /* QUADBIN */ ? intersectTileQuadbin(
-      parent,
-      cellResolution,
-      spatialFilter
-    ) : intersectTileH3(
-      parent,
-      cellResolution,
-      spatialFilter
-    );
+    if (spatialIndex === "quadbin" /* QUADBIN */) {
+      const parent = getTileIndex(tile, spatialIndex);
+      intersection3 = intersectTileQuadbin(
+        parent,
+        cellResolution,
+        spatialFilter
+      );
+    }
     if (!intersection3) continue;
     tile.data.forEach((d) => {
       if (intersection3 === true || intersection3.has(d.id)) {