@deck.gl/carto 8.10.0-alpha.7 → 9.0.0-alpha.4

package/dist/es5/layers/utils.js

@@ -6,9 +6,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.injectAccessToken = injectAccessToken;
+exports.mergeBoundaryData = mergeBoundaryData;
+exports.TilejsonPropType = void 0;
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _core = require("@deck.gl/core");
+
+var _excluded = ["geoid"];
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 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; }
@@ -26,4 +42,90 @@ function injectAccessToken(loadOptions, accessToken) {
     });
   }
 }
+
+function mergeBoundaryData(geometry, properties) {
+  var mapping = {};
+
+  var _iterator = _createForOfIteratorHelper(properties.properties),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _ref3 = _step.value;
+      var geoid = _ref3.geoid,
+          rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
+
+      if (geoid in mapping) {
+        _core.log.warn("Duplicate geoid key in boundary mapping, using first occurance")();
+      } else {
+        mapping[geoid] = rest;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  for (var _i = 0, _arr = ['points', 'lines', 'polygons']; _i < _arr.length; _i++) {
+    var type = _arr[_i];
+    var geom = geometry[type];
+
+    if (geom.positions.value.length === 0) {
+      continue;
+    }
+
+    geom.properties = geom.properties.map(function (_ref2) {
+      var geoid = _ref2.geoid;
+      return mapping[geoid];
+    });
+    var positions = geom.positions,
+        globalFeatureIds = geom.globalFeatureIds;
+    var indices = null;
+    if (type === 'lines') indices = geom.pathIndices.value;
+    if (type === 'polygons') indices = geom.polygonIndices.value;
+    var length = positions.value.length / positions.size;
+
+    for (var key in properties.numericProps) {
+      var sourceProp = properties.numericProps[key].value;
+      var TypedArray = sourceProp.constructor;
+      var destProp = new TypedArray(length);
+      geom.numericProps[key] = {
+        value: destProp,
+        size: 1
+      };
+
+      if (!indices) {
+        for (var i = 0; i < length; i++) {
+          var featureId = globalFeatureIds.value[i];
+          destProp[i] = sourceProp[featureId];
+        }
+      } else {
+        for (var _i2 = 0; _i2 < indices.length - 1; _i2++) {
+          var startIndex = indices[_i2];
+          var endIndex = indices[_i2 + 1];
+          var _featureId = globalFeatureIds.value[startIndex];
+          destProp.fill(sourceProp[_featureId], startIndex, endIndex);
+        }
+      }
+    }
+  }
+
+  return geometry;
+}
+
+var TilejsonPropType = {
+  type: 'object',
+  value: null,
+  validate: function validate(value, propType) {
+    return propType.optional && value === null || (0, _typeof2.default)(value) === 'object' && Array.isArray(value.tiles) && value.tiles.every(function (url) {
+      return typeof url === 'string';
+    });
+  },
+  equal: function equal(value1, value2) {
+    return (0, _core._deepEqual)(value1, value2, 2);
+  },
+  async: true
+};
+exports.TilejsonPropType = TilejsonPropType;
 //# sourceMappingURL=utils.js.map

package/dist/es5/layers/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/utils.ts"],"names":["injectAccessToken","loadOptions","accessToken","fetch","headers","Authorization"],"mappings":";;;;;;;;;;;;;;;AAGO,SAASA,iBAAT,CAA2BC,WAA3B,EAA6CC,WAA7C,EAAwE;AAAA;;AAC7E,MAAI,EAACD,WAAD,aAACA,WAAD,qCAACA,WAAW,CAAEE,KAAd,wEAAC,mBAAoBC,OAArB,kDAAC,sBAA6BC,aAA9B,CAAJ,EAAiD;AAAA;;AAC/CJ,IAAAA,WAAW,CAACE,KAAZ,mCACKF,WAAW,CAACE,KADjB;AAEEC,MAAAA,OAAO,yDAAMH,WAAW,CAACE,KAAlB,wDAAM,oBAAmBC,OAAzB;AAAkCC,QAAAA,aAAa,mBAAYH,WAAZ;AAA/C;AAFT;AAID;AACF","sourcesContent":["/**\n * Adds access token to Authorization header in loadOptions\n */\nexport function injectAccessToken(loadOptions: any, accessToken: string): void {\n  if (!loadOptions?.fetch?.headers?.Authorization) {\n    loadOptions.fetch = {\n      ...loadOptions.fetch,\n      headers: {...loadOptions.fetch?.headers, Authorization: `Bearer ${accessToken}`}\n    };\n  }\n}\n"],"file":"utils.js"}
+{"version":3,"sources":["../../../src/layers/utils.ts"],"names":["injectAccessToken","loadOptions","accessToken","fetch","headers","Authorization","mergeBoundaryData","geometry","properties","mapping","geoid","rest","log","warn","type","geom","positions","value","length","map","globalFeatureIds","indices","pathIndices","polygonIndices","size","key","numericProps","sourceProp","TypedArray","constructor","destProp","i","featureId","startIndex","endIndex","fill","TilejsonPropType","validate","propType","optional","Array","isArray","tiles","every","url","equal","value1","value2","async"],"mappings":"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","sourcesContent":["import {log} from '@deck.gl/core';\nimport {Tile as PropertiesTile} from './schema/carto-properties-tile';\nimport {Tile as VectorTile} from './schema/carto-tile';\nimport {_deepEqual as deepEqual} from '@deck.gl/core';\nimport type {TilejsonResult} from '../sources/types';\n\n/**\n * Adds access token to Authorization header in loadOptions\n */\nexport function injectAccessToken(loadOptions: any, accessToken: string): void {\n  if (!loadOptions?.fetch?.headers?.Authorization) {\n    loadOptions.fetch = {\n      ...loadOptions.fetch,\n      headers: {...loadOptions.fetch?.headers, Authorization: `Bearer ${accessToken}`}\n    };\n  }\n}\n\nexport function mergeBoundaryData(geometry: VectorTile, properties: PropertiesTile): VectorTile {\n  const mapping = {};\n  for (const {geoid, ...rest} of properties.properties) {\n    if (geoid in mapping) {\n      log.warn(`Duplicate geoid key in boundary mapping, using first occurance`)();\n    } else {\n      mapping[geoid] = rest;\n    }\n  }\n\n  for (const type of ['points', 'lines', 'polygons']) {\n    const geom = geometry[type];\n    if (geom.positions.value.length === 0) {\n      continue;\n    }\n\n    geom.properties = geom.properties.map(({geoid}) => mapping[geoid]);\n\n    // numericProps need to be filled to match length of positions buffer\n    const {positions, globalFeatureIds} = geom;\n    let indices: Uint16Array | Uint32Array | null = null;\n    if (type === 'lines') indices = geom.pathIndices.value;\n    if (type === 'polygons') indices = geom.polygonIndices.value;\n    const length = positions.value.length / positions.size;\n    for (const key in properties.numericProps) {\n      const sourceProp = properties.numericProps[key].value;\n      const TypedArray = sourceProp.constructor as\n        | Float32ArrayConstructor\n        | Float64ArrayConstructor;\n      const destProp = new TypedArray(length);\n      geom.numericProps[key] = {value: destProp, size: 1};\n\n      if (!indices) {\n        for (let i = 0; i < length; i++) {\n          // points\n          const featureId = globalFeatureIds.value[i];\n          destProp[i] = sourceProp[featureId];\n        }\n      } else {\n        // lines|polygons\n        for (let i = 0; i < indices.length - 1; i++) {\n          const startIndex = indices[i];\n          const endIndex = indices[i + 1];\n          const featureId = globalFeatureIds.value[startIndex];\n          destProp.fill(sourceProp[featureId], startIndex, endIndex);\n        }\n      }\n    }\n  }\n\n  return geometry;\n}\n\nexport const TilejsonPropType = {\n  type: 'object' as const,\n  value: null as null | TilejsonResult,\n  validate: (value: TilejsonResult, propType) =>\n    (propType.optional && value === null) ||\n    (typeof value === 'object' &&\n      Array.isArray(value.tiles) &&\n      value.tiles.every(url => typeof url === 'string')),\n  equal: (value1, value2) => {\n    return deepEqual(value1, value2, 2);\n  },\n  async: true\n};\n"],"file":"utils.js"}

package/dist/es5/layers/vector-tile-layer.js

@@ -7,8 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
@@ -23,6 +29,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _core = require("@loaders.gl/core");
 
+var _cartoPropertiesTileLoader = _interopRequireDefault(require("./schema/carto-properties-tile-loader"));
+
 var _cartoVectorTileLoader = _interopRequireDefault(require("./schema/carto-vector-tile-loader"));
 
 var _extensions = require("@deck.gl/extensions");
@@ -33,10 +41,6 @@ var _layers = require("@deck.gl/layers");
 
 var _gis = require("@loaders.gl/gis");
 
-var _mapsApiCommon = require("../api/maps-api-common");
-
-var _common = require("../sources/common");
-
 var _utils = require("./utils");
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
@@ -47,12 +51,11 @@ 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; }
 
