@deck.gl/carto 9.0.13 → 9.0.14

package/dist/api/request-with-parameters.d.ts

@@ -1,7 +1,7 @@
 import type { APIErrorContext } from "./types.js";
 export declare function requestWithParameters<T = any>({ baseUrl, parameters, headers: customHeaders, errorContext }: {
     baseUrl: string;
-    parameters?: Record<string, string>;
+    parameters?: Record<string, unknown>;
     headers: Record<string, string>;
     errorContext: APIErrorContext;
 }): Promise<T>;

package/dist/api/request-with-parameters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request-with-parameters.d.ts","sourceRoot":"","sources":["../../src/api/request-with-parameters.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,eAAe,EAAC,mBAAgB;AAU7C,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,EACnD,OAAO,EACP,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,EACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,EAAE,eAAe,CAAC;CAC/B,GAAG,OAAO,CAAC,CAAC,CAAC,CAkCb"}
+{"version":3,"file":"request-with-parameters.d.ts","sourceRoot":"","sources":["../../src/api/request-with-parameters.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,eAAe,EAAC,mBAAgB;AAa7C,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,EACnD,OAAO,EACP,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,EACb,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,YAAY,EAAE,eAAe,CAAC;CAC/B,GAAG,OAAO,CAAC,CAAC,CAAC,CAmCb"}

package/dist/api/request-with-parameters.js

@@ -1,13 +1,18 @@
+import { isPureObject } from '@loaders.gl/core';
 import { CartoAPIError } from "./carto-api-error.js";
 import { DEFAULT_HEADERS, DEFAULT_PARAMETERS, MAX_GET_LENGTH } from "./common.js";
 /**
  * Simple encode parameter
  */
 function encodeParameter(name, value) {
+    if (isPureObject(value) || Array.isArray(value)) {
+        return `${name}=${encodeURIComponent(JSON.stringify(value))}`;
+    }
     return `${name}=${encodeURIComponent(value)}`;
 }
 const REQUEST_CACHE = new Map();
 export async function requestWithParameters({ baseUrl, parameters, headers: customHeaders, errorContext }) {
+    parameters = { ...DEFAULT_PARAMETERS, ...parameters };
     const key = createCacheKey(baseUrl, parameters || {}, customHeaders || {});
     if (REQUEST_CACHE.has(key)) {
         return REQUEST_CACHE.get(key);
@@ -43,8 +48,6 @@ function createCacheKey(baseUrl, parameters, headers) {
     return JSON.stringify({ baseUrl, parameters: parameterEntries, headers: headerEntries });
 }
 function createURLWithParameters(baseUrl, parameters) {
-    const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(([key, value]) => {
-        return encodeParameter(key, value);
-    });
+    const encodedParameters = Object.entries(parameters).map(([key, value]) => encodeParameter(key, value));
     return `${baseUrl}?${encodedParameters.join('&')}`;
 }

package/dist/cartoRasterTile-worker.js

@@ -1008,7 +1008,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.13" : "latest";
+  var VERSION = true ? "9.0.14" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/cartoSpatialTile-worker.js

@@ -1397,7 +1397,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.0.13" : "latest";
+  var VERSION = true ? "9.0.14" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -1625,7 +1625,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.0.13" : "latest";
+  var VERSION = true ? "9.0.14" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/dist.dev.js

@@ -13383,7 +13383,11 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   }
 
   // src/api/request-with-parameters.ts
+  var import_core14 = __toESM(require_core2(), 1);
   function encodeParameter(name, value) {
+    if ((0, import_core14.isPureObject)(value) || Array.isArray(value)) {
+      return `${name}=${encodeURIComponent(JSON.stringify(value))}`;
+    }
     return `${name}=${encodeURIComponent(value)}`;
   }
   var REQUEST_CACHE = /* @__PURE__ */ new Map();
@@ -13393,6 +13397,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     headers: customHeaders,
     errorContext
   }) {
+    parameters = { ...DEFAULT_PARAMETERS, ...parameters };
     const key = createCacheKey(baseUrl2, parameters || {}, customHeaders || {});
     if (REQUEST_CACHE.has(key)) {
       return REQUEST_CACHE.get(key);
@@ -13422,10 +13427,8 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     return JSON.stringify({ baseUrl: baseUrl2, parameters: parameterEntries, headers: headerEntries });
   }
   function createURLWithParameters(baseUrl2, parameters) {
-    const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(
-      ([key, value]) => {
-        return encodeParameter(key, value);
-      }
+    const encodedParameters = Object.entries(parameters).map(
+      ([key, value]) => encodeParameter(key, value)
     );
     return `${baseUrl2}?${encodedParameters.join("&")}`;
   }
@@ -13503,10 +13506,10 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       urlParameters.columns = columns.join(",");
     }
     if (filters) {
-      urlParameters.filters = JSON.stringify(filters);
+      urlParameters.filters = filters;
     }
     if (queryParameters) {
-      urlParameters.queryParameters = JSON.stringify(queryParameters);
+      urlParameters.queryParameters = queryParameters;
     }
     return baseSource("boundary", options, urlParameters);
   };
