@deck.gl/carto 8.7.0-alpha.1 → 8.7.0-alpha.2

package/dist/dist.dev.js

@@ -33576,7 +33576,7 @@ function calculateDomain(data, name, scaleType) {
     // GeoJSON data type
     const values = data.features.map(({properties}) => properties[name]);
     return domainFromValues(values, scaleType);
-  } else if (Array.isArray(data) && data[0][name]) {
+  } else if (Array.isArray(data) && data[0][name] !== undefined) {
     // JSON data type
     const values = data.map(properties => properties[name]);
     return domainFromValues(values, scaleType);
@@ -33598,7 +33598,7 @@ function getColorAccessor({name}, scaleType, {colors}, opacity, data) {
   const scale = SCALE_FUNCS[scaleType]();
   scale.domain(calculateDomain(data, name, scaleType));
   scale.range(colors);
-  const alpha = opacity !== undefined ? 255 * Math.pow(opacity, 1 / 2.2) : 255;
+  const alpha = opacity !== undefined ? Math.round(255 * Math.pow(opacity, 1 / 2.2)) : 255;
 
   const accessor = properties => {
     const rgba = Object(d3_color__WEBPACK_IMPORTED_MODULE_1__["rgb"])(scale(properties[name]));
@@ -33773,7 +33773,7 @@ async function getDataV2({type, source, credentials}) {
 
     default:
       throw new Error(
-        `Invalid maps API version. It shoud be ${_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V1} or ${_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V2}`
+        `Invalid maps API version. It should be ${_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V1} or ${_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V2}`
       );
   }
 }
@@ -33812,15 +33812,11 @@ function dealWithError({response, json, credentials}) {
   switch (response.status) {
     case 401:
       throw new Error(
-        `Unauthorized access to Maps API: invalid combination of user ('${
-          credentials.username
-        }') and apiKey ('${credentials.apiKey}')`
+        `Unauthorized access to Maps API: invalid combination of user ('${credentials.username}') and apiKey ('${credentials.apiKey}')`
       );
     case 403:
       throw new Error(
-        `Unauthorized access to dataset: the provided apiKey('${
-          credentials.apiKey
-        }') doesn't provide access to the requested data`
+        `Unauthorized access to dataset: the provided apiKey('${credentials.apiKey}') doesn't provide access to the requested data`
       );
 
     default:
@@ -34143,7 +34139,7 @@ async function getData({type, source, connection, credentials, geoColumn, column
   return layerData.data;
 }
 
-/* global setInterval, URLSearchParams */
+/* global clearInterval, setInterval, URLSearchParams */
 async function _fetchMapDataset(dataset, accessToken) {
   // First fetch metadata
   const {connectionName: connection, source, type} = dataset;
@@ -34172,10 +34168,14 @@ async function fillInMapDatasets({datasets, publicToken}) {
   return await Promise.all(promises);
 }
 
-async function fetchMap({mapId, credentials, autoRefresh, onNewData}) {
-  const localCreds = {...Object(_config__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"])(), ...credentials};
+async function fetchMap({cartoMapId, credentials, autoRefresh, onNewData}) {
+  const defaultCredentials = Object(_config__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"])();
+  const localCreds = {
+    ...(defaultCredentials.apiVersion === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3 && defaultCredentials),
+    ...credentials
+  };
 
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(mapId, 'Must define map id');
+  _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');
@@ -34189,23 +34189,30 @@ async function fetchMap({mapId, credentials, autoRefresh, onNewData}) {
     _deck_gl_core__WEBPACK_IMPORTED_MODULE_3__["log"].assert(autoRefresh > 0, '`autoRefresh` must be a positive number');
   }
 
-  const url = `${localCreds.mapsUrl}/public/${mapId}`;
+  const url = `${localCreds.mapsUrl}/public/${cartoMapId}`;
   const map = await request({url});
 
   // Periodically check if the data has changed. Note that this
   // will not update when a map is published.
+  let stopAutoRefresh;
   if (autoRefresh) {
-    setInterval(async () => {
+    const intervalId = setInterval(async () => {
       const changed = await fillInMapDatasets(map);
       if (changed.some(v => v === true)) {
         onNewData(Object(_parseMap__WEBPACK_IMPORTED_MODULE_2__["parseMap"])(map));
       }
     }, autoRefresh * 1000);
+    stopAutoRefresh = () => {
+      clearInterval(intervalId);
+    };
   }
 
   // Mutates map.datasets so that dataset.data contains data
   await fillInMapDatasets(map);
-  return Object(_parseMap__WEBPACK_IMPORTED_MODULE_2__["parseMap"])(map);
+  return {
+    ...Object(_parseMap__WEBPACK_IMPORTED_MODULE_2__["parseMap"])(map),
+    ...{stopAutoRefresh}
+  };
 }
 
 
@@ -34241,7 +34248,7 @@ function parseMap(json) {
     description: json.description,
     createdAt: json.createdAt,
     updatedAt: json.updatedAt,
-    mapState,
+    initialViewState: mapState,
     mapStyle,
     layers: extractTextLayers(layers.reverse()).map(({id, type, config, visualChannels}) => {
       _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(type in _layer_map__WEBPACK_IMPORTED_MODULE_1__["LAYER_MAP"], `Unsupported layer type: ${type}`);
@@ -34274,17 +34281,19 @@ function extractTextLayers(layers) {
         {id, config: configRest, ...rest},
 
         // One layer per valid text label, with full opacity
-        ...textLabel.filter(t => t.field).map(t => {
-          return {
-            id: `id-label-${t.field.name}`,
-            config: {
-              textLabel: t,
-              ...configRest,
-              visConfig: {...configRest.visConfig, opacity: 1}
-            },
-            ...rest
-          };
-        })
+        ...textLabel
+          .filter(t => t.field)
+          .map(t => {
+            return {
+              id: `${id}-label-${t.field.name}`,
+              config: {
+                textLabel: t,
+                ...configRest,
+                visConfig: {...configRest.visConfig, opacity: 1}
+              },
+              ...rest
+            };
+          })
       ];
     })
   );
@@ -34319,12 +34328,6 @@ function createInteractionProps(interactionConfig) {
 }
 
 function mapProps(source, target, mapping) {
-  if (Array.isArray(source)) {
-    source = source[0];
-  }
-  if (!source) {
-    return;
-  }
   for (const sourceKey in mapping) {
     const sourceValue = source[sourceKey];
     const targetKey = mapping[sourceKey];
@@ -34350,14 +34353,8 @@ function createStyleProps(config, mapping) {
 
 /* eslint-disable complexity */
 function createChannelProps(visualChannels, type, config, data) {
-  const {
-    colorField,
-    colorScale,
-    sizeField,
-    sizeScale,
-    strokeColorField,
-    strokeColorScale
-  } = visualChannels;
+  const {colorField, colorScale, sizeField, sizeScale, strokeColorField, strokeColorScale} =
+    visualChannels;
   let {heightField, heightScale} = visualChannels;
   if (type === 'hexagonId') {
     heightField = sizeField;
@@ -34442,12 +34439,13 @@ const base_url = 'https://basemaps.cartocdn.com/gl/{basemap}-gl-style/style.json
 /*!***********************!*\
   !*** ./src/config.js ***!
   \***********************/
-/*! exports provided: defaultClassicCredentials, setDefaultCredentials, getDefaultCredentials, buildMapsUrlFromBase */
+/*! exports provided: defaultClassicCredentials, defaultCloudNativeCredentials, setDefaultCredentials, getDefaultCredentials, buildMapsUrlFromBase */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultClassicCredentials", function() { return defaultClassicCredentials; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultCloudNativeCredentials", function() { return defaultCloudNativeCredentials; });
 /* 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; });
@@ -34455,60 +34453,29 @@ __webpack_require__.r(__webpack_exports__);
 
 
 const defaultClassicCredentials = {
-  username: 'public',
   apiKey: 'default_public',
   region: 'us',
-  mapsUrl: null
+  username: 'public'
 };
 
 const defaultCloudNativeCredentials = {
-  accessToken: null,
-  apiBaseUrl: null,
-  mapsUrl: null
+  apiBaseUrl: 'https://gcp-us-east1.api.carto.com'
 };
 
 let credentials = {};
 
 setDefaultCredentials({});
 
-function setDefaultCredentials(opts) {
-  const apiVersion = opts.apiVersion || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["API_VERSIONS"].V2;
+function setDefaultCredentials({apiVersion, ...rest}) {
+  apiVersion = apiVersion || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["API_VERSIONS"].V3;
 
   switch (apiVersion) {
     case _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["API_VERSIONS"].V1:
-      opts.mapsUrl = opts.mapsUrl || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["DEFAULT_MAPS_URL_FORMAT"][apiVersion];
-      credentials = {
-        apiVersion,
-        ...defaultClassicCredentials,
-        ...opts
-      };
-      break;
-
     case _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["API_VERSIONS"].V2:
-      opts.mapsUrl = opts.mapsUrl || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["DEFAULT_MAPS_URL_FORMAT"][apiVersion];
-      credentials = {
-        apiVersion,
-        ...defaultClassicCredentials,
-        ...opts
-      };
-
+      credentials = {apiVersion, ...defaultClassicCredentials, ...rest};
       break;
     case _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["API_VERSIONS"].V3:
-      if (!opts.apiBaseUrl) {
-        throw new Error(
-          `API version ${
-            _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["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.`);
@@ -34751,7 +34718,9 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
 
       let data;
 
-      if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3) {
+      if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V2) {
+        data = await Object(_api__WEBPACK_IMPORTED_MODULE_1__["getDataV2"])({type, source, credentials});
+      } else {
         data = await Object(_api__WEBPACK_IMPORTED_MODULE_1__["getData"])({
           type,
           source,
@@ -34760,10 +34729,6 @@ class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLa
           geoColumn,
           columns
         });
-      } else if (apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V1 || apiVersion === _api__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V2) {
-        data = await Object(_api__WEBPACK_IMPORTED_MODULE_1__["getDataV2"])({type, source, credentials});
-      } else {
-        _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["log"].assert(`Unknow apiVersion ${apiVersion}. Use API_VERSIONS enum.`);
       }
 
       this.setState({data, apiVersion});
@@ -34885,9 +34850,7 @@ function colorBins({
 
   const palette = typeof colors === 'string' ? Object(_palette__WEBPACK_IMPORTED_MODULE_1__["default"])(colors, domain.length) : colors;
 
-  const color = Object(d3_scale__WEBPACK_IMPORTED_MODULE_0__["scaleThreshold"])()
-    .domain(domain)
-    .range(palette);
+  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);
@@ -34966,9 +34929,7 @@ function colorContinuous({
   Object(_utils__WEBPACK_IMPORTED_MODULE_2__["assert"])(Array.isArray(domain), 'Expected "domain" to be an array of numbers');
 
   const palette = typeof colors === 'string' ? Object(_palette__WEBPACK_IMPORTED_MODULE_1__["default"])(colors) : colors;
-  const color = Object(d3_scale__WEBPACK_IMPORTED_MODULE_0__["scaleLinear"])()
-    .domain(domain)
-    .range(palette);
+  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);

package/dist/es5/api/index.js

@@ -5,55 +5,55 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "FORMATS", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsApiCommon.FORMATS;
   }
 });
 Object.defineProperty(exports, "MAP_TYPES", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsApiCommon.MAP_TYPES;
   }
 });
 Object.defineProperty(exports, "API_VERSIONS", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsApiCommon.API_VERSIONS;
   }
 });
 Object.defineProperty(exports, "getDataV2", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsClient.getDataV2;
   }
 });
 Object.defineProperty(exports, "CONNECTIONS", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsClient.CONNECTIONS;
   }
 });
 Object.defineProperty(exports, "fetchLayerData", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsV3Client.fetchLayerData;
   }
 });
 Object.defineProperty(exports, "fetchMap", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsV3Client.fetchMap;
   }
 });
 Object.defineProperty(exports, "getData", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsV3Client.getData;
   }
 });
 Object.defineProperty(exports, "mapInstantiation", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsV3Client.mapInstantiation;
   }
 });

package/dist/es5/api/layer-map.js

@@ -11,10 +11,6 @@ exports.getTextAccessor = getTextAccessor;
 exports.getTextPixelOffsetAccessor = getTextPixelOffsetAccessor;
 exports.LAYER_MAP = void 0;
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _d3Array = require("d3-array");
 
 var _d3Color = require("d3-color");
@@ -29,11 +25,7 @@ var _geoLayers = require("@deck.gl/geo-layers");
 
 var _layers = require("@deck.gl/layers");
 
-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 SCALE_FUNCS = {
+const SCALE_FUNCS = {
   linear: _d3Scale.scaleLinear,
   ordinal: _d3Scale.scaleOrdinal,
   log: _d3Scale.scaleLog,
@@ -42,7 +34,7 @@ var SCALE_FUNCS = {
   quantize: _d3Scale.scaleQuantize,
   sqrt: _d3Scale.scaleSqrt
 };
-var sharedPropMap = {
+const sharedPropMap = {
   color: 'getFillColor',
   isVisible: 'visible',
   textLabel: {
@@ -62,8 +54,8 @@ var sharedPropMap = {
     wireframe: 'wireframe'
   }
 };
-var RADIUS_DOWNSCALE = 0.2;
-var defaultProps = {
+const RADIUS_DOWNSCALE = 0.2;
+const defaultProps = {
   lineMiterLimit: 2,
   lineWidthUnits: 'pixels',
   pointRadiusScale: RADIUS_DOWNSCALE,
@@ -73,12 +65,15 @@ var defaultProps = {
 };
 
 function mergePropMaps(a, b) {
-  return _objectSpread(_objectSpread(_objectSpread({}, a), b), {}, {
-    visConfig: _objectSpread(_objectSpread({}, a.visConfig), b.visConfig)
-  });
+  return { ...a,
+    ...b,
+    visConfig: { ...a.visConfig,
+      ...b.visConfig
+    }
+  };
 }
 
-var LAYER_MAP = {
+const LAYER_MAP = {
   point: {
     Layer: _layers.GeoJsonLayer,
     propMap: mergePropMaps(sharedPropMap, {
@@ -86,14 +81,14 @@ var LAYER_MAP = {
         outline: 'stroked'
       }
     }),
-    defaultProps: defaultProps
+    defaultProps
   },
   geojson: {
     Layer: _layers.GeoJsonLayer,
     propMap: sharedPropMap,
-    defaultProps: _objectSpread(_objectSpread({}, defaultProps), {}, {
+    defaultProps: { ...defaultProps,
       lineWidthScale: 2
-    })
+    }
   },
   hexagonId: {
     Layer: _geoLayers.H3HexagonLayer,
@@ -103,33 +98,29 @@ var LAYER_MAP = {
         elevationScale: 'elevationScale'
       }
     }),
-    defaultProps: _objectSpread(_objectSpread({}, defaultProps), {}, {
-      getHexagon: function getHexagon(d) {
-        return d.h3;
-      }
-    })
+    defaultProps: { ...defaultProps,
+      getHexagon: d => d.h3
+    }
   },
   mvt: {
     Layer: _geoLayers.MVTLayer,
     propMap: sharedPropMap,
-    defaultProps: _objectSpread(_objectSpread({}, defaultProps), {}, {
+    defaultProps: { ...defaultProps,
       pointRadiusScale: 0.3,
       lineWidthScale: 2
-    })
+    }
   }
 };
 exports.LAYER_MAP = LAYER_MAP;
 
 function domainFromAttribute(attribute, scaleType) {
   if (scaleType === 'ordinal' || scaleType === 'point') {
-    return attribute.categories.map(function (c) {
-      return c.category;
-    }).filter(function (c) {
-      return c !== undefined && c !== null;
-    });
+    return attribute.categories.map(c => c.category).filter(c => c !== undefined && c !== null);
   }
 
-  var min = attribute.min;
+  let {
+    min
+  } = attribute;
 
   if (scaleType === 'log' && min === 0) {
     min = 1e-5;
@@ -140,7 +131,7 @@ function domainFromAttribute(attribute, scaleType) {
 
 function domainFromValues(values, scaleType) {
   if (scaleType === 'ordinal') {
-    return (0, _toConsumableArray2.default)(new Set(values)).sort();
+    return [...new Set(values)].sort();
   }
 
   return (0, _d3Array.extent)(values);
@@ -148,23 +139,19 @@ function domainFromValues(values, scaleType) {
 
 function calculateDomain(data, name, scaleType) {
   if (data.tilestats) {
-    var attributes = data.tilestats.layers[0].attributes;
-    var attribute = attributes.find(function (a) {
-      return a.attribute === name;
-    });
+    const {
+      attributes
+    } = data.tilestats.layers[0];
+    const attribute = attributes.find(a => a.attribute === name);
     return domainFromAttribute(attribute, scaleType);
   } else if (data.features) {
-    var values = data.features.map(function (_ref) {
-      var properties = _ref.properties;
-      return properties[name];
-    });
+    const values = data.features.map(({
+      properties
+    }) => properties[name]);
+    return domainFromValues(values, scaleType);
+  } else if (Array.isArray(data) && data[0][name] !== undefined) {
+    const values = data.map(properties => properties[name]);
     return domainFromValues(values, scaleType);
-  } else if (Array.isArray(data) && data[0][name]) {
-    var _values = data.map(function (properties) {
-      return properties[name];
-    });
-
-    return domainFromValues(_values, scaleType);
   }
 
   return [0, 1];
@@ -172,8 +159,9 @@ function calculateDomain(data, name, scaleType) {
 
 function normalizeAccessor(accessor, data) {
   if (data.features || data.tilestats) {
-    return function (_ref2) {
-      var properties = _ref2.properties;
+    return ({
+      properties
+    }) => {
       return accessor(properties);
     };
   }
@@ -181,74 +169,75 @@ function normalizeAccessor(accessor, data) {
   return accessor;
 }
 
-function getColorAccessor(_ref3, scaleType, _ref4, opacity, data) {
-  var name = _ref3.name;
-  var colors = _ref4.colors;
-  var scale = SCALE_FUNCS[scaleType]();
+function getColorAccessor({
+  name
+}, scaleType, {
+  colors
+}, opacity, data) {
+  const scale = SCALE_FUNCS[scaleType]();
   scale.domain(calculateDomain(data, name, scaleType));
   scale.range(colors);
-  var alpha = opacity !== undefined ? 255 * Math.pow(opacity, 1 / 2.2) : 255;
+  const alpha = opacity !== undefined ? Math.round(255 * Math.pow(opacity, 1 / 2.2)) : 255;
 
-  var accessor = function accessor(properties) {
-    var rgba = (0, _d3Color.rgb)(scale(properties[name]));
+  const accessor = properties => {
+    const rgba = (0, _d3Color.rgb)(scale(properties[name]));
     return [rgba.r, rgba.g, rgba.b, alpha];
   };
 
   return normalizeAccessor(accessor, data);
 }
 
-function getSizeAccessor(_ref5, scaleType, range, data) {
-  var name = _ref5.name;
-  var scale = SCALE_FUNCS[scaleType]();
+function getSizeAccessor({
+  name
+}, scaleType, range, data) {
+  const scale = SCALE_FUNCS[scaleType]();
   scale.domain(calculateDomain(data, name, scaleType));
   scale.range(range);
 
-  var accessor = function accessor(properties) {
+  const accessor = properties => {
     return scale(properties[name]);
   };
 
   return normalizeAccessor(accessor, data);
 }
 
-var FORMATS = {
-  date: function date(s) {
-    return _momentTimezone.default.utc(s).format('MM/DD/YY HH:mm:ssa');
-  },
+const FORMATS = {
+  date: s => _momentTimezone.default.utc(s).format('MM/DD/YY HH:mm:ssa'),
   integer: (0, _d3Format.format)('i'),
   float: (0, _d3Format.format)('.5f'),
-  timestamp: function timestamp(s) {
-    return _momentTimezone.default.utc(s).format('X');
-  },
+  timestamp: s => _momentTimezone.default.utc(s).format('X'),
   default: String
 };
 
-function getTextAccessor(_ref6, data) {
-  var name = _ref6.name,
-      type = _ref6.type;
-  var format = FORMATS[type] || FORMATS.default;
+function getTextAccessor({
+  name,
+  type
+}, data) {
+  const format = FORMATS[type] || FORMATS.default;
 
-  var accessor = function accessor(properties) {
+  const accessor = properties => {
     return format(properties[name]);
   };
 
   return normalizeAccessor(accessor, data);
 }
 
-function getTextPixelOffsetAccessor(_ref7, radius) {
-  var alignment = _ref7.alignment,
-      anchor = _ref7.anchor,
-      size = _ref7.size;
-  var padding = 20;
-  var signX = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;
-  var signY = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1;
-  var sizeOffset = alignment === 'center' ? 0 : size;
-
-  var calculateOffset = function calculateOffset(r) {
+function getTextPixelOffsetAccessor({
+  alignment,
+  anchor,
+  size
+}, radius) {
+  const padding = 20;
+  const signX = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;
+  const signY = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1;
+  const sizeOffset = alignment === 'center' ? 0 : size;
+
+  const calculateOffset = r => {
     r = RADIUS_DOWNSCALE * r;
     return [signX * (r + padding), signY * (r + padding + sizeOffset)];
   };
 
-  return typeof radius === 'function' ? function (d) {
+  return typeof radius === 'function' ? d => {
     return calculateOffset(radius(d));
   } : calculateOffset(radius);
 }