@deck.gl/carto 8.6.3 → 8.7.0-alpha.10

package/src/config.js

@@ -1,60 +1,29 @@
-import {API_VERSIONS, DEFAULT_MAPS_URL_FORMAT} from './api/maps-api-common';
+import {API_VERSIONS} from './api/maps-api-common';
 
 export const defaultClassicCredentials = {
-  username: 'public',
   apiKey: 'default_public',
   region: 'us',
-  mapsUrl: null
+  username: 'public'
 };
 
-const defaultCloudNativeCredentials = {
-  accessToken: null,
-  apiBaseUrl: null,
-  mapsUrl: null
+export const defaultCloudNativeCredentials = {
+  apiBaseUrl: 'https://gcp-us-east1.api.carto.com'
 };
 
 let credentials = {};
 
 setDefaultCredentials({});
 
-export function setDefaultCredentials(opts) {
-  const apiVersion = opts.apiVersion || API_VERSIONS.V2;
+export function setDefaultCredentials({apiVersion, ...rest}) {
+  apiVersion = apiVersion || API_VERSIONS.V3;
 
   switch (apiVersion) {
     case API_VERSIONS.V1:
-      opts.mapsUrl = opts.mapsUrl || DEFAULT_MAPS_URL_FORMAT[apiVersion];
-      credentials = {
-        apiVersion,
-        ...defaultClassicCredentials,
-        ...opts
-      };
-      break;
-
     case API_VERSIONS.V2:
-      opts.mapsUrl = opts.mapsUrl || DEFAULT_MAPS_URL_FORMAT[apiVersion];
-      credentials = {
-        apiVersion,
-        ...defaultClassicCredentials,
-        ...opts
-      };
-
+      credentials = {apiVersion, ...defaultClassicCredentials, ...rest};
       break;
     case API_VERSIONS.V3:
-      if (!opts.apiBaseUrl) {
-        throw new Error(
-          `API version ${
-            API_VERSIONS.V3
-          } requires to define apiBaseUrl at credentials. Go to https://app.carto.com to get your apiBaseUrl.`
-        );
-      }
-
-      const apiBaseUrl = opts.apiBaseUrl || defaultCloudNativeCredentials.apiBaseUrl;
-      opts.mapsUrl = opts.mapsUrl || buildMapsUrlFromBase(apiBaseUrl);
-      credentials = {
-        apiVersion,
-        ...defaultCloudNativeCredentials,
-        ...opts
-      };
+      credentials = {apiVersion, ...defaultCloudNativeCredentials, ...rest};
       break;
     default:
       throw new Error(`Invalid API version ${apiVersion}. Use API_VERSIONS enum.`);

package/src/index.js

@@ -1,6 +1,4 @@
 export {getDefaultCredentials, setDefaultCredentials} from './config.js';
-export {default as CartoSQLLayer} from './layers/carto-sql-layer';
-export {default as CartoBQTilerLayer} from './layers/carto-bqtiler-layer';
 export {default as CartoLayer} from './layers/carto-layer';
 export {default as BASEMAP} from './basemap';
 export {default as colorBins} from './style/color-bins-style';
@@ -11,6 +9,7 @@ export {
   MAP_TYPES,
   API_VERSIONS,
   fetchLayerData,
+  fetchMap,
   getDataV2 as _getDataV2,
   getData,
   mapInstantiation as _mapInstantiation

package/src/layers/carto-dynamic-tile-layer.js

@@ -0,0 +1,87 @@
+/* global TextDecoder */
+import {log} from '@deck.gl/core';
+import {ClipExtension} from '@deck.gl/extensions';
+import {MVTLayer} from '@deck.gl/geo-layers';
+import {GeoJsonLayer} from '@deck.gl/layers';
+import {geojsonToBinary} from '@loaders.gl/gis';
+import {encodeParameter} from '../api/maps-api-common';
+import {getURLFromTemplate} from '@deck.gl/geo-layers/tile-layer/utils';
+
+function parseJSON(arrayBuffer) {
+  return JSON.parse(new TextDecoder().decode(arrayBuffer));
+}
+
+function parseCartoDynamicTile(arrayBuffer, options) {
+  if (!arrayBuffer) return null;
+  const formatTiles = options && options.cartoDynamicTile && options.cartoDynamicTile.formatTiles;
+  if (formatTiles === 'geojson') return geojsonToBinary(parseJSON(arrayBuffer).features);
+  return null;
+}
+
+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: {
+      formatTiles: 'geojson'
+    }
+  }
+};
+
+export default class CartoDynamicTileLayer extends MVTLayer {
+  getTileData(tile) {
+    let url = 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) {
+      log.assert(
+        ['geojson'].includes(formatTiles),
+        `Invalid value for formatTiles: ${formatTiles}`
+      );
+      url += `&${encodeParameter('formatTiles', formatTiles)}`;
+      loadOptions.cartoBinaryTile = {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 ClipExtension()];
+    props.clipBounds = [west, south, east, north];
+
+    const subLayer = new GeoJsonLayer({
+      ...props
+    });
+    return subLayer;
+  }
+}
+
+CartoDynamicTileLayer.layerName = 'CartoDynamicTileLayer';
+CartoDynamicTileLayer.defaultProps = {...MVTLayer.defaultProps, loaders: [CartoDynamicTileLoader]};

package/src/layers/carto-layer.js

@@ -1,8 +1,9 @@
 import {CompositeLayer, log} from '@deck.gl/core';
+import CartoDynamicTileLayer from './carto-dynamic-tile-layer';
 import {MVTLayer} from '@deck.gl/geo-layers';
 import {GeoJsonLayer} from '@deck.gl/layers';
-import {getData, getDataV2, API_VERSIONS} from '../api';
-import {MAP_TYPES} from '../api/maps-api-common';
+import {fetchLayerData, getDataV2, API_VERSIONS} from '../api';
+import {FORMATS, MAP_TYPES} from '../api/maps-api-common';
 import {getDefaultCredentials} from '../config';
 
 const defaultProps = {
@@ -12,6 +13,7 @@ const defaultProps = {
   type: null,
   onDataLoad: {type: 'function', value: data => {}, compare: false},
   onDataError: {type: 'function', value: null, compare: false, optional: true},
+  uniqueIdProperty: 'cartodb_id',
 
   // override carto credentials for the layer, set to null to read from default
   credentials: null,
@@ -22,6 +24,12 @@ const defaultProps = {
   // (String, required): connection name at CARTO platform
   connection: null,
 
+  // (String, optional): format of data
+  format: null,
+
+  // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.
+  clientId: null,
+
   // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.
   geoColumn: null,
 
@@ -93,29 +101,19 @@ export default class CartoLayer extends CompositeLayer {
 
   async _updateData() {
     try {
-      const {type, data: source, connection, credentials, geoColumn, columns} = this.props;
+      const {type, data: source, clientId, credentials, ...rest} = this.props;
       const localConfig = {...getDefaultCredentials(), ...credentials};
       const {apiVersion} = localConfig;
 
-      let data;
-
-      if (apiVersion === API_VERSIONS.V3) {
-        data = await getData({
-          type,
-          source,
-          connection,
-          credentials,
-          geoColumn,
-          columns
-        });
-      } else if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {
-        data = await getDataV2({type, source, credentials});
+      let result;
+      if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {
+        result = {data: await getDataV2({type, source, credentials})};
       } else {
-        log.assert(`Unknow apiVersion ${apiVersion}. Use API_VERSIONS enum.`);
+        result = await fetchLayerData({type, source, clientId, credentials, ...rest});
       }
 
-      this.setState({data, apiVersion});
-      this.props.onDataLoad(data);
+      this.setState({...result, apiVersion});
+      this.props.onDataLoad(result.data);
     } catch (err) {
       if (this.props.onDataError) {
         this.props.onDataError(err);
@@ -126,26 +124,28 @@ export default class CartoLayer extends CompositeLayer {
   }
 
   renderLayers() {
-    const {data, apiVersion} = this.state;
-    const {type} = this.props;
+    const {data, format, apiVersion} = this.state;
 
     if (!data) return null;
 
-    const {updateTriggers} = this.props;
+    const {type, updateTriggers} = this.props;
 
     let layer;
 
-    if (
+    if (apiVersion === API_VERSIONS.V3 && type === MAP_TYPES.TABLE && format === FORMATS.TILEJSON) {
+      layer = CartoDynamicTileLayer;
+    } else if (
       apiVersion === API_VERSIONS.V1 ||
       apiVersion === API_VERSIONS.V2 ||
-      type === MAP_TYPES.TILESET
+      format === FORMATS.TILEJSON
     ) {
       layer = MVTLayer;
     } else {
       layer = GeoJsonLayer;
     }
 
-    const props = {...this.props};
+    const {uniqueIdProperty} = defaultProps;
+    const props = {uniqueIdProperty, ...this.props};
     delete props.data;
 
     // eslint-disable-next-line new-cap

package/src/style/color-bins-style.js

@@ -10,11 +10,9 @@ export default function colorBins({
 }) {
   assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
 
-  const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : colors;
+  const palette = typeof colors === 'string' ? getPalette(colors, domain.length + 1) : colors;
 
-  const color = scaleThreshold()
-    .domain(domain)
-    .range(palette);
+  const color = scaleThreshold().domain(domain).range(palette);
 
   return d => {
     const value = getAttrValue(attr, d);

package/src/style/color-continuous-style.js

@@ -10,10 +10,8 @@ export default function colorContinuous({
 }) {
   assert(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
 
-  const palette = typeof colors === 'string' ? getPalette(colors) : colors;
-  const color = scaleLinear()
-    .domain(domain)
-    .range(palette);
+  const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : colors;
+  const color = scaleLinear().domain(domain).range(palette);
 
   return d => {
     const value = getAttrValue(attr, d);

package/dist/es5/layers/carto-bqtiler-layer.js

@@ -1,32 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _core = require("@deck.gl/core");
-
-var _cartoLayer = _interopRequireDefault(require("./carto-layer"));
-
-var _api = require("../api");
-
-const defaultProps = { ..._cartoLayer.default.defaultProps,
-  type: _api.MAP_TYPES.TILESET
-};
-
-class CartoBQTilerLayer extends _cartoLayer.default {
-  constructor(...args) {
-    super(...args);
-
-    _core.log.warn('CartoBQTilerLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.TILESET and apiVersion=API_VERSIONS.V2')();
-  }
-
-}
-
-exports.default = CartoBQTilerLayer;
-CartoBQTilerLayer.layerName = 'CartoBQTilerLayer';
-CartoBQTilerLayer.defaultProps = defaultProps;
-//# sourceMappingURL=carto-bqtiler-layer.js.map

package/dist/es5/layers/carto-bqtiler-layer.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/layers/carto-bqtiler-layer.js"],"names":["defaultProps","CartoLayer","type","MAP_TYPES","TILESET","CartoBQTilerLayer","constructor","args","log","warn","layerName"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAEA,MAAMA,YAAY,GAAG,EACnB,GAAGC,oBAAWD,YADK;AAEnBE,EAAAA,IAAI,EAAEC,eAAUC;AAFG,CAArB;;AAKe,MAAMC,iBAAN,SAAgCJ,mBAAhC,CAA2C;AACxDK,EAAAA,WAAW,CAAC,GAAGC,IAAJ,EAAU;AACnB,UAAM,GAAGA,IAAT;;AAEAC,cAAIC,IAAJ,CACE,iIADF;AAGD;;AAPuD;;;AAU1DJ,iBAAiB,CAACK,SAAlB,GAA8B,mBAA9B;AACAL,iBAAiB,CAACL,YAAlB,GAAiCA,YAAjC","sourcesContent":["import {log} from '@deck.gl/core';\nimport CartoLayer from './carto-layer';\nimport {MAP_TYPES} from '../api';\n\nconst defaultProps = {\n  ...CartoLayer.defaultProps,\n  type: MAP_TYPES.TILESET\n};\n\nexport default class CartoBQTilerLayer extends CartoLayer {\n  constructor(...args) {\n    super(...args);\n\n    log.warn(\n      'CartoBQTilerLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.TILESET and apiVersion=API_VERSIONS.V2'\n    )();\n  }\n}\n\nCartoBQTilerLayer.layerName = 'CartoBQTilerLayer';\nCartoBQTilerLayer.defaultProps = defaultProps;\n"],"file":"carto-bqtiler-layer.js"}

package/dist/es5/layers/carto-sql-layer.js

@@ -1,33 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _core = require("@deck.gl/core");
-
-var _cartoLayer = _interopRequireDefault(require("./carto-layer"));
-
-var _api = require("../api");
-
-const defaultProps = { ..._cartoLayer.default.defaultProps,
-  type: _api.MAP_TYPES.QUERY,
-  uniqueIdProperty: 'cartodb_id'
-};
-
-class CartoSQLLayer extends _cartoLayer.default {
-  constructor(...args) {
-    super(...args);
-
-    _core.log.warn('CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2')();
-  }
-
-}
-
-exports.default = CartoSQLLayer;
-CartoSQLLayer.layerName = 'CartoSQLLayer';
-CartoSQLLayer.defaultProps = defaultProps;
-//# sourceMappingURL=carto-sql-layer.js.map

package/dist/es5/layers/carto-sql-layer.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/layers/carto-sql-layer.js"],"names":["defaultProps","CartoLayer","type","MAP_TYPES","QUERY","uniqueIdProperty","CartoSQLLayer","constructor","args","log","warn","layerName"],"mappings":";;;;;;;;;AAAA;;AACA;;AACA;;AAEA,MAAMA,YAAY,GAAG,EACnB,GAAGC,oBAAWD,YADK;AAEnBE,EAAAA,IAAI,EAAEC,eAAUC,KAFG;AAGnBC,EAAAA,gBAAgB,EAAE;AAHC,CAArB;;AAMe,MAAMC,aAAN,SAA4BL,mBAA5B,CAAuC;AACpDM,EAAAA,WAAW,CAAC,GAAGC,IAAJ,EAAU;AACnB,UAAM,GAAGA,IAAT;;AAEAC,cAAIC,IAAJ,CACE,2HADF;AAGD;;AAPmD;;;AAUtDJ,aAAa,CAACK,SAAd,GAA0B,eAA1B;AACAL,aAAa,CAACN,YAAd,GAA6BA,YAA7B","sourcesContent":["import {log} from '@deck.gl/core';\nimport CartoLayer from './carto-layer';\nimport {MAP_TYPES} from '../api';\n\nconst defaultProps = {\n  ...CartoLayer.defaultProps,\n  type: MAP_TYPES.QUERY,\n  uniqueIdProperty: 'cartodb_id'\n};\n\nexport default class CartoSQLLayer extends CartoLayer {\n  constructor(...args) {\n    super(...args);\n\n    log.warn(\n      'CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2'\n    )();\n  }\n}\n\nCartoSQLLayer.layerName = 'CartoSQLLayer';\nCartoSQLLayer.defaultProps = defaultProps;\n"],"file":"carto-sql-layer.js"}

package/dist/esm/layers/carto-bqtiler-layer.js

@@ -1,16 +0,0 @@
-import { log } from '@deck.gl/core';
-import CartoLayer from './carto-layer';
-import { MAP_TYPES } from '../api';
-const defaultProps = { ...CartoLayer.defaultProps,
-  type: MAP_TYPES.TILESET
-};
-export default class CartoBQTilerLayer extends CartoLayer {
-  constructor(...args) {
-    super(...args);
-    log.warn('CartoBQTilerLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.TILESET and apiVersion=API_VERSIONS.V2')();
-  }
-
-}
-CartoBQTilerLayer.layerName = 'CartoBQTilerLayer';
-CartoBQTilerLayer.defaultProps = defaultProps;
-//# sourceMappingURL=carto-bqtiler-layer.js.map

package/dist/esm/layers/carto-bqtiler-layer.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/layers/carto-bqtiler-layer.js"],"names":["log","CartoLayer","MAP_TYPES","defaultProps","type","TILESET","CartoBQTilerLayer","constructor","args","warn","layerName"],"mappings":"AAAA,SAAQA,GAAR,QAAkB,eAAlB;AACA,OAAOC,UAAP,MAAuB,eAAvB;AACA,SAAQC,SAAR,QAAwB,QAAxB;AAEA,MAAMC,YAAY,GAAG,EACnB,GAAGF,UAAU,CAACE,YADK;AAEnBC,EAAAA,IAAI,EAAEF,SAAS,CAACG;AAFG,CAArB;AAKA,eAAe,MAAMC,iBAAN,SAAgCL,UAAhC,CAA2C;AACxDM,EAAAA,WAAW,CAAC,GAAGC,IAAJ,EAAU;AACnB,UAAM,GAAGA,IAAT;AAEAR,IAAAA,GAAG,CAACS,IAAJ,CACE,iIADF;AAGD;;AAPuD;AAU1DH,iBAAiB,CAACI,SAAlB,GAA8B,mBAA9B;AACAJ,iBAAiB,CAACH,YAAlB,GAAiCA,YAAjC","sourcesContent":["import {log} from '@deck.gl/core';\nimport CartoLayer from './carto-layer';\nimport {MAP_TYPES} from '../api';\n\nconst defaultProps = {\n  ...CartoLayer.defaultProps,\n  type: MAP_TYPES.TILESET\n};\n\nexport default class CartoBQTilerLayer extends CartoLayer {\n  constructor(...args) {\n    super(...args);\n\n    log.warn(\n      'CartoBQTilerLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.TILESET and apiVersion=API_VERSIONS.V2'\n    )();\n  }\n}\n\nCartoBQTilerLayer.layerName = 'CartoBQTilerLayer';\nCartoBQTilerLayer.defaultProps = defaultProps;\n"],"file":"carto-bqtiler-layer.js"}

package/dist/esm/layers/carto-sql-layer.js

@@ -1,17 +0,0 @@
-import { log } from '@deck.gl/core';
-import CartoLayer from './carto-layer';
-import { MAP_TYPES } from '../api';
-const defaultProps = { ...CartoLayer.defaultProps,
-  type: MAP_TYPES.QUERY,
-  uniqueIdProperty: 'cartodb_id'
-};
-export default class CartoSQLLayer extends CartoLayer {
-  constructor(...args) {
-    super(...args);
-    log.warn('CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2')();
-  }
-
-}
-CartoSQLLayer.layerName = 'CartoSQLLayer';
-CartoSQLLayer.defaultProps = defaultProps;
-//# sourceMappingURL=carto-sql-layer.js.map

package/dist/esm/layers/carto-sql-layer.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../src/layers/carto-sql-layer.js"],"names":["log","CartoLayer","MAP_TYPES","defaultProps","type","QUERY","uniqueIdProperty","CartoSQLLayer","constructor","args","warn","layerName"],"mappings":"AAAA,SAAQA,GAAR,QAAkB,eAAlB;AACA,OAAOC,UAAP,MAAuB,eAAvB;AACA,SAAQC,SAAR,QAAwB,QAAxB;AAEA,MAAMC,YAAY,GAAG,EACnB,GAAGF,UAAU,CAACE,YADK;AAEnBC,EAAAA,IAAI,EAAEF,SAAS,CAACG,KAFG;AAGnBC,EAAAA,gBAAgB,EAAE;AAHC,CAArB;AAMA,eAAe,MAAMC,aAAN,SAA4BN,UAA5B,CAAuC;AACpDO,EAAAA,WAAW,CAAC,GAAGC,IAAJ,EAAU;AACnB,UAAM,GAAGA,IAAT;AAEAT,IAAAA,GAAG,CAACU,IAAJ,CACE,2HADF;AAGD;;AAPmD;AAUtDH,aAAa,CAACI,SAAd,GAA0B,eAA1B;AACAJ,aAAa,CAACJ,YAAd,GAA6BA,YAA7B","sourcesContent":["import {log} from '@deck.gl/core';\nimport CartoLayer from './carto-layer';\nimport {MAP_TYPES} from '../api';\n\nconst defaultProps = {\n  ...CartoLayer.defaultProps,\n  type: MAP_TYPES.QUERY,\n  uniqueIdProperty: 'cartodb_id'\n};\n\nexport default class CartoSQLLayer extends CartoLayer {\n  constructor(...args) {\n    super(...args);\n\n    log.warn(\n      'CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2'\n    )();\n  }\n}\n\nCartoSQLLayer.layerName = 'CartoSQLLayer';\nCartoSQLLayer.defaultProps = defaultProps;\n"],"file":"carto-sql-layer.js"}

package/src/layers/carto-bqtiler-layer.js

@@ -1,21 +0,0 @@
-import {log} from '@deck.gl/core';
-import CartoLayer from './carto-layer';
-import {MAP_TYPES} from '../api';
-
-const defaultProps = {
-  ...CartoLayer.defaultProps,
-  type: MAP_TYPES.TILESET
-};
-
-export default class CartoBQTilerLayer extends CartoLayer {
-  constructor(...args) {
-    super(...args);
-
-    log.warn(
-      'CartoBQTilerLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.TILESET and apiVersion=API_VERSIONS.V2'
-    )();
-  }
-}
-
-CartoBQTilerLayer.layerName = 'CartoBQTilerLayer';
-CartoBQTilerLayer.defaultProps = defaultProps;

package/src/layers/carto-sql-layer.js

@@ -1,22 +0,0 @@
-import {log} from '@deck.gl/core';
-import CartoLayer from './carto-layer';
-import {MAP_TYPES} from '../api';
-
-const defaultProps = {
-  ...CartoLayer.defaultProps,
-  type: MAP_TYPES.QUERY,
-  uniqueIdProperty: 'cartodb_id'
-};
-
-export default class CartoSQLLayer extends CartoLayer {
-  constructor(...args) {
-    super(...args);
-
-    log.warn(
-      'CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2'
-    )();
-  }
-}
-
-CartoSQLLayer.layerName = 'CartoSQLLayer';
-CartoSQLLayer.defaultProps = defaultProps;