@deck.gl/geo-layers 8.8.0-alpha.4 → 8.8.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (127) hide show
  1. package/dist/dist.dev.js +32610 -62978
  2. package/dist/es5/geo-cell-layer/GeoCellLayer.js.map +1 -1
  3. package/dist/es5/index.js +8 -0
  4. package/dist/es5/index.js.map +1 -1
  5. package/dist/es5/mvt-layer/coordinate-transform.js.map +1 -1
  6. package/dist/es5/mvt-layer/find-index-binary.js +7 -5
  7. package/dist/es5/mvt-layer/find-index-binary.js.map +1 -1
  8. package/dist/es5/mvt-layer/mvt-layer.js +35 -25
  9. package/dist/es5/mvt-layer/mvt-layer.js.map +1 -1
  10. package/dist/es5/quadkey-layer/quadkey-layer.js.map +1 -1
  11. package/dist/es5/tile-layer/tile-2d-header.js.map +1 -1
  12. package/dist/es5/tile-layer/tile-layer.js +0 -4
  13. package/dist/es5/tile-layer/tile-layer.js.map +1 -1
  14. package/dist/es5/tile-layer/tileset-2d.js +1 -6
  15. package/dist/es5/tile-layer/tileset-2d.js.map +1 -1
  16. package/dist/es5/tile-layer/utils.js +5 -0
  17. package/dist/es5/tile-layer/utils.js.map +1 -1
  18. package/dist/es5/trips-layer/trips-layer.js +6 -6
  19. package/dist/es5/trips-layer/trips-layer.js.map +1 -1
  20. package/dist/esm/geo-cell-layer/GeoCellLayer.js.map +1 -1
  21. package/dist/esm/index.js +1 -0
  22. package/dist/esm/index.js.map +1 -1
  23. package/dist/esm/mvt-layer/coordinate-transform.js.map +1 -1
  24. package/dist/esm/mvt-layer/find-index-binary.js +1 -1
  25. package/dist/esm/mvt-layer/find-index-binary.js.map +1 -1
  26. package/dist/esm/mvt-layer/mvt-layer.js +40 -33
  27. package/dist/esm/mvt-layer/mvt-layer.js.map +1 -1
  28. package/dist/esm/quadkey-layer/quadkey-layer.js.map +1 -1
  29. package/dist/esm/tile-layer/tile-2d-header.js.map +1 -1
  30. package/dist/esm/tile-layer/tile-layer.js +1 -5
  31. package/dist/esm/tile-layer/tile-layer.js.map +1 -1
  32. package/dist/esm/tile-layer/tileset-2d.js +1 -5
  33. package/dist/esm/tile-layer/tileset-2d.js.map +1 -1
  34. package/dist/esm/tile-layer/utils.js +3 -0
  35. package/dist/esm/tile-layer/utils.js.map +1 -1
  36. package/dist/esm/trips-layer/trips-layer.js +7 -4
  37. package/dist/esm/trips-layer/trips-layer.js.map +1 -1
  38. package/dist.min.js +2 -2
  39. package/package.json +15 -12
  40. package/src/geo-cell-layer/GeoCellLayer.ts +3 -2
  41. package/src/index.ts +4 -1
  42. package/src/mvt-layer/{coordinate-transform.js → coordinate-transform.ts} +10 -8
  43. package/src/mvt-layer/{find-index-binary.js → find-index-binary.ts} +41 -10
  44. package/src/mvt-layer/{mvt-layer.js → mvt-layer.ts} +143 -58
  45. package/src/quadkey-layer/quadkey-layer.ts +7 -6
  46. package/src/tile-layer/tile-2d-header.ts +15 -14
  47. package/src/tile-layer/tile-layer.ts +29 -30
  48. package/src/tile-layer/tileset-2d.ts +14 -14
  49. package/src/tile-layer/types.ts +5 -1
  50. package/src/tile-layer/utils.ts +10 -1
  51. package/src/trips-layer/{trips-layer.js → trips-layer.ts} +39 -8
  52. package/typed/geo-cell-layer/GeoCellLayer.d.ts +47 -0
  53. package/typed/geo-cell-layer/GeoCellLayer.d.ts.map +1 -0
  54. package/typed/geo-cell-layer/GeoCellLayer.js +49 -0
  55. package/typed/great-circle-layer/great-circle-layer.d.ts +16 -0
  56. package/typed/great-circle-layer/great-circle-layer.d.ts.map +1 -0
  57. package/typed/great-circle-layer/great-circle-layer.js +29 -0
  58. package/typed/h3-layers/h3-cluster-layer.d.ts +16 -0
  59. package/typed/h3-layers/h3-cluster-layer.d.ts.map +1 -0
  60. package/typed/h3-layers/h3-cluster-layer.js +33 -0
  61. package/typed/h3-layers/h3-hexagon-layer.d.ts +107 -0
  62. package/typed/h3-layers/h3-hexagon-layer.d.ts.map +1 -0
  63. package/typed/h3-layers/h3-hexagon-layer.js +251 -0
  64. package/typed/index.d.ts +19 -0
  65. package/typed/index.d.ts.map +1 -0
  66. package/typed/index.js +33 -0
  67. package/typed/mesh-layer/mesh-layer-fragment.glsl.d.ts +3 -0
  68. package/typed/mesh-layer/mesh-layer-fragment.glsl.d.ts.map +1 -0
  69. package/typed/mesh-layer/mesh-layer-fragment.glsl.js +55 -0
  70. package/typed/mesh-layer/mesh-layer-vertex.glsl.d.ts +3 -0
  71. package/typed/mesh-layer/mesh-layer-vertex.glsl.d.ts.map +1 -0
  72. package/typed/mesh-layer/mesh-layer-vertex.glsl.js +80 -0
  73. package/typed/mesh-layer/mesh-layer.d.ts +27 -0
  74. package/typed/mesh-layer/mesh-layer.d.ts.map +1 -0
  75. package/typed/mesh-layer/mesh-layer.js +110 -0
  76. package/typed/mvt-layer/coordinate-transform.d.ts +4 -0
  77. package/typed/mvt-layer/coordinate-transform.d.ts.map +1 -0
  78. package/typed/mvt-layer/coordinate-transform.js +41 -0
  79. package/typed/mvt-layer/find-index-binary.d.ts +12 -0
  80. package/typed/mvt-layer/find-index-binary.d.ts.map +1 -0
  81. package/typed/mvt-layer/find-index-binary.js +96 -0
  82. package/typed/mvt-layer/mvt-layer.d.ts +102 -0
  83. package/typed/mvt-layer/mvt-layer.d.ts.map +1 -0
  84. package/typed/mvt-layer/mvt-layer.js +297 -0
  85. package/typed/package.json +6 -0
  86. package/typed/quadkey-layer/quadkey-layer.d.ts +20 -0
  87. package/typed/quadkey-layer/quadkey-layer.d.ts.map +1 -0
  88. package/typed/quadkey-layer/quadkey-layer.js +18 -0
  89. package/typed/quadkey-layer/quadkey-utils.d.ts +3 -0
  90. package/typed/quadkey-layer/quadkey-utils.d.ts.map +1 -0
  91. package/typed/quadkey-layer/quadkey-utils.js +26 -0
  92. package/typed/s2-layer/s2-geometry.d.ts +11 -0
  93. package/typed/s2-layer/s2-geometry.d.ts.map +1 -0
  94. package/typed/s2-layer/s2-geometry.js +123 -0
  95. package/typed/s2-layer/s2-layer.d.ts +16 -0
  96. package/typed/s2-layer/s2-layer.d.ts.map +1 -0
  97. package/typed/s2-layer/s2-layer.js +37 -0
  98. package/typed/s2-layer/s2-utils.d.ts +10 -0
  99. package/typed/s2-layer/s2-utils.d.ts.map +1 -0
  100. package/typed/s2-layer/s2-utils.js +88 -0
  101. package/typed/terrain-layer/terrain-layer.d.ts +28 -0
  102. package/typed/terrain-layer/terrain-layer.d.ts.map +1 -0
  103. package/typed/terrain-layer/terrain-layer.js +226 -0
  104. package/typed/tile-3d-layer/tile-3d-layer.d.ts +70 -0
  105. package/typed/tile-3d-layer/tile-3d-layer.d.ts.map +1 -0
  106. package/typed/tile-3d-layer/tile-3d-layer.js +294 -0
  107. package/typed/tile-layer/tile-2d-header.d.ts +40 -0
  108. package/typed/tile-layer/tile-2d-header.d.ts.map +1 -0
  109. package/typed/tile-layer/tile-2d-header.js +113 -0
  110. package/typed/tile-layer/tile-2d-traversal.d.ts +4 -0
  111. package/typed/tile-layer/tile-2d-traversal.d.ts.map +1 -0
  112. package/typed/tile-layer/tile-2d-traversal.js +181 -0
  113. package/typed/tile-layer/tile-layer.d.ts +118 -0
  114. package/typed/tile-layer/tile-layer.d.ts.map +1 -0
  115. package/typed/tile-layer/tile-layer.js +192 -0
  116. package/typed/tile-layer/tileset-2d.d.ts +87 -0
  117. package/typed/tile-layer/tileset-2d.d.ts.map +1 -0
  118. package/typed/tile-layer/tileset-2d.js +399 -0
  119. package/typed/tile-layer/types.d.ts +29 -0
  120. package/typed/tile-layer/types.d.ts.map +1 -0
  121. package/typed/tile-layer/types.js +1 -0
  122. package/typed/tile-layer/utils.d.ts +37 -0
  123. package/typed/tile-layer/utils.d.ts.map +1 -0
  124. package/typed/tile-layer/utils.js +197 -0
  125. package/typed/trips-layer/trips-layer.d.ts +36 -0
  126. package/typed/trips-layer/trips-layer.d.ts.map +1 -0
  127. package/typed/trips-layer/trips-layer.js +92 -0
@@ -3,19 +3,20 @@ import {Layer, log} from '@deck.gl/core';
3
3
  import {RequestScheduler} from '@loaders.gl/loader-utils';
4
4
  import {TileBoundingBox, TileIndex, TileLoadProps} from './types';
5
5
 
6
- export type TileLoadDataProps = {
6
+ export type TileLoadDataProps<DataT = any> = {
7
7
  requestScheduler: RequestScheduler;
8
- getData: (props: TileLoadProps) => Promise<any>;
9
- onLoad: (tile: Tile2DHeader) => void;
10
- onError: (error: any, tile: Tile2DHeader) => void;
8
+ getData: (props: TileLoadProps) => Promise<DataT>;
9
+ onLoad: (tile: Tile2DHeader<DataT>) => void;
10
+ onError: (error: any, tile: Tile2DHeader<DataT>) => void;
11
11
  };
12
- export default class Tile2DHeader {
12
+
13
+ export default class Tile2DHeader<DataT = any> {
13
14
  index: TileIndex;
14
15
  isVisible: boolean;
15
16
  isSelected: boolean;
16
17
  parent: Tile2DHeader | null;
17
18
  children: Tile2DHeader[] | null;
18
- content: any;
19
+ content: DataT | null;
19
20
  state?: number;
20
21
  layers?: Layer[] | null;
21
22
 
@@ -48,24 +49,24 @@ export default class Tile2DHeader {
48
49
  this._needsReload = false;
49
50
  }
50
51
 
51
- get data() {
52
+ get data(): Promise<DataT | null> | DataT | null {
52
53
  return this.isLoading && this._loader ? this._loader.then(() => this.data) : this.content;
53
54
  }
54
55
 
55
- get isLoaded() {
56
+ get isLoaded(): boolean {
56
57
  return this._isLoaded && !this._needsReload;
57
58
  }
58
59
 
59
- get isLoading() {
60
+ get isLoading(): boolean {
60
61
  return Boolean(this._loader) && !this._isCancelled;
61
62
  }
62
63
 
63
- get needsReload() {
64
+ get needsReload(): boolean {
64
65
  return this._needsReload || this._isCancelled;
65
66
  }
66
67
 
67
- get byteLength() {
68
- const result = this.content ? this.content.byteLength : 0;
68
+ get byteLength(): number {
69
+ const result = this.content ? (this.content as any).byteLength : 0;
69
70
  if (!Number.isFinite(result)) {
70
71
  log.error('byteLength not defined in tile data')();
71
72
  }
@@ -78,7 +79,7 @@ export default class Tile2DHeader {
78
79
  requestScheduler,
79
80
  onLoad,
80
81
  onError
81
- }: TileLoadDataProps): Promise<void> {
82
+ }: TileLoadDataProps<DataT>): Promise<void> {
82
83
  const {index, id, bbox, userData, zoom} = this;
83
84
  const loaderId = this._loaderId;
84
85
 
@@ -100,7 +101,7 @@ export default class Tile2DHeader {
100
101
  return;
101
102
  }
102
103
 
103
- let tileData = null;
104
+ let tileData: DataT | null = null;
104
105
  let error;
105
106
  try {
106
107
  tileData = await getData({index, id, bbox, userData, zoom, signal});
@@ -1,10 +1,11 @@
1
1
  import {
2
- assert,
3
2
  CompositeLayer,
4
3
  CompositeLayerProps,
5
4
  Layer,
6
5
  LayerProps,
7
6
  UpdateParameters,
7
+ PickingInfo,
8
+ GetPickingInfoParams,
8
9
  _flatten as flatten
9
10
  } from '@deck.gl/core';
10
11
  import {GeoJsonLayer} from '@deck.gl/layers';
@@ -40,7 +41,7 @@ const defaultProps = {
40
41
  };
41
42
 
42
43
  /** All props supported by the TileLayer */
43
- export type TileLayerProps<DataT> = _TileLayerProps<DataT> & CompositeLayerProps<DataT>;
44
+ export type TileLayerProps<DataT = any> = _TileLayerProps<DataT> & CompositeLayerProps<DataT>;
44
45
 
45
46
  /** Props added by the TileLayer */
46
47
  type _TileLayerProps<DataT> = {
@@ -54,24 +55,24 @@ type _TileLayerProps<DataT> = {
54
55
  renderSubLayers?: (
55
56
  props: TileLayerProps<DataT> & {
56
57
  id: string;
57
- data: any;
58
+ data: DataT;
58
59
  _offset: number;
59
- tile: Tile2DHeader;
60
+ tile: Tile2DHeader<DataT>;
60
61
  }
61
- ) => LayersList;
62
+ ) => Layer | null | LayersList;
62
63
  /**
63
64
  * If supplied, `getTileData` is called to retrieve the data of each tile.
64
65
  */
65
66
  getTileData?: (props: TileLoadProps) => Promise<DataT> | DataT;
66
67
 
67
68
  /** Called when all tiles in the current viewport are loaded. */
68
- onViewportLoad?: (tiles: Tile2DHeader[]) => void;
69
+ onViewportLoad?: (tiles: Tile2DHeader<DataT>[]) => void;
69
70
 
70
71
  /** Called when a tile successfully loads. */
71
- onTileLoad?: (tile: Tile2DHeader) => void;
72
+ onTileLoad?: (tile: Tile2DHeader<DataT>) => void;
72
73
 
73
74
  /** Called when a tile is cleared from cache. */
74
- onTileUnload?: (tile: Tile2DHeader) => void;
75
+ onTileUnload?: (tile: Tile2DHeader<DataT>) => void;
75
76
 
76
77
  /** Called when a tile failed to load. */
77
78
  onTileError?: (err: any) => void;
@@ -129,6 +130,10 @@ type _TileLayerProps<DataT> = {
129
130
  zoomOffset?: number;
130
131
  };
131
132
 
133
+ export type TiledPickingInfo<DataT = any> = PickingInfo & {
134
+ tile?: Tile2DHeader<DataT>;
135
+ };
136
+
132
137
  /**
133
138
  * The TileLayer is a composite layer that makes it possible to visualize very large datasets.
134
139
  *
@@ -161,9 +166,7 @@ export default class TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeL
161
166
  return changeFlags.somethingChanged;
162
167
  }
163
168
 
164
- updateState({changeFlags}: UpdateParameters<TileLayer>) {
165
- assert(this.state);
166
-
169
+ updateState({changeFlags}: UpdateParameters<this>) {
167
170
  let {tileset} = this.state;
168
171
  const propsChanged = changeFlags.propsOrDataChanged || changeFlags.updateTriggersChanged;
169
172
  const dataChanged =
@@ -223,8 +226,7 @@ export default class TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeL
223
226
  };
224
227
  }
225
228
 
226
- _updateTileset(): void {
227
- assert(this.state && this.context);
229
+ private _updateTileset(): void {
228
230
  const {tileset} = this.state;
229
231
  const {zRange, modelMatrix} = this.props;
230
232
  const frameNumber = tileset.update(this.context.viewport, {zRange, modelMatrix});
@@ -246,8 +248,6 @@ export default class TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeL
246
248
  }
247
249
 
248
250
  _onViewportLoad(): void {
249
- assert(this.state);
250
-
251
251
  const {tileset} = this.state;
252
252
  const {onViewportLoad} = this.props;
253
253
 
@@ -256,27 +256,27 @@ export default class TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeL
256
256
  }
257
257
  }
258
258
 
259
- _onTileLoad(tile: Tile2DHeader): void {
259
+ _onTileLoad(tile: Tile2DHeader<DataT>): void {
260
260
  this.props.onTileLoad(tile);
261
261
  tile.layers = null;
262
262
 
263
263
  this.setNeedsUpdate();
264
264
  }
265
265
 
266
- _onTileError(error: any, tile: Tile2DHeader) {
266
+ _onTileError(error: any, tile: Tile2DHeader<DataT>) {
267
267
  this.props.onTileError(error);
268
268
  tile.layers = null;
269
269
 
270
270
  this.setNeedsUpdate();
271
271
  }
272
272
 
273
- _onTileUnload(tile: Tile2DHeader) {
273
+ _onTileUnload(tile: Tile2DHeader<DataT>) {
274
274
  this.props.onTileUnload(tile);
275
275
  }
276
276
 
277
277
  // Methods for subclass to override
278
278
 
279
- getTileData(tile: TileLoadProps) {
279
+ getTileData(tile: TileLoadProps): Promise<DataT> | DataT | null {
280
280
  const {data, getTileData, fetch} = this.props;
281
281
  const {signal} = tile;
282
282
 
@@ -293,33 +293,32 @@ export default class TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeL
293
293
  }
294
294
 
295
295
  renderSubLayers(
296
- props: _TileLayerProps<DataT> & {
296
+ props: TileLayer['props'] & {
297
297
  id: string;
298
- data: any;
298
+ data: DataT;
299
299
  _offset: number;
300
- tile: Tile2DHeader;
300
+ tile: Tile2DHeader<DataT>;
301
301
  }
302
- ): LayersList {
302
+ ): Layer | null | LayersList {
303
303
  return this.props.renderSubLayers(props);
304
304
  }
305
305
 
306
- getSubLayerPropsByTile(tile: Tile2DHeader): LayerProps | null {
306
+ getSubLayerPropsByTile(tile: Tile2DHeader): Partial<LayerProps> | null {
307
307
  return null;
308
308
  }
309
309
 
310
- getPickingInfo({info, sourceLayer}) {
311
- info.tile = sourceLayer.props.tile;
310
+ getPickingInfo({info, sourceLayer}: GetPickingInfoParams): TiledPickingInfo<DataT> {
311
+ (info as any).tile = (sourceLayer as any).props.tile;
312
312
  return info;
313
313
  }
314
314
 
315
- _updateAutoHighlight(info) {
315
+ protected _updateAutoHighlight(info: PickingInfo): void {
316
316
  if (info.sourceLayer) {
317
317
  info.sourceLayer.updateAutoHighlight(info);
318
318
  }
319
319
  }
320
320
 
321
- renderLayers(): Layer[] {
322
- assert(this.state);
321
+ renderLayers(): Layer | null | LayersList {
323
322
  return this.state.tileset.tiles.map((tile: Tile2DHeader) => {
324
323
  const subLayerProps = this.getSubLayerPropsByTile(tile);
325
324
  // cache the rendered layer in the tile
@@ -333,7 +332,7 @@ export default class TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeL
333
332
  _offset: 0,
334
333
  tile
335
334
  });
336
- tile.layers = (flatten(layers, Boolean) as Layer[]).map(layer =>
335
+ tile.layers = (flatten(layers, Boolean) as Layer<{tile?: Tile2DHeader}>[]).map(layer =>
337
336
  layer.clone({
338
337
  tile,
339
338
  ...subLayerProps
@@ -2,7 +2,7 @@ import Tile2DHeader from './tile-2d-header';
2
2
  import {getTileIndices, tileToBoundingBox} from './utils';
3
3
  import {RequestScheduler} from '@loaders.gl/loader-utils';
4
4
  import {Matrix4} from '@math.gl/core';
5
- import {assert, Viewport} from '@deck.gl/core';
5
+ import {Viewport} from '@deck.gl/core';
6
6
  import {Bounds, TileIndex, ZRange} from './types';
7
7
  import {TileLayerProps} from './tile-layer';
8
8
 
@@ -48,7 +48,7 @@ const STRATEGIES = {
48
48
  };
49
49
 
50
50
  export type Tileset2DProps = Pick<
51
- TileLayerProps,
51
+ Required<TileLayerProps>,
52
52
  | 'getTileData'
53
53
  | 'tileSize'
54
54
  | 'maxCacheSize'
@@ -145,10 +145,10 @@ export default class Tileset2D {
145
145
  setOptions(opts: Tileset2DProps): void {
146
146
  Object.assign(this.opts, opts);
147
147
  if (Number.isFinite(opts.maxZoom)) {
148
- this._maxZoom = Math.floor(opts.maxZoom);
148
+ this._maxZoom = Math.floor(opts.maxZoom as number);
149
149
  }
150
150
  if (Number.isFinite(opts.minZoom)) {
151
- this._minZoom = Math.ceil(opts.minZoom);
151
+ this._minZoom = Math.ceil(opts.minZoom as number);
152
152
  }
153
153
  }
154
154
 
@@ -206,7 +206,7 @@ export default class Tileset2D {
206
206
  }
207
207
  // Check for needed reloads explicitly even if the view/matrix has not changed.
208
208
  } else if (this.needsReload) {
209
- this._selectedTiles = this._selectedTiles!.map(tile => this._getTile(tile.index));
209
+ this._selectedTiles = this._selectedTiles!.map(tile => this._getTile(tile.index, true));
210
210
  }
211
211
 
212
212
  // Update tile states
@@ -270,9 +270,9 @@ export default class Tileset2D {
270
270
  }
271
271
 
272
272
  /** Returns additional metadata to add to tile, bbox by default */
273
- getTileMetadata(index: TileIndex) {
274
- assert(this._viewport);
273
+ getTileMetadata(index: TileIndex): Record<string, any> {
275
274
  const {tileSize} = this.opts;
275
+ // @ts-expect-error
276
276
  return {bbox: tileToBoundingBox(this._viewport, index.x, index.y, index.z, tileSize)};
277
277
  }
278
278
 
@@ -285,8 +285,7 @@ export default class Tileset2D {
285
285
  }
286
286
 
287
287
  // Returns true if any tile's visibility changed
288
- updateTileStates() {
289
- assert(this._selectedTiles);
288
+ private updateTileStates() {
290
289
  const refinementStrategy = this.opts.refinementStrategy || STRATEGY_DEFAULT;
291
290
 
292
291
  const visibilities = new Array(this._cache.size);
@@ -298,6 +297,7 @@ export default class Tileset2D {
298
297
  tile.isSelected = false;
299
298
  tile.isVisible = false;
300
299
  }
300
+ // @ts-expect-error called only when _selectedTiles is already defined
301
301
  for (const tile of this._selectedTiles) {
302
302
  tile.isSelected = true;
303
303
  tile.isVisible = true;
@@ -370,12 +370,12 @@ export default class Tileset2D {
370
370
  * Clear tiles that are not visible when the cache is full
371
371
  */
372
372
  /* eslint-disable complexity */
373
- _resizeCache() {
374
- assert(this.selectedTiles);
373
+ private _resizeCache() {
375
374
  const {_cache, opts} = this;
376
375
 
377
376
  const maxCacheSize =
378
377
  opts.maxCacheSize ||
378
+ // @ts-expect-error called only when selectedTiles is initialized
379
379
  (opts.maxCacheByteSize ? Infinity : DEFAULT_CACHE_SCALE * this.selectedTiles.length);
380
380
  const maxCacheByteSize = opts.maxCacheByteSize || Infinity;
381
381
 
@@ -405,9 +405,9 @@ export default class Tileset2D {
405
405
  }
406
406
  /* eslint-enable complexity */
407
407
 
408
- _getTile(index: TileIndex, create: true): Tile2DHeader;
409
- _getTile(index: TileIndex, create?: false): Tile2DHeader | undefined;
410
- _getTile(index: TileIndex, create?: boolean): Tile2DHeader | undefined {
408
+ private _getTile(index: TileIndex, create: true): Tile2DHeader;
409
+ private _getTile(index: TileIndex, create?: false): Tile2DHeader | undefined;
410
+ private _getTile(index: TileIndex, create?: boolean): Tile2DHeader | undefined {
411
411
  const id = this.getTileId(index);
412
412
  let tile = this._cache.get(id);
413
413
  let needsReload = false;
@@ -2,9 +2,11 @@ export type ZRange = [minZ: number, maxZ: number];
2
2
 
3
3
  export type Bounds = [minX: number, minY: number, maxX: number, maxY: number];
4
4
 
5
+ export type GeoBoundingBox = {west: number; north: number; east: number; south: number};
6
+
5
7
  export type TileBoundingBox =
6
8
  | {left: number; top: number; right: number; bottom: number}
7
- | {west: number; north: number; east: number; south: number};
9
+ | GeoBoundingBox;
8
10
 
9
11
  export type TileIndex = {x: number; y: number; z: number};
10
12
 
@@ -14,4 +16,6 @@ export type TileLoadProps = {
14
16
  bbox: TileBoundingBox;
15
17
  url?: string | null;
16
18
  signal?: AbortSignal;
19
+ userData?: Record<string, any>;
20
+ zoom?: number;
17
21
  };
@@ -1,7 +1,7 @@
1
1
  import {Viewport} from '@deck.gl/core';
2
2
  import {Matrix4} from '@math.gl/core';
3
3
  import {getOSMTileIndices} from './tile-2d-traversal';
4
- import {Bounds, TileBoundingBox, TileIndex, ZRange} from './types';
4
+ import {Bounds, GeoBoundingBox, TileBoundingBox, TileIndex, ZRange} from './types';
5
5
 
6
6
  const TILE_SIZE = 512;
7
7
  const DEFAULT_EXTENT: Bounds = [-Infinity, -Infinity, Infinity, Infinity];
@@ -255,3 +255,12 @@ export function getTileIndices({
255
255
  export function isURLTemplate(s: string): boolean {
256
256
  return /(?=.*{z})(?=.*{x})(?=.*({y}|{-y}))/.test(s);
257
257
  }
258
+
259
+ export function isGeoBoundingBox(v: any): v is GeoBoundingBox {
260
+ return (
261
+ Number.isFinite(v.west) &&
262
+ Number.isFinite(v.north) &&
263
+ Number.isFinite(v.east) &&
264
+ Number.isFinite(v.south)
265
+ );
266
+ }
@@ -18,7 +18,9 @@
18
18
  // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19
19
  // THE SOFTWARE.
20
20
 
21
- import {PathLayer} from '@deck.gl/layers';
21
+ import type {NumericArray} from '@math.gl/core';
22
+ import {AccessorFunction} from '@deck.gl/core';
23
+ import {PathLayer, PathLayerProps} from '@deck.gl/layers';
22
24
 
23
25
  const defaultProps = {
24
26
  fadeTrail: true,
@@ -27,7 +29,39 @@ const defaultProps = {
27
29
  getTimestamps: {type: 'accessor', value: null}
28
30
  };
29
31
 
30
- export default class TripsLayer extends PathLayer {
32
+ /** All properties supported by TripsLayer. */
33
+ export type TripsLayerProps<DataT = any> = _TripsLayerProps<DataT> & PathLayerProps<DataT>;
34
+
35
+ /** Properties added by TripsLayer. */
36
+ type _TripsLayerProps<DataT = any> = {
37
+ /**
38
+ * Whether or not the path fades out.
39
+ * @default true
40
+ */
41
+ fadeTrail?: boolean;
42
+ /**
43
+ * Trail length.
44
+ * @default 120
45
+ */
46
+ trailLength?: number;
47
+ /**
48
+ * The current time of the frame.
49
+ * @default 0
50
+ */
51
+ currentTime?: number;
52
+ /**
53
+ * Timestamp accessor.
54
+ */
55
+ getTimestamps?: AccessorFunction<DataT, NumericArray>;
56
+ };
57
+
58
+ export default class TripsLayer<DataT = any, ExtraProps = {}> extends PathLayer<
59
+ DataT,
60
+ Required<_TripsLayerProps> & ExtraProps
61
+ > {
62
+ static layerName = 'TripsLayer';
63
+ static defaultProps: any = defaultProps;
64
+
31
65
  getShaders() {
32
66
  const shaders = super.getShaders();
33
67
  shaders.inject = {
@@ -63,11 +97,11 @@ if(fadeTrail) {
63
97
  return shaders;
64
98
  }
65
99
 
66
- initializeState(params) {
67
- super.initializeState(params);
100
+ initializeState() {
101
+ super.initializeState();
68
102
 
69
103
  const attributeManager = this.getAttributeManager();
70
- attributeManager.addInstanced({
104
+ attributeManager!.addInstanced({
71
105
  timestamps: {
72
106
  size: 1,
73
107
  accessor: 'getTimestamps',
@@ -96,6 +130,3 @@ if(fadeTrail) {
96
130
  super.draw(params);
97
131
  }
98
132
  }
99
-
100
- TripsLayer.layerName = 'TripsLayer';
101
- TripsLayer.defaultProps = defaultProps;
@@ -0,0 +1,47 @@
1
+ import { CompositeLayer, CompositeLayerProps, Layer, LayersList } from '@deck.gl/core/typed';
2
+ import { PolygonLayerProps } from '@deck.gl/layers/typed';
3
+ /** All properties supported by GeoCellLayer. */
4
+ export declare type GeoCellLayerProps<DataT = any> = PolygonLayerProps<DataT> & CompositeLayerProps<DataT>;
5
+ export default class GeoCellLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<Required<GeoCellLayerProps<DataT>> & ExtraProps> {
6
+ static layerName: string;
7
+ static defaultProps: {
8
+ stroked: boolean;
9
+ filled: boolean;
10
+ extruded: boolean;
11
+ elevationScale: number;
12
+ wireframe: boolean;
13
+ _normalize: boolean;
14
+ _windingOrder: string;
15
+ lineWidthUnits: string;
16
+ lineWidthScale: number;
17
+ lineWidthMinPixels: number;
18
+ lineWidthMaxPixels: number;
19
+ lineJointRounded: boolean;
20
+ lineMiterLimit: number;
21
+ getPolygon: {
22
+ type: string;
23
+ value: (f: any) => any;
24
+ };
25
+ getFillColor: {
26
+ type: string;
27
+ value: number[];
28
+ };
29
+ getLineColor: {
30
+ type: string;
31
+ value: number[];
32
+ };
33
+ getLineWidth: {
34
+ type: string;
35
+ value: number;
36
+ };
37
+ getElevation: {
38
+ type: string;
39
+ value: number;
40
+ };
41
+ material: boolean;
42
+ };
43
+ /** Implement to generate props to create geometry. */
44
+ indexToBounds(): Partial<GeoCellLayer['props']> | null;
45
+ renderLayers(): Layer | null | LayersList;
46
+ }
47
+ //# sourceMappingURL=GeoCellLayer.d.ts.map
@@ -0,0 +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,EAAC,MAAM,eAAe,CAAC;AACrF,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAgB;IAEnC,sDAAsD;IACtD,aAAa,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI;IAItD,YAAY,IAAI,KAAK,GAAG,IAAI,GAAG,UAAU;CA+D1C"}
@@ -0,0 +1,49 @@
1
+ import { CompositeLayer } from '@deck.gl/core';
2
+ import { PolygonLayer } from '@deck.gl/layers';
3
+ const defaultProps = {
4
+ ...PolygonLayer.defaultProps
5
+ };
6
+ export default class GeoCellLayer extends CompositeLayer {
7
+ /** Implement to generate props to create geometry. */
8
+ indexToBounds() {
9
+ return null;
10
+ }
11
+ renderLayers() {
12
+ // Rendering props underlying layer
13
+ const { elevationScale, extruded, wireframe, filled, stroked, lineWidthUnits, lineWidthScale, lineWidthMinPixels, lineWidthMaxPixels, lineJointRounded, lineMiterLimit, lineDashJustified, getElevation, getFillColor, getLineColor, getLineWidth } = this.props;
14
+ // Accessor props for underlying layers
15
+ const { updateTriggers, material, transitions } = this.props;
16
+ // Filled Polygon Layer
17
+ const CellLayer = this.getSubLayerClass('cell', PolygonLayer);
18
+ return new CellLayer({
19
+ filled,
20
+ wireframe,
21
+ extruded,
22
+ elevationScale,
23
+ stroked,
24
+ lineWidthUnits,
25
+ lineWidthScale,
26
+ lineWidthMinPixels,
27
+ lineWidthMaxPixels,
28
+ lineJointRounded,
29
+ lineMiterLimit,
30
+ lineDashJustified,
31
+ material,
32
+ transitions,
33
+ getElevation,
34
+ getFillColor,
35
+ getLineColor,
36
+ getLineWidth
37
+ }, this.getSubLayerProps({
38
+ id: 'cell',
39
+ updateTriggers: updateTriggers && {
40
+ getElevation: updateTriggers.getElevation,
41
+ getFillColor: updateTriggers.getFillColor,
42
+ getLineColor: updateTriggers.getLineColor,
43
+ getLineWidth: updateTriggers.getLineWidth
44
+ }
45
+ }), this.indexToBounds());
46
+ }
47
+ }
48
+ GeoCellLayer.layerName = 'GeoCellLayer';
49
+ GeoCellLayer.defaultProps = defaultProps;
@@ -0,0 +1,16 @@
1
+ declare class GreatCircleLayer extends ArcLayer<any, any> {
2
+ constructor(...propObjects: Partial<any>[]);
3
+ }
4
+ declare namespace GreatCircleLayer {
5
+ const layerName: string;
6
+ namespace defaultProps {
7
+ namespace getHeight {
8
+ const type: string;
9
+ const value: number;
10
+ }
11
+ const greatCircle: boolean;
12
+ }
13
+ }
14
+ export default GreatCircleLayer;
15
+ import { ArcLayer } from '@deck.gl/layers/typed';
16
+ //# sourceMappingURL=great-circle-layer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"great-circle-layer.d.ts","sourceRoot":"","sources":["../../src/great-circle-layer/great-circle-layer.js"],"names":[],"mappings":"AAwBA;IAfmE,4CAC1B;CAcgB"}
@@ -0,0 +1,29 @@
1
+ // Copyright (c) 2015 - 2017 Uber Technologies, Inc.
2
+ //
3
+ // Permission is hereby granted, free of charge, to any person obtaining a copy
4
+ // of this software and associated documentation files (the "Software"), to deal
5
+ // in the Software without restriction, including without limitation the rights
6
+ // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7
+ // copies of the Software, and to permit persons to whom the Software is
8
+ // furnished to do so, subject to the following conditions:
9
+ //
10
+ // The above copyright notice and this permission notice shall be included in
11
+ // all copies or substantial portions of the Software.
12
+ //
13
+ // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14
+ // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15
+ // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16
+ // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17
+ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18
+ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19
+ // THE SOFTWARE.
20
+ import { ArcLayer } from '@deck.gl/layers';
21
+ // This layer has been merged into the core ArcLayer
22
+ // Keeping for backward-compatibility
23
+ export default class GreatCircleLayer extends ArcLayer {
24
+ }
25
+ GreatCircleLayer.layerName = 'GreatCircleLayer';
26
+ GreatCircleLayer.defaultProps = {
27
+ getHeight: { type: 'accessor', value: 0 },
28
+ greatCircle: true
29
+ };
@@ -0,0 +1,16 @@
1
+ declare class H3ClusterLayer extends GeoCellLayer<any, any> {
2
+ constructor(...propObjects: Partial<any>[]);
3
+ }
4
+ declare namespace H3ClusterLayer {
5
+ export { defaultProps };
6
+ export const layerName: string;
7
+ }
8
+ export default H3ClusterLayer;
9
+ import GeoCellLayer from "../geo-cell-layer/GeoCellLayer";
10
+ declare namespace defaultProps {
11
+ namespace getHexagons {
12
+ const type: string;
13
+ function value(d: any): any;
14
+ }
15
+ }
16
+ //# sourceMappingURL=h3-cluster-layer.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"h3-cluster-layer.d.ts","sourceRoot":"","sources":["../../src/h3-layers/h3-cluster-layer.js"],"names":[],"mappings":"AASA;IASuC,4CACP;CAoB/B;;;;;;;;;;QAjCwC,4BAAe"}
@@ -0,0 +1,33 @@
1
+ import { h3SetToMultiPolygon } from 'h3-js';
2
+ import { createIterable } from '@deck.gl/core';
3
+ import GeoCellLayer from '../geo-cell-layer/GeoCellLayer';
4
+ const defaultProps = {
5
+ getHexagons: { type: 'accessor', value: d => d.hexagons }
6
+ };
7
+ export default class H3ClusterLayer extends GeoCellLayer {
8
+ updateState({ props, oldProps, changeFlags }) {
9
+ if (changeFlags.dataChanged ||
10
+ (changeFlags.updateTriggers && changeFlags.updateTriggers.getHexagons)) {
11
+ const { data, getHexagons } = props;
12
+ const polygons = [];
13
+ const { iterable, objectInfo } = createIterable(data);
14
+ for (const object of iterable) {
15
+ objectInfo.index++;
16
+ const hexagons = getHexagons(object, objectInfo);
17
+ const multiPolygon = h3SetToMultiPolygon(hexagons, true);
18
+ for (const polygon of multiPolygon) {
19
+ polygons.push(this.getSubLayerRow({ polygon }, object, objectInfo.index));
20
+ }
21
+ }
22
+ this.setState({ polygons });
23
+ }
24
+ }
25
+ indexToBounds() {
26
+ return {
27
+ data: this.state.polygons,
28
+ getPolygon: d => d.polygon
29
+ };
30
+ }
31
+ }
32
+ H3ClusterLayer.defaultProps = defaultProps;
33
+ H3ClusterLayer.layerName = 'H3ClusterLayer';