@deck.gl/carto 8.8.0-alpha.3 → 8.8.0-alpha.4

package/dist/es5/layers/spatial-index-tile-layer.js

@@ -0,0 +1,92 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+
+var _geoLayers = require("@deck.gl/geo-layers");
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function isFeatureIdDefined(value) {
+  return value !== undefined && value !== null && value !== '';
+}
+
+var SpatialIndexTileLayer = function (_TileLayer) {
+  (0, _inherits2.default)(SpatialIndexTileLayer, _TileLayer);
+
+  var _super = _createSuper(SpatialIndexTileLayer);
+
+  function SpatialIndexTileLayer() {
+    (0, _classCallCheck2.default)(this, SpatialIndexTileLayer);
+    return _super.apply(this, arguments);
+  }
+
+  (0, _createClass2.default)(SpatialIndexTileLayer, [{
+    key: "_updateAutoHighlight",
+    value: function _updateAutoHighlight(info) {
+      var hoveredFeatureId = this.state.hoveredFeatureId;
+      var hoveredFeature = info.object;
+      var newHoveredFeatureId;
+
+      if (hoveredFeature) {
+        newHoveredFeatureId = hoveredFeature.id;
+      }
+
+      if (hoveredFeatureId !== newHoveredFeatureId) {
+        var highlightColor = this.props.highlightColor;
+
+        if (typeof highlightColor === 'function') {
+          highlightColor = highlightColor(info);
+        }
+
+        this.setState({
+          highlightColor: highlightColor,
+          hoveredFeatureId: newHoveredFeatureId
+        });
+      }
+    }
+  }, {
+    key: "getSubLayerPropsByTile",
+    value: function getSubLayerPropsByTile(tile) {
+      return {
+        highlightedObjectIndex: this.getHighlightedObjectIndex(tile),
+        highlightColor: this.state.highlightColor
+      };
+    }
+  }, {
+    key: "getHighlightedObjectIndex",
+    value: function getHighlightedObjectIndex(tile) {
+      var hoveredFeatureId = this.state.hoveredFeatureId;
+      var data = tile.content;
+      var isFeatureIdPresent = isFeatureIdDefined(hoveredFeatureId);
+
+      if (!isFeatureIdPresent || !Array.isArray(data)) {
+        return -1;
+      }
+
+      return data.findIndex(function (feature) {
+        return feature.id === hoveredFeatureId;
+      });
+    }
+  }]);
+  return SpatialIndexTileLayer;
+}(_geoLayers.TileLayer);
+
+exports.default = SpatialIndexTileLayer;
+//# sourceMappingURL=spatial-index-tile-layer.js.map

package/dist/es5/layers/spatial-index-tile-layer.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/layers/spatial-index-tile-layer.js"],"names":["isFeatureIdDefined","value","undefined","SpatialIndexTileLayer","info","hoveredFeatureId","state","hoveredFeature","object","newHoveredFeatureId","id","highlightColor","props","setState","tile","highlightedObjectIndex","getHighlightedObjectIndex","data","content","isFeatureIdPresent","Array","isArray","findIndex","feature","TileLayer"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;;;;;AAEA,SAASA,kBAAT,CAA4BC,KAA5B,EAAmC;AACjC,SAAOA,KAAK,KAAKC,SAAV,IAAuBD,KAAK,KAAK,IAAjC,IAAyCA,KAAK,KAAK,EAA1D;AACD;;IAEoBE,qB;;;;;;;;;;;;WACnB,8BAAqBC,IAArB,EAA2B;AACzB,UAAOC,gBAAP,GAA2B,KAAKC,KAAhC,CAAOD,gBAAP;AACA,UAAME,cAAc,GAAGH,IAAI,CAACI,MAA5B;AACA,UAAIC,mBAAJ;;AAEA,UAAIF,cAAJ,EAAoB;AAClBE,QAAAA,mBAAmB,GAAGF,cAAc,CAACG,EAArC;AACD;;AAED,UAAIL,gBAAgB,KAAKI,mBAAzB,EAA8C;AAC5C,YAAKE,cAAL,GAAuB,KAAKC,KAA5B,CAAKD,cAAL;;AACA,YAAI,OAAOA,cAAP,KAA0B,UAA9B,EAA0C;AACxCA,UAAAA,cAAc,GAAGA,cAAc,CAACP,IAAD,CAA/B;AACD;;AAED,aAAKS,QAAL,CAAc;AACZF,UAAAA,cAAc,EAAdA,cADY;AAEZN,UAAAA,gBAAgB,EAAEI;AAFN,SAAd;AAID;AACF;;;WAED,gCAAuBK,IAAvB,EAA6B;AAC3B,aAAO;AACLC,QAAAA,sBAAsB,EAAE,KAAKC,yBAAL,CAA+BF,IAA/B,CADnB;AAELH,QAAAA,cAAc,EAAE,KAAKL,KAAL,CAAWK;AAFtB,OAAP;AAID;;;WAED,mCAA0BG,IAA1B,EAAgC;AAC9B,UAAOT,gBAAP,GAA2B,KAAKC,KAAhC,CAAOD,gBAAP;AACA,UAAMY,IAAI,GAAGH,IAAI,CAACI,OAAlB;AAEA,UAAMC,kBAAkB,GAAGnB,kBAAkB,CAACK,gBAAD,CAA7C;;AACA,UAAI,CAACc,kBAAD,IAAuB,CAACC,KAAK,CAACC,OAAN,CAAcJ,IAAd,CAA5B,EAAiD;AAC/C,eAAO,CAAC,CAAR;AACD;;AAED,aAAOA,IAAI,CAACK,SAAL,CAAe,UAAAC,OAAO;AAAA,eAAIA,OAAO,CAACb,EAAR,KAAeL,gBAAnB;AAAA,OAAtB,CAAP;AACD;;;EAxCgDmB,oB","sourcesContent":["import {TileLayer} from '@deck.gl/geo-layers';\n\nfunction isFeatureIdDefined(value) {\n  return value !== undefined && value !== null && value !== '';\n}\n\nexport default class SpatialIndexTileLayer extends TileLayer {\n  _updateAutoHighlight(info) {\n    const {hoveredFeatureId} = this.state;\n    const hoveredFeature = info.object;\n    let newHoveredFeatureId;\n\n    if (hoveredFeature) {\n      newHoveredFeatureId = hoveredFeature.id;\n    }\n\n    if (hoveredFeatureId !== newHoveredFeatureId) {\n      let {highlightColor} = this.props;\n      if (typeof highlightColor === 'function') {\n        highlightColor = highlightColor(info);\n      }\n\n      this.setState({\n        highlightColor,\n        hoveredFeatureId: newHoveredFeatureId\n      });\n    }\n  }\n\n  getSubLayerPropsByTile(tile) {\n    return {\n      highlightedObjectIndex: this.getHighlightedObjectIndex(tile),\n      highlightColor: this.state.highlightColor\n    };\n  }\n\n  getHighlightedObjectIndex(tile) {\n    const {hoveredFeatureId} = this.state;\n    const data = tile.content;\n\n    const isFeatureIdPresent = isFeatureIdDefined(hoveredFeatureId);\n    if (!isFeatureIdPresent || !Array.isArray(data)) {\n      return -1;\n    }\n\n    return data.findIndex(feature => feature.id === hoveredFeatureId);\n  }\n}\n"],"file":"spatial-index-tile-layer.js"}

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

