@deck.gl/carto 8.10.0-alpha.2 → 8.10.0-alpha.5

package/dist/esm/index.js

@@ -1,13 +1,14 @@
 export { getDefaultCredentials, setDefaultCredentials } from './config';
 export { default as CartoLayer } from './layers/carto-layer';
-export { default as _CartoTileLayer } from './layers/carto-tile-layer';
-export { default as _H3TileLayer } from './layers/h3-tile-layer';
+export { default as VectorTileLayer } from './layers/vector-tile-layer';
+export { default as H3TileLayer } from './layers/h3-tile-layer';
 export { default as _PointLabelLayer } from './layers/point-label-layer';
-export { default as _QuadbinTileLayer } from './layers/quadbin-tile-layer';
-export { default as _RasterTileLayer } from './layers/raster-tile-layer';
+export { default as QuadbinTileLayer } from './layers/quadbin-tile-layer';
+export { default as RasterTileLayer } from './layers/raster-tile-layer';
 export { default as BASEMAP } from './basemap';
 export { default as colorBins } from './style/color-bins-style';
 export { default as colorCategories } from './style/color-categories-style';
 export { default as colorContinuous } from './style/color-continuous-style';
 export { FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS, CartoAPIError, fetchLayerData, fetchMap, getDataV2 as _getDataV2, mapInstantiation as _mapInstantiation } from './api';
+export { cartoH3QuerySource, cartoH3TableSource, cartoH3TilesetSource, cartoRasterSource, cartoQuadbinQuerySource, cartoQuadbinTableSource, cartoQuadbinTilesetSource, cartoVectorQuerySource, cartoVectorTableSource, cartoVectorTilesetSource, SOURCE_DEFAULTS } from './sources';
 //# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"names":["getDefaultCredentials","setDefaultCredentials","default","CartoLayer","_CartoTileLayer","_H3TileLayer","_PointLabelLayer","_QuadbinTileLayer","_RasterTileLayer","BASEMAP","colorBins","colorCategories","colorContinuous","FORMATS","TILE_FORMATS","MAP_TYPES","API_VERSIONS","CartoAPIError","fetchLayerData","fetchMap","getDataV2","_getDataV2","mapInstantiation","_mapInstantiation"],"mappings":"AAAA,SAAQA,qBAAR,EAA+BC,qBAA/B,QAA2D,UAA3D;AACA,SAAQC,OAAO,IAAIC,UAAnB,QAAoC,sBAApC;AACA,SAAQD,OAAO,IAAIE,eAAnB,QAAyC,2BAAzC;AACA,SAAQF,OAAO,IAAIG,YAAnB,QAAsC,wBAAtC;AACA,SAAQH,OAAO,IAAII,gBAAnB,QAA0C,4BAA1C;AACA,SAAQJ,OAAO,IAAIK,iBAAnB,QAA2C,6BAA3C;AACA,SAAQL,OAAO,IAAIM,gBAAnB,QAA0C,4BAA1C;AACA,SAAQN,OAAO,IAAIO,OAAnB,QAAiC,WAAjC;AACA,SAAQP,OAAO,IAAIQ,SAAnB,QAAmC,0BAAnC;AACA,SAAQR,OAAO,IAAIS,eAAnB,QAAyC,gCAAzC;AACA,SAAQT,OAAO,IAAIU,eAAnB,QAAyC,gCAAzC;AACA,SACEC,OADF,EAEEC,YAFF,EAGEC,SAHF,EAIEC,YAJF,EAKEC,aALF,EAMEC,cANF,EAOEC,QAPF,EAQEC,SAAS,IAAIC,UARf,EASEC,gBAAgB,IAAIC,iBATtB,QAUO,OAVP","sourcesContent":["export {getDefaultCredentials, setDefaultCredentials} from './config';\nexport {default as CartoLayer} from './layers/carto-layer';\nexport {default as _CartoTileLayer} from './layers/carto-tile-layer';\nexport {default as _H3TileLayer} from './layers/h3-tile-layer';\nexport {default as _PointLabelLayer} from './layers/point-label-layer';\nexport {default as _QuadbinTileLayer} from './layers/quadbin-tile-layer';\nexport {default as _RasterTileLayer} from './layers/raster-tile-layer';\nexport {default as BASEMAP} from './basemap';\nexport {default as colorBins} from './style/color-bins-style';\nexport {default as colorCategories} from './style/color-categories-style';\nexport {default as colorContinuous} from './style/color-continuous-style';\nexport {\n  FORMATS,\n  TILE_FORMATS,\n  MAP_TYPES,\n  API_VERSIONS,\n  CartoAPIError,\n  fetchLayerData,\n  fetchMap,\n  getDataV2 as _getDataV2,\n  mapInstantiation as _mapInstantiation\n} from './api';\nexport type {APIErrorContext, QueryParameters} from './api';\nexport type {CartoLayerProps} from './layers/carto-layer';\n"],"file":"index.js"}
+{"version":3,"sources":["../../src/index.ts"],"names":["getDefaultCredentials","setDefaultCredentials","default","CartoLayer","VectorTileLayer","H3TileLayer","_PointLabelLayer","QuadbinTileLayer","RasterTileLayer","BASEMAP","colorBins","colorCategories","colorContinuous","FORMATS","TILE_FORMATS","MAP_TYPES","API_VERSIONS","CartoAPIError","fetchLayerData","fetchMap","getDataV2","_getDataV2","mapInstantiation","_mapInstantiation","cartoH3QuerySource","cartoH3TableSource","cartoH3TilesetSource","cartoRasterSource","cartoQuadbinQuerySource","cartoQuadbinTableSource","cartoQuadbinTilesetSource","cartoVectorQuerySource","cartoVectorTableSource","cartoVectorTilesetSource","SOURCE_DEFAULTS"],"mappings":"AAAA,SAAQA,qBAAR,EAA+BC,qBAA/B,QAA2D,UAA3D;AACA,SAAQC,OAAO,IAAIC,UAAnB,QAAoC,sBAApC;AACA,SAAQD,OAAO,IAAIE,eAAnB,QAAyC,4BAAzC;AACA,SAAQF,OAAO,IAAIG,WAAnB,QAAqC,wBAArC;AACA,SAAQH,OAAO,IAAII,gBAAnB,QAA0C,4BAA1C;AACA,SAAQJ,OAAO,IAAIK,gBAAnB,QAA0C,6BAA1C;AACA,SAAQL,OAAO,IAAIM,eAAnB,QAAyC,4BAAzC;AACA,SAAQN,OAAO,IAAIO,OAAnB,QAAiC,WAAjC;AACA,SAAQP,OAAO,IAAIQ,SAAnB,QAAmC,0BAAnC;AACA,SAAQR,OAAO,IAAIS,eAAnB,QAAyC,gCAAzC;AACA,SAAQT,OAAO,IAAIU,eAAnB,QAAyC,gCAAzC;AACA,SACEC,OADF,EAEEC,YAFF,EAGEC,SAHF,EAIEC,YAJF,EAKEC,aALF,EAMEC,cANF,EAOEC,QAPF,EAQEC,SAAS,IAAIC,UARf,EASEC,gBAAgB,IAAIC,iBATtB,QAUO,OAVP;AAcA,SACEC,kBADF,EAEEC,kBAFF,EAGEC,oBAHF,EAIEC,iBAJF,EAKEC,uBALF,EAMEC,uBANF,EAOEC,yBAPF,EAQEC,sBARF,EASEC,sBATF,EAUEC,wBAVF,EAWEC,eAXF,QAYO,WAZP","sourcesContent":["export {getDefaultCredentials, setDefaultCredentials} from './config';\nexport {default as CartoLayer} from './layers/carto-layer'; // <-- REMOVE in v9\nexport {default as VectorTileLayer} from './layers/vector-tile-layer';\nexport {default as H3TileLayer} from './layers/h3-tile-layer';\nexport {default as _PointLabelLayer} from './layers/point-label-layer';\nexport {default as QuadbinTileLayer} from './layers/quadbin-tile-layer';\nexport {default as RasterTileLayer} from './layers/raster-tile-layer';\nexport {default as BASEMAP} from './basemap';\nexport {default as colorBins} from './style/color-bins-style';\nexport {default as colorCategories} from './style/color-categories-style';\nexport {default as colorContinuous} from './style/color-continuous-style';\nexport {\n  FORMATS,\n  TILE_FORMATS,\n  MAP_TYPES,\n  API_VERSIONS,\n  CartoAPIError,\n  fetchLayerData,\n  fetchMap,\n  getDataV2 as _getDataV2,\n  mapInstantiation as _mapInstantiation\n} from './api';\nexport type {APIErrorContext, QueryParameters} from './api';\nexport type {CartoLayerProps} from './layers/carto-layer';\n\nexport {\n  cartoH3QuerySource,\n  cartoH3TableSource,\n  cartoH3TilesetSource,\n  cartoRasterSource,\n  cartoQuadbinQuerySource,\n  cartoQuadbinTableSource,\n  cartoQuadbinTilesetSource,\n  cartoVectorQuerySource,\n  cartoVectorTableSource,\n  cartoVectorTilesetSource,\n  SOURCE_DEFAULTS\n} from './sources';\nexport type {\n  CartoTilejsonResult,\n  CartoH3QuerySourceOptions,\n  CartoH3TableSourceOptions,\n  CartoH3TilesetSourceOptions,\n  CartoRasterSourceOptions,\n  CartoQuadbinQuerySourceOptions,\n  CartoQuadbinTableSourceOptions,\n  CartoQuadbinTilesetSourceOptions,\n  CartoVectorQuerySourceOptions,\n  CartoVectorTableSourceOptions,\n  CartoVectorTilesetSourceOptions,\n  GeojsonResult,\n  JsonResult\n} from './sources';\n"],"file":"index.js"}

package/dist/esm/layers/carto-layer.js

@@ -1,4 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { CompositeLayer, log } from '@deck.gl/core';
 import { MVTLayer } from '@deck.gl/geo-layers';
 import { fetchLayerData, getDataV2, API_VERSIONS } from '../api';
@@ -64,23 +63,23 @@ export default class CartoLayer extends CompositeLayer {
     const {
       apiVersion
     } = localCreds;
-    log.assert(Object.values(API_VERSIONS).includes(apiVersion), "Invalid apiVersion ".concat(apiVersion, ". Use API_VERSIONS enum."));
+    log.assert(Object.values(API_VERSIONS).includes(apiVersion), `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`);
 
     if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {
-      log.assert(type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET, "Invalid type ".concat(type, ". Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ").concat(apiVersion));
-      log.assert(!connection, "Connection prop is not supported for apiVersion ".concat(apiVersion));
-      log.assert(!geoColumn, "geoColumn prop is not supported for apiVersion ".concat(apiVersion));
-      log.assert(!columns, "columns prop is not supported for apiVersion ".concat(apiVersion));
+      log.assert(type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET, `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`);
+      log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);
+      log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);
+      log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);
     } else if (apiVersion === API_VERSIONS.V3) {
       log.assert(connection, 'Missing mandatory connection parameter');
-      log.assert(Object.values(MAP_TYPES).includes(type), "Invalid type ".concat(type, ". Use MAP_TYPES enum."));
+      log.assert(Object.values(MAP_TYPES).includes(type), `Invalid type ${type}. Use MAP_TYPES enum.`);
 
       if (!COLUMNS_SUPPORT.includes(type)) {
-        log.assert(!columns, "columns prop is only supported for types: ".concat(COLUMNS_SUPPORT.join()));
+        log.assert(!columns, `columns prop is only supported for types: ${COLUMNS_SUPPORT.join()}`);
       }
 
       if (!GEO_COLUMN_SUPPORT.includes(type)) {
-        log.assert(!geoColumn, "geoColumn prop is only supported for types: ".concat(GEO_COLUMN_SUPPORT.join()));
+        log.assert(!geoColumn, `geoColumn prop is only supported for types: ${GEO_COLUMN_SUPPORT.join()}`);
       }
 
       if (columns) {
@@ -213,7 +212,7 @@ export default class CartoLayer extends CompositeLayer {
       } = localConfig;
       loadOptions.fetch = { ...loadOptions.fetch,
         headers: { ...((_loadOptions$fetch = loadOptions.fetch) === null || _loadOptions$fetch === void 0 ? void 0 : _loadOptions$fetch.headers),
-          Authorization: "Bearer ".concat(accessToken)
+          Authorization: `Bearer ${accessToken}`
         }
       };
     }
@@ -221,7 +220,7 @@ export default class CartoLayer extends CompositeLayer {
     const [layer, props] = this._getSubLayerAndProps();
 
     return new layer(props, this.getSubLayerProps({
-      id: "carto-".concat(layer.layerName),
+      id: `carto-${layer.layerName}`,
       data,
       loadOptions,
       updateTriggers
@@ -229,8 +228,6 @@ export default class CartoLayer extends CompositeLayer {
   }
 
 }
-
-_defineProperty(CartoLayer, "layerName", 'CartoLayer');
-
-_defineProperty(CartoLayer, "defaultProps", defaultProps);
+CartoLayer.layerName = 'CartoLayer';
+CartoLayer.defaultProps = defaultProps;
 //# sourceMappingURL=carto-layer.js.map

package/dist/esm/layers/carto-layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","MVTLayer","fetchLayerData","getDataV2","API_VERSIONS","layerFromTileDataset","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","headers","aggregationExp","aggregationResLevel","queryParameters","CartoLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","Object","values","includes","V1","V2","QUERY","TILESET","V3","join","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","TILEJSON","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","tileUrl","URL","tiles","searchParams","get","scheme","renderLayers","updateTriggers","loadOptions","getLoadOptions","accessToken","fetch","Authorization","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {\n  CompositeLayer,\n  CompositeLayerProps,\n  Layer,\n  LayerProps,\n  log,\n  UpdateParameters\n} from '@deck.gl/core';\n\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {CartoAPIError} from '../api/carto-api-error';\nimport {layerFromTileDataset} from '../api/layer-map';\nimport {\n  COLUMNS_SUPPORT,\n  FORMATS,\n  GEO_COLUMN_SUPPORT,\n  MapType,\n  MAP_TYPES,\n  TileFormat,\n  QueryParameters\n} from '../api/maps-api-common';\nimport {\n  ClassicCredentials,\n  CloudNativeCredentials,\n  Credentials,\n  getDefaultCredentials\n} from '../config';\nimport {FetchLayerDataResult, Headers} from '../api/maps-v3-client';\nimport {assert} from '../utils';\n\nconst defaultProps = {\n  // (String, required): data resource to load. table name, sql query or tileset name.\n  data: null,\n  // (Enum (MAP_TYPES), required)\n  type: null,\n  onDataLoad: {type: 'function', value: data => {}},\n  onDataError: {type: 'function', value: null, optional: true},\n  uniqueIdProperty: 'cartodb_id',\n\n  // override carto credentials for the layer, set to null to read from default\n  credentials: null,\n\n  /*********************/\n  /* API v3 PARAMETERS */\n  /**********************/\n  // (String, required): connection name at CARTO platform\n  connection: null,\n\n  // (String, optional): format of data\n  format: null,\n\n  // (String, optional): force format of data for tiles\n  formatTiles: null,\n\n  // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.\n  clientId: null,\n\n  // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n  geoColumn: null,\n\n  // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n  columns: {type: 'array', value: null},\n\n  // (Headers, optional): Custom headers to include in the map instantiation request.\n  headers: {type: 'object', value: {}, optional: true},\n\n  // (String, optional): aggregation SQL expression. Only used for spatial index datasets\n  aggregationExp: null,\n\n  // (Number, optional): aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3\n  aggregationResLevel: null,\n\n  // (QueryParameters, optional): query parameters to be sent to the server.\n  queryParameters: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps = _CartoLayerProps & CompositeLayerProps;\n\n/** Properties added by CartoLayer. */\ntype _CartoLayerProps = {\n  /**\n   * Either a SQL query or a name of dataset/tileset.\n   */\n  data: string;\n\n  /**\n   * Data type.\n   *\n   * Possible values are:\n   *  * `MAP_TYPES.QUERY`, if data is a SQL query.\n   *  * `MAP_TYPES.TILESET`, if data is a tileset name.\n   *  * `MAP_TYPES.TABLE`, if data is a dataset name. Only supported with API v3.\n   */\n  type: MapType;\n\n  /**\n   * Name of the connection registered in the CARTO workspace.\n   *\n   * Required when apiVersion is `API_VERSIONS.V3`.\n   */\n  connection?: string;\n\n  /**\n   * Use to override the default tile data format.\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3`.\n   *\n   * Possible values are: `TILE_FORMATS.BINARY`, `TILE_FORMATS.GEOJSON` and `TILE_FORMATS.MVT`.\n   */\n  formatTiles?: TileFormat;\n\n  /**\n   * Name of the geo_column in the CARTO platform.\n   *\n   * Use this override the default column (`'geom'`), from which the geometry information should be fetched.\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3` and type is `MAP_TYPES.TABLE`.\n   */\n  geoColumn?: string;\n\n  /**\n   * Names of columns to fetch.\n   *\n   * By default, all columns are fetched\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3` and type is `MAP_TYPES.TABLE`.\n   */\n  columns?: string[];\n\n  /**\n   * A string pointing to a unique attribute at the result of the query.\n   *\n   * A unique attribute is needed for highlighting with vector tiles when a feature is split across two or more tiles.\n   */\n  uniqueIdProperty?: string;\n\n  /**\n   * Optional. Overrides the configuration to connect with CARTO.\n   *\n   * @see Credentials\n   */\n  credentials?: Credentials;\n\n  /**\n   * Called when the request to the CARTO Maps API failed.\n   *\n   * By default the CartoAPIError is thrown.\n   */\n  onDataError?: (err: CartoAPIError) => void;\n\n  clientId?: string;\n\n  /** Custom headers to include in the map instantiation request **/\n  headers?: Headers;\n\n  /** Aggregation SQL expression. Only used for spatial index datasets **/\n  aggregationExp?: string;\n\n  /** Aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3. **/\n  aggregationResLevel?: number;\n\n  /** Query parameters to be sent to the server. **/\n  queryParameters?: QueryParameters;\n};\n\nexport default class CartoLayer<ExtraProps extends {} = {}> extends CompositeLayer<\n  Required<_CartoLayerProps> & ExtraProps\n> {\n  static layerName = 'CartoLayer';\n  static defaultProps = defaultProps;\n\n  initializeState(): void {\n    this.state = {\n      data: null,\n      apiVersion: null\n    };\n  }\n\n  get isLoaded(): boolean {\n    return this.getSubLayers().length > 0 && super.isLoaded;\n  }\n\n  _checkProps(props: CartoLayerProps): void {\n    const {type, credentials, connection, geoColumn, columns} = props;\n    const localCreds = {...getDefaultCredentials(), ...credentials};\n    const {apiVersion} = localCreds;\n\n    log.assert(\n      Object.values(API_VERSIONS).includes(apiVersion),\n      `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`\n    );\n\n    if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n      log.assert(\n        type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET,\n        `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`\n      );\n      log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);\n      log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);\n      log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);\n    } else if (apiVersion === API_VERSIONS.V3) {\n      log.assert(connection, 'Missing mandatory connection parameter');\n      log.assert(\n        Object.values(MAP_TYPES).includes(type),\n        `Invalid type ${type}. Use MAP_TYPES enum.`\n      );\n      if (!COLUMNS_SUPPORT.includes(type)) {\n        log.assert(!columns, `columns prop is only supported for types: ${COLUMNS_SUPPORT.join()}`);\n      }\n      if (!GEO_COLUMN_SUPPORT.includes(type)) {\n        log.assert(\n          !geoColumn,\n          `geoColumn prop is only supported for types: ${GEO_COLUMN_SUPPORT.join()}`\n        );\n      }\n      if (columns) {\n        log.assert(Array.isArray(columns), 'columns prop must be an Array');\n      }\n    }\n  }\n\n  updateState({props, oldProps, changeFlags}: UpdateParameters<this>) {\n    this._checkProps(props);\n    const shouldUpdateData =\n      changeFlags.dataChanged ||\n      props.aggregationExp !== oldProps.aggregationExp ||\n      props.aggregationResLevel !== oldProps.aggregationResLevel ||\n      props.connection !== oldProps.connection ||\n      props.geoColumn !== oldProps.geoColumn ||\n      props.formatTiles !== oldProps.formatTiles ||\n      props.type !== oldProps.type ||\n      JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n      JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials) ||\n      JSON.stringify(props.queryParameters) !== JSON.stringify(oldProps.queryParameters);\n\n    if (shouldUpdateData) {\n      this.setState({data: null, apiVersion: null});\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this._updateData();\n    }\n  }\n\n  async _updateData(): Promise<void> {\n    try {\n      const {type, data: source, credentials, connection, ...rest} = this.props;\n      const localConfig = {...getDefaultCredentials(), ...credentials};\n      const {apiVersion} = localConfig;\n\n      let result: Partial<FetchLayerDataResult>;\n      if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n        result = {\n          data: await getDataV2({type, source, credentials: credentials as ClassicCredentials})\n        };\n      } else {\n        result = await fetchLayerData({\n          type,\n          source,\n          credentials: credentials as CloudNativeCredentials,\n          connection,\n          ...rest,\n          // CartoLayer only supports tiled output from v8.8, force data format\n          format: FORMATS.TILEJSON\n        });\n      }\n\n      this.setState({...result, apiVersion});\n\n      this.props.onDataLoad?.(result.data, {\n        propName: 'data',\n        layer: this\n      });\n    } catch (err) {\n      if (this.props.onDataError) {\n        this.props.onDataError(err as CartoAPIError);\n      } else {\n        throw err;\n      }\n    }\n  }\n\n  _getSubLayerAndProps(): [any, LayerProps] {\n    assert(this.state);\n\n    const {data, apiVersion} = this.state;\n\n    const {uniqueIdProperty} = defaultProps;\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    const {data: _notUsed, ...propsNoData} = this.props;\n    // @ts-expect-error 'uniqueIdProperty' is specified more than once, so this usage will be overwritten.\n    const props = {uniqueIdProperty, ...propsNoData};\n\n    if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n      return [MVTLayer, props];\n    }\n\n    /* global URL */\n    const tileUrl = new URL(data.tiles[0]);\n    props.formatTiles =\n      props.formatTiles || (tileUrl.searchParams.get('formatTiles') as TileFormat);\n\n    return [layerFromTileDataset(props.formatTiles, data.scheme, props.type), props];\n  }\n\n  renderLayers(): Layer | null {\n    assert(this.state);\n\n    const {apiVersion, data} = this.state;\n\n    if (!data) return null;\n\n    const {credentials, updateTriggers} = this.props;\n    const loadOptions: any = this.getLoadOptions() || {};\n    if (apiVersion === API_VERSIONS.V3) {\n      const localConfig = {...getDefaultCredentials(), ...credentials} as CloudNativeCredentials;\n      const {accessToken} = localConfig;\n      loadOptions.fetch = {\n        ...loadOptions.fetch,\n        headers: {\n          ...loadOptions.fetch?.headers,\n          Authorization: `Bearer ${accessToken}`\n        }\n      };\n    }\n\n    const [layer, props] = this._getSubLayerAndProps();\n\n    // eslint-disable-next-line new-cap\n    return new layer(\n      props,\n      this.getSubLayerProps({\n        id: `carto-${layer.layerName}`,\n        data,\n        loadOptions,\n        updateTriggers\n      })\n    );\n  }\n}\n"],"file":"carto-layer.js"}
+{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","MVTLayer","fetchLayerData","getDataV2","API_VERSIONS","layerFromTileDataset","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","headers","aggregationExp","aggregationResLevel","queryParameters","CartoLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","Object","values","includes","V1","V2","QUERY","TILESET","V3","join","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","TILEJSON","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","tileUrl","URL","tiles","searchParams","get","scheme","renderLayers","updateTriggers","loadOptions","getLoadOptions","accessToken","fetch","Authorization","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {\n  CompositeLayer,\n  CompositeLayerProps,\n  Layer,\n  LayerProps,\n  log,\n  UpdateParameters\n} from '@deck.gl/core';\n\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {CartoAPIError} from '../api/carto-api-error';\nimport {layerFromTileDataset} from '../api/layer-map';\nimport {\n  COLUMNS_SUPPORT,\n  FORMATS,\n  GEO_COLUMN_SUPPORT,\n  MapType,\n  MAP_TYPES,\n  TileFormat,\n  QueryParameters\n} from '../api/maps-api-common';\nimport {\n  ClassicCredentials,\n  CloudNativeCredentials,\n  Credentials,\n  getDefaultCredentials\n} from '../config';\nimport {FetchLayerDataResult, Headers} from '../api/maps-v3-client';\nimport {assert} from '../utils';\n\nconst defaultProps = {\n  // (String, required): data resource to load. table name, sql query or tileset name.\n  data: null,\n  // (Enum (MAP_TYPES), required)\n  type: null,\n  onDataLoad: {type: 'function', value: data => {}},\n  onDataError: {type: 'function', value: null, optional: true},\n  uniqueIdProperty: 'cartodb_id',\n\n  // override carto credentials for the layer, set to null to read from default\n  credentials: null,\n\n  /*********************/\n  /* API v3 PARAMETERS */\n  /**********************/\n  // (String, required): connection name at CARTO platform\n  connection: null,\n\n  // (String, optional): format of data\n  format: null,\n\n  // (String, optional): force format of data for tiles\n  formatTiles: null,\n\n  // (String, optional): clientId identifier used for internal tracing, place here a string to identify the client who is doing the request.\n  clientId: null,\n\n  // (String, optional): name of the `geo_column` in the CARTO platform. Use this override the default column ('geom'), from which the geometry information should be fetched.\n  geoColumn: null,\n\n  // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.\n  columns: {type: 'array', value: null},\n\n  // (Headers, optional): Custom headers to include in the map instantiation request.\n  headers: {type: 'object', value: {}, optional: true},\n\n  // (String, optional): aggregation SQL expression. Only used for spatial index datasets\n  aggregationExp: null,\n\n  // (Number, optional): aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3\n  aggregationResLevel: null,\n\n  // (QueryParameters, optional): query parameters to be sent to the server.\n  queryParameters: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps = _CartoLayerProps & CompositeLayerProps;\n\n/** Properties added by CartoLayer. */\ntype _CartoLayerProps = {\n  /**\n   * Either a SQL query or a name of dataset/tileset.\n   */\n  data: string;\n\n  /**\n   * Data type.\n   *\n   * Possible values are:\n   *  * `MAP_TYPES.QUERY`, if data is a SQL query.\n   *  * `MAP_TYPES.TILESET`, if data is a tileset name.\n   *  * `MAP_TYPES.TABLE`, if data is a dataset name. Only supported with API v3.\n   */\n  type: MapType;\n\n  /**\n   * Name of the connection registered in the CARTO workspace.\n   *\n   * Required when apiVersion is `API_VERSIONS.V3`.\n   */\n  connection?: string;\n\n  /**\n   * Use to override the default tile data format.\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3`.\n   *\n   * Possible values are: `TILE_FORMATS.BINARY`, `TILE_FORMATS.GEOJSON` and `TILE_FORMATS.MVT`.\n   */\n  formatTiles?: TileFormat;\n\n  /**\n   * Name of the geo_column in the CARTO platform.\n   *\n   * Use this override the default column (`'geom'`), from which the geometry information should be fetched.\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3` and type is `MAP_TYPES.TABLE`.\n   */\n  geoColumn?: string;\n\n  /**\n   * Names of columns to fetch.\n   *\n   * By default, all columns are fetched\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3` and type is `MAP_TYPES.TABLE`.\n   */\n  columns?: string[];\n\n  /**\n   * A string pointing to a unique attribute at the result of the query.\n   *\n   * A unique attribute is needed for highlighting with vector tiles when a feature is split across two or more tiles.\n   */\n  uniqueIdProperty?: string;\n\n  /**\n   * Optional. Overrides the configuration to connect with CARTO.\n   *\n   * @see Credentials\n   */\n  credentials?: Credentials;\n\n  /**\n   * Called when the request to the CARTO Maps API failed.\n   *\n   * By default the CartoAPIError is thrown.\n   */\n  onDataError?: (err: CartoAPIError) => void;\n\n  clientId?: string;\n\n  /** Custom headers to include in the map instantiation request **/\n  headers?: Headers;\n\n  /** Aggregation SQL expression. Only used for spatial index datasets **/\n  aggregationExp?: string;\n\n  /** Aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3. **/\n  aggregationResLevel?: number;\n\n  /** Query parameters to be sent to the server. **/\n  queryParameters?: QueryParameters;\n};\n\nexport default class CartoLayer<ExtraProps extends {} = {}> extends CompositeLayer<\n  Required<_CartoLayerProps> & ExtraProps\n> {\n  static layerName = 'CartoLayer';\n  static defaultProps = defaultProps;\n\n  initializeState(): void {\n    this.state = {\n      data: null,\n      apiVersion: null\n    };\n  }\n\n  get isLoaded(): boolean {\n    return this.getSubLayers().length > 0 && super.isLoaded;\n  }\n\n  _checkProps(props: CartoLayerProps): void {\n    const {type, credentials, connection, geoColumn, columns} = props;\n    const localCreds = {...getDefaultCredentials(), ...credentials};\n    const {apiVersion} = localCreds;\n\n    log.assert(\n      Object.values(API_VERSIONS).includes(apiVersion),\n      `Invalid apiVersion ${apiVersion}. Use API_VERSIONS enum.`\n    );\n\n    if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n      log.assert(\n        type === MAP_TYPES.QUERY || type === MAP_TYPES.TILESET,\n        `Invalid type ${type}. Use type MAP_TYPES.QUERY or MAP_TYPES.TILESET for apiVersion ${apiVersion}`\n      );\n      log.assert(!connection, `Connection prop is not supported for apiVersion ${apiVersion}`);\n      log.assert(!geoColumn, `geoColumn prop is not supported for apiVersion ${apiVersion}`);\n      log.assert(!columns, `columns prop is not supported for apiVersion ${apiVersion}`);\n    } else if (apiVersion === API_VERSIONS.V3) {\n      log.assert(connection, 'Missing mandatory connection parameter');\n      log.assert(\n        Object.values(MAP_TYPES).includes(type),\n        `Invalid type ${type}. Use MAP_TYPES enum.`\n      );\n      if (!COLUMNS_SUPPORT.includes(type)) {\n        log.assert(!columns, `columns prop is only supported for types: ${COLUMNS_SUPPORT.join()}`);\n      }\n      if (!GEO_COLUMN_SUPPORT.includes(type)) {\n        log.assert(\n          !geoColumn,\n          `geoColumn prop is only supported for types: ${GEO_COLUMN_SUPPORT.join()}`\n        );\n      }\n      if (columns) {\n        log.assert(Array.isArray(columns), 'columns prop must be an Array');\n      }\n    }\n  }\n\n  updateState({props, oldProps, changeFlags}: UpdateParameters<this>) {\n    this._checkProps(props);\n    const shouldUpdateData =\n      changeFlags.dataChanged ||\n      props.aggregationExp !== oldProps.aggregationExp ||\n      props.aggregationResLevel !== oldProps.aggregationResLevel ||\n      props.connection !== oldProps.connection ||\n      props.geoColumn !== oldProps.geoColumn ||\n      props.formatTiles !== oldProps.formatTiles ||\n      props.type !== oldProps.type ||\n      JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||\n      JSON.stringify(props.credentials) !== JSON.stringify(oldProps.credentials) ||\n      JSON.stringify(props.queryParameters) !== JSON.stringify(oldProps.queryParameters);\n\n    if (shouldUpdateData) {\n      this.setState({data: null, apiVersion: null});\n      // eslint-disable-next-line @typescript-eslint/no-floating-promises\n      this._updateData();\n    }\n  }\n\n  async _updateData(): Promise<void> {\n    try {\n      const {type, data: source, credentials, connection, ...rest} = this.props;\n      const localConfig = {...getDefaultCredentials(), ...credentials};\n      const {apiVersion} = localConfig;\n\n      let result: Partial<FetchLayerDataResult>;\n      if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n        result = {\n          data: await getDataV2({type, source, credentials: credentials as ClassicCredentials})\n        };\n      } else {\n        result = await fetchLayerData({\n          type,\n          source,\n          credentials: credentials as CloudNativeCredentials,\n          connection,\n          ...rest,\n          // CartoLayer only supports tiled output from v8.8, force data format\n          format: FORMATS.TILEJSON\n        });\n      }\n\n      this.setState({...result, apiVersion});\n\n      this.props.onDataLoad?.(result.data, {\n        propName: 'data',\n        layer: this\n      });\n    } catch (err) {\n      if (this.props.onDataError) {\n        this.props.onDataError(err as CartoAPIError);\n      } else {\n        throw err;\n      }\n    }\n  }\n\n  _getSubLayerAndProps(): [any, LayerProps] {\n    assert(this.state);\n\n    const {data, apiVersion} = this.state;\n\n    const {uniqueIdProperty} = defaultProps;\n    // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    const {data: _notUsed, ...propsNoData} = this.props;\n    // @ts-expect-error 'uniqueIdProperty' is specified more than once, so this usage will be overwritten.\n    const props = {uniqueIdProperty, ...propsNoData};\n\n    if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n      return [MVTLayer, props];\n    }\n\n    /* global URL */\n    const tileUrl = new URL(data.tiles[0]);\n    props.formatTiles =\n      props.formatTiles || (tileUrl.searchParams.get('formatTiles') as TileFormat);\n\n    return [layerFromTileDataset(props.formatTiles, data.scheme, props.type), props];\n  }\n\n  renderLayers(): Layer | null {\n    assert(this.state);\n\n    const {apiVersion, data} = this.state;\n\n    if (!data) return null;\n\n    const {credentials, updateTriggers} = this.props;\n    const loadOptions: any = this.getLoadOptions() || {};\n    if (apiVersion === API_VERSIONS.V3) {\n      const localConfig = {...getDefaultCredentials(), ...credentials} as CloudNativeCredentials;\n      const {accessToken} = localConfig;\n      loadOptions.fetch = {\n        ...loadOptions.fetch,\n        headers: {\n          ...loadOptions.fetch?.headers,\n          Authorization: `Bearer ${accessToken}`\n        }\n      };\n    }\n\n    const [layer, props] = this._getSubLayerAndProps();\n\n    // eslint-disable-next-line new-cap\n    return new layer(\n      props,\n      this.getSubLayerProps({\n        id: `carto-${layer.layerName}`,\n        data,\n        loadOptions,\n        updateTriggers\n      })\n    );\n  }\n}\n"],"file":"carto-layer.js"}

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

@@ -1,8 +1,9 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { CompositeLayer } from '@deck.gl/core';
 import { H3HexagonLayer } from '@deck.gl/geo-layers';
 import H3Tileset2D, { getHexagonResolution } from './h3-tileset-2d';
 import SpatialIndexTileLayer from './spatial-index-tile-layer';
+import { TilejsonPropType } from '../sources/common';
+import { injectAccessToken } from './utils';
 
 const renderSubLayers = props => {
   const {
@@ -20,47 +21,34 @@ const renderSubLayers = props => {
 };
 
 const defaultProps = {
-  aggregationResLevel: 4
+  aggregationResLevel: 4,
+  data: TilejsonPropType
 };
 export default class H3TileLayer extends CompositeLayer {
-  constructor(...args) {
-    super(...args);
-
-    _defineProperty(this, "state", void 0);
-  }
-
   initializeState() {
     H3HexagonLayer._checkH3Lib();
-
-    this.setState({
-      data: null,
-      tileJSON: null
-    });
   }
 
-  updateState({
-    changeFlags
-  }) {
-    if (changeFlags.dataChanged) {
-      let {
-        data
-      } = this.props;
-      const tileJSON = data;
-      data = tileJSON.tiles;
-      this.setState({
-        data,
-        tileJSON
-      });
-    }
+  getLoadOptions() {
+    const loadOptions = super.getLoadOptions() || {};
+    const tileJSON = this.props.data;
+    injectAccessToken(loadOptions, tileJSON.accessToken);
+    loadOptions.cartoSpatialTile = { ...loadOptions.cartoSpatialTile,
+      scheme: 'h3'
+    };
+    return loadOptions;
   }
 
   renderLayers() {
+    const tileJSON = this.props.data;
+    if (!tileJSON) return null;
     const {
-      data,
-      tileJSON
-    } = this.state;
-    let minresolution = parseInt(tileJSON.minresolution);
-    let maxresolution = parseInt(tileJSON.maxresolution);
+      tiles: data
+    } = tileJSON;
+    let {
+      minresolution,
+      maxresolution
+    } = tileJSON;
 
     if (this.props.minZoom) {
       minresolution = Math.max(minresolution, getHexagonResolution({
@@ -77,24 +65,17 @@ export default class H3TileLayer extends CompositeLayer {
     }
 
     return [new SpatialIndexTileLayer(this.props, {
-      id: "h3-tile-layer-".concat(this.props.id),
+      id: `h3-tile-layer-${this.props.id}`,
       data,
       TilesetClass: H3Tileset2D,
       renderSubLayers,
       minZoom: minresolution,
       maxZoom: maxresolution,
-      loadOptions: { ...this.getLoadOptions(),
-        cartoSpatialTile: {
-          scheme: 'h3'
-        },
-        mimeType: 'application/vnd.carto-spatial-tile'
-      }
+      loadOptions: this.getLoadOptions()
     })];
   }
 
 }
-
-_defineProperty(H3TileLayer, "layerName", 'H3TileLayer');
-
-_defineProperty(H3TileLayer, "defaultProps", defaultProps);
+H3TileLayer.layerName = 'H3TileLayer';
+H3TileLayer.defaultProps = defaultProps;
 //# sourceMappingURL=h3-tile-layer.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","getHexagonResolution","SpatialIndexTileLayer","renderSubLayers","props","data","index","tile","length","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","_checkH3Lib","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","minresolution","parseInt","maxresolution","minZoom","Math","max","zoom","latitude","maxZoom","min","TilesetClass","loadOptions","getLoadOptions","cartoSpatialTile","scheme","mimeType"],"mappings":"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","sourcesContent":["import {\n  CompositeLayer,\n  CompositeLayerProps,\n  Layer,\n  LayersList,\n  UpdateParameters,\n  DefaultProps\n} from '@deck.gl/core';\nimport {H3HexagonLayer} from '@deck.gl/geo-layers';\nimport H3Tileset2D, {getHexagonResolution} from './h3-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\n\nconst renderSubLayers = props => {\n  const {data} = props;\n  const {index} = props.tile;\n  if (!data || !data.length) return null;\n\n  return new H3HexagonLayer(props, {\n    getHexagon: d => d.id,\n    centerHexagon: index,\n    highPrecision: true\n  });\n};\n\nconst defaultProps: DefaultProps<H3HexagonLayerProps> = {\n  aggregationResLevel: 4\n};\n\n/** All properties supported by H3TileLayer. */\nexport type H3TileLayerProps<DataT = any> = _H3TileLayerProps<DataT> & CompositeLayerProps;\n\n// TODO: use type from h3-hexagon-layer when available\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\ntype H3HexagonLayerProps<DataT = any> = Record<string, any>;\n\n/** Properties added by H3TileLayer. */\ntype _H3TileLayerProps<DataT> = H3HexagonLayerProps<DataT> & {\n  data: string;\n  aggregationResLevel?: number;\n};\n\nexport default class H3TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<\n  ExtraPropsT & Required<_H3TileLayerProps<DataT>>\n> {\n  static layerName = 'H3TileLayer';\n  static defaultProps = defaultProps;\n\n  state!: {\n    tileJSON: any;\n    data: any;\n  };\n\n  initializeState(): void {\n    H3HexagonLayer._checkH3Lib();\n    this.setState({data: null, tileJSON: null});\n  }\n\n  updateState({changeFlags}: UpdateParameters<this>): void {\n    if (changeFlags.dataChanged) {\n      let {data} = this.props;\n      const tileJSON = data;\n      data = (tileJSON as any).tiles;\n      this.setState({data, tileJSON});\n    }\n  }\n\n  renderLayers(): Layer | null | LayersList {\n    const {data, tileJSON} = this.state;\n    let minresolution = parseInt(tileJSON.minresolution);\n    let maxresolution = parseInt(tileJSON.maxresolution);\n\n    // Convert Mercator zooms provided in props into H3 res levels\n    // and clip into valid range provided from the tilejson\n    if (this.props.minZoom) {\n      minresolution = Math.max(\n        minresolution,\n        getHexagonResolution({zoom: this.props.minZoom, latitude: 0})\n      );\n    }\n    if (this.props.maxZoom) {\n      maxresolution = Math.min(\n        maxresolution,\n        getHexagonResolution({zoom: this.props.maxZoom, latitude: 0})\n      );\n    }\n\n    // The naming is unfortunate, but minZoom & maxZoom in the context\n    // of a Tileset2D refer to the resolution levels, not the Mercator zooms\n    return [\n      new SpatialIndexTileLayer(this.props, {\n        id: `h3-tile-layer-${this.props.id}`,\n        data,\n        // @ts-expect-error Tileset2D should be generic over TileIndex\n        TilesetClass: H3Tileset2D,\n        renderSubLayers,\n        // minZoom and maxZoom are H3 resolutions, however we must use this naming as that is what the Tileset2D class expects\n        minZoom: minresolution,\n        maxZoom: maxresolution,\n        loadOptions: {\n          ...this.getLoadOptions(),\n          cartoSpatialTile: {scheme: 'h3'},\n          mimeType: 'application/vnd.carto-spatial-tile'\n        }\n      })\n    ];\n  }\n}\n"],"file":"h3-tile-layer.js"}
+{"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","getHexagonResolution","SpatialIndexTileLayer","TilejsonPropType","injectAccessToken","renderSubLayers","props","data","index","tile","length","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","_checkH3Lib","getLoadOptions","loadOptions","tileJSON","accessToken","cartoSpatialTile","scheme","renderLayers","tiles","minresolution","maxresolution","minZoom","Math","max","zoom","latitude","maxZoom","min","TilesetClass","layerName"],"mappings":"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","sourcesContent":["import {CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps} from '@deck.gl/core';\nimport {H3HexagonLayer} from '@deck.gl/geo-layers';\nimport H3Tileset2D, {getHexagonResolution} from './h3-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\nimport {TilejsonPropType, CartoTilejsonResult} from '../sources/common';\nimport {injectAccessToken} from './utils';\n\nconst renderSubLayers = (props: H3HexagonLayerProps) => {\n  const {data} = props;\n  const {index} = props.tile;\n  if (!data || !data.length) return null;\n\n  return new H3HexagonLayer(props, {\n    getHexagon: d => d.id,\n    centerHexagon: index,\n    highPrecision: true\n  });\n};\n\nconst defaultProps: DefaultProps<H3HexagonLayerProps> = {\n  aggregationResLevel: 4,\n  data: TilejsonPropType\n};\n\n/** All properties supported by H3TileLayer. */\nexport type H3TileLayerProps<DataT = any> = _H3TileLayerProps<DataT> & CompositeLayerProps;\n\n// TODO: use type from h3-hexagon-layer when available\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\ntype H3HexagonLayerProps<DataT = any> = Record<string, any>;\n\n/** Properties added by H3TileLayer. */\ntype _H3TileLayerProps<DataT> = Omit<H3HexagonLayerProps<DataT>, 'data'> & {\n  data: null | CartoTilejsonResult | Promise<CartoTilejsonResult>;\n  aggregationResLevel?: number;\n};\n\nexport default class H3TileLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<\n  ExtraPropsT & Required<_H3TileLayerProps<DataT>>\n> {\n  static layerName = 'H3TileLayer';\n  static defaultProps = defaultProps;\n\n  initializeState(): void {\n    H3HexagonLayer._checkH3Lib();\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.cartoSpatialTile = {...loadOptions.cartoSpatialTile, scheme: 'h3'};\n    return loadOptions;\n  }\n\n  renderLayers(): Layer | null | LayersList {\n    const tileJSON = this.props.data as CartoTilejsonResult;\n    if (!tileJSON) return null;\n\n    const {tiles: data} = tileJSON;\n    let {minresolution, maxresolution} = tileJSON;\n    // Convert Mercator zooms provided in props into H3 res levels\n    // and clip into valid range provided from the tilejson\n    if (this.props.minZoom) {\n      minresolution = Math.max(\n        minresolution,\n        getHexagonResolution({zoom: this.props.minZoom, latitude: 0})\n      );\n    }\n    if (this.props.maxZoom) {\n      maxresolution = Math.min(\n        maxresolution,\n        getHexagonResolution({zoom: this.props.maxZoom, latitude: 0})\n      );\n    }\n\n    // The naming is unfortunate, but minZoom & maxZoom in the context\n    // of a Tileset2D refer to the resolution levels, not the Mercator zooms\n    return [\n      // @ts-ignore\n      new SpatialIndexTileLayer(this.props, {\n        id: `h3-tile-layer-${this.props.id}`,\n        data,\n        // TODO: Tileset2D should be generic over TileIndex type\n        TilesetClass: H3Tileset2D as any,\n        renderSubLayers,\n        // minZoom and maxZoom are H3 resolutions, however we must use this naming as that is what the Tileset2D class expects\n        minZoom: minresolution,\n        maxZoom: maxresolution,\n        loadOptions: this.getLoadOptions()\n      })\n    ];\n  }\n}\n"],"file":"h3-tile-layer.js"}

package/dist/esm/layers/point-label-layer.js

@@ -1,4 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { CompositeLayer } from '@deck.gl/core';
 import { TextLayer, _TextBackgroundLayer as TextBackgroundLayer } from '@deck.gl/layers';
 const [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];
@@ -16,7 +15,7 @@ class EnhancedTextBackgroundLayer extends TextBackgroundLayer {
 
 }
 
-_defineProperty(EnhancedTextBackgroundLayer, "layerName", 'EnhancedTextBackgroundLayer');
+EnhancedTextBackgroundLayer.layerName = 'EnhancedTextBackgroundLayer';
 
 class EnhancedTextLayer extends TextLayer {
   filterSubLayer({
@@ -34,8 +33,7 @@ class EnhancedTextLayer extends TextLayer {
 
 }
 
-_defineProperty(EnhancedTextLayer, "layerName", 'EnhancedTextLayer');
-
+EnhancedTextLayer.layerName = 'EnhancedTextLayer';
 const defaultProps = { ...TextLayer.defaultProps,
   getRadius: {
     type: 'accessor',
@@ -168,12 +166,12 @@ export default class PointLabelLayer extends CompositeLayer {
     } = this.props;
     const getPixelOffset = this.calculatePixelOffset(false);
     const backgroundPadding = this.calculateBackgroundPadding();
-    const out = [this.renderTextLayer("".concat(updateTriggers.getText, "-primary"), {
+    const out = [this.renderTextLayer(`${updateTriggers.getText}-primary`, {
       backgroundPadding,
       getText,
       getPixelOffset,
       background: true
-    }), Boolean(getSecondaryText) && this.renderTextLayer("".concat(updateTriggers.getSecondaryText, "-secondary"), {
+    }), Boolean(getSecondaryText) && this.renderTextLayer(`${updateTriggers.getSecondaryText}-secondary`, {
       getText: getSecondaryText,
       getPixelOffset: this.calculatePixelOffset(true),
       getAlignmentBaseline: 'top',
@@ -191,8 +189,6 @@ export default class PointLabelLayer extends CompositeLayer {
   }
 
 }
-
-_defineProperty(PointLabelLayer, "layerName", 'PointLabelLayer');
-
-_defineProperty(PointLabelLayer, "defaultProps", defaultProps);
+PointLabelLayer.layerName = 'PointLabelLayer';
+PointLabelLayer.defaultProps = defaultProps;
 //# sourceMappingURL=point-label-layer.js.map

package/dist/esm/layers/point-label-layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/point-label-layer.ts"],"names":["CompositeLayer","TextLayer","_TextBackgroundLayer","TextBackgroundLayer","LEFT","TOP","RIGHT","BOTTOM","EnhancedTextBackgroundLayer","getShaders","shaders","vs","replaceAll","replace","EnhancedTextLayer","filterSubLayer","layer","renderPass","background","id","includes","defaultProps","getRadius","type","value","radiusScale","min","PointLabelLayer","calculatePixelOffset","secondary","getTextAnchor","anchor","getAlignmentBaseline","alignment","getSecondaryText","secondarySizeScale","sizeScale","props","xMult","yMult","xPadding","yPadding","secondaryOffset","yOffset","radiusPadding","d","info","r","calculateBackgroundPadding","paddingX","paddingY","backgroundPadding","renderTextLayer","updateTriggers","updateTriggersOverride","data","characterSet","fontFamily","fontSettings","fontWeight","outlineColor","outlineWidth","getColor","getPosition","getSubLayerProps","getPixelOffset","getSize","_subLayerProps","renderLayers","getText","getSecondaryColor","secondaryOutlineColor","out","Boolean"],"mappings":"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","sourcesContent":["import {\n  Accessor,\n  Color,\n  CompositeLayer,\n  CompositeLayerProps,\n  DefaultProps,\n  Layer,\n  LayersList\n} from '@deck.gl/core';\nimport {\n  TextLayer,\n  TextLayerProps,\n  _TextBackgroundLayer as TextBackgroundLayer\n} from '@deck.gl/layers';\n\nconst [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];\n\nclass EnhancedTextBackgroundLayer extends TextBackgroundLayer {\n  static layerName = 'EnhancedTextBackgroundLayer';\n\n  getShaders() {\n    const shaders = super.getShaders();\n    let vs = shaders.vs;\n\n    // Modify shader so that the padding is offset by the pixel offset to ensure the padding\n    // always captures the anchor point. As padding is uniform we cannot pass it a per-label value\n    vs = vs.replaceAll('padding.', '_padding.');\n    vs = vs.replace(\n      'void main(void) {',\n      'void main(void) {\\n  vec4 _padding = padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);'\n    );\n\n    return {...shaders, vs};\n  }\n}\n\n// TextLayer which includes modified text-background-layer-vertex shader and only renders the\n// primary background layer in the collision pass\nclass EnhancedTextLayer extends TextLayer {\n  static layerName = 'EnhancedTextLayer';\n\n  filterSubLayer({layer, renderPass}) {\n    const background = layer.id.includes('primary-background');\n    if (renderPass === 'collision') {\n      return background; // Only draw primary background layer in collision pass\n    }\n\n    return !background; // Do not draw background layer in other passes\n  }\n}\n\nconst defaultProps: DefaultProps<PointLabelLayerProps> = {\n  ...TextLayer.defaultProps,\n  getRadius: {type: 'accessor', value: 1},\n  radiusScale: {type: 'number', min: 0, value: 1}\n};\n\n/** All properties supported by PointLabelLayer. */\nexport type PointLabelLayerProps<DataT = any> = _PointLabelLayerProps<DataT> &\n  TextLayerProps &\n  CompositeLayerProps;\n\n/** Properties added by PointLabelLayer. */\ntype _PointLabelLayerProps<DataT> = TextLayerProps<DataT> & {\n  /**\n   * Radius multiplier.\n   * @default 1\n   */\n  radiusScale?: number;\n  /**\n   * Radius accessor.\n   * @default 1\n   */\n  getRadius?: Accessor<DataT, number>;\n  /**\n   * Secondary label text accessor\n   */\n  getSecondaryText?: Accessor<DataT, string>;\n  /**\n   * Secondary label color accessor\n   * @default [0, 0, 0, 255]\n   */\n  getSecondaryColor?: Accessor<DataT, Color>;\n  /**\n   * Secondary label color of outline around the text, in `[r, g, b, [a]]`. Each channel is a number between 0-255 and `a` is 255 if not supplied.\n   * @default [0, 0, 0, 255]\n   */\n  secondaryOutlineColor?: Color;\n  /**\n   * Secondary label text size multiplier.\n   * @default 1\n   */\n  secondarySizeScale?: number;\n};\n\nexport default class PointLabelLayer<\n  DataT = any,\n  ExtraProps extends {} = {}\n> extends CompositeLayer<ExtraProps & Required<_PointLabelLayerProps<DataT>>> {\n  static layerName = 'PointLabelLayer';\n  static defaultProps = defaultProps;\n\n  calculatePixelOffset(secondary) {\n    const {\n      getTextAnchor: anchor,\n      getAlignmentBaseline: alignment,\n      getRadius,\n      getSecondaryText,\n      radiusScale,\n      secondarySizeScale,\n      sizeScale\n    } = this.props;\n    const xMult = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;\n    const yMult = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1;\n\n    // Padding based on font size (font size / 4)\n    const xPadding = sizeScale / 4;\n    const yPadding = sizeScale * (1 + 1 / 4);\n\n    // Place secondary label under main label (secondary label always 'top' baseline aligned)\n    const secondaryOffset = 0.6 * (1 - yMult) * sizeScale;\n    let yOffset = secondary ? secondaryOffset : 0;\n\n    // Special case, position relative to secondary label\n    if (anchor === 'middle' && alignment === 'top' && getSecondaryText) {\n      yOffset -= secondaryOffset;\n      yOffset -= secondarySizeScale;\n      yOffset += sizeScale;\n    }\n\n    // Padding based on point radius (radius/ 4)\n    const radiusPadding = 1 + 1 / 4;\n\n    return typeof getRadius === 'function'\n      ? (d, info) => {\n          const r = (info ? getRadius(d, info) : 1) * radiusScale * radiusPadding;\n          return [xMult * (r + xPadding), yMult * (r + yPadding) + yOffset];\n        }\n      : [\n          xMult * (getRadius * radiusScale * radiusPadding + xPadding),\n          yMult * (getRadius * radiusScale * radiusPadding + yPadding) + yOffset\n        ];\n  }\n\n  calculateBackgroundPadding() {\n    const {getTextAnchor: anchor, getAlignmentBaseline: alignment, sizeScale} = this.props;\n\n    // Heuristics to avoid label overlap\n    const paddingX = 12 * sizeScale;\n    const paddingY = 3 * sizeScale;\n    const backgroundPadding = [0, 0, 0, 0];\n    if (alignment === 'top') {\n      backgroundPadding[TOP] = paddingY;\n    } else if (alignment === 'bottom') {\n      backgroundPadding[BOTTOM] = paddingY;\n    } else {\n      backgroundPadding[TOP] = 0.5 * paddingY;\n      backgroundPadding[BOTTOM] = 0.5 * paddingY;\n    }\n    if (anchor === 'start') {\n      backgroundPadding[LEFT] = paddingX;\n    } else if (anchor === 'end') {\n      backgroundPadding[RIGHT] = paddingX;\n    } else {\n      backgroundPadding[LEFT] = 0.5 * paddingX;\n      backgroundPadding[RIGHT] = 0.5 * paddingX;\n    }\n\n    return backgroundPadding;\n  }\n\n  renderTextLayer(id, {updateTriggers: updateTriggersOverride = {}, ...props}): EnhancedTextLayer {\n    const {\n      data,\n\n      characterSet,\n      fontFamily,\n      fontSettings,\n      fontWeight,\n      outlineColor,\n      outlineWidth,\n      sizeScale,\n      radiusScale,\n\n      getAlignmentBaseline,\n      getColor,\n      getPosition,\n      getTextAnchor,\n\n      updateTriggers\n    } = this.props;\n\n    return new EnhancedTextLayer(\n      this.getSubLayerProps({\n        id,\n        data,\n\n        characterSet,\n        fontFamily,\n        fontSettings,\n        fontWeight,\n        outlineColor,\n        outlineWidth,\n        sizeScale,\n\n        getAlignmentBaseline,\n        getColor,\n        getPosition,\n        getTextAnchor,\n\n        updateTriggers: {\n          ...updateTriggers,\n          ...updateTriggersOverride,\n          getPixelOffset: [\n            updateTriggers.getRadius,\n            updateTriggers.getTextAnchor,\n            updateTriggers.getAlignmentBaseline,\n            radiusScale,\n            sizeScale\n          ]\n        }\n      }),\n      {\n        getSize: 1,\n        _subLayerProps: {background: {type: EnhancedTextBackgroundLayer}}\n      },\n      props\n    );\n  }\n\n  renderLayers(): Layer | null | LayersList {\n    const {\n      getText,\n      getSecondaryColor,\n      getSecondaryText,\n      secondaryOutlineColor,\n      secondarySizeScale,\n      updateTriggers\n    } = this.props;\n    const getPixelOffset = this.calculatePixelOffset(false);\n    const backgroundPadding = this.calculateBackgroundPadding();\n    const out = [\n      // Text doesn't update via updateTrigger for some reason\n      this.renderTextLayer(`${updateTriggers.getText}-primary`, {\n        backgroundPadding,\n        getText,\n        getPixelOffset,\n        background: true // Only use background for primary label for faster collisions\n      }),\n      Boolean(getSecondaryText) &&\n        this.renderTextLayer(`${updateTriggers.getSecondaryText}-secondary`, {\n          getText: getSecondaryText,\n          getPixelOffset: this.calculatePixelOffset(true),\n          getAlignmentBaseline: 'top',\n          // updateTriggers: {getText: updateTriggers.getSecondaryText},\n\n          // Optional overrides\n          ...(getSecondaryColor && {getColor: getSecondaryColor}),\n          ...(secondarySizeScale && {sizeScale: secondarySizeScale}),\n          ...(secondaryOutlineColor && {outlineColor: secondaryOutlineColor})\n        })\n    ];\n\n    return out;\n  }\n}\n"],"file":"point-label-layer.js"}
+{"version":3,"sources":["../../../src/layers/point-label-layer.ts"],"names":["CompositeLayer","TextLayer","_TextBackgroundLayer","TextBackgroundLayer","LEFT","TOP","RIGHT","BOTTOM","EnhancedTextBackgroundLayer","getShaders","shaders","vs","replaceAll","replace","layerName","EnhancedTextLayer","filterSubLayer","layer","renderPass","background","id","includes","defaultProps","getRadius","type","value","radiusScale","min","PointLabelLayer","calculatePixelOffset","secondary","getTextAnchor","anchor","getAlignmentBaseline","alignment","getSecondaryText","secondarySizeScale","sizeScale","props","xMult","yMult","xPadding","yPadding","secondaryOffset","yOffset","radiusPadding","d","info","r","calculateBackgroundPadding","paddingX","paddingY","backgroundPadding","renderTextLayer","updateTriggers","updateTriggersOverride","data","characterSet","fontFamily","fontSettings","fontWeight","outlineColor","outlineWidth","getColor","getPosition","getSubLayerProps","getPixelOffset","getSize","_subLayerProps","renderLayers","getText","getSecondaryColor","secondaryOutlineColor","out","Boolean"],"mappings":"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","sourcesContent":["import {\n  Accessor,\n  Color,\n  CompositeLayer,\n  CompositeLayerProps,\n  DefaultProps,\n  Layer,\n  LayersList\n} from '@deck.gl/core';\nimport {\n  TextLayer,\n  TextLayerProps,\n  _TextBackgroundLayer as TextBackgroundLayer\n} from '@deck.gl/layers';\n\nconst [LEFT, TOP, RIGHT, BOTTOM] = [0, 1, 2, 3];\n\nclass EnhancedTextBackgroundLayer extends TextBackgroundLayer {\n  static layerName = 'EnhancedTextBackgroundLayer';\n\n  getShaders() {\n    const shaders = super.getShaders();\n    let vs = shaders.vs;\n\n    // Modify shader so that the padding is offset by the pixel offset to ensure the padding\n    // always captures the anchor point. As padding is uniform we cannot pass it a per-label value\n    vs = vs.replaceAll('padding.', '_padding.');\n    vs = vs.replace(\n      'void main(void) {',\n      'void main(void) {\\n  vec4 _padding = padding + instancePixelOffsets.xyxy * vec4(1.0, 1.0, -1.0, -1.0);'\n    );\n\n    return {...shaders, vs};\n  }\n}\n\n// TextLayer which includes modified text-background-layer-vertex shader and only renders the\n// primary background layer in the collision pass\nclass EnhancedTextLayer extends TextLayer {\n  static layerName = 'EnhancedTextLayer';\n\n  filterSubLayer({layer, renderPass}) {\n    const background = layer.id.includes('primary-background');\n    if (renderPass === 'collision') {\n      return background; // Only draw primary background layer in collision pass\n    }\n\n    return !background; // Do not draw background layer in other passes\n  }\n}\n\nconst defaultProps: DefaultProps<PointLabelLayerProps> = {\n  ...TextLayer.defaultProps,\n  getRadius: {type: 'accessor', value: 1},\n  radiusScale: {type: 'number', min: 0, value: 1}\n};\n\n/** All properties supported by PointLabelLayer. */\nexport type PointLabelLayerProps<DataT = any> = _PointLabelLayerProps<DataT> &\n  TextLayerProps &\n  CompositeLayerProps;\n\n/** Properties added by PointLabelLayer. */\ntype _PointLabelLayerProps<DataT> = TextLayerProps<DataT> & {\n  /**\n   * Radius multiplier.\n   * @default 1\n   */\n  radiusScale?: number;\n  /**\n   * Radius accessor.\n   * @default 1\n   */\n  getRadius?: Accessor<DataT, number>;\n  /**\n   * Secondary label text accessor\n   */\n  getSecondaryText?: Accessor<DataT, string>;\n  /**\n   * Secondary label color accessor\n   * @default [0, 0, 0, 255]\n   */\n  getSecondaryColor?: Accessor<DataT, Color>;\n  /**\n   * Secondary label color of outline around the text, in `[r, g, b, [a]]`. Each channel is a number between 0-255 and `a` is 255 if not supplied.\n   * @default [0, 0, 0, 255]\n   */\n  secondaryOutlineColor?: Color;\n  /**\n   * Secondary label text size multiplier.\n   * @default 1\n   */\n  secondarySizeScale?: number;\n};\n\nexport default class PointLabelLayer<\n  DataT = any,\n  ExtraProps extends {} = {}\n> extends CompositeLayer<ExtraProps & Required<_PointLabelLayerProps<DataT>>> {\n  static layerName = 'PointLabelLayer';\n  static defaultProps = defaultProps;\n\n  calculatePixelOffset(secondary) {\n    const {\n      getTextAnchor: anchor,\n      getAlignmentBaseline: alignment,\n      getRadius,\n      getSecondaryText,\n      radiusScale,\n      secondarySizeScale,\n      sizeScale\n    } = this.props;\n    const xMult = anchor === 'middle' ? 0 : anchor === 'start' ? 1 : -1;\n    const yMult = alignment === 'center' ? 0 : alignment === 'bottom' ? 1 : -1;\n\n    // Padding based on font size (font size / 4)\n    const xPadding = sizeScale / 4;\n    const yPadding = sizeScale * (1 + 1 / 4);\n\n    // Place secondary label under main label (secondary label always 'top' baseline aligned)\n    const secondaryOffset = 0.6 * (1 - yMult) * sizeScale;\n    let yOffset = secondary ? secondaryOffset : 0;\n\n    // Special case, position relative to secondary label\n    if (anchor === 'middle' && alignment === 'top' && getSecondaryText) {\n      yOffset -= secondaryOffset;\n      yOffset -= secondarySizeScale;\n      yOffset += sizeScale;\n    }\n\n    // Padding based on point radius (radius/ 4)\n    const radiusPadding = 1 + 1 / 4;\n\n    return typeof getRadius === 'function'\n      ? (d, info) => {\n          const r = (info ? getRadius(d, info) : 1) * radiusScale * radiusPadding;\n          return [xMult * (r + xPadding), yMult * (r + yPadding) + yOffset];\n        }\n      : [\n          xMult * (getRadius * radiusScale * radiusPadding + xPadding),\n          yMult * (getRadius * radiusScale * radiusPadding + yPadding) + yOffset\n        ];\n  }\n\n  calculateBackgroundPadding() {\n    const {getTextAnchor: anchor, getAlignmentBaseline: alignment, sizeScale} = this.props;\n\n    // Heuristics to avoid label overlap\n    const paddingX = 12 * sizeScale;\n    const paddingY = 3 * sizeScale;\n    const backgroundPadding = [0, 0, 0, 0];\n    if (alignment === 'top') {\n      backgroundPadding[TOP] = paddingY;\n    } else if (alignment === 'bottom') {\n      backgroundPadding[BOTTOM] = paddingY;\n    } else {\n      backgroundPadding[TOP] = 0.5 * paddingY;\n      backgroundPadding[BOTTOM] = 0.5 * paddingY;\n    }\n    if (anchor === 'start') {\n      backgroundPadding[LEFT] = paddingX;\n    } else if (anchor === 'end') {\n      backgroundPadding[RIGHT] = paddingX;\n    } else {\n      backgroundPadding[LEFT] = 0.5 * paddingX;\n      backgroundPadding[RIGHT] = 0.5 * paddingX;\n    }\n\n    return backgroundPadding;\n  }\n\n  renderTextLayer(id, {updateTriggers: updateTriggersOverride = {}, ...props}): EnhancedTextLayer {\n    const {\n      data,\n\n      characterSet,\n      fontFamily,\n      fontSettings,\n      fontWeight,\n      outlineColor,\n      outlineWidth,\n      sizeScale,\n      radiusScale,\n\n      getAlignmentBaseline,\n      getColor,\n      getPosition,\n      getTextAnchor,\n\n      updateTriggers\n    } = this.props;\n\n    return new EnhancedTextLayer(\n      this.getSubLayerProps({\n        id,\n        data,\n\n        characterSet,\n        fontFamily,\n        fontSettings,\n        fontWeight,\n        outlineColor,\n        outlineWidth,\n        sizeScale,\n\n        getAlignmentBaseline,\n        getColor,\n        getPosition,\n        getTextAnchor,\n\n        updateTriggers: {\n          ...updateTriggers,\n          ...updateTriggersOverride,\n          getPixelOffset: [\n            updateTriggers.getRadius,\n            updateTriggers.getTextAnchor,\n            updateTriggers.getAlignmentBaseline,\n            radiusScale,\n            sizeScale\n          ]\n        }\n      }),\n      {\n        getSize: 1,\n        _subLayerProps: {background: {type: EnhancedTextBackgroundLayer}}\n      },\n      props\n    );\n  }\n\n  renderLayers(): Layer | null | LayersList {\n    const {\n      getText,\n      getSecondaryColor,\n      getSecondaryText,\n      secondaryOutlineColor,\n      secondarySizeScale,\n      updateTriggers\n    } = this.props;\n    const getPixelOffset = this.calculatePixelOffset(false);\n    const backgroundPadding = this.calculateBackgroundPadding();\n    const out = [\n      // Text doesn't update via updateTrigger for some reason\n      this.renderTextLayer(`${updateTriggers.getText}-primary`, {\n        backgroundPadding,\n        getText,\n        getPixelOffset,\n        background: true // Only use background for primary label for faster collisions\n      }),\n      Boolean(getSecondaryText) &&\n        this.renderTextLayer(`${updateTriggers.getSecondaryText}-secondary`, {\n          getText: getSecondaryText,\n          getPixelOffset: this.calculatePixelOffset(true),\n          getAlignmentBaseline: 'top',\n          // updateTriggers: {getText: updateTriggers.getSecondaryText},\n\n          // Optional overrides\n          ...(getSecondaryColor && {getColor: getSecondaryColor}),\n          ...(secondarySizeScale && {sizeScale: secondarySizeScale}),\n          ...(secondaryOutlineColor && {outlineColor: secondaryOutlineColor})\n        })\n    ];\n\n    return out;\n  }\n}\n"],"file":"point-label-layer.js"}

package/dist/esm/layers/quadbin-layer.js

@@ -1,4 +1,3 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { _GeoCellLayer as GeoCellLayer } from '@deck.gl/geo-layers';
 import { getQuadbinPolygon } from './quadbin-utils';
 const defaultProps = {
@@ -27,8 +26,6 @@ export default class QuadbinLayer extends GeoCellLayer {
   }
 
 }
-
-_defineProperty(QuadbinLayer, "layerName", 'QuadbinLayer');
-
-_defineProperty(QuadbinLayer, "defaultProps", defaultProps);
+QuadbinLayer.layerName = 'QuadbinLayer';
+QuadbinLayer.defaultProps = defaultProps;
 //# sourceMappingURL=quadbin-layer.js.map

package/dist/esm/layers/quadbin-layer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/quadbin-layer.ts"],"names":["_GeoCellLayer","GeoCellLayer","getQuadbinPolygon","defaultProps","getQuadbin","type","value","d","quadbin","QuadbinLayer","indexToBounds","data","extruded","props","coverage","_normalize","positionFormat","getPolygon","x","objectInfo","updateTriggers"],"mappings":";AACA,SACEA,aAAa,IAAIC,YADnB,QAGO,qBAHP;AAIA,SAAQC,iBAAR,QAAgC,iBAAhC;AAEA,MAAMC,YAA6C,GAAG;AACpDC,EAAAA,UAAU,EAAE;AAACC,IAAAA,IAAI,EAAE,UAAP;AAAmBC,IAAAA,KAAK,EAAEC,CAAC,IAAIA,CAAC,CAACC;AAAjC;AADwC,CAAtD;AAiBA,eAAe,MAAMC,YAAN,SAAoER,YAApE,CAGb;AAIAS,EAAAA,aAAa,GAA0C;AACrD,UAAM;AAACC,MAAAA,IAAD;AAAOC,MAAAA,QAAP;AAAiBR,MAAAA;AAAjB,QAA+B,KAAKS,KAA1C;AAEA,UAAMC,QAAQ,GAAGF,QAAQ,GAAG,IAAH,GAAU,CAAnC;AAEA,WAAO;AACLD,MAAAA,IADK;AAELI,MAAAA,UAAU,EAAE,KAFP;AAGLC,MAAAA,cAAc,EAAE,IAHX;AAKLC,MAAAA,UAAU,EAAE,CAACC,CAAD,EAAWC,UAAX,KAA0BjB,iBAAiB,CAACE,UAAU,CAACc,CAAD,EAAIC,UAAJ,CAAX,EAA4BL,QAA5B,CALlD;AAMLM,MAAAA,cAAc,EAAE;AAACH,QAAAA,UAAU,EAAEH;AAAb;AANX,KAAP;AAQD;;AAjBD;;gBAHmBL,Y,eAIA,c;;gBAJAA,Y,kBAKGN,Y","sourcesContent":["import {AccessorFunction, DefaultProps} from '@deck.gl/core';\nimport {\n  _GeoCellLayer as GeoCellLayer,\n  _GeoCellLayerProps as GeoCellLayerProps\n} from '@deck.gl/geo-layers';\nimport {getQuadbinPolygon} from './quadbin-utils';\n\nconst defaultProps: DefaultProps<QuadbinLayerProps> = {\n  getQuadbin: {type: 'accessor', value: d => d.quadbin}\n};\n\n/** All properties supported by QuadbinLayer. */\nexport type QuadbinLayerProps<DataT = any> = _QuadbinLayerProps<DataT> & GeoCellLayerProps<DataT>;\n\n/** Properties added by QuadbinLayer. */\ntype _QuadbinLayerProps<DataT> = {\n  /**\n   * Called for each data object to retrieve the quadbin string identifier.\n   *\n   * By default, it reads `quadbin` property of data object.\n   */\n  getQuadbin?: AccessorFunction<DataT, bigint>;\n};\n\nexport default class QuadbinLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<\n  DataT,\n  Required<_QuadbinLayerProps<DataT>> & ExtraProps\n> {\n  static layerName = 'QuadbinLayer';\n  static defaultProps = defaultProps;\n\n  indexToBounds(): Partial<GeoCellLayer['props']> | null {\n    const {data, extruded, getQuadbin} = this.props;\n    // To avoid z-fighting reduce polygon footprint when extruding\n    const coverage = extruded ? 0.99 : 1;\n\n    return {\n      data,\n      _normalize: false,\n      positionFormat: 'XY',\n\n      getPolygon: (x: DataT, objectInfo) => getQuadbinPolygon(getQuadbin(x, objectInfo), coverage),\n      updateTriggers: {getPolygon: coverage}\n    };\n  }\n}\n"],"file":"quadbin-layer.js"}
+{"version":3,"sources":["../../../src/layers/quadbin-layer.ts"],"names":["_GeoCellLayer","GeoCellLayer","getQuadbinPolygon","defaultProps","getQuadbin","type","value","d","quadbin","QuadbinLayer","indexToBounds","data","extruded","props","coverage","_normalize","positionFormat","getPolygon","x","objectInfo","updateTriggers","layerName"],"mappings":"AACA,SACEA,aAAa,IAAIC,YADnB,QAGO,qBAHP;AAIA,SAAQC,iBAAR,QAAgC,iBAAhC;AAEA,MAAMC,YAA6C,GAAG;AACpDC,EAAAA,UAAU,EAAE;AAACC,IAAAA,IAAI,EAAE,UAAP;AAAmBC,IAAAA,KAAK,EAAEC,CAAC,IAAIA,CAAC,CAACC;AAAjC;AADwC,CAAtD;AAiBA,eAAe,MAAMC,YAAN,SAAoER,YAApE,CAGb;AAIAS,EAAAA,aAAa,GAA0C;AACrD,UAAM;AAACC,MAAAA,IAAD;AAAOC,MAAAA,QAAP;AAAiBR,MAAAA;AAAjB,QAA+B,KAAKS,KAA1C;AAEA,UAAMC,QAAQ,GAAGF,QAAQ,GAAG,IAAH,GAAU,CAAnC;AAEA,WAAO;AACLD,MAAAA,IADK;AAELI,MAAAA,UAAU,EAAE,KAFP;AAGLC,MAAAA,cAAc,EAAE,IAHX;AAKLC,MAAAA,UAAU,EAAE,CAACC,CAAD,EAAWC,UAAX,KAA0BjB,iBAAiB,CAACE,UAAU,CAACc,CAAD,EAAIC,UAAJ,CAAX,EAA4BL,QAA5B,CALlD;AAMLM,MAAAA,cAAc,EAAE;AAACH,QAAAA,UAAU,EAAEH;AAAb;AANX,KAAP;AAQD;;AAjBD;AAHmBL,Y,CAIZY,S,GAAY,c;AAJAZ,Y,CAKZN,Y,GAAeA,Y","sourcesContent":["import {AccessorFunction, DefaultProps} from '@deck.gl/core';\nimport {\n  _GeoCellLayer as GeoCellLayer,\n  _GeoCellLayerProps as GeoCellLayerProps\n} from '@deck.gl/geo-layers';\nimport {getQuadbinPolygon} from './quadbin-utils';\n\nconst defaultProps: DefaultProps<QuadbinLayerProps> = {\n  getQuadbin: {type: 'accessor', value: d => d.quadbin}\n};\n\n/** All properties supported by QuadbinLayer. */\nexport type QuadbinLayerProps<DataT = any> = _QuadbinLayerProps<DataT> & GeoCellLayerProps<DataT>;\n\n/** Properties added by QuadbinLayer. */\ntype _QuadbinLayerProps<DataT> = {\n  /**\n   * Called for each data object to retrieve the quadbin string identifier.\n   *\n   * By default, it reads `quadbin` property of data object.\n   */\n  getQuadbin?: AccessorFunction<DataT, bigint>;\n};\n\nexport default class QuadbinLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<\n  DataT,\n  Required<_QuadbinLayerProps<DataT>> & ExtraProps\n> {\n  static layerName = 'QuadbinLayer';\n  static defaultProps = defaultProps;\n\n  indexToBounds(): Partial<GeoCellLayer['props']> | null {\n    const {data, extruded, getQuadbin} = this.props;\n    // To avoid z-fighting reduce polygon footprint when extruding\n    const coverage = extruded ? 0.99 : 1;\n\n    return {\n      data,\n      _normalize: false,\n      positionFormat: 'XY',\n\n      getPolygon: (x: DataT, objectInfo) => getQuadbinPolygon(getQuadbin(x, objectInfo), coverage),\n      updateTriggers: {getPolygon: coverage}\n    };\n  }\n}\n"],"file":"quadbin-layer.js"}

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

@@ -1,9 +1,10 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import { CompositeLayer } from '@deck.gl/core';
 import QuadbinLayer from './quadbin-layer';
 import QuadbinTileset2D from './quadbin-tileset-2d';
 import SpatialIndexTileLayer from './spatial-index-tile-layer';
 import { hexToBigInt } from 'quadbin';
+import { TilejsonPropType } from '../sources/common';
+import { injectAccessToken } from './utils';
 export const renderSubLayers = props => {
   const {
     data
@@ -15,62 +16,38 @@ export const renderSubLayers = props => {
   });
 };
 const defaultProps = {
-  aggregationResLevel: 6
+  aggregationResLevel: 6,
+  data: TilejsonPropType
 };
 export default class QuadbinTileLayer extends CompositeLayer {
-  constructor(...args) {
-    super(...args);
-
-    _defineProperty(this, "state", void 0);
-  }
-
-  initializeState() {
-    this.setState({
-      data: null,
-      tileJSON: null
-    });
-  }
-
-  updateState({
-    changeFlags
-  }) {
-    if (changeFlags.dataChanged) {
-      let {
-        data
-      } = this.props;
-      const tileJSON = data;
-      data = tileJSON.tiles;
-      this.setState({
-        data,
-        tileJSON
-      });
-    }
+  getLoadOptions() {
+    const loadOptions = super.getLoadOptions() || {};
+    const tileJSON = this.props.data;
+    injectAccessToken(loadOptions, tileJSON.accessToken);
+    loadOptions.cartoSpatialTile = { ...loadOptions.cartoSpatialTile,
+      scheme: 'quadbin'
+    };
+    return loadOptions;
   }
 
   renderLayers() {
+    const tileJSON = this.props.data;
+    if (!tileJSON) return null;
     const {
-      data,
-      tileJSON
-    } = this.state;
-    const maxZoom = parseInt(tileJSON === null || tileJSON === void 0 ? void 0 : tileJSON.maxresolution);
+      tiles: data,
+      maxresolution: maxZoom
+    } = tileJSON;
     return [new SpatialIndexTileLayer(this.props, {
-      id: "quadbin-tile-layer-".concat(this.props.id),
+      id: `quadbin-tile-layer-${this.props.id}`,
       data,
       TilesetClass: QuadbinTileset2D,
       renderSubLayers,
       maxZoom,
-      loadOptions: { ...this.getLoadOptions(),
-        cartoSpatialTile: {
-          scheme: 'quadbin'
-        },
-        mimeType: 'application/vnd.carto-spatial-tile'
-      }
+      loadOptions: this.getLoadOptions()
     })];
   }
 
 }
-
-_defineProperty(QuadbinTileLayer, "layerName", 'QuadbinTileLayer');
-
-_defineProperty(QuadbinTileLayer, "defaultProps", defaultProps);
+QuadbinTileLayer.layerName = 'QuadbinTileLayer';
+QuadbinTileLayer.defaultProps = defaultProps;
 //# sourceMappingURL=quadbin-tile-layer.js.map