@@ -13523,7 +13526,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       urlParameters.columns = columns.join(",");
     }
     if (filters) {
-      urlParameters.filters = JSON.stringify(filters);
+      urlParameters.filters = filters;
     }
     return baseSource("boundary", options, urlParameters);
   };
@@ -13547,7 +13550,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       urlParameters.aggregationResLevel = String(aggregationResLevel);
     }
     if (queryParameters) {
-      urlParameters.queryParameters = JSON.stringify(queryParameters);
+      urlParameters.queryParameters = queryParameters;
     }
     return baseSource("query", options, urlParameters);
   };
@@ -13605,7 +13608,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       urlParameters.aggregationResLevel = String(aggregationResLevel);
     }
     if (queryParameters) {
-      urlParameters.queryParameters = JSON.stringify(queryParameters);
+      urlParameters.queryParameters = queryParameters;
     }
     return baseSource("query", options, urlParameters);
   };
@@ -13657,10 +13660,10 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       urlParameters.columns = columns.join(",");
     }
     if (filters) {
-      urlParameters.filters = JSON.stringify(filters);
+      urlParameters.filters = filters;
     }
     if (queryParameters) {
-      urlParameters.queryParameters = JSON.stringify(queryParameters);
+      urlParameters.queryParameters = queryParameters;
     }
     return baseSource("query", options, urlParameters);
   };
@@ -13684,7 +13687,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       urlParameters.columns = columns.join(",");
     }
     if (filters) {
-      urlParameters.filters = JSON.stringify(filters);
+      urlParameters.filters = filters;
     }
     return baseSource("table", options, urlParameters);
   };
@@ -14348,7 +14351,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   })(GLEnum || (GLEnum = {}));
 
   // src/api/parse-map.ts
-  var import_core14 = __toESM(require_core(), 1);
+  var import_core15 = __toESM(require_core(), 1);
 
   // src/api/layer-map.ts
   var import_moment_timezone = __toESM(require_moment_timezone2(), 1);
@@ -14742,7 +14745,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
             ...createLoadOptions(token)
           });
         } catch (e) {
-          import_core14.log.error(e.message)();
+          import_core15.log.error(e.message)();
           return void 0;
         }
       })

package/dist/index.cjs