@@ -33,7 +33,9 @@ const defaultProps = {
   columns: {
     type: 'array',
     value: null
-  }
+  },
+  aggregationExp: null,
+  aggregationResLevel: null
 };
 export default class CartoLayer extends CompositeLayer {
   initializeState() {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","CartoTileLayer","H3TileLayer","QuadkeyTileLayer","MVTLayer","GeoJsonLayer","fetchLayerData","getDataV2","API_VERSIONS","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","TILE_FORMATS","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","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","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","TILEJSON","tileUrl","URL","tiles","searchParams","get","MVT","scheme","renderLayers","updateTriggers","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {CompositeLayer, Layer, log} from '@deck.gl/core';\nimport CartoTileLayer from './carto-tile-layer';\nimport H3TileLayer from './h3-tile-layer';\nimport QuadkeyTileLayer from './quadkey-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {\n  COLUMNS_SUPPORT,\n  Format,\n  FORMATS,\n  GEO_COLUMN_SUPPORT,\n  MapType,\n  MAP_TYPES,\n  TileFormat,\n  TILE_FORMATS\n} from '../api/maps-api-common';\nimport {\n  ClassicCredentials,\n  CloudNativeCredentials,\n  Credentials,\n  getDefaultCredentials\n} from '../config';\nimport {CompositeLayerProps, LayerProps} from 'modules/core/src/types/layer-props';\nimport {ChangeFlags} from 'modules/core/src/lib/layer-state';\nimport {FetchLayerDataResult} 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 => {}, compare: false},\n  onDataError: {type: 'function', value: null, compare: false, 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\nexport interface CartoLayerProps<DataT = any> extends CompositeLayerProps<DataT> {\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 data format.\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3`.\n   *\n   * Possible values are: `FORMATS.GEOJSON`, `FORMATS.JSON` and `FORMATS.TILEJSON`.\n   */\n  format?: Format;\n\n  /**\n   * Use to override the default tile data format.\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3` and format is `FORMATS.TILEJSON`.\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 Error is thrown.\n   */\n  onDataError?: (err: unknown) => void;\n\n  clientId?: string;\n}\n\nexport default class CartoLayer<DataT = any> extends CompositeLayer<CartoLayerProps<DataT>> {\n  static layerName = 'CartoLayer';\n  static defaultProps = defaultProps as any;\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({\n    props,\n    oldProps,\n    changeFlags\n  }: {\n    props: CartoLayerProps;\n    oldProps: CartoLayerProps;\n    context: any;\n    changeFlags: ChangeFlags;\n  }): void {\n    this._checkProps(props);\n    const shouldUpdateData =\n      changeFlags.dataChanged ||\n      props.connection !== oldProps.connection ||\n      props.geoColumn !== oldProps.geoColumn ||\n      props.format !== oldProps.format ||\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\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, clientId, credentials, connection, ...rest} = this.props;\n      const localConfig = {...getDefaultCredentials(), ...credentials};\n      const {apiVersion} = localConfig;\n\n      let result: 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          clientId,\n          credentials: credentials as CloudNativeCredentials,\n          connection,\n          ...rest\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 Error);\n      } else {\n        throw err;\n      }\n    }\n  }\n\n  _getSubLayerAndProps(): [any, LayerProps] {\n    assert(this.state);\n\n    const {data, format, 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    const props = {uniqueIdProperty, ...propsNoData};\n\n    if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n      return [MVTLayer, props];\n    }\n\n    if (format === FORMATS.TILEJSON) {\n      /* global URL */\n      const tileUrl = new URL(data.tiles[0]);\n\n      props.formatTiles =\n        props.formatTiles ||\n        (tileUrl.searchParams.get('formatTiles') as TileFormat) ||\n        TILE_FORMATS.MVT;\n\n      if (data.scheme === 'h3') {\n        return [H3TileLayer, props];\n      }\n      if (data.scheme === 'quadkey') {\n        return [QuadkeyTileLayer, props];\n      }\n      return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];\n    }\n\n    // It's a geojson layer\n    return [GeoJsonLayer, props];\n  }\n\n  renderLayers(): Layer | null {\n    assert(this.state);\n\n    const {data} = this.state;\n\n    if (!data) return null;\n\n    const {updateTriggers} = this.props;\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        updateTriggers\n      })\n    );\n  }\n}\n"],"file":"carto-layer.js"}
