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

package/build/api-client.d.cts

@@ -1446,7 +1446,7 @@ type TileFeatures = {
     spatialFilter: SpatialFilter;
     uniqueIdProperty?: string;
     rasterMetadata?: RasterMetadata;
-    options?: TileFeatureExtractOptions;
+    storeGeometry?: boolean;
 };
 /** @privateRemarks Source: @carto/react-core */
 type TileFeatureExtractOptions = {
@@ -1456,17 +1456,18 @@ type TileFeatureExtractOptions = {
     uniqueIdProperty?: string;
 };
 /** @privateRemarks Source: @carto/react-core */
-declare function tileFeatures({ tiles, spatialFilter, uniqueIdProperty, tileFormat, spatialDataColumn, spatialDataType, rasterMetadata, options, }: TileFeatures): FeatureData[];
+declare function tileFeatures({ tiles, spatialFilter, uniqueIdProperty, tileFormat, spatialDataColumn, spatialDataType, rasterMetadata, storeGeometry, }: TileFeatures): FeatureData[];
 
 declare const FEATURE_GEOM_PROPERTY = "__geomValue";
+type GeometryExtractOptions = {
+    storeGeometry?: boolean;
+};
 declare function tileFeaturesGeometries({ tiles, tileFormat, spatialFilter, uniqueIdProperty, options, }: {
     tiles: Tile[];
     tileFormat?: TileFormat;
     spatialFilter: SpatialFilter;
     uniqueIdProperty?: string;
-    options?: {
-        storeGeometry?: boolean;
-    };
+    options?: GeometryExtractOptions;
 }): FeatureData[];
 
 type TileFeaturesSpatialIndexOptions = {

package/build/api-client.d.ts

@@ -1446,7 +1446,7 @@ type TileFeatures = {
     spatialFilter: SpatialFilter;
     uniqueIdProperty?: string;
     rasterMetadata?: RasterMetadata;
-    options?: TileFeatureExtractOptions;
+    storeGeometry?: boolean;
 };
 /** @privateRemarks Source: @carto/react-core */
 type TileFeatureExtractOptions = {
@@ -1456,17 +1456,18 @@ type TileFeatureExtractOptions = {
     uniqueIdProperty?: string;
 };
 /** @privateRemarks Source: @carto/react-core */
-declare function tileFeatures({ tiles, spatialFilter, uniqueIdProperty, tileFormat, spatialDataColumn, spatialDataType, rasterMetadata, options, }: TileFeatures): FeatureData[];
+declare function tileFeatures({ tiles, spatialFilter, uniqueIdProperty, tileFormat, spatialDataColumn, spatialDataType, rasterMetadata, storeGeometry, }: TileFeatures): FeatureData[];
 
 declare const FEATURE_GEOM_PROPERTY = "__geomValue";
+type GeometryExtractOptions = {
+    storeGeometry?: boolean;
+};
 declare function tileFeaturesGeometries({ tiles, tileFormat, spatialFilter, uniqueIdProperty, options, }: {
     tiles: Tile[];
     tileFormat?: TileFormat;
     spatialFilter: SpatialFilter;
     uniqueIdProperty?: string;
-    options?: {
-        storeGeometry?: boolean;
-    };
+    options?: GeometryExtractOptions;
 }): FeatureData[];
 
 type TileFeaturesSpatialIndexOptions = {

package/build/api-client.js

@@ -5491,6 +5491,20 @@ function isValidBandValue(value, nodata) {
   return Number.isNaN(value) ? false : nodata !== value;
 }
 
+// src/types.ts
+var SchemaFieldType = /* @__PURE__ */ ((SchemaFieldType2) => {
+  SchemaFieldType2["Number"] = "number";
+  SchemaFieldType2["Bigint"] = "bigint";
+  SchemaFieldType2["String"] = "string";
+  SchemaFieldType2["Geometry"] = "geometry";
+  SchemaFieldType2["Timestamp"] = "timestamp";
+  SchemaFieldType2["Object"] = "object";
+  SchemaFieldType2["Boolean"] = "boolean";
+  SchemaFieldType2["Variant"] = "variant";
+  SchemaFieldType2["Unknown"] = "unknown";
+  return SchemaFieldType2;
+})(SchemaFieldType || {});
+
 // src/utils.ts
 var FILTER_TYPES = new Set(Object.values(FilterType));
 function normalizeObjectKeys(el) {
@@ -5541,6 +5555,13 @@ function assignOptional(target, ...sources) {
   }
   return target;
 }
+function getWidgetSpatialDataType(spatialDataType, spatialDataColumn, schema) {
+  const field = schema.find((field2) => field2.name === spatialDataColumn);
+  if (field && field.type === "geometry" /* Geometry */) {
+    return "geo";
+  }
+  return spatialDataType;
+}
 
 // src/filters/tileFeatures.ts
 function tileFeatures({
@@ -5551,7 +5572,7 @@ function tileFeatures({
   spatialDataColumn = DEFAULT_GEO_COLUMN,
   spatialDataType,
   rasterMetadata,
-  options = {}
+  storeGeometry = false
 }) {
   if (spatialDataType === "geo") {
     return tileFeaturesGeometries({
@@ -5559,7 +5580,7 @@ function tileFeatures({
       tileFormat,
       spatialFilter,
       uniqueIdProperty,
-      options
+      options: { storeGeometry }
     });
   }
   if (tiles.some(isRasterTile)) {
@@ -7639,7 +7660,11 @@ var h3QuerySource = async function(options) {
         ...options,
         // NOTE: Parameters with default values above must be explicitly passed here.
         spatialDataColumn,
-        spatialDataType
+        spatialDataType: getWidgetSpatialDataType(
+          spatialDataType,
+          spatialDataColumn,
+          result.schema
+        )
       })
     })
   );
@@ -7674,7 +7699,11 @@ var h3TableSource = async function(options) {
         ...options,
         // NOTE: Parameters with default values above must be explicitly passed here.
         spatialDataColumn,
-        spatialDataType
+        spatialDataType: getWidgetSpatialDataType(
+          spatialDataType,
+          spatialDataColumn,
+          result.schema
+        )
       })
     })
   );
@@ -7757,7 +7786,11 @@ var quadbinQuerySource = async function(options) {
         ...options,
         // NOTE: Parameters with default values above must be explicitly passed here.
         spatialDataColumn,
-        spatialDataType
+        spatialDataType: getWidgetSpatialDataType(
+          spatialDataType,
+          spatialDataColumn,
+          result.schema
+        )
       })
     })
   );
