@deck.gl/carto 8.8.0-beta.3 → 8.8.0

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 (101) hide show
  1. package/dist/dist.dev.js +2298 -1182
  2. package/dist/es5/api/index.js +0 -6
  3. package/dist/es5/api/index.js.map +1 -1
  4. package/dist/es5/api/maps-v3-client.js +44 -86
  5. package/dist/es5/api/maps-v3-client.js.map +1 -1
  6. package/dist/es5/index.js +23 -9
  7. package/dist/es5/index.js.map +1 -1
  8. package/dist/es5/layers/carto-layer.js +14 -19
  9. package/dist/es5/layers/carto-layer.js.map +1 -1
  10. package/dist/es5/layers/h3-tile-layer.js +28 -3
  11. package/dist/es5/layers/h3-tile-layer.js.map +1 -1
  12. package/dist/es5/layers/h3-tileset-2d.js +19 -13
  13. package/dist/es5/layers/h3-tileset-2d.js.map +1 -1
  14. package/dist/es5/layers/quadbin-layer.js +71 -0
  15. package/dist/es5/layers/quadbin-layer.js.map +1 -0
  16. package/dist/es5/layers/{quadkey-tile-layer.js → quadbin-tile-layer.js} +17 -17
  17. package/dist/es5/layers/quadbin-tile-layer.js.map +1 -0
  18. package/dist/es5/layers/{quadkey-tileset-2d.js → quadbin-tileset-2d.js} +25 -57
  19. package/dist/es5/layers/quadbin-tileset-2d.js.map +1 -0
  20. package/dist/es5/layers/quadbin-utils.js +122 -0
  21. package/dist/es5/layers/quadbin-utils.js.map +1 -0
  22. package/dist/esm/api/index.js +1 -1
  23. package/dist/esm/api/index.js.map +1 -1
  24. package/dist/esm/api/maps-v3-client.js +0 -24
  25. package/dist/esm/api/maps-v3-client.js.map +1 -1
  26. package/dist/esm/index.js +3 -2
  27. package/dist/esm/index.js.map +1 -1
  28. package/dist/esm/layers/carto-layer.js +12 -17
  29. package/dist/esm/layers/carto-layer.js.map +1 -1
  30. package/dist/esm/layers/h3-tile-layer.js +22 -3
  31. package/dist/esm/layers/h3-tile-layer.js.map +1 -1
  32. package/dist/esm/layers/h3-tileset-2d.js +20 -16
  33. package/dist/esm/layers/h3-tileset-2d.js.map +1 -1
  34. package/dist/esm/layers/quadbin-layer.js +29 -0
  35. package/dist/esm/layers/quadbin-layer.js.map +1 -0
  36. package/dist/esm/layers/{quadkey-tile-layer.js → quadbin-tile-layer.js} +10 -10
  37. package/dist/esm/layers/quadbin-tile-layer.js.map +1 -0
  38. package/dist/esm/layers/quadbin-tileset-2d.js +37 -0
  39. package/dist/esm/layers/quadbin-tileset-2d.js.map +1 -0
  40. package/dist/esm/layers/quadbin-utils.js +88 -0
  41. package/dist/esm/layers/quadbin-utils.js.map +1 -0
  42. package/dist.min.js +138 -138
  43. package/package.json +2 -2
  44. package/src/api/index.ts +1 -1
  45. package/src/api/maps-v3-client.ts +0 -24
  46. package/src/index.ts +6 -2
  47. package/src/layers/carto-layer.ts +22 -37
  48. package/src/layers/h3-tile-layer.ts +25 -3
  49. package/src/layers/h3-tileset-2d.ts +20 -10
  50. package/src/layers/quadbin-layer.ts +43 -0
  51. package/src/layers/{quadkey-tile-layer.ts → quadbin-tile-layer.ts} +15 -13
  52. package/src/layers/quadbin-tileset-2d.ts +34 -0
  53. package/src/layers/quadbin-utils.ts +102 -0
  54. package/typed/api/index.d.ts +1 -1
  55. package/typed/api/index.d.ts.map +1 -1
  56. package/typed/api/index.js +3 -0
  57. package/typed/api/layer-map.js +264 -0
  58. package/typed/api/maps-api-common.js +50 -0
  59. package/typed/api/maps-client.js +125 -0
  60. package/typed/api/maps-v3-client.d.ts +0 -1
  61. package/typed/api/maps-v3-client.d.ts.map +1 -1
  62. package/typed/api/maps-v3-client.js +304 -0
  63. package/typed/api/parseMap.js +178 -0
  64. package/typed/basemap.js +9 -0
  65. package/typed/config.js +35 -0
  66. package/typed/index.d.ts +3 -2
  67. package/typed/index.d.ts.map +1 -1
  68. package/typed/index.js +10 -0
  69. package/typed/layers/carto-layer.d.ts +4 -12
  70. package/typed/layers/carto-layer.d.ts.map +1 -1
  71. package/typed/layers/carto-layer.js +173 -0
  72. package/typed/layers/carto-tile-layer.js +105 -0
  73. package/typed/layers/h3-tile-layer.d.ts.map +1 -1
  74. package/typed/layers/h3-tile-layer.js +47 -0
  75. package/typed/layers/h3-tileset-2d.d.ts +6 -0
  76. package/typed/layers/h3-tileset-2d.d.ts.map +1 -1
  77. package/typed/layers/h3-tileset-2d.js +85 -0
  78. package/typed/layers/quadbin-layer.d.ts +20 -0
  79. package/typed/layers/quadbin-layer.d.ts.map +1 -0
  80. package/typed/layers/quadbin-tile-layer.d.ts +21 -0
  81. package/typed/layers/quadbin-tile-layer.d.ts.map +1 -0
  82. package/typed/layers/quadbin-tileset-2d.d.ts +13 -0
  83. package/typed/layers/quadbin-tileset-2d.d.ts.map +1 -0
  84. package/typed/layers/quadbin-utils.d.ts +11 -0
  85. package/typed/layers/quadbin-utils.d.ts.map +1 -0
  86. package/typed/layers/quadkey-tile-layer.js +42 -0
  87. package/typed/layers/quadkey-tileset-2d.js +36 -0
  88. package/typed/layers/schema/carto-tile.js +161 -0
  89. package/typed/layers/spatial-index-tile-layer.js +40 -0
  90. package/typed/style/color-bins-style.js +12 -0
  91. package/typed/style/color-categories-style.js +16 -0
  92. package/typed/style/color-continuous-style.js +12 -0
  93. package/typed/style/palette.js +62 -0
  94. package/typed/style/utils.js +15 -0
  95. package/typed/utils.js +4 -0
  96. package/dist/es5/layers/quadkey-tile-layer.js.map +0 -1
  97. package/dist/es5/layers/quadkey-tileset-2d.js.map +0 -1
  98. package/dist/esm/layers/quadkey-tile-layer.js.map +0 -1
  99. package/dist/esm/layers/quadkey-tileset-2d.js +0 -71
  100. package/dist/esm/layers/quadkey-tileset-2d.js.map +0 -1
  101. package/src/layers/quadkey-tileset-2d.ts +0 -59
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@deck.gl/carto",
3
3
  "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
4
4
  "license": "MIT",
5
- "version": "8.8.0-beta.3",
5
+ "version": "8.8.0",
6
6
  "publishConfig": {
7
7
  "access": "public"
8
8
  },
@@ -61,5 +61,5 @@
61
61
  "@deck.gl/layers": "^8.0.0",
62
62
  "@loaders.gl/core": "^3.0.0"
63
63
  },
64
- "gitHead": "bb459e1b4a4e3674ee9832d775d39211541d17b4"
64
+ "gitHead": "4fda19a4ca2f02bcb756eca0f20c6534ab744be3"
65
65
  }
package/src/api/index.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export {FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS} from './maps-api-common';
2
2
  export {getDataV2, CONNECTIONS} from './maps-client';
3
- export {fetchLayerData, fetchMap, getData, mapInstantiation} from './maps-v3-client';
3
+ export {fetchLayerData, fetchMap, mapInstantiation} from './maps-v3-client';
@@ -356,30 +356,6 @@ async function _fetchDataUrl({
356
356
  return {url, accessToken, mapFormat, metadata};
357
357
  }
358
358
 
359
- export async function getData({
360
- type,
361
- source,
362
- connection,
363
- credentials,
364
- geoColumn,
365
- columns,
366
- format,
367
- clientId
368
- }: FetchLayerDataParams) {
369
- log.deprecated('getData', 'fetchLayerData')();
370
- const layerData = await fetchLayerData({
371
- type,
372
- source,
373
- connection,
374
- credentials,
375
- geoColumn,
376
- columns,
377
- format,
378
- clientId
379
- });
380
- return layerData.data;
381
- }
382
-
383
359
  /* global clearInterval, setInterval, URL */
384
360
  async function _fetchMapDataset(
385
361
  dataset,
package/src/index.ts CHANGED
@@ -2,7 +2,12 @@ export {getDefaultCredentials, setDefaultCredentials} from './config';
2
2
  export {default as CartoLayer} from './layers/carto-layer';
3
3
  export {default as _CartoTileLayer} from './layers/carto-tile-layer';
4
4
  export {default as _H3TileLayer} from './layers/h3-tile-layer';
5
- export {default as _QuadkeyTileLayer} from './layers/quadkey-tile-layer';
5
+ export {default as _QuadbinTileLayer} from './layers/quadbin-tile-layer';
6
+ export {
7
+ tileToQuadbin as _tileToQuadbin,
8
+ quadbinToTile as _quadbinToTile,
9
+ quadbinZoom as _quadbinZoom
10
+ } from './layers/quadbin-utils';
6
11
  export {default as BASEMAP} from './basemap';
7
12
  export {default as colorBins} from './style/color-bins-style';
8
13
  export {default as colorCategories} from './style/color-categories-style';
@@ -15,7 +20,6 @@ export {
15
20
  fetchLayerData,
16
21
  fetchMap,
17
22
  getDataV2 as _getDataV2,
18
- getData,
19
23
  mapInstantiation as _mapInstantiation
20
24
  } from './api';
21
25
 
@@ -8,13 +8,11 @@ import {
8
8
  } from '@deck.gl/core';
9
9
  import CartoTileLayer from './carto-tile-layer';
10
10
  import H3TileLayer from './h3-tile-layer';
11
- import QuadkeyTileLayer from './quadkey-tile-layer';
11
+ import QuadbinTileLayer from './quadbin-tile-layer';
12
12
  import {MVTLayer} from '@deck.gl/geo-layers';
13
- import {GeoJsonLayer} from '@deck.gl/layers';
14
13
  import {fetchLayerData, getDataV2, API_VERSIONS} from '../api';
15
14
  import {
16
15
  COLUMNS_SUPPORT,
17
- Format,
18
16
  FORMATS,
19
17
  GEO_COLUMN_SUPPORT,
20
18
  MapType,
@@ -64,10 +62,10 @@ const defaultProps = {
64
62
  // (Array<String>, optional): names of columns to fetch. By default, all columns are fetched.
65
63
  columns: {type: 'array', value: null},
66
64
 
67
- // (String, optional): aggregration SQL expression. Only used for spatial index datasets
65
+ // (String, optional): aggregation SQL expression. Only used for spatial index datasets
68
66
  aggregationExp: null,
69
67
 
70
- // (Number, optional): aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3
68
+ // (Number, optional): aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3
71
69
  aggregationResLevel: null
72
70
  };
73
71
 
@@ -98,19 +96,10 @@ type _CartoLayerProps = {
98
96
  */
99
97
  connection?: string;
100
98
 
101
- /**
102
- * Use to override the default data format.
103
- *
104
- * Only supported when apiVersion is `API_VERSIONS.V3`.
105
- *
106
- * Possible values are: `FORMATS.GEOJSON`, `FORMATS.JSON` and `FORMATS.TILEJSON`.
107
- */
108
- format?: Format;
109
-
110
99
  /**
111
100
  * Use to override the default tile data format.
112
101
  *
113
- * Only supported when apiVersion is `API_VERSIONS.V3` and format is `FORMATS.TILEJSON`.
102
+ * Only supported when apiVersion is `API_VERSIONS.V3`.
114
103
  *
115
104
  * Possible values are: `TILE_FORMATS.BINARY`, `TILE_FORMATS.GEOJSON` and `TILE_FORMATS.MVT`.
116
105
  */
@@ -157,10 +146,10 @@ type _CartoLayerProps = {
157
146
 
158
147
  clientId?: string;
159
148
 
160
- /** Aggregration SQL expression. Only used for spatial index datasets **/
149
+ /** Aggregation SQL expression. Only used for spatial index datasets **/
161
150
  aggregationExp?: string;
162
151
 
163
- /** Aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3. **/
152
+ /** Aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3. **/
164
153
  aggregationResLevel?: number;
165
154
  };
166
155
 
@@ -237,7 +226,6 @@ export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
237
226
  props.aggregationResLevel !== oldProps.aggregationResLevel ||
238
227
  props.connection !== oldProps.connection ||
239
228
  props.geoColumn !== oldProps.geoColumn ||
240
- props.format !== oldProps.format ||
241
229
  props.formatTiles !== oldProps.formatTiles ||
242
230
  props.type !== oldProps.type ||
243
231
  JSON.stringify(props.columns) !== JSON.stringify(oldProps.columns) ||
@@ -268,7 +256,9 @@ export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
268
256
  clientId,
269
257
  credentials: credentials as CloudNativeCredentials,
270
258
  connection,
271
- ...rest
259
+ ...rest,
260
+ // CartoLayer only supports tiled output from v8.8, force data format
261
+ format: FORMATS.TILEJSON
272
262
  });
273
263
  }
274
264
 
@@ -290,7 +280,7 @@ export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
290
280
  _getSubLayerAndProps(): [any, LayerProps] {
291
281
  assert(this.state);
292
282
 
293
- const {data, format, apiVersion} = this.state;
283
+ const {data, apiVersion} = this.state;
294
284
 
295
285
  const {uniqueIdProperty} = defaultProps;
296
286
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -302,26 +292,21 @@ export default class CartoLayer<ExtraProps = {}> extends CompositeLayer<
302
292
  return [MVTLayer, props];
303
293
  }
304
294
 
305
- if (format === FORMATS.TILEJSON) {
306
- /* global URL */
307
- const tileUrl = new URL(data.tiles[0]);
295
+ /* global URL */
296
+ const tileUrl = new URL(data.tiles[0]);
308
297
 
309
- props.formatTiles =
310
- props.formatTiles ||
311
- (tileUrl.searchParams.get('formatTiles') as TileFormat) ||
312
- TILE_FORMATS.MVT;
298
+ props.formatTiles =
299
+ props.formatTiles ||
300
+ (tileUrl.searchParams.get('formatTiles') as TileFormat) ||
301
+ TILE_FORMATS.MVT;
313
302
 
314
- if (data.scheme === 'h3') {
315
- return [H3TileLayer, props];
316
- }
317
- if (data.scheme === 'quadkey') {
318
- return [QuadkeyTileLayer, props];
319
- }
320
- return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];
303
+ if (data.scheme === 'h3') {
304
+ return [H3TileLayer, props];
321
305
  }
322
-
323
- // It's a geojson layer
324
- return [GeoJsonLayer, props];
306
+ if (data.scheme === 'quadbin') {
307
+ return [QuadbinTileLayer, props];
308
+ }
309
+ return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];
325
310
  }
326
311
 
327
312
  renderLayers(): Layer | null {
@@ -7,7 +7,7 @@ import {
7
7
  DefaultProps
8
8
  } from '@deck.gl/core';
9
9
  import {H3HexagonLayer} from '@deck.gl/geo-layers';
10
- import H3Tileset2D from './h3-tileset-2d';
10
+ import H3Tileset2D, {getHexagonResolution} from './h3-tileset-2d';
11
11
  import SpatialIndexTileLayer from './spatial-index-tile-layer';
12
12
 
13
13
  const renderSubLayers = props => {
@@ -50,6 +50,7 @@ export default class H3TileLayer<DataT = any, ExtraPropsT = {}> extends Composit
50
50
  };
51
51
 
52
52
  initializeState(): void {
53
+ H3HexagonLayer._checkH3Lib();
53
54
  this.setState({data: null, tileJSON: null});
54
55
  }
55
56
 
@@ -64,7 +65,26 @@ export default class H3TileLayer<DataT = any, ExtraPropsT = {}> extends Composit
64
65
 
65
66
  renderLayers(): Layer | null | LayersList {
66
67
  const {data, tileJSON} = this.state;
67
- const maxZoom = parseInt(tileJSON.maxresolution);
68
+ let minresolution = parseInt(tileJSON.minresolution);
69
+ let maxresolution = parseInt(tileJSON.maxresolution);
70
+
71
+ // Convert Mercator zooms provided in props into H3 res levels
72
+ // and clip into valid range provided from the tilejson
73
+ if (this.props.minZoom) {
74
+ minresolution = Math.max(
75
+ minresolution,
76
+ getHexagonResolution({zoom: this.props.minZoom, latitude: 0})
77
+ );
78
+ }
79
+ if (this.props.maxZoom) {
80
+ maxresolution = Math.min(
81
+ maxresolution,
82
+ getHexagonResolution({zoom: this.props.maxZoom, latitude: 0})
83
+ );
84
+ }
85
+
86
+ // The naming is unfortunate, but minZoom & maxZoom in the context
87
+ // of a Tileset2D refer to the resolution levels, not the Mercator zooms
68
88
  return [
69
89
  new SpatialIndexTileLayer(this.props, {
70
90
  id: `h3-tile-layer-${this.props.id}`,
@@ -72,7 +92,9 @@ export default class H3TileLayer<DataT = any, ExtraPropsT = {}> extends Composit
72
92
  // @ts-expect-error Tileset2D should be generic over TileIndex
73
93
  TilesetClass: H3Tileset2D,
74
94
  renderSubLayers,
75
- maxZoom
95
+ // minZoom and maxZoom are H3 resolutions, however we must use this naming as that is what the Tileset2D class expects
96
+ minZoom: minresolution,
97
+ maxZoom: maxresolution
76
98
  })
77
99
  ];
78
100
  }
@@ -7,16 +7,20 @@ function getHexagonsInBoundingBox(
7
7
  {west, north, east, south}: GeoBoundingBox,
8
8
  resolution: number
9
9
  ): string[] {
10
- if (Math.abs(east - west) > 180) {
10
+ const longitudeSpan = Math.abs(east - west);
11
+ if (longitudeSpan > 180) {
11
12
  // This is a known issue in h3-js: polyfill does not work correctly
12
13
  // when longitude span is larger than 180 degrees.
13
- return [
14
- ...new Set(
15
- getHexagonsInBoundingBox({west, north, east: 0, south}, resolution).concat(
16
- getHexagonsInBoundingBox({west: 0, north, east, south}, resolution)
17
- )
18
- )
19
- ];
14
+ const nSegments = Math.ceil(longitudeSpan / 180);
15
+ let h3Indices: string[] = [];
16
+ for (let s = 0; s < nSegments; s++) {
17
+ const segmentEast = east + s * 180;
18
+ const segmentWest = Math.min(segmentEast + 179.9999999, west);
19
+ h3Indices = h3Indices.concat(
20
+ getHexagonsInBoundingBox({west: segmentWest, north, east: segmentEast, south}, resolution)
21
+ );
22
+ }
23
+ return [...new Set(h3Indices)];
20
24
  }
21
25
 
22
26
  // `polyfill()` fills based on hexagon center, which means tiles vanish
@@ -55,7 +59,7 @@ function tileToBoundingBox(index: string): GeoBoundingBox {
55
59
  // similar
56
60
  // Relative scale factor (0 = no biasing, 2 = a few hexagons cover view)
57
61
  const BIAS = 2;
58
- function getHexagonResolution(viewport): number {
62
+ export function getHexagonResolution(viewport): number {
59
63
  const hexagonScaleFactor = (2 / 3) * viewport.zoom;
60
64
  const latitudeScaleFactor = Math.log(1 / Math.cos((Math.PI * viewport.latitude) / 180));
61
65
 
@@ -64,6 +68,11 @@ function getHexagonResolution(viewport): number {
64
68
  }
65
69
 
66
70
  export default class H3Tileset2D extends Tileset2D {
71
+ /**
72
+ * Returns all tile indices in the current viewport. If the current zoom level is smaller
73
+ * than minZoom, return an empty array. If the current zoom level is greater than maxZoom,
74
+ * return tiles that are on maxZoom.
75
+ */
67
76
  // @ts-expect-error Tileset2D should be generic over TileIndex
68
77
  getTileIndices({viewport, minZoom, maxZoom}): H3TileIndex[] {
69
78
  const [east, south, west, north] = viewport.getBounds();
@@ -71,7 +80,8 @@ export default class H3Tileset2D extends Tileset2D {
71
80
  let z = getHexagonResolution(viewport);
72
81
  let indices: string[];
73
82
  if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
74
- z = minZoom;
83
+ // TODO support `extent` prop
84
+ return [];
75
85
  }
76
86
  if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {
77
87
  z = maxZoom;
@@ -0,0 +1,43 @@
1
+ import {AccessorFunction, DefaultProps} from '@deck.gl/core';
2
+ import {
3
+ _GeoCellLayer as GeoCellLayer,
4
+ _GeoCellLayerProps as GeoCellLayerProps
5
+ } from '@deck.gl/geo-layers';
6
+ import {getQuadbinPolygon} from './quadbin-utils';
7
+
8
+ const defaultProps: DefaultProps<QuadbinLayerProps> = {
9
+ getQuadbin: {type: 'accessor', value: d => d.quadbin}
10
+ };
11
+
12
+ /** All properties supported by QuadbinLayer. */
13
+ export type QuadbinLayerProps<DataT = any> = _QuadbinLayerProps<DataT> & GeoCellLayerProps<DataT>;
14
+
15
+ /** Properties added by QuadbinLayer. */
16
+ type _QuadbinLayerProps<DataT> = {
17
+ /**
18
+ * Called for each data object to retrieve the quadbin string identifier.
19
+ *
20
+ * By default, it reads `quadbin` property of data object.
21
+ */
22
+ getQuadbin?: AccessorFunction<DataT, string>;
23
+ };
24
+
25
+ export default class QuadbinLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<
26
+ DataT,
27
+ Required<_QuadbinLayerProps<DataT>> & ExtraProps
28
+ > {
29
+ static layerName = 'QuadbinLayer';
30
+ static defaultProps = defaultProps;
31
+
32
+ indexToBounds(): Partial<GeoCellLayer['props']> | null {
33
+ const {data, getQuadbin} = this.props;
34
+
35
+ return {
36
+ data,
37
+ _normalize: false,
38
+ positionFormat: 'XY',
39
+
40
+ getPolygon: (x: DataT, objectInfo) => getQuadbinPolygon(getQuadbin(x, objectInfo))
41
+ };
42
+ }
43
+ }
@@ -6,33 +6,35 @@ import {
6
6
  UpdateParameters,
7
7
  DefaultProps
8
8
  } from '@deck.gl/core';
9
- import {QuadkeyLayer, QuadkeyLayerProps} from '@deck.gl/geo-layers';
10
- import QuadkeyTileset2D from './quadkey-tileset-2d';
9
+ import QuadbinLayer, {QuadbinLayerProps} from './quadbin-layer';
10
+ import QuadbinTileset2D from './quadbin-tileset-2d';
11
11
  import SpatialIndexTileLayer from './spatial-index-tile-layer';
12
12
 
13
13
  const renderSubLayers = props => {
14
14
  const {data} = props;
15
15
  if (!data || !data.length) return null;
16
- return new QuadkeyLayer(props, {getQuadkey: d => d.id});
16
+ return new QuadbinLayer(props, {
17
+ getQuadbin: d => d.id
18
+ });
17
19
  };
18
20
 
19
- const defaultProps: DefaultProps<QuadkeyTileLayerProps> = {
21
+ const defaultProps: DefaultProps<QuadbinTileLayerProps> = {
20
22
  aggregationResLevel: 6
21
23
  };
22
24
 
23
- /** All properties supported by QuadkeyTileLayer. */
24
- export type QuadkeyTileLayerProps<DataT = any> = _QuadkeyTileLayerProps<DataT> &
25
+ /** All properties supported by QuadbinTileLayer. */
26
+ export type QuadbinTileLayerProps<DataT = any> = _QuadbinTileLayerProps<DataT> &
25
27
  CompositeLayerProps<DataT>;
26
28
 
27
- /** Properties added by QuadkeyTileLayer. */
28
- type _QuadkeyTileLayerProps<DataT> = QuadkeyLayerProps<DataT> & {
29
+ /** Properties added by QuadbinTileLayer. */
30
+ type _QuadbinTileLayerProps<DataT> = QuadbinLayerProps<DataT> & {
29
31
  aggregationResLevel?: number;
30
32
  };
31
33
 
32
- export default class QuadkeyTileLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<
33
- ExtraProps & Required<_QuadkeyTileLayerProps<DataT>>
34
+ export default class QuadbinTileLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<
35
+ ExtraProps & Required<_QuadbinTileLayerProps<DataT>>
34
36
  > {
35
- static layerName = 'QuadkeyTileLayer';
37
+ static layerName = 'QuadbinTileLayer';
36
38
  static defaultProps = defaultProps;
37
39
 
38
40
  state!: {
@@ -57,10 +59,10 @@ export default class QuadkeyTileLayer<DataT = any, ExtraProps = {}> extends Comp
57
59
  const maxZoom = parseInt(tileJSON?.maxresolution);
58
60
  return [
59
61
  new SpatialIndexTileLayer(this.props, {
60
- id: `quadkey-tile-layer-${this.props.id}`,
62
+ id: `quadbin-tile-layer-${this.props.id}`,
61
63
  data,
62
64
  // TODO: Tileset2D should be generic over TileIndex type
63
- TilesetClass: QuadkeyTileset2D as any,
65
+ TilesetClass: QuadbinTileset2D as any,
64
66
  renderSubLayers,
65
67
  maxZoom
66
68
  })
@@ -0,0 +1,34 @@
1
+ import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers';
2
+ import {tileToQuadbin, quadbinToTile, quadbinParent, quadbinZoom} from './quadbin-utils';
3
+
4
+ type QuadbinTileIndex = {i: string};
5
+
6
+ export default class QuadbinTileset2D extends Tileset2D {
7
+ // @ts-expect-error for spatial indices, TileSet2d should be parametrized by TileIndexT
8
+ getTileIndices(opts): QuadbinTileIndex[] {
9
+ return super
10
+ .getTileIndices(opts)
11
+ .map(tileToQuadbin)
12
+ .map(i => ({i}));
13
+ }
14
+
15
+ // @ts-expect-error TileIndex must be generic
16
+ getTileId({i}: QuadbinTileIndex): string {
17
+ return i;
18
+ }
19
+
20
+ // @ts-expect-error TileIndex must be generic
21
+ getTileMetadata({i}: QuadbinTileIndex) {
22
+ return super.getTileMetadata(quadbinToTile(i));
23
+ }
24
+
25
+ // @ts-expect-error TileIndex must be generic
26
+ getTileZoom({i}: QuadbinTileIndex): number {
27
+ return Number(quadbinZoom(i));
28
+ }
29
+
30
+ // @ts-expect-error TileIndex must be generic
31
+ getParentIndex({i}: QuadbinTileIndex): QuadbinTileIndex {
32
+ return {i: quadbinParent(i)};
33
+ }
34
+ }
@@ -0,0 +1,102 @@
1
+ import {worldToLngLat} from '@math.gl/web-mercator';
2
+
3
+ const TILE_SIZE = 512;
4
+
5
+ const B = [
6
+ 0x5555555555555555n,
7
+ 0x3333333333333333n,
8
+ 0x0f0f0f0f0f0f0f0fn,
9
+ 0x00ff00ff00ff00ffn,
10
+ 0x0000ffff0000ffffn,
11
+ 0x00000000ffffffffn
12
+ ];
13
+ const S = [0n, 1n, 2n, 4n, 8n, 16n];
14
+
15
+ function indexToBigInt(index: string): bigint {
16
+ return BigInt(`0x${index}`);
17
+ }
18
+
19
+ function bigIntToIndex(quadbin: bigint): string {
20
+ return quadbin.toString(16);
21
+ }
22
+
23
+ export function tileToQuadbin(tile): string {
24
+ if (tile.z < 0 || tile.z > 26) {
25
+ throw new Error('Wrong zoom');
26
+ }
27
+ const z = BigInt(tile.z);
28
+ let x = BigInt(tile.x) << (32n - z);
29
+ let y = BigInt(tile.y) << (32n - z);
30
+
31
+ for (let i = 0; i < 5; i++) {
32
+ const s = S[5 - i];
33
+ const b = B[4 - i];
34
+ x = (x | (x << s)) & b;
35
+ y = (y | (y << s)) & b;
36
+ }
37
+
38
+ const quadbin =
39
+ 0x4000000000000000n |
40
+ (1n << 59n) | // | (mode << 59) | (mode_dep << 57)
41
+ (z << 52n) |
42
+ ((x | (y << 1n)) >> 12n) |
43
+ (0xfffffffffffffn >> (z * 2n));
44
+ return bigIntToIndex(quadbin);
45
+ }
46
+
47
+ export function quadbinToTile(index: string) {
48
+ const quadbin = indexToBigInt(index);
49
+ const mode = (quadbin >> 59n) & 7n;
50
+ const modeDep = (quadbin >> 57n) & 3n;
51
+ const z = (quadbin >> 52n) & 0x1fn;
52
+ const q = (quadbin & 0xfffffffffffffn) << 12n;
53
+
54
+ if (mode !== 1n && modeDep !== 0n) {
55
+ throw new Error('Wrong mode');
56
+ }
57
+
58
+ let x = q;
59
+ let y = q >> 1n;
60
+
61
+ for (let i = 0; i < 6; i++) {
62
+ const s = S[i];
63
+ const b = B[i];
64
+ x = (x | (x >> s)) & b;
65
+ y = (y | (y >> s)) & b;
66
+ }
67
+
68
+ x = x >> (32n - z);
69
+ y = y >> (32n - z);
70
+
71
+ return {z: Number(z), x: Number(x), y: Number(y)};
72
+ }
73
+
74
+ export function quadbinZoom(index: string) {
75
+ const quadbin = indexToBigInt(index);
76
+ return (quadbin >> 52n) & 0x1fn;
77
+ }
78
+
79
+ export function quadbinParent(index: string) {
80
+ const quadbin = indexToBigInt(index);
81
+ const zparent = quadbinZoom(index) - 1n;
82
+ const parent =
83
+ (quadbin & ~(0x1fn << 52n)) | (zparent << 52n) | (0xfffffffffffffn >> (zparent * 2n));
84
+ return bigIntToIndex(parent);
85
+ }
86
+
87
+ export function quadbinToWorldBounds(quadbin: string): [number[], number[]] {
88
+ const {x, y, z} = quadbinToTile(quadbin);
89
+ const mask = 1 << z;
90
+ const scale = mask / TILE_SIZE;
91
+ return [
92
+ [x / scale, TILE_SIZE - y / scale],
93
+ [(x + 0.99) / scale, TILE_SIZE - (y + 0.99) / scale]
94
+ ];
95
+ }
96
+
97
+ export function getQuadbinPolygon(quadbin: string): number[] {
98
+ const [topLeft, bottomRight] = quadbinToWorldBounds(quadbin);
99
+ const [w, n] = worldToLngLat(topLeft);
100
+ const [e, s] = worldToLngLat(bottomRight);
101
+ return [e, n, e, s, w, s, w, n, e, n];
102
+ }
@@ -1,4 +1,4 @@
1
1
  export { FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS } from './maps-api-common';
2
2
  export { getDataV2, CONNECTIONS } from './maps-client';
3
- export { fetchLayerData, fetchMap, getData, mapInstantiation } from './maps-v3-client';
3
+ export { fetchLayerData, fetchMap, mapInstantiation } from './maps-v3-client';
4
4
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,EAAC,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,cAAc,EAAE,QAAQ,EAAE,gBAAgB,EAAC,MAAM,kBAAkB,CAAC"}
@@ -0,0 +1,3 @@
1
+ export { FORMATS, TILE_FORMATS, MAP_TYPES, API_VERSIONS } from './maps-api-common';
2
+ export { getDataV2, CONNECTIONS } from './maps-client';
3
+ export { fetchLayerData, fetchMap, getData, mapInstantiation } from './maps-v3-client';