@deck.gl/carto 8.7.0-beta.5 → 8.7.0

package/dist/dist.dev.js

@@ -52870,7 +52870,7 @@ attribute float instanceOffsets;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-const CartoUtils = __webpack_require__(/*! ./src */ "./src/index.js");
+const CartoUtils = __webpack_require__(/*! ./src */ "./src/index.ts");
 
 const deck = globalThis.deck || {}; // Check if peer dependencies are included
 
@@ -52884,16 +52884,16 @@ module.exports = Object.assign(deck, {
 
 /***/ }),
 
-/***/ "./src/api/index.js":
+/***/ "./src/api/index.ts":
 /*!**************************!*\
-  !*** ./src/api/index.js ***!
+  !*** ./src/api/index.ts ***!
   \**************************/
 /*! exports provided: FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS, getDataV2, CONNECTIONS, fetchLayerData, fetchMap, getData, mapInstantiation */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.js");
+/* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "FORMATS", function() { return _maps_api_common__WEBPACK_IMPORTED_MODULE_0__["FORMATS"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TILE_FORMATS", function() { return _maps_api_common__WEBPACK_IMPORTED_MODULE_0__["TILE_FORMATS"]; });
@@ -52902,12 +52902,12 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "API_VERSIONS", function() { return _maps_api_common__WEBPACK_IMPORTED_MODULE_0__["API_VERSIONS"]; });
 
-/* harmony import */ var _maps_client__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./maps-client */ "./src/api/maps-client.js");
+/* harmony import */ var _maps_client__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./maps-client */ "./src/api/maps-client.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getDataV2", function() { return _maps_client__WEBPACK_IMPORTED_MODULE_1__["getDataV2"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "CONNECTIONS", function() { return _maps_client__WEBPACK_IMPORTED_MODULE_1__["CONNECTIONS"]; });
 
-/* harmony import */ var _maps_v3_client__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./maps-v3-client */ "./src/api/maps-v3-client.js");
+/* harmony import */ var _maps_v3_client__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./maps-v3-client */ "./src/api/maps-v3-client.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fetchLayerData", function() { return _maps_v3_client__WEBPACK_IMPORTED_MODULE_2__["fetchLayerData"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fetchMap", function() { return _maps_v3_client__WEBPACK_IMPORTED_MODULE_2__["fetchMap"]; });
@@ -52922,9 +52922,9 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ "./src/api/layer-map.js":
+/***/ "./src/api/layer-map.ts":
 /*!******************************!*\
-  !*** ./src/api/layer-map.js ***!
+  !*** ./src/api/layer-map.ts ***!
   \******************************/
 /*! exports provided: getLayer, getColorAccessor, getSizeAccessor, getTextAccessor, getTextPixelOffsetAccessor, _domainFromValues */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -52943,9 +52943,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var d3_format__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! d3-format */ "../../node_modules/d3-format/src/index.js");
 /* harmony import */ var moment_timezone__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! moment-timezone */ "../../node_modules/moment-timezone/index.js");
 /* harmony import */ var moment_timezone__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(moment_timezone__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var _deck_gl_carto__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @deck.gl/carto */ "./src/index.js");
+/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/core");
+/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_geo_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.js");
+/* 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");
+
 
 
 
@@ -52963,8 +52966,8 @@ const SCALE_FUNCS = {
   quantile: d3_scale__WEBPACK_IMPORTED_MODULE_2__["scaleQuantile"],
   quantize: d3_scale__WEBPACK_IMPORTED_MODULE_2__["scaleQuantize"],
   sqrt: d3_scale__WEBPACK_IMPORTED_MODULE_2__["scaleSqrt"]
-}; // Kepler -> Deck.gl
-
+};
+// Kepler -> Deck.gl
 const sharedPropMap = {
   color: 'getFillColor',
   isVisible: 'visible',
@@ -53013,7 +53016,7 @@ function getLayer(type, config, dataset) {
   const hexagonId = config.columns?.hex_id;
   const layer = {
     point: {
-      Layer: _deck_gl_core__WEBPACK_IMPORTED_MODULE_5__["GeoJsonLayer"],
+      Layer: _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_5__["GeoJsonLayer"],
       propMap: mergePropMaps(sharedPropMap, {
         visConfig: {
           outline: 'stroked'
@@ -53022,14 +53025,14 @@ function getLayer(type, config, dataset) {
       defaultProps
     },
     geojson: {
-      Layer: _deck_gl_core__WEBPACK_IMPORTED_MODULE_5__["GeoJsonLayer"],
+      Layer: _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_5__["GeoJsonLayer"],
       propMap: sharedPropMap,
       defaultProps: { ...defaultProps,
         lineWidthScale: 2
       }
     },
     hexagonId: {
-      Layer: _deck_gl_core__WEBPACK_IMPORTED_MODULE_5__["H3HexagonLayer"],
+      Layer: _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_5__["H3HexagonLayer"],
       propMap: mergePropMaps(sharedPropMap, {
         visConfig: {
           coverage: 'coverage',
@@ -53041,7 +53044,7 @@ function getLayer(type, config, dataset) {
       }
     }
   }[type];
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_5__["log"].assert(layer, `Unsupported layer type: ${type}`);
+  Object(_utils__WEBPACK_IMPORTED_MODULE_8__["assert"])(layer, `Unsupported layer type: ${type}`);
   return layer;
 }
 
@@ -53053,9 +53056,9 @@ function getTileLayer(dataset) {
   } = dataset;
   /* global URL */
 
