@carto/api-client 0.5.4-alpha.1 → 0.5.5-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.4-alpha.1",
+  "version": "0.5.5-alpha.0",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
@@ -129,5 +129,5 @@
     "@carto/api-client": "portal:./",
     "rollup": "^4.20.0"
   },
-  "stableVersion": "0.5.3"
+  "stableVersion": "0.5.4"
 }

package/src/api/index.ts

@@ -11,4 +11,7 @@ export {
 export {buildPublicMapUrl, buildStatsUrl} from './endpoints.js';
 export {query} from './query.js';
 export type {QueryOptions} from './query.js';
-export {requestWithParameters} from './request-with-parameters.js';
+export {
+  requestWithParameters,
+  clearDefaultRequestCache,
+} from './request-with-parameters.js';

package/src/api/request-with-parameters.ts

@@ -164,3 +164,11 @@ function excludeURLParameters(baseUrlString: string, parameters: string[]) {
   }
   return baseUrl.toString();
 }
+
+/**
+ * Clears the HTTP response cache for all requests using the default cache.
+ * @internal
+ */
+export function clearDefaultRequestCache() {
+  DEFAULT_REQUEST_CACHE.clear();
+}

package/src/index.ts

@@ -18,6 +18,7 @@ export {
   buildStatsUrl, // Internal, but required for fetchMap().
   query,
   requestWithParameters,
+  clearDefaultRequestCache, // Internal, for unit testing.
 } from './api/index.js';
 
 export {_getHexagonResolution} from './spatial-index.js';

package/src/models/model.ts

@@ -85,6 +85,7 @@ export function executeModel(props: {
     filters,
     filtersLogicalOperator = 'and',
     spatialDataType = 'geo',
+    spatialDataColumn = DEFAULT_GEO_COLUMN,
     spatialFiltersMode = 'intersects',
   } = source;
 
@@ -98,26 +99,15 @@ export function executeModel(props: {
     filtersLogicalOperator,
   };
 
-  const spatialDataColumn = source.spatialDataColumn || DEFAULT_GEO_COLUMN;
+  queryParams.spatialDataType = spatialDataType;
+  queryParams.spatialDataColumn = spatialDataColumn;
 
-  // Picking Model API requires 'spatialDataColumn'.
-  if (model === 'pick') {
-    queryParams.spatialDataColumn = spatialDataColumn;
-  }
-
-  // API supports multiple filters, we apply it only to spatialDataColumn
-  const spatialFilters = source.spatialFilter
-    ? {[spatialDataColumn]: source.spatialFilter}
-    : undefined;
-
-  if (spatialFilters) {
-    queryParams.spatialFilters = spatialFilters;
-    queryParams.spatialDataColumn = spatialDataColumn;
-    queryParams.spatialDataType = spatialDataType;
-  }
-
-  if (spatialDataType !== 'geo') {
-    queryParams.spatialFiltersMode = spatialFiltersMode;
+  if (source.spatialFilter) {
+    // API supports multiple filters, we apply it only to spatialDataColumn
+    queryParams.spatialFilters = {[spatialDataColumn]: source.spatialFilter};
+    if (spatialDataType !== 'geo') {
+      queryParams.spatialFiltersMode = spatialFiltersMode;
+    }
   }
 
   const urlWithSearchParams =