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

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.5",
   "publishConfig": {
     "access": "public"
   },
@@ -20,6 +20,7 @@
   },
   "main": "dist/es5/index.js",
   "module": "dist/esm/index.js",
+  "types": "typed/index.d.ts",
   "files": [
     "dist",
     "src",
@@ -59,12 +60,12 @@
     "@types/d3-scale": "^3.0.0"
   },
   "peerDependencies": {
-    "@deck.gl/aggregation-layers": "^8.0.0",
-    "@deck.gl/core": "^8.0.0",
-    "@deck.gl/extensions": "^8.0.0",
-    "@deck.gl/geo-layers": "^8.0.0",
-    "@deck.gl/layers": "^8.0.0",
+    "@deck.gl/aggregation-layers": "^9.0.0-alpha",
+    "@deck.gl/core": "^9.0.0-alpha",
+    "@deck.gl/extensions": "^9.0.0-alpha",
+    "@deck.gl/geo-layers": "^9.0.0-alpha",
+    "@deck.gl/layers": "^9.0.0-alpha",
     "@loaders.gl/core": "4.0.3"
   },
-  "gitHead": "51dfb88f9168ccf478d01b28a2c5ada7bd8281c7"
+  "gitHead": "683e985b1b91160d7930b746bbd195fc1405a687"
 }

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/api/layer-map.d.ts

@@ -1,5 +1,5 @@
 import { scaleLinear, scaleOrdinal, scaleLog, scalePoint, scaleQuantile, scaleQuantize, scaleSqrt, scaleThreshold } from 'd3-scale';
-import { Accessor, Layer, _ConstructorOf as ConstructorOf } from '@deck.gl/core/typed';
+import { Accessor, Layer, _ConstructorOf as ConstructorOf } from '@deck.gl/core';
 import H3TileLayer from '../layers/h3-tile-layer';
 import QuadbinTileLayer from '../layers/quadbin-tile-layer';
 import VectorTileLayer from '../layers/vector-tile-layer';

package/typed/layers/h3-tile-layer.d.ts