-  const formatTiles = new URL(tileUrl).searchParams.get('formatTiles') || _deck_gl_carto__WEBPACK_IMPORTED_MODULE_6__["TILE_FORMATS"].MVT;
+  const formatTiles = new URL(tileUrl).searchParams.get('formatTiles') || _maps_api_common__WEBPACK_IMPORTED_MODULE_7__["TILE_FORMATS"].MVT;
   return {
-    Layer: formatTiles === _deck_gl_carto__WEBPACK_IMPORTED_MODULE_6__["TILE_FORMATS"].MVT ? _deck_gl_core__WEBPACK_IMPORTED_MODULE_5__["MVTLayer"] : _deck_gl_carto__WEBPACK_IMPORTED_MODULE_6__["_CartoDynamicTileLayer"],
+    Layer: formatTiles === _maps_api_common__WEBPACK_IMPORTED_MODULE_7__["TILE_FORMATS"].MVT ? _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_5__["MVTLayer"] : _layers_carto_tile_layer__WEBPACK_IMPORTED_MODULE_6__["default"],
     propMap: sharedPropMap,
     defaultProps: { ...defaultProps,
       pointRadiusScale: 0.3,
@@ -53202,11 +53205,11 @@ function getTextPixelOffsetAccessor({
 
 /***/ }),
 
-/***/ "./src/api/maps-api-common.js":
+/***/ "./src/api/maps-api-common.ts":
 /*!************************************!*\
-  !*** ./src/api/maps-api-common.js ***!
+  !*** ./src/api/maps-api-common.ts ***!
   \************************************/
-/*! exports provided: DEFAULT_USER_COMPONENT_IN_URL, DEFAULT_REGION_COMPONENT_IN_URL, API_VERSIONS, DEFAULT_MAPS_URL_FORMAT, MAP_TYPES, FORMATS, TILE_FORMATS, encodeParameter */
+/*! exports provided: DEFAULT_USER_COMPONENT_IN_URL, DEFAULT_REGION_COMPONENT_IN_URL, API_VERSIONS, DEFAULT_MAPS_URL_FORMAT, MAP_TYPES, FORMATS, TILE_FORMATS, SchemaFieldType, encodeParameter */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -53218,6 +53221,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MAP_TYPES", function() { return MAP_TYPES; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FORMATS", function() { return FORMATS; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TILE_FORMATS", function() { return TILE_FORMATS; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SchemaFieldType", function() { return SchemaFieldType; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "encodeParameter", function() { return encodeParameter; });
 const DEFAULT_USER_COMPONENT_IN_URL = '{user}';
 const DEFAULT_REGION_COMPONENT_IN_URL = '{region}';
@@ -53234,33 +53238,46 @@ const MAP_TYPES = {
   QUERY: 'query',
   TABLE: 'table',
   TILESET: 'tileset'
-}; // AVAILABLE FORMATS
-
+};
+// AVAILABLE FORMATS
 const FORMATS = {
   GEOJSON: 'geojson',
   NDJSON: 'ndjson',
   TILEJSON: 'tilejson',
   JSON: 'json'
-}; // AVAILABLE FORMATS FOR TILES
-
+};
+// AVAILABLE FORMATS FOR TILES
 const TILE_FORMATS = {
   MVT: 'mvt',
   GEOJSON: 'geojson',
   BINARY: 'binary'
 };
+let SchemaFieldType;
+
+(function (SchemaFieldType) {
+  SchemaFieldType["Number"] = "number";
+  SchemaFieldType["Bigint"] = "bigint";
+  SchemaFieldType["String"] = "string";
+  SchemaFieldType["Geometry"] = "geometry";
+  SchemaFieldType["Timestamp"] = "timestamp";
+  SchemaFieldType["Object"] = "object";
+  SchemaFieldType["Boolean"] = "boolean";
+  SchemaFieldType["Variant"] = "variant";
+  SchemaFieldType["Unknown"] = "unknown";
+})(SchemaFieldType || (SchemaFieldType = {}));
+
 /**
  * Simple encode parameter
  */
-
 function encodeParameter(name, value) {
   return `${name}=${encodeURIComponent(value)}`;
 }
 
 /***/ }),
 
-/***/ "./src/api/maps-client.js":
+/***/ "./src/api/maps-client.ts":
 /*!********************************!*\
-  !*** ./src/api/maps-client.js ***!
+  !*** ./src/api/maps-client.ts ***!
   \********************************/
 /*! exports provided: CONNECTIONS, getDataV2 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -53269,8 +53286,8 @@ function encodeParameter(name, value) {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CONNECTIONS", function() { return CONNECTIONS; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDataV2", function() { return getDataV2; });
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../config */ "./src/config.js");
-/* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.js");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../config */ "./src/config.ts");
+/* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.ts");
 /**
  * Maps API Client for Maps API v1 and Maps API v2
  */
@@ -53292,20 +53309,16 @@ async function getDataV2({
   credentials
 }) {
   const defaultCredentials = Object(_config__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"])();
-  const apiVersion = credentials && credentials.apiVersion || defaultCredentials.apiVersion; // Only pick up default credentials if they have been defined for
+  const apiVersion = credentials?.apiVersion || defaultCredentials.apiVersion; // Only pick up default credentials if they have been defined for
   // correct API version
 
-  const localCreds = { ..._config__WEBPACK_IMPORTED_MODULE_0__["defaultClassicCredentials"],
+  const localCreds = { ...(apiVersion === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3 ? _config__WEBPACK_IMPORTED_MODULE_0__["defaultCloudNativeCredentials"] : _config__WEBPACK_IMPORTED_MODULE_0__["defaultClassicCredentials"]),
+    mapsUrl: _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["DEFAULT_MAPS_URL_FORMAT"][apiVersion],
     ...(defaultCredentials.apiVersion === apiVersion && defaultCredentials),
     ...credentials
   };
-
-  if (!localCreds.mapsUrl) {
-    localCreds.mapsUrl = _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["DEFAULT_MAPS_URL_FORMAT"][apiVersion];
-  }
-
   let url;
-  const connection = type === 'tileset' ? CONNECTIONS.BIGQUERY : CONNECTIONS.CARTO;
+  const connection = type === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["MAP_TYPES"].TILESET ? CONNECTIONS.BIGQUERY : CONNECTIONS.CARTO;
 
   switch (apiVersion) {
     case _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V1:
@@ -53350,8 +53363,6 @@ async function request({
 
   try {
     /* global fetch */
-
-    /* eslint no-undef: "error" */
     response = await fetch(url, {
       headers: {
         Accept: 'application/json'
@@ -53398,7 +53409,7 @@ function dealWithError({
 
 function initURLParameters(credentials) {
   const encodedApiKey = Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])('api_key', credentials.apiKey);
-  const encodedClient = Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])('client', `deck-gl-carto`);
+  const encodedClient = Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])('client', 'deck-gl-carto');
   return [encodedApiKey, encodedClient];
 }
 /**
@@ -53447,6 +53458,7 @@ function createMapConfig(sql) {
       type: 'mapnik',
       options: {
         sql,
+        // eslint-disable-next-line camelcase
         vector_extent: TILE_EXTENT
       }
     }]
@@ -53455,9 +53467,9 @@ function createMapConfig(sql) {
 
 /***/ }),
 
-/***/ "./src/api/maps-v3-client.js":
+/***/ "./src/api/maps-v3-client.ts":
 /*!***********************************!*\
-  !*** ./src/api/maps-v3-client.js ***!
+  !*** ./src/api/maps-v3-client.ts ***!
   \***********************************/
 /*! exports provided: mapInstantiation, fetchLayerData, getData, fetchMap */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -53468,11 +53480,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fetchLayerData", function() { return fetchLayerData; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getData", function() { return getData; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fetchMap", function() { return fetchMap; });
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../config */ "./src/config.js");
-/* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.js");
-/* harmony import */ var _parseMap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./parseMap */ "./src/api/parseMap.js");
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../config */ "./src/config.ts");
+/* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.ts");
+/* harmony import */ var _parseMap__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./parseMap */ "./src/api/parseMap.ts");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../utils */ "./src/utils.ts");
 /**
  * Maps API Client for Carto 3
  */