-(0, _core.registerLoaders)([_cartoVectorTileLoader.default]);
-var defaultTileFormat = _mapsApiCommon.TILE_FORMATS.BINARY;
+(0, _core.registerLoaders)([_cartoPropertiesTileLoader.default, _cartoVectorTileLoader.default]);
 
 var defaultProps = _objectSpread(_objectSpread({}, _geoLayers.MVTLayer.defaultProps), {}, {
-  data: _common.TilejsonPropType,
-  formatTiles: defaultTileFormat
+  data: _utils.TilejsonPropType,
+  dataComparator: _utils.TilejsonPropType.equal
 });
 
 var VectorTileLayer = function (_MVTLayer) {
@@ -61,17 +64,25 @@ var VectorTileLayer = function (_MVTLayer) {
   var _super = _createSuper(VectorTileLayer);
 
   function VectorTileLayer() {
+    var _this;
+
     (0, _classCallCheck2.default)(this, VectorTileLayer);
-    return _super.apply(this, arguments);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    _this.state = void 0;
+    return _this;
   }
 
   var _proto = VectorTileLayer.prototype;
 
   _proto.initializeState = function initializeState() {
     (0, _get2.default)((0, _getPrototypeOf2.default)(VectorTileLayer.prototype), "initializeState", this).call(this);
-    var binary = this.props.formatTiles === _mapsApiCommon.TILE_FORMATS.BINARY || _mapsApiCommon.TILE_FORMATS.MVT;
     this.setState({
-      binary: binary
+      binary: true
     });
   };
 
@@ -81,7 +92,7 @@ var VectorTileLayer = function (_MVTLayer) {
     if (props.data) {
       (0, _get2.default)((0, _getPrototypeOf2.default)(VectorTileLayer.prototype), "updateState", this).call(this, parameters);
       var formatTiles = new URL(props.data.tiles[0]).searchParams.get('formatTiles');
-      var mvt = formatTiles === _mapsApiCommon.TILE_FORMATS.MVT;
+      var mvt = formatTiles === 'mvt';
       this.setState({
         mvt: mvt
       });
@@ -98,23 +109,97 @@ var VectorTileLayer = function (_MVTLayer) {
     return loadOptions;
   };
 
-  _proto.getTileData = function getTileData(tile) {
-    var url = (0, _geoLayers._getURLFromTemplate)(this.state.data, tile);
-
-    if (!url) {
-      return Promise.reject('Invalid URL');
+  _proto.getTileData = function () {
+    var _getTileData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(tile) {
+      var tileJSON, tiles, properties_tiles, url, loadOptions, fetch, signal, geometryFetch, propertiesUrl, attributesFetch, _yield$Promise$all, _yield$Promise$all2, geometry, attributes;
+
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              tileJSON = this.props.data;
+              tiles = tileJSON.tiles, properties_tiles = tileJSON.properties_tiles;
+              url = (0, _geoLayers._getURLFromTemplate)(tiles, tile);
+
+              if (url) {
+                _context.next = 5;
+                break;
+              }
+
+              return _context.abrupt("return", Promise.reject('Invalid URL'));
+
+            case 5:
+              loadOptions = this.getLoadOptions();
+              fetch = this.props.fetch;
+              signal = tile.signal;
+              geometryFetch = fetch(url, {
+                propName: 'data',
+                layer: this,
+                loadOptions: loadOptions,
+                signal: signal
+              });
+
+              if (properties_tiles) {
+                _context.next = 13;
+                break;
+              }
+
+              _context.next = 12;
+              return geometryFetch;
+
+            case 12:
+              return _context.abrupt("return", _context.sent);
+
+            case 13:
+              propertiesUrl = (0, _geoLayers._getURLFromTemplate)(properties_tiles, tile);
+
+              if (propertiesUrl) {
+                _context.next = 16;
+                break;
+              }
+
+              return _context.abrupt("return", Promise.reject('Invalid properties URL'));
+
+            case 16:
+              attributesFetch = fetch(propertiesUrl, {
+                propName: 'data',
+                layer: this,
+                loadOptions: loadOptions,
+                signal: signal
+              });
+              _context.next = 19;
+              return Promise.all([geometryFetch, attributesFetch]);
+
+            case 19:
+              _yield$Promise$all = _context.sent;
+              _yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 2);
+              geometry = _yield$Promise$all2[0];
+              attributes = _yield$Promise$all2[1];
+
+              if (geometry) {
+                _context.next = 25;
+                break;
+              }
+
+              return _context.abrupt("return", null);
+
+            case 25:
+              return _context.abrupt("return", attributes ? (0, _utils.mergeBoundaryData)(geometry, attributes) : geometry);
+
+            case 26:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, this);
+    }));
+
+    function getTileData(_x) {
+      return _getTileData.apply(this, arguments);
     }
 
-    var loadOptions = this.getLoadOptions();
-    var fetch = this.props.fetch;
-    var signal = tile.signal;
-    return fetch(url, {
-      propName: 'data',
-      layer: this,
-      loadOptions: loadOptions,
-      signal: signal
-    });
-  };
+    return getTileData;
+  }();
 
   _proto.renderSubLayers = function renderSubLayers(props) {
     if (props.data === null) {

package/dist/es5/layers/vector-tile-layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/vector-tile-layer.ts"],"names":["CartoVectorTileLoader","defaultTileFormat","TILE_FORMATS","BINARY","defaultProps","MVTLayer","data","TilejsonPropType","formatTiles","VectorTileLayer","initializeState","binary","props","MVT","setState","updateState","parameters","URL","tiles","searchParams","get","mvt","getLoadOptions","loadOptions","tileJSON","accessToken","gis","format","getTileData","tile","url","state","Promise","reject","fetch","signal","propName","layer","renderSubLayers","tileBbox","bbox","west","south","east","north","subLayerProps","autoHighlight","extensions","ClipExtension","clipBounds","subLayer","GeoJsonLayer","getPickingInfo","params","info","index","sourceLayer","object","globalFeatureId","layerName"],"mappings":"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","sourcesContent":["import {registerLoaders} from '@loaders.gl/core';\nimport CartoVectorTileLoader from './schema/carto-vector-tile-loader';\nregisterLoaders([CartoVectorTileLoader]);\n\nimport {DefaultProps} from '@deck.gl/core';\nimport {ClipExtension} from '@deck.gl/extensions';\nimport {\n  MVTLayer,\n  MVTLayerProps,\n  TileLayer,\n  _getURLFromTemplate,\n  _Tile2DHeader,\n  _TileLoadProps as TileLoadProps\n} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {binaryToGeojson} from '@loaders.gl/gis';\nimport type {BinaryFeatureCollection} from '@loaders.gl/schema';\nimport {TileFormat, TILE_FORMATS} from '../api/maps-api-common';\nimport type {Feature} from 'geojson';\nimport {TilejsonPropType, CartoTilejsonResult} from '../sources/common';\nimport {injectAccessToken} from './utils';\n\nconst defaultTileFormat = TILE_FORMATS.BINARY;\n\nconst defaultProps: DefaultProps<VectorTileLayerProps> = {\n  ...MVTLayer.defaultProps,\n  data: TilejsonPropType,\n  formatTiles: defaultTileFormat\n};\n\n/** All properties supported by VectorTileLayer. */\nexport type VectorTileLayerProps = _VectorTileLayerProps & Omit<MVTLayerProps, 'data'>;\n\n/** Properties added by VectorTileLayer. */\ntype _VectorTileLayerProps = {\n  data: null | CartoTilejsonResult | Promise<CartoTilejsonResult>;\n  /** Use to override the default tile data format.\n   *\n   * Possible values are: `TILE_FORMATS.BINARY`, `TILE_FORMATS.GEOJSON` and `TILE_FORMATS.MVT`.\n   *\n   * Only supported when `apiVersion` is `API_VERSIONS.V3` and `format` is `FORMATS.TILEJSON`.\n   */\n  formatTiles?: TileFormat;\n};\n\n// TODO Perhaps we can't subclass MVTLayer and keep types. Better to subclass TileLayer instead?\n// @ts-ignore\nexport default class VectorTileLayer<ExtraProps extends {} = {}> extends MVTLayer<\n  Required<_VectorTileLayerProps> & ExtraProps\n> {\n  static layerName = 'VectorTileLayer';\n  static defaultProps = defaultProps;\n\n  initializeState(): void {\n    super.initializeState();\n    const binary = this.props.formatTiles === TILE_FORMATS.BINARY || TILE_FORMATS.MVT;\n    this.setState({binary});\n  }\n\n  updateState(parameters) {\n    const {props} = parameters;\n    if (props.data) {\n      super.updateState(parameters);\n\n      const formatTiles = new URL(props.data.tiles[0]).searchParams.get('formatTiles');\n      const mvt = formatTiles === TILE_FORMATS.MVT;\n      this.setState({mvt});\n    }\n  }\n\n  getLoadOptions(): any {\n    const loadOptions = super.getLoadOptions() || {};\n    const tileJSON = this.props.data as CartoTilejsonResult;\n    injectAccessToken(loadOptions, tileJSON.accessToken);\n    loadOptions.gis = {format: 'binary'}; // Use binary for MVT loading\n    return loadOptions;\n  }\n\n  getTileData(tile: TileLoadProps) {\n    const url = _getURLFromTemplate(this.state.data, tile);\n    if (!url) {\n      return Promise.reject('Invalid URL');\n    }\n\n    const loadOptions = this.getLoadOptions();\n    const {fetch} = this.props;\n    const {signal} = tile;\n    return fetch(url, {propName: 'data', layer: this, loadOptions, signal});\n  }\n\n  renderSubLayers(\n    props: TileLayer['props'] & {\n      id: string;\n      data: any;\n      _offset: number;\n      tile: _Tile2DHeader;\n    }\n  ): GeoJsonLayer | null {\n    if (props.data === null) {\n      return null;\n    }\n\n    if (this.state.mvt) {\n      return super.renderSubLayers(props) as GeoJsonLayer;\n    }\n\n    const tileBbox = props.tile.bbox as any;\n    const {west, south, east, north} = tileBbox;\n\n    const subLayerProps = {\n      ...props,\n      autoHighlight: false,\n      extensions: [new ClipExtension(), ...(props.extensions || [])],\n      clipBounds: [west, south, east, north]\n    };\n\n    const subLayer = new GeoJsonLayer(subLayerProps);\n    return subLayer;\n  }\n\n  getPickingInfo(params) {\n    const info = super.getPickingInfo(params);\n\n    if (this.state.binary && info.index !== -1) {\n      const {data} = params.sourceLayer!.props;\n      info.object = binaryToGeojson(data as BinaryFeatureCollection, {\n        globalFeatureId: info.index\n      }) as Feature;\n    }\n\n    return info;\n  }\n}\n"],"file":"vector-tile-layer.js"}
+{"version":3,"sources":["../../../src/layers/vector-tile-layer.ts"],"names":["CartoPropertiesTileLoader","CartoVectorTileLoader","defaultProps","MVTLayer","data","TilejsonPropType","dataComparator","equal","VectorTileLayer","state","initializeState","setState","binary","updateState","parameters","props","formatTiles","URL","tiles","searchParams","get","mvt","getLoadOptions","loadOptions","tileJSON","accessToken","gis","format","getTileData","tile","properties_tiles","url","Promise","reject","fetch","signal","geometryFetch","propName","layer","propertiesUrl","attributesFetch","all","geometry","attributes","renderSubLayers","tileBbox","bbox","west","south","east","north","subLayerProps","autoHighlight","extensions","ClipExtension","clipBounds","subLayer","GeoJsonLayer","getPickingInfo","params","info","index","sourceLayer","object","globalFeatureId","layerName"],"mappings":"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","sourcesContent":["import {registerLoaders} from '@loaders.gl/core';\nimport CartoPropertiesTileLoader from './schema/carto-properties-tile-loader';\nimport CartoVectorTileLoader from './schema/carto-vector-tile-loader';\nregisterLoaders([CartoPropertiesTileLoader, CartoVectorTileLoader]);\n\nimport {DefaultProps} from '@deck.gl/core';\nimport {ClipExtension} from '@deck.gl/extensions';\nimport {\n  MVTLayer,\n  MVTLayerProps,\n  TileLayer,\n  _getURLFromTemplate,\n  _Tile2DHeader,\n  _TileLoadProps as TileLoadProps\n} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {binaryToGeojson} from '@loaders.gl/gis';\nimport type {BinaryFeatureCollection} from '@loaders.gl/schema';\nimport type {Feature} from 'geojson';\n\nimport type {TilejsonResult} from '../sources/types';\nimport {TilejsonPropType, injectAccessToken, mergeBoundaryData} from './utils';\n\nconst defaultProps: DefaultProps<VectorTileLayerProps> = {\n  ...MVTLayer.defaultProps,\n  data: TilejsonPropType,\n  dataComparator: TilejsonPropType.equal\n};\n\n/** All properties supported by VectorTileLayer. */\nexport type VectorTileLayerProps = _VectorTileLayerProps & Omit<MVTLayerProps, 'data'>;\n\n/** Properties added by VectorTileLayer. */\ntype _VectorTileLayerProps = {\n  data: null | TilejsonResult | Promise<TilejsonResult>;\n};\n\n// TODO Perhaps we can't subclass MVTLayer and keep types. Better to subclass TileLayer instead?\n// @ts-ignore\nexport default class VectorTileLayer<ExtraProps extends {} = {}> extends MVTLayer<\n  Required<_VectorTileLayerProps> & ExtraProps\n> {\n  static layerName = 'VectorTileLayer';\n  static defaultProps = defaultProps;\n\n  state!: MVTLayer['state'] & {\n    mvt: boolean;\n  };\n\n  initializeState(): void {\n    super.initializeState();\n    this.setState({binary: true});\n  }\n\n  updateState(parameters) {\n    const {props} = parameters;\n    if (props.data) {\n      super.updateState(parameters);\n\n      const formatTiles = new URL(props.data.tiles[0]).searchParams.get('formatTiles');\n      const mvt = formatTiles === 'mvt';\n      this.setState({mvt});\n    }\n  }\n\n  getLoadOptions(): any {\n    const loadOptions = super.getLoadOptions() || {};\n    const tileJSON = this.props.data as TilejsonResult;\n    injectAccessToken(loadOptions, tileJSON.accessToken);\n    loadOptions.gis = {format: 'binary'}; // Use binary for MVT loading\n    return loadOptions;\n  }\n\n  async getTileData(tile: TileLoadProps) {\n    const tileJSON = this.props.data as TilejsonResult;\n    const {tiles, properties_tiles} = tileJSON;\n    const url = _getURLFromTemplate(tiles, tile);\n    if (!url) {\n      return Promise.reject('Invalid URL');\n    }\n\n    const loadOptions = this.getLoadOptions();\n    const {fetch} = this.props;\n    const {signal} = tile;\n\n    // Fetch geometry and attributes separately\n    const geometryFetch = fetch(url, {propName: 'data', layer: this, loadOptions, signal});\n\n    if (!properties_tiles) {\n      return await geometryFetch;\n    }\n\n    const propertiesUrl = _getURLFromTemplate(properties_tiles, tile);\n    if (!propertiesUrl) {\n      return Promise.reject('Invalid properties URL');\n    }\n\n    const attributesFetch = fetch(propertiesUrl, {\n      propName: 'data',\n      layer: this,\n      loadOptions,\n      signal\n    });\n    const [geometry, attributes] = await Promise.all([geometryFetch, attributesFetch]);\n    if (!geometry) return null;\n\n    return attributes ? mergeBoundaryData(geometry, attributes) : geometry;\n  }\n\n  renderSubLayers(\n    props: TileLayer['props'] & {\n      id: string;\n      data: any;\n      _offset: number;\n      tile: _Tile2DHeader;\n    }\n  ): GeoJsonLayer | null {\n    if (props.data === null) {\n      return null;\n    }\n\n    if (this.state.mvt) {\n      return super.renderSubLayers(props) as GeoJsonLayer;\n    }\n\n    const tileBbox = props.tile.bbox as any;\n    const {west, south, east, north} = tileBbox;\n\n    const subLayerProps = {\n      ...props,\n      autoHighlight: false,\n      extensions: [new ClipExtension(), ...(props.extensions || [])],\n      clipBounds: [west, south, east, north]\n    };\n\n    const subLayer = new GeoJsonLayer(subLayerProps);\n    return subLayer;\n  }\n\n  getPickingInfo(params) {\n    const info = super.getPickingInfo(params);\n\n    if (this.state.binary && info.index !== -1) {\n      const {data} = params.sourceLayer!.props;\n      info.object = binaryToGeojson(data as BinaryFeatureCollection, {\n        globalFeatureId: info.index\n      }) as Feature;\n    }\n\n    return info;\n  }\n}\n"],"file":"vector-tile-layer.js"}

package/dist/es5/sources/base-source.js

@@ -5,38 +5,63 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.cartoBaseSource = cartoBaseSource;
+exports.baseSource = baseSource;
+exports.SOURCE_DEFAULTS = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 
-var _common = require("./common");
+var _common = require("../api/common");
+
+var _endpoints = require("../api/endpoints");
 
-var _utils = require("./utils");
+var _requestWithParameters = require("../api/request-with-parameters");
+
+var _excluded = ["accessToken", "connectionName", "cache"];
 
 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; }
 
-function cartoBaseSource(_x, _x2, _x3) {
-  return _cartoBaseSource.apply(this, arguments);
+var SOURCE_DEFAULTS = {
+  apiBaseUrl: _common.DEFAULT_API_BASE_URL,
+  clientId: _common.DEFAULT_CLIENT,
+  format: 'tilejson',
+  headers: {}
+};
+exports.SOURCE_DEFAULTS = SOURCE_DEFAULTS;
+
+function baseSource(_x, _x2, _x3) {
+  return _baseSource.apply(this, arguments);
 }
 
-function _cartoBaseSource() {
-  _cartoBaseSource = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(endpoint, options, urlParameters) {
-    var mergedOptions, baseUrl, accessToken, format, headers, errorContext, mapInstantiation, dataUrl, tilejson;
+function _baseSource() {
+  _baseSource = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(endpoint, options, urlParameters) {
+    var accessToken, connectionName, cache, optionalOptions, mergedOptions, key, baseUrl, format, headers, errorContext, mapInstantiation, dataUrl;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            mergedOptions = _objectSpread(_objectSpread(_objectSpread({}, _common.SOURCE_DEFAULTS), options), {}, {
+            accessToken = options.accessToken, connectionName = options.connectionName, cache = options.cache, optionalOptions = (0, _objectWithoutProperties2.default)(options, _excluded);
+            mergedOptions = _objectSpread(_objectSpread({}, SOURCE_DEFAULTS), {}, {
+              accessToken: accessToken,
+              connectionName: connectionName,
               endpoint: endpoint
             });
-            baseUrl = (0, _utils.buildApiEndpoint)(mergedOptions);
-            accessToken = mergedOptions.accessToken, format = mergedOptions.format;
+
+            for (key in optionalOptions) {
+              if (optionalOptions[key]) {
+                mergedOptions[key] = optionalOptions[key];
+              }
+            }
+
+            baseUrl = (0, _endpoints.buildSourceUrl)(mergedOptions);
+            format = mergedOptions.format;
             headers = _objectSpread({
               Authorization: "Bearer ".concat(options.accessToken)
             }, options.headers);
@@ -46,55 +71,58 @@ function _cartoBaseSource() {
               type: endpoint,
               source: JSON.stringify(urlParameters, undefined, 2)
             };
-            _context.next = 7;
-            return (0, _utils.requestWithParameters)({
+            _context.next = 9;
+            return (0, _requestWithParameters.requestWithParameters)({
               baseUrl: baseUrl,
               parameters: urlParameters,
               headers: headers,
               errorContext: errorContext
             });
 
-          case 7:
+          case 9:
             mapInstantiation = _context.sent;
             dataUrl = mapInstantiation[format].url[0];
+
+            if (cache) {
+              cache.value = parseInt(new URL(dataUrl).searchParams.get('cache') || '', 10);
+            }
+
             errorContext.requestType = 'Map data';
 
             if (!(format === 'tilejson')) {
-              _context.next = 15;
+              _context.next = 17;
               break;
             }
 
-            _context.next = 13;
-            return (0, _utils.requestWithParameters)({
+            _context.next = 16;
+            return (0, _requestWithParameters.requestWithParameters)({
+              accessToken: accessToken,
               baseUrl: dataUrl,
               headers: headers,
               errorContext: errorContext
             });
 
-          case 13:
-            tilejson = _context.sent;
-            return _context.abrupt("return", _objectSpread(_objectSpread({}, tilejson), {}, {
-              accessToken: accessToken
-            }));
+          case 16:
+            return _context.abrupt("return", _context.sent);
 
-          case 15:
-            _context.next = 17;
-            return (0, _utils.requestWithParameters)({
+          case 17:
+            _context.next = 19;
+            return (0, _requestWithParameters.requestWithParameters)({
               baseUrl: dataUrl,
               headers: headers,
               errorContext: errorContext
             });
 
-          case 17:
+          case 19:
             return _context.abrupt("return", _context.sent);
 
-          case 18:
+          case 20:
           case "end":
             return _context.stop();
         }
       }
     }, _callee);
   }));
-  return _cartoBaseSource.apply(this, arguments);
+  return _baseSource.apply(this, arguments);
 }
 //# sourceMappingURL=base-source.js.map

package/dist/es5/sources/base-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/sources/base-source.ts"],"names":["cartoBaseSource","endpoint","options","urlParameters","mergedOptions","SOURCE_DEFAULTS","baseUrl","accessToken","format","headers","Authorization","errorContext","requestType","connection","connectionName","type","source","JSON","stringify","undefined","parameters","mapInstantiation","dataUrl","url","tilejson"],"mappings":";;;;;;;;;;;;;;;AAEA;;AAUA;;;;;;SAEsBA,e;;;;;+EAAf,iBACLC,QADK,EAELC,OAFK,EAGLC,aAHK;AAAA;AAAA;AAAA;AAAA;AAAA;AAKCC,YAAAA,aALD,iDAKqBC,uBALrB,GAKyCH,OALzC;AAKkDD,cAAAA,QAAQ,EAARA;AALlD;AAMCK,YAAAA,OAND,GAMW,6BAAiBF,aAAjB,CANX;AAOEG,YAAAA,WAPF,GAOyBH,aAPzB,CAOEG,WAPF,EAOeC,MAPf,GAOyBJ,aAPzB,CAOeI,MAPf;AAQCC,YAAAA,OARD;AAQYC,cAAAA,aAAa,mBAAYR,OAAO,CAACK,WAApB;AARzB,eAQ+DL,OAAO,CAACO,OARvE;AAUCE,YAAAA,YAVD,GAUiC;AACpCC,cAAAA,WAAW,EAAE,mBADuB;AAEpCC,cAAAA,UAAU,EAAEX,OAAO,CAACY,cAFgB;AAGpCC,cAAAA,IAAI,EAAEd,QAH8B;AAIpCe,cAAAA,MAAM,EAAEC,IAAI,CAACC,SAAL,CAAef,aAAf,EAA8BgB,SAA9B,EAAyC,CAAzC;AAJ4B,aAVjC;AAAA;AAAA,mBAgB0B,kCAAgD;AAC7Eb,cAAAA,OAAO,EAAPA,OAD6E;AAE7Ec,cAAAA,UAAU,EAAEjB,aAFiE;AAG7EM,cAAAA,OAAO,EAAPA,OAH6E;AAI7EE,cAAAA,YAAY,EAAZA;AAJ6E,aAAhD,CAhB1B;;AAAA;AAgBCU,YAAAA,gBAhBD;AAuBCC,YAAAA,OAvBD,GAuBWD,gBAAgB,CAACb,MAAD,CAAhB,CAAyBe,GAAzB,CAA6B,CAA7B,CAvBX;AAwBLZ,YAAAA,YAAY,CAACC,WAAb,GAA2B,UAA3B;;AAxBK,kBA0BDJ,MAAM,KAAK,UA1BV;AAAA;AAAA;AAAA;;AAAA;AAAA,mBA2BoB,kCAAgC;AACrDF,cAAAA,OAAO,EAAEgB,OAD4C;AAErDb,cAAAA,OAAO,EAAPA,OAFqD;AAGrDE,cAAAA,YAAY,EAAZA;AAHqD,aAAhC,CA3BpB;;AAAA;AA2BGa,YAAAA,QA3BH;AAAA,6EAgCQA,QAhCR;AAgCkBjB,cAAAA,WAAW,EAAXA;AAhClB;;AAAA;AAAA;AAAA,mBAmCQ,kCAAkD;AAC7DD,cAAAA,OAAO,EAAEgB,OADoD;AAE7Db,cAAAA,OAAO,EAAPA,OAF6D;AAG7DE,cAAAA,YAAY,EAAZA;AAH6D,aAAlD,CAnCR;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["import type {MapType} from '../api/maps-api-common';\nimport {APIErrorContext} from '../api/carto-api-error';\nimport {\n  CartoSourceOptionalOptions,\n  CartoSourceRequiredOptions,\n  CartoTilejsonResult,\n  GeojsonResult,\n  JsonResult,\n  SOURCE_DEFAULTS,\n  Tilejson,\n  TilejsonMapInstantiation\n} from './common';\nimport {buildApiEndpoint, requestWithParameters} from './utils';\n\nexport async function cartoBaseSource<UrlParameters extends Record<string, string>>(\n  endpoint: MapType,\n  options: Partial<CartoSourceOptionalOptions> & CartoSourceRequiredOptions,\n  urlParameters: UrlParameters\n): Promise<CartoTilejsonResult | GeojsonResult | JsonResult> {\n  const mergedOptions = {...SOURCE_DEFAULTS, ...options, endpoint};\n  const baseUrl = buildApiEndpoint(mergedOptions);\n  const {accessToken, format} = mergedOptions;\n  const headers = {Authorization: `Bearer ${options.accessToken}`, ...options.headers};\n\n  const errorContext: APIErrorContext = {\n    requestType: 'Map instantiation',\n    connection: options.connectionName,\n    type: endpoint,\n    source: JSON.stringify(urlParameters, undefined, 2)\n  };\n  const mapInstantiation = await requestWithParameters<TilejsonMapInstantiation>({\n    baseUrl,\n    parameters: urlParameters,\n    headers,\n    errorContext\n  });\n\n  const dataUrl = mapInstantiation[format].url[0];\n  errorContext.requestType = 'Map data';\n\n  if (format === 'tilejson') {\n    const tilejson = await requestWithParameters<Tilejson>({\n      baseUrl: dataUrl,\n      headers,\n      errorContext\n    });\n    return {...tilejson, accessToken};\n  }\n\n  return await requestWithParameters<GeojsonResult | JsonResult>({\n    baseUrl: dataUrl,\n    headers,\n    errorContext\n  });\n}\n"],"file":"base-source.js"}
+{"version":3,"sources":["../../../src/sources/base-source.ts"],"names":["SOURCE_DEFAULTS","apiBaseUrl","DEFAULT_API_BASE_URL","clientId","DEFAULT_CLIENT","format","headers","baseSource","endpoint","options","urlParameters","accessToken","connectionName","cache","optionalOptions","mergedOptions","key","baseUrl","Authorization","errorContext","requestType","connection","type","source","JSON","stringify","undefined","parameters","mapInstantiation","dataUrl","url","value","parseInt","URL","searchParams","get"],"mappings":";;;;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;;;;;;;AAYO,IAAMA,eAAsC,GAAG;AACpDC,EAAAA,UAAU,EAAEC,4BADwC;AAEpDC,EAAAA,QAAQ,EAAEC,sBAF0C;AAGpDC,EAAAA,MAAM,EAAE,UAH4C;AAIpDC,EAAAA,OAAO,EAAE;AAJ2C,CAA/C;;;SAOeC,U;;;;;0EAAf,iBACLC,QADK,EAELC,OAFK,EAGLC,aAHK;AAAA;AAAA;AAAA;AAAA;AAAA;AAKEC,YAAAA,WALF,GAK4DF,OAL5D,CAKEE,WALF,EAKeC,cALf,GAK4DH,OAL5D,CAKeG,cALf,EAK+BC,KAL/B,GAK4DJ,OAL5D,CAK+BI,KAL/B,EAKyCC,eALzC,0CAK4DL,OAL5D;AAMCM,YAAAA,aAND,mCAMqBf,eANrB;AAMsCW,cAAAA,WAAW,EAAXA,WANtC;AAMmDC,cAAAA,cAAc,EAAdA,cANnD;AAMmEJ,cAAAA,QAAQ,EAARA;AANnE;;AAOL,iBAAWQ,GAAX,IAAkBF,eAAlB,EAAmC;AACjC,kBAAIA,eAAe,CAACE,GAAD,CAAnB,EAA0B;AACxBD,gBAAAA,aAAa,CAACC,GAAD,CAAb,GAAqBF,eAAe,CAACE,GAAD,CAApC;AACD;AACF;;AACKC,YAAAA,OAZD,GAYW,+BAAeF,aAAf,CAZX;AAaEV,YAAAA,MAbF,GAaYU,aAbZ,CAaEV,MAbF;AAcCC,YAAAA,OAdD;AAcYY,cAAAA,aAAa,mBAAYT,OAAO,CAACE,WAApB;AAdzB,eAc+DF,OAAO,CAACH,OAdvE;AAgBCa,YAAAA,YAhBD,GAgBiC;AACpCC,cAAAA,WAAW,EAAE,mBADuB;AAEpCC,cAAAA,UAAU,EAAEZ,OAAO,CAACG,cAFgB;AAGpCU,cAAAA,IAAI,EAAEd,QAH8B;AAIpCe,cAAAA,MAAM,EAAEC,IAAI,CAACC,SAAL,CAAef,aAAf,EAA8BgB,SAA9B,EAAyC,CAAzC;AAJ4B,aAhBjC;AAAA;AAAA,mBAsB0B,kDAAgD;AAC7ET,cAAAA,OAAO,EAAPA,OAD6E;AAE7EU,cAAAA,UAAU,EAAEjB,aAFiE;AAG7EJ,cAAAA,OAAO,EAAPA,OAH6E;AAI7Ea,cAAAA,YAAY,EAAZA;AAJ6E,aAAhD,CAtB1B;;AAAA;AAsBCS,YAAAA,gBAtBD;AA6BCC,YAAAA,OA7BD,GA6BWD,gBAAgB,CAACvB,MAAD,CAAhB,CAAyByB,GAAzB,CAA6B,CAA7B,CA7BX;;AA8BL,gBAAIjB,KAAJ,EAAW;AACTA,cAAAA,KAAK,CAACkB,KAAN,GAAcC,QAAQ,CAAC,IAAIC,GAAJ,CAAQJ,OAAR,EAAiBK,YAAjB,CAA8BC,GAA9B,CAAkC,OAAlC,KAA8C,EAA/C,EAAmD,EAAnD,CAAtB;AACD;;AACDhB,YAAAA,YAAY,CAACC,WAAb,GAA2B,UAA3B;;AAjCK,kBAmCDf,MAAM,KAAK,UAnCV;AAAA;AAAA;AAAA;;AAAA;AAAA,mBAoCU,kDAAsC;AACjDM,cAAAA,WAAW,EAAXA,WADiD;AAEjDM,cAAAA,OAAO,EAAEY,OAFwC;AAGjDvB,cAAAA,OAAO,EAAPA,OAHiD;AAIjDa,cAAAA,YAAY,EAAZA;AAJiD,aAAtC,CApCV;;AAAA;AAAA;;AAAA;AAAA;AAAA,mBA4CQ,kDAAkD;AAC7DF,cAAAA,OAAO,EAAEY,OADoD;AAE7DvB,cAAAA,OAAO,EAAPA,OAF6D;AAG7Da,cAAAA,YAAY,EAAZA;AAH6D,aAAlD,CA5CR;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G","sourcesContent":["/* eslint-disable camelcase */\nimport {DEFAULT_API_BASE_URL, DEFAULT_CLIENT} from '../api/common';\nimport {buildSourceUrl} from '../api/endpoints';\nimport {requestWithParameters} from '../api/request-with-parameters';\nimport type {APIErrorContext, MapType} from '../api/types';\nimport type {\n  GeojsonResult,\n  JsonResult,\n  SourceOptionalOptions,\n  SourceRequiredOptions,\n  Tilejson,\n  TilejsonMapInstantiation,\n  TilejsonResult\n} from './types';\n\nexport const SOURCE_DEFAULTS: SourceOptionalOptions = {\n  apiBaseUrl: DEFAULT_API_BASE_URL,\n  clientId: DEFAULT_CLIENT,\n  format: 'tilejson',\n  headers: {}\n};\n\nexport async function baseSource<UrlParameters extends Record<string, string>>(\n  endpoint: MapType,\n  options: Partial<SourceOptionalOptions> & SourceRequiredOptions,\n  urlParameters: UrlParameters\n): Promise<TilejsonResult | GeojsonResult | JsonResult> {\n  const {accessToken, connectionName, cache, ...optionalOptions} = options;\n  const mergedOptions = {...SOURCE_DEFAULTS, accessToken, connectionName, endpoint};\n  for (const key in optionalOptions) {\n    if (optionalOptions[key]) {\n      mergedOptions[key] = optionalOptions[key];\n    }\n  }\n  const baseUrl = buildSourceUrl(mergedOptions);\n  const {format} = mergedOptions;\n  const headers = {Authorization: `Bearer ${options.accessToken}`, ...options.headers};\n\n  const errorContext: APIErrorContext = {\n    requestType: 'Map instantiation',\n    connection: options.connectionName,\n    type: endpoint,\n    source: JSON.stringify(urlParameters, undefined, 2)\n  };\n  const mapInstantiation = await requestWithParameters<TilejsonMapInstantiation>({\n    baseUrl,\n    parameters: urlParameters,\n    headers,\n    errorContext\n  });\n\n  const dataUrl = mapInstantiation[format].url[0];\n  if (cache) {\n    cache.value = parseInt(new URL(dataUrl).searchParams.get('cache') || '', 10);\n  }\n  errorContext.requestType = 'Map data';\n\n  if (format === 'tilejson') {\n    return await requestWithParameters<TilejsonResult>({\n      accessToken,\n      baseUrl: dataUrl,\n      headers,\n      errorContext\n    });\n  }\n\n  return await requestWithParameters<GeojsonResult | JsonResult>({\n    baseUrl: dataUrl,\n    headers,\n    errorContext\n  });\n}\n"],"file":"base-source.js"}

package/dist/es5/sources/boundary-query-source.js

@@ -0,0 +1,51 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.boundaryQuerySource = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _baseSource = require("./base-source");
+
+var boundaryQuerySource = function () {
+  var _ref = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(options) {
+    var boundaryId, _options$matchingColu, matchingColumn, sqlQuery, queryParameters, urlParameters;
+
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            boundaryId = options.boundaryId, _options$matchingColu = options.matchingColumn, matchingColumn = _options$matchingColu === void 0 ? 'id' : _options$matchingColu, sqlQuery = options.sqlQuery, queryParameters = options.queryParameters;
+            urlParameters = {
+              boundaryId: boundaryId,
+              matchingColumn: matchingColumn,
+              sqlQuery: sqlQuery
+            };
+
+            if (queryParameters) {
+              urlParameters.queryParameters = JSON.stringify(queryParameters);
+            }
+
+            return _context.abrupt("return", (0, _baseSource.baseSource)('boundary', options, urlParameters));
+
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function boundaryQuerySource(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+exports.boundaryQuerySource = boundaryQuerySource;
+//# sourceMappingURL=boundary-query-source.js.map

package/dist/es5/sources/boundary-query-source.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/sources/boundary-query-source.ts"],"names":["boundaryQuerySource","options","boundaryId","matchingColumn","sqlQuery","queryParameters","urlParameters","JSON","stringify"],"mappings":";;;;;;;;;;;;;AACA;;AAgBO,IAAMA,mBAAmB;AAAA,uEAAG,iBACjCC,OADiC;AAAA;;AAAA;AAAA;AAAA;AAAA;AAG1BC,YAAAA,UAH0B,GAGsCD,OAHtC,CAG1BC,UAH0B,0BAGsCD,OAHtC,CAGdE,cAHc,EAGdA,cAHc,sCAGG,IAHH,0BAGSC,QAHT,GAGsCH,OAHtC,CAGSG,QAHT,EAGmBC,eAHnB,GAGsCJ,OAHtC,CAGmBI,eAHnB;AAI3BC,YAAAA,aAJ2B,GAII;AACnCJ,cAAAA,UAAU,EAAVA,UADmC;AAEnCC,cAAAA,cAAc,EAAdA,cAFmC;AAGnCC,cAAAA,QAAQ,EAARA;AAHmC,aAJJ;;AASjC,gBAAIC,eAAJ,EAAqB;AACnBC,cAAAA,aAAa,CAACD,eAAd,GAAgCE,IAAI,CAACC,SAAL,CAAeH,eAAf,CAAhC;AACD;;AAXgC,6CAY1B,4BAA0B,UAA1B,EAAsCJ,OAAtC,EAA+CK,aAA/C,CAZ0B;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,GAAH;;AAAA,kBAAnBN,mBAAmB;AAAA;AAAA;AAAA,GAAzB","sourcesContent":["import {QueryParameters} from '../api';\nimport {baseSource} from './base-source';\nimport type {SourceOptions, TilejsonResult} from './types';\n\nexport type BoundaryQuerySourceOptions = SourceOptions & {\n  boundaryId: string;\n  matchingColumn?: string;\n  sqlQuery: string;\n  queryParameters?: QueryParameters;\n};\ntype UrlParameters = {\n  boundaryId: string;\n  matchingColumn: string;\n  sqlQuery: string;\n  queryParameters?: string;\n};\n\nexport const boundaryQuerySource = async function (\n  options: BoundaryQuerySourceOptions\n): Promise<TilejsonResult> {\n  const {boundaryId, matchingColumn = 'id', sqlQuery, queryParameters} = options;\n  const urlParameters: UrlParameters = {\n    boundaryId,\n    matchingColumn,\n    sqlQuery\n  };\n  if (queryParameters) {\n    urlParameters.queryParameters = JSON.stringify(queryParameters);\n  }\n  return baseSource<UrlParameters>('boundary', options, urlParameters) as Promise<TilejsonResult>;\n};\n"],"file":"boundary-query-source.js"}