@@ -1,5 +1,5 @@
-import { CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core/typed';
-import { H3HexagonLayer, H3HexagonLayerProps } from '@deck.gl/geo-layers/typed';
+import { CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core';
+import { H3HexagonLayer, H3HexagonLayerProps } from '@deck.gl/geo-layers';
 import { SpatialIndexTileLayerProps } from './spatial-index-tile-layer';
 import type { TilejsonResult } from '../sources/types';
 export declare const renderSubLayers: (props: any) => H3HexagonLayer<any, {

package/typed/layers/h3-tileset-2d.d.ts

@@ -1,4 +1,4 @@
-import { _Tileset2D as Tileset2D, GeoBoundingBox } from '@deck.gl/geo-layers/typed';
+import { _Tileset2D as Tileset2D, GeoBoundingBox } from '@deck.gl/geo-layers';
 export declare type H3TileIndex = {
     i: string;
 };

package/typed/layers/point-label-layer.d.ts

@@ -1,5 +1,5 @@
-import { Accessor, Color, CompositeLayer, CompositeLayerProps, DefaultProps, Layer, LayersList } from '@deck.gl/core/typed';
-import { TextLayer, TextLayerProps } from '@deck.gl/layers/typed';
+import { Accessor, Color, CompositeLayer, CompositeLayerProps, DefaultProps, Layer, LayersList } from '@deck.gl/core';
+import { TextLayer, TextLayerProps } from '@deck.gl/layers';
 declare class EnhancedTextLayer extends TextLayer {
     static layerName: string;
     filterSubLayer({ layer, renderPass }: {

package/typed/layers/quadbin-layer.d.ts

@@ -1,5 +1,5 @@
-import { AccessorFunction, DefaultProps } from '@deck.gl/core/typed';
-import { _GeoCellLayer as GeoCellLayer, _GeoCellLayerProps as GeoCellLayerProps } from '@deck.gl/geo-layers/typed';
+import { AccessorFunction, DefaultProps } from '@deck.gl/core';
+import { _GeoCellLayer as GeoCellLayer, _GeoCellLayerProps as GeoCellLayerProps } from '@deck.gl/geo-layers';
 /** All properties supported by QuadbinLayer. */
 export declare type QuadbinLayerProps<DataT = unknown> = _QuadbinLayerProps<DataT> & GeoCellLayerProps<DataT>;
 /** Properties added by QuadbinLayer. */

package/typed/layers/quadbin-tile-layer.d.ts

@@ -1,4 +1,4 @@
-import { CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core/typed';
+import { CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core';
 import QuadbinLayer, { QuadbinLayerProps } from './quadbin-layer';
 import { SpatialIndexTileLayerProps } from './spatial-index-tile-layer';
 import type { TilejsonResult } from '../sources/types';

package/typed/layers/quadbin-tileset-2d.d.ts

@@ -1,4 +1,4 @@
-import { _Tileset2D as Tileset2D } from '@deck.gl/geo-layers/typed';
+import { _Tileset2D as Tileset2D } from '@deck.gl/geo-layers';
 declare type QuadbinTileIndex = {
     q: bigint;
     i?: string;

package/typed/layers/raster-layer.d.ts

@@ -1,5 +1,5 @@
-import { Accessor, CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core/typed';
-import { ColumnLayerProps } from '@deck.gl/layers/typed';
+import { Accessor, CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps } from '@deck.gl/core';
+import { ColumnLayerProps } from '@deck.gl/layers';
 /** All properties supported by RasterLayer. */
 export declare type RasterLayerProps<DataT = unknown> = _RasterLayerProps & ColumnLayerProps<DataT> & CompositeLayerProps;
 /** Properties added by RasterLayer. */

package/typed/layers/raster-tile-layer.d.ts

@@ -1,4 +1,4 @@
-import { CompositeLayer, CompositeLayerProps, DefaultProps, Layer, LayersList } from '@deck.gl/core/typed';
+import { CompositeLayer, CompositeLayerProps, DefaultProps, Layer, LayersList } from '@deck.gl/core';
 import RasterLayer, { RasterLayerProps } from './raster-layer';
 import { SpatialIndexTileLayerProps } from './spatial-index-tile-layer';
 import type { TilejsonResult } from '../sources/types';

package/typed/layers/spatial-index-tile-layer.d.ts

@@ -1,6 +1,6 @@
-import { DefaultProps } from '@deck.gl/core/typed';
-import { PickingInfo } from '@deck.gl/core/typed';
-import { TileLayer, _Tile2DHeader as Tile2DHeader, TileLayerProps } from '@deck.gl/geo-layers/typed';
+import { DefaultProps } from '@deck.gl/core';
+import { PickingInfo } from '@deck.gl/core';
+import { TileLayer, _Tile2DHeader as Tile2DHeader, TileLayerProps } from '@deck.gl/geo-layers';
 /** All properties supported by SpatialIndexTileLayer. */
 export declare type SpatialIndexTileLayerProps<DataT = unknown> = _SpatialIndexTileLayerProps & TileLayerProps<DataT>;
 /** Properties added by SpatialIndexTileLayer. */

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/layers/vector-tile-layer.d.ts

@@ -1,6 +1,6 @@
-import { DefaultProps } from '@deck.gl/core/typed';
-import { MVTLayer, MVTLayerProps, TileLayer, _Tile2DHeader, _TileLoadProps as TileLoadProps } from '@deck.gl/geo-layers/typed';
-import { GeoJsonLayer } from '@deck.gl/layers/typed';
+import { DefaultProps } from '@deck.gl/core';
+import { MVTLayer, MVTLayerProps, TileLayer, _Tile2DHeader, _TileLoadProps as TileLoadProps } from '@deck.gl/geo-layers';
+import { GeoJsonLayer } from '@deck.gl/layers';
 import type { TilejsonResult } from '../sources/types';
 /** All properties supported by VectorTileLayer. */
 export declare type VectorTileLayerProps = _VectorTileLayerProps & Omit<MVTLayerProps, 'data'>;

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/typed/style/color-bins-style.d.ts

@@ -1,4 +1,4 @@
-import { AccessorFunction } from '@deck.gl/core/typed';
+import { AccessorFunction } from '@deck.gl/core';
 import { Feature } from 'geojson';
 import { Color } from './palette';
 import { AttributeSelector } from './utils';

package/typed/style/color-categories-style.d.ts

@@ -1,4 +1,4 @@
-import { AccessorFunction } from '@deck.gl/core/typed';
+import { AccessorFunction } from '@deck.gl/core';
 import { Feature } from 'geojson';
 import { Color } from './palette';
 import { AttributeSelector } from './utils';

package/typed/style/color-continuous-style.d.ts

@@ -1,4 +1,4 @@
-import { AccessorFunction } from '@deck.gl/core/typed';
+import { AccessorFunction } from '@deck.gl/core';
 import { Feature } from 'geojson';
 import { Color } from './palette';
 import { AttributeSelector } from './utils';

package/typed/package.json

@@ -1,6 +0,0 @@
-{
-  "internal": true,
-  "main": "../dist/es5/index.js",
-  "module": "../dist/esm/index.js",
-  "types": "index.d.ts"
-}