@deck.gl/carto 8.9.0-alpha.4 → 8.9.0-beta.1

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

@@ -19,6 +19,8 @@ var _config = require("../config");
 
 var _mapsApiCommon = require("./maps-api-common");
 
+var _cartoApiError = require("./carto-api-error");
+
 var _parseMap = require("./parseMap");
 
 var _core = require("@deck.gl/core");
@@ -35,7 +37,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 MAX_GET_LENGTH = 2048;
+var MAX_GET_LENGTH = 8192;
 var DEFAULT_CLIENT = 'deck-gl-carto';
 var V3_MINOR_VERSION = '3.1';
 
@@ -45,12 +47,12 @@ function request(_x) {
 
 function _request() {
   _request = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(_ref) {
-    var method, url, customHeaders, accessToken, body, headers;
+    var method, url, customHeaders, accessToken, body, errorContext, headers;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            method = _ref.method, url = _ref.url, customHeaders = _ref.headers, accessToken = _ref.accessToken, body = _ref.body;
+            method = _ref.method, url = _ref.url, customHeaders = _ref.headers, accessToken = _ref.accessToken, body = _ref.body, errorContext = _ref.errorContext;
             headers = _objectSpread(_objectSpread({}, customHeaders), {}, {
               Accept: 'application/json'
             });
@@ -77,7 +79,7 @@ function _request() {
           case 10:
             _context.prev = 10;
             _context.t0 = _context["catch"](4);
-            throw new Error("Failed to connect to Maps API: ".concat(_context.t0));
+            throw new _cartoApiError.CartoAPIError(_context.t0, errorContext);
 
           case 13:
           case "end":
@@ -95,19 +97,20 @@ function requestJson(_x2) {
 
 function _requestJson() {
   _requestJson = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref2) {
-    var method, url, headers, accessToken, body, response, json;
+    var method, url, headers, accessToken, body, errorContext, response, json;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            method = _ref2.method, url = _ref2.url, headers = _ref2.headers, accessToken = _ref2.accessToken, body = _ref2.body;
+            method = _ref2.method, url = _ref2.url, headers = _ref2.headers, accessToken = _ref2.accessToken, body = _ref2.body, errorContext = _ref2.errorContext;
             _context2.next = 3;
             return request({
               method: method,
               url: url,
               headers: headers,
               accessToken: accessToken,
-              body: body
+              body: body,
+              errorContext: errorContext
             });
 
           case 3:
@@ -118,16 +121,17 @@ function _requestJson() {
           case 6:
             json = _context2.sent;
 
-            if (!response.ok) {
-              dealWithError({
-                response: response,
-                error: json.error
-              });
+            if (response.ok) {
+              _context2.next = 9;
+              break;
             }
 
-            return _context2.abrupt("return", json);
+            throw new _cartoApiError.CartoAPIError(json.error, errorContext, response);
 
           case 9:
+            return _context2.abrupt("return", json);
+
+          case 10:
           case "end":
             return _context2.stop();
         }
@@ -143,12 +147,12 @@ function requestData(_x3) {
 
 function _requestData() {
   _requestData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee3(_ref3) {
-    var method, url, accessToken, format, body, data;
+    var method, url, accessToken, format, body, errorContext, 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;
+            method = _ref3.method, url = _ref3.url, accessToken = _ref3.accessToken, format = _ref3.format, body = _ref3.body, errorContext = _ref3.errorContext;
 
             if (!(format === _mapsApiCommon.FORMATS.NDJSON)) {
               _context3.next = 3;
@@ -159,7 +163,8 @@ function _requestData() {
               method: method,
               url: url,
               accessToken: accessToken,
-              body: body
+              body: body,
+              errorContext: errorContext
             }));
 
           case 3:
@@ -168,7 +173,8 @@ function _requestData() {
               method: method,
               url: url,
               accessToken: accessToken,
-              body: body
+              body: body,
+              errorContext: errorContext
             });
 
           case 5:
@@ -185,32 +191,15 @@ function _requestData() {
   return _requestData.apply(this, arguments);
 }
 
-function dealWithError(_ref4) {
-  var response = _ref4.response,
-      error = _ref4.error;
-
-  switch (response.status) {
-    case 400:
-      throw new Error("Bad request. ".concat(error));
-
-    case 401:
-    case 403:
-      throw new Error("Unauthorized access. ".concat(error));
-
-    default:
-      throw new Error(error);
-  }
-}
-
-function getParameters(_ref5) {
-  var type = _ref5.type,
-      source = _ref5.source,
-      geoColumn = _ref5.geoColumn,
-      columns = _ref5.columns,
-      clientId = _ref5.clientId,
-      aggregationExp = _ref5.aggregationExp,
-      aggregationResLevel = _ref5.aggregationResLevel,
-      queryParameters = _ref5.queryParameters;
+function getParameters(_ref4) {
+  var type = _ref4.type,
+      source = _ref4.source,
+      geoColumn = _ref4.geoColumn,
+      columns = _ref4.columns,
+      clientId = _ref4.clientId,
+      aggregationExp = _ref4.aggregationExp,
+      aggregationResLevel = _ref4.aggregationResLevel,
+      queryParameters = _ref4.queryParameters;
   var parameters = [(0, _mapsApiCommon.encodeParameter)('client', clientId || DEFAULT_CLIENT)];
   parameters.push((0, _mapsApiCommon.encodeParameter)('v', V3_MINOR_VERSION));
   var sourceName = type === _mapsApiCommon.MAP_TYPES.QUERY ? 'q' : 'name';
@@ -251,13 +240,13 @@ function mapInstantiation(_x4) {
 }
 
 function _mapInstantiation() {
-  _mapInstantiation = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4(_ref6) {
-    var type, source, connection, credentials, geoColumn, columns, clientId, headers, aggregationExp, aggregationResLevel, queryParameters, baseUrl, url, accessToken, body;
+  _mapInstantiation = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee4(_ref5) {
+    var type, source, connection, credentials, geoColumn, columns, clientId, headers, aggregationExp, aggregationResLevel, queryParameters, baseUrl, url, accessToken, errorContext, body;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
-            type = _ref6.type, source = _ref6.source, connection = _ref6.connection, credentials = _ref6.credentials, geoColumn = _ref6.geoColumn, columns = _ref6.columns, clientId = _ref6.clientId, headers = _ref6.headers, aggregationExp = _ref6.aggregationExp, aggregationResLevel = _ref6.aggregationResLevel, queryParameters = _ref6.queryParameters;
+            type = _ref5.type, source = _ref5.source, connection = _ref5.connection, credentials = _ref5.credentials, geoColumn = _ref5.geoColumn, columns = _ref5.columns, clientId = _ref5.clientId, headers = _ref5.headers, aggregationExp = _ref5.aggregationExp, aggregationResLevel = _ref5.aggregationResLevel, queryParameters = _ref5.queryParameters;
             baseUrl = "".concat(credentials.mapsUrl, "/").concat(connection, "/").concat(type);
             url = "".concat(baseUrl, "?").concat(getParameters({
               type: type,
@@ -270,41 +259,52 @@ function _mapInstantiation() {
               queryParameters: queryParameters
             }));
             accessToken = credentials.accessToken;
+            errorContext = {
+              requestType: _mapsApiCommon.REQUEST_TYPES.INSTANTIATION,
+              connection: connection,
+              type: type,
+              source: source
+            };
 
             if (!(url.length > MAX_GET_LENGTH && type === _mapsApiCommon.MAP_TYPES.QUERY)) {
-              _context4.next = 9;
+              _context4.next = 10;
               break;
             }
 
             body = JSON.stringify({
               q: source,
               client: clientId || DEFAULT_CLIENT,
+              aggregationResLevel: aggregationResLevel,
+              aggregationExp: aggregationExp,
+              geoColumn: geoColumn,
               queryParameters: queryParameters
             });
-            _context4.next = 8;
+            _context4.next = 9;
             return requestJson({
               method: 'POST',
               url: baseUrl,
               headers: headers,
               accessToken: accessToken,
-              body: body
+              body: body,
+              errorContext: errorContext
             });
 
-          case 8:
+          case 9:
             return _context4.abrupt("return", _context4.sent);
 
-          case 9:
-            _context4.next = 11;
+          case 10:
+            _context4.next = 12;
             return requestJson({
               url: url,
               headers: headers,
-              accessToken: accessToken
+              accessToken: accessToken,
+              errorContext: errorContext
             });
 
-          case 11:
+          case 12:
             return _context4.abrupt("return", _context4.sent);
 
-          case 12:
+          case 13:
           case "end":
             return _context4.stop();
         }
@@ -324,15 +324,15 @@ function getUrlFromMetadata(metadata, format) {
   return null;
 }
 
-function checkFetchLayerDataParameters(_ref7) {
-  var type = _ref7.type,
-      source = _ref7.source,
-      connection = _ref7.connection,
-      credentials = _ref7.credentials,
-      geoColumn = _ref7.geoColumn,
-      columns = _ref7.columns,
-      aggregationExp = _ref7.aggregationExp,
-      aggregationResLevel = _ref7.aggregationResLevel;
+function checkFetchLayerDataParameters(_ref6) {
+  var type = _ref6.type,
+      source = _ref6.source,
+      connection = _ref6.connection,
+      credentials = _ref6.credentials,
+      geoColumn = _ref6.geoColumn,
+      columns = _ref6.columns,
+      aggregationExp = _ref6.aggregationExp,
+      aggregationResLevel = _ref6.aggregationResLevel;
   (0, _utils.assert)(connection, 'Must define connection');
   (0, _utils.assert)(type, 'Must define a type');
   (0, _utils.assert)(source, 'Must define a source');
@@ -350,10 +350,6 @@ function checkFetchLayerDataParameters(_ref7) {
     (0, _utils.assert)(!aggregationExp, 'Have aggregationExp, but geoColumn parameter is missing');
     (0, _utils.assert)(!aggregationResLevel, 'Have aggregationResLevel, but geoColumn parameter is missing');
   }
-
-  if (!aggregationExp) {
-    (0, _utils.assert)(!aggregationResLevel, 'Have aggregationResLevel, but aggregationExp parameter is missing');
-  }
 }
 
 function fetchLayerData(_x5) {
@@ -361,14 +357,14 @@ function fetchLayerData(_x5) {
 }
 
 function _fetchLayerData() {
-  _fetchLayerData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee5(_ref8) {
-    var type, source, connection, credentials, geoColumn, columns, format, formatTiles, clientId, headers, aggregationExp, aggregationResLevel, queryParameters, _yield$_fetchDataUrl, url, accessToken, mapFormat, metadata, data, result;
+  _fetchLayerData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee5(_ref7) {
+    var type, source, connection, credentials, geoColumn, columns, format, formatTiles, clientId, headers, aggregationExp, aggregationResLevel, queryParameters, _yield$_fetchDataUrl, url, accessToken, mapFormat, metadata, errorContext, data, result;
 
     return _regenerator.default.wrap(function _callee5$(_context5) {
       while (1) {
         switch (_context5.prev = _context5.next) {
           case 0:
-            type = _ref8.type, source = _ref8.source, connection = _ref8.connection, credentials = _ref8.credentials, geoColumn = _ref8.geoColumn, columns = _ref8.columns, format = _ref8.format, formatTiles = _ref8.formatTiles, clientId = _ref8.clientId, headers = _ref8.headers, aggregationExp = _ref8.aggregationExp, aggregationResLevel = _ref8.aggregationResLevel, queryParameters = _ref8.queryParameters;
+            type = _ref7.type, source = _ref7.source, connection = _ref7.connection, credentials = _ref7.credentials, geoColumn = _ref7.geoColumn, columns = _ref7.columns, format = _ref7.format, formatTiles = _ref7.formatTiles, clientId = _ref7.clientId, headers = _ref7.headers, aggregationExp = _ref7.aggregationExp, aggregationResLevel = _ref7.aggregationResLevel, queryParameters = _ref7.queryParameters;
             _context5.next = 3;
             return _fetchDataUrl({
               type: type,
@@ -392,14 +388,21 @@ function _fetchLayerData() {
             accessToken = _yield$_fetchDataUrl.accessToken;
             mapFormat = _yield$_fetchDataUrl.mapFormat;
             metadata = _yield$_fetchDataUrl.metadata;
-            _context5.next = 10;
+            errorContext = {
+              requestType: _mapsApiCommon.REQUEST_TYPES.DATA,
+              connection: connection,
+              type: type,
+              source: source
+            };
+            _context5.next = 11;
             return requestData({
               url: url,
               format: mapFormat,
-              accessToken: accessToken
+              accessToken: accessToken,
+              errorContext: errorContext
             });
 
-          case 10:
+          case 11:
             data = _context5.sent;
             result = {
               data: data,
@@ -408,7 +411,7 @@ function _fetchLayerData() {
             };
             return _context5.abrupt("return", result);
 
-          case 13:
+          case 14:
           case "end":
             return _context5.stop();
         }
@@ -423,14 +426,14 @@ function _fetchDataUrl(_x6) {
 }
 
 function _fetchDataUrl2() {
-  _fetchDataUrl2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee6(_ref9) {
+  _fetchDataUrl2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee6(_ref8) {
     var type, source, connection, credentials, geoColumn, columns, format, formatTiles, clientId, headers, aggregationExp, aggregationResLevel, queryParameters, defaultCredentials, localCreds, metadata, url, mapFormat, prioritizedFormats, _i, _prioritizedFormats, f, accessToken;
 
     return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
-            type = _ref9.type, source = _ref9.source, connection = _ref9.connection, credentials = _ref9.credentials, geoColumn = _ref9.geoColumn, columns = _ref9.columns, format = _ref9.format, formatTiles = _ref9.formatTiles, clientId = _ref9.clientId, headers = _ref9.headers, aggregationExp = _ref9.aggregationExp, aggregationResLevel = _ref9.aggregationResLevel, queryParameters = _ref9.queryParameters;
+            type = _ref8.type, source = _ref8.source, connection = _ref8.connection, credentials = _ref8.credentials, geoColumn = _ref8.geoColumn, columns = _ref8.columns, format = _ref8.format, formatTiles = _ref8.formatTiles, clientId = _ref8.clientId, headers = _ref8.headers, aggregationExp = _ref8.aggregationExp, aggregationResLevel = _ref8.aggregationResLevel, queryParameters = _ref8.queryParameters;
             defaultCredentials = (0, _config.getDefaultCredentials)();
             localCreds = _objectSpread(_objectSpread({}, defaultCredentials.apiVersion === _mapsApiCommon.API_VERSIONS.V3 && defaultCredentials), credentials);
             checkFetchLayerDataParameters({
@@ -538,7 +541,7 @@ function _fetchMapDataset(_x7, _x8, _x9, _x10, _x11) {
 
 function _fetchMapDataset2() {
   _fetchMapDataset2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee7(dataset, accessToken, credentials, clientId, headers) {
-    var aggregationExp, aggregationResLevel, connection, columns, format, geoColumn, source, type, queryParameters, _yield$_fetchDataUrl2, url, mapFormat, cache;
+    var aggregationExp, aggregationResLevel, connection, columns, format, geoColumn, source, type, queryParameters, _yield$_fetchDataUrl2, url, mapFormat, cache, errorContext;
 
     return _regenerator.default.wrap(function _callee7$(_context7) {
       while (1) {
@@ -578,18 +581,25 @@ function _fetchMapDataset2() {
 
           case 9:
             dataset.cache = cache;
-            _context7.next = 12;
+            errorContext = {
+              requestType: _mapsApiCommon.REQUEST_TYPES.DATA,
+              connection: connection,
+              type: type,
+              source: source
+            };
+            _context7.next = 13;
             return requestData({
               url: url,
               format: mapFormat,
-              accessToken: accessToken
+              accessToken: accessToken,
+              errorContext: errorContext
             });
 
-          case 12:
+          case 13:
             dataset.data = _context7.sent;
             return _context7.abrupt("return", true);
 
-          case 14:
+          case 15:
           case "end":
             return _context7.stop();
         }
@@ -605,7 +615,7 @@ function _fetchTilestats(_x12, _x13, _x14, _x15) {
 
 function _fetchTilestats2() {
   _fetchTilestats2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee8(attribute, dataset, accessToken, credentials) {
-    var connection, source, type, statsUrl, url, stats, attributes, index;
+    var connection, source, type, statsUrl, url, errorContext, stats, attributes, index;
     return _regenerator.default.wrap(function _callee8$(_context8) {
       while (1) {
         switch (_context8.prev = _context8.next) {
@@ -615,19 +625,26 @@ function _fetchTilestats2() {
             url = "".concat(statsUrl, "/").concat(connection, "/");
 
             if (type === _mapsApiCommon.MAP_TYPES.QUERY) {
-              url += "".concat(attribute, "?q=").concat(source);
+              url += "".concat(attribute, "?").concat((0, _mapsApiCommon.encodeParameter)('q', source));
             } else {
               url += "".concat(source, "/").concat(attribute);
             }
 
-            _context8.next = 6;
+            errorContext = {
+              requestType: _mapsApiCommon.REQUEST_TYPES.TILE_STATS,
+              connection: connection,
+              type: type,
+              source: source
+            };
+            _context8.next = 7;
             return requestData({
               url: url,
               format: _mapsApiCommon.FORMATS.JSON,
-              accessToken: accessToken
+              accessToken: accessToken,
+              errorContext: errorContext
             });
 
-          case 6:
+          case 7:
             stats = _context8.sent;
             attributes = dataset.data.tilestats.layers[0].attributes;
             index = attributes.findIndex(function (d) {
@@ -636,7 +653,7 @@ function _fetchTilestats2() {
             attributes[index] = stats;
             return _context8.abrupt("return", true);
 
-          case 11:
+          case 12:
           case "end":
             return _context8.stop();
         }
@@ -651,13 +668,13 @@ function fillInMapDatasets(_x16, _x17, _x18, _x19) {
 }
 
 function _fillInMapDatasets() {
-  _fillInMapDatasets = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee9(_ref10, clientId, credentials, headers) {
+  _fillInMapDatasets = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee9(_ref9, clientId, credentials, headers) {
     var datasets, token, promises;
     return _regenerator.default.wrap(function _callee9$(_context9) {
       while (1) {
         switch (_context9.prev = _context9.next) {
           case 0:
-            datasets = _ref10.datasets, token = _ref10.token;
+            datasets = _ref9.datasets, token = _ref9.token;
             promises = datasets.map(function (dataset) {
               return _fetchMapDataset(dataset, token, credentials, clientId, headers);
             });
@@ -682,14 +699,14 @@ function fillInTileStats(_x20, _x21) {
 }
 
 function _fillInTileStats() {
-  _fillInTileStats = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee10(_ref11, credentials) {
+  _fillInTileStats = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee10(_ref10, credentials) {
     var datasets, keplerMapConfig, token, attributes, layers, _iterator, _step, _loop2, filteredAttributes, _loop, _i2, _attributes, promises;
 
     return _regenerator.default.wrap(function _callee10$(_context10) {
       while (1) {
         switch (_context10.prev = _context10.next) {
           case 0:
-            datasets = _ref11.datasets, keplerMapConfig = _ref11.keplerMapConfig, token = _ref11.token;
+            datasets = _ref10.datasets, keplerMapConfig = _ref10.keplerMapConfig, token = _ref10.token;
             attributes = [];
             layers = keplerMapConfig.config.visState.layers;
             _iterator = _createForOfIteratorHelper(layers);
@@ -733,9 +750,9 @@ function _fillInTileStats() {
             _loop = function _loop() {
               var a = _attributes[_i2];
 
-              if (!filteredAttributes.find(function (_ref13) {
-                var attribute = _ref13.attribute,
-                    dataset = _ref13.dataset;
+              if (!filteredAttributes.find(function (_ref12) {
+                var attribute = _ref12.attribute,
+                    dataset = _ref12.dataset;
                 return attribute === a.attribute && dataset === a.dataset;
               })) {
                 filteredAttributes.push(a);
@@ -746,9 +763,9 @@ function _fillInTileStats() {
               _loop();
             }
 
-            promises = filteredAttributes.map(function (_ref14) {
-              var attribute = _ref14.attribute,
-                  dataset = _ref14.dataset;
+            promises = filteredAttributes.map(function (_ref13) {
+              var attribute = _ref13.attribute,
+                  dataset = _ref13.dataset;
               return _fetchTilestats(attribute, dataset, token, credentials);
             });
             _context10.next = 11;
@@ -772,13 +789,13 @@ function fetchMap(_x22) {
 }
 
 function _fetchMap() {
-  _fetchMap = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee12(_ref12) {
-    var cartoMapId, clientId, credentials, headers, autoRefresh, onNewData, defaultCredentials, localCreds, accessToken, url, map, stopAutoRefresh, intervalId, geojsonLayers, geojsonDatasetIds;
+  _fetchMap = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee12(_ref11) {
+    var cartoMapId, clientId, credentials, headers, autoRefresh, onNewData, defaultCredentials, localCreds, accessToken, url, errorContext, map, stopAutoRefresh, intervalId, geojsonLayers, geojsonDatasetIds;
     return _regenerator.default.wrap(function _callee12$(_context12) {
       while (1) {
         switch (_context12.prev = _context12.next) {
           case 0:
-            cartoMapId = _ref12.cartoMapId, clientId = _ref12.clientId, credentials = _ref12.credentials, headers = _ref12.headers, autoRefresh = _ref12.autoRefresh, onNewData = _ref12.onNewData;
+            cartoMapId = _ref11.cartoMapId, clientId = _ref11.clientId, credentials = _ref11.credentials, headers = _ref11.headers, autoRefresh = _ref11.autoRefresh, onNewData = _ref11.onNewData;
             defaultCredentials = (0, _config.getDefaultCredentials)();
             localCreds = _objectSpread(_objectSpread({}, defaultCredentials.apiVersion === _mapsApiCommon.API_VERSIONS.V3 && defaultCredentials), credentials);
             accessToken = localCreds.accessToken;
@@ -797,14 +814,19 @@ function _fetchMap() {
             }
 
             url = "".concat(localCreds.mapsUrl, "/public/").concat(cartoMapId);
-            _context12.next = 12;
+            errorContext = {
+              requestType: _mapsApiCommon.REQUEST_TYPES.PUBLIC_MAP,
+              mapId: cartoMapId
+            };
+            _context12.next = 13;
             return requestJson({
               url: url,
               headers: headers,
-              accessToken: accessToken
+              accessToken: accessToken,
+              errorContext: errorContext
             });
 
-          case 12:
+          case 13:
             map = _context12.sent;
 
             if (autoRefresh) {
@@ -839,32 +861,42 @@ function _fetchMap() {
               };
             }
 
-            geojsonLayers = map.keplerMapConfig.config.visState.layers.filter(function (_ref16) {
-              var type = _ref16.type;
+            geojsonLayers = map.keplerMapConfig.config.visState.layers.filter(function (_ref15) {
+              var type = _ref15.type;
               return type === 'geojson' || type === 'point';
             });
-            geojsonDatasetIds = geojsonLayers.map(function (_ref17) {
-              var config = _ref17.config;
+            geojsonDatasetIds = geojsonLayers.map(function (_ref16) {
+              var config = _ref16.config;
               return config.dataId;
             });
             map.datasets.forEach(function (dataset) {
               if (geojsonDatasetIds.includes(dataset.id)) {
+                var _geojsonLayers$find = geojsonLayers.find(function (_ref17) {
+                  var config = _ref17.config;
+                  return config.dataId === dataset.id;
+                }),
+                    config = _geojsonLayers$find.config;
+
                 dataset.format = 'geojson';
+
+                if (!dataset.geoColumn && config.columns.geojson) {
+                  dataset.geoColumn = config.columns.geojson;
+                }
               }
             });
-            _context12.next = 19;
+            _context12.next = 20;
             return fillInMapDatasets(map, clientId, localCreds, headers);
 
-          case 19:
-            _context12.next = 21;
+          case 20:
+            _context12.next = 22;
             return fillInTileStats(map, localCreds);
 
-          case 21:
+          case 22:
             return _context12.abrupt("return", _objectSpread(_objectSpread({}, (0, _parseMap.parseMap)(map)), {
               stopAutoRefresh: stopAutoRefresh
             }));
 
-          case 22:
+          case 23:
           case "end":
             return _context12.stop();
         }