@deck.gl/geo-layers 8.9.0-alpha.5 → 8.9.0-beta.2

package/src/{tile-layer → tileset-2d}/tileset-2d.ts

@@ -1,11 +1,14 @@
-import Tile2DHeader from './tile-2d-header';
-import {getTileIndices, tileToBoundingBox, getCullBounds} from './utils';
+import {Viewport} from '@deck.gl/core';
+
 import {RequestScheduler} from '@loaders.gl/loader-utils';
 import {Matrix4, equals} from '@math.gl/core';
-import {Viewport} from '@deck.gl/core';
+
+import {Tile2DHeader} from './tile-2d-header';
+
+import {getTileIndices, tileToBoundingBox, getCullBounds} from './utils';
 import {Bounds, TileIndex, ZRange} from './types';
-import {TileLayerProps} from './tile-layer';
-import {_memoize as memoize} from '@deck.gl/core';
+import {TileLoadProps} from './types';
+import {memoize} from './memoize';
 
 // bit masks
 const TILE_STATE_VISITED = 1;
@@ -35,9 +38,9 @@ export const STRATEGY_DEFAULT = 'best-available';
 
 export type RefinementStrategyFunction = (tiles: Tile2DHeader[]) => void;
 export type RefinementStrategy =
-  | typeof STRATEGY_NEVER
-  | typeof STRATEGY_REPLACE
-  | typeof STRATEGY_DEFAULT
+  | 'never'
+  | 'no-overlap'
+  | 'best-available'
   | RefinementStrategyFunction;
 
 const DEFAULT_CACHE_SCALE = 5;
@@ -48,30 +51,71 @@ const STRATEGIES = {
   [STRATEGY_NEVER]: () => {}
 };
 
