@deck.gl/carto 9.0.23 → 9.0.24

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

@@ -1,9 +1,5 @@
 import { scaleLinear, scaleOrdinal, scaleLog, scalePoint, scaleQuantile, scaleQuantize, scaleSqrt, scaleThreshold } from 'd3-scale';
 import { Accessor, Layer, _ConstructorOf as ConstructorOf } from '@deck.gl/core';
-import H3TileLayer from "../layers/h3-tile-layer.js";
-import QuadbinTileLayer from "../layers/quadbin-tile-layer.js";
-import VectorTileLayer from "../layers/vector-tile-layer.js";
-import { MapType } from "./types.js";
 import { scaleIdentity } from "../utils.js";
 import { CustomMarkersRange, MapDataset, MapTextSubLayerConfig, VisConfig, VisualChannelField, VisualChannels } from "./types.js";
 declare const SCALE_FUNCS: {
@@ -18,6 +14,9 @@ declare const SCALE_FUNCS: {
     identity: typeof scaleIdentity;
 };
 export type SCALE_TYPE = keyof typeof SCALE_FUNCS;
+type TileLayerType = 'clusterTile' | 'h3' | 'heatmapTile' | 'mvt' | 'quadbin' | 'raster' | 'tileset';
+type DocumentLayerType = 'geojson' | 'grid' | 'heatmap' | 'hexagon' | 'hexagonId' | 'point';
+type LayerType = TileLayerType | DocumentLayerType;
 export declare const AGGREGATION: {
     average: string;
     maximum: string;
@@ -29,12 +28,11 @@ export declare const OPACITY_MAP: {
     getLineColor: string;
     getTextColor: string;
 };
-export declare function getLayer(type: string, config: MapTextSubLayerConfig, dataset: MapDataset): {
+export declare function getLayer(type: LayerType, config: MapTextSubLayerConfig, dataset: MapDataset): {
     Layer: ConstructorOf<Layer>;
     propMap: any;
     defaultProps: any;
 };
-export declare function layerFromTileDataset(scheme: string, type?: MapType): typeof VectorTileLayer | typeof H3TileLayer | typeof QuadbinTileLayer;
 declare function domainFromValues(values: any, scaleType: SCALE_TYPE): any;
 export declare function opacityToAlpha(opacity?: number): number;
 export declare function getColorValueAccessor({ name }: {

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

@@ -1 +1 @@
-{"version":3,"file":"layer-map.d.ts","sourceRoot":"","sources":["../../src/api/layer-map.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,aAAa,EACb,aAAa,EACb,SAAS,EACT,cAAc,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,cAAc,IAAI,aAAa,EAAC,MAAM,eAAe,CAAC;AAK/E,OAAO,WAAW,mCAAgC;AAClD,OAAO,gBAAgB,wCAAqC;AAE5D,OAAO,eAAe,uCAAoC;AAC1D,OAAO,EAAC,OAAO,EAAC,mBAAgB;AAChC,OAAO,EAA4B,aAAa,EAAC,oBAAiB;AAClE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,qBAAqB,EACrB,SAAS,EACT,kBAAkB,EAClB,cAAc,EACf,mBAAgB;AAEjB,QAAA,MAAM,WAAW;;;;;;;;;;CAUhB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,WAAW,CAAC;AAQlD,eAAO,MAAM,WAAW;;;;;CAKvB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;CAIvB,CAAC;AAuEF,wBAAgB,QAAQ,CACtB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,UAAU,GAClB;IAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC;IAAC,YAAY,EAAE,GAAG,CAAA;CAAC,CA6DhE;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,eAAe,GAAG,OAAO,WAAW,GAAG,OAAO,gBAAgB,CAYvE;AAuCD,iBAAS,gBAAgB,CAAC,MAAM,KAAA,EAAE,SAAS,EAAE,UAAU,OActD;AAoCD,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,UAE9C;AAqBD,wBAAgB,qBAAqB,CAAC,EAAC,IAAI,EAAC;;CAAA,EAAE,gBAAgB,KAAA,EAAE,IAAI,EAAE,GAAG,OAIxE;AAED,wBAAgB,gBAAgB,CAC9B,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,kBAAkB,EACvC,SAAS,EAAE,UAAU,EACrB,EAAC,WAAW,EAAE,KAAK,EAAC;;;CAAA,EACpB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,IAAI,EAAE,GAAG,OAeV;AAmCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,EAC5C,KAAK,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,EAC5C,EAAC,WAAW,EAAE,WAAW,EAAE,cAAc,EAAC;;;;CAAA,EAC1C,IAAI,EAAE,GAAG,OAgCV;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAK7F;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAEpF;AAED,wBAAgB,eAAe,CAC7B,EAAC,IAAI,EAAC;;CAAA,EACN,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,WAAW,KAAA,EACX,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS,EAClC,IAAI,EAAE,GAAG,OAmBV;AAUD,wBAAgB,eAAe,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,EAAE,kBAAkB,EAAE,IAAI,KAAA,OAMrE;AAED,OAAO,EAAC,gBAAgB,IAAI,iBAAiB,EAAC,CAAC"}
+{"version":3,"file":"layer-map.d.ts","sourceRoot":"","sources":["../../src/api/layer-map.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,aAAa,EACb,aAAa,EACb,SAAS,EACT,cAAc,EACf,MAAM,UAAU,CAAC;AAIlB,OAAO,EAAC,QAAQ,EAAE,KAAK,EAAE,cAAc,IAAI,aAAa,EAAC,MAAM,eAAe,CAAC;AAU/E,OAAO,EAA4B,aAAa,EAAC,oBAAiB;AAClE,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,qBAAqB,EACrB,SAAS,EACT,kBAAkB,EAClB,cAAc,EACf,mBAAgB;AAGjB,QAAA,MAAM,WAAW;;;;;;;;;;CAUhB,CAAC;AACF,MAAM,MAAM,UAAU,GAAG,MAAM,OAAO,WAAW,CAAC;AAElD,KAAK,aAAa,GACd,aAAa,GACb,IAAI,GACJ,aAAa,GACb,KAAK,GACL,SAAS,GACT,QAAQ,GACR,SAAS,CAAC;AACd,KAAK,iBAAiB,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC;AAC5F,KAAK,SAAS,GAAG,aAAa,GAAG,iBAAiB,CAAC;AAQnD,eAAO,MAAM,WAAW;;;;;CAKvB,CAAC;AAEF,eAAO,MAAM,WAAW;;;;CAIvB,CAAC;AAiFF,wBAAgB,QAAQ,CACtB,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,qBAAqB,EAC7B,OAAO,EAAE,UAAU,GAClB;IAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC;IAAC,YAAY,EAAE,GAAG,CAAA;CAAC,CA6DhE;AAmCD,iBAAS,gBAAgB,CAAC,MAAM,KAAA,EAAE,SAAS,EAAE,UAAU,OActD;AAoCD,wBAAgB,cAAc,CAAC,OAAO,CAAC,EAAE,MAAM,UAE9C;AAqBD,wBAAgB,qBAAqB,CAAC,EAAC,IAAI,EAAC;;CAAA,EAAE,gBAAgB,KAAA,EAAE,IAAI,EAAE,GAAG,OAIxE;AAED,wBAAgB,gBAAgB,CAC9B,EAAC,IAAI,EAAE,WAAW,EAAC,EAAE,kBAAkB,EACvC,SAAS,EAAE,UAAU,EACrB,EAAC,WAAW,EAAE,KAAK,EAAC;;;CAAA,EACpB,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,IAAI,EAAE,GAAG,OAeV;AAmCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,EAC5C,KAAK,EAAE,kBAAkB,GAAG,IAAI,GAAG,SAAS,EAC5C,EAAC,WAAW,EAAE,WAAW,EAAE,cAAc,EAAC;;;;CAAA,EAC1C,IAAI,EAAE,GAAG,OAgCV;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,cAAc,GAAG,MAAM,CAK7F;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAEpF;AAED,wBAAgB,eAAe,CAC7B,EAAC,IAAI,EAAC;;CAAA,EACN,SAAS,EAAE,UAAU,GAAG,SAAS,EACjC,WAAW,KAAA,EACX,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS,EAClC,IAAI,EAAE,GAAG,OAmBV;AAUD,wBAAgB,eAAe,CAAC,EAAC,IAAI,EAAE,IAAI,EAAC,EAAE,kBAAkB,EAAE,IAAI,KAAA,OAMrE;AAED,OAAO,EAAC,gBAAgB,IAAI,iBAAiB,EAAC,CAAC"}

package/dist/api/layer-map.js

@@ -6,11 +6,13 @@ import moment from 'moment-timezone';
 import { CPUGridLayer, HeatmapLayer, HexagonLayer } from '@deck.gl/aggregation-layers';
 import { GeoJsonLayer } from '@deck.gl/layers';
 import { H3HexagonLayer } from '@deck.gl/geo-layers';
+import ClusterTileLayer from "../layers/cluster-tile-layer.js";
 import H3TileLayer from "../layers/h3-tile-layer.js";
 import QuadbinTileLayer from "../layers/quadbin-tile-layer.js";
 import RasterTileLayer from "../layers/raster-tile-layer.js";
 import VectorTileLayer from "../layers/vector-tile-layer.js";
 import { assert, createBinaryProxy, scaleIdentity } from "../utils.js";
+import HeatmapTileLayer from "../layers/heatmap-tile-layer.js";
 const SCALE_FUNCS = {
     linear: scaleLinear,
     ordinal: scaleOrdinal,
@@ -45,6 +47,15 @@ const AGGREGATION_FUNC = {
     stddev: deviation,
     variance
 };
+const TILE_LAYER_TYPE_TO_LAYER = {
+    clusterTile: ClusterTileLayer,
+    h3: H3TileLayer,
+    heatmapTile: HeatmapTileLayer,
+    mvt: VectorTileLayer,
+    quadbin: QuadbinTileLayer,
+    raster: RasterTileLayer,
+    tileset: VectorTileLayer
+};
 const hexToRGBA = c => {
     const { r, g, b, opacity } = rgb(c);
     return [r, g, b, 255 * opacity];
@@ -104,8 +115,8 @@ export function getLayer(type, config, dataset) {
     if (config.visConfig?.customMarkers) {
         basePropMap = mergePropMaps(sharedPropMap, customMarkersPropsMap);
     }
-    if (type === 'mvt' || type === 'tileset' || type === 'h3' || type === 'quadbin') {
-        return getTileLayer(dataset, basePropMap);
+    if (TILE_LAYER_TYPE_TO_LAYER[type]) {
+        return getTileLayer(dataset, basePropMap, type);
     }
     const geoColumn = dataset?.geoColumn;
     const getPosition = d => d[geoColumn].coordinates;
@@ -152,22 +163,10 @@ export function getLayer(type, config, dataset) {
         defaultProps: { ...defaultProps, ...layer.defaultProps }
     };
 }
-export function layerFromTileDataset(scheme, type) {
-    if (type === 'raster') {
-        return RasterTileLayer;
-    }
-    if (scheme === 'h3') {
-        return H3TileLayer;
-    }
-    if (scheme === 'quadbin') {
-        return QuadbinTileLayer;
-    }
-    return VectorTileLayer;
-}
-function getTileLayer(dataset, basePropMap) {
-    const { aggregationExp, aggregationResLevel, data: { scheme } } = dataset;
+function getTileLayer(dataset, basePropMap, type) {
+    const { aggregationExp, aggregationResLevel } = dataset;
     return {
-        Layer: layerFromTileDataset(scheme),
+        Layer: TILE_LAYER_TYPE_TO_LAYER[type] || VectorTileLayer,
         propMap: basePropMap,
         defaultProps: {
             ...defaultProps,

package/dist/cartoRasterTile-worker.js

@@ -1008,7 +1008,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.23" : "latest";
+  var VERSION = true ? "9.0.24" : "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.23" : "latest";
+  var VERSION = true ? "9.0.24" : "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.23" : "latest";
+  var VERSION = true ? "9.0.24" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {