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

package/dist/dist.dev.js

@@ -47320,7 +47320,11 @@ const defaultProps = {
   columns: {
     type: 'array',
     value: null
-  }
+  },
+  // (String, optional): aggregration SQL expression. Only used for spatial index datasets
+  aggregationExp: null,
+  // (Number, optional): aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3
+  aggregationResLevel: null
 };
 class CartoLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLayer"] {
   initializeState() {
@@ -47691,6 +47695,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _h3_tileset_2d__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./h3-tileset-2d */ "./src/layers/h3-tileset-2d.js");
+/* harmony import */ var _spatial_index_tile_layer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./spatial-index-tile-layer */ "./src/layers/spatial-index-tile-layer.js");
+
 
 
 
@@ -47709,6 +47715,9 @@ const renderSubLayers = props => {
   });
 };
 
+const defaultProps = {
+  aggregationResLevel: 4
+};
 class H3TileLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLayer"] {
   initializeState() {
     this.setState({
@@ -47738,19 +47747,23 @@ class H3TileLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeL
 
   renderLayers() {
     const {
-      data
+      data,
+      tileJSON
     } = this.state;
-    return [new _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["TileLayer"](this.props, {
+    const maxZoom = parseInt(tileJSON.maxresolution);
+    return [new _spatial_index_tile_layer__WEBPACK_IMPORTED_MODULE_2__["default"](this.props, {
       id: 'h3-tile-layer',
       data,
       getHexagon: d => d.id,
       TilesetClass: _h3_tileset_2d__WEBPACK_IMPORTED_MODULE_1__["default"],
-      renderSubLayers
+      renderSubLayers,
+      maxZoom
     })];
   }
 
 }
 H3TileLayer.layerName = 'H3TileLayer';
+H3TileLayer.defaultProps = defaultProps;
 
 /***/ }),
 
@@ -47758,13 +47771,11 @@ H3TileLayer.layerName = 'H3TileLayer';
 /*!*************************************!*\
   !*** ./src/layers/h3-tileset-2d.js ***!
   \*************************************/
-/*! exports provided: getHexagonsInBoundingBox, tileToBoundingBox, default */
+/*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getHexagonsInBoundingBox", function() { return getHexagonsInBoundingBox; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "tileToBoundingBox", function() { return tileToBoundingBox; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return H3Tileset2D; });
 /* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__);
@@ -47772,6 +47783,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var h3_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(h3_js__WEBPACK_IMPORTED_MODULE_1__);
 
 
+
 function getHexagonsInBoundingBox({
   west,
   north,
@@ -47800,10 +47812,11 @@ function getHexagonsInBoundingBox({
   // prematurely. Get more accurate coverage by oversampling
 
 
-  const oversample = 1;
+  const oversample = 2;
   const h3Indices = Object(h3_js__WEBPACK_IMPORTED_MODULE_1__["polyfill"])([[[west, north], [west, south], [east, south], [east, north], [west, north]]], resolution + oversample, true);
   return oversample ? [...new Set(h3Indices.map(i => Object(h3_js__WEBPACK_IMPORTED_MODULE_1__["h3ToParent"])(i, resolution)))] : h3Indices;
 }
+
 function tileToBoundingBox(index) {
   const coordinates = Object(h3_js__WEBPACK_IMPORTED_MODULE_1__["h3ToGeoBoundary"])(index);
   const latitudes = coordinates.map(c => c[0]);
@@ -47818,33 +47831,51 @@ function tileToBoundingBox(index) {
     east,
     north
   };
+} // Resolution conversion function. Takes a WebMercatorViewport and returns
+// a H3 resolution such that the screen space size of the hexagons is
+// similar
+// Relative scale factor (0 = no biasing, 2 = a few hexagons cover view)
+
+
+const BIAS = 2;
+
+function getHexagonResolution(viewport) {
+  const hexagonScaleFactor = 2 / 3 * viewport.zoom;
+  const latitudeScaleFactor = Math.log(1 / Math.cos(Math.PI * viewport.latitude / 180)); // Clip and bias
+
+  return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));
 }
+
 class H3Tileset2D extends _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__["_Tileset2D"] {
   getTileIndices({
     viewport,
     minZoom,
     maxZoom
   }) {
-    const [east, south, west, north] = viewport.getBounds(); // TODO ignores extent
-
-    let z = viewport.zoom;
+    const [east, south, west, north] = viewport.getBounds();
+    let z = getHexagonResolution(viewport);
+    let indices = [];
 
     if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
       z = minZoom;
     }
 
     if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {
-      z = maxZoom;
-    } // Heuristic to get h3 resolution
+      z = maxZoom; // Once we are at max zoom, getHexagonsInBoundingBox doesn't work, simply
+      // get a ring centered on the hexagon in the viewport center
 
+      const center = Object(h3_js__WEBPACK_IMPORTED_MODULE_1__["geoToH3"])(viewport.latitude, viewport.longitude, maxZoom);
+      indices = Object(h3_js__WEBPACK_IMPORTED_MODULE_1__["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
     }));
   }
@@ -47894,6 +47925,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/core */ "@deck.gl/core");
 /* harmony import */ var _deck_gl_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_core__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _quadkey_tileset_2d__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./quadkey-tileset-2d */ "./src/layers/quadkey-tileset-2d.js");
+/* harmony import */ var _spatial_index_tile_layer__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./spatial-index-tile-layer */ "./src/layers/spatial-index-tile-layer.js");
+
 
 
 
