fix(picking): Fixes for Picking Model API calls

src/models/model.ts

@@ -75,7 +75,13 @@ export function executeModel(props: {
 
   let url = `${apiBaseUrl}/v3/sql/${connectionName}/model/${model}`;
 
-  const {filters, filtersLogicalOperator = 'and', data} = source;
+  const {
+    data,
+    filters,
+    filtersLogicalOperator = 'and',
+    geoColumn = DEFAULT_GEO_COLUMN,
+  } = source;
+
   const queryParameters = source.queryParameters
     ? JSON.stringify(source.queryParameters)
     : '';
@@ -90,12 +96,14 @@ export function executeModel(props: {
     filtersLogicalOperator,
   };
 
+  // Picking Model API requires 'spatialDataColumn'.
+  if (model === 'pick') {
+    queryParams.spatialDataColumn = geoColumn;
+  }
+
   // API supports multiple filters, we apply it only to geoColumn
   const spatialFilters = source.spatialFilter
-    ? {
-        [source.geoColumn ? source.geoColumn : DEFAULT_GEO_COLUMN]:
-          source.spatialFilter,
-      }
+    ? {[geoColumn]: source.spatialFilter}
     : undefined;
 
   if (spatialFilters) {

src/widget-sources/types.ts

@@ -44,6 +44,9 @@ export interface FeaturesRequestOptions extends BaseRequestOptions {
   /** Topology of objects to be picked. */
   dataType: 'points' | 'lines' | 'polygons';
 
+  /** Zoom level, required if using 'points' data type. */
+  z?: number;
+
   /**
    * Maximum number of objects to return in the result set. For datasets
    * containing features with identical geometry, those features will have

src/widget-sources/widget-base-source.ts

@@ -126,7 +126,7 @@ export abstract class WidgetBaseSource<Props extends WidgetBaseSourceProps> {
     options: FeaturesRequestOptions
   ): Promise<FeaturesResponse> {
     const {filterOwner, spatialFilter, abortController, ...params} = options;
-    const {columns, dataType, featureIds, limit, tileResolution} = params;
+    const {columns, dataType, featureIds, z, limit, tileResolution} = params;
 
     type FeaturesModelResponse = {rows: Record<string, unknown>[]};
 
@@ -137,6 +137,7 @@ export abstract class WidgetBaseSource<Props extends WidgetBaseSourceProps> {
         columns,
         dataType,
         featureIds,
+        z,
         limit: limit || 1000,
         tileResolution: tileResolution || DEFAULT_TILE_RESOLUTION,
       },