+{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","CartoTileLayer","H3TileLayer","QuadkeyTileLayer","MVTLayer","GeoJsonLayer","fetchLayerData","getDataV2","API_VERSIONS","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","TILE_FORMATS","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","aggregationExp","aggregationResLevel","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","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","TILEJSON","tileUrl","URL","tiles","searchParams","get","MVT","scheme","renderLayers","updateTriggers","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {CompositeLayer, Layer, log} from '@deck.gl/core';\nimport CartoTileLayer from './carto-tile-layer';\nimport H3TileLayer from './h3-tile-layer';\nimport QuadkeyTileLayer from './quadkey-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {GeoJsonLayer} from '@deck.gl/layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {\n  COLUMNS_SUPPORT,\n  Format,\n  FORMATS,\n  GEO_COLUMN_SUPPORT,\n  MapType,\n  MAP_TYPES,\n  TileFormat,\n  TILE_FORMATS\n} from '../api/maps-api-common';\nimport {\n  ClassicCredentials,\n  CloudNativeCredentials,\n  Credentials,\n  getDefaultCredentials\n} from '../config';\nimport {CompositeLayerProps, LayerProps} from 'modules/core/src/types/layer-props';\nimport {ChangeFlags} from 'modules/core/src/lib/layer-state';\nimport {FetchLayerDataResult} 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 => {}, compare: false},\n  onDataError: {type: 'function', value: null, compare: false, 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  // (String, optional): aggregration SQL expression. Only used for spatial index datasets\n  aggregationExp: null,\n\n  // (Number, optional): aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3\n  aggregationResLevel: null\n};\n\nexport interface CartoLayerProps<DataT = any> extends CompositeLayerProps<DataT> {\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 data format.\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3`.\n   *\n   * Possible values are: `FORMATS.GEOJSON`, `FORMATS.JSON` and `FORMATS.TILEJSON`.\n   */\n  format?: Format;\n\n  /**\n   * Use to override the default tile data format.\n   *\n   * Only supported when apiVersion is `API_VERSIONS.V3` and format is `FORMATS.TILEJSON`.\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 Error is thrown.\n   */\n  onDataError?: (err: unknown) => void;\n\n  clientId?: string;\n}\n\nexport default class CartoLayer<DataT = any> extends CompositeLayer<CartoLayerProps<DataT>> {\n  static layerName = 'CartoLayer';\n  static defaultProps = defaultProps as any;\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({\n    props,\n    oldProps,\n    changeFlags\n  }: {\n    props: CartoLayerProps;\n    oldProps: CartoLayerProps;\n    context: any;\n    changeFlags: ChangeFlags;\n  }): void {\n    this._checkProps(props);\n    const shouldUpdateData =\n      changeFlags.dataChanged ||\n      props.connection !== oldProps.connection ||\n      props.geoColumn !== oldProps.geoColumn ||\n      props.format !== oldProps.format ||\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\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, clientId, credentials, connection, ...rest} = this.props;\n      const localConfig = {...getDefaultCredentials(), ...credentials};\n      const {apiVersion} = localConfig;\n\n      let result: 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          clientId,\n          credentials: credentials as CloudNativeCredentials,\n          connection,\n          ...rest\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 Error);\n      } else {\n        throw err;\n      }\n    }\n  }\n\n  _getSubLayerAndProps(): [any, LayerProps] {\n    assert(this.state);\n\n    const {data, format, 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    const props = {uniqueIdProperty, ...propsNoData};\n\n    if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n      return [MVTLayer, props];\n    }\n\n    if (format === FORMATS.TILEJSON) {\n      /* global URL */\n      const tileUrl = new URL(data.tiles[0]);\n\n      props.formatTiles =\n        props.formatTiles ||\n        (tileUrl.searchParams.get('formatTiles') as TileFormat) ||\n        TILE_FORMATS.MVT;\n\n      if (data.scheme === 'h3') {\n        return [H3TileLayer, props];\n      }\n      if (data.scheme === 'quadkey') {\n        return [QuadkeyTileLayer, props];\n      }\n      return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];\n    }\n\n    // It's a geojson layer\n    return [GeoJsonLayer, props];\n  }\n\n  renderLayers(): Layer | null {\n    assert(this.state);\n\n    const {data} = this.state;\n\n    if (!data) return null;\n\n    const {updateTriggers} = this.props;\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        updateTriggers\n      })\n    );\n  }\n}\n"],"file":"carto-layer.js"}

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

@@ -1,6 +1,7 @@
 import { CompositeLayer } from '@deck.gl/core';
-import { H3HexagonLayer, TileLayer } from '@deck.gl/geo-layers';
+import { H3HexagonLayer } from '@deck.gl/geo-layers';
 import H3Tileset2D from './h3-tileset-2d';
+import SpatialIndexTileLayer from './spatial-index-tile-layer';
 
 const renderSubLayers = props => {
   const {
@@ -16,6 +17,9 @@ const renderSubLayers = props => {
   });
 };
 
+const defaultProps = {
+  aggregationResLevel: 4
+};
 export default class H3TileLayer extends CompositeLayer {
   initializeState() {
     this.setState({
@@ -45,17 +49,21 @@ export default class H3TileLayer extends CompositeLayer {
 
   renderLayers() {
     const {
-      data
+      data,
+      tileJSON
     } = this.state;
-    return [new TileLayer(this.props, {
+    const maxZoom = parseInt(tileJSON.maxresolution);
+    return [new SpatialIndexTileLayer(this.props, {
       id: 'h3-tile-layer',
       data,
       getHexagon: d => d.id,
       TilesetClass: H3Tileset2D,
-      renderSubLayers
+      renderSubLayers,
+      maxZoom
     })];
   }
 
 }
 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.js"],"names":["CompositeLayer","H3HexagonLayer","TileLayer","H3Tileset2D","renderSubLayers","props","data","index","tile","length","centerHexagon","highPrecision","H3TileLayer","initializeState","setState","tileJSON","updateState","oldProps","context","changeFlags","dataChanged","tiles","renderLayers","state","id","getHexagon","d","TilesetClass","layerName"],"mappings":"AAAA,SAAQA,cAAR,QAA6B,eAA7B;AACA,SAAQC,cAAR,EAAwBC,SAAxB,QAAwC,qBAAxC;AACA,OAAOC,WAAP,MAAwB,iBAAxB;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,QAAM;AAACE,IAAAA;AAAD,MAAUF,KAAK,CAACG,IAAtB;AACA,MAAI,CAACF,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIR,cAAJ,CAAmBI,KAAnB,EAA0B;AAC/BK,IAAAA,aAAa,EAAEH,KADgB;AAE/BI,IAAAA,aAAa,EAAE;AAFgB,GAA1B,CAAP;AAID,CATD;;AAWA,eAAe,MAAMC,WAAN,SAA0BZ,cAA1B,CAAyC;AACtDa,EAAAA,eAAe,GAAG;AAChB,SAAKC,QAAL,CAAc;AAACR,MAAAA,IAAI,EAAE,IAAP;AAAaS,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACX,IAAAA,KAAD;AAAQY,IAAAA,QAAR;AAAkBC,IAAAA,OAAlB;AAA2BC,IAAAA;AAA3B,GAAD,EAA0C;AACnD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAACd,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMU,QAAQ,GAAGT,IAAjB;AACAA,MAAAA,IAAI,GAAGS,QAAQ,CAACM,KAAhB;AACA,WAAKP,QAAL,CAAc;AAACR,QAAAA,IAAD;AAAOS,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDO,EAAAA,YAAY,GAAG;AACb,UAAM;AAAChB,MAAAA;AAAD,QAAS,KAAKiB,KAApB;AACA,WAAO,CACL,IAAIrB,SAAJ,CAAc,KAAKG,KAAnB,EAA0B;AACxBmB,MAAAA,EAAE,EAAE,eADoB;AAExBlB,MAAAA,IAFwB;AAGxBmB,MAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACF,EAHK;AAIxBG,MAAAA,YAAY,EAAExB,WAJU;AAKxBC,MAAAA;AALwB,KAA1B,CADK,CAAP;AASD;;AAzBqD;AA4BxDQ,WAAW,CAACgB,SAAZ,GAAwB,aAAxB","sourcesContent":["import {CompositeLayer} from '@deck.gl/core';\nimport {H3HexagonLayer, TileLayer} from '@deck.gl/geo-layers';\nimport H3Tileset2D from './h3-tileset-2d';\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    centerHexagon: index,\n    highPrecision: true\n  });\n};\n\nexport default class H3TileLayer extends CompositeLayer {\n  initializeState() {\n    this.setState({data: null, tileJSON: null});\n  }\n\n  updateState({props, oldProps, context, changeFlags}) {\n    if (changeFlags.dataChanged) {\n      let {data} = this.props;\n      const tileJSON = data;\n      data = tileJSON.tiles;\n      this.setState({data, tileJSON});\n    }\n  }\n\n  renderLayers() {\n    const {data} = this.state;\n    return [\n      new TileLayer(this.props, {\n        id: 'h3-tile-layer',\n        data,\n        getHexagon: d => d.id,\n        TilesetClass: H3Tileset2D,\n        renderSubLayers\n      })\n    ];\n  }\n}\n\nH3TileLayer.layerName = 'H3TileLayer';\n"],"file":"h3-tile-layer.js"}
+{"version":3,"sources":["../../../src/layers/h3-tile-layer.js"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","SpatialIndexTileLayer","renderSubLayers","props","data","index","tile","length","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","setState","tileJSON","updateState","oldProps","context","changeFlags","dataChanged","tiles","renderLayers","state","maxZoom","parseInt","maxresolution","id","getHexagon","d","TilesetClass","layerName"],"mappings":"AAAA,SAAQA,cAAR,QAA6B,eAA7B;AACA,SAAQC,cAAR,QAA6B,qBAA7B;AACA,OAAOC,WAAP,MAAwB,iBAAxB;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,QAAM;AAACE,IAAAA;AAAD,MAAUF,KAAK,CAACG,IAAtB;AACA,MAAI,CAACF,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIR,cAAJ,CAAmBI,KAAnB,EAA0B;AAC/BK,IAAAA,aAAa,EAAEH,KADgB;AAE/BI,IAAAA,aAAa,EAAE;AAFgB,GAA1B,CAAP;AAID,CATD;;AAWA,MAAMC,YAAY,GAAG;AACnBC,EAAAA,mBAAmB,EAAE;AADF,CAArB;AAIA,eAAe,MAAMC,WAAN,SAA0Bd,cAA1B,CAAyC;AACtDe,EAAAA,eAAe,GAAG;AAChB,SAAKC,QAAL,CAAc;AAACV,MAAAA,IAAI,EAAE,IAAP;AAAaW,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACb,IAAAA,KAAD;AAAQc,IAAAA,QAAR;AAAkBC,IAAAA,OAAlB;AAA2BC,IAAAA;AAA3B,GAAD,EAA0C;AACnD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAAChB,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMY,QAAQ,GAAGX,IAAjB;AACAA,MAAAA,IAAI,GAAGW,QAAQ,CAACM,KAAhB;AACA,WAAKP,QAAL,CAAc;AAACV,QAAAA,IAAD;AAAOW,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDO,EAAAA,YAAY,GAAG;AACb,UAAM;AAAClB,MAAAA,IAAD;AAAOW,MAAAA;AAAP,QAAmB,KAAKQ,KAA9B;AACA,UAAMC,OAAO,GAAGC,QAAQ,CAACV,QAAQ,CAACW,aAAV,CAAxB;AACA,WAAO,CACL,IAAIzB,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCwB,MAAAA,EAAE,EAAE,eADgC;AAEpCvB,MAAAA,IAFoC;AAGpCwB,MAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACF,EAHiB;AAIpCG,MAAAA,YAAY,EAAE9B,WAJsB;AAKpCE,MAAAA,eALoC;AAMpCsB,MAAAA;AANoC,KAAtC,CADK,CAAP;AAUD;;AA3BqD;AA8BxDZ,WAAW,CAACmB,SAAZ,GAAwB,aAAxB;AACAnB,WAAW,CAACF,YAAZ,GAA2BA,YAA3B","sourcesContent":["import {CompositeLayer} from '@deck.gl/core';\nimport {H3HexagonLayer} from '@deck.gl/geo-layers';\nimport H3Tileset2D 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    centerHexagon: index,\n    highPrecision: true\n  });\n};\n\nconst defaultProps = {\n  aggregationResLevel: 4\n};\n\nexport default class H3TileLayer extends CompositeLayer {\n  initializeState() {\n    this.setState({data: null, tileJSON: null});\n  }\n\n  updateState({props, oldProps, context, changeFlags}) {\n    if (changeFlags.dataChanged) {\n      let {data} = this.props;\n      const tileJSON = data;\n      data = tileJSON.tiles;\n      this.setState({data, tileJSON});\n    }\n  }\n\n  renderLayers() {\n    const {data, tileJSON} = this.state;\n    const maxZoom = parseInt(tileJSON.maxresolution);\n    return [\n      new SpatialIndexTileLayer(this.props, {\n        id: 'h3-tile-layer',\n        data,\n        getHexagon: d => d.id,\n        TilesetClass: H3Tileset2D,\n        renderSubLayers,\n        maxZoom\n      })\n    ];\n  }\n}\n\nH3TileLayer.layerName = 'H3TileLayer';\nH3TileLayer.defaultProps = defaultProps;\n"],"file":"h3-tile-layer.js"}

package/dist/esm/layers/h3-tileset-2d.js

@@ -1,6 +1,7 @@
 import { _Tileset2D as Tileset2D } from '@deck.gl/geo-layers';
-import { polyfill, getRes0Indexes, h3GetResolution, h3ToGeoBoundary, h3ToParent } from 'h3-js';
-export function getHexagonsInBoundingBox({
+import { polyfill, getRes0Indexes, geoToH3, h3GetResolution, h3ToGeoBoundary, h3ToParent, kRing } from 'h3-js';
+
+function getHexagonsInBoundingBox({
   west,
   north,
   east,
@@ -24,11 +25,12 @@ export function getHexagonsInBoundingBox({
     }, resolution));
   }
 
-  const oversample = 1;
+  const oversample = 2;
   const h3Indices = polyfill([[[west, north], [west, south], [east, south], [east, north], [west, north]]], resolution + oversample, true);
   return oversample ? [...new Set(h3Indices.map(i => h3ToParent(i, resolution)))] : h3Indices;
 }
-export function tileToBoundingBox(index) {
+
+function tileToBoundingBox(index) {
   const coordinates = h3ToGeoBoundary(index);
   const latitudes = coordinates.map(c => c[0]);
   const longitudes = coordinates.map(c => c[1]);
@@ -43,6 +45,15 @@ export function tileToBoundingBox(index) {
     north
   };
 }
+
+const BIAS = 2;
+
+function getHexagonResolution(viewport) {
+  const hexagonScaleFactor = 2 / 3 * viewport.zoom;
+  const latitudeScaleFactor = Math.log(1 / Math.cos(Math.PI * viewport.latitude / 180));
+  return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));
+}
+
 export default class H3Tileset2D extends Tileset2D {
   getTileIndices({
     viewport,
@@ -50,7 +61,8 @@ export default class H3Tileset2D extends Tileset2D {
     maxZoom
   }) {
     const [east, south, west, north] = viewport.getBounds();
-    let z = viewport.zoom;
+    let z = getHexagonResolution(viewport);
+    let indices = [];
 
     if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
       z = minZoom;
@@ -58,15 +70,18 @@ export default class H3Tileset2D extends Tileset2D {
 
     if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {
       z = maxZoom;
+      const center = geoToH3(viewport.latitude, viewport.longitude, maxZoom);
+      indices = kRing(center, 1);
+    } else {
+      indices = getHexagonsInBoundingBox({
+        west,
+        north,
+        east,
+        south
+      }, z);
     }
 
-    const resolution = Math.max(0, Math.floor(2 * z / 3) - 2);
-    return getHexagonsInBoundingBox({
-      west,
-      north,
-      east,
-      south
-    }, resolution).map(i => ({
+    return indices.map(i => ({
       i
     }));
   }

package/dist/esm/layers/h3-tileset-2d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/h3-tileset-2d.js"],"names":["_Tileset2D","Tileset2D","polyfill","getRes0Indexes","h3GetResolution","h3ToGeoBoundary","h3ToParent","getHexagonsInBoundingBox","west","north","east","south","resolution","concat","oversample","h3Indices","Set","map","i","tileToBoundingBox","index","coordinates","latitudes","c","longitudes","Math","min","max","H3Tileset2D","getTileIndices","viewport","minZoom","maxZoom","getBounds","z","zoom","Number","isFinite","floor","getTileId","getTileMetadata","bbox","getTileZoom","getParentIndex"],"mappings":"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","sourcesContent":["import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers';\nimport {polyfill, getRes0Indexes, h3GetResolution, h3ToGeoBoundary, h3ToParent} from 'h3-js';\n\nexport function getHexagonsInBoundingBox({west, north, east, south}, resolution) {\n  if (resolution === 0) {\n    return getRes0Indexes();\n  }\n  if (east - west > 180) {\n    // This is a known issue in h3-js: polyfill does not work correctly\n    // when longitude span is larger than 180 degrees.\n    return getHexagonsInBoundingBox({west, north, east: 0, south}, resolution).concat(\n      getHexagonsInBoundingBox({west: 0, north, east, south}, resolution)\n    );\n  }\n\n  // `polyfill()` fills based on hexagon center, which means tiles vanish\n  // prematurely. Get more accurate coverage by oversampling\n  const oversample = 1;\n  const h3Indices = polyfill(\n    [\n      [\n        [west, north],\n        [west, south],\n        [east, south],\n        [east, north],\n        [west, north]\n      ]\n    ],\n    resolution + oversample,\n    true\n  );\n\n  return oversample ? [...new Set(h3Indices.map(i => h3ToParent(i, resolution)))] : h3Indices;\n}\n\nexport function tileToBoundingBox(index) {\n  const coordinates = h3ToGeoBoundary(index);\n  const latitudes = coordinates.map(c => c[0]);\n  const longitudes = coordinates.map(c => c[1]);\n  const west = Math.min(...longitudes);\n  const south = Math.min(...latitudes);\n  const east = Math.max(...longitudes);\n  const north = Math.max(...latitudes);\n  return {west, south, east, north};\n}\n\nexport default class H3Tileset2D extends Tileset2D {\n  getTileIndices({viewport, minZoom, maxZoom}) {\n    const [east, south, west, north] = viewport.getBounds();\n\n    // TODO ignores extent\n    let z = viewport.zoom;\n    if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {\n      z = minZoom;\n    }\n    if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {\n      z = maxZoom;\n    }\n\n    // Heuristic to get h3 resolution\n    const resolution = Math.max(0, Math.floor((2 * z) / 3) - 2);\n    return getHexagonsInBoundingBox({west, north, east, south}, resolution).map(i => ({i}));\n  }\n\n  getTileId({i}) {\n    return i;\n  }\n\n  getTileMetadata({i}) {\n    return {bbox: tileToBoundingBox(i)};\n  }\n\n  getTileZoom({i}) {\n    return h3GetResolution(i);\n  }\n\n  getParentIndex(index) {\n    const resolution = h3GetResolution(index.i);\n    const i = h3ToParent(index.i, resolution - 1);\n    return {i};\n  }\n}\n"],"file":"h3-tileset-2d.js"}
+{"version":3,"sources":["../../../src/layers/h3-tileset-2d.js"],"names":["_Tileset2D","Tileset2D","polyfill","getRes0Indexes","geoToH3","h3GetResolution","h3ToGeoBoundary","h3ToParent","kRing","getHexagonsInBoundingBox","west","north","east","south","resolution","concat","oversample","h3Indices","Set","map","i","tileToBoundingBox","index","coordinates","latitudes","c","longitudes","Math","min","max","BIAS","getHexagonResolution","viewport","hexagonScaleFactor","zoom","latitudeScaleFactor","log","cos","PI","latitude","floor","H3Tileset2D","getTileIndices","minZoom","maxZoom","getBounds","z","indices","Number","isFinite","center","longitude","getTileId","getTileMetadata","bbox","getTileZoom","getParentIndex"],"mappings":"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","sourcesContent":["import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers';\nimport {\n  polyfill,\n  getRes0Indexes,\n  geoToH3,\n  h3GetResolution,\n  h3ToGeoBoundary,\n  h3ToParent,\n  kRing\n} from 'h3-js';\n\nfunction getHexagonsInBoundingBox({west, north, east, south}, resolution) {\n  if (resolution === 0) {\n    return getRes0Indexes();\n  }\n  if (east - west > 180) {\n    // This is a known issue in h3-js: polyfill does not work correctly\n    // when longitude span is larger than 180 degrees.\n    return getHexagonsInBoundingBox({west, north, east: 0, south}, resolution).concat(\n      getHexagonsInBoundingBox({west: 0, north, east, south}, resolution)\n    );\n  }\n\n  // `polyfill()` fills based on hexagon center, which means tiles vanish\n  // prematurely. Get more accurate coverage by oversampling\n  const oversample = 2;\n  const h3Indices = polyfill(\n    [\n      [\n        [west, north],\n        [west, south],\n        [east, south],\n        [east, north],\n        [west, north]\n      ]\n    ],\n    resolution + oversample,\n    true\n  );\n\n  return oversample ? [...new Set(h3Indices.map(i => h3ToParent(i, resolution)))] : h3Indices;\n}\n\nfunction tileToBoundingBox(index) {\n  const coordinates = h3ToGeoBoundary(index);\n  const latitudes = coordinates.map(c => c[0]);\n  const longitudes = coordinates.map(c => c[1]);\n  const west = Math.min(...longitudes);\n  const south = Math.min(...latitudes);\n  const east = Math.max(...longitudes);\n  const north = Math.max(...latitudes);\n  return {west, south, east, north};\n}\n\n// Resolution conversion function. Takes a WebMercatorViewport and returns\n// a H3 resolution such that the screen space size of the hexagons is\n// similar\n// Relative scale factor (0 = no biasing, 2 = a few hexagons cover view)\nconst BIAS = 2;\nfunction getHexagonResolution(viewport) {\n  const hexagonScaleFactor = (2 / 3) * viewport.zoom;\n  const latitudeScaleFactor = Math.log(1 / Math.cos((Math.PI * viewport.latitude) / 180));\n\n  // Clip and bias\n  return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));\n}\n\nexport default class H3Tileset2D extends Tileset2D {\n  getTileIndices({viewport, minZoom, maxZoom}) {\n    const [east, south, west, north] = viewport.getBounds();\n\n    let z = getHexagonResolution(viewport);\n    let indices = [];\n    if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {\n      z = minZoom;\n    }\n    if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {\n      z = maxZoom;\n\n      // Once we are at max zoom, getHexagonsInBoundingBox doesn't work, simply\n      // get a ring centered on the hexagon in the viewport center\n      const center = geoToH3(viewport.latitude, viewport.longitude, maxZoom);\n      indices = kRing(center, 1);\n    } else {\n      indices = getHexagonsInBoundingBox({west, north, east, south}, z);\n    }\n\n    return indices.map(i => ({i}));\n  }\n\n  getTileId({i}) {\n    return i;\n  }\n\n  getTileMetadata({i}) {\n    return {bbox: tileToBoundingBox(i)};\n  }\n\n  getTileZoom({i}) {\n    return h3GetResolution(i);\n  }\n\n  getParentIndex(index) {\n    const resolution = h3GetResolution(index.i);\n    const i = h3ToParent(index.i, resolution - 1);\n    return {i};\n  }\n}\n"],"file":"h3-tileset-2d.js"}

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

@@ -1,6 +1,7 @@
 import { CompositeLayer } from '@deck.gl/core';
-import { QuadkeyLayer, TileLayer } from '@deck.gl/geo-layers';
+import { QuadkeyLayer } from '@deck.gl/geo-layers';
 import QuadkeyTileset2D from './quadkey-tileset-2d';
+import SpatialIndexTileLayer from './spatial-index-tile-layer';
 
 const renderSubLayers = props => {
   const {
@@ -10,6 +11,9 @@ const renderSubLayers = props => {
   return new QuadkeyLayer(props);
 };
 
+const defaultProps = {
+  aggregationResLevel: 6
+};
 export default class QuadkeyTileLayer extends CompositeLayer {
   initializeState() {
     this.setState({
@@ -42,11 +46,8 @@ export default class QuadkeyTileLayer extends CompositeLayer {
       data,
       tileJSON
     } = this.state;
-    const {
-      maxresolution
-    } = tileJSON;
-    const maxZoom = maxresolution - this.props.aggregationResLevel;
-    return [new TileLayer(this.props, {
+    const maxZoom = parseInt(tileJSON.maxresolution);
+    return [new SpatialIndexTileLayer(this.props, {
       id: 'quadkey-tile-layer',
       data,
       getQuadkey: d => d.id,
@@ -58,4 +59,5 @@ export default class QuadkeyTileLayer extends CompositeLayer {
 
 }
 QuadkeyTileLayer.layerName = 'QuadkeyTileLayer';
+QuadkeyTileLayer.defaultProps = defaultProps;
 //# sourceMappingURL=quadkey-tile-layer.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/quadkey-tile-layer.js"],"names":["CompositeLayer","QuadkeyLayer","TileLayer","QuadkeyTileset2D","renderSubLayers","props","data","length","QuadkeyTileLayer","initializeState","setState","tileJSON","updateState","oldProps","context","changeFlags","dataChanged","tiles","renderLayers","state","maxresolution","maxZoom","aggregationResLevel","id","getQuadkey","d","TilesetClass","layerName"],"mappings":"AAAA,SAAQA,cAAR,QAA6B,eAA7B;AACA,SAAQC,YAAR,EAAsBC,SAAtB,QAAsC,qBAAtC;AACA,OAAOC,gBAAP,MAA6B,sBAA7B;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,MAAI,CAACC,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,SAAO,IAAIN,YAAJ,CAAiBI,KAAjB,CAAP;AACD,CAJD;;AAMA,eAAe,MAAMG,gBAAN,SAA+BR,cAA/B,CAA8C;AAC3DS,EAAAA,eAAe,GAAG;AAChB,SAAKC,QAAL,CAAc;AAACJ,MAAAA,IAAI,EAAE,IAAP;AAAaK,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACP,IAAAA,KAAD;AAAQQ,IAAAA,QAAR;AAAkBC,IAAAA,OAAlB;AAA2BC,IAAAA;AAA3B,GAAD,EAA0C;AACnD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAACV,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMM,QAAQ,GAAGL,IAAjB;AACAA,MAAAA,IAAI,GAAGK,QAAQ,CAACM,KAAhB;AACA,WAAKP,QAAL,CAAc;AAACJ,QAAAA,IAAD;AAAOK,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDO,EAAAA,YAAY,GAAG;AACb,UAAM;AAACZ,MAAAA,IAAD;AAAOK,MAAAA;AAAP,QAAmB,KAAKQ,KAA9B;AACA,UAAM;AAACC,MAAAA;AAAD,QAAkBT,QAAxB;AACA,UAAMU,OAAO,GAAGD,aAAa,GAAG,KAAKf,KAAL,CAAWiB,mBAA3C;AACA,WAAO,CACL,IAAIpB,SAAJ,CAAc,KAAKG,KAAnB,EAA0B;AACxBkB,MAAAA,EAAE,EAAE,oBADoB;AAExBjB,MAAAA,IAFwB;AAGxBkB,MAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACF,EAHK;AAIxBG,MAAAA,YAAY,EAAEvB,gBAJU;AAKxBC,MAAAA,eALwB;AAMxBiB,MAAAA;AANwB,KAA1B,CADK,CAAP;AAUD;;AA5B0D;AA+B7Db,gBAAgB,CAACmB,SAAjB,GAA6B,kBAA7B","sourcesContent":["import {CompositeLayer} from '@deck.gl/core';\nimport {QuadkeyLayer, TileLayer} from '@deck.gl/geo-layers';\nimport QuadkeyTileset2D from './quadkey-tileset-2d';\n\nconst renderSubLayers = props => {\n  const {data} = props;\n  if (!data || !data.length) return null;\n  return new QuadkeyLayer(props);\n};\n\nexport default class QuadkeyTileLayer extends CompositeLayer {\n  initializeState() {\n    this.setState({data: null, tileJSON: null});\n  }\n\n  updateState({props, oldProps, context, changeFlags}) {\n    if (changeFlags.dataChanged) {\n      let {data} = this.props;\n      const tileJSON = data;\n      data = tileJSON.tiles;\n      this.setState({data, tileJSON});\n    }\n  }\n\n  renderLayers() {\n    const {data, tileJSON} = this.state;\n    const {maxresolution} = tileJSON;\n    const maxZoom = maxresolution - this.props.aggregationResLevel;\n    return [\n      new TileLayer(this.props, {\n        id: 'quadkey-tile-layer',\n        data,\n        getQuadkey: d => d.id,\n        TilesetClass: QuadkeyTileset2D,\n        renderSubLayers,\n        maxZoom\n      })\n    ];\n  }\n}\n\nQuadkeyTileLayer.layerName = 'QuadkeyTileLayer';\n"],"file":"quadkey-tile-layer.js"}
+{"version":3,"sources":["../../../src/layers/quadkey-tile-layer.js"],"names":["CompositeLayer","QuadkeyLayer","QuadkeyTileset2D","SpatialIndexTileLayer","renderSubLayers","props","data","length","defaultProps","aggregationResLevel","QuadkeyTileLayer","initializeState","setState","tileJSON","updateState","oldProps","context","changeFlags","dataChanged","tiles","renderLayers","state","maxZoom","parseInt","maxresolution","id","getQuadkey","d","TilesetClass","layerName"],"mappings":"AAAA,SAAQA,cAAR,QAA6B,eAA7B;AACA,SAAQC,YAAR,QAA2B,qBAA3B;AACA,OAAOC,gBAAP,MAA6B,sBAA7B;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,MAAI,CAACC,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,SAAO,IAAIN,YAAJ,CAAiBI,KAAjB,CAAP;AACD,CAJD;;AAMA,MAAMG,YAAY,GAAG;AACnBC,EAAAA,mBAAmB,EAAE;AADF,CAArB;AAIA,eAAe,MAAMC,gBAAN,SAA+BV,cAA/B,CAA8C;AAC3DW,EAAAA,eAAe,GAAG;AAChB,SAAKC,QAAL,CAAc;AAACN,MAAAA,IAAI,EAAE,IAAP;AAAaO,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACT,IAAAA,KAAD;AAAQU,IAAAA,QAAR;AAAkBC,IAAAA,OAAlB;AAA2BC,IAAAA;AAA3B,GAAD,EAA0C;AACnD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAACZ,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMQ,QAAQ,GAAGP,IAAjB;AACAA,MAAAA,IAAI,GAAGO,QAAQ,CAACM,KAAhB;AACA,WAAKP,QAAL,CAAc;AAACN,QAAAA,IAAD;AAAOO,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDO,EAAAA,YAAY,GAAG;AACb,UAAM;AAACd,MAAAA,IAAD;AAAOO,MAAAA;AAAP,QAAmB,KAAKQ,KAA9B;AACA,UAAMC,OAAO,GAAGC,QAAQ,CAACV,QAAQ,CAACW,aAAV,CAAxB;AACA,WAAO,CACL,IAAIrB,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCoB,MAAAA,EAAE,EAAE,oBADgC;AAEpCnB,MAAAA,IAFoC;AAGpCoB,MAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACF,EAHiB;AAIpCG,MAAAA,YAAY,EAAE1B,gBAJsB;AAKpCE,MAAAA,eALoC;AAMpCkB,MAAAA;AANoC,KAAtC,CADK,CAAP;AAUD;;AA3B0D;AA8B7DZ,gBAAgB,CAACmB,SAAjB,GAA6B,kBAA7B;AACAnB,gBAAgB,CAACF,YAAjB,GAAgCA,YAAhC","sourcesContent":["import {CompositeLayer} from '@deck.gl/core';\nimport {QuadkeyLayer} from '@deck.gl/geo-layers';\nimport QuadkeyTileset2D from './quadkey-tileset-2d';\nimport SpatialIndexTileLayer from './spatial-index-tile-layer';\n\nconst renderSubLayers = props => {\n  const {data} = props;\n  if (!data || !data.length) return null;\n  return new QuadkeyLayer(props);\n};\n\nconst defaultProps = {\n  aggregationResLevel: 6\n};\n\nexport default class QuadkeyTileLayer extends CompositeLayer {\n  initializeState() {\n    this.setState({data: null, tileJSON: null});\n  }\n\n  updateState({props, oldProps, context, changeFlags}) {\n    if (changeFlags.dataChanged) {\n      let {data} = this.props;\n      const tileJSON = data;\n      data = tileJSON.tiles;\n      this.setState({data, tileJSON});\n    }\n  }\n\n  renderLayers() {\n    const {data, tileJSON} = this.state;\n    const maxZoom = parseInt(tileJSON.maxresolution);\n    return [\n      new SpatialIndexTileLayer(this.props, {\n        id: 'quadkey-tile-layer',\n        data,\n        getQuadkey: d => d.id,\n        TilesetClass: QuadkeyTileset2D,\n        renderSubLayers,\n        maxZoom\n      })\n    ];\n  }\n}\n\nQuadkeyTileLayer.layerName = 'QuadkeyTileLayer';\nQuadkeyTileLayer.defaultProps = defaultProps;\n"],"file":"quadkey-tile-layer.js"}

package/dist/esm/layers/spatial-index-tile-layer.js

@@ -0,0 +1,57 @@
+import { TileLayer } from '@deck.gl/geo-layers';
+
+function isFeatureIdDefined(value) {
+  return value !== undefined && value !== null && value !== '';
+}
+
+export default class SpatialIndexTileLayer extends TileLayer {
+  _updateAutoHighlight(info) {
+    const {
+      hoveredFeatureId
+    } = this.state;
+    const hoveredFeature = info.object;
+    let newHoveredFeatureId;
+
+    if (hoveredFeature) {
+      newHoveredFeatureId = hoveredFeature.id;
+    }
+
+    if (hoveredFeatureId !== newHoveredFeatureId) {
+      let {
+        highlightColor
+      } = this.props;
+
+      if (typeof highlightColor === 'function') {
+        highlightColor = highlightColor(info);
+      }
+
+      this.setState({
+        highlightColor,
+        hoveredFeatureId: newHoveredFeatureId
+      });
+    }
+  }
+
+  getSubLayerPropsByTile(tile) {
+    return {
+      highlightedObjectIndex: this.getHighlightedObjectIndex(tile),
+      highlightColor: this.state.highlightColor
+    };
+  }
+
+  getHighlightedObjectIndex(tile) {
+    const {
+      hoveredFeatureId
+    } = this.state;
+    const data = tile.content;
+    const isFeatureIdPresent = isFeatureIdDefined(hoveredFeatureId);
+
+    if (!isFeatureIdPresent || !Array.isArray(data)) {
+      return -1;
+    }
+
+    return data.findIndex(feature => feature.id === hoveredFeatureId);
+  }
+
+}
+//# sourceMappingURL=spatial-index-tile-layer.js.map

package/dist/esm/layers/spatial-index-tile-layer.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/layers/spatial-index-tile-layer.js"],"names":["TileLayer","isFeatureIdDefined","value","undefined","SpatialIndexTileLayer","_updateAutoHighlight","info","hoveredFeatureId","state","hoveredFeature","object","newHoveredFeatureId","id","highlightColor","props","setState","getSubLayerPropsByTile","tile","highlightedObjectIndex","getHighlightedObjectIndex","data","content","isFeatureIdPresent","Array","isArray","findIndex","feature"],"mappings":"AAAA,SAAQA,SAAR,QAAwB,qBAAxB;;AAEA,SAASC,kBAAT,CAA4BC,KAA5B,EAAmC;AACjC,SAAOA,KAAK,KAAKC,SAAV,IAAuBD,KAAK,KAAK,IAAjC,IAAyCA,KAAK,KAAK,EAA1D;AACD;;AAED,eAAe,MAAME,qBAAN,SAAoCJ,SAApC,CAA8C;AAC3DK,EAAAA,oBAAoB,CAACC,IAAD,EAAO;AACzB,UAAM;AAACC,MAAAA;AAAD,QAAqB,KAAKC,KAAhC;AACA,UAAMC,cAAc,GAAGH,IAAI,CAACI,MAA5B;AACA,QAAIC,mBAAJ;;AAEA,QAAIF,cAAJ,EAAoB;AAClBE,MAAAA,mBAAmB,GAAGF,cAAc,CAACG,EAArC;AACD;;AAED,QAAIL,gBAAgB,KAAKI,mBAAzB,EAA8C;AAC5C,UAAI;AAACE,QAAAA;AAAD,UAAmB,KAAKC,KAA5B;;AACA,UAAI,OAAOD,cAAP,KAA0B,UAA9B,EAA0C;AACxCA,QAAAA,cAAc,GAAGA,cAAc,CAACP,IAAD,CAA/B;AACD;;AAED,WAAKS,QAAL,CAAc;AACZF,QAAAA,cADY;AAEZN,QAAAA,gBAAgB,EAAEI;AAFN,OAAd;AAID;AACF;;AAEDK,EAAAA,sBAAsB,CAACC,IAAD,EAAO;AAC3B,WAAO;AACLC,MAAAA,sBAAsB,EAAE,KAAKC,yBAAL,CAA+BF,IAA/B,CADnB;AAELJ,MAAAA,cAAc,EAAE,KAAKL,KAAL,CAAWK;AAFtB,KAAP;AAID;;AAEDM,EAAAA,yBAAyB,CAACF,IAAD,EAAO;AAC9B,UAAM;AAACV,MAAAA;AAAD,QAAqB,KAAKC,KAAhC;AACA,UAAMY,IAAI,GAAGH,IAAI,CAACI,OAAlB;AAEA,UAAMC,kBAAkB,GAAGrB,kBAAkB,CAACM,gBAAD,CAA7C;;AACA,QAAI,CAACe,kBAAD,IAAuB,CAACC,KAAK,CAACC,OAAN,CAAcJ,IAAd,CAA5B,EAAiD;AAC/C,aAAO,CAAC,CAAR;AACD;;AAED,WAAOA,IAAI,CAACK,SAAL,CAAeC,OAAO,IAAIA,OAAO,CAACd,EAAR,KAAeL,gBAAzC,CAAP;AACD;;AAxC0D","sourcesContent":["import {TileLayer} from '@deck.gl/geo-layers';\n\nfunction isFeatureIdDefined(value) {\n  return value !== undefined && value !== null && value !== '';\n}\n\nexport default class SpatialIndexTileLayer extends TileLayer {\n  _updateAutoHighlight(info) {\n    const {hoveredFeatureId} = this.state;\n    const hoveredFeature = info.object;\n    let newHoveredFeatureId;\n\n    if (hoveredFeature) {\n      newHoveredFeatureId = hoveredFeature.id;\n    }\n\n    if (hoveredFeatureId !== newHoveredFeatureId) {\n      let {highlightColor} = this.props;\n      if (typeof highlightColor === 'function') {\n        highlightColor = highlightColor(info);\n      }\n\n      this.setState({\n        highlightColor,\n        hoveredFeatureId: newHoveredFeatureId\n      });\n    }\n  }\n\n  getSubLayerPropsByTile(tile) {\n    return {\n      highlightedObjectIndex: this.getHighlightedObjectIndex(tile),\n      highlightColor: this.state.highlightColor\n    };\n  }\n\n  getHighlightedObjectIndex(tile) {\n    const {hoveredFeatureId} = this.state;\n    const data = tile.content;\n\n    const isFeatureIdPresent = isFeatureIdDefined(hoveredFeatureId);\n    if (!isFeatureIdPresent || !Array.isArray(data)) {\n      return -1;\n    }\n\n    return data.findIndex(feature => feature.id === hoveredFeatureId);\n  }\n}\n"],"file":"spatial-index-tile-layer.js"}