@deck.gl/carto 9.0.0-alpha.3 → 9.0.0-alpha.4

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": "9.0.0-alpha.3",
+  "version": "9.0.0-alpha.4",
   "publishConfig": {
     "access": "public"
   },
@@ -66,5 +66,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "4.0.3"
   },
-  "gitHead": "51dfb88f9168ccf478d01b28a2c5ada7bd8281c7"
+  "gitHead": "13ace64fc2cee08c133afc882fc307253489a4e4"
 }

package/src/api/fetch-map.ts

@@ -113,7 +113,7 @@ async function _fetchTilestats(
   accessToken: string,
   apiBaseUrl: string
 ) {
-  const {connectionName: connection, data, id, source, type} = dataset;
+  const {connectionName: connection, data, id, source, type, queryParameters} = dataset;
   const errorContext: APIErrorContext = {requestType: 'Tile stats', connection, type, source};
   if (!('tilestats' in data)) {
     throw new CartoAPIError(new Error(`Invalid dataset for tilestats: ${id}`), errorContext);
@@ -129,10 +129,17 @@ async function _fetchTilestats(
   }
 
   const headers = {Authorization: `Bearer ${accessToken}`};
+  const parameters: Record<string, string> = {};
+  if (type === 'query') {
+    parameters.q = source;
+    if (queryParameters) {
+      parameters.queryParameters = JSON.stringify(queryParameters);
+    }
+  }
   const stats = await requestWithParameters({
     baseUrl,
     headers,
-    parameters: type === 'query' ? {q: source} : {},
+    parameters,
     errorContext
   });
 

package/src/layers/utils.ts

@@ -1,3 +1,4 @@
+import {log} from '@deck.gl/core';
 import {Tile as PropertiesTile} from './schema/carto-properties-tile';
 import {Tile as VectorTile} from './schema/carto-tile';
 import {_deepEqual as deepEqual} from '@deck.gl/core';
@@ -19,9 +20,10 @@ export function mergeBoundaryData(geometry: VectorTile, properties: PropertiesTi
   const mapping = {};
   for (const {geoid, ...rest} of properties.properties) {
     if (geoid in mapping) {
-      throw new Error(`Duplicate geoid key in mapping: ${geoid}`);
+      log.warn(`Duplicate geoid key in boundary mapping, using first occurance`)();
+    } else {
+      mapping[geoid] = rest;
     }
-    mapping[geoid] = rest;
   }
 
   for (const type of ['points', 'lines', 'polygons']) {

package/src/layers/vector-tile-layer.ts

@@ -104,7 +104,7 @@ export default class VectorTileLayer<ExtraProps extends {} = {}> extends MVTLaye
     const [geometry, attributes] = await Promise.all([geometryFetch, attributesFetch]);
     if (!geometry) return null;
 
-    return mergeBoundaryData(geometry, attributes);
+    return attributes ? mergeBoundaryData(geometry, attributes) : geometry;
   }
 
   renderSubLayers(

package/src/sources/boundary-query-source.ts

@@ -6,7 +6,7 @@ export type BoundaryQuerySourceOptions = SourceOptions & {
   boundaryId: string;
   matchingColumn?: string;
   sqlQuery: string;
-  queryParameters: QueryParameters;
+  queryParameters?: QueryParameters;
 };
 type UrlParameters = {
   boundaryId: string;

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

@@ -1 +1 @@
-{"version":3,"file":"fetch-map.d.ts","sourceRoot":"","sources":["../../src/api/fetch-map.ts"],"names":[],"mappings":"AAiMA,oBAAY,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,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,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,OAAO,EACP,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":"AAwMA,oBAAY,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,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,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,OAAO,EACP,WAAW,EACX,SAAS,EACV,EAAE,eAAe;4BAmBY,IAAI;;;;;;;;;;GAuDjC"}

package/typed/layers/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/layers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,IAAI,cAAc,EAAC,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAC,IAAI,IAAI,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAErD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAO7E;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,GAAG,UAAU,CAkD9F;AAED,eAAO,MAAM,gBAAgB;;;sBAGT,cAAc;;;CASjC,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/layers/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,IAAI,cAAc,EAAC,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAC,IAAI,IAAI,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAErD;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,CAO7E;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,cAAc,GAAG,UAAU,CAmD9F;AAED,eAAO,MAAM,gBAAgB;;;sBAGT,cAAc;;;CASjC,CAAC"}

package/typed/sources/boundary-query-source.d.ts

@@ -4,7 +4,7 @@ export declare type BoundaryQuerySourceOptions = SourceOptions & {
     boundaryId: string;
     matchingColumn?: string;
     sqlQuery: string;
-    queryParameters: QueryParameters;
+    queryParameters?: QueryParameters;
 };
 export declare const boundaryQuerySource: (options: BoundaryQuerySourceOptions) => Promise<TilejsonResult>;
 //# sourceMappingURL=boundary-query-source.d.ts.map

package/typed/sources/boundary-query-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"boundary-query-source.d.ts","sourceRoot":"","sources":["../../src/sources/boundary-query-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAE3D,oBAAY,0BAA0B,GAAG,aAAa,GAAG;IACvD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,eAAe,CAAC;CAClC,CAAC;AAQF,eAAO,MAAM,mBAAmB,YACrB,0BAA0B,KAClC,QAAQ,cAAc,CAWxB,CAAC"}
+{"version":3,"file":"boundary-query-source.d.ts","sourceRoot":"","sources":["../../src/sources/boundary-query-source.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAE3D,oBAAY,0BAA0B,GAAG,aAAa,GAAG;IACvD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AAQF,eAAO,MAAM,mBAAmB,YACrB,0BAA0B,KAClC,QAAQ,cAAc,CAWxB,CAAC"}

package/LICENSE

@@ -1,19 +0,0 @@
-Copyright Vis.gl contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.