@@ -265,7 +265,7 @@ function scaleIdentity() {
 }
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION = true ? "9.0.13" : "latest";
+var VERSION = true ? "9.0.14" : "latest";
 var id = "cartoRasterTile";
 var DEFAULT_OPTIONS = {
   cartoRasterTile: {
@@ -536,7 +536,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION2 = true ? "9.0.13" : "latest";
+var VERSION2 = true ? "9.0.14" : "latest";
 var id2 = "cartoSpatialTile";
 var DEFAULT_OPTIONS2 = {
   cartoSpatialTile: {
@@ -1619,7 +1619,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION3 = true ? "9.0.13" : "latest";
+var VERSION3 = true ? "9.0.14" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -1974,11 +1974,16 @@ function buildQueryUrl({ apiBaseUrl, connectionName }) {
 }
 
 // dist/api/request-with-parameters.js
+var import_core14 = require("@loaders.gl/core");
 function encodeParameter(name, value) {
+  if ((0, import_core14.isPureObject)(value) || Array.isArray(value)) {
+    return `${name}=${encodeURIComponent(JSON.stringify(value))}`;
+  }
   return `${name}=${encodeURIComponent(value)}`;
 }
 var REQUEST_CACHE = /* @__PURE__ */ new Map();
 async function requestWithParameters({ baseUrl: baseUrl2, parameters, headers: customHeaders, errorContext }) {
+  parameters = { ...DEFAULT_PARAMETERS, ...parameters };
   const key = createCacheKey(baseUrl2, parameters || {}, customHeaders || {});
   if (REQUEST_CACHE.has(key)) {
     return REQUEST_CACHE.get(key);
@@ -2008,9 +2013,7 @@ function createCacheKey(baseUrl2, parameters, headers) {
   return JSON.stringify({ baseUrl: baseUrl2, parameters: parameterEntries, headers: headerEntries });
 }
 function createURLWithParameters(baseUrl2, parameters) {
-  const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(([key, value]) => {
-    return encodeParameter(key, value);
-  });
+  const encodedParameters = Object.entries(parameters).map(([key, value]) => encodeParameter(key, value));
   return `${baseUrl2}?${encodedParameters.join("&")}`;
 }
 
@@ -2080,10 +2083,10 @@ var boundaryQuerySource = async function(options) {
     urlParameters.columns = columns.join(",");
   }
   if (filters) {
-    urlParameters.filters = JSON.stringify(filters);
+    urlParameters.filters = filters;
   }
   if (queryParameters) {
-    urlParameters.queryParameters = JSON.stringify(queryParameters);
+    urlParameters.queryParameters = queryParameters;
   }
   return baseSource("boundary", options, urlParameters);
 };
@@ -2100,7 +2103,7 @@ var boundaryTableSource = async function(options) {
     urlParameters.columns = columns.join(",");
   }
   if (filters) {
-    urlParameters.filters = JSON.stringify(filters);
+    urlParameters.filters = filters;
   }
   return baseSource("boundary", options, urlParameters);
 };
@@ -2118,7 +2121,7 @@ var h3QuerySource = async function(options) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
   if (queryParameters) {
-    urlParameters.queryParameters = JSON.stringify(queryParameters);
+    urlParameters.queryParameters = queryParameters;
   }
   return baseSource("query", options, urlParameters);
 };
@@ -2165,7 +2168,7 @@ var quadbinQuerySource = async function(options) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
   if (queryParameters) {
-    urlParameters.queryParameters = JSON.stringify(queryParameters);
+    urlParameters.queryParameters = queryParameters;
   }
   return baseSource("query", options, urlParameters);
 };
@@ -2205,10 +2208,10 @@ var vectorQuerySource = async function(options) {
     urlParameters.columns = columns.join(",");
   }
   if (filters) {
-    urlParameters.filters = JSON.stringify(filters);
+    urlParameters.filters = filters;
   }
   if (queryParameters) {
-    urlParameters.queryParameters = JSON.stringify(queryParameters);
+    urlParameters.queryParameters = queryParameters;
   }
   return baseSource("query", options, urlParameters);
 };
@@ -2226,7 +2229,7 @@ var vectorTableSource = async function(options) {
     urlParameters.columns = columns.join(",");
   }
   if (filters) {
-    urlParameters.filters = JSON.stringify(filters);
+    urlParameters.filters = filters;
   }
   return baseSource("table", options, urlParameters);
 };
@@ -2240,7 +2243,7 @@ var vectorTilesetSource = async function(options) {
 
 // dist/api/parse-map.js
 var import_constants12 = require("@luma.gl/constants");
-var import_core14 = require("@deck.gl/core");
+var import_core15 = require("@deck.gl/core");
 
 // dist/api/layer-map.js
 var import_d3_array = require("d3-array");
@@ -2631,7 +2634,7 @@ function parseMap(json) {
           ...createLoadOptions(token)
         });
       } catch (e) {
-        import_core14.log.error(e.message)();
+        import_core15.log.error(e.message)();
         return void 0;
       }
     })