@deck.gl/carto 8.10.0-alpha.6 → 9.0.0-alpha.3

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

@@ -1,24 +1,26 @@
 import { registerLoaders } from '@loaders.gl/core';
+import CartoPropertiesTileLoader from './schema/carto-properties-tile-loader';
 import CartoVectorTileLoader from './schema/carto-vector-tile-loader';
-registerLoaders([CartoVectorTileLoader]);
+registerLoaders([CartoPropertiesTileLoader, CartoVectorTileLoader]);
 import { ClipExtension } from '@deck.gl/extensions';
 import { MVTLayer, _getURLFromTemplate } from '@deck.gl/geo-layers';
 import { GeoJsonLayer } from '@deck.gl/layers';
 import { binaryToGeojson } from '@loaders.gl/gis';
-import { TILE_FORMATS } from '../api/maps-api-common';
-import { TilejsonPropType } from '../sources/common';
-import { injectAccessToken } from './utils';
-const defaultTileFormat = TILE_FORMATS.BINARY;
+import { TilejsonPropType, injectAccessToken, mergeBoundaryData } from './utils';
 const defaultProps = { ...MVTLayer.defaultProps,
   data: TilejsonPropType,
-  formatTiles: defaultTileFormat
+  dataComparator: TilejsonPropType.equal
 };
 export default class VectorTileLayer extends MVTLayer {
+  constructor(...args) {
+    super(...args);
+    this.state = void 0;
+  }
+
   initializeState() {
     super.initializeState();
-    const binary = this.props.formatTiles === TILE_FORMATS.BINARY || TILE_FORMATS.MVT;
     this.setState({
-      binary
+      binary: true
     });
   }
 
@@ -30,7 +32,7 @@ export default class VectorTileLayer extends MVTLayer {
     if (props.data) {
       super.updateState(parameters);
       const formatTiles = new URL(props.data.tiles[0]).searchParams.get('formatTiles');
-      const mvt = formatTiles === TILE_FORMATS.MVT;
+      const mvt = formatTiles === 'mvt';
       this.setState({
         mvt
       });
@@ -47,8 +49,14 @@ export default class VectorTileLayer extends MVTLayer {
     return loadOptions;
   }
 
-  getTileData(tile) {
-    const url = _getURLFromTemplate(this.state.data, tile);
+  async getTileData(tile) {
+    const tileJSON = this.props.data;
+    const {
+      tiles,
+      properties_tiles
+    } = tileJSON;
+
+    const url = _getURLFromTemplate(tiles, tile);
 
     if (!url) {
       return Promise.reject('Invalid URL');
@@ -61,12 +69,32 @@ export default class VectorTileLayer extends MVTLayer {
     const {
       signal
     } = tile;
-    return fetch(url, {
+    const geometryFetch = fetch(url, {
+      propName: 'data',
+      layer: this,
+      loadOptions,
+      signal
+    });
+
+    if (!properties_tiles) {
+      return await geometryFetch;
+    }
+
+    const propertiesUrl = _getURLFromTemplate(properties_tiles, tile);
+
+    if (!propertiesUrl) {
+      return Promise.reject('Invalid properties URL');
+    }
+
+    const attributesFetch = fetch(propertiesUrl, {
       propName: 'data',
       layer: this,
       loadOptions,
       signal
     });
+    const [geometry, attributes] = await Promise.all([geometryFetch, attributesFetch]);
+    if (!geometry) return null;
+    return mergeBoundaryData(geometry, attributes);
   }
 
   renderSubLayers(props) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/vector-tile-layer.ts"],"names":["registerLoaders","CartoVectorTileLoader","ClipExtension","MVTLayer","_getURLFromTemplate","GeoJsonLayer","binaryToGeojson","TILE_FORMATS","TilejsonPropType","injectAccessToken","defaultTileFormat","BINARY","defaultProps","data","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","clipBounds","subLayer","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 {BinaryFeatures} 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 BinaryFeatures, {\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":["registerLoaders","CartoPropertiesTileLoader","CartoVectorTileLoader","ClipExtension","MVTLayer","_getURLFromTemplate","GeoJsonLayer","binaryToGeojson","TilejsonPropType","injectAccessToken","mergeBoundaryData","defaultProps","data","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","geometry","attributes","all","renderSubLayers","tileBbox","bbox","west","south","east","north","subLayerProps","autoHighlight","extensions","clipBounds","subLayer","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 mergeBoundaryData(geometry, attributes);\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/esm/sources/base-source.js

@@ -1,13 +1,33 @@
-import { SOURCE_DEFAULTS } from './common';
-import { buildApiEndpoint, requestWithParameters } from './utils';
-export async function cartoBaseSource(endpoint, options, urlParameters) {
+import { DEFAULT_API_BASE_URL, DEFAULT_CLIENT } from '../api/common';
+import { buildSourceUrl } from '../api/endpoints';
+import { requestWithParameters } from '../api/request-with-parameters';
+export const SOURCE_DEFAULTS = {
+  apiBaseUrl: DEFAULT_API_BASE_URL,
+  clientId: DEFAULT_CLIENT,
+  format: 'tilejson',
+  headers: {}
+};
+export async function baseSource(endpoint, options, urlParameters) {
+  const {
+    accessToken,
+    connectionName,
+    cache,
+    ...optionalOptions
+  } = options;
   const mergedOptions = { ...SOURCE_DEFAULTS,
-    ...options,
+    accessToken,
+    connectionName,
     endpoint
   };
-  const baseUrl = buildApiEndpoint(mergedOptions);
+
+  for (const key in optionalOptions) {
+    if (optionalOptions[key]) {
+      mergedOptions[key] = optionalOptions[key];
+    }
+  }
+
+  const baseUrl = buildSourceUrl(mergedOptions);
   const {
-    accessToken,
     format
   } = mergedOptions;
   const headers = {
@@ -27,17 +47,20 @@ export async function cartoBaseSource(endpoint, options, urlParameters) {
     errorContext
   });
   const dataUrl = mapInstantiation[format].url[0];
+
+  if (cache) {
+    cache.value = parseInt(new URL(dataUrl).searchParams.get('cache') || '', 10);
+  }
+
   errorContext.requestType = 'Map data';
 
   if (format === 'tilejson') {
-    const tilejson = await requestWithParameters({
+    return await requestWithParameters({
+      accessToken,
       baseUrl: dataUrl,
       headers,
       errorContext
     });
-    return { ...tilejson,
-      accessToken
-    };
   }
 
   return await requestWithParameters({

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/sources/base-source.ts"],"names":["SOURCE_DEFAULTS","buildApiEndpoint","requestWithParameters","cartoBaseSource","endpoint","options","urlParameters","mergedOptions","baseUrl","accessToken","format","headers","Authorization","errorContext","requestType","connection","connectionName","type","source","JSON","stringify","undefined","mapInstantiation","parameters","dataUrl","url","tilejson"],"mappings":"AAEA,SAMEA,eANF,QASO,UATP;AAUA,SAAQC,gBAAR,EAA0BC,qBAA1B,QAAsD,SAAtD;AAEA,OAAO,eAAeC,eAAf,CACLC,QADK,EAELC,OAFK,EAGLC,aAHK,EAIsD;AAC3D,QAAMC,aAAa,GAAG,EAAC,GAAGP,eAAJ;AAAqB,OAAGK,OAAxB;AAAiCD,IAAAA;AAAjC,GAAtB;AACA,QAAMI,OAAO,GAAGP,gBAAgB,CAACM,aAAD,CAAhC;AACA,QAAM;AAACE,IAAAA,WAAD;AAAcC,IAAAA;AAAd,MAAwBH,aAA9B;AACA,QAAMI,OAAO,GAAG;AAACC,IAAAA,aAAa,EAAG,UAASP,OAAO,CAACI,WAAY,EAA9C;AAAiD,OAAGJ,OAAO,CAACM;AAA5D,GAAhB;AAEA,QAAME,YAA6B,GAAG;AACpCC,IAAAA,WAAW,EAAE,mBADuB;AAEpCC,IAAAA,UAAU,EAAEV,OAAO,CAACW,cAFgB;AAGpCC,IAAAA,IAAI,EAAEb,QAH8B;AAIpCc,IAAAA,MAAM,EAAEC,IAAI,CAACC,SAAL,CAAed,aAAf,EAA8Be,SAA9B,EAAyC,CAAzC;AAJ4B,GAAtC;AAMA,QAAMC,gBAAgB,GAAG,MAAMpB,qBAAqB,CAA2B;AAC7EM,IAAAA,OAD6E;AAE7Ee,IAAAA,UAAU,EAAEjB,aAFiE;AAG7EK,IAAAA,OAH6E;AAI7EE,IAAAA;AAJ6E,GAA3B,CAApD;AAOA,QAAMW,OAAO,GAAGF,gBAAgB,CAACZ,MAAD,CAAhB,CAAyBe,GAAzB,CAA6B,CAA7B,CAAhB;AACAZ,EAAAA,YAAY,CAACC,WAAb,GAA2B,UAA3B;;AAEA,MAAIJ,MAAM,KAAK,UAAf,EAA2B;AACzB,UAAMgB,QAAQ,GAAG,MAAMxB,qBAAqB,CAAW;AACrDM,MAAAA,OAAO,EAAEgB,OAD4C;AAErDb,MAAAA,OAFqD;AAGrDE,MAAAA;AAHqD,KAAX,CAA5C;AAKA,WAAO,EAAC,GAAGa,QAAJ;AAAcjB,MAAAA;AAAd,KAAP;AACD;;AAED,SAAO,MAAMP,qBAAqB,CAA6B;AAC7DM,IAAAA,OAAO,EAAEgB,OADoD;AAE7Db,IAAAA,OAF6D;AAG7DE,IAAAA;AAH6D,GAA7B,CAAlC;AAKD","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":["DEFAULT_API_BASE_URL","DEFAULT_CLIENT","buildSourceUrl","requestWithParameters","SOURCE_DEFAULTS","apiBaseUrl","clientId","format","headers","baseSource","endpoint","options","urlParameters","accessToken","connectionName","cache","optionalOptions","mergedOptions","key","baseUrl","Authorization","errorContext","requestType","connection","type","source","JSON","stringify","undefined","mapInstantiation","parameters","dataUrl","url","value","parseInt","URL","searchParams","get"],"mappings":"AACA,SAAQA,oBAAR,EAA8BC,cAA9B,QAAmD,eAAnD;AACA,SAAQC,cAAR,QAA6B,kBAA7B;AACA,SAAQC,qBAAR,QAAoC,gCAApC;AAYA,OAAO,MAAMC,eAAsC,GAAG;AACpDC,EAAAA,UAAU,EAAEL,oBADwC;AAEpDM,EAAAA,QAAQ,EAAEL,cAF0C;AAGpDM,EAAAA,MAAM,EAAE,UAH4C;AAIpDC,EAAAA,OAAO,EAAE;AAJ2C,CAA/C;AAOP,OAAO,eAAeC,UAAf,CACLC,QADK,EAELC,OAFK,EAGLC,aAHK,EAIiD;AACtD,QAAM;AAACC,IAAAA,WAAD;AAAcC,IAAAA,cAAd;AAA8BC,IAAAA,KAA9B;AAAqC,OAAGC;AAAxC,MAA2DL,OAAjE;AACA,QAAMM,aAAa,GAAG,EAAC,GAAGb,eAAJ;AAAqBS,IAAAA,WAArB;AAAkCC,IAAAA,cAAlC;AAAkDJ,IAAAA;AAAlD,GAAtB;;AACA,OAAK,MAAMQ,GAAX,IAAkBF,eAAlB,EAAmC;AACjC,QAAIA,eAAe,CAACE,GAAD,CAAnB,EAA0B;AACxBD,MAAAA,aAAa,CAACC,GAAD,CAAb,GAAqBF,eAAe,CAACE,GAAD,CAApC;AACD;AACF;;AACD,QAAMC,OAAO,GAAGjB,cAAc,CAACe,aAAD,CAA9B;AACA,QAAM;AAACV,IAAAA;AAAD,MAAWU,aAAjB;AACA,QAAMT,OAAO,GAAG;AAACY,IAAAA,aAAa,EAAG,UAAST,OAAO,CAACE,WAAY,EAA9C;AAAiD,OAAGF,OAAO,CAACH;AAA5D,GAAhB;AAEA,QAAMa,YAA6B,GAAG;AACpCC,IAAAA,WAAW,EAAE,mBADuB;AAEpCC,IAAAA,UAAU,EAAEZ,OAAO,CAACG,cAFgB;AAGpCU,IAAAA,IAAI,EAAEd,QAH8B;AAIpCe,IAAAA,MAAM,EAAEC,IAAI,CAACC,SAAL,CAAef,aAAf,EAA8BgB,SAA9B,EAAyC,CAAzC;AAJ4B,GAAtC;AAMA,QAAMC,gBAAgB,GAAG,MAAM1B,qBAAqB,CAA2B;AAC7EgB,IAAAA,OAD6E;AAE7EW,IAAAA,UAAU,EAAElB,aAFiE;AAG7EJ,IAAAA,OAH6E;AAI7Ea,IAAAA;AAJ6E,GAA3B,CAApD;AAOA,QAAMU,OAAO,GAAGF,gBAAgB,CAACtB,MAAD,CAAhB,CAAyByB,GAAzB,CAA6B,CAA7B,CAAhB;;AACA,MAAIjB,KAAJ,EAAW;AACTA,IAAAA,KAAK,CAACkB,KAAN,GAAcC,QAAQ,CAAC,IAAIC,GAAJ,CAAQJ,OAAR,EAAiBK,YAAjB,CAA8BC,GAA9B,CAAkC,OAAlC,KAA8C,EAA/C,EAAmD,EAAnD,CAAtB;AACD;;AACDhB,EAAAA,YAAY,CAACC,WAAb,GAA2B,UAA3B;;AAEA,MAAIf,MAAM,KAAK,UAAf,EAA2B;AACzB,WAAO,MAAMJ,qBAAqB,CAAiB;AACjDU,MAAAA,WADiD;AAEjDM,MAAAA,OAAO,EAAEY,OAFwC;AAGjDvB,MAAAA,OAHiD;AAIjDa,MAAAA;AAJiD,KAAjB,CAAlC;AAMD;;AAED,SAAO,MAAMlB,qBAAqB,CAA6B;AAC7DgB,IAAAA,OAAO,EAAEY,OADoD;AAE7DvB,IAAAA,OAF6D;AAG7Da,IAAAA;AAH6D,GAA7B,CAAlC;AAKD","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/esm/sources/boundary-query-source.js

@@ -0,0 +1,21 @@
+import { baseSource } from './base-source';
+export const boundaryQuerySource = async function (options) {
+  const {
+    boundaryId,
+    matchingColumn = 'id',
+    sqlQuery,
+    queryParameters
+  } = options;
+  const urlParameters = {
+    boundaryId,
+    matchingColumn,
+    sqlQuery
+  };
+
+  if (queryParameters) {
+    urlParameters.queryParameters = JSON.stringify(queryParameters);
+  }
+
+  return baseSource('boundary', options, urlParameters);
+};
+//# sourceMappingURL=boundary-query-source.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/sources/boundary-query-source.ts"],"names":["baseSource","boundaryQuerySource","options","boundaryId","matchingColumn","sqlQuery","queryParameters","urlParameters","JSON","stringify"],"mappings":"AACA,SAAQA,UAAR,QAAyB,eAAzB;AAgBA,OAAO,MAAMC,mBAAmB,GAAG,gBACjCC,OADiC,EAER;AACzB,QAAM;AAACC,IAAAA,UAAD;AAAaC,IAAAA,cAAc,GAAG,IAA9B;AAAoCC,IAAAA,QAApC;AAA8CC,IAAAA;AAA9C,MAAiEJ,OAAvE;AACA,QAAMK,aAA4B,GAAG;AACnCJ,IAAAA,UADmC;AAEnCC,IAAAA,cAFmC;AAGnCC,IAAAA;AAHmC,GAArC;;AAKA,MAAIC,eAAJ,EAAqB;AACnBC,IAAAA,aAAa,CAACD,eAAd,GAAgCE,IAAI,CAACC,SAAL,CAAeH,eAAf,CAAhC;AACD;;AACD,SAAON,UAAU,CAAgB,UAAhB,EAA4BE,OAA5B,EAAqCK,aAArC,CAAjB;AACD,CAbM","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"}

package/dist/esm/sources/boundary-table-source.js

@@ -0,0 +1,21 @@
+import { baseSource } from './base-source';
+export const boundaryTableSource = async function (options) {
+  const {
+    boundaryId,
+    columns,
+    matchingColumn = 'id',
+    tableName
+  } = options;
+  const urlParameters = {
+    boundaryId,
+    matchingColumn,
+    tableName
+  };
+
+  if (columns) {
+    urlParameters.columns = columns.join(',');
+  }
+
+  return baseSource('boundary', options, urlParameters);
+};
+//# sourceMappingURL=boundary-table-source.js.map

package/dist/esm/sources/boundary-table-source.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/sources/boundary-table-source.ts"],"names":["baseSource","boundaryTableSource","options","boundaryId","columns","matchingColumn","tableName","urlParameters","join"],"mappings":"AAAA,SAAQA,UAAR,QAAyB,eAAzB;AAgBA,OAAO,MAAMC,mBAAmB,GAAG,gBACjCC,OADiC,EAER;AACzB,QAAM;AAACC,IAAAA,UAAD;AAAaC,IAAAA,OAAb;AAAsBC,IAAAA,cAAc,GAAG,IAAvC;AAA6CC,IAAAA;AAA7C,MAA0DJ,OAAhE;AACA,QAAMK,aAA4B,GAAG;AACnCJ,IAAAA,UADmC;AAEnCE,IAAAA,cAFmC;AAGnCC,IAAAA;AAHmC,GAArC;;AAMA,MAAIF,OAAJ,EAAa;AACXG,IAAAA,aAAa,CAACH,OAAd,GAAwBA,OAAO,CAACI,IAAR,CAAa,GAAb,CAAxB;AACD;;AACD,SAAOR,UAAU,CAAgB,UAAhB,EAA4BE,OAA5B,EAAqCK,aAArC,CAAjB;AACD,CAdM","sourcesContent":["import {baseSource} from './base-source';\nimport type {SourceOptions, TilejsonResult} from './types';\n\nexport type BoundaryTableSourceOptions = SourceOptions & {\n  boundaryId: string;\n  columns?: string[];\n  matchingColumn?: string;\n  tableName: string;\n};\ntype UrlParameters = {\n  boundaryId: string;\n  columns?: string;\n  matchingColumn: string;\n  tableName: string;\n};\n\nexport const boundaryTableSource = async function (\n  options: BoundaryTableSourceOptions\n): Promise<TilejsonResult> {\n  const {boundaryId, columns, matchingColumn = 'id', tableName} = options;\n  const urlParameters: UrlParameters = {\n    boundaryId,\n    matchingColumn,\n    tableName\n  };\n\n  if (columns) {\n    urlParameters.columns = columns.join(',');\n  }\n  return baseSource<UrlParameters>('boundary', options, urlParameters) as Promise<TilejsonResult>;\n};\n"],"file":"boundary-table-source.js"}

package/dist/esm/sources/boundary-tileset-source.js

@@ -0,0 +1,11 @@
+import { baseSource } from './base-source';
+export const boundaryTilesetSource = async function (options) {
+  const {
+    boundaryId
+  } = options;
+  const urlParameters = {
+    boundaryId
+  };
+  return baseSource('boundary', options, urlParameters);
+};
+//# sourceMappingURL=boundary-tileset-source.js.map

package/dist/esm/sources/boundary-tileset-source.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/sources/boundary-tileset-source.ts"],"names":["baseSource","boundaryTilesetSource","options","boundaryId","urlParameters"],"mappings":"AAAA,SAAQA,UAAR,QAAyB,eAAzB;AAMA,OAAO,MAAMC,qBAAqB,GAAG,gBACnCC,OADmC,EAEV;AACzB,QAAM;AAACC,IAAAA;AAAD,MAAeD,OAArB;AACA,QAAME,aAA4B,GAAG;AAACD,IAAAA;AAAD,GAArC;AAEA,SAAOH,UAAU,CAAgB,UAAhB,EAA4BE,OAA5B,EAAqCE,aAArC,CAAjB;AACD,CAPM","sourcesContent":["import {baseSource} from './base-source';\nimport type {SourceOptions, TilejsonResult} from './types';\n\nexport type BoundaryTilesetSourceOptions = SourceOptions & {boundaryId: string};\ntype UrlParameters = {boundaryId: string};\n\nexport const boundaryTilesetSource = async function (\n  options: BoundaryTilesetSourceOptions\n): Promise<TilejsonResult> {\n  const {boundaryId} = options;\n  const urlParameters: UrlParameters = {boundaryId};\n\n  return baseSource<UrlParameters>('boundary', options, urlParameters) as Promise<TilejsonResult>;\n};\n"],"file":"boundary-tileset-source.js"}

package/dist/esm/sources/h3-query-source.js

@@ -1,15 +1,16 @@
-import { cartoBaseSource } from './base-source';
-
-const cartoH3QuerySource = async function (options) {
+import { baseSource } from './base-source';
+export const h3QuerySource = async function (options) {
   const {
     aggregationExp,
     aggregationResLevel = 4,
     sqlQuery,
-    spatialDataColumn = 'h3:h3',
+    spatialDataColumn = 'h3',
     queryParameters
   } = options;
   const urlParameters = {
     aggregationExp,
+    spatialDataColumn,
+    spatialDataType: 'h3',
     q: sqlQuery
   };
 
@@ -17,16 +18,10 @@ const cartoH3QuerySource = async function (options) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
 
-  if (spatialDataColumn) {
-    urlParameters.geo_column = spatialDataColumn;
-  }
-
   if (queryParameters) {
     urlParameters.queryParameters = JSON.stringify(queryParameters);
   }
 
-  return cartoBaseSource('query', options, urlParameters);
+  return baseSource('query', options, urlParameters);
 };
-
-export { cartoH3QuerySource };
 //# sourceMappingURL=h3-query-source.js.map

package/dist/esm/sources/h3-query-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/sources/h3-query-source.ts"],"names":["cartoBaseSource","cartoH3QuerySource","options","aggregationExp","aggregationResLevel","sqlQuery","spatialDataColumn","queryParameters","urlParameters","q","String","geo_column","JSON","stringify"],"mappings":"AACA,SAAQA,eAAR,QAA8B,eAA9B;;AAmBA,MAAMC,kBAA6D,GAAG,gBACpEC,OADoE,EAEtD;AACd,QAAM;AACJC,IAAAA,cADI;AAEJC,IAAAA,mBAAmB,GAAG,CAFlB;AAGJC,IAAAA,QAHI;AAIJC,IAAAA,iBAAiB,GAAG,OAJhB;AAKJC,IAAAA;AALI,MAMFL,OANJ;AAOA,QAAMM,aAA4B,GAAG;AAACL,IAAAA,cAAD;AAAiBM,IAAAA,CAAC,EAAEJ;AAApB,GAArC;;AAEA,MAAID,mBAAJ,EAAyB;AACvBI,IAAAA,aAAa,CAACJ,mBAAd,GAAoCM,MAAM,CAACN,mBAAD,CAA1C;AACD;;AACD,MAAIE,iBAAJ,EAAuB;AACrBE,IAAAA,aAAa,CAACG,UAAd,GAA2BL,iBAA3B;AACD;;AACD,MAAIC,eAAJ,EAAqB;AACnBC,IAAAA,aAAa,CAACD,eAAd,GAAgCK,IAAI,CAACC,SAAL,CAAeN,eAAf,CAAhC;AACD;;AACD,SAAOP,eAAe,CAAgB,OAAhB,EAAyBE,OAAzB,EAAkCM,aAAlC,CAAtB;AACD,CAtBD;;AAwBA,SAAQP,kBAAR","sourcesContent":["/* eslint-disable camelcase */\nimport {cartoBaseSource} from './base-source';\nimport {\n  CartoAggregationOptions,\n  CartoQuerySourceOptions,\n  CartoSourceOptions,\n  TilejsonSource\n} from './common';\n\nexport type CartoH3QuerySourceOptions = CartoSourceOptions &\n  CartoQuerySourceOptions &\n  CartoAggregationOptions;\ntype UrlParameters = {\n  aggregationExp: string;\n  aggregationResLevel?: string;\n  geo_column?: string;\n  q: string;\n  queryParameters?: string;\n};\n\nconst cartoH3QuerySource: TilejsonSource<CartoH3QuerySourceOptions> = async function (\n  options: CartoH3QuerySourceOptions\n): Promise<any> {\n  const {\n    aggregationExp,\n    aggregationResLevel = 4,\n    sqlQuery,\n    spatialDataColumn = 'h3:h3',\n    queryParameters\n  } = options;\n  const urlParameters: UrlParameters = {aggregationExp, q: sqlQuery};\n\n  if (aggregationResLevel) {\n    urlParameters.aggregationResLevel = String(aggregationResLevel);\n  }\n  if (spatialDataColumn) {\n    urlParameters.geo_column = spatialDataColumn;\n  }\n  if (queryParameters) {\n    urlParameters.queryParameters = JSON.stringify(queryParameters);\n  }\n  return cartoBaseSource<UrlParameters>('query', options, urlParameters);\n};\n\nexport {cartoH3QuerySource};\n"],"file":"h3-query-source.js"}
+{"version":3,"sources":["../../../src/sources/h3-query-source.ts"],"names":["baseSource","h3QuerySource","options","aggregationExp","aggregationResLevel","sqlQuery","spatialDataColumn","queryParameters","urlParameters","spatialDataType","q","String","JSON","stringify"],"mappings":"AACA,SAAQA,UAAR,QAAyB,eAAzB;AAmBA,OAAO,MAAMC,aAAa,GAAG,gBAC3BC,OAD2B,EAEF;AACzB,QAAM;AACJC,IAAAA,cADI;AAEJC,IAAAA,mBAAmB,GAAG,CAFlB;AAGJC,IAAAA,QAHI;AAIJC,IAAAA,iBAAiB,GAAG,IAJhB;AAKJC,IAAAA;AALI,MAMFL,OANJ;AAOA,QAAMM,aAA4B,GAAG;AACnCL,IAAAA,cADmC;AAEnCG,IAAAA,iBAFmC;AAGnCG,IAAAA,eAAe,EAAE,IAHkB;AAInCC,IAAAA,CAAC,EAAEL;AAJgC,GAArC;;AAOA,MAAID,mBAAJ,EAAyB;AACvBI,IAAAA,aAAa,CAACJ,mBAAd,GAAoCO,MAAM,CAACP,mBAAD,CAA1C;AACD;;AACD,MAAIG,eAAJ,EAAqB;AACnBC,IAAAA,aAAa,CAACD,eAAd,GAAgCK,IAAI,CAACC,SAAL,CAAeN,eAAf,CAAhC;AACD;;AACD,SAAOP,UAAU,CAAgB,OAAhB,EAAyBE,OAAzB,EAAkCM,aAAlC,CAAjB;AACD,CAxBM","sourcesContent":["/* eslint-disable camelcase */\nimport {baseSource} from './base-source';\nimport type {\n  AggregationOptions,\n  QuerySourceOptions,\n  SourceOptions,\n  SpatialDataType,\n  TilejsonResult\n} from './types';\n\nexport type H3QuerySourceOptions = SourceOptions & QuerySourceOptions & AggregationOptions;\ntype UrlParameters = {\n  aggregationExp: string;\n  aggregationResLevel?: string;\n  spatialDataType: SpatialDataType;\n  spatialDataColumn?: string;\n  q: string;\n  queryParameters?: string;\n};\n\nexport const h3QuerySource = async function (\n  options: H3QuerySourceOptions\n): Promise<TilejsonResult> {\n  const {\n    aggregationExp,\n    aggregationResLevel = 4,\n    sqlQuery,\n    spatialDataColumn = 'h3',\n    queryParameters\n  } = options;\n  const urlParameters: UrlParameters = {\n    aggregationExp,\n    spatialDataColumn,\n    spatialDataType: 'h3',\n    q: sqlQuery\n  };\n\n  if (aggregationResLevel) {\n    urlParameters.aggregationResLevel = String(aggregationResLevel);\n  }\n  if (queryParameters) {\n    urlParameters.queryParameters = JSON.stringify(queryParameters);\n  }\n  return baseSource<UrlParameters>('query', options, urlParameters) as Promise<TilejsonResult>;\n};\n"],"file":"h3-query-source.js"}

package/dist/esm/sources/h3-table-source.js

@@ -1,16 +1,17 @@
-import { cartoBaseSource } from './base-source';
-
-const cartoH3TableSource = async function (options) {
+import { baseSource } from './base-source';
+export const h3TableSource = async function (options) {
   const {
     aggregationExp,
     aggregationResLevel = 4,
     columns,
-    spatialDataColumn = 'h3:h3',
+    spatialDataColumn = 'h3',
     tableName
   } = options;
   const urlParameters = {
     aggregationExp,
-    name: tableName
+    name: tableName,
+    spatialDataColumn,
+    spatialDataType: 'h3'
   };
 
   if (aggregationResLevel) {
@@ -21,12 +22,6 @@ const cartoH3TableSource = async function (options) {
     urlParameters.columns = columns.join(',');
   }
 
-  if (spatialDataColumn) {
-    urlParameters.geo_column = spatialDataColumn;
-  }
-
-  return cartoBaseSource('table', options, urlParameters);
+  return baseSource('table', options, urlParameters);
 };
-
-export { cartoH3TableSource };
 //# sourceMappingURL=h3-table-source.js.map

package/dist/esm/sources/h3-table-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/sources/h3-table-source.ts"],"names":["cartoBaseSource","cartoH3TableSource","options","aggregationExp","aggregationResLevel","columns","spatialDataColumn","tableName","urlParameters","name","String","join","geo_column"],"mappings":"AACA,SAAQA,eAAR,QAA8B,eAA9B;;AAoBA,MAAMC,kBAA6D,GAAG,gBACpEC,OADoE,EAEtD;AACd,QAAM;AACJC,IAAAA,cADI;AAEJC,IAAAA,mBAAmB,GAAG,CAFlB;AAGJC,IAAAA,OAHI;AAIJC,IAAAA,iBAAiB,GAAG,OAJhB;AAKJC,IAAAA;AALI,MAMFL,OANJ;AAOA,QAAMM,aAA4B,GAAG;AAACL,IAAAA,cAAD;AAAiBM,IAAAA,IAAI,EAAEF;AAAvB,GAArC;;AAEA,MAAIH,mBAAJ,EAAyB;AACvBI,IAAAA,aAAa,CAACJ,mBAAd,GAAoCM,MAAM,CAACN,mBAAD,CAA1C;AACD;;AACD,MAAIC,OAAJ,EAAa;AACXG,IAAAA,aAAa,CAACH,OAAd,GAAwBA,OAAO,CAACM,IAAR,CAAa,GAAb,CAAxB;AACD;;AACD,MAAIL,iBAAJ,EAAuB;AACrBE,IAAAA,aAAa,CAACI,UAAd,GAA2BN,iBAA3B;AACD;;AACD,SAAON,eAAe,CAAgB,OAAhB,EAAyBE,OAAzB,EAAkCM,aAAlC,CAAtB;AACD,CAtBD;;AAwBA,SAAQP,kBAAR","sourcesContent":["/* eslint-disable camelcase */\nimport {cartoBaseSource} from './base-source';\nimport {\n  CartoAggregationOptions,\n  CartoSourceOptions,\n  CartoTableSourceOptions,\n  TilejsonSource\n} from './common';\n\nexport type CartoH3TableSourceOptions = CartoSourceOptions &\n  CartoTableSourceOptions &\n  CartoAggregationOptions;\n\ntype UrlParameters = {\n  aggregationExp: string;\n  aggregationResLevel?: string;\n  columns?: string;\n  geo_column?: string;\n  name: string;\n};\n\nconst cartoH3TableSource: TilejsonSource<CartoH3TableSourceOptions> = async function (\n  options: CartoH3TableSourceOptions\n): Promise<any> {\n  const {\n    aggregationExp,\n    aggregationResLevel = 4,\n    columns,\n    spatialDataColumn = 'h3:h3',\n    tableName\n  } = options;\n  const urlParameters: UrlParameters = {aggregationExp, name: tableName};\n\n  if (aggregationResLevel) {\n    urlParameters.aggregationResLevel = String(aggregationResLevel);\n  }\n  if (columns) {\n    urlParameters.columns = columns.join(',');\n  }\n  if (spatialDataColumn) {\n    urlParameters.geo_column = spatialDataColumn;\n  }\n  return cartoBaseSource<UrlParameters>('table', options, urlParameters);\n};\n\nexport {cartoH3TableSource};\n"],"file":"h3-table-source.js"}
+{"version":3,"sources":["../../../src/sources/h3-table-source.ts"],"names":["baseSource","h3TableSource","options","aggregationExp","aggregationResLevel","columns","spatialDataColumn","tableName","urlParameters","name","spatialDataType","String","join"],"mappings":"AACA,SAAQA,UAAR,QAAyB,eAAzB;AAoBA,OAAO,MAAMC,aAAa,GAAG,gBAC3BC,OAD2B,EAEF;AACzB,QAAM;AACJC,IAAAA,cADI;AAEJC,IAAAA,mBAAmB,GAAG,CAFlB;AAGJC,IAAAA,OAHI;AAIJC,IAAAA,iBAAiB,GAAG,IAJhB;AAKJC,IAAAA;AALI,MAMFL,OANJ;AAOA,QAAMM,aAA4B,GAAG;AACnCL,IAAAA,cADmC;AAEnCM,IAAAA,IAAI,EAAEF,SAF6B;AAGnCD,IAAAA,iBAHmC;AAInCI,IAAAA,eAAe,EAAE;AAJkB,GAArC;;AAOA,MAAIN,mBAAJ,EAAyB;AACvBI,IAAAA,aAAa,CAACJ,mBAAd,GAAoCO,MAAM,CAACP,mBAAD,CAA1C;AACD;;AACD,MAAIC,OAAJ,EAAa;AACXG,IAAAA,aAAa,CAACH,OAAd,GAAwBA,OAAO,CAACO,IAAR,CAAa,GAAb,CAAxB;AACD;;AACD,SAAOZ,UAAU,CAAgB,OAAhB,EAAyBE,OAAzB,EAAkCM,aAAlC,CAAjB;AACD,CAxBM","sourcesContent":["/* eslint-disable camelcase */\nimport {baseSource} from './base-source';\nimport type {\n  AggregationOptions,\n  SourceOptions,\n  SpatialDataType,\n  TableSourceOptions,\n  TilejsonResult\n} from './types';\n\nexport type H3TableSourceOptions = SourceOptions & TableSourceOptions & AggregationOptions;\n\ntype UrlParameters = {\n  aggregationExp: string;\n  aggregationResLevel?: string;\n  columns?: string;\n  spatialDataType: SpatialDataType;\n  spatialDataColumn?: string;\n  name: string;\n};\n\nexport const h3TableSource = async function (\n  options: H3TableSourceOptions\n): Promise<TilejsonResult> {\n  const {\n    aggregationExp,\n    aggregationResLevel = 4,\n    columns,\n    spatialDataColumn = 'h3',\n    tableName\n  } = options;\n  const urlParameters: UrlParameters = {\n    aggregationExp,\n    name: tableName,\n    spatialDataColumn,\n    spatialDataType: 'h3'\n  };\n\n  if (aggregationResLevel) {\n    urlParameters.aggregationResLevel = String(aggregationResLevel);\n  }\n  if (columns) {\n    urlParameters.columns = columns.join(',');\n  }\n  return baseSource<UrlParameters>('table', options, urlParameters) as Promise<TilejsonResult>;\n};\n"],"file":"h3-table-source.js"}

package/dist/esm/sources/h3-tileset-source.js

@@ -1,14 +1,11 @@
-import { cartoBaseSource } from './base-source';
-
-const cartoH3TilesetSource = async function (options) {
+import { baseSource } from './base-source';
+export const h3TilesetSource = async function (options) {
   const {
     tableName
   } = options;
   const urlParameters = {
     name: tableName
   };
-  return cartoBaseSource('tileset', options, urlParameters);
+  return baseSource('tileset', options, urlParameters);
 };
-
-export { cartoH3TilesetSource };
 //# sourceMappingURL=h3-tileset-source.js.map

package/dist/esm/sources/h3-tileset-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/sources/h3-tileset-source.ts"],"names":["cartoBaseSource","cartoH3TilesetSource","options","tableName","urlParameters","name"],"mappings":"AAAA,SAAQA,eAAR,QAA8B,eAA9B;;AAMA,MAAMC,oBAAiE,GAAG,gBACxEC,OADwE,EAE1D;AACd,QAAM;AAACC,IAAAA;AAAD,MAAcD,OAApB;AACA,QAAME,aAA4B,GAAG;AAACC,IAAAA,IAAI,EAAEF;AAAP,GAArC;AAEA,SAAOH,eAAe,CAAgB,SAAhB,EAA2BE,OAA3B,EAAoCE,aAApC,CAAtB;AACD,CAPD;;AASA,SAAQH,oBAAR","sourcesContent":["import {cartoBaseSource} from './base-source';\nimport {CartoSourceOptions, CartoTilesetSourceOptions, TilejsonSource} from './common';\n\nexport type CartoH3TilesetSourceOptions = CartoSourceOptions & CartoTilesetSourceOptions;\ntype UrlParameters = {name: string};\n\nconst cartoH3TilesetSource: TilejsonSource<CartoH3TilesetSourceOptions> = async function (\n  options: CartoH3TilesetSourceOptions\n): Promise<any> {\n  const {tableName} = options;\n  const urlParameters: UrlParameters = {name: tableName};\n\n  return cartoBaseSource<UrlParameters>('tileset', options, urlParameters);\n};\n\nexport {cartoH3TilesetSource};\n"],"file":"h3-tileset-source.js"}
+{"version":3,"sources":["../../../src/sources/h3-tileset-source.ts"],"names":["baseSource","h3TilesetSource","options","tableName","urlParameters","name"],"mappings":"AAAA,SAAQA,UAAR,QAAyB,eAAzB;AAMA,OAAO,MAAMC,eAAe,GAAG,gBAC7BC,OAD6B,EAEJ;AACzB,QAAM;AAACC,IAAAA;AAAD,MAAcD,OAApB;AACA,QAAME,aAA4B,GAAG;AAACC,IAAAA,IAAI,EAAEF;AAAP,GAArC;AAEA,SAAOH,UAAU,CAAgB,SAAhB,EAA2BE,OAA3B,EAAoCE,aAApC,CAAjB;AACD,CAPM","sourcesContent":["import {baseSource} from './base-source';\nimport type {SourceOptions, TilejsonResult, TilesetSourceOptions} from './types';\n\nexport type H3TilesetSourceOptions = SourceOptions & TilesetSourceOptions;\ntype UrlParameters = {name: string};\n\nexport const h3TilesetSource = async function (\n  options: H3TilesetSourceOptions\n): Promise<TilejsonResult> {\n  const {tableName} = options;\n  const urlParameters: UrlParameters = {name: tableName};\n\n  return baseSource<UrlParameters>('tileset', options, urlParameters) as Promise<TilejsonResult>;\n};\n"],"file":"h3-tileset-source.js"}

package/dist/esm/sources/index.js

@@ -1,12 +1,15 @@
-export { SOURCE_DEFAULTS } from './common';
-export { cartoH3QuerySource } from './h3-query-source';
-export { cartoH3TableSource } from './h3-table-source';
-export { cartoH3TilesetSource } from './h3-tileset-source';
-export { cartoRasterSource } from './raster-source';
-export { cartoQuadbinQuerySource } from './quadbin-query-source';
-export { cartoQuadbinTableSource } from './quadbin-table-source';
-export { cartoQuadbinTilesetSource } from './quadbin-tileset-source';
-export { cartoVectorQuerySource } from './vector-query-source';
-export { cartoVectorTableSource } from './vector-table-source';
-export { cartoVectorTilesetSource } from './vector-tileset-source';
+export { SOURCE_DEFAULTS } from './base-source';
+export { boundaryQuerySource } from './boundary-query-source';
+export { boundaryTableSource } from './boundary-table-source';
+export { boundaryTilesetSource } from './boundary-tileset-source';
+export { h3QuerySource } from './h3-query-source';
+export { h3TableSource } from './h3-table-source';
+export { h3TilesetSource } from './h3-tileset-source';
+export { rasterSource } from './raster-source';
+export { quadbinQuerySource } from './quadbin-query-source';
+export { quadbinTableSource } from './quadbin-table-source';
+export { quadbinTilesetSource } from './quadbin-tileset-source';
+export { vectorQuerySource } from './vector-query-source';
+export { vectorTableSource } from './vector-table-source';
+export { vectorTilesetSource } from './vector-tileset-source';
 //# sourceMappingURL=index.js.map

package/dist/esm/sources/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/sources/index.ts"],"names":["SOURCE_DEFAULTS","cartoH3QuerySource","cartoH3TableSource","cartoH3TilesetSource","cartoRasterSource","cartoQuadbinQuerySource","cartoQuadbinTableSource","cartoQuadbinTilesetSource","cartoVectorQuerySource","cartoVectorTableSource","cartoVectorTilesetSource"],"mappings":"AAAA,SAAQA,eAAR,QAA8B,UAA9B;AAGA,SAAQC,kBAAR,QAAiC,mBAAjC;AAGA,SAAQC,kBAAR,QAAiC,mBAAjC;AAGA,SAAQC,oBAAR,QAAmC,qBAAnC;AAGA,SAAQC,iBAAR,QAAgC,iBAAhC;AAGA,SAAQC,uBAAR,QAAsC,wBAAtC;AAGA,SAAQC,uBAAR,QAAsC,wBAAtC;AAGA,SAAQC,yBAAR,QAAwC,0BAAxC;AAGA,SAAQC,sBAAR,QAAqC,uBAArC;AAGA,SAAQC,sBAAR,QAAqC,uBAArC;AAGA,SAAQC,wBAAR,QAAuC,yBAAvC","sourcesContent":["export {SOURCE_DEFAULTS} from './common';\nexport type {CartoTilejsonResult, GeojsonResult, JsonResult} from './common';\n\nexport {cartoH3QuerySource} from './h3-query-source';\nexport type {CartoH3QuerySourceOptions} from './h3-query-source';\n\nexport {cartoH3TableSource} from './h3-table-source';\nexport type {CartoH3TableSourceOptions} from './h3-table-source';\n\nexport {cartoH3TilesetSource} from './h3-tileset-source';\nexport type {CartoH3TilesetSourceOptions} from './h3-tileset-source';\n\nexport {cartoRasterSource} from './raster-source';\nexport type {CartoRasterSourceOptions} from './raster-source';\n\nexport {cartoQuadbinQuerySource} from './quadbin-query-source';\nexport type {CartoQuadbinQuerySourceOptions} from './quadbin-query-source';\n\nexport {cartoQuadbinTableSource} from './quadbin-table-source';\nexport type {CartoQuadbinTableSourceOptions} from './quadbin-table-source';\n\nexport {cartoQuadbinTilesetSource} from './quadbin-tileset-source';\nexport type {CartoQuadbinTilesetSourceOptions} from './quadbin-tileset-source';\n\nexport {cartoVectorQuerySource} from './vector-query-source';\nexport type {CartoVectorQuerySourceOptions} from './vector-query-source';\n\nexport {cartoVectorTableSource} from './vector-table-source';\nexport type {CartoVectorTableSourceOptions} from './vector-table-source';\n\nexport {cartoVectorTilesetSource} from './vector-tileset-source';\nexport type {CartoVectorTilesetSourceOptions} from './vector-tileset-source';\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/sources/index.ts"],"names":["SOURCE_DEFAULTS","boundaryQuerySource","boundaryTableSource","boundaryTilesetSource","h3QuerySource","h3TableSource","h3TilesetSource","rasterSource","quadbinQuerySource","quadbinTableSource","quadbinTilesetSource","vectorQuerySource","vectorTableSource","vectorTilesetSource"],"mappings":"AAAA,SAAQA,eAAR,QAA8B,eAA9B;AAGA,SAAQC,mBAAR,QAAkC,yBAAlC;AAGA,SAAQC,mBAAR,QAAkC,yBAAlC;AAGA,SAAQC,qBAAR,QAAoC,2BAApC;AAGA,SAAQC,aAAR,QAA4B,mBAA5B;AAGA,SAAQC,aAAR,QAA4B,mBAA5B;AAGA,SAAQC,eAAR,QAA8B,qBAA9B;AAGA,SAAQC,YAAR,QAA2B,iBAA3B;AAGA,SAAQC,kBAAR,QAAiC,wBAAjC;AAGA,SAAQC,kBAAR,QAAiC,wBAAjC;AAGA,SAAQC,oBAAR,QAAmC,0BAAnC;AAGA,SAAQC,iBAAR,QAAgC,uBAAhC;AAGA,SAAQC,iBAAR,QAAgC,uBAAhC;AAGA,SAAQC,mBAAR,QAAkC,yBAAlC","sourcesContent":["export {SOURCE_DEFAULTS} from './base-source';\nexport type {TilejsonResult, GeojsonResult, JsonResult} from './types';\n\nexport {boundaryQuerySource} from './boundary-query-source';\nexport type {BoundaryQuerySourceOptions} from './boundary-query-source';\n\nexport {boundaryTableSource} from './boundary-table-source';\nexport type {BoundaryTableSourceOptions} from './boundary-table-source';\n\nexport {boundaryTilesetSource} from './boundary-tileset-source';\nexport type {BoundaryTilesetSourceOptions} from './boundary-tileset-source';\n\nexport {h3QuerySource} from './h3-query-source';\nexport type {H3QuerySourceOptions} from './h3-query-source';\n\nexport {h3TableSource} from './h3-table-source';\nexport type {H3TableSourceOptions} from './h3-table-source';\n\nexport {h3TilesetSource} from './h3-tileset-source';\nexport type {H3TilesetSourceOptions} from './h3-tileset-source';\n\nexport {rasterSource} from './raster-source';\nexport type {RasterSourceOptions} from './raster-source';\n\nexport {quadbinQuerySource} from './quadbin-query-source';\nexport type {QuadbinQuerySourceOptions} from './quadbin-query-source';\n\nexport {quadbinTableSource} from './quadbin-table-source';\nexport type {QuadbinTableSourceOptions} from './quadbin-table-source';\n\nexport {quadbinTilesetSource} from './quadbin-tileset-source';\nexport type {QuadbinTilesetSourceOptions} from './quadbin-tileset-source';\n\nexport {vectorQuerySource} from './vector-query-source';\nexport type {VectorQuerySourceOptions} from './vector-query-source';\n\nexport {vectorTableSource} from './vector-table-source';\nexport type {VectorTableSourceOptions} from './vector-table-source';\n\nexport {vectorTilesetSource} from './vector-tileset-source';\nexport type {VectorTilesetSourceOptions} from './vector-tileset-source';\n"],"file":"index.js"}

package/dist/esm/sources/quadbin-query-source.js

@@ -1,32 +1,27 @@
-import { cartoBaseSource } from './base-source';
-
-const cartoQuadbinQuerySource = async function (options) {
+import { baseSource } from './base-source';
+export const quadbinQuerySource = async function (options) {
   const {
     aggregationExp,
     aggregationResLevel = 6,
     sqlQuery,
-    spatialDataColumn = 'quadbin:quadbin',
+    spatialDataColumn = 'quadbin',
     queryParameters
   } = options;
   const urlParameters = {
     aggregationExp,
-    q: sqlQuery
+    q: sqlQuery,
+    spatialDataColumn,
+    spatialDataType: 'quadbin'
   };
 
   if (aggregationResLevel) {
     urlParameters.aggregationResLevel = String(aggregationResLevel);
   }
 
-  if (spatialDataColumn) {
-    urlParameters.geo_column = spatialDataColumn;
-  }
-
   if (queryParameters) {
     urlParameters.queryParameters = JSON.stringify(queryParameters);
   }
 
-  return cartoBaseSource('query', options, urlParameters);
+  return baseSource('query', options, urlParameters);
 };
-
-export { cartoQuadbinQuerySource };
 //# sourceMappingURL=quadbin-query-source.js.map

package/dist/esm/sources/quadbin-query-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/sources/quadbin-query-source.ts"],"names":["cartoBaseSource","cartoQuadbinQuerySource","options","aggregationExp","aggregationResLevel","sqlQuery","spatialDataColumn","queryParameters","urlParameters","q","String","geo_column","JSON","stringify"],"mappings":"AACA,SAAQA,eAAR,QAA8B,eAA9B;;AAoBA,MAAMC,uBAAuE,GAAG,gBAC9EC,OAD8E,EAEhE;AACd,QAAM;AACJC,IAAAA,cADI;AAEJC,IAAAA,mBAAmB,GAAG,CAFlB;AAGJC,IAAAA,QAHI;AAIJC,IAAAA,iBAAiB,GAAG,iBAJhB;AAKJC,IAAAA;AALI,MAMFL,OANJ;AAOA,QAAMM,aAA4B,GAAG;AAACL,IAAAA,cAAD;AAAiBM,IAAAA,CAAC,EAAEJ;AAApB,GAArC;;AAEA,MAAID,mBAAJ,EAAyB;AACvBI,IAAAA,aAAa,CAACJ,mBAAd,GAAoCM,MAAM,CAACN,mBAAD,CAA1C;AACD;;AACD,MAAIE,iBAAJ,EAAuB;AACrBE,IAAAA,aAAa,CAACG,UAAd,GAA2BL,iBAA3B;AACD;;AACD,MAAIC,eAAJ,EAAqB;AACnBC,IAAAA,aAAa,CAACD,eAAd,GAAgCK,IAAI,CAACC,SAAL,CAAeN,eAAf,CAAhC;AACD;;AACD,SAAOP,eAAe,CAAgB,OAAhB,EAAyBE,OAAzB,EAAkCM,aAAlC,CAAtB;AACD,CAtBD;;AAwBA,SAAQP,uBAAR","sourcesContent":["/* eslint-disable camelcase */\nimport {cartoBaseSource} from './base-source';\nimport {\n  CartoAggregationOptions,\n  CartoQuerySourceOptions,\n  CartoSourceOptions,\n  TilejsonSource\n} from './common';\n\nexport type CartoQuadbinQuerySourceOptions = CartoSourceOptions &\n  CartoQuerySourceOptions &\n  CartoAggregationOptions;\n\ntype UrlParameters = {\n  aggregationExp: string;\n  aggregationResLevel?: string;\n  geo_column?: string;\n  q: string;\n  queryParameters?: string;\n};\n\nconst cartoQuadbinQuerySource: TilejsonSource<CartoQuadbinQuerySourceOptions> = async function (\n  options: CartoQuadbinQuerySourceOptions\n): Promise<any> {\n  const {\n    aggregationExp,\n    aggregationResLevel = 6,\n    sqlQuery,\n    spatialDataColumn = 'quadbin:quadbin',\n    queryParameters\n  } = options;\n  const urlParameters: UrlParameters = {aggregationExp, q: sqlQuery};\n\n  if (aggregationResLevel) {\n    urlParameters.aggregationResLevel = String(aggregationResLevel);\n  }\n  if (spatialDataColumn) {\n    urlParameters.geo_column = spatialDataColumn;\n  }\n  if (queryParameters) {\n    urlParameters.queryParameters = JSON.stringify(queryParameters);\n  }\n  return cartoBaseSource<UrlParameters>('query', options, urlParameters);\n};\n\nexport {cartoQuadbinQuerySource};\n"],"file":"quadbin-query-source.js"}
+{"version":3,"sources":["../../../src/sources/quadbin-query-source.ts"],"names":["baseSource","quadbinQuerySource","options","aggregationExp","aggregationResLevel","sqlQuery","spatialDataColumn","queryParameters","urlParameters","q","spatialDataType","String","JSON","stringify"],"mappings":"AACA,SAAQA,UAAR,QAAyB,eAAzB;AAoBA,OAAO,MAAMC,kBAAkB,GAAG,gBAChCC,OADgC,EAEP;AACzB,QAAM;AACJC,IAAAA,cADI;AAEJC,IAAAA,mBAAmB,GAAG,CAFlB;AAGJC,IAAAA,QAHI;AAIJC,IAAAA,iBAAiB,GAAG,SAJhB;AAKJC,IAAAA;AALI,MAMFL,OANJ;AAOA,QAAMM,aAA4B,GAAG;AACnCL,IAAAA,cADmC;AAEnCM,IAAAA,CAAC,EAAEJ,QAFgC;AAGnCC,IAAAA,iBAHmC;AAInCI,IAAAA,eAAe,EAAE;AAJkB,GAArC;;AAOA,MAAIN,mBAAJ,EAAyB;AACvBI,IAAAA,aAAa,CAACJ,mBAAd,GAAoCO,MAAM,CAACP,mBAAD,CAA1C;AACD;;AACD,MAAIG,eAAJ,EAAqB;AACnBC,IAAAA,aAAa,CAACD,eAAd,GAAgCK,IAAI,CAACC,SAAL,CAAeN,eAAf,CAAhC;AACD;;AACD,SAAOP,UAAU,CAAgB,OAAhB,EAAyBE,OAAzB,EAAkCM,aAAlC,CAAjB;AACD,CAxBM","sourcesContent":["/* eslint-disable camelcase */\nimport {baseSource} from './base-source';\nimport type {\n  AggregationOptions,\n  QuerySourceOptions,\n  SourceOptions,\n  SpatialDataType,\n  TilejsonResult\n} from './types';\n\nexport type QuadbinQuerySourceOptions = SourceOptions & QuerySourceOptions & AggregationOptions;\n\ntype UrlParameters = {\n  aggregationExp: string;\n  aggregationResLevel?: string;\n  spatialDataType: SpatialDataType;\n  spatialDataColumn?: string;\n  q: string;\n  queryParameters?: string;\n};\n\nexport const quadbinQuerySource = async function (\n  options: QuadbinQuerySourceOptions\n): Promise<TilejsonResult> {\n  const {\n    aggregationExp,\n    aggregationResLevel = 6,\n    sqlQuery,\n    spatialDataColumn = 'quadbin',\n    queryParameters\n  } = options;\n  const urlParameters: UrlParameters = {\n    aggregationExp,\n    q: sqlQuery,\n    spatialDataColumn,\n    spatialDataType: 'quadbin'\n  };\n\n  if (aggregationResLevel) {\n    urlParameters.aggregationResLevel = String(aggregationResLevel);\n  }\n  if (queryParameters) {\n    urlParameters.queryParameters = JSON.stringify(queryParameters);\n  }\n  return baseSource<UrlParameters>('query', options, urlParameters) as Promise<TilejsonResult>;\n};\n"],"file":"quadbin-query-source.js"}

package/dist/esm/sources/quadbin-table-source.js

@@ -1,16 +1,17 @@
-import { cartoBaseSource } from './base-source';
-
-const cartoQuadbinTableSource = async function (options) {
+import { baseSource } from './base-source';
+export const quadbinTableSource = async function (options) {
   const {
     aggregationExp,
     aggregationResLevel = 6,
     columns,
-    spatialDataColumn = 'quadbin:quadbin',
+    spatialDataColumn = 'quadbin',
     tableName
   } = options;
   const urlParameters = {
     aggregationExp,
-    name: tableName
+    name: tableName,
+    spatialDataColumn,
+    spatialDataType: 'quadbin'
   };
 
   if (aggregationResLevel) {
@@ -21,12 +22,6 @@ const cartoQuadbinTableSource = async function (options) {
     urlParameters.columns = columns.join(',');
   }
 
-  if (spatialDataColumn) {
-    urlParameters.geo_column = spatialDataColumn;
-  }
-
-  return cartoBaseSource('table', options, urlParameters);
+  return baseSource('table', options, urlParameters);
 };
-
-export { cartoQuadbinTableSource };
 //# sourceMappingURL=quadbin-table-source.js.map

package/dist/esm/sources/quadbin-table-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/sources/quadbin-table-source.ts"],"names":["cartoBaseSource","cartoQuadbinTableSource","options","aggregationExp","aggregationResLevel","columns","spatialDataColumn","tableName","urlParameters","name","String","join","geo_column"],"mappings":"AACA,SAAQA,eAAR,QAA8B,eAA9B;;AAoBA,MAAMC,uBAAuE,GAAG,gBAC9EC,OAD8E,EAEhE;AACd,QAAM;AACJC,IAAAA,cADI;AAEJC,IAAAA,mBAAmB,GAAG,CAFlB;AAGJC,IAAAA,OAHI;AAIJC,IAAAA,iBAAiB,GAAG,iBAJhB;AAKJC,IAAAA;AALI,MAMFL,OANJ;AAOA,QAAMM,aAA4B,GAAG;AAACL,IAAAA,cAAD;AAAiBM,IAAAA,IAAI,EAAEF;AAAvB,GAArC;;AAEA,MAAIH,mBAAJ,EAAyB;AACvBI,IAAAA,aAAa,CAACJ,mBAAd,GAAoCM,MAAM,CAACN,mBAAD,CAA1C;AACD;;AACD,MAAIC,OAAJ,EAAa;AACXG,IAAAA,aAAa,CAACH,OAAd,GAAwBA,OAAO,CAACM,IAAR,CAAa,GAAb,CAAxB;AACD;;AACD,MAAIL,iBAAJ,EAAuB;AACrBE,IAAAA,aAAa,CAACI,UAAd,GAA2BN,iBAA3B;AACD;;AACD,SAAON,eAAe,CAAgB,OAAhB,EAAyBE,OAAzB,EAAkCM,aAAlC,CAAtB;AACD,CAtBD;;AAwBA,SAAQP,uBAAR","sourcesContent":["/* eslint-disable camelcase */\nimport {cartoBaseSource} from './base-source';\nimport {\n  CartoAggregationOptions,\n  CartoSourceOptions,\n  CartoTableSourceOptions,\n  TilejsonSource\n} from './common';\n\nexport type CartoQuadbinTableSourceOptions = CartoSourceOptions &\n  CartoTableSourceOptions &\n  CartoAggregationOptions;\n\ntype UrlParameters = {\n  aggregationExp: string;\n  aggregationResLevel?: string;\n  columns?: string;\n  geo_column?: string;\n  name: string;\n};\n\nconst cartoQuadbinTableSource: TilejsonSource<CartoQuadbinTableSourceOptions> = async function (\n  options: CartoQuadbinTableSourceOptions\n): Promise<any> {\n  const {\n    aggregationExp,\n    aggregationResLevel = 6,\n    columns,\n    spatialDataColumn = 'quadbin:quadbin',\n    tableName\n  } = options;\n  const urlParameters: UrlParameters = {aggregationExp, name: tableName};\n\n  if (aggregationResLevel) {\n    urlParameters.aggregationResLevel = String(aggregationResLevel);\n  }\n  if (columns) {\n    urlParameters.columns = columns.join(',');\n  }\n  if (spatialDataColumn) {\n    urlParameters.geo_column = spatialDataColumn;\n  }\n  return cartoBaseSource<UrlParameters>('table', options, urlParameters);\n};\n\nexport {cartoQuadbinTableSource};\n"],"file":"quadbin-table-source.js"}
+{"version":3,"sources":["../../../src/sources/quadbin-table-source.ts"],"names":["baseSource","quadbinTableSource","options","aggregationExp","aggregationResLevel","columns","spatialDataColumn","tableName","urlParameters","name","spatialDataType","String","join"],"mappings":"AACA,SAAQA,UAAR,QAAyB,eAAzB;AAoBA,OAAO,MAAMC,kBAAkB,GAAG,gBAChCC,OADgC,EAEP;AACzB,QAAM;AACJC,IAAAA,cADI;AAEJC,IAAAA,mBAAmB,GAAG,CAFlB;AAGJC,IAAAA,OAHI;AAIJC,IAAAA,iBAAiB,GAAG,SAJhB;AAKJC,IAAAA;AALI,MAMFL,OANJ;AAQA,QAAMM,aAA4B,GAAG;AACnCL,IAAAA,cADmC;AAEnCM,IAAAA,IAAI,EAAEF,SAF6B;AAGnCD,IAAAA,iBAHmC;AAInCI,IAAAA,eAAe,EAAE;AAJkB,GAArC;;AAOA,MAAIN,mBAAJ,EAAyB;AACvBI,IAAAA,aAAa,CAACJ,mBAAd,GAAoCO,MAAM,CAACP,mBAAD,CAA1C;AACD;;AACD,MAAIC,OAAJ,EAAa;AACXG,IAAAA,aAAa,CAACH,OAAd,GAAwBA,OAAO,CAACO,IAAR,CAAa,GAAb,CAAxB;AACD;;AACD,SAAOZ,UAAU,CAAgB,OAAhB,EAAyBE,OAAzB,EAAkCM,aAAlC,CAAjB;AACD,CAzBM","sourcesContent":["/* eslint-disable camelcase */\nimport {baseSource} from './base-source';\nimport type {\n  AggregationOptions,\n  SourceOptions,\n  SpatialDataType,\n  TableSourceOptions,\n  TilejsonResult\n} from './types';\n\nexport type QuadbinTableSourceOptions = SourceOptions & TableSourceOptions & AggregationOptions;\n\ntype UrlParameters = {\n  aggregationExp: string;\n  aggregationResLevel?: string;\n  columns?: string;\n  spatialDataType: SpatialDataType;\n  spatialDataColumn?: string;\n  name: string;\n};\n\nexport const quadbinTableSource = async function (\n  options: QuadbinTableSourceOptions\n): Promise<TilejsonResult> {\n  const {\n    aggregationExp,\n    aggregationResLevel = 6,\n    columns,\n    spatialDataColumn = 'quadbin',\n    tableName\n  } = options;\n\n  const urlParameters: UrlParameters = {\n    aggregationExp,\n    name: tableName,\n    spatialDataColumn,\n    spatialDataType: 'quadbin'\n  };\n\n  if (aggregationResLevel) {\n    urlParameters.aggregationResLevel = String(aggregationResLevel);\n  }\n  if (columns) {\n    urlParameters.columns = columns.join(',');\n  }\n  return baseSource<UrlParameters>('table', options, urlParameters) as Promise<TilejsonResult>;\n};\n"],"file":"quadbin-table-source.js"}