@deck.gl/carto 8.6.5 → 8.7.0-alpha.7

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-layer.js

@@ -1,8 +1,8 @@
 import {CompositeLayer, log} from '@deck.gl/core';
 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 +12,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 +23,9 @@ const defaultProps = {
   // (String, required): connection name at CARTO platform
   connection: null,
 
+  // (String, optional): format of data
+  format: 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 +97,19 @@ export default class CartoLayer extends CompositeLayer {
 
   async _updateData() {
     try {
-      const {type, data: source, connection, credentials, geoColumn, columns} = this.props;
+      const {type, data: source, 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, 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,8 +120,7 @@ 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;
 
@@ -138,14 +131,15 @@ export default class CartoLayer extends CompositeLayer {
     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,65 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _core = require("@deck.gl/core");
-
-var _cartoLayer = _interopRequireDefault(require("./carto-layer"));
-
-var _api = require("../api");
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var defaultProps = _objectSpread(_objectSpread({}, _cartoLayer.default.defaultProps), {}, {
-  type: _api.MAP_TYPES.TILESET
-});
-
-var CartoBQTilerLayer = function (_CartoLayer) {
-  (0, _inherits2.default)(CartoBQTilerLayer, _CartoLayer);
-
-  var _super = _createSuper(CartoBQTilerLayer);
-
-  function CartoBQTilerLayer() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, CartoBQTilerLayer);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _core.log.warn('CartoBQTilerLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.TILESET and apiVersion=API_VERSIONS.V2')();
-
-    return _this;
-  }
-
-  return CartoBQTilerLayer;
-}(_cartoLayer.default);
-
-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","args","log","warn","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;;;;;AAEA,IAAMA,YAAY,mCACbC,oBAAWD,YADE;AAEhBE,EAAAA,IAAI,EAAEC,eAAUC;AAFA,EAAlB;;IAKqBC,iB;;;;;AACnB,+BAAqB;AAAA;;AAAA;;AAAA,sCAANC,IAAM;AAANA,MAAAA,IAAM;AAAA;;AACnB,oDAASA,IAAT;;AAEAC,cAAIC,IAAJ,CACE,iIADF;;AAHmB;AAMpB;;;EAP4CP,mB;;;AAU/CI,iBAAiB,CAACI,SAAlB,GAA8B,mBAA9B;AACAJ,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,66 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _core = require("@deck.gl/core");
-
-var _cartoLayer = _interopRequireDefault(require("./carto-layer"));
-
-var _api = require("../api");
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var defaultProps = _objectSpread(_objectSpread({}, _cartoLayer.default.defaultProps), {}, {
-  type: _api.MAP_TYPES.QUERY,
-  uniqueIdProperty: 'cartodb_id'
-});
-
-var CartoSQLLayer = function (_CartoLayer) {
-  (0, _inherits2.default)(CartoSQLLayer, _CartoLayer);
-
-  var _super = _createSuper(CartoSQLLayer);
-
-  function CartoSQLLayer() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, CartoSQLLayer);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
-    _core.log.warn('CartoSQLLayer will be removed in future versions. Use CartoLayer with type=MAP_TYPES.QUERY and apiVersion=API_VERSIONS.V2')();
-
-    return _this;
-  }
-
-  return CartoSQLLayer;
-}(_cartoLayer.default);
-
-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","args","log","warn","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;;;;;AAEA,IAAMA,YAAY,mCACbC,oBAAWD,YADE;AAEhBE,EAAAA,IAAI,EAAEC,eAAUC,KAFA;AAGhBC,EAAAA,gBAAgB,EAAE;AAHF,EAAlB;;IAMqBC,a;;;;;AACnB,2BAAqB;AAAA;;AAAA;;AAAA,sCAANC,IAAM;AAANA,MAAAA,IAAM;AAAA;;AACnB,oDAASA,IAAT;;AAEAC,cAAIC,IAAJ,CACE,2HADF;;AAHmB;AAMpB;;;EAPwCR,mB;;;AAU3CK,aAAa,CAACI,SAAd,GAA0B,eAA1B;AACAJ,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;