@deck.gl/carto 8.8.4 → 8.8.5

package/dist/dist.dev.js

@@ -46676,7 +46676,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!******************************!*\
   !*** ./src/api/layer-map.ts ***!
   \******************************/
-/*! exports provided: AGGREGATION, OPACITY_MAP, getLayer, opacityToAlpha, getColorValueAccessor, getColorAccessor, getSizeAccessor, getTextAccessor, getTextPixelOffsetAccessor, _domainFromValues */
+/*! exports provided: AGGREGATION, OPACITY_MAP, getLayer, layerFromTileDataset, opacityToAlpha, getColorValueAccessor, getColorAccessor, getSizeAccessor, getTextAccessor, getTextPixelOffsetAccessor, _domainFromValues */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -46684,6 +46684,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AGGREGATION", function() { return AGGREGATION; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "OPACITY_MAP", function() { return OPACITY_MAP; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getLayer", function() { return getLayer; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "layerFromTileDataset", function() { return layerFromTileDataset; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "opacityToAlpha", function() { return opacityToAlpha; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getColorValueAccessor", function() { return getColorValueAccessor; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getColorAccessor", function() { return getColorAccessor; });
@@ -46700,8 +46701,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @deck.gl/aggregation-layers */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5__);
 /* harmony import */ var _layers_carto_tile_layer__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../layers/carto-tile-layer */ "./src/layers/carto-tile-layer.ts");
-/* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.ts");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../utils */ "./src/utils.ts");
+/* harmony import */ var _layers_h3_tile_layer__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../layers/h3-tile-layer */ "./src/layers/h3-tile-layer.ts");
+/* harmony import */ var _layers_quadbin_tile_layer__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../layers/quadbin-tile-layer */ "./src/layers/quadbin-tile-layer.ts");
+/* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.ts");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../utils */ "./src/utils.ts");
+
+
 
 
 