@@ -53480,20 +53493,19 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+
 const MAX_GET_LENGTH = 2048;
 const DEFAULT_CLIENT = 'deck-gl-carto';
+
 /**
  * Request against Maps API
  */
-
 async function request({
   method,
   url,
-  format,
   accessToken,
   body
 }) {
-  let response;
   const headers = {
     Accept: 'application/json'
   };
@@ -53508,9 +53520,7 @@ async function request({
 
   try {
     /* global fetch */
-
-    /* eslint no-undef: "error" */
-    response = await fetch(url, {
+    return await fetch(url, {
       method,
       headers,
       body
@@ -53518,11 +53528,20 @@ async function request({
   } catch (error) {
     throw new Error(`Failed to connect to Maps API: ${error}`);
   }
+}
 
-  if (format === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["FORMATS"].NDJSON) {
-    return response;
-  }
-
+async function requestJson({
+  method,
+  url,
+  accessToken,
+  body
+}) {
+  const response = await request({
+    method,
+    url,
+    accessToken,
+    body
+  });
   const json = await response.json();
 
   if (!response.ok) {
@@ -53532,7 +53551,32 @@ async function request({
     });
   }
 
-  return json.rows ? json.rows : json;
+  return json;
+}
+
+async function requestData({
+  method,
+  url,
+  accessToken,
+  format,
+  body
+}) {
+  if (format === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["FORMATS"].NDJSON) {
+    return request({
+      method,
+      url,
+      accessToken,
+      body
+    });
+  }
+
+  const data = await requestJson({
+    method,
+    url,
+    accessToken,
+    body
+  });
+  return data.rows ? data.rows : data;
 }
 /**
  * Display proper message from Maps API error
@@ -53555,11 +53599,10 @@ function dealWithError({
       throw new Error(error);
   }
 }
+
 /**
  * Build a URL with all required parameters
  */
-
-
 function getParameters({
   type,
   source,
@@ -53612,7 +53655,6 @@ async function mapInstantiation({
   const {
     accessToken
   } = credentials;
-  const format = 'json';
 
   if (url.length > MAX_GET_LENGTH && type === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["MAP_TYPES"].QUERY) {
     // need to be a POST request
@@ -53620,18 +53662,16 @@ async function mapInstantiation({
       q: source,
       client: clientId || DEFAULT_CLIENT
     });
-    return await request({
+    return await requestJson({
       method: 'POST',
       url: baseUrl,
-      format,
       accessToken,
       body
     });
   }
 
-  return await request({
+  return await requestJson({
     url,
-    format,
     accessToken
   });
 }
@@ -53650,14 +53690,14 @@ function checkFetchLayerDataParameters({
   type,
   source,
   connection,
-  localCreds
+  credentials
 }) {
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(connection, 'Must define connection');
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(type, 'Must define a type');
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(source, 'Must define a source');
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(localCreds.apiVersion === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3, 'Method only available for v3');
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(localCreds.apiBaseUrl, 'Must define apiBaseUrl');
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(localCreds.accessToken, 'Must define an accessToken');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(connection, 'Must define connection');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(type, 'Must define a type');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(source, 'Must define a source');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(credentials.apiVersion === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3, 'Method only available for v3');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(credentials.apiBaseUrl, 'Must define apiBaseUrl');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(credentials.accessToken, 'Must define an accessToken');
 }
 
 async function fetchLayerData({
@@ -53689,7 +53729,7 @@ async function fetchLayerData({
     schema,
     clientId
   });
-  const data = await request({
+  const data = await requestData({
     url,
     format: mapFormat,
     accessToken
@@ -53727,7 +53767,7 @@ async function _fetchDataUrl({
     type,
     source,
     connection,
-    localCreds
+    credentials: localCreds
   });
 
   if (!localCreds.mapsUrl) {
@@ -53744,13 +53784,13 @@ async function _fetchDataUrl({
     schema,
     clientId
   });
-  let url;
+  let url = null;
   let mapFormat;
 
   if (format) {
     mapFormat = format;
     url = getUrlFromMetadata(metadata, format);
-    _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(url, `Format ${format} not available`);
+    Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(url, `Format ${format} not available`);
   } else {
     // guess map format
     const prioritizedFormats = [_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["FORMATS"].GEOJSON, _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["FORMATS"].JSON, _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["FORMATS"].NDJSON, _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["FORMATS"].TILEJSON];
@@ -53763,6 +53803,8 @@ async function _fetchDataUrl({
         break;
       }
     }
+
+    Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(url && mapFormat, 'Unsupported data formats received from backend.');
   }
 
   const {
@@ -53803,12 +53845,14 @@ async function getData({
 /* global clearInterval, setInterval, URL */
 
 async function _fetchMapDataset(dataset, accessToken, credentials, clientId) {
-  // First fetch metadata
   const {
     connectionName: connection,
+    columns,
+    geoColumn,
     source,
     type
-  } = dataset;
+  } = dataset; // First fetch metadata
+
   const {
     url,
     mapFormat
@@ -53817,12 +53861,14 @@ async function _fetchMapDataset(dataset, accessToken, credentials, clientId) {
       accessToken
     },
     connection,
+    columns,
+    geoColumn,
     source,
     type,
     clientId
   }); // Extract the last time the data changed
 
-  const cache = parseInt(new URL(url).searchParams.get('cache'), 10);
+  const cache = parseInt(new URL(url).searchParams.get('cache') || '', 10);
 
   if (cache && dataset.cache === cache) {
     return false;
@@ -53830,12 +53876,11 @@ async function _fetchMapDataset(dataset, accessToken, credentials, clientId) {
 
   dataset.cache = cache; // Only fetch if the data has changed
 
-  const data = await request({
+  dataset.data = await requestData({
     url,
     format: mapFormat,
     accessToken
   });
-  dataset.data = data;
   return true;
 }
 
@@ -53861,22 +53906,22 @@ async function fetchMap({
   const {
     accessToken
   } = localCreds;
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(cartoMapId, `Must define CARTO map id: fetchMap({cartoMapId: 'XXXX-XXXX-XXXX'})`);
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(localCreds.apiVersion === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3, 'Method only available for v3');
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(localCreds.apiBaseUrl, 'Must define apiBaseUrl');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(cartoMapId, 'Must define CARTO map id: fetchMap({cartoMapId: "XXXX-XXXX-XXXX"})');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(localCreds.apiVersion === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3, 'Method only available for v3');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(localCreds.apiBaseUrl, 'Must define apiBaseUrl');
 
   if (!localCreds.mapsUrl) {
     localCreds.mapsUrl = Object(_config__WEBPACK_IMPORTED_MODULE_0__["buildMapsUrlFromBase"])(localCreds.apiBaseUrl);
   }
 
   if (autoRefresh || onNewData) {
-    _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(onNewData, 'Must define `onNewData` when using autoRefresh');
-    _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(typeof onNewData === 'function', '`onNewData` must be a function');
-    _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(autoRefresh > 0, '`autoRefresh` must be a positive number');
+    Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(onNewData, 'Must define `onNewData` when using autoRefresh');
+    Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(typeof onNewData === 'function', '`onNewData` must be a function');
+    Object(_utils__WEBPACK_IMPORTED_MODULE_4__["assert"])(typeof autoRefresh === 'number' && autoRefresh > 0, '`autoRefresh` must be a positive number');
   }
 
   const url = `${localCreds.mapsUrl}/public/${cartoMapId}`;
-  const map = await request({
+  const map = await requestJson({
     url,
     accessToken
   }); // Periodically check if the data has changed. Note that this
@@ -53885,10 +53930,11 @@ async function fetchMap({
   let stopAutoRefresh;
 
   if (autoRefresh) {
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     const intervalId = setInterval(async () => {
-      const changed = await fillInMapDatasets(map, clientId, credentials);
+      const changed = await fillInMapDatasets(map, clientId, localCreds);
 
-      if (changed.some(v => v === true)) {
+      if (onNewData && changed.some(v => v === true)) {
         onNewData(Object(_parseMap__WEBPACK_IMPORTED_MODULE_2__["parseMap"])(map));
       }
     }, autoRefresh * 1000);
@@ -53899,7 +53945,7 @@ async function fetchMap({
   } // Mutates map.datasets so that dataset.data contains data
 
 
-  await fillInMapDatasets(map, clientId, credentials);
+  await fillInMapDatasets(map, clientId, localCreds);
   return { ...Object(_parseMap__WEBPACK_IMPORTED_MODULE_2__["parseMap"])(map),
     ...{
       stopAutoRefresh
@@ -53909,9 +53955,9 @@ async function fetchMap({
 
 /***/ }),
 
-/***/ "./src/api/parseMap.js":
+/***/ "./src/api/parseMap.ts":
 /*!*****************************!*\
-  !*** ./src/api/parseMap.js ***!
+  !*** ./src/api/parseMap.ts ***!
   \*****************************/
 /*! exports provided: parseMap */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -53920,9 +53966,11 @@ async function fetchMap({
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "parseMap", function() { return parseMap; });
 /* harmony import */ var _luma_gl_constants__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @luma.gl/constants */ "../../node_modules/@luma.gl/constants/dist/esm/index.js");
-/* harmony import */ var _layer_map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./layer-map */ "./src/api/layer-map.js");
+/* harmony import */ var _layer_map__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./layer-map */ "./src/api/layer-map.ts");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils */ "./src/utils.ts");
+
 
 
 
@@ -53931,7 +53979,7 @@ function parseMap(json) {
     keplerMapConfig,
     datasets
   } = json;
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(keplerMapConfig.version === 'v1', 'Only support Kepler v1');
+  Object(_utils__WEBPACK_IMPORTED_MODULE_3__["assert"])(keplerMapConfig.version === 'v1', 'Only support Kepler v1');
   const {
     mapState,
     mapStyle
@@ -53960,11 +54008,11 @@ function parseMap(json) {
           dataId
         } = config;
         const dataset = datasets.find(d => d.id === dataId);
-        _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(dataset, `No dataset matching dataId: ${dataId}`);
+        Object(_utils__WEBPACK_IMPORTED_MODULE_3__["assert"])(dataset, `No dataset matching dataId: ${dataId}`);
         const {
           data
         } = dataset;
-        _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(data, `No data loaded for dataId: ${dataId}`);
+        Object(_utils__WEBPACK_IMPORTED_MODULE_3__["assert"])(data, `No data loaded for dataId: ${dataId}`);
         const {
           Layer,
           propMap,
@@ -54133,30 +54181,30 @@ function createChannelProps(visualChannels, type, config, data) {
 
 /***/ }),
 
-/***/ "./src/basemap.js":
+/***/ "./src/basemap.ts":
 /*!************************!*\
-  !*** ./src/basemap.js ***!
+  !*** ./src/basemap.ts ***!
   \************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-const base_url = 'https://basemaps.cartocdn.com/gl/{basemap}-gl-style/style.json';
+const baseUrl = 'https://basemaps.cartocdn.com/gl/{basemap}-gl-style/style.json';
 /* harmony default export */ __webpack_exports__["default"] = ({
-  VOYAGER: base_url.replace('{basemap}', 'voyager'),
-  POSITRON: base_url.replace('{basemap}', 'positron'),
-  DARK_MATTER: base_url.replace('{basemap}', 'dark-matter'),
-  VOYAGER_NOLABELS: base_url.replace('{basemap}', 'voyager-nolabels'),
-  POSITRON_NOLABELS: base_url.replace('{basemap}', 'positron-nolabels'),
-  DARK_MATTER_NOLABELS: base_url.replace('{basemap}', 'dark-matter-nolabels')
+  VOYAGER: baseUrl.replace('{basemap}', 'voyager'),
+  POSITRON: baseUrl.replace('{basemap}', 'positron'),
+  DARK_MATTER: baseUrl.replace('{basemap}', 'dark-matter'),
+  VOYAGER_NOLABELS: baseUrl.replace('{basemap}', 'voyager-nolabels'),
+  POSITRON_NOLABELS: baseUrl.replace('{basemap}', 'positron-nolabels'),
+  DARK_MATTER_NOLABELS: baseUrl.replace('{basemap}', 'dark-matter-nolabels')
 });
 
 /***/ }),
 
-/***/ "./src/config.js":
+/***/ "./src/config.ts":
 /*!***********************!*\
-  !*** ./src/config.js ***!
+  !*** ./src/config.ts ***!
   \***********************/
 /*! exports provided: defaultClassicCredentials, defaultCloudNativeCredentials, setDefaultCredentials, getDefaultCredentials, buildMapsUrlFromBase */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -54168,7 +54216,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 import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./api/maps-api-common */ "./src/api/maps-api-common.js");
+/* 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 = {
   apiKey: 'default_public',
@@ -54223,39 +54271,39 @@ function buildMapsUrlFromBase(apiBaseUrl) {
 
 /***/ }),
 
-/***/ "./src/index.js":
+/***/ "./src/index.ts":
 /*!**********************!*\
-  !*** ./src/index.js ***!
+  !*** ./src/index.ts ***!
   \**********************/
-/*! exports provided: getDefaultCredentials, setDefaultCredentials, CartoLayer, _CartoDynamicTileLayer, BASEMAP, colorBins, colorCategories, colorContinuous, FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS, fetchLayerData, fetchMap, _getDataV2, getData, _mapInstantiation */
+/*! exports provided: getDefaultCredentials, setDefaultCredentials, CartoLayer, _CartoTileLayer, BASEMAP, colorBins, colorCategories, colorContinuous, FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS, fetchLayerData, fetchMap, _getDataV2, getData, _mapInstantiation */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./config.js */ "./src/config.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getDefaultCredentials", function() { return _config_js__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"]; });
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./config */ "./src/config.ts");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getDefaultCredentials", function() { return _config__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "setDefaultCredentials", function() { return _config_js__WEBPACK_IMPORTED_MODULE_0__["setDefaultCredentials"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "setDefaultCredentials", function() { return _config__WEBPACK_IMPORTED_MODULE_0__["setDefaultCredentials"]; });
 
 /* harmony import */ var _layers_carto_layer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./layers/carto-layer */ "./src/layers/carto-layer.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "CartoLayer", function() { return _layers_carto_layer__WEBPACK_IMPORTED_MODULE_1__["default"]; });
 
-/* harmony import */ var _layers_carto_dynamic_tile_layer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./layers/carto-dynamic-tile-layer */ "./src/layers/carto-dynamic-tile-layer.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "_CartoDynamicTileLayer", function() { return _layers_carto_dynamic_tile_layer__WEBPACK_IMPORTED_MODULE_2__["default"]; });
+/* harmony import */ var _layers_carto_tile_layer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./layers/carto-tile-layer */ "./src/layers/carto-tile-layer.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "_CartoTileLayer", function() { return _layers_carto_tile_layer__WEBPACK_IMPORTED_MODULE_2__["default"]; });
 
-/* harmony import */ var _basemap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./basemap */ "./src/basemap.js");
+/* harmony import */ var _basemap__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./basemap */ "./src/basemap.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "BASEMAP", function() { return _basemap__WEBPACK_IMPORTED_MODULE_3__["default"]; });
 
-/* harmony import */ var _style_color_bins_style__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./style/color-bins-style */ "./src/style/color-bins-style.js");
+/* harmony import */ var _style_color_bins_style__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./style/color-bins-style */ "./src/style/color-bins-style.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "colorBins", function() { return _style_color_bins_style__WEBPACK_IMPORTED_MODULE_4__["default"]; });
 
-/* harmony import */ var _style_color_categories_style__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./style/color-categories-style */ "./src/style/color-categories-style.js");
+/* harmony import */ var _style_color_categories_style__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./style/color-categories-style */ "./src/style/color-categories-style.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "colorCategories", function() { return _style_color_categories_style__WEBPACK_IMPORTED_MODULE_5__["default"]; });
 
-/* harmony import */ var _style_color_continuous_style__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./style/color-continuous-style */ "./src/style/color-continuous-style.js");
+/* harmony import */ var _style_color_continuous_style__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./style/color-continuous-style */ "./src/style/color-continuous-style.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "colorContinuous", function() { return _style_color_continuous_style__WEBPACK_IMPORTED_MODULE_6__["default"]; });
 
-/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./api */ "./src/api/index.js");
+/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./api */ "./src/api/index.ts");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "FORMATS", function() { return _api__WEBPACK_IMPORTED_MODULE_7__["FORMATS"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "TILE_FORMATS", function() { return _api__WEBPACK_IMPORTED_MODULE_7__["TILE_FORMATS"]; });
@@ -54283,170 +54331,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-/***/ }),
-
-/***/ "./src/layers/carto-dynamic-tile-layer.js":
-/*!************************************************!*\
-  !*** ./src/layers/carto-dynamic-tile-layer.js ***!
-  \************************************************/
-/*! exports provided: default */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CartoDynamicTileLayer; });
-/* harmony import */ var pbf__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! pbf */ "../../node_modules/pbf/index.js");
-/* harmony import */ var pbf__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(pbf__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
-/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _deck_gl_extensions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/extensions */ "../extensions/src/index.ts");
-/* harmony import */ var _loaders_gl_gis__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @loaders.gl/gis */ "../../node_modules/@loaders.gl/gis/dist/esm/index.js");
-/* harmony import */ var _schema_carto_dynamic_tile__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./schema/carto-dynamic-tile */ "./src/layers/schema/carto-dynamic-tile.js");
-/* harmony import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../api/maps-api-common */ "./src/api/maps-api-common.js");
-/* global TextDecoder */
-
-
-
-
-
-
-
-
-
-function parseJSON(arrayBuffer) {
-  return JSON.parse(new TextDecoder().decode(arrayBuffer));
-}
-
-function parsePbf(buffer) {
-  const pbf = new pbf__WEBPACK_IMPORTED_MODULE_0___default.a(buffer);
-  const tile = _schema_carto_dynamic_tile__WEBPACK_IMPORTED_MODULE_4__["Tile"].read(pbf);
-  return tile;
-}
-
-function unpackProperties(properties) {
-  if (!properties || !properties.length) {
-    return [];
-  }
-
-  return properties.map(item => {
-    const currentRecord = {};
-    item.data.forEach(({
-      key,
-      value
-    }) => {
-      currentRecord[key] = value;
-    });
-    return currentRecord;
-  });
-}
-
-function parseCartoDynamicTile(arrayBuffer, options) {
-  if (!arrayBuffer) return null;
-  const formatTiles = options && options.cartoDynamicTile && options.cartoDynamicTile.formatTiles;
-  if (formatTiles === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["TILE_FORMATS"].GEOJSON) return Object(_loaders_gl_gis__WEBPACK_IMPORTED_MODULE_3__["geojsonToBinary"])(parseJSON(arrayBuffer).features);
-  const tile = parsePbf(arrayBuffer);
-  const {
-    points,
-    lines,
-    polygons
-  } = tile;
-  const data = {
-    points: { ...points,
-      properties: unpackProperties(points.properties)
-    },
-    lines: { ...lines,
-      properties: unpackProperties(lines.properties)
-    },
-    polygons: { ...polygons,
-      properties: unpackProperties(polygons.properties)
-    }
-  };
-  return data;
-}
-
-const CartoDynamicTileLoader = {
-  name: 'CARTO Dynamic Tile',
-  id: 'cartoDynamicTile',
-  module: 'carto',
-  extensions: ['pbf'],
-  mimeTypes: ['application/x-protobuf'],
-  category: 'geometry',
-  worker: false,
-  parse: async (arrayBuffer, options) => parseCartoDynamicTile(arrayBuffer, options),
-  parseSync: parseCartoDynamicTile,
-  options: {
-    cartoDynamicTile: {
-      // TODO change to BINARY for 8.7 prod release
-      formatTiles: _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["TILE_FORMATS"].GEOJSON
-    }
-  }
-};
-class CartoDynamicTileLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["MVTLayer"] {
-  getTileData(tile) {
-    let url = Object(_deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["_getURLFromTemplate"])(this.state.data, tile);
-
-    if (!url) {
-      return Promise.reject('Invalid URL');
-    }
-
-    let loadOptions = this.getLoadOptions();
-    const {
-      fetch,
-      formatTiles
-    } = this.props;
-    const {
-      signal
-    } = tile;
-    loadOptions = { ...loadOptions,
-      mimeType: 'application/x-protobuf'
-    };
-
-    if (formatTiles) {
-      _deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["log"].assert(Object.values(_api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["TILE_FORMATS"]).includes(formatTiles), `Invalid value for formatTiles: ${formatTiles}. Use value from TILE_FORMATS`); // eslint-disable-next-line no-undef
-
-      const newUrl = new URL(url);
-      newUrl.searchParams.set('formatTiles', formatTiles);
-      url = newUrl.toString();
-      loadOptions.cartoDynamicTile = {
-        formatTiles
-      };
-    }
-
-    return fetch(url, {
-      propName: 'data',
-      layer: this,
-      loadOptions,
-      signal
-    });
-  }
-
-  renderSubLayers(props) {
-    if (props.data === null) {
-      return null;
-    }
-
-    props.autoHighlight = false;
-    const {
-      bbox: {
-        west,
-        south,
-        east,
-        north
-      }
-    } = props.tile;
-    props.extensions = [new _deck_gl_extensions__WEBPACK_IMPORTED_MODULE_2__["ClipExtension"](), ...(props.extensions || [])];
-    props.clipBounds = [west, south, east, north];
-    const subLayer = new _deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["GeoJsonLayer"]({ ...props
-    });
-    return subLayer;
-  }
-
-}
-CartoDynamicTileLayer.layerName = 'CartoDynamicTileLayer';
-CartoDynamicTileLayer.defaultProps = { ..._deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["MVTLayer"].defaultProps,
-  loaders: [CartoDynamicTileLoader]
-};
-
 /***/ }),
 
 /***/ "./src/layers/carto-layer.js":
@@ -54461,10 +54345,10 @@ __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_dynamic_tile_layer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./carto-dynamic-tile-layer */ "./src/layers/carto-dynamic-tile-layer.js");
-/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../api */ "./src/api/index.js");
-/* harmony import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../api/maps-api-common */ "./src/api/maps-api-common.js");
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../config */ "./src/config.js");
+/* harmony import */ var _carto_tile_layer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./carto-tile-layer */ "./src/layers/carto-tile-layer.js");
+/* harmony import */ var _api__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../api */ "./src/api/index.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");
 
 
 
@@ -54628,25 +54512,33 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
     }
   }
 
-  _getRenderLayer() {
+  _getSubLayerAndProps() {
     const {
       data,
       format,
       apiVersion
     } = this.state;
+    const {
+      uniqueIdProperty
+    } = defaultProps;
+    const props = {
+      uniqueIdProperty,
+      ...this.props
+    };
+    delete props.data;
 
     if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_2__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_2__["API_VERSIONS"].V2) {
-      return _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["MVTLayer"];
+      return [_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["MVTLayer"], props];
     }
 
     if (format === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["FORMATS"].TILEJSON) {
       /* global URL */
-      const formatTiles = this.props.formatTiles || new URL(data.tiles[0]).searchParams.get('formatTiles') || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["TILE_FORMATS"].MVT;
-      return formatTiles === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["TILE_FORMATS"].MVT ? _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["MVTLayer"] : _carto_dynamic_tile_layer__WEBPACK_IMPORTED_MODULE_1__["default"];
+      props.formatTiles = props.formatTiles || new URL(data.tiles[0]).searchParams.get('formatTiles') || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["TILE_FORMATS"].MVT;
+      return props.formatTiles === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_3__["TILE_FORMATS"].MVT ? [_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["MVTLayer"], props] : [_carto_tile_layer__WEBPACK_IMPORTED_MODULE_1__["default"], props];
     } // It's a geojson layer
 
 
-    return _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["GeoJsonLayer"];
+    return [_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["GeoJsonLayer"], props];
   }
 
   renderLayers() {
@@ -54658,18 +54550,8 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
       updateTriggers
     } = this.props;
 
-    const layer = this._getRenderLayer();
+    const [layer, props] = this._getSubLayerAndProps(); // eslint-disable-next-line new-cap
 
-    const {
-      formatTiles,
-      uniqueIdProperty
-    } = defaultProps;
-    const props = {
-      formatTiles,
-      uniqueIdProperty,
-      ...this.props
-    };
-    delete props.data; // eslint-disable-next-line new-cap
 
     return new layer(props, this.getSubLayerProps({
       id: `carto-${layer.layerName}`,
@@ -54684,10 +54566,174 @@ CartoLayer.defaultProps = defaultProps;
 
 /***/ }),
 
-/***/ "./src/layers/schema/carto-dynamic-tile.js":
-/*!*************************************************!*\
-  !*** ./src/layers/schema/carto-dynamic-tile.js ***!
-  \*************************************************/
+/***/ "./src/layers/carto-tile-layer.js":
+/*!****************************************!*\
+  !*** ./src/layers/carto-tile-layer.js ***!
+  \****************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return CartoTileLayer; });
+/* harmony import */ var pbf__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! pbf */ "../../node_modules/pbf/index.js");
+/* harmony import */ var pbf__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(pbf__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
+/* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _deck_gl_extensions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @deck.gl/extensions */ "../extensions/src/index.ts");
+/* harmony import */ var _loaders_gl_gis__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @loaders.gl/gis */ "../../node_modules/@loaders.gl/gis/dist/esm/index.js");
+/* harmony import */ var _schema_carto_tile__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./schema/carto-tile */ "./src/layers/schema/carto-tile.js");
+/* harmony import */ var _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../api/maps-api-common */ "./src/api/maps-api-common.ts");
+/* global TextDecoder */
+
+
+
+
+
+
+
+
+
+function parseJSON(arrayBuffer) {
+  return JSON.parse(new TextDecoder().decode(arrayBuffer));
+}
+
+function parsePbf(buffer) {
+  const pbf = new pbf__WEBPACK_IMPORTED_MODULE_0___default.a(buffer);
+  const tile = _schema_carto_tile__WEBPACK_IMPORTED_MODULE_4__["Tile"].read(pbf);
+  return tile;
+}
+
+function unpackProperties(properties) {
+  if (!properties || !properties.length) {
+    return [];
+  }
+
+  return properties.map(item => {
+    const currentRecord = {};
+    item.data.forEach(({
+      key,
+      value
+    }) => {
+      currentRecord[key] = value;
+    });
+    return currentRecord;
+  });
+}
+
+function parseCartoTile(arrayBuffer, options) {
+  if (!arrayBuffer) return null;
+  const formatTiles = options && options.cartoTile && options.cartoTile.formatTiles;
+  if (formatTiles === _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["TILE_FORMATS"].GEOJSON) return Object(_loaders_gl_gis__WEBPACK_IMPORTED_MODULE_3__["geojsonToBinary"])(parseJSON(arrayBuffer).features);
+  const tile = parsePbf(arrayBuffer);
+  const {
+    points,
+    lines,
+    polygons
+  } = tile;
+  const data = {
+    points: { ...points,
+      properties: unpackProperties(points.properties)
+    },
+    lines: { ...lines,
+      properties: unpackProperties(lines.properties)
+    },
+    polygons: { ...polygons,
+      properties: unpackProperties(polygons.properties)
+    }
+  };
+  return data;
+}
+
+const CartoTileLoader = {
+  name: 'CARTO Tile',
+  id: 'cartoTile',
+  module: 'carto',
+  extensions: ['pbf'],
+  mimeTypes: ['application/x-protobuf'],
+  category: 'geometry',
+  worker: false,
+  parse: async (arrayBuffer, options) => parseCartoTile(arrayBuffer, options),
+  parseSync: parseCartoTile,
+  options: {
+    cartoTile: {
+      // TODO change to BINARY for 8.7 prod release
+      formatTiles: _api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["TILE_FORMATS"].BINARY
+    }
+  }
+};
+class CartoTileLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["MVTLayer"] {
+  getTileData(tile) {
+    let url = Object(_deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["_getURLFromTemplate"])(this.state.data, tile);
+
+    if (!url) {
+      return Promise.reject('Invalid URL');
+    }
+
+    let loadOptions = this.getLoadOptions();
+    const {
+      fetch,
+      formatTiles
+    } = this.props;
+    const {
+      signal
+    } = tile;
+    loadOptions = { ...loadOptions,
+      mimeType: 'application/x-protobuf'
+    };
+
+    if (formatTiles) {
+      _deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["log"].assert(Object.values(_api_maps_api_common__WEBPACK_IMPORTED_MODULE_5__["TILE_FORMATS"]).includes(formatTiles), `Invalid value for formatTiles: ${formatTiles}. Use value from TILE_FORMATS`); // eslint-disable-next-line no-undef
+
+      const newUrl = new URL(url);
+      newUrl.searchParams.set('formatTiles', formatTiles);
+      url = newUrl.toString();
+      loadOptions.cartoTile = {
+        formatTiles
+      };
+    }
+
+    return fetch(url, {
+      propName: 'data',
+      layer: this,
+      loadOptions,
+      signal
+    });
+  }
+
+  renderSubLayers(props) {
+    if (props.data === null) {
+      return null;
+    }
+
+    props.autoHighlight = false;
+    const {
+      bbox: {
+        west,
+        south,
+        east,
+        north
+      }
+    } = props.tile;
+    props.extensions = [new _deck_gl_extensions__WEBPACK_IMPORTED_MODULE_2__["ClipExtension"](), ...(props.extensions || [])];
+    props.clipBounds = [west, south, east, north];
+    const subLayer = new _deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["GeoJsonLayer"]({ ...props
+    });
+    return subLayer;
+  }
+
+}
+CartoTileLayer.layerName = 'CartoTileLayer';
+CartoTileLayer.defaultProps = { ..._deck_gl_core__WEBPACK_IMPORTED_MODULE_1__["MVTLayer"].defaultProps,
+  loaders: [CartoTileLoader]
+};
+
+/***/ }),
+
+/***/ "./src/layers/schema/carto-tile.js":
+/*!*****************************************!*\
+  !*** ./src/layers/schema/carto-tile.js ***!
+  \*****************************************/
 /*! exports provided: Tile */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -54900,9 +54946,9 @@ Tile._readField = function (tag, obj, pbf) {
 
 /***/ }),
 
-/***/ "./src/style/color-bins-style.js":
+/***/ "./src/style/color-bins-style.ts":
 /*!***************************************!*\
-  !*** ./src/style/color-bins-style.js ***!
+  !*** ./src/style/color-bins-style.ts ***!
   \***************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -54911,8 +54957,8 @@ Tile._readField = function (tag, obj, pbf) {
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return colorBins; });
 /* harmony import */ var d3_scale__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! d3-scale */ "../../node_modules/d3-scale/src/index.js");
-/* harmony import */ var _palette__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./palette */ "./src/style/palette.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./utils */ "./src/style/utils.js");
+/* harmony import */ var _palette__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./palette */ "./src/style/palette.ts");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./utils */ "./src/style/utils.ts");
 
 
 
