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

package/dist/es5/api/maps-v3-client.js

@@ -24,6 +24,8 @@ var _parseMap = require("./parseMap");
 
 var _core = require("@deck.gl/core");
 
+var _utils = require("../utils");
+
 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; }
@@ -37,12 +39,12 @@ function request(_x) {
 
 function _request() {
   _request = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(_ref) {
-    var method, url, format, accessToken, body, response, headers, json;
+    var method, url, accessToken, body, headers;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            method = _ref.method, url = _ref.url, format = _ref.format, accessToken = _ref.accessToken, body = _ref.body;
+            method = _ref.method, url = _ref.url, accessToken = _ref.accessToken, body = _ref.body;
             headers = {
               Accept: 'application/json'
             };
@@ -64,9 +66,7 @@ function _request() {
             });
 
           case 7:
-            response = _context.sent;
-            _context.next = 13;
-            break;
+            return _context.abrupt("return", _context.sent);
 
           case 10:
             _context.prev = 10;
@@ -74,19 +74,42 @@ function _request() {
             throw new Error("Failed to connect to Maps API: ".concat(_context.t0));
 
           case 13:
-            if (!(format === _mapsApiCommon.FORMATS.NDJSON)) {
-              _context.next = 15;
-              break;
-            }
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[4, 10]]);
+  }));
+  return _request.apply(this, arguments);
+}
 
-            return _context.abrupt("return", response);
+function requestJson(_x2) {
+  return _requestJson.apply(this, arguments);
+}
 
-          case 15:
-            _context.next = 17;
+function _requestJson() {
+  _requestJson = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref2) {
+    var method, url, accessToken, body, response, json;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            method = _ref2.method, url = _ref2.url, accessToken = _ref2.accessToken, body = _ref2.body;
+            _context2.next = 3;
+            return request({
+              method: method,
+              url: url,
+              accessToken: accessToken,
+              body: body
+            });
+
+          case 3:
+            response = _context2.sent;
+            _context2.next = 6;
             return response.json();
 
-          case 17:
-            json = _context.sent;
+          case 6:
+            json = _context2.sent;
 
             if (!response.ok) {
               dealWithError({
@@ -95,21 +118,69 @@ function _request() {
               });
             }
 
-            return _context.abrupt("return", json.rows ? json.rows : json);
+            return _context2.abrupt("return", json);
 
-          case 20:
+          case 9:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
       }
-    }, _callee, null, [[4, 10]]);
+    }, _callee2);
   }));