@@ -46805,7 +46810,7 @@ function mergePropMaps(a = {}, b = {}) {
 }
 
 function getLayer(type, config, dataset) {
-  if (type === 'mvt' || type === 'tileset') {
+  if (type === 'mvt' || type === 'tileset' || type === 'h3' || type === 'quadbin') {
     return getTileLayer(dataset);
   }
 
@@ -46877,7 +46882,7 @@ function getLayer(type, config, dataset) {
     }
   };
   const layer = layerTypeDefs[type];
-  Object(_utils__WEBPACK_IMPORTED_MODULE_8__["assert"])(layer, `Unsupported layer type: ${type}`);
+  Object(_utils__WEBPACK_IMPORTED_MODULE_10__["assert"])(layer, `Unsupported layer type: ${type}`);
   return { ...layer,
     propMap: mergePropMaps(sharedPropMap, layer.propMap),
     defaultProps: { ...defaultProps,
@@ -46885,31 +46890,60 @@ function getLayer(type, config, dataset) {
     }
   };
 }
+function layerFromTileDataset(formatTiles = _maps_api_common__WEBPACK_IMPORTED_MODULE_9__["TILE_FORMATS"].MVT, scheme) {
+  if (scheme === 'h3') {
+    return _layers_h3_tile_layer__WEBPACK_IMPORTED_MODULE_7__["default"];
+  }
+
+  if (scheme === 'quadbin') {
+    return _layers_quadbin_tile_layer__WEBPACK_IMPORTED_MODULE_8__["default"];
+  }
+
+  if (formatTiles === _maps_api_common__WEBPACK_IMPORTED_MODULE_9__["TILE_FORMATS"].MVT) {
+    return _deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5__["MVTLayer"];
+  } // formatTiles === BINARY|JSON|GEOJSON
+
+
+  return _layers_carto_tile_layer__WEBPACK_IMPORTED_MODULE_6__["default"];
+}
 
 function getTileLayer(dataset) {
   const {
+    aggregationExp,
+    aggregationResLevel,
     data: {
+      scheme,
       tiles: [tileUrl]
     }
   } = dataset;
   /* global URL */
 
-  const formatTiles = new URL(tileUrl).searchParams.get('formatTiles') || _maps_api_common__WEBPACK_IMPORTED_MODULE_7__["TILE_FORMATS"].MVT;
+  const formatTiles = new URL(tileUrl).searchParams.get('formatTiles');
   return {
-    Layer: formatTiles === _maps_api_common__WEBPACK_IMPORTED_MODULE_7__["TILE_FORMATS"].MVT ? _deck_gl_aggregation_layers__WEBPACK_IMPORTED_MODULE_5__["MVTLayer"] : _layers_carto_tile_layer__WEBPACK_IMPORTED_MODULE_6__["default"],
+    Layer: layerFromTileDataset(formatTiles, scheme),
     propMap: sharedPropMap,
     defaultProps: { ...defaultProps,
-      uniqueIdProperty: 'geoid',
-      formatTiles
+      ...(aggregationExp && {
+        aggregationExp
+      }),
+      ...(aggregationResLevel && {
+        aggregationResLevel
+      }),
+      formatTiles,
+      uniqueIdProperty: 'geoid'
     }
   };
 }
 
-function domainFromAttribute(attribute, scaleType) {
+function domainFromAttribute(attribute, scaleType, scaleLength) {
   if (scaleType === 'ordinal' || scaleType === 'point') {
     return attribute.categories.map(c => c.category).filter(c => c !== undefined && c !== null);
   }
 
+  if (scaleType === 'quantile' && attribute.quantiles) {
+    return attribute.quantiles[scaleLength];
+  }
+
   let {
     min
   } = attribute;
@@ -46934,14 +46968,14 @@ function domainFromValues(values, scaleType) {
   return Object(d3_array__WEBPACK_IMPORTED_MODULE_0__["extent"])(values);
 }
 
-function calculateDomain(data, name, scaleType) {
+function calculateDomain(data, name, scaleType, scaleLength) {
   if (data.tilestats) {
     // Tileset data type
     const {
       attributes
     } = data.tilestats.layers[0];
     const attribute = attributes.find(a => a.attribute === name);
-    return domainFromAttribute(attribute, scaleType);
+    return domainFromAttribute(attribute, scaleType, scaleLength);
   } else if (data.features) {
     // GeoJSON data type
     const values = data.features.map(({
@@ -46972,6 +47006,28 @@ function normalizeAccessor(accessor, data) {
 function opacityToAlpha(opacity) {
   return opacity !== undefined ? Math.round(255 * Math.pow(opacity, 1 / 2.2)) : 255;
 }
+
+function getAccessorKeys(name, aggregation) {
+  let keys = [name];
+
+  if (aggregation) {
+    // Snowflake will capitalized the keys, need to check lower and upper case version
+    keys = keys.concat([aggregation, aggregation.toUpperCase()].map(a => `${name}_${a}`));
+  }
+
+  return keys;
+}
+
+function findAccessorKey(keys, properties) {
+  for (const key of keys) {
+    if (key in properties) {
+      return [key];
+    }
+  }
+
+  throw new Error(`Could not find property for any accessor key: ${keys}`);
+}
+
 function getColorValueAccessor({
   name
 }, colorAggregation, data) {
@@ -46984,8 +47040,11 @@ function getColorValueAccessor({
 function getColorAccessor({
   name
 }, scaleType, {
-  colors,
-  colorMap
+  aggregation,
+  range: {
+    colors,
+    colorMap
+  }
 }, opacity, data) {
   const scale = SCALE_FUNCS[scaleType]();
   let domain = [];
@@ -46997,7 +47056,7 @@ function getColorAccessor({
       scaleColor.push(color);
     });
   } else {
-    domain = calculateDomain(data, name, scaleType);
+    domain = calculateDomain(data, name, scaleType, colors.length);
     scaleColor = colors;
   }
 
@@ -47009,9 +47068,14 @@ function getColorAccessor({
   scale.range(scaleColor);
   scale.unknown(UNKNOWN_COLOR);
   const alpha = opacityToAlpha(opacity);
+  let accessorKeys = getAccessorKeys(name, aggregation);
 
   const accessor = properties => {
-    const propertyValue = properties[name];
+    if (!(accessorKeys[0] in properties)) {
+      accessorKeys = findAccessorKey(accessorKeys, properties);
+    }
+
+    const propertyValue = properties[accessorKeys[0]];
     const {
       r,
       g,
@@ -47024,13 +47088,19 @@ function getColorAccessor({
 }
 function getSizeAccessor({
   name
-}, scaleType, range, data) {
+}, scaleType, aggregation, range, data) {
   const scale = SCALE_FUNCS[scaleType]();
   scale.domain(calculateDomain(data, name, scaleType));
   scale.range(range);
+  let accessorKeys = getAccessorKeys(name, aggregation);
 
   const accessor = properties => {
-    return scale(properties[name]);
+    if (!(accessorKeys[0] in properties)) {
+      accessorKeys = findAccessorKey(accessorKeys, properties);
+    }
+
+    const propertyValue = properties[accessorKeys[0]];
+    return scale(propertyValue);
   };
 
   return normalizeAccessor(accessor, data);
@@ -47499,6 +47569,9 @@ function getParameters({
 
   if (aggregationExp) {
     parameters.push(Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])('aggregationExp', aggregationExp));
+  } else if (isSpatialIndexGeoColumn(geoColumn)) {
+    // Default aggregationExp required for spatial index layers
+    parameters.push(Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])('aggregationExp', '1 AS value'));
   }
 
   if (aggregationResLevel) {
@@ -47508,6 +47581,11 @@ function getParameters({
   return parameters.join('&');
 }
 
+function isSpatialIndexGeoColumn(geoColumn) {
+  const spatialIndex = geoColumn?.split(':')[0];
+  return spatialIndex === 'h3' || spatialIndex === 'quadbin';
+}
+
 async function mapInstantiation({
   type,
   source,
@@ -47526,8 +47604,8 @@ async function mapInstantiation({
     geoColumn,
     columns,
     clientId,
-    aggregationExp,
-    aggregationResLevel
+    aggregationResLevel,
+    aggregationExp
   })}`;
   const {
     accessToken
@@ -47730,6 +47808,8 @@ async function _fetchDataUrl({
 
 async function _fetchMapDataset(dataset, accessToken, credentials, clientId) {
   const {
+    aggregationExp,
+    aggregationResLevel,
     connectionName: connection,
     columns,
     format,
@@ -47742,6 +47822,8 @@ async function _fetchMapDataset(dataset, accessToken, credentials, clientId) {
     url,
     mapFormat
   } = await _fetchDataUrl({
+    aggregationExp,
+    aggregationResLevel,
     clientId,
     credentials: { ...credentials,
       accessToken
@@ -47770,6 +47852,36 @@ async function _fetchMapDataset(dataset, accessToken, credentials, clientId) {
   return true;
 }
 
+async function _fetchTilestats(attribute, dataset, accessToken, credentials) {
+  const {
+    connectionName: connection,
+    source,
+    type
+  } = dataset;
+  const statsUrl = Object(_config__WEBPACK_IMPORTED_MODULE_0__["buildStatsUrlFromBase"])(credentials.apiBaseUrl);
+  let url = `${statsUrl}/${connection}/`;
+
+  if (type === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["MAP_TYPES"].QUERY) {
+    url += `${attribute}?q=${source}`;
+  } else {
+    // MAP_TYPE.TABLE
+    url += `${source}/${attribute}`;
+  }
+
+  const stats = await requestData({
+    url,
+    format: _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["FORMATS"].JSON,
+    accessToken
+  }); // Replace tilestats for attribute with value from API
+
+  const {
+    attributes
+  } = dataset.data.tilestats.layers[0];
+  const index = attributes.findIndex(d => d.attribute === attribute);
+  attributes[index] = stats;
+  return true;
+}
+
 async function fillInMapDatasets({
   datasets,
   token
@@ -47778,6 +47890,53 @@ async function fillInMapDatasets({
   return await Promise.all(promises);
 }
 
+async function fillInTileStats({
+  datasets,
+  keplerMapConfig,
+  token
+}, credentials) {
+  const attributes = [];
+  const {
+    layers
+  } = keplerMapConfig.config.visState;
+
+  for (const layer of layers) {
+    for (const channel of Object.keys(layer.visualChannels)) {
+      const attribute = layer.visualChannels[channel]?.name;
+
+      if (attribute) {
+        const dataset = datasets.find(d => d.id === layer.config.dataId);
+
+        if (dataset.data.tilestats && dataset.type !== _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["MAP_TYPES"].TILESET) {
+          // Only fetch stats for QUERY & TABLE map types
+          attributes.push({
+            attribute,
+            dataset
+          });
+        }
+      }
+    }
+  } // Remove duplicates to avoid repeated requests
+
+
+  const filteredAttributes = [];
+
+  for (const a of attributes) {
+    if (!filteredAttributes.find(({
+      attribute,
+      dataset
+    }) => attribute === a.attribute && dataset === a.dataset)) {
+      filteredAttributes.push(a);
+    }
+  }
+
+  const promises = filteredAttributes.map(({
+    attribute,
+    dataset
+  }) => _fetchTilestats(attribute, dataset, token, credentials));
+  return await Promise.all(promises);
+}
+
 async function fetchMap({
   cartoMapId,
   clientId,
@@ -47842,7 +48001,9 @@ async function fetchMap({
     }
   }); // Mutates map.datasets so that dataset.data contains data
 
-  await fillInMapDatasets(map, clientId, localCreds);
+  await fillInMapDatasets(map, clientId, localCreds); // Mutates attributes in visualChannels to contain tile stats
+
+  await fillInTileStats(map, localCreds);
   return { ...Object(_parseMap__WEBPACK_IMPORTED_MODULE_2__["parseMap"])(map),
     ...{
       stopAutoRefresh
@@ -48082,21 +48243,35 @@ function createChannelProps(visualChannels, type, config, data) {
       }
     }
   } else if (colorField) {
-    result.getFillColor = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getColorAccessor"])(colorField, colorScale, visConfig.colorRange, visConfig.opacity, data);
+    const {
+      colorAggregation: aggregation,
+      colorRange: range
+    } = visConfig;
+    result.getFillColor = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getColorAccessor"])(colorField, colorScale, {
+      aggregation,
+      range
+    }, visConfig.opacity, data);
   }
 
   if (strokeColorField) {
     const fallbackOpacity = type === 'point' ? visConfig.opacity : 1;
     const opacity = visConfig.strokeOpacity !== undefined ? visConfig.strokeOpacity : fallbackOpacity;
-    result.getLineColor = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getColorAccessor"])(strokeColorField, strokeColorScale, visConfig.strokeColorRange, opacity, data);
+    const {
+      strokeColorAggregation: aggregation,
+      strokeColorRange: range
+    } = visConfig;
+    result.getLineColor = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getColorAccessor"])(strokeColorField, strokeColorScale, {
+      aggregation,
+      range
+    }, opacity, data);
   }
 
   if (heightField) {
-    result.getElevation = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])(heightField, heightScale, visConfig.heightRange || visConfig.sizeRange, data);
+    result.getElevation = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])(heightField, heightScale, visConfig.heightAggregation, visConfig.heightRange || visConfig.sizeRange, data);
   }
 
   if (sizeField) {
-    result.getPointRadius = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])(sizeField, sizeScale, visConfig.radiusRange || visConfig.sizeRange, data);
+    result.getPointRadius = Object(_layer_map__WEBPACK_IMPORTED_MODULE_1__["getSizeAccessor"])(sizeField, sizeScale, visConfig.sizeAggregation, visConfig.radiusRange || visConfig.sizeRange, data);
   }
 
   if (textLabelField) {
@@ -48136,7 +48311,7 @@ const baseUrl = 'https://basemaps.cartocdn.com/gl/{basemap}-gl-style/style.json'
 /*!***********************!*\
   !*** ./src/config.ts ***!
   \***********************/
-/*! exports provided: defaultClassicCredentials, defaultCloudNativeCredentials, setDefaultCredentials, getDefaultCredentials, buildMapsUrlFromBase */
+/*! exports provided: defaultClassicCredentials, defaultCloudNativeCredentials, setDefaultCredentials, getDefaultCredentials, buildMapsUrlFromBase, buildStatsUrlFromBase */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -48146,6 +48321,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setDefaultCredentials", function() { return setDefaultCredentials; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDefaultCredentials", function() { return getDefaultCredentials; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildMapsUrlFromBase", function() { return buildMapsUrlFromBase; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildStatsUrlFromBase", function() { return buildStatsUrlFromBase; });
 /* harmony import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./api/maps-api-common */ "./src/api/maps-api-common.ts");
 
 const defaultClassicCredentials = {
@@ -48189,8 +48365,9 @@ function setDefaultCredentials({
 function getDefaultCredentials() {
   return credentials;
 }
-function buildMapsUrlFromBase(apiBaseUrl) {
-  let suffix = '/v3/maps';
+
+function buildUrlFromBase(apiBaseUrl, endpoint) {
+  let suffix = `/v3/${endpoint}`;
 
   if (apiBaseUrl.endsWith('/')) {
     suffix = suffix.substring(1);
@@ -48199,6 +48376,13 @@ function buildMapsUrlFromBase(apiBaseUrl) {
   return `${apiBaseUrl}${suffix}`;
 }
 
+function buildMapsUrlFromBase(apiBaseUrl) {
+  return buildUrlFromBase(apiBaseUrl, 'maps');
+}
+function buildStatsUrlFromBase(apiBaseUrl) {
+  return buildUrlFromBase(apiBaseUrl, 'stats');
+}
+
 /***/ }),
 
 /***/ "./src/index.ts":
@@ -48289,13 +48473,11 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CartoLayer; });
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _carto_tile_layer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./carto-tile-layer */ "./src/layers/carto-tile-layer.ts");
-/* harmony import */ var _h3_tile_layer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./h3-tile-layer */ "./src/layers/h3-tile-layer.ts");
-/* harmony import */ var _quadbin_tile_layer__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./quadbin-tile-layer */ "./src/layers/quadbin-tile-layer.ts");
-/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../api */ "./src/api/index.ts");
-/* harmony import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../api/maps-api-common */ "./src/api/maps-api-common.ts");
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../config */ "./src/config.ts");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils */ "./src/utils.ts");
+/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../api */ "./src/api/index.ts");
+/* harmony import */ var _api_layer_map__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../api/layer-map */ "./src/api/layer-map.ts");
+/* harmony import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../api/maps-api-common */ "./src/api/maps-api-common.ts");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../config */ "./src/config.ts");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../utils */ "./src/utils.ts");
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 
@@ -48305,8 +48487,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
-
-
 const defaultProps = {
   // (String, required): data resource to load. table name, sql query or tileset name.
   data: null,
@@ -48374,29 +48554,29 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
       geoColumn,
       columns
     } = props;
-    const localCreds = { ...Object(_config__WEBPACK_IMPORTED_MODULE_6__["getDefaultCredentials"])(),
+    const localCreds = { ...Object(_config__WEBPACK_IMPORTED_MODULE_4__["getDefaultCredentials"])(),
       ...credentials
     };
     const {
       apiVersion
     } = localCreds;
-    _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(Object.values(_api__WEBPACK_IMPORTED_MODULE_4__["API_VERSIONS"]).includes(apiVersion), `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`);
+    _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(Object.values(_api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"]).includes(apiVersion), `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`);
 
-    if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_4__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_4__["API_VERSIONS"].V2) {
-      _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(type === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["MAP_TYPES"].QUERY || type === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["MAP_TYPES"].TILESET, `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`);
+    if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V2) {
+      _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(type === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["MAP_TYPES"].QUERY || type === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["MAP_TYPES"].TILESET, `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`);
       _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);
       _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);
       _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);
-    } else if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_4__["API_VERSIONS"].V3) {
+    } else if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3) {
       _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(connection, 'Missing mandatory connection parameter');
-      _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(Object.values(_api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["MAP_TYPES"]).includes(type), `Invalid type ${type}. Use MAP_TYPES enum.`);
+      _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(Object.values(_api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["MAP_TYPES"]).includes(type), `Invalid type ${type}. Use MAP_TYPES enum.`);
 
-      if (!_api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["COLUMNS_SUPPORT"].includes(type)) {
-        _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(!columns, `columns prop is only supported for types: ${_api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["COLUMNS_SUPPORT"].join()}`);
+      if (!_api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["COLUMNS_SUPPORT"].includes(type)) {
+        _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(!columns, `columns prop is only supported for types: ${_api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["COLUMNS_SUPPORT"].join()}`);
       }
 
-      if (!_api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["GEO_COLUMN_SUPPORT"].includes(type)) {
-        _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(!geoColumn, `geoColumn prop is only supported for types: ${_api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["GEO_COLUMN_SUPPORT"].join()}`);
+      if (!_api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["GEO_COLUMN_SUPPORT"].includes(type)) {
+        _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(!geoColumn, `geoColumn prop is only supported for types: ${_api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["GEO_COLUMN_SUPPORT"].join()}`);
       }
 
       if (columns) {
@@ -48434,7 +48614,7 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
         connection,
         ...rest
       } = this.props;
-      const localConfig = { ...Object(_config__WEBPACK_IMPORTED_MODULE_6__["getDefaultCredentials"])(),
+      const localConfig = { ...Object(_config__WEBPACK_IMPORTED_MODULE_4__["getDefaultCredentials"])(),
         ...credentials
       };
       const {
@@ -48442,16 +48622,16 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
       } = localConfig;
       let result;
 
-      if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_4__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_4__["API_VERSIONS"].V2) {
+      if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V2) {
         result = {
-          data: await Object(_api__WEBPACK_IMPORTED_MODULE_4__["getDataV2"])({
+          data: await Object(_api__WEBPACK_IMPORTED_MODULE_1__["getDataV2"])({
             type,
             source,
             credentials: credentials
           })
         };
       } else {
-        result = await Object(_api__WEBPACK_IMPORTED_MODULE_4__["fetchLayerData"])({
+        result = await Object(_api__WEBPACK_IMPORTED_MODULE_1__["fetchLayerData"])({
           type,
           source,
           clientId,
@@ -48459,7 +48639,7 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
           connection,
           ...rest,
           // CartoLayer only supports tiled output from v8.8, force data format
-          format: _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["FORMATS"].TILEJSON
+          format: _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["FORMATS"].TILEJSON
         });
       }
 
@@ -48480,7 +48660,7 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
   }
 
   _getSubLayerAndProps() {
-    Object(_utils__WEBPACK_IMPORTED_MODULE_7__["assert"])(this.state);
+    Object(_utils__WEBPACK_IMPORTED_MODULE_5__["assert"])(this.state);
     const {
       data,
       apiVersion
@@ -48499,28 +48679,19 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
       ...propsNoData
     };
 
-    if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_4__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_4__["API_VERSIONS"].V2) {
+    if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V2) {
       return [_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["MVTLayer"], props];
     }
     /* global URL */
 
 
     const tileUrl = new URL(data.tiles[0]);
-    props.formatTiles = props.formatTiles || tileUrl.searchParams.get('formatTiles') || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["TILE_FORMATS"].MVT;
-
-    if (data.scheme === 'h3') {
-      return [_h3_tile_layer__WEBPACK_IMPORTED_MODULE_2__["default"], props];
-    }
-
-    if (data.scheme === 'quadbin') {
-      return [_quadbin_tile_layer__WEBPACK_IMPORTED_MODULE_3__["default"], props];
-    }
-
-    return props.formatTiles === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["TILE_FORMATS"].MVT ? [_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["MVTLayer"], props] : [_carto_tile_layer__WEBPACK_IMPORTED_MODULE_1__["default"], props];
+    props.formatTiles = props.formatTiles || tileUrl.searchParams.get('formatTiles');
+    return [Object(_api_layer_map__WEBPACK_IMPORTED_MODULE_2__["layerFromTileDataset"])(props.formatTiles, data.scheme), props];
   }
 
   renderLayers() {
-    Object(_utils__WEBPACK_IMPORTED_MODULE_7__["assert"])(this.state);
+    Object(_utils__WEBPACK_IMPORTED_MODULE_5__["assert"])(this.state);
     const {
       data
     } = this.state;