@@ -54927,15 +54973,15 @@ function colorBins({
   const color = Object(d3_scale__WEBPACK_IMPORTED_MODULE_0__["scaleThreshold"])().domain(domain).range(palette);
   return d => {
     const value = Object(_utils__WEBPACK_IMPORTED_MODULE_2__["getAttrValue"])(attr, d);
-    return Number.isFinite(value) ? color(value) : nullColor;
+    return typeof value === 'number' && Number.isFinite(value) ? color(value) : nullColor;
   };
 }
 
 /***/ }),
 
-/***/ "./src/style/color-categories-style.js":
+/***/ "./src/style/color-categories-style.ts":
 /*!*********************************************!*\
-  !*** ./src/style/color-categories-style.js ***!
+  !*** ./src/style/color-categories-style.ts ***!
   \*********************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -54943,8 +54989,8 @@ function colorBins({
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return colorCategories; });
-/* harmony import */ var _palette__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./palette */ "./src/style/palette.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./utils */ "./src/style/utils.js");
+/* harmony import */ var _palette__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./palette */ "./src/style/palette.ts");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./utils */ "./src/style/utils.ts");
 
 
 function colorCategories({
@@ -54964,15 +55010,15 @@ function colorCategories({
 
   return d => {
     const value = Object(_utils__WEBPACK_IMPORTED_MODULE_1__["getAttrValue"])(attr, d);
-    return Number.isFinite(value) || typeof value === 'string' ? colorsByCategory[value] || othersColor : nullColor;
+    return typeof value === 'number' && Number.isFinite(value) || typeof value === 'string' ? colorsByCategory[value] || othersColor : nullColor;
   };
 }
 
 /***/ }),
 
-/***/ "./src/style/color-continuous-style.js":
+/***/ "./src/style/color-continuous-style.ts":
 /*!*********************************************!*\
-  !*** ./src/style/color-continuous-style.js ***!
+  !*** ./src/style/color-continuous-style.ts ***!
   \*********************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -54981,8 +55027,8 @@ function colorCategories({
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return colorContinuous; });
 /* harmony import */ var d3_scale__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! d3-scale */ "../../node_modules/d3-scale/src/index.js");