-export type Tileset2DProps = Pick<
-  Required<TileLayerProps>,
-  | 'tileSize'
-  | 'maxCacheSize'
-  | 'maxCacheByteSize'
-  | 'refinementStrategy'
-  | 'extent'
-  | 'maxZoom'
-  | 'minZoom'
-  | 'maxRequests'
-  | 'zoomOffset'
-> & {
-  getTileData: NonNullable<TileLayerProps['getTileData']>;
-  onTileLoad: (tile: Tile2DHeader) => void;
-  onTileUnload: (tile: Tile2DHeader) => void;
-  onTileError: (error: any, tile: Tile2DHeader) => void;
+export type Tileset2DProps<DataT = any> = {
+  /** `getTileData` is called to retrieve the data of each tile. */
+  getTileData: (props: TileLoadProps) => Promise<DataT> | DataT;
+
+  /** The bounding box of the layer's data. */
+  extent?: number[] | null;
+  /** The pixel dimension of the tiles, usually a power of 2. */
+  tileSize?: number;
+  /** The max zoom level of the layer's data. @default null */
+  maxZoom?: number | null;
+  /** The min zoom level of the layer's data. @default 0 */
+  minZoom?: number | null;
+  /** The maximum number of tiles that can be cached. */
+  maxCacheSize?: number | null;
+  /** The maximum memory used for caching tiles. @default null */
+  maxCacheByteSize?: number | null;
+  /** How the tile layer refines the visibility of tiles. @default 'best-available' */
+  refinementStrategy?: RefinementStrategy;
+  /** Range of minimum and maximum heights in the tile. */
+  zRange?: ZRange | null;
+  /** The maximum number of concurrent getTileData calls. @default 6 */
+  maxRequests?: number;
+  /** Changes the zoom level at which the tiles are fetched. Needs to be an integer. @default 0 */
+  zoomOffset?: number;
+
+  /** Called when a tile successfully loads. */
+  onTileLoad?: (tile: Tile2DHeader<DataT>) => void;
+  /** Called when a tile is cleared from cache. */
+  onTileUnload?: (tile: Tile2DHeader<DataT>) => void;
+  /** Called when a tile failed to load. */
+  onTileError?: (err: any, tile: Tile2DHeader<DataT>) => void;
+
+  // onTileLoad: (tile: Tile2DHeader) => void;
+  // onTileUnload: (tile: Tile2DHeader) => void;
+  // onTileError: (error: any, tile: Tile2DHeader) => void;
+  /** Called when all tiles in the current viewport are loaded. */
+  // sonViewportLoad?: ((tiles: Tile2DHeader<DataT>[]) => void) | null;
+};
+
+export const DEFAULT_TILESET2D_PROPS: Omit<Required<Tileset2DProps>, 'getTileData'> = {
+  extent: null,
+  tileSize: 512,
+
+  maxZoom: null,
+  minZoom: null,
+  maxCacheSize: null,
+  maxCacheByteSize: null,
+  refinementStrategy: 'best-available',
+  zRange: null,
+  maxRequests: 6,
+  zoomOffset: 0,
+
+  // onTileLoad: (tile: Tile2DHeader) => void,  // onTileUnload: (tile: Tile2DHeader) => void,  // onTileError: (error: any, tile: Tile2DHeader) => void,  /** Called when all tiles in the current viewport are loaded. */
+  // onViewportLoad: ((tiles: Tile2DHeader<DataT>[]) => void) | null,
+  onTileLoad: () => {},
+  onTileUnload: () => {},
+  onTileError: () => {}
 };
 
 /**
  * Manages loading and purging of tile data. This class caches recently visited tiles
  * and only creates new tiles if they are present.
  */
-export default class Tileset2D {
-  private opts: Tileset2DProps;
+export class Tileset2D {
+  private opts: Required<Tileset2DProps>;
   private _requestScheduler: RequestScheduler;
   private _cache: Map<string, Tile2DHeader>;
   private _dirty: boolean;
@@ -95,10 +139,10 @@ export default class Tileset2D {
    * Cache size defaults to 5 * number of tiles in the current viewport
    */
   constructor(opts: Tileset2DProps) {
-    this.opts = opts;
+    this.opts = {...DEFAULT_TILESET2D_PROPS, ...opts};
 
     this.onTileLoad = tile => {
-      this.opts.onTileLoad(tile);
+      this.opts.onTileLoad?.(tile);
       if (this.opts.maxCacheByteSize) {
         this._cacheByteSize += tile.byteLength;
         this._resizeCache();
@@ -107,7 +151,7 @@ export default class Tileset2D {
 
     this._requestScheduler = new RequestScheduler({
       maxRequests: opts.maxRequests,
-      throttleRequests: opts.maxRequests > 0
+      throttleRequests: Boolean(opts.maxRequests && opts.maxRequests > 0)
     });
 
     // Maps tile id in string {z}-{x}-{y} to a Tile object
@@ -242,19 +286,27 @@ export default class Tileset2D {
     }
 
     if (cullRect && this._viewport) {
-      const [minX, minY, maxX, maxY] = getCullBounds({
+      const boundsArr = this._getCullBounds({
         viewport: this._viewport,
         z: this._zRange,
         cullRect
       });
       const {bbox} = tile;
-      if ('west' in bbox) {
-        return bbox.west < maxX && bbox.east > minX && bbox.south < maxY && bbox.north > minY;
+      for (const [minX, minY, maxX, maxY] of boundsArr) {
+        let overlaps;
+        if ('west' in bbox) {
+          overlaps = bbox.west < maxX && bbox.east > minX && bbox.south < maxY && bbox.north > minY;
+        } else {
+          // top/bottom could be swapped depending on the indexing system
+          const y0 = Math.min(bbox.top, bbox.bottom);
+          const y1 = Math.max(bbox.top, bbox.bottom);
+          overlaps = bbox.left < maxX && bbox.right > minX && y0 < maxY && y1 > minY;
+        }
+        if (overlaps) {
+          return true;
+        }
       }
-      // top/bottom could be swapped depending on the indexing system
-      const y0 = Math.min(bbox.top, bbox.bottom);
-      const y1 = Math.max(bbox.top, bbox.bottom);
-      return bbox.left < maxX && bbox.right > minX && y0 < maxY && y1 > minY;
+      return false;
     }
     return true;
   }
@@ -358,7 +410,7 @@ export default class Tileset2D {
   private _getCullBounds = memoize(getCullBounds);
 
   private _pruneRequests(): void {
-    const {maxRequests} = this.opts;
+    const {maxRequests = 0} = this.opts;
 
     const abortCandidates: Tile2DHeader[] = [];
     let ongoingRequestCount = 0;
@@ -419,11 +471,11 @@ export default class Tileset2D {
 
     if (overflown) {
       for (const [id, tile] of _cache) {
-        if (!tile.isVisible) {
+        if (!tile.isVisible && !tile.isSelected) {
           // delete tile
           this._cacheByteSize -= opts.maxCacheByteSize ? tile.byteLength : 0;
           _cache.delete(id);
-          this.opts.onTileUnload(tile);
+          this.opts.onTileUnload?.(tile);
         }
         if (_cache.size <= maxCacheSize && this._cacheByteSize <= maxCacheByteSize) {
           break;

package/src/{tile-layer → tileset-2d}/utils.ts

@@ -6,14 +6,16 @@ import {Bounds, GeoBoundingBox, TileBoundingBox, TileIndex, ZRange} from './type
 const TILE_SIZE = 512;
 const DEFAULT_EXTENT: Bounds = [-Infinity, -Infinity, Infinity, Infinity];
 
+export type URLTemplate = string | string[] | null;
+
 export const urlType = {
-  type: 'url',
-  value: null,
+  type: 'object' as const,
+  value: null as URLTemplate,
   validate: (value, propType) =>
     (propType.optional && value === null) ||
     typeof value === 'string' ||
     (Array.isArray(value) && value.every(url => typeof url === 'string')),
-  equals: (value1, value2) => {
+  equal: (value1, value2) => {
     if (value1 === value2) {
       return true;
     }
@@ -62,7 +64,7 @@ function stringHash(s: string): number {
 }
 
 export function getURLFromTemplate(
-  template: string | string[],
+  template: URLTemplate,
   tile: {
     index: TileIndex;
     id: string;
@@ -130,7 +132,7 @@ function getBoundingBox(viewport: Viewport, zRange: number[] | null, extent: Bou
 /** Get culling bounds in world space */
 export function getCullBounds({
   viewport,
-  z,
+  z = 0,
   cullRect
 }: {
   /** Current viewport */
@@ -139,13 +141,25 @@ export function getCullBounds({
   z: ZRange | number | undefined;
   /** Culling rectangle in screen space */
   cullRect: {x: number; y: number; width: number; height: number};
-}): [number, number, number, number] {
-  const x = cullRect.x - viewport.x;
-  const y = cullRect.y - viewport.y;
-  const {width, height} = cullRect;
+}): [number, number, number, number][] {
+  const subViewports = viewport.subViewports || [viewport];
+  return subViewports.map(v => getCullBoundsInViewport(v, z, cullRect));
+}
 
+function getCullBoundsInViewport(
+  /** Current viewport */
+  viewport: Viewport,
+  /** At altitude */
+  z: ZRange | number,
+  /** Culling rectangle in screen space */
+  cullRect: {x: number; y: number; width: number; height: number}
+): [number, number, number, number] {
   if (!Array.isArray(z)) {
-    const unprojectOption = {targetZ: z || 0};
+    const x = cullRect.x - viewport.x;
+    const y = cullRect.y - viewport.y;
+    const {width, height} = cullRect;
+
+    const unprojectOption = {targetZ: z};
 
     const topLeft = viewport.unproject([x, y], unprojectOption);
     const topRight = viewport.unproject([x + width, y], unprojectOption);
@@ -160,8 +174,8 @@ export function getCullBounds({
     ];
   }
 
-  const bounds0 = getCullBounds({viewport, z: z[0], cullRect});
-  const bounds1 = getCullBounds({viewport, z: z[1], cullRect});
+  const bounds0 = getCullBoundsInViewport(viewport, z[0], cullRect);
+  const bounds1 = getCullBoundsInViewport(viewport, z[1], cullRect);
 
   return [
     Math.min(bounds0[0], bounds1[0]),

package/src/trips-layer/trips-layer.ts

@@ -56,7 +56,7 @@ type _TripsLayerProps<DataT = any> = {
 };
 
 /** Render animated paths that represent vehicle trips. */
-export default class TripsLayer<DataT = any, ExtraProps = {}> extends PathLayer<
+export default class TripsLayer<DataT = any, ExtraProps extends {} = {}> extends PathLayer<
   DataT,
   Required<_TripsLayerProps> & ExtraProps
 > {

package/typed/geo-cell-layer/GeoCellLayer.d.ts

@@ -2,9 +2,9 @@ import { CompositeLayer, CompositeLayerProps, Layer, LayersList, DefaultProps }
 import { PolygonLayerProps } from '@deck.gl/layers/typed';
 /** All properties supported by GeoCellLayer. */
 export declare type GeoCellLayerProps<DataT = any> = PolygonLayerProps<DataT> & CompositeLayerProps<DataT>;
-export default class GeoCellLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<Required<GeoCellLayerProps<DataT>> & ExtraProps> {
+export default class GeoCellLayer<DataT = any, ExtraProps extends {} = {}> extends CompositeLayer<Required<GeoCellLayerProps<DataT>> & ExtraProps> {
     static layerName: string;
-    static defaultProps: DefaultProps<GeoCellLayerProps<any>>;
+    static defaultProps: DefaultProps;
     /** Implement to generate props to create geometry. */
     indexToBounds(): Partial<GeoCellLayer['props']> | null;
     renderLayers(): Layer | null | LayersList;

package/typed/geo-cell-layer/GeoCellLayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeoCellLayer.d.ts","sourceRoot":"","sources":["../../src/geo-cell-layer/GeoCellLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAe,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAMhE,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,cAAc,CACpF,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAChD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,sDAAsD;IACtD,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;IAItD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CA+D1C"}
+{"version":3,"file":"GeoCellLayer.d.ts","sourceRoot":"","sources":["../../src/geo-cell-layer/GeoCellLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AACnG,OAAO,EAAe,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAMhE,gDAAgD;AAChD,oBAAY,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI,iBAAiB,CAAC,KAAK,CAAC,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAEnG,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,cAAc,CAC/F,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CAChD;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,EAAE,YAAY,CAAgB;IAEjD,sDAAsD;IACtD,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;IAItD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CA+D1C"}

package/typed/geo-cell-layer/GeoCellLayer.js

@@ -0,0 +1,49 @@
+import { CompositeLayer } from '@deck.gl/core';
+import { PolygonLayer } from '@deck.gl/layers';
+const defaultProps = {
+    ...PolygonLayer.defaultProps
+};
+export default class GeoCellLayer extends CompositeLayer {
+    /** Implement to generate props to create geometry. */
+    indexToBounds() {
+        return null;
+    }
+    renderLayers() {
+        // Rendering props underlying layer
+        const { elevationScale, extruded, wireframe, filled, stroked, lineWidthUnits, lineWidthScale, lineWidthMinPixels, lineWidthMaxPixels, lineJointRounded, lineMiterLimit, lineDashJustified, getElevation, getFillColor, getLineColor, getLineWidth } = this.props;
+        // Accessor props for underlying layers
+        const { updateTriggers, material, transitions } = this.props;
+        // Filled Polygon Layer
+        const CellLayer = this.getSubLayerClass('cell', PolygonLayer);
+        return new CellLayer({
+            filled,
+            wireframe,
+            extruded,
+            elevationScale,
+            stroked,
+            lineWidthUnits,
+            lineWidthScale,
+            lineWidthMinPixels,
+            lineWidthMaxPixels,
+            lineJointRounded,
+            lineMiterLimit,
+            lineDashJustified,
+            material,
+            transitions,
+            getElevation,
+            getFillColor,
+            getLineColor,
+            getLineWidth
+        }, this.getSubLayerProps({
+            id: 'cell',
+            updateTriggers: updateTriggers && {
+                getElevation: updateTriggers.getElevation,
+                getFillColor: updateTriggers.getFillColor,
+                getLineColor: updateTriggers.getLineColor,
+                getLineWidth: updateTriggers.getLineWidth
+            }
+        }), this.indexToBounds());
+    }
+}
+GeoCellLayer.layerName = 'GeoCellLayer';
+GeoCellLayer.defaultProps = defaultProps;

package/typed/geohash-layer/geohash-layer.d.ts

@@ -1,4 +1,4 @@
-import { AccessorFunction } from '@deck.gl/core/typed';
+import { AccessorFunction, DefaultProps } from '@deck.gl/core/typed';
 import GeoCellLayer from '../geo-cell-layer/GeoCellLayer';
 /**
  * Properties of `GeohashLayer`.
@@ -12,9 +12,9 @@ declare type GeohashLayerProps<DataT = any> = {
     getGeohash?: AccessorFunction<DataT, string>;
 };
 /** Render filled and/or stroked polygons based on the [Geohash](https://en.wikipedia.org/wiki/Geohash) geospatial indexing system. */
-export default class GeohashLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<DataT, Required<GeohashLayerProps> & ExtraProps> {
+export default class GeohashLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<DataT, Required<GeohashLayerProps> & ExtraProps> {
     static layerName: string;
-    static defaultProps: any;
+    static defaultProps: DefaultProps<GeohashLayerProps<any>>;
     indexToBounds(): Partial<GeoCellLayer['props']> | null;
 }
 export {};

package/typed/geohash-layer/geohash-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geohash-layer.d.ts","sourceRoot":"","sources":["../../src/geohash-layer/geohash-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,eAAe,CAAC;AAC/C,OAAO,YAAY,MAAM,gCAAgC,CAAC;AAO1D;;GAEG;AACH,aAAK,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI;IACpC;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,sIAAsI;AACtI,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,YAAY,CAClF,KAAK,EACL,QAAQ,CAAC,iBAAiB,CAAC,GAAG,UAAU,CACzC;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAgB;IAExC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAUvD"}
+{"version":3,"file":"geohash-layer.d.ts","sourceRoot":"","sources":["../../src/geohash-layer/geohash-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,YAAY,MAAM,gCAAgC,CAAC;AAO1D;;GAEG;AACH,aAAK,iBAAiB,CAAC,KAAK,GAAG,GAAG,IAAI;IACpC;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;CAC9C,CAAC;AAEF,sIAAsI;AACtI,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,YAAY,CAC7F,KAAK,EACL,QAAQ,CAAC,iBAAiB,CAAC,GAAG,UAAU,CACzC;IACC,MAAM,CAAC,SAAS,SAAkB;IAClC,MAAM,CAAC,YAAY,uCAAgB;IAEnC,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;CAUvD"}

package/typed/great-circle-layer/great-circle-layer.d.ts

@@ -1,9 +1,10 @@
+import { DefaultProps } from '@deck.gl/core/typed';
 import { ArcLayer, ArcLayerProps } from '@deck.gl/layers/typed';
 /** All properties supported by GreatCircleLayer. */
 export declare type GreatCircleLayerProps<DataT = any> = ArcLayerProps<DataT>;
 /** @deprecated Use ArcLayer with `greatCircle: true` instead */
-export default class GreatCircleLayer<DataT = any, ExtraProps = {}> extends ArcLayer<DataT, ExtraProps> {
+export default class GreatCircleLayer<DataT = any, ExtraProps extends {} = {}> extends ArcLayer<DataT, ExtraProps> {
     static layerName: string;
-    static defaultProps: any;
+    static defaultProps: DefaultProps<ArcLayerProps<any>>;
 }
 //# sourceMappingURL=great-circle-layer.d.ts.map

package/typed/great-circle-layer/great-circle-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"great-circle-layer.d.ts","sourceRoot":"","sources":["../../src/great-circle-layer/great-circle-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAOxD,oDAAoD;AACpD,oBAAY,qBAAqB,CAAC,KAAK,GAAG,GAAG,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AAItE,gEAAgE;AAChE,MAAM,CAAC,OAAO,OAAO,gBAAgB,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,QAAQ,CAClF,KAAK,EACL,UAAU,CACX;IACC,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAgB;CACzC"}
+{"version":3,"file":"great-circle-layer.d.ts","sourceRoot":"","sources":["../../src/great-circle-layer/great-circle-layer.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAC,QAAQ,EAAE,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAOxD,oDAAoD;AACpD,oBAAY,qBAAqB,CAAC,KAAK,GAAG,GAAG,IAAI,aAAa,CAAC,KAAK,CAAC,CAAC;AAItE,gEAAgE;AAChE,MAAM,CAAC,OAAO,OAAO,gBAAgB,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,QAAQ,CAC7F,KAAK,EACL,UAAU,CACX;IACC,MAAM,CAAC,SAAS,SAAsB;IACtC,MAAM,CAAC,YAAY,mCAAgB;CACpC"}

package/typed/great-circle-layer/great-circle-layer.js

@@ -0,0 +1,29 @@
+// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+import { ArcLayer } from '@deck.gl/layers';
+// This layer has been merged into the core ArcLayer
+// Keeping for backward-compatibility
+export default class GreatCircleLayer extends ArcLayer {
+}
+GreatCircleLayer.layerName = 'GreatCircleLayer';
+GreatCircleLayer.defaultProps = {
+    getHeight: { type: 'accessor', value: 0 },
+    greatCircle: true
+};

package/typed/h3-layers/h3-cluster-layer.d.ts

@@ -12,7 +12,7 @@ declare type _H3ClusterLayerProps<DataT> = {
      */
     getHexagons?: AccessorFunction<DataT, H3IndexInput[]>;
 };
-export default class H3ClusterLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<DataT, Required<_H3ClusterLayerProps<DataT>> & ExtraProps> {
+export default class H3ClusterLayer<DataT = any, ExtraProps extends {} = {}> extends GeoCellLayer<DataT, Required<_H3ClusterLayerProps<DataT>> & ExtraProps> {
     static layerName: string;
     static defaultProps: DefaultProps<H3ClusterLayerProps<any>>;
     initializeState(): void;

package/typed/h3-layers/h3-cluster-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-cluster-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAC,MAAM,OAAO,CAAC;AAExD,OAAO,EAAC,gBAAgB,EAAkB,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAE/F,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AAM/E,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,0CAA0C;AAC1C,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;;OAIG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,GAAG,EAAE,CAAE,SAAQ,YAAY,CACpF,KAAK,EACL,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACnD;IACC,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAuB/D,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;CAMhD"}
+{"version":3,"file":"h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-cluster-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,YAAY,EAAC,MAAM,OAAO,CAAC;AAExD,OAAO,EAAC,gBAAgB,EAAkB,gBAAgB,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAE/F,OAAO,YAAY,EAAE,EAAC,iBAAiB,EAAC,MAAM,gCAAgC,CAAC;AAM/E,kDAAkD;AAClD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,CAAC;AAE3B,0CAA0C;AAC1C,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;;OAIG;IACH,WAAW,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,KAAK,GAAG,GAAG,EAAE,UAAU,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,YAAY,CAC/F,KAAK,EACL,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,GAAG,UAAU,CACnD;IACC,MAAM,CAAC,SAAS,SAAoB;IACpC,MAAM,CAAC,YAAY,yCAAgB;IAEnC,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAuB/D,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;CAMhD"}

package/typed/h3-layers/h3-cluster-layer.js

@@ -0,0 +1,33 @@
+import { h3SetToMultiPolygon } from 'h3-js';
+import { createIterable } from '@deck.gl/core';
+import GeoCellLayer from '../geo-cell-layer/GeoCellLayer';
+const defaultProps = {
+    getHexagons: { type: 'accessor', value: d => d.hexagons }
+};
+export default class H3ClusterLayer extends GeoCellLayer {
+    updateState({ props, oldProps, changeFlags }) {
+        if (changeFlags.dataChanged ||
+            (changeFlags.updateTriggers && changeFlags.updateTriggers.getHexagons)) {
+            const { data, getHexagons } = props;
+            const polygons = [];
+            const { iterable, objectInfo } = createIterable(data);
+            for (const object of iterable) {
+                objectInfo.index++;
+                const hexagons = getHexagons(object, objectInfo);
+                const multiPolygon = h3SetToMultiPolygon(hexagons, true);
+                for (const polygon of multiPolygon) {
+                    polygons.push(this.getSubLayerRow({ polygon }, object, objectInfo.index));
+                }
+            }
+            this.setState({ polygons });
+        }
+    }
+    indexToBounds() {
+        return {
+            data: this.state.polygons,
+            getPolygon: d => d.polygon
+        };
+    }
+}
+H3ClusterLayer.defaultProps = defaultProps;
+H3ClusterLayer.layerName = 'H3ClusterLayer';

package/typed/h3-layers/h3-hexagon-layer.d.ts

@@ -36,7 +36,7 @@ declare type _H3HexagonLayerProps<DataT> = {
 /**
  * Render hexagons from the [H3](https://h3geo.org/) geospatial indexing system.
  */
-export default class H3HexagonLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<ExtraPropsT & Required<_H3HexagonLayerProps<DataT> & Required<PolygonLayerProps<DataT>>>> {
+export default class H3HexagonLayer<DataT = any, ExtraPropsT extends {} = {}> extends CompositeLayer<ExtraPropsT & Required<_H3HexagonLayerProps<DataT> & Required<PolygonLayerProps<DataT>>>> {
     static defaultProps: DefaultProps<H3HexagonLayerProps<any>>;
     static layerName: string;
     static _checkH3Lib: () => void;

package/typed/h3-layers/h3-hexagon-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EAEnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQ7E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAU/E;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAcvF;AAqDD,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,GACxB,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE7B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CAAC,KAAK,GAAG,GAAG,EAAE,WAAW,GAAG,EAAE,CAAE,SAAQ,cAAc,CACvF,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CACzF;IACC,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IAuCvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}
+{"version":3,"file":"h3-hexagon-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-hexagon-layer.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,OAAO,EACR,MAAM,OAAO,CAAC;AAEf,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,mBAAmB,EAEnB,KAAK,EACL,UAAU,EACV,gBAAgB,EAEhB,YAAY,EACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAA4B,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQ7E,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAU/E;AAGD,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAcvF;AAqDD,iDAAiD;AACjD,oBAAY,mBAAmB,CAAC,KAAK,GAAG,GAAG,IAAI,oBAAoB,CAAC,KAAK,CAAC,GACxE,iBAAiB,CAAC,KAAK,CAAC,GACxB,mBAAmB,CAAC,KAAK,CAAC,CAAC;AAE7B,wCAAwC;AACxC,aAAK,oBAAoB,CAAC,KAAK,IAAI;IACjC;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;IAC/B;;;;OAIG;IACH,UAAU,CAAC,EAAE,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAC7C;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,cAAc,CACjC,KAAK,GAAG,GAAG,EACX,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CACtB,WAAW,GAAG,QAAQ,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,CACzF;IACC,MAAM,CAAC,YAAY,yCAAgB;IACnC,MAAM,CAAC,SAAS,SAAoB;IAGpC,MAAM,CAAC,WAAW,aAAY;IAE9B,eAAe;IAQf,KAAK,EAAG;QACN,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;KACvB,CAAC;IAEF,iBAAiB,CAAC,EAAC,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAMjE,WAAW,CAAC,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI;IAa/D,OAAO,CAAC,qBAAqB;IAgC7B,OAAO,CAAC,uBAAuB;IAe/B,OAAO,CAAC,eAAe;IAuCvB,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;IAIzC,OAAO,CAAC,gBAAgB;IAsDxB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,kBAAkB;CAuB3B"}