@deck.gl/carto 9.0.0-beta.7 → 9.0.0-beta.9

package/dist/api/common.d.ts

@@ -1,6 +1,6 @@
 export declare const DEFAULT_API_BASE_URL = "https://gcp-us-east1.api.carto.com";
 export declare const DEFAULT_CLIENT = "deck-gl-carto";
-export declare const V3_MINOR_VERSION = "3.3";
+export declare const V3_MINOR_VERSION = "3.4";
 export declare const MAX_GET_LENGTH = 8192;
 export declare const DEFAULT_PARAMETERS: {
     v: string;

package/dist/api/common.js

@@ -1,6 +1,6 @@
 export const DEFAULT_API_BASE_URL = 'https://gcp-us-east1.api.carto.com';
 export const DEFAULT_CLIENT = 'deck-gl-carto';
-export const V3_MINOR_VERSION = '3.3';
+export const V3_MINOR_VERSION = '3.4';
 export const MAX_GET_LENGTH = 8192;
 export const DEFAULT_PARAMETERS = {
     v: V3_MINOR_VERSION

package/dist/api/fetch-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch-map.d.ts","sourceRoot":"","sources":["../../src/api/fetch-map.ts"],"names":[],"mappings":"AAyMA,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,CAAC;AAGF,wBAAsB,QAAQ,CAAC,EAC7B,UAAiC,EACjC,UAAU,EACV,QAAyB,EACzB,OAAY,EACZ,WAAW,EACX,SAAS,EACV,EAAE,eAAe;4BAmBY,IAAI;;;;;;;;;;GAuDjC"}
+{"version":3,"file":"fetch-map.d.ts","sourceRoot":"","sources":["../../src/api/fetch-map.ts"],"names":[],"mappings":"AA8MA,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC,CAAC;AAGF,wBAAsB,QAAQ,CAAC,EAC7B,UAAiC,EACjC,UAAU,EACV,QAAyB,EACzB,OAAY,EACZ,WAAW,EACX,SAAS,EACV,EAAE,eAAe;4BAmBY,IAAI;;;;;;;;;;GAuDjC"}

package/dist/api/fetch-map.js

@@ -36,13 +36,18 @@ async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, head
                 dataset.data = await vectorTableSource({ ...options, columns, tableName: source });
             }
             else if (type === 'query') {
-                dataset.data = await vectorQuerySource({ ...options, sqlQuery: source, queryParameters });
+                dataset.data = await vectorQuerySource({
+                    ...options,
+                    columns,
+                    sqlQuery: source,
+                    queryParameters
+                });
             }
         }
         else if (spatialDataType === 'h3') {
             const options = { ...globalOptions, aggregationExp, aggregationResLevel, spatialDataColumn };
             if (type === 'table') {
-                dataset.data = await h3TableSource({ ...options, columns, tableName: source });
+                dataset.data = await h3TableSource({ ...options, tableName: source });
             }
             else if (type === 'query') {
                 dataset.data = await h3QuerySource({ ...options, sqlQuery: source, queryParameters });
@@ -51,7 +56,7 @@ async function _fetchMapDataset(dataset, accessToken, apiBaseUrl, clientId, head
         else if (spatialDataType === 'quadbin') {
             const options = { ...globalOptions, aggregationExp, aggregationResLevel, spatialDataColumn };
             if (type === 'table') {
-                dataset.data = await quadbinTableSource({ ...options, columns, tableName: source });
+                dataset.data = await quadbinTableSource({ ...options, tableName: source });
             }
             else if (type === 'query') {
                 dataset.data = await quadbinQuerySource({ ...options, sqlQuery: source, queryParameters });

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,WAAW,EACX,OAAO,EACP,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,EACb,EAAE;IACD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,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,CA2Cb"}
+{"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,WAAW,EACX,OAAO,EACP,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,EACb,EAAE;IACD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,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,CA4Cb"}

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

@@ -8,14 +8,13 @@ function encodeParameter(name, value) {
 }
 const REQUEST_CACHE = new Map();
 export async function requestWithParameters({ accessToken, baseUrl, parameters, headers: customHeaders, errorContext }) {
-    const key = JSON.stringify({ baseUrl, parameters, customHeaders });
+    const key = createCacheKey(baseUrl, parameters || {}, customHeaders || {});
     if (REQUEST_CACHE.has(key)) {
         return REQUEST_CACHE.get(key);
     }
     let url = baseUrl;
     if (parameters) {
-        const allParameters = { ...DEFAULT_PARAMETERS, ...parameters };
-        const encodedParameters = Object.entries(allParameters).map(([key, value]) => {
+        const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(([key, value]) => {
             return encodeParameter(key, value);
         });
         url += `?${encodedParameters.join('&')}`;
@@ -51,3 +50,8 @@ export async function requestWithParameters({ accessToken, baseUrl, parameters,
         throw new CartoAPIError(error, errorContext);
     }
 }
+function createCacheKey(baseUrl, parameters, headers) {
+    const parameterEntries = Object.entries(parameters).sort(([a], [b]) => (a > b ? 1 : -1));
+    const headerEntries = Object.entries(headers).sort(([a], [b]) => (a > b ? 1 : -1));
+    return JSON.stringify({ baseUrl, parameters: parameterEntries, headers: headerEntries });
+}

package/dist/cartoRasterTile-worker.js

@@ -762,9 +762,7 @@
   var parentPort = null;
 
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-utils/get-transfer-list.js
-  function getTransferList(object) {
-    let recursive = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-    let transfers = arguments.length > 2 ? arguments[2] : void 0;
+  function getTransferList(object, recursive = true, transfers) {
     const transfersSet = transfers || /* @__PURE__ */ new Set();
     if (!object) {
     } else if (isTransferable(object)) {
@@ -810,10 +808,7 @@
     static set onmessage(onMessage) {
       async function handleMessage(message) {
         const parentPort2 = await getParentPort();
-        const {
-          type,
-          payload
-        } = parentPort2 ? message : message.data;
+        const { type, payload } = parentPort2 ? message : message.data;
         onMessage(type, payload);
       }
       getParentPort().then((parentPort2) => {
@@ -833,10 +828,7 @@
             return;
           }
           const parentPort3 = await getParentPort();
-          const {
-            type,
-            payload
-          } = parentPort3 ? message : message.data;
+          const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
@@ -858,11 +850,7 @@
       }
     }
     static async postMessage(type, payload) {
-      const data = {
-        source: "loaders.gl",
-        type,
-        payload
-      };
+      const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
       const parentPort2 = await getParentPort();
       if (parentPort2) {
@@ -873,10 +861,7 @@
     }
   };
   function isKnownMessage(message) {
-    const {
-      type,
-      data
-    } = message;
+    const { type, data } = message;
     return type === "message" && data && typeof data.source === "string" && data.source.startsWith("loaders.gl");
   }
 
@@ -890,11 +875,7 @@
       switch (type) {
         case "process":
           try {
-            const {
-              input,
-              options = {},
-              context = {}
-            } = payload;
+            const { input, options = {}, context = {} } = payload;
             const result = await parseData({
               loader,
               arrayBuffer: input,
@@ -904,14 +885,10 @@
                 _parse: parseOnMainThread
               }
             });
-            WorkerBody.postMessage("done", {
-              result
-            });
+            WorkerBody.postMessage("done", { result });
           } catch (error) {
             const message = error instanceof Error ? error.message : "";
-            WorkerBody.postMessage("error", {
-              error: message
-            });
+            WorkerBody.postMessage("error", { error: message });
           }
           break;
         default:
@@ -938,21 +915,11 @@
         }
       };
       WorkerBody.addEventListener(onMessage);
-      const payload = {
-        id: id2,
-        input: arrayBuffer,
-        options
-      };
+      const payload = { id: id2, input: arrayBuffer, options };
       WorkerBody.postMessage("process", payload);
     });
   }
-  async function parseData(_ref) {
-    let {
-      loader,
-      arrayBuffer,
-      options,
-      context
-    } = _ref;
+  async function parseData({ loader, arrayBuffer, options, context }) {
     let data;
     let parser;
     if (loader.parseSync || loader.parse) {
@@ -970,9 +937,7 @@
       modules: loader && loader.options && loader.options.modules || {},
       worker: false
     };
-    return await parser(data, {
-      ...options
-    }, context, loader);
+    return await parser(data, { ...options }, context, loader);
   }
 
   // src/layers/schema/fast-pbf.ts
@@ -1017,14 +982,12 @@
   };
   var TileReader = class {
     static read(pbf, end) {
-      return pbf.readFields(TileReader._readField, { blockWidth: 0, blockHeight: 0, bands: [] }, end);
+      return pbf.readFields(TileReader._readField, { blockSize: 0, bands: [] }, end);
     }
     static _readField(tag, obj, pbf) {
       if (tag === 1)
-        obj.blockWidth = pbf.readVarint();
+        obj.blockSize = pbf.readVarint();
       else if (tag === 2)
-        obj.blockHeight = pbf.readVarint();
-      else if (tag === 3)
         obj.bands.push(BandReader.read(pbf, pbf.readVarint() + pbf.pos));
     }
   };
@@ -1043,7 +1006,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.0-beta.7" : "latest";
+  var VERSION = true ? "9.0.0-beta.9" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {
@@ -1066,14 +1029,13 @@
   function parseCartoRasterTile(arrayBuffer, options) {
     if (!arrayBuffer)
       return null;
-    const tile = parsePbf(arrayBuffer, TileReader);
-    const { bands, blockHeight, blockWidth } = tile;
+    const { bands, blockSize } = parsePbf(arrayBuffer, TileReader);
     const numericProps = {};
     for (let i = 0; i < bands.length; i++) {
       const { name, data } = bands[i];
       numericProps[name] = data;
     }
-    return { blockWidth, blockHeight, cells: { numericProps, properties: [] } };
+    return { blockSize, cells: { numericProps, properties: [] } };
   }
   var carto_raster_tile_loader_default = CartoRasterTileLoader;
 

package/dist/cartoSpatialTile-worker.js

@@ -1088,9 +1088,7 @@
   var parentPort = null;
 
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-utils/get-transfer-list.js
-  function getTransferList(object) {
-    let recursive = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-    let transfers = arguments.length > 2 ? arguments[2] : void 0;
+  function getTransferList(object, recursive = true, transfers) {
     const transfersSet = transfers || /* @__PURE__ */ new Set();
     if (!object) {
     } else if (isTransferable(object)) {
@@ -1136,10 +1134,7 @@
     static set onmessage(onMessage) {
       async function handleMessage(message) {
         const parentPort2 = await getParentPort();
-        const {
-          type,
-          payload
-        } = parentPort2 ? message : message.data;
+        const { type, payload } = parentPort2 ? message : message.data;
         onMessage(type, payload);
       }
       getParentPort().then((parentPort2) => {
@@ -1159,10 +1154,7 @@
             return;
           }
           const parentPort3 = await getParentPort();
-          const {
-            type,
-            payload
-          } = parentPort3 ? message : message.data;
+          const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
@@ -1184,11 +1176,7 @@
       }
     }
     static async postMessage(type, payload) {
-      const data = {
-        source: "loaders.gl",
-        type,
-        payload
-      };
+      const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
       const parentPort2 = await getParentPort();
       if (parentPort2) {
@@ -1199,10 +1187,7 @@
     }
   };
   function isKnownMessage(message) {
-    const {
-      type,
-      data
-    } = message;
+    const { type, data } = message;
     return type === "message" && data && typeof data.source === "string" && data.source.startsWith("loaders.gl");
   }
 
@@ -1216,11 +1201,7 @@
       switch (type) {
         case "process":
           try {
-            const {
-              input,
-              options = {},
-              context = {}
-            } = payload;
+            const { input, options = {}, context = {} } = payload;
             const result = await parseData({
               loader,
               arrayBuffer: input,
@@ -1230,14 +1211,10 @@
                 _parse: parseOnMainThread
               }
             });
-            WorkerBody.postMessage("done", {
-              result
-            });
+            WorkerBody.postMessage("done", { result });
           } catch (error) {
             const message = error instanceof Error ? error.message : "";
-            WorkerBody.postMessage("error", {
-              error: message
-            });
+            WorkerBody.postMessage("error", { error: message });
           }
           break;
         default:
@@ -1264,21 +1241,11 @@
         }
       };
       WorkerBody.addEventListener(onMessage);
-      const payload = {
-        id: id2,
-        input: arrayBuffer,
-        options
-      };
+      const payload = { id: id2, input: arrayBuffer, options };
       WorkerBody.postMessage("process", payload);
     });
   }
-  async function parseData(_ref) {
-    let {
-      loader,
-      arrayBuffer,
-      options,
-      context
-    } = _ref;
+  async function parseData({ loader, arrayBuffer, options, context }) {
     let data;
     let parser;
     if (loader.parseSync || loader.parse) {
@@ -1296,9 +1263,7 @@
       modules: loader && loader.options && loader.options.modules || {},
       worker: false
     };
-    return await parser(data, {
-      ...options
-    }, context, loader);
+    return await parser(data, { ...options }, context, loader);
   }
 
   // src/layers/schema/fast-pbf.ts
@@ -1430,7 +1395,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.0.0-beta.7" : "latest";
+  var VERSION = true ? "9.0.0-beta.9" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -1225,9 +1225,7 @@
   var parentPort = null;
 
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-utils/get-transfer-list.js
-  function getTransferList(object) {
-    let recursive = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
-    let transfers = arguments.length > 2 ? arguments[2] : void 0;
+  function getTransferList(object, recursive = true, transfers) {
     const transfersSet = transfers || /* @__PURE__ */ new Set();
     if (!object) {
     } else if (isTransferable(object)) {
@@ -1273,10 +1271,7 @@
     static set onmessage(onMessage) {
       async function handleMessage(message) {
         const parentPort2 = await getParentPort();
-        const {
-          type,
-          payload
-        } = parentPort2 ? message : message.data;
+        const { type, payload } = parentPort2 ? message : message.data;
         onMessage(type, payload);
       }
       getParentPort().then((parentPort2) => {
@@ -1296,10 +1291,7 @@
             return;
           }
           const parentPort3 = await getParentPort();
-          const {
-            type,
-            payload
-          } = parentPort3 ? message : message.data;
+          const { type, payload } = parentPort3 ? message : message.data;
           onMessage(type, payload);
         };
       }
@@ -1321,11 +1313,7 @@
       }
     }
     static async postMessage(type, payload) {
-      const data = {
-        source: "loaders.gl",
-        type,
-        payload
-      };
+      const data = { source: "loaders.gl", type, payload };
       const transferList = getTransferList(payload);
       const parentPort2 = await getParentPort();
       if (parentPort2) {
@@ -1336,10 +1324,7 @@
     }
   };
   function isKnownMessage(message) {
-    const {
-      type,
-      data
-    } = message;
+    const { type, data } = message;
     return type === "message" && data && typeof data.source === "string" && data.source.startsWith("loaders.gl");
   }
 
@@ -1353,11 +1338,7 @@
       switch (type) {
         case "process":
           try {
-            const {
-              input,
-              options = {},
-              context = {}
-            } = payload;
+            const { input, options = {}, context = {} } = payload;
             const result = await parseData({
               loader,
               arrayBuffer: input,
@@ -1367,14 +1348,10 @@
                 _parse: parseOnMainThread
               }
             });
-            WorkerBody.postMessage("done", {
-              result
-            });
+            WorkerBody.postMessage("done", { result });
           } catch (error) {
             const message = error instanceof Error ? error.message : "";
-            WorkerBody.postMessage("error", {
-              error: message
-            });
+            WorkerBody.postMessage("error", { error: message });
           }
           break;
         default:
@@ -1401,21 +1378,11 @@
         }
       };
       WorkerBody.addEventListener(onMessage);
-      const payload = {
-        id: id2,
-        input: arrayBuffer,
-        options
-      };
+      const payload = { id: id2, input: arrayBuffer, options };
       WorkerBody.postMessage("process", payload);
     });
   }
-  async function parseData(_ref) {
-    let {
-      loader,
-      arrayBuffer,
-      options,
-      context
-    } = _ref;
+  async function parseData({ loader, arrayBuffer, options, context }) {
     let data;
     let parser;
     if (loader.parseSync || loader.parse) {
@@ -1433,9 +1400,7 @@
       modules: loader && loader.options && loader.options.modules || {},
       worker: false
     };
-    return await parser(data, {
-      ...options
-    }, context, loader);
+    return await parser(data, { ...options }, context, loader);
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
@@ -1658,7 +1623,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.0.0-beta.7" : "latest";
+  var VERSION = true ? "9.0.0-beta.9" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/constants.d.ts

@@ -0,0 +1,5 @@
+export declare const DEFAULT_TILE_SIZE = 512;
+export declare const DEFAULT_TILE_RESOLUTION = 0.5;
+export declare const DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
+export declare const DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;
+//# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,iBAAiB,MAAM,CAAC;AACrC,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAE3C,eAAO,MAAM,gCAAgC,IAAI,CAAC;AAClD,eAAO,MAAM,qCAAqC,IAAI,CAAC"}

package/dist/constants.js

@@ -0,0 +1,4 @@
+export const DEFAULT_TILE_SIZE = 512;
+export const DEFAULT_TILE_RESOLUTION = 0.5;
+export const DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
+export const DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;