-  return _request.apply(this, arguments);
+  return _requestJson.apply(this, arguments);
+}
+
+function requestData(_x3) {
+  return _requestData.apply(this, arguments);
+}
+
+function _requestData() {
+  _requestData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(_ref3) {
+    var method, url, accessToken, format, body, data;
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            method = _ref3.method, url = _ref3.url, accessToken = _ref3.accessToken, format = _ref3.format, body = _ref3.body;
+
+            if (!(format === _mapsApiCommon.FORMATS.NDJSON)) {
+              _context3.next = 3;
+              break;
+            }
+
+            return _context3.abrupt("return", request({
+              method: method,
+              url: url,
+              accessToken: accessToken,
+              body: body
+            }));
+
+          case 3:
+            _context3.next = 5;
+            return requestJson({
+              method: method,
+              url: url,
+              accessToken: accessToken,
+              body: body
+            });
+
+          case 5:
+            data = _context3.sent;
+            return _context3.abrupt("return", data.rows ? data.rows : data);
+
+          case 7:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+  return _requestData.apply(this, arguments);
 }
 
-function dealWithError(_ref2) {
-  var response = _ref2.response,
-      error = _ref2.error;
+function dealWithError(_ref4) {
+  var response = _ref4.response,
+      error = _ref4.error;
 
   switch (response.status) {
     case 400:
@@ -124,13 +195,13 @@ function dealWithError(_ref2) {
   }
 }
 
-function getParameters(_ref3) {
-  var type = _ref3.type,
-      source = _ref3.source,
-      geoColumn = _ref3.geoColumn,
-      columns = _ref3.columns,
-      schema = _ref3.schema,
-      clientId = _ref3.clientId;
+function getParameters(_ref5) {
+  var type = _ref5.type,
+      source = _ref5.source,
+      geoColumn = _ref5.geoColumn,
+      columns = _ref5.columns,
+      schema = _ref5.schema,
+      clientId = _ref5.clientId;
   var parameters = [(0, _mapsApiCommon.encodeParameter)('client', clientId || DEFAULT_CLIENT)];
 
   if (schema) {
@@ -153,18 +224,18 @@ function getParameters(_ref3) {
   return parameters.join('&');
 }
 
-function mapInstantiation(_x2) {
+function mapInstantiation(_x4) {
   return _mapInstantiation.apply(this, arguments);
 }
 
 function _mapInstantiation() {
-  _mapInstantiation = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref4) {
-    var type, source, connection, credentials, geoColumn, columns, schema, clientId, baseUrl, url, accessToken, format, body;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
+  _mapInstantiation = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4(_ref6) {
+    var type, source, connection, credentials, geoColumn, columns, schema, clientId, baseUrl, url, accessToken, body;
+    return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) {
-        switch (_context2.prev = _context2.next) {
+        switch (_context4.prev = _context4.next) {
           case 0:
-            type = _ref4.type, source = _ref4.source, connection = _ref4.connection, credentials = _ref4.credentials, geoColumn = _ref4.geoColumn, columns = _ref4.columns, schema = _ref4.schema, clientId = _ref4.clientId;
+            type = _ref6.type, source = _ref6.source, connection = _ref6.connection, credentials = _ref6.credentials, geoColumn = _ref6.geoColumn, columns = _ref6.columns, schema = _ref6.schema, clientId = _ref6.clientId;
             baseUrl = "".concat(credentials.mapsUrl, "/").concat(connection, "/").concat(type);
             url = "".concat(baseUrl, "?").concat(getParameters({
               type: type,
@@ -175,10 +246,9 @@ function _mapInstantiation() {
               clientId: clientId
             }));
             accessToken = credentials.accessToken;
-            format = 'json';
 
             if (!(url.length > MAX_GET_LENGTH && type === _mapsApiCommon.MAP_TYPES.QUERY)) {
-              _context2.next = 10;
+              _context4.next = 9;
               break;
             }
 
@@ -186,35 +256,33 @@ function _mapInstantiation() {
               q: source,
               client: clientId || DEFAULT_CLIENT
             });
-            _context2.next = 9;
-            return request({
+            _context4.next = 8;
+            return requestJson({
               method: 'POST',
               url: baseUrl,
-              format: format,
               accessToken: accessToken,
               body: body
             });
 
-          case 9:
-            return _context2.abrupt("return", _context2.sent);
+          case 8:
+            return _context4.abrupt("return", _context4.sent);
 
-          case 10:
-            _context2.next = 12;
-            return request({
+          case 9:
+            _context4.next = 11;
+            return requestJson({
               url: url,
-              format: format,
               accessToken: accessToken
             });
 
-          case 12:
-            return _context2.abrupt("return", _context2.sent);
+          case 11:
+            return _context4.abrupt("return", _context4.sent);
 
-          case 13:
+          case 12:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
       }
-    }, _callee2);
+    }, _callee4);
   }));
   return _mapInstantiation.apply(this, arguments);
 }
@@ -229,39 +297,33 @@ function getUrlFromMetadata(metadata, format) {
   return null;
 }
 
-function checkFetchLayerDataParameters(_ref5) {
-  var type = _ref5.type,
-      source = _ref5.source,
-      connection = _ref5.connection,
-      localCreds = _ref5.localCreds;
-
-  _core.log.assert(connection, 'Must define connection');
-
-  _core.log.assert(type, 'Must define a type');
-
-  _core.log.assert(source, 'Must define a source');
-
-  _core.log.assert(localCreds.apiVersion === _mapsApiCommon.API_VERSIONS.V3, 'Method only available for v3');
-
-  _core.log.assert(localCreds.apiBaseUrl, 'Must define apiBaseUrl');
-
-  _core.log.assert(localCreds.accessToken, 'Must define an accessToken');
+function checkFetchLayerDataParameters(_ref7) {
+  var type = _ref7.type,
+      source = _ref7.source,
+      connection = _ref7.connection,
+      credentials = _ref7.credentials;
+  (0, _utils.assert)(connection, 'Must define connection');
+  (0, _utils.assert)(type, 'Must define a type');
+  (0, _utils.assert)(source, 'Must define a source');
+  (0, _utils.assert)(credentials.apiVersion === _mapsApiCommon.API_VERSIONS.V3, 'Method only available for v3');
+  (0, _utils.assert)(credentials.apiBaseUrl, 'Must define apiBaseUrl');
+  (0, _utils.assert)(credentials.accessToken, 'Must define an accessToken');
 }
 
-function fetchLayerData(_x3) {
+function fetchLayerData(_x5) {
   return _fetchLayerData.apply(this, arguments);
 }
 
 function _fetchLayerData() {
-  _fetchLayerData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(_ref6) {
+  _fetchLayerData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee5(_ref8) {
     var type, source, connection, credentials, geoColumn, columns, format, schema, clientId, _yield$_fetchDataUrl, url, accessToken, mapFormat, metadata, data, result;
 
-    return _regenerator.default.wrap(function _callee3$(_context3) {
+    return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) {
-        switch (_context3.prev = _context3.next) {
+        switch (_context5.prev = _context5.next) {
           case 0:
-            type = _ref6.type, source = _ref6.source, connection = _ref6.connection, credentials = _ref6.credentials, geoColumn = _ref6.geoColumn, columns = _ref6.columns, format = _ref6.format, schema = _ref6.schema, clientId = _ref6.clientId;
-            _context3.next = 3;
+            type = _ref8.type, source = _ref8.source, connection = _ref8.connection, credentials = _ref8.credentials, geoColumn = _ref8.geoColumn, columns = _ref8.columns, format = _ref8.format, schema = _ref8.schema, clientId = _ref8.clientId;
+            _context5.next = 3;
             return _fetchDataUrl({
               type: type,
               source: source,
@@ -275,20 +337,20 @@ function _fetchLayerData() {
             });
 
           case 3:
-            _yield$_fetchDataUrl = _context3.sent;
+            _yield$_fetchDataUrl = _context5.sent;
             url = _yield$_fetchDataUrl.url;
             accessToken = _yield$_fetchDataUrl.accessToken;
             mapFormat = _yield$_fetchDataUrl.mapFormat;
             metadata = _yield$_fetchDataUrl.metadata;
-            _context3.next = 10;
-            return request({
+            _context5.next = 10;
+            return requestData({
               url: url,
               format: mapFormat,
               accessToken: accessToken
             });
 
           case 10:
-            data = _context3.sent;
+            data = _context5.sent;
             result = {
               data: data,
               format: mapFormat
@@ -298,45 +360,45 @@ function _fetchLayerData() {
               result.schema = metadata.schema;
             }
 
-            return _context3.abrupt("return", result);
+            return _context5.abrupt("return", result);
 
           case 14:
           case "end":
-            return _context3.stop();
+            return _context5.stop();
         }
       }
-    }, _callee3);
+    }, _callee5);
   }));
   return _fetchLayerData.apply(this, arguments);
 }
 
-function _fetchDataUrl(_x4) {
+function _fetchDataUrl(_x6) {
   return _fetchDataUrl2.apply(this, arguments);
 }
 
 function _fetchDataUrl2() {
-  _fetchDataUrl2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4(_ref7) {
+  _fetchDataUrl2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee6(_ref9) {
     var type, source, connection, credentials, geoColumn, columns, format, schema, clientId, defaultCredentials, localCreds, metadata, url, mapFormat, prioritizedFormats, _i, _prioritizedFormats, f, accessToken;
 
-    return _regenerator.default.wrap(function _callee4$(_context4) {
+    return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) {
-        switch (_context4.prev = _context4.next) {
+        switch (_context6.prev = _context6.next) {
           case 0:
-            type = _ref7.type, source = _ref7.source, connection = _ref7.connection, credentials = _ref7.credentials, geoColumn = _ref7.geoColumn, columns = _ref7.columns, format = _ref7.format, schema = _ref7.schema, clientId = _ref7.clientId;
+            type = _ref9.type, source = _ref9.source, connection = _ref9.connection, credentials = _ref9.credentials, geoColumn = _ref9.geoColumn, columns = _ref9.columns, format = _ref9.format, schema = _ref9.schema, clientId = _ref9.clientId;
             defaultCredentials = (0, _config.getDefaultCredentials)();
             localCreds = _objectSpread(_objectSpread({}, defaultCredentials.apiVersion === _mapsApiCommon.API_VERSIONS.V3 && defaultCredentials), credentials);
             checkFetchLayerDataParameters({
               type: type,
               source: source,
               connection: connection,
-              localCreds: localCreds
+              credentials: localCreds
             });
 
             if (!localCreds.mapsUrl) {
               localCreds.mapsUrl = (0, _config.buildMapsUrlFromBase)(localCreds.apiBaseUrl);
             }
 
-            _context4.next = 7;
+            _context6.next = 7;
             return mapInstantiation({
               type: type,
               source: source,
@@ -349,28 +411,27 @@ function _fetchDataUrl2() {
             });
 
           case 7:
-            metadata = _context4.sent;
+            metadata = _context6.sent;
+            url = null;
 
             if (!format) {
-              _context4.next = 14;
+              _context6.next = 15;
               break;
             }
 
             mapFormat = format;
             url = getUrlFromMetadata(metadata, format);
-
-            _core.log.assert(url, "Format ".concat(format, " not available"));
-
-            _context4.next = 25;
+            (0, _utils.assert)(url, "Format ".concat(format, " not available"));
+            _context6.next = 27;
             break;
 
-          case 14:
+          case 15:
             prioritizedFormats = [_mapsApiCommon.FORMATS.GEOJSON, _mapsApiCommon.FORMATS.JSON, _mapsApiCommon.FORMATS.NDJSON, _mapsApiCommon.FORMATS.TILEJSON];
             _i = 0, _prioritizedFormats = prioritizedFormats;
 
-          case 16:
+          case 17:
             if (!(_i < _prioritizedFormats.length)) {
-              _context4.next = 25;
+              _context6.next = 26;
               break;
             }
 
@@ -378,53 +439,56 @@ function _fetchDataUrl2() {
             url = getUrlFromMetadata(metadata, f);
 
             if (!url) {
-              _context4.next = 22;
+              _context6.next = 23;
               break;
             }
 
             mapFormat = f;
-            return _context4.abrupt("break", 25);
+            return _context6.abrupt("break", 26);
 
-          case 22:
+          case 23:
             _i++;
-            _context4.next = 16;
+            _context6.next = 17;
             break;
 
-          case 25:
+          case 26:
+            (0, _utils.assert)(url && mapFormat, 'Unsupported data formats received from backend.');
+
+          case 27:
             accessToken = localCreds.accessToken;
-            return _context4.abrupt("return", {
+            return _context6.abrupt("return", {
               url: url,
               accessToken: accessToken,
               mapFormat: mapFormat,
               metadata: metadata
             });
 
-          case 27:
+          case 29:
           case "end":
-            return _context4.stop();
+            return _context6.stop();
         }
       }
-    }, _callee4);
+    }, _callee6);
   }));
   return _fetchDataUrl2.apply(this, arguments);
 }
 
-function getData(_x5) {
+function getData(_x7) {
   return _getData.apply(this, arguments);
 }
 
 function _getData() {
-  _getData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee5(_ref8) {
+  _getData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee7(_ref10) {
     var type, source, connection, credentials, geoColumn, columns, format, clientId, layerData;
-    return _regenerator.default.wrap(function _callee5$(_context5) {
+    return _regenerator.default.wrap(function _callee7$(_context7) {
       while (1) {
-        switch (_context5.prev = _context5.next) {
+        switch (_context7.prev = _context7.next) {
           case 0:
-            type = _ref8.type, source = _ref8.source, connection = _ref8.connection, credentials = _ref8.credentials, geoColumn = _ref8.geoColumn, columns = _ref8.columns, format = _ref8.format, clientId = _ref8.clientId;
+            type = _ref10.type, source = _ref10.source, connection = _ref10.connection, credentials = _ref10.credentials, geoColumn = _ref10.geoColumn, columns = _ref10.columns, format = _ref10.format, clientId = _ref10.clientId;
 
             _core.log.deprecated('getData', 'fetchLayerData')();
 
-            _context5.next = 4;
+            _context7.next = 4;
             return fetchLayerData({
               type: type,
               source: source,
@@ -438,169 +502,165 @@ function _getData() {
             });
 
           case 4:
-            layerData = _context5.sent;
-            return _context5.abrupt("return", layerData.data);
+            layerData = _context7.sent;
+            return _context7.abrupt("return", layerData.data);
 
           case 6:
           case "end":
-            return _context5.stop();
+            return _context7.stop();
         }
       }
-    }, _callee5);
+    }, _callee7);
   }));
   return _getData.apply(this, arguments);
 }
 
-function _fetchMapDataset(_x6, _x7, _x8, _x9) {
+function _fetchMapDataset(_x8, _x9, _x10, _x11) {
   return _fetchMapDataset2.apply(this, arguments);
 }
 
 function _fetchMapDataset2() {
-  _fetchMapDataset2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee6(dataset, accessToken, credentials, clientId) {
-    var connection, source, type, _yield$_fetchDataUrl2, url, mapFormat, cache, data;
+  _fetchMapDataset2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee8(dataset, accessToken, credentials, clientId) {
+    var connection, columns, geoColumn, source, type, _yield$_fetchDataUrl2, url, mapFormat, cache;
 
-    return _regenerator.default.wrap(function _callee6$(_context6) {
+    return _regenerator.default.wrap(function _callee8$(_context8) {
       while (1) {
-        switch (_context6.prev = _context6.next) {
+        switch (_context8.prev = _context8.next) {
           case 0:
-            connection = dataset.connectionName, source = dataset.source, type = dataset.type;
-            _context6.next = 3;
+            connection = dataset.connectionName, columns = dataset.columns, geoColumn = dataset.geoColumn, source = dataset.source, type = dataset.type;
+            _context8.next = 3;
             return _fetchDataUrl({
               credentials: _objectSpread(_objectSpread({}, credentials), {}, {
                 accessToken: accessToken
               }),
               connection: connection,
+              columns: columns,
+              geoColumn: geoColumn,
               source: source,
               type: type,
               clientId: clientId
             });
 
           case 3:
-            _yield$_fetchDataUrl2 = _context6.sent;
+            _yield$_fetchDataUrl2 = _context8.sent;
             url = _yield$_fetchDataUrl2.url;
             mapFormat = _yield$_fetchDataUrl2.mapFormat;
-            cache = parseInt(new URL(url).searchParams.get('cache'), 10);
+            cache = parseInt(new URL(url).searchParams.get('cache') || '', 10);
 
             if (!(cache && dataset.cache === cache)) {
-              _context6.next = 9;
+              _context8.next = 9;
               break;
             }
 
-            return _context6.abrupt("return", false);
+            return _context8.abrupt("return", false);
 
           case 9:
             dataset.cache = cache;
-            _context6.next = 12;
-            return request({
+            _context8.next = 12;
+            return requestData({
               url: url,
               format: mapFormat,
               accessToken: accessToken
             });
 
           case 12:
-            data = _context6.sent;
-            dataset.data = data;
-            return _context6.abrupt("return", true);
+            dataset.data = _context8.sent;
+            return _context8.abrupt("return", true);
 
-          case 15:
+          case 14:
           case "end":
-            return _context6.stop();
+            return _context8.stop();
         }
       }
-    }, _callee6);
+    }, _callee8);
   }));
   return _fetchMapDataset2.apply(this, arguments);
 }
 
-function fillInMapDatasets(_x10, _x11, _x12) {
+function fillInMapDatasets(_x12, _x13, _x14) {
   return _fillInMapDatasets.apply(this, arguments);
 }
 
 function _fillInMapDatasets() {
-  _fillInMapDatasets = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee7(_ref9, clientId, credentials) {
+  _fillInMapDatasets = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee9(_ref11, clientId, credentials) {
     var datasets, token, promises;
-    return _regenerator.default.wrap(function _callee7$(_context7) {
+    return _regenerator.default.wrap(function _callee9$(_context9) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context9.prev = _context9.next) {
           case 0:
-            datasets = _ref9.datasets, token = _ref9.token;
+            datasets = _ref11.datasets, token = _ref11.token;
             promises = datasets.map(function (dataset) {
               return _fetchMapDataset(dataset, token, credentials, clientId);
             });
-            _context7.next = 4;
+            _context9.next = 4;
             return Promise.all(promises);
 
           case 4:
-            return _context7.abrupt("return", _context7.sent);
+            return _context9.abrupt("return", _context9.sent);
 
           case 5:
           case "end":
-            return _context7.stop();
+            return _context9.stop();
         }
       }
-    }, _callee7);
+    }, _callee9);
   }));
   return _fillInMapDatasets.apply(this, arguments);
 }
 
-function fetchMap(_x13) {
+function fetchMap(_x15) {
   return _fetchMap.apply(this, arguments);
 }
 
 function _fetchMap() {
-  _fetchMap = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee9(_ref10) {
+  _fetchMap = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee11(_ref12) {
     var cartoMapId, clientId, credentials, autoRefresh, onNewData, defaultCredentials, localCreds, accessToken, url, map, stopAutoRefresh, intervalId;
-    return _regenerator.default.wrap(function _callee9$(_context9) {
+    return _regenerator.default.wrap(function _callee11$(_context11) {
       while (1) {
-        switch (_context9.prev = _context9.next) {
+        switch (_context11.prev = _context11.next) {
           case 0:
-            cartoMapId = _ref10.cartoMapId, clientId = _ref10.clientId, credentials = _ref10.credentials, autoRefresh = _ref10.autoRefresh, onNewData = _ref10.onNewData;
+            cartoMapId = _ref12.cartoMapId, clientId = _ref12.clientId, credentials = _ref12.credentials, autoRefresh = _ref12.autoRefresh, onNewData = _ref12.onNewData;
             defaultCredentials = (0, _config.getDefaultCredentials)();
             localCreds = _objectSpread(_objectSpread({}, defaultCredentials.apiVersion === _mapsApiCommon.API_VERSIONS.V3 && defaultCredentials), credentials);
             accessToken = localCreds.accessToken;
-
-            _core.log.assert(cartoMapId, "Must define CARTO map id: fetchMap({cartoMapId: 'XXXX-XXXX-XXXX'})");
-
-            _core.log.assert(localCreds.apiVersion === _mapsApiCommon.API_VERSIONS.V3, 'Method only available for v3');
-
-            _core.log.assert(localCreds.apiBaseUrl, 'Must define apiBaseUrl');
+            (0, _utils.assert)(cartoMapId, 'Must define CARTO map id: fetchMap({cartoMapId: "XXXX-XXXX-XXXX"})');
+            (0, _utils.assert)(localCreds.apiVersion === _mapsApiCommon.API_VERSIONS.V3, 'Method only available for v3');
+            (0, _utils.assert)(localCreds.apiBaseUrl, 'Must define apiBaseUrl');
 
             if (!localCreds.mapsUrl) {
               localCreds.mapsUrl = (0, _config.buildMapsUrlFromBase)(localCreds.apiBaseUrl);
             }
 
             if (autoRefresh || onNewData) {
-              _core.log.assert(onNewData, 'Must define `onNewData` when using autoRefresh');
-
-              _core.log.assert(typeof onNewData === 'function', '`onNewData` must be a function');
-
-              _core.log.assert(autoRefresh > 0, '`autoRefresh` must be a positive number');
+              (0, _utils.assert)(onNewData, 'Must define `onNewData` when using autoRefresh');
+              (0, _utils.assert)(typeof onNewData === 'function', '`onNewData` must be a function');
+              (0, _utils.assert)(typeof autoRefresh === 'number' && autoRefresh > 0, '`autoRefresh` must be a positive number');
             }
 
             url = "".concat(localCreds.mapsUrl, "/public/").concat(cartoMapId);
-            _context9.next = 12;
-            return request({
+            _context11.next = 12;
+            return requestJson({
               url: url,
               accessToken: accessToken
             });
 
           case 12:
-            map = _context9.sent;
+            map = _context11.sent;
 
             if (autoRefresh) {
-              intervalId = setInterval((0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee8() {
+              intervalId = setInterval((0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee10() {
                 var changed;
-                return _regenerator.default.wrap(function _callee8$(_context8) {
+                return _regenerator.default.wrap(function _callee10$(_context10) {
                   while (1) {
-                    switch (_context8.prev = _context8.next) {
+                    switch (_context10.prev = _context10.next) {
                       case 0:
-                        _context8.next = 2;
-                        return fillInMapDatasets(map, clientId, credentials);
+                        _context10.next = 2;
+                        return fillInMapDatasets(map, clientId, localCreds);
 
                       case 2:
-                        changed = _context8.sent;
+                        changed = _context10.sent;
 
-                        if (changed.some(function (v) {
+                        if (onNewData && changed.some(function (v) {
                           return v === true;
                         })) {
                           onNewData((0, _parseMap.parseMap)(map));
@@ -608,10 +668,10 @@ function _fetchMap() {
 
                       case 4:
                       case "end":
-                        return _context8.stop();
+                        return _context10.stop();
                     }
                   }
-                }, _callee8);
+                }, _callee10);
               })), autoRefresh * 1000);
 
               stopAutoRefresh = function stopAutoRefresh() {
@@ -619,20 +679,20 @@ function _fetchMap() {
               };
             }
 
-            _context9.next = 16;
-            return fillInMapDatasets(map, clientId, credentials);
+            _context11.next = 16;
+            return fillInMapDatasets(map, clientId, localCreds);
 
           case 16:
-            return _context9.abrupt("return", _objectSpread(_objectSpread({}, (0, _parseMap.parseMap)(map)), {
+            return _context11.abrupt("return", _objectSpread(_objectSpread({}, (0, _parseMap.parseMap)(map)), {
               stopAutoRefresh: stopAutoRefresh
             }));
 
           case 17:
           case "end":
-            return _context9.stop();
+            return _context11.stop();
         }
       }
-    }, _callee9);
+    }, _callee11);
   }));
   return _fetchMap.apply(this, arguments);
 }