Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[feat] experimental support for ARROW:extension:point; support for arrrow:wkb for geojson layer (#2716)
Igor Dykhtad783b43cb68d
diff --git a/examples/demo-app/package.json b/examples/demo-app/package.jsonindex d16668557..a84426243 100644--- a/examples/demo-app/package.json+++ b/examples/demo-app/package.json@@ -19,10 +19,11 @@"@kepler.gl/schemas": "^3.0.0-alpha.1","@kepler.gl/styles": "^3.0.0-alpha.1","@kepler.gl/utils": "^3.0.0-alpha.1",- "@loaders.gl/arrow": "^4.1.1",- "@loaders.gl/core": "^4.1.1",- "@loaders.gl/csv": "^4.1.1",- "@loaders.gl/json": "^4.1.1",+ "@loaders.gl/arrow": "^4.3.2",+ "@loaders.gl/core": "^4.3.2",+ "@loaders.gl/csv": "^4.3.2",+ "@loaders.gl/json": "^4.3.2",+ "@loaders.gl/parquet": "^4.3.2","@types/classnames": "^2.3.1","@types/keymirror": "^0.1.1","classnames": "^2.2.1",diff --git a/examples/demo-app/src/actions.js b/examples/demo-app/src/actions.jsindex 6c6406efd..52778ccd8 100644--- a/examples/demo-app/src/actions.js+++ b/examples/demo-app/src/actions.js@@ -7,8 +7,9 @@ import {fetch} from 'global';import {loadFiles, toggleModal} from '@kepler.gl/actions';import {load} from '@loaders.gl/core';import {CSVLoader} from '@loaders.gl/csv';-import {ArrowLoader} from '@loaders.gl/arrow';+import {GeoArrowLoader} from '@loaders.gl/arrow';import {_GeoJSONLoader as GeoJSONLoader} from '@loaders.gl/json';+import {ParquetWasmLoader} from '@loaders.gl/parquet';import {LOADING_SAMPLE_ERROR_MESSAGE,@@ -251,13 +252,16 @@ function loadRemoteData(url) {// Load datareturn new Promise(resolve => {- const loaders = [CSVLoader, ArrowLoader, GeoJSONLoader];+ const loaders = [CSVLoader, GeoArrowLoader, ParquetWasmLoader, GeoJSONLoader];const loadOptions = {+ csv: {+ shape: 'object-row-table'+ },arrow: {shape: 'arrow-table'},- csv: {- shape: 'object-row-table'+ parquet: {+ shape: 'arrow-table'},metadata: true};diff --git a/examples/demo-app/yarn.lock b/examples/demo-app/yarn.lockindex f593ac1b6..e00572906 100644--- a/examples/demo-app/yarn.lock+++ b/examples/demo-app/yarn.lock@@ -1292,6 +1292,23 @@ __metadata:languageName: nodelinkType: hard+"@loaders.gl/arrow@npm:4.3.2, @loaders.gl/arrow@npm:^4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/arrow@npm:4.3.2"+ dependencies:+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/wkt": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2"+ "@math.gl/polygon": "npm:^4.1.0"+ apache-arrow: "npm:>= 15.0.0"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/009a3cb32fbdcda3806211a4ceab8ac4037c37b93a67e8da361c23005885ae24190132cac4ca67580dfcf513a0a24642b30f23acd1df9d136505eec3475aba76+ languageName: node+ linkType: hard+"@loaders.gl/arrow@npm:^4.1.0-alpha.4":version: 4.2.2resolution: "@loaders.gl/arrow@npm:4.2.2"@@ -1309,20 +1326,46 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/arrow@npm:^4.1.1":- version: 4.2.3- resolution: "@loaders.gl/arrow@npm:4.2.3"+"@loaders.gl/bson@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/bson@npm:4.3.2"dependencies:- "@loaders.gl/gis": "npm:4.2.3"- "@loaders.gl/loader-utils": "npm:4.2.3"- "@loaders.gl/schema": "npm:4.2.3"- "@loaders.gl/wkt": "npm:4.2.3"- "@loaders.gl/worker-utils": "npm:4.2.3"- "@math.gl/polygon": "npm:4.0.0"- apache-arrow: "npm:>= 15.0.0"+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@types/bson": "npm:4.2.0"+ bson: "npm:4.2.0"peerDependencies:- "@loaders.gl/core": ^4.0.0- checksum: 10c0/d9f296de09f9ea2c989f555fe3bc5c3da8b48c4f9a89d11b4bc9d9aeb1ecb9726ce37fed76c9f20d01a487f176329034d6c1391242fe9dcc8a9273371ea7a6a9+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/0b3a9bde4d53db3ba8918e432ff65e35e8c1f98a0b6b84d2c8da55b98055562dc09769933aeb988bdca8349c15baaba484a55790259fcc72ed54c0b076d1acd9+ languageName: node+ linkType: hard++"@loaders.gl/compression@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/compression@npm:4.3.2"+ dependencies:+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2"+ "@types/brotli": "npm:^1.3.0"+ "@types/pako": "npm:^1.0.1"+ brotli: "npm:^1.3.2"+ fflate: "npm:0.7.4"+ lz4js: "npm:^0.2.0"+ lzo-wasm: "npm:^0.0.4"+ pako: "npm:1.0.11"+ snappyjs: "npm:^0.6.1"+ zstd-codec: "npm:^0.1"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ dependenciesMeta:+ brotli:+ optional: true+ lz4js:+ optional: true+ zstd-codec:+ optional: true+ checksum: 10c0/0fa9ee1d9a57707e069b66966396999e54a23188d94f5dcd98b7409c0654c0cff396971f835d59e368b5e6e55c8517af8cc58c59bd3f7d5e22065779f0aee97alanguageName: nodelinkType: hard@@ -1350,15 +1393,15 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/core@npm:^4.1.1":- version: 4.2.3- resolution: "@loaders.gl/core@npm:4.2.3"+"@loaders.gl/core@npm:^4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/core@npm:4.3.2"dependencies:- "@loaders.gl/loader-utils": "npm:4.2.3"- "@loaders.gl/schema": "npm:4.2.3"- "@loaders.gl/worker-utils": "npm:4.2.3"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2""@probe.gl/log": "npm:^4.0.2"- checksum: 10c0/b3ed3cea0a7350c4c2369bbdcaab28642f2051e4e0263bd2d22fa8425da7eea1cc47141adea974308338fa8741f04c0f86f9cceb2bd338fd39245b4da64435fd+ checksum: 10c0/3dbc564707996f376221e49f6ceaa53c8ce1b8026af591cbdce5c6eb87ffaeddc5e4174c0f4c4f2b589c5c586a4fa0045b6891d196ea3a6929d9a8ce1a6ae9e5languageName: nodelinkType: hard@@ -1374,15 +1417,16 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/csv@npm:^4.1.1":- version: 4.2.3- resolution: "@loaders.gl/csv@npm:4.2.3"+"@loaders.gl/csv@npm:^4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/csv@npm:4.3.2"dependencies:- "@loaders.gl/loader-utils": "npm:4.2.3"- "@loaders.gl/schema": "npm:4.2.3"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ d3-dsv: "npm:^1.2.0"peerDependencies:- "@loaders.gl/core": ^4.0.0- checksum: 10c0/5b58f4e315202d495dfb9d1bfdcdc825e0be79be29986181c93ee3f17916a5e2f2ab8b35bda4edf9b05916bb238bb48ce03bffe0ac97dbdcb98ecc134c9af750+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/69fb75b0957b4765b0d70dfa2519aa41fcb0da428574d3ab92192db783c140acc4fa417555856456e46258bd087edbac0f9072a1e2f98f9cae1f9c2aaa616185languageName: nodelinkType: hard@@ -1441,18 +1485,18 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/gis@npm:4.2.3":- version: 4.2.3- resolution: "@loaders.gl/gis@npm:4.2.3"+"@loaders.gl/gis@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/gis@npm:4.3.2"dependencies:- "@loaders.gl/loader-utils": "npm:4.2.3"- "@loaders.gl/schema": "npm:4.2.3"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2""@mapbox/vector-tile": "npm:^1.3.1"- "@math.gl/polygon": "npm:^4.0.0"+ "@math.gl/polygon": "npm:^4.1.0"pbf: "npm:^3.2.1"peerDependencies:- "@loaders.gl/core": ^4.0.0- checksum: 10c0/6cbdae6b7b608107b82b77c6ee741706bd1aa2db5783dd06214104bf24b324a392cb37bca44c3cf78ac2fe72d6a76006ed54b2773b6c61fc2efce657f3f6bca4+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/b8c643bc9bddeaf3a34b6ea162a36bd7f1943898a326e441a52e6340f248e7fe1be3a031945b0fb46f004a3a0578e25cf7435d54fab5cdb92597aefc1083a43dlanguageName: nodelinkType: hard@@ -1518,16 +1562,16 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/json@npm:^4.1.1":- version: 4.2.3- resolution: "@loaders.gl/json@npm:4.2.3"+"@loaders.gl/json@npm:^4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/json@npm:4.3.2"dependencies:- "@loaders.gl/gis": "npm:4.2.3"- "@loaders.gl/loader-utils": "npm:4.2.3"- "@loaders.gl/schema": "npm:4.2.3"+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"peerDependencies:- "@loaders.gl/core": ^4.0.0- checksum: 10c0/eb79c0ecd6c01190865b1eade356bca341c4a506801c326af305cf6a39768edefec20ada5fcdb76e2da46f4c9ad020c59f6e44aba8c55a46fbd9f0a37b0afe6c+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/10101cb63e0fc210e7a61234aff331c4f4a992eee58a88e6379a663bfd881a6e8cead9600b2fecf7500143d45063d9a082d59592246e1aab72cf15b4fa1555a9languageName: nodelinkType: hard@@ -1555,16 +1599,17 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/loader-utils@npm:4.2.3":- version: 4.2.3- resolution: "@loaders.gl/loader-utils@npm:4.2.3"+"@loaders.gl/loader-utils@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/loader-utils@npm:4.3.2"dependencies:- "@loaders.gl/schema": "npm:4.2.3"- "@loaders.gl/worker-utils": "npm:4.2.3"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2"+ "@probe.gl/log": "npm:^4.0.2""@probe.gl/stats": "npm:^4.0.2"peerDependencies:- "@loaders.gl/core": ^4.0.0- checksum: 10c0/55a5d906193263136ed94cd04fb4414e86256722f402e97a213d125177241b88f2fd5dd205c06bce5ae0842e5f3e93b9d7241d46d78b1ac4da329c7baa22f5b6+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/bbaeb362c63b760569323c50ad3a695737fdc93f5ef68c594aa35668ebb35a8332f53cd0cb74c49cc5cf026b9fad4f889c2efde0dc294a269c10c6b304ec5f0clanguageName: nodelinkType: hard@@ -1592,6 +1637,39 @@ __metadata:languageName: nodelinkType: hard+"@loaders.gl/parquet@npm:^4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/parquet@npm:4.3.2"+ dependencies:+ "@loaders.gl/arrow": "npm:4.3.2"+ "@loaders.gl/bson": "npm:4.3.2"+ "@loaders.gl/compression": "npm:4.3.2"+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/wkt": "npm:4.3.2"+ "@probe.gl/log": "npm:^4.0.9"+ async-mutex: "npm:^0.2.2"+ base64-js: "npm:^1.3.1"+ brotli: "npm:^1.3.2"+ ieee754: "npm:^1.2.1"+ int53: "npm:^0.2.4"+ lz4js: "npm:^0.2.0"+ node-int64: "npm:^0.4.0"+ object-stream: "npm:0.0.1"+ parquet-wasm: "npm:^0.6.1"+ snappyjs: "npm:^0.6.0"+ thrift: "npm:^0.19.0"+ util: "npm:^0.12.5"+ varint: "npm:^6.0.0"+ zstd-codec: "npm:^0.1"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ apache-arrow: ">= 15.0.0"+ checksum: 10c0/5a0996df63a24a1e32b8275fa20f9cfa6018eaae55757b9a43c80f9f8e72e8728617d67c7df54c203df0a558de50ca7f3143f7f6aea4c064ab61cb1b2297335e+ languageName: node+ linkType: hard+"@loaders.gl/schema@npm:3.4.15, @loaders.gl/schema@npm:^3.4.13":version: 3.4.15resolution: "@loaders.gl/schema@npm:3.4.15"@@ -1612,14 +1690,14 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/schema@npm:4.2.3":- version: 4.2.3- resolution: "@loaders.gl/schema@npm:4.2.3"+"@loaders.gl/schema@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/schema@npm:4.3.2"dependencies:"@types/geojson": "npm:^7946.0.7"peerDependencies:- "@loaders.gl/core": ^4.0.0- checksum: 10c0/b6bf755a8ec64340d333df57e6c56c4a9ca703cdb8f464cdec3cfe8f41a04d7558522e3a90ae178e2d95cef9d9d945f7915e767a877146a47ccf25969e5e35a1+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/6ba7f1b60b1c746f71a62e0dc627a13e1f7ebedb338630ce8b00972ef8c67dae614bc698be35618f4bc02c7d2536b2e686329af6076ed22ddddaf2269fc5efd1languageName: nodelinkType: hard@@ -1697,16 +1775,16 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/wkt@npm:4.2.3":- version: 4.2.3- resolution: "@loaders.gl/wkt@npm:4.2.3"+"@loaders.gl/wkt@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/wkt@npm:4.3.2"dependencies:- "@loaders.gl/gis": "npm:4.2.3"- "@loaders.gl/loader-utils": "npm:4.2.3"- "@loaders.gl/schema": "npm:4.2.3"+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"peerDependencies:- "@loaders.gl/core": ^4.0.0- checksum: 10c0/f074594e8cbc4dd517cf5552f1af13dd89a82685a4b88a9dd21c2e7635ffa87a5641efb33ce13cfe0c0b3d5462b82e96883f388aea0ba16dedda9fb73d0d6bf4+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/dc9809948be2dc1fa2b4da322a9c5ad63501b260c2c76ea0a694944aaddf09e6c8586e0999e4073fa039f6e801b9a6e8b3654ffa56d7e5b32a9ccebb938d9b9elanguageName: nodelinkType: hard@@ -1744,12 +1822,12 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/worker-utils@npm:4.2.3":- version: 4.2.3- resolution: "@loaders.gl/worker-utils@npm:4.2.3"+"@loaders.gl/worker-utils@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/worker-utils@npm:4.3.2"peerDependencies:- "@loaders.gl/core": ^4.0.0- checksum: 10c0/30a9ee62530fa12cb1b2b014386d1709d3f2bfe5e4dbc16a7cbeb1221334ec2073e9a2a3581843cc8e655d7f36fd173def047af92d55cc00c53f2e9ecf1bcc52+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/53a2b595f6e85786fb7233e28239dc49b52fb08278d93c85a3f01d9315dcd9404aa0d3458ec586768a43894d7ba1a32e14f10e11a8308dc1c6baed63a06bd8dalanguageName: nodelinkType: hard@@ -2074,6 +2152,15 @@ __metadata:languageName: nodelinkType: hard+"@math.gl/core@npm:4.1.0":+ version: 4.1.0+ resolution: "@math.gl/core@npm:4.1.0"+ dependencies:+ "@math.gl/types": "npm:4.1.0"+ checksum: 10c0/495934dc2be0b60cd6ff2cc16a0215608c9254919db741a0074b6b41cef9a0543c7f790eda7d529afa102d2937490608ef75fcc64c789ef2876ae750fd0ed3d6+ languageName: node+ linkType: hard+"@math.gl/culling@npm:^3.5.1, @math.gl/culling@npm:^3.6.2":version: 3.6.3resolution: "@math.gl/culling@npm:3.6.3"@@ -2123,6 +2210,15 @@ __metadata:languageName: nodelinkType: hard+"@math.gl/polygon@npm:^4.1.0":+ version: 4.1.0+ resolution: "@math.gl/polygon@npm:4.1.0"+ dependencies:+ "@math.gl/core": "npm:4.1.0"+ checksum: 10c0/0fcfb489c5613ddff6dd0cbea65084e10fa9a3523fb87a36a4fdf10057d12d2a99f1ebd93da6e72b45db0783fb8cd9cff704765473372a8db580faaf50c85ab5+ languageName: node+ linkType: hard+"@math.gl/sun@npm:^3.6.2":version: 3.6.3resolution: "@math.gl/sun@npm:3.6.3"@@ -2153,6 +2249,13 @@ __metadata:languageName: nodelinkType: hard+"@math.gl/types@npm:4.1.0":+ version: 4.1.0+ resolution: "@math.gl/types@npm:4.1.0"+ checksum: 10c0/3c4dfa5ac5c9e2cef24d31f56b89c1dde785a5d70fd1a7030386346cb7dd4fa2cce5ba983b89842c1971492e30870dd22a078d64893f9c66887e38367bf992fa+ languageName: node+ linkType: hard+"@math.gl/web-mercator@npm:^3.5.1, @math.gl/web-mercator@npm:^3.5.5, @math.gl/web-mercator@npm:^3.6.2":version: 3.6.3resolution: "@math.gl/web-mercator@npm:3.6.3"@@ -2277,7 +2380,7 @@ __metadata:languageName: nodelinkType: hard-"@probe.gl/log@npm:^4.0.2":+"@probe.gl/log@npm:^4.0.2, @probe.gl/log@npm:^4.0.9":version: 4.0.9resolution: "@probe.gl/log@npm:4.0.9"dependencies:@@ -2953,6 +3056,24 @@ __metadata:languageName: nodelinkType: hard+"@types/brotli@npm:^1.3.0":+ version: 1.3.4+ resolution: "@types/brotli@npm:1.3.4"+ dependencies:+ "@types/node": "npm:*"+ checksum: 10c0/b13829301b3ee79250d3fa8b1973097837bdd040fb90c90f63f406385e62b8e06e72a41e77939c6f8118090a7c72215b0d7b4d83b1e69457616810a65a576339+ languageName: node+ linkType: hard++"@types/bson@npm:4.2.0":+ version: 4.2.0+ resolution: "@types/bson@npm:4.2.0"+ dependencies:+ bson: "npm:*"+ checksum: 10c0/06f226fa7d033badf3b0a90cd31fc720e82637b513282bf843732bdf3e8127a81dd0050cf95acd324e8812be6d16726c859c3f9dbf1d0e5e4d2e092a2cdff37d+ languageName: node+ linkType: hard+"@types/cacheable-request@npm:^6.0.1":version: 6.0.3resolution: "@types/cacheable-request@npm:6.0.3"@@ -3308,6 +3429,13 @@ __metadata:languageName: nodelinkType: hard+"@types/pako@npm:^1.0.1":+ version: 1.0.7+ resolution: "@types/pako@npm:1.0.7"+ checksum: 10c0/1ba133db0b30a974c3d651c85651fd30135f629727b4b4d7ef2649c8f8b01014d5ef41f75399d939e320a50bfa87c32beccbb513badfeaf85d74ea6d5370fdcc+ languageName: node+ linkType: hard+"@types/pbf@npm:*, @types/pbf@npm:^3.0.5":version: 3.0.5resolution: "@types/pbf@npm:3.0.5"@@ -3620,6 +3748,22 @@ __metadata:languageName: nodelinkType: hard+"async-limiter@npm:~1.0.0":+ version: 1.0.1+ resolution: "async-limiter@npm:1.0.1"+ checksum: 10c0/0693d378cfe86842a70d4c849595a0bb50dc44c11649640ca982fa90cbfc74e3cc4753b5a0847e51933f2e9c65ce8e05576e75e5e1fd963a086e673735b35969+ languageName: node+ linkType: hard++"async-mutex@npm:^0.2.2":+ version: 0.2.6+ resolution: "async-mutex@npm:0.2.6"+ dependencies:+ tslib: "npm:^2.0.0"+ checksum: 10c0/440f1388fdbf2021261ba05952765182124a333681692fdef6af13935c20bfc2017e24e902362f12b29094a77b359ce3131e8dd45b1db42f1d570927ace9e7d9+ languageName: node+ linkType: hard+"asynckit@npm:^0.4.0":version: 0.4.0resolution: "asynckit@npm:0.4.0"@@ -3665,13 +3809,45 @@ __metadata:languageName: nodelinkType: hard-"base64-js@npm:^1.3.1":+"base64-js@npm:^1.1.2, base64-js@npm:^1.3.1":version: 1.5.1resolution: "base64-js@npm:1.5.1"checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bflanguageName: nodelinkType: hard+"brotli@npm:^1.3.2":+ version: 1.3.3+ resolution: "brotli@npm:1.3.3"+ dependencies:+ base64-js: "npm:^1.1.2"+ checksum: 10c0/9d24e24f8b7eabf44af034ed5f7d5530008b835f09a107a84ac060723e86dd43c6aa68958691fe5df524f59473b35f5ce2e0854aa1152c0a254d1010f51bcf22+ languageName: node+ linkType: hard++"browser-or-node@npm:^1.2.1":+ version: 1.3.0+ resolution: "browser-or-node@npm:1.3.0"+ checksum: 10c0/a914790dd6a857149b1bb128a39872a95172f6f1db7824dd014b88cc2f88ce6433013ec83388fff83512fb815e7dc2ea60ddbfe8ff150d4f233092ff0d60ec60+ languageName: node+ linkType: hard++"bson@npm:*":+ version: 6.8.0+ resolution: "bson@npm:6.8.0"+ checksum: 10c0/0503bb2a4ce2e183bd06151bdb983a623cfde05c76fbb5a34e941c594f3a681b52333d61b37c7933b8733b0ba14607b3599d94b46635d90bb96b1e7cec51aa8f+ languageName: node+ linkType: hard++"bson@npm:4.2.0":+ version: 4.2.0+ resolution: "bson@npm:4.2.0"+ dependencies:+ buffer: "npm:^5.6.0"+ checksum: 10c0/50e852996fd630a1d8d40840f1f775b5e0c821616d0a3710abdd45fcfdaec796b215202ed33d4955f517f3ac2119648ea1c0d96654309bbf1fee1d736cf5e0d8+ languageName: node+ linkType: hard+"buf-compare@npm:^1.0.0":version: 1.0.1resolution: "buf-compare@npm:1.0.1"@@ -3679,7 +3855,7 @@ __metadata:languageName: nodelinkType: hard-"buffer@npm:^5.0.8":+"buffer@npm:^5.0.8, buffer@npm:^5.6.0":version: 5.7.1resolution: "buffer@npm:5.7.1"dependencies:@@ -4112,7 +4288,7 @@ __metadata:languageName: nodelinkType: hard-"d3-dsv@npm:1":+"d3-dsv@npm:1, d3-dsv@npm:^1.2.0":version: 1.2.0resolution: "d3-dsv@npm:1.2.0"dependencies:@@ -4899,6 +5075,13 @@ __metadata:languageName: nodelinkType: hard+"fflate@npm:0.7.4":+ version: 0.7.4+ resolution: "fflate@npm:0.7.4"+ checksum: 10c0/5e749eb3a6ed61a0f6c55756abf9f4258f06f60505db689e22d18503dd252ca5af656d32668e4b7b20714adf8b313febf695d23863a8352f23e325baee0f672d+ languageName: node+ linkType: hard+"find-replace@npm:^3.0.0":version: 3.0.0resolution: "find-replace@npm:3.0.0"@@ -5354,7 +5537,7 @@ __metadata:languageName: nodelinkType: hard-"ieee754@npm:^1.1.12, ieee754@npm:^1.1.13":+"ieee754@npm:^1.1.12, ieee754@npm:^1.1.13, ieee754@npm:^1.2.1":version: 1.2.1resolution: "ieee754@npm:1.2.1"checksum: 10c0/b0782ef5e0935b9f12883a2e2aa37baa75da6e66ce6515c168697b42160807d9330de9a32ec1ed73149aea02e0d822e572bca6f1e22bdcbd2149e13b050b17bb@@ -5396,6 +5579,13 @@ __metadata:languageName: nodelinkType: hard+"inherits@npm:^2.0.3":+ version: 2.0.4+ resolution: "inherits@npm:2.0.4"+ checksum: 10c0/4e531f648b29039fb7426fb94075e6545faa1eb9fe83c29f0b6d9e7263aceb4289d2d4557db0d428188eeb449cc7c5e77b0a0b2c4e248ff2a65933a0dee49ef2+ languageName: node+ linkType: hard+"ini@npm:^1.3.5":version: 1.3.8resolution: "ini@npm:1.3.8"@@ -5410,6 +5600,13 @@ __metadata:languageName: nodelinkType: hard+"int53@npm:^0.2.4":+ version: 0.2.4+ resolution: "int53@npm:0.2.4"+ checksum: 10c0/7942bc3cee8aa6ed143b5169bcc2518c7d8d7e67601e3a982e853efb6a67420e863b90ff4d2edf0f4cfe6bd259b16d91690067986f8b2d4f8026c70d369b401a+ languageName: node+ linkType: hard+"internal-slot@npm:^1.0.7":version: 1.0.7resolution: "internal-slot@npm:1.0.7"@@ -5466,7 +5663,7 @@ __metadata:languageName: nodelinkType: hard-"is-arguments@npm:^1.1.1":+"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":version: 1.1.1resolution: "is-arguments@npm:1.1.1"dependencies:@@ -5583,6 +5780,15 @@ __metadata:languageName: nodelinkType: hard+"is-generator-function@npm:^1.0.7":+ version: 1.0.10+ resolution: "is-generator-function@npm:1.0.10"+ dependencies:+ has-tostringtag: "npm:^1.0.0"+ checksum: 10c0/df03514df01a6098945b5a0cfa1abff715807c8e72f57c49a0686ad54b3b74d394e2d8714e6f709a71eb00c9630d48e73ca1796c1ccc84ac95092c1fecc0d98b+ languageName: node+ linkType: hard+"is-hexadecimal@npm:^1.0.0":version: 1.0.4resolution: "is-hexadecimal@npm:1.0.4"@@ -5673,7 +5879,7 @@ __metadata:languageName: nodelinkType: hard-"is-typed-array@npm:^1.1.13":+"is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.3":version: 1.1.13resolution: "is-typed-array@npm:1.1.13"dependencies:@@ -5729,6 +5935,15 @@ __metadata:languageName: nodelinkType: hard+"isomorphic-ws@npm:^4.0.1":+ version: 4.0.1+ resolution: "isomorphic-ws@npm:4.0.1"+ peerDependencies:+ ws: "*"+ checksum: 10c0/7cb90dc2f0eb409825558982fb15d7c1d757a88595efbab879592f9d2b63820d6bbfb5571ab8abe36c715946e165a413a99f6aafd9f40ab1f514d73487bc9996+ languageName: node+ linkType: hard+"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":version: 4.0.0resolution: "js-tokens@npm:4.0.0"@@ -6019,6 +6234,20 @@ __metadata:languageName: nodelinkType: hard+"lz4js@npm:^0.2.0":+ version: 0.2.0+ resolution: "lz4js@npm:0.2.0"+ checksum: 10c0/73c6dd5117a6fa465e6be1bd5ae34ef4f02e4eb164a47d77f8c2483ccdde43cbdf8509a5e5a4480ef812e5c7a2cb946e026b9c784533775ee5c91861edaefb39+ languageName: node+ linkType: hard++"lzo-wasm@npm:^0.0.4":+ version: 0.0.4+ resolution: "lzo-wasm@npm:0.0.4"+ checksum: 10c0/33c0d43c9617f23e03196f475fd35b6b4a725e7252cf328002a606a4377ea281d380f12160df80bedfbe5516f7d9ad70592f469a6bef1e91db274e86d411452e+ languageName: node+ linkType: hard+"magic-string@npm:^0.25.7":version: 0.25.9resolution: "magic-string@npm:0.25.9"@@ -6392,6 +6621,13 @@ __metadata:languageName: nodelinkType: hard+"node-int64@npm:^0.4.0":+ version: 0.4.0+ resolution: "node-int64@npm:0.4.0"+ checksum: 10c0/a6a4d8369e2f2720e9c645255ffde909c0fbd41c92ea92a5607fc17055955daac99c1ff589d421eee12a0d24e99f7bfc2aabfeb1a4c14742f6c099a51863f31a+ languageName: node+ linkType: hard+"normalize-package-data@npm:^2.5.0":version: 2.5.0resolution: "normalize-package-data@npm:2.5.0"@@ -6454,6 +6690,13 @@ __metadata:languageName: nodelinkType: hard+"object-stream@npm:0.0.1":+ version: 0.0.1+ resolution: "object-stream@npm:0.0.1"+ checksum: 10c0/f8ecf919b3e10917daf34fb2bb94521108b85411b8a94d5a996e6d40eb4c6e2246e179067dc528b83e86c51b01b1fd16c617da0e2193dd00f0bf74a1efb8f048+ languageName: node+ linkType: hard+"object.assign@npm:^4.1.5":version: 4.1.5resolution: "object.assign@npm:4.1.5"@@ -6523,6 +6766,20 @@ __metadata:languageName: nodelinkType: hard+"pako@npm:1.0.11":+ version: 1.0.11+ resolution: "pako@npm:1.0.11"+ checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe+ languageName: node+ linkType: hard++"parquet-wasm@npm:^0.6.1":+ version: 0.6.1+ resolution: "parquet-wasm@npm:0.6.1"+ checksum: 10c0/dcade4b006ff86edca711dacf3c71997b4a86985384fc183119f73d5dae1d0c94d3e7fa5b48845845df5db97d3eb445d6c137f3459a5d9a66a3b9b3bc0474497+ languageName: node+ linkType: hard+"parse-entities@npm:^2.0.0":version: 2.0.0resolution: "parse-entities@npm:2.0.0"@@ -6701,6 +6958,13 @@ __metadata:languageName: nodelinkType: hard+"q@npm:^1.5.0":+ version: 1.5.1+ resolution: "q@npm:1.5.1"+ checksum: 10c0/7855fbdba126cb7e92ef3a16b47ba998c0786ec7fface236e3eb0135b65df36429d91a86b1fff3ab0927b4ac4ee88a2c44527c7c3b8e2a37efbec9fe34803df4+ languageName: node+ linkType: hard+"query-string@npm:^4.2.2":version: 4.3.4resolution: "query-string@npm:4.3.4"@@ -7471,10 +7735,11 @@ __metadata:"@kepler.gl/schemas": "npm:^3.0.0-alpha.1""@kepler.gl/styles": "npm:^3.0.0-alpha.1""@kepler.gl/utils": "npm:^3.0.0-alpha.1"- "@loaders.gl/arrow": "npm:^4.1.1"- "@loaders.gl/core": "npm:^4.1.1"- "@loaders.gl/csv": "npm:^4.1.1"- "@loaders.gl/json": "npm:^4.1.1"+ "@loaders.gl/arrow": "npm:^4.3.2"+ "@loaders.gl/core": "npm:^4.3.2"+ "@loaders.gl/csv": "npm:^4.3.2"+ "@loaders.gl/json": "npm:^4.3.2"+ "@loaders.gl/parquet": "npm:^4.3.2""@types/classnames": "npm:^2.3.1""@types/keymirror": "npm:^0.1.1"classnames: "npm:^2.2.1"@@ -7640,6 +7905,13 @@ __metadata:languageName: nodelinkType: hard+"snappyjs@npm:^0.6.0, snappyjs@npm:^0.6.1":+ version: 0.6.1+ resolution: "snappyjs@npm:0.6.1"+ checksum: 10c0/6fa62bb62adfc2bad577db78c58b1c52aba5482f749018ff3000f13bf660f13ec5f16ab80673ce4e8792902a16c30e5fb40a3b67dbca9af525658c9d343c5b1c+ languageName: node+ linkType: hard+"sort-asc@npm:^0.2.0":version: 0.2.0resolution: "sort-asc@npm:0.2.0"@@ -7957,6 +8229,19 @@ __metadata:languageName: nodelinkType: hard+"thrift@npm:^0.19.0":+ version: 0.19.0+ resolution: "thrift@npm:0.19.0"+ dependencies:+ browser-or-node: "npm:^1.2.1"+ isomorphic-ws: "npm:^4.0.1"+ node-int64: "npm:^0.4.0"+ q: "npm:^1.5.0"+ ws: "npm:^5.2.3"+ checksum: 10c0/935c2d9fcd3f23528fb462e8186aacf6e9c185593f59ac6ede1e3f5862de85f7d093a99546edce77443c990e6fde850a5ef5603e087cc1e9df96003f01860435+ languageName: node+ linkType: hard+"tiny-warning@npm:^1.0.0":version: 1.0.3resolution: "tiny-warning@npm:1.0.3"@@ -8297,6 +8582,19 @@ __metadata:languageName: nodelinkType: hard+"util@npm:^0.12.5":+ version: 0.12.5+ resolution: "util@npm:0.12.5"+ dependencies:+ inherits: "npm:^2.0.3"+ is-arguments: "npm:^1.0.4"+ is-generator-function: "npm:^1.0.7"+ is-typed-array: "npm:^1.1.3"+ which-typed-array: "npm:^1.1.2"+ checksum: 10c0/c27054de2cea2229a66c09522d0fa1415fb12d861d08523a8846bf2e4cbf0079d4c3f725f09dcb87493549bcbf05f5798dce1688b53c6c17201a45759e7253f3+ languageName: node+ linkType: hard+"uuid@npm:^7.0.3":version: 7.0.3resolution: "uuid@npm:7.0.3"@@ -8316,6 +8614,13 @@ __metadata:languageName: nodelinkType: hard+"varint@npm:^6.0.0":+ version: 6.0.0+ resolution: "varint@npm:6.0.0"+ checksum: 10c0/737fc37088a62ed3bd21466e318d21ca7ac4991d0f25546f518f017703be4ed0f9df1c5559f1dd533dddba4435a1b758fd9230e4772c1a930ef72b42f5c750fd+ languageName: node+ linkType: hard+"vfile-message@npm:^2.0.0":version: 2.0.4resolution: "vfile-message@npm:2.0.4"@@ -8406,7 +8711,7 @@ __metadata:languageName: nodelinkType: hard-"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15":+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2":version: 1.1.15resolution: "which-typed-array@npm:1.1.15"dependencies:@@ -8444,6 +8749,15 @@ __metadata:languageName: nodelinkType: hard+"ws@npm:^5.2.3":+ version: 5.2.4+ resolution: "ws@npm:5.2.4"+ dependencies:+ async-limiter: "npm:~1.0.0"+ checksum: 10c0/14e84e4209f86ab68b01b9ebf42c88f81f26a64ff4886ef65d27c734c9b90b8d7e84712da3c3f7a922a4ab58bf0b96544d32ae28ebbd620fcda3027dd5bc7604+ languageName: node+ linkType: hard+"xmlhttprequest@npm:1":version: 1.8.0resolution: "xmlhttprequest@npm:1.8.0"@@ -8471,3 +8785,10 @@ __metadata:checksum: 10c0/0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72languageName: nodelinkType: hard++"zstd-codec@npm:^0.1":+ version: 0.1.5+ resolution: "zstd-codec@npm:0.1.5"+ checksum: 10c0/8b7e6d9ce86f00fc4ea16c949aab5538505a1f3f1a9c7c095b2a7308b4ed894deec7bdb2c614e1486a337abdce09a6e56282dc0e39fe9f880953b094f8c7810b+ languageName: node+ linkType: harddiff --git a/jest.setup.js b/jest.setup.jsindex ac1fd0fa1..3775174f1 100644--- a/jest.setup.js+++ b/jest.setup.js@@ -2,8 +2,17 @@// Copyright contributors to the kepler.gl projectimport '@testing-library/jest-dom';-import {installFilePolyfills} from '@loaders.gl/polyfills';-installFilePolyfills();++// Disable polyfills as // ReferenceError: ReadableStream is not defined in @loaders.gl/polyfills+// import {installFilePolyfills} from '@loaders.gl/polyfills';+// installFilePolyfills();++// Remove once @loaders.gl/polyfills are reenabled+const {TextDecoder, TextEncoder} = require('node:util');+Object.defineProperties(globalThis, {+ TextDecoder: {value: TextDecoder},+ TextEncoder: {value: TextEncoder}+});jest.mock('mapbox-gl/dist/mapbox-gl', () => ({Map: () => ({})@@ -15,4 +24,7 @@ jest.mock('@kepler.gl/utils', () => ({hasMobileWidth: jest.fn()}));+// @loaders.gl/parquet isn't tested in jest atm, and is generating errors+jest.mock('@loaders.gl/parquet', () => ({}));+global.URL.createObjectURL = jest.fn();diff --git a/package.json b/package.jsonindex c78ff37ca..7bbdf39b2 100644--- a/package.json+++ b/package.json@@ -102,7 +102,7 @@"@hubble.gl/core": "1.2.0-alpha.6","@hubble.gl/react": "1.2.0-alpha.6","@kepler.gl/components": "3.0.0",- "@loaders.gl/polyfills": "^4.1.1",+ "@loaders.gl/polyfills": "^4.3.2","@types/mapbox__geo-viewport": "^0.4.1","html-webpack-plugin": "^4.3.0","typedoc": "^0.19.2"@@ -130,9 +130,10 @@"@babel/traverse": "^7.12.1","@cfaester/enzyme-adapter-react-18": "^0.7.0","@deck.gl/test-utils": "^8.9.27",- "@loaders.gl/polyfills": "^4.1.1",+ "@loaders.gl/polyfills": "^4.3.2","@luma.gl/test-utils": "^8.5.20","@nebula.gl/layers": "1.0.2-alpha.1",+ "@open-wc/webpack-import-meta-loader": "0.4.7","@probe.gl/env": "^3.5.0","@probe.gl/test-utils": "^3.5.0","@testing-library/dom": "^9.0.1",@@ -208,17 +209,18 @@"webpack-stats-plugin": "^0.2.1"},"resolutions": {- "@loaders.gl/core": "4.1.1",- "@loaders.gl/csv": "4.1.1",- "@loaders.gl/draco": "4.1.1",- "@loaders.gl/gltf": "4.1.1",- "@loaders.gl/json": "4.1.1",- "@loaders.gl/loader-utils": "4.1.1",- "@loaders.gl/polyfills": "4.1.1",- "@loaders.gl/arrow": "4.1.1",- "@loaders.gl/gis": "4.1.1",- "@loaders.gl/schema": "4.1.1",- "@loaders.gl/wkt": "4.1.1",+ "@loaders.gl/core": "4.3.2",+ "@loaders.gl/csv": "4.3.2",+ "@loaders.gl/draco": "4.3.2",+ "@loaders.gl/gltf": "4.3.2",+ "@loaders.gl/json": "4.3.2",+ "@loaders.gl/loader-utils": "4.3.2",+ "@loaders.gl/polyfills": "4.3.2",+ "@loaders.gl/arrow": "4.3.2",+ "@loaders.gl/parquet": "4.3.2",+ "@loaders.gl/gis": "4.3.2",+ "@loaders.gl/schema": "4.3.2",+ "@loaders.gl/wkt": "4.3.2","@luma.gl/constants": "8.5.21","@luma.gl/core": "8.5.21","@luma.gl/experimental": "8.5.21",diff --git a/src/deckgl-arrow-layers/src/constants.ts b/src/deckgl-arrow-layers/src/constants.tsindex 96e195b46..88422a4b4 100644--- a/src/deckgl-arrow-layers/src/constants.ts+++ b/src/deckgl-arrow-layers/src/constants.ts@@ -14,7 +14,8 @@ export enum EXTENSION_NAME {POLYGON = 'geoarrow.polygon',MULTIPOINT = 'geoarrow.multipoint',MULTILINESTRING = 'geoarrow.multilinestring',- MULTIPOLYGON = 'geoarrow.multipolygon'+ MULTIPOLYGON = 'geoarrow.multipolygon',+ WKB = 'geoarrow.wkb'}export const DEFAULT_COLOR: [number, number, number, number] = [0, 0, 0, 255];diff --git a/src/deckgl-arrow-layers/src/layers/geo-arrow-arc-layer.ts b/src/deckgl-arrow-layers/src/layers/geo-arrow-arc-layer.tsindex c2dea7a29..a534fdc91 100644--- a/src/deckgl-arrow-layers/src/layers/geo-arrow-arc-layer.ts+++ b/src/deckgl-arrow-layers/src/layers/geo-arrow-arc-layer.ts@@ -18,7 +18,7 @@ import * as ga from '@geoarrow/geoarrow-js';import {assignAccessor, extractAccessorsFromProps} from '../utils/utils';import {child} from '@geoarrow/geoarrow-js';import {GeoArrowExtraPickingProps, computeChunkOffsets, getPickingInfo} from '../utils/picking';-import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo} from '../types';+import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo, ExtensionProps} from '../types';import {validateAccessors} from '../utils/validate';/** All properties supported by GeoArrowArcLayer */@@ -154,7 +154,10 @@ export class GeoArrowArcLayer<ExtraProps extends object = object> extends Composconst targetData = targetPosition.data[recordBatchIdx];const targetValues = child.getPointChild(targetData).values;- const props: ArcLayerProps<any> = {+ // @ts-expect-error how to properly retrieve batch offset?+ const batchOffset = sourcePosition._offsets[recordBatchIdx];++ const props: ArcLayerProps<any> & ExtensionProps = {// Note: because this is a composite layer and not doing the rendering// itself, we still have to pass in our defaultProps...ourDefaultProps,@@ -187,12 +190,18 @@ export class GeoArrowArcLayer<ExtraProps extends object = object> extends Composprops,propName,propInput,- chunkIdx: recordBatchIdx+ chunkIdx: recordBatchIdx,+ batchOffset});}const SubLayerClass = this.getSubLayerClass('geo-arrow-arc-layer', ArcLayer);- const layer = new SubLayerClass(this.getSubLayerProps(props));+ const layer = new SubLayerClass({+ ...this.getSubLayerProps(props),+ // preserve binded accessors, as they are overwriten back by pass-through accessors from extensions+ getFiltered: props.getFiltered,+ getFilterValue: props.getFilterValue+ });layers.push(layer);}diff --git a/src/deckgl-arrow-layers/src/layers/geo-arrow-scatterplot-layer.ts b/src/deckgl-arrow-layers/src/layers/geo-arrow-scatterplot-layer.tsindex 2f2cca2fb..1f77ce8da 100644--- a/src/deckgl-arrow-layers/src/layers/geo-arrow-scatterplot-layer.ts+++ b/src/deckgl-arrow-layers/src/layers/geo-arrow-scatterplot-layer.ts@@ -25,7 +25,7 @@ import {invertOffsets} from '../utils/utils';import {GeoArrowExtraPickingProps, computeChunkOffsets, getPickingInfo} from '../utils/picking';-import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo} from '../types';+import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo, ExtensionProps} from '../types';import {EXTENSION_NAME} from '../constants';import {validateAccessors} from '../utils/validate';@@ -153,7 +153,10 @@ export class GeoArrowScatterplotLayer<ExtraProps extends object = object> extendconst flatCoordsData = ga.child.getPointChild(geometryData);const flatCoordinateArray = flatCoordsData.values;- const props: ScatterplotLayerProps<any> = {+ // @ts-expect-error how to properly retrieve batch offset?+ const batchOffset = geometryColumn._offsets[recordBatchIdx];++ const props: ScatterplotLayerProps<any> & ExtensionProps = {// Note: because this is a composite layer and not doing the rendering// itself, we still have to pass in our defaultProps...ourDefaultProps,@@ -182,11 +185,17 @@ export class GeoArrowScatterplotLayer<ExtraProps extends object = object> extendprops,propName,propInput,- chunkIdx: recordBatchIdx+ chunkIdx: recordBatchIdx,+ batchOffset});}- const layer = new ScatterplotLayer(this.getSubLayerProps(props));+ const layer = new ScatterplotLayer({+ ...this.getSubLayerProps(props),+ // preserve binded accessors, as they are overwriten back by pass-through accessors from extensions+ getFiltered: props.getFiltered,+ getFilterValue: props.getFilterValue+ });layers.push(layer);}@@ -217,7 +226,10 @@ export class GeoArrowScatterplotLayer<ExtraProps extends object = object> extendconst flatCoordsData = ga.child.getPointChild(pointData);const flatCoordinateArray = flatCoordsData.values;- const props: ScatterplotLayerProps = {+ // @ts-expect-error how to properly retrieve batch offset?+ const batchOffset = geometryColumn._offsets[recordBatchIdx];++ const props: ScatterplotLayerProps & ExtensionProps = {// Note: because this is a composite layer and not doing the rendering// itself, we still have to pass in our defaultProps...ourDefaultProps,@@ -251,11 +263,17 @@ export class GeoArrowScatterplotLayer<ExtraProps extends object = object> extendpropName,propInput,chunkIdx: recordBatchIdx,- geomCoordOffsets: geomOffsets+ geomCoordOffsets: geomOffsets,+ batchOffset});}- const layer = new ScatterplotLayer(this.getSubLayerProps(props));+ const layer = new ScatterplotLayer({+ ...this.getSubLayerProps(props),+ // preserve binded accessors, as they are overwriten back by pass-through accessors from extensions+ getFiltered: props.getFiltered,+ getFilterValue: props.getFilterValue+ });layers.push(layer);}diff --git a/src/deckgl-arrow-layers/src/layers/geo-arrow-text-layer.ts b/src/deckgl-arrow-layers/src/layers/geo-arrow-text-layer.tsindex 089a282e9..4c00aee84 100644--- a/src/deckgl-arrow-layers/src/layers/geo-arrow-text-layer.ts+++ b/src/deckgl-arrow-layers/src/layers/geo-arrow-text-layer.ts@@ -22,7 +22,7 @@ import {getGeometryVector} from '../utils/utils';import {GeoArrowExtraPickingProps, computeChunkOffsets, getPickingInfo} from '../utils/picking';-import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo} from '../types';+import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo, ExtensionProps} from '../types';import {EXTENSION_NAME} from '../constants';import {validateAccessors} from '../utils/validate';@@ -198,7 +198,10 @@ export class GeoArrowTextLayer<ExtraProps extends object = object> extends Compo// ! TODO valueOffsets are only present for string columnsconst characterOffsets = textData.valueOffsets;- const props: TextLayerProps<any> = {+ // @ts-expect-error how to properly retrieve batch offset?+ const batchOffset = geometryColumn._offsets[recordBatchIdx];++ const props: TextLayerProps<any> & ExtensionProps = {// Note: because this is a composite layer and not doing the rendering// itself, we still have to pass in our defaultProps...ourDefaultProps,@@ -250,11 +253,17 @@ export class GeoArrowTextLayer<ExtraProps extends object = object> extends CompopropName,propInput,chunkIdx: recordBatchIdx,- geomCoordOffsets: characterOffsets+ geomCoordOffsets: characterOffsets,+ batchOffset});}- const layer = new TextLayer(this.getSubLayerProps(props));+ const layer = new TextLayer({+ ...this.getSubLayerProps(props),+ // preserve binded accessors, as they are overwriten back by pass-through accessors from extensions+ getFiltered: props.getFiltered,+ getFilterValue: props.getFilterValue+ });layers.push(layer);}diff --git a/src/deckgl-arrow-layers/src/types.ts b/src/deckgl-arrow-layers/src/types.tsindex 8ef5af81c..d6e0bf606 100644--- a/src/deckgl-arrow-layers/src/types.ts+++ b/src/deckgl-arrow-layers/src/types.ts@@ -71,3 +71,8 @@ export type ColorAccessor =export type NormalAccessor =| arrow.Vector<arrow.FixedSizeList<arrow.Float32>>| Accessor<arrow.Table, arrow.Vector<arrow.FixedSizeList<arrow.Float32>>>;++export type ExtensionProps = {+ getFiltered?: ({index: number}) => number;+ getFilterValue?: (d: any, objectInfo?: {index: number}) => (number | number[])[];+};diff --git a/src/deckgl-arrow-layers/src/utils/utils.ts b/src/deckgl-arrow-layers/src/utils/utils.tsindex f257bbd27..0ccbb748c 100644--- a/src/deckgl-arrow-layers/src/utils/utils.ts+++ b/src/deckgl-arrow-layers/src/utils/utils.ts@@ -111,6 +111,8 @@ type AssignAccessorProps = {chunkIdx: number;/** a map from the geometry index to the coord offsets for that geometry. */geomCoordOffsets?: Int32Array | null;+ /** Absolute offset of the batch in the table/vector. Added to the sampling index. */+ batchOffset?: number;};/**@@ -126,10 +128,11 @@ type AssignAccessorProps = {*/function wrapAccessorFunction<In, Out>(objectInfo: _InternalAccessorContext<In>,- userAccessorFunction: AccessorFunction<In, Out>+ userAccessorFunction: AccessorFunction<In, Out>,+ batchOffset: number): Out {const {index, data} = objectInfo;- let newIndex = index;+ let newIndex = index + batchOffset;if (data.invertedGeomOffsets !== undefined) {newIndex = data.invertedGeomOffsets[index];}@@ -154,7 +157,7 @@ function wrapAccessorFunction<In, Out>(**/export function assignAccessor(args: AssignAccessorProps) {- const {props, propName, propInput, chunkIdx, geomCoordOffsets} = args;+ const {props, propName, propInput, chunkIdx, geomCoordOffsets, batchOffset = 0} = args;if (propInput === undefined) {return;@@ -198,7 +201,7 @@ export function assignAccessor(args: AssignAccessorProps) {return propInput(object, objectInfo);}- return wrapAccessorFunction(objectInfo, propInput);+ return wrapAccessorFunction(objectInfo, propInput, batchOffset);};} else {props[propName] = propInput;diff --git a/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts b/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.tsindex 757390cd1..b7640bb8b 100644--- a/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts+++ b/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts@@ -15,19 +15,10 @@ const vs = `const fs = ``;const inject = {- 'vs:#decl': `- varying float is_filtered;- `,- 'vs:#main-end': `- is_filtered = FILTER_ARROW_ATTRIB;- `,- 'fs:#decl': `- varying float is_filtered;- `,- 'fs:DECKGL_FILTER_COLOR': `- // abandon the fragments if it is not filtered- if (is_filtered == 0.) {- discard;+ // create degenerate vertices instead of discarding pixels in the fragment shader+ 'vs:DECKGL_FILTER_GL_POSITION': `+ if (FILTER_ARROW_ATTRIB == 0.) {+ position = vec4(0., 0., 0., 0.);}`};diff --git a/src/layers/package.json b/src/layers/package.jsonindex 7e00d6732..9d521b99d 100644--- a/src/layers/package.json+++ b/src/layers/package.json@@ -37,17 +37,19 @@"@deck.gl/layers": "^8.9.27","@deck.gl/mesh-layers": "^8.9.27","@kepler.gl/constants": "3.0.0",+ "@kepler.gl/deckgl-arrow-layers": "3.0.0","@kepler.gl/deckgl-layers": "3.0.0","@kepler.gl/localization": "3.0.0","@kepler.gl/table": "3.0.0","@kepler.gl/types": "3.0.0","@kepler.gl/utils": "3.0.0",- "@loaders.gl/arrow": "^4.1.1",- "@loaders.gl/core": "^4.1.1",- "@loaders.gl/gis": "^4.1.1",- "@loaders.gl/gltf": "^4.1.1",- "@loaders.gl/schema": "^4.1.1",- "@loaders.gl/wkt": "^4.1.1",+ "@loaders.gl/arrow": "^4.3.2",+ "@loaders.gl/core": "^4.3.2",+ "@loaders.gl/gis": "^4.3.2",+ "@loaders.gl/gltf": "^4.3.2",+ "@loaders.gl/parquet": "^4.3.2",+ "@loaders.gl/schema": "^4.3.2",+ "@loaders.gl/wkt": "^4.3.2","@luma.gl/constants": "^8.5.20","@mapbox/geojson-normalize": "0.0.1","@nebula.gl/edit-modes": "1.0.2-alpha.1",diff --git a/src/layers/src/arc-layer/arc-layer.ts b/src/layers/src/arc-layer/arc-layer.tsindex ae993d666..674dae6b8 100644--- a/src/layers/src/arc-layer/arc-layer.ts+++ b/src/layers/src/arc-layer/arc-layer.ts@@ -1,6 +1,8 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project+import * as arrow from 'apache-arrow';+import Layer, {LayerBaseConfig,LayerColorConfig,@@ -9,11 +11,14 @@ import Layer, {LayerBaseConfigPartial} from '../base-layer';import {BrushingExtension} from '@deck.gl/extensions';+import {GeoArrowArcLayer} from '@kepler.gl/deckgl-arrow-layers';+import {FilterArrowExtension} from '@kepler.gl/deckgl-layers';import {ArcLayer as DeckArcLayer} from '@deck.gl/layers';import {h3ToGeo} from 'h3-js';-import {hexToRgb, DataContainerInterface} from '@kepler.gl/utils';+import {hexToRgb, DataContainerInterface, ArrowDataContainer} from '@kepler.gl/utils';import ArcLayerIcon from './arc-layer-icon';+import {isLayerHoveredFromArrow, createGeoArrowPointVector, getFilteredIndex} from '../layer-utils';import {DEFAULT_LAYER_COLOR,ColorRange,@@ -27,7 +32,9 @@ import {VisConfigColorSelect,VisConfigNumber,VisConfigRange,- LayerColumn+ LayerColumn,+ Field,+ AnimationConfig} from '@kepler.gl/types';import {KeplerTable} from '@kepler.gl/table';@@ -50,6 +57,10 @@ export type ArcLayerColumnsConfig = {lat: LayerColumn;lng: LayerColumn;neighbors: LayerColumn;++ // COLUMN_MODE_GEOARROW+ geoarrow0: LayerColumn;+ geoarrow1: LayerColumn;};export type ArcLayerVisConfig = {@@ -79,6 +90,7 @@ export type ArcLayerMeta = {export const arcRequiredColumns = ['lat0', 'lng0', 'lat1', 'lng1'];export const neighborRequiredColumns = ['lat', 'lng', 'neighbors'];+export const geoarrowRequiredColumns = ['geoarrow0', 'geoarrow1'];export const arcColumnLabels = {lat0: 'arc.lat0',@@ -104,6 +116,7 @@ export const arcVisConfigs: {export const COLUMN_MODE_POINTS = 'points';export const COLUMN_MODE_NEIGHBORS = 'neighbors';+export const COLUMN_MODE_GEOARROW = 'geoarrow';const SUPPORTED_COLUMN_MODES = [{key: COLUMN_MODE_POINTS,@@ -114,10 +127,18 @@ const SUPPORTED_COLUMN_MODES = [key: COLUMN_MODE_NEIGHBORS,label: 'Point and Neighbors',requiredColumns: neighborRequiredColumns+ },+ {+ key: COLUMN_MODE_GEOARROW,+ label: 'Geoarrow Points',+ requiredColumns: geoarrowRequiredColumns}];const DEFAULT_COLUMN_MODE = COLUMN_MODE_POINTS;+const brushingExtension = new BrushingExtension();+const arrowCPUFilterExtension = new FilterArrowExtension();+export function getPositionFromHexValue(token) {const pos = h3ToGeo(token);@@ -150,40 +171,62 @@ function isOtherFieldString(columns, allFields, key) {return field && field.type === 'string';}export const arcPosAccessor =- ({lat0, lng0, lat1, lng1, lat, lng}: ArcLayerColumnsConfig, columnMode) =>+ ({lat0, lng0, lat1, lng1, lat, lng, geoarrow0, geoarrow1}: ArcLayerColumnsConfig, columnMode) =>(dc: DataContainerInterface) => {- if (columnMode === COLUMN_MODE_POINTS) {- return d => {- // lat or lng column could be hex column- // we assume string value is hex and try to convert it to geo lat lng- const startPos = maybeHexToGeo(dc, d, lat0, lng0);- const endPos = maybeHexToGeo(dc, d, lat1, lng1);- return [- startPos ? startPos[0] : dc.valueAt(d.index, lng0.fieldIdx),- startPos ? startPos[1] : dc.valueAt(d.index, lat0.fieldIdx),- 0,- endPos ? endPos[0] : dc.valueAt(d.index, lng1.fieldIdx),- endPos ? endPos[1] : dc.valueAt(d.index, lat1.fieldIdx),- 0- ];- };+ switch (columnMode) {+ case COLUMN_MODE_GEOARROW:+ return d => {+ const start = dc.valueAt(d.index, geoarrow0.fieldIdx);+ const end = dc.valueAt(d.index, geoarrow1.fieldIdx);+ return [start.get(0), start.get(1), 0, end.get(2), end.get(3), 0];+ };+ case COLUMN_MODE_NEIGHBORS:+ return d => {+ const startPos = maybeHexToGeo(dc, d, lat, lng);+ // only return source point if columnMode is COLUMN_MODE_NEIGHBORS++ return [+ startPos ? startPos[0] : dc.valueAt(d.index, lng.fieldIdx),+ startPos ? startPos[1] : dc.valueAt(d.index, lat.fieldIdx),+ 0+ ];+ };+ default:+ // COLUMN_MODE_POINTS+ return d => {+ // lat or lng column could be hex column+ // we assume string value is hex and try to convert it to geo lat lng+ const startPos = maybeHexToGeo(dc, d, lat0, lng0);+ const endPos = maybeHexToGeo(dc, d, lat1, lng1);+ return [+ startPos ? startPos[0] : dc.valueAt(d.index, lng0.fieldIdx),+ startPos ? startPos[1] : dc.valueAt(d.index, lat0.fieldIdx),+ 0,+ endPos ? endPos[0] : dc.valueAt(d.index, lng1.fieldIdx),+ endPos ? endPos[1] : dc.valueAt(d.index, lat1.fieldIdx),+ 0+ ];+ };}- return d => {- const startPos = maybeHexToGeo(dc, d, lat, lng);- // only return source point if columnMode is COLUMN_MODE_NEIGHBORS-- return [- startPos ? startPos[0] : dc.valueAt(d.index, lng.fieldIdx),- startPos ? startPos[1] : dc.valueAt(d.index, lat.fieldIdx),- 0- ];- };};export default class ArcLayer extends Layer {declare visConfigSettings: ArcLayerVisConfigSettings;declare config: ArcLayerConfig;declare meta: ArcLayerMeta;+ dataContainer: DataContainerInterface | null = null;+ geoArrowVector0: arrow.Vector | undefined = undefined;+ geoArrowVector1: arrow.Vector | undefined = undefined;++ /*+ * CPU filtering an arrow table by values and assembling a partial copy of the raw table is expensive+ * so we will use filteredIndex to create an attribute e.g. filteredIndex [0|1] for GPU filtering+ * in deck.gl layer, see: FilterArrowExtension in @kepler.gl/deckgl-layers.+ * Note that this approach can create visible lags in case of a lot of discarted geometry.+ */+ filteredIndex: Uint8ClampedArray | null = null;+ filteredIndexTrigger: number[] = [];+constructor(props) {super(props);@@ -255,6 +298,9 @@ export default class ArcLayer extends Layer {hasAllColumns() {const {columns} = this.config;+ if (this.config.columnMode === COLUMN_MODE_GEOARROW) {+ return this.hasColumnValue(columns.geoarrow0) && this.hasColumnValue(columns.geoarrow1);+ }if (this.config.columnMode === COLUMN_MODE_POINTS) {// TODO - this does not have access to allFields...// So we can't do the same validation as for the field errors@@ -267,7 +313,7 @@ export default class ArcLayer extends Layer {return hasStart && hasNeibors;}- static findDefaultLayerProps({fieldPairs = []}: KeplerTable): {+ static findDefaultLayerProps({fields, fieldPairs = []}: KeplerTable): {props: {color?: RGBColor; columns: ArcLayerColumnsConfig; label: string}[];} {if (fieldPairs.length < 2) {@@ -303,6 +349,34 @@ export default class ArcLayer extends Layer {};}+ calculateDataAttributeForGeoArrow(+ {dataContainer, filteredIndex}: {dataContainer: ArrowDataContainer; filteredIndex: number[]},+ getPosition+ ) {+ this.filteredIndex = getFilteredIndex(+ dataContainer.numRows(),+ filteredIndex,+ this.filteredIndex+ );+ this.filteredIndexTrigger = filteredIndex;++ if (this.config.columnMode === COLUMN_MODE_GEOARROW) {+ this.geoArrowVector0 = dataContainer.getColumn(this.config.columns.geoarrow0.fieldIdx);+ this.geoArrowVector1 = dataContainer.getColumn(this.config.columns.geoarrow1.fieldIdx);+ } else {+ // generate columns compatible with geoarrow point extension+ // TODO remove excessive intermediate allocations+ this.geoArrowVector0 = createGeoArrowPointVector(dataContainer, d => {+ return getPosition(d).slice(0, 3);+ });+ this.geoArrowVector1 = createGeoArrowPointVector(dataContainer, d => {+ return getPosition(d).slice(3, 6);+ });+ }++ return dataContainer.getTable();+ }+calculateDataAttributeForPoints({filteredIndex}: {dataContainer: DataContainerInterface; filteredIndex: number[]},getPosition@@ -363,6 +437,22 @@ export default class ArcLayer extends Layer {}calculateDataAttribute({dataContainer, filteredIndex}: KeplerTable, getPosition) {+ const {columnMode} = this.config;++ // 1) COLUMN_MODE_GEOARROW - when we have a geoarrow point column+ // 2) COLUMN_MODE_POINTS + ArrowDataContainer > create geoarrow point column on the fly+ if (+ dataContainer instanceof ArrowDataContainer &&+ (columnMode === COLUMN_MODE_GEOARROW || columnMode === COLUMN_MODE_POINTS)+ ) {+ return this.calculateDataAttributeForGeoArrow({dataContainer, filteredIndex}, getPosition);+ }++ // we don't need these in non-Arrow modes atm.+ this.geoArrowVector0 = undefined;+ this.geoArrowVector1 = undefined;+ this.filteredIndex = null;+if (this.config.columnMode === COLUMN_MODE_POINTS) {return this.calculateDataAttributeForPoints({dataContainer, filteredIndex}, getPosition);}@@ -379,15 +469,23 @@ export default class ArcLayer extends Layer {const {gpuFilter, dataContainer} = datasets[this.config.dataId];const {data} = this.updateData(datasets, oldLayerData);const accessors = this.getAttributeAccessors({dataContainer});+ const isFilteredAccessor = (data: {index: number}) => {+ // for GeoArrow data is a buffer, so use objectInfo+ return this.filteredIndex ? this.filteredIndex[data.index] : 1;+ };+return {data,getFilterValue: gpuFilter.filterValueAccessor(dataContainer)(),+ getFiltered: isFilteredAccessor,...accessors};}/* eslint-enable complexity */updateLayerMeta(dataContainer) {+ this.dataContainer = dataContainer;+// get bounds from arcsconst getPosition = this.getPositionAccessor(dataContainer);@@ -421,23 +519,46 @@ export default class ArcLayer extends Layer {}renderLayer(opts) {- const {data, gpuFilter, objectHovered, interactionConfig} = opts;+ const {data, gpuFilter, objectHovered, interactionConfig, dataset} = opts;const updateTriggers = {getPosition: this.config.columns,getFilterValue: gpuFilter.filterValueUpdateTriggers,+ getFiltered: this.filteredIndexTrigger,...this.getVisualChannelUpdateTriggers()};const widthScale = this.config.visConfig.thickness * PROJECTED_PIXEL_SIZE_MULTIPLIER;const defaultLayerProps = this.getDefaultDeckLayerProps(opts);const hoveredObject = this.hasHoveredObject(objectHovered);++ const useArrowLayer = Boolean(this.geoArrowVector0);++ let ArcLayerClass: typeof DeckArcLayer | typeof GeoArrowArcLayer = DeckArcLayer;+ let deckLayerData = data.data;+ let getSourcePosition = data.getPosition;+ let getTargetPosition = data.getPosition;+ if (useArrowLayer) {+ ArcLayerClass = GeoArrowArcLayer;+ deckLayerData = dataset.dataContainer.getTable();+ getSourcePosition = this.geoArrowVector0;+ getTargetPosition = this.geoArrowVector1;+ }+return [- new DeckArcLayer({+ // @ts-expect-error+ new ArcLayerClass({...defaultLayerProps,...this.getBrushingExtensionProps(interactionConfig, 'source_target'),...data,+ data: deckLayerData,+ getSourcePosition,+ getTargetPosition,widthScale,updateTriggers,- extensions: [...defaultLayerProps.extensions, new BrushingExtension()]+ extensions: [+ ...defaultLayerProps.extensions,+ brushingExtension,+ ...(useArrowLayer ? [arrowCPUFilterExtension] : [])+ ]}),// hover layer...(hoveredObject@@ -455,4 +576,37 @@ export default class ArcLayer extends Layer {: [])];}++ hasHoveredObject(objectInfo: {index: number}) {+ if (+ isLayerHoveredFromArrow(objectInfo, this.id) &&+ objectInfo.index >= 0 &&+ this.dataContainer+ ) {+ return {+ index: objectInfo.index,+ position: this.getPositionAccessor(this.dataContainer)(objectInfo)+ };+ }++ return super.hasHoveredObject(objectInfo);+ }++ getHoverData(+ object: {index: number} | arrow.StructRow | undefined,+ dataContainer: DataContainerInterface,+ fields: Field[],+ animationConfig: AnimationConfig,+ hoverInfo: {index: number}+ ) {+ // for arrow format, `object` is the Arrow row object Proxy,+ // and index is passed in `hoverInfo`.+ const index = Boolean(this.geoArrowVector0)+ ? hoverInfo?.index+ : (object as {index: number}).index;+ if (index >= 0) {+ return dataContainer.row(index);+ }+ return null;+ }}diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.tsindex 36e7219b8..5480fe20a 100644--- a/src/layers/src/base-layer.ts+++ b/src/layers/src/base-layer.ts@@ -2,11 +2,13 @@// Copyright contributors to the kepler.gl projectimport React from 'react';+import * as arrow from 'apache-arrow';import {console as Console} from 'global/window';import keymirror from 'keymirror';import {DataFilterExtension} from '@deck.gl/extensions';import {COORDINATE_SYSTEM} from '@deck.gl/core';import {TextLayer} from '@deck.gl/layers';+import {GeoArrowTextLayer} from '@kepler.gl/deckgl-arrow-layers';import DefaultLayerIcon from './default-layer-icon';import {diffUpdateTriggers} from './layer-update';@@ -662,7 +664,9 @@ class Layer {// eslint-disable-next-line @typescript-eslint/no-unused-varsfields?: Field[],// eslint-disable-next-line @typescript-eslint/no-unused-vars- animationConfig?: AnimationConfig+ animationConfig?: AnimationConfig,+ // eslint-disable-next-line @typescript-eslint/no-unused-vars+ hoverInfo?: {index: number}): any {if (!object) {return null;@@ -988,11 +992,15 @@ class Layer {* @param {Array | Object} layerData* @returns {boolean} yes or no*/- hasLayerData(layerData) {+ hasLayerData(layerData: {data: unknown[] | arrow.Table}) {if (!layerData) {return false;}- return Boolean(layerData.data && layerData.data.length);++ return Boolean(+ layerData.data &&+ ((layerData.data as unknown[]).length || (layerData.data as arrow.Table).numRows)+ );}isValidToSave(): boolean {@@ -1440,15 +1448,19 @@ class Layer {renderTextLabelLayer({getPosition,+ getFiltered,getPixelOffset,backgroundProps,updateTriggers,sharedProps}: {- getPosition: any;- getPixelOffset: any;- backgroundProps?: any;- updateTriggers: any;+ getPosition?: ((d: any) => number[]) | arrow.Vector;+ getFiltered?: (data: {index: number}, objectInfo: {index: number}) => number;+ getPixelOffset: (textLabel: any) => number[] | ((d: any) => number[]);+ backgroundProps?: {background: boolean};+ updateTriggers: {+ [key: string]: any;+ };sharedProps: any;},renderOpts@@ -1456,18 +1468,22 @@ class Layer {const {data, mapState} = renderOpts;const {textLabel} = this.config;+ const TextLayerClass = data.data instanceof arrow.Table ? GeoArrowTextLayer : TextLayer;+return data.textLabels.reduce((accu, d, i) => {if (d.getText) {const background = textLabel[i].background || backgroundProps?.background;accu.push(- new TextLayer({+ // @ts-expect-error+ new TextLayerClass({...sharedProps,id: `${this.id}-label-${textLabel[i].field?.name}`,data: data.data,visible: this.config.isVisible,getText: d.getText,getPosition,+ getFiltered,characterSet: d.characterSet,getPixelOffset: getPixelOffset(textLabel[i]),getSize: PROJECTED_PIXEL_SIZE_MULTIPLIER,diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.tsindex 9f26887fe..cec164791 100644--- a/src/layers/src/geojson-layer/geojson-layer.ts+++ b/src/layers/src/geojson-layer/geojson-layer.ts@@ -542,21 +542,20 @@ export default class GeoJsonLayer extends Layer {updateLayerMeta(dataContainer) {this.dataContainer = dataContainer;- const getFeature = this.getPositionAccessor(dataContainer);- const getGeoColumn = geoColumnAccessor(this.config.columns);- const getGeoField = geoFieldAccessor(this.config.columns);-if (dataContainer instanceof ArrowDataContainer) {+ const geoColumn = geoColumnAccessor(this.config.columns)(dataContainer);+ const geoField = geoFieldAccessor(this.config.columns)(dataContainer);+// update the latest batch/chunk of geoarrow data when loading data incrementally- if (this.dataToFeature.length < dataContainer.numChunks()) {+ if (geoColumn && geoField && this.dataToFeature.length < dataContainer.numChunks()) {// for incrementally loading data, we only load and render the latest batch; otherwise, we will load and render all batchesconst isIncrementalLoad = dataContainer.numChunks() - this.dataToFeature.length === 1;// TODO: add support for COLUMN_MODE_TABLE in getGeojsonLayerMetaFromArrowconst {dataToFeature, bounds, fixedRadius, featureTypes, centroids} =getGeojsonLayerMetaFromArrow({dataContainer,- getGeoColumn,- getGeoField,+ geoColumn,+ geoField,...(isIncrementalLoad ? {chunkIndex: this.dataToFeature.length} : null)});if (centroids) this.centroids = this.centroids.concat(centroids);@@ -564,6 +563,8 @@ export default class GeoJsonLayer extends Layer {this.dataToFeature = [...this.dataToFeature, ...dataToFeature];}} else if (this.dataToFeature.length === 0) {+ const getFeature = this.getPositionAccessor(dataContainer);+const {dataToFeature, bounds, fixedRadius, featureTypes, centroids} = getGeojsonLayerMeta({dataContainer,getFeature,diff --git a/src/layers/src/heatmap-layer/heatmap-layer.ts b/src/layers/src/heatmap-layer/heatmap-layer.tsindex 0e8840c02..d2112a6be 100644--- a/src/layers/src/heatmap-layer/heatmap-layer.ts+++ b/src/layers/src/heatmap-layer/heatmap-layer.ts@@ -2,7 +2,6 @@// Copyright contributors to the kepler.gl projectimport {createSelector} from 'reselect';-import memoize from 'lodash.memoize';import {CHANNEL_SCALES, SCALE_FUNC, ALL_FIELD_TYPES, ColorRange} from '@kepler.gl/constants';import MapboxGLLayer, {MapboxLayerGLConfig} from '../mapboxgl-layer';import HeatmapLayerIcon from './heatmap-layer-icon';@@ -16,7 +15,14 @@ export type HeatmapLayerVisConfigSettings = {radius: VisConfigNumber;};-export type HeatmapLayerColumnsConfig = {lat: LayerColumn; lng: LayerColumn};+export type HeatmapLayerColumnsConfig = {+ // COLUMN_MODE_POINTS+ lat: LayerColumn;+ lng: LayerColumn;++ // COLUMN_MODE_GEOARROW+ geoarrow: LayerColumn;+};export type HeatmapLayerVisConfig = {opacity: number;@@ -36,11 +42,23 @@ export const MAX_ZOOM_LEVEL = 18;export const pointPosAccessor =({lat, lng}: HeatmapLayerColumnsConfig) =>(dc: DataContainerInterface) =>- d =>+ (d: {index: number}): number[] =>[dc.valueAt(d.index, lng.fieldIdx), dc.valueAt(d.index, lat.fieldIdx)];-export const pointColResolver = ({lat, lng}: HeatmapLayerColumnsConfig) =>- `${lat.fieldIdx}-${lng.fieldIdx}`;+export const geoarrowPosAccessor =+ ({geoarrow}: HeatmapLayerColumnsConfig) =>+ (dc: DataContainerInterface) =>+ (d: {index: number}): number[] => {+ const row = dc.valueAt(d.index, geoarrow.fieldIdx);+ return [row.get(0), row.get(1)];+ };++export const pointColResolver = ({lat, lng, geoarrow}: HeatmapLayerColumnsConfig, columnMode) => {+ if (columnMode === COLUMN_MODE_POINTS) {+ return `${lat.fieldIdx}-${lng.fieldIdx}`;+ }+ return `geoarrow-${geoarrow.fieldIdx}`;+};export const heatmapVisConfigs: {opacity: 'opacity';@@ -52,6 +70,25 @@ export const heatmapVisConfigs: {radius: 'heatmapRadius'};+export const pointRequiredColumns = ['lat', 'lng'];+export const geoarrowRequiredColumns = ['geoarrow'];++export const COLUMN_MODE_POINTS = 'points';+export const COLUMN_MODE_GEOARROW = 'geoarrow';+const SUPPORTED_COLUMN_MODES = [+ {+ key: COLUMN_MODE_POINTS,+ label: 'Points',+ requiredColumns: pointRequiredColumns+ },+ {+ key: COLUMN_MODE_GEOARROW,+ label: 'Geoarrow Points',+ requiredColumns: geoarrowRequiredColumns+ }+];+const DEFAULT_COLUMN_MODE = COLUMN_MODE_POINTS;+/**** @param colorRange@@ -87,18 +124,37 @@ class HeatmapLayer extends MapboxGLLayer {declare visConfigSettings: HeatmapLayerVisConfigSettings;declare config: HeatmapLayerConfig;- getPosition: (config: HeatmapLayerColumnsConfig) => any;-constructor(props) {super(props);this.registerVisConfig(heatmapVisConfigs);- this.getPosition = memoize(pointPosAccessor, pointColResolver);++ this.getPositionAccessor = (dataContainer: DataContainerInterface) => {+ switch (this.config.columnMode) {+ case COLUMN_MODE_GEOARROW:+ return geoarrowPosAccessor(this.config.columns)(dataContainer);+ default:+ // COLUMN_MODE_POINTS+ return pointPosAccessor(this.config.columns)(dataContainer);+ }+ };}get type(): 'heatmap' {return 'heatmap';}+ get supportedColumnModes() {+ return SUPPORTED_COLUMN_MODES;+ }++ hasAllColumns() {+ const {columns, columnMode} = this.config;+ if (columnMode === COLUMN_MODE_GEOARROW) {+ return this.hasColumnValue(columns.geoarrow);+ }+ return super.hasAllColumns();+ }+get visualChannels(): VisualChannels {return {// @ts-expect-error@@ -140,6 +196,7 @@ class HeatmapLayer extends MapboxGLLayer {// eslint-disable-next-line @typescript-eslint/no-unused-varsconst {colorField, colorDomain, colorScale, ...layerConfig} = {...super.getDefaultLayerConfig(props),+ columnMode: props?.columnMode ?? DEFAULT_COLUMN_MODE,weightField: null,weightDomain: [0, 1],@@ -150,17 +207,13 @@ class HeatmapLayer extends MapboxGLLayer {return layerConfig;}- getPositionAccessor(dataContainer) {- return this.getPosition(this.config.columns)(dataContainer);- }-updateLayerMeta(dataContainer) {const getPosition = this.getPositionAccessor(dataContainer);const bounds = this.getPointsBounds(dataContainer, getPosition);this.updateMeta({bounds});}- columnsSelector = config => pointColResolver(config.columns);+ columnsSelector = config => pointColResolver(config.columns, config.columnMode);visConfigSelector = config => config.visConfig;weightFieldSelector = config => (config.weightField ? config.weightField.name : null);weightDomainSelector = config => config.weightDomain;diff --git a/src/layers/src/layer-text-label.ts b/src/layers/src/layer-text-label.tsindex bfcfa005b..35760e88e 100644--- a/src/layers/src/layer-text-label.ts+++ b/src/layers/src/layer-text-label.ts@@ -1,8 +1,9 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project+import * as arrow from 'apache-arrow';import {getDistanceScales} from 'viewport-mercator-project';-import {notNullorUndefined} from '@kepler.gl/utils';+import {notNullorUndefined, DataContainerInterface, ArrowDataContainer} from '@kepler.gl/utils';import uniq from 'lodash.uniq';export const defaultPadding = 20;@@ -46,7 +47,15 @@ export const formatTextLabelData = ({triggerChanged,oldLayerData,data,- dataContainer+ dataContainer,+ filteredIndex+}: {+ textLabel: any;+ triggerChanged?: boolean | {[key: string]: boolean};+ oldLayerData: any;+ data: any;+ dataContainer: DataContainerInterface;+ filteredIndex?: Uint8ClampedArray | null;}) => {return textLabel.map((tl, i) => {if (!tl.field) {@@ -57,19 +66,46 @@ export const formatTextLabelData = ({};}- const getText = textLabelAccessor(tl)(dataContainer);+ const getTextAccessor: (d: {index: number}) => string = textLabelAccessor(tl)(dataContainer);let characterSet;if (- !triggerChanged[`getLabelCharacterSet-${i}`] &&+ !triggerChanged?.[`getLabelCharacterSet-${i}`] &&oldLayerData &&oldLayerData.textLabels &&oldLayerData.textLabels[i]) {characterSet = oldLayerData.textLabels[i].characterSet;} else {- const allLabels = tl.field ? data.map(getText) : [];- characterSet = uniq(allLabels.join(''));+ if (data instanceof arrow.Table) {+ // we don't filter out arrow tables,+ // so we use filteredIndex array instead+ const allLabels: string[] = [];+ if (tl.field) {+ if (filteredIndex) {+ filteredIndex.forEach((value, index) => {+ if (value > 0) allLabels.push(getTextAccessor({index}));+ });+ } else {+ for (let index = 0; index < dataContainer.numRows(); ++index) {+ allLabels.push(getTextAccessor({index}));+ }+ }+ }+ characterSet = uniq(allLabels.join(''));+ } else {+ const allLabels = tl.field ? data.map(getTextAccessor) : [];+ characterSet = uniq(allLabels.join(''));+ }+ }++ let getText: typeof getTextAccessor | arrow.Vector = getTextAccessor;+ // For Arrow Layers getText has to be an arrow vector.+ // For now check here for ArrowTable, not ArrowDataContainer.+ if (data instanceof arrow.Table && dataContainer instanceof ArrowDataContainer) {+ // TODO the data has to be a column of string type.+ // as numerical and other columns types lack valueOffsets prop.+ getText = dataContainer.getColumn(tl.field.fieldIdx);}return {diff --git a/src/layers/src/layer-utils.ts b/src/layers/src/layer-utils.tsindex bf1b8d04a..a962904f7 100644--- a/src/layers/src/layer-utils.ts+++ b/src/layers/src/layer-utils.ts@@ -3,13 +3,27 @@import * as arrow from 'apache-arrow';import {Feature, BBox} from 'geojson';-import {Field, FieldPair, SupportedColumnMode} from '@kepler.gl/types';-import {DataContainerInterface} from '@kepler.gl/utils';+import {getGeoMetadata} from '@loaders.gl/gis';++import {Field, FieldPair, SupportedColumnMode, LayerColumn} from '@kepler.gl/types';+import {DataContainerInterface, ArrowDataContainer} from '@kepler.gl/utils';import {getBinaryGeometriesFromArrow,parseGeometryFromArrow,- BinaryGeometriesFromArrowOptions+ BinaryGeometriesFromArrowOptions,+ updateBoundsFromGeoArrowSamples} from '@loaders.gl/arrow';+import {EXTENSION_NAME} from '@kepler.gl/deckgl-arrow-layers';++import {WKBLoader} from '@loaders.gl/wkt';+import {geojsonToBinary} from '@loaders.gl/gis';+import {+ BinaryFeatureCollection,+ Geometry,+ BinaryPointFeature,+ BinaryLineFeature,+ BinaryPolygonFeature+} from '@loaders.gl/schema';import {DeckGlGeoTypes, GeojsonDataMaps} from './geojson-layer/geojson-utils';@@ -36,21 +50,110 @@ export type GeojsonLayerMetaProps = {centroids?: Array<number[] | null>;};+/**+ * Converts a geoarrow.wkb vector into an array of BinaryFeatureCollections.+ * @param geoColumn A vector column with geoarrow.wkb extension.+ * @param options Options for geometry transformation.+ * @returns+ */+function getBinaryGeometriesFromWKBArrow(+ geoColumn: arrow.Vector,+ options: {chunkIndex?: number; chunkOffset?: number}+): GeojsonLayerMetaProps {+ const dataToFeature: BinaryFeatureCollection[] = [];+ const featureTypes: GeojsonLayerMetaProps['featureTypes'] = {+ point: false,+ line: false,+ polygon: false+ };++ const chunks =+ options?.chunkIndex !== undefined && options?.chunkIndex >= 0+ ? [geoColumn.data[options?.chunkIndex]]+ : geoColumn.data;+ let globalFeatureIdOffset = options?.chunkOffset || 0;+ let featureIndex = globalFeatureIdOffset;+ let bounds: [number, number, number, number] = [Infinity, Infinity, -Infinity, -Infinity];++ chunks.forEach(chunk => {+ const geojsonFeatures: Feature[] = [];+ for (let i = 0; i < chunk.length; ++i) {+ // ignore features without any geometry+ if (chunk.valueOffsets[i + 1] - chunk.valueOffsets[i] > 0) {+ const valuesSlice = chunk.values.slice(chunk.valueOffsets[i], chunk.valueOffsets[i + 1]);++ const geometry = WKBLoader?.parseSync?.(valuesSlice.buffer, {+ wkb: {shape: 'geojson-geometry'}+ }) as Geometry;+ const feature: Feature = {+ type: 'Feature',+ geometry,+ properties: {index: featureIndex}+ };+ geojsonFeatures.push(feature);++ const {type} = geometry;+ featureTypes.polygon = type === 'Polygon' || type === 'MultiPolygon';+ featureTypes.point = type === 'Point' || type === 'MultiPoint';+ featureTypes.line = type === 'LineString' || type === 'MultiLineString';+ }++ featureIndex++;+ }++ const geojsonToBinaryOptions = {+ triangulate: true,+ fixRingWinding: true+ };+ const binaryFeatures = geojsonToBinary(geojsonFeatures, geojsonToBinaryOptions);++ // Need to update globalFeatureIds, to take into account previous batches,+ // as geojsonToBinary doesn't have such option.+ const featureTypesArr = ['points', 'lines', 'polygons'];+ featureTypesArr.forEach(prop => {+ const features = binaryFeatures[prop] as+ | BinaryPointFeature+ | BinaryLineFeature+ | BinaryPolygonFeature;+ if (features) {+ bounds = updateBoundsFromGeoArrowSamples(+ features.positions.value as Float64Array,+ features.positions.size,+ bounds+ );++ const {globalFeatureIds, numericProps} = features;+ const {index} = numericProps;+ const len = globalFeatureIds.value.length;+ for (let i = 0; i < len; ++i) {+ globalFeatureIds.value[i] = index.value[i];+ }+ }+ });++ dataToFeature.push(binaryFeatures);+ });++ return {+ dataToFeature: dataToFeature,+ featureTypes: featureTypes,+ bounds,+ fixedRadius: false+ };+}+export function getGeojsonLayerMetaFromArrow({dataContainer,- getGeoColumn,- getGeoField,+ geoColumn,+ geoField,chunkIndex}: {dataContainer: DataContainerInterface;- getGeoColumn: (dataContainer: DataContainerInterface) => unknown;- getGeoField: (dataContainer: DataContainerInterface) => Field | null;+ geoColumn: arrow.Vector;+ geoField: Field;chunkIndex?: number;}): GeojsonLayerMetaProps {- const geoColumn = getGeoColumn(dataContainer) as arrow.Vector;- const arrowField = getGeoField(dataContainer);-- const encoding = arrowField?.metadata?.get('ARROW:extension:name');+ const encoding = geoField?.metadata?.get('ARROW:extension:name');const options: BinaryGeometriesFromArrowOptions = {...(chunkIndex !== undefined && chunkIndex >= 0? {@@ -61,6 +164,12 @@ export function getGeojsonLayerMetaFromArrow({triangulate: true,calculateMeanCenters: true};++ // getBinaryGeometriesFromArrow doesn't support geoarrow.wkb+ if (encoding === EXTENSION_NAME.WKB) {+ return getBinaryGeometriesFromWKBArrow(geoColumn, options);+ }+// create binary data from arrow data for GeoJsonLayerconst {binaryGeometries, featureTypes, bounds, meanCenters} = getBinaryGeometriesFromArrow(// @ts-ignore@@ -140,3 +249,159 @@ export function getColumnModeRequiredColumns(): string[] | undefined {return supportedColumnModes?.find(({key}) => key === columnMode)?.requiredColumns;}++/**+ * Returns geoarrow fields with ARROW:extension:name POINT metadata+ * @param fields Any fields+ * @returns geoarrow fields with ARROW:extension:name POINT metadata+ */+export function getGeoArrowPointFields(fields: Field[]): Field[] {+ return fields.filter(field => {+ return (+ field.type === 'geoarrow' &&+ field.metadata?.get('ARROW:extension:name') === EXTENSION_NAME.POINT+ );+ });+}++/**+ * Builds an arrow vector compatible with ARROW:extension:name geoarrow.point.+ * @param getPosition Position accessor.+ * @param numElements Number of elements in the vector.+ * @returns An arrow vector compatible with ARROW:extension:name geoarrow.point.+ */+export function createGeoArrowPointVector(+ dataContainer: ArrowDataContainer,+ getPosition: ({index: number}) => number[]+): arrow.Vector {+ // TODO update/resize existing vector?+ // TODO find an easier way to create point geo columns+ // in a correct arrow format, as this approach seems too excessive for just a simple interleaved buffer.++ const numElements = dataContainer.numRows();+ const table = dataContainer.getTable();++ const numCoords = numElements > 0 ? getPosition({index: 0}).length : 2;+ const precision = 2;++ const metadata = new Map();+ metadata.set('ARROW:extension:name', EXTENSION_NAME.POINT);++ const childField = new arrow.Field('xyz', new arrow.Float(precision), false, metadata);+ const fixedSizeList = new arrow.FixedSizeList(numCoords, childField);+ const floatBuilder = new arrow.FloatBuilder({type: new arrow.Float(precision)});+ const fixedSizeListBuilder = new arrow.FixedSizeListBuilder({type: fixedSizeList});+ fixedSizeListBuilder.addChild(floatBuilder);++ const assembledBatches: arrow.Data[] = [];+ const indexData = {index: 0};+ for (let batchIndex = 0; batchIndex < table.batches.length; ++batchIndex) {+ const numRowsInBatch = table.batches[batchIndex].numRows;++ for (let i = 0; i < numRowsInBatch; ++i) {+ const pos = getPosition(indexData);+ fixedSizeListBuilder.append(pos);++ ++indexData.index;+ }+ assembledBatches.push(fixedSizeListBuilder.flush());+ }++ return arrow.makeVector(assembledBatches);+}++/**+ * Builds a filtered index suitable for FilterArrowExtension.+ * @param numElements Size for filtered index array.+ * @param visibleIndices An array with indices of elements that aren't filtered out.+ * @returns filteredIndex [0|1] array for GPU filtering+ */+export function getFilteredIndex(+ numElements: number,+ visibleIndices: number[],+ existingFilteredIndex: Uint8ClampedArray | null+) {+ // contents are initialized with zeros by default, meaning not visible+ let filteredIndex =+ existingFilteredIndex && existingFilteredIndex.length === numElements+ ? existingFilteredIndex+ : new Uint8ClampedArray(numElements);+ filteredIndex.fill(0);++ if (visibleIndices) {+ for (let i = 0; i < visibleIndices.length; ++i) {+ filteredIndex[visibleIndices[i]] = 1;+ }+ }+ return filteredIndex;+}++/**+ * Returns an array of neighbors to the specified index.+ * @param neighborsField LayerColumn field with information about neighbors.+ * @param dataContainer Data container.+ * @param index Index of interest.+ * @param getPosition Position accessor.+ * @returns An array with information about neighbors.+ */+export function getNeighbors(+ neighborsField: LayerColumn | undefined,+ dataContainer: DataContainerInterface,+ index: number,+ getPosition: ({index: number}) => number[]+): {index: number; position: number[]}[] {+ if (!neighborsField || neighborsField.fieldIdx < 0) return [];++ let neighborIndices = dataContainer.valueAt(index, neighborsField.fieldIdx);+ // In case of arrow column with an array of indices.+ if (neighborIndices.toArray) {+ neighborIndices = Array.from(neighborIndices.toArray());+ }+ if (!Array.isArray(neighborIndices)) return [];++ // find neighbor+ const neighborsData = neighborIndices.map(idx => ({+ index: idx,+ position: getPosition({index: idx})+ }));++ return neighborsData;+}++/**+ * Returns bounds from a geoarrow field.+ * TODO: refactor once metadata extraction from parquet to arrow vectors is in place.+ * @param layerColumn Layer columns for which to check for a bounding box.+ * @param dataContainer Data container with geoarrow metadata.+ * @returns Returns bounding box if exists.+ */+export function getBoundsFromArrowMetadata(+ layerColumn: LayerColumn,+ dataContainer: ArrowDataContainer+): [number, number, number, number] | false {+ try {+ const field = dataContainer.getField(layerColumn.fieldIdx);+ const table = dataContainer.getTable();++ const geoMetadata = getGeoMetadata({+ metadata: {+ // @ts-expect-error+ geo: table.schema.metadata.get('geo')+ }+ });++ if (geoMetadata) {+ const fieldMetadata = geoMetadata.columns[field.name];+ if (fieldMetadata) {+ const boundsFromMetadata = fieldMetadata['bbox'];+ if (Array.isArray(boundsFromMetadata) && boundsFromMetadata.length === 4) {+ return boundsFromMetadata;+ }+ }+ }+ } catch (error) {+ // ignore for now+ }++ return false;+}diff --git a/src/layers/src/line-layer/line-layer.ts b/src/layers/src/line-layer/line-layer.tsindex 102027770..804b5783a 100644--- a/src/layers/src/line-layer/line-layer.ts+++ b/src/layers/src/line-layer/line-layer.ts@@ -3,6 +3,8 @@import {BrushingExtension} from '@deck.gl/extensions';+import {GeoArrowArcLayer} from '@kepler.gl/deckgl-arrow-layers';+import {FilterArrowExtension} from '@kepler.gl/deckgl-layers';import {EnhancedLineLayer} from '@kepler.gl/deckgl-layers';import LineLayerIcon from './line-layer-icon';import ArcLayer, {ArcLayerConfig} from '../arc-layer/arc-layer';@@ -42,6 +44,10 @@ export type LineLayerColumnsConfig = {lng: LayerColumn;alt: LayerColumn;neighbors: LayerColumn;++ // COLUMN_MODE_GEOARROW+ geoarrow0: LayerColumn;+ geoarrow1: LayerColumn;};export type LineLayerVisConfig = {@@ -67,6 +73,7 @@ export const lineRequiredColumns: ['lat0', 'lng0', 'lat1', 'lng1'] = [export const lineOptionalColumns: ['alt0', 'alt1'] = ['alt0', 'alt1'];export const neighborRequiredColumns = ['lat', 'lng', 'neighbors'];export const neighborOptionalColumns = ['alt'];+export const geoarrowRequiredColumns = ['geoarrow0', 'geoarrow1'];export const lineColumnLabels = {lat0: 'arc.lat0',@@ -98,6 +105,7 @@ export const lineVisConfigs: {export const COLUMN_MODE_POINTS = 'points';export const COLUMN_MODE_NEIGHBORS = 'neighbors';+export const COLUMN_MODE_GEOARROW = 'geoarrow';const SUPPORTED_COLUMN_MODES = [{key: COLUMN_MODE_POINTS,@@ -110,28 +118,59 @@ const SUPPORTED_COLUMN_MODES = [label: 'Point and Neighbors',requiredColumns: neighborRequiredColumns,optionalColumns: neighborOptionalColumns+ },+ {+ key: COLUMN_MODE_GEOARROW,+ label: 'Geoarrow Points',+ requiredColumns: geoarrowRequiredColumns}];-// const DEFAULT_COLUMN_MODE = COLUMN_MODE_POINTS;++const brushingExtension = new BrushingExtension();+const arrowCPUFilterExtension = new FilterArrowExtension();export const linePosAccessor =- ({lat0, lng0, lat1, lng1, alt0, alt1, lat, lng, alt}: LineLayerColumnsConfig, columnMode) =>+ (+ {+ lat0,+ lng0,+ lat1,+ lng1,+ alt0,+ alt1,+ lat,+ lng,+ alt,+ geoarrow0,+ geoarrow1+ }: LineLayerColumnsConfig,+ columnMode+ ) =>(dc: DataContainerInterface) => {- return columnMode === COLUMN_MODE_POINTS- ? d => [+ switch (columnMode) {+ case COLUMN_MODE_GEOARROW:+ return d => {+ const start = dc.valueAt(d.index, geoarrow0.fieldIdx);+ const end = dc.valueAt(d.index, geoarrow1.fieldIdx);+ return [start.get(0), start.get(1), 0, end.get(2), end.get(3), 0];+ };+ case COLUMN_MODE_NEIGHBORS:+ return d => [+ dc.valueAt(d.index, lng.fieldIdx),+ dc.valueAt(d.index, lat.fieldIdx),+ alt?.fieldIdx > -1 ? dc.valueAt(d.index, alt.fieldIdx) : 0+ ];+ default:+ // COLUMN_MODE_POINTS+ return d => [dc.valueAt(d.index, lng0.fieldIdx),dc.valueAt(d.index, lat0.fieldIdx),alt0 && alt0.fieldIdx > -1 ? dc.valueAt(d.index, alt0.fieldIdx) : 0,dc.valueAt(d.index, lng1.fieldIdx),dc.valueAt(d.index, lat1.fieldIdx),alt1 && alt1?.fieldIdx > -1 ? dc.valueAt(d.index, alt1.fieldIdx) : 0- ]- : // only return source point if columnMode is COLUMN_MODE_NEIGHBORS- d => [- dc.valueAt(d.index, lng.fieldIdx),- dc.valueAt(d.index, lat.fieldIdx),- alt?.fieldIdx > -1 ? dc.valueAt(d.index, alt.fieldIdx) : 0];+ }};export default class LineLayer extends ArcLayer {@@ -177,7 +216,9 @@ export default class LineLayer extends ArcLayer {};}- static findDefaultLayerProps({fieldPairs = []}: KeplerTable) {+ static findDefaultLayerProps({fields, fieldPairs = []}: KeplerTable): {+ props: {color?: RGBColor; columns: LineLayerColumnsConfig; label: string}[];+ } {if (fieldPairs.length < 2) {return {props: []};}@@ -200,7 +241,9 @@ export default class LineLayer extends ArcLayer {lat: {...defaultAltColumn},lng: {...defaultAltColumn},alt: {...defaultAltColumn},- neighbors: {...defaultAltColumn}+ neighbors: {...defaultAltColumn},+ geoarrow0: {...defaultAltColumn},+ geoarrow1: {...defaultAltColumn}},label: `${fieldPairs[0].defaultName} -> ${fieldPairs[1].defaultName} line`,isVisible: false@@ -210,7 +253,7 @@ export default class LineLayer extends ArcLayer {}renderLayer(opts) {- const {data, gpuFilter, objectHovered, interactionConfig} = opts;+ const {data, gpuFilter, objectHovered, interactionConfig, dataset} = opts;const layerProps = {widthScale: this.config.visConfig.thickness * PROJECTED_PIXEL_SIZE_MULTIPLIER,@@ -220,20 +263,46 @@ export default class LineLayer extends ArcLayer {const updateTriggers = {getPosition: this.config.columns,getFilterValue: gpuFilter.filterValueUpdateTriggers,+ getFiltered: this.filteredIndexTrigger,...this.getVisualChannelUpdateTriggers()};const defaultLayerProps = this.getDefaultDeckLayerProps(opts);const hoveredObject = this.hasHoveredObject(objectHovered);+ const useArrowLayer = Boolean(this.geoArrowVector0);++ let LineLayerClass: typeof EnhancedLineLayer | typeof GeoArrowArcLayer = EnhancedLineLayer;+ let deckLayerData = data.data;+ let getSourcePosition = data.getPosition;+ let getTargetPosition = data.getPosition;+ if (useArrowLayer) {+ LineLayerClass = GeoArrowArcLayer;+ deckLayerData = dataset.dataContainer.getTable();+ getSourcePosition = this.geoArrowVector0;+ getTargetPosition = this.geoArrowVector1;+ }+return [// base layer- new EnhancedLineLayer({+ new LineLayerClass({...defaultLayerProps,...this.getBrushingExtensionProps(interactionConfig, 'source_target'),...data,+ data: deckLayerData,+ getSourcePosition,+ getTargetPosition,...layerProps,updateTriggers,- extensions: [...defaultLayerProps.extensions, new BrushingExtension()]+ extensions: [+ ...defaultLayerProps.extensions,+ brushingExtension,+ ...(useArrowLayer ? [arrowCPUFilterExtension] : [])+ ],+ _subLayerProps: {+ 'geo-arrow-arc-layer': {+ type: EnhancedLineLayer+ }+ }}),// hover layer...(hoveredObjectdiff --git a/src/layers/src/mapboxgl-layer.ts b/src/layers/src/mapboxgl-layer.tsindex cd4f33c89..5e6e6ccc3 100644--- a/src/layers/src/mapboxgl-layer.ts+++ b/src/layers/src/mapboxgl-layer.ts@@ -11,14 +11,25 @@ import {Merge, LayerColumn} from '@kepler.gl/types';type MapboxLayerGLColumns = {lat: LayerColumn;lng: LayerColumn;++ // COLUMN_MODE_GEOARROW+ geoarrow?: LayerColumn;};export type MapboxLayerGLConfig = Merge<LayerBaseConfig, {columns: MapboxLayerGLColumns}>;-export const mapboxRequiredColumns: ['lat', 'lng'] = ['lat', 'lng'];+export const COLUMN_MODE_POINTS = 'points';+export const mapboxRequiredColumns = ['lat', 'lng'];+const SUPPORTED_COLUMN_MODES = [+ {+ key: COLUMN_MODE_POINTS,+ label: 'Points',+ requiredColumns: mapboxRequiredColumns+ }+];-export const pointColResolver = ({lat, lng}: MapboxLayerGLColumns) =>- `${lat.fieldIdx}-${lng.fieldIdx}`;+export const pointColResolver = ({lat, lng, geoarrow}: MapboxLayerGLColumns, columnMode?: string) =>+ `${columnMode}-${lat.fieldIdx}-${lng.fieldIdx}-${geoarrow?.fieldIdx}`;class MapboxLayerGL extends Layer {declare config: MapboxLayerGLConfig;@@ -35,8 +46,8 @@ class MapboxLayerGL extends Layer {return true;}- get requiredLayerColumns() {- return mapboxRequiredColumns;+ get supportedColumnModes() {+ return SUPPORTED_COLUMN_MODES;}get columnPairs() {@@ -53,7 +64,8 @@ class MapboxLayerGL extends Layer {datasetSelector = (config: MapboxLayerGLConfig) => config.dataId;gpuFilterSelector = (config: MapboxLayerGLConfig, datasets) =>((config.dataId && datasets[config.dataId]) || {}).gpuFilter;- columnsSelector = (config: MapboxLayerGLConfig) => pointColResolver(config.columns);+ columnsSelector = (config: MapboxLayerGLConfig) =>+ pointColResolver(config.columns, config.columnMode);sourceSelector = createSelector(this.datasetSelector,diff --git a/src/layers/src/point-layer/point-layer.ts b/src/layers/src/point-layer/point-layer.tsindex d765cc826..b03a5a645 100644--- a/src/layers/src/point-layer/point-layer.ts+++ b/src/layers/src/point-layer/point-layer.ts@@ -1,9 +1,14 @@// SPDX-License-Identifier: MIT// Copyright contributors to the kepler.gl project+import * as arrow from 'apache-arrow';+import {BrushingExtension} from '@deck.gl/extensions';import {ScatterplotLayer} from '@deck.gl/layers';+import {GeoArrowScatterplotLayer} from '@kepler.gl/deckgl-arrow-layers';+import {FilterArrowExtension} from '@kepler.gl/deckgl-layers';+import Layer, {LayerBaseConfig,LayerBaseConfigPartial,@@ -11,7 +16,12 @@ import Layer, {LayerSizeConfig,LayerStrokeColorConfig} from '../base-layer';-import {hexToRgb, findDefaultColorField, DataContainerInterface} from '@kepler.gl/utils';+import {+ hexToRgb,+ findDefaultColorField,+ DataContainerInterface,+ ArrowDataContainer+} from '@kepler.gl/utils';import {default as KeplerTable} from '@kepler.gl/table';import PointLayerIcon from './point-layer-icon';import {@@ -22,7 +32,14 @@ import {} from '@kepler.gl/constants';import {getTextOffsetByRadius, formatTextLabelData} from '../layer-text-label';-import {assignPointPairToLayerColumn} from '../layer-utils';+import {+ assignPointPairToLayerColumn,+ isLayerHoveredFromArrow,+ getBoundsFromArrowMetadata,+ createGeoArrowPointVector,+ getFilteredIndex,+ getNeighbors+} from '../layer-utils';import {getGeojsonPointDataMaps, GeojsonPointDataMaps} from '../geojson-layer/geojson-utils';import {Merge,@@ -32,7 +49,9 @@ import {VisConfigColorSelect,VisConfigNumber,VisConfigRange,- LayerColumn+ LayerColumn,+ Field,+ AnimationConfig} from '@kepler.gl/types';export type PointLayerVisConfigSettings = {@@ -54,6 +73,7 @@ export type PointLayerColumnsConfig = {altitude?: LayerColumn;neighbors?: LayerColumn;geojson: LayerColumn;+ geoarrow: LayerColumn;};export type PointLayerVisConfig = {@@ -102,12 +122,22 @@ export const geojsonPosAccessor =d =>d[geojson.fieldIdx];+export const geoarrowPosAccessor =+ ({geoarrow}: PointLayerColumnsConfig) =>+ (dataContainer: DataContainerInterface) =>+ (d: {index: number}) => {+ const row = dataContainer.valueAt(d.index, geoarrow.fieldIdx);+ return [row.get(0), row.get(1), 0];+ };+export const COLUMN_MODE_POINTS = 'points';export const COLUMN_MODE_GEOJSON = 'geojson';+export const COLUMN_MODE_GEOARROW = 'geoarrow';export const pointRequiredColumns: ['lat', 'lng'] = ['lat', 'lng'];export const pointOptionalColumns: ['altitude', 'neighbors'] = ['altitude', 'neighbors'];export const geojsonRequiredColumns: ['geojson'] = ['geojson'];+export const geoarrowRequiredColumns: ['geoarrow'] = ['geoarrow'];const SUPPORTED_COLUMN_MODES = [{@@ -120,13 +150,19 @@ const SUPPORTED_COLUMN_MODES = [key: COLUMN_MODE_GEOJSON,label: 'GeoJSON Feature',requiredColumns: geojsonRequiredColumns+ },+ {+ key: COLUMN_MODE_GEOARROW,+ label: 'Geoarrow Points',+ requiredColumns: geoarrowRequiredColumns}];const DEFAULT_COLUMN_MODE = COLUMN_MODE_POINTS;const brushingExtension = new BrushingExtension();+const arrowCPUFilterExtension = new FilterArrowExtension();-function pushPointPosition(data: any[], pos: number[], index: number, neighbors: number[]) {+function pushPointPosition(data: any[], pos: number[], index: number, neighbors?: number[]) {if (pos.every(Number.isFinite)) {data.push({position: pos,@@ -180,14 +216,33 @@ export default class PointLayer extends Layer {declare visConfigSettings: PointLayerVisConfigSettings;dataToFeature: GeojsonPointDataMaps = [];+ dataContainer: DataContainerInterface | null = null;+ geoArrowVector: arrow.Vector | undefined = undefined;++ /*+ * CPU filtering an arrow table by values and assembling a partial copy of the raw table is expensive+ * so we will use filteredIndex to create an attribute e.g. filteredIndex [0|1] for GPU filtering+ * in deck.gl layer, see: FilterArrowExtension in @kepler.gl/deckgl-layers.+ * Note that this approach can create visible lags in case of a lot of discarted geometry.+ */+ filteredIndex: Uint8ClampedArray | null = null;+ filteredIndexTrigger: number[] = [];+constructor(props) {super(props);this.registerVisConfig(pointVisConfigs);- this.getPositionAccessor = (dataContainer: DataContainerInterface) =>- this.config.columnMode === COLUMN_MODE_POINTS- ? pointPosAccessor(this.config.columns)(dataContainer)- : geojsonPosAccessor(this.config.columns);+ this.getPositionAccessor = (dataContainer: DataContainerInterface) => {+ switch (this.config.columnMode) {+ case COLUMN_MODE_GEOARROW:+ return geoarrowPosAccessor(this.config.columns)(dataContainer);+ case COLUMN_MODE_GEOJSON:+ return geojsonPosAccessor(this.config.columns);+ default:+ // COLUMN_MODE_POINTS+ return pointPosAccessor(this.config.columns)(dataContainer);+ }+ };}get type(): 'point' {@@ -319,6 +374,35 @@ export default class PointLayer extends Layer {}calculateDataAttribute({filteredIndex, dataContainer}: KeplerTable, getPosition) {+ const {columnMode} = this.config;++ // 1) COLUMN_MODE_GEOARROW - when we have a geoarrow point column+ // 2) COLUMN_MODE_POINTS + ArrowDataContainer > create geoarrow point column on the fly+ if (+ dataContainer instanceof ArrowDataContainer &&+ (columnMode === COLUMN_MODE_GEOARROW || columnMode === COLUMN_MODE_POINTS)+ ) {+ this.filteredIndex = getFilteredIndex(+ dataContainer.numRows(),+ filteredIndex,+ this.filteredIndex+ );+ this.filteredIndexTrigger = filteredIndex;++ if (this.config.columnMode === COLUMN_MODE_GEOARROW) {+ this.geoArrowVector = dataContainer.getColumn(this.config.columns.geoarrow.fieldIdx);+ } else {+ // generate a column compatible with geoarrow point+ this.geoArrowVector = createGeoArrowPointVector(dataContainer, getPosition);+ }++ return dataContainer.getTable();+ }++ // we don't need these in non-Arrow modes atm.+ this.geoArrowVector = undefined;+ this.filteredIndex = null;+const data: PointLayerData[] = [];for (let i = 0; i < filteredIndex.length; i++) {@@ -338,15 +422,15 @@ export default class PointLayer extends Layer {// deck.gl can't handle position = nullpushPointPosition(data, pos, index, neighbors);} else {- // point from geojson coordinates+ // COLUMN_MODE_GEOJSON mode - point from geojson coordinatesconst coordinates = this.dataToFeature[i];// if multi pointsif (coordinates && Array.isArray(coordinates[0])) {coordinates.forEach(coord => {- pushPointPosition(data, coord, index, neighbors);+ pushPointPosition(data, coord, index);});} else if (coordinates && Number.isFinite(coordinates[0])) {- pushPointPosition(data, coordinates as number[], index, neighbors);+ pushPointPosition(data, coordinates as number[], index);}}}@@ -369,15 +453,21 @@ export default class PointLayer extends Layer {triggerChanged,oldLayerData,data,- dataContainer+ dataContainer,+ filteredIndex: this.filteredIndex});const accessors = this.getAttributeAccessors({dataContainer});+ const isFilteredAccessor = (data: {index: number}) => {+ return this.filteredIndex ? this.filteredIndex[data.index] : 1;+ };+return {data,getPosition,getFilterValue: gpuFilter.filterValueAccessor(dataContainer)(),+ getFiltered: isFilteredAccessor,textLabels,...accessors};@@ -385,9 +475,23 @@ export default class PointLayer extends Layer {/* eslint-enable complexity */updateLayerMeta(dataContainer) {+ this.dataContainer = dataContainer;+if (this.config.columnMode === COLUMN_MODE_GEOJSON) {const getFeature = this.getPositionAccessor();this.dataToFeature = getGeojsonPointDataMaps(dataContainer, getFeature);+ } else if (this.config.columnMode === COLUMN_MODE_GEOARROW) {+ const boundsFromMetadata = getBoundsFromArrowMetadata(+ this.config.columns.geoarrow,+ dataContainer+ );+ if (boundsFromMetadata) {+ this.updateMeta({bounds: boundsFromMetadata});+ } else {+ const getPosition = this.getPositionAccessor(dataContainer);+ const bounds = this.getPointsBounds(dataContainer, getPosition);+ this.updateMeta({bounds});+ }} else {const getPosition = this.getPositionAccessor(dataContainer);const bounds = this.getPointsBounds(dataContainer, getPosition);@@ -415,13 +519,20 @@ export default class PointLayer extends Layer {const updateTriggers = {getPosition: this.config.columns,getFilterValue: gpuFilter.filterValueUpdateTriggers,+ getFiltered: this.filteredIndexTrigger,...this.getVisualChannelUpdateTriggers()};+ const useArrowLayer = Boolean(this.geoArrowVector);+const defaultLayerProps = this.getDefaultDeckLayerProps(opts);const brushingProps = this.getBrushingExtensionProps(interactionConfig);const getPixelOffset = getTextOffsetByRadius(radiusScale, data.getRadius, mapState);- const extensions = [...defaultLayerProps.extensions, brushingExtension];+ const extensions = [+ ...defaultLayerProps.extensions,+ brushingExtension,+ ...(useArrowLayer ? [arrowCPUFilterExtension] : [])+ ];const sharedProps = {getFilterValue: data.getFilterValue,@@ -432,26 +543,36 @@ export default class PointLayer extends Layer {};const hoveredObject = this.hasHoveredObject(objectHovered);const {showNeighborOnHover, allowHover} = this.config.visConfig;- let neighborsData = [];+ let neighborsData: ReturnType<typeof getNeighbors> = [];if (allowHover && showNeighborOnHover && hoveredObject) {- // find neighbor- neighborsData = (hoveredObject.neighbors || [])- .map(idx => ({- // TODO do we really need to pass data here?- data: dataset.dataContainer.rowAsArray(idx),- // position: pos,- // index is important for filter- index: idx- }))- .filter(d => d.data);+ // find neighbors+ neighborsData = getNeighbors(+ this.config.columns.neighbors,+ dataset.dataContainer,+ hoveredObject.index,+ this.getPositionAccessor(dataset.dataContainer)+ );+ }++ let ScatterplotLayerClass: typeof ScatterplotLayer | typeof GeoArrowScatterplotLayer =+ ScatterplotLayer;+ let deckLayerData = data.data;+ let getPosition = data.getPosition;+ if (useArrowLayer) {+ ScatterplotLayerClass = GeoArrowScatterplotLayer;+ deckLayerData = dataset.dataContainer.getTable();+ getPosition = this.geoArrowVector;}return [- new ScatterplotLayer({+ // @ts-expect-error+ new ScatterplotLayerClass({...defaultLayerProps,...brushingProps,...layerProps,...data,+ data: deckLayerData,+ getPosition,parameters: {// circles will be flat on the map when the altitude column is not useddepthTest: (this.config.columns.altitude?.fieldIdx as number) > -1@@ -485,13 +606,52 @@ export default class PointLayer extends Layer {// text label layer...this.renderTextLabelLayer({- getPosition: data.getPosition,+ getPosition,sharedProps,getPixelOffset,- updateTriggers+ updateTriggers,+ getFiltered: data.getFiltered},- opts+ Boolean(this.geoArrowVector)+ ? {+ ...opts,+ data: {...opts.data, getPosition}+ }+ : opts)];}++ hasHoveredObject(objectInfo: {index: number}) {+ if (+ isLayerHoveredFromArrow(objectInfo, this.id) &&+ objectInfo.index >= 0 &&+ this.dataContainer+ ) {+ return {+ index: objectInfo.index,+ position: this.getPositionAccessor(this.dataContainer)(objectInfo)+ };+ }++ return super.hasHoveredObject(objectInfo);+ }++ getHoverData(+ object: {index: number} | arrow.StructRow | undefined,+ dataContainer: DataContainerInterface,+ fields: Field[],+ animationConfig: AnimationConfig,+ hoverInfo: {index: number}+ ) {+ // for arrow format, `object` is the Arrow row object Proxy,+ // and index is passed in `hoverInfo`.+ const index = Boolean(this.geoArrowVector)+ ? hoverInfo?.index+ : (object as {index: number}).index;+ if (index >= 0) {+ return dataContainer.row(index);+ }+ return null;+ }}diff --git a/src/localization/src/translations/en.ts b/src/localization/src/translations/en.tsindex 2e0068d0c..d8378afac 100644--- a/src/localization/src/translations/en.ts+++ b/src/localization/src/translations/en.ts@@ -539,6 +539,9 @@ ${'```'}timestamp: 'time',icon: 'icon',geojson: 'geojson',+ geoarrow: 'geoarrow',+ geoarrow0: 'geoarrow source',+ geoarrow1: 'geoarrow target',token: 'token',sortBy: 'sort by',neighbors: 'neighbors',diff --git a/src/processors/package.json b/src/processors/package.jsonindex 0190f9db4..742e3d4f0 100644--- a/src/processors/package.json+++ b/src/processors/package.json@@ -35,11 +35,13 @@"@kepler.gl/schemas": "3.0.0","@kepler.gl/types": "3.0.0","@kepler.gl/utils": "3.0.0",- "@loaders.gl/arrow": "^4.1.1",- "@loaders.gl/core": "^4.1.1",- "@loaders.gl/csv": "^4.1.1",- "@loaders.gl/json": "^4.1.1",- "@loaders.gl/loader-utils": "^4.1.1",+ "@loaders.gl/arrow": "^4.3.2",+ "@loaders.gl/core": "^4.3.2",+ "@loaders.gl/csv": "^4.3.2",+ "@loaders.gl/gis": "^4.3.2",+ "@loaders.gl/json": "^4.3.2",+ "@loaders.gl/loader-utils": "^4.3.2",+ "@loaders.gl/parquet": "^4.3.2","@mapbox/geojson-normalize": "0.0.1","@nebula.gl/edit-modes": "1.0.2-alpha.1","@turf/helpers": "^6.1.4",diff --git a/src/processors/src/data-processor.ts b/src/processors/src/data-processor.tsindex 4a7f422da..80e5fbee8 100644--- a/src/processors/src/data-processor.ts+++ b/src/processors/src/data-processor.ts@@ -421,6 +421,7 @@ export function processArrowBatches(arrowBatches: arrow.RecordBatch[]): Processo});const cols = [...Array(arrowTable.numCols).keys()].map(i => arrowTable.getChildAt(i));+// return empty rows and use raw arrow table to construct column-wise data containerreturn {fields, rows: [], cols, metadata: arrowTable.schema.metadata};}diff --git a/src/processors/src/file-handler.ts b/src/processors/src/file-handler.tsindex 7aa2d3a8e..ac3a75cf8 100644--- a/src/processors/src/file-handler.ts+++ b/src/processors/src/file-handler.ts@@ -5,7 +5,8 @@ import * as arrow from 'apache-arrow';import {parseInBatches} from '@loaders.gl/core';import {JSONLoader, _JSONPath} from '@loaders.gl/json';import {CSVLoader} from '@loaders.gl/csv';-import {ArrowLoader} from '@loaders.gl/arrow';+import {GeoArrowLoader} from '@loaders.gl/arrow';+import {ParquetWasmLoader} from '@loaders.gl/parquet';import {Loader} from '@loaders.gl/loader-utils';import {generateHashId, isPlainObject, generateHashIdFromString} from '@kepler.gl/utils';import {DATASET_FORMATS} from '@kepler.gl/constants';@@ -38,6 +39,10 @@ const ARROW_LOADER_OPTIONS = {batchDebounceMs: 10 // time to delay between batches, for incremental loading};+const PARQUET_LOADER_OPTIONS = {+ shape: 'arrow-table'+};+const JSON_LOADER_OPTIONS = {shape: 'object-row-table',// instruct loaders.gl on what json paths to stream@@ -72,7 +77,7 @@ export function isArrowTable(table: any): table is arrow.Table {* @returns {boolean} - true if data is an ArrowData object type guarded*/export function isArrowData(data: any): boolean {- return Array.isArray(data) && Boolean(data[0].data && data[0].schema);+ return Array.isArray(data) && Boolean(data.length && data[0].data && data[0].schema);}export function isGeoJson(json: unknown): json is Feature | FeatureCollection {@@ -179,11 +184,12 @@ export async function readFileInBatches({loaders: Loader[];loadOptions: any;}): Promise<AsyncGenerator> {- loaders = [JSONLoader, CSVLoader, ArrowLoader, ...loaders];+ loaders = [JSONLoader, CSVLoader, GeoArrowLoader, ParquetWasmLoader, ...loaders];loadOptions = {csv: CSV_LOADER_OPTIONS,arrow: ARROW_LOADER_OPTIONS,json: JSON_LOADER_OPTIONS,+ parquet: PARQUET_LOADER_OPTIONS,metadata: true,...loadOptions};diff --git a/src/reducers/package.json b/src/reducers/package.jsonindex 254404053..4bdc4c66a 100644--- a/src/reducers/package.json+++ b/src/reducers/package.json@@ -33,6 +33,7 @@"@kepler.gl/actions": "3.0.0","@kepler.gl/cloud-providers": "3.0.0","@kepler.gl/constants": "3.0.0",+ "@kepler.gl/deckgl-arrow-layers": "3.0.0","@kepler.gl/deckgl-layers": "3.0.0","@kepler.gl/effects": "3.0.0","@kepler.gl/layers": "3.0.0",@@ -43,7 +44,7 @@"@kepler.gl/tasks": "3.0.0","@kepler.gl/types": "3.0.0","@kepler.gl/utils": "3.0.0",- "@loaders.gl/loader-utils": "^4.1.1",+ "@loaders.gl/loader-utils": "^4.3.2","@turf/bbox": "^6.0.1","@types/lodash.clonedeep": "^4.5.7","@types/lodash.flattendeep": "^4.4.7",diff --git a/src/reducers/src/layer-utils.ts b/src/reducers/src/layer-utils.tsindex 8ff36012c..ceed13300 100644--- a/src/reducers/src/layer-utils.ts+++ b/src/reducers/src/layer-utils.ts@@ -191,7 +191,8 @@ export function getLayerHoverProp({object || hoverInfo.index,dataContainer,fields,- animationConfig+ animationConfig,+ hoverInfo);if (!data) {return null;diff --git a/src/reducers/src/vis-state-selectors.ts b/src/reducers/src/vis-state-selectors.tsindex 0d9f5e8e9..25efef1dd 100644--- a/src/reducers/src/vis-state-selectors.ts+++ b/src/reducers/src/vis-state-selectors.ts@@ -4,8 +4,8 @@import {createSelector} from 'reselect';// NOTE: default formats must match file-handler-test.js-const DEFAULT_FILE_EXTENSIONS = ['csv', 'json', 'geojson', 'arrow'];-const DEFAULT_FILE_FORMATS = ['CSV', 'Json', 'GeoJSON', 'Arrow'];+const DEFAULT_FILE_EXTENSIONS = ['csv', 'json', 'geojson', 'arrow', 'parquet'];+const DEFAULT_FILE_FORMATS = ['CSV', 'Json', 'GeoJSON', 'Arrow', 'Parquet'];export const getFileFormatNames = createSelector(state => state.loaders,diff --git a/src/schemas/package.json b/src/schemas/package.jsonindex 453a181a1..e675ea664 100644--- a/src/schemas/package.json+++ b/src/schemas/package.json@@ -35,7 +35,7 @@"@kepler.gl/table": "3.0.0","@kepler.gl/types": "3.0.0","@kepler.gl/utils": "3.0.0",- "@loaders.gl/loader-utils": "^4.1.1",+ "@loaders.gl/loader-utils": "^4.3.2","@types/keymirror": "^0.1.1","@types/lodash.clonedeep": "^4.5.7","@types/lodash.pick": "^4.4.6",diff --git a/src/table/src/gpu-filter-utils.ts b/src/table/src/gpu-filter-utils.tsindex ec600b799..8e4c0e2b0 100644--- a/src/table/src/gpu-filter-utils.ts+++ b/src/table/src/gpu-filter-utils.ts@@ -154,7 +154,7 @@ const getFilterValueAccessor =(channels: (Filter | undefined)[], dataId: string, fields: any[]) =>(dc: DataContainerInterface) =>(getIndex = defaultGetIndex, getData = defaultGetData) =>- d => {+ (d, objectInfo?: {index: number}) => {// for empty channel, value is 0 and min max would be [0, 0]const channelValues = channels.map(filter => {if (!filter) {@@ -164,7 +164,9 @@ const getFilterValueAccessor =const field = fields[fieldIndex];let value;- const data = getData(dc, d, fieldIndex);+ // d can be undefined when called from attribute updater from deck,+ // when data is an ArrowTable, so use objectInfo instead.+ const data = getData(dc, d || objectInfo, fieldIndex);if (typeof data === 'function') {value = data(field);} else {diff --git a/src/table/src/kepler-table.ts b/src/table/src/kepler-table.tsindex 3bb61083c..2cc19fea2 100644--- a/src/table/src/kepler-table.ts+++ b/src/table/src/kepler-table.ts@@ -62,7 +62,7 @@ export type GpuFilter = {) => (getIndex?: (any) => number,getData?: (dc_: DataContainerInterface, d: any, fieldIndex: number) => any- ) => (d: any) => (number | number[])[];+ ) => (d: any, objectInfo?: {index: number}) => (number | number[])[];};export type FilterProps =diff --git a/src/utils/src/arrow-data-container.ts b/src/utils/src/arrow-data-container.tsindex 5b5330b00..cabefa469 100644--- a/src/utils/src/arrow-data-container.ts+++ b/src/utils/src/arrow-data-container.ts@@ -49,6 +49,9 @@ export class ArrowDataContainer implements DataContainerInterface {// cache column data to make valueAt() faster// _colData: any[][];+ /** An arrow table recreated from vectors */+ _arrowTable: arrow.Table;+constructor(data: ArrowDataContainerInput) {if (!data.cols) {throw Error('ArrowDataContainer: no columns provided');@@ -64,6 +67,24 @@ export class ArrowDataContainer implements DataContainerInterface {this._fields = data.fields || [];this._numChunks = data.cols[0].data.length;// this._colData = data.cols.map(c => c.toArray());++ this._arrowTable = this._createTable();+ }++ /**+ * Restores internal Arrow table from vectors.+ * TODO: consider using original arrow table, as it could contain extra metadata, not passed to the fields.+ */+ private _createTable() {+ const creaOpts = {};+ this._fields.map((field, index) => {+ creaOpts[field.name] = this._cols[index];+ });+ return new arrow.Table(creaOpts);+ }++ getTable() {+ return this._arrowTable;}update(updateData: arrow.Vector<any>[]) {@@ -71,6 +92,9 @@ export class ArrowDataContainer implements DataContainerInterface {this._numColumns = this._cols.length;this._numRows = this._cols[0].length;this._numChunks = this._cols[0].data.length;++ this._arrowTable = this._createTable();+// cache column data to make valueAt() faster// this._colData = this._cols.map(c => c.toArray());}diff --git a/src/utils/src/data-container-interface.ts b/src/utils/src/data-container-interface.tsindex 5e544df2a..350a2f2e4 100644--- a/src/utils/src/data-container-interface.ts+++ b/src/utils/src/data-container-interface.ts@@ -84,6 +84,12 @@ export interface DataContainerInterface {*/getField?(columnIndex: number): Field;+ /**+ * Returns the underlying data object.+ * @returns Returns the underlying data object.+ */+ getTable?(): unknown;+/*** Returns contents of the data container as a two-dimensional array.* @returns Data.diff --git a/test/browser/components/side-panel/layer-configurator-test.js b/test/browser/components/side-panel/layer-configurator-test.jsindex 592aaa87e..8847dac18 100644--- a/test/browser/components/side-panel/layer-configurator-test.js+++ b/test/browser/components/side-panel/layer-configurator-test.js@@ -156,7 +156,7 @@ test('Components -> LayerConfigurator.mount -> LayerColumnConfig', t => {1,'should render 1 LayerColumnModeConfig');- t.equal(baseConfigGroup.find(LayerColumnConfig).length, 2, 'should render 2 LayerColumnConfig');+ t.equal(baseConfigGroup.find(LayerColumnConfig).length, 3, 'should render 2 LayerColumnConfig');t.equal(baseConfigGroup.find(LayerColumnConfig).at(0).find(ColumnSelector).length,@@ -221,7 +221,8 @@ test('Components -> LayerConfigurator.mount -> LayerColumnConfig', t => {},altitude: {value: null, fieldIdx: -1, optional: true},neighbors: {value: null, fieldIdx: -1, optional: true},- geojson: {value: null, fieldIdx: -1}+ geojson: {value: null, fieldIdx: -1},+ geoarrow: {value: null, fieldIdx: -1}}}],diff --git a/test/browser/layer-tests/arc-layer-specs.js b/test/browser/layer-tests/arc-layer-specs.jsindex ae4e5cd68..a8bdc4c29 100644--- a/test/browser/layer-tests/arc-layer-specs.js+++ b/test/browser/layer-tests/arc-layer-specs.js@@ -92,6 +92,7 @@ test('#ArcLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getSourceColor: () => {},getTargetColor: () => {},getWidth: () => {}@@ -160,6 +161,7 @@ test('#ArcLayer -> formatLayerData', t => {const expectedLayerData = {data: [],getFilterValue: () => {},+ getFiltered: () => {},getSourceColor: () => {},getTargetColor: () => {},getWidth: () => {}@@ -230,6 +232,7 @@ test('#ArcLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getSourceColor: () => {},getTargetColor: () => {},getWidth: () => {}@@ -313,6 +316,7 @@ test('#ArcLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getSourceColor: () => {},getTargetColor: () => {},getWidth: () => {}@@ -354,6 +358,7 @@ test('#ArcLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getSourceColor: () => {},getTargetColor: () => {},getWidth: () => {}diff --git a/test/browser/layer-tests/heatmap-layer-specs.js b/test/browser/layer-tests/heatmap-layer-specs.jsindex cfbe089e0..d8e56a35f 100644--- a/test/browser/layer-tests/heatmap-layer-specs.js+++ b/test/browser/layer-tests/heatmap-layer-specs.js@@ -54,7 +54,7 @@ test('#Heatmaplayer -> formatLayerData -> w/ GpuFilter', t => {const expectedConfig = {type: 'heatmap',id: 'heatmap-test-1',- source: `${dataId}-1-2`,+ source: `${dataId}-points-1-2--1`,layout: {visibility: 'visible'},filter: ['all', ['>=', 'gpu:utc_timestamp', 39000], ['<=', 'gpu:utc_timestamp', 552000]],paint: {@@ -110,7 +110,8 @@ test('#Heatmaplayer -> formatLayerData -> w/ GpuFilter', t => {const expectedLayerData = {columns: {lat: {value: 'lat', fieldIdx: 1},- lng: {value: 'lng', fieldIdx: 2}+ lng: {value: 'lng', fieldIdx: 2},+ geoarrow: {value: null, fieldIdx: -1}},config: expectedConfig,data: {@@ -187,7 +188,7 @@ test('#Heatmaplayer -> formatLayerData -> w/o GpuFilter', t => {const expectedConfig = {type: 'heatmap',id: 'heatmap-test-1',- source: `${testCsvDataId}-1-2`,+ source: `${testCsvDataId}-points-1-2--1`,layout: {visibility: 'visible'},paint: {'heatmap-weight': 1,@@ -237,7 +238,8 @@ test('#Heatmaplayer -> formatLayerData -> w/o GpuFilter', t => {const expectedLayerData = {columns: {lat: {value: 'gps_data.lat', fieldIdx: 1},- lng: {value: 'gps_data.lng', fieldIdx: 2}+ lng: {value: 'gps_data.lng', fieldIdx: 2},+ geoarrow: {value: null, fieldIdx: -1}},config: expectedConfig,weightField: null,diff --git a/test/browser/layer-tests/line-layer-specs.js b/test/browser/layer-tests/line-layer-specs.jsindex ab61876eb..36dbac71a 100644--- a/test/browser/layer-tests/line-layer-specs.js+++ b/test/browser/layer-tests/line-layer-specs.js@@ -87,6 +87,7 @@ test('#LineLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getColor: () => {},getTargetColor: () => {},getWidth: () => {}@@ -147,6 +148,7 @@ test('#LineLayer -> formatLayerData', t => {const expectedLayerData = {data: [],getFilterValue: () => {},+ getFiltered: () => {},getColor: () => {},getTargetColor: () => {},getWidth: () => {}@@ -212,6 +214,7 @@ test('#LineLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getColor: () => {},getTargetColor: () => {},getWidth: () => {}diff --git a/test/browser/layer-tests/point-layer-specs.js b/test/browser/layer-tests/point-layer-specs.jsindex 236022138..58598f88d 100644--- a/test/browser/layer-tests/point-layer-specs.js+++ b/test/browser/layer-tests/point-layer-specs.js@@ -124,6 +124,7 @@ test('#PointLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getFillColor: () => {},getLineColor: () => {},getRadius: () => {},@@ -234,6 +235,7 @@ test('#PointLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getLineColor: () => {},getFillColor: () => {},getRadius: () => {},@@ -326,6 +328,7 @@ test('#PointLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getLineColor: () => {},getFillColor: () => {},getRadius: () => {},@@ -409,6 +412,7 @@ test('#PointLayer -> formatLayerData', t => {}],getFilterValue: () => {},+ getFiltered: () => {},getLineColor: () => {},getFillColor: () => {},getRadius: () => {},diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.jsindex 9089b11d9..f95c02d4d 100644--- a/test/node/reducers/vis-state-test.js+++ b/test/node/reducers/vis-state-test.js@@ -898,7 +898,8 @@ test('visStateReducer -> layerDataIdChangeUpdater -> validation', t => {lat: {value: 'gps_data.lat', fieldIdx: 1},lng: {value: 'gps_data.lng', fieldIdx: 2},neighbors: {value: null, fieldIdx: -1, optional: true},- geojson: {value: null, fieldIdx: -1}+ geojson: {value: null, fieldIdx: -1},+ geoarrow: {value: null, fieldIdx: -1}},'should update point layer column');diff --git a/website/webpack.config.js b/website/webpack.config.jsindex 66b247eaf..548ab932a 100644--- a/website/webpack.config.js+++ b/website/webpack.config.js@@ -75,13 +75,23 @@ const COMMON_CONFIG = {include: /node_modules\/apache-arrow/,type: 'javascript/auto'},+ {+ test: /\.js$/,+ loader: require.resolve('@open-wc/webpack-import-meta-loader'),+ include: [/node_modules\/parquet-wasm/]+ },// for compiling @probe.gl, website build started to fail (March, 2024)// netlify builder complains loader not found for these modules (April, 2024){test: /\.(js)$/,loader: 'babel-loader',options: BABEL_CONFIG,- include: [/node_modules\/@probe.gl/, /node_modules\/@loaders.gl/, /node_modules\/@math.gl/]+ include: [+ /node_modules\/@probe.gl/,+ /node_modules\/@loaders.gl/,+ /node_modules\/@math.gl/,+ /node_modules\/@geoarrow/+ ]}]},diff --git a/yarn.lock b/yarn.lockindex 451032665..549c71623 100644--- a/yarn.lock+++ b/yarn.lock@@ -2959,7 +2959,7 @@ __metadata:languageName: unknownlinkType: soft-"@kepler.gl/deckgl-arrow-layers@workspace:src/deckgl-arrow-layers":+"@kepler.gl/deckgl-arrow-layers@npm:3.0.0, @kepler.gl/deckgl-arrow-layers@workspace:src/deckgl-arrow-layers":version: 0.0.0-use.localresolution: "@kepler.gl/deckgl-arrow-layers@workspace:src/deckgl-arrow-layers"dependencies:@@ -3031,17 +3031,19 @@ __metadata:"@deck.gl/layers": "npm:^8.9.27""@deck.gl/mesh-layers": "npm:^8.9.27""@kepler.gl/constants": "npm:3.0.0"+ "@kepler.gl/deckgl-arrow-layers": "npm:3.0.0""@kepler.gl/deckgl-layers": "npm:3.0.0""@kepler.gl/localization": "npm:3.0.0""@kepler.gl/table": "npm:3.0.0""@kepler.gl/types": "npm:3.0.0""@kepler.gl/utils": "npm:3.0.0"- "@loaders.gl/arrow": "npm:^4.1.1"- "@loaders.gl/core": "npm:^4.1.1"- "@loaders.gl/gis": "npm:^4.1.1"- "@loaders.gl/gltf": "npm:^4.1.1"- "@loaders.gl/schema": "npm:^4.1.1"- "@loaders.gl/wkt": "npm:^4.1.1"+ "@loaders.gl/arrow": "npm:^4.3.2"+ "@loaders.gl/core": "npm:^4.3.2"+ "@loaders.gl/gis": "npm:^4.3.2"+ "@loaders.gl/gltf": "npm:^4.3.2"+ "@loaders.gl/parquet": "npm:^4.3.2"+ "@loaders.gl/schema": "npm:^4.3.2"+ "@loaders.gl/wkt": "npm:^4.3.2""@luma.gl/constants": "npm:^8.5.20""@mapbox/geojson-normalize": "npm:0.0.1""@nebula.gl/edit-modes": "npm:1.0.2-alpha.1"@@ -3090,11 +3092,13 @@ __metadata:"@kepler.gl/schemas": "npm:3.0.0""@kepler.gl/types": "npm:3.0.0""@kepler.gl/utils": "npm:3.0.0"- "@loaders.gl/arrow": "npm:^4.1.1"- "@loaders.gl/core": "npm:^4.1.1"- "@loaders.gl/csv": "npm:^4.1.1"- "@loaders.gl/json": "npm:^4.1.1"- "@loaders.gl/loader-utils": "npm:^4.1.1"+ "@loaders.gl/arrow": "npm:^4.3.2"+ "@loaders.gl/core": "npm:^4.3.2"+ "@loaders.gl/csv": "npm:^4.3.2"+ "@loaders.gl/gis": "npm:^4.3.2"+ "@loaders.gl/json": "npm:^4.3.2"+ "@loaders.gl/loader-utils": "npm:^4.3.2"+ "@loaders.gl/parquet": "npm:^4.3.2""@mapbox/geojson-normalize": "npm:0.0.1""@nebula.gl/edit-modes": "npm:1.0.2-alpha.1""@turf/helpers": "npm:^6.1.4"@@ -3109,6 +3113,7 @@ __metadata:"@kepler.gl/actions": "npm:3.0.0""@kepler.gl/cloud-providers": "npm:3.0.0""@kepler.gl/constants": "npm:3.0.0"+ "@kepler.gl/deckgl-arrow-layers": "npm:3.0.0""@kepler.gl/deckgl-layers": "npm:3.0.0""@kepler.gl/effects": "npm:3.0.0""@kepler.gl/layers": "npm:3.0.0"@@ -3119,7 +3124,7 @@ __metadata:"@kepler.gl/tasks": "npm:3.0.0""@kepler.gl/types": "npm:3.0.0""@kepler.gl/utils": "npm:3.0.0"- "@loaders.gl/loader-utils": "npm:^4.1.1"+ "@loaders.gl/loader-utils": "npm:^4.3.2""@turf/bbox": "npm:^6.0.1""@types/lodash.clonedeep": "npm:^4.5.7""@types/lodash.flattendeep": "npm:^4.4.7"@@ -3155,7 +3160,7 @@ __metadata:"@kepler.gl/table": "npm:3.0.0""@kepler.gl/types": "npm:3.0.0""@kepler.gl/utils": "npm:3.0.0"- "@loaders.gl/loader-utils": "npm:^4.1.1"+ "@loaders.gl/loader-utils": "npm:^4.3.2""@types/keymirror": "npm:^0.1.1""@types/lodash.clonedeep": "npm:^4.5.7""@types/lodash.pick": "npm:^4.4.6"@@ -3283,90 +3288,146 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/arrow@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/arrow@npm:4.1.1"- dependencies:- "@loaders.gl/gis": "npm:4.1.1"- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/schema": "npm:4.1.1"- "@loaders.gl/wkt": "npm:4.1.1"- "@math.gl/polygon": "npm:4.0.0"+"@loaders.gl/arrow@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/arrow@npm:4.3.2"+ dependencies:+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/wkt": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2"+ "@math.gl/polygon": "npm:^4.1.0"apache-arrow: "npm:>= 15.0.0"- checksum: 10c0/eafdaf4a44065cc7b66b289e15d1e0a56af83e2a9235b63c6a7d5887215f68ccf7103b92ce0d6dde07c133ab05b452533625f67948f194c34150a8b9d3acecee+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/009a3cb32fbdcda3806211a4ceab8ac4037c37b93a67e8da361c23005885ae24190132cac4ca67580dfcf513a0a24642b30f23acd1df9d136505eec3475aba76languageName: nodelinkType: hard-"@loaders.gl/core@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/core@npm:4.1.1"+"@loaders.gl/bson@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/bson@npm:4.3.2"dependencies:- "@babel/runtime": "npm:^7.3.1"- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/worker-utils": "npm:4.1.1"+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@types/bson": "npm:4.2.0"+ bson: "npm:4.2.0"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/0b3a9bde4d53db3ba8918e432ff65e35e8c1f98a0b6b84d2c8da55b98055562dc09769933aeb988bdca8349c15baaba484a55790259fcc72ed54c0b076d1acd9+ languageName: node+ linkType: hard++"@loaders.gl/compression@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/compression@npm:4.3.2"+ dependencies:+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2"+ "@types/brotli": "npm:^1.3.0"+ "@types/pako": "npm:^1.0.1"+ brotli: "npm:^1.3.2"+ fflate: "npm:0.7.4"+ lz4js: "npm:^0.2.0"+ lzo-wasm: "npm:^0.0.4"+ pako: "npm:1.0.11"+ snappyjs: "npm:^0.6.1"+ zstd-codec: "npm:^0.1"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ dependenciesMeta:+ brotli:+ optional: true+ lz4js:+ optional: true+ zstd-codec:+ optional: true+ checksum: 10c0/0fa9ee1d9a57707e069b66966396999e54a23188d94f5dcd98b7409c0654c0cff396971f835d59e368b5e6e55c8517af8cc58c59bd3f7d5e22065779f0aee97a+ languageName: node+ linkType: hard++"@loaders.gl/core@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/core@npm:4.3.2"+ dependencies:+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2""@probe.gl/log": "npm:^4.0.2"- checksum: 10c0/1511ce81b19d6cb004bbb4446f62f15dd0e3b3571747ae691e928bd439792428c20456152011400a5a8f4db2b9bd8f24d9935d76ba29db1c887a51cd45590a49+ checksum: 10c0/3dbc564707996f376221e49f6ceaa53c8ce1b8026af591cbdce5c6eb87ffaeddc5e4174c0f4c4f2b589c5c586a4fa0045b6891d196ea3a6929d9a8ce1a6ae9e5languageName: nodelinkType: hard-"@loaders.gl/crypto@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/crypto@npm:4.1.1"+"@loaders.gl/crypto@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/crypto@npm:4.3.2"dependencies:- "@babel/runtime": "npm:^7.3.1"- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/worker-utils": "npm:4.1.1"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2""@types/crypto-js": "npm:^4.0.2"- checksum: 10c0/d9ef09831f5a09a9ecaf9d79654a3d32ee65f3e3d9c5b054eaa36a3492049a06f71c209dc459d9deb191ee66fa3b47a8a57e0cba66d9e00326c8796402f3694c+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/0fd54c933dc6fb4545fdfccca9173fc3c6f7324aa4ec190ac2211da31f0054dad18a101caaa469195f9f0ae6ae6e62958e14ceabf458b478f0f27c83c9892255languageName: nodelinkType: hard-"@loaders.gl/csv@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/csv@npm:4.1.1"+"@loaders.gl/csv@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/csv@npm:4.3.2"dependencies:- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/schema": "npm:4.1.1"- checksum: 10c0/292068794b2cfdb3fe4ee4e075549c4d15ea926d6fed70a1f16d04111765814778b7dac0b2a746597b2f7cff65a0a36cdadbe85b885bafd7be1c65c40df9bfd8+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ d3-dsv: "npm:^1.2.0"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/69fb75b0957b4765b0d70dfa2519aa41fcb0da428574d3ab92192db783c140acc4fa417555856456e46258bd087edbac0f9072a1e2f98f9cae1f9c2aaa616185languageName: nodelinkType: hard-"@loaders.gl/draco@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/draco@npm:4.1.1"+"@loaders.gl/draco@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/draco@npm:4.3.2"dependencies:- "@babel/runtime": "npm:^7.3.1"- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/schema": "npm:4.1.1"- "@loaders.gl/worker-utils": "npm:4.1.1"- draco3d: "npm:1.5.5"- checksum: 10c0/86491898bba61b216b9a052a036b533007ed280abb97fb1f78be950ca8719e23fbe4b5b0b3f4cf9408766cbcc86f87cb530e13697f9cafcf874bba2e5c0067ca+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2"+ draco3d: "npm:1.5.7"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/33f8b992311cd341d5ae0410a2f614c27f8a864c0bb93e3749d9845f14bab06b2262553513e135e9c2ddc390364d1de2798efed1362511b2d4225c320e175dealanguageName: nodelinkType: hard-"@loaders.gl/gis@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/gis@npm:4.1.1"+"@loaders.gl/gis@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/gis@npm:4.3.2"dependencies:- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/schema": "npm:4.1.1"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2""@mapbox/vector-tile": "npm:^1.3.1"- "@math.gl/polygon": "npm:^4.0.0"+ "@math.gl/polygon": "npm:^4.1.0"pbf: "npm:^3.2.1"- checksum: 10c0/b61a524b1317ede63b43adbce5a00271eb36803b45c01b571cfba1641ac2444a02bb2c55da2ddc7857683fe4088fcc56b4dc44c3edda3c1f5b14d58aa4c4f52c+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/b8c643bc9bddeaf3a34b6ea162a36bd7f1943898a326e441a52e6340f248e7fe1be3a031945b0fb46f004a3a0578e25cf7435d54fab5cdb92597aefc1083a43dlanguageName: nodelinkType: hard-"@loaders.gl/gltf@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/gltf@npm:4.1.1"- dependencies:- "@loaders.gl/draco": "npm:4.1.1"- "@loaders.gl/images": "npm:4.1.1"- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/textures": "npm:4.1.1"- "@math.gl/core": "npm:^4.0.0"- checksum: 10c0/78ca87552f4ffc08842c1324828a30a3421bd35b666eeb53ec1d4f44c3ffb3fef7fbe5cb0ebfcb3f69570b4f74947d5f8a964ff376c60ae3a19696890f97209f+"@loaders.gl/gltf@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/gltf@npm:4.3.2"+ dependencies:+ "@loaders.gl/draco": "npm:4.3.2"+ "@loaders.gl/images": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/textures": "npm:4.3.2"+ "@math.gl/core": "npm:^4.1.0"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/79ac51980b054ae20938f2dfde08389c007efbafe580ffcb43c2ef923cc9af92a21b46d665766a83b832aa3e39d62c27981fea03d5923bead43d94a49810dec6languageName: nodelinkType: hard@@ -3379,34 +3440,41 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/images@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/images@npm:4.1.1"+"@loaders.gl/images@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/images@npm:4.3.2"dependencies:- "@loaders.gl/loader-utils": "npm:4.1.1"- checksum: 10c0/eacd3ad9da79894e3098a221740bb339dabb5baa4bab481c02394098769e646f3fdcac746d53517527dd36ab1a3988f1eac00ef78e7a2aa17311b2be6ac5b7c9+ "@loaders.gl/loader-utils": "npm:4.3.2"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/2fc2f32880436dbf28d14b642fe2007b41372951b65248e5c5c4dd1bc631236af387b0561b4f5fb2ad85fe72852be79b26c91fa206980aa8d57465d21ba332b3languageName: nodelinkType: hard-"@loaders.gl/json@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/json@npm:4.1.1"+"@loaders.gl/json@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/json@npm:4.3.2"dependencies:- "@loaders.gl/gis": "npm:4.1.1"- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/schema": "npm:4.1.1"- checksum: 10c0/e588bb0565aa0c9ef23754974b3d7efb1289d47b77228b6c2b34850dfeb4f1c7939d095f13631161bde70b14195f639027971bbe92efbdd85e0f32233c531d64+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/10101cb63e0fc210e7a61234aff331c4f4a992eee58a88e6379a663bfd881a6e8cead9600b2fecf7500143d45063d9a082d59592246e1aab72cf15b4fa1555a9languageName: nodelinkType: hard-"@loaders.gl/loader-utils@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/loader-utils@npm:4.1.1"+"@loaders.gl/loader-utils@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/loader-utils@npm:4.3.2"dependencies:- "@babel/runtime": "npm:^7.3.1"- "@loaders.gl/worker-utils": "npm:4.1.1"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2"+ "@probe.gl/log": "npm:^4.0.2""@probe.gl/stats": "npm:^4.0.2"- checksum: 10c0/efacd848c184f4e72d87423ee913ebb9bcb6ea3d30b109635c9f330c395d1325839803fa96aac2a0592ccb2c2594e45f51ac4a48e06d2da4e2ac1a0fd06e4378+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/bbaeb362c63b760569323c50ad3a695737fdc93f5ef68c594aa35668ebb35a8332f53cd0cb74c49cc5cf026b9fad4f889c2efde0dc294a269c10c6b304ec5f0clanguageName: nodelinkType: hard@@ -3434,30 +3502,66 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/polyfills@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/polyfills@npm:4.1.1"+"@loaders.gl/parquet@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/parquet@npm:4.3.2"+ dependencies:+ "@loaders.gl/arrow": "npm:4.3.2"+ "@loaders.gl/bson": "npm:4.3.2"+ "@loaders.gl/compression": "npm:4.3.2"+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/wkt": "npm:4.3.2"+ "@probe.gl/log": "npm:^4.0.9"+ async-mutex: "npm:^0.2.2"+ base64-js: "npm:^1.3.1"+ brotli: "npm:^1.3.2"+ ieee754: "npm:^1.2.1"+ int53: "npm:^0.2.4"+ lz4js: "npm:^0.2.0"+ node-int64: "npm:^0.4.0"+ object-stream: "npm:0.0.1"+ parquet-wasm: "npm:^0.6.1"+ snappyjs: "npm:^0.6.0"+ thrift: "npm:^0.19.0"+ util: "npm:^0.12.5"+ varint: "npm:^6.0.0"+ zstd-codec: "npm:^0.1"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ apache-arrow: ">= 15.0.0"+ checksum: 10c0/5a0996df63a24a1e32b8275fa20f9cfa6018eaae55757b9a43c80f9f8e72e8728617d67c7df54c203df0a558de50ca7f3143f7f6aea4c064ab61cb1b2297335e+ languageName: node+ linkType: hard++"@loaders.gl/polyfills@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/polyfills@npm:4.3.2"dependencies:- "@babel/runtime": "npm:^7.3.1"- "@loaders.gl/crypto": "npm:4.1.1"- "@loaders.gl/loader-utils": "npm:4.1.1"+ "@loaders.gl/crypto": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"buffer: "npm:^6.0.3"get-pixels: "npm:^3.3.3"ndarray: "npm:^1.0.19"save-pixels: "npm:^2.3.6"stream-to-async-iterator: "npm:^1.0.0"through: "npm:^2.3.8"- web-streams-polyfill: "npm:^3.2.1"- checksum: 10c0/0d5c5a9f829826d8a90a6d1c3040da7d31c1e5e45398ee36c0b07f70bc12edab57455617b710fb143adcbdb6379a4674355b781b15466f7fe41de03ae2bb3076+ web-streams-polyfill: "npm:^4.0.0"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/1f89ad827ac73c8cca651ec2d77a36018205f18e8eb3d52ac2cdc08cc76453881c50db0ae6e85775c9a4bdd45b7a7ec25997c9862da61c0dde19841d1c96fad5languageName: nodelinkType: hard-"@loaders.gl/schema@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/schema@npm:4.1.1"+"@loaders.gl/schema@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/schema@npm:4.3.2"dependencies:"@types/geojson": "npm:^7946.0.7"- checksum: 10c0/69751a361ddf0bdbbf3af86efff52859be321335db8bab408e3ad5b98eac89b6687ccf45205a5a1d71ec53a71cc4d037f34d3469218503395de94ea2f7a6ad8d+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/6ba7f1b60b1c746f71a62e0dc627a13e1f7ebedb338630ce8b00972ef8c67dae614bc698be35618f4bc02c7d2536b2e686329af6076ed22ddddaf2269fc5efd1languageName: nodelinkType: hard@@ -3474,17 +3578,20 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/textures@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/textures@npm:4.1.1"- dependencies:- "@loaders.gl/images": "npm:4.1.1"- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/schema": "npm:4.1.1"- "@loaders.gl/worker-utils": "npm:4.1.1"- ktx-parse: "npm:^0.0.4"+"@loaders.gl/textures@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/textures@npm:4.3.2"+ dependencies:+ "@loaders.gl/images": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ "@loaders.gl/worker-utils": "npm:4.3.2"+ "@math.gl/types": "npm:^4.1.0"+ ktx-parse: "npm:^0.7.0"texture-compressor: "npm:^1.0.2"- checksum: 10c0/e470aadc48a6f007cf454befe81b7ed5541dae34eb3145071dd247baa84f149845f0ab02bc7a668cdea00959002bfe155455d9ba14d1372b358973928fd31ebf+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/f9a379973578533d131a51657675f2589843f16d67be9e37cfc4ce559b32e5725f6e0a2f5cda2d86e30868b8985554a5c42f2867732e56bd099a0e32d76631c2languageName: nodelinkType: hard@@ -3515,13 +3622,16 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/wkt@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/wkt@npm:4.1.1"+"@loaders.gl/wkt@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/wkt@npm:4.3.2"dependencies:- "@loaders.gl/loader-utils": "npm:4.1.1"- "@loaders.gl/schema": "npm:4.1.1"- checksum: 10c0/b4494cdd167fea06a6b29d5039d9944002dbbf88c457fee0a231a71c93125738a7466e6741059c1627b7b8c0880e466d91a7907a1313c0c76eb8b53804ac91ac+ "@loaders.gl/gis": "npm:4.3.2"+ "@loaders.gl/loader-utils": "npm:4.3.2"+ "@loaders.gl/schema": "npm:4.3.2"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/dc9809948be2dc1fa2b4da322a9c5ad63501b260c2c76ea0a694944aaddf09e6c8586e0999e4073fa039f6e801b9a6e8b3654ffa56d7e5b32a9ccebb938d9b9elanguageName: nodelinkType: hard@@ -3541,12 +3651,12 @@ __metadata:languageName: nodelinkType: hard-"@loaders.gl/worker-utils@npm:4.1.1":- version: 4.1.1- resolution: "@loaders.gl/worker-utils@npm:4.1.1"- dependencies:- "@babel/runtime": "npm:^7.3.1"- checksum: 10c0/1dc3ad62f3fe2babe7ef36f9e42efb4f95a2e5a0c604cb6d78020439b234a7271cdc591c807b34cf6e5421fb59f5ccec7c39c3ce0e6946fb1d16e888851e9c61+"@loaders.gl/worker-utils@npm:4.3.2":+ version: 4.3.2+ resolution: "@loaders.gl/worker-utils@npm:4.3.2"+ peerDependencies:+ "@loaders.gl/core": ^4.3.0+ checksum: 10c0/53a2b595f6e85786fb7233e28239dc49b52fb08278d93c85a3f01d9315dcd9404aa0d3458ec586768a43894d7ba1a32e14f10e11a8308dc1c6baed63a06bd8dalanguageName: nodelinkType: hard@@ -3868,16 +3978,6 @@ __metadata:languageName: nodelinkType: hard-"@math.gl/core@npm:4.0.0":- version: 4.0.0- resolution: "@math.gl/core@npm:4.0.0"- dependencies:- "@babel/runtime": "npm:^7.12.0"- "@math.gl/types": "npm:4.0.0"- checksum: 10c0/66cbe6d67d3f725dd31d18cd45d6ee13ad1a08e717c0c69a5acb0f10329bf7209fee643810aeb86f38997168a6ced34c6d2bf2561435d35cbf605289bc33ff58- languageName: node- linkType: hard-"@math.gl/core@npm:4.0.1, @math.gl/core@npm:^4.0.0":version: 4.0.1resolution: "@math.gl/core@npm:4.0.1"@@ -3887,6 +3987,15 @@ __metadata:languageName: nodelinkType: hard+"@math.gl/core@npm:4.1.0, @math.gl/core@npm:^4.1.0":+ version: 4.1.0+ resolution: "@math.gl/core@npm:4.1.0"+ dependencies:+ "@math.gl/types": "npm:4.1.0"+ checksum: 10c0/495934dc2be0b60cd6ff2cc16a0215608c9254919db741a0074b6b41cef9a0543c7f790eda7d529afa102d2937490608ef75fcc64c789ef2876ae750fd0ed3d6+ languageName: node+ linkType: hard+"@math.gl/culling@npm:^3.5.1, @math.gl/culling@npm:^3.6.2":version: 3.6.3resolution: "@math.gl/culling@npm:3.6.3"@@ -3909,15 +4018,6 @@ __metadata:languageName: nodelinkType: hard-"@math.gl/polygon@npm:4.0.0":- version: 4.0.0- resolution: "@math.gl/polygon@npm:4.0.0"- dependencies:- "@math.gl/core": "npm:4.0.0"- checksum: 10c0/85fd09cadb3a9f05df296e0c7c33aa166a6c06c7ac7bd6962bb5e45a0bcab4396bace78aeeb163ccbf14f5daf36d69f6087c6e600d8869a2d4ecd00f3ebdbe78- languageName: node- linkType: hard-"@math.gl/polygon@npm:^3.5.1, @math.gl/polygon@npm:^3.6.2":version: 3.6.3resolution: "@math.gl/polygon@npm:3.6.3"@@ -3936,6 +4036,15 @@ __metadata:languageName: nodelinkType: hard+"@math.gl/polygon@npm:^4.1.0":+ version: 4.1.0+ resolution: "@math.gl/polygon@npm:4.1.0"+ dependencies:+ "@math.gl/core": "npm:4.1.0"+ checksum: 10c0/0fcfb489c5613ddff6dd0cbea65084e10fa9a3523fb87a36a4fdf10057d12d2a99f1ebd93da6e72b45db0783fb8cd9cff704765473372a8db580faaf50c85ab5+ languageName: node+ linkType: hard+"@math.gl/sun@npm:^3.6.2":version: 3.6.3resolution: "@math.gl/sun@npm:3.6.3"@@ -3952,13 +4061,6 @@ __metadata:languageName: nodelinkType: hard-"@math.gl/types@npm:4.0.0":- version: 4.0.0- resolution: "@math.gl/types@npm:4.0.0"- checksum: 10c0/7a8fbda69d872a53e374cd93f4a2992bb4624af8e8b370a91c1760db5afb6082c3aa58f41ccbe0ba6bf7670d1a9291ce2a933b682e8864e9cdef395c77144c11- languageName: node- linkType: hard-"@math.gl/types@npm:4.0.1":version: 4.0.1resolution: "@math.gl/types@npm:4.0.1"@@ -3966,7 +4068,7 @@ __metadata:languageName: nodelinkType: hard-"@math.gl/types@npm:^4.0.0":+"@math.gl/types@npm:4.1.0, @math.gl/types@npm:^4.0.0, @math.gl/types@npm:^4.1.0":version: 4.1.0resolution: "@math.gl/types@npm:4.1.0"checksum: 10c0/3c4dfa5ac5c9e2cef24d31f56b89c1dde785a5d70fd1a7030386346cb7dd4fa2cce5ba983b89842c1971492e30870dd22a078d64893f9c66887e38367bf992fa@@ -4156,6 +4258,13 @@ __metadata:languageName: nodelinkType: hard+"@open-wc/webpack-import-meta-loader@npm:0.4.7":+ version: 0.4.7+ resolution: "@open-wc/webpack-import-meta-loader@npm:0.4.7"+ checksum: 10c0/17bbb7ec94ec61b851685aab559cf82d33754e910eb1334cef754c842c4950a33b61c1304088712764a38ca439af768212158d3e96e5a5e87fdbca682de931ef+ languageName: node+ linkType: hard+"@pkgjs/parseargs@npm:^0.11.0":version: 0.11.0resolution: "@pkgjs/parseargs@npm:0.11.0"@@ -4216,7 +4325,7 @@ __metadata:languageName: nodelinkType: hard-"@probe.gl/log@npm:^4.0.2":+"@probe.gl/log@npm:^4.0.2, @probe.gl/log@npm:^4.0.9":version: 4.0.9resolution: "@probe.gl/log@npm:4.0.9"dependencies:@@ -5062,6 +5171,24 @@ __metadata:languageName: nodelinkType: hard+"@types/brotli@npm:^1.3.0":+ version: 1.3.4+ resolution: "@types/brotli@npm:1.3.4"+ dependencies:+ "@types/node": "npm:*"+ checksum: 10c0/b13829301b3ee79250d3fa8b1973097837bdd040fb90c90f63f406385e62b8e06e72a41e77939c6f8118090a7c72215b0d7b4d83b1e69457616810a65a576339+ languageName: node+ linkType: hard++"@types/bson@npm:4.2.0":+ version: 4.2.0+ resolution: "@types/bson@npm:4.2.0"+ dependencies:+ bson: "npm:*"+ checksum: 10c0/06f226fa7d033badf3b0a90cd31fc720e82637b513282bf843732bdf3e8127a81dd0050cf95acd324e8812be6d16726c859c3f9dbf1d0e5e4d2e092a2cdff37d+ languageName: node+ linkType: hard+"@types/cacheable-request@npm:^6.0.1":version: 6.0.3resolution: "@types/cacheable-request@npm:6.0.3"@@ -5545,6 +5672,13 @@ __metadata:languageName: nodelinkType: hard+"@types/pako@npm:^1.0.1":+ version: 1.0.7+ resolution: "@types/pako@npm:1.0.7"+ checksum: 10c0/1ba133db0b30a974c3d651c85651fd30135f629727b4b4d7ef2649c8f8b01014d5ef41f75399d939e320a50bfa87c32beccbb513badfeaf85d74ea6d5370fdcc+ languageName: node+ linkType: hard+"@types/parse-json@npm:^4.0.0":version: 4.0.2resolution: "@types/parse-json@npm:4.0.2"@@ -6977,6 +7111,15 @@ __metadata:languageName: nodelinkType: hard+"async-mutex@npm:^0.2.2":+ version: 0.2.6+ resolution: "async-mutex@npm:0.2.6"+ dependencies:+ tslib: "npm:^2.0.0"+ checksum: 10c0/440f1388fdbf2021261ba05952765182124a333681692fdef6af13935c20bfc2017e24e902362f12b29094a77b359ce3131e8dd45b1db42f1d570927ace9e7d9+ languageName: node+ linkType: hard+"async@npm:^2.6.4":version: 2.6.4resolution: "async@npm:2.6.4"@@ -7405,7 +7548,7 @@ __metadata:languageName: nodelinkType: hard-"base64-js@npm:^1.0.2, base64-js@npm:^1.3.1":+"base64-js@npm:^1.0.2, base64-js@npm:^1.1.2, base64-js@npm:^1.3.1":version: 1.5.1resolution: "base64-js@npm:1.5.1"checksum: 10c0/f23823513b63173a001030fae4f2dabe283b99a9d324ade3ad3d148e218134676f1ee8568c877cd79ec1c53158dcf2d2ba527a97c606618928ba99dd930102bf@@ -7637,6 +7780,22 @@ __metadata:languageName: nodelinkType: hard+"brotli@npm:^1.3.2":+ version: 1.3.3+ resolution: "brotli@npm:1.3.3"+ dependencies:+ base64-js: "npm:^1.1.2"+ checksum: 10c0/9d24e24f8b7eabf44af034ed5f7d5530008b835f09a107a84ac060723e86dd43c6aa68958691fe5df524f59473b35f5ce2e0854aa1152c0a254d1010f51bcf22+ languageName: node+ linkType: hard++"browser-or-node@npm:^1.2.1":+ version: 1.3.0+ resolution: "browser-or-node@npm:1.3.0"+ checksum: 10c0/a914790dd6a857149b1bb128a39872a95172f6f1db7824dd014b88cc2f88ce6433013ec83388fff83512fb815e7dc2ea60ddbfe8ff150d4f233092ff0d60ec60+ languageName: node+ linkType: hard+"browser-pack@npm:^6.0.1":version: 6.1.0resolution: "browser-pack@npm:6.1.0"@@ -7826,6 +7985,22 @@ __metadata:languageName: nodelinkType: hard+"bson@npm:*":+ version: 6.8.0+ resolution: "bson@npm:6.8.0"+ checksum: 10c0/0503bb2a4ce2e183bd06151bdb983a623cfde05c76fbb5a34e941c594f3a681b52333d61b37c7933b8733b0ba14607b3599d94b46635d90bb96b1e7cec51aa8f+ languageName: node+ linkType: hard++"bson@npm:4.2.0":+ version: 4.2.0+ resolution: "bson@npm:4.2.0"+ dependencies:+ buffer: "npm:^5.6.0"+ checksum: 10c0/50e852996fd630a1d8d40840f1f775b5e0c821616d0a3710abdd45fcfdaec796b215202ed33d4955f517f3ac2119648ea1c0d96654309bbf1fee1d736cf5e0d8+ languageName: node+ linkType: hard+"buf-compare@npm:^1.0.0":version: 1.0.1resolution: "buf-compare@npm:1.0.1"@@ -7886,7 +8061,7 @@ __metadata:languageName: nodelinkType: hard-"buffer@npm:^5.2.1, buffer@npm:^5.5.0":+"buffer@npm:^5.2.1, buffer@npm:^5.5.0, buffer@npm:^5.6.0":version: 5.7.1resolution: "buffer@npm:5.7.1"dependencies:@@ -9296,6 +9471,27 @@ __metadata:languageName: nodelinkType: hard+"d3-dsv@npm:^1.2.0":+ version: 1.2.0+ resolution: "d3-dsv@npm:1.2.0"+ dependencies:+ commander: "npm:2"+ iconv-lite: "npm:0.4"+ rw: "npm:1"+ bin:+ csv2json: bin/dsv2json+ csv2tsv: bin/dsv2dsv+ dsv2dsv: bin/dsv2dsv+ dsv2json: bin/dsv2json+ json2csv: bin/json2dsv+ json2dsv: bin/json2dsv+ json2tsv: bin/json2dsv+ tsv2csv: bin/dsv2dsv+ tsv2json: bin/dsv2json+ checksum: 10c0/e1698408b3c583d236f2c5f333d793cff2ac65e5ee11c4b6606becf86bf1d089e6de2be730aa9103c3d175fe3d63942de9a5a808e439ff9de7219149aa58aa37+ languageName: node+ linkType: hard+"d3-dsv@npm:^2.0.0":version: 2.0.0resolution: "d3-dsv@npm:2.0.0"@@ -10380,10 +10576,10 @@ __metadata:languageName: nodelinkType: hard-"draco3d@npm:1.5.5":- version: 1.5.5- resolution: "draco3d@npm:1.5.5"- checksum: 10c0/bbf5d91ee7fb24aba80d75030590141ac14cf2865ad9d0a5127bdf73e89ce81cce15f28bb262940fd997a4dbae925ea52895a65db2e1941d52be293853fd3df0+"draco3d@npm:1.5.7":+ version: 1.5.7+ resolution: "draco3d@npm:1.5.7"+ checksum: 10c0/4419509bb93c31560a22a1a54e1c394a5b5017cab39941120c75151d941c11dec05925abf31f597ac2694c570b78c04f82aa3d69e5311f8f8e71fc8b9d92d12flanguageName: nodelinkType: hard@@ -11722,6 +11918,13 @@ __metadata:languageName: nodelinkType: hard+"fflate@npm:0.7.4":+ version: 0.7.4+ resolution: "fflate@npm:0.7.4"+ checksum: 10c0/5e749eb3a6ed61a0f6c55756abf9f4258f06f60505db689e22d18503dd252ca5af656d32668e4b7b20714adf8b313febf695d23863a8352f23e325baee0f672d+ languageName: node+ linkType: hard+"figgy-pudding@npm:^3.5.1":version: 3.5.2resolution: "figgy-pudding@npm:3.5.2"@@ -13713,6 +13916,13 @@ __metadata:languageName: nodelinkType: hard+"int53@npm:^0.2.4":+ version: 0.2.4+ resolution: "int53@npm:0.2.4"+ checksum: 10c0/7942bc3cee8aa6ed143b5169bcc2518c7d8d7e67601e3a982e853efb6a67420e863b90ff4d2edf0f4cfe6bd259b16d91690067986f8b2d4f8026c70d369b401a+ languageName: node+ linkType: hard+"internal-ip@npm:^4.3.0":version: 4.3.0resolution: "internal-ip@npm:4.3.0"@@ -13890,7 +14100,7 @@ __metadata:languageName: nodelinkType: hard-"is-arguments@npm:^1.1.1":+"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":version: 1.1.1resolution: "is-arguments@npm:1.1.1"dependencies:@@ -14123,7 +14333,7 @@ __metadata:languageName: nodelinkType: hard-"is-generator-function@npm:^1.0.10":+"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7":version: 1.0.10resolution: "is-generator-function@npm:1.0.10"dependencies:@@ -14369,7 +14579,7 @@ __metadata:languageName: nodelinkType: hard-"is-typed-array@npm:^1.1.13":+"is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.3":version: 1.1.13resolution: "is-typed-array@npm:1.1.13"dependencies:@@ -14537,6 +14747,15 @@ __metadata:languageName: nodelinkType: hard+"isomorphic-ws@npm:^4.0.1":+ version: 4.0.1+ resolution: "isomorphic-ws@npm:4.0.1"+ peerDependencies:+ ws: "*"+ checksum: 10c0/7cb90dc2f0eb409825558982fb15d7c1d757a88595efbab879592f9d2b63820d6bbfb5571ab8abe36c715946e165a413a99f6aafd9f40ab1f514d73487bc9996+ languageName: node+ linkType: hard+"isstream@npm:~0.1.2":version: 0.1.2resolution: "isstream@npm:0.1.2"@@ -15522,9 +15741,10 @@ __metadata:"@hubble.gl/core": "npm:1.2.0-alpha.6""@hubble.gl/react": "npm:1.2.0-alpha.6""@kepler.gl/components": "npm:3.0.0"- "@loaders.gl/polyfills": "npm:^4.1.1"+ "@loaders.gl/polyfills": "npm:^4.3.2""@luma.gl/test-utils": "npm:^8.5.20""@nebula.gl/layers": "npm:1.0.2-alpha.1"+ "@open-wc/webpack-import-meta-loader": "npm:0.4.7""@probe.gl/env": "npm:^3.5.0""@probe.gl/test-utils": "npm:^3.5.0""@testing-library/dom": "npm:^9.0.1"@@ -15652,10 +15872,10 @@ __metadata:languageName: nodelinkType: hard-"ktx-parse@npm:^0.0.4":- version: 0.0.4- resolution: "ktx-parse@npm:0.0.4"- checksum: 10c0/806d5005696c25147dcc9aa6a2033587041fb391c58faaecd88b94ad17b3edfc145d3d69746a218f569600e8e9c7116886e70251c5fd1c813086a093271643b2+"ktx-parse@npm:^0.7.0":+ version: 0.7.1+ resolution: "ktx-parse@npm:0.7.1"+ checksum: 10c0/07c0870a0d0fe0bd412b430ac58afd721136a1ca76db83a066b6d20810878822822cbe3b8c8507c15ae8680be0988675b4f5c3d1243262284f161b52c59d09e9languageName: nodelinkType: hard@@ -16077,6 +16297,20 @@ __metadata:languageName: nodelinkType: hard+"lz4js@npm:^0.2.0":+ version: 0.2.0+ resolution: "lz4js@npm:0.2.0"+ checksum: 10c0/73c6dd5117a6fa465e6be1bd5ae34ef4f02e4eb164a47d77f8c2483ccdde43cbdf8509a5e5a4480ef812e5c7a2cb946e026b9c784533775ee5c91861edaefb39+ languageName: node+ linkType: hard++"lzo-wasm@npm:^0.0.4":+ version: 0.0.4+ resolution: "lzo-wasm@npm:0.0.4"+ checksum: 10c0/33c0d43c9617f23e03196f475fd35b6b4a725e7252cf328002a606a4377ea281d380f12160df80bedfbe5516f7d9ad70592f469a6bef1e91db274e86d411452e+ languageName: node+ linkType: hard+"make-dir@npm:^2.0.0, make-dir@npm:^2.1.0":version: 2.1.0resolution: "make-dir@npm:2.1.0"@@ -17670,6 +17904,13 @@ __metadata:languageName: nodelinkType: hard+"object-stream@npm:0.0.1":+ version: 0.0.1+ resolution: "object-stream@npm:0.0.1"+ checksum: 10c0/f8ecf919b3e10917daf34fb2bb94521108b85411b8a94d5a996e6d40eb4c6e2246e179067dc528b83e86c51b01b1fd16c617da0e2193dd00f0bf74a1efb8f048+ languageName: node+ linkType: hard+"object-visit@npm:^1.0.0":version: 1.0.1resolution: "object-visit@npm:1.0.1"@@ -18042,7 +18283,7 @@ __metadata:languageName: nodelinkType: hard-"pako@npm:~1.0.5":+"pako@npm:1.0.11, pako@npm:~1.0.5":version: 1.0.11resolution: "pako@npm:1.0.11"checksum: 10c0/86dd99d8b34c3930345b8bbeb5e1cd8a05f608eeb40967b293f72fe469d0e9c88b783a8777e4cc7dc7c91ce54c5e93d88ff4b4f060e6ff18408fd21030d9ffbe@@ -18088,6 +18329,13 @@ __metadata:languageName: nodelinkType: hard+"parquet-wasm@npm:^0.6.1":+ version: 0.6.1+ resolution: "parquet-wasm@npm:0.6.1"+ checksum: 10c0/dcade4b006ff86edca711dacf3c71997b4a86985384fc183119f73d5dae1d0c94d3e7fa5b48845845df5db97d3eb445d6c137f3459a5d9a66a3b9b3bc0474497+ languageName: node+ linkType: hard+"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.7":version: 5.1.7resolution: "parse-asn1@npm:5.1.7"@@ -19131,6 +19379,13 @@ __metadata:languageName: nodelinkType: hard+"q@npm:^1.5.0":+ version: 1.5.1+ resolution: "q@npm:1.5.1"+ checksum: 10c0/7855fbdba126cb7e92ef3a16b47ba998c0786ec7fface236e3eb0135b65df36429d91a86b1fff3ab0927b4ac4ee88a2c44527c7c3b8e2a37efbec9fe34803df4+ languageName: node+ linkType: hard+"qs@npm:6.11.0":version: 6.11.0resolution: "qs@npm:6.11.0"@@ -21391,6 +21646,13 @@ __metadata:languageName: nodelinkType: hard+"snappyjs@npm:^0.6.0, snappyjs@npm:^0.6.1":+ version: 0.6.1+ resolution: "snappyjs@npm:0.6.1"+ checksum: 10c0/6fa62bb62adfc2bad577db78c58b1c52aba5482f749018ff3000f13bf660f13ec5f16ab80673ce4e8792902a16c30e5fb40a3b67dbca9af525658c9d343c5b1c+ languageName: node+ linkType: hard+"sockjs-client@npm:^1.5.0":version: 1.6.1resolution: "sockjs-client@npm:1.6.1"@@ -22755,6 +23017,19 @@ __metadata:languageName: nodelinkType: hard+"thrift@npm:^0.19.0":+ version: 0.19.0+ resolution: "thrift@npm:0.19.0"+ dependencies:+ browser-or-node: "npm:^1.2.1"+ isomorphic-ws: "npm:^4.0.1"+ node-int64: "npm:^0.4.0"+ q: "npm:^1.5.0"+ ws: "npm:^5.2.3"+ checksum: 10c0/935c2d9fcd3f23528fb462e8186aacf6e9c185593f59ac6ede1e3f5862de85f7d093a99546edce77443c990e6fde850a5ef5603e087cc1e9df96003f01860435+ languageName: node+ linkType: hard+"through2-filter@npm:^3.0.0":version: 3.1.0resolution: "through2-filter@npm:3.1.0"@@ -23905,6 +24180,19 @@ __metadata:languageName: nodelinkType: hard+"util@npm:^0.12.5":+ version: 0.12.5+ resolution: "util@npm:0.12.5"+ dependencies:+ inherits: "npm:^2.0.3"+ is-arguments: "npm:^1.0.4"+ is-generator-function: "npm:^1.0.7"+ is-typed-array: "npm:^1.1.3"+ which-typed-array: "npm:^1.1.2"+ checksum: 10c0/c27054de2cea2229a66c09522d0fa1415fb12d861d08523a8846bf2e4cbf0079d4c3f725f09dcb87493549bcbf05f5798dce1688b53c6c17201a45759e7253f3+ languageName: node+ linkType: hard+"utila@npm:~0.4":version: 0.4.0resolution: "utila@npm:0.4.0"@@ -23990,6 +24278,13 @@ __metadata:languageName: nodelinkType: hard+"varint@npm:^6.0.0":+ version: 6.0.0+ resolution: "varint@npm:6.0.0"+ checksum: 10c0/737fc37088a62ed3bd21466e318d21ca7ac4991d0f25546f518f017703be4ed0f9df1c5559f1dd533dddba4435a1b758fd9230e4772c1a930ef72b42f5c750fd+ languageName: node+ linkType: hard+"vary@npm:~1.1.2":version: 1.1.2resolution: "vary@npm:1.1.2"@@ -24287,10 +24582,10 @@ __metadata:languageName: nodelinkType: hard-"web-streams-polyfill@npm:^3.2.1":- version: 3.3.3- resolution: "web-streams-polyfill@npm:3.3.3"- checksum: 10c0/64e855c47f6c8330b5436147db1c75cb7e7474d924166800e8e2aab5eb6c76aac4981a84261dd2982b3e754490900b99791c80ae1407a9fa0dcff74f82ea3a7f+"web-streams-polyfill@npm:^4.0.0":+ version: 4.0.0+ resolution: "web-streams-polyfill@npm:4.0.0"+ checksum: 10c0/c570cea10db4c88eb630e1ddc2b3390eaf215527ab1229258ac6d1eb6ed3bb095312d4ce5c35090b590c051e1a94043b11d00fe4188413c67112bdf61e554b87languageName: nodelinkType: hard@@ -24629,7 +24924,7 @@ __metadata:languageName: nodelinkType: hard-"which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.9":+"which-typed-array@npm:^1.1.13, which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":version: 1.1.15resolution: "which-typed-array@npm:1.1.15"dependencies:@@ -24804,6 +25099,15 @@ __metadata:languageName: nodelinkType: hard+"ws@npm:^5.2.3":+ version: 5.2.4+ resolution: "ws@npm:5.2.4"+ dependencies:+ async-limiter: "npm:~1.0.0"+ checksum: 10c0/14e84e4209f86ab68b01b9ebf42c88f81f26a64ff4886ef65d27c734c9b90b8d7e84712da3c3f7a922a4ab58bf0b96544d32ae28ebbd620fcda3027dd5bc7604+ languageName: node+ linkType: hard+"ws@npm:^6.0.0, ws@npm:^6.2.1":version: 6.2.3resolution: "ws@npm:6.2.3"@@ -25038,6 +25342,13 @@ __metadata:languageName: nodelinkType: hard+"zstd-codec@npm:^0.1":+ version: 0.1.5+ resolution: "zstd-codec@npm:0.1.5"+ checksum: 10c0/8b7e6d9ce86f00fc4ea16c949aab5538505a1f3f1a9c7c095b2a7308b4ed894deec7bdb2c614e1486a337abdce09a6e56282dc0e39fe9f880953b094f8c7810b+ languageName: node+ linkType: hard+"zwitch@npm:^1.0.0":version: 1.0.5resolution: "zwitch@npm:1.0.5"