-/* harmony import */ var _palette__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./palette */ "./src/style/palette.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./utils */ "./src/style/utils.js");
+/* harmony import */ var _palette__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./palette */ "./src/style/palette.ts");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./utils */ "./src/style/utils.ts");
 
 
 
@@ -54997,15 +55043,15 @@ function colorContinuous({
   const color = Object(d3_scale__WEBPACK_IMPORTED_MODULE_0__["scaleLinear"])().domain(domain).range(palette);
   return d => {
     const value = Object(_utils__WEBPACK_IMPORTED_MODULE_2__["getAttrValue"])(attr, d);
-    return Number.isFinite(value) ? color(value) : nullColor;
+    return typeof value === 'number' && Number.isFinite(value) ? color(value) : nullColor;
   };
 }
 
 /***/ }),
 
-/***/ "./src/style/palette.js":
+/***/ "./src/style/palette.ts":
 /*!******************************!*\
-  !*** ./src/style/palette.js ***!
+  !*** ./src/style/palette.ts ***!
   \******************************/
 /*! exports provided: DEFAULT_PALETTE, NULL_COLOR, OTHERS_COLOR, default, hexToRgb */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -55019,7 +55065,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "hexToRgb", function() { return hexToRgb; });
 /* harmony import */ var cartocolor__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! cartocolor */ "../../node_modules/cartocolor/index.js");
 /* harmony import */ var cartocolor__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(cartocolor__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./utils */ "./src/style/utils.js");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./utils */ "./src/style/utils.ts");
 
 
 const DEFAULT_PALETTE = 'PurpOr';
