@deck.gl/carto 8.9.0-beta.2 → 8.9.0-beta.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
-  "version": "8.9.0-beta.2",
+  "version": "8.9.0-beta.3",
   "publishConfig": {
     "access": "public"
   },
@@ -62,5 +62,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.0.0"
   },
-  "gitHead": "5dae086e4f3eb46c30d8e761f9d600be4f68e949"
+  "gitHead": "da509f9b00415a8d0700951663b65b59077c0cae"
 }

package/src/api/maps-v3-client.ts

@@ -131,6 +131,18 @@ type FetchLayerDataParams = {
   queryParameters?: QueryParameters;
 };
 
+type MapsAPIParameters = {
+  client: string;
+  v: string;
+  q?: string;
+  name?: string;
+  queryParameters?: QueryParameters;
+  geo_column?: string;
+  columns?: string;
+  aggregationExp?: string;
+  aggregationResLevel?: number;
+};
+
 /**
  * Build a URL with all required parameters
  */
@@ -143,34 +155,36 @@ function getParameters({
   aggregationExp,
   aggregationResLevel,
   queryParameters
-}: Omit<FetchLayerDataParams, 'connection' | 'credentials'>) {
-  const parameters = [encodeParameter('client', clientId || DEFAULT_CLIENT)];
-  parameters.push(encodeParameter('v', V3_MINOR_VERSION));
+}: Omit<FetchLayerDataParams, 'connection' | 'credentials'>): MapsAPIParameters {
+  const parameters: MapsAPIParameters = {
+    client: clientId || DEFAULT_CLIENT,
+    v: V3_MINOR_VERSION
+  };
 
   const sourceName = type === MAP_TYPES.QUERY ? 'q' : 'name';
-  parameters.push(encodeParameter(sourceName, source));
+  parameters[sourceName] = source;
 
   if (queryParameters) {
-    parameters.push(encodeParameter('queryParameters', JSON.stringify(queryParameters)));
+    parameters.queryParameters = queryParameters;
   }
 
   if (geoColumn) {
-    parameters.push(encodeParameter('geo_column', geoColumn));
+    parameters.geo_column = geoColumn;
   }
   if (columns) {
-    parameters.push(encodeParameter('columns', columns.join(',')));
+    parameters.columns = columns.join(',');
   }
   if (aggregationExp) {
-    parameters.push(encodeParameter('aggregationExp', aggregationExp));
+    parameters.aggregationExp = aggregationExp;
   } else if (isSpatialIndexGeoColumn(geoColumn)) {
     // Default aggregationExp required for spatial index layers
-    parameters.push(encodeParameter('aggregationExp', '1 AS value'));
+    parameters.aggregationExp = '1 AS value';
   }
   if (aggregationResLevel) {
-    parameters.push(encodeParameter('aggregationResLevel', aggregationResLevel));
+    parameters.aggregationResLevel = aggregationResLevel;
   }
 
-  return parameters.join('&');
+  return parameters;
 }
 
 function isSpatialIndexGeoColumn(geoColumn: string | undefined) {
@@ -192,7 +206,7 @@ export async function mapInstantiation({
   queryParameters
 }: FetchLayerDataParams): Promise<MapInstantiation> {
   const baseUrl = `${credentials.mapsUrl}/${connection}/${type}`;
-  const url = `${baseUrl}?${getParameters({
+  const parameters = getParameters({
     type,
     source,
     geoColumn,
@@ -201,26 +215,24 @@ export async function mapInstantiation({
     aggregationResLevel,
     aggregationExp,
     queryParameters
-  })}`;
+  });
+  const encodedParameters = Object.entries(parameters).map(([key, value]) => {
+    if (typeof value !== 'string') {
+      value = JSON.stringify(value);
+    }
+    return encodeParameter(key, value);
+  });
+  const url = `${baseUrl}?${encodedParameters.join('&')}`;
   const {accessToken} = credentials;
 
   const errorContext = {requestType: REQUEST_TYPES.INSTANTIATION, connection, type, source};
   if (url.length > MAX_GET_LENGTH && type === MAP_TYPES.QUERY) {
-    // need to be a POST request
-    const body = JSON.stringify({
-      q: source,
-      client: clientId || DEFAULT_CLIENT,
-      aggregationResLevel,
-      aggregationExp,
-      geoColumn,
-      queryParameters
-    });
     return await requestJson({
       method: 'POST',
       url: baseUrl,
       headers,
       accessToken,
-      body,
+      body: JSON.stringify(parameters),
       errorContext
     });
   }

package/typed/api/maps-v3-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maps-v3-client.d.ts","sourceRoot":"","sources":["../../src/api/maps-v3-client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAIL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAIL,MAAM,EAGN,gBAAgB,EAChB,OAAO,EAEP,eAAe,EAEf,WAAW,EACX,UAAU,EAEX,MAAM,mBAAmB,CAAC;AAY3B,oBAAY,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAiF7C,aAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,sBAAsB,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAiDF,wBAAsB,gBAAgB,CAAC,EACrC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAoClD;AA+CD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AACD,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAuBtD;AA+MD,wBAAsB,QAAQ,CAAC,EAC7B,UAAU,EACV,QAAQ,EACR,WAAW,EACX,OAAO,EACP,WAAW,EACX,SAAS,EACV,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC;4BA+B6B,IAAI;;;;;;;;;;GAsCjC"}
+{"version":3,"file":"maps-v3-client.d.ts","sourceRoot":"","sources":["../../src/api/maps-v3-client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAIL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAIL,MAAM,EAGN,gBAAgB,EAChB,OAAO,EAEP,eAAe,EAEf,WAAW,EACX,UAAU,EAEX,MAAM,mBAAmB,CAAC;AAY3B,oBAAY,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAiF7C,aAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,sBAAsB,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AA+DF,wBAAsB,gBAAgB,CAAC,EACrC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkClD;AA+CD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AACD,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAuBtD;AA+MD,wBAAsB,QAAQ,CAAC,EAC7B,UAAU,EACV,QAAQ,EACR,WAAW,EACX,OAAO,EACP,WAAW,EACX,SAAS,EACV,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC;4BA+B6B,IAAI;;;;;;;;;;GAsCjC"}