@@ -47906,6 +47939,9 @@ const renderSubLayers = props => {
   return new _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["QuadkeyLayer"](props);
 };
 
+const defaultProps = {
+  aggregationResLevel: 6
+};
 class QuadkeyTileLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["CompositeLayer"] {
   initializeState() {
     this.setState({
@@ -47938,11 +47974,8 @@ class QuadkeyTileLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["Compo
       data,
       tileJSON
     } = this.state;
-    const {
-      maxresolution
-    } = tileJSON;
-    const maxZoom = maxresolution - this.props.aggregationResLevel;
-    return [new _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["TileLayer"](this.props, {
+    const maxZoom = parseInt(tileJSON.maxresolution);
+    return [new _spatial_index_tile_layer__WEBPACK_IMPORTED_MODULE_2__["default"](this.props, {
       id: 'quadkey-tile-layer',
       data,
       getQuadkey: d => d.id,
@@ -47954,6 +47987,7 @@ class QuadkeyTileLayer extends _deck_gl_core__WEBPACK_IMPORTED_MODULE_0__["Compo
 
 }
 QuadkeyTileLayer.layerName = 'QuadkeyTileLayer';
+QuadkeyTileLayer.defaultProps = defaultProps;
 
 /***/ }),
 
@@ -48235,6 +48269,77 @@ Tile._readField = function (tag, obj, pbf) {
 
 /***/ }),
 
+/***/ "./src/layers/spatial-index-tile-layer.js":
+/*!************************************************!*\
+  !*** ./src/layers/spatial-index-tile-layer.js ***!
+  \************************************************/
+/*! exports provided: default */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return SpatialIndexTileLayer; });
+/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @deck.gl/geo-layers */ "@deck.gl/core");
+/* harmony import */ var _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__);
+
+
+function isFeatureIdDefined(value) {
+  return value !== undefined && value !== null && value !== '';
+}
+
+class SpatialIndexTileLayer extends _deck_gl_geo_layers__WEBPACK_IMPORTED_MODULE_0__["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);
+  }
+
+}
+
+/***/ }),
+
 /***/ "./src/style/color-bins-style.ts":
 /*!***************************************!*\
   !*** ./src/style/color-bins-style.ts ***!

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

@@ -84,7 +84,9 @@ var defaultProps = {
   columns: {
     type: 'array',
     value: null
-  }
+  },
+  aggregationExp: null,
+  aggregationResLevel: null
 };
 
 var CartoLayer = function (_CompositeLayer) {

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","CartoLayer","state","apiVersion","getSubLayers","length","props","localCreds","log","assert","Object","values","API_VERSIONS","includes","V1","V2","MAP_TYPES","QUERY","TILESET","V3","COLUMNS_SUPPORT","join","GEO_COLUMN_SUPPORT","Array","isArray","oldProps","changeFlags","_checkProps","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","propName","layer","_notUsed","propsNoData","MVTLayer","FORMATS","TILEJSON","tileUrl","URL","tiles","searchParams","get","TILE_FORMATS","MVT","scheme","H3TileLayer","QuadkeyTileLayer","CartoTileLayer","GeoJsonLayer","updateTriggers","_getSubLayerAndProps","getSubLayerProps","id","layerName","CompositeLayer"],"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":["defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","aggregationExp","aggregationResLevel","CartoLayer","state","apiVersion","getSubLayers","length","props","localCreds","log","assert","Object","values","API_VERSIONS","includes","V1","V2","MAP_TYPES","QUERY","TILESET","V3","COLUMNS_SUPPORT","join","GEO_COLUMN_SUPPORT","Array","isArray","oldProps","changeFlags","_checkProps","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","propName","layer","_notUsed","propsNoData","MVTLayer","FORMATS","TILEJSON","tileUrl","URL","tiles","searchParams","get","TILE_FORMATS","MVT","scheme","H3TileLayer","QuadkeyTileLayer","CartoTileLayer","GeoJsonLayer","updateTriggers","_getSubLayerAndProps","getSubLayerProps","id","layerName","CompositeLayer"],"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/es5/layers/h3-tile-layer.js

@@ -23,6 +23,8 @@ var _geoLayers = require("@deck.gl/geo-layers");
 
 var _h3Tileset2d = _interopRequireDefault(require("./h3-tileset-2d"));
 
+var _spatialIndexTileLayer = _interopRequireDefault(require("./spatial-index-tile-layer"));
+
 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; } }
@@ -37,6 +39,10 @@ var renderSubLayers = function renderSubLayers(props) {
   });
 };
 
+var defaultProps = {
+  aggregationResLevel: 4
+};
+
 var H3TileLayer = function (_CompositeLayer) {
   (0, _inherits2.default)(H3TileLayer, _CompositeLayer);
 
@@ -76,15 +82,19 @@ var H3TileLayer = function (_CompositeLayer) {
   }, {
     key: "renderLayers",
     value: function renderLayers() {
-      var data = this.state.data;
-      return [new _geoLayers.TileLayer(this.props, {
+      var _this$state = this.state,
+          data = _this$state.data,
+          tileJSON = _this$state.tileJSON;
+      var maxZoom = parseInt(tileJSON.maxresolution);
+      return [new _spatialIndexTileLayer.default(this.props, {
         id: 'h3-tile-layer',
         data: data,
         getHexagon: function getHexagon(d) {
           return d.id;
         },
         TilesetClass: _h3Tileset2d.default,
-        renderSubLayers: renderSubLayers
+        renderSubLayers: renderSubLayers,
+        maxZoom: maxZoom
       })];
     }
   }]);
@@ -93,4 +103,5 @@ var H3TileLayer = function (_CompositeLayer) {
 
 exports.default = H3TileLayer;
 H3TileLayer.layerName = 'H3TileLayer';
+H3TileLayer.defaultProps = defaultProps;
 //# sourceMappingURL=h3-tile-layer.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/h3-tile-layer.js"],"names":["renderSubLayers","props","data","index","tile","length","H3HexagonLayer","centerHexagon","highPrecision","H3TileLayer","setState","tileJSON","oldProps","context","changeFlags","dataChanged","tiles","state","TileLayer","id","getHexagon","d","TilesetClass","H3Tileset2D","CompositeLayer","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;AAEA,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAAAC,KAAK,EAAI;AAC/B,MAAOC,IAAP,GAAeD,KAAf,CAAOC,IAAP;AACA,MAAOC,KAAP,GAAgBF,KAAK,CAACG,IAAtB,CAAOD,KAAP;AACA,MAAI,CAACD,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIC,yBAAJ,CAAmBL,KAAnB,EAA0B;AAC/BM,IAAAA,aAAa,EAAEJ,KADgB;AAE/BK,IAAAA,aAAa,EAAE;AAFgB,GAA1B,CAAP;AAID,CATD;;IAWqBC,W;;;;;;;;;;;;WACnB,2BAAkB;AAChB,WAAKC,QAAL,CAAc;AAACR,QAAAA,IAAI,EAAE,IAAP;AAAaS,QAAAA,QAAQ,EAAE;AAAvB,OAAd;AACD;;;WAED,2BAAqD;AAAA,UAAxCV,KAAwC,QAAxCA,KAAwC;AAAA,UAAjCW,QAAiC,QAAjCA,QAAiC;AAAA,UAAvBC,OAAuB,QAAvBA,OAAuB;AAAA,UAAdC,WAAc,QAAdA,WAAc;;AACnD,UAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,YAAKb,IAAL,GAAa,KAAKD,KAAlB,CAAKC,IAAL;AACA,YAAMS,QAAQ,GAAGT,IAAjB;AACAA,QAAAA,IAAI,GAAGS,QAAQ,CAACK,KAAhB;AACA,aAAKN,QAAL,CAAc;AAACR,UAAAA,IAAI,EAAJA,IAAD;AAAOS,UAAAA,QAAQ,EAARA;AAAP,SAAd;AACD;AACF;;;WAED,wBAAe;AACb,UAAOT,IAAP,GAAe,KAAKe,KAApB,CAAOf,IAAP;AACA,aAAO,CACL,IAAIgB,oBAAJ,CAAc,KAAKjB,KAAnB,EAA0B;AACxBkB,QAAAA,EAAE,EAAE,eADoB;AAExBjB,QAAAA,IAAI,EAAJA,IAFwB;AAGxBkB,QAAAA,UAAU,EAAE,oBAAAC,CAAC;AAAA,iBAAIA,CAAC,CAACF,EAAN;AAAA,SAHW;AAIxBG,QAAAA,YAAY,EAAEC,oBAJU;AAKxBvB,QAAAA,eAAe,EAAfA;AALwB,OAA1B,CADK,CAAP;AASD;;;EAzBsCwB,oB;;;AA4BzCf,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":["renderSubLayers","props","data","index","tile","length","H3HexagonLayer","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","setState","tileJSON","oldProps","context","changeFlags","dataChanged","tiles","state","maxZoom","parseInt","maxresolution","SpatialIndexTileLayer","id","getHexagon","d","TilesetClass","H3Tileset2D","CompositeLayer","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;AAEA,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAAAC,KAAK,EAAI;AAC/B,MAAOC,IAAP,GAAeD,KAAf,CAAOC,IAAP;AACA,MAAOC,KAAP,GAAgBF,KAAK,CAACG,IAAtB,CAAOD,KAAP;AACA,MAAI,CAACD,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIC,yBAAJ,CAAmBL,KAAnB,EAA0B;AAC/BM,IAAAA,aAAa,EAAEJ,KADgB;AAE/BK,IAAAA,aAAa,EAAE;AAFgB,GAA1B,CAAP;AAID,CATD;;AAWA,IAAMC,YAAY,GAAG;AACnBC,EAAAA,mBAAmB,EAAE;AADF,CAArB;;IAIqBC,W;;;;;;;;;;;;WACnB,2BAAkB;AAChB,WAAKC,QAAL,CAAc;AAACV,QAAAA,IAAI,EAAE,IAAP;AAAaW,QAAAA,QAAQ,EAAE;AAAvB,OAAd;AACD;;;WAED,2BAAqD;AAAA,UAAxCZ,KAAwC,QAAxCA,KAAwC;AAAA,UAAjCa,QAAiC,QAAjCA,QAAiC;AAAA,UAAvBC,OAAuB,QAAvBA,OAAuB;AAAA,UAAdC,WAAc,QAAdA,WAAc;;AACnD,UAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,YAAKf,IAAL,GAAa,KAAKD,KAAlB,CAAKC,IAAL;AACA,YAAMW,QAAQ,GAAGX,IAAjB;AACAA,QAAAA,IAAI,GAAGW,QAAQ,CAACK,KAAhB;AACA,aAAKN,QAAL,CAAc;AAACV,UAAAA,IAAI,EAAJA,IAAD;AAAOW,UAAAA,QAAQ,EAARA;AAAP,SAAd;AACD;AACF;;;WAED,wBAAe;AACb,wBAAyB,KAAKM,KAA9B;AAAA,UAAOjB,IAAP,eAAOA,IAAP;AAAA,UAAaW,QAAb,eAAaA,QAAb;AACA,UAAMO,OAAO,GAAGC,QAAQ,CAACR,QAAQ,CAACS,aAAV,CAAxB;AACA,aAAO,CACL,IAAIC,8BAAJ,CAA0B,KAAKtB,KAA/B,EAAsC;AACpCuB,QAAAA,EAAE,EAAE,eADgC;AAEpCtB,QAAAA,IAAI,EAAJA,IAFoC;AAGpCuB,QAAAA,UAAU,EAAE,oBAAAC,CAAC;AAAA,iBAAIA,CAAC,CAACF,EAAN;AAAA,SAHuB;AAIpCG,QAAAA,YAAY,EAAEC,oBAJsB;AAKpC5B,QAAAA,eAAe,EAAfA,eALoC;AAMpCoB,QAAAA,OAAO,EAAPA;AANoC,OAAtC,CADK,CAAP;AAUD;;;EA3BsCS,oB;;;AA8BzClB,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/es5/layers/h3-tileset-2d.js

@@ -5,8 +5,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getHexagonsInBoundingBox = getHexagonsInBoundingBox;
-exports.tileToBoundingBox = tileToBoundingBox;
 exports.default = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -55,7 +53,7 @@ function getHexagonsInBoundingBox(_ref, resolution) {
     }, resolution));
   }
 
-  var oversample = 1;
+  var oversample = 2;
   var h3Indices = (0, _h3Js.polyfill)([[[west, north], [west, south], [east, south], [east, north], [west, north]]], resolution + oversample, true);
   return oversample ? (0, _toConsumableArray2.default)(new Set(h3Indices.map(function (i) {
     return (0, _h3Js.h3ToParent)(i, resolution);
@@ -82,6 +80,14 @@ function tileToBoundingBox(index) {
   };
 }
 
+var BIAS = 2;
+
+function getHexagonResolution(viewport) {
+  var hexagonScaleFactor = 2 / 3 * viewport.zoom;
+  var latitudeScaleFactor = Math.log(1 / Math.cos(Math.PI * viewport.latitude / 180));
+  return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));
+}
+
 var H3Tileset2D = function (_Tileset2D) {
   (0, _inherits2.default)(H3Tileset2D, _Tileset2D);
 
@@ -106,7 +112,8 @@ var H3Tileset2D = function (_Tileset2D) {
           west = _viewport$getBounds2[2],
           north = _viewport$getBounds2[3];
 
-      var z = viewport.zoom;
+      var z = getHexagonResolution(viewport);
+      var indices = [];
 
       if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
         z = minZoom;
@@ -114,15 +121,18 @@ var H3Tileset2D = function (_Tileset2D) {
 
       if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {
         z = maxZoom;
+        var center = (0, _h3Js.geoToH3)(viewport.latitude, viewport.longitude, maxZoom);
+        indices = (0, _h3Js.kRing)(center, 1);
+      } else {
+        indices = getHexagonsInBoundingBox({
+          west: west,
+          north: north,
+          east: east,
+          south: south
+        }, z);
       }
 
-      var resolution = Math.max(0, Math.floor(2 * z / 3) - 2);
-      return getHexagonsInBoundingBox({
-        west: west,
-        north: north,
-        east: east,
-        south: south
-      }, resolution).map(function (i) {
+      return indices.map(function (i) {
         return {
           i: i
         };

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/h3-tileset-2d.js"],"names":["getHexagonsInBoundingBox","resolution","west","north","east","south","concat","oversample","h3Indices","Set","map","i","tileToBoundingBox","index","coordinates","latitudes","c","longitudes","Math","min","max","H3Tileset2D","viewport","minZoom","maxZoom","getBounds","z","zoom","Number","isFinite","floor","bbox","Tileset2D"],"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":["getHexagonsInBoundingBox","resolution","west","north","east","south","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","minZoom","maxZoom","getBounds","z","indices","Number","isFinite","center","longitude","bbox","Tileset2D"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;;;;;AAUA,SAASA,wBAAT,OAA8DC,UAA9D,EAA0E;AAAA,MAAvCC,IAAuC,QAAvCA,IAAuC;AAAA,MAAjCC,KAAiC,QAAjCA,KAAiC;AAAA,MAA1BC,IAA0B,QAA1BA,IAA0B;AAAA,MAApBC,KAAoB,QAApBA,KAAoB;;AACxE,MAAIJ,UAAU,KAAK,CAAnB,EAAsB;AACpB,WAAO,2BAAP;AACD;;AACD,MAAIG,IAAI,GAAGF,IAAP,GAAc,GAAlB,EAAuB;AAGrB,WAAOF,wBAAwB,CAAC;AAACE,MAAAA,IAAI,EAAJA,IAAD;AAAOC,MAAAA,KAAK,EAALA,KAAP;AAAcC,MAAAA,IAAI,EAAE,CAApB;AAAuBC,MAAAA,KAAK,EAALA;AAAvB,KAAD,EAAgCJ,UAAhC,CAAxB,CAAoEK,MAApE,CACLN,wBAAwB,CAAC;AAACE,MAAAA,IAAI,EAAE,CAAP;AAAUC,MAAAA,KAAK,EAALA,KAAV;AAAiBC,MAAAA,IAAI,EAAJA,IAAjB;AAAuBC,MAAAA,KAAK,EAALA;AAAvB,KAAD,EAAgCJ,UAAhC,CADnB,CAAP;AAGD;;AAID,MAAMM,UAAU,GAAG,CAAnB;AACA,MAAMC,SAAS,GAAG,oBAChB,CACE,CACE,CAACN,IAAD,EAAOC,KAAP,CADF,EAEE,CAACD,IAAD,EAAOG,KAAP,CAFF,EAGE,CAACD,IAAD,EAAOC,KAAP,CAHF,EAIE,CAACD,IAAD,EAAOD,KAAP,CAJF,EAKE,CAACD,IAAD,EAAOC,KAAP,CALF,CADF,CADgB,EAUhBF,UAAU,GAAGM,UAVG,EAWhB,IAXgB,CAAlB;AAcA,SAAOA,UAAU,oCAAO,IAAIE,GAAJ,CAAQD,SAAS,CAACE,GAAV,CAAc,UAAAC,CAAC;AAAA,WAAI,sBAAWA,CAAX,EAAcV,UAAd,CAAJ;AAAA,GAAf,CAAR,CAAP,IAAiEO,SAAlF;AACD;;AAED,SAASI,iBAAT,CAA2BC,KAA3B,EAAkC;AAChC,MAAMC,WAAW,GAAG,2BAAgBD,KAAhB,CAApB;AACA,MAAME,SAAS,GAAGD,WAAW,CAACJ,GAAZ,CAAgB,UAAAM,CAAC;AAAA,WAAIA,CAAC,CAAC,CAAD,CAAL;AAAA,GAAjB,CAAlB;AACA,MAAMC,UAAU,GAAGH,WAAW,CAACJ,GAAZ,CAAgB,UAAAM,CAAC;AAAA,WAAIA,CAAC,CAAC,CAAD,CAAL;AAAA,GAAjB,CAAnB;AACA,MAAMd,IAAI,GAAGgB,IAAI,CAACC,GAAL,OAAAD,IAAI,mCAAQD,UAAR,EAAjB;AACA,MAAMZ,KAAK,GAAGa,IAAI,CAACC,GAAL,OAAAD,IAAI,mCAAQH,SAAR,EAAlB;AACA,MAAMX,IAAI,GAAGc,IAAI,CAACE,GAAL,OAAAF,IAAI,mCAAQD,UAAR,EAAjB;AACA,MAAMd,KAAK,GAAGe,IAAI,CAACE,GAAL,OAAAF,IAAI,mCAAQH,SAAR,EAAlB;AACA,SAAO;AAACb,IAAAA,IAAI,EAAJA,IAAD;AAAOG,IAAAA,KAAK,EAALA,KAAP;AAAcD,IAAAA,IAAI,EAAJA,IAAd;AAAoBD,IAAAA,KAAK,EAALA;AAApB,GAAP;AACD;;AAMD,IAAMkB,IAAI,GAAG,CAAb;;AACA,SAASC,oBAAT,CAA8BC,QAA9B,EAAwC;AACtC,MAAMC,kBAAkB,GAAI,IAAI,CAAL,GAAUD,QAAQ,CAACE,IAA9C;AACA,MAAMC,mBAAmB,GAAGR,IAAI,CAACS,GAAL,CAAS,IAAIT,IAAI,CAACU,GAAL,CAAUV,IAAI,CAACW,EAAL,GAAUN,QAAQ,CAACO,QAApB,GAAgC,GAAzC,CAAb,CAA5B;AAGA,SAAOZ,IAAI,CAACE,GAAL,CAAS,CAAT,EAAYF,IAAI,CAACa,KAAL,CAAWP,kBAAkB,GAAGE,mBAArB,GAA2CL,IAAtD,CAAZ,CAAP;AACD;;IAEoBW,W;;;;;;;;;;;;WACnB,+BAA6C;AAAA,UAA7BT,QAA6B,SAA7BA,QAA6B;AAAA,UAAnBU,OAAmB,SAAnBA,OAAmB;AAAA,UAAVC,OAAU,SAAVA,OAAU;;AAC3C,gCAAmCX,QAAQ,CAACY,SAAT,EAAnC;AAAA;AAAA,UAAO/B,IAAP;AAAA,UAAaC,KAAb;AAAA,UAAoBH,IAApB;AAAA,UAA0BC,KAA1B;;AAEA,UAAIiC,CAAC,GAAGd,oBAAoB,CAACC,QAAD,CAA5B;AACA,UAAIc,OAAO,GAAG,EAAd;;AACA,UAAI,OAAOJ,OAAP,KAAmB,QAAnB,IAA+BK,MAAM,CAACC,QAAP,CAAgBN,OAAhB,CAA/B,IAA2DG,CAAC,GAAGH,OAAnE,EAA4E;AAC1EG,QAAAA,CAAC,GAAGH,OAAJ;AACD;;AACD,UAAI,OAAOC,OAAP,KAAmB,QAAnB,IAA+BI,MAAM,CAACC,QAAP,CAAgBL,OAAhB,CAA/B,IAA2DE,CAAC,GAAGF,OAAnE,EAA4E;AAC1EE,QAAAA,CAAC,GAAGF,OAAJ;AAIA,YAAMM,MAAM,GAAG,mBAAQjB,QAAQ,CAACO,QAAjB,EAA2BP,QAAQ,CAACkB,SAApC,EAA+CP,OAA/C,CAAf;AACAG,QAAAA,OAAO,GAAG,iBAAMG,MAAN,EAAc,CAAd,CAAV;AACD,OAPD,MAOO;AACLH,QAAAA,OAAO,GAAGrC,wBAAwB,CAAC;AAACE,UAAAA,IAAI,EAAJA,IAAD;AAAOC,UAAAA,KAAK,EAALA,KAAP;AAAcC,UAAAA,IAAI,EAAJA,IAAd;AAAoBC,UAAAA,KAAK,EAALA;AAApB,SAAD,EAA6B+B,CAA7B,CAAlC;AACD;;AAED,aAAOC,OAAO,CAAC3B,GAAR,CAAY,UAAAC,CAAC;AAAA,eAAK;AAACA,UAAAA,CAAC,EAADA;AAAD,SAAL;AAAA,OAAb,CAAP;AACD;;;WAED,0BAAe;AAAA,UAAJA,CAAI,SAAJA,CAAI;AACb,aAAOA,CAAP;AACD;;;WAED,gCAAqB;AAAA,UAAJA,CAAI,SAAJA,CAAI;AACnB,aAAO;AAAC+B,QAAAA,IAAI,EAAE9B,iBAAiB,CAACD,CAAD;AAAxB,OAAP;AACD;;;WAED,4BAAiB;AAAA,UAAJA,CAAI,SAAJA,CAAI;AACf,aAAO,2BAAgBA,CAAhB,CAAP;AACD;;;WAED,wBAAeE,KAAf,EAAsB;AACpB,UAAMZ,UAAU,GAAG,2BAAgBY,KAAK,CAACF,CAAtB,CAAnB;AACA,UAAMA,CAAC,GAAG,sBAAWE,KAAK,CAACF,CAAjB,EAAoBV,UAAU,GAAG,CAAjC,CAAV;AACA,aAAO;AAACU,QAAAA,CAAC,EAADA;AAAD,OAAP;AACD;;;EAvCsCgC,qB","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/es5/layers/quadkey-tile-layer.js

@@ -23,6 +23,8 @@ var _geoLayers = require("@deck.gl/geo-layers");
 
 var _quadkeyTileset2d = _interopRequireDefault(require("./quadkey-tileset-2d"));
 
+var _spatialIndexTileLayer = _interopRequireDefault(require("./spatial-index-tile-layer"));
+
 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; } }
@@ -33,6 +35,10 @@ var renderSubLayers = function renderSubLayers(props) {
   return new _geoLayers.QuadkeyLayer(props);
 };
 
+var defaultProps = {
+  aggregationResLevel: 6
+};
+
 var QuadkeyTileLayer = function (_CompositeLayer) {
   (0, _inherits2.default)(QuadkeyTileLayer, _CompositeLayer);
 
@@ -75,9 +81,8 @@ var QuadkeyTileLayer = function (_CompositeLayer) {
       var _this$state = this.state,
           data = _this$state.data,
           tileJSON = _this$state.tileJSON;
-      var maxresolution = tileJSON.maxresolution;
-      var maxZoom = maxresolution - this.props.aggregationResLevel;
-      return [new _geoLayers.TileLayer(this.props, {
+      var maxZoom = parseInt(tileJSON.maxresolution);
+      return [new _spatialIndexTileLayer.default(this.props, {
         id: 'quadkey-tile-layer',
         data: data,
         getQuadkey: function getQuadkey(d) {
@@ -94,4 +99,5 @@ var QuadkeyTileLayer = function (_CompositeLayer) {
 
 exports.default = QuadkeyTileLayer;
 QuadkeyTileLayer.layerName = 'QuadkeyTileLayer';
+QuadkeyTileLayer.defaultProps = defaultProps;
 //# sourceMappingURL=quadkey-tile-layer.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/layers/quadkey-tile-layer.js"],"names":["renderSubLayers","props","data","length","QuadkeyLayer","QuadkeyTileLayer","setState","tileJSON","oldProps","context","changeFlags","dataChanged","tiles","state","maxresolution","maxZoom","aggregationResLevel","TileLayer","id","getQuadkey","d","TilesetClass","QuadkeyTileset2D","CompositeLayer","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;AAEA,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAAAC,KAAK,EAAI;AAC/B,MAAOC,IAAP,GAAeD,KAAf,CAAOC,IAAP;AACA,MAAI,CAACA,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,SAAO,IAAIC,uBAAJ,CAAiBH,KAAjB,CAAP;AACD,CAJD;;IAMqBI,gB;;;;;;;;;;;;WACnB,2BAAkB;AAChB,WAAKC,QAAL,CAAc;AAACJ,QAAAA,IAAI,EAAE,IAAP;AAAaK,QAAAA,QAAQ,EAAE;AAAvB,OAAd;AACD;;;WAED,2BAAqD;AAAA,UAAxCN,KAAwC,QAAxCA,KAAwC;AAAA,UAAjCO,QAAiC,QAAjCA,QAAiC;AAAA,UAAvBC,OAAuB,QAAvBA,OAAuB;AAAA,UAAdC,WAAc,QAAdA,WAAc;;AACnD,UAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,YAAKT,IAAL,GAAa,KAAKD,KAAlB,CAAKC,IAAL;AACA,YAAMK,QAAQ,GAAGL,IAAjB;AACAA,QAAAA,IAAI,GAAGK,QAAQ,CAACK,KAAhB;AACA,aAAKN,QAAL,CAAc;AAACJ,UAAAA,IAAI,EAAJA,IAAD;AAAOK,UAAAA,QAAQ,EAARA;AAAP,SAAd;AACD;AACF;;;WAED,wBAAe;AACb,wBAAyB,KAAKM,KAA9B;AAAA,UAAOX,IAAP,eAAOA,IAAP;AAAA,UAAaK,QAAb,eAAaA,QAAb;AACA,UAAOO,aAAP,GAAwBP,QAAxB,CAAOO,aAAP;AACA,UAAMC,OAAO,GAAGD,aAAa,GAAG,KAAKb,KAAL,CAAWe,mBAA3C;AACA,aAAO,CACL,IAAIC,oBAAJ,CAAc,KAAKhB,KAAnB,EAA0B;AACxBiB,QAAAA,EAAE,EAAE,oBADoB;AAExBhB,QAAAA,IAAI,EAAJA,IAFwB;AAGxBiB,QAAAA,UAAU,EAAE,oBAAAC,CAAC;AAAA,iBAAIA,CAAC,CAACF,EAAN;AAAA,SAHW;AAIxBG,QAAAA,YAAY,EAAEC,yBAJU;AAKxBtB,QAAAA,eAAe,EAAfA,eALwB;AAMxBe,QAAAA,OAAO,EAAPA;AANwB,OAA1B,CADK,CAAP;AAUD;;;EA5B2CQ,oB;;;AA+B9ClB,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":["renderSubLayers","props","data","length","QuadkeyLayer","defaultProps","aggregationResLevel","QuadkeyTileLayer","setState","tileJSON","oldProps","context","changeFlags","dataChanged","tiles","state","maxZoom","parseInt","maxresolution","SpatialIndexTileLayer","id","getQuadkey","d","TilesetClass","QuadkeyTileset2D","CompositeLayer","layerName"],"mappings":";;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;;;;;AAEA,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAAAC,KAAK,EAAI;AAC/B,MAAOC,IAAP,GAAeD,KAAf,CAAOC,IAAP;AACA,MAAI,CAACA,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,SAAO,IAAIC,uBAAJ,CAAiBH,KAAjB,CAAP;AACD,CAJD;;AAMA,IAAMI,YAAY,GAAG;AACnBC,EAAAA,mBAAmB,EAAE;AADF,CAArB;;IAIqBC,gB;;;;;;;;;;;;WACnB,2BAAkB;AAChB,WAAKC,QAAL,CAAc;AAACN,QAAAA,IAAI,EAAE,IAAP;AAAaO,QAAAA,QAAQ,EAAE;AAAvB,OAAd;AACD;;;WAED,2BAAqD;AAAA,UAAxCR,KAAwC,QAAxCA,KAAwC;AAAA,UAAjCS,QAAiC,QAAjCA,QAAiC;AAAA,UAAvBC,OAAuB,QAAvBA,OAAuB;AAAA,UAAdC,WAAc,QAAdA,WAAc;;AACnD,UAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,YAAKX,IAAL,GAAa,KAAKD,KAAlB,CAAKC,IAAL;AACA,YAAMO,QAAQ,GAAGP,IAAjB;AACAA,QAAAA,IAAI,GAAGO,QAAQ,CAACK,KAAhB;AACA,aAAKN,QAAL,CAAc;AAACN,UAAAA,IAAI,EAAJA,IAAD;AAAOO,UAAAA,QAAQ,EAARA;AAAP,SAAd;AACD;AACF;;;WAED,wBAAe;AACb,wBAAyB,KAAKM,KAA9B;AAAA,UAAOb,IAAP,eAAOA,IAAP;AAAA,UAAaO,QAAb,eAAaA,QAAb;AACA,UAAMO,OAAO,GAAGC,QAAQ,CAACR,QAAQ,CAACS,aAAV,CAAxB;AACA,aAAO,CACL,IAAIC,8BAAJ,CAA0B,KAAKlB,KAA/B,EAAsC;AACpCmB,QAAAA,EAAE,EAAE,oBADgC;AAEpClB,QAAAA,IAAI,EAAJA,IAFoC;AAGpCmB,QAAAA,UAAU,EAAE,oBAAAC,CAAC;AAAA,iBAAIA,CAAC,CAACF,EAAN;AAAA,SAHuB;AAIpCG,QAAAA,YAAY,EAAEC,yBAJsB;AAKpCxB,QAAAA,eAAe,EAAfA,eALoC;AAMpCgB,QAAAA,OAAO,EAAPA;AANoC,OAAtC,CADK,CAAP;AAUD;;;EA3B2CS,oB;;;AA8B9ClB,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"}