@@ -55071,20 +55117,15 @@ function hexToRgb(hex) {
 
 
   result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-
-  if (result) {
-    return [parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16), parseInt(result[4], 16)];
-  }
-
   Object(_utils__WEBPACK_IMPORTED_MODULE_1__["assert"])(result, `Hexadecimal color "${hex}" was not parsed correctly`);
-  return NULL_COLOR;
+  return [parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16), parseInt(result[4], 16)];
 }
 
 /***/ }),
 
-/***/ "./src/style/utils.js":
+/***/ "./src/style/utils.ts":
 /*!****************************!*\
-  !*** ./src/style/utils.js ***!
+  !*** ./src/style/utils.ts ***!
   \****************************/
 /*! exports provided: getAttrValue, assert */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
@@ -55098,16 +55139,11 @@ function getAttrValue(attr, d) {
   assert(typeof d === 'object', 'Expected "data" to be an object');
   assert(ALLOWED_ATTR_TYPES.includes(typeof attr), 'Expected "attr" to be a function or string'); // Is function
 
-  if (typeof attr === ALLOWED_ATTR_TYPES[0]) {
+  if (typeof attr === 'function') {
     return attr(d);
-  } // Is string
-
-
-  if (typeof attr === ALLOWED_ATTR_TYPES[1]) {
-    return d.properties[attr];
   }
 
-  return {};
+  return d.properties[attr];
 }
 function assert(condition, message = '') {
   if (!condition) {
@@ -55117,6 +55153,25 @@ function assert(condition, message = '') {
 
 /***/ }),
 
+/***/ "./src/utils.ts":
+/*!**********************!*\
+  !*** ./src/utils.ts ***!
+  \**********************/
+/*! exports provided: assert */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "assert", function() { return assert; });
+/* 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__);
+
+function assert(condition, message) {
+  _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(condition, message);
+}
+
+/***/ }),
+
 /***/ "@deck.gl/core":
 /*!***********************!*\
   !*** external "deck" ***!