@@ -7792,7 +7825,11 @@ var quadbinTableSource = async function(options) {
         ...options,
         // NOTE: Parameters with default values above must be explicitly passed here.
         spatialDataColumn,
-        spatialDataType
+        spatialDataType: getWidgetSpatialDataType(
+          spatialDataType,
+          spatialDataColumn,
+          result.schema
+        )
       })
     })
   );
@@ -10050,20 +10087,6 @@ function _isMultiPolygon(geometry) {
   return getType(geometry) === "MultiPolygon";
 }
 
-// src/types.ts
-var SchemaFieldType = /* @__PURE__ */ ((SchemaFieldType2) => {
-  SchemaFieldType2["Number"] = "number";
-  SchemaFieldType2["Bigint"] = "bigint";
-  SchemaFieldType2["String"] = "string";
-  SchemaFieldType2["Geometry"] = "geometry";
-  SchemaFieldType2["Timestamp"] = "timestamp";
-  SchemaFieldType2["Object"] = "object";
-  SchemaFieldType2["Boolean"] = "boolean";
-  SchemaFieldType2["Variant"] = "variant";
-  SchemaFieldType2["Unknown"] = "unknown";
-  return SchemaFieldType2;
-})(SchemaFieldType || {});
-
 // src/spatial-index.ts
 var DEFAULT_TILE_SIZE = 512;
 var BIAS = 2;