@deck.gl/carto 8.8.0-beta.4 → 8.8.0-beta.5

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 (86) hide show
  1. package/dist/dist.dev.js +2257 -1119
  2. package/dist/es5/index.js +3 -3
  3. package/dist/es5/index.js.map +1 -1
  4. package/dist/es5/layers/carto-layer.js +3 -3
  5. package/dist/es5/layers/carto-layer.js.map +1 -1
  6. package/dist/es5/layers/h3-tile-layer.js +26 -3
  7. package/dist/es5/layers/h3-tile-layer.js.map +1 -1
  8. package/dist/es5/layers/h3-tileset-2d.js +19 -13
  9. package/dist/es5/layers/h3-tileset-2d.js.map +1 -1
  10. package/dist/es5/layers/quadbin-layer.js +71 -0
  11. package/dist/es5/layers/quadbin-layer.js.map +1 -0
  12. package/dist/es5/layers/{quadkey-tile-layer.js → quadbin-tile-layer.js} +17 -17
  13. package/dist/es5/layers/quadbin-tile-layer.js.map +1 -0
  14. package/dist/es5/layers/{quadkey-tileset-2d.js → quadbin-tileset-2d.js} +25 -57
  15. package/dist/es5/layers/quadbin-tileset-2d.js.map +1 -0
  16. package/dist/es5/layers/quadbin-utils.js +122 -0
  17. package/dist/es5/layers/quadbin-utils.js.map +1 -0
  18. package/dist/esm/index.js +1 -1
  19. package/dist/esm/index.js.map +1 -1
  20. package/dist/esm/layers/carto-layer.js +3 -3
  21. package/dist/esm/layers/carto-layer.js.map +1 -1
  22. package/dist/esm/layers/h3-tile-layer.js +20 -3
  23. package/dist/esm/layers/h3-tile-layer.js.map +1 -1
  24. package/dist/esm/layers/h3-tileset-2d.js +20 -16
  25. package/dist/esm/layers/h3-tileset-2d.js.map +1 -1
  26. package/dist/esm/layers/quadbin-layer.js +29 -0
  27. package/dist/esm/layers/quadbin-layer.js.map +1 -0
  28. package/dist/esm/layers/{quadkey-tile-layer.js → quadbin-tile-layer.js} +10 -10
  29. package/dist/esm/layers/quadbin-tile-layer.js.map +1 -0
  30. package/dist/esm/layers/quadbin-tileset-2d.js +37 -0
  31. package/dist/esm/layers/quadbin-tileset-2d.js.map +1 -0
  32. package/dist/esm/layers/quadbin-utils.js +88 -0
  33. package/dist/esm/layers/quadbin-utils.js.map +1 -0
  34. package/dist.min.js +138 -138
  35. package/package.json +2 -2
  36. package/src/index.ts +1 -1
  37. package/src/layers/carto-layer.ts +7 -7
  38. package/src/layers/h3-tile-layer.ts +24 -3
  39. package/src/layers/h3-tileset-2d.ts +20 -10
  40. package/src/layers/quadbin-layer.ts +43 -0
  41. package/src/layers/{quadkey-tile-layer.ts → quadbin-tile-layer.ts} +15 -13
  42. package/src/layers/quadbin-tileset-2d.ts +34 -0
  43. package/src/layers/quadbin-utils.ts +102 -0
  44. package/typed/index.d.ts +1 -1
  45. package/typed/layers/carto-layer.d.ts +2 -2
  46. package/typed/layers/carto-layer.d.ts.map +1 -1
  47. package/typed/layers/h3-tile-layer.d.ts.map +1 -1
  48. package/typed/layers/h3-tileset-2d.d.ts +6 -0
  49. package/typed/layers/h3-tileset-2d.d.ts.map +1 -1
  50. package/typed/layers/quadbin-layer.d.ts +20 -0
  51. package/typed/layers/quadbin-layer.d.ts.map +1 -0
  52. package/typed/layers/quadbin-tile-layer.d.ts +21 -0
  53. package/typed/layers/quadbin-tile-layer.d.ts.map +1 -0
  54. package/typed/layers/quadbin-tileset-2d.d.ts +13 -0
  55. package/typed/layers/quadbin-tileset-2d.d.ts.map +1 -0
  56. package/typed/layers/quadbin-utils.d.ts +11 -0
  57. package/typed/layers/quadbin-utils.d.ts.map +1 -0
  58. package/dist/es5/layers/quadkey-tile-layer.js.map +0 -1
  59. package/dist/es5/layers/quadkey-tileset-2d.js.map +0 -1
  60. package/dist/esm/layers/quadkey-tile-layer.js.map +0 -1
  61. package/dist/esm/layers/quadkey-tileset-2d.js +0 -71
  62. package/dist/esm/layers/quadkey-tileset-2d.js.map +0 -1
  63. package/src/layers/quadkey-tileset-2d.ts +0 -59
  64. package/typed/api/index.js +0 -3
  65. package/typed/api/layer-map.js +0 -264
  66. package/typed/api/maps-api-common.js +0 -50
  67. package/typed/api/maps-client.js +0 -125
  68. package/typed/api/maps-v3-client.js +0 -304
  69. package/typed/api/parseMap.js +0 -178
  70. package/typed/basemap.js +0 -9
  71. package/typed/config.js +0 -35
  72. package/typed/index.js +0 -10
  73. package/typed/layers/carto-layer.js +0 -173
  74. package/typed/layers/carto-tile-layer.js +0 -105
  75. package/typed/layers/h3-tile-layer.js +0 -47
  76. package/typed/layers/h3-tileset-2d.js +0 -85
  77. package/typed/layers/quadkey-tile-layer.js +0 -42
  78. package/typed/layers/quadkey-tileset-2d.js +0 -36
  79. package/typed/layers/schema/carto-tile.js +0 -161
  80. package/typed/layers/spatial-index-tile-layer.js +0 -40
  81. package/typed/style/color-bins-style.js +0 -12
  82. package/typed/style/color-categories-style.js +0 -16
  83. package/typed/style/color-continuous-style.js +0 -12
  84. package/typed/style/palette.js +0 -62
  85. package/typed/style/utils.js +0 -15
  86. package/typed/utils.js +0 -4
@@ -0,0 +1,122 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.tileToQuadbin = tileToQuadbin;
9
+ exports.quadbinToTile = quadbinToTile;
10
+ exports.quadbinZoom = quadbinZoom;
11
+ exports.quadbinParent = quadbinParent;
12
+ exports.quadbinToWorldBounds = quadbinToWorldBounds;
13
+ exports.getQuadbinPolygon = getQuadbinPolygon;
14
+
15
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
16
+
17
+ var _webMercator = require("@math.gl/web-mercator");
18
+
19
+ var TILE_SIZE = 512;
20
+ var B = [0x5555555555555555n, 0x3333333333333333n, 0x0f0f0f0f0f0f0f0fn, 0x00ff00ff00ff00ffn, 0x0000ffff0000ffffn, 0x00000000ffffffffn];
21
+ var S = [0n, 1n, 2n, 4n, 8n, 16n];
22
+
23
+ function indexToBigInt(index) {
24
+ return BigInt("0x".concat(index));
25
+ }
26
+
27
+ function bigIntToIndex(quadbin) {
28
+ return quadbin.toString(16);
29
+ }
30
+
31
+ function tileToQuadbin(tile) {
32
+ if (tile.z < 0 || tile.z > 26) {
33
+ throw new Error('Wrong zoom');
34
+ }
35
+
36
+ var z = BigInt(tile.z);
37
+ var x = BigInt(tile.x) << 32n - z;
38
+ var y = BigInt(tile.y) << 32n - z;
39
+
40
+ for (var i = 0; i < 5; i++) {
41
+ var s = S[5 - i];
42
+ var b = B[4 - i];
43
+ x = (x | x << s) & b;
44
+ y = (y | y << s) & b;
45
+ }
46
+
47
+ var quadbin = 0x4000000000000000n | 1n << 59n | z << 52n | (x | y << 1n) >> 12n | 0xfffffffffffffn >> z * 2n;
48
+ return bigIntToIndex(quadbin);
49
+ }
50
+
51
+ function quadbinToTile(index) {
52
+ var quadbin = indexToBigInt(index);
53
+ var mode = quadbin >> 59n & 7n;
54
+ var modeDep = quadbin >> 57n & 3n;
55
+ var z = quadbin >> 52n & 0x1fn;
56
+ var q = (quadbin & 0xfffffffffffffn) << 12n;
57
+
58
+ if (mode !== 1n && modeDep !== 0n) {
59
+ throw new Error('Wrong mode');
60
+ }
61
+
62
+ var x = q;
63
+ var y = q >> 1n;
64
+
65
+ for (var i = 0; i < 6; i++) {
66
+ var s = S[i];
67
+ var b = B[i];
68
+ x = (x | x >> s) & b;
69
+ y = (y | y >> s) & b;
70
+ }
71
+
72
+ x = x >> 32n - z;
73
+ y = y >> 32n - z;
74
+ return {
75
+ z: Number(z),
76
+ x: Number(x),
77
+ y: Number(y)
78
+ };
79
+ }
80
+
81
+ function quadbinZoom(index) {
82
+ var quadbin = indexToBigInt(index);
83
+ return quadbin >> 52n & 0x1fn;
84
+ }
85
+
86
+ function quadbinParent(index) {
87
+ var quadbin = indexToBigInt(index);
88
+ var zparent = quadbinZoom(index) - 1n;
89
+ var parent = quadbin & ~(0x1fn << 52n) | zparent << 52n | 0xfffffffffffffn >> zparent * 2n;
90
+ return bigIntToIndex(parent);
91
+ }
92
+
93
+ function quadbinToWorldBounds(quadbin) {
94
+ var _quadbinToTile = quadbinToTile(quadbin),
95
+ x = _quadbinToTile.x,
96
+ y = _quadbinToTile.y,
97
+ z = _quadbinToTile.z;
98
+
99
+ var mask = 1 << z;
100
+ var scale = mask / TILE_SIZE;
101
+ return [[x / scale, TILE_SIZE - y / scale], [(x + 0.99) / scale, TILE_SIZE - (y + 0.99) / scale]];
102
+ }
103
+
104
+ function getQuadbinPolygon(quadbin) {
105
+ var _quadbinToWorldBounds = quadbinToWorldBounds(quadbin),
106
+ _quadbinToWorldBounds2 = (0, _slicedToArray2.default)(_quadbinToWorldBounds, 2),
107
+ topLeft = _quadbinToWorldBounds2[0],
108
+ bottomRight = _quadbinToWorldBounds2[1];
109
+
110
+ var _worldToLngLat = (0, _webMercator.worldToLngLat)(topLeft),
111
+ _worldToLngLat2 = (0, _slicedToArray2.default)(_worldToLngLat, 2),
112
+ w = _worldToLngLat2[0],
113
+ n = _worldToLngLat2[1];
114
+
115
+ var _worldToLngLat3 = (0, _webMercator.worldToLngLat)(bottomRight),
116
+ _worldToLngLat4 = (0, _slicedToArray2.default)(_worldToLngLat3, 2),
117
+ e = _worldToLngLat4[0],
118
+ s = _worldToLngLat4[1];
119
+
120
+ return [e, n, e, s, w, s, w, n, e, n];
121
+ }
122
+ //# sourceMappingURL=quadbin-utils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../src/layers/quadbin-utils.ts"],"names":["TILE_SIZE","B","S","indexToBigInt","index","BigInt","bigIntToIndex","quadbin","toString","tileToQuadbin","tile","z","Error","x","y","i","s","b","quadbinToTile","mode","modeDep","q","Number","quadbinZoom","quadbinParent","zparent","parent","quadbinToWorldBounds","mask","scale","getQuadbinPolygon","topLeft","bottomRight","w","n","e"],"mappings":"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","sourcesContent":["import {worldToLngLat} from '@math.gl/web-mercator';\n\nconst TILE_SIZE = 512;\n\nconst B = [\n 0x5555555555555555n,\n 0x3333333333333333n,\n 0x0f0f0f0f0f0f0f0fn,\n 0x00ff00ff00ff00ffn,\n 0x0000ffff0000ffffn,\n 0x00000000ffffffffn\n];\nconst S = [0n, 1n, 2n, 4n, 8n, 16n];\n\nfunction indexToBigInt(index: string): bigint {\n return BigInt(`0x${index}`);\n}\n\nfunction bigIntToIndex(quadbin: bigint): string {\n return quadbin.toString(16);\n}\n\nexport function tileToQuadbin(tile): string {\n if (tile.z < 0 || tile.z > 26) {\n throw new Error('Wrong zoom');\n }\n const z = BigInt(tile.z);\n let x = BigInt(tile.x) << (32n - z);\n let y = BigInt(tile.y) << (32n - z);\n\n for (let i = 0; i < 5; i++) {\n const s = S[5 - i];\n const b = B[4 - i];\n x = (x | (x << s)) & b;\n y = (y | (y << s)) & b;\n }\n\n const quadbin =\n 0x4000000000000000n |\n (1n << 59n) | // | (mode << 59) | (mode_dep << 57)\n (z << 52n) |\n ((x | (y << 1n)) >> 12n) |\n (0xfffffffffffffn >> (z * 2n));\n return bigIntToIndex(quadbin);\n}\n\nexport function quadbinToTile(index: string) {\n const quadbin = indexToBigInt(index);\n const mode = (quadbin >> 59n) & 7n;\n const modeDep = (quadbin >> 57n) & 3n;\n const z = (quadbin >> 52n) & 0x1fn;\n const q = (quadbin & 0xfffffffffffffn) << 12n;\n\n if (mode !== 1n && modeDep !== 0n) {\n throw new Error('Wrong mode');\n }\n\n let x = q;\n let y = q >> 1n;\n\n for (let i = 0; i < 6; i++) {\n const s = S[i];\n const b = B[i];\n x = (x | (x >> s)) & b;\n y = (y | (y >> s)) & b;\n }\n\n x = x >> (32n - z);\n y = y >> (32n - z);\n\n return {z: Number(z), x: Number(x), y: Number(y)};\n}\n\nexport function quadbinZoom(index: string) {\n const quadbin = indexToBigInt(index);\n return (quadbin >> 52n) & 0x1fn;\n}\n\nexport function quadbinParent(index: string) {\n const quadbin = indexToBigInt(index);\n const zparent = quadbinZoom(index) - 1n;\n const parent =\n (quadbin & ~(0x1fn << 52n)) | (zparent << 52n) | (0xfffffffffffffn >> (zparent * 2n));\n return bigIntToIndex(parent);\n}\n\nexport function quadbinToWorldBounds(quadbin: string): [number[], number[]] {\n const {x, y, z} = quadbinToTile(quadbin);\n const mask = 1 << z;\n const scale = mask / TILE_SIZE;\n return [\n [x / scale, TILE_SIZE - y / scale],\n [(x + 0.99) / scale, TILE_SIZE - (y + 0.99) / scale]\n ];\n}\n\nexport function getQuadbinPolygon(quadbin: string): number[] {\n const [topLeft, bottomRight] = quadbinToWorldBounds(quadbin);\n const [w, n] = worldToLngLat(topLeft);\n const [e, s] = worldToLngLat(bottomRight);\n return [e, n, e, s, w, s, w, n, e, n];\n}\n"],"file":"quadbin-utils.js"}
package/dist/esm/index.js CHANGED
@@ -2,7 +2,7 @@ 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
6
  export { default as BASEMAP } from './basemap';
7
7
  export { default as colorBins } from './style/color-bins-style';
8
8
  export { default as colorCategories } from './style/color-categories-style';
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/index.ts"],"names":["getDefaultCredentials","setDefaultCredentials","default","CartoLayer","_CartoTileLayer","_H3TileLayer","_QuadkeyTileLayer","BASEMAP","colorBins","colorCategories","colorContinuous","FORMATS","TILE_FORMATS","MAP_TYPES","API_VERSIONS","fetchLayerData","fetchMap","getDataV2","_getDataV2","mapInstantiation","_mapInstantiation"],"mappings":"AAAA,SAAQA,qBAAR,EAA+BC,qBAA/B,QAA2D,UAA3D;AACA,SAAQC,OAAO,IAAIC,UAAnB,QAAoC,sBAApC;AACA,SAAQD,OAAO,IAAIE,eAAnB,QAAyC,2BAAzC;AACA,SAAQF,OAAO,IAAIG,YAAnB,QAAsC,wBAAtC;AACA,SAAQH,OAAO,IAAII,iBAAnB,QAA2C,6BAA3C;AACA,SAAQJ,OAAO,IAAIK,OAAnB,QAAiC,WAAjC;AACA,SAAQL,OAAO,IAAIM,SAAnB,QAAmC,0BAAnC;AACA,SAAQN,OAAO,IAAIO,eAAnB,QAAyC,gCAAzC;AACA,SAAQP,OAAO,IAAIQ,eAAnB,QAAyC,gCAAzC;AACA,SACEC,OADF,EAEEC,YAFF,EAGEC,SAHF,EAIEC,YAJF,EAKEC,cALF,EAMEC,QANF,EAOEC,SAAS,IAAIC,UAPf,EAQEC,gBAAgB,IAAIC,iBARtB,QASO,OATP","sourcesContent":["export {getDefaultCredentials, setDefaultCredentials} from './config';\nexport {default as CartoLayer} from './layers/carto-layer';\nexport {default as _CartoTileLayer} from './layers/carto-tile-layer';\nexport {default as _H3TileLayer} from './layers/h3-tile-layer';\nexport {default as _QuadkeyTileLayer} from './layers/quadkey-tile-layer';\nexport {default as BASEMAP} from './basemap';\nexport {default as colorBins} from './style/color-bins-style';\nexport {default as colorCategories} from './style/color-categories-style';\nexport {default as colorContinuous} from './style/color-continuous-style';\nexport {\n FORMATS,\n TILE_FORMATS,\n MAP_TYPES,\n API_VERSIONS,\n fetchLayerData,\n fetchMap,\n getDataV2 as _getDataV2,\n mapInstantiation as _mapInstantiation\n} from './api';\n\nexport type {CartoLayerProps} from './layers/carto-layer';\n"],"file":"index.js"}
1
+ {"version":3,"sources":["../../src/index.ts"],"names":["getDefaultCredentials","setDefaultCredentials","default","CartoLayer","_CartoTileLayer","_H3TileLayer","_QuadbinTileLayer","BASEMAP","colorBins","colorCategories","colorContinuous","FORMATS","TILE_FORMATS","MAP_TYPES","API_VERSIONS","fetchLayerData","fetchMap","getDataV2","_getDataV2","mapInstantiation","_mapInstantiation"],"mappings":"AAAA,SAAQA,qBAAR,EAA+BC,qBAA/B,QAA2D,UAA3D;AACA,SAAQC,OAAO,IAAIC,UAAnB,QAAoC,sBAApC;AACA,SAAQD,OAAO,IAAIE,eAAnB,QAAyC,2BAAzC;AACA,SAAQF,OAAO,IAAIG,YAAnB,QAAsC,wBAAtC;AACA,SAAQH,OAAO,IAAII,iBAAnB,QAA2C,6BAA3C;AACA,SAAQJ,OAAO,IAAIK,OAAnB,QAAiC,WAAjC;AACA,SAAQL,OAAO,IAAIM,SAAnB,QAAmC,0BAAnC;AACA,SAAQN,OAAO,IAAIO,eAAnB,QAAyC,gCAAzC;AACA,SAAQP,OAAO,IAAIQ,eAAnB,QAAyC,gCAAzC;AACA,SACEC,OADF,EAEEC,YAFF,EAGEC,SAHF,EAIEC,YAJF,EAKEC,cALF,EAMEC,QANF,EAOEC,SAAS,IAAIC,UAPf,EAQEC,gBAAgB,IAAIC,iBARtB,QASO,OATP","sourcesContent":["export {getDefaultCredentials, setDefaultCredentials} from './config';\nexport {default as CartoLayer} from './layers/carto-layer';\nexport {default as _CartoTileLayer} from './layers/carto-tile-layer';\nexport {default as _H3TileLayer} from './layers/h3-tile-layer';\nexport {default as _QuadbinTileLayer} from './layers/quadbin-tile-layer';\nexport {default as BASEMAP} from './basemap';\nexport {default as colorBins} from './style/color-bins-style';\nexport {default as colorCategories} from './style/color-categories-style';\nexport {default as colorContinuous} from './style/color-continuous-style';\nexport {\n FORMATS,\n TILE_FORMATS,\n MAP_TYPES,\n API_VERSIONS,\n fetchLayerData,\n fetchMap,\n getDataV2 as _getDataV2,\n mapInstantiation as _mapInstantiation\n} from './api';\n\nexport type {CartoLayerProps} from './layers/carto-layer';\n"],"file":"index.js"}
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
  import { CompositeLayer, log } from '@deck.gl/core';
3
3
  import CartoTileLayer from './carto-tile-layer';
4
4
  import H3TileLayer from './h3-tile-layer';
5
- import QuadkeyTileLayer from './quadkey-tile-layer';
5
+ import QuadbinTileLayer from './quadbin-tile-layer';
6
6
  import { MVTLayer } from '@deck.gl/geo-layers';
7
7
  import { fetchLayerData, getDataV2, API_VERSIONS } from '../api';
8
8
  import { COLUMNS_SUPPORT, FORMATS, GEO_COLUMN_SUPPORT, MAP_TYPES, TILE_FORMATS } from '../api/maps-api-common';
@@ -191,8 +191,8 @@ export default class CartoLayer extends CompositeLayer {
191
191
  return [H3TileLayer, props];
192
192
  }
193
193
 
194
- if (data.scheme === 'quadkey') {
195
- return [QuadkeyTileLayer, props];
194
+ if (data.scheme === 'quadbin') {
195
+ return [QuadbinTileLayer, props];
196
196
  }
197
197
 
198
198
  return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, props];
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","CartoTileLayer","H3TileLayer","QuadkeyTileLayer","MVTLayer","fetchLayerData","getDataV2","API_VERSIONS","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","TILE_FORMATS","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","aggregationExp","aggregationResLevel","CartoLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","Object","values","includes","V1","V2","QUERY","TILESET","V3","join","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","TILEJSON","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","tileUrl","URL","tiles","searchParams","get","MVT","scheme","renderLayers","updateTriggers","getSubLayerProps","id","layerName"],"mappings":"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","sourcesContent":["import {\n CompositeLayer,\n Layer,\n log,\n CompositeLayerProps,\n LayerProps,\n ChangeFlags\n} 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 {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {\n COLUMNS_SUPPORT,\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 {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\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps<DataT = any> = _CartoLayerProps & CompositeLayerProps<DataT>;\n\n/** Properties added by CartoLayer. */\ntype _CartoLayerProps = {\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 tile data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3`.\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 /** Aggregration SQL expression. Only used for spatial index datasets **/\n aggregationExp?: string;\n\n /** Aggregration resolution level. Only used for spatial index datasets, defaults to 6 for quadkeys, 4 for h3. **/\n aggregationResLevel?: number;\n};\n\nexport default class CartoLayer<ExtraProps = {}> extends CompositeLayer<\n Required<_CartoLayerProps> & ExtraProps\n> {\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.aggregationExp !== oldProps.aggregationExp ||\n props.aggregationResLevel !== oldProps.aggregationResLevel ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\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: Partial<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 // CartoLayer only supports tiled output from v8.8, force data format\n format: FORMATS.TILEJSON\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, 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 // @ts-expect-error 'uniqueIdProperty' is specified more than once, so this usage will be overwritten.\n const props = {uniqueIdProperty, ...propsNoData};\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n return [MVTLayer, props];\n }\n\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 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"}
1
+ {"version":3,"sources":["../../../src/layers/carto-layer.ts"],"names":["CompositeLayer","log","CartoTileLayer","H3TileLayer","QuadbinTileLayer","MVTLayer","fetchLayerData","getDataV2","API_VERSIONS","COLUMNS_SUPPORT","FORMATS","GEO_COLUMN_SUPPORT","MAP_TYPES","TILE_FORMATS","getDefaultCredentials","assert","defaultProps","data","type","onDataLoad","value","compare","onDataError","optional","uniqueIdProperty","credentials","connection","format","formatTiles","clientId","geoColumn","columns","aggregationExp","aggregationResLevel","CartoLayer","initializeState","state","apiVersion","isLoaded","getSubLayers","length","_checkProps","props","localCreds","Object","values","includes","V1","V2","QUERY","TILESET","V3","join","Array","isArray","updateState","oldProps","changeFlags","shouldUpdateData","dataChanged","JSON","stringify","setState","_updateData","source","rest","localConfig","result","TILEJSON","propName","layer","err","_getSubLayerAndProps","_notUsed","propsNoData","tileUrl","URL","tiles","searchParams","get","MVT","scheme","renderLayers","updateTriggers","getSubLayerProps","id","layerName"],"mappings":";AAAA,SACEA,cADF,EAGEC,GAHF,QAOO,eAPP;AAQA,OAAOC,cAAP,MAA2B,oBAA3B;AACA,OAAOC,WAAP,MAAwB,iBAAxB;AACA,OAAOC,gBAAP,MAA6B,sBAA7B;AACA,SAAQC,QAAR,QAAuB,qBAAvB;AACA,SAAQC,cAAR,EAAwBC,SAAxB,EAAmCC,YAAnC,QAAsD,QAAtD;AACA,SACEC,eADF,EAEEC,OAFF,EAGEC,kBAHF,EAKEC,SALF,EAOEC,YAPF,QAQO,wBARP;AASA,SAIEC,qBAJF,QAKO,WALP;AAOA,SAAQC,MAAR,QAAqB,UAArB;AAEA,MAAMC,YAAY,GAAG;AAEnBC,EAAAA,IAAI,EAAE,IAFa;AAInBC,EAAAA,IAAI,EAAE,IAJa;AAKnBC,EAAAA,UAAU,EAAE;AAACD,IAAAA,IAAI,EAAE,UAAP;AAAmBE,IAAAA,KAAK,EAAEH,IAAI,IAAI,CAAE,CAApC;AAAsCI,IAAAA,OAAO,EAAE;AAA/C,GALO;AAMnBC,EAAAA,WAAW,EAAE;AAACJ,IAAAA,IAAI,EAAE,UAAP;AAAmBE,IAAAA,KAAK,EAAE,IAA1B;AAAgCC,IAAAA,OAAO,EAAE,KAAzC;AAAgDE,IAAAA,QAAQ,EAAE;AAA1D,GANM;AAOnBC,EAAAA,gBAAgB,EAAE,YAPC;AAUnBC,EAAAA,WAAW,EAAE,IAVM;AAgBnBC,EAAAA,UAAU,EAAE,IAhBO;AAmBnBC,EAAAA,MAAM,EAAE,IAnBW;AAsBnBC,EAAAA,WAAW,EAAE,IAtBM;AAyBnBC,EAAAA,QAAQ,EAAE,IAzBS;AA4BnBC,EAAAA,SAAS,EAAE,IA5BQ;AA+BnBC,EAAAA,OAAO,EAAE;AAACb,IAAAA,IAAI,EAAE,OAAP;AAAgBE,IAAAA,KAAK,EAAE;AAAvB,GA/BU;AAkCnBY,EAAAA,cAAc,EAAE,IAlCG;AAqCnBC,EAAAA,mBAAmB,EAAE;AArCF,CAArB;AA4HA,eAAe,MAAMC,UAAN,SAA0ClC,cAA1C,CAEb;AAIAmC,EAAAA,eAAe,GAAS;AACtB,SAAKC,KAAL,GAAa;AACXnB,MAAAA,IAAI,EAAE,IADK;AAEXoB,MAAAA,UAAU,EAAE;AAFD,KAAb;AAID;;AAEW,MAARC,QAAQ,GAAY;AACtB,WAAO,KAAKC,YAAL,GAAoBC,MAApB,GAA6B,CAA7B,IAAkC,MAAMF,QAA/C;AACD;;AAEDG,EAAAA,WAAW,CAACC,KAAD,EAA+B;AACxC,UAAM;AAACxB,MAAAA,IAAD;AAAOO,MAAAA,WAAP;AAAoBC,MAAAA,UAApB;AAAgCI,MAAAA,SAAhC;AAA2CC,MAAAA;AAA3C,QAAsDW,KAA5D;AACA,UAAMC,UAAU,GAAG,EAAC,GAAG7B,qBAAqB,EAAzB;AAA6B,SAAGW;AAAhC,KAAnB;AACA,UAAM;AAACY,MAAAA;AAAD,QAAeM,UAArB;AAEA1C,IAAAA,GAAG,CAACc,MAAJ,CACE6B,MAAM,CAACC,MAAP,CAAcrC,YAAd,EAA4BsC,QAA5B,CAAqCT,UAArC,CADF,+BAEwBA,UAFxB;;AAKA,QAAIA,UAAU,KAAK7B,YAAY,CAACuC,EAA5B,IAAkCV,UAAU,KAAK7B,YAAY,CAACwC,EAAlE,EAAsE;AACpE/C,MAAAA,GAAG,CAACc,MAAJ,CACEG,IAAI,KAAKN,SAAS,CAACqC,KAAnB,IAA4B/B,IAAI,KAAKN,SAAS,CAACsC,OADjD,yBAEkBhC,IAFlB,4EAEwFmB,UAFxF;AAIApC,MAAAA,GAAG,CAACc,MAAJ,CAAW,CAACW,UAAZ,4DAA2EW,UAA3E;AACApC,MAAAA,GAAG,CAACc,MAAJ,CAAW,CAACe,SAAZ,2DAAyEO,UAAzE;AACApC,MAAAA,GAAG,CAACc,MAAJ,CAAW,CAACgB,OAAZ,yDAAqEM,UAArE;AACD,KARD,MAQO,IAAIA,UAAU,KAAK7B,YAAY,CAAC2C,EAAhC,EAAoC;AACzClD,MAAAA,GAAG,CAACc,MAAJ,CAAWW,UAAX,EAAuB,wCAAvB;AACAzB,MAAAA,GAAG,CAACc,MAAJ,CACE6B,MAAM,CAACC,MAAP,CAAcjC,SAAd,EAAyBkC,QAAzB,CAAkC5B,IAAlC,CADF,yBAEkBA,IAFlB;;AAIA,UAAI,CAACT,eAAe,CAACqC,QAAhB,CAAyB5B,IAAzB,CAAL,EAAqC;AACnCjB,QAAAA,GAAG,CAACc,MAAJ,CAAW,CAACgB,OAAZ,sDAAkEtB,eAAe,CAAC2C,IAAhB,EAAlE;AACD;;AACD,UAAI,CAACzC,kBAAkB,CAACmC,QAAnB,CAA4B5B,IAA5B,CAAL,EAAwC;AACtCjB,QAAAA,GAAG,CAACc,MAAJ,CACE,CAACe,SADH,wDAEiDnB,kBAAkB,CAACyC,IAAnB,EAFjD;AAID;;AACD,UAAIrB,OAAJ,EAAa;AACX9B,QAAAA,GAAG,CAACc,MAAJ,CAAWsC,KAAK,CAACC,OAAN,CAAcvB,OAAd,CAAX,EAAmC,+BAAnC;AACD;AACF;AACF;;AAEDwB,EAAAA,WAAW,CAAC;AACVb,IAAAA,KADU;AAEVc,IAAAA,QAFU;AAGVC,IAAAA;AAHU,GAAD,EASF;AACP,SAAKhB,WAAL,CAAiBC,KAAjB;;AACA,UAAMgB,gBAAgB,GACpBD,WAAW,CAACE,WAAZ,IACAjB,KAAK,CAACV,cAAN,KAAyBwB,QAAQ,CAACxB,cADlC,IAEAU,KAAK,CAACT,mBAAN,KAA8BuB,QAAQ,CAACvB,mBAFvC,IAGAS,KAAK,CAAChB,UAAN,KAAqB8B,QAAQ,CAAC9B,UAH9B,IAIAgB,KAAK,CAACZ,SAAN,KAAoB0B,QAAQ,CAAC1B,SAJ7B,IAKAY,KAAK,CAACd,WAAN,KAAsB4B,QAAQ,CAAC5B,WAL/B,IAMAc,KAAK,CAACxB,IAAN,KAAesC,QAAQ,CAACtC,IANxB,IAOA0C,IAAI,CAACC,SAAL,CAAenB,KAAK,CAACX,OAArB,MAAkC6B,IAAI,CAACC,SAAL,CAAeL,QAAQ,CAACzB,OAAxB,CAPlC,IAQA6B,IAAI,CAACC,SAAL,CAAenB,KAAK,CAACjB,WAArB,MAAsCmC,IAAI,CAACC,SAAL,CAAeL,QAAQ,CAAC/B,WAAxB,CATxC;;AAWA,QAAIiC,gBAAJ,EAAsB;AACpB,WAAKI,QAAL,CAAc;AAAC7C,QAAAA,IAAI,EAAE,IAAP;AAAaoB,QAAAA,UAAU,EAAE;AAAzB,OAAd;;AAEA,WAAK0B,WAAL;AACD;AACF;;AAEgB,QAAXA,WAAW,GAAkB;AACjC,QAAI;AAAA;;AACF,YAAM;AAAC7C,QAAAA,IAAD;AAAOD,QAAAA,IAAI,EAAE+C,MAAb;AAAqBnC,QAAAA,QAArB;AAA+BJ,QAAAA,WAA/B;AAA4CC,QAAAA,UAA5C;AAAwD,WAAGuC;AAA3D,UAAmE,KAAKvB,KAA9E;AACA,YAAMwB,WAAW,GAAG,EAAC,GAAGpD,qBAAqB,EAAzB;AAA6B,WAAGW;AAAhC,OAApB;AACA,YAAM;AAACY,QAAAA;AAAD,UAAe6B,WAArB;AAEA,UAAIC,MAAJ;;AACA,UAAI9B,UAAU,KAAK7B,YAAY,CAACuC,EAA5B,IAAkCV,UAAU,KAAK7B,YAAY,CAACwC,EAAlE,EAAsE;AACpEmB,QAAAA,MAAM,GAAG;AACPlD,UAAAA,IAAI,EAAE,MAAMV,SAAS,CAAC;AAACW,YAAAA,IAAD;AAAO8C,YAAAA,MAAP;AAAevC,YAAAA,WAAW,EAAEA;AAA5B,WAAD;AADd,SAAT;AAGD,OAJD,MAIO;AACL0C,QAAAA,MAAM,GAAG,MAAM7D,cAAc,CAAC;AAC5BY,UAAAA,IAD4B;AAE5B8C,UAAAA,MAF4B;AAG5BnC,UAAAA,QAH4B;AAI5BJ,UAAAA,WAAW,EAAEA,WAJe;AAK5BC,UAAAA,UAL4B;AAM5B,aAAGuC,IANyB;AAQ5BtC,UAAAA,MAAM,EAAEjB,OAAO,CAAC0D;AARY,SAAD,CAA7B;AAUD;;AAED,WAAKN,QAAL,CAAc,EAAC,GAAGK,MAAJ;AAAY9B,QAAAA;AAAZ,OAAd;AAEA,mDAAKK,KAAL,EAAWvB,UAAX,kGAAwBgD,MAAM,CAAClD,IAA/B,EAAqC;AACnCoD,QAAAA,QAAQ,EAAE,MADyB;AAEnCC,QAAAA,KAAK,EAAE;AAF4B,OAArC;AAID,KA7BD,CA6BE,OAAOC,GAAP,EAAY;AACZ,UAAI,KAAK7B,KAAL,CAAWpB,WAAf,EAA4B;AAC1B,aAAKoB,KAAL,CAAWpB,WAAX,CAAuBiD,GAAvB;AACD,OAFD,MAEO;AACL,cAAMA,GAAN;AACD;AACF;AACF;;AAEDC,EAAAA,oBAAoB,GAAsB;AACxCzD,IAAAA,MAAM,CAAC,KAAKqB,KAAN,CAAN;AAEA,UAAM;AAACnB,MAAAA,IAAD;AAAOoB,MAAAA;AAAP,QAAqB,KAAKD,KAAhC;AAEA,UAAM;AAACZ,MAAAA;AAAD,QAAqBR,YAA3B;AAEA,UAAM;AAACC,MAAAA,IAAI,EAAEwD,QAAP;AAAiB,SAAGC;AAApB,QAAmC,KAAKhC,KAA9C;AAEA,UAAMA,KAAK,GAAG;AAAClB,MAAAA,gBAAD;AAAmB,SAAGkD;AAAtB,KAAd;;AAEA,QAAIrC,UAAU,KAAK7B,YAAY,CAACuC,EAA5B,IAAkCV,UAAU,KAAK7B,YAAY,CAACwC,EAAlE,EAAsE;AACpE,aAAO,CAAC3C,QAAD,EAAWqC,KAAX,CAAP;AACD;;AAGD,UAAMiC,OAAO,GAAG,IAAIC,GAAJ,CAAQ3D,IAAI,CAAC4D,KAAL,CAAW,CAAX,CAAR,CAAhB;AAEAnC,IAAAA,KAAK,CAACd,WAAN,GACEc,KAAK,CAACd,WAAN,IACC+C,OAAO,CAACG,YAAR,CAAqBC,GAArB,CAAyB,aAAzB,CADD,IAEAlE,YAAY,CAACmE,GAHf;;AAKA,QAAI/D,IAAI,CAACgE,MAAL,KAAgB,IAApB,EAA0B;AACxB,aAAO,CAAC9E,WAAD,EAAcuC,KAAd,CAAP;AACD;;AACD,QAAIzB,IAAI,CAACgE,MAAL,KAAgB,SAApB,EAA+B;AAC7B,aAAO,CAAC7E,gBAAD,EAAmBsC,KAAnB,CAAP;AACD;;AACD,WAAOA,KAAK,CAACd,WAAN,KAAsBf,YAAY,CAACmE,GAAnC,GAAyC,CAAC3E,QAAD,EAAWqC,KAAX,CAAzC,GAA6D,CAACxC,cAAD,EAAiBwC,KAAjB,CAApE;AACD;;AAEDwC,EAAAA,YAAY,GAAiB;AAC3BnE,IAAAA,MAAM,CAAC,KAAKqB,KAAN,CAAN;AAEA,UAAM;AAACnB,MAAAA;AAAD,QAAS,KAAKmB,KAApB;AAEA,QAAI,CAACnB,IAAL,EAAW,OAAO,IAAP;AAEX,UAAM;AAACkE,MAAAA;AAAD,QAAmB,KAAKzC,KAA9B;;AAEA,UAAM,CAAC4B,KAAD,EAAQ5B,KAAR,IAAiB,KAAK8B,oBAAL,EAAvB;;AAGA,WAAO,IAAIF,KAAJ,CACL5B,KADK,EAEL,KAAK0C,gBAAL,CAAsB;AACpBC,MAAAA,EAAE,kBAAWf,KAAK,CAACgB,SAAjB,CADkB;AAEpBrE,MAAAA,IAFoB;AAGpBkE,MAAAA;AAHoB,KAAtB,CAFK,CAAP;AAQD;;AA9KD;;gBAFmBjD,U,eAGA,Y;;gBAHAA,U,kBAIGlB,Y","sourcesContent":["import {\n CompositeLayer,\n Layer,\n log,\n CompositeLayerProps,\n LayerProps,\n ChangeFlags\n} from '@deck.gl/core';\nimport CartoTileLayer from './carto-tile-layer';\nimport H3TileLayer from './h3-tile-layer';\nimport QuadbinTileLayer from './quadbin-tile-layer';\nimport {MVTLayer} from '@deck.gl/geo-layers';\nimport {fetchLayerData, getDataV2, API_VERSIONS} from '../api';\nimport {\n COLUMNS_SUPPORT,\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 {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): aggregation SQL expression. Only used for spatial index datasets\n aggregationExp: null,\n\n // (Number, optional): aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3\n aggregationResLevel: null\n};\n\n/** All properties supported by CartoLayer. */\nexport type CartoLayerProps<DataT = any> = _CartoLayerProps & CompositeLayerProps<DataT>;\n\n/** Properties added by CartoLayer. */\ntype _CartoLayerProps = {\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 tile data format.\n *\n * Only supported when apiVersion is `API_VERSIONS.V3`.\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 /** Aggregation SQL expression. Only used for spatial index datasets **/\n aggregationExp?: string;\n\n /** Aggregation resolution level. Only used for spatial index datasets, defaults to 6 for quadbins, 4 for h3. **/\n aggregationResLevel?: number;\n};\n\nexport default class CartoLayer<ExtraProps = {}> extends CompositeLayer<\n Required<_CartoLayerProps> & ExtraProps\n> {\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.aggregationExp !== oldProps.aggregationExp ||\n props.aggregationResLevel !== oldProps.aggregationResLevel ||\n props.connection !== oldProps.connection ||\n props.geoColumn !== oldProps.geoColumn ||\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: Partial<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 // CartoLayer only supports tiled output from v8.8, force data format\n format: FORMATS.TILEJSON\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, 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 // @ts-expect-error 'uniqueIdProperty' is specified more than once, so this usage will be overwritten.\n const props = {uniqueIdProperty, ...propsNoData};\n\n if (apiVersion === API_VERSIONS.V1 || apiVersion === API_VERSIONS.V2) {\n return [MVTLayer, props];\n }\n\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 === 'quadbin') {\n return [QuadbinTileLayer, props];\n }\n return props.formatTiles === TILE_FORMATS.MVT ? [MVTLayer, props] : [CartoTileLayer, 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"}
@@ -1,7 +1,7 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
  import { CompositeLayer } from '@deck.gl/core';
3
3
  import { H3HexagonLayer } from '@deck.gl/geo-layers';
4
- import H3Tileset2D from './h3-tileset-2d';
4
+ import H3Tileset2D, { getHexagonResolution } from './h3-tileset-2d';
5
5
  import SpatialIndexTileLayer from './spatial-index-tile-layer';
6
6
 
7
7
  const renderSubLayers = props => {
@@ -59,13 +59,30 @@ export default class H3TileLayer extends CompositeLayer {
59
59
  data,
60
60
  tileJSON
61
61
  } = this.state;
62
- const maxZoom = parseInt(tileJSON.maxresolution);
62
+ let minresolution = parseInt(tileJSON.minresolution);
63
+ let maxresolution = parseInt(tileJSON.maxresolution);
64
+
65
+ if (this.props.minZoom) {
66
+ minresolution = Math.max(minresolution, getHexagonResolution({
67
+ zoom: this.props.minZoom,
68
+ latitude: 0
69
+ }));
70
+ }
71
+
72
+ if (this.props.maxZoom) {
73
+ maxresolution = Math.min(maxresolution, getHexagonResolution({
74
+ zoom: this.props.maxZoom,
75
+ latitude: 0
76
+ }));
77
+ }
78
+
63
79
  return [new SpatialIndexTileLayer(this.props, {
64
80
  id: "h3-tile-layer-".concat(this.props.id),
65
81
  data,
66
82
  TilesetClass: H3Tileset2D,
67
83
  renderSubLayers,
68
- maxZoom
84
+ minZoom: minresolution,
85
+ maxZoom: maxresolution
69
86
  })];
70
87
  }
71
88
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","SpatialIndexTileLayer","renderSubLayers","props","data","index","tile","length","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","_checkH3Lib","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","maxZoom","parseInt","maxresolution","TilesetClass"],"mappings":";AAAA,SACEA,cADF,QAOO,eAPP;AAQA,SAAQC,cAAR,QAA6B,qBAA7B;AACA,OAAOC,WAAP,MAAwB,iBAAxB;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,QAAM;AAACE,IAAAA;AAAD,MAAUF,KAAK,CAACG,IAAtB;AACA,MAAI,CAACF,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIR,cAAJ,CAAmBI,KAAnB,EAA0B;AAC/BK,IAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACC,EADY;AAE/BC,IAAAA,aAAa,EAAEN,KAFgB;AAG/BO,IAAAA,aAAa,EAAE;AAHgB,GAA1B,CAAP;AAKD,CAVD;;AAYA,MAAMC,YAA+C,GAAG;AACtDC,EAAAA,mBAAmB,EAAE;AADiC,CAAxD;AAgBA,eAAe,MAAMC,WAAN,SAAyDjB,cAAzD,CAEb;AAAA;AAAA;;AAAA;AAAA;;AASAkB,EAAAA,eAAe,GAAS;AACtBjB,IAAAA,cAAc,CAACkB,WAAf;;AACA,SAAKC,QAAL,CAAc;AAACd,MAAAA,IAAI,EAAE,IAAP;AAAae,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACC,IAAAA;AAAD,GAAD,EAA8C;AACvD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAAClB,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMgB,QAAQ,GAAGf,IAAjB;AACAA,MAAAA,IAAI,GAAIe,QAAD,CAAkBI,KAAzB;AACA,WAAKL,QAAL,CAAc;AAACd,QAAAA,IAAD;AAAOe,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAACpB,MAAAA,IAAD;AAAOe,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,UAAMC,OAAO,GAAGC,QAAQ,CAACR,QAAQ,CAACS,aAAV,CAAxB;AACA,WAAO,CACL,IAAI3B,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCO,MAAAA,EAAE,0BAAmB,KAAKP,KAAL,CAAWO,EAA9B,CADkC;AAEpCN,MAAAA,IAFoC;AAIpCyB,MAAAA,YAAY,EAAE7B,WAJsB;AAKpCE,MAAAA,eALoC;AAMpCwB,MAAAA;AANoC,KAAtC,CADK,CAAP;AAUD;;AApCD;;gBAFmBX,W,eAGA,a;;gBAHAA,W,kBAIGF,Y","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n UpdateParameters,\n DefaultProps\n} 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 getHexagon: d => d.id,\n centerHexagon: index,\n highPrecision: true\n });\n};\n\nconst defaultProps: DefaultProps<H3HexagonLayerProps> = {\n aggregationResLevel: 4\n};\n\n/** All properties supported by H3TileLayer. */\nexport type H3TileLayerProps<DataT = any> = _H3TileLayerProps<DataT> & CompositeLayerProps<DataT>;\n\n// TODO: use type from h3-hexagon-layer when available\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\ntype H3HexagonLayerProps<DataT = any> = Record<string, any>;\n\n/** Properties added by H3TileLayer. */\ntype _H3TileLayerProps<DataT> = H3HexagonLayerProps<DataT> & {\n aggregationResLevel?: number;\n};\n\nexport default class H3TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<\n ExtraPropsT & Required<_H3TileLayerProps<DataT>>\n> {\n static layerName = 'H3TileLayer';\n static defaultProps = defaultProps;\n\n state!: {\n tileJSON: any;\n data: any;\n };\n\n initializeState(): void {\n H3HexagonLayer._checkH3Lib();\n this.setState({data: null, tileJSON: null});\n }\n\n updateState({changeFlags}: UpdateParameters<this>): void {\n if (changeFlags.dataChanged) {\n let {data} = this.props;\n const tileJSON = data;\n data = (tileJSON as any).tiles;\n this.setState({data, tileJSON});\n }\n }\n\n renderLayers(): Layer | null | LayersList {\n const {data, tileJSON} = this.state;\n const maxZoom = parseInt(tileJSON.maxresolution);\n return [\n new SpatialIndexTileLayer(this.props, {\n id: `h3-tile-layer-${this.props.id}`,\n data,\n // @ts-expect-error Tileset2D should be generic over TileIndex\n TilesetClass: H3Tileset2D,\n renderSubLayers,\n maxZoom\n })\n ];\n }\n}\n"],"file":"h3-tile-layer.js"}
1
+ {"version":3,"sources":["../../../src/layers/h3-tile-layer.ts"],"names":["CompositeLayer","H3HexagonLayer","H3Tileset2D","getHexagonResolution","SpatialIndexTileLayer","renderSubLayers","props","data","index","tile","length","getHexagon","d","id","centerHexagon","highPrecision","defaultProps","aggregationResLevel","H3TileLayer","initializeState","_checkH3Lib","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","minresolution","parseInt","maxresolution","minZoom","Math","max","zoom","latitude","maxZoom","min","TilesetClass"],"mappings":";AAAA,SACEA,cADF,QAOO,eAPP;AAQA,SAAQC,cAAR,QAA6B,qBAA7B;AACA,OAAOC,WAAP,IAAqBC,oBAArB,QAAgD,iBAAhD;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,QAAM;AAACE,IAAAA;AAAD,MAAUF,KAAK,CAACG,IAAtB;AACA,MAAI,CAACF,IAAD,IAAS,CAACA,IAAI,CAACG,MAAnB,EAA2B,OAAO,IAAP;AAE3B,SAAO,IAAIT,cAAJ,CAAmBK,KAAnB,EAA0B;AAC/BK,IAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACC,EADY;AAE/BC,IAAAA,aAAa,EAAEN,KAFgB;AAG/BO,IAAAA,aAAa,EAAE;AAHgB,GAA1B,CAAP;AAKD,CAVD;;AAYA,MAAMC,YAA+C,GAAG;AACtDC,EAAAA,mBAAmB,EAAE;AADiC,CAAxD;AAgBA,eAAe,MAAMC,WAAN,SAAyDlB,cAAzD,CAEb;AAAA;AAAA;;AAAA;AAAA;;AASAmB,EAAAA,eAAe,GAAS;AACtBlB,IAAAA,cAAc,CAACmB,WAAf;;AACA,SAAKC,QAAL,CAAc;AAACd,MAAAA,IAAI,EAAE,IAAP;AAAae,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACC,IAAAA;AAAD,GAAD,EAA8C;AACvD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAAClB,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMgB,QAAQ,GAAGf,IAAjB;AACAA,MAAAA,IAAI,GAAIe,QAAD,CAAkBI,KAAzB;AACA,WAAKL,QAAL,CAAc;AAACd,QAAAA,IAAD;AAAOe,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAACpB,MAAAA,IAAD;AAAOe,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,QAAIC,aAAa,GAAGC,QAAQ,CAACR,QAAQ,CAACO,aAAV,CAA5B;AACA,QAAIE,aAAa,GAAGD,QAAQ,CAACR,QAAQ,CAACS,aAAV,CAA5B;;AAIA,QAAI,KAAKzB,KAAL,CAAW0B,OAAf,EAAwB;AACtBH,MAAAA,aAAa,GAAGI,IAAI,CAACC,GAAL,CACdL,aADc,EAEd1B,oBAAoB,CAAC;AAACgC,QAAAA,IAAI,EAAE,KAAK7B,KAAL,CAAW0B,OAAlB;AAA2BI,QAAAA,QAAQ,EAAE;AAArC,OAAD,CAFN,CAAhB;AAID;;AACD,QAAI,KAAK9B,KAAL,CAAW+B,OAAf,EAAwB;AACtBN,MAAAA,aAAa,GAAGE,IAAI,CAACK,GAAL,CACdP,aADc,EAEd5B,oBAAoB,CAAC;AAACgC,QAAAA,IAAI,EAAE,KAAK7B,KAAL,CAAW+B,OAAlB;AAA2BD,QAAAA,QAAQ,EAAE;AAArC,OAAD,CAFN,CAAhB;AAID;;AAID,WAAO,CACL,IAAIhC,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCO,MAAAA,EAAE,0BAAmB,KAAKP,KAAL,CAAWO,EAA9B,CADkC;AAEpCN,MAAAA,IAFoC;AAIpCgC,MAAAA,YAAY,EAAErC,WAJsB;AAKpCG,MAAAA,eALoC;AAOpC2B,MAAAA,OAAO,EAAEH,aAP2B;AAQpCQ,MAAAA,OAAO,EAAEN;AAR2B,KAAtC,CADK,CAAP;AAYD;;AAzDD;;gBAFmBb,W,eAGA,a;;gBAHAA,W,kBAIGF,Y","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n UpdateParameters,\n DefaultProps\n} from '@deck.gl/core';\nimport {H3HexagonLayer} from '@deck.gl/geo-layers';\nimport H3Tileset2D, {getHexagonResolution} 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 getHexagon: d => d.id,\n centerHexagon: index,\n highPrecision: true\n });\n};\n\nconst defaultProps: DefaultProps<H3HexagonLayerProps> = {\n aggregationResLevel: 4\n};\n\n/** All properties supported by H3TileLayer. */\nexport type H3TileLayerProps<DataT = any> = _H3TileLayerProps<DataT> & CompositeLayerProps<DataT>;\n\n// TODO: use type from h3-hexagon-layer when available\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\ntype H3HexagonLayerProps<DataT = any> = Record<string, any>;\n\n/** Properties added by H3TileLayer. */\ntype _H3TileLayerProps<DataT> = H3HexagonLayerProps<DataT> & {\n aggregationResLevel?: number;\n};\n\nexport default class H3TileLayer<DataT = any, ExtraPropsT = {}> extends CompositeLayer<\n ExtraPropsT & Required<_H3TileLayerProps<DataT>>\n> {\n static layerName = 'H3TileLayer';\n static defaultProps = defaultProps;\n\n state!: {\n tileJSON: any;\n data: any;\n };\n\n initializeState(): void {\n H3HexagonLayer._checkH3Lib();\n this.setState({data: null, tileJSON: null});\n }\n\n updateState({changeFlags}: UpdateParameters<this>): void {\n if (changeFlags.dataChanged) {\n let {data} = this.props;\n const tileJSON = data;\n data = (tileJSON as any).tiles;\n this.setState({data, tileJSON});\n }\n }\n\n renderLayers(): Layer | null | LayersList {\n const {data, tileJSON} = this.state;\n let minresolution = parseInt(tileJSON.minresolution);\n let maxresolution = parseInt(tileJSON.maxresolution);\n\n // Convert Mercator zooms provided in props into H3 res levels\n // and clip into valid range provided from the tilejson\n if (this.props.minZoom) {\n minresolution = Math.max(\n minresolution,\n getHexagonResolution({zoom: this.props.minZoom, latitude: 0})\n );\n }\n if (this.props.maxZoom) {\n maxresolution = Math.min(\n maxresolution,\n getHexagonResolution({zoom: this.props.maxZoom, latitude: 0})\n );\n }\n\n // The naming is unfortunate, but minZoom & maxZoom in the context\n // of a Tileset2D refer to the resolution levels, not the Mercator zooms\n return [\n new SpatialIndexTileLayer(this.props, {\n id: `h3-tile-layer-${this.props.id}`,\n data,\n // @ts-expect-error Tileset2D should be generic over TileIndex\n TilesetClass: H3Tileset2D,\n renderSubLayers,\n // minZoom and maxZoom are H3 resolutions, however we must use this naming as that is what the Tileset2D class expects\n minZoom: minresolution,\n maxZoom: maxresolution\n })\n ];\n }\n}\n"],"file":"h3-tile-layer.js"}
@@ -7,18 +7,24 @@ function getHexagonsInBoundingBox({
7
7
  east,
8
8
  south
9
9
  }, resolution) {
10
- if (Math.abs(east - west) > 180) {
11
- return [...new Set(getHexagonsInBoundingBox({
12
- west,
13
- north,
14
- east: 0,
15
- south
16
- }, resolution).concat(getHexagonsInBoundingBox({
17
- west: 0,
18
- north,
19
- east,
20
- south
21
- }, resolution)))];
10
+ const longitudeSpan = Math.abs(east - west);
11
+
12
+ if (longitudeSpan > 180) {
13
+ const nSegments = Math.ceil(longitudeSpan / 180);
14
+ let h3Indices = [];
15
+
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(getHexagonsInBoundingBox({
20
+ west: segmentWest,
21
+ north,
22
+ east: segmentEast,
23
+ south
24
+ }, resolution));
25
+ }
26
+
27
+ return [...new Set(h3Indices)];
22
28
  }
23
29
 
24
30
  const oversample = 2;
@@ -43,13 +49,11 @@ function tileToBoundingBox(index) {
43
49
  }
44
50
 
45
51
  const BIAS = 2;
46
-
47
- function getHexagonResolution(viewport) {
52
+ export function getHexagonResolution(viewport) {
48
53
  const hexagonScaleFactor = 2 / 3 * viewport.zoom;
49
54
  const latitudeScaleFactor = Math.log(1 / Math.cos(Math.PI * viewport.latitude / 180));
50
55
  return Math.max(0, Math.floor(hexagonScaleFactor + latitudeScaleFactor - BIAS));
51
56
  }
52
-
53
57
  export default class H3Tileset2D extends Tileset2D {
54
58
  getTileIndices({
55
59
  viewport,
@@ -61,7 +65,7 @@ export default class H3Tileset2D extends Tileset2D {
61
65
  let indices;
62
66
 
63
67
  if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {
64
- z = minZoom;
68
+ return [];
65
69
  }
66
70
 
67
71
  if (typeof maxZoom === 'number' && Number.isFinite(maxZoom) && z > maxZoom) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../src/layers/h3-tileset-2d.ts"],"names":["_Tileset2D","Tileset2D","polyfill","geoToH3","h3GetResolution","h3ToGeoBoundary","h3ToParent","kRing","getHexagonsInBoundingBox","west","north","east","south","resolution","Math","abs","Set","concat","oversample","h3Indices","map","i","tileToBoundingBox","index","coordinates","latitudes","c","longitudes","min","max","BIAS","getHexagonResolution","viewport","hexagonScaleFactor","zoom","latitudeScaleFactor","log","cos","PI","latitude","floor","H3Tileset2D","getTileIndices","minZoom","maxZoom","getBounds","z","indices","Number","isFinite","center","longitude","getTileId","getTileMetadata","bbox","getTileZoom","getParentIndex"],"mappings":"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","sourcesContent":["import {_Tileset2D as Tileset2D, GeoBoundingBox} from '@deck.gl/geo-layers';\nimport {polyfill, geoToH3, h3GetResolution, h3ToGeoBoundary, h3ToParent, kRing} from 'h3-js';\n\nexport type H3TileIndex = {i: string};\n\nfunction getHexagonsInBoundingBox(\n {west, north, east, south}: GeoBoundingBox,\n resolution: number\n): string[] {\n if (Math.abs(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 [\n ...new Set(\n getHexagonsInBoundingBox({west, north, east: 0, south}, resolution).concat(\n getHexagonsInBoundingBox({west: 0, north, east, south}, resolution)\n )\n )\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: string): GeoBoundingBox {\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): number {\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 // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileIndices({viewport, minZoom, maxZoom}): H3TileIndex[] {\n const [east, south, west, north] = viewport.getBounds();\n\n let z = getHexagonResolution(viewport);\n let indices: string[];\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 // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileId({i}: H3TileIndex): string {\n return i;\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileMetadata({i}: H3TileIndex) {\n return {bbox: tileToBoundingBox(i)};\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileZoom({i}: H3TileIndex): number {\n return h3GetResolution(i);\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getParentIndex(index: H3TileIndex): H3TileIndex {\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"}
1
+ {"version":3,"sources":["../../../src/layers/h3-tileset-2d.ts"],"names":["_Tileset2D","Tileset2D","polyfill","geoToH3","h3GetResolution","h3ToGeoBoundary","h3ToParent","kRing","getHexagonsInBoundingBox","west","north","east","south","resolution","longitudeSpan","Math","abs","nSegments","ceil","h3Indices","s","segmentEast","segmentWest","min","concat","Set","oversample","map","i","tileToBoundingBox","index","coordinates","latitudes","c","longitudes","max","BIAS","getHexagonResolution","viewport","hexagonScaleFactor","zoom","latitudeScaleFactor","log","cos","PI","latitude","floor","H3Tileset2D","getTileIndices","minZoom","maxZoom","getBounds","z","indices","Number","isFinite","center","longitude","getTileId","getTileMetadata","bbox","getTileZoom","getParentIndex"],"mappings":"AAAA,SAAQA,UAAU,IAAIC,SAAtB,QAAsD,qBAAtD;AACA,SAAQC,QAAR,EAAkBC,OAAlB,EAA2BC,eAA3B,EAA4CC,eAA5C,EAA6DC,UAA7D,EAAyEC,KAAzE,QAAqF,OAArF;;AAIA,SAASC,wBAAT,CACE;AAACC,EAAAA,IAAD;AAAOC,EAAAA,KAAP;AAAcC,EAAAA,IAAd;AAAoBC,EAAAA;AAApB,CADF,EAEEC,UAFF,EAGY;AACV,QAAMC,aAAa,GAAGC,IAAI,CAACC,GAAL,CAASL,IAAI,GAAGF,IAAhB,CAAtB;;AACA,MAAIK,aAAa,GAAG,GAApB,EAAyB;AAGvB,UAAMG,SAAS,GAAGF,IAAI,CAACG,IAAL,CAAUJ,aAAa,GAAG,GAA1B,CAAlB;AACA,QAAIK,SAAmB,GAAG,EAA1B;;AACA,SAAK,IAAIC,CAAC,GAAG,CAAb,EAAgBA,CAAC,GAAGH,SAApB,EAA+BG,CAAC,EAAhC,EAAoC;AAClC,YAAMC,WAAW,GAAGV,IAAI,GAAGS,CAAC,GAAG,GAA/B;AACA,YAAME,WAAW,GAAGP,IAAI,CAACQ,GAAL,CAASF,WAAW,GAAG,WAAvB,EAAoCZ,IAApC,CAApB;AACAU,MAAAA,SAAS,GAAGA,SAAS,CAACK,MAAV,CACVhB,wBAAwB,CAAC;AAACC,QAAAA,IAAI,EAAEa,WAAP;AAAoBZ,QAAAA,KAApB;AAA2BC,QAAAA,IAAI,EAAEU,WAAjC;AAA8CT,QAAAA;AAA9C,OAAD,EAAuDC,UAAvD,CADd,CAAZ;AAGD;;AACD,WAAO,CAAC,GAAG,IAAIY,GAAJ,CAAQN,SAAR,CAAJ,CAAP;AACD;;AAID,QAAMO,UAAU,GAAG,CAAnB;AACA,QAAMP,SAAS,GAAGjB,QAAQ,CACxB,CACE,CACE,CAACO,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,CADwB,EAUxBG,UAAU,GAAGa,UAVW,EAWxB,IAXwB,CAA1B;AAcA,SAAOA,UAAU,GAAG,CAAC,GAAG,IAAID,GAAJ,CAAQN,SAAS,CAACQ,GAAV,CAAcC,CAAC,IAAItB,UAAU,CAACsB,CAAD,EAAIf,UAAJ,CAA7B,CAAR,CAAJ,CAAH,GAAiEM,SAAlF;AACD;;AAED,SAASU,iBAAT,CAA2BC,KAA3B,EAA0D;AACxD,QAAMC,WAAW,GAAG1B,eAAe,CAACyB,KAAD,CAAnC;AACA,QAAME,SAAS,GAAGD,WAAW,CAACJ,GAAZ,CAAgBM,CAAC,IAAIA,CAAC,CAAC,CAAD,CAAtB,CAAlB;AACA,QAAMC,UAAU,GAAGH,WAAW,CAACJ,GAAZ,CAAgBM,CAAC,IAAIA,CAAC,CAAC,CAAD,CAAtB,CAAnB;AACA,QAAMxB,IAAI,GAAGM,IAAI,CAACQ,GAAL,CAAS,GAAGW,UAAZ,CAAb;AACA,QAAMtB,KAAK,GAAGG,IAAI,CAACQ,GAAL,CAAS,GAAGS,SAAZ,CAAd;AACA,QAAMrB,IAAI,GAAGI,IAAI,CAACoB,GAAL,CAAS,GAAGD,UAAZ,CAAb;AACA,QAAMxB,KAAK,GAAGK,IAAI,CAACoB,GAAL,CAAS,GAAGH,SAAZ,CAAd;AACA,SAAO;AAACvB,IAAAA,IAAD;AAAOG,IAAAA,KAAP;AAAcD,IAAAA,IAAd;AAAoBD,IAAAA;AAApB,GAAP;AACD;;AAMD,MAAM0B,IAAI,GAAG,CAAb;AACA,OAAO,SAASC,oBAAT,CAA8BC,QAA9B,EAAgD;AACrD,QAAMC,kBAAkB,GAAI,IAAI,CAAL,GAAUD,QAAQ,CAACE,IAA9C;AACA,QAAMC,mBAAmB,GAAG1B,IAAI,CAAC2B,GAAL,CAAS,IAAI3B,IAAI,CAAC4B,GAAL,CAAU5B,IAAI,CAAC6B,EAAL,GAAUN,QAAQ,CAACO,QAApB,GAAgC,GAAzC,CAAb,CAA5B;AAGA,SAAO9B,IAAI,CAACoB,GAAL,CAAS,CAAT,EAAYpB,IAAI,CAAC+B,KAAL,CAAWP,kBAAkB,GAAGE,mBAArB,GAA2CL,IAAtD,CAAZ,CAAP;AACD;AAED,eAAe,MAAMW,WAAN,SAA0B9C,SAA1B,CAAoC;AAOjD+C,EAAAA,cAAc,CAAC;AAACV,IAAAA,QAAD;AAAWW,IAAAA,OAAX;AAAoBC,IAAAA;AAApB,GAAD,EAA8C;AAC1D,UAAM,CAACvC,IAAD,EAAOC,KAAP,EAAcH,IAAd,EAAoBC,KAApB,IAA6B4B,QAAQ,CAACa,SAAT,EAAnC;AAEA,QAAIC,CAAC,GAAGf,oBAAoB,CAACC,QAAD,CAA5B;AACA,QAAIe,OAAJ;;AACA,QAAI,OAAOJ,OAAP,KAAmB,QAAnB,IAA+BK,MAAM,CAACC,QAAP,CAAgBN,OAAhB,CAA/B,IAA2DG,CAAC,GAAGH,OAAnE,EAA4E;AAE1E,aAAO,EAAP;AACD;;AACD,QAAI,OAAOC,OAAP,KAAmB,QAAnB,IAA+BI,MAAM,CAACC,QAAP,CAAgBL,OAAhB,CAA/B,IAA2DE,CAAC,GAAGF,OAAnE,EAA4E;AAC1EE,MAAAA,CAAC,GAAGF,OAAJ;AAIA,YAAMM,MAAM,GAAGrD,OAAO,CAACmC,QAAQ,CAACO,QAAV,EAAoBP,QAAQ,CAACmB,SAA7B,EAAwCP,OAAxC,CAAtB;AACAG,MAAAA,OAAO,GAAG9C,KAAK,CAACiD,MAAD,EAAS,CAAT,CAAf;AACD,KAPD,MAOO;AACLH,MAAAA,OAAO,GAAG7C,wBAAwB,CAAC;AAACC,QAAAA,IAAD;AAAOC,QAAAA,KAAP;AAAcC,QAAAA,IAAd;AAAoBC,QAAAA;AAApB,OAAD,EAA6BwC,CAA7B,CAAlC;AACD;;AAED,WAAOC,OAAO,CAAC1B,GAAR,CAAYC,CAAC,KAAK;AAACA,MAAAA;AAAD,KAAL,CAAb,CAAP;AACD;;AAGD8B,EAAAA,SAAS,CAAC;AAAC9B,IAAAA;AAAD,GAAD,EAA2B;AAClC,WAAOA,CAAP;AACD;;AAGD+B,EAAAA,eAAe,CAAC;AAAC/B,IAAAA;AAAD,GAAD,EAAmB;AAChC,WAAO;AAACgC,MAAAA,IAAI,EAAE/B,iBAAiB,CAACD,CAAD;AAAxB,KAAP;AACD;;AAGDiC,EAAAA,WAAW,CAAC;AAACjC,IAAAA;AAAD,GAAD,EAA2B;AACpC,WAAOxB,eAAe,CAACwB,CAAD,CAAtB;AACD;;AAGDkC,EAAAA,cAAc,CAAChC,KAAD,EAAkC;AAC9C,UAAMjB,UAAU,GAAGT,eAAe,CAAC0B,KAAK,CAACF,CAAP,CAAlC;AACA,UAAMA,CAAC,GAAGtB,UAAU,CAACwB,KAAK,CAACF,CAAP,EAAUf,UAAU,GAAG,CAAvB,CAApB;AACA,WAAO;AAACe,MAAAA;AAAD,KAAP;AACD;;AAlDgD","sourcesContent":["import {_Tileset2D as Tileset2D, GeoBoundingBox} from '@deck.gl/geo-layers';\nimport {polyfill, geoToH3, h3GetResolution, h3ToGeoBoundary, h3ToParent, kRing} from 'h3-js';\n\nexport type H3TileIndex = {i: string};\n\nfunction getHexagonsInBoundingBox(\n {west, north, east, south}: GeoBoundingBox,\n resolution: number\n): string[] {\n const longitudeSpan = Math.abs(east - west);\n if (longitudeSpan > 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 const nSegments = Math.ceil(longitudeSpan / 180);\n let h3Indices: string[] = [];\n for (let s = 0; s < nSegments; s++) {\n const segmentEast = east + s * 180;\n const segmentWest = Math.min(segmentEast + 179.9999999, west);\n h3Indices = h3Indices.concat(\n getHexagonsInBoundingBox({west: segmentWest, north, east: segmentEast, south}, resolution)\n );\n }\n return [...new Set(h3Indices)];\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: string): GeoBoundingBox {\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;\nexport function getHexagonResolution(viewport): number {\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 /**\n * Returns all tile indices in the current viewport. If the current zoom level is smaller\n * than minZoom, return an empty array. If the current zoom level is greater than maxZoom,\n * return tiles that are on maxZoom.\n */\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileIndices({viewport, minZoom, maxZoom}): H3TileIndex[] {\n const [east, south, west, north] = viewport.getBounds();\n\n let z = getHexagonResolution(viewport);\n let indices: string[];\n if (typeof minZoom === 'number' && Number.isFinite(minZoom) && z < minZoom) {\n // TODO support `extent` prop\n return [];\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 // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileId({i}: H3TileIndex): string {\n return i;\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileMetadata({i}: H3TileIndex) {\n return {bbox: tileToBoundingBox(i)};\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getTileZoom({i}: H3TileIndex): number {\n return h3GetResolution(i);\n }\n\n // @ts-expect-error Tileset2D should be generic over TileIndex\n getParentIndex(index: H3TileIndex): H3TileIndex {\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"}
@@ -0,0 +1,29 @@
1
+ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
+ import { _GeoCellLayer as GeoCellLayer } from '@deck.gl/geo-layers';
3
+ import { getQuadbinPolygon } from './quadbin-utils';
4
+ const defaultProps = {
5
+ getQuadbin: {
6
+ type: 'accessor',
7
+ value: d => d.quadbin
8
+ }
9
+ };
10
+ export default class QuadbinLayer extends GeoCellLayer {
11
+ indexToBounds() {
12
+ const {
13
+ data,
14
+ getQuadbin
15
+ } = this.props;
16
+ return {
17
+ data,
18
+ _normalize: false,
19
+ positionFormat: 'XY',
20
+ getPolygon: (x, objectInfo) => getQuadbinPolygon(getQuadbin(x, objectInfo))
21
+ };
22
+ }
23
+
24
+ }
25
+
26
+ _defineProperty(QuadbinLayer, "layerName", 'QuadbinLayer');
27
+
28
+ _defineProperty(QuadbinLayer, "defaultProps", defaultProps);
29
+ //# sourceMappingURL=quadbin-layer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../src/layers/quadbin-layer.ts"],"names":["_GeoCellLayer","GeoCellLayer","getQuadbinPolygon","defaultProps","getQuadbin","type","value","d","quadbin","QuadbinLayer","indexToBounds","data","props","_normalize","positionFormat","getPolygon","x","objectInfo"],"mappings":";AACA,SACEA,aAAa,IAAIC,YADnB,QAGO,qBAHP;AAIA,SAAQC,iBAAR,QAAgC,iBAAhC;AAEA,MAAMC,YAA6C,GAAG;AACpDC,EAAAA,UAAU,EAAE;AAACC,IAAAA,IAAI,EAAE,UAAP;AAAmBC,IAAAA,KAAK,EAAEC,CAAC,IAAIA,CAAC,CAACC;AAAjC;AADwC,CAAtD;AAiBA,eAAe,MAAMC,YAAN,SAAyDR,YAAzD,CAGb;AAIAS,EAAAA,aAAa,GAA0C;AACrD,UAAM;AAACC,MAAAA,IAAD;AAAOP,MAAAA;AAAP,QAAqB,KAAKQ,KAAhC;AAEA,WAAO;AACLD,MAAAA,IADK;AAELE,MAAAA,UAAU,EAAE,KAFP;AAGLC,MAAAA,cAAc,EAAE,IAHX;AAKLC,MAAAA,UAAU,EAAE,CAACC,CAAD,EAAWC,UAAX,KAA0Bf,iBAAiB,CAACE,UAAU,CAACY,CAAD,EAAIC,UAAJ,CAAX;AALlD,KAAP;AAOD;;AAdD;;gBAHmBR,Y,eAIA,c;;gBAJAA,Y,kBAKGN,Y","sourcesContent":["import {AccessorFunction, DefaultProps} from '@deck.gl/core';\nimport {\n _GeoCellLayer as GeoCellLayer,\n _GeoCellLayerProps as GeoCellLayerProps\n} from '@deck.gl/geo-layers';\nimport {getQuadbinPolygon} from './quadbin-utils';\n\nconst defaultProps: DefaultProps<QuadbinLayerProps> = {\n getQuadbin: {type: 'accessor', value: d => d.quadbin}\n};\n\n/** All properties supported by QuadbinLayer. */\nexport type QuadbinLayerProps<DataT = any> = _QuadbinLayerProps<DataT> & GeoCellLayerProps<DataT>;\n\n/** Properties added by QuadbinLayer. */\ntype _QuadbinLayerProps<DataT> = {\n /**\n * Called for each data object to retrieve the quadbin string identifier.\n *\n * By default, it reads `quadbin` property of data object.\n */\n getQuadbin?: AccessorFunction<DataT, string>;\n};\n\nexport default class QuadbinLayer<DataT = any, ExtraProps = {}> extends GeoCellLayer<\n DataT,\n Required<_QuadbinLayerProps<DataT>> & ExtraProps\n> {\n static layerName = 'QuadbinLayer';\n static defaultProps = defaultProps;\n\n indexToBounds(): Partial<GeoCellLayer['props']> | null {\n const {data, getQuadbin} = this.props;\n\n return {\n data,\n _normalize: false,\n positionFormat: 'XY',\n\n getPolygon: (x: DataT, objectInfo) => getQuadbinPolygon(getQuadbin(x, objectInfo))\n };\n }\n}\n"],"file":"quadbin-layer.js"}
@@ -1,7 +1,7 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
  import { CompositeLayer } from '@deck.gl/core';
3
- import { QuadkeyLayer } from '@deck.gl/geo-layers';
4
- import QuadkeyTileset2D from './quadkey-tileset-2d';
3
+ import QuadbinLayer from './quadbin-layer';
4
+ import QuadbinTileset2D from './quadbin-tileset-2d';
5
5
  import SpatialIndexTileLayer from './spatial-index-tile-layer';
6
6
 
7
7
  const renderSubLayers = props => {
@@ -9,15 +9,15 @@ const renderSubLayers = props => {
9
9
  data
10
10
  } = props;
11
11
  if (!data || !data.length) return null;
12
- return new QuadkeyLayer(props, {
13
- getQuadkey: d => d.id
12
+ return new QuadbinLayer(props, {
13
+ getQuadbin: d => d.id
14
14
  });
15
15
  };
16
16
 
17
17
  const defaultProps = {
18
18
  aggregationResLevel: 6
19
19
  };
20
- export default class QuadkeyTileLayer extends CompositeLayer {
20
+ export default class QuadbinTileLayer extends CompositeLayer {
21
21
  constructor(...args) {
22
22
  super(...args);
23
23
 
@@ -54,9 +54,9 @@ export default class QuadkeyTileLayer extends CompositeLayer {
54
54
  } = this.state;
55
55
  const maxZoom = parseInt(tileJSON === null || tileJSON === void 0 ? void 0 : tileJSON.maxresolution);
56
56
  return [new SpatialIndexTileLayer(this.props, {
57
- id: "quadkey-tile-layer-".concat(this.props.id),
57
+ id: "quadbin-tile-layer-".concat(this.props.id),
58
58
  data,
59
- TilesetClass: QuadkeyTileset2D,
59
+ TilesetClass: QuadbinTileset2D,
60
60
  renderSubLayers,
61
61
  maxZoom
62
62
  })];
@@ -64,7 +64,7 @@ export default class QuadkeyTileLayer extends CompositeLayer {
64
64
 
65
65
  }
66
66
 
67
- _defineProperty(QuadkeyTileLayer, "layerName", 'QuadkeyTileLayer');
67
+ _defineProperty(QuadbinTileLayer, "layerName", 'QuadbinTileLayer');
68
68
 
69
- _defineProperty(QuadkeyTileLayer, "defaultProps", defaultProps);
70
- //# sourceMappingURL=quadkey-tile-layer.js.map
69
+ _defineProperty(QuadbinTileLayer, "defaultProps", defaultProps);
70
+ //# sourceMappingURL=quadbin-tile-layer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../src/layers/quadbin-tile-layer.ts"],"names":["CompositeLayer","QuadbinLayer","QuadbinTileset2D","SpatialIndexTileLayer","renderSubLayers","props","data","length","getQuadbin","d","id","defaultProps","aggregationResLevel","QuadbinTileLayer","initializeState","setState","tileJSON","updateState","changeFlags","dataChanged","tiles","renderLayers","state","maxZoom","parseInt","maxresolution","TilesetClass"],"mappings":";AAAA,SACEA,cADF,QAOO,eAPP;AAQA,OAAOC,YAAP,MAA8C,iBAA9C;AACA,OAAOC,gBAAP,MAA6B,sBAA7B;AACA,OAAOC,qBAAP,MAAkC,4BAAlC;;AAEA,MAAMC,eAAe,GAAGC,KAAK,IAAI;AAC/B,QAAM;AAACC,IAAAA;AAAD,MAASD,KAAf;AACA,MAAI,CAACC,IAAD,IAAS,CAACA,IAAI,CAACC,MAAnB,EAA2B,OAAO,IAAP;AAC3B,SAAO,IAAIN,YAAJ,CAAiBI,KAAjB,EAAwB;AAC7BG,IAAAA,UAAU,EAAEC,CAAC,IAAIA,CAAC,CAACC;AADU,GAAxB,CAAP;AAGD,CAND;;AAQA,MAAMC,YAAiD,GAAG;AACxDC,EAAAA,mBAAmB,EAAE;AADmC,CAA1D;AAaA,eAAe,MAAMC,gBAAN,SAA6Db,cAA7D,CAEb;AAAA;AAAA;;AAAA;AAAA;;AAQAc,EAAAA,eAAe,GAAS;AACtB,SAAKC,QAAL,CAAc;AAACT,MAAAA,IAAI,EAAE,IAAP;AAAaU,MAAAA,QAAQ,EAAE;AAAvB,KAAd;AACD;;AAEDC,EAAAA,WAAW,CAAC;AAACC,IAAAA;AAAD,GAAD,EAA8C;AACvD,QAAIA,WAAW,CAACC,WAAhB,EAA6B;AAC3B,UAAI;AAACb,QAAAA;AAAD,UAAS,KAAKD,KAAlB;AACA,YAAMW,QAAQ,GAAGV,IAAjB;AACAA,MAAAA,IAAI,GAAIU,QAAD,CAAkBI,KAAzB;AACA,WAAKL,QAAL,CAAc;AAACT,QAAAA,IAAD;AAAOU,QAAAA;AAAP,OAAd;AACD;AACF;;AAEDK,EAAAA,YAAY,GAA8B;AACxC,UAAM;AAACf,MAAAA,IAAD;AAAOU,MAAAA;AAAP,QAAmB,KAAKM,KAA9B;AACA,UAAMC,OAAO,GAAGC,QAAQ,CAACR,QAAD,aAACA,QAAD,uBAACA,QAAQ,CAAES,aAAX,CAAxB;AACA,WAAO,CACL,IAAItB,qBAAJ,CAA0B,KAAKE,KAA/B,EAAsC;AACpCK,MAAAA,EAAE,+BAAwB,KAAKL,KAAL,CAAWK,EAAnC,CADkC;AAEpCJ,MAAAA,IAFoC;AAIpCoB,MAAAA,YAAY,EAAExB,gBAJsB;AAKpCE,MAAAA,eALoC;AAMpCmB,MAAAA;AANoC,KAAtC,CADK,CAAP;AAUD;;AAlCD;;gBAFmBV,gB,eAGA,kB;;gBAHAA,gB,kBAIGF,Y","sourcesContent":["import {\n CompositeLayer,\n CompositeLayerProps,\n Layer,\n LayersList,\n UpdateParameters,\n DefaultProps\n} from '@deck.gl/core';\nimport QuadbinLayer, {QuadbinLayerProps} from './quadbin-layer';\nimport QuadbinTileset2D from './quadbin-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 QuadbinLayer(props, {\n getQuadbin: d => d.id\n });\n};\n\nconst defaultProps: DefaultProps<QuadbinTileLayerProps> = {\n aggregationResLevel: 6\n};\n\n/** All properties supported by QuadbinTileLayer. */\nexport type QuadbinTileLayerProps<DataT = any> = _QuadbinTileLayerProps<DataT> &\n CompositeLayerProps<DataT>;\n\n/** Properties added by QuadbinTileLayer. */\ntype _QuadbinTileLayerProps<DataT> = QuadbinLayerProps<DataT> & {\n aggregationResLevel?: number;\n};\n\nexport default class QuadbinTileLayer<DataT = any, ExtraProps = {}> extends CompositeLayer<\n ExtraProps & Required<_QuadbinTileLayerProps<DataT>>\n> {\n static layerName = 'QuadbinTileLayer';\n static defaultProps = defaultProps;\n\n state!: {\n tileJSON: any;\n data: any;\n };\n initializeState(): void {\n this.setState({data: null, tileJSON: null});\n }\n\n updateState({changeFlags}: UpdateParameters<this>): void {\n if (changeFlags.dataChanged) {\n let {data} = this.props;\n const tileJSON = data;\n data = (tileJSON as any).tiles;\n this.setState({data, tileJSON});\n }\n }\n\n renderLayers(): Layer | null | LayersList {\n const {data, tileJSON} = this.state;\n const maxZoom = parseInt(tileJSON?.maxresolution);\n return [\n new SpatialIndexTileLayer(this.props, {\n id: `quadbin-tile-layer-${this.props.id}`,\n data,\n // TODO: Tileset2D should be generic over TileIndex type\n TilesetClass: QuadbinTileset2D as any,\n renderSubLayers,\n maxZoom\n })\n ];\n }\n}\n"],"file":"quadbin-tile-layer.js"}
@@ -0,0 +1,37 @@
1
+ import { _Tileset2D as Tileset2D } from '@deck.gl/geo-layers';
2
+ import { tileToQuadbin, quadbinToTile, quadbinParent, quadbinZoom } from './quadbin-utils';
3
+ export default class QuadbinTileset2D extends Tileset2D {
4
+ getTileIndices(opts) {
5
+ return super.getTileIndices(opts).map(tileToQuadbin).map(i => ({
6
+ i
7
+ }));
8
+ }
9
+
10
+ getTileId({
11
+ i
12
+ }) {
13
+ return i;
14
+ }
15
+
16
+ getTileMetadata({
17
+ i
18
+ }) {
19
+ return super.getTileMetadata(quadbinToTile(i));
20
+ }
21
+
22
+ getTileZoom({
23
+ i
24
+ }) {
25
+ return Number(quadbinZoom(i));
26
+ }
27
+
28
+ getParentIndex({
29
+ i
30
+ }) {
31
+ return {
32
+ i: quadbinParent(i)
33
+ };
34
+ }
35
+
36
+ }
37
+ //# sourceMappingURL=quadbin-tileset-2d.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../src/layers/quadbin-tileset-2d.ts"],"names":["_Tileset2D","Tileset2D","tileToQuadbin","quadbinToTile","quadbinParent","quadbinZoom","QuadbinTileset2D","getTileIndices","opts","map","i","getTileId","getTileMetadata","getTileZoom","Number","getParentIndex"],"mappings":"AAAA,SAAQA,UAAU,IAAIC,SAAtB,QAAsC,qBAAtC;AACA,SAAQC,aAAR,EAAuBC,aAAvB,EAAsCC,aAAtC,EAAqDC,WAArD,QAAuE,iBAAvE;AAIA,eAAe,MAAMC,gBAAN,SAA+BL,SAA/B,CAAyC;AAEtDM,EAAAA,cAAc,CAACC,IAAD,EAA2B;AACvC,WAAO,MACJD,cADI,CACWC,IADX,EAEJC,GAFI,CAEAP,aAFA,EAGJO,GAHI,CAGAC,CAAC,KAAK;AAACA,MAAAA;AAAD,KAAL,CAHD,CAAP;AAID;;AAGDC,EAAAA,SAAS,CAAC;AAACD,IAAAA;AAAD,GAAD,EAAgC;AACvC,WAAOA,CAAP;AACD;;AAGDE,EAAAA,eAAe,CAAC;AAACF,IAAAA;AAAD,GAAD,EAAwB;AACrC,WAAO,MAAME,eAAN,CAAsBT,aAAa,CAACO,CAAD,CAAnC,CAAP;AACD;;AAGDG,EAAAA,WAAW,CAAC;AAACH,IAAAA;AAAD,GAAD,EAAgC;AACzC,WAAOI,MAAM,CAACT,WAAW,CAACK,CAAD,CAAZ,CAAb;AACD;;AAGDK,EAAAA,cAAc,CAAC;AAACL,IAAAA;AAAD,GAAD,EAA0C;AACtD,WAAO;AAACA,MAAAA,CAAC,EAAEN,aAAa,CAACM,CAAD;AAAjB,KAAP;AACD;;AA3BqD","sourcesContent":["import {_Tileset2D as Tileset2D} from '@deck.gl/geo-layers';\nimport {tileToQuadbin, quadbinToTile, quadbinParent, quadbinZoom} from './quadbin-utils';\n\ntype QuadbinTileIndex = {i: string};\n\nexport default class QuadbinTileset2D extends Tileset2D {\n // @ts-expect-error for spatial indices, TileSet2d should be parametrized by TileIndexT\n getTileIndices(opts): QuadbinTileIndex[] {\n return super\n .getTileIndices(opts)\n .map(tileToQuadbin)\n .map(i => ({i}));\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileId({i}: QuadbinTileIndex): string {\n return i;\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileMetadata({i}: QuadbinTileIndex) {\n return super.getTileMetadata(quadbinToTile(i));\n }\n\n // @ts-expect-error TileIndex must be generic\n getTileZoom({i}: QuadbinTileIndex): number {\n return Number(quadbinZoom(i));\n }\n\n // @ts-expect-error TileIndex must be generic\n getParentIndex({i}: QuadbinTileIndex): QuadbinTileIndex {\n return {i: quadbinParent(i)};\n }\n}\n"],"file":"quadbin-tileset-2d.js"}