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

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

@@ -12,9 +12,7 @@ export default function colorBins({
 
   const palette = typeof colors === 'string' ? getPalette(colors, domain.length) : 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

@@ -11,9 +11,7 @@ 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 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;