Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

chore: deck.gl 9.2 upgrade & loaders.gl, luma.gl upgrades (#3271)

Igor Dykhtabe6ba648d788
diff --git a/README.md b/README.md
index 7cd87eb28..6d2943bae 100644
--- a/README.md
+++ b/README.md
@@ -51,8 +51,9 @@ Kepler.gl is also a React component that uses [Redux](https://redux.js.org/) to
## Env
-Use Node 18.18.2 or above, older node versions have not been supported/ tested.
-For best results, use [nvm](https://github.com/creationix/nvm) `nvm install`.
+For **developing this repository**, use Node **18.18.2** (see `.nvmrc`): run `nvm install` and `nvm use`. Newer Node versions can make `yarn install` / `yarn bootstrap` try to compile the `gl` dev dependency from source; if that fails, see [Troubleshooting: gl package install](contributing/DEVELOPERS.md#troubleshooting-gl-package-install).
+
+When **using kepler.gl as a dependency** in your own app, use Node 18.18.2 or a supported LTS; older Node versions are not supported or tested.
## Install kepler.gl modules
diff --git a/SUMMARY.md b/SUMMARY.md
index 44c6d3fdf..40c11a7e6 100644
--- a/SUMMARY.md
+++ b/SUMMARY.md
@@ -70,7 +70,7 @@
* [Examples](examples/README.md)
* [Node/Express](examples/node-app/README.md)
* [Demo App](examples/demo-app/README.md)
- * [Open modal](examples/replace-component/README.md)
+ * [Replace Component](examples/replace-component/README.md)
* [Open modal](examples/open-modal/README.md)
* [UMD client](examples/umd-client/README.md)
* [Customize kepler.gl Theme](examples/custom-theme/README.md)
@@ -80,3 +80,4 @@
* [Contributor Covenant Code of Conduct](contributing/CODE_OF_CONDUCT.md)
* [Change Log](CHANGELOG.md)
* [Upgrade Guide](UPGRADE-GUIDE.md)
+* [Upgrade Guide v3.3](docs/upgrade-guide-v3.3.md)
diff --git a/contributing/DEVELOPERS.md b/contributing/DEVELOPERS.md
index ccd2a2431..d44b9719d 100644
--- a/contributing/DEVELOPERS.md
+++ b/contributing/DEVELOPERS.md
@@ -3,6 +3,7 @@
## Table of contents
- [Development Setup](./#development-setup)
+- [Troubleshooting: gl package install](./#troubleshooting-gl-package-install)
- [Running Tests](./#running-tests)
- [Coding Rules](./#coding-rules)
- [Commit Message Guidelines](./#git-commit-guidelines)
@@ -68,6 +69,7 @@ On Unix, MacOS
# install Volta on Unix
curl https://get.volta.sh | bash
```
+
On Windows
```bash
@@ -117,6 +119,29 @@ An demo app will be served at `http://localhost:8080/`
This is the demo app we hosted on [http://kepler.gl/#/demo][demo-app]. By default, it serves non-minified source code inside the src directory.
+### Troubleshooting: gl package install
+
+Yarn may report that the `gl` package (a dev dependency used for headless WebGL in tests) **could not be built**. That usually happens for one of two reasons:
+
+1. **No prebuilt binary for your Node version and platform**
+ `prebuild-install` only ships binaries for certain Node releases and OS/arch pairs (for example, very new Node versions on Apple Silicon often have none). Yarn then falls back to compiling `gl` from source with `node-gyp`.
+
+2. **Source build needs a `python` command**
+ The ANGLE sources invoked during that compile run `python` (not `python3`). macOS Command Line Tools typically install `python3` only, so the log shows `python: command not found` and `gyp ERR! configure error` even though `node-gyp` found Python 3.
+
+**What to do**
+
+- **Prefer the Node version pinned for this repo** (see `.nvmrc`, currently 18.18.2). After `nvm install` and `nvm use` (or Volta, as above), run `yarn install` / `yarn bootstrap` again. A matching prebuild is often available, so the native compile step never runs.
+
+- **If you must use a newer Node** and the install compiles from source, ensure `python` is on your `PATH` and points to Python 3, for example on macOS:
+
+ ```bash
+ sudo mkdir -p /usr/local/bin
+ sudo ln -sf /usr/bin/python3 /usr/local/bin/python
+ ```
+
+ Use another location if `/usr/local/bin` is not early in your `PATH`.
+
#### Develop with deck.gl
When develop, upgrade, debug deck.gl, Demo app can load deck.gl directly from src
diff --git a/docs/RFC/table-class.md b/docs/RFC/table-class.md
index b603d4197..ffdbe5d2d 100644
--- a/docs/RFC/table-class.md
+++ b/docs/RFC/table-class.md
@@ -66,12 +66,12 @@ Missing features
#### Current kepler.gl methods:
-1. `initalize`
+1. `initialize`
to replace utils/dataset-utils `createNewDataEntry` This table method takes a `ProtoTable` and returns a `Table` to be saved in kepler state.
```js
-table.initalize(protoTable);
+table.initialize(protoTable);
// following meta data should be initialized
table.allIndexes,
@@ -102,7 +102,7 @@ table.allIndexes,
Value the field value, type the field type
7. `sortDatasetByColumn`
- Sort a column, return an sorted index, assign to `sortColumn`, `sortOrder`
+ Sort a column, return a sorted index, assign to `sortColumn`, `sortOrder`
8. `filterDataset(filters, layers, opt)`
to replace `filter-utils.js` `filterDataset`
diff --git a/docs/api-reference/actions/actions.md b/docs/api-reference/actions/actions.md
index 9e6643936..60a1a94fe 100644
--- a/docs/api-reference/actions/actions.md
+++ b/docs/api-reference/actions/actions.md
@@ -298,7 +298,7 @@ Callback when load map style success
### mapConfigChange
-Update `visibleLayerGroups`to change layer group visibility
+Update `visibleLayerGroups` to change layer group visibility
- **ActionTypes**: [`ActionTypes.MAP_CONFIG_CHANGE`][12]
- **Updaters**: [`mapStyleUpdaters.mapConfigChangeUpdater`][171]
@@ -343,12 +343,12 @@ Set 3d building layer group color
## main
Main kepler.gl actions, these actions handles loading data and config into kepler.gl reducer. These actions
-is listened by all subreducers,
+are listened to by all subreducers.
### addDataToMap
Add data to kepler.gl reducer, prepare map with preset configuration if config is passed.
-Kepler.gl provides a handy set of utils to parse data from different formats to the `data` object required in dataset. You rarely need to manually format the data obejct.
+Kepler.gl provides a handy set of utils to parse data from different formats to the `data` object required in dataset. You rarely need to manually format the data object.
Use `KeplerGlSchema.getConfigToSave` to generate a json blob of the currents instance config.
The config object value will always have higher precedence than the options properties.
@@ -533,7 +533,7 @@ Trigger CPU filter of selected dataset
**Parameters**
-- `dataId` **([string][162] | Arrary<[string][162]>)** single dataId or an array of dataIds
+- `dataId` **([string][162] | Array<[string][162]>)** single dataId or an array of dataIds
Returns **{type: ActionTypes.APPLY_CPU_FILTER, dataId: [string][162]}**
@@ -593,7 +593,7 @@ Update layer text label
### layerTypeChange
-Update layer type. Previews layer config will be copied if applicable.
+Update layer type. Previous layer config will be copied if applicable.
- **ActionTypes**: [`ActionTypes.LAYER_TYPE_CHANGE`][12]
- **Updaters**: [`visStateUpdaters.layerTypeChangeUpdater`][192]
@@ -697,7 +697,7 @@ Returns **{type: ActionTypes.MAP_CLICK}**
### onMouseMove
-Trigger map mouse moveevent, payload would be
+Trigger map mouse move event, payload would be
React-map-gl MapLayerMouseEvent
[https://visgl.github.io/react-map-gl/docs/api-reference/types#maplayermouseevent][202]
@@ -708,7 +708,7 @@ React-map-gl MapLayerMouseEvent
- `evt` **[Object][164]** MapLayerMouseEvent
-Returns **{type: ActionTypes.MAP_CLICK}**
+Returns **{type: ActionTypes.MOUSE_MOVE}**
### removeDataset
@@ -784,10 +784,10 @@ Set the map mode
**Examples**
```javascript
-import {setMapMode} from '@kepler.gl/actions';
+import {setEditorMode} from '@kepler.gl/actions';
import {EDITOR_MODES} from '@kepler.gl/constants';
-this.props.dispatch(setMapMode(EDITOR_MODES.DRAW_POLYGON));
+this.props.dispatch(setEditorMode(EDITOR_MODES.DRAW_POLYGON));
```
### setFilter
@@ -822,18 +822,16 @@ Returns **{type: ActionTypes.SET_FILTER_PLOT, idx: any, newProp: any}**
### setMapInfo
-Set the property of a filter plot
+Set map info such as title and description
- **ActionTypes**: [`ActionTypes.SET_MAP_INFO`][12]
- **Updaters**: [`visStateUpdaters.setMapInfoUpdater`][211]
**Parameters**
-- `info`
-- `idx` **[Number][188]**
-- `newProp` **[Object][164]** key value mapping of new prop `{yAxis: 'histogram'}`
+- `info` **[Object][164]** map info object, e.g. `{title: 'My Map', description: 'My map description'}`
-Returns **{type: ActionTypes.SET_FILTER_PLOT, idx: any, newProp: any}**
+Returns **{type: ActionTypes.SET_MAP_INFO, info: info}**
### showDatasetTable
@@ -958,9 +956,9 @@ Returns **{type: ActionTypes.UPDATE_VIS_DATA, datasets: datasets, options: optio
## uiStateActions
Actions handled mostly by `uiState` reducer.
-They manage UI changes in tha app, such as open and close side panel,
+They manage UI changes in the app, such as open and close side panel,
switch between tabs in the side panel, open and close modal dialog for exporting data / images etc.
-It also manges which settings are selected during image and map export
+It also manages which settings are selected during image and map export
### addNotification
@@ -1037,7 +1035,7 @@ Whether to export filtered data, `true` or `false`
**Parameters**
-- `payload` **[boolean][165]** set `true` to ony export filtered data
+- `payload` **[boolean][165]** set `true` to only export filtered data
### setExportImageDataUri
@@ -1474,7 +1472,7 @@ Set the export map format (html, json)
[173]: ../reducers/map-style.md#mapstyleupdatersrequestmapstylesupdater
[174]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array
[175]: ../reducers/map-style.md#mapstyleupdatersset3dbuildingcolorupdater
-[176]: ../reducers/composers.md#combinedupdatersadddatatomapupdater
+[176]: ../reducers/combine.md#combinedupdatersadddatatomapupdater
[177]: ../reducers/map-style.md#mapstyleupdatersinitmapstyleupdater
[178]: ../reducers/map-state.md#mapstateupdatersreceivemapconfigupdater
[179]: ../reducers/map-style.md#mapstyleupdatersreceivemapconfigupdater
diff --git a/docs/api-reference/advanced-usages/custom-initial-state.md b/docs/api-reference/advanced-usages/custom-initial-state.md
index 1f526a52e..b2972ccac 100644
--- a/docs/api-reference/advanced-usages/custom-initial-state.md
+++ b/docs/api-reference/advanced-usages/custom-initial-state.md
@@ -6,7 +6,7 @@ Here is an example modify `uiState` `initialState` to hide side panel, and selec
```js
import {combineReducers} from 'redux';
-import {keplerGlReducer} from '@kepler.gl/reducers';
+import keplerGlReducer from '@kepler.gl/reducers';
const customizedKeplerGlReducer = keplerGlReducer
.initialState({
diff --git a/docs/api-reference/advanced-usages/custom-map-styles.md b/docs/api-reference/advanced-usages/custom-map-styles.md
index a12ae5ed7..2cd3f437e 100644
--- a/docs/api-reference/advanced-usages/custom-map-styles.md
+++ b/docs/api-reference/advanced-usages/custom-map-styles.md
@@ -7,7 +7,7 @@ By default, kepler.gl uses mapbox-gl.js to render its base maps, displayed in [m
You can custom kepler.gl to use other base map services, by passing in style.json written in [Mapbox GL Style Spec](https://docs.mapbox.com/mapbox-gl-js/style-spec/). With custom style.json kepler.gl can render base map independent of mapbox vector tile service.
-For instance. there is a example [style.json](https://raw.githubusercontent.com/heshan0131/kepler.gl-data/master/style/basic.json). It points to the tile server described in the `sources` field.
+For instance. there is an example [style.json](https://raw.githubusercontent.com/heshan0131/kepler.gl-data/master/style/basic.json). It points to the tile server described in the `sources` field.
```json
"sources": {
@@ -129,7 +129,7 @@ If your map styles are not using Mapbox services, and you replaced all kepler.gl
#### 4. `DEFAULT_LAYER_GROUPS`
-If `layerGroups` is not suppied, kepler.gl uses the default layer groups below.
+If `layerGroups` is not supplied, kepler.gl uses the default layer groups below.
```js
diff --git a/docs/api-reference/advanced-usages/custom-mapbox-host.md b/docs/api-reference/advanced-usages/custom-mapbox-host.md
index d7a8aa4ea..d761669a3 100644
--- a/docs/api-reference/advanced-usages/custom-mapbox-host.md
+++ b/docs/api-reference/advanced-usages/custom-mapbox-host.md
@@ -38,7 +38,7 @@ and In render:
<KeplerGl
id="foo"
mapboxApiAccessToken={this.token}
- mapboxApiUrl={}
+ mapboxApiUrl={this.apiHost}
mapStyles={this.mapStyles}
width={width}
height={height}/>
diff --git a/docs/api-reference/advanced-usages/forward-actions.md b/docs/api-reference/advanced-usages/forward-actions.md
index e5e142717..3b8bfba75 100644
--- a/docs/api-reference/advanced-usages/forward-actions.md
+++ b/docs/api-reference/advanced-usages/forward-actions.md
@@ -53,7 +53,7 @@ import {toggleFullScreen, wrapTo} from '@kepler.gl/actions';
const wrapToMap = wrapTo('foo');
const MapContainer = ({dispatch}) => (
<div>
- <button onClick={() => dispatch(wrapToMap(toggleFullScreen())} />
+ <button onClick={() => dispatch(wrapToMap(toggleFullScreen()))} />
<KeplerGl id="foo"/>
</div>
);
diff --git a/docs/api-reference/advanced-usages/saving-loading-w-schema.md b/docs/api-reference/advanced-usages/saving-loading-w-schema.md
index 5aba4a460..3e7d7864d 100644
--- a/docs/api-reference/advanced-usages/saving-loading-w-schema.md
+++ b/docs/api-reference/advanced-usages/saving-loading-w-schema.md
@@ -2,7 +2,7 @@
![Processor and Schema][processor-schema]
-Kelper.gl provides a schema manager to save and load maps. It converts current map data and configuration into a smaller JSON blob. You can then load that JSON blob into an empty map by passing it to `addDataToMap`.
+Kepler.gl provides a schema manager to save and load maps. It converts current map data and configuration into a smaller JSON blob. You can then load that JSON blob into an empty map by passing it to `addDataToMap`.
The reason kepler.gl provides a Schema manager is to make it easy for users to connect the kepler.gl client app to any database, saving map data / config and later load it back. With the schema manager, a map saved in an older version can still be parsed and loaded with the latest kepler.gl library.
@@ -16,7 +16,7 @@ Under the hood, `SchemaManager.save()` calls `SchemaManager.getDatasetToSave()`
- `SchemaManager.getDatasetToSave()` will output an array of dataset.
- `SchemaManager.getConfigToSave()` will output a JSON blob of the current config.
-In the example blow, `foo` is the id of the KeplerGl instance to be save.
+In the example below, `foo` is the id of the KeplerGl instance to be save.
```js
import KeplerGlSchema from '@kepler.gl/schemas';
diff --git a/docs/api-reference/advanced-usages/using-updaters.md b/docs/api-reference/advanced-usages/using-updaters.md
index ee903a120..bb91112b2 100644
--- a/docs/api-reference/advanced-usages/using-updaters.md
+++ b/docs/api-reference/advanced-usages/using-updaters.md
@@ -39,7 +39,7 @@ const composedReducer = (state, action) => {
foo: {
...state.keplerGl.foo,
mapState: mapStateUpdaters.togglePerspectiveUpdater(
- t state.keplerGl.foo.mapState
+ state.keplerGl.foo.mapState
)
}
}
diff --git a/docs/api-reference/cloud-providers/README.md b/docs/api-reference/cloud-providers/README.md
index 4a4b78e3d..f9c4faeec 100644
--- a/docs/api-reference/cloud-providers/README.md
+++ b/docs/api-reference/cloud-providers/README.md
@@ -2,7 +2,7 @@
The kepler.gl application does not have a backend, however it offers integration point for optional commercial backends. Each backend can integrate with kepler by adding a "cloud provider" object to kepler's global list of cloud providers.
-These objects must implement certain minimal set of methods, and can optionally immplement others, depending on the capability of the backend.
+These objects must implement certain minimal set of methods, and can optionally implement others, depending on the capability of the backend.
The set of methods available for cloud providers to implement is subject to change as new features are added to the front-end.
@@ -32,7 +32,7 @@ Cloud-providers providers can implement the following properties
| `logout` | Method called to logout an user | required |
| `uploadMap` | Method called to upload map to storage | required |
| `listMaps` | Method called to load a catalog of maps saved by the current user | required |
-| `downloadMap` | MEthod called to download a specific map | required |
+| `downloadMap` | Method called to download a specific map | required |
## Adding a new Cloud Provider
diff --git a/docs/api-reference/cloud-providers/cloud-provider.md b/docs/api-reference/cloud-providers/cloud-provider.md
index 434ad758f..9a894f4cd 100644
--- a/docs/api-reference/cloud-providers/cloud-provider.md
+++ b/docs/api-reference/cloud-providers/cloud-provider.md
@@ -60,8 +60,8 @@ async downloadMap(loadParams) {
config: {},
info: {
app: 'kepler.gl',
- created_at: ''
- title: 'test map',
+ created_at: '',
+ title: 'test map',
description: 'Hello this is my test dropbox map'
}
},
@@ -69,7 +69,7 @@ async downloadMap(loadParams) {
format: 'keplergl'
};
- return downloadMap;
+ return mockResponse;
}
```
@@ -105,7 +105,7 @@ Returns **[string][28]** shareUrl
This method is called to get the user name of the current user. It will be displayed in the cloud provider tile.
-Returns **[string][28]** true if a user already logged in
+Returns **[string][28]** the user name of the logged in user
### hasPrivateStorage
@@ -133,7 +133,7 @@ async listMaps() {
title: 'My map',
description: 'My first kepler map',
imageUrl: 'http://',
- udpatedAt: 1582677787000,
+ updatedAt: 1582677787000,
privateMap: false,
loadParams: {}
}
diff --git a/docs/api-reference/ecosystem.md b/docs/api-reference/ecosystem.md
index 1ad7fb973..89e8b80a6 100644
--- a/docs/api-reference/ecosystem.md
+++ b/docs/api-reference/ecosystem.md
@@ -16,7 +16,7 @@ Read more about [Component][components].
![Forward Dispatcher][forward-dispatcher]
-The kepler.gl root reducer that user mounted in their app is in fact a wrapper reducer that stored the child state and update them based on forwarded actions. If An action is not a forwarded action, it pass down to all child reducers.
+The kepler.gl root reducer that user mounted in their app is in fact a wrapper reducer that stored the child state and update them based on forwarded actions. If an action is not a forwarded action, it pass down to all child reducers.
When a KeplerGl component instance is mounted with the id `foo`, the wrapper reducer will add a kepler.gl local state in the root state at key `foo`.
@@ -56,7 +56,7 @@ Read more about [Actions and Updaters][actions-updaters].
Processors and schema manager are useful helpers to get data in and out of kepler.gl. You can use `processCsvData(csv)` and `processGeojson(geojson)` to parse csv or geoJson file and pass it to `addDataToMap()` action.
-To save and reload the current map, you can call `KeplerGlSchema.save()` and pass it the instant state. It will return a json output containing map data and config. Pass this json file to `processKeplerglJSON()` and then `addDataToMap()` will reproduce the same map.
+To save and reload the current map, you can call `KeplerGlSchema.save()` and pass it the instance state. It will return a json output containing map data and config. Pass this json file to `processKeplerglJSON()` and then `addDataToMap()` will reproduce the same map.
Read more about [Processors][processors] and [Schema Manager][schemas].
diff --git a/docs/api-reference/localization/README.md b/docs/api-reference/localization/README.md
index c6cce0254..949c9740a 100644
--- a/docs/api-reference/localization/README.md
+++ b/docs/api-reference/localization/README.md
@@ -70,7 +70,7 @@ const localeMessages = {
const App = () => (
<KeplerGl
id="map"
- localeMessages={messages}
+ localeMessages={localeMessages}
mapboxApiAccessToken={Token}
/>
);
@@ -88,7 +88,7 @@ const localeMessages = {
const App = () => (
<KeplerGl
id="map"
- localeMessages={messages}
+ localeMessages={localeMessages}
mapboxApiAccessToken={Token}
/>
);
diff --git a/docs/api-reference/reducers/README.md b/docs/api-reference/reducers/README.md
index 5fcc2b5bd..8029a2d76 100644
--- a/docs/api-reference/reducers/README.md
+++ b/docs/api-reference/reducers/README.md
@@ -9,7 +9,7 @@ Kepler.gl is a redux-connected component that utilizes redux to manage its state
![Compose-reducer][diagram-1]
-It is immportant to understand the relationship between __kepler.gl reducer__, __instance reducer__ and __subreducer__. Kepler.gl reducer is the root reducer that combines multiple instance reducer, which manages the state of each individual kepler.gl component. The instance reducer is consists of 4 subreducers, each manages an independent part of the state.
+It is important to understand the relationship between __kepler.gl reducer__, __instance reducer__ and __subreducer__. Kepler.gl reducer is the root reducer that combines multiple instance reducer, which manages the state of each individual kepler.gl component. The instance reducer consists of 4 subreducers, each manages an independent part of the state.
## KeplerGl Reducer
@@ -17,7 +17,7 @@ To connect kepler.gl components to your Redux app you'll need the following piec
- Redux Reducer: `keplerGlReducer` imported from `@kepler.gl/reducers`
- React Component: `KeplerGl` imported from `@kepler.gl/components`
-These are the only 2 pieces you need to get kepler.gl up and running in your app. When you mount kepler.gl reducer in your app reducer (with `combineReducers`), it will then managers __ALL__ KeplerGl component instances that you add to your app. Each kepler.gl instance state is stored in a instance reduccer.
+These are the only 2 pieces you need to get kepler.gl up and running in your app. When you mount kepler.gl reducer in your app reducer (with `combineReducers`), it will then manages __ALL__ KeplerGl component instances that you add to your app. Each kepler.gl instance state is stored in a instance reducer.
For instance, if you have 2 kepler.gl components in your App:
```js
@@ -45,14 +45,14 @@ state = {
## Instance Reducer
-Each kepler.gl component state is stored in a instance reduccer. A instance reducer has 4 subreducers. __`visState`__, __`mapState`__, __`mapStyle`__ and __`uiState`__. Each of them managers a piece of state that is mostly self contained.
+Each kepler.gl component state is stored in a instance reducer. A instance reducer has 4 subreducers. __`visState`__, __`mapState`__, __`mapStyle`__ and __`uiState`__. Each of them manages a piece of state that is mostly self contained.
- __visState__ - Manages all data and visualization related state, including datasets, layers, filters and interaction configs. Some of the key updaters are `updateVisDataUpdater`, `layerConfigChangeUpdater`, `setFilterUpdater`, `interactionConfigChangeUpdater`.
- __mapState__ - Manages base map behavior including the viewport, drag rotate and toggle split maps. Key updates are `updateMapUpdater`, `toggleSplitMapUpdater` and `togglePerspectiveUpdater`.
-- __mapStyle__ - Managers base map style, including setting base map style, toggling base map layers and adding custom base map style.
+- __mapStyle__ - Manages base map style, including setting base map style, toggling base map layers and adding custom base map style.
-- __uiState__ - Managers all UI component transition state, including open / close side panel, current displayed panel etc. Note, ui state reducer is the only reducer that’s not saved in kepler.gl schema.
+- __uiState__ - Manages all UI component transition state, including open / close side panel, current displayed panel etc. Note, ui state reducer is the only reducer that’s not saved in kepler.gl schema.
## Subreducer
@@ -68,7 +68,7 @@ const actionHandler = {
};
```
-User can import a specific action handler in their root reducer and use it to directly modify kepler.gl’s state (without dispathcing a kepler.gl action). This will give user the full control over kepler.gl’s component state.
+User can import a specific action handler in their root reducer and use it to directly modify kepler.gl’s state (without dispatching a kepler.gl action). This will give user the full control over kepler.gl’s component state.
Here is an example how you can listen to an app action `QUERY_SUCCESS` and call `updateVisDataUpdater` to load data into kepler.gl.
diff --git a/docs/api-reference/reducers/combine.md b/docs/api-reference/reducers/combine.md
index 46c8537f4..78ae3aa02 100644
--- a/docs/api-reference/reducers/combine.md
+++ b/docs/api-reference/reducers/combine.md
@@ -7,7 +7,7 @@
## combinedUpdaters
-Some actions will affect the entire kepler.lg instance state.
+Some actions will affect the entire kepler.gl instance state.
The updaters for these actions is exported as `combinedUpdaters`. These updater take the entire instance state
as the first argument. Read more about [Using updaters][5]
@@ -82,7 +82,7 @@ Returns **[Object][7]** nextState
[4]: #parameters
-[5]: ../advanced-usage/using-updaters.md
+[5]: ../advanced-usages/using-updaters.md
[6]: ../actions/actions.md#adddatatomap
diff --git a/docs/api-reference/reducers/map-state.md b/docs/api-reference/reducers/map-state.md
index 53b601ce8..8015f29b0 100644
--- a/docs/api-reference/reducers/map-state.md
+++ b/docs/api-reference/reducers/map-state.md
@@ -38,7 +38,7 @@ const composedReducer = (state, action) => {
foo: {
...state.keplerGl.foo,
mapState: mapStateUpdaters.fitBoundsUpdater(
- mapState, {payload: [127.34, 31.09, 127.56, 31.59]]}
+ state.keplerGl.foo.mapState, {payload: [127.34, 31.09, 127.56, 31.59]}
)
}
}
@@ -179,7 +179,7 @@ Returns **[Object][19]** nextState
[16]: #parameters-5
-[17]: ../advanced-usage/using-updaters.md
+[17]: ../advanced-usages/using-updaters.md
[18]: ../actions/actions.md#fitbounds
diff --git a/docs/api-reference/reducers/map-style.md b/docs/api-reference/reducers/map-style.md
index 5e7185389..554ef5204 100644
--- a/docs/api-reference/reducers/map-style.md
+++ b/docs/api-reference/reducers/map-style.md
@@ -40,7 +40,7 @@ const composedReducer = (state, action) => {
foo: {
...state.keplerGl.foo,
mapStyle: mapStyleUpdaters.mapConfigChangeUpdater(
- mapStyle,
+ state.keplerGl.foo.mapStyle,
{payload: {visibleLayerGroups: {label: false, road: true, background: true}}}
)
}
@@ -234,7 +234,7 @@ Returns **[Object][23]** nextState
[20]: #parameters-7
-[21]: ../advanced-usage/using-updaters.md
+[21]: ../advanced-usages/using-updaters.md
[22]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
diff --git a/docs/api-reference/reducers/reducers.md b/docs/api-reference/reducers/reducers.md
index 46eb2d2d3..f7b1c9893 100644
--- a/docs/api-reference/reducers/reducers.md
+++ b/docs/api-reference/reducers/reducers.md
@@ -33,7 +33,7 @@ const reducers = combineReducers({
});
// using createStore
-export default createStore(reducer, initialState, applyMiddleware(taskMiddleware));
+export default createStore(reducers, initialState, applyMiddleware(taskMiddleware));
```
### keplerGlReducer.initialState
@@ -64,7 +64,7 @@ const myKeplerGlReducer = keplerGlReducer
### keplerGlReducer.plugin
-Returns a kepler.gl reducer that will also pass each action through additional reducers spiecified.
+Returns a kepler.gl reducer that will also pass each action through additional reducers specified.
The parameter should be either a reducer map or a reducer function.
The state passed into the additional action handler is the instance state.
It will include all the subreducers `visState`, `uiState`, `mapState` and `mapStyle`.
diff --git a/docs/api-reference/reducers/ui-state.md b/docs/api-reference/reducers/ui-state.md
index ba90d510a..9b5eb6a57 100644
--- a/docs/api-reference/reducers/ui-state.md
+++ b/docs/api-reference/reducers/ui-state.md
@@ -60,7 +60,7 @@ const composedReducer = (state, action) => {
foo: {
...state.keplerGl.foo,
uiState: uiStateUpdaters.toggleSidePanelUpdater(
- uiState, {payload: null}
+ state.keplerGl.foo.uiState, {payload: null}
)
}
}
@@ -521,7 +521,7 @@ Returns **[Object][55]** nextState
[52]: #parameters-19
-[53]: ../advanced-usage/using-updaters.md
+[53]: ../advanced-usages/using-updaters.md
[54]: ../actions/actions.md#addnotification
diff --git a/docs/api-reference/reducers/vis-state.md b/docs/api-reference/reducers/vis-state.md
index 10ca6e4c1..1996af724 100644
--- a/docs/api-reference/reducers/vis-state.md
+++ b/docs/api-reference/reducers/vis-state.md
@@ -202,7 +202,7 @@ Returns **[Object][69]** nextState
### layerTypeChangeUpdater
-Update layer type. Previews layer config will be copied if applicable.
+Update layer type. Previous layer config will be copied if applicable.
- **Action**: [`layerTypeChange`][79]
@@ -328,7 +328,7 @@ Remove a filter
- `state` **[Object][69]** `visState`
- `action` **[Object][69]** action
- - `action.idx` **[Number][74]** index of filter to b e removed
+ - `action.idx` **[Number][74]** index of filter to be removed
Returns **[Object][69]** nextState
@@ -342,7 +342,7 @@ remove layer
- `state` **[Object][69]** `visState`
- `action` **[Object][69]** action
- - `action.idx` **[Number][74]** index of layer to b e removed
+ - `action.idx` **[Number][74]** index of layer to be removed
Returns **[Object][69]** nextState
@@ -688,7 +688,7 @@ Returns **[Object][69]** nextState
[66]: #parameters-30
-[67]: ../advanced-usage/using-updaters.md
+[67]: ../advanced-usages/using-updaters.md
[68]: ../actions/actions.md#addfilter
diff --git a/docs/keplergl-jupyter/README.md b/docs/keplergl-jupyter/README.md
index c2da3917f..f089976b4 100644
--- a/docs/keplergl-jupyter/README.md
+++ b/docs/keplergl-jupyter/README.md
@@ -30,7 +30,7 @@
### Prerequisites
-- Python >= 2
+- Python >= 3
- ipywidgets >= 7.0.0
To install use pip:
diff --git a/docs/release-notes.md b/docs/release-notes.md
index ca0356492..6394ed934 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -2,6 +2,35 @@
This page shows features that have landed to kepler.gl in major versions. For a complete list of changes to kepler.gl including each minor version, please [visit the full change log](../CHANGELOG.md).
+## 3.3
+
+### deck.gl 9 / luma.gl 9 Rendering Stack
+
+kepler.gl 3.3 upgrades the entire rendering stack from **deck.gl 8 / luma.gl 8** to **deck.gl 9.2 / luma.gl 9.2**. This is a major internal change that modernizes how WebGL resources, shaders, and rendering parameters are handled. Blending is now declarative via WebGPU-style string constants, all custom shaders target GLSL 300 es with Uniform Buffer Objects (UBOs), and the GPU initialization callback uses luma.gl's device-agnostic `Device` abstraction instead of a raw `WebGLRenderingContext`.
+
+Most users will not need to change application code, but library consumers who extend layers or interact with the WebGL context directly should review the [Upgrade Guide](upgrade-guide-v3.3.md).
+
+### Editor Layer Migration
+
+The editor layer (`EditableGeoJsonLayer` for draw/edit modes) has been migrated from the deprecated `@nebula.gl/layers` package to `@deck.gl-community/editable-layers`. The API remains the same.
+
+### TypeScript 5.6
+
+TypeScript has been upgraded from 4.7.2 to 5.6.3.
+
+### More Bug Fixes and Improvements
+
+- Fix blending for subtractive mode.
+- Restore shadow effect uniform shadow during nighttime.
+- Fix raster tile layer shaders (UBO migration, pipeline validation patch).
+- Fix aggregation layer highlight outlines and infinite config changes.
+- Fix H3, GeoJSON, line, and arc layer issues after the deck.gl 9 upgrade.
+- Disable mouse-move and hover console logging by default.
+- Fog effects.
+- Internal improvements to aggregation layers.
+
+For the complete list of commits, see the [full change log](../CHANGELOG.md).
+
## 3.2
_Released August 21st, 2025_
@@ -87,7 +116,7 @@ By leveraging the efficiency of vector tiles, users can visualize complex, large
### DuckDB Support & SQL Explorer
-Leverage DuckDB directly within kepler.gl your geospatial projects with big data. Write and execute SQL queries to perform custom analyses, visualizing the results on your map.
+Leverage DuckDB directly within kepler.gl for your geospatial projects with big data. Write and execute SQL queries to perform custom analyses, visualizing the results on your map.
DuckDB enables in-browser data processing, allowing you to work with large datasets without the need for external infrastructure.
@@ -105,7 +134,7 @@ Mapbox and MapLibre base maps are now simultaneously supported.
### Color Scale Improvements
-Custom color scale is now supported in categorial/ordinal fields, aggregate layers, and other layer components. In addition, custom breaks are now supported within the color scales.
+Custom color scale is now supported in categorical/ordinal fields, aggregate layers, and other layer components. In addition, custom breaks are now supported within the color scales.
### Value Formatting
diff --git a/docs/spatial-analysis-tutorial/README.md b/docs/spatial-analysis-tutorial/README.md
index 42ddef0da..638b19725 100644
--- a/docs/spatial-analysis-tutorial/README.md
+++ b/docs/spatial-analysis-tutorial/README.md
@@ -8,7 +8,7 @@ The spatial data analysis tools are powered by [Geoda](https://geodacenter.githu
#### [Get Started](./get-started.md)
-#### [Spatial Data Wrangling - Basic Operations](./spatial-data-wragling.md)
+#### [Spatial Data Wrangling - Basic Operations](./spatial-data-wrangling.md)
#### [Spatial Data Wrangling - GIS Operations](./spatial-data-gis.md)
@@ -34,8 +34,8 @@ The spatial data analysis tools are powered by [Geoda](https://geodacenter.githu
#### [Local Spatial Autocorrelation](./local-spatial-autocorrelation.md)
- [LISA and Local Moran](./local-moran-i.md)
-- Other Local Spatial Autorrelation
-- Multivariate Local Spatial Autorrelation
+- Other Local Spatial Autocorrelation
+- Multivariate Local Spatial Autocorrelation
- LISA for Discrete Variables
#### [Spatial Regression](./spatial-regression.md)
diff --git a/docs/spatial-analysis-tutorial/basic-mapping.md b/docs/spatial-analysis-tutorial/basic-mapping.md
index 73ca0301c..b62fdf388 100644
--- a/docs/spatial-analysis-tutorial/basic-mapping.md
+++ b/docs/spatial-analysis-tutorial/basic-mapping.md
@@ -4,7 +4,7 @@ Original GeoDa lab by Luc Anselin: https://geodacenter.github.io/workbook/3a_map
## Introduction
-In this Chapter, we will explore a range of mapping and geovisualization options. We start with a review of common thematic map classifications. We next focus on different statistical maps, in particular maps that are designed to highight extreme values or outliers. We also illustrate maps for categorical variables (unique value maps), and their extension to multiple categories in the form of co-location maps. We close with a review of some special approaches to geovisualization, i.e., ~~conditional maps~~, the cartogram and map animation.
+In this Chapter, we will explore a range of mapping and geovisualization options. We start with a review of common thematic map classifications. We next focus on different statistical maps, in particular maps that are designed to highlight extreme values or outliers. We also illustrate maps for categorical variables (unique value maps), and their extension to multiple categories in the form of co-location maps. We close with a review of some special approaches to geovisualization, i.e., ~~conditional maps~~, the cartogram and map animation.
The main objective is to use the maps to interact with the data as part of the exploration process.
@@ -102,7 +102,7 @@ In Kepler.gl, the equal intervals method is also callled 'quantize'. See documen
To create an equal intervals map for the variable `rent2008` with 4 categories, you can use the following prompt:
```
-Can you create a equal intervals map for the variable 'rent2008' with 4 categories using the same YlOrBr color scheme?
+Can you create an equal intervals map for the variable 'rent2008' with 4 categories using the same YlOrBr color scheme?
```
<img width="1068" alt="Screenshot 2025-06-12 at 3 16 40 PM" src="https://github.com/user-attachments/assets/d985a359-f053-4a3e-bdcf-f3e015adc70d" />
@@ -119,12 +119,12 @@ Can you create a histogram for the variable 'rent2008' with 4 bins?
The resulting histogram has the exact same ranges for each interval as the equal intervals map. The number of observations in each category is the same as well. The values for the number of observations in the descriptive statistics below the graph match the values given in the map legend.
-Finally, we illustrate the equivalence between the two graphs by selecting a category in the map legend. To accomplish this, we select the highest category in the histogram. This selects will highlights the related observations in the map, through linking.
+Finally, we illustrate the equivalence between the two graphs by selecting a category in the map legend. To accomplish this, we select the highest category in the histogram. This selection will highlight the related observations in the map, through linking.
![equal-map-histogram-link](https://github.com/user-attachments/assets/e60c9d4b-4c56-4993-8b65-6c9ca5325ce0)
:::note
-The linking is now way one for now: from plot to map. The two-way linking is not supported yet.
+The linking is now one way for now: from plot to map. The two-way linking is not supported yet.
:::
@@ -133,7 +133,7 @@ The linking is now way one for now: from plot to map. The two-way linking is not
In Kepler.gl, there are several options to customize the map.
- change base map [doc](https://docs.kepler.gl/docs/user-guides/f-map-styles)
-- chang layer order [doc](https://docs.kepler.gl/docs/user-guides/b-kepler-gl-workflow/add-data-to-layers/d-blend-and-rearrange-layers)
+- change layer order [doc](https://docs.kepler.gl/docs/user-guides/b-kepler-gl-workflow/add-data-to-layers/d-blend-and-rearrange-layers)
- configure layer [doc](https://docs.kepler.gl/docs/user-guides/d-layer-attributes)
- configure color palettes [doc](https://docs.kepler.gl/docs/user-guides/l-color-attributes)
diff --git a/docs/spatial-analysis-tutorial/rate-mapping.md b/docs/spatial-analysis-tutorial/rate-mapping.md
index 3d76be7d8..b9da0d53a 100644
--- a/docs/spatial-analysis-tutorial/rate-mapping.md
+++ b/docs/spatial-analysis-tutorial/rate-mapping.md
@@ -36,7 +36,7 @@ Can you load the dataset: https://geodacenter.github.io/data-and-lab/data/ohlung
We start our discussion of rate maps by illustrating something we should not be doing. This pertains to the important difference between a spatially extensive and a spatially intensive variable. In many applications that use public health data, we typically have access to a count of events, such as the number of cancer cases (a spatially extensive variable), as well as to the relevant population at risk, which allows for the calculation of a rate (a spatially intensive variable).
-In our example, we could consider the number (count) of lung cancer cases by county among white females in Ohio (say, in 1968). The corresponding variable in our data set is LFW68. We can create a box map (hinge 1.5) in the by now familar prompt:
+In our example, we could consider the number (count) of lung cancer cases by county among white females in Ohio (say, in 1968). The corresponding variable in our data set is LFW68. We can create a box map (hinge 1.5) in the by now familiar prompt:
```
Can you create a box map (hinge 1.5) for the LFW68 variable using color theme BuRd?
diff --git a/docs/spatial-analysis-tutorial/spatial-data-gis.md b/docs/spatial-analysis-tutorial/spatial-data-gis.md
index 0e7f47ba2..b001f13df 100644
--- a/docs/spatial-analysis-tutorial/spatial-data-gis.md
+++ b/docs/spatial-analysis-tutorial/spatial-data-gis.md
@@ -58,7 +58,7 @@ The center point and Thiessen polygon functionality is brought up through the op
### Mean centers and centroids
-The **mean centers** is obtained as the simple average of the the X and Y coordinates that define the vertices of the polygon. The **centroid** is more complex, and is the actual center of mass of the polygon (image a cardboard cutout of the polygon, the centroid is the central point where a pin would hold up the cutout in a stable equilibrium).
+The **mean center** is obtained as the simple average of the the X and Y coordinates that define the vertices of the polygon. The **centroid** is more complex, and is the actual center of mass of the polygon (image a cardboard cutout of the polygon, the centroid is the central point where a pin would hold up the cutout in a stable equilibrium).
Both methods can yield strange results when the polygons are highly irregular or in a so-called multi-polygon situation (different polygons associated with the same ID, such as a mainland area and an island belonging to the same county). In those instances the centers can end up being located outside the polygon. Nevertheless, the shape centers are a handy way to convert a polygon layer to a corresponding point layer with the same underlying geography. For example, as we will see in a later chapter, they are used under the hood to calculate distance-based spatial weights for polygons.
@@ -96,7 +96,7 @@ An important graph is the so-called max-min connectivity graph, which shows the
A minimum spanning tree (MST) associated with a graph is a path through the graph that ensures that each node is visited once and which achieves a minimum cost objective. A typical application is to minimize the total distance traveled through the path. The MST is employed in a range of methods, particularly clustering algorithms.
-The Ai assistant uses GeoDa library to construct an MST based on the max-min connectivity graph for any point layer. The construction of the MST employs Prim’s algorithm, which is illustrated in more detail in the [Appendix](https://geodacenter.github.io/workbook/01_datawrangling_2/lab1b.html#appendix).
+The AI assistant uses GeoDa library to construct an MST based on the max-min connectivity graph for any point layer. The construction of the MST employs Prim’s algorithm, which is illustrated in more detail in the [Appendix](https://geodacenter.github.io/workbook/01_datawrangling_2/lab1b.html#appendix).
To create a minimum spanning tree for the point layer, you can use the following prompt:
@@ -108,7 +108,7 @@ Can you create a minimum spanning tree for the point layer?
## Aggregation
-Spatial data sets often contain identifiers of larger encompassing units, such as states for counties, or census tracts for individual household data. Spatial disolve is a function that allows us to aggregate the smaller units into the larger units.
+Spatial data sets often contain identifiers of larger encompassing units, such as states for counties, or census tracts for individual household data. Spatial dissolve is a function that allows us to aggregate the smaller units into the larger units.
We illustrate this functionality with the natregimes dataset using **spatial dissolve** tool. First, load the dataset:
diff --git a/docs/spatial-analysis-tutorial/spatial-data-wrangling.md b/docs/spatial-analysis-tutorial/spatial-data-wrangling.md
index 9356e59bf..b3e796675 100644
--- a/docs/spatial-analysis-tutorial/spatial-data-wrangling.md
+++ b/docs/spatial-analysis-tutorial/spatial-data-wrangling.md
@@ -81,7 +81,7 @@ If the csv file contains coordinates, the AI Assistant will automatically create
Here we convert the chicago_sup.dbf, which is used in [GeoDa workbook](https://geodacenter.github.io/workbook/01_datawrangling_1/lab1a.html), to chicago_sup.csv file:
```
-Can you create a map layerfrom https://geodacenter.github.io/data-and-lab/data/chicago_sup.csv?
+Can you create a map layer from https://geodacenter.github.io/data-and-lab/data/chicago_sup.csv?
```
<img width="1092" alt="Screenshot 2025-05-31 at 10 45 07 PM" src="https://github.com/user-attachments/assets/0a3059db-bc76-427d-8866-885f21bded71" />
@@ -95,7 +95,7 @@ In the GeoDa workbook, you will need to specify the latitude/longitude columns i
Grid layers are useful to aggregate counts of point locations in order to calculate point pattern statistics, such as quadrat counts. In Kepler.gl, users can create a grid layer from a dataset easily. See [Kepler.gl Grid Layer](https://docs.kepler.gl/docs/user-guides/c-types-of-layers/d-grid) for more details.
-In this tutorial, we are using the Ai assistant to create a grid layer from either the current map view (the map bounds defind by northwest and southweast points), or use the bounding box of an available data source.
+In this tutorial, we are using the Ai assistant to create a grid layer from either the current map view (the map bounds defined by northwest and southeast points), or use the bounding box of an available data source.
```
Can you create a 20x20 grid layer over the chicago_commpop areas?
@@ -125,7 +125,7 @@ The table of the dataset can be opened by using the 'Show Data Table' button whe
<img width="1145" alt="Screenshot 2025-06-06 at 3 49 55 PM" src="https://github.com/user-attachments/assets/fa80088b-59d7-4821-ae12-1b7c063fac90" />
-This is a view only table. You can not e.g. edit the data, or add/remove a column in this table. The Foursqure Studio, which is developed based on Kepler.gl, has a more powerful table editor (see docs [here](https://docs.foursquare.com/analytics-products/docs/data)). We hope these features will be upstream back to Kepler.gl in the future.
+This is a view only table. You can not e.g. edit the data, or add/remove a column in this table. The Foursquare Studio, which is developed based on Kepler.gl, has a more powerful table editor (see docs [here](https://docs.foursquare.com/analytics-products/docs/data)). We hope these features will be upstream back to Kepler.gl in the future.
However, using different AI Assistant tools, like query, standardizeVariable, etc., you can achieve the same goal of manipulating the data in the table. The limitation is that you can not directly edit the data in the table, but you can create a new dataset with the manipulated data.
@@ -160,7 +160,7 @@ The calculator functionality is to create a new variable with:
- univariate and bivariate operations
- spatial lag
- rates
-- data/time operations
+- date/time operations
Spatial Lag and Rates are advanced functions that are discussed separately in later chapters.
diff --git a/docs/upgrade-guide-v3.3.md b/docs/upgrade-guide-v3.3.md
new file mode 100644
index 000000000..b56258544
--- /dev/null
+++ b/docs/upgrade-guide-v3.3.md
@@ -0,0 +1,201 @@
+# Upgrade Guide — kepler.gl 3.3
+
+kepler.gl 3.3 upgrades the rendering stack from **deck.gl 8 / luma.gl 8** to **deck.gl 9 / luma.gl 9**. This is a major dependency upgrade that changes how WebGL resources, shaders, and rendering parameters are handled under the hood. Most kepler.gl users will not need to change application code, but library consumers who extend layers, interact with the WebGL context directly, or depend on internal types should review this guide.
+
+## Dependency Changes
+
+| Package group | Old version | New version |
+| --------------- | ----------- | ----------- |
+| `@deck.gl/*` | 8.9.x | **9.2.11** |
+| `@luma.gl/*` | 8.x | **9.2.6** |
+| `@loaders.gl/*` | 3.x / 4.3.2 | **4.3.4** |
+| `math.gl` | — | **^4.1.0** |
+| `typescript` | 4.7.2 | **5.6.3** |
+
+### New dependencies
+
+| Package | Version | Notes |
+| ------------------------------------ | ------- | --------------------------------------------- |
+| `@deck.gl-community/editable-layers` | 9.2.8 | Replaces `@nebula.gl/layers` for editor layer |
+| `@deck.gl-community/layers` | 9.2.8 | Community layers package |
+| `@deck.gl/widgets` | 9.2.11 | New deck.gl 9 module |
+| `@luma.gl/effects` | 9.2.6 | New luma.gl 9 module |
+| `@luma.gl/webgpu` | 9.2.6 | Dev dependency for test environment |
+
+### Removed dependencies
+
+| Package | Notes |
+| ----------------------------------- | ------------------------------------------------ |
+| `hubble.gl/core`, `hubble.gl/react` | Removed from kepler.gl |
+| `@nebula.gl/layers` | Replaced by `@deck.gl-community/editable-layers` |
+
+### Yarn resolutions
+
+All `@deck.gl/*`, `@loaders.gl/*`, and `@luma.gl/*` packages are pinned via resolutions. If your project has its own resolutions for these packages, make sure they are consistent with the versions above.
+
+---
+
+## Breaking Changes for Library Consumers
+
+### 1. WebGL context callback renamed
+
+The `DeckGL` component callback changed from `onWebGLInitialized` to `onDeviceInitialized`. The callback now receives a luma.gl `Device` instead of a raw `WebGLRenderingContext`.
+
+If you override `MapContainerFactory` and rely on the initialization callback:
+
+```diff
+- onWebGLInitialized={gl => this._onDeckInitialized(gl)}
++ onDeviceInitialized={device => this._onDeckInitialized(device)}
+```
+
+### 2. Layer blending is now declarative
+
+In deck.gl 8, kepler.gl called `setParameters(gl, {...})` with GL constants before each render to set blending mode. In deck.gl 9, blending is set via a `parameters` prop on `DeckGL` using WebGPU-style string constants.
+
+**Old (removed):**
+
+```js
+import {setParameters} from '@luma.gl/core';
+setParameters(gl, {
+ blendFunc: [GL.SRC_ALPHA, GL.ONE_MINUS_SRC_ALPHA],
+ blendEquation: GL.FUNC_ADD
+});
+```
+
+**New:**
+
+```js
+import {getLayerBlendingParameters} from '@kepler.gl/utils';
+<DeckGL parameters={getLayerBlendingParameters(layerBlending)} />;
+```
+
+If your application calls `setParameters` for blending, migrate to the `parameters` prop instead.
+
+### 3. GPU parameter constants
+
+A new module `@kepler.gl/constants` exports WebGPU-style string constants that replace the old GL enum values throughout the codebase:
+
+- `BLEND_FACTOR` — `'zero'`, `'one'`, `'src-alpha'`, etc.
+- `BLEND_OPERATION` — `'add'`, `'subtract'`, etc.
+- `FILTER_MODE` — `'nearest'`, `'linear'`
+- `ADDRESS_MODE` — `'clamp-to-edge'`, `'repeat'`, `'mirror-repeat'`
+- `TEXTURE_FORMAT` — `'r8uint'`, `'rgba8unorm'`, etc.
+- `TOPOLOGY` — `'triangle-list'`, `'triangle-strip'`, etc.
+
+If you referenced GL constants for kepler.gl layer configuration, switch to these string constants.
+
+### 4. `setLayerBlending` removed
+
+The function `setLayerBlending` (previously exported from `@kepler.gl/utils`) is removed. Use `getLayerBlendingParameters` instead, which returns a `parameters` object for deck.gl 9.
+
+### 5. Aggregation layers use deck.gl 9 native CPU aggregation
+
+`GridLayer` and `HexagonLayer` now use deck.gl 9's built-in CPU aggregation (`gpuAggregation: false`) instead of kepler.gl's custom `CPUAggregator`. This means:
+
+- `onSetColorDomain` / `onSetElevationDomain` callbacks now receive `[min, max]` number arrays instead of `{domain, aggregatedBins}` objects.
+- Per-bin filtering is applied at the accessor level (`getColorValue`, `getElevationValue`) rather than via a `_filterData` prop.
+- `ClusterLayer` still uses the internal `CPUAggregator`.
+
+If you listen to domain callbacks on aggregation layers, update your handler to accept the new format:
+
+```diff
+- onSetColorDomain={({domain, aggregatedBins}) => { ... }}
++ onSetColorDomain={domain => { /* domain is [min, max] */ }}
+```
+
+### 6. Shader changes — GLSL 300 es and UBOs
+
+All custom shaders now target **GLSL 300 es**:
+
+- `attribute` → `in`, `varying` → `in`/`out`
+- `texture2D()` → `texture()`
+- `gl_FragColor` → explicit `out vec4 fragColor`
+- Uniforms are declared inside **Uniform Buffer Objects** (UBOs) instead of standalone `uniform` declarations. For example, `uniform float opacity` becomes a field inside a `uniform layerUniforms { float opacity; } layer;` block, accessed as `layer.opacity`.
+
+If you have custom layers that inject into kepler.gl's shaders (via `editShader` or shader hooks), review the new GLSL 300 es syntax.
+
+### 7. Model API changes in custom layers
+
+If you extend any kepler.gl layer and interact with `Model` objects:
+
+```diff
+- model.setUniforms({elevationScale: 1.0});
++ model.shaderInputs.setProps({elevationScale: {elevationScale: 1.0}});
+```
+
+```diff
+- model.draw();
++ model.draw(this.context.renderPass);
+```
+
+The `_getModel(gl)` pattern is replaced — models are now created from `super._getModel()` and modified via `model.setGeometry()`.
+
+### 8. `PickInfo` type change
+
+A custom `PickInfo<DataT>` type is now defined in `@kepler.gl/types`. This type is a relaxed version of deck.gl 9's `PickingInfo` to work around stricter generic inference in the `DeckGL` component's callback types. If you import `PickingInfo` from `@deck.gl/core`, be aware that kepler.gl's callbacks use `PickInfo` instead.
+
+### 9. `MapViewState` type is locally defined
+
+`MapViewState` is no longer imported from `@deck.gl/core/typed`. It is defined locally in `@kepler.gl/types` (from `reducers.d.ts`). If you were importing it from deck.gl, import from `@kepler.gl/types` instead.
+
+### 10. Editor layers migrated to `@deck.gl-community`
+
+The editor layer (`EditableGeoJsonLayer`) is now imported from `@deck.gl-community/editable-layers` instead of `@nebula.gl/layers`. If you extend or replace the editor layer factory, update your imports.
+
+### 11. Lighting effect API changes
+
+`CustomDeckLightingEffect` (kepler.gl's lighting/shadow effect) has been rewritten for deck.gl 9:
+
+- `preRender` → `setup(context)` / `cleanup(context)` lifecycle
+- `getModuleParameters` → `getShaderModuleProps`
+- Shadow module uses UBO-based uniforms with `uniformTypes` declarations
+- `Texture2D` constructor → `device.createTexture()`
+- `addDefaultShaderModule` / `removeDefaultShaderModule` API on `deck` instance
+
+If you extend `CustomDeckLightingEffect`, review the new lifecycle methods.
+
+### 12. `MapView` with `legacyMeterSizes`
+
+kepler.gl now creates `MapView` with `{legacyMeterSizes: true}` to preserve backward-compatible meter-based sizing behavior from deck.gl 8.
+
+---
+
+## Runtime Patches
+
+kepler.gl 3.3 applies two patches to work around deck.gl 9 / luma.gl 9 issues. These are applied automatically and require no action, but are documented for awareness:
+
+1. **`patchDeckRendererForPostProcessing()`** — Patches `DeckRenderer._resizeRenderBuffers` to add depth-stencil attachments to post-processing framebuffers. In deck.gl 9, FBOs are created without depth buffers by default, which breaks depth testing when post-processing effects are active.
+
+2. **`patchPipelineValidation()`** — Patches `WEBGLRenderPipeline._getLinkStatus` to suppress false-positive "mixed sampler type" validation errors in luma.gl 9. This patch is applied lazily only when a raster tile layer is instantiated.
+
+---
+
+## New Features
+
+### 3D Tile Layer (experimental)
+
+A new **3D Tile Layer** enables rendering of photogrammetry meshes, buildings, terrain and other 3D content from OGC 3D Tiles and I3S tilesets. Supported providers:
+
+- **OGC 3D Tiles 1.0 / 1.1** — any standard `tileset.json` endpoint.
+- **Google Photorealistic 3D Tiles** — requires a Google Maps API key.
+- **Cesium Ion** — requires a Cesium Ion access token.
+- **ArcGIS I3S** — scene service endpoints.
+
+Add a 3D tileset via the **Add Data → Tilesets** modal by selecting the "3D Tile" type. The layer supports opacity, point size configuration, zoom-to-layer, and the Light and Shadow effect. See the [3D Tile Layer user guide](./user-guides/c-types-of-layers/p-3d-tile-layer.md) for details.
+
+### Fog post-processing effects
+
+Two new post-processing effects are available:
+
+- **Distance Fog** (`distanceFog`) — depth-buffer-based fog that increases with camera distance. Parameters: `density`, `fogStart`, `fogRange`, `fogColor`.
+- **Surface Fog** (`surfaceFog`) — elevation-based ground fog applied below a configurable height in meters. Parameters: `density`, `height`, `thickness`, `fogColor`.
+
+Both effects are registered in `POSTPROCESSING_EFFECTS` and can be created via `createEffect()`. Only one fog effect can be active at a time (enforced by the effect manager UI). Fog effects are ordered early in the post-processing chain to read the depth buffer before subsequent effects clear it.
+
+---
+
+## Known Issues
+
+### Performance with tiled layers on older hardware
+
+The deck.gl 9 upgrade introduces additional per-frame overhead in the layer management and GPU state pipelines compared to deck.gl 8. This may cause noticeable slowness when interacting with tiled layers (`Tile3DLayer`, raster tile layers) — especially when changing visual properties like opacity or when moving the camera over a scene with many visible tiles. The issue is more pronounced on older or lower-end GPUs and is currently under investigation.
diff --git a/docs/user-guides/README.md b/docs/user-guides/README.md
index 7b3ad5919..e1e094e23 100644
--- a/docs/user-guides/README.md
+++ b/docs/user-guides/README.md
@@ -47,10 +47,10 @@ This guide will teach you how to perform data analysis in Kepler.gl by adding da
#### [Filters](./e-filters.md)
-#### [Map styles](./f-map-styles.md#map-styles.md)
-* [Base map styles](./f-map-styles.md#base-map-styles.md)
-* [Map layers](./f-map-styles.md#map-layers.md)
-* [Custom styles](./f-map-styles.md#custom-styles.md)
+#### [Map styles](./f-map-styles.md#map-styles)
+* [Base map styles](./f-map-styles.md#base-map-styles)
+* [Map layers](./f-map-styles.md#toggle-map-layers)
+* [Custom styles](./f-map-styles.md#custom-map-styles)
#### [Interactions](./g-interactions.md)
* [Tooltips](./g-interactions.md#tooltips)
diff --git a/docs/user-guides/ai-assistant.md b/docs/user-guides/ai-assistant.md
index 49192fa8a..ebed6301c 100644
--- a/docs/user-guides/ai-assistant.md
+++ b/docs/user-guides/ai-assistant.md
@@ -23,7 +23,7 @@ The following providers and models are currently supported.
## Parameters
-Before initating the AI assistant, the following parameters are required. A temperature and Top P are selected for you; however, you will need to provide an API key for a remote model, and a base URL for local models.
+Before initiating the AI assistant, the following parameters are required. A temperature and Top P are selected for you; however, you will need to provide an API key for a remote model, and a base URL for local models.
| **Parameter** | **Description** |
| --------------- | -------------------------------------------------------------------------------------------------------------------------------------- |
@@ -68,7 +68,7 @@ After granting access, users can start talking to the AI assistant.
## Map and Data Analysis Assistant
-Using LLM function tools, kepler.gl's AI assistant can help transform users's prompt into actions that executed inside kepler.gl. This allows users to interact with kepler.gl in a more natural and creative way.
+Using LLM function tools, kepler.gl's AI assistant can help transform users' prompt into actions that executed inside kepler.gl. This allows users to interact with kepler.gl in a more natural and creative way.
### Why use LLM function tools?
@@ -121,7 +121,7 @@ One can click the **Box Select** button first. Then, start selecting the data in
For scatter plot, the AI assistant will create a scatter plot with a regression line by default. If users select points in the plot, there will be 3 different regression lines created: one for all points, one for the selected points, and one for the unselected points.
-If users click the 'expand' button on the top right corner of the plot, the plot will be expanded to a floating modal dialog with more details of the regressions shown in a tablt.
+If users click the 'expand' button on the top right corner of the plot, the plot will be expanded to a floating modal dialog with more details of the regressions shown in a table.
The regression details include:
diff --git a/docs/user-guides/b-kepler-gl-workflow/a-add-data-to-the-map.md b/docs/user-guides/b-kepler-gl-workflow/a-add-data-to-the-map.md
index 0c83412dc..fa1d67788 100644
--- a/docs/user-guides/b-kepler-gl-workflow/a-add-data-to-the-map.md
+++ b/docs/user-guides/b-kepler-gl-workflow/a-add-data-to-the-map.md
@@ -17,7 +17,7 @@
## Supported Projection Coordinate System
-kepler.gl only supports **[Web Mercator]([https://en.wikipedia.org/wiki/Web_Mercator_projection) EPSG:3857 -- WGS84**.
+kepler.gl only supports **[Web Mercator](https://en.wikipedia.org/wiki/Web_Mercator_projection) EPSG:3857 -- WGS84**.
Geometry coordinates should be presented with a geographic coordinate reference system, using the WGS84 datum, and with longitude and latitude units of decimal degrees.
@@ -68,7 +68,7 @@ kepler.gl will auto detect layer, if the column names follows certain naming con
|**Polygon**| A column content contains `geojson` data types. Acceptable formats include [Well-Known Text](http://www.postgis.net/docs/ST_AsText.html) e.g. `POLYGON ((-74.158 40.835, -74.148 40.830, -74.151 40.832, -74.158 40.835))` and [GeoJSON Geometry](https://tools.ietf.org/html/rfc7946#appendix-A). e.g. `{"type":"LineString","coordinates":[[100.0, 0.0],[101.0, 1.0]]}`
#### 3. Embed Geometries in CSV
-Geometries (Polygons, Points, LindStrings etc) can be embedded into CSV as a `GeoJSON` or `WKT` formatted string.
+Geometries (Polygons, Points, LineStrings etc) can be embedded into CSV as a `GeoJSON` or `WKT` formatted string.
##### `GeoJSON` String
Use the geometry of a Feature, which includes type and coordinates. It should be a JSON formatted string, with the `"` corrected escaped. More info on [String escape in csv](https://gpdb.docs.pivotal.io/43250/admin_guide/load/topics/g-escaping-in-csv-formatted-files.html)
diff --git a/docs/user-guides/c-types-of-layers/README.md b/docs/user-guides/c-types-of-layers/README.md
index d24d12505..e25b51e99 100644
--- a/docs/user-guides/c-types-of-layers/README.md
+++ b/docs/user-guides/c-types-of-layers/README.md
@@ -160,4 +160,31 @@ Examples of supported WMS Tiles:
For step-by-step instructions, see [WMS Layer — How to add](./o-wms-layer.md).
+## 3D Tile Layer (experimental)
+
+3D Tile layers render photogrammetry meshes, buildings, terrain and other 3D content served as OGC 3D Tiles or I3S tilesets. The layer streams and renders tiles based on the current viewport and camera position, loading detail on demand.
+
+Supported providers:
+
+- OGC 3D Tiles 1.0 / 1.1 (any `tileset.json` endpoint)
+- Google Photorealistic 3D Tiles (requires a Google Maps API key)
+- Cesium Ion (requires a Cesium Ion access token)
+- ArcGIS I3S scene services
+
+Example ArcGIS I3S tileset:
+
+- San Francisco Buildings — https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/SanFrancisco_Bldgs/SceneServer/layers/0
+
+Example Cesium Ion tilesets (require access token):
+
+- Washington DC mesh — https://assets.ion.cesium.com/57588/tileset.json
+- Melbourne point cloud — https://assets.ion.cesium.com/43978/tileset.json
+- Mount St. Helens — https://assets.cesium.com/33301/tileset.json
+
+Example generic OGC 3D Tiles:
+
+- Royal Exhibition Building (point cloud) — https://raw.githubusercontent.com/visgl/deck.gl-data/master/3d-tiles/RoyalExhibitionBuilding/tileset.json
+
+For step-by-step instructions, see [3D Tile Layer — How to add](./p-3d-tile-layer.md).
+
[Back to table of contents](../README.md)
diff --git a/docs/user-guides/c-types-of-layers/k-trip.md b/docs/user-guides/c-types-of-layers/k-trip.md
index ebfdf7942..62de6d4a4 100644
--- a/docs/user-guides/c-types-of-layers/k-trip.md
+++ b/docs/user-guides/c-types-of-layers/k-trip.md
@@ -7,7 +7,7 @@ Trip layer can display animated path.
### How to use trip layer to animate path
**Data format**
-Currently trip layer support a special `geoJSON` format where the coordinate `linestring` has a 4th element denoting timestamp.
+Currently trip layer supports a special `geoJSON` format where the coordinate `linestring` has a 4th element denoting timestamp.
In order to animate the path, the `geoJSON` data needs to contain `LineString` in its features' geometry, and the coordinates in the `LineString` need to have 4 elements in the format of `[longitude, latitude, altitude, timestamp]`, with the last element being a timestamp. Valid timestamp formats include unix in seconds such as `1564184363` or in milliseconds such as `1564184363000`.
diff --git a/docs/user-guides/c-types-of-layers/p-3d-tile-layer.md b/docs/user-guides/c-types-of-layers/p-3d-tile-layer.md
new file mode 100644
index 000000000..941feed25
--- /dev/null
+++ b/docs/user-guides/c-types-of-layers/p-3d-tile-layer.md
@@ -0,0 +1,54 @@
+# 3D Tile Layer — How to add (experimental)
+
+Use the 3D Tile layer to render photogrammetry meshes, buildings, terrain and other 3D content served as [OGC 3D Tiles](https://www.ogc.org/standard/3dtiles/) or [I3S](https://www.ogc.org/standard/i3s/) tilesets.
+
+1. Open Add Data → Tilesets.
+2. Select the **3D Tile** tileset type.
+3. Enter a **name** for the layer.
+4. Paste the **Tileset URL** — this should point to a `tileset.json` (3D Tiles) or an I3S service endpoint.
+5. If the provider requires authentication (Google or Cesium Ion), enter the **Access Token**.
+6. Click **Add**. A new 3D Tile layer will appear in the Layers panel.
+
+## Supported providers
+
+| Provider | URL pattern | Authentication |
+| ---------------------------------- | -------------------------------- | ----------------------- |
+| **OGC 3D Tiles 1.0 / 1.1** | Any URL ending in `tileset.json` | None |
+| **Google Photorealistic 3D Tiles** | URL containing `google` | Google Maps API key |
+| **Cesium Ion** | URL containing `ion.cesium` | Cesium Ion access token |
+| **ArcGIS I3S** | URL containing `arcgis` | None |
+
+The provider is auto-detected from the URL. When a Google or Cesium Ion tileset is detected, an additional **Access Token** field will appear in the form.
+
+## Layer settings
+
+- **Opacity** — controls the transparency of the 3D tiles (0 – fully transparent, 1 – fully opaque).
+- **Point Size** — adjusts the size of point-cloud content within the tileset.
+
+## Notes
+
+- The layer supports the **Light and Shadow** effect. For I3S tilesets that lack explicit PBR material parameters, the layer automatically patches material defaults to prevent black surfaces.
+- **Zoom to layer** is supported — the layer extracts bounding volume information from the tileset and enables the zoom-to-bounds action in the layer panel.
+- 3D Tile layers are **not pickable** (no tooltip on hover).
+
+## Example tilesets
+
+Google Photorealistic 3D Tiles (requires API key):
+
+- `https://tile.googleapis.com/v1/3dtiles/root.json`
+
+Cesium Ion (requires access token):
+
+- Washington DC — `https://assets.ion.cesium.com/57588/tileset.json`
+- Melbourne point cloud — `https://assets.ion.cesium.com/43978/tileset.json`
+- Mount St. Helens — `https://assets.cesium.com/33301/tileset.json`
+
+Generic OGC 3D Tiles:
+
+- Royal Exhibition Building (point cloud) — `https://raw.githubusercontent.com/visgl/deck.gl-data/master/3d-tiles/RoyalExhibitionBuilding/tileset.json`
+
+ArcGIS I3S:
+
+- San Francisco Buildings — `https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/SanFrancisco_Bldgs/SceneServer/layers/0`
+
+[Back to layer overview](./README.md)
diff --git a/docs/user-guides/f-map-styles.md b/docs/user-guides/f-map-styles.md
index c94df017e..698e71f31 100644
--- a/docs/user-guides/f-map-styles.md
+++ b/docs/user-guides/f-map-styles.md
@@ -12,7 +12,7 @@
![map styles](https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/f-map-styles-0.png "Map panel")
-kepler.gl provide a set of [Mapbox](https://www.mapbox.com) basemap styles as background map, including 3D buildings! You can also add your own custom map sytle using the Mapbox style link.
+kepler.gl provide a set of [Mapbox](https://www.mapbox.com) basemap styles as background map, including 3D buildings! You can also add your own custom map style using the Mapbox style link.
## Base Map Styles
@@ -36,9 +36,9 @@ Hide and show water, buildings, roads, and more. Options include:
- __Buildings__: shows building footprints.
- __Water__: displays bodies of water.
- __Land__: Shows parks, mountains, and other landscape features.
-- __3d Building__: Shows 3D buildings on the map. 3D buildings are only visible in the 3D map view. Resolution automatically updates based on current map zoom level. Use the input below to edit 3D bulding color.
+- __3d Building__: Shows 3D buildings on the map. 3D buildings are only visible in the 3D map view. Resolution automatically updates based on current map zoom level. Use the input below to edit 3D building color.
-![3d building](https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/f-map-styles-3.png "3d buldings")
+![3d building](https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/f-map-styles-3.png "3d buildings")
#### Layer Order
@@ -48,7 +48,7 @@ To control the order in which map imagery layers are displayed, toggle the move
__TIP__: Move labels to the top on maps with colored layers to keep the labels from being concealed.
-![Examales of ordered layers](https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/f-map-styles-5.png "examples of ordered layers")
+![Examples of ordered layers](https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/f-map-styles-5.png "examples of ordered layers")
## Custom Map Styles
diff --git a/docs/user-guides/g-interactions.md b/docs/user-guides/g-interactions.md
index 21d06e44a..c4a9ff442 100644
--- a/docs/user-guides/g-interactions.md
+++ b/docs/user-guides/g-interactions.md
@@ -33,7 +33,7 @@ tooltip displays metrics when hovering over a data point. You can choose which f
- __Web link__
-Tooltip can be a clicable weblink. To add a web link as tooltip, add url starts with `http://` to the field content.
+Tooltip can be a clickable weblink. To add a web link as tooltip, add a url that starts with `http://` to the field content.
![tooltips](https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/g-interactions-1.png "tooltips")
diff --git a/docs/user-guides/k-save-and-export.md b/docs/user-guides/k-save-and-export.md
index 32a5634cc..5170fc956 100644
--- a/docs/user-guides/k-save-and-export.md
+++ b/docs/user-guides/k-save-and-export.md
@@ -34,7 +34,7 @@ You can export the current map using two different formats. The __Export Map__ w
To save and export your current map as HTML file, click on __Export Map__ and subsequently on __Export__.
When prompted provide your own mapbox token to be used in the newly generated file. If you don't provide a Mapbox Token,
-Kepler.gl will use a default one which can expire at anytime without any communication and therefore break your your existing map.
+Kepler.gl will use a default one which can expire at anytime without any communication and therefore break your existing map.
#### How to update an exported map token
In order to edit the mapbox token in your html file you simply need to perform the following steps:
@@ -47,7 +47,7 @@ In order to edit the mapbox token in your html file you simply need to perform t
**/
const MAPBOX_TOKEN = 'CURRENT_TOKEN';
```
-4. Replace the current value a new valid token. The code should now look like the following:
+4. Replace the current value with a new valid token. The code should now look like the following:
```javascript
/**
* Provide your MapBox Token
@@ -58,9 +58,9 @@ In order to edit the mapbox token in your html file you simply need to perform t
### <a href="#export-json-map">Export Map as JSON</a>
![Export Map as JSON](https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/k-save-and-export-5.png "activate interactions")
-You can export the current map as a `json` file. This is useful when you are running your own kepler.gl application and want to load your map programmatticaly.
+You can export the current map as a `json` file. This is useful when you are running your own kepler.gl application and want to load your map programmatically.
The JSON file includes:
-- dataset: processed data to create used to render your map
+- dataset: processed data used to render your map
- config: layer, filter, map style and interaction settings.
The map config includes the current layer, filter, map style and interaction settings.
diff --git a/docs/user-guides/l-color-attributes.md b/docs/user-guides/l-color-attributes.md
index 37ce26e8f..c3c1f30e5 100644
--- a/docs/user-guides/l-color-attributes.md
+++ b/docs/user-guides/l-color-attributes.md
@@ -1,6 +1,6 @@
# Color Palettes
-Color palettes pride both predefined and customized options and can be applied to either fill or stroke. Predefined palettes comes in diverging, sequential and qualitative types.
+Color palettes provide both predefined and customized options and can be applied to either fill or stroke. Predefined palettes comes in diverging, sequential and qualitative types.
To choose a palette:
diff --git a/docs/user-guides/m-map-settings.md b/docs/user-guides/m-map-settings.md
index f6638c270..09647d424 100644
--- a/docs/user-guides/m-map-settings.md
+++ b/docs/user-guides/m-map-settings.md
@@ -40,7 +40,7 @@ View your map in 3D by clicking the 3D icon in the top right corner of your map
## Display Legend
-View your map in 3D by clicking the 3D icon in the top right corner of your map:
+Display a legend for visible layers on the map.
![Display Legend](https://d1a3f4spazzrp4.cloudfront.net/kepler.gl/documentation/m-map-settings-legend.png "Display Legend")
diff --git a/docs/user-guides/sql-data-explorer.md b/docs/user-guides/sql-data-explorer.md
index d85147b45..a5fb426a3 100644
--- a/docs/user-guides/sql-data-explorer.md
+++ b/docs/user-guides/sql-data-explorer.md
@@ -2,7 +2,7 @@
**This feature is currently undergoing development. Stay tuned for updates!**
-The new SQL data explorer provides a DucKDB instance where you can use SQL to transform and add data to the map.
+The new SQL data explorer provides a DuckDB instance where you can use SQL to transform and add data to the map.
![SQL Data Explorer](https://4sq-studio-public.s3.us-west-2.amazonaws.com/statics/keplergl/images/kepler-duck-db.png 'SQL Data Explorer')
diff --git a/examples/demo-app/README.md b/examples/demo-app/README.md
index a6a3b8764..ff1b9126f 100644
--- a/examples/demo-app/README.md
+++ b/examples/demo-app/README.md
@@ -17,6 +17,10 @@ Go to the root directory and install the dependencies using yarn:
yarn bootstrap
```
+If install fails while building the `gl` package, use Node 18.18.2 from the repo root `.nvmrc` (`nvm install` / `nvm use`), or see [Troubleshooting: gl package install](../../contributing/DEVELOPERS.md#troubleshooting-gl-package-install).
+
+If `yarn start` errors with missing `@kepler.gl/duckdb/components` (or other workspace `dist/` files), from the repo root run `yarn workspaces foreach -At run stab` or run full `yarn bootstrap` (not only `yarn install`).
+
Then, go to the `examples/demo-app` directory and install the dependencies using yarn:
```sh
diff --git a/examples/demo-app/esbuild.config.mjs b/examples/demo-app/esbuild.config.mjs
index 5ed61c6f2..6d93cddf5 100644
--- a/examples/demo-app/esbuild.config.mjs
+++ b/examples/demo-app/esbuild.config.mjs
@@ -25,9 +25,6 @@ const EXTERNAL_DECK_SRC = join(LIB_DIR, 'deck.gl');
// For debugging loaders.gl, load loaders.gl from external loaders.gl directory
const EXTERNAL_LOADERS_SRC = join(LIB_DIR, 'loaders.gl');
-// For debugging hubble.gl, load hubble.gl from external hubble.gl directory
-const EXTERNAL_HUBBLE_SRC = join(LIB_DIR, '../../hubble.gl');
-
const port = 8080;
const getThirdPartyLibraryAliases = useKeplerNodeModules => {
@@ -124,7 +121,7 @@ function addAliases(externals, args) {
const resolveAlias = getThirdPartyLibraryAliases(true);
// Combine flags
- const useLocalDeck = args.includes('--env.deck') || args.includes('--env.hubble_src');
+ const useLocalDeck = args.includes('--env.deck');
const useRepoDeck = args.includes('--env.deck_src');
const useLocalAiAssistant = args.includes('--env.ai');
@@ -202,12 +199,6 @@ function addAliases(externals, args) {
});
}
- if (args.includes('--env.hubble_src')) {
- externals['hubble.gl'].forEach(mdl => {
- resolveAlias[`@hubble.gl/${mdl}`] = `${EXTERNAL_HUBBLE_SRC}/modules/${mdl}/src`;
- });
- }
-
return resolveAlias;
}
@@ -227,7 +218,7 @@ function openURL(url) {
(async () => {
// local dev
- const modules = ['@deck.gl', '@loaders.gl', '@luma.gl', '@probe.gl', '@hubble.gl'];
+ const modules = ['@deck.gl', '@loaders.gl', '@luma.gl', '@probe.gl'];
const loadAllDirs = modules.map(
dir =>
new Promise(success => {
@@ -251,8 +242,7 @@ function openURL(url) {
'deck.gl': results[0],
'loaders.gl': results[1],
'luma.gl': results[2],
- 'probe.gl': results[3],
- 'hubble.gl': results[4]
+ 'probe.gl': results[3]
}));
const localAliases = addAliases(externals, args);
diff --git a/examples/demo-app/package.json b/examples/demo-app/package.json
index e9b0d1476..297e98d63 100644
--- a/examples/demo-app/package.json
+++ b/examples/demo-app/package.json
@@ -8,8 +8,7 @@
"start:local-ai": "NODE_ENV=local node esbuild.config.mjs --start --env.ai",
"start:local-deck": "NODE_ENV=local node esbuild.config.mjs --start --env.deck",
"start:local-deck-src": "NODE_ENV=local node esbuild.config.mjs --start --env.deck_src",
- "start:local-loaders-src": "NODE_ENV=local node esbuild.config.mjs --start --env.loaders_src",
- "start:local-hubble-src": "NODE_ENV=local node esbuild.config.mjs --start --env.hubble_src"
+ "start:local-loaders-src": "NODE_ENV=local node esbuild.config.mjs --start --env.loaders_src"
},
"dependencies": {
"@auth0/auth0-spa-js": "^2.1.2",
diff --git a/examples/demo-app/src/store.js b/examples/demo-app/src/store.js
index f643a43cd..d015ecabf 100644
--- a/examples/demo-app/src/store.js
+++ b/examples/demo-app/src/store.js
@@ -21,10 +21,14 @@ const reducers = combineReducers({
export const middlewares = enhanceReduxMiddleware([thunk, routerMiddleware(browserHistory)]);
+const NOISY_ACTIONS = new Set(['@@kepler.gl/MOUSE_MOVE', '@@kepler.gl/LAYER_HOVER']);
+
+// Set window.__KEPLER_LOG_FULL__ = true in the console to include
+// high-frequency actions (MOUSE_MOVE, LAYER_HOVER, UPDATE_MAP).
if (NODE_ENV === 'local') {
- // Redux logger
const logger = createLogger({
- collapsed: () => true // Collapse all actions for more compact log
+ collapsed: () => true,
+ predicate: (_getState, action) => Window.__KEPLER_LOG_FULL__ || !NOISY_ACTIONS.has(action.type)
});
middlewares.push(logger);
}
@@ -42,11 +46,7 @@ let composeEnhancers = compose;
if (Window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) {
composeEnhancers = Window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__({
- actionsBlacklist: [
- '@@kepler.gl/MOUSE_MOVE',
- '@@kepler.gl/UPDATE_MAP',
- '@@kepler.gl/LAYER_HOVER'
- ]
+ actionsBlacklist: [...NOISY_ACTIONS]
});
}
diff --git a/examples/replace-component/esbuild.config.mjs b/examples/replace-component/esbuild.config.mjs
index 8ebbf010a..c03862649 100644
--- a/examples/replace-component/esbuild.config.mjs
+++ b/examples/replace-component/esbuild.config.mjs
@@ -23,9 +23,6 @@ const EXTERNAL_DECK_SRC = join(LIB_DIR, 'deck.gl');
// For debugging loaders.gl, load loaders.gl from external loaders.gl directory
const EXTERNAL_LOADERS_SRC = join(LIB_DIR, 'loaders.gl');
-// For debugging hubble.gl, load hubble.gl from external hubble.gl directory
-const EXTERNAL_HUBBLE_SRC = join(LIB_DIR, '../../hubble.gl');
-
const port = 8080;
const NODE_ENV = JSON.stringify(process.env.NODE_ENV || 'production');
@@ -94,7 +91,7 @@ function addAliases(externals, args) {
const resolveAlias = RESOLVE_LOCAL_ALIASES;
// Combine flags
- const useLocalDeck = args.includes('--env.deck') || args.includes('--env.hubble_src');
+ const useLocalDeck = args.includes('--env.deck');
const useRepoDeck = args.includes('--env.deck_src');
// resolve deck.gl from local dir
@@ -142,12 +139,6 @@ function addAliases(externals, args) {
});
}
- if (args.includes('--env.hubble_src')) {
- externals['hubble.gl'].forEach(mdl => {
- resolveAlias[`@hubble.gl/${mdl}`] = `${EXTERNAL_HUBBLE_SRC}/modules/${mdl}/src`;
- });
- }
-
return resolveAlias;
}
@@ -167,7 +158,7 @@ function openURL(url) {
(async () => {
// local dev
- const modules = ['@deck.gl', '@loaders.gl', '@luma.gl', '@probe.gl', '@hubble.gl'];
+ const modules = ['@deck.gl', '@loaders.gl', '@luma.gl', '@probe.gl'];
const loadAllDirs = modules.map(
dir =>
new Promise(success => {
@@ -191,8 +182,7 @@ function openURL(url) {
'deck.gl': results[0],
'loaders.gl': results[1],
'luma.gl': results[2],
- 'probe.gl': results[3],
- 'hubble.gl': results[4]
+ 'probe.gl': results[3]
}));
const localAliases = addAliases(externals, args);
diff --git a/jest.config.js b/jest.config.js
index 64a54a802..504896e6e 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -22,7 +22,7 @@ const config = {
// Some libraries (even if transitive) are transitioning to ESM and need additional transpilation. Relevant issues:
// - tiny-sdf: https://github.com/visgl/deck.gl/issues/7735
transformIgnorePatterns: [
- '/node_modules\\/(?!(.*@mapbox\\/tiny-sdf\\.*|@loaders\\.gl))',
+ '/node_modules\\/(?!(.*@mapbox\\/tiny-sdf\\.*|@loaders\\.gl|@deck\\.gl|@deck\\.gl-community|@luma\\.gl|preact))',
'\\.pnp\\.[^\\/]+$'
]
};
diff --git a/package.json b/package.json
index cfdbb4d5a..59e042e9d 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"url": "https://github.com/keplergl/kepler.gl.git"
},
"scripts": {
- "bootstrap": "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true git submodule update --init --recursive && yarn install && yarn fix-dependencies",
+ "bootstrap": "PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true git submodule update --init --recursive && yarn install && yarn fix-dependencies && yarn workspaces foreach -At run stab",
"install:example": "cd examples/demo-app && NODE_OPTIONS=--openssl-legacy-provider yarn",
"install:web": "yarn install:example && cd website && yarn",
"install-and-start": "node ./scripts/install-and-start",
@@ -101,13 +101,12 @@
"umd"
],
"dependencies": {
- "@deck.gl/mapbox": "^8.9.27",
- "@hubble.gl/core": "1.4.0",
- "@hubble.gl/react": "1.4.0",
+ "@deck.gl/mapbox": "^9.2.11",
"@kepler.gl/components": "3.2.6",
- "@loaders.gl/polyfills": "^4.3.2",
+ "@loaders.gl/polyfills": "^4.3.4",
"@types/mapbox__geo-viewport": "^0.4.1",
"html-webpack-plugin": "^4.3.0",
+ "math.gl": "^4.1.0",
"monaco-editor": "^0.52.0",
"typedoc": "^0.19.2"
},
@@ -133,10 +132,12 @@
"@babel/runtime": "^7.12.1",
"@babel/traverse": "^7.12.1",
"@cfaester/enzyme-adapter-react-18": "^0.7.0",
- "@deck.gl/test-utils": "^8.9.27",
- "@loaders.gl/polyfills": "^4.3.2",
- "@luma.gl/test-utils": "^8.5.20",
- "@nebula.gl/layers": "1.0.2-alpha.1",
+ "@deck.gl-community/editable-layers": "9.2.8",
+ "@deck.gl-community/layers": "9.2.8",
+ "@deck.gl/test-utils": "^9.2.11",
+ "@loaders.gl/polyfills": "^4.3.4",
+ "@luma.gl/test-utils": "^9.2.6",
+ "@luma.gl/webgpu": "^9.2.6",
"@open-wc/webpack-import-meta-loader": "0.4.7",
"@probe.gl/env": "^3.5.0",
"@probe.gl/test-utils": "^3.5.0",
@@ -210,7 +211,7 @@
"tape": "^4.9.2",
"tape-catch": "^1.0.6",
"typedoc-plugin-markdown": "^3.0.11",
- "typescript": "4.7.2",
+ "typescript": "5.6.3",
"url-loader": "^4.1.1",
"usehooks-ts": "^3.1.0",
"watchify": "^3.6.1",
@@ -223,25 +224,36 @@
"webpack-stats-plugin": "^0.2.1"
},
"resolutions": {
- "@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",
- "@loaders.gl/wms": "4.3.2",
- "@luma.gl/constants": "8.5.21",
- "@luma.gl/core": "8.5.21",
- "@luma.gl/experimental": "8.5.21",
- "@luma.gl/shadertools": "8.5.21",
- "@luma.gl/test-utils": "8.5.21",
- "@luma.gl/webgl": "8.5.21",
+ "@deck.gl/aggregation-layers": "9.2.11",
+ "@deck.gl/core": "9.2.11",
+ "@deck.gl/extensions": "9.2.11",
+ "@deck.gl/geo-layers": "9.2.11",
+ "@deck.gl/layers": "9.2.11",
+ "@deck.gl/mesh-layers": "9.2.11",
+ "@deck.gl/mapbox": "9.2.11",
+ "@deck.gl/react": "9.2.11",
+ "@deck.gl/widgets": "9.2.11",
+ "@loaders.gl/core": "4.3.4",
+ "@loaders.gl/csv": "4.3.4",
+ "@loaders.gl/draco": "4.3.4",
+ "@loaders.gl/gltf": "4.3.4",
+ "@loaders.gl/json": "4.3.4",
+ "@loaders.gl/loader-utils": "4.3.4",
+ "@loaders.gl/polyfills": "4.3.4",
+ "@loaders.gl/arrow": "4.3.4",
+ "@loaders.gl/parquet": "4.3.4",
+ "@loaders.gl/gis": "4.3.4",
+ "@loaders.gl/schema": "4.3.4",
+ "@loaders.gl/wkt": "4.3.4",
+ "@loaders.gl/wms": "4.3.4",
+ "@luma.gl/constants": "9.2.6",
+ "@luma.gl/core": "9.2.6",
+ "@luma.gl/effects": "9.2.6",
+ "@luma.gl/engine": "9.2.6",
+ "@luma.gl/shadertools": "9.2.6",
+ "@luma.gl/test-utils": "9.2.6",
+ "@luma.gl/webgl": "9.2.6",
+ "@luma.gl/webgpu": "9.2.6",
"@types/lodash": "4.17.5",
"browserslist": "^4.17.0",
"caniuse-lite": "^1.0.30001636",
diff --git a/scripts/fix-dependencies.sh b/scripts/fix-dependencies.sh
index 2d59eb0b4..ab88cc881 100755
--- a/scripts/fix-dependencies.sh
+++ b/scripts/fix-dependencies.sh
@@ -8,6 +8,16 @@
# We use tail to avoid the first line of the the output which is the command itself
yarn babel node_modules/@mapbox/tiny-sdf/index.js | tail -n +2 > node_modules/@mapbox/tiny-sdf/index.cjs
+# Make the CJS build resolvable by require() - patch package.json to add exports and remove ESM-only type
+node -e "
+const fs = require('fs');
+const p = 'node_modules/@mapbox/tiny-sdf/package.json';
+const pkg = JSON.parse(fs.readFileSync(p, 'utf8'));
+pkg.exports = { '.': { require: './index.cjs', import: './index.js', default: './index.cjs' } };
+pkg.main = './index.cjs';
+fs.writeFileSync(p, JSON.stringify(pkg, null, 2));
+"
+
# Patch for an issue with react-virtualized output having an invalid import
# https://github.com/bvaughn/react-virtualized/issues/1212
if [[ -f "node_modules/react-virtualized/dist/es/WindowScroller/utils/onScroll.js" ]]; then
diff --git a/src/actions/package.json b/src/actions/package.json
index cc6b01b45..4f7f00ed1 100644
--- a/src/actions/package.json
+++ b/src/actions/package.json
@@ -30,7 +30,7 @@
"umd"
],
"dependencies": {
- "@deck.gl/core": "^8.9.27",
+ "@deck.gl/core": "^9.2.11",
"@kepler.gl/cloud-providers": "3.2.6",
"@kepler.gl/constants": "3.2.6",
"@kepler.gl/layers": "3.2.6",
diff --git a/src/actions/src/vis-state-actions.ts b/src/actions/src/vis-state-actions.ts
index 91556fa69..c8dd0e45d 100644
--- a/src/actions/src/vis-state-actions.ts
+++ b/src/actions/src/vis-state-actions.ts
@@ -2,7 +2,6 @@
// Copyright contributors to the kepler.gl project
// vis-state-reducer
-import {PickInfo} from '@deck.gl/core/lib/deck';
import {default as ActionTypes} from './action-types';
import {FileCacheItem} from '@kepler.gl/processors';
import {Layer, LayerBaseConfig} from '@kepler.gl/layers';
@@ -11,6 +10,7 @@ import {
AddDataToMapPayload,
ValueOf,
Merge,
+ PickInfo,
RGBColor,
NestedPartial,
LayerVisConfig,
@@ -1112,7 +1112,7 @@ export function toggleFilterFeature(
}
export type OnLayerHoverUpdaterAction = {
- info: PickInfo<any> | null;
+ info: PickInfo | null;
mapIndex?: number;
};
/**
@@ -1124,7 +1124,7 @@ export type OnLayerHoverUpdaterAction = {
* @public
*/
export function onLayerHover(
- info: PickInfo<any> | null,
+ info: PickInfo | null,
mapIndex?: number
): Merge<OnLayerHoverUpdaterAction, {type: typeof ActionTypes.LAYER_HOVER}> {
return {
@@ -1135,7 +1135,7 @@ export function onLayerHover(
}
export type OnLayerClickUpdaterAction = {
- info: PickInfo<any> | null;
+ info: PickInfo | null;
};
/**
* Trigger layer click event with clicked object
@@ -1145,7 +1145,7 @@ export type OnLayerClickUpdaterAction = {
* @public
*/
export function onLayerClick(
- info: PickInfo<any> | null
+ info: PickInfo | null
): Merge<OnLayerClickUpdaterAction, {type: typeof ActionTypes.LAYER_CLICK}> {
return {
type: ActionTypes.LAYER_CLICK,
diff --git a/src/ai-assistant/src/components/ai-assistant-component.tsx b/src/ai-assistant/src/components/ai-assistant-component.tsx
index d4cc0cc0c..63a4d678c 100644
--- a/src/ai-assistant/src/components/ai-assistant-component.tsx
+++ b/src/ai-assistant/src/components/ai-assistant-component.tsx
@@ -72,8 +72,11 @@ export function AiAssistantComponent() {
const instructions = `${INSTRUCTIONS}\n\n${datasetMetaData}`;
// generate ideas from LLM
- const {temporaryPrompt, restartChat: libraryRestartChat} = useAssistant({...assistantProps, instructions});
-
+ const {temporaryPrompt, restartChat: libraryRestartChat} = useAssistant({
+ ...assistantProps,
+ instructions
+ });
+
const restartChatRef = useRef(libraryRestartChat);
restartChatRef.current = libraryRestartChat;
@@ -104,13 +107,13 @@ export function AiAssistantComponent() {
const onRestartAssistant = async () => {
dispatch(updateAiAssistantMessages([]));
-
+
try {
await restartChatRef.current();
} catch (e) {
console.error('Error restarting chat:', e);
}
-
+
setRestartKey(prev => prev + 1);
};
diff --git a/src/ai-assistant/src/config/models.ts b/src/ai-assistant/src/config/models.ts
index af8cd0ed6..c335f3103 100644
--- a/src/ai-assistant/src/config/models.ts
+++ b/src/ai-assistant/src/config/models.ts
@@ -2,12 +2,12 @@
// Copyright contributors to the kepler.gl project
export const PROVIDER_DEFAULT_BASE_URLS = {
- "openai": "https://api.openai.com/v1",
- "anthropic": "https://api.anthropic.com/v1",
- "google": "https://generativelanguage.googleapis.com/v1beta",
- "deepseek": "https://api.deepseek.com/v1",
- "xai": "https://api.x.ai/v1",
- "ollama": "http://localhost:11434/api"
+ openai: 'https://api.openai.com/v1',
+ anthropic: 'https://api.anthropic.com/v1',
+ google: 'https://generativelanguage.googleapis.com/v1beta',
+ deepseek: 'https://api.deepseek.com/v1',
+ xai: 'https://api.x.ai/v1',
+ ollama: 'http://localhost:11434/api'
};
export const PROVIDER_MODELS = {
diff --git a/src/components/package.json b/src/components/package.json
index 23145dac5..36391af6e 100644
--- a/src/components/package.json
+++ b/src/components/package.json
@@ -30,8 +30,10 @@
"umd"
],
"dependencies": {
- "@deck.gl/core": "^8.9.27",
- "@deck.gl/react": "^8.9.27",
+ "@deck.gl-community/editable-layers": "9.2.8",
+ "@deck.gl/core": "^9.2.11",
+ "@deck.gl/react": "^9.2.11",
+ "@deck.gl/widgets": "^9.2.11",
"@dnd-kit/core": "^6.1.0",
"@dnd-kit/modifiers": "^7.0.0",
"@dnd-kit/sortable": "^8.0.0",
@@ -52,11 +54,10 @@
"@kepler.gl/table": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
- "@loaders.gl/mvt": "^4.3.2",
- "@loaders.gl/pmtiles": "^4.3.2",
- "@loaders.gl/wms": "4.3.2",
+ "@loaders.gl/mvt": "^4.3.4",
+ "@loaders.gl/pmtiles": "^4.3.4",
+ "@loaders.gl/wms": "4.3.4",
"@mapbox/mapbox-sdk": "^0.15.3",
- "@nebula.gl/edit-modes": "1.0.2-alpha.1",
"@tippyjs/react": "^4.2.0",
"@types/classnames": "^2.3.1",
"@types/d3-array": "^2.8.0",
@@ -91,7 +92,7 @@
"mapbox-gl": "1.13.1",
"maplibre-gl": "^3.6.2",
"markdown-to-jsx": "^7.7.6",
- "mjolnir.js": "^2.7.0",
+ "mjolnir.js": "^3.0.0",
"moment": "^2.10.6",
"moment-timezone": "^0.5.35",
"prop-types": "^15.6.0",
diff --git a/src/components/src/common/data-table/index.tsx b/src/components/src/common/data-table/index.tsx
index 8c8a0661f..bf658cadb 100644
--- a/src/components/src/common/data-table/index.tsx
+++ b/src/components/src/common/data-table/index.tsx
@@ -349,7 +349,7 @@ export const TableSection = ({
height={headerGridProps.height + browserScrollBarWidth}
width={headerGridWidth}
scrollLeft={scrollLeft}
- onScroll={args => onScroll?.({...args, scrollTop:scrollTop ?? 0 })}
+ onScroll={args => onScroll?.({...args, scrollTop: scrollTop ?? 0})}
/>
</div>
<div
diff --git a/src/components/src/common/icons/close.tsx b/src/components/src/common/icons/close.tsx
index c9c95bf2f..8d9828837 100644
--- a/src/components/src/common/icons/close.tsx
+++ b/src/components/src/common/icons/close.tsx
@@ -14,7 +14,13 @@ export default class Close extends Component<Partial<BaseProps>> {
return (
<Base {...this.props}>
<g transform="translate(32,32)">
- <path d="M-16,-16 L16,16 M16,-16 L-16,16" stroke="currentColor" strokeWidth="5" strokeLinecap="round" fill="none" />
+ <path
+ d="M-16,-16 L16,16 M16,-16 L-16,16"
+ stroke="currentColor"
+ strokeWidth="5"
+ strokeLinecap="round"
+ fill="none"
+ />
</g>
</Base>
);
diff --git a/src/components/src/common/icons/effects/distance-fog.tsx b/src/components/src/common/icons/effects/distance-fog.tsx
new file mode 100644
index 000000000..a6ddd4caa
--- /dev/null
+++ b/src/components/src/common/icons/effects/distance-fog.tsx
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
+import Base from '../base';
+
+export default class DistanceFog extends Component {
+ static propTypes = {
+ /** Set the height of the icon, ex. '16px' */
+ height: PropTypes.string
+ };
+
+ static defaultProps = {
+ height: '16px',
+ viewBox: '0 0 16 16',
+ predefinedClassName: 'data-ex-icons-distance-fog'
+ };
+
+ render() {
+ return (
+ <Base {...this.props}>
+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path
+ opacity="0.3"
+ d="M2 3.5H14"
+ stroke="currentColor"
+ strokeWidth="1.2"
+ strokeLinecap="round"
+ />
+ <path
+ opacity="0.45"
+ d="M3 5.8H13"
+ stroke="currentColor"
+ strokeWidth="1.2"
+ strokeLinecap="round"
+ />
+ <path
+ opacity="0.6"
+ d="M2.5 8.1H13.5"
+ stroke="currentColor"
+ strokeWidth="1.4"
+ strokeLinecap="round"
+ />
+ <path
+ opacity="0.8"
+ d="M3 10.4H13"
+ stroke="currentColor"
+ strokeWidth="1.4"
+ strokeLinecap="round"
+ />
+ <path d="M2 12.7H14" stroke="currentColor" strokeWidth="1.6" strokeLinecap="round" />
+ </svg>
+ </Base>
+ );
+ }
+}
diff --git a/src/components/src/common/icons/effects/surface-fog.tsx b/src/components/src/common/icons/effects/surface-fog.tsx
new file mode 100644
index 000000000..bbaabf97f
--- /dev/null
+++ b/src/components/src/common/icons/effects/surface-fog.tsx
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
+import Base from '../base';
+
+export default class SurfaceFog extends Component {
+ static propTypes = {
+ /** Set the height of the icon, ex. '16px' */
+ height: PropTypes.string
+ };
+
+ static defaultProps = {
+ height: '16px',
+ viewBox: '0 0 16 16',
+ predefinedClassName: 'data-ex-icons-surface-fog'
+ };
+
+ render() {
+ return (
+ <Base {...this.props}>
+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path d="M5 3L8 1.5L11 3L8 4.5L5 3Z" opacity="0.6" />
+ <path
+ d="M3.5 5L8 2.5L12.5 5L8 7.5L3.5 5Z"
+ fill="none"
+ stroke="currentColor"
+ strokeWidth="0.8"
+ opacity="0.5"
+ />
+ <path
+ opacity="0.35"
+ d="M2 8.5C3.5 8 4.5 8.8 6 8.3C7.5 7.8 8.5 8.6 10 8.1C11.5 7.6 12.5 8.4 14 7.9"
+ stroke="currentColor"
+ strokeWidth="1"
+ strokeLinecap="round"
+ fill="none"
+ />
+ <path
+ opacity="0.55"
+ d="M1.5 10.3C3 9.8 4 10.6 5.5 10.1C7 9.6 8 10.4 9.5 9.9C11 9.4 12 10.2 14.5 9.7"
+ stroke="currentColor"
+ strokeWidth="1.2"
+ strokeLinecap="round"
+ fill="none"
+ />
+ <path
+ opacity="0.75"
+ d="M2 12.2C3.5 11.7 4.5 12.5 6 12C7.5 11.5 8.5 12.3 10 11.8C11.5 11.3 12.5 12.1 14 11.6"
+ stroke="currentColor"
+ strokeWidth="1.4"
+ strokeLinecap="round"
+ fill="none"
+ />
+ <path
+ d="M1.5 14C3 13.5 4 14.3 5.5 13.8C7 13.3 8 14.1 9.5 13.6C11 13.1 12 13.9 14.5 13.4"
+ stroke="currentColor"
+ strokeWidth="1.6"
+ strokeLinecap="round"
+ fill="none"
+ />
+ </svg>
+ </Base>
+ );
+ }
+}
diff --git a/src/components/src/common/icons/index.tsx b/src/components/src/common/icons/index.tsx
index a0e983342..1223af6bd 100644
--- a/src/components/src/common/icons/index.tsx
+++ b/src/components/src/common/icons/index.tsx
@@ -116,5 +116,7 @@ export {default as EdgeWorkEffectIcon} from './effects/edge-work';
export {default as VignetteEffectIcon} from './effects/vignette';
export {default as MagnifyEffectIcon} from './effects/magnify';
export {default as HexagonalPixelateEffectIcon} from './effects/hexagonal-pixelate';
+export {default as DistanceFogEffectIcon} from './effects/distance-fog';
+export {default as SurfaceFogEffectIcon} from './effects/surface-fog';
export {default as ZoomIn} from './zoom-in';
export {default as ZoomOut} from './zoom-out';
diff --git a/src/components/src/editor/editor.tsx b/src/components/src/editor/editor.tsx
index 7ea295dd0..34650ffea 100644
--- a/src/components/src/editor/editor.tsx
+++ b/src/components/src/editor/editor.tsx
@@ -18,7 +18,7 @@ import {
} from '@kepler.gl/constants';
import {Layer, EditorLayerUtils} from '@kepler.gl/layers';
import {Filter, FeatureSelectionContext, Feature} from '@kepler.gl/types';
-import {FeatureOf, Polygon} from '@nebula.gl/edit-modes';
+import {Feature as EditableFeature, Polygon} from '@deck.gl-community/editable-layers';
import {Datasets} from '@kepler.gl/table';
import {RootContext} from '../context';
@@ -76,7 +76,7 @@ export default function EditorFactory(
<StyledWrapper className={classnames('editor', className)} style={style}>
{visiblePanel ? (
<FeatureActionPanel
- selectedFeature={selectedFeature as FeatureOf<Polygon>}
+ selectedFeature={selectedFeature as EditableFeature<Polygon>}
datasets={datasets}
layers={layers}
currentFilter={currentFilter}
@@ -191,7 +191,7 @@ export default function EditorFactory(
return (
<PortalEditor
- selectedFeature={selectedFeature as FeatureOf<Polygon>}
+ selectedFeature={selectedFeature as EditableFeature<Polygon>}
visiblePanel={Boolean(rightClick) && selectedFeature && index === mapIndex}
datasets={datasets}
layers={availableLayers}
diff --git a/src/components/src/editor/feature-action-panel.tsx b/src/components/src/editor/feature-action-panel.tsx
index b92ef91fd..98edd0ba6 100644
--- a/src/components/src/editor/feature-action-panel.tsx
+++ b/src/components/src/editor/feature-action-panel.tsx
@@ -10,7 +10,7 @@ import styled from 'styled-components';
import {Layer} from '@kepler.gl/layers';
import {Filter} from '@kepler.gl/types';
-import {Feature} from '@nebula.gl/edit-modes';
+import {Feature} from '@deck.gl-community/editable-layers';
import {Datasets} from '@kepler.gl/table';
import {canApplyFeatureFilter} from '@kepler.gl/utils';
diff --git a/src/components/src/effects/effect-configurator.tsx b/src/components/src/effects/effect-configurator.tsx
index 382865f49..a9159b4a0 100644
--- a/src/components/src/effects/effect-configurator.tsx
+++ b/src/components/src/effects/effect-configurator.tsx
@@ -148,9 +148,11 @@ const COMMON_SLIDER_PROPS = {
type EffectParameterDescriptionFlattened = {
name: string;
+ type?: 'number' | 'array' | 'color';
label?: string | false | (string | false)[];
min: number;
max: number;
+ defaultValue?: number | number[];
index?: number;
};
@@ -283,12 +285,15 @@ export default function EffectConfiguratorFactory(
effect,
updateEffectConfig
}) => {
- const uniforms = effect.deckEffect?.module.uniforms || defaultUniforms;
+ const uniforms = effect.deckEffect?.module.propTypes || defaultUniforms;
const parameterDescriptions = effect.getParameterDescriptions();
const {parameters, id} = effect;
const flatParameterDescriptions = useMemo(() => {
return parameterDescriptions.reduce((acc, description) => {
- if (description.type === 'array') {
+ if (description.type === 'color') {
+ // color parameters are rendered separately via CompactColorPicker
+ acc.push(description);
+ } else if (description.type === 'array') {
// split arrays of controls into a separate controls for each component
if (Array.isArray(description.defaultValue)) {
description.defaultValue.forEach((_, index) => {
@@ -309,19 +314,36 @@ export default function EffectConfiguratorFactory(
const controls = useMemo(() => {
return flatParameterDescriptions.map(desc => {
+ if (desc.type === 'color') {
+ return {
+ isColor: true as const,
+ label: desc.label || desc.name,
+ paramName: desc.name,
+ color: parameters[desc.name] || desc.defaultValue || [255, 255, 255],
+ onSetColor: (v: [number, number, number]) =>
+ updateEffectConfig(null, id, {parameters: {[desc.name]: v}})
+ };
+ }
+
const paramName = desc.name;
- const uniform = uniforms[desc.name];
- if ((!uniform && uniform !== 0) || uniform.private) {
+ const rawUniform = uniforms[desc.name];
+ if ((!rawUniform && rawUniform !== 0) || rawUniform.private) {
return null;
}
+ // luma.gl 9 wraps array propTypes as {value: [...]}
+ const uniform =
+ rawUniform && typeof rawUniform === 'object' && Array.isArray(rawUniform.value)
+ ? rawUniform.value
+ : rawUniform;
+
const prevValue = parameters[paramName];
const label = desc.label === false ? false : desc.label || desc.name;
// the uniform is [number, number] array
- if (uniform.length === 2) {
+ if (Array.isArray(uniform) && uniform.length === 2) {
return {
label,
value1: prevValue[desc.index || 0] || 0,
@@ -351,14 +373,16 @@ export default function EffectConfiguratorFactory(
}
// the uniform description is {value: 0, min: 0, max: 1, ...}
else if (isNumber(uniform.value)) {
+ const rangeMin = desc.min ?? uniform.min ?? uniform.softMin ?? 0;
+ const rangeMax = desc.max ?? uniform.max ?? uniform.softMax ?? 1;
+ const rangeSpan = rangeMax - rangeMin;
+ const step = rangeSpan > 10 ? 1 : 0.001;
return {
label,
value1: prevValue || 0,
- range: [
- desc.min ?? uniform.min ?? uniform.softMin ?? 0,
- desc.max ?? uniform.max ?? uniform.softMax ?? 1
- ],
- value0: desc.min ?? uniform.min ?? uniform.softMin ?? 0,
+ range: [rangeMin, rangeMax],
+ value0: rangeMin,
+ step,
onChange: (newValue: number[], event) => {
updateEffectConfig(event, id, {parameters: {[paramName]: newValue[1]}});
}
@@ -378,6 +402,24 @@ export default function EffectConfiguratorFactory(
return null;
}
+ if ('isColor' in control) {
+ return (
+ <RegularOuterWrapper key={`${effect.id}-${parameterIndex}`}>
+ <CompactColorPicker
+ label={typeof control.label === 'string' ? control.label : 'Color'}
+ color={control.color}
+ onSetColor={
+ control.onSetColor ??
+ (() => {
+ /* noop */
+ })
+ }
+ Icon={ArrowDownSmall}
+ />
+ </RegularOuterWrapper>
+ );
+ }
+
return (
<RegularOuterWrapper key={`${effect.id}-${parameterIndex}`}>
{control.label ? (
diff --git a/src/components/src/effects/effect-manager.tsx b/src/components/src/effects/effect-manager.tsx
index 037001eea..b028c52ec 100644
--- a/src/components/src/effects/effect-manager.tsx
+++ b/src/components/src/effects/effect-manager.tsx
@@ -12,7 +12,12 @@ import {
reorderEffect,
ActionHandler
} from '@kepler.gl/actions';
-import {LIGHT_AND_SHADOW_EFFECT, EFFECT_DESCRIPTIONS} from '@kepler.gl/constants';
+import {
+ LIGHT_AND_SHADOW_EFFECT,
+ EFFECT_DESCRIPTIONS,
+ DISTANCE_FOG_TYPE,
+ SURFACE_FOG_TYPE
+} from '@kepler.gl/constants';
import {visStateLens} from '@kepler.gl/reducers';
import {Effect} from '@kepler.gl/types';
import {VisState} from '@kepler.gl/schemas';
@@ -98,11 +103,21 @@ function EffectManagerFactory(
const hasShadow = effects.some(effect => {
return effect.type === LIGHT_AND_SHADOW_EFFECT.type;
});
+ const hasDistanceFog = effects.some(effect => {
+ return effect.type === DISTANCE_FOG_TYPE;
+ });
+ const hasSurfaceFog = effects.some(effect => {
+ return effect.type === SURFACE_FOG_TYPE;
+ });
+ const hasAnyFog = hasDistanceFog || hasSurfaceFog;
return EFFECT_DESCRIPTIONS.map(desc => {
return {
...desc,
- disabled: Boolean(hasShadow && desc.type === LIGHT_AND_SHADOW_EFFECT.type)
+ disabled: Boolean(
+ (hasShadow && desc.type === LIGHT_AND_SHADOW_EFFECT.type) ||
+ (hasAnyFog && (desc.type === DISTANCE_FOG_TYPE || desc.type === SURFACE_FOG_TYPE))
+ )
};
});
}, [effects]);
diff --git a/src/components/src/effects/effect-panel-header.tsx b/src/components/src/effects/effect-panel-header.tsx
index 5dcc5e811..467c0d82b 100644
--- a/src/components/src/effects/effect-panel-header.tsx
+++ b/src/components/src/effects/effect-panel-header.tsx
@@ -8,7 +8,9 @@ import styled from 'styled-components';
import {
EFFECT_DESCRIPTIONS,
LIGHT_AND_SHADOW_EFFECT,
- POSTPROCESSING_EFFECTS
+ POSTPROCESSING_EFFECTS,
+ DISTANCE_FOG_TYPE,
+ SURFACE_FOG_TYPE
} from '@kepler.gl/constants';
import PanelHeaderActionFactory, {PanelHeaderActionIcon} from '../side-panel/panel-header-action';
@@ -35,6 +37,8 @@ import {
VignetteEffectIcon,
MagnifyEffectIcon,
HexagonalPixelateEffectIcon,
+ DistanceFogEffectIcon,
+ SurfaceFogEffectIcon,
BaseProps
} from '../common/icons';
import {StyledPanelHeader} from '../common/styled-components';
@@ -99,7 +103,9 @@ const defaultEffectIcons = {
[POSTPROCESSING_EFFECTS.edgeWork.type]: EdgeWorkEffectIcon,
[POSTPROCESSING_EFFECTS.vignette.type]: VignetteEffectIcon,
[POSTPROCESSING_EFFECTS.magnify.type]: MagnifyEffectIcon,
- [POSTPROCESSING_EFFECTS.hexagonalPixelate.type]: HexagonalPixelateEffectIcon
+ [POSTPROCESSING_EFFECTS.hexagonalPixelate.type]: HexagonalPixelateEffectIcon,
+ [DISTANCE_FOG_TYPE]: DistanceFogEffectIcon,
+ [SURFACE_FOG_TYPE]: SurfaceFogEffectIcon
};
const StyledEffectPanelHeader = styled(StyledPanelHeader)`
diff --git a/src/components/src/geocoder-panel.tsx b/src/components/src/geocoder-panel.tsx
index 8d5a7842f..0192dddd1 100644
--- a/src/components/src/geocoder-panel.tsx
+++ b/src/components/src/geocoder-panel.tsx
@@ -5,7 +5,7 @@ import React, {useCallback} from 'react';
import styled, {IStyledComponent} from 'styled-components';
import classnames from 'classnames';
import {processRowObject} from '@kepler.gl/processors';
-import {FlyToInterpolator} from '@deck.gl/core/typed';
+import {FlyToInterpolator} from '@deck.gl/core';
import {getCenterAndZoomFromBounds} from '@kepler.gl/utils';
import {
GEOCODER_DATASET_NAME,
@@ -18,7 +18,15 @@ import {AddDataToMapOptions, MapState, ProtoDataset, UiState, Viewport} from '@k
import {ActionHandler, removeDataset, updateMap, updateVisData} from '@kepler.gl/actions';
import Geocoder, {Result} from './geocoder/geocoder';
-import {MapViewState} from '@deck.gl/core/typed';
+type MapViewState = {
+ latitude: number;
+ longitude: number;
+ zoom: number;
+ bearing?: number;
+ pitch?: number;
+ transitionDuration?: number;
+ transitionInterpolator?: object;
+};
import {BaseComponentProps} from './types';
diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsx
index 224df74ee..d0e1acfd4 100644
--- a/src/components/src/map-container.tsx
+++ b/src/components/src/map-container.tsx
@@ -5,7 +5,7 @@
import React, {Component, createRef, useMemo} from 'react';
import styled, {withTheme} from 'styled-components';
import {Map, MapRef} from 'react-map-gl';
-import {PickInfo} from '@deck.gl/core/lib/deck';
+import {PickingInfo, MapView} from '@deck.gl/core';
import DeckGL from '@deck.gl/react';
import {createSelector, Selector} from 'reselect';
import {useDroppable} from '@dnd-kit/core';
@@ -43,7 +43,6 @@ import {
} from '@kepler.gl/types';
import {
errorNotification,
- setLayerBlending,
isStyleUsingMapboxTiles,
isStyleUsingOpenStreetMapTiles,
getBaseMapLibrary,
@@ -59,7 +58,9 @@ import {
rgbToHex,
computeDeckEffects,
getApplicationConfig,
- GetMapRef
+ GetMapRef,
+ getLayerBlendingParameters,
+ patchDeckRendererForPostProcessing
} from '@kepler.gl/utils';
import {breakPointValues} from '@kepler.gl/styles';
@@ -79,7 +80,6 @@ import {MapViewStateContext} from './map-view-state-context';
import ErrorBoundary from './common/error-boundary';
import {LOCALE_CODES} from '@kepler.gl/localization';
-import {MapView} from '@deck.gl/core';
import {
MapStyle,
areAnyDeckLayersLoading,
@@ -387,6 +387,7 @@ export default function MapContainerFactory(
constructor(props) {
super(props);
+ patchDeckRendererForPostProcessing();
}
state = {
@@ -511,18 +512,24 @@ export default function MapContainerFactory(
this.props.visStateActions.onLayerClick(null);
};
- _onLayerHover = (_idx: number, info: PickInfo<any> | null) => {
+ _onLayerHover = (_idx: number, info: PickingInfo<any> | null) => {
this.props.visStateActions.onLayerHover(info, this.props.index);
};
_onLayerSetDomain = (
idx: number,
- value: {domain: VisualChannelDomain; aggregatedBins: AggregatedBin[]}
+ value: number[] | {domain: VisualChannelDomain; aggregatedBins: AggregatedBin[]}
) => {
- this.props.visStateActions.layerConfigChange(this.props.visState.layers[idx], {
- colorDomain: value.domain,
- aggregatedBins: value.aggregatedBins
- } as Partial<LayerBaseConfig>);
+ // deck.gl 9 native aggregation layers (Grid, Hexagon) pass [min, max],
+ // while ClusterLayer's CPUAggregator still passes {domain, aggregatedBins}.
+ const config = Array.isArray(value)
+ ? {colorDomain: value as VisualChannelDomain}
+ : {colorDomain: value.domain, aggregatedBins: value.aggregatedBins};
+
+ const layer = this.props.visState.layers[idx];
+ if (!layer) return;
+
+ this.props.visStateActions.layerConfigChange(layer, config as Partial<LayerBaseConfig>);
};
_onRedrawNeeded = (_idx: number) => {
@@ -531,6 +538,10 @@ export default function MapContainerFactory(
mapStateActions.updateMap({}, index);
};
+ _onFitBounds = (_idx: number, bounds: [number, number, number, number]) => {
+ this.props.mapStateActions.fitBounds(bounds);
+ };
+
_onLayerFilteredItemsChange = (idx, event) => {
this.props.visStateActions.layerFilteredItemsChange(this.props.visState.layers[idx], event);
};
@@ -607,9 +618,9 @@ export default function MapContainerFactory(
}
};
- _onDeckInitialized(gl) {
+ _onDeckInitialized(device) {
if (this.props.onDeckInitialized) {
- this.props.onDeckInitialized(this._deck, gl);
+ this.props.onDeckInitialized(this._deck, device);
}
}
@@ -623,8 +634,8 @@ export default function MapContainerFactory(
return !viewIndex && Boolean(this._deck?.viewManager?._viewports?.length);
}
- _onBeforeRender = ({gl}) => {
- setLayerBlending(gl, this.props.visState.layerBlending);
+ _onBeforeRender = () => {
+ // no-op
};
_onDeckError = (error, layer) => {
@@ -848,7 +859,8 @@ export default function MapContainerFactory(
onSetLayerDomain: this._onLayerSetDomain,
onFilteredItemsChange: this._onLayerFilteredItemsChange,
onWMSFeatureInfo: this._onWMSFeatureInfo,
- onRedrawNeeded: this._onRedrawNeeded
+ onRedrawNeeded: this._onRedrawNeeded,
+ onFitBounds: this._onFitBounds
},
deckGlProps
);
@@ -887,19 +899,22 @@ export default function MapContainerFactory(
}
const effects = this._isOKToRenderEffects(index)
- ? computeDeckEffects({visState, mapState})
+ ? computeDeckEffects({visState, mapState, isExport: this.props.isExport})
: [];
const views = deckGlProps?.views
? deckGlProps?.views()
- : new MapView({legacyMeterSizes: true});
+ : new MapView({legacyMeterSizes: true} as ConstructorParameters<typeof MapView>[0] & {
+ legacyMeterSizes: boolean;
+ });
let allDeckGlProps = {
...deckGlProps,
pickingRadius: DEFAULT_PICKING_RADIUS,
views,
layers: deckGlLayers,
- effects
+ effects,
+ parameters: getLayerBlendingParameters(visState.layerBlending)
};
if (typeof deckRenderCallbacks?.onDeckRender === 'function') {
@@ -979,7 +994,7 @@ export default function MapContainerFactory(
this._deck = comp.deck;
}
}}
- onWebGLInitialized={gl => this._onDeckInitialized(gl)}
+ onDeviceInitialized={device => this._onDeckInitialized(device)}
onAfterRender={() => {
if (typeof deckRenderCallbacks?.onDeckAfterRender === 'function') {
deckRenderCallbacks.onDeckAfterRender(allDeckGlProps);
@@ -1205,7 +1220,7 @@ export default function MapContainerFactory(
)
: null}
{this._renderMapPopover()}
- {primary !== isSplit ? (
+ {!isExport && primary !== isSplit ? (
<LoadingIndicator
isVisible={Boolean(isLoadingIndicatorVisible || this.anyActiveLayerLoading)}
activeSidePanel={Boolean(activeSidePanel)}
diff --git a/src/components/src/map-view-state-context.tsx b/src/components/src/map-view-state-context.tsx
index da77ec746..8711e5ffc 100644
--- a/src/components/src/map-view-state-context.tsx
+++ b/src/components/src/map-view-state-context.tsx
@@ -4,7 +4,13 @@
import React, {useState, useEffect, createContext} from 'react';
import isEqual from 'lodash/isEqual';
import pick from 'lodash/pick';
-import {MapViewState} from '@deck.gl/core/typed';
+type MapViewState = {
+ latitude: number;
+ longitude: number;
+ zoom: number;
+ bearing?: number;
+ pitch?: number;
+};
import {pickViewportPropsFromMapState} from '@kepler.gl/reducers';
import {MapState} from '@kepler.gl/types';
diff --git a/src/components/src/map/lazy-tippy.tsx b/src/components/src/map/lazy-tippy.tsx
index 8dbb0f0a8..0e125f59d 100644
--- a/src/components/src/map/lazy-tippy.tsx
+++ b/src/components/src/map/lazy-tippy.tsx
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-// @ts-nocheck
-import React, {useState, forwardRef} from 'react';
+import React, {useState, forwardRef, Ref} from 'react';
import Tippy from '@tippyjs/react/headless';
import type {TippyProps} from '@tippyjs/react';
import {isTest} from '@kepler.gl/utils';
@@ -30,12 +29,13 @@ const LazyTippy = forwardRef((props: TippyProps, ref) => {
computedProps.plugins = [lazyPlugin, ...(props.plugins || [])];
if (props.render) {
- computedProps.render = (...args) => (mounted ? props.render(...args) : '');
+ const render = props.render;
+ computedProps.render = (...args) => (mounted ? render(...args) : '');
} else {
computedProps.content = mounted ? props.content : '';
}
- return <Tippy {...computedProps} ref={ref} />;
+ return <Tippy {...computedProps} ref={ref as Ref<Element>} />;
});
export default LazyTippy;
diff --git a/src/components/src/modals/export-data-modal.tsx b/src/components/src/modals/export-data-modal.tsx
index a58fe48be..e0ac181e6 100644
--- a/src/components/src/modals/export-data-modal.tsx
+++ b/src/components/src/modals/export-data-modal.tsx
@@ -95,7 +95,8 @@ const ExportDataModalFactory = () => {
return (
(datasets[datasetId].type === DatasetType.VECTOR_TILE ||
datasets[datasetId].type === DatasetType.RASTER_TILE ||
- datasets[datasetId].type === DatasetType.WMS_TILE) &&
+ datasets[datasetId].type === DatasetType.WMS_TILE ||
+ datasets[datasetId].type === DatasetType.TILE_3D) &&
(selectedDataset === datasetId || exportAllDatasets)
);
});
diff --git a/src/components/src/modals/export-image-modal.tsx b/src/components/src/modals/export-image-modal.tsx
index 45d81e21a..95a676d3f 100644
--- a/src/components/src/modals/export-image-modal.tsx
+++ b/src/components/src/modals/export-image-modal.tsx
@@ -193,10 +193,7 @@ const ExportImageModalFactory = () => {
</div>
{ratio !== EXPORT_IMG_RATIOS.CUSTOM && (
<div className="image-option-section">
- <div
- className="image-option-section-title"
- id="export-image-modal__resolution-title"
- >
+ <div className="image-option-section-title" id="export-image-modal__resolution-title">
<FormattedMessage id={'modal.exportImage.resolutionTitle'} />
</div>
<FormattedMessage id={'modal.exportImage.resolutionDescription'} />
@@ -265,4 +262,4 @@ const ExportImageModalFactory = () => {
return injectIntl(ExportImageModal);
};
-export default ExportImageModalFactory;
\ No newline at end of file
+export default ExportImageModalFactory;
diff --git a/src/components/src/modals/tilesets-modals/common.tsx b/src/components/src/modals/tilesets-modals/common.tsx
index c47ef8442..5efca6235 100644
--- a/src/components/src/modals/tilesets-modals/common.tsx
+++ b/src/components/src/modals/tilesets-modals/common.tsx
@@ -13,7 +13,12 @@ export type DatasetCreationAttributes = {
};
export type MetaResponse = {
- metadata?: VectorTileMetadata | StacTypes.CompleteSTACObject | WMSCapabilities | null;
+ metadata?:
+ | VectorTileMetadata
+ | StacTypes.CompleteSTACObject
+ | WMSCapabilities
+ | Record<string, unknown>
+ | null;
dataset?: DatasetCreationAttributes | null;
loading?: boolean;
error?: Error | null;
diff --git a/src/components/src/modals/tilesets-modals/load-tileset.tsx b/src/components/src/modals/tilesets-modals/load-tileset.tsx
index 2228dac37..35ed47574 100644
--- a/src/components/src/modals/tilesets-modals/load-tileset.tsx
+++ b/src/components/src/modals/tilesets-modals/load-tileset.tsx
@@ -7,7 +7,7 @@ import JSONPretty from 'react-json-pretty';
import {AutoSizer} from 'react-virtualized';
import styled from 'styled-components';
-import {VectorTileIcon, RasterTileIcon, WMSLayerIcon} from '@kepler.gl/layers';
+import {VectorTileIcon, RasterTileIcon, WMSLayerIcon, Tile3DLayerIcon} from '@kepler.gl/layers';
import {getError, getApplicationConfig} from '@kepler.gl/utils';
import {MetaResponse} from './common';
@@ -17,6 +17,7 @@ import TilesetVectorForm from './tileset-vector-form';
import TilesetRasterForm from './tileset-raster-form';
import TilesetWMSForm from './tileset-wms-form';
+import TilesetTile3DForm from './tileset-tile3d-form';
const WIDTH_ICON = '70px';
@@ -33,7 +34,7 @@ const Container = styled.div`
const TilesetTypeContainer = styled.div`
display: grid;
- grid-template-columns: repeat(4, ${WIDTH_ICON});
+ grid-template-columns: repeat(5, ${WIDTH_ICON});
column-gap: 10px;
margin-bottom: 20px;
`;
@@ -101,6 +102,12 @@ const TILE_TYPES = [
label: 'WMS',
Icon: WMSLayerIcon,
Component: TilesetWMSForm
+ },
+ {
+ id: 'tile3d',
+ label: '3D Tile',
+ Icon: Tile3DLayerIcon,
+ Component: TilesetTile3DForm
}
];
diff --git a/src/components/src/modals/tilesets-modals/tileset-tile3d-form.tsx b/src/components/src/modals/tilesets-modals/tileset-tile3d-form.tsx
new file mode 100644
index 000000000..4fcdd0d20
--- /dev/null
+++ b/src/components/src/modals/tilesets-modals/tileset-tile3d-form.tsx
@@ -0,0 +1,398 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import styled from 'styled-components';
+
+import {validateUrl} from '@kepler.gl/common-utils';
+import {DatasetType, TILE3D_PROVIDERS, Tile3DDatasetMetadata} from '@kepler.gl/constants';
+
+import {MetaResponse, DatasetCreationAttributes} from './common';
+import {InputLight} from '../../common';
+import {Help} from '../../common/icons';
+
+const TilesetInputContainer = styled.div`
+ display: grid;
+ grid-template-rows: repeat(4, auto);
+ row-gap: 18px;
+ font-size: 12px;
+`;
+
+const TilesetInputDescription = styled.div`
+ text-align: center;
+ color: ${props => props.theme.AZURE200};
+ font-size: 11px;
+`;
+
+const ExampleUrlsContainer = styled.div`
+ text-align: left;
+ color: ${props => props.theme.AZURE200};
+ font-size: 11px;
+`;
+
+const ExampleTabs = styled.div`
+ display: flex;
+ gap: 6px;
+ margin-top: 6px;
+ margin-bottom: 6px;
+`;
+
+const ExampleTab = styled.div<{active: boolean}>`
+ padding: 3px 8px;
+ border-radius: 3px;
+ cursor: pointer;
+ font-size: 11px;
+ white-space: nowrap;
+ background: ${props => (props.active ? props.theme.AZURE400 : 'transparent')};
+ color: ${props => (props.active ? props.theme.WHITE : props.theme.AZURE200)};
+ border: 1px solid ${props => (props.active ? props.theme.AZURE400 : props.theme.AZURE400)};
+
+ &:hover {
+ background: ${props => (props.active ? props.theme.AZURE400 : props.theme.AZURE500)};
+ }
+`;
+
+const ExampleUrl = styled.div`
+ word-break: break-all;
+ cursor: pointer;
+ color: ${props => props.theme.AZURE200};
+ font-size: 11px;
+
+ &:hover {
+ color: ${props => props.theme.AZURE100};
+ }
+`;
+
+const LabelRow = styled.div`
+ display: flex;
+ align-items: center;
+`;
+
+const InfoIconLink = styled.a`
+ margin-left: 4px;
+ color: ${props => props.theme.labelColor};
+ text-decoration: none;
+ display: inline-flex;
+ align-items: center;
+ line-height: 0;
+ vertical-align: middle;
+ opacity: 0.7;
+
+ &:hover {
+ opacity: 1;
+ }
+
+ svg {
+ display: block;
+ }
+`;
+
+const TILE3D_DOCUMENTATION_URL =
+ 'https://docs.kepler.gl/docs/user-guides/c-types-of-layers/p-3d-tile-layer';
+
+const TILE3D_EXAMPLES = [
+ {
+ label: 'ArcGIS I3S',
+ name: 'San Francisco Buildings',
+ url: 'https://tiles.arcgis.com/tiles/z2tnIkrLQ2BRzr6P/arcgis/rest/services/SanFrancisco_Bldgs/SceneServer/layers/0'
+ },
+ {
+ label: 'OGC 3D Tiles',
+ name: 'Royal Exhibition Building',
+ url: 'https://raw.githubusercontent.com/visgl/deck.gl-data/master/3d-tiles/RoyalExhibitionBuilding/tileset.json'
+ },
+ {
+ label: 'Google 3D Tiles',
+ name: 'Google 3D Tiles',
+ url: 'https://tile.googleapis.com/v1/3dtiles/root.json'
+ },
+ {
+ label: 'Cesium Ion',
+ name: 'Washington DC mesh',
+ url: 'https://assets.ion.cesium.com/57588/tileset.json'
+ }
+];
+
+type Tile3DFormProps = {
+ setResponse: (response: MetaResponse) => void;
+};
+
+function detectProvider(url: string): string | undefined {
+ for (const key of Object.keys(TILE3D_PROVIDERS)) {
+ if (url.includes(TILE3D_PROVIDERS[key].urlKey)) {
+ return key;
+ }
+ }
+ return undefined;
+}
+
+export function getDatasetAttributesFromTile3D({
+ name,
+ tileUrl,
+ accessToken
+}: {
+ name: string;
+ tileUrl: string;
+ accessToken?: string;
+}): DatasetCreationAttributes {
+ return {
+ name,
+ type: DatasetType.TILE_3D,
+ metadata: {
+ tile3dUrl: tileUrl,
+ tile3dAccessToken: accessToken || undefined,
+ tile3dProvider: detectProvider(tileUrl)
+ } as Tile3DDatasetMetadata
+ };
+}
+
+type FetchResult = {ok: true; data: Record<string, unknown>} | {ok: false; error: string};
+
+async function fetchTilesetMetadata(
+ url: string,
+ provider?: string,
+ accessToken?: string
+): Promise<FetchResult> {
+ try {
+ const headers: Record<string, string> = {};
+ let fetchUrl = url;
+
+ if (provider === 'google' && accessToken) {
+ headers['X-GOOG-API-KEY'] = accessToken;
+ } else if (provider === 'cesium' && accessToken) {
+ const assetId = url.match(/\/(\d+)\/tileset\.json/)?.[1];
+ if (assetId) {
+ const endpointRes = await fetch(`https://api.cesium.com/v1/assets/${assetId}/endpoint`, {
+ headers: {Authorization: `Bearer ${accessToken}`}
+ });
+ if (!endpointRes.ok) {
+ if (endpointRes.status === 401 || endpointRes.status === 403) {
+ return {ok: false, error: 'Invalid or expired Cesium Ion access token.'};
+ }
+ if (endpointRes.status === 404) {
+ return {ok: false, error: 'Cesium Ion asset not found. Check the asset ID.'};
+ }
+ return {ok: false, error: `Cesium Ion API error (${endpointRes.status}).`};
+ }
+ const endpoint = await endpointRes.json();
+ fetchUrl = endpoint.url;
+ if (endpoint.accessToken) {
+ headers['Authorization'] = `Bearer ${endpoint.accessToken}`;
+ }
+ }
+ }
+
+ const response = await fetch(fetchUrl, {headers});
+ if (!response.ok) {
+ if (response.status === 401 || response.status === 403) {
+ return {
+ ok: false,
+ error: `Access denied (HTTP ${response.status}). Check your access token.`
+ };
+ }
+ if (response.status === 404) {
+ return {ok: false, error: 'Tileset not found (HTTP 404). Check the URL.'};
+ }
+ return {ok: false, error: `Failed to load tileset (HTTP ${response.status}).`};
+ }
+
+ const contentType = response.headers.get('content-type') || '';
+ if (!contentType.includes('json') && !url.endsWith('.json')) {
+ return {ok: false, error: 'Response is not a valid tileset (unexpected content type).'};
+ }
+
+ const data = await response.json();
+ return {ok: true, data};
+ } catch (err) {
+ const message = err instanceof Error ? err.message : 'Unknown error';
+ return {ok: false, error: `Network error: ${message}`};
+ }
+}
+
+const TilesetTile3DForm: React.FC<Tile3DFormProps> = ({setResponse}) => {
+ const [layerName, setLayerName] = useState<string>('');
+ const [tileUrl, setTileUrl] = useState<string>('');
+ const [accessToken, setAccessToken] = useState<string>('');
+ const [tilesetMeta, setTilesetMeta] = useState<Record<string, unknown> | null>(null);
+ const [metaLoading, setMetaLoading] = useState(false);
+ const [fetchError, setFetchError] = useState<string | null>(null);
+ const [exampleTab, setExampleTab] = useState(0);
+ const fetchIdRef = useRef(0);
+
+ const onLayerNameChange = useCallback(
+ (event: React.ChangeEvent<HTMLInputElement>) => {
+ event.preventDefault();
+ setLayerName(event.target.value);
+ },
+ [setLayerName]
+ );
+
+ const onTileUrlChange = useCallback(
+ (event: React.ChangeEvent<HTMLInputElement>) => {
+ event.preventDefault();
+ const newUrl = event.target.value;
+ setTileUrl(newUrl);
+
+ if (!layerName && validateUrl(newUrl)) {
+ const detected = detectProvider(newUrl);
+ if (detected) {
+ setLayerName(TILE3D_PROVIDERS[detected].name);
+ } else {
+ setLayerName('3D Tileset');
+ }
+ }
+ },
+ [layerName]
+ );
+
+ const onAccessTokenChange = useCallback(
+ (event: React.ChangeEvent<HTMLInputElement>) => {
+ event.preventDefault();
+ setAccessToken(event.target.value);
+ },
+ [setAccessToken]
+ );
+
+ const onExampleClick = useCallback(
+ (url: string, name: string) => {
+ setTileUrl(url);
+ setLayerName(name);
+ },
+ [setTileUrl, setLayerName]
+ );
+
+ // Fetch tileset metadata when URL and (if needed) token are available
+ useEffect(() => {
+ if (!tileUrl || !validateUrl(tileUrl)) {
+ setTilesetMeta(null);
+ setFetchError(null);
+ return;
+ }
+
+ const currentFetchId = ++fetchIdRef.current;
+ setMetaLoading(true);
+ setFetchError(null);
+
+ fetchTilesetMetadata(tileUrl, detectProvider(tileUrl), accessToken || undefined).then(
+ result => {
+ if (currentFetchId === fetchIdRef.current) {
+ if (result.ok) {
+ setTilesetMeta(result.data);
+ setFetchError(null);
+ } else {
+ setTilesetMeta(null);
+ setFetchError(result.error);
+ }
+ setMetaLoading(false);
+ }
+ }
+ );
+ }, [tileUrl, accessToken]);
+
+ // Update response whenever form state or metadata changes
+ useEffect(() => {
+ if (fetchError) {
+ setResponse({
+ metadata: null,
+ dataset: null,
+ loading: false,
+ error: new Error(fetchError)
+ });
+ return;
+ }
+
+ if (layerName && tileUrl && validateUrl(tileUrl)) {
+ const dataset = getDatasetAttributesFromTile3D({
+ name: layerName,
+ tileUrl,
+ accessToken: accessToken || undefined
+ });
+ setResponse({
+ metadata: tilesetMeta as MetaResponse['metadata'],
+ dataset,
+ loading: metaLoading,
+ error: null
+ });
+ } else {
+ setResponse({
+ metadata: tilesetMeta as MetaResponse['metadata'],
+ dataset: null,
+ loading: metaLoading,
+ error: null
+ });
+ }
+ }, [setResponse, layerName, tileUrl, accessToken, tilesetMeta, metaLoading, fetchError]);
+
+ return (
+ <TilesetInputContainer>
+ <div>
+ <label htmlFor="tile3d-layer-name">Name</label>
+ <InputLight
+ id="tile3d-layer-name"
+ placeholder="Name your 3D tileset"
+ value={layerName}
+ onChange={onLayerNameChange}
+ />
+ </div>
+ <div>
+ <LabelRow>
+ <label htmlFor="tile3d-url">Tileset URL</label>
+ <InfoIconLink
+ href={TILE3D_DOCUMENTATION_URL}
+ target="_blank"
+ rel="noopener noreferrer"
+ aria-label="Open 3D Tile Layer documentation"
+ >
+ <Help height="16px" />
+ </InfoIconLink>
+ </LabelRow>
+ <InputLight
+ id="tile3d-url"
+ placeholder="Enter 3D Tiles URL (tileset.json)"
+ value={tileUrl}
+ onChange={onTileUrlChange}
+ />
+ <TilesetInputDescription>
+ URL to a 3D Tiles tileset.json, Google 3D Tiles, or Cesium Ion asset.
+ </TilesetInputDescription>
+ </div>
+ <div>
+ <label htmlFor="tile3d-token">Access Token (if needed)</label>
+ <InputLight
+ id="tile3d-token"
+ placeholder="Enter access token"
+ value={accessToken}
+ onChange={onAccessTokenChange}
+ />
+ </div>
+ <div>
+ <TilesetInputDescription>For example, try a public 3D tileset:</TilesetInputDescription>
+ <ExampleUrlsContainer>
+ <ExampleTabs>
+ {TILE3D_EXAMPLES.map((ex, i) => (
+ <ExampleTab
+ key={ex.label}
+ active={exampleTab === i}
+ onClick={() => {
+ setExampleTab(i);
+ onExampleClick(ex.url, ex.name);
+ }}
+ >
+ {ex.label}
+ </ExampleTab>
+ ))}
+ </ExampleTabs>
+ <ExampleUrl
+ onClick={() =>
+ onExampleClick(TILE3D_EXAMPLES[exampleTab].url, TILE3D_EXAMPLES[exampleTab].name)
+ }
+ >
+ {TILE3D_EXAMPLES[exampleTab].url}
+ </ExampleUrl>
+ </ExampleUrlsContainer>
+ </div>
+ </TilesetInputContainer>
+ );
+};
+
+export default TilesetTile3DForm;
diff --git a/src/components/src/modals/tilesets-modals/tileset-wms-form.tsx b/src/components/src/modals/tilesets-modals/tileset-wms-form.tsx
index 1c01e824f..36f7694ef 100644
--- a/src/components/src/modals/tilesets-modals/tileset-wms-form.tsx
+++ b/src/components/src/modals/tilesets-modals/tileset-wms-form.tsx
@@ -29,13 +29,59 @@ const ExampleUrlsContainer = styled.div`
text-align: left;
color: ${props => props.theme.AZURE200};
font-size: 11px;
+`;
+
+const ExampleTabs = styled.div`
+ display: flex;
+ gap: 6px;
+ margin-top: 6px;
+ margin-bottom: 6px;
+`;
+
+const ExampleTab = styled.div<{active: boolean}>`
+ padding: 3px 8px;
+ border-radius: 3px;
+ cursor: pointer;
+ font-size: 11px;
+ white-space: nowrap;
+ background: ${props => (props.active ? props.theme.AZURE400 : 'transparent')};
+ color: ${props => (props.active ? props.theme.WHITE : props.theme.AZURE200)};
+ border: 1px solid ${props => (props.active ? props.theme.AZURE400 : props.theme.AZURE400)};
+
+ &:hover {
+ background: ${props => (props.active ? props.theme.AZURE400 : props.theme.AZURE500)};
+ }
+`;
- .example-url {
- margin-top: 8px;
- display: block;
+const ExampleUrl = styled.div`
+ word-break: break-all;
+ cursor: pointer;
+ color: ${props => props.theme.AZURE200};
+ font-size: 11px;
+
+ &:hover {
+ color: ${props => props.theme.AZURE100};
}
`;
+const WMS_EXAMPLES = [
+ {
+ label: 'OSM',
+ name: 'OpenStreetMap WMS',
+ url: 'https://ows.terrestris.de/osm/service'
+ },
+ {
+ label: 'NOAA Radar',
+ name: 'NOAA CONUS Radar',
+ url: 'https://opengeo.ncep.noaa.gov/geoserver/conus/conus_cref_qcd/ows'
+ },
+ {
+ label: 'NASA GIBS',
+ name: 'NASA GIBS',
+ url: 'https://gibs.earthdata.nasa.gov/wms/epsg4326/best/wms.cgi'
+ }
+];
+
type WMSTileFormProps = {
setResponse: (response: MetaResponse) => void;
};
@@ -52,6 +98,7 @@ const TilesetWMSForm: React.FC<WMSTileFormProps> = ({setResponse}) => {
const [loading, setLoading] = useState<boolean>(false);
const [error, setError] = useState<Error | null>(null);
const [wmsData, setWMSData] = useState<WMSData | null>(null);
+ const [exampleTab, setExampleTab] = useState(0);
const onLayerNameChange = useCallback(
(event: React.ChangeEvent<HTMLInputElement>) => {
@@ -61,6 +108,14 @@ const TilesetWMSForm: React.FC<WMSTileFormProps> = ({setResponse}) => {
[setLayerName]
);
+ const onExampleClick = useCallback(
+ (url: string, name: string) => {
+ setWmsUrl(url);
+ setLayerName(name);
+ },
+ [setWmsUrl, setLayerName]
+ );
+
const onWmsUrlChange = useCallback(
async (event: React.ChangeEvent<HTMLInputElement>) => {
event.preventDefault();
@@ -156,13 +211,27 @@ const TilesetWMSForm: React.FC<WMSTileFormProps> = ({setResponse}) => {
<div>
<TilesetInputDescription>For example, try a public WMS URL:</TilesetInputDescription>
<ExampleUrlsContainer>
- <div className="example-url">• https://ows.terrestris.de/osm/service</div>
- <div className="example-url">
- • https://opengeo.ncep.noaa.gov/geoserver/conus/conus_cref_qcd/ows
- </div>
- <div className="example-url">
- • https://gibs.earthdata.nasa.gov/wms/epsg4326/best/wms.cgi
- </div>
+ <ExampleTabs>
+ {WMS_EXAMPLES.map((ex, i) => (
+ <ExampleTab
+ key={ex.label}
+ active={exampleTab === i}
+ onClick={() => {
+ setExampleTab(i);
+ onExampleClick(ex.url, ex.name);
+ }}
+ >
+ {ex.label}
+ </ExampleTab>
+ ))}
+ </ExampleTabs>
+ <ExampleUrl
+ onClick={() =>
+ onExampleClick(WMS_EXAMPLES[exampleTab].url, WMS_EXAMPLES[exampleTab].name)
+ }
+ >
+ {WMS_EXAMPLES[exampleTab].url}
+ </ExampleUrl>
</ExampleUrlsContainer>
</div>
</TilesetInputContainer>
diff --git a/src/components/src/plot-container.tsx b/src/components/src/plot-container.tsx
index 8b71613d9..be73fb3c1 100644
--- a/src/components/src/plot-container.tsx
+++ b/src/components/src/plot-container.tsx
@@ -13,7 +13,7 @@ import {
convertToPng,
getScaleFromImageSize
} from '@kepler.gl/utils';
-import {findMapBounds} from '@kepler.gl/reducers';
+import {findMapBounds, areAnyDeckLayersLoading} from '@kepler.gl/reducers';
import MapContainerFactory from './map-container';
import MapsLayoutFactory from './maps-layout';
import {MapViewStateContextProvider} from './map-view-state-context';
@@ -161,6 +161,10 @@ export default function PlotContainerFactory(
const {mapState} = mapFields;
+ const deckLayersLoadingRef = useRef(true);
+ const mapStyleLoadedRef = useRef(false);
+ const screenshotTakenRef = useRef(false);
+
// Memoize the scale calculation
const scale = useMemo(() => {
if (imageSize.scale) {
@@ -232,19 +236,54 @@ export default function PlotContainerFactory(
const retrieveNewScreenshot = useCallback(debouncedScreenshot, [debouncedScreenshot]);
+ const tryScreenshot = useCallback(() => {
+ if (mapStyleLoadedRef.current && !deckLayersLoadingRef.current) {
+ screenshotTakenRef.current = true;
+ retrieveNewScreenshot();
+ }
+ }, [retrieveNewScreenshot]);
+
+ // Fallback: if layers never finish loading, capture after timeout
+ useEffect(() => {
+ const timer = setTimeout(() => {
+ if (!screenshotTakenRef.current) {
+ deckLayersLoadingRef.current = false;
+ tryScreenshot();
+ }
+ }, 30000);
+ return () => clearTimeout(timer);
+ }, [tryScreenshot]);
+
// Memoize the onMapRender callback
const debouncedMapRender = useMemo(
() =>
debounce(map => {
if (map.isStyleLoaded()) {
- retrieveNewScreenshot();
+ mapStyleLoadedRef.current = true;
+ tryScreenshot();
}
}, 500),
- [retrieveNewScreenshot]
+ [tryScreenshot]
);
const onMapRender = useCallback(debouncedMapRender, [debouncedMapRender]);
+ const deckRenderCallbacks = useMemo(
+ () => ({
+ onDeckAfterRender: (deckProps: Record<string, unknown>) => {
+ const layers = deckProps.layers as any[];
+ if (!layers) return;
+ const stillLoading = areAnyDeckLayersLoading(layers);
+ if (deckLayersLoadingRef.current && !stillLoading) {
+ deckLayersLoadingRef.current = false;
+ tryScreenshot();
+ }
+ deckLayersLoadingRef.current = stillLoading;
+ }
+ }),
+ [tryScreenshot]
+ );
+
// Initial setup effect
useEffect(() => {
setExportImageSetting({processing: true});
@@ -254,9 +293,9 @@ export default function PlotContainerFactory(
useEffect(() => {
if (ratio !== undefined || resolution !== undefined || legend !== undefined) {
setExportImageSetting({processing: true});
- retrieveNewScreenshot();
+ tryScreenshot();
}
- }, [ratio, resolution, legend, setExportImageSetting, retrieveNewScreenshot]);
+ }, [ratio, resolution, legend, setExportImageSetting, tryScreenshot]);
// Memoize size calculations
const {size, width, height} = useMemo(() => {
@@ -321,11 +360,14 @@ export default function PlotContainerFactory(
isExport: true,
deckGlProps: {
...mapFields.deckGlProps,
- glOptions: {
- preserveDrawingBuffer: true,
- useDevicePixels: false
+ useDevicePixels: false,
+ deviceProps: {
+ webgl: {
+ preserveDrawingBuffer: true
+ }
}
},
+ deckRenderCallbacks,
visState: {
...mapFields.visState,
effects: plotEffects
@@ -333,7 +375,16 @@ export default function PlotContainerFactory(
// allow overriding the legend panel logo in export
logoComponent
}),
- [mapFields, scaledMapStyle, newMapState, legend, onMapRender, plotEffects, logoComponent]
+ [
+ mapFields,
+ scaledMapStyle,
+ newMapState,
+ legend,
+ onMapRender,
+ deckRenderCallbacks,
+ plotEffects,
+ logoComponent
+ ]
);
const isSplit = splitMaps.length > 1;
@@ -359,4 +410,4 @@ export default function PlotContainerFactory(
}
return React.memo(PlotContainer);
-}
\ No newline at end of file
+}
diff --git a/src/components/src/side-panel/common/dataset-info.tsx b/src/components/src/side-panel/common/dataset-info.tsx
index 3d7f59e3b..eacac63ea 100644
--- a/src/components/src/side-panel/common/dataset-info.tsx
+++ b/src/components/src/side-panel/common/dataset-info.tsx
@@ -37,6 +37,8 @@ export default function DatasetInfoFactory() {
? 'datasetInfo.rasterTile'
: dataset.type === DatasetType.WMS_TILE
? 'datasetInfo.wmsTile'
+ : dataset.type === DatasetType.TILE_3D
+ ? 'datasetInfo.tile3d'
: 'datasetInfo.rowCount'
}
values={{rowCount: numFormat(dataset.dataContainer.numRows())}}
diff --git a/src/components/src/side-panel/layer-panel/layer-configurator.tsx b/src/components/src/side-panel/layer-panel/layer-configurator.tsx
index 2bc7da89a..9a24b5d0a 100644
--- a/src/components/src/side-panel/layer-panel/layer-configurator.tsx
+++ b/src/components/src/side-panel/layer-panel/layer-configurator.tsx
@@ -1024,6 +1024,18 @@ export default function LayerConfiguratorFactory(
);
}
+ _renderTile3dLayerConfig({layer, visConfiguratorProps, layerConfiguratorProps}) {
+ return (
+ <StyledLayerVisualConfigurator>
+ <LayerConfigGroup label={'layer.appearance'}>
+ <LayerColorSelector {...layerConfiguratorProps} />
+ <VisConfigSlider {...layer.visConfigSettings.opacity} {...visConfiguratorProps} />
+ <VisConfigSlider {...layer.visConfigSettings.pointSize} {...visConfiguratorProps} />
+ </LayerConfigGroup>
+ </StyledLayerVisualConfigurator>
+ );
+ }
+
_renderWmsLayerConfig({
layer,
visConfiguratorProps,
diff --git a/src/constants/src/dataset.ts b/src/constants/src/dataset.ts
index f6bcb17cc..f1c915407 100644
--- a/src/constants/src/dataset.ts
+++ b/src/constants/src/dataset.ts
@@ -5,7 +5,8 @@ export enum DatasetType {
LOCAL = 'local',
VECTOR_TILE = 'vector-tile',
RASTER_TILE = 'raster-tile',
- WMS_TILE = 'wms-tile'
+ WMS_TILE = 'wms-tile',
+ TILE_3D = 'tile-3d'
}
export enum RemoteTileFormat {
@@ -75,3 +76,29 @@ export type WMSDatasetMetadata = {
version: string;
layers: {name: string; title: string; boundingBox: number[] | null}[];
};
+
+export type Tile3DProvider = {
+ name: string;
+ urlKey: string;
+};
+
+export const TILE3D_PROVIDERS: Record<string, Tile3DProvider> = {
+ google: {
+ name: 'Google 3D Tiles',
+ urlKey: 'google'
+ },
+ cesium: {
+ name: 'Cesium ion',
+ urlKey: 'ion.cesium'
+ },
+ arcgis: {
+ name: 'ArcGIS',
+ urlKey: 'arcgis'
+ }
+};
+
+export type Tile3DDatasetMetadata = {
+ tile3dUrl: string;
+ tile3dAccessToken?: string;
+ tile3dProvider?: string;
+};
diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.ts
index 579c4f1de..bea62a827 100644
--- a/src/constants/src/default-settings.ts
+++ b/src/constants/src/default-settings.ts
@@ -1409,6 +1409,9 @@ export const LIGHT_AND_SHADOW_EFFECT: EffectDescription = {
]
};
+export const DISTANCE_FOG_TYPE = 'distanceFog';
+export const SURFACE_FOG_TYPE = 'surfaceFog';
+
export const POSTPROCESSING_EFFECTS: {[key: string]: EffectDescription} = {
ink: {
type: 'ink',
@@ -1602,6 +1605,26 @@ export const POSTPROCESSING_EFFECTS: {[key: string]: EffectDescription} = {
type: 'hexagonalPixelate',
name: 'Hexagonal Pixelate',
parameters: [{name: 'scale', defaultValue: 20, min: 1, max: 50}]
+ },
+ distanceFog: {
+ type: DISTANCE_FOG_TYPE,
+ name: 'Distance Fog',
+ parameters: [
+ {name: 'density', defaultValue: 0.5, min: 0, max: 1},
+ {name: 'fogStart', label: 'Start', defaultValue: 0.3, min: 0, max: 1},
+ {name: 'fogRange', label: 'Range', defaultValue: 0.5, min: 0.01, max: 1},
+ {name: 'fogColor', type: 'color', min: 0, max: 255, defaultValue: [217, 222, 230]}
+ ]
+ },
+ surfaceFog: {
+ type: SURFACE_FOG_TYPE,
+ name: 'Surface Fog',
+ parameters: [
+ {name: 'density', defaultValue: 0.6, min: 0, max: 1},
+ {name: 'height', label: 'Elevation (m)', defaultValue: 100, min: -200, max: 3000},
+ {name: 'thickness', label: 'Transition (m)', defaultValue: 200, min: 0, max: 1000},
+ {name: 'fogColor', type: 'color', min: 0, max: 255, defaultValue: [230, 235, 242]}
+ ]
}
};
@@ -1626,6 +1649,8 @@ export type EffectType =
| 'vignette'
| 'magnify'
| 'hexagonalPixelate'
+ | 'distanceFog'
+ | 'surfaceFog'
| 'lightAndShadow';
export const SYNC_TIMELINE_MODES: Record<string, SyncTimelineMode> = {
@@ -1663,4 +1688,4 @@ export const getLoaderOptions = () => {
workerUrl: `${LOADERS_CDN_URL}/textures@${LOADERS_CDN_VERSION}/dist/npy-worker.js`
}
};
-};
\ No newline at end of file
+};
diff --git a/src/constants/src/gpu-parameters.ts b/src/constants/src/gpu-parameters.ts
new file mode 100644
index 000000000..f70edd8ce
--- /dev/null
+++ b/src/constants/src/gpu-parameters.ts
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+/**
+ * WebGPU-style string constants for deck.gl 9 / luma.gl 9 render parameters.
+ * These replace the old GL.* enum values that were used in deck.gl 8.
+ */
+
+// --- Blend factors ---
+export const BLEND_FACTOR = {
+ ZERO: 'zero',
+ ONE: 'one',
+ SRC: 'src',
+ ONE_MINUS_SRC: 'one-minus-src',
+ SRC_ALPHA: 'src-alpha',
+ ONE_MINUS_SRC_ALPHA: 'one-minus-src-alpha',
+ DST: 'dst',
+ ONE_MINUS_DST: 'one-minus-dst',
+ DST_ALPHA: 'dst-alpha',
+ ONE_MINUS_DST_ALPHA: 'one-minus-dst-alpha'
+} as const;
+
+// --- Blend operations ---
+export const BLEND_OPERATION = {
+ ADD: 'add',
+ SUBTRACT: 'subtract',
+ REVERSE_SUBTRACT: 'reverse-subtract',
+ MIN: 'min',
+ MAX: 'max'
+} as const;
+
+// --- Cull modes ---
+export const CULL_MODE = {
+ NONE: 'none',
+ FRONT: 'front',
+ BACK: 'back'
+} as const;
+
+// --- Texture filter modes ---
+export const FILTER_MODE = {
+ NEAREST: 'nearest',
+ LINEAR: 'linear'
+} as const;
+
+// --- Texture address (wrap) modes ---
+export const ADDRESS_MODE = {
+ CLAMP_TO_EDGE: 'clamp-to-edge',
+ REPEAT: 'repeat',
+ MIRROR_REPEAT: 'mirror-repeat'
+} as const;
+
+// --- Texture formats ---
+export const TEXTURE_FORMAT = {
+ R8_UINT: 'r8uint',
+ R16_UINT: 'r16uint',
+ R32_UINT: 'r32uint',
+ R8_SINT: 'r8sint',
+ R16_SINT: 'r16sint',
+ R32_SINT: 'r32sint',
+ R32_FLOAT: 'r32float',
+ RGBA8_UNORM: 'rgba8unorm'
+} as const;
+
+// --- Depth-stencil attachment formats ---
+export const DEPTH_STENCIL_FORMAT = {
+ DEPTH24_PLUS: 'depth24plus'
+} as const;
+
+// --- Texture usage flags (mirroring luma.gl Texture static fields) ---
+export const TEXTURE_USAGE = {
+ COPY_SRC: 0x01,
+ COPY_DST: 0x02,
+ SAMPLE: 0x04,
+ RENDER_ATTACHMENT: 0x10
+} as const;
+
+// --- Primitive topologies ---
+export const TOPOLOGY = {
+ TRIANGLE_LIST: 'triangle-list',
+ TRIANGLE_STRIP: 'triangle-strip',
+ LINE_LIST: 'line-list',
+ LINE_STRIP: 'line-strip',
+ POINT_LIST: 'point-list'
+} as const;
+
+// --- Precomposed parameter sets ---
+
+/**
+ * Standard alpha blending: srcAlpha / oneMinusSrcAlpha for both color and alpha.
+ * Include `blend: true` since per-layer parameters override global ones in deck.gl 9.
+ */
+export const BLEND_PARAMS_ALPHA = {
+ blend: true,
+ blendColorSrcFactor: BLEND_FACTOR.SRC_ALPHA,
+ blendColorDstFactor: BLEND_FACTOR.ONE_MINUS_SRC_ALPHA,
+ blendAlphaSrcFactor: BLEND_FACTOR.ONE,
+ blendAlphaDstFactor: BLEND_FACTOR.ONE_MINUS_SRC_ALPHA,
+ blendColorOperation: BLEND_OPERATION.ADD,
+ blendAlphaOperation: BLEND_OPERATION.ADD
+} as const;
+
+// --- Mapping tables (GL enum name → WebGPU string) used by gl-utils ---
+
+export const GL_BLEND_FUNC_TO_WEBGPU: Record<string, string> = {
+ SRC_ALPHA: BLEND_FACTOR.SRC_ALPHA,
+ ONE_MINUS_SRC_ALPHA: BLEND_FACTOR.ONE_MINUS_SRC_ALPHA,
+ DST_ALPHA: BLEND_FACTOR.DST_ALPHA,
+ ONE: BLEND_FACTOR.ONE,
+ ONE_MINUS_DST_COLOR: BLEND_FACTOR.ONE_MINUS_DST,
+ DST_COLOR: BLEND_FACTOR.DST,
+ ZERO: BLEND_FACTOR.ZERO,
+ SRC_COLOR: BLEND_FACTOR.SRC
+};
+
+export const GL_BLEND_EQ_TO_WEBGPU: Record<string, string> = {
+ FUNC_ADD: BLEND_OPERATION.ADD,
+ FUNC_SUBTRACT: BLEND_OPERATION.SUBTRACT,
+ FUNC_REVERSE_SUBTRACT: BLEND_OPERATION.REVERSE_SUBTRACT
+};
diff --git a/src/constants/src/index.ts b/src/constants/src/index.ts
index fcda42781..291d291cc 100644
--- a/src/constants/src/index.ts
+++ b/src/constants/src/index.ts
@@ -6,6 +6,7 @@
export * from './colors-by-theme';
export * from './color-palettes';
export * from './default-settings';
+export * from './gpu-parameters';
export * from './layers';
export * from './dataset';
export {default as KeyEvent} from './keyevent';
diff --git a/src/constants/src/layers.ts b/src/constants/src/layers.ts
index 6a700a826..0dcc5a83a 100644
--- a/src/constants/src/layers.ts
+++ b/src/constants/src/layers.ts
@@ -555,7 +555,8 @@ export const LAYER_TYPES = keyMirror({
s2: null,
vectorTile: null,
rasterTile: null,
- wms: null
+ wms: null,
+ tile3d: null
});
export const EDITOR_AVAILABLE_LAYERS: string[] = [
diff --git a/src/deckgl-arrow-layers/package.json b/src/deckgl-arrow-layers/package.json
index dc550c6ef..9d185838e 100644
--- a/src/deckgl-arrow-layers/package.json
+++ b/src/deckgl-arrow-layers/package.json
@@ -40,10 +40,10 @@
"threads": "^1.7.0"
},
"peerDependencies": {
- "@deck.gl/aggregation-layers": "^8.9.27",
- "@deck.gl/core": "^8.9.27",
- "@deck.gl/geo-layers": "^8.9.27",
- "@deck.gl/layers": "^8.9.27"
+ "@deck.gl/aggregation-layers": "^9.2.11",
+ "@deck.gl/core": "^9.2.11",
+ "@deck.gl/geo-layers": "^9.2.11",
+ "@deck.gl/layers": "^9.2.11"
},
"nyc": {
"sourceMap": false,
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.ts
index 07bc1d66a..2e3f48b5e 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
@@ -11,17 +11,17 @@ import {
DefaultProps,
GetPickingInfoParams,
Layer,
- LayersList,
- assert
-} from '@deck.gl/core/typed';
-import {ArcLayer} from '@deck.gl/layers/typed';
-import type {ArcLayerProps} from '@deck.gl/layers/typed';
+ LayersList
+} from '@deck.gl/core';
+import {ArcLayer} from '@deck.gl/layers';
+import type {ArcLayerProps} from '@deck.gl/layers';
import * as arrow from 'apache-arrow';
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, ExtensionProps} from '../types';
+import {assert} from '../utils/utils';
import {validateAccessors} from '../utils/validate';
/** All properties supported by GeoArrowArcLayer */
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.ts
index 9b1dce3a2..46cc854a2 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
@@ -11,11 +11,10 @@ import {
DefaultProps,
GetPickingInfoParams,
Layer,
- LayersList,
- assert
-} from '@deck.gl/core/typed';
-import {ScatterplotLayer} from '@deck.gl/layers/typed';
-import type {ScatterplotLayerProps} from '@deck.gl/layers/typed';
+ LayersList
+} from '@deck.gl/core';
+import {ScatterplotLayer} from '@deck.gl/layers';
+import type {ScatterplotLayerProps} from '@deck.gl/layers';
import * as arrow from 'apache-arrow';
import * as ga from '@geoarrow/geoarrow-js';
@@ -29,6 +28,7 @@ import {
} from '../utils/utils';
import {GeoArrowExtraPickingProps, computeChunkOffsets, getPickingInfo} from '../utils/picking';
import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo, ExtensionProps} from '../types';
+import {assert} from '../utils/utils';
import {validateAccessors} from '../utils/validate';
/** All properties supported by GeoArrowScatterplotLayer */
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.ts
index d8b0faa2d..b6c2fe1a9 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
@@ -11,10 +11,9 @@ import {
DefaultProps,
GetPickingInfoParams,
Layer,
- LayersList,
- assert
-} from '@deck.gl/core/typed';
-import {TextLayer} from '@deck.gl/layers/typed';
+ LayersList
+} from '@deck.gl/core';
+import {TextLayer} from '@deck.gl/layers';
import type {TextLayerProps} from '@deck.gl/layers';
import * as arrow from 'apache-arrow';
import * as ga from '@geoarrow/geoarrow-js';
@@ -28,7 +27,8 @@ import {
getGeometryVector
} from '../utils/utils';
import {GeoArrowExtraPickingProps, computeChunkOffsets, getPickingInfo} from '../utils/picking';
-import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo, ExtensionProps} from '../types';
+import {ColorAccessor, FloatAccessor, GeoArrowPickingInfo} from '../types';
+import {assert} from '../utils/utils';
import {validateAccessors} from '../utils/validate';
/** All properties supported by GeoArrowTextLayer */
@@ -207,14 +207,13 @@ export class GeoArrowTextLayer<ExtraProps extends object = object> extends Compo
// @ts-expect-error how to properly retrieve batch offset?
const batchOffset = geometryColumn._offsets[recordBatchIdx];
- const props: TextLayerProps<any> & ExtensionProps = {
+ const props: Record<string, any> = {
// Note: because this is a composite layer and not doing the rendering
// itself, we still have to pass in our defaultProps
...ourDefaultProps,
...otherProps,
// used for picking purposes
- // @ts-expect-error
recordBatchIdx,
tableOffsets,
@@ -242,12 +241,12 @@ export class GeoArrowTextLayer<ExtraProps extends object = object> extends Compo
}
},
// TODO privide more robust data comparators
- dataComparator: (d1, d2) => {
+ dataComparator: (d1: {data: unknown}, d2: {data: unknown}) => {
return d1.data === d2.data;
},
_subLayerProps: {
characters: {
- dataComparator: (d1, d2) => {
+ dataComparator: (d1: {data: unknown}, d2: {data: unknown}) => {
return d1.data === d2.data;
}
}
diff --git a/src/deckgl-arrow-layers/src/types.ts b/src/deckgl-arrow-layers/src/types.ts
index 567c958e6..2ae8a4501 100644
--- a/src/deckgl-arrow-layers/src/types.ts
+++ b/src/deckgl-arrow-layers/src/types.ts
@@ -5,7 +5,7 @@
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors
-import type {BinaryAttribute, Color, PickingInfo} from '@deck.gl/core/typed';
+import type {BinaryAttribute, Color, PickingInfo} from '@deck.gl/core';
import {TypedArray} from '@math.gl/types';
import * as arrow from 'apache-arrow';
diff --git a/src/deckgl-arrow-layers/src/utils/picking.ts b/src/deckgl-arrow-layers/src/utils/picking.ts
index cc66a8de7..d731566fc 100644
--- a/src/deckgl-arrow-layers/src/utils/picking.ts
+++ b/src/deckgl-arrow-layers/src/utils/picking.ts
@@ -6,7 +6,7 @@
// Copyright (c) vis.gl contributors
import * as arrow from 'apache-arrow';
-import {GetPickingInfoParams} from '@deck.gl/core/typed';
+import {GetPickingInfoParams} from '@deck.gl/core';
import {GeoArrowPickingInfo} from '../types';
export interface GeoArrowExtraPickingProps {
diff --git a/src/deckgl-arrow-layers/src/utils/utils.ts b/src/deckgl-arrow-layers/src/utils/utils.ts
index 889e695c7..58c07c1ce 100644
--- a/src/deckgl-arrow-layers/src/utils/utils.ts
+++ b/src/deckgl-arrow-layers/src/utils/utils.ts
@@ -5,12 +5,15 @@
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors
-import {assert} from '@deck.gl/core/typed';
import * as arrow from 'apache-arrow';
import * as ga from '@geoarrow/geoarrow-js';
import {AccessorContext, AccessorFunction, _InternalAccessorContext} from '../types';
import {isArrowFixedSizeList, isArrowStruct, isArrowVector} from '@kepler.gl/utils';
+export function assert(condition: unknown, message?: string): asserts condition {
+ if (!condition) throw new Error(message || 'assert');
+}
+
export type TypedArray =
| Uint8Array
| Uint8ClampedArray
diff --git a/src/deckgl-arrow-layers/src/utils/validate.ts b/src/deckgl-arrow-layers/src/utils/validate.ts
index af29bb325..34dba5cba 100644
--- a/src/deckgl-arrow-layers/src/utils/validate.ts
+++ b/src/deckgl-arrow-layers/src/utils/validate.ts
@@ -5,9 +5,9 @@
// SPDX-License-Identifier: MIT
// Copyright (c) vis.gl contributors
-import {assert} from '@deck.gl/core/typed';
import {isArrowVector} from '@kepler.gl/utils';
import * as arrow from 'apache-arrow';
+import {assert} from './utils';
export function validateAccessors(props: Record<string, any>, table: arrow.Table): void {
const vectorAccessors: arrow.Vector[] = [];
diff --git a/src/deckgl-layers/package.json b/src/deckgl-layers/package.json
index 5fb488392..d4fa9e087 100644
--- a/src/deckgl-layers/package.json
+++ b/src/deckgl-layers/package.json
@@ -30,20 +30,21 @@
"umd"
],
"dependencies": {
- "@danmarshall/deckgl-typings": "4.9.22",
- "@deck.gl/aggregation-layers": "^8.9.27",
- "@deck.gl/core": "^8.9.27",
- "@deck.gl/geo-layers": "^8.9.27",
- "@deck.gl/layers": "^8.9.27",
+ "@deck.gl/aggregation-layers": "^9.2.11",
+ "@deck.gl/core": "^9.2.11",
+ "@deck.gl/geo-layers": "^9.2.11",
+ "@deck.gl/layers": "^9.2.11",
"@kepler.gl/constants": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
- "@loaders.gl/wms": "4.3.2",
- "@luma.gl/constants": "^8.5.20",
- "@luma.gl/core": "^8.5.20",
+ "@loaders.gl/wms": "4.3.4",
+ "@luma.gl/constants": "^9.2.6",
+ "@luma.gl/core": "^9.2.6",
+ "@luma.gl/engine": "^9.2.6",
+ "@luma.gl/webgl": "^9.2.6",
"@mapbox/geo-viewport": "^0.4.1",
"@mapbox/vector-tile": "^1.3.1",
- "@math.gl/web-mercator": "^3.6.2",
+ "@math.gl/web-mercator": "^4.1.0",
"@types/d3-array": "^2.8.0",
"@types/geojson": "^7946.0.8",
"@types/lodash": "4.17.5",
diff --git a/src/deckgl-layers/src/3d-building-layer/3d-building-layer.ts b/src/deckgl-layers/src/3d-building-layer/3d-building-layer.ts
index b3f74aa06..cba5fcb37 100644
--- a/src/deckgl-layers/src/3d-building-layer/3d-building-layer.ts
+++ b/src/deckgl-layers/src/3d-building-layer/3d-building-layer.ts
@@ -1,10 +1,10 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import GL from '@luma.gl/constants';
-import {CompositeLayer} from '@deck.gl/core/typed';
-import {TileLayer as DeckGLTileLayer} from '@deck.gl/geo-layers/typed';
-import {SolidPolygonLayer, SolidPolygonLayerProps} from '@deck.gl/layers/typed';
+import {CompositeLayer} from '@deck.gl/core';
+import {TileLayer as DeckGLTileLayer} from '@deck.gl/geo-layers';
+import {SolidPolygonLayer, SolidPolygonLayerProps} from '@deck.gl/layers';
+import {BLEND_PARAMS_ALPHA} from '@kepler.gl/constants';
import {getTileData} from './3d-building-utils';
import {ThreeDBuildingLayerProps, TileDataItem, TileLoadProps} from './types';
@@ -15,10 +15,7 @@ export default class ThreeDBuildingLayer extends CompositeLayer<ThreeDBuildingLa
renderSubLayers(props: SolidPolygonLayerProps<any>) {
return new SolidPolygonLayer<TileDataItem>({
...props,
- parameters: {
- blendFunc: [GL.SRC_ALPHA, GL.ONE_MINUS_SRC_ALPHA, GL.ONE, GL.ONE_MINUS_SRC_ALPHA],
- blendEquation: [GL.FUNC_ADD, GL.FUNC_ADD]
- },
+ parameters: BLEND_PARAMS_ALPHA,
extruded: true,
opacity: 1,
filled: true,
diff --git a/src/deckgl-layers/src/cluster-layer/cluster-layer.ts b/src/deckgl-layers/src/cluster-layer/cluster-layer.ts
index 25f84e42a..e6f3436d5 100644
--- a/src/deckgl-layers/src/cluster-layer/cluster-layer.ts
+++ b/src/deckgl-layers/src/cluster-layer/cluster-layer.ts
@@ -1,8 +1,8 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
+import {CompositeLayer, GetPickingInfoParams, PickingInfo} from '@deck.gl/core';
import {ScatterplotLayer} from '@deck.gl/layers';
-import {_AggregationLayer as AggregationLayer} from '@deck.gl/aggregation-layers';
import geoViewport from '@mapbox/geo-viewport';
import CPUAggregator, {
@@ -17,13 +17,12 @@ import {max} from 'd3-array';
import {SCALE_TYPES, DEFAULT_COLOR_RANGE, LAYER_VIS_CONFIGS} from '@kepler.gl/constants';
import ClusterBuilder, {getGeoJSON} from '../layer-utils/cluster-utils';
import {RGBAColor} from '@kepler.gl/types';
-import {AggregationLayerProps} from '@deck.gl/aggregation-layers/aggregation-layer';
const defaultRadius = LAYER_VIS_CONFIGS.clusterRadius.defaultValue;
const defaultRadiusRange = LAYER_VIS_CONFIGS.clusterRadiusRange.defaultValue;
-const defaultGetColorValue = points => points.length;
-const defaultGetRadiusValue = cell =>
+const defaultGetColorValue = (points: Record<string, unknown>[]) => points.length;
+const defaultGetRadiusValue = (cell: {filteredPoints?: unknown[]; points: unknown[]}) =>
cell.filteredPoints ? cell.filteredPoints.length : cell.points.length;
// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -43,15 +42,19 @@ function getClusters(this: CPUAggregator, step, props, aggregation, {viewport})
// zoom needs to be an integer for the different map utils. Also helps with cache key.
const bbox = geoViewport.bounds([longitude, latitude], zoom, [width, height]);
- const clusters = clusterBuilder.clustersAtZoom({bbox, clusterRadius, geoJSON, zoom});
+ const clusters = clusterBuilder?.clustersAtZoom({bbox, clusterRadius, geoJSON, zoom}) ?? [];
this.setState({
layerData: {data: clusters}
});
}
-function getSubLayerRadius(dimensionState, dimension, layerProps) {
- return cell => {
+function getSubLayerRadius(
+ dimensionState: {scaleFunc: (v: number) => number},
+ dimension: DimensionType,
+ layerProps: Record<string, any>
+) {
+ return (cell: Record<string, unknown>): number => {
const {getRadiusValue} = layerProps;
const {scaleFunc} = dimensionState;
return scaleFunc(getRadiusValue(cell));
@@ -101,7 +104,7 @@ function getRadiusValueDomain(this: CPUAggregator, step, props, dimensionUpdater
const {getRadiusValue} = props;
const {layerData} = this.state;
- const valueDomain = [0, max(layerData.data, getRadiusValue)];
+ const valueDomain = [0, max(layerData.data as unknown as number[], getRadiusValue)];
this._setDimensionState(key, {valueDomain});
}
@@ -155,10 +158,12 @@ const defaultProps = {
getRadiusValue: {type: 'accessor', value: defaultGetRadiusValue}
};
-export default class ClusterLayer extends AggregationLayer<
- any,
- AggregationLayerProps<any> & {radiusScale: number}
-> {
+interface ClusterLayerState {
+ cpuAggregator: CPUAggregator;
+ aggregatorState: CPUAggregator['state'];
+}
+
+export default class ClusterLayer extends CompositeLayer {
initializeState() {
const cpuAggregator = new CPUAggregator({
aggregation: clusterAggregation,
@@ -169,28 +174,34 @@ export default class ClusterLayer extends AggregationLayer<
cpuAggregator,
aggregatorState: cpuAggregator.state
};
- const attributeManager = this.getAttributeManager();
- attributeManager.add({
- positions: {size: 3, accessor: 'getPosition'}
- });
}
- updateState({oldProps, props, changeFlags}) {
+ updateState({
+ oldProps,
+ props,
+ changeFlags
+ }: {
+ oldProps: Record<string, any>;
+ props: Record<string, any>;
+ changeFlags: Record<string, any>;
+ }) {
this.setState({
- // make a copy of the internal state of cpuAggregator for testing
- aggregatorState: this.state.cpuAggregator.updateState(
+ aggregatorState: (this.state as unknown as ClusterLayerState).cpuAggregator.updateState(
{oldProps, props, changeFlags},
{
viewport: this.context.viewport,
- attributes: this.getAttributes(),
+ // @ts-expect-error props passed for internal calculation
numInstances: this.getNumInstances(props)
}
)
});
}
- getPickingInfo({info}) {
- const obj = this.state.cpuAggregator.getPickingInfo({info}, this.props);
+ getPickingInfo({info}: GetPickingInfoParams): PickingInfo {
+ const obj = (this.state as unknown as ClusterLayerState).cpuAggregator.getPickingInfo(
+ {info},
+ this.props
+ );
if (obj?.object) {
// @ts-expect-error
const distanceScale = getDistanceScales(this.context.viewport);
@@ -198,28 +209,30 @@ export default class ClusterLayer extends AggregationLayer<
obj.object.scaledRadiusValue = obj.object.scaledRadiusValue * metersPerPixel;
}
- return obj;
+ return obj as PickingInfo;
}
_getSublayerUpdateTriggers() {
- return this.state.cpuAggregator.getUpdateTriggers(this.props);
+ return (this.state as unknown as ClusterLayerState).cpuAggregator.getUpdateTriggers(this.props);
}
_getSubLayerAccessors() {
return {
- getRadius: this.state.cpuAggregator.getAccessor('radius', this.props),
- getFillColor: this.state.cpuAggregator.getAccessor('fillColor', this.props)
+ getRadius: (this.state as unknown as ClusterLayerState).cpuAggregator.getAccessor(
+ 'radius',
+ this.props
+ ),
+ getFillColor: (this.state as unknown as ClusterLayerState).cpuAggregator.getAccessor(
+ 'fillColor',
+ this.props
+ )
};
}
renderLayers() {
- // for subclassing, override this method to return
- // customized sub layer props
- const {id, radiusScale} = this.props;
- const {cpuAggregator} = this.state;
-
- // base layer props
- const {visible, opacity, pickable, autoHighlight, highlightColor} = this.props;
+ const {id, radiusScale, visible, opacity, pickable, autoHighlight, highlightColor} = this
+ .props as Record<string, any>;
+ const {cpuAggregator} = this.state as unknown as ClusterLayerState;
const updateTriggers = this._getSublayerUpdateTriggers();
const accessors = this._getSubLayerAccessors();
diff --git a/src/deckgl-layers/src/column-layer/enhanced-column-layer.ts b/src/deckgl-layers/src/column-layer/enhanced-column-layer.ts
index f054622a5..82e420363 100644
--- a/src/deckgl-layers/src/column-layer/enhanced-column-layer.ts
+++ b/src/deckgl-layers/src/column-layer/enhanced-column-layer.ts
@@ -1,13 +1,12 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
+import {ColumnLayer, ColumnLayerProps} from '@deck.gl/layers';
import {UNIT} from '@deck.gl/core';
-import {ColumnLayer, ColumnLayerProps} from '@deck.gl/layers/typed';
-import GL from '@luma.gl/constants';
import {editShader} from '../';
-function addInstanceCoverage(vs) {
+function addInstanceCoverage(vs: string) {
const addDecl = editShader(
vs,
'hexagon cell vs add instance 1',
@@ -19,16 +18,15 @@ function addInstanceCoverage(vs) {
return editShader(
addDecl,
'hexagon cell vs add instance 2',
- 'float dotRadius = radius * coverage * shouldRender;',
- 'float dotRadius = radius * coverage * instanceCoverage * shouldRender;'
+ 'float dotRadius = column.radius * column.coverage * shouldRender;',
+ 'float dotRadius = column.radius * column.coverage * instanceCoverage * shouldRender;'
);
}
type EnhancedColumnLayerProps = ColumnLayerProps<any> & {
- strokeOpacity: any;
+ strokeOpacity: number;
};
-// TODO: export all deck.gl layers from kepler.gl
class EnhancedColumnLayer extends ColumnLayer<any, EnhancedColumnLayerProps> {
getShaders() {
const shaders = super.getShaders();
@@ -47,7 +45,7 @@ class EnhancedColumnLayer extends ColumnLayer<any, EnhancedColumnLayerProps> {
});
}
- draw({uniforms}) {
+ draw({uniforms: _uniforms}) {
const {
lineWidthUnits,
lineWidthScale,
@@ -65,9 +63,11 @@ class EnhancedColumnLayer extends ColumnLayer<any, EnhancedColumnLayerProps> {
radius,
angle
} = this.props;
- const {model, fillVertexCount, wireframeVertexCount, edgeDistance} = this.state;
+ const fillModel = this.state.fillModel;
+ const wireframeModel = this.state.wireframeModel;
+ const {fillVertexCount, edgeDistance} = this.state;
- model.setUniforms(uniforms).setUniforms({
+ const columnProps = {
radius,
angle: (angle / 180) * Math.PI,
offset,
@@ -81,35 +81,33 @@ class EnhancedColumnLayer extends ColumnLayer<any, EnhancedColumnLayerProps> {
widthScale: lineWidthScale,
widthMinPixels: lineWidthMinPixels,
widthMaxPixels: lineWidthMaxPixels
- });
+ };
- // When drawing 3d: draw wireframe first so it doesn't get occluded by depth test
- if (extruded && wireframe) {
- model.setProps({isIndexed: true});
- model
- .setVertexCount(wireframeVertexCount)
- .setDrawMode(GL.LINES)
- .setUniforms({isStroke: true})
- .draw();
+ if (extruded && wireframe && wireframeModel) {
+ wireframeModel.shaderInputs.setProps({
+ column: {...columnProps, isStroke: true}
+ });
+ wireframeModel.draw(this.context.renderPass);
}
- if (filled) {
- model.setProps({isIndexed: false});
- model
- .setVertexCount(fillVertexCount)
- .setDrawMode(GL.TRIANGLE_STRIP)
- .setUniforms({isStroke: false})
- .draw();
+ if (filled && fillModel) {
+ fillModel.setVertexCount(fillVertexCount);
+ fillModel.shaderInputs.setProps({
+ column: {...columnProps, isStroke: false}
+ });
+ fillModel.draw(this.context.renderPass);
}
- // When drawing 2d: draw fill before stroke so that the outline is always on top
- if (!extruded && stroked) {
- model.setProps({isIndexed: false});
- // The width of the stroke is achieved by flattening the side of the cylinder.
- // Skip the last 1/3 of the vertices which is the top.
- model
- .setVertexCount((fillVertexCount * 2) / 3)
- .setDrawMode(GL.TRIANGLE_STRIP)
- .setUniforms({isStroke: true, opacity: strokeOpacity})
- .draw();
+ if (!extruded && stroked && fillModel) {
+ fillModel.setVertexCount((fillVertexCount * 2) / 3);
+ fillModel.shaderInputs.setProps({
+ column: {...columnProps, isStroke: true},
+ layer: {opacity: strokeOpacity ?? this.props.opacity}
+ });
+ fillModel.draw(this.context.renderPass);
+ // Restore original vertex count and opacity so subsequent passes are unaffected
+ fillModel.setVertexCount(fillVertexCount);
+ fillModel.shaderInputs.setProps({
+ layer: {opacity: this.props.opacity}
+ });
}
}
}
diff --git a/src/deckgl-layers/src/deckgl-extensions/filter-arrow-layer.ts b/src/deckgl-layers/src/deckgl-extensions/filter-arrow-layer.ts
index 6b25a2649..02460963b 100644
--- a/src/deckgl-layers/src/deckgl-extensions/filter-arrow-layer.ts
+++ b/src/deckgl-layers/src/deckgl-extensions/filter-arrow-layer.ts
@@ -2,7 +2,6 @@
// Copyright contributors to the kepler.gl project
import {Layer, LayerExtension} from '@deck.gl/core';
-import GL from '@luma.gl/constants';
import shaderModule from './filter-shader-module';
@@ -42,16 +41,9 @@ export default class FilterArrowExtension extends LayerExtension {
attributeManager.add({
filtered: {
size: 1,
- type: GL.FLOAT,
- accessor: 'getFiltered',
- shaderAttributes: {
- filtered: {
- divisor: 0
- },
- instanceFiltered: {
- divisor: 1
- }
- }
+ type: 'float32',
+ stepMode: 'dynamic',
+ accessor: 'getFiltered'
}
});
}
diff --git a/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts b/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts
index 2bfd50ac5..70a5e3a3f 100644
--- a/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts
+++ b/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts
@@ -4,20 +4,14 @@
import {project} from '@deck.gl/core';
const vs = `
- #ifdef NON_INSTANCED_MODEL
- #define FILTER_ARROW_ATTRIB filtered
- #else
- #define FILTER_ARROW_ATTRIB instanceFiltered
- #endif
- attribute float FILTER_ARROW_ATTRIB;
+ in float filtered;
`;
const fs = ``;
const inject = {
- // create degenerate vertices in vertex shader instead of discarding pixels in the fragment shader.
'vs:#main-start': `
- if (FILTER_ARROW_ATTRIB == 0.) {
+ if (filtered == 0.) {
gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
return;
}
diff --git a/src/deckgl-layers/src/grid-layer/enhanced-cpu-grid-layer.ts b/src/deckgl-layers/src/grid-layer/enhanced-cpu-grid-layer.ts
index ebcbfaca7..729989181 100644
--- a/src/deckgl-layers/src/grid-layer/enhanced-cpu-grid-layer.ts
+++ b/src/deckgl-layers/src/grid-layer/enhanced-cpu-grid-layer.ts
@@ -1,45 +1,66 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {CPUGridLayer} from '@deck.gl/aggregation-layers';
-import CPUAggregator, {AggregationType, getAggregatedData} from '../layer-utils/cpu-aggregator';
+import {GridLayer, GridLayerPickingInfo} from '@deck.gl/aggregation-layers';
+import {GetPickingInfoParams, PickingInfo, Viewport} from '@deck.gl/core';
-export const gridAggregation: AggregationType = {
- key: 'position',
- updateSteps: [
- {
- key: 'aggregate',
- triggers: {
- cellSize: {
- prop: 'cellSize'
- },
- position: {
- prop: 'getPosition',
- updateTrigger: 'getPosition'
- },
- aggregator: {
- prop: 'gridAggregator'
- }
- },
- updater: getAggregatedData
- }
- ]
-};
+interface GridInternalState {
+ cellOriginCommon?: [number, number];
+ cellSizeCommon?: [number, number];
+ aggregatorViewport?: Viewport & {unprojectFlat(xy: number[]): number[]};
+}
+
+interface GridPickingObject {
+ col: number;
+ row: number;
+ cellOutline?: number[][];
+ [key: string]: unknown;
+}
+
+/**
+ * In deck.gl 9, GridLayer natively supports CPU aggregation via gpuAggregation: false,
+ * custom getColorValue/getElevationValue accessors, percentile filtering, and scale types.
+ * The custom CPUAggregator override from deck.gl 8 is no longer needed.
+ *
+ * We override getPickingInfo to add `cellOutline` — an array of [lng, lat] coordinates
+ * computed in common space so the outline aligns with rendered cells at all latitudes.
+ */
+export default class ScaleEnhancedGridLayer extends GridLayer<any> {
+ static defaultProps = {
+ ...GridLayer.defaultProps,
+ gpuAggregation: false
+ };
-export default class ScaleEnhancedGridLayer extends CPUGridLayer<any> {
- initializeState() {
- const cpuAggregator = new CPUAggregator({
- aggregation: gridAggregation
- });
+ getPickingInfo(params: GetPickingInfoParams): PickingInfo {
+ const info = super.getPickingInfo(params) as GridLayerPickingInfo<Record<string, unknown>>;
+ if (info.object) {
+ const {cellOriginCommon, cellSizeCommon, aggregatorViewport} = this
+ .state as unknown as GridInternalState;
+ const coverage = this.props.coverage ?? 1;
+ if (!cellOriginCommon || !cellSizeCommon || !aggregatorViewport) {
+ console.error(
+ 'ScaleEnhancedGridLayer: expected internal state properties ' +
+ '(cellOriginCommon, cellSizeCommon, aggregatorViewport) are missing. ' +
+ 'Hover outline will not be shown. This may indicate a deck.gl version change.'
+ );
+ return info;
+ }
+ const {col, row} = info.object as GridPickingObject;
+ if (typeof col !== 'number' || typeof row !== 'number') return info;
+ const cx = (col + 0.5) * cellSizeCommon[0] + cellOriginCommon[0];
+ const cy = (row + 0.5) * cellSizeCommon[1] + cellOriginCommon[1];
+ const hw = 0.5 * coverage * cellSizeCommon[0];
+ const hh = 0.5 * coverage * cellSizeCommon[1];
- this.state = {
- cpuAggregator,
- aggregatorState: cpuAggregator.state
- };
- const attributeManager = this.getAttributeManager();
- attributeManager.add({
- positions: {size: 3, accessor: 'getPosition'}
- });
+ (info.object as GridPickingObject).cellOutline = [
+ aggregatorViewport.unprojectFlat([cx - hw, cy - hh]),
+ aggregatorViewport.unprojectFlat([cx + hw, cy - hh]),
+ aggregatorViewport.unprojectFlat([cx + hw, cy + hh]),
+ aggregatorViewport.unprojectFlat([cx - hw, cy + hh]),
+ aggregatorViewport.unprojectFlat([cx - hw, cy - hh])
+ ];
+ }
+ return info;
}
}
diff --git a/src/deckgl-layers/src/hexagon-layer/enhanced-hexagon-layer.ts b/src/deckgl-layers/src/hexagon-layer/enhanced-hexagon-layer.ts
index 81096549a..0c211acc9 100644
--- a/src/deckgl-layers/src/hexagon-layer/enhanced-hexagon-layer.ts
+++ b/src/deckgl-layers/src/hexagon-layer/enhanced-hexagon-layer.ts
@@ -1,45 +1,78 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {HexagonLayer} from '@deck.gl/aggregation-layers';
-import CPUAggregator, {AggregationType, getAggregatedData} from '../layer-utils/cpu-aggregator';
-
-export const hexagonAggregation: AggregationType = {
- key: 'position',
- updateSteps: [
- {
- key: 'aggregate',
- triggers: {
- cellSize: {
- prop: 'radius'
- },
- position: {
- prop: 'getPosition',
- updateTrigger: 'getPosition'
- },
- aggregator: {
- prop: 'hexagonAggregator'
- }
- },
- updater: getAggregatedData
- }
- ]
-};
+import {HexagonLayer, HexagonLayerPickingInfo} from '@deck.gl/aggregation-layers';
+import {GetPickingInfoParams, PickingInfo, Viewport} from '@deck.gl/core';
+
+const THIRD_PI = Math.PI / 3;
+const HexbinVertices = Array.from({length: 6}, (_, i) => {
+ const angle = i * THIRD_PI;
+ return [Math.sin(angle), -Math.cos(angle)];
+});
+
+function getHexbinCentroid(id: [number, number], radius: number): [number, number] {
+ const DIST_X = 2 * Math.sin(THIRD_PI);
+ const DIST_Y = 1.5;
+ return [(id[0] + (id[1] & 1) / 2) * radius * DIST_X, id[1] * radius * DIST_Y];
+}
+
+interface HexInternalState {
+ radiusCommon?: number;
+ hexOriginCommon?: [number, number];
+ aggregatorViewport?: Viewport & {unprojectFlat(xy: number[]): number[]};
+}
+interface HexPickingObject {
+ col: number;
+ row: number;
+ cellOutline?: number[][];
+ [key: string]: unknown;
+}
+
+/**
+ * In deck.gl 9, HexagonLayer natively supports CPU aggregation via gpuAggregation: false,
+ * custom getColorValue/getElevationValue accessors, percentile filtering, and scale types.
+ *
+ * We override getPickingInfo to add `cellOutline` — an array of [lng, lat] coordinates
+ * computed in common space so the outline aligns with rendered cells at all latitudes.
+ */
export default class ScaleEnhancedHexagonLayer extends HexagonLayer<any> {
- initializeState() {
- const cpuAggregator = new CPUAggregator({
- aggregation: hexagonAggregation
- });
-
- this.state = {
- cpuAggregator,
- aggregatorState: cpuAggregator.state
- };
- const attributeManager = this.getAttributeManager();
- attributeManager.add({
- positions: {size: 3, accessor: 'getPosition'}
- });
+ static defaultProps = {
+ ...HexagonLayer.defaultProps,
+ gpuAggregation: false
+ };
+
+ getPickingInfo(params: GetPickingInfoParams): PickingInfo {
+ const info = super.getPickingInfo(params) as HexagonLayerPickingInfo<Record<string, unknown>>;
+ if (info.object) {
+ const {radiusCommon, hexOriginCommon, aggregatorViewport} = this
+ .state as unknown as HexInternalState;
+ const coverage = this.props.coverage ?? 1;
+ if (!radiusCommon || !aggregatorViewport) {
+ console.error(
+ 'ScaleEnhancedHexagonLayer: expected internal state properties ' +
+ '(radiusCommon, aggregatorViewport) are missing. ' +
+ 'Hover outline will not be shown. This may indicate a deck.gl version change.'
+ );
+ return info;
+ }
+ const {col, row} = info.object as HexPickingObject;
+ if (typeof col !== 'number' || typeof row !== 'number') return info;
+ const centroid = getHexbinCentroid([col, row], radiusCommon);
+ const ox = hexOriginCommon?.[0] ?? 0;
+ const oy = hexOriginCommon?.[1] ?? 0;
+ const r = radiusCommon * coverage;
+
+ const outline: number[][] = [];
+ for (let i = 0; i < 6; i++) {
+ const vx = centroid[0] + r * HexbinVertices[i][0] + ox;
+ const vy = centroid[1] + r * HexbinVertices[i][1] + oy;
+ outline.push(aggregatorViewport.unprojectFlat([vx, vy]));
+ }
+ outline.push(outline[0]);
+ (info.object as HexPickingObject).cellOutline = outline;
+ }
+ return info;
}
}
diff --git a/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts b/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
index 9eee7a14c..89770b375 100644
--- a/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
+++ b/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
@@ -2,12 +2,171 @@
// Copyright contributors to the kepler.gl project
/* eslint-disable guard-for-in */
-import {AGGREGATION_OPERATION, _BinSorter as BinSorter} from '@deck.gl/aggregation-layers';
import {console as Console} from 'global/window';
import {aggregate} from '@kepler.gl/utils';
import {AGGREGATION_TYPES, SCALE_FUNC} from '@kepler.gl/constants';
import {RGBAColor} from '@kepler.gl/types';
+import type ClusterBuilder from './cluster-utils';
+
+const AGGREGATION_OPERATION = {
+ SUM: 'SUM' as const,
+ MEAN: 'MEAN' as const,
+ MIN: 'MIN' as const,
+ MAX: 'MAX' as const,
+ COUNT: 'COUNT' as const
+};
+
+const MAX_32_BIT_FLOAT = 3.402823466e38;
+
+interface Bin {
+ points: Record<string, unknown>[];
+ filteredPoints?: Record<string, unknown>[] | null;
+ index?: number;
+}
+
+interface AggregatedBin {
+ i: number;
+ value: number;
+ counts: number;
+}
+
+const defaultGetValue = (points: Record<string, unknown>[]) => points.length;
+const defaultGetPoints = (bin: Bin) => bin.points;
+const defaultGetIndex = (bin: Bin) => bin.index;
+const ascending = (a: number, b: number) => (a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN);
+
+function clamp(value: number, min: number, max: number) {
+ return Math.max(min, Math.min(max, value));
+}
+
+function getQuantileDomain(data: AggregatedBin[], valueAccessor: (d: AggregatedBin) => number) {
+ return data.map(valueAccessor).sort(ascending);
+}
+
+function getOrdinalDomain(data: AggregatedBin[], valueAccessor: (d: AggregatedBin) => number) {
+ return [...new Set(data.map(valueAccessor))];
+}
+
+class BinSorter {
+ maxCount!: number;
+ maxValue!: number;
+ minValue!: number;
+ totalCount!: number;
+ aggregatedBins: AggregatedBin[];
+ sortedBins!: AggregatedBin[];
+ binMap: Record<number, AggregatedBin>;
+
+ constructor(bins: Bin[] = [], props: Record<string, any> = {}) {
+ this.aggregatedBins = this._getAggregatedBins(bins, props);
+ this._updateMinMaxValues();
+ this.binMap = this._getBinMap();
+ }
+
+ _getAggregatedBins(bins: Bin[], props: Record<string, any>): AggregatedBin[] {
+ const {
+ getValue = defaultGetValue,
+ getPoints = defaultGetPoints,
+ getIndex = defaultGetIndex,
+ filterData
+ } = props;
+ const hasFilter = typeof filterData === 'function';
+ const aggregatedBins: AggregatedBin[] = [];
+ let index = 0;
+ for (let binIndex = 0; binIndex < bins.length; binIndex++) {
+ const bin = bins[binIndex];
+ const points = getPoints(bin);
+ const i = getIndex(bin);
+ const filteredPoints = hasFilter ? points.filter(filterData) : points;
+ bin.filteredPoints = hasFilter ? filteredPoints : null;
+ const value = filteredPoints.length ? getValue(filteredPoints) : null;
+ if (value !== null && value !== undefined) {
+ aggregatedBins[index] = {
+ i: Number.isFinite(i) ? i : binIndex,
+ value,
+ counts: filteredPoints.length
+ };
+ index++;
+ }
+ }
+ return aggregatedBins;
+ }
+
+ _updateMinMaxValues() {
+ let maxCount = 0;
+ let maxValue = -MAX_32_BIT_FLOAT;
+ let minValue = MAX_32_BIT_FLOAT;
+ let totalCount = 0;
+ for (const x of this.aggregatedBins) {
+ maxCount = maxCount > x.counts ? maxCount : x.counts;
+ maxValue = maxValue > x.value ? maxValue : x.value;
+ minValue = minValue < x.value ? minValue : x.value;
+ totalCount += x.counts;
+ }
+ if (this.aggregatedBins.length === 0) {
+ maxValue = 0;
+ minValue = 0;
+ }
+ this.maxCount = maxCount;
+ this.maxValue = maxValue;
+ this.minValue = minValue;
+ this.totalCount = totalCount;
+ }
+
+ _getBinMap() {
+ const binMap = {};
+ for (const bin of this.aggregatedBins) {
+ binMap[bin.i] = bin;
+ }
+ return binMap;
+ }
+
+ _percentileToIndex(percentileRange: number[]) {
+ const len = this.sortedBins.length;
+ if (len < 2) return [0, 0];
+ const [lower, upper] = percentileRange.map(n => clamp(n, 0, 100));
+ return [Math.ceil((lower / 100) * (len - 1)), Math.floor((upper / 100) * (len - 1))];
+ }
+
+ getValueDomainByScale(scale: string, [lower = 0, upper = 100]: number[] = []) {
+ if (!this.sortedBins) {
+ this.sortedBins = this.aggregatedBins.sort((a, b) => ascending(a.value, b.value));
+ }
+ if (!this.sortedBins.length) return [];
+ const indexEdge = this._percentileToIndex([lower, upper]);
+ return this._getScaleDomain(scale, indexEdge);
+ }
+
+ _getScaleDomain(scaleType: string, [lowerIdx, upperIdx]: number[]) {
+ const bins = this.sortedBins;
+ switch (scaleType) {
+ case 'quantize':
+ case 'linear':
+ return [bins[lowerIdx].value, bins[upperIdx].value];
+ case 'quantile':
+ return getQuantileDomain(bins.slice(lowerIdx, upperIdx + 1), d => d.value);
+ case 'ordinal':
+ return getOrdinalDomain(bins, d => d.value);
+ default:
+ return [bins[lowerIdx].value, bins[upperIdx].value];
+ }
+ }
+
+ getValueRange(percentileRange?: number[]) {
+ if (!this.sortedBins) {
+ this.sortedBins = this.aggregatedBins.sort((a, b) => ascending(a.value, b.value));
+ }
+ if (!this.sortedBins.length) return [];
+ let lowerIdx = 0;
+ let upperIdx = this.sortedBins.length - 1;
+ if (Array.isArray(percentileRange)) {
+ const idxRange = this._percentileToIndex(percentileRange);
+ lowerIdx = idxRange[0];
+ upperIdx = idxRange[1];
+ }
+ return [this.sortedBins[lowerIdx].value, this.sortedBins[upperIdx].value];
+ }
+}
export type UpdaterType = (this: CPUAggregator, step, props, dimensionUpdater) => void;
export type BindedUpdaterType = () => void;
@@ -66,7 +225,10 @@ export const DECK_AGGREGATION_MAP = {
[AGGREGATION_OPERATION.MAX]: AGGREGATION_TYPES.maximum
};
-export function getValueFunc(aggregation, accessor) {
+export function getValueFunc(
+ aggregation: string,
+ accessor: (d: Record<string, unknown>) => number
+) {
if (!aggregation || !AGGREGATION_OPERATION[aggregation.toUpperCase()]) {
Console.warn(`Aggregation ${aggregation} is not supported`);
}
@@ -77,7 +239,7 @@ export function getValueFunc(aggregation, accessor) {
return pts => aggregate(pts.map(accessor), keplerOp);
}
-export function getScaleFunctor(scaleType) {
+export function getScaleFunctor(scaleType: string) {
if (!scaleType || !SCALE_FUNC[scaleType]) {
Console.warn(`Scale ${scaleType} is not supported`);
}
@@ -107,8 +269,7 @@ export function getGetValue(this: CPUAggregator, step, props, dimensionUpdater)
export function getDimensionSortedBins(this: CPUAggregator, step, props, dimensionUpdater) {
const {key} = dimensionUpdater;
const {getValue} = this.state.dimensions[key];
- // @ts-expect-error
- const sortedBins = new BinSorter(this.state.layerData.data || [], {
+ const sortedBins = new BinSorter((this.state.layerData.data || []) as unknown as Bin[], {
getValue,
filterData: props._filterData
});
@@ -167,12 +328,20 @@ export function getDimensionScale(this: CPUAggregator, step, props, dimensionUpd
if (typeof onSet === 'object' && typeof props[onSet.props] === 'function') {
const sortedBins = this.state.dimensions[key].sortedBins;
- props[onSet.props]({domain: scaleFunc.domain(), aggregatedBins: sortedBins.binMap});
+ if (sortedBins) {
+ props[onSet.props]({domain: scaleFunc.domain(), aggregatedBins: sortedBins.binMap});
+ }
}
this._setDimensionState(key, {scaleFunc});
}
-function normalizeResult(result: {hexagons?; layerData?} = {}) {
+function normalizeResult(
+ result: {
+ hexagons?: Record<string, unknown>[];
+ layerData?: Record<string, unknown>[];
+ data?: Record<string, unknown>[];
+ } = {}
+) {
// support previous hexagonAggregator API
if (result.hexagons) {
return Object.assign({data: result.hexagons}, result);
@@ -225,8 +394,11 @@ export const defaultAggregation: AggregationType = {
]
};
-function getSubLayerAccessor(dimensionState, dimension) {
- return cell => {
+function getSubLayerAccessor(
+ dimensionState: {sortedBins: BinSorter; scaleFunc: ReturnType<typeof getScaleFunctor>},
+ dimension: DimensionType
+) {
+ return (cell: {index: number}) => {
const {sortedBins, scaleFunc} = dimensionState;
const bin = sortedBins.binMap[cell.index];
@@ -390,10 +562,18 @@ export const defaultElevationDimension: DimensionType<number> = {
export const defaultDimensions = [defaultColorDimension, defaultElevationDimension];
export type CPUAggregatorState = {
- layerData: {data?};
- dimensions: object;
- geoJSON?;
- clusterBuilder?;
+ layerData: {data?: Record<string, unknown>[]};
+ dimensions: Record<
+ string,
+ {
+ getValue?: (...args: unknown[]) => number;
+ sortedBins?: BinSorter;
+ valueDomain?: number[];
+ scaleFunc?: ((...args: unknown[]) => unknown) & {domain: () => number[]; scaleType?: string};
+ }
+ >;
+ geoJSON?: GeoJSON.FeatureCollection;
+ clusterBuilder?: ClusterBuilder;
};
export default class CPUAggregator {
@@ -438,7 +618,7 @@ export default class CPUAggregator {
return defaultDimensions;
}
- updateAllDimensions(props) {
+ updateAllDimensions(props: Record<string, any>) {
let dimensionChanges: BindedUpdaterType[] = [];
// update all dimensions
for (const dim in this.dimensionUpdaters) {
@@ -449,12 +629,19 @@ export default class CPUAggregator {
dimensionChanges.forEach(f => typeof f === 'function' && f());
}
- updateAggregation(props, aggregationParams) {
+ updateAggregation(props: Record<string, any>, aggregationParams: Record<string, any>) {
const updaters = this._accumulateUpdaters(0, props, this.aggregationUpdater);
updaters.forEach(f => typeof f === 'function' && f(aggregationParams));
}
- updateState(opts, aggregationParams) {
+ updateState(
+ opts: {
+ oldProps: Record<string, any>;
+ props: Record<string, any>;
+ changeFlags: Record<string, any>;
+ },
+ aggregationParams: Record<string, any>
+ ) {
const {oldProps, props, changeFlags} = opts;
let dimensionChanges: BindedUpdaterType[] = [];
@@ -482,12 +669,12 @@ export default class CPUAggregator {
}
// Update private state
- setState(updateObject) {
+ setState(updateObject: Partial<CPUAggregatorState>) {
this.state = Object.assign({}, this.state, updateObject);
}
// Update private state.dimensions
- _setDimensionState(key, updateObject) {
+ _setDimensionState(key: string, updateObject: Record<string, any>) {
this.setState({
dimensions: Object.assign({}, this.state.dimensions, {
[key]: Object.assign({}, this.state.dimensions[key], updateObject)
@@ -543,7 +730,12 @@ export default class CPUAggregator {
const updater = dimension.updateSteps[i].updater;
if (typeof updater === 'function') {
updaters.push(
- updater.bind(this, dimension.updateSteps[i], props, dimension) as LocalUpdaterType
+ (updater as UpdaterType).bind(
+ this,
+ dimension.updateSteps[i],
+ props,
+ dimension
+ ) as LocalUpdaterType
);
}
}
@@ -572,12 +764,20 @@ export default class CPUAggregator {
return updaters;
}
- _getAggregationChanges(oldProps, props, changeFlags) {
+ _getAggregationChanges(
+ oldProps: Record<string, any>,
+ props: Record<string, any>,
+ changeFlags: Record<string, any>
+ ) {
const updaters = this._getAllUpdaters(this.aggregationUpdater, oldProps, props, changeFlags);
return updaters.length ? updaters : null;
}
- _getDimensionChanges(oldProps, props, changeFlags) {
+ _getDimensionChanges(
+ oldProps: Record<string, any>,
+ props: Record<string, any>,
+ changeFlags: Record<string, any>
+ ) {
let updaters: BindedUpdaterType[] = [];
// get dimension to be updated
@@ -591,12 +791,12 @@ export default class CPUAggregator {
return updaters.length ? updaters : null;
}
- getUpdateTriggers(props) {
+ getUpdateTriggers(props: Record<string, any>) {
const _updateTriggers = props.updateTriggers || {};
const updateTriggers = {};
for (const key in this.dimensionUpdaters) {
- const {accessor, updateSteps}: {accessor; updateSteps: UpdateStepsType[]} =
+ const {accessor, updateSteps}: {accessor: string; updateSteps: UpdateStepsType[]} =
this.dimensionUpdaters[key];
// fold dimension triggers into each accessor
updateTriggers[accessor] = {};
@@ -625,10 +825,10 @@ export default class CPUAggregator {
return updateTriggers;
}
- getPickingInfo({info}, layerProps) {
+ getPickingInfo({info}: {info: Record<string, any>}, layerProps: Record<string, any>) {
const isPicked = info.picked && info.index > -1;
- let object = null;
- const cell = isPicked ? this.state.layerData.data[info.index] : null;
+ let object: Record<string, any> | null = null;
+ const cell = isPicked ? this.state.layerData.data?.[info.index] : null;
if (cell) {
let binInfo = {};
for (const key in this.dimensionUpdaters) {
@@ -655,7 +855,7 @@ export default class CPUAggregator {
});
}
- getAccessor(dimensionKey, layerProps) {
+ getAccessor(dimensionKey: string, layerProps: Record<string, any>) {
if (!Object.prototype.hasOwnProperty.call(this.dimensionUpdaters, dimensionKey)) {
return nop;
}
diff --git a/src/deckgl-layers/src/line-layer/line-layer.ts b/src/deckgl-layers/src/line-layer/line-layer.ts
index 2f39fddd3..1cd696403 100644
--- a/src/deckgl-layers/src/line-layer/line-layer.ts
+++ b/src/deckgl-layers/src/line-layer/line-layer.ts
@@ -2,10 +2,22 @@
// Copyright contributors to the kepler.gl project
import {LineLayer, LineLayerProps} from '@deck.gl/layers';
-import GL from '@luma.gl/constants';
-import {RGBAColor} from 'deck.gl';
+import type {Color, AttributeManager} from '@deck.gl/core';
import {editShader} from '../';
+type RGBAColor = Color;
+
+const elevationScaleUniforms = {
+ name: 'elevationScale',
+ vs: `uniform elevationScaleUniforms {
+ float elevationScale;
+} elevationScaleProps;
+`,
+ uniformTypes: {
+ elevationScale: 'f32'
+ }
+};
+
const defaultProps = {
...LineLayer.defaultProps,
getTargetColor: x => x.color || [0, 0, 0, 255]
@@ -15,51 +27,34 @@ function addInstanceColorShader(vs) {
const targetColorVs = editShader(
vs,
'line target color vs',
- 'attribute vec4 instanceColors;',
- 'attribute vec4 instanceColors; attribute vec4 instanceTargetColors;'
+ 'in vec4 instanceColors;',
+ 'in vec4 instanceColors; in vec4 instanceTargetColors;'
);
return editShader(
targetColorVs,
'line color vs',
- 'vColor = vec4(instanceColors.rgb, instanceColors.a * opacity);',
+ 'vColor = vec4(instanceColors.rgb, instanceColors.a * layer.opacity);',
`vec4 color = mix(instanceColors, instanceTargetColors, positions.x);` +
- `vColor = vec4(color.rgb, color.a * opacity);`
+ `vColor = vec4(color.rgb, color.a * layer.opacity);`
);
}
function addElevationScale(vs) {
- let elevationVs = editShader(
+ return editShader(
vs,
- 'line elevation scale 1 vs - inject elevation scale',
- 'uniform float widthMaxPixels;',
- `uniform float widthMaxPixels;
- uniform float elevationScale;`
- );
-
- elevationVs = editShader(
- elevationVs,
- 'line elevation scale 2 vs - multiply by elevation scale',
+ 'line elevation scale vs - multiply by elevation scale',
`geometry.worldPosition = instanceSourcePositions;
- geometry.worldPositionAlt = instanceTargetPositions;`,
+geometry.worldPositionAlt = instanceTargetPositions;
+vec3 source_world = instanceSourcePositions;
+vec3 target_world = instanceTargetPositions;`,
`vec3 source_world = instanceSourcePositions;
- vec3 target_world = instanceTargetPositions;
- source_world.z *= elevationScale;
- target_world.z *= elevationScale;
-
- geometry.worldPosition = source_world;
- geometry.worldPositionAlt = target_world;`
+vec3 target_world = instanceTargetPositions;
+source_world.z *= elevationScaleProps.elevationScale;
+target_world.z *= elevationScaleProps.elevationScale;
+geometry.worldPosition = source_world;
+geometry.worldPositionAlt = target_world;`
);
-
- elevationVs = editShader(
- elevationVs,
- 'line elevation scale 3 vs',
- `vec3 source_world = instanceSourcePositions;
- vec3 target_world = instanceTargetPositions;`,
- ''
- );
-
- return elevationVs;
}
export default class EnhancedLineLayer extends LineLayer<
@@ -74,23 +69,30 @@ export default class EnhancedLineLayer extends LineLayer<
return {
...shaders,
- vs
+ vs,
+ modules: [...(shaders.modules || []), elevationScaleUniforms]
};
}
- draw({uniforms}) {
- const {elevationScale} = this.props;
- super.draw({uniforms: {...uniforms, elevationScale}});
+ draw(opts) {
+ const model = this.state.model;
+ if (model) {
+ model.shaderInputs.setProps({
+ elevationScale: {
+ elevationScale: this.props.elevationScale ?? 1
+ }
+ });
+ }
+ super.draw(opts);
}
initializeState() {
- super.initializeState(undefined);
- const {attributeManager} = this.state;
+ super.initializeState();
+ const {attributeManager} = this.state as {attributeManager: AttributeManager};
attributeManager.addInstanced({
instanceTargetColors: {
size: this.props.colorFormat?.length,
- type: GL.UNSIGNED_BYTE,
- normalized: true,
+ type: 'unorm8',
transition: true,
accessor: 'getTargetColor',
defaultValue: [0, 0, 0, 255]
diff --git a/src/deckgl-layers/src/raster/images.ts b/src/deckgl-layers/src/raster/images.ts
index 4178f46b6..d2ff7e7ed 100644
--- a/src/deckgl-layers/src/raster/images.ts
+++ b/src/deckgl-layers/src/raster/images.ts
@@ -1,25 +1,58 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import GL from '@luma.gl/constants';
-import {isWebGL2, Texture2D} from '@luma.gl/core';
-import type {Texture2DProps} from '@luma.gl/webgl';
+// @ts-ignore GL resolution depends on moduleResolution setting
+import {GL} from '@luma.gl/constants';
import isEqual from 'lodash/isEqual';
+import {FILTER_MODE, ADDRESS_MODE, TEXTURE_FORMAT} from '@kepler.gl/constants';
+import type {Texture} from '@luma.gl/core';
import type {ImageInput, ImageState} from './types';
/**
- * Texture parameters that should work for every texture on both WebGL1 and WebGL2
+ * Legacy texture creation descriptor used by raster shader modules.
+ * Contains CPU-side data + old GL-enum-based parameters that get
+ * translated to luma.gl 9's device.createTexture() props.
*/
-const DEFAULT_UNIVERSAL_TEXTURE_PARAMETERS = {
- [GL.TEXTURE_MIN_FILTER]: GL.NEAREST,
- [GL.TEXTURE_MAG_FILTER]: GL.NEAREST,
- [GL.TEXTURE_WRAP_S]: GL.CLAMP_TO_EDGE,
- [GL.TEXTURE_WRAP_T]: GL.CLAMP_TO_EDGE
+type TextureDataSource =
+ | HTMLImageElement
+ | HTMLCanvasElement
+ | ImageBitmap
+ | ImageData
+ | ArrayBufferView;
+
+type RasterTextureData = {
+ handle?: unknown;
+ id?: string;
+ device?: unknown;
+ width?: number;
+ height?: number;
+ format?: number;
+ type?: number;
+ parameters?: Record<number, number>;
+ mipmaps?: boolean;
+ data?: TextureDataSource & {width?: number; height?: number};
+};
+
+/**
+ * Texture sampler parameters for luma.gl 9 textures
+ */
+const DEFAULT_SAMPLER_PARAMETERS = {
+ minFilter: FILTER_MODE.NEAREST,
+ magFilter: FILTER_MODE.NEAREST,
+ addressModeU: ADDRESS_MODE.CLAMP_TO_EDGE,
+ addressModeV: ADDRESS_MODE.CLAMP_TO_EDGE
};
+/** luma.gl device interface for texture creation */
+interface LumaDevice {
+ createTexture(props: Record<string, unknown>): Texture;
+ gl?: WebGL2RenderingContext;
+}
+
type LoadImagesOptions = {
- gl: WebGLRenderingContext | WebGL2RenderingContext;
+ gl: WebGL2RenderingContext;
+ device?: LumaDevice;
images: ImageState;
imagesData: ImageInput;
oldImagesData: ImageInput;
@@ -27,17 +60,15 @@ type LoadImagesOptions = {
/**
* Load image items to webgl context
- * @param gl webgl rendering context
- * @param imageItem image item, might be single texture or array of textures
- * @returns loaded single webgl texture or array of webgl texture or null
*/
function loadImageItem(
- gl: WebGLRenderingContext | WebGL2RenderingContext,
- imageItem: Texture2DProps | Texture2D | (Texture2DProps | Texture2D)[]
-): null | Texture2D | Texture2D[] {
- let result: null | Texture2D | Texture2D[];
+ gl: WebGL2RenderingContext,
+ device: LumaDevice | undefined,
+ imageItem: RasterTextureData | Texture | (RasterTextureData | Texture)[]
+): null | Texture | Texture[] {
+ let result: null | Texture | Texture[];
if (Array.isArray(imageItem)) {
- const dirtyResult = imageItem.map(x => loadTexture(gl, x));
+ const dirtyResult = imageItem.map(x => loadTexture(gl, device, x));
result = [];
for (const texture of dirtyResult) {
if (texture) {
@@ -48,7 +79,7 @@ function loadImageItem(
result = null;
}
} else {
- result = loadTexture(gl, imageItem);
+ result = loadTexture(gl, device, imageItem);
}
return result;
}
@@ -56,16 +87,13 @@ function loadImageItem(
// eslint-disable-next-line complexity
export function loadImages({
gl,
+ device,
images,
imagesData,
oldImagesData
}: LoadImagesOptions): ImageState | null {
- // Change to `true` if we need to setState with a new `images` object
let imagesDirty = false;
- // If there are any removed keys, which previously existed in oldProps and
- // this.state.images but no longer exist in props, remove from the images
- // object
if (oldImagesData) {
for (const key in oldImagesData) {
if (imagesData && !(key in imagesData) && key in images) {
@@ -75,16 +103,13 @@ export function loadImages({
}
}
- // Check if any keys of props.images have changed
const changedKeys: string[] = [];
for (const key in imagesData) {
- // If oldProps.images didn't exist or it existed and this key didn't exist
if (!oldImagesData || (oldImagesData && !(key in oldImagesData))) {
changedKeys.push(key);
continue;
}
- // Deep compare when the key previously existed to see if it changed
if (!isEqual(imagesData[key], oldImagesData[key])) {
changedKeys.push(key);
}
@@ -96,7 +121,7 @@ export function loadImages({
continue;
}
- const loadedItem = loadImageItem(gl, imageData);
+ const loadedItem = loadImageItem(gl, device, imageData);
if (loadedItem) {
images[key] = loadedItem;
}
@@ -111,72 +136,179 @@ export function loadImages({
}
/**
- * Create Texture2D object from image data
+ * Map old GL texture parameter constants to luma.gl 9 sampler parameters
*/
-function loadTexture(
- gl: WebGLRenderingContext | WebGL2RenderingContext,
- imageData: Texture2D | Texture2DProps
-): Texture2D | null {
- if (!imageData) {
- return null;
- }
+function mapSamplerParameters(oldParams: Record<number, number>): Record<string, string> {
+ const result: Record<string, string> = {...DEFAULT_SAMPLER_PARAMETERS};
- if (imageData instanceof Texture2D) {
- return imageData;
- }
+ const magFilterMap = {
+ [GL.NEAREST]: FILTER_MODE.NEAREST,
+ [GL.LINEAR]: FILTER_MODE.LINEAR
+ };
+
+ const minFilterMap: Record<number, {minFilter: string; mipmapFilter?: string}> = {
+ [GL.NEAREST]: {minFilter: FILTER_MODE.NEAREST},
+ [GL.LINEAR]: {minFilter: FILTER_MODE.LINEAR},
+ [GL.NEAREST_MIPMAP_NEAREST]: {
+ minFilter: FILTER_MODE.NEAREST,
+ mipmapFilter: FILTER_MODE.NEAREST
+ },
+ [GL.NEAREST_MIPMAP_LINEAR]: {minFilter: FILTER_MODE.NEAREST, mipmapFilter: FILTER_MODE.LINEAR},
+ [GL.LINEAR_MIPMAP_NEAREST]: {minFilter: FILTER_MODE.LINEAR, mipmapFilter: FILTER_MODE.NEAREST},
+ [GL.LINEAR_MIPMAP_LINEAR]: {minFilter: FILTER_MODE.LINEAR, mipmapFilter: FILTER_MODE.LINEAR}
+ };
- let textureParams: Texture2DProps = {
- parameters: DEFAULT_UNIVERSAL_TEXTURE_PARAMETERS,
- ...imageData
+ const wrapMap = {
+ [GL.CLAMP_TO_EDGE]: ADDRESS_MODE.CLAMP_TO_EDGE,
+ [GL.REPEAT]: ADDRESS_MODE.REPEAT,
+ [GL.MIRRORED_REPEAT]: ADDRESS_MODE.MIRROR_REPEAT
};
- if (!isWebGL2(gl)) {
- textureParams = webgl1TextureFallbacks(textureParams);
+ if (oldParams) {
+ if (oldParams[GL.TEXTURE_MIN_FILTER] !== undefined) {
+ const mapped = minFilterMap[oldParams[GL.TEXTURE_MIN_FILTER]];
+ if (mapped) {
+ result.minFilter = mapped.minFilter;
+ if (mapped.mipmapFilter) {
+ result.mipmapFilter = mapped.mipmapFilter;
+ }
+ }
+ }
+ if (oldParams[GL.TEXTURE_MAG_FILTER] !== undefined) {
+ result.magFilter = magFilterMap[oldParams[GL.TEXTURE_MAG_FILTER]] || FILTER_MODE.NEAREST;
+ }
+ if (oldParams[GL.TEXTURE_WRAP_S] !== undefined) {
+ result.addressModeU = wrapMap[oldParams[GL.TEXTURE_WRAP_S]] || ADDRESS_MODE.CLAMP_TO_EDGE;
+ }
+ if (oldParams[GL.TEXTURE_WRAP_T] !== undefined) {
+ result.addressModeV = wrapMap[oldParams[GL.TEXTURE_WRAP_T]] || ADDRESS_MODE.CLAMP_TO_EDGE;
+ }
}
- return new Texture2D(gl, textureParams);
+ return result;
+}
+
+/**
+ * Map old GL format/type to luma.gl 9 texture format string
+ */
+function mapTextureFormat(glFormat: number, _glType?: number): string {
+ switch (glFormat) {
+ case GL.R8UI:
+ return TEXTURE_FORMAT.R8_UINT;
+ case GL.R16UI:
+ return TEXTURE_FORMAT.R16_UINT;
+ case GL.R32UI:
+ return TEXTURE_FORMAT.R32_UINT;
+ case GL.R8I:
+ return TEXTURE_FORMAT.R8_SINT;
+ case GL.R16I:
+ return TEXTURE_FORMAT.R16_SINT;
+ case GL.R32I:
+ return TEXTURE_FORMAT.R32_SINT;
+ case GL.R32F:
+ return TEXTURE_FORMAT.R32_FLOAT;
+ case GL.RGBA:
+ return TEXTURE_FORMAT.RGBA8_UNORM;
+ case GL.RGB:
+ return TEXTURE_FORMAT.RGBA8_UNORM;
+ default:
+ return TEXTURE_FORMAT.RGBA8_UNORM;
+ }
}
/**
- * Texture fallbacks for WebGL1
- * Fallback ideas derived from viv
- * https://github.com/hms-dbmi/viv/blob/5bcec429eeba55914ef3d7155a610d82048520a0/src/layers/XRLayer/XRLayer.js#L280-L302
+ * Expand 3-byte-per-pixel RGB data to 4-byte-per-pixel RGBA.
+ * Needed because WebGPU/luma.gl 9 has no 3-channel texture format.
*/
-function webgl1TextureFallbacks(textureParams: Texture2DProps): Texture2DProps {
- // Set mipmaps to false
- // Not sure if this is necessary?
- // Might actually only be necessary for uint textures
- textureParams.mipmaps = false;
-
- // Change format to Luminance
- if (textureParams.format && [GL.R8UI, GL.R16UI, GL.R32UI].includes(textureParams.format)) {
- textureParams.format = GL.LUMINANCE;
+function expandRGBtoRGBA(
+ data: Uint8Array | Uint8ClampedArray,
+ width: number,
+ height: number
+): Uint8Array {
+ const pixelCount = width * height;
+ const rgba = new Uint8Array(pixelCount * 4);
+ for (let i = 0; i < pixelCount; i++) {
+ rgba[i * 4] = data[i * 3];
+ rgba[i * 4 + 1] = data[i * 3 + 1];
+ rgba[i * 4 + 2] = data[i * 3 + 2];
+ rgba[i * 4 + 3] = 255;
}
+ return rgba;
+}
- // Change dataFormat to Luminance
- if (textureParams.dataFormat === GL.RED_INTEGER) {
- textureParams.dataFormat = GL.LUMINANCE;
+/**
+ * Create texture object from image data using luma.gl 9 device API.
+ * Returns a proper luma.gl Texture object that works with the binding system.
+ */
+function loadTexture(
+ gl: WebGL2RenderingContext,
+ device: LumaDevice | undefined,
+ imageData: Texture | RasterTextureData
+): Texture | null {
+ if (!imageData) {
+ return null;
}
- // Set data type to float
+ // If already a luma.gl Texture instance, return as-is
+ const rasterTextureData = imageData as RasterTextureData;
if (
- textureParams.type &&
- [GL.UNSIGNED_BYTE, GL.UNSIGNED_SHORT, GL.UNSIGNED_INT].includes(textureParams.type)
+ rasterTextureData.handle ||
+ rasterTextureData.id?.startsWith?.('luma') ||
+ rasterTextureData.device
) {
- textureParams.type = GL.FLOAT;
+ return imageData as Texture;
}
- // Cast data to float 32 if one of the uint types
- if (
- textureParams.data instanceof Uint8Array ||
- textureParams.data instanceof Uint16Array ||
- textureParams.data instanceof Uint32Array
- ) {
- textureParams.data = new Float32Array(textureParams.data);
+ const rawData = imageData as RasterTextureData;
+
+ // @ts-expect-error luma internal properties not in WebGL2RenderingContext type
+ const lumaDevice = device || gl.luma?.device || gl.__luma_device;
+
+ if (!lumaDevice?.createTexture) {
+ console.warn('RasterLayer: No luma.gl device available for texture creation');
+ return null;
}
- // Override texture parameters to make sure they're valid on WebGL1
- textureParams.parameters = {...textureParams.parameters, ...DEFAULT_UNIVERSAL_TEXTURE_PARAMETERS};
+ try {
+ const samplerParams = mapSamplerParameters(rawData.parameters || {});
+ const textureFormat = rawData.format
+ ? mapTextureFormat(rawData.format, rawData.type)
+ : TEXTURE_FORMAT.RGBA8_UNORM;
+
+ const width = rawData.width || rawData.data?.width || 1;
+ const height = rawData.height || rawData.data?.height || 1;
+
+ const textureProps: Record<string, unknown> = {
+ width,
+ height,
+ format: textureFormat,
+ sampler: samplerParams,
+ ...(rawData.mipmaps === false ? {mipmaps: false} : {})
+ };
- return textureParams;
+ if (rawData.data) {
+ if (
+ rawData.data instanceof HTMLImageElement ||
+ rawData.data instanceof HTMLCanvasElement ||
+ rawData.data instanceof ImageBitmap ||
+ rawData.data instanceof ImageData
+ ) {
+ textureProps.data = rawData.data;
+ } else if (ArrayBuffer.isView(rawData.data)) {
+ if (
+ rawData.format === GL.RGB &&
+ (rawData.data instanceof Uint8Array || rawData.data instanceof Uint8ClampedArray)
+ ) {
+ textureProps.data = expandRGBtoRGBA(rawData.data, width, height);
+ } else {
+ textureProps.data = rawData.data;
+ }
+ }
+ }
+
+ return lumaDevice.createTexture(textureProps);
+ } catch (e) {
+ console.warn('RasterLayer: Failed to create texture via device.createTexture:', e);
+ return null;
+ }
}
diff --git a/src/deckgl-layers/src/raster/pipeline-validation-patch.ts b/src/deckgl-layers/src/raster/pipeline-validation-patch.ts
new file mode 100644
index 000000000..614ba3e5b
--- /dev/null
+++ b/src/deckgl-layers/src/raster/pipeline-validation-patch.ts
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+/**
+ * Patch luma.gl 9's WEBGLRenderPipeline to tolerate mixed-sampler-type
+ * validation errors in _getLinkStatus().
+ *
+ * WebGL2's validateProgram checks that sampler uniforms of different types
+ * (sampler2D, usampler2D, isampler2D) are not assigned to the same texture
+ * unit. Before any draw call the default texture unit for all samplers is 0,
+ * so programs that mix sampler types (e.g. raster band data as usampler2D +
+ * colormap as sampler2D) always fail validation even though the program linked
+ * successfully and will work correctly once texture units are assigned at draw
+ * time.
+ *
+ * luma.gl calls validateProgram inside _getLinkStatus() immediately after
+ * linkProgram, before any texture units can be assigned. This patch keeps the
+ * full validateProgram call but ignores only the known false-positive about
+ * mixed sampler types. All other validation errors are still reported.
+ */
+
+// @ts-ignore WEBGLRenderPipeline resolution depends on moduleResolution setting
+import {WEBGLRenderPipeline} from '@luma.gl/webgl';
+
+const MIXED_SAMPLER_RE = /different type[s]? use the same sampler location/i;
+
+let _patched = false;
+
+export function patchPipelineValidation(): void {
+ if (_patched) return;
+ _patched = true;
+
+ if (!WEBGLRenderPipeline?.prototype?._getLinkStatus) {
+ return;
+ }
+
+ WEBGLRenderPipeline.prototype._getLinkStatus = function (
+ this: WEBGLRenderPipeline & {linkStatus: string}
+ ) {
+ const {gl} = this.device;
+ const linked = gl.getProgramParameter(this.handle, 0x8b82 /* LINK_STATUS */);
+ if (!linked) {
+ this.linkStatus = 'error';
+ return 'link-error';
+ }
+
+ gl.validateProgram(this.handle);
+ const validated = gl.getProgramParameter(this.handle, 0x8b83 /* VALIDATE_STATUS */);
+ if (!validated) {
+ const infoLog = gl.getProgramInfoLog(this.handle) || '';
+ if (!MIXED_SAMPLER_RE.test(infoLog)) {
+ this.linkStatus = 'error';
+ return 'validation-error';
+ }
+ }
+
+ this.linkStatus = 'success';
+ return 'success';
+ };
+}
diff --git a/src/deckgl-layers/src/raster/raster-layer/raster-layer-shaders.ts b/src/deckgl-layers/src/raster/raster-layer/raster-layer-shaders.ts
new file mode 100644
index 000000000..0b973f622
--- /dev/null
+++ b/src/deckgl-layers/src/raster/raster-layer/raster-layer-shaders.ts
@@ -0,0 +1,254 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import {ShaderAssembler} from '@luma.gl/shadertools';
+import type {ShaderModule as LumaShaderModule} from '../webgl/types';
+
+/**
+ * UBO-based shader module for raster layer uniforms.
+ * Replaces the old standalone `uniform float desaturate` etc.
+ */
+const rasterUniformBlock = `\
+uniform rasterUniforms {
+ vec4 bounds;
+ float coordinateConversion;
+ float desaturate;
+ float opacity;
+ vec3 tintColor;
+ vec4 transparentColor;
+} raster;
+`;
+
+export const rasterUniforms = {
+ name: 'raster',
+ vs: rasterUniformBlock,
+ fs: rasterUniformBlock,
+ uniformTypes: {
+ bounds: 'vec4<f32>',
+ coordinateConversion: 'f32',
+ desaturate: 'f32',
+ opacity: 'f32',
+ tintColor: 'vec3<f32>',
+ transparentColor: 'vec4<f32>'
+ }
+};
+
+/**
+ * Register custom DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR shader hooks
+ * with the default ShaderAssembler. These hooks are used by the raster layer's
+ * custom shader modules (rgbaImage, combineBands, colormap, etc.).
+ *
+ * In luma.gl 8.x these were registered via ProgramManager; in luma.gl 9.x
+ * we register them with the ShaderAssembler singleton.
+ *
+ * NOTE: We must check the assembler's hook list every time rather than using
+ * a module-level boolean guard, because deck.gl's getShaderAssembler() clears
+ * _hookFunctions when a new Deck instance is created (e.g. during image export).
+ */
+export function ensureRasterHooksRegistered(): void {
+ const assembler = ShaderAssembler.getDefaultShaderAssembler();
+ // @ts-expect-error _hookFunctions is private in ShaderAssembler
+ const existingHooks = assembler._hookFunctions || [];
+ const hookNames = existingHooks.map(h => (typeof h === 'string' ? h : h.hook));
+
+ if (!hookNames.some(h => h?.includes('DECKGL_CREATE_COLOR'))) {
+ assembler.addShaderHook('fs:DECKGL_CREATE_COLOR(inout vec4 image, vec2 coord)');
+ }
+ if (!hookNames.some(h => h?.includes('DECKGL_MUTATE_COLOR'))) {
+ assembler.addShaderHook('fs:DECKGL_MUTATE_COLOR(inout vec4 image, vec2 coord)');
+ }
+}
+
+/**
+ * Convert kepler.gl's custom raster shader modules into luma.gl 9 compatible
+ * format. Ensures fs2 (WebGL2) shaders are used and texture2D -> texture.
+ */
+interface LumaModuleOutput {
+ name: string;
+ fs: string;
+ vs?: string;
+ defines?: Record<string, string>;
+ getUniforms?: (opts: object) => Record<string, unknown> | null;
+ uniforms?: Record<string, unknown>;
+ uniformTypes?: Record<string, string>;
+ inject?: Record<string, string>;
+ dependencies?: unknown[];
+ deprecations?: unknown[];
+}
+
+export function prepareLumaModules(modules: LumaShaderModule[]): LumaModuleOutput[] {
+ return modules.map(mod => {
+ const fs = mod.fs2 || mod.fs || '';
+ const result: LumaModuleOutput = {
+ name: mod.name,
+ // Replace texture2D with texture for GLSL 300 es
+ fs: fs.replace(/texture2D\(/g, 'texture('),
+ dependencies: mod.dependencies,
+ deprecations: mod.deprecations
+ };
+
+ if (mod.vs) {
+ result.vs = mod.vs.replace(/texture2D\(/g, 'texture(');
+ }
+
+ if (mod.defines) {
+ result.defines = mod.defines;
+ }
+
+ if (mod.getUniforms) {
+ result.getUniforms = mod.getUniforms;
+ }
+
+ if (mod.uniforms) {
+ result.uniforms = mod.uniforms;
+ }
+
+ if (mod.uniformTypes) {
+ result.uniformTypes = mod.uniformTypes;
+ }
+
+ // Convert inject code, replacing texture2D -> texture
+ if (mod.inject) {
+ result.inject = {};
+ for (const [hook, code] of Object.entries(mod.inject)) {
+ const codeStr =
+ typeof code === 'string' ? code : (code as {injection?: string}).injection || '';
+ result.inject[hook] = codeStr.replace(/texture2D\(/g, 'texture(');
+ }
+ }
+
+ return result;
+ });
+}
+
+/**
+ * Build the vertex shader for the raster layer.
+ * References raster.coordinateConversion from the UBO.
+ */
+export function buildRasterVertexShader(): string {
+ return `\
+#version 300 es
+#define SHADER_NAME raster-layer-vertex-shader
+
+precision mediump float;
+
+in vec2 texCoords;
+in vec3 positions;
+in vec3 positions64Low;
+
+out vec2 vTexCoord;
+out vec2 vTexPos;
+
+const vec3 pickingColor = vec3(1.0, 0.0, 0.0);
+
+void main(void) {
+ geometry.worldPosition = positions;
+ geometry.uv = texCoords;
+ geometry.pickingColor = pickingColor;
+
+ gl_Position = project_position_to_clipspace(positions, positions64Low, vec3(0.0), geometry.position);
+ DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+
+ vTexCoord = texCoords;
+
+ if (raster.coordinateConversion < -0.5) {
+ vTexPos = geometry.position.xy + project.commonOrigin.xy;
+ } else if (raster.coordinateConversion > 0.5) {
+ vTexPos = geometry.worldPosition.xy;
+ }
+
+ vec4 color = vec4(0.0);
+ DECKGL_FILTER_COLOR(color, geometry);
+}
+`;
+}
+
+/**
+ * Build the fragment shader for the raster layer.
+ * Uses DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR hooks which are now
+ * registered with the ShaderAssembler and populated by module injections.
+ */
+export function buildRasterFragmentShader(): string {
+ return `\
+#version 300 es
+#define SHADER_NAME raster-layer-fragment-shader
+
+precision mediump float;
+precision mediump int;
+precision mediump usampler2D;
+
+in vec2 vTexCoord;
+in vec2 vTexPos;
+
+out vec4 fragColor;
+
+/* projection utils */
+const float TILE_SIZE = 512.0;
+const float PI = 3.1415926536;
+const float WORLD_SCALE = TILE_SIZE / PI / 2.0;
+
+vec2 lnglat_to_mercator(vec2 lnglat) {
+ float x = lnglat.x;
+ float y = clamp(lnglat.y, -89.9, 89.9);
+ return vec2(
+ radians(x) + PI,
+ PI + log(tan(PI * 0.25 + radians(y) * 0.5))
+ ) * WORLD_SCALE;
+}
+
+vec2 mercator_to_lnglat(vec2 xy) {
+ xy /= WORLD_SCALE;
+ return degrees(vec2(
+ xy.x - PI,
+ atan(exp(xy.y - PI)) * 2.0 - PI * 0.5
+ ));
+}
+
+vec3 color_desaturate(vec3 color) {
+ float luminance = (color.r + color.g + color.b) * 0.333333333;
+ return mix(color, vec3(luminance), raster.desaturate);
+}
+
+vec3 color_tint(vec3 color) {
+ return color * raster.tintColor;
+}
+
+vec4 apply_opacity(vec3 color, float alpha) {
+ if (raster.transparentColor.a == 0.0) {
+ return vec4(color, alpha);
+ }
+ float blendedAlpha = alpha + raster.transparentColor.a * (1.0 - alpha);
+ float highLightRatio = alpha / blendedAlpha;
+ vec3 blendedRGB = mix(raster.transparentColor.rgb, color, highLightRatio);
+ return vec4(blendedRGB, blendedAlpha);
+}
+
+vec2 getUV(vec2 pos) {
+ return vec2(
+ (pos.x - raster.bounds[0]) / (raster.bounds[2] - raster.bounds[0]),
+ (pos.y - raster.bounds[3]) / (raster.bounds[1] - raster.bounds[3])
+ );
+}
+
+void main(void) {
+ vec2 uv = vTexCoord;
+ if (raster.coordinateConversion < -0.5) {
+ vec2 lnglat = mercator_to_lnglat(vTexPos);
+ uv = getUV(lnglat);
+ } else if (raster.coordinateConversion > 0.5) {
+ vec2 commonPos = lnglat_to_mercator(vTexPos);
+ uv = getUV(commonPos);
+ }
+
+ vec4 image = vec4(0.0);
+ DECKGL_CREATE_COLOR(image, uv);
+
+ DECKGL_MUTATE_COLOR(image, uv);
+
+ fragColor = apply_opacity(color_tint(color_desaturate(image.rgb)), raster.opacity);
+
+ geometry.uv = uv;
+ DECKGL_FILTER_COLOR(fragColor, geometry);
+}
+`;
+}
diff --git a/src/deckgl-layers/src/raster/raster-layer/raster-layer.ts b/src/deckgl-layers/src/raster/raster-layer/raster-layer.ts
index 0706aa75c..f8eb1f29f 100644
--- a/src/deckgl-layers/src/raster/raster-layer/raster-layer.ts
+++ b/src/deckgl-layers/src/raster/raster-layer/raster-layer.ts
@@ -1,24 +1,27 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {project32, UpdateParameters} from '@deck.gl/core/typed';
-import {BitmapLayer} from '@deck.gl/layers/typed';
-import {isWebGL2} from '@luma.gl/core';
-import {ProgramManager} from '@luma.gl/engine';
-
-import fsWebGL1 from './raster-layer-webgl1.fs';
-import vsWebGL1 from './raster-layer-webgl1.vs';
-import fsWebGL2 from './raster-layer-webgl2.fs';
-import vsWebGL2 from './raster-layer-webgl2.vs';
+import {UpdateParameters} from '@deck.gl/core';
+import {BitmapLayer} from '@deck.gl/layers';
+
+import {
+ buildRasterFragmentShader,
+ buildRasterVertexShader,
+ rasterUniforms,
+ ensureRasterHooksRegistered,
+ prepareLumaModules
+} from './raster-layer-shaders';
import {loadImages} from '../images';
import type {RasterLayerAddedProps, ImageState} from '../types';
import {modulesEqual} from '../util';
+import {patchPipelineValidation} from '../pipeline-validation-patch';
const defaultProps = {
...BitmapLayer.defaultProps,
modules: {type: 'array', value: [], compare: true},
images: {type: 'object', value: {}, compare: true},
- moduleProps: {type: 'object', value: {}, compare: true}
+ moduleProps: {type: 'object', value: {}, compare: true},
+ onRedrawNeeded: {type: 'function', value: null, compare: false}
};
export default class RasterLayer extends BitmapLayer<RasterLayerAddedProps> {
@@ -26,36 +29,19 @@ export default class RasterLayer extends BitmapLayer<RasterLayerAddedProps> {
images: ImageState;
};
- initializeState(): void {
- const {gl} = this.context;
- const programManager = ProgramManager.getDefaultProgramManager(gl);
-
- const fsStr1 = 'fs:DECKGL_MUTATE_COLOR(inout vec4 image, in vec2 coord)';
- const fsStr2 = 'fs:DECKGL_CREATE_COLOR(inout vec4 image, in vec2 coord)';
-
- // Only initialize shader hook functions _once globally_
- // Since the program manager is shared across all layers, but many layers
- // might be created, this solves the performance issue of always adding new
- // hook functions.
- if (!programManager._hookFunctions.includes(fsStr1)) {
- programManager.addShaderHook(fsStr1);
- }
- if (!programManager._hookFunctions.includes(fsStr2)) {
- programManager.addShaderHook(fsStr2);
- }
+ _redrawScheduled = false;
- // images is a mapping from keys to Texture2D objects. The keys should match
- // names of uniforms in shader modules
+ initializeState(): void {
+ patchPipelineValidation();
+ ensureRasterHooksRegistered();
this.setState({images: {}});
-
super.initializeState();
}
- draw({uniforms}: {uniforms: {[key: string]: any}}): void {
+ draw(_opts: {shaderModuleProps: Record<string, unknown>}): void {
const {model, images, coordinateConversion, bounds} = this.state;
const {desaturate, transparentColor, tintColor, moduleProps} = this.props;
- // Render the image
if (
!model ||
!images ||
@@ -65,44 +51,67 @@ export default class RasterLayer extends BitmapLayer<RasterLayerAddedProps> {
return;
}
- model
- .setUniforms({
- ...uniforms,
- desaturate,
- transparentColor: transparentColor?.map(x => (x ? x / 255 : 0)),
- tintColor: tintColor?.slice(0, 3).map(x => x / 255),
- coordinateConversion,
- bounds
- })
- .updateModuleSettings({
- ...moduleProps,
- ...images
- })
- .draw();
+ // Set UBO uniforms for the raster module
+ model.shaderInputs.setProps({
+ raster: {
+ desaturate: desaturate || 0,
+ transparentColor: (transparentColor || [0, 0, 0, 0]).map(x => (x ? x / 255 : 0)),
+ tintColor: (tintColor || [255, 255, 255]).slice(0, 3).map(x => x / 255),
+ coordinateConversion: coordinateConversion || 0,
+ bounds: bounds || [0, 0, 0, 0],
+ opacity: this.props.opacity ?? 1
+ }
+ });
+
+ // Set props for each custom module through shaderInputs.
+ // We call getUniforms ourselves to skip modules that return null (inactive).
+ // Passing allModuleProps directly to setProps would cause the null-fallback
+ // in ShaderInputs to treat the entire props bag as uniforms/bindings,
+ // triggering expensive texture rebinding every frame.
+ const allModuleProps = {...moduleProps, ...images};
+ const modules = this.props.modules || [];
+ for (const mod of modules) {
+ if (mod.getUniforms) {
+ const result = mod.getUniforms(allModuleProps);
+ if (result) {
+ model.shaderInputs.setProps({[mod.name]: result});
+ }
+ }
+ }
+
+ const drawSuccess = model.draw(this.context.renderPass);
+ if (!drawSuccess) {
+ this._scheduleRedraw();
+ }
+ }
+
+ _scheduleRedraw(): void {
+ if (this._redrawScheduled) return;
+ this._redrawScheduled = true;
+ requestAnimationFrame(() => {
+ this._redrawScheduled = false;
+ if (this.context.deck) {
+ // @ts-expect-error accessing private deck.gl property
+ this.context.deck._needsRedraw = 'RasterLayer pipeline pending';
+ }
+ this.context.layerManager?.setNeedsRedraw('RasterLayer pipeline pending');
+ if (typeof this.props.onRedrawNeeded === 'function') {
+ this.props.onRedrawNeeded();
+ }
+ });
}
getShaders(): any {
- const {gl} = this.context;
const {modules = []} = this.props;
- const webgl2 = isWebGL2(gl);
-
- // Choose webgl version for module
- // If fs2 or fs1 keys exist, prefer them, but fall back to fs, so that
- // version-independent modules don't need to care
- for (const module of modules) {
- module.fs = webgl2 ? module.fs2 || module.fs : module.fs1 || module.fs;
- // Sampler type is always float for WebGL1
- if (!webgl2 && module.defines) {
- module.defines.SAMPLER_TYPE = 'sampler2D';
- }
- }
+ const lumaModules = prepareLumaModules(modules);
+ const parentShaders = super.getShaders();
return {
- ...super.getShaders(),
- vs: webgl2 ? vsWebGL2 : vsWebGL1,
- fs: webgl2 ? fsWebGL2 : fsWebGL1,
- modules: [project32, ...modules]
+ ...parentShaders,
+ vs: buildRasterVertexShader(),
+ fs: buildRasterFragmentShader(),
+ modules: [...(parentShaders.modules || []), rasterUniforms, ...lumaModules]
};
}
@@ -112,12 +121,10 @@ export default class RasterLayer extends BitmapLayer<RasterLayerAddedProps> {
const modules = props && props.modules;
const oldModules = oldProps && oldProps.modules;
- // setup model first
- // If the list of modules changed, need to recompile the shaders
if (changeFlags.extensionsChanged || !modulesEqual(modules, oldModules)) {
- const {gl} = this.context;
- this.state.model?.delete();
- this.state.model = this._getModel(gl);
+ this.state.model?.destroy?.();
+ // @ts-expect-error _getModel is internal to BitmapLayer
+ this.state.model = this._getModel(this.context.device || this.context.gl);
this.getAttributeManager()?.invalidateAll();
}
@@ -150,10 +157,12 @@ export default class RasterLayer extends BitmapLayer<RasterLayerAddedProps> {
oldProps: RasterLayerAddedProps;
}): void {
const {images} = this.state;
- const {gl} = this.context;
+ const device = this.context.device;
+ const gl = device?.gl || this.context.gl;
const newImages = loadImages({
gl,
+ device,
images,
imagesData: props.images,
oldImagesData: oldProps.images
@@ -169,9 +178,9 @@ export default class RasterLayer extends BitmapLayer<RasterLayerAddedProps> {
if (this.state.images) {
for (const image of Object.values(this.state.images)) {
if (Array.isArray(image)) {
- image.map(x => x && x.delete());
+ image.map(x => x && (x.destroy ? x.destroy() : x.delete?.()));
} else if (image) {
- image.delete();
+ image.destroy ? image.destroy() : image.delete?.();
}
}
}
diff --git a/src/deckgl-layers/src/raster/raster-mesh-layer/matrix.ts b/src/deckgl-layers/src/raster/raster-mesh-layer/matrix.ts
index a517b24fd..c865c38d3 100644
--- a/src/deckgl-layers/src/raster/raster-mesh-layer/matrix.ts
+++ b/src/deckgl-layers/src/raster/raster-mesh-layer/matrix.ts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {COORDINATE_SYSTEM, Viewport, CoordinateSystem} from '@deck.gl/core/typed';
+import {COORDINATE_SYSTEM, Viewport} from '@deck.gl/core';
+type CoordinateSystem = number;
// only apply composeModelMatrix when in cartesian or meter_offsets coordinate system
// with `composeModelMatrix` enabled, the rotation part of the layer's modelMatrix will be composed to instance's transformations
diff --git a/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer-shaders.ts b/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer-shaders.ts
new file mode 100644
index 000000000..2ed2e9d92
--- /dev/null
+++ b/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer-shaders.ts
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+const rasterMeshUniformBlock = `\
+uniform rasterMeshUniforms {
+ float meshOpacity;
+ float meshFlatShading;
+} rasterMesh;
+`;
+
+export const rasterMeshUniforms = {
+ name: 'rasterMesh',
+ vs: rasterMeshUniformBlock,
+ fs: rasterMeshUniformBlock,
+ uniformTypes: {
+ meshOpacity: 'f32',
+ meshFlatShading: 'f32'
+ }
+};
+
+/**
+ * Build the vertex shader for the raster mesh layer.
+ */
+export function buildRasterMeshVertexShader(): string {
+ return `\
+#version 300 es
+#define SHADER_NAME raster-mesh-layer-vs
+
+in vec3 positions;
+in vec3 positions64Low;
+in vec3 normals;
+in vec3 colors;
+in vec2 texCoords;
+
+out vec2 vTexCoord;
+out vec3 cameraPosition;
+out vec3 normals_commonspace;
+out vec4 position_commonspace;
+out vec4 vColor;
+
+const vec3 pickingColor = vec3(1.0, 0.0, 0.0);
+const vec3 defaultNormal = vec3(0.0, 0.0, 1.0);
+
+void main(void) {
+ geometry.worldPosition = positions;
+ geometry.uv = texCoords;
+ geometry.pickingColor = pickingColor;
+
+ normals_commonspace = project_normal(normals);
+ geometry.normal = normals_commonspace;
+
+ gl_Position = project_position_to_clipspace(positions, positions64Low, vec3(0.0), geometry.position);
+ position_commonspace = geometry.position;
+ DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
+
+ vTexCoord = texCoords;
+ cameraPosition = project.cameraPosition;
+
+ vColor = vec4(colors, 1.0);
+ DECKGL_FILTER_COLOR(vColor, geometry);
+}
+`;
+}
+
+/**
+ * Build the fragment shader for the raster mesh layer.
+ * Uses DECKGL_CREATE_COLOR and DECKGL_MUTATE_COLOR hooks registered with
+ * the ShaderAssembler. Module inject code is assembled by luma.gl.
+ */
+export function buildRasterMeshFragmentShader(): string {
+ return `\
+#version 300 es
+#define SHADER_NAME raster-mesh-layer-fs
+
+precision highp float;
+precision mediump int;
+precision mediump usampler2D;
+
+in vec2 vTexCoord;
+in vec3 cameraPosition;
+in vec3 normals_commonspace;
+in vec4 position_commonspace;
+in vec4 vColor;
+
+out vec4 fragColor;
+
+void main(void) {
+ geometry.uv = vTexCoord;
+ vec2 coord = vTexCoord;
+ vec4 image;
+
+ DECKGL_CREATE_COLOR(image, coord);
+
+ DECKGL_MUTATE_COLOR(image, coord);
+
+ vec3 normal;
+ if (rasterMesh.meshFlatShading > 0.5) {
+ normal = normalize(cross(dFdx(position_commonspace.xyz), dFdy(position_commonspace.xyz)));
+ } else {
+ normal = normals_commonspace;
+ }
+
+ vec3 lightColor = lighting_getLightColor(image.rgb, cameraPosition, position_commonspace.xyz, normal);
+ fragColor = vec4(lightColor, rasterMesh.meshOpacity);
+
+ DECKGL_FILTER_COLOR(fragColor, geometry);
+}
+`;
+}
diff --git a/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer.ts b/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer.ts
index 1c7aad2b6..a3cd66cd2 100644
--- a/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer.ts
+++ b/src/deckgl-layers/src/raster/raster-mesh-layer/raster-mesh-layer.ts
@@ -1,46 +1,61 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {project32, phongLighting, log, UpdateParameters} from '@deck.gl/core/typed';
-import {SimpleMeshLayer, SimpleMeshLayerProps} from '@deck.gl/mesh-layers/typed';
-import GL from '@luma.gl/constants';
-import {Model, Geometry, isWebGL2} from '@luma.gl/core';
-import {ProgramManager} from '@luma.gl/engine';
-import {UniformsOptions} from '@luma.gl/webgl/src/classes/uniforms';
-
-import fsWebGL1 from './raster-mesh-layer-webgl1.fs';
-import vsWebGL1 from './raster-mesh-layer-webgl1.vs';
-import fsWebGL2 from './raster-mesh-layer-webgl2.fs';
-import vsWebGL2 from './raster-mesh-layer-webgl2.vs';
+import {UpdateParameters} from '@deck.gl/core';
+import {SimpleMeshLayer, SimpleMeshLayerProps} from '@deck.gl/mesh-layers';
+import {Geometry} from '@luma.gl/engine';
+import {Model} from '@luma.gl/engine';
+
+import {
+ buildRasterMeshFragmentShader,
+ buildRasterMeshVertexShader,
+ rasterMeshUniforms
+} from './raster-mesh-layer-shaders';
+import {
+ ensureRasterHooksRegistered,
+ prepareLumaModules
+} from '../raster-layer/raster-layer-shaders';
import {loadImages} from '../images';
import type {RasterLayerAddedProps, ImageState} from '../types';
import {modulesEqual} from '../util';
+import {patchPipelineValidation} from '../pipeline-validation-patch';
+import {TOPOLOGY} from '@kepler.gl/constants';
type Mesh = SimpleMeshLayerProps['mesh'];
-function validateGeometryAttributes(attributes) {
- log.assert(
- attributes.positions || attributes.POSITION,
- 'RasterMeshLayer requires "postions" or "POSITION" attribute in mesh property.'
- );
+interface MeshData {
+ attributes?: Record<string, unknown>;
+ positions?: unknown;
+ POSITION?: unknown;
+ NORMAL?: unknown;
+ normals?: unknown;
+ [key: string]: unknown;
+}
+
+function validateGeometryAttributes(attributes: Record<string, unknown>) {
+ if (!(attributes.positions || attributes.POSITION)) {
+ throw new Error(
+ 'RasterMeshLayer requires "positions" or "POSITION" attribute in mesh property.'
+ );
+ }
}
/*
* Convert mesh data into geometry
* @returns geometry
*/
-function getGeometry(data): Geometry {
- if (data.attributes) {
+function getGeometry(data: MeshData | Geometry): Geometry {
+ if ('attributes' in data && data.attributes) {
validateGeometryAttributes(data.attributes);
if (data instanceof Geometry) {
return data;
}
- return new Geometry(data);
- } else if (data.positions || data.POSITION) {
- validateGeometryAttributes(data);
+ return new Geometry(data as ConstructorParameters<typeof Geometry>[0]);
+ } else if ('positions' in data || 'POSITION' in data) {
+ validateGeometryAttributes(data as Record<string, unknown>);
return new Geometry({
- attributes: data
- });
+ attributes: data as Record<string, unknown>
+ } as ConstructorParameters<typeof Geometry>[0]);
}
throw Error('Invalid mesh');
}
@@ -49,7 +64,8 @@ const defaultProps = {
...SimpleMeshLayer.defaultProps,
modules: {type: 'array', value: [], compare: true},
images: {type: 'object', value: {}, compare: true},
- moduleProps: {type: 'object', value: {}, compare: true}
+ moduleProps: {type: 'object', value: {}, compare: true},
+ onRedrawNeeded: {type: 'function', value: null, compare: false}
};
export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAddedProps> {
@@ -57,53 +73,26 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
images: ImageState;
};
- initializeState(): void {
- const {gl} = this.context;
- const programManager = ProgramManager.getDefaultProgramManager(gl);
-
- const fsStr1 = 'fs:DECKGL_MUTATE_COLOR(inout vec4 image, in vec2 coord)';
- const fsStr2 = 'fs:DECKGL_CREATE_COLOR(inout vec4 image, in vec2 coord)';
-
- // Only initialize shader hook functions _once globally_
- // Since the program manager is shared across all layers, but many layers
- // might be created, this solves the performance issue of always adding new
- // hook functions.
- if (!programManager._hookFunctions.includes(fsStr1)) {
- programManager.addShaderHook(fsStr1);
- }
- if (!programManager._hookFunctions.includes(fsStr2)) {
- programManager.addShaderHook(fsStr2);
- }
+ _redrawScheduled = false;
- // images is a mapping from keys to Texture2D objects. The keys should match
- // names of uniforms in shader modules
+ initializeState(): void {
+ patchPipelineValidation();
+ ensureRasterHooksRegistered();
this.setState({images: {}});
-
super.initializeState();
}
getShaders(): any {
- const {gl} = this.context;
const {modules = []} = this.props;
- const webgl2 = isWebGL2(gl);
- // Choose webgl version for module
- // If fs2 or fs1 keys exist, prefer them, but fall back to fs, so that
- // version-independent modules don't need to care
- for (const module of modules) {
- module.fs = webgl2 ? module.fs2 || module.fs : module.fs1 || module.fs;
-
- // Sampler type is always float for WebGL1
- if (!webgl2 && module.defines) {
- module.defines.SAMPLER_TYPE = 'sampler2D';
- }
- }
+ const lumaModules = prepareLumaModules(modules);
+ const parentShaders = super.getShaders();
return {
- ...super.getShaders(),
- vs: webgl2 ? vsWebGL2 : vsWebGL1,
- fs: webgl2 ? fsWebGL2 : fsWebGL1,
- modules: [project32, phongLighting, ...modules]
+ ...parentShaders,
+ vs: buildRasterMeshVertexShader(),
+ fs: buildRasterMeshFragmentShader(),
+ modules: [...(parentShaders.modules || []), rasterMeshUniforms, ...lumaModules]
};
}
@@ -115,19 +104,18 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
const modules = props && props.modules;
const oldModules = oldProps && oldProps.modules;
- // If the list of modules changed, need to recompile the shaders
if (
props.mesh !== oldProps.mesh ||
changeFlags.extensionsChanged ||
!modulesEqual(modules, oldModules)
) {
if (this.state.model) {
- this.state.model.delete();
+ this.state.model.destroy?.();
}
if (props.mesh) {
this.state.model = this.getModel(props.mesh as Mesh);
- const attributes = (props.mesh as any).attributes || props.mesh;
+ const attributes = ((props.mesh as MeshData).attributes || props.mesh) as MeshData;
this.setState({
hasNormals: Boolean(attributes.NORMAL || attributes.normals)
});
@@ -140,7 +128,9 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
}
if (this.state.model) {
- this.state.model.setDrawMode(this.props.wireframe ? GL.LINE_STRIP : GL.TRIANGLES);
+ this.state.model.setTopology?.(
+ this.props.wireframe ? TOPOLOGY.LINE_STRIP : TOPOLOGY.TRIANGLE_LIST
+ );
}
}
@@ -152,10 +142,12 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
oldProps: RasterLayerAddedProps;
}): void {
const {images} = this.state;
- const {gl} = this.context;
+ const device = this.context.device;
+ const gl = device?.gl || this.context.gl;
const newImages = loadImages({
gl,
+ device,
images,
imagesData: props.images,
oldImagesData: oldProps.images
@@ -166,11 +158,10 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
}
}
- draw({uniforms}: UniformsOptions): void {
+ draw(_opts: Record<string, unknown>): void {
const {model, images} = this.state;
const {moduleProps} = this.props;
- // Render the image
if (
!model ||
!images ||
@@ -180,20 +171,49 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
return;
}
- const {sizeScale} = this.props;
-
- model
- .setUniforms(
- Object.assign({}, uniforms, {
- sizeScale,
- flatShading: !this.state.hasNormals
- })
- )
- .updateModuleSettings({
- ...moduleProps,
- ...images
- })
- .draw();
+ // Set mesh-specific UBO uniforms
+ model.shaderInputs.setProps({
+ rasterMesh: {
+ meshOpacity: this.props.opacity ?? 1,
+ meshFlatShading: !this.state.hasNormals ? 1.0 : 0.0
+ }
+ });
+
+ // Set props for each custom module through shaderInputs.
+ // Call getUniforms ourselves to skip inactive modules (null return),
+ // avoiding the ShaderInputs null-fallback that would dump all textures
+ // into bindings every frame.
+ const allModuleProps = {...moduleProps, ...images};
+ const modules = this.props.modules || [];
+ for (const mod of modules) {
+ if (mod.getUniforms) {
+ const result = mod.getUniforms(allModuleProps);
+ if (result) {
+ model.shaderInputs.setProps({[mod.name]: result});
+ }
+ }
+ }
+
+ const drawSuccess = model.draw(this.context.renderPass);
+ if (!drawSuccess) {
+ this._scheduleRedraw();
+ }
+ }
+
+ _scheduleRedraw(): void {
+ if (this._redrawScheduled) return;
+ this._redrawScheduled = true;
+ requestAnimationFrame(() => {
+ this._redrawScheduled = false;
+ if (this.context.deck) {
+ // @ts-expect-error accessing private deck.gl property
+ this.context.deck._needsRedraw = 'RasterMeshLayer pipeline pending';
+ }
+ this.context.layerManager?.setNeedsRedraw('RasterMeshLayer pipeline pending');
+ if (typeof this.props.onRedrawNeeded === 'function') {
+ this.props.onRedrawNeeded();
+ }
+ });
}
finalizeState(): void {
@@ -202,22 +222,22 @@ export default class RasterMeshLayer extends SimpleMeshLayer<any, RasterLayerAdd
if (this.state.images) {
for (const image of Object.values(this.state.images)) {
if (Array.isArray(image)) {
- image.map(x => x && x.delete());
+ image.map(x => x && (x.destroy ? x.destroy() : x.delete?.()));
} else if (image) {
- image.delete();
+ image.destroy ? image.destroy() : image.delete?.();
}
}
}
}
protected getModel(mesh: Mesh): Model {
- const {gl} = this.context;
+ const device = this.context.device || this.context.gl;
const model = new Model(
- gl,
+ device,
Object.assign({}, this.getShaders(), {
id: this.props.id,
- geometry: getGeometry(mesh),
+ geometry: getGeometry(mesh as MeshData | Geometry),
isInstanced: false
})
);
diff --git a/src/deckgl-layers/src/raster/types.ts b/src/deckgl-layers/src/raster/types.ts
index 06b94cd78..2452b9461 100644
--- a/src/deckgl-layers/src/raster/types.ts
+++ b/src/deckgl-layers/src/raster/types.ts
@@ -1,26 +1,26 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import type {Texture2DProps, Texture2D} from '@luma.gl/webgl';
-
+import type {Texture} from '@luma.gl/core';
import type {ShaderModule} from './webgl';
-/** Allowed input for images prop
- * Texture2D is already on the GPU, while Texture2DProps can be data on the CPU that is not yet copied to the GPU.
+/** Allowed input for images prop — either GPU-resident Texture objects or
+ * legacy raster texture descriptors with CPU data that will be uploaded.
*/
export type ImageInput = Record<
string,
- Texture2DProps | Texture2D | (Texture2DProps | Texture2D)[]
+ Texture | Texture[] | Record<string, unknown> | Record<string, unknown>[]
>;
/** Internal storage of images
- * The Texture2D object references data on the GPU
+ * The Texture object references data on the GPU
*/
-export type ImageState = Record<string, Texture2D | Texture2D[]>;
+export type ImageState = Record<string, Texture | Texture[]>;
/** Properties added by RasterLayer. */
export type RasterLayerAddedProps = {
modules: ShaderModule[];
images: ImageInput;
moduleProps: Record<string, number>;
+ onRedrawNeeded?: (() => void) | null;
};
diff --git a/src/deckgl-layers/src/raster/webgl/color/colormap.ts b/src/deckgl-layers/src/raster/webgl/color/colormap.ts
index 5903f9e76..924134456 100644
--- a/src/deckgl-layers/src/raster/webgl/color/colormap.ts
+++ b/src/deckgl-layers/src/raster/webgl/color/colormap.ts
@@ -1,30 +1,32 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {Texture2D} from '@luma.gl/webgl';
-
+import type {Texture} from '@luma.gl/core';
import {GetUniformsOutput, ShaderModule} from '../types';
const fs = `\
uniform sampler2D uColormapTexture;
-uniform int uHasCategoricalColors;
-uniform int uCategoricalMinValue;
-uniform int uCategoricalMaxValue;
-uniform int uMaxPixelValue;
+
+uniform colormapUniforms {
+ int hasCategoricalColors;
+ int categoricalMinValue;
+ int categoricalMaxValue;
+ int maxPixelValue;
+} colormap;
// Apply colormap texture given value
// Since the texture only varies in the x direction, setting v to 0.5 as a
// constant is fine
// Assumes the input range of value is -1 to 1
-vec4 colormap(sampler2D cmap, vec4 image) {
+vec4 colormapApply(sampler2D cmap, vec4 image) {
vec2 uv;
- if (uHasCategoricalColors == 1) {
- float step = float(uMaxPixelValue) / float(uCategoricalMaxValue - uCategoricalMinValue);
+ if (colormap.hasCategoricalColors == 1) {
+ float step = float(colormap.maxPixelValue) / float(colormap.categoricalMaxValue - colormap.categoricalMinValue);
uv = vec2(image.r * step, 0.5);
} else {
uv = vec2(0.5 * image.r + 0.5, 0.5);
}
- vec4 color = texture2D(cmap, uv);
+ vec4 color = texture(cmap, uv);
if(color.a <= 0.0) discard;
return color;
}
@@ -32,7 +34,7 @@ vec4 colormap(sampler2D cmap, vec4 image) {
function getUniforms(
opts: {
- imageColormap?: Texture2D;
+ imageColormap?: Texture;
minCategoricalBandValue?: number;
maxCategoricalBandValue?: number;
dataTypeMaxValue?: number;
@@ -59,20 +61,26 @@ function getUniforms(
Number.isFinite(maxCategoricalBandValue);
return {
uColormapTexture: imageColormap,
- uHasCategoricalColors: isCategorical ? 1 : 0,
- uCategoricalMinValue: Number.isFinite(minCategoricalBandValue) ? minCategoricalBandValue : 0,
- uCategoricalMaxValue: Number.isFinite(maxCategoricalBandValue) ? maxCategoricalBandValue : 0,
- uMaxPixelValue: Number.isFinite(maxPixelValue) ? maxPixelValue : 0
+ hasCategoricalColors: isCategorical ? 1 : 0,
+ categoricalMinValue: Number.isFinite(minCategoricalBandValue) ? minCategoricalBandValue : 0,
+ categoricalMaxValue: Number.isFinite(maxCategoricalBandValue) ? maxCategoricalBandValue : 0,
+ maxPixelValue: Number.isFinite(maxPixelValue) ? maxPixelValue : 0
};
}
export const colormap: ShaderModule = {
name: 'colormap',
fs,
+ uniformTypes: {
+ hasCategoricalColors: 'i32',
+ categoricalMinValue: 'i32',
+ categoricalMaxValue: 'i32',
+ maxPixelValue: 'i32'
+ },
getUniforms,
inject: {
'fs:DECKGL_MUTATE_COLOR': `
- image = colormap(uColormapTexture, image);
+ image = colormapApply(uColormapTexture, image);
`
}
};
diff --git a/src/deckgl-layers/src/raster/webgl/color/filter.ts b/src/deckgl-layers/src/raster/webgl/color/filter.ts
index 210ca5760..594469b9f 100644
--- a/src/deckgl-layers/src/raster/webgl/color/filter.ts
+++ b/src/deckgl-layers/src/raster/webgl/color/filter.ts
@@ -4,14 +4,16 @@
import {GetUniformsOutput, ShaderModule} from '../types';
const fs = `\
-uniform float filterMin1;
-uniform float filterMax1;
-uniform float filterMin2;
-uniform float filterMax2;
-uniform float filterMin3;
-uniform float filterMax3;
-uniform float filterMin4;
-uniform float filterMax4;
+uniform bandFilterUniforms {
+ float min1;
+ float max1;
+ float min2;
+ float max2;
+ float min3;
+ float max3;
+ float min4;
+ float max4;
+} bandFilter;
`;
// You can't pass JS' -Infinity or Infinity to a shader as a uniform
@@ -52,14 +54,14 @@ function getUniforms(
Number.isFinite(filterMax4)
) {
return {
- filterMin1: Number.isFinite(filterMin1) ? filterMin1 : -inf,
- filterMin2: Number.isFinite(filterMin2) ? filterMin2 : -inf,
- filterMin3: Number.isFinite(filterMin3) ? filterMin3 : -inf,
- filterMin4: Number.isFinite(filterMin4) ? filterMin4 : -inf,
- filterMax1: Number.isFinite(filterMax1) ? filterMax1 : inf,
- filterMax2: Number.isFinite(filterMax2) ? filterMax2 : inf,
- filterMax3: Number.isFinite(filterMax3) ? filterMax3 : inf,
- filterMax4: Number.isFinite(filterMax4) ? filterMax4 : inf
+ min1: Number.isFinite(filterMin1) ? filterMin1 : -inf,
+ min2: Number.isFinite(filterMin2) ? filterMin2 : -inf,
+ min3: Number.isFinite(filterMin3) ? filterMin3 : -inf,
+ min4: Number.isFinite(filterMin4) ? filterMin4 : -inf,
+ max1: Number.isFinite(filterMax1) ? filterMax1 : inf,
+ max2: Number.isFinite(filterMax2) ? filterMax2 : inf,
+ max3: Number.isFinite(filterMax3) ? filterMax3 : inf,
+ max4: Number.isFinite(filterMax4) ? filterMax4 : inf
};
}
@@ -67,19 +69,29 @@ function getUniforms(
}
export const filter: ShaderModule = {
- name: 'filter',
+ name: 'bandFilter',
fs,
+ uniformTypes: {
+ min1: 'f32',
+ max1: 'f32',
+ min2: 'f32',
+ max2: 'f32',
+ min3: 'f32',
+ max3: 'f32',
+ min4: 'f32',
+ max4: 'f32'
+ },
getUniforms,
inject: {
'fs:DECKGL_MUTATE_COLOR': `
- if (image.r < filterMin1) discard;
- if (image.g < filterMin2) discard;
- if (image.b < filterMin3) discard;
- if (image.a < filterMin4) discard;
- if (image.r > filterMax1) discard;
- if (image.g > filterMax2) discard;
- if (image.b > filterMax3) discard;
- if (image.a > filterMax4) discard;
+ if (image.r < bandFilter.min1) discard;
+ if (image.g < bandFilter.min2) discard;
+ if (image.b < bandFilter.min3) discard;
+ if (image.a < bandFilter.min4) discard;
+ if (image.r > bandFilter.max1) discard;
+ if (image.g > bandFilter.max2) discard;
+ if (image.b > bandFilter.max3) discard;
+ if (image.a > bandFilter.max4) discard;
`
}
};
diff --git a/src/deckgl-layers/src/raster/webgl/color/gamma-contrast.ts b/src/deckgl-layers/src/raster/webgl/color/gamma-contrast.ts
index 6ef5cb8c6..47e35f84b 100644
--- a/src/deckgl-layers/src/raster/webgl/color/gamma-contrast.ts
+++ b/src/deckgl-layers/src/raster/webgl/color/gamma-contrast.ts
@@ -22,23 +22,25 @@ import {GetUniformsOutput, ShaderModule} from '../types';
const fs = `\
#define epsilon 0.00000001
-uniform float gamma1;
-uniform float gamma2;
-uniform float gamma3;
-uniform float gamma4;
+uniform gamma_contrastUniforms {
+ float gamma1;
+ float gamma2;
+ float gamma3;
+ float gamma4;
+} gamma_contrast;
-float gammaContrast(float arr, float g) {
+float gammaContrastCalc(float arr, float g) {
// Gamma must be > 0
g = clamp(g, epsilon, g);
return pow(arr, 1.0 / g);
}
-vec4 gammaContrast(vec4 arr, float g1, float g2, float g3, float g4) {
- arr.r = gammaContrast(arr.r, g1);
- arr.g = gammaContrast(arr.g, g2);
- arr.b = gammaContrast(arr.b, g3);
- arr.a = gammaContrast(arr.a, g4);
+vec4 gammaContrastCalc(vec4 arr, float g1, float g2, float g3, float g4) {
+ arr.r = gammaContrastCalc(arr.r, g1);
+ arr.g = gammaContrastCalc(arr.g, g2);
+ arr.b = gammaContrastCalc(arr.b, g3);
+ arr.a = gammaContrastCalc(arr.a, g4);
return arr;
}
@@ -90,10 +92,16 @@ function getUniforms(
export const gammaContrast: ShaderModule = {
name: 'gamma_contrast',
fs,
+ uniformTypes: {
+ gamma1: 'f32',
+ gamma2: 'f32',
+ gamma3: 'f32',
+ gamma4: 'f32'
+ },
getUniforms,
inject: {
'fs:DECKGL_MUTATE_COLOR': `
- image = gammaContrast(image, gamma1, gamma2, gamma3, gamma4);
+ image = gammaContrastCalc(image, gamma_contrast.gamma1, gamma_contrast.gamma2, gamma_contrast.gamma3, gamma_contrast.gamma4);
`
}
};
diff --git a/src/deckgl-layers/src/raster/webgl/color/linear-rescale.ts b/src/deckgl-layers/src/raster/webgl/color/linear-rescale.ts
index 7e8d31358..7f6bec039 100644
--- a/src/deckgl-layers/src/raster/webgl/color/linear-rescale.ts
+++ b/src/deckgl-layers/src/raster/webgl/color/linear-rescale.ts
@@ -4,11 +4,13 @@
import {GetUniformsOutput, ShaderModule} from '../types';
const fs = `\
-uniform float linearRescaleScaler;
-uniform float linearRescaleOffset;
+uniform linear_rescaleUniforms {
+ float scaler;
+ float offset;
+} linear_rescale;
// Perform a linear rescaling of image
-vec4 linear_rescale(vec4 arr, float scaler, float offset) {
+vec4 linear_rescale_fn(vec4 arr, float scaler, float offset) {
return arr * scaler + offset;
}
`;
@@ -23,18 +25,22 @@ function getUniforms(
}
return {
- linearRescaleScaler: Number.isFinite(linearRescaleScaler) ? linearRescaleScaler : 1,
- linearRescaleOffset: Number.isFinite(linearRescaleOffset) ? linearRescaleOffset : 0
+ scaler: Number.isFinite(linearRescaleScaler) ? linearRescaleScaler : 1,
+ offset: Number.isFinite(linearRescaleOffset) ? linearRescaleOffset : 0
};
}
export const linearRescale: ShaderModule = {
name: 'linear_rescale',
fs,
+ uniformTypes: {
+ scaler: 'f32',
+ offset: 'f32'
+ },
getUniforms,
inject: {
'fs:DECKGL_MUTATE_COLOR': `
- image = linear_rescale(image, linearRescaleScaler, linearRescaleOffset);
+ image = linear_rescale_fn(image, linear_rescale.scaler, linear_rescale.offset);
`
}
};
diff --git a/src/deckgl-layers/src/raster/webgl/color/saturation.ts b/src/deckgl-layers/src/raster/webgl/color/saturation.ts
index 916659851..f550e1e6a 100644
--- a/src/deckgl-layers/src/raster/webgl/color/saturation.ts
+++ b/src/deckgl-layers/src/raster/webgl/color/saturation.ts
@@ -14,7 +14,10 @@ import {GetUniformsOutput, ShaderModule} from '../types';
* @returns {vec3} The color with the saturation adjusted.
*/
const fs = `\
-uniform float uSaturationValue;
+uniform saturationUniforms {
+ float value;
+} saturation;
+
vec3 saturate(vec3 rgb, float adjustment) {
// Algorithm from Chapter 16 of OpenGL Shading Language
const vec3 W = vec3(0.2125, 0.7154, 0.0721);
@@ -31,17 +34,20 @@ function getUniforms(opts: {saturationValue?: number} = {}): GetUniformsOutput {
}
return {
- uSaturationValue: Number.isFinite(saturationValue) ? saturationValue : 1
+ value: Number.isFinite(saturationValue) ? saturationValue : 1
};
}
export const saturation: ShaderModule = {
name: 'saturation',
fs,
+ uniformTypes: {
+ value: 'f32'
+ },
getUniforms,
inject: {
'fs:DECKGL_MUTATE_COLOR': `
- image = vec4(saturate(image.rgb, uSaturationValue), image.a);
+ image = vec4(saturate(image.rgb, saturation.value), image.a);
`
}
};
diff --git a/src/deckgl-layers/src/raster/webgl/color/sigmoidal-contrast.ts b/src/deckgl-layers/src/raster/webgl/color/sigmoidal-contrast.ts
index 354152c2f..9d5eace43 100644
--- a/src/deckgl-layers/src/raster/webgl/color/sigmoidal-contrast.ts
+++ b/src/deckgl-layers/src/raster/webgl/color/sigmoidal-contrast.ts
@@ -39,8 +39,10 @@ import {GetUniformsOutput, ShaderModule} from '../types';
const fs = `\
#define epsilon 0.00000001
-uniform float sigmoidalContrast;
-uniform float sigmoidalBias;
+uniform sigmoidalContrastUniforms {
+ float contrast;
+ float bias;
+} sigmoidalContrast;
// NOTE: Input array must have float values between 0 and 1!
// NOTE: bias must be a scalar float between 0 and 1!
@@ -87,18 +89,22 @@ function getUniforms(
}
return {
- sigmoidalContrast: Number.isFinite(sigmoidalContrast) ? sigmoidalContrast : 0,
- sigmoidalBias: Number.isFinite(sigmoidalBias) ? sigmoidalBias : 0.5
+ contrast: Number.isFinite(sigmoidalContrast) ? sigmoidalContrast : 0,
+ bias: Number.isFinite(sigmoidalBias) ? sigmoidalBias : 0.5
};
}
export const sigmoidalContrast: ShaderModule = {
name: 'sigmoidalContrast',
fs,
+ uniformTypes: {
+ contrast: 'f32',
+ bias: 'f32'
+ },
getUniforms,
inject: {
'fs:DECKGL_MUTATE_COLOR': `
- image = calculateSigmoidalContrast(image, sigmoidalContrast, sigmoidalBias);
+ image = calculateSigmoidalContrast(image, sigmoidalContrast.contrast, sigmoidalContrast.bias);
`
}
};
diff --git a/src/deckgl-layers/src/raster/webgl/pansharpen/pansharpen-brovey.ts b/src/deckgl-layers/src/raster/webgl/pansharpen/pansharpen-brovey.ts
index cdf916a36..a6d480a8f 100644
--- a/src/deckgl-layers/src/raster/webgl/pansharpen/pansharpen-brovey.ts
+++ b/src/deckgl-layers/src/raster/webgl/pansharpen/pansharpen-brovey.ts
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {Texture2D} from '@luma.gl/webgl';
-
+import type {Texture} from '@luma.gl/core';
import {GetUniformsOutput, ShaderModule} from '../types';
// Brovey Method: Each resampled, multispectral pixel is
@@ -13,7 +12,10 @@ import {GetUniformsOutput, ShaderModule} from '../types';
//
const fs1 = `\
uniform sampler2D bitmapTexturePan;
-uniform float panWeight;
+
+uniform pansharpen_broveyUniforms {
+ float panWeight;
+} pansharpen_brovey;
float pansharpen_brovey_ratio(vec4 rgb, float pan, float weight) {
return pan / ((rgb.r + rgb.g + rgb.b * weight) / (2. + weight));
@@ -34,7 +36,9 @@ precision mediump usampler2D;
uniform sampler2D bitmapTexturePan;
#endif
-uniform float panWeight;
+uniform pansharpen_broveyUniforms {
+ float panWeight;
+} pansharpen_brovey;
float pansharpen_brovey_ratio(vec4 rgb, float pan, float weight) {
return pan / ((rgb.r + rgb.g + rgb.b * weight) / (2. + weight));
@@ -46,7 +50,7 @@ vec4 pansharpen_brovey_calc(vec4 rgb, float pan, float weight) {
}
`;
-function getUniforms(opts: {imagePan?: Texture2D; panWeight?: number} = {}): GetUniformsOutput {
+function getUniforms(opts: {imagePan?: Texture; panWeight?: number} = {}): GetUniformsOutput {
const {imagePan, panWeight = 0.2} = opts;
if (!imagePan) {
@@ -63,14 +67,17 @@ export const pansharpenBrovey: ShaderModule = {
name: 'pansharpen_brovey',
fs1,
fs2,
+ uniformTypes: {
+ panWeight: 'f32'
+ },
defines: {
SAMPLER_TYPE: 'sampler2D'
},
getUniforms,
inject: {
'fs:DECKGL_MUTATE_COLOR': `
- float pan_band = float(texture2D(bitmapTexturePan, coord).r);
- image = pansharpen_brovey_calc(image, pan_band, panWeight);
+ float pan_band = float(texture(bitmapTexturePan, coord).r);
+ image = pansharpen_brovey_calc(image, pan_band, pansharpen_brovey.panWeight);
`
}
};
diff --git a/src/deckgl-layers/src/raster/webgl/texture/combine-bands.ts b/src/deckgl-layers/src/raster/webgl/texture/combine-bands.ts
index ff58e12fa..75b6e3388 100644
--- a/src/deckgl-layers/src/raster/webgl/texture/combine-bands.ts
+++ b/src/deckgl-layers/src/raster/webgl/texture/combine-bands.ts
@@ -1,11 +1,10 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {Texture2D} from '@luma.gl/webgl';
-
+import type {Texture} from '@luma.gl/core';
import {GetUniformsOutput, ShaderModule} from '../types';
-function getUniforms(opts: {imageBands?: Texture2D[]} = {}): GetUniformsOutput {
+function getUniforms(opts: {imageBands?: Texture[]} = {}): GetUniformsOutput {
const {imageBands} = opts;
if (!imageBands || imageBands.length === 0) {
diff --git a/src/deckgl-layers/src/raster/webgl/texture/mask.ts b/src/deckgl-layers/src/raster/webgl/texture/mask.ts
index 4ab37e185..0f1e9acc0 100644
--- a/src/deckgl-layers/src/raster/webgl/texture/mask.ts
+++ b/src/deckgl-layers/src/raster/webgl/texture/mask.ts
@@ -1,14 +1,13 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {Texture2D} from '@luma.gl/webgl';
-
+import type {Texture} from '@luma.gl/core';
import {GetUniformsOutput, ShaderModule} from '../types';
const inf = Math.pow(2, 62);
function getUniforms(
- opts: {imageMask?: Texture2D; maskKeepMin?: number; maskKeepMax?: number} = {}
+ opts: {imageMask?: Texture; maskKeepMin?: number; maskKeepMax?: number} = {}
): GetUniformsOutput {
const {imageMask, maskKeepMin, maskKeepMax} = opts;
if (!imageMask) {
@@ -17,18 +16,30 @@ function getUniforms(
return {
bitmapTextureMask: imageMask,
- uMaskKeepMin: Number.isFinite(maskKeepMin) ? maskKeepMin : -inf,
- uMaskKeepMax: Number.isFinite(maskKeepMax) ? maskKeepMax : inf
+ keepMin: Number.isFinite(maskKeepMin) ? maskKeepMin : -inf,
+ keepMax: Number.isFinite(maskKeepMax) ? maskKeepMax : inf
};
}
-const fs1 = `\
+const maskUniformTypes = {
+ keepMin: 'f32',
+ keepMax: 'f32'
+};
+
+function makeMaskModule(name: string, samplerType: string): ShaderModule {
+ const blockDecl = `\
+uniform ${name}Uniforms {
+ float keepMin;
+ float keepMax;
+} ${name};
+`;
+
+ const fs1 = `\
uniform sampler2D bitmapTextureMask;
-uniform float uMaskKeepMin;
-uniform float uMaskKeepMax;
+${blockDecl}
`;
-const fs2 = `\
+ const fs2 = `\
precision mediump float;
precision mediump int;
precision mediump usampler2D;
@@ -39,42 +50,28 @@ precision mediump usampler2D;
uniform sampler2D bitmapTextureMask;
#endif
-uniform float uMaskKeepMin;
-uniform float uMaskKeepMax;
+${blockDecl}
`;
-const mask: ShaderModule = {
- name: 'mask-image',
- fs1,
- fs2,
- getUniforms,
- defines: {
- SAMPLER_TYPE: 'sampler2D'
- },
- inject: {
- 'fs:DECKGL_CREATE_COLOR': `
- float mask_value = float(texture2D(bitmapTextureMask, coord).r);
- if (mask_value < uMaskKeepMin) discard;
- if (mask_value > uMaskKeepMax) discard;
+ return {
+ name,
+ fs1,
+ fs2,
+ uniformTypes: maskUniformTypes,
+ getUniforms,
+ defines: {
+ SAMPLER_TYPE: samplerType
+ },
+ inject: {
+ 'fs:DECKGL_CREATE_COLOR': `
+ float mask_value = float(texture(bitmapTextureMask, coord).r);
+ if (mask_value < ${name}.keepMin) discard;
+ if (mask_value > ${name}.keepMax) discard;
`
- }
-};
+ }
+ };
+}
-export const maskFloat: ShaderModule = {
- ...mask,
- name: 'mask-image-float'
-};
-export const maskUint: ShaderModule = {
- ...mask,
- name: 'mask-image-uint',
- defines: {
- SAMPLER_TYPE: 'usampler2D'
- }
-};
-export const maskInt: ShaderModule = {
- ...mask,
- name: 'mask-image-int',
- defines: {
- SAMPLER_TYPE: 'isampler2D'
- }
-};
+export const maskFloat: ShaderModule = makeMaskModule('mask_image_float', 'sampler2D');
+export const maskUint: ShaderModule = makeMaskModule('mask_image_uint', 'usampler2D');
+export const maskInt: ShaderModule = makeMaskModule('mask_image_int', 'isampler2D');
diff --git a/src/deckgl-layers/src/raster/webgl/texture/reorder-bands.ts b/src/deckgl-layers/src/raster/webgl/texture/reorder-bands.ts
index 87e21a009..44462dc8b 100644
--- a/src/deckgl-layers/src/raster/webgl/texture/reorder-bands.ts
+++ b/src/deckgl-layers/src/raster/webgl/texture/reorder-bands.ts
@@ -9,7 +9,9 @@ import {ShaderModule, GetUniformsOutput} from '../types';
*/
const fs = `\
-uniform mat4 uReorder;
+uniform reorder_bandsUniforms {
+ mat4 ordering;
+} reorder_bands;
vec4 reorder_image(vec4 image, mat4 ordering) {
return image.rgba * ordering;
@@ -24,7 +26,7 @@ function getUniforms(opts: {ordering?: number[]} = {}): GetUniformsOutput {
}
return {
- uReorder: constructPermutationMatrix(ordering)
+ ordering: constructPermutationMatrix(ordering)
};
}
@@ -52,12 +54,15 @@ export function constructPermutationMatrix(vector: number[]): number[] {
}
export const reorderBands: ShaderModule = {
- name: 'reorder-bands',
+ name: 'reorder_bands',
fs,
+ uniformTypes: {
+ ordering: 'mat4x4<f32>'
+ },
getUniforms,
inject: {
'fs:DECKGL_MUTATE_COLOR': `
- image = reorder_image(image, uReorder);
+ image = reorder_image(image, reorder_bands.ordering);
`
}
};
diff --git a/src/deckgl-layers/src/raster/webgl/texture/rgba-image.ts b/src/deckgl-layers/src/raster/webgl/texture/rgba-image.ts
index 5747896c5..2ce69967c 100644
--- a/src/deckgl-layers/src/raster/webgl/texture/rgba-image.ts
+++ b/src/deckgl-layers/src/raster/webgl/texture/rgba-image.ts
@@ -1,11 +1,10 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {Texture2D} from '@luma.gl/webgl';
-
+import type {Texture} from '@luma.gl/core';
import {GetUniformsOutput, ShaderModule} from '../types';
-function getUniforms(opts: {imageRgba?: Texture2D} = {}): GetUniformsOutput {
+function getUniforms(opts: {imageRgba?: Texture} = {}): GetUniformsOutput {
const {imageRgba} = opts;
if (!imageRgba) {
diff --git a/src/deckgl-layers/src/raster/webgl/types.ts b/src/deckgl-layers/src/raster/webgl/types.ts
index 38fe7493c..5df026963 100644
--- a/src/deckgl-layers/src/raster/webgl/types.ts
+++ b/src/deckgl-layers/src/raster/webgl/types.ts
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {Texture2D} from '@luma.gl/webgl';
+import type {Texture} from '@luma.gl/core';
export interface ShaderModule {
/** A unique name for this shader module */
@@ -18,16 +18,19 @@ export interface ShaderModule {
/** A vertex shader to inject */
vs?: string;
- uniforms?: Record<string, any>;
+ uniforms?: Record<string, UniformType>;
getUniforms?: (opts: object) => GetUniformsOutput;
+ /** luma.gl 9 UBO uniform type declarations (e.g. { opacity: 'f32' }) */
+ uniformTypes?: Record<string, string>;
+
/** Optional constants to define when injecting */
defines?: Record<string, string>;
inject?: Record<string, string>;
dependencies?: ShaderModule[];
- deprecations?: any[];
+ deprecations?: {type: string; old: string; new: string}[];
}
-export type UniformType = number | number[] | Texture2D | undefined;
+export type UniformType = number | number[] | Texture | undefined;
export type GetUniformsOutput = Record<string, UniformType> | null;
diff --git a/src/deckgl-layers/src/svg-icon-layer/scatterplot-icon-layer.ts b/src/deckgl-layers/src/svg-icon-layer/scatterplot-icon-layer.ts
index 040c9af6b..3108ff447 100644
--- a/src/deckgl-layers/src/svg-icon-layer/scatterplot-icon-layer.ts
+++ b/src/deckgl-layers/src/svg-icon-layer/scatterplot-icon-layer.ts
@@ -2,44 +2,32 @@
// Copyright contributors to the kepler.gl project
import {ScatterplotLayer, ScatterplotLayerProps} from '@deck.gl/layers';
-import {Geometry, Model} from '@luma.gl/core';
-import GL from '@luma.gl/constants';
+import {Geometry} from '@luma.gl/engine';
+import {TOPOLOGY} from '@kepler.gl/constants';
const DEFAULT_POS = [-1, -1, 0, -1, 1, 0, 1, 1, 0, 1, -1, 0];
export interface ScatterplotIconLayerProps extends ScatterplotLayerProps<any> {
- iconGeometry: number;
+ iconGeometry: number[];
}
export default class ScatterplotIconLayer extends ScatterplotLayer<any, ScatterplotIconLayerProps> {
- _getModel(gl: WebGLRenderingContext) {
- // use default scatterplot shaders
- const shaders = this.getShaders(undefined);
-
+ _getModel() {
const {iconGeometry} = this.props;
+ const positions = iconGeometry ? new Float32Array(iconGeometry) : new Float32Array(DEFAULT_POS);
- const geometry = iconGeometry
- ? new Geometry({
- drawMode: GL.TRIANGLES,
- attributes: {
- positions: new Float32Array(iconGeometry)
- }
- })
- : new Geometry({
- drawMode: GL.TRIANGLE_FAN,
- attributes: {
- positions: new Float32Array(DEFAULT_POS)
- }
- });
-
- return new Model(gl, {
- ...shaders,
- id: this.props.id,
- geometry,
- isInstanced: true,
- // @ts-ignore
- shaderCache: this.context.shaderCache
+ const geometry = new Geometry({
+ topology: iconGeometry ? TOPOLOGY.TRIANGLE_LIST : TOPOLOGY.TRIANGLE_STRIP,
+ attributes: {
+ positions: {size: 3, value: positions}
+ }
});
+
+ const model = super._getModel();
+ if (model) {
+ model.setGeometry(geometry);
+ }
+ return model;
}
}
diff --git a/src/deckgl-layers/src/svg-icon-layer/svg-icon-layer.ts b/src/deckgl-layers/src/svg-icon-layer/svg-icon-layer.ts
index 195d42c20..12c04af70 100644
--- a/src/deckgl-layers/src/svg-icon-layer/svg-icon-layer.ts
+++ b/src/deckgl-layers/src/svg-icon-layer/svg-icon-layer.ts
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {CompositeLayer, Position} from '@deck.gl/core';
-import {CompositeLayerProps} from '@deck.gl/core/lib/composite-layer';
+import {CompositeLayer, CompositeLayerProps, Layer, Position} from '@deck.gl/core';
import {RGBColor, RGBAColor} from '@kepler.gl/types';
import ScatterplotIconLayer from './scatterplot-icon-layer';
@@ -10,12 +9,18 @@ import ScatterplotIconLayer from './scatterplot-icon-layer';
// default icon geometry is a square
const DEFAULT_ICON_GEOMETRY = [1, 1, 0, 1, -1, 0, -1, -1, 0, -1, -1, 0, -1, 1, 0, 1, 1, 0];
+interface SvgIconData {
+ id: string;
+ data: unknown[];
+ geometry: number[];
+}
+
const defaultProps = {
getIconGeometry: () => DEFAULT_ICON_GEOMETRY,
getIcon: (d: {icon: string}) => d.icon
};
-export interface SvgIconLayerProps extends CompositeLayerProps<any> {
+export interface SvgIconLayerProps extends CompositeLayerProps {
getIconGeometry: (i: string) => number[];
getIcon: (d: {icon: string}) => string;
getPosition: (d: any) => Position;
@@ -23,7 +28,7 @@ export interface SvgIconLayerProps extends CompositeLayerProps<any> {
getFillColor: RGBColor | RGBAColor;
}
-export default class SvgIconLayer extends CompositeLayer<any, SvgIconLayerProps> {
+export default class SvgIconLayer extends CompositeLayer<SvgIconLayerProps> {
// Must be defined
initializeState() {
this.state = {
@@ -38,9 +43,10 @@ export default class SvgIconLayer extends CompositeLayer<any, SvgIconLayerProps>
}
_extractSublayers() {
- const {data, getIconGeometry, getIcon} = this.props;
+ const {data: rawData, getIconGeometry, getIcon} = this.props;
+ const data = rawData as {icon: string}[];
- const iconLayers = {};
+ const iconLayers: Record<string, SvgIconData> = {};
for (let i = 0; i < data.length; i++) {
const iconId = getIcon(data[i]);
iconLayers[iconId] = iconLayers[iconId] || {
@@ -59,13 +65,14 @@ export default class SvgIconLayer extends CompositeLayer<any, SvgIconLayerProps>
info?.sourceLayer?.updateAutoHighlight(info);
}
- renderLayers() {
+ renderLayers(): Layer[] | null {
const layerId = this.props.id;
+ const data = this.state.data as SvgIconData[];
const layers =
- this.state.data &&
- this.state.data.length &&
- this.state.data.map(
+ data &&
+ data.length &&
+ data.map(
({id, data, geometry}) =>
new ScatterplotIconLayer({
...this.props,
diff --git a/src/deckgl-layers/src/typedefs/deckgl.d.ts b/src/deckgl-layers/src/typedefs/deckgl.d.ts
deleted file mode 100644
index c33216387..000000000
--- a/src/deckgl-layers/src/typedefs/deckgl.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright contributors to the kepler.gl project
-
-// Eslint does not seem to be able to understand the namespace re-export here
-/* eslint-disable */
-
-import * as DeckTypings from '@danmarshall/deckgl-typings';
-
-declare module 'deck.gl' {
- export namespace DeckTypings {}
-}
diff --git a/src/deckgl-layers/src/wms/wms-layer.ts b/src/deckgl-layers/src/wms/wms-layer.ts
index 1b20e216c..36ac95a47 100644
--- a/src/deckgl-layers/src/wms/wms-layer.ts
+++ b/src/deckgl-layers/src/wms/wms-layer.ts
@@ -12,8 +12,8 @@ import {
Viewport,
COORDINATE_SYSTEM,
_deepEqual as deepEqual
-} from '@deck.gl/core/typed';
-import {BitmapLayer} from '@deck.gl/layers/typed';
+} from '@deck.gl/core';
+import {BitmapLayer} from '@deck.gl/layers';
import {ImageSource, createImageSource} from '@loaders.gl/wms';
import type {ImageSourceMetadata} from '@loaders.gl/loader-utils';
diff --git a/src/deckgl-types.d.ts b/src/deckgl-types.d.ts
new file mode 100644
index 000000000..2f2e94f69
--- /dev/null
+++ b/src/deckgl-types.d.ts
@@ -0,0 +1,172 @@
+/**
+ * Type augmentation for deck.gl 9.x packages.
+ *
+ * deck.gl 9 uses .js extensions in its index.d.ts re-exports
+ * (e.g. `export { default as Layer } from "./lib/layer.js"`).
+ * Some TypeScript/environment combinations with moduleResolution "node"
+ * cannot resolve these, making all exports invisible. This file
+ * re-declares the module exports by referencing the .d.ts files directly.
+ */
+
+declare module '@deck.gl/core' {
+ export {default as Deck} from '@deck.gl/core/dist/lib/deck';
+ export {default as DeckRenderer} from '@deck.gl/core/dist/lib/deck-renderer';
+ export {default as LayerManager} from '@deck.gl/core/dist/lib/layer-manager';
+ export {default as Layer} from '@deck.gl/core/dist/lib/layer';
+ export {default as CompositeLayer} from '@deck.gl/core/dist/lib/composite-layer';
+ export {default as LayerExtension} from '@deck.gl/core/dist/lib/layer-extension';
+ export {default as Viewport} from '@deck.gl/core/dist/viewports/viewport';
+ export {default as WebMercatorViewport} from '@deck.gl/core/dist/viewports/web-mercator-viewport';
+ export {default as MapView} from '@deck.gl/core/dist/views/map-view';
+ export {default as View} from '@deck.gl/core/dist/views/view';
+ export {default as FlyToInterpolator} from '@deck.gl/core/dist/transitions/fly-to-interpolator';
+ export {default as PostProcessEffect} from '@deck.gl/core/dist/effects/post-process-effect';
+ export {default as LightingEffect} from '@deck.gl/core/dist/effects/lighting/lighting-effect';
+ export {AmbientLight} from '@deck.gl/core/dist/effects/lighting/ambient-light';
+ export {default as _SunLight} from '@deck.gl/core/dist/effects/lighting/sun-light';
+ export {COORDINATE_SYSTEM, OPERATION, UNIT} from '@deck.gl/core/dist/lib/constants';
+ export {color, picking, project, project32, shadow} from '@deck.gl/core/dist/shaderlib/index';
+ export {default as Attribute} from '@deck.gl/core/dist/lib/attribute/attribute';
+ export {default as AttributeManager} from '@deck.gl/core/dist/lib/attribute/attribute-manager';
+ export {default as Tesselator} from '@deck.gl/core/dist/utils/tesselator';
+ export {deepEqual as _deepEqual} from '@deck.gl/core/dist/deep-equal';
+ export {Widget} from '@deck.gl/core/dist/lib/widget';
+
+ export type {LayersList, LayerContext} from '@deck.gl/core/dist/lib/layer-manager';
+ export type {UpdateParameters} from '@deck.gl/core/dist/lib/layer';
+ export type {DeckProps} from '@deck.gl/core/dist/lib/deck';
+ export type {
+ LayerProps,
+ CompositeLayerProps,
+ Accessor,
+ AccessorContext,
+ AccessorFunction,
+ LayerData,
+ LayerDataSource,
+ Unit,
+ Operation,
+ Position,
+ Color,
+ TextureSource,
+ Material
+ } from '@deck.gl/core/dist/types/layer-props';
+ export type {PickingInfo, GetPickingInfoParams} from '@deck.gl/core/dist/lib/picking/pick-info';
+ export type {DefaultProps} from '@deck.gl/core/dist/lifecycle/prop-types';
+ export type {CoordinateSystem} from '@deck.gl/core/dist/lib/constants';
+ export type {ChangeFlags} from '@deck.gl/core/dist/lib/layer-state';
+ export type {MapViewState} from '@deck.gl/core/dist/views/map-view';
+ export type {Effect, PreRenderOptions, PostRenderOptions} from '@deck.gl/core/dist/lib/effect';
+ export type {ControllerProps} from '@deck.gl/core/dist/controllers/controller';
+ export type {BinaryAttribute} from '@deck.gl/core/dist/lib/attribute/attribute';
+ export type {_ConstructorOf} from '@deck.gl/core/dist/types/types';
+ export type {LightingEffectProps} from '@deck.gl/core/dist/effects/lighting/lighting-effect';
+ export type {WidgetProps} from '@deck.gl/core/dist/lib/widget';
+}
+
+declare module '@deck.gl/layers' {
+ export {default as ArcLayer} from '@deck.gl/layers/dist/arc-layer/arc-layer';
+ export {default as BitmapLayer} from '@deck.gl/layers/dist/bitmap-layer/bitmap-layer';
+ export {default as IconLayer} from '@deck.gl/layers/dist/icon-layer/icon-layer';
+ export {default as LineLayer} from '@deck.gl/layers/dist/line-layer/line-layer';
+ export {default as ScatterplotLayer} from '@deck.gl/layers/dist/scatterplot-layer/scatterplot-layer';
+ export {default as ColumnLayer} from '@deck.gl/layers/dist/column-layer/column-layer';
+ export {default as GridCellLayer} from '@deck.gl/layers/dist/column-layer/grid-cell-layer';
+ export {default as PathLayer} from '@deck.gl/layers/dist/path-layer/path-layer';
+ export {default as PolygonLayer} from '@deck.gl/layers/dist/polygon-layer/polygon-layer';
+ export {default as GeoJsonLayer} from '@deck.gl/layers/dist/geojson-layer/geojson-layer';
+ export {default as TextLayer} from '@deck.gl/layers/dist/text-layer/text-layer';
+ export {default as SolidPolygonLayer} from '@deck.gl/layers/dist/solid-polygon-layer/solid-polygon-layer';
+ export {default as PointCloudLayer} from '@deck.gl/layers/dist/point-cloud-layer/point-cloud-layer';
+
+ export type {ArcLayerProps} from '@deck.gl/layers/dist/arc-layer/arc-layer';
+ export type {
+ BitmapLayerProps,
+ BitmapBoundingBox,
+ BitmapLayerPickingInfo
+ } from '@deck.gl/layers/dist/bitmap-layer/bitmap-layer';
+ export type {ColumnLayerProps} from '@deck.gl/layers/dist/column-layer/column-layer';
+ export type {ScatterplotLayerProps} from '@deck.gl/layers/dist/scatterplot-layer/scatterplot-layer';
+ export type {IconLayerProps} from '@deck.gl/layers/dist/icon-layer/icon-layer';
+ export type {LineLayerProps} from '@deck.gl/layers/dist/line-layer/line-layer';
+ export type {PolygonLayerProps} from '@deck.gl/layers/dist/polygon-layer/polygon-layer';
+ export type {GeoJsonLayerProps} from '@deck.gl/layers/dist/geojson-layer/geojson-layer';
+ export type {GridCellLayerProps} from '@deck.gl/layers/dist/column-layer/grid-cell-layer';
+ export type {TextLayerProps} from '@deck.gl/layers/dist/text-layer/text-layer';
+ export type {PathLayerProps} from '@deck.gl/layers/dist/path-layer/path-layer';
+ export type {SolidPolygonLayerProps} from '@deck.gl/layers/dist/solid-polygon-layer/solid-polygon-layer';
+ export type {PointCloudLayerProps} from '@deck.gl/layers/dist/point-cloud-layer/point-cloud-layer';
+}
+
+declare module '@deck.gl/geo-layers' {
+ export {default as H3HexagonLayer} from '@deck.gl/geo-layers/dist/h3-layers/h3-hexagon-layer';
+ export {default as H3ClusterLayer} from '@deck.gl/geo-layers/dist/h3-layers/h3-cluster-layer';
+ export {default as S2Layer} from '@deck.gl/geo-layers/dist/s2-layer/s2-layer';
+ export {default as TripsLayer} from '@deck.gl/geo-layers/dist/trips-layer/trips-layer';
+ export {default as TileLayer} from '@deck.gl/geo-layers/dist/tile-layer/tile-layer';
+ export {default as MVTLayer} from '@deck.gl/geo-layers/dist/mvt-layer/mvt-layer';
+ export {default as TerrainLayer} from '@deck.gl/geo-layers/dist/terrain-layer/terrain-layer';
+ export {default as Tile3DLayer} from '@deck.gl/geo-layers/dist/tile-3d-layer/tile-3d-layer';
+ export {WMSLayer as _WMSLayer} from '@deck.gl/geo-layers/dist/wms-layer/wms-layer';
+
+ export type {H3HexagonLayerProps} from '@deck.gl/geo-layers/dist/h3-layers/h3-hexagon-layer';
+ export type {S2LayerProps} from '@deck.gl/geo-layers/dist/s2-layer/s2-layer';
+ export type {
+ TileLayerProps,
+ TileLayerPickingInfo
+ } from '@deck.gl/geo-layers/dist/tile-layer/tile-layer';
+ export type {TripsLayerProps} from '@deck.gl/geo-layers/dist/trips-layer/trips-layer';
+ export type {MVTLayerProps} from '@deck.gl/geo-layers/dist/mvt-layer/mvt-layer';
+ export type {GeoBoundingBox, NonGeoBoundingBox} from '@deck.gl/geo-layers/dist/tileset-2d/index';
+ export {Tile2DHeader as _Tile2DHeader} from '@deck.gl/geo-layers/dist/tileset-2d/index';
+}
+
+declare module '@deck.gl/aggregation-layers' {
+ export {default as GridLayer} from '@deck.gl/aggregation-layers/dist/grid-layer/grid-layer';
+ export {default as HexagonLayer} from '@deck.gl/aggregation-layers/dist/hexagon-layer/hexagon-layer';
+ export {default as HeatmapLayer} from '@deck.gl/aggregation-layers/dist/heatmap-layer/heatmap-layer';
+ export {default as ScreenGridLayer} from '@deck.gl/aggregation-layers/dist/screen-grid-layer/screen-grid-layer';
+ export {default as ContourLayer} from '@deck.gl/aggregation-layers/dist/contour-layer/contour-layer';
+
+ export type {
+ GridLayerProps,
+ GridLayerPickingInfo
+ } from '@deck.gl/aggregation-layers/dist/grid-layer/grid-layer';
+ export type {
+ HexagonLayerProps,
+ HexagonLayerPickingInfo
+ } from '@deck.gl/aggregation-layers/dist/hexagon-layer/hexagon-layer';
+ export type {HeatmapLayerProps} from '@deck.gl/aggregation-layers/dist/heatmap-layer/heatmap-layer';
+ export type {ScreenGridLayerProps} from '@deck.gl/aggregation-layers/dist/screen-grid-layer/screen-grid-layer';
+}
+
+declare module '@deck.gl/mesh-layers' {
+ export {default as ScenegraphLayer} from '@deck.gl/mesh-layers/dist/scenegraph-layer/scenegraph-layer';
+ export {default as SimpleMeshLayer} from '@deck.gl/mesh-layers/dist/simple-mesh-layer/simple-mesh-layer';
+
+ export type {ScenegraphLayerProps} from '@deck.gl/mesh-layers/dist/scenegraph-layer/scenegraph-layer';
+ export type {SimpleMeshLayerProps} from '@deck.gl/mesh-layers/dist/simple-mesh-layer/simple-mesh-layer';
+}
+
+declare module '@deck.gl/extensions' {
+ export {default as BrushingExtension} from '@deck.gl/extensions/dist/brushing/brushing-extension';
+ export {default as DataFilterExtension} from '@deck.gl/extensions/dist/data-filter/data-filter-extension';
+ export {default as PathStyleExtension} from '@deck.gl/extensions/dist/path-style/path-style-extension';
+ export {default as FillStyleExtension} from '@deck.gl/extensions/dist/fill-style/fill-style-extension';
+ export {default as ClipExtension} from '@deck.gl/extensions/dist/clip/clip-extension';
+ export {default as CollisionFilterExtension} from '@deck.gl/extensions/dist/collision-filter/collision-filter-extension';
+ export {default as MaskExtension} from '@deck.gl/extensions/dist/mask/mask-extension';
+
+ export type {BrushingExtensionProps} from '@deck.gl/extensions/dist/brushing/brushing-extension';
+ export type {
+ DataFilterExtensionProps,
+ DataFilterExtensionOptions
+ } from '@deck.gl/extensions/dist/data-filter/data-filter-extension';
+ export type {PathStyleExtensionProps} from '@deck.gl/extensions/dist/path-style/path-style-extension';
+ export type {FillStyleExtensionProps} from '@deck.gl/extensions/dist/fill-style/fill-style-extension';
+ export type {CollisionFilterExtensionProps} from '@deck.gl/extensions/dist/collision-filter/collision-filter-extension';
+ export type {MaskExtensionProps} from '@deck.gl/extensions/dist/mask/mask-extension';
+}
+
+declare module '@luma.gl/core' {
+ export {Texture, type TextureProps} from '@luma.gl/core/dist/adapter/resources/texture';
+}
diff --git a/src/duckdb/src/table/duckdb-table-utils.ts b/src/duckdb/src/table/duckdb-table-utils.ts
index b6b4d8021..7e9b755b0 100644
--- a/src/duckdb/src/table/duckdb-table-utils.ts
+++ b/src/duckdb/src/table/duckdb-table-utils.ts
@@ -36,9 +36,7 @@ export async function getDuckDBColumnTypes(
try {
// PRAGMA table_info is less likely to bind/execute view SQL than DESCRIBE,
// so it avoids triggering remote access (e.g., S3) for view-backed schemas.
- const resInfo = await connection.query(
- `PRAGMA table_info(${quotedTableName})`
- );
+ const resInfo = await connection.query(`PRAGMA table_info(${quotedTableName})`);
const numRows = resInfo.numRows;
const columnNames = resInfo.getChild('name');
const columnTypes = resInfo.getChild('type');
diff --git a/src/duckdb/src/table/index.ts b/src/duckdb/src/table/index.ts
index 1c8e34ad3..b9e5a3aa9 100644
--- a/src/duckdb/src/table/index.ts
+++ b/src/duckdb/src/table/index.ts
@@ -2,4 +2,3 @@
// Copyright contributors to the kepler.gl project
export * from './duckdb-table-utils';
-
diff --git a/src/effects/package.json b/src/effects/package.json
index 420ac19a8..7f9a31d47 100644
--- a/src/effects/package.json
+++ b/src/effects/package.json
@@ -30,13 +30,15 @@
"umd"
],
"dependencies": {
- "@deck.gl/core": "^8.9.27",
+ "@deck.gl/core": "^9.2.11",
"@kepler.gl/common-utils": "3.2.6",
"@kepler.gl/constants": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
- "@luma.gl/core": "^8.5.20",
- "@luma.gl/shadertools": "^8.5.20",
+ "@luma.gl/core": "^9.2.6",
+ "@luma.gl/effects": "^9.2.6",
+ "@luma.gl/engine": "^9.2.6",
+ "@luma.gl/shadertools": "^9.2.6",
"moment-timezone": "^0.5.35",
"suncalc": "^1.9.0"
},
diff --git a/src/effects/src/custom-deck-lighting-effect.ts b/src/effects/src/custom-deck-lighting-effect.ts
index eb268333a..1b90da48e 100644
--- a/src/effects/src/custom-deck-lighting-effect.ts
+++ b/src/effects/src/custom-deck-lighting-effect.ts
@@ -1,134 +1,137 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-// @ts-nocheck This is a hack, don't check types
-
-// import {console as Console} from 'global/window';
import {LightingEffect, shadow} from '@deck.gl/core';
-import {Texture2D, ProgramManager} from '@luma.gl/core';
+import type {Texture} from '@luma.gl/core';
+import type {ShaderModule} from '@luma.gl/shadertools';
/**
- * Inserts shader code before detected part.
- * @param {string} vs Original shader code.
- * @param {string} type Debug string.
- * @param {string} insertBeforeText Text chunk to insert before.
- * @param {string} textToInsert Text to insert.
- * @returns Modified shader code.
+ * Exposes private members of LightingEffect that we need to access.
+ * These are runtime-accessible but TypeScript marks them as private.
*/
-export function insertBefore(vs, type, insertBeforeText, textToInsert) {
- const at = vs.indexOf(insertBeforeText);
- if (at < 0) {
- // Console.error(`Cannot edit ${type} layer shader`);
- return vs;
- }
+interface LightingEffectPrivate {
+ shadow: boolean;
+ shadowPasses: {delete(): void}[];
+ dummyShadowMap: Texture | null;
+ _createShadowPasses(device: unknown): void;
+}
- return vs.slice(0, at) + textToInsert + vs.slice(at);
+/** Extended shadow module props with our custom field. */
+interface CustomShadowProps {
+ outputUniformShadow?: boolean;
+ dummyShadowMap?: Texture | null;
+ [key: string]: unknown;
}
-const CustomShadowModule = shadow ? {...shadow} : undefined;
+/**
+ * Insert text before a target string in shader source.
+ */
+function insertBefore(source: string, target: string, textToInsert: string): string {
+ const at = source.indexOf(target);
+ if (at < 0) return source;
+ return source.slice(0, at) + textToInsert + source.slice(at);
+}
/**
- * Custom shadow module
- * 1) Add u_outputUniformShadow uniform
- * 2) always produce full shadow when the uniform is set to true.
+ * Create a patched shadow module that adds `outputUniformShadow` to the
+ * shadow UBO. When true, `shadow_getShadowWeight` returns 1.0 (full
+ * uniform shadow) instead of sampling the shadow map. Used for nighttime
+ * rendering to avoid partial shadows from below.
*/
-CustomShadowModule.fs = insertBefore(
- CustomShadowModule.fs,
- 'custom shadow #1',
- 'uniform vec4 shadow_uColor;',
- 'uniform bool u_outputUniformShadow;'
-);
-
-CustomShadowModule.fs = insertBefore(
- CustomShadowModule.fs,
- 'custom shadow #1',
- 'vec4 rgbaDepth = texture2D(shadowMap, position.xy);',
- 'if(u_outputUniformShadow) return 1.0;'
-);
-
-CustomShadowModule.getUniforms = (opts = {}, context = {}) => {
- const u = shadow.getUniforms(opts, context);
- if (opts.outputUniformShadow !== undefined) {
- u.u_outputUniformShadow = opts.outputUniformShadow;
- }
- return u;
-};
+function createCustomShadowModule(): ShaderModule | null {
+ if (!shadow) return null;
+
+ const mod = {...shadow} as Record<string, any>;
+
+ const uboField = ' float outputUniformShadow;\n';
+ mod.vs = insertBefore(mod.vs, '} shadow;', uboField);
+ mod.fs = insertBefore(mod.fs, '} shadow;', uboField);
+
+ mod.fs = insertBefore(
+ mod.fs,
+ 'vec4 rgbaDepth = texture(shadowMap, position.xy);',
+ 'if (shadow.outputUniformShadow > 0.5) return 1.0;\n '
+ );
+
+ mod.uniformTypes = {
+ ...shadow.uniformTypes,
+ outputUniformShadow: 'f32'
+ };
+
+ const originalGetUniforms = shadow.getUniforms as (
+ opts: Record<string, unknown>,
+ prevUniforms: Record<string, unknown>
+ ) => Record<string, unknown>;
+ mod.getUniforms = (opts: CustomShadowProps = {}, context = {}) => {
+ const u = originalGetUniforms(opts, context);
+ u.outputUniformShadow = opts.outputUniformShadow ? 1.0 : 0.0;
+ return u;
+ };
+
+ return mod as unknown as ShaderModule;
+}
+
+const CustomShadowModule = createCustomShadowModule();
/**
- * Custom LightingEffect
- * 1) adds CustomShadowModule
- * 2) pass outputUniformShadow as module parameters
- * 3) properly removes CustomShadowModule
+ * Custom LightingEffect for kepler.gl.
+ *
+ * Extends deck.gl's LightingEffect with:
+ * - A patched shadow module with `outputUniformShadow` for uniform shadow
+ * during nighttime (avoids partial shadows from below).
+ * - getShaderModuleProps override that always provides dummyShadowMap
+ * to prevent "Bad texture binding" errors when shadows are disabled.
*/
class CustomDeckLightingEffect extends LightingEffect {
+ outputUniformShadow: boolean;
+
+ private get _private(): LightingEffectPrivate {
+ return this as unknown as LightingEffectPrivate;
+ }
+
constructor(props) {
super(props);
- this.useOutputUniformShadow = false;
+ this.outputUniformShadow = false;
}
- preRender(gl, {layers, layerFilter, viewports, onViewportActive, views}) {
- if (!this.shadow) return;
-
- // create light matrix every frame to make sure always updated from light source
- this.shadowMatrices = this._calculateMatrices();
-
- if (this.shadowPasses.length === 0) {
- this._createShadowPasses(gl);
- }
- if (!this.programManager) {
- this.programManager = ProgramManager.getDefaultProgramManager(gl);
- if (CustomShadowModule) {
- this.programManager.addDefaultModule(CustomShadowModule);
- }
+ setup(context) {
+ this.context = context;
+ const {device, deck} = context;
+ if (this._private.shadow && !this._private.dummyShadowMap) {
+ this._private._createShadowPasses(device);
+ deck._addDefaultShaderModule(CustomShadowModule || shadow);
+ this._private.dummyShadowMap = device.createTexture({width: 1, height: 1});
}
+ }
- if (!this.dummyShadowMap) {
- this.dummyShadowMap = new Texture2D(gl, {
- width: 1,
- height: 1
- });
+ cleanup(context) {
+ for (const shadowPass of this._private.shadowPasses) {
+ shadowPass.delete();
}
-
- for (let i = 0; i < this.shadowPasses.length; i++) {
- const shadowPass = this.shadowPasses[i];
- shadowPass.render({
- layers,
- layerFilter,
- viewports,
- onViewportActive,
- views,
- moduleParameters: {
- shadowLightId: i,
- dummyShadowMap: this.dummyShadowMap,
- shadowMatrices: this.shadowMatrices,
- useOutputUniformShadow: false
- }
- });
+ this._private.shadowPasses.length = 0;
+ if (this._private.dummyShadowMap) {
+ this._private.dummyShadowMap.destroy();
+ this._private.dummyShadowMap = null;
+ context.deck._removeDefaultShaderModule(CustomShadowModule || shadow);
}
}
- getModuleParameters(layer) {
- const parameters = super.getModuleParameters(layer);
- parameters.outputUniformShadow = this.outputUniformShadow;
- return parameters;
- }
+ getShaderModuleProps(layer, otherShaderModuleProps) {
+ const props = super.getShaderModuleProps(layer, otherShaderModuleProps);
- cleanup() {
- for (const shadowPass of this.shadowPasses) {
- shadowPass.delete();
+ if (
+ props.shadow &&
+ !(props.shadow as CustomShadowProps).dummyShadowMap &&
+ this._private.dummyShadowMap
+ ) {
+ (props.shadow as CustomShadowProps).dummyShadowMap = this._private.dummyShadowMap;
}
- this.shadowPasses.length = 0;
- this.shadowMaps.length = 0;
- if (this.dummyShadowMap) {
- this.dummyShadowMap.delete();
- this.dummyShadowMap = null;
+ if (props.shadow) {
+ (props.shadow as CustomShadowProps).outputUniformShadow = this.outputUniformShadow;
}
- if (this.shadow && this.programManager) {
- this.programManager.removeDefaultModule(CustomShadowModule);
- this.programManager = null;
- }
+ return props;
}
}
diff --git a/src/effects/src/distance-fog-effect.ts b/src/effects/src/distance-fog-effect.ts
new file mode 100644
index 000000000..cd82626e3
--- /dev/null
+++ b/src/effects/src/distance-fog-effect.ts
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import {POSTPROCESSING_EFFECTS, DEFAULT_POST_PROCESSING_EFFECT_TYPE} from '@kepler.gl/constants';
+import {EffectPropsPartial} from '@kepler.gl/types';
+
+import Effect from './effect';
+import {DeckDistanceFogEffect, DistanceFogProps} from './shader-passes/distance-fog';
+
+class DistanceFogEffect extends Effect {
+ constructor(props: EffectPropsPartial) {
+ super(props);
+ }
+
+ _initializeEffect() {
+ const effectDesc = POSTPROCESSING_EFFECTS.distanceFog;
+ if (!effectDesc) return;
+
+ const defaultParameters: Record<string, any> = {};
+ for (const param of effectDesc.parameters) {
+ defaultParameters[param.name] = param.defaultValue ?? param.min;
+ }
+ this.parameters = {...defaultParameters, ...this.parameters};
+
+ this.deckEffect = new DeckDistanceFogEffect(this.parameters as DistanceFogProps);
+ }
+
+ getDefaultProps(props: EffectPropsPartial = {}) {
+ return super.getDefaultProps({type: DEFAULT_POST_PROCESSING_EFFECT_TYPE, ...props});
+ }
+
+ setProps(props: EffectPropsPartial) {
+ super.setProps(props);
+
+ if (props.parameters) {
+ this.deckEffect?.setProps(this.parameters);
+ }
+ }
+}
+
+export default DistanceFogEffect;
diff --git a/src/effects/src/post-processing-effect.ts b/src/effects/src/post-processing-effect.ts
index 7f94699e5..05dca0275 100644
--- a/src/effects/src/post-processing-effect.ts
+++ b/src/effects/src/post-processing-effect.ts
@@ -18,7 +18,7 @@ import {
zoomBlur,
magnify,
hexagonalPixelate
-} from '@luma.gl/shadertools';
+} from '@luma.gl/effects';
import {POSTPROCESSING_EFFECTS, DEFAULT_POST_PROCESSING_EFFECT_TYPE} from '@kepler.gl/constants';
import {EffectPropsPartial, EffectParameterDescription} from '@kepler.gl/types';
@@ -117,13 +117,12 @@ class PostProcessingEffect extends Effect {
if (effectDesc) {
this.deckEffect = new DeckPostProcessEffect(effectDesc.class, this.parameters);
- const uniforms = this.deckEffect?.module?.uniforms;
- if (uniforms) {
- // get default parameters
- const keys = Object.keys(uniforms);
+ const propTypes = this.deckEffect?.module?.propTypes;
+ if (propTypes) {
+ const keys = Object.keys(propTypes);
const defaultParameters = {};
keys.forEach(key => {
- defaultParameters[key] = getDefaultValueForParameter(key, this._uiConfig, uniforms);
+ defaultParameters[key] = getDefaultValueForParameter(key, this._uiConfig, propTypes);
});
this.parameters = {...defaultParameters, ...this.parameters};
this.deckEffect?.setProps(this.parameters);
diff --git a/src/effects/src/shader-passes/distance-fog.ts b/src/effects/src/shader-passes/distance-fog.ts
new file mode 100644
index 000000000..4f22e444b
--- /dev/null
+++ b/src/effects/src/shader-passes/distance-fog.ts
@@ -0,0 +1,206 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import {ClipSpace} from '@luma.gl/engine';
+import type {ShaderModule} from '@luma.gl/shadertools';
+
+export type DistanceFogProps = {
+ density: number;
+ fogStart: number;
+ fogRange: number;
+ fogColor: [number, number, number];
+};
+
+const DISTANCE_FOG_UNIFORM_BLOCK = /* glsl */ `\
+uniform distanceFogUniforms {
+ float density;
+ float fogStart;
+ float fogRange;
+ float nearPlane;
+ float farPlane;
+ vec3 fogColor;
+} distanceFog;
+`;
+
+const DISTANCE_FOG_FS = /* glsl */ `\
+#version 300 es
+precision highp float;
+
+uniform sampler2D texSrc;
+uniform sampler2D texDepth;
+
+in vec2 position;
+in vec2 coordinate;
+in vec2 uv;
+
+out vec4 fragColor;
+
+void main() {
+ vec4 color = texture(texSrc, coordinate);
+ float depth = texture(texDepth, coordinate).r;
+
+ float n = distanceFog.nearPlane;
+ float f = distanceFog.farPlane;
+ float eyeZ = n * f / (f - depth * (f - n));
+ float linearDepth = (eyeZ - n) / (f - n);
+
+ vec3 fogColor = distanceFog.fogColor / 255.0;
+ float end = distanceFog.fogStart + distanceFog.fogRange;
+ float fogFactor = smoothstep(distanceFog.fogStart, end, linearDepth) * distanceFog.density;
+
+ fragColor = vec4(mix(color.rgb, fogColor, fogFactor), color.a);
+}
+`;
+
+const screenModule = {
+ name: 'screen',
+ fs: /* glsl */ `\
+uniform screenUniforms {
+ vec2 texSize;
+} screen;
+`,
+ uniformTypes: {
+ texSize: 'vec2<f32>'
+ }
+} as const satisfies ShaderModule;
+
+const distanceFogModule = {
+ name: 'distanceFog',
+ fs: DISTANCE_FOG_UNIFORM_BLOCK,
+ uniformTypes: {
+ density: 'f32',
+ fogStart: 'f32',
+ fogRange: 'f32',
+ nearPlane: 'f32',
+ farPlane: 'f32',
+ fogColor: 'vec3<f32>'
+ },
+ defaultUniforms: {
+ density: 0.5,
+ fogStart: 0.3,
+ fogRange: 0.5,
+ nearPlane: 0.1,
+ farPlane: 1000,
+ fogColor: [217, 222, 230]
+ },
+ propTypes: {
+ density: {value: 0.5, min: 0, max: 1},
+ fogStart: {value: 0.3, min: 0, max: 1},
+ fogRange: {value: 0.5, min: 0.01, max: 1},
+ fogColor: {value: [217, 222, 230]},
+ nearPlane: {value: 0.1, private: true},
+ farPlane: {value: 1000, private: true}
+ }
+} as const satisfies ShaderModule;
+
+/**
+ * Distance Fog Effect - uses the depth buffer to apply fog based on
+ * camera-to-fragment distance. The raw depth buffer values are linearized
+ * using the camera's near/far planes (extracted from the viewport projection
+ * matrix) so that the fog gradient is perceptually uniform with distance.
+ */
+export class DeckDistanceFogEffect {
+ id = 'distance-fog-effect';
+ props: DistanceFogProps;
+ module = distanceFogModule;
+ private model: InstanceType<typeof ClipSpace> | null = null;
+
+ constructor(props: Partial<DistanceFogProps> = {}) {
+ this.props = {
+ density: 0.5,
+ fogStart: 0.3,
+ fogRange: 0.5,
+ fogColor: [217, 222, 230],
+ ...props
+ };
+ }
+
+ setup({device}) {
+ this.model = new ClipSpace(device, {
+ id: 'distance-fog-pass',
+ fs: DISTANCE_FOG_FS,
+ modules: [distanceFogModule, screenModule],
+ parameters: {
+ depthWriteEnabled: false,
+ depthCompare: 'always' as const,
+ blend: true,
+ blendColorSrcFactor: 'one' as const,
+ blendColorDstFactor: 'one-minus-src-alpha' as const,
+ blendAlphaSrcFactor: 'one' as const,
+ blendAlphaDstFactor: 'one-minus-src-alpha' as const,
+ blendColorOperation: 'add' as const,
+ blendAlphaOperation: 'add' as const
+ }
+ });
+ }
+
+ setProps(props: Partial<DistanceFogProps>) {
+ Object.assign(this.props, props);
+ }
+
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
+ preRender(): void {}
+
+ postRender(params: any): any {
+ const {inputBuffer, swapBuffer, target} = params;
+ const outputBuffer = target !== undefined ? target : swapBuffer;
+
+ if (!this.model) return inputBuffer;
+
+ // Distance fog always runs first among post-processing effects
+ // (enforced by fixEffectOrder), so inputBuffer is always the scene
+ // render target with valid depth data.
+ const depthAttachment = inputBuffer.depthStencilAttachment;
+ if (!depthAttachment) return inputBuffer;
+
+ let nearPlane = 0.1;
+ let farPlane = 1000;
+ if (params.viewports?.length > 0) {
+ const pm = params.viewports[0].projectionMatrix;
+ if (pm) {
+ const n = pm[14] / (pm[10] - 1);
+ const f = pm[14] / (pm[10] + 1);
+ if (Number.isFinite(n) && Number.isFinite(f) && n > 0 && f > n) {
+ nearPlane = n;
+ farPlane = f;
+ }
+ }
+ }
+
+ const texSize: [number, number] = [inputBuffer.width, inputBuffer.height];
+
+ this.model.shaderInputs.setProps({
+ screen: {
+ texSrc: inputBuffer.colorAttachments[0],
+ texSize
+ },
+ distanceFog: {
+ texDepth: depthAttachment,
+ density: this.props.density,
+ fogStart: this.props.fogStart,
+ fogRange: this.props.fogRange,
+ nearPlane,
+ farPlane,
+ fogColor: this.props.fogColor
+ }
+ });
+
+ const renderPass = this.model.device.beginRenderPass({
+ framebuffer: outputBuffer,
+ parameters: {viewport: [0, 0, ...texSize]},
+ clearColor: [0, 0, 0, 0],
+ clearDepth: 1
+ });
+ this.model.draw(renderPass);
+ renderPass.end();
+
+ return outputBuffer || inputBuffer;
+ }
+
+ cleanup(): void {
+ if (this.model) {
+ this.model.destroy();
+ this.model = null;
+ }
+ }
+}
diff --git a/src/effects/src/shader-passes/surface-fog.ts b/src/effects/src/shader-passes/surface-fog.ts
new file mode 100644
index 000000000..8bf5642d0
--- /dev/null
+++ b/src/effects/src/shader-passes/surface-fog.ts
@@ -0,0 +1,280 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import {ClipSpace} from '@luma.gl/engine';
+import type {ShaderModule} from '@luma.gl/shadertools';
+
+export type SurfaceFogProps = {
+ density: number;
+ /** Fog ceiling elevation in meters. Geometry below this gets fog. */
+ height: number;
+ /** Vertical transition zone in meters above the ceiling. */
+ thickness: number;
+ fogColor: [number, number, number];
+};
+
+const SURFACE_FOG_UNIFORM_BLOCK = /* glsl */ `\
+uniform surfaceFogUniforms {
+ float density;
+ float fogHeight;
+ float fogThickness;
+ vec3 fogColor;
+ vec4 invCol0;
+ vec4 invCol1;
+ vec4 invCol2;
+ vec4 invCol3;
+ float viewportWidth;
+ float viewportHeight;
+} surfaceFog;
+`;
+
+const SURFACE_FOG_FS = /* glsl */ `\
+#version 300 es
+precision highp float;
+
+uniform sampler2D texSrc;
+uniform sampler2D texDepth;
+
+in vec2 position;
+in vec2 coordinate;
+in vec2 uv;
+
+out vec4 fragColor;
+
+void main() {
+ vec4 color = texture(texSrc, coordinate);
+ float depth = texture(texDepth, coordinate).r;
+
+ if (depth >= 0.999) {
+ fragColor = color;
+ return;
+ }
+
+ // pixelUnprojectionMatrix maps (pixelX, pixelY, clipZ) → common space.
+ // coordinate is 0..1 UV; convert to CSS pixel coords matching deck.gl convention
+ // (origin top-left, y-down).
+ // Depth buffer stores [0,1]; convert to clip-space Z [-1,1] (WebGL NDC).
+ // Must use viewport CSS dimensions (not texture device-pixel size) because
+ // pixelUnprojectionMatrix is built from CSS-pixel width/height.
+ vec3 pixelPos = vec3(
+ coordinate.x * surfaceFog.viewportWidth,
+ (1.0 - coordinate.y) * surfaceFog.viewportHeight,
+ depth * 2.0 - 1.0
+ );
+
+ mat4 invMat = mat4(
+ surfaceFog.invCol0,
+ surfaceFog.invCol1,
+ surfaceFog.invCol2,
+ surfaceFog.invCol3
+ );
+
+ vec4 commonPos = invMat * vec4(pixelPos, 1.0);
+ commonPos /= commonPos.w;
+
+ // commonPos.z is elevation in common-space units.
+ // fogHeight and fogThickness are pre-converted to the same units on CPU.
+ // Below fogHeight: full fog.
+ // fogHeight → fogHeight + fogThickness: smooth transition.
+ // Above fogHeight + fogThickness: no fog.
+ float fogFactor = (1.0 - smoothstep(surfaceFog.fogHeight, surfaceFog.fogHeight + surfaceFog.fogThickness, commonPos.z))
+ * surfaceFog.density;
+
+ vec3 fogColorNorm = surfaceFog.fogColor / 255.0;
+ fragColor = vec4(mix(color.rgb, fogColorNorm, clamp(fogFactor, 0.0, 1.0)), color.a);
+}
+`;
+
+const screenModule = {
+ name: 'screen',
+ fs: /* glsl */ `\
+uniform screenUniforms {
+ vec2 texSize;
+} screen;
+`,
+ uniformTypes: {
+ texSize: 'vec2<f32>'
+ }
+} as const satisfies ShaderModule;
+
+const surfaceFogModule = {
+ name: 'surfaceFog',
+ fs: SURFACE_FOG_UNIFORM_BLOCK,
+ uniformTypes: {
+ density: 'f32',
+ fogHeight: 'f32',
+ fogThickness: 'f32',
+ fogColor: 'vec3<f32>',
+ invCol0: 'vec4<f32>',
+ invCol1: 'vec4<f32>',
+ invCol2: 'vec4<f32>',
+ invCol3: 'vec4<f32>',
+ viewportWidth: 'f32',
+ viewportHeight: 'f32'
+ },
+ defaultUniforms: {
+ density: 0.6,
+ fogHeight: 0,
+ fogThickness: 0,
+ fogColor: [230, 235, 242],
+ invCol0: [1, 0, 0, 0],
+ invCol1: [0, 1, 0, 0],
+ invCol2: [0, 0, 1, 0],
+ invCol3: [0, 0, 0, 1],
+ viewportWidth: 1,
+ viewportHeight: 1
+ },
+ propTypes: {
+ density: {value: 0.6, min: 0, max: 1},
+ height: {value: 100, min: 0, max: 3000},
+ thickness: {value: 200, min: 0, max: 1000},
+ fogColor: {value: [230, 235, 242]},
+ fogHeight: {value: 0, private: true},
+ fogThickness: {value: 0, private: true},
+ invCol0: {value: [1, 0, 0, 0], private: true},
+ invCol1: {value: [0, 1, 0, 0], private: true},
+ invCol2: {value: [0, 0, 1, 0], private: true},
+ invCol3: {value: [0, 0, 0, 1], private: true},
+ viewportWidth: {value: 1, private: true},
+ viewportHeight: {value: 1, private: true}
+ }
+} as const satisfies ShaderModule;
+
+/**
+ * Surface Fog Effect — elevation-based ground-level fog.
+ *
+ * Uses deck.gl's pixelUnprojectionMatrix to reconstruct the common-space
+ * position of each fragment from the depth buffer. The Z component of
+ * that position corresponds to the fragment's real-world elevation
+ * (scaled by distanceScales.unitsPerMeter). Fog is applied to all
+ * fragments whose elevation is below the user-configured height (meters),
+ * with a smooth transition zone controlled by thickness (meters).
+ */
+export class DeckSurfaceFogEffect {
+ id = 'surface-fog-effect';
+ props: SurfaceFogProps;
+ module = surfaceFogModule;
+ private model: InstanceType<typeof ClipSpace> | null = null;
+
+ constructor(props: Partial<SurfaceFogProps> = {}) {
+ this.props = {
+ density: 0.6,
+ height: 100,
+ thickness: 200,
+ fogColor: [230, 235, 242],
+ ...props
+ };
+ }
+
+ setup({device}) {
+ this.model = new ClipSpace(device, {
+ id: 'surface-fog-pass',
+ fs: SURFACE_FOG_FS,
+ modules: [surfaceFogModule, screenModule],
+ parameters: {
+ depthWriteEnabled: false,
+ depthCompare: 'always' as const,
+ blend: true,
+ blendColorSrcFactor: 'one' as const,
+ blendColorDstFactor: 'one-minus-src-alpha' as const,
+ blendAlphaSrcFactor: 'one' as const,
+ blendAlphaDstFactor: 'one-minus-src-alpha' as const,
+ blendColorOperation: 'add' as const,
+ blendAlphaOperation: 'add' as const
+ }
+ });
+ }
+
+ setProps(props: Partial<SurfaceFogProps>) {
+ Object.assign(this.props, props);
+ }
+
+ // eslint-disable-next-line @typescript-eslint/no-empty-function
+ preRender(): void {}
+
+ postRender(params: any): any {
+ const {inputBuffer, swapBuffer, target} = params;
+ const outputBuffer = target !== undefined ? target : swapBuffer;
+
+ if (!this.model) return inputBuffer;
+
+ const depthAttachment = inputBuffer.depthStencilAttachment;
+ if (!depthAttachment) return inputBuffer;
+
+ let invCol0 = [1, 0, 0, 0];
+ let invCol1 = [0, 1, 0, 0];
+ let invCol2 = [0, 0, 1, 0];
+ let invCol3 = [0, 0, 0, 1];
+ let unitsPerMeterZ = 1;
+ let viewportWidth = 1;
+ let viewportHeight = 1;
+
+ if (params.viewports?.length > 0) {
+ const viewport = params.viewports[0];
+
+ viewportWidth = viewport.width;
+ viewportHeight = viewport.height;
+
+ // pixelUnprojectionMatrix maps (pixelX, pixelY, depth) → common space
+ const pum = viewport.pixelUnprojectionMatrix;
+ if (pum) {
+ invCol0 = [pum[0], pum[1], pum[2], pum[3]];
+ invCol1 = [pum[4], pum[5], pum[6], pum[7]];
+ invCol2 = [pum[8], pum[9], pum[10], pum[11]];
+ invCol3 = [pum[12], pum[13], pum[14], pum[15]];
+ }
+
+ const ds = viewport.distanceScales;
+ if (ds?.unitsPerMeter) {
+ const z = Array.isArray(ds.unitsPerMeter) ? ds.unitsPerMeter[2] : ds.unitsPerMeter;
+ if (Number.isFinite(z) && z > 0) {
+ unitsPerMeterZ = z;
+ }
+ }
+ }
+
+ // Convert user-facing meters to common-space units for the shader
+ const fogHeightCommon = this.props.height * unitsPerMeterZ;
+ const fogThicknessCommon = this.props.thickness * unitsPerMeterZ;
+
+ const texSize: [number, number] = [inputBuffer.width, inputBuffer.height];
+
+ this.model.shaderInputs.setProps({
+ screen: {
+ texSrc: inputBuffer.colorAttachments[0],
+ texSize
+ },
+ surfaceFog: {
+ texDepth: depthAttachment,
+ density: this.props.density,
+ fogHeight: fogHeightCommon,
+ fogThickness: fogThicknessCommon,
+ fogColor: this.props.fogColor,
+ invCol0,
+ invCol1,
+ invCol2,
+ invCol3,
+ viewportWidth,
+ viewportHeight
+ }
+ });
+
+ const renderPass = this.model.device.beginRenderPass({
+ framebuffer: outputBuffer,
+ parameters: {viewport: [0, 0, ...texSize]},
+ clearColor: [0, 0, 0, 0],
+ clearDepth: 1
+ });
+ this.model.draw(renderPass);
+ renderPass.end();
+
+ return outputBuffer || inputBuffer;
+ }
+
+ cleanup(): void {
+ if (this.model) {
+ this.model.destroy();
+ this.model = null;
+ }
+ }
+}
diff --git a/src/effects/src/surface-fog-effect.ts b/src/effects/src/surface-fog-effect.ts
new file mode 100644
index 000000000..8ae8dc7ca
--- /dev/null
+++ b/src/effects/src/surface-fog-effect.ts
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import {POSTPROCESSING_EFFECTS, DEFAULT_POST_PROCESSING_EFFECT_TYPE} from '@kepler.gl/constants';
+import {EffectPropsPartial} from '@kepler.gl/types';
+
+import Effect from './effect';
+import {DeckSurfaceFogEffect, SurfaceFogProps} from './shader-passes/surface-fog';
+
+class SurfaceFogEffect extends Effect {
+ constructor(props: EffectPropsPartial) {
+ super(props);
+ }
+
+ _initializeEffect() {
+ const effectDesc = POSTPROCESSING_EFFECTS.surfaceFog;
+ if (!effectDesc) return;
+
+ const defaultParameters: Record<string, any> = {};
+ for (const param of effectDesc.parameters) {
+ defaultParameters[param.name] = param.defaultValue ?? param.min;
+ }
+ this.parameters = {...defaultParameters, ...this.parameters};
+
+ this.deckEffect = new DeckSurfaceFogEffect(this.parameters as SurfaceFogProps);
+ }
+
+ getDefaultProps(props: EffectPropsPartial = {}) {
+ return super.getDefaultProps({type: DEFAULT_POST_PROCESSING_EFFECT_TYPE, ...props});
+ }
+
+ setProps(props: EffectPropsPartial) {
+ super.setProps(props);
+
+ if (props.parameters) {
+ this.deckEffect?.setProps(this.parameters);
+ }
+ }
+}
+
+export default SurfaceFogEffect;
diff --git a/src/effects/src/utils.ts b/src/effects/src/utils.ts
index 68d365d3e..7d7016b7a 100644
--- a/src/effects/src/utils.ts
+++ b/src/effects/src/utils.ts
@@ -2,14 +2,22 @@
// Copyright contributors to the kepler.gl project
import {Effect as EffectInterface, EffectPropsPartial} from '@kepler.gl/types';
-import {LIGHT_AND_SHADOW_EFFECT} from '@kepler.gl/constants';
+import {LIGHT_AND_SHADOW_EFFECT, DISTANCE_FOG_TYPE, SURFACE_FOG_TYPE} from '@kepler.gl/constants';
import LightingEffect from './lighting-effect';
import PostProcessEffect from './post-processing-effect';
+import DistanceFogEffect from './distance-fog-effect';
+import SurfaceFogEffect from './surface-fog-effect';
export function createEffect(params: EffectPropsPartial): EffectInterface {
if (params?.type === LIGHT_AND_SHADOW_EFFECT.type) {
return new LightingEffect(params);
}
+ if (params?.type === DISTANCE_FOG_TYPE) {
+ return new DistanceFogEffect(params);
+ }
+ if (params?.type === SURFACE_FOG_TYPE) {
+ return new SurfaceFogEffect(params);
+ }
return new PostProcessEffect(params);
}
diff --git a/src/layers/package.json b/src/layers/package.json
index 575b5938c..3700f6e2b 100644
--- a/src/layers/package.json
+++ b/src/layers/package.json
@@ -30,12 +30,12 @@
"umd"
],
"dependencies": {
- "@danmarshall/deckgl-typings": "4.9.22",
- "@deck.gl/core": "^8.9.27",
- "@deck.gl/extensions": "^8.9.27",
- "@deck.gl/geo-layers": "^8.9.27",
- "@deck.gl/layers": "^8.9.27",
- "@deck.gl/mesh-layers": "^8.9.27",
+ "@deck.gl-community/editable-layers": "9.2.8",
+ "@deck.gl/core": "^9.2.11",
+ "@deck.gl/extensions": "^9.2.11",
+ "@deck.gl/geo-layers": "^9.2.11",
+ "@deck.gl/layers": "^9.2.11",
+ "@deck.gl/mesh-layers": "^9.2.11",
"@kepler.gl/common-utils": "3.2.6",
"@kepler.gl/constants": "3.2.6",
"@kepler.gl/deckgl-arrow-layers": "3.2.6",
@@ -44,19 +44,20 @@
"@kepler.gl/table": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
- "@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/mvt": "^4.3.2",
- "@loaders.gl/parquet": "^4.3.2",
- "@loaders.gl/pmtiles": "^4.3.2",
- "@loaders.gl/schema": "^4.3.2",
- "@loaders.gl/wkt": "^4.3.2",
- "@luma.gl/constants": "^8.5.20",
+ "@loaders.gl/3d-tiles": "4.3.4",
+ "@loaders.gl/arrow": "^4.3.4",
+ "@loaders.gl/core": "^4.3.4",
+ "@loaders.gl/gis": "^4.3.4",
+ "@loaders.gl/gltf": "^4.3.4",
+ "@loaders.gl/i3s": "4.3.4",
+ "@loaders.gl/mvt": "^4.3.4",
+ "@loaders.gl/parquet": "^4.3.4",
+ "@loaders.gl/pmtiles": "^4.3.4",
+ "@loaders.gl/schema": "^4.3.4",
+ "@loaders.gl/wkt": "^4.3.4",
+ "@luma.gl/constants": "^9.2.6",
+ "@luma.gl/core": "^9.2.6",
"@mapbox/geojson-normalize": "0.0.1",
- "@nebula.gl/edit-modes": "1.0.2-alpha.1",
- "@nebula.gl/layers": "1.0.2-alpha.1",
"@turf/bbox": "^6.0.1",
"@turf/boolean-within": "^6.0.1",
"@turf/center": "^6.0.1",
diff --git a/src/layers/src/aggregation-layer.ts b/src/layers/src/aggregation-layer.ts
index ac6c79c43..aefba7376 100644
--- a/src/layers/src/aggregation-layer.ts
+++ b/src/layers/src/aggregation-layer.ts
@@ -16,7 +16,8 @@ import {
CHANNEL_SCALES,
FIELD_OPTS,
DEFAULT_AGGREGATION,
- AGGREGATION_TYPES
+ AGGREGATION_TYPES,
+ ALL_FIELD_TYPES
} from '@kepler.gl/constants';
import {ColorRange, Field, LayerColumn, Merge} from '@kepler.gl/types';
import {KeplerTable, Datasets} from '@kepler.gl/table';
@@ -57,6 +58,35 @@ export const getFilterDataFunc =
return typeof val === 'number' ? val >= filterRange[i][0] && val <= filterRange[i][1] : false;
});
+const NON_NUMERIC_FIELD_TYPES: Set<string> = new Set([
+ ALL_FIELD_TYPES.string,
+ ALL_FIELD_TYPES.boolean,
+ ALL_FIELD_TYPES.date
+]);
+
+/**
+ * Wrap a per-bin accessor that may return a non-numeric value (e.g. a string
+ * from "mode" aggregation) so that it returns a stable numeric index instead.
+ * deck.gl 9's native CPU aggregation stores results in a Float32Array which
+ * silently converts strings to NaN — this wrapper prevents that.
+ */
+function wrapOrdinalAccessor(
+ accessor: (points: unknown[]) => unknown
+): (points: unknown[]) => number {
+ const valueToIndex = new Map<string, number>();
+ return (points: unknown[]) => {
+ const value = accessor(points);
+ if (value == null) return NaN;
+ const key = String(value);
+ let idx = valueToIndex.get(key);
+ if (idx === undefined) {
+ idx = valueToIndex.size;
+ valueToIndex.set(key, idx);
+ }
+ return idx;
+ };
+}
+
const getLayerColorRange = (colorRange: ColorRange) => colorRange.colors.map(hexToRgb);
export const aggregateRequiredColumns: ['lat', 'lng'] = ['lat', 'lng'];
@@ -82,9 +112,9 @@ export default class AggregationLayer extends Layer {
pointPosAccessor(this.config.columns)(dataContainer);
this.getColorRange = memoize(getLayerColorRange);
- // Access data of a point from aggregated bins, depends on how BinSorter works
- // Deck.gl's BinSorter puts data in point.source
- this.getPointData = pt => pt.source;
+ // Access data of a point from aggregated bins
+ // In deck.gl 9, aggregation layers pass original data items directly to getColorValue/getElevationValue
+ this.getPointData = pt => pt;
this.gpuFilterGetIndex = pt => this.getPointData(pt).index;
this.gpuFilterGetData = (dataContainer, data, fieldIndex) =>
@@ -234,6 +264,18 @@ export default class AggregationLayer extends Layer {
// current aggregation type is not supported by this field
// set aggregation to the first supported option
this.updateLayerVisConfig({[aggregation]: aggregationOptions[0]});
+ } else if (
+ this.config[field] &&
+ this.config.visConfig[aggregation] === AGGREGATION_TYPES.count
+ ) {
+ // When a field is selected but aggregation is still 'count' (carried over
+ // from the no-field / "Count Points" state), switch to a meaningful default.
+ // 'count' ignores the field values entirely, so keeping it would make the
+ // field selection appear to have no effect.
+ const meaningful = aggregationOptions.find(opt => opt !== AGGREGATION_TYPES.count);
+ if (meaningful) {
+ this.updateLayerVisConfig({[aggregation]: meaningful});
+ }
}
}
@@ -311,16 +353,6 @@ export default class AggregationLayer extends Layer {
const {gpuFilter, dataContainer} = datasets[this.config.dataId];
const getPosition = this.getPositionAccessor(dataContainer);
- const aggregatePoints = getValueAggrFunc(this.getPointData);
- const getColorValue = aggregatePoints(
- this.config.colorField,
- this.config.visConfig.colorAggregation
- );
-
- const getElevationValue = aggregatePoints(
- this.config.sizeField,
- this.config.visConfig.sizeAggregation
- );
const hasFilter = Object.values(gpuFilter.filterRange).some((arr: any) =>
arr.some(v => v !== 0)
);
@@ -333,17 +365,60 @@ export default class AggregationLayer extends Layer {
? getFilterDataFunc(gpuFilter.filterRange, getFilterValue)
: undefined;
+ const aggregatePoints = getValueAggrFunc(this.getPointData);
+ let getColorValue = aggregatePoints(
+ this.config.colorField,
+ this.config.visConfig.colorAggregation
+ );
+
+ let getElevationValue = aggregatePoints(
+ this.config.sizeField,
+ this.config.visConfig.sizeAggregation
+ );
+
+ // deck.gl 9's native CPU aggregation stores getColorValue/getElevationValue
+ // results in a Float32Array. "mode" aggregation on non-numeric fields returns
+ // a string, which becomes NaN in Float32Array. Wrap with ordinal mapping to
+ // convert strings to stable numeric indices.
+ if (
+ this.config.colorField &&
+ this.config.visConfig.colorAggregation === AGGREGATION_TYPES.mode &&
+ NON_NUMERIC_FIELD_TYPES.has(this.config.colorField.type)
+ ) {
+ getColorValue = wrapOrdinalAccessor(getColorValue);
+ }
+ if (
+ this.config.sizeField &&
+ this.config.visConfig.sizeAggregation === AGGREGATION_TYPES.mode &&
+ NON_NUMERIC_FIELD_TYPES.has(this.config.sizeField.type)
+ ) {
+ getElevationValue = wrapOrdinalAccessor(getElevationValue);
+ }
+
+ // Wrap accessors to filter points within each bin before aggregating.
+ // deck.gl 9's native aggregation doesn't support per-bin filtering, so we
+ // apply gpuFilter at the accessor level to keep bin values in sync with
+ // active cross-filters / time-filters.
+ const getFilteredColorValue =
+ filterData && getColorValue
+ ? points => getColorValue(points.filter(filterData))
+ : getColorValue;
+ const getFilteredElevationValue =
+ filterData && getElevationValue
+ ? points => getElevationValue(points.filter(filterData))
+ : getElevationValue;
+
const {data} = this.updateData(datasets, oldLayerData);
- return {
+ const result = {
data,
getPosition,
_filterData: filterData,
- // @ts-expect-error
- ...(getColorValue ? {getColorValue} : {}),
- // @ts-expect-error
- ...(getElevationValue ? {getElevationValue} : {})
+ ...(getFilteredColorValue ? {getColorValue: getFilteredColorValue} : {}),
+ ...(getFilteredElevationValue ? {getElevationValue: getFilteredElevationValue} : {})
};
+
+ return result;
}
getDefaultDeckLayerProps(opts): any {
@@ -367,13 +442,13 @@ export default class AggregationLayer extends Layer {
colorField: this.config.colorField,
colorAggregation: this.config.visConfig.colorAggregation,
colorRange: visConfig.colorRange,
- colorMap: visConfig.colorRange.colorMap
+ colorMap: visConfig.colorRange.colorMap,
+ filterRange: gpuFilter.filterRange,
+ ...gpuFilter.filterValueUpdateTriggers
},
getElevationValue: {
sizeField: this.config.sizeField,
- sizeAggregation: this.config.visConfig.sizeAggregation
- },
- _filterData: {
+ sizeAggregation: this.config.visConfig.sizeAggregation,
filterRange: gpuFilter.filterRange,
...gpuFilter.filterValueUpdateTriggers
}
diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.ts
index 57f09446c..f06c763a3 100644
--- a/src/layers/src/base-layer.ts
+++ b/src/layers/src/base-layer.ts
@@ -158,8 +158,6 @@ const MAX_SAMPLE_SIZE = 5000;
const defaultDomain: [number, number] = [0, 1];
const dataFilterExtension = new DataFilterExtension({
filterSize: MAX_GPU_FILTERS,
- // `countItems` option. It enables the GPU to report the number of objects that pass the filter criteria via the `onFilteredItemsChange` callback.
- // @ts-expect-error not typed
countItems: getApplicationConfig().useOnFilteredItemsChange ?? false
});
diff --git a/src/layers/src/editor-layer/editor-layer-utils.ts b/src/layers/src/editor-layer/editor-layer-utils.ts
index a39534845..92274a2ee 100644
--- a/src/layers/src/editor-layer/editor-layer-utils.ts
+++ b/src/layers/src/editor-layer/editor-layer-utils.ts
@@ -1,8 +1,7 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {PickInfo} from '@deck.gl/core/lib/deck';
-import {Editor, Feature, FeatureSelectionContext} from '@kepler.gl/types';
+import {Editor, Feature, FeatureSelectionContext, PickInfo} from '@kepler.gl/types';
import {EDITOR_LAYER_ID, EDITOR_MODES} from '@kepler.gl/constants';
/**
@@ -31,7 +30,7 @@ export function isDrawingActive(editorMenuActive: boolean, mode: string): boolea
*/
// eslint-disable-next-line complexity
export function onClick(
- info: PickInfo<any>,
+ info: PickInfo,
event: any,
{
editorMenuActive,
@@ -110,7 +109,7 @@ export function onClick(
* @returns Returns true is hover is handled.
*/
export function onHover(
- info: PickInfo<any>,
+ info: PickInfo,
{hoverInfo, editor, editorMenuActive}: {editorMenuActive: boolean; editor: Editor; hoverInfo}
): boolean {
if (isDrawingActive(editorMenuActive, editor.mode)) {
@@ -140,13 +139,14 @@ const MIN_DISTANCE_TO_BOTTOM_EDGE = 100;
*/
// eslint-disable-next-line complexity
export function getTooltip(
- // TODO PickInfo type in deck typings doesn't include viewport and pixel
- info: PickInfo<any> & {viewport: any; pixel: any[]},
+ // TODO PickingInfo type in deck typings doesn't include viewport and pixel
+ info: PickInfo & {viewport: {width?: number; height?: number}; pixel: number[]},
{editor, theme, editorMenuActive}: {editorMenuActive: boolean; editor: Editor; theme: any}
): object | null {
const {object, layer, viewport = {}, pixel = []} = info;
- const closeToLeftEdge = viewport?.width - pixel[0] < MIN_DISTANCE_TO_LEFT_EDGE;
- const closeToBottomEdge = viewport?.height - pixel[1] < MIN_DISTANCE_TO_BOTTOM_EDGE;
+ const closeToLeftEdge = (viewport?.width ?? 0) - (pixel?.[0] ?? 0) < MIN_DISTANCE_TO_LEFT_EDGE;
+ const closeToBottomEdge =
+ (viewport?.height ?? 0) - (pixel?.[1] ?? 0) < MIN_DISTANCE_TO_BOTTOM_EDGE;
// don't show the tooltip when the menu is visible
if (editor.selectionContext?.rightClick) {
@@ -155,7 +155,10 @@ export function getTooltip(
if (isDrawingActive(editorMenuActive, editor.mode)) {
// TODO save interaction state in editor object
- if (layer?.state?.mode?._clickSequence?.length) {
+ if (
+ (layer?.state as {mode?: {_clickSequence?: unknown[]}} | undefined)?.mode?._clickSequence
+ ?.length
+ ) {
return null;
}
diff --git a/src/layers/src/editor-layer/editor-layer.ts b/src/layers/src/editor-layer/editor-layer.ts
index bd8c109f5..c9310ef91 100644
--- a/src/layers/src/editor-layer/editor-layer.ts
+++ b/src/layers/src/editor-layer/editor-layer.ts
@@ -1,14 +1,15 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {EditableGeoJsonLayer} from '@nebula.gl/layers';
-import {Layer as DeckLayer, LayerProps as DeckLayerProps} from '@deck.gl/core/typed';
+import {EditableGeoJsonLayer} from '@deck.gl-community/editable-layers';
+import {Layer as DeckLayer, LayerProps as DeckLayerProps} from '@deck.gl/core';
import {
DrawPolygonMode,
TranslateMode,
CompositeMode,
- DrawRectangleMode
-} from '@nebula.gl/edit-modes';
+ DrawRectangleMode,
+ GeoJsonEditMode
+} from '@deck.gl-community/editable-layers';
import {PathStyleExtension} from '@deck.gl/extensions';
import {EDITOR_LAYER_ID, EDITOR_MODES, EDITOR_LAYER_PICKING_RADIUS} from '@kepler.gl/constants';
@@ -20,7 +21,10 @@ import {LINE_STYLE, FEATURE_STYLE, EDIT_HANDLE_STYLE} from './feature-styles';
import {ModifyModeExtended} from './modify-mode-extended';
import {isDrawingActive} from './editor-layer-utils';
-const DEFAULT_COMPOSITE_MODE = new CompositeMode([new TranslateMode(), new ModifyModeExtended()]);
+const DEFAULT_COMPOSITE_MODE = new CompositeMode([
+ new TranslateMode() as unknown as GeoJsonEditMode,
+ new ModifyModeExtended() as unknown as GeoJsonEditMode
+]);
export type GetEditorLayerProps = {
editorMenuActive: boolean;
@@ -93,17 +97,17 @@ export function getEditorLayer({
const {features: _features} = updatedData;
if (_features.length) {
const lastFeature = _features[_features.length - 1];
- lastFeature.properties.isClosed = true;
+ if (lastFeature.properties) lastFeature.properties.isClosed = true;
lastFeature.id = generateHashId(6);
- onSetFeatures(updatedData.features);
- setSelectedFeature(lastFeature);
+ onSetFeatures(updatedData.features as unknown as Feature[]);
+ setSelectedFeature(lastFeature as unknown as Feature);
}
break;
}
case EDIT_TYPES.ADD_POSITION:
case EDIT_TYPES.MOVE_POSITION:
case EDIT_TYPES.TRANSLATING:
- onSetFeatures(updatedData.features);
+ onSetFeatures(updatedData.features as unknown as Feature[]);
break;
default:
break;
@@ -160,6 +164,17 @@ export function getEditorLayer({
getTentativeLineWidth: LINE_STYLE.getTentativeLineWidth,
getTentativeFillColor: LINE_STYLE.getTentativeFillColor,
- parameters: {}
+ parameters: {},
+ shadowEnabled: false,
+ _subLayerProps: {
+ geojson: {shadowEnabled: false},
+ guides: {shadowEnabled: false},
+ tooltips: {
+ shadowEnabled: false,
+ _subLayerProps: {
+ characters: {shadowEnabled: false}
+ }
+ }
+ }
});
}
diff --git a/src/layers/src/editor-layer/feature-styles.ts b/src/layers/src/editor-layer/feature-styles.ts
index c80b177f5..c446f69e1 100644
--- a/src/layers/src/editor-layer/feature-styles.ts
+++ b/src/layers/src/editor-layer/feature-styles.ts
@@ -1,9 +1,10 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {RGBAColor} from '@deck.gl/core';
import {Feature} from '@kepler.gl/types';
+type RGBAColor = [number, number, number, number];
+
import {COLORS} from './constants';
const POINT_RADIUS = 5;
diff --git a/src/layers/src/editor-layer/modify-mode-extended.ts b/src/layers/src/editor-layer/modify-mode-extended.ts
index 120aeecc1..3e1ca6f0a 100644
--- a/src/layers/src/editor-layer/modify-mode-extended.ts
+++ b/src/layers/src/editor-layer/modify-mode-extended.ts
@@ -3,11 +3,11 @@
import {
ModifyMode,
- FeatureOf,
+ Feature,
LineString,
Point,
Viewport as NebulaViewport
-} from '@nebula.gl/edit-modes';
+} from '@deck.gl-community/editable-layers';
import {Viewport} from '@deck.gl/core';
import {EDITOR_LAYER_PICKING_RADIUS} from '@kepler.gl/constants';
@@ -20,8 +20,8 @@ const RIGHT_BUTTON = 2;
export class ModifyModeExtended extends ModifyMode {
// @ts-expect-error expect to return no point when object is too far
getNearestPoint(
- line: FeatureOf<LineString>,
- inPoint: FeatureOf<Point>,
+ line: Feature<LineString>,
+ inPoint: Feature<Point>,
viewport: Viewport | null | undefined
) {
const p = super.getNearestPoint(line, inPoint, viewport as NebulaViewport | null | undefined);
diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.ts
index dbb5906f9..6c71e77df 100644
--- a/src/layers/src/geojson-layer/geojson-layer.ts
+++ b/src/layers/src/geojson-layer/geojson-layer.ts
@@ -18,7 +18,7 @@ import Layer, {
LayerSizeConfig,
LayerStrokeColorConfig
} from '../base-layer';
-import {GeoJsonLayer as DeckGLGeoJsonLayer} from '@deck.gl/layers';
+import {GeoJsonLayer as DeckGLGeoJsonLayer, GeoJsonLayerProps} from '@deck.gl/layers';
import {
getGeojsonLayerMeta,
GeojsonDataMaps,
@@ -743,7 +743,7 @@ export default class GeoJsonLayer extends Layer {
...layerProps,
visible: defaultLayerProps.visible,
wrapLongitude: false,
- data: [hoveredObject],
+ data: [hoveredObject] as Feature[],
getLineWidth: props.getLineWidth,
getPointRadius: props.getPointRadius,
getElevation: props.getElevation,
@@ -752,7 +752,7 @@ export default class GeoJsonLayer extends Layer {
// always draw outline
stroked: true,
filled: false
- })
+ } as unknown as GeoJsonLayerProps)
]
: [])
];
diff --git a/src/layers/src/grid-layer/grid-layer.ts b/src/layers/src/grid-layer/grid-layer.ts
index f740222f2..e8e915268 100644
--- a/src/layers/src/grid-layer/grid-layer.ts
+++ b/src/layers/src/grid-layer/grid-layer.ts
@@ -4,7 +4,6 @@
import {GeoJsonLayer} from '@deck.gl/layers';
import {EnhancedGridLayer} from '@kepler.gl/deckgl-layers';
import AggregationLayer, {AggregationLayerConfig} from '../aggregation-layer';
-import {pointToPolygonGeo} from './grid-utils';
import GridLayerIcon from './grid-layer-icon';
import {
ColorRange,
@@ -107,6 +106,10 @@ export default class GridLayer extends AggregationLayer {
const cellSize = visConfig.worldUnitSize * 1000;
const hoveredObject = this.hasHoveredObject(objectHovered);
+ // Use cellOutline computed in common space by ScaleEnhancedGridLayer.getPickingInfo
+ // so the outline aligns with rendered cells at all latitudes.
+ const outlineCoords = hoveredObject?.cellOutline;
+
return [
new EnhancedGridLayer({
...defaultAggregationLayerProps,
@@ -116,19 +119,21 @@ export default class GridLayer extends AggregationLayer {
}),
// render an outline of each cell if not extruded
- ...(hoveredObject && !visConfig.enable3d
+ ...(outlineCoords && !visConfig.enable3d
? [
new GeoJsonLayer({
...this.getDefaultHoverLayerProps(),
visible: defaultAggregationLayerProps.visible,
wrapLongitude: false,
data: [
- pointToPolygonGeo({
- object: hoveredObject,
- cellSize,
- coverage: visConfig.coverage,
- mapState
- })
+ {
+ type: 'Feature' as const,
+ properties: {},
+ geometry: {
+ coordinates: outlineCoords,
+ type: 'LineString' as const
+ }
+ }
],
getLineColor: this.config.highlightColor,
lineWidthScale: 8 * zoomFactor
diff --git a/src/layers/src/grid-layer/grid-utils.ts b/src/layers/src/grid-layer/grid-utils.ts
index df48d2cbd..3f829be3e 100644
--- a/src/layers/src/grid-layer/grid-utils.ts
+++ b/src/layers/src/grid-layer/grid-utils.ts
@@ -12,6 +12,7 @@ import {MapState} from '@kepler.gl/types';
* @param coverage
* @param properties
* @param mapState
+ * @param coordinate - fallback position from picking info (deck.gl 9 no longer provides object.position)
* @returns - geojson feature
*/
@@ -21,15 +22,17 @@ export function pointToPolygonGeo({
cellSize,
coverage,
properties,
- mapState
+ mapState,
+ coordinate
}: {
object: any;
cellSize: number;
coverage: number;
properties?: any;
mapState: MapState;
+ coordinate?: number[];
}) {
- const {position} = object;
+ const position = object.position || coordinate;
const viewport = new WebMercatorViewport(mapState);
if (!position) {
diff --git a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts
index e52c69aa2..8a3e127e3 100644
--- a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts
+++ b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts
@@ -11,6 +11,7 @@ import Layer, {
import {BrushingExtension} from '@deck.gl/extensions';
import {GeoJsonLayer} from '@deck.gl/layers';
import {H3HexagonLayer} from '@deck.gl/geo-layers';
+import type {Feature} from 'geojson';
import {EnhancedColumnLayer} from '@kepler.gl/deckgl-layers';
import {
getCentroid,
@@ -467,7 +468,7 @@ export default class HexagonIdLayer extends Layer {
new GeoJsonLayer({
...this.getDefaultHoverLayerProps(),
visible: defaultLayerProps.visible,
- data: [idToPolygonGeo(hoveredObject)],
+ data: [idToPolygonGeo(hoveredObject)].filter(Boolean) as Feature[],
getLineColor: config.highlightColor,
lineWidthScale: DEFAULT_LINE_SCALE_VALUE * zoomFactor,
wrapLongitude: false
diff --git a/src/layers/src/hexagon-layer/hexagon-layer.ts b/src/layers/src/hexagon-layer/hexagon-layer.ts
index 8a95cfaab..ff7f7a74f 100644
--- a/src/layers/src/hexagon-layer/hexagon-layer.ts
+++ b/src/layers/src/hexagon-layer/hexagon-layer.ts
@@ -4,7 +4,6 @@
import {GeoJsonLayer} from '@deck.gl/layers';
import AggregationLayer, {AggregationLayerConfig} from '../aggregation-layer';
import {EnhancedHexagonLayer} from '@kepler.gl/deckgl-layers';
-import {hexagonToPolygonGeo} from './hexagon-utils';
import HexagonLayerIcon from './hexagon-layer-icon';
import {
ColorRange,
@@ -115,6 +114,10 @@ export default class HexagonLayer extends AggregationLayer {
const radius = visConfig.worldUnitSize * 1000;
const hoveredObject = this.hasHoveredObject(objectHovered);
+ // Use cellOutline computed in common space by ScaleEnhancedHexagonLayer.getPickingInfo
+ // so the outline aligns with rendered cells at all latitudes.
+ const outlineCoords = hoveredObject?.cellOutline;
+
return [
new EnhancedHexagonLayer({
...defaultAggregationLayerProps,
@@ -124,15 +127,22 @@ export default class HexagonLayer extends AggregationLayer {
}),
// render an outline of each hexagon if not extruded
- ...(hoveredObject && !visConfig.enable3d
+ ...(outlineCoords && !visConfig.enable3d
? [
new GeoJsonLayer({
...this.getDefaultHoverLayerProps(),
visible: defaultAggregationLayerProps.visible,
wrapLongitude: false,
data: [
- hexagonToPolygonGeo(hoveredObject, {}, radius * visConfig.coverage, mapState)
- ].filter(d => d),
+ {
+ type: 'Feature' as const,
+ properties: {},
+ geometry: {
+ coordinates: outlineCoords,
+ type: 'LineString' as const
+ }
+ }
+ ],
getLineColor: this.config.highlightColor,
lineWidthScale: 8 * zoomFactor
})
diff --git a/src/layers/src/hexagon-layer/hexagon-utils.ts b/src/layers/src/hexagon-layer/hexagon-utils.ts
index 723e9cb01..3912d1d88 100644
--- a/src/layers/src/hexagon-layer/hexagon-utils.ts
+++ b/src/layers/src/hexagon-layer/hexagon-utils.ts
@@ -5,14 +5,16 @@ import {WebMercatorViewport} from '@deck.gl/core';
import Console from 'global/console';
import type {Centroid} from '@kepler.gl/common-utils';
-export function hexagonToPolygonGeo(object, properties, radius, mapState) {
+export function hexagonToPolygonGeo(object, properties, radius, mapState, coordinate?) {
const viewport = new WebMercatorViewport(mapState);
- if (!Array.isArray(object.position)) {
+ const pos = object.position || coordinate;
+ const position = pos ? (Array.from(pos) as number[]) : null;
+ if (!position || position.length < 2) {
return null;
}
- const screenCenter = viewport.projectFlat(object.position);
- const {unitsPerMeter} = viewport.getDistanceScales(object.position);
+ const screenCenter = viewport.projectFlat(position);
+ const {unitsPerMeter} = viewport.getDistanceScales(position);
if (!Array.isArray(unitsPerMeter)) {
Console.warn(`unitsPerMeter is undefined`);
diff --git a/src/layers/src/icon-layer/icon-layer.ts b/src/layers/src/icon-layer/icon-layer.ts
index 297b25fdc..b8ea7a6a7 100644
--- a/src/layers/src/icon-layer/icon-layer.ts
+++ b/src/layers/src/icon-layer/icon-layer.ts
@@ -3,11 +3,10 @@
import Window from 'global/window';
import {BrushingExtension} from '@deck.gl/extensions';
-import GL from '@luma.gl/constants';
import {SvgIconLayer} from '@kepler.gl/deckgl-layers';
import IconLayerIcon from './icon-layer-icon';
-import {ICON_FIELDS} from '@kepler.gl/constants';
+import {ICON_FIELDS, CULL_MODE} from '@kepler.gl/constants';
import IconInfoModalFactory from './icon-info-modal';
import Layer, {LayerBaseConfig, LayerBaseConfigPartial} from '../base-layer';
import {assignPointPairToLayerColumn, FindDefaultLayerPropsReturnValue} from '../layer-utils';
@@ -415,7 +414,7 @@ export default class IconLayer extends Layer {
const parameters = {
// icons will be flat on the map when the altitude column is not used
depthTest: this.config.columns.altitude?.fieldIdx > -1,
- cullFace: GL.FRONT
+ cullMode: CULL_MODE.FRONT
};
// Append geometry version to layer id so deck.gl treats it as new layer when geometry changes
@@ -440,7 +439,6 @@ export default class IconLayer extends Layer {
// hover layer
...(hoveredObject
? [
- // @ts-expect-error SvgIconLayerProps needs getIcon Field
new SvgIconLayer({
...this.getDefaultHoverLayerProps(),
id: `${layerIdWithVersion}-hover`,
diff --git a/src/layers/src/index.ts b/src/layers/src/index.ts
index 548c7db9e..9e6fcd168 100644
--- a/src/layers/src/index.ts
+++ b/src/layers/src/index.ts
@@ -52,6 +52,10 @@ export {
default as RasterTileLayer,
getNumRasterTilesBeingLoaded
} from './raster-tile/raster-tile-layer';
+
+import {default as Tile3DLayer} from './tile3d-layer/tile3d-layer';
+export {default as Tile3DLayer} from './tile3d-layer/tile3d-layer';
+export {default as Tile3DLayerIcon} from './tile3d-layer/tile3d-layer-icon';
export {
CATEGORICAL_COLORMAP_ID,
DATA_SOURCE_COLOR_DEFAULTS,
@@ -94,7 +98,8 @@ export const KeplerGlLayers = {
S2GeometryLayer,
VectorTileLayer,
RasterTileLayer,
- WMSLayer
+ WMSLayer,
+ Tile3DLayer
};
export type LayerClassesType = typeof LayerClasses;
@@ -114,7 +119,8 @@ export const LayerClasses = {
[LAYER_TYPES.s2]: S2GeometryLayer,
[LAYER_TYPES['vectorTile']]: VectorTileLayer,
[LAYER_TYPES['rasterTile']]: RasterTileLayer,
- [LAYER_TYPES.wms]: WMSLayer
+ [LAYER_TYPES.wms]: WMSLayer,
+ [LAYER_TYPES.tile3d]: Tile3DLayer
};
export * from './mapbox-utils';
diff --git a/src/layers/src/line-layer/line-layer.ts b/src/layers/src/line-layer/line-layer.ts
index 7f1e6021b..921ae4e54 100644
--- a/src/layers/src/line-layer/line-layer.ts
+++ b/src/layers/src/line-layer/line-layer.ts
@@ -239,7 +239,7 @@ export default class LineLayer extends ArcLayer {
}
const defaultAltColumn = {value: null, fieldIdx: -1, optional: true};
- const props: {columns: LineLayerColumnsConfig; label: string; isVisible: boolean} = {
+ const props: {columns: LineLayerColumnsConfig; label: string} = {
// connect the first two point layer with line
// TODO: fill default columns by parsing supported_column_modes
columns: {
@@ -260,8 +260,7 @@ export default class LineLayer extends ArcLayer {
geoarrow0: {...defaultAltColumn},
geoarrow1: {...defaultAltColumn}
},
- label: `${fieldPairs[0].defaultName} -> ${fieldPairs[1].defaultName} line`,
- isVisible: false
+ label: `${fieldPairs[0].defaultName} -> ${fieldPairs[1].defaultName} line`
};
return {props: [props]};
diff --git a/src/layers/src/raster-tile/gpu-utils.ts b/src/layers/src/raster-tile/gpu-utils.ts
index 9f908c832..3169f7477 100644
--- a/src/layers/src/raster-tile/gpu-utils.ts
+++ b/src/layers/src/raster-tile/gpu-utils.ts
@@ -5,11 +5,17 @@
* Functions and constants for handling webgl/luma.gl/deck.gl entities
*/
-import {parse, fetchFile, load, FetchError} from '@loaders.gl/core';
+import {parse, fetchFile, load, FetchError, Loader} from '@loaders.gl/core';
import {ImageLoader} from '@loaders.gl/images';
import {NPYLoader} from '@loaders.gl/textures';
-import GL from '@luma.gl/constants';
-import {Texture2DProps} from '@luma.gl/webgl';
+// @ts-ignore GL resolution depends on moduleResolution setting
+import {GL} from '@luma.gl/constants';
+
+/**
+ * Loose texture data descriptor passed around before actual luma.gl Texture creation.
+ * Not the same as luma.gl's strict TextureProps (which requires width/height).
+ */
+type Texture2DProps = Record<string, any>;
import {sleep} from '@kepler.gl/common-utils';
import {getLoaderOptions} from '@kepler.gl/constants';
@@ -296,10 +302,11 @@ export async function loadNpyArray(
for (let attempt = 0; attempt < numAttempts; attempt++) {
try {
const {npy: npyOptions} = getLoaderOptions();
- const response: NPYLoaderResponse = await load(request.url, NPYLoader, {
+
+ const response = (await load(request.url, NPYLoader as Loader<NPYLoaderResponse>, {
npy: npyOptions,
fetch: options?.fetch
- });
+ })) as NPYLoaderResponse;
if (!response || !response.data || request.options.signal?.aborted) {
return null;
diff --git a/src/layers/src/raster-tile/raster-tile-layer.ts b/src/layers/src/raster-tile/raster-tile-layer.ts
index c176e219f..135681fd3 100644
--- a/src/layers/src/raster-tile/raster-tile-layer.ts
+++ b/src/layers/src/raster-tile/raster-tile-layer.ts
@@ -1,13 +1,15 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {COORDINATE_SYSTEM, Layer as DeckLayer} from '@deck.gl/core/typed';
-import {TileLayer, GeoBoundingBox} from '@deck.gl/geo-layers/typed';
+import {COORDINATE_SYSTEM, Layer as DeckLayer} from '@deck.gl/core';
+import {TileLayer, GeoBoundingBox} from '@deck.gl/geo-layers';
import {PMTilesSource, PMTilesTileSource} from '@loaders.gl/pmtiles';
-import {Texture2DProps} from '@luma.gl/webgl';
+import type {TypedArray} from '@loaders.gl/loader-utils';
+import type {TextureProps} from '@luma.gl/core';
+type Texture2DProps = Partial<TextureProps> & Record<string, any>;
import memoize from 'lodash/memoize';
-import {PathLayer} from '@deck.gl/layers/typed';
+import {PathLayer} from '@deck.gl/layers';
import {DatasetType, PMTilesType, LAYER_TYPES} from '@kepler.gl/constants';
import {RasterLayer, RasterMeshLayer} from '@kepler.gl/deckgl-layers';
import {
@@ -128,6 +130,13 @@ export default class RasterTileLayer extends KeplerLayer {
maxViewportPixelValue = -Infinity;
/** Memoized method that calculates data source params */
+ /** Callback to trigger a map redraw (stored from layerCallbacks) */
+ onRedrawNeeded: (() => void) | undefined;
+ /** Track the last rendered preset to detect changes */
+ _lastRenderedPreset: string | undefined;
+ /** Timeout ID for deferred redraws */
+ _redrawTimeout: ReturnType<typeof setTimeout> | undefined;
+
getDataSourceParams: (
stac: CompleteSTACObject,
preset: string,
@@ -376,7 +385,7 @@ export default class RasterTileLayer extends KeplerLayer {
let maxPixelValue = -Infinity;
if (images) {
for (const image of images) {
- const [min, max] = getImageMinMax(image.data);
+ const [min, max] = getImageMinMax(image.data as TypedArray);
if (typeof min === 'number') {
minPixelValue = Math.min(min, minPixelValue);
}
@@ -390,7 +399,22 @@ export default class RasterTileLayer extends KeplerLayer {
// generate a deck layer
renderLayer(opts): TileLayer<any>[] {
- const {data} = opts;
+ const {data, layerCallbacks} = opts;
+
+ // Store callback to trigger map redraw when sublayers need async re-render
+ this.onRedrawNeeded = layerCallbacks?.onRedrawNeeded;
+
+ // Detect preset changes and schedule a deferred redraw so that
+ // deck.gl re-renders sublayers after the new pipeline compiles
+ const currentPreset = this.config.visConfig?.preset;
+ if (this._lastRenderedPreset !== undefined && this._lastRenderedPreset !== currentPreset) {
+ if (this._redrawTimeout) clearTimeout(this._redrawTimeout);
+ this._redrawTimeout = setTimeout(() => {
+ this._redrawTimeout = undefined;
+ this.onRedrawNeeded?.();
+ }, 100);
+ }
+ this._lastRenderedPreset = currentPreset;
if (data?.dataset?.metadata?.pmtilesType === PMTilesType.RASTER) {
return this.renderPMTilesLayer(opts);
@@ -399,7 +423,7 @@ export default class RasterTileLayer extends KeplerLayer {
}
private renderStacLayer(opts): TileLayer<any>[] {
- const {data, mapState, experimentalContext} = opts;
+ const {data, mapState, experimentalContext, layerCallbacks} = opts;
const stac = data?.dataset?.metadata as GetTileDataCustomProps['stac'];
// If a tabular dataset is loaded, and then the layer type is switched from Point to Raster Tile
@@ -548,7 +572,8 @@ export default class RasterTileLayer extends KeplerLayer {
minCategoricalBandValue,
maxCategoricalBandValue,
hasCategoricalColorMap: Boolean(categoricalColorMap),
- hasShadowEffect
+ hasShadowEffect,
+ onRedrawNeeded: layerCallbacks?.onRedrawNeeded
});
return [tileLayer];
@@ -557,7 +582,7 @@ export default class RasterTileLayer extends KeplerLayer {
private renderPMTilesLayer(opts): TileLayer<any>[] {
const {id, opacity, visible} = this.getDefaultDeckLayerProps(opts);
- const {data, mapState} = opts;
+ const {data, mapState, layerCallbacks} = opts;
const metadata = data?.dataset?.metadata as VectorTileMetadata;
const {visConfig} = this.config;
@@ -604,7 +629,8 @@ export default class RasterTileLayer extends KeplerLayer {
zRange: this.meta.zRange || null,
refinementStrategy: 'no-overlap'
}
- : {})
+ : {}),
+ onRedrawNeeded: layerCallbacks?.onRedrawNeeded
})
];
}
diff --git a/src/layers/src/raster-tile/raster-tile-utils.ts b/src/layers/src/raster-tile/raster-tile-utils.ts
index 31827f81a..ee667b1df 100644
--- a/src/layers/src/raster-tile/raster-tile-utils.ts
+++ b/src/layers/src/raster-tile/raster-tile-utils.ts
@@ -5,7 +5,7 @@
* Utility functions and constants for processing STAC metadata and other raster tile data
*/
-import {TypedArray} from '@loaders.gl/loader-utils/src/types';
+import type {TypedArray} from '@loaders.gl/loader-utils';
import {isArray} from '@math.gl/core';
import {StacTypes} from '@kepler.gl/types';
diff --git a/src/layers/src/raster-tile/types.ts b/src/layers/src/raster-tile/types.ts
index cb23a202b..4666ba51a 100644
--- a/src/layers/src/raster-tile/types.ts
+++ b/src/layers/src/raster-tile/types.ts
@@ -1,9 +1,15 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {_Tile2DHeader} from '@deck.gl/geo-layers/typed';
-import {TypedArray} from '@loaders.gl/loader-utils/src/types';
-import {Texture2DProps} from '@luma.gl/webgl';
+import {_Tile2DHeader} from '@deck.gl/geo-layers';
+import type {TypedArray} from '@loaders.gl/loader-utils';
+import type {TextureProps} from '@luma.gl/core';
+
+/**
+ * Loose texture data descriptor assembled before actual luma.gl Texture creation.
+ * Intentionally broader than luma.gl's strict TextureProps (which requires width/height).
+ */
+type Texture2DProps = Partial<TextureProps> & Record<string, any>;
import {KeplerTable as KeplerDataset} from '@kepler.gl/table';
import type {ColorMap, StacTypes} from '@kepler.gl/types';
diff --git a/src/layers/src/tile3d-layer/tile3d-layer-icon.tsx b/src/layers/src/tile3d-layer/tile3d-layer-icon.tsx
new file mode 100644
index 000000000..075bf3d77
--- /dev/null
+++ b/src/layers/src/tile3d-layer/tile3d-layer-icon.tsx
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import React, {Component} from 'react';
+import PropTypes from 'prop-types';
+import {Base} from '../base';
+
+export default class Tile3DLayerIcon extends Component {
+ static propTypes = {
+ height: PropTypes.string,
+ colors: PropTypes.arrayOf(PropTypes.string)
+ };
+
+ static defaultProps = {
+ height: '16px',
+ predefinedClassName: 'tile3d-layer-icon',
+ totalColor: 2
+ };
+
+ render() {
+ return (
+ <Base {...this.props}>
+ <g transform="translate(6, 6)">
+ <path d="M24 2L44 13.5V36.5L24 48L4 36.5V13.5L24 2Z" fill="currentColor" opacity="0.2" />
+ <path d="M24 2L44 13.5L24 25L4 13.5L24 2Z" fill="currentColor" opacity="0.6" />
+ <path d="M24 25V48L4 36.5V13.5L24 25Z" fill="currentColor" opacity="0.4" />
+ <path d="M24 25V48L44 36.5V13.5L24 25Z" fill="currentColor" opacity="0.8" />
+ <path d="M14 7.5L34 19V35.5L14 24V7.5Z" fill="currentColor" opacity="0.3" />
+ </g>
+ </Base>
+ );
+ }
+}
diff --git a/src/layers/src/tile3d-layer/tile3d-layer.ts b/src/layers/src/tile3d-layer/tile3d-layer.ts
new file mode 100644
index 000000000..952c4d2dd
--- /dev/null
+++ b/src/layers/src/tile3d-layer/tile3d-layer.ts
@@ -0,0 +1,403 @@
+// SPDX-License-Identifier: MIT
+// Copyright contributors to the kepler.gl project
+
+import {Tile3DLayer as DeckTile3DLayer} from '@deck.gl/geo-layers';
+import {UpdateParameters} from '@deck.gl/core';
+import {Tiles3DLoader, CesiumIonLoader} from '@loaders.gl/3d-tiles';
+import {I3SLoader} from '@loaders.gl/i3s';
+import {Tileset3D, Tile3D, TILE_TYPE} from '@loaders.gl/tiles';
+
+import Layer from '../base-layer';
+import Tile3DLayerIcon from './tile3d-layer-icon';
+import {FindDefaultLayerPropsReturnValue} from '../layer-utils';
+import {
+ LAYER_VIS_CONFIGS,
+ LAYER_TYPES,
+ DatasetType,
+ TILE3D_PROVIDERS,
+ Tile3DDatasetMetadata
+} from '@kepler.gl/constants';
+import {KeplerTable as KeplerDataset, Datasets as KeplerDatasets} from '@kepler.gl/table';
+import {VisConfigNumber, BindedLayerCallbacks} from '@kepler.gl/types';
+
+/**
+ * Custom DeckTile3DLayer that catches exceptions in _loadTileset and
+ * _updateTileset (which calls selectTiles – an unhandled-promise path
+ * where errors like "boundingVolume must contain …" escape).
+ * See: https://github.com/visgl/deck.gl/issues/8755
+ */
+// @ts-expect-error Types have separate declarations of a private property '_loadTileset'.
+class KeplerTile3DLayer extends DeckTile3DLayer {
+ // @ts-ignore override of private method called by deck.gl internals
+ private async _loadTileset(tilesetUrl: string) {
+ try {
+ // @ts-expect-error _loadTileset is private in DeckTile3DLayer
+ await super._loadTileset(tilesetUrl);
+ } catch (error: any) {
+ if (error?.message?.includes("reading 'refine'")) {
+ this.raiseError(new Error('Bad tileset format or invalid API key'), '_loadTileset');
+ } else {
+ console.error('Tile3DLayer: tileset load error', error);
+ }
+ }
+ }
+
+ /**
+ * Override _updateTileset to catch errors from selectTiles(),
+ * which deck.gl calls with .then() but no .catch().
+ * Errors from tilesetInitializationPromise (e.g. invalid boundingVolume
+ * in child tiles) surface here as unhandled promise rejections.
+ */
+ // @ts-ignore override of private method
+ private _updateTileset(viewports: Record<string, any> | null): void {
+ if (!viewports) return;
+ const {tileset3d} = this.state as any;
+ const {timeline} = this.context;
+ const viewportsNumber = Object.keys(viewports).length;
+ if (!timeline || !viewportsNumber || !tileset3d) return;
+
+ tileset3d
+ .selectTiles(Object.values(viewports))
+ .then((frameNumber: number) => {
+ const tilesetChanged = (this.state as any).frameNumber !== frameNumber;
+ if (tilesetChanged) {
+ this.setState({frameNumber});
+ }
+ })
+ .catch((error: any) => {
+ console.error('Tile3DLayer: selectTiles error', error);
+ });
+ }
+
+ // deck.gl's ScenegraphLayer does not recreate its models when
+ // defaultShaderModules change (extensionsChanged flag). This means
+ // adding/removing the Light & Shadow effect after tiles are loaded
+ // leaves ScenegraphLayer sublayers without the shadow shader module.
+ // SimpleMeshLayer (ArcGIS/I3S) already handles extensionsChanged
+ // correctly, so only invalidate SCENEGRAPH sublayers (Google 3D Tiles).
+ updateState(params: UpdateParameters<this>): void {
+ super.updateState(params);
+ if (params.changeFlags.extensionsChanged) {
+ const {layerMap} = this.state as any;
+ if (layerMap) {
+ for (const key of Object.keys(layerMap)) {
+ const entry = layerMap[key];
+ if (entry.tile?.type === TILE_TYPE.SCENEGRAPH) {
+ entry.layer = null;
+ entry.needsUpdate = true;
+ }
+ }
+ }
+ }
+ }
+}
+(KeplerTile3DLayer as any).layerName = 'KeplerTile3DLayer';
+
+export const TILE3D_LAYER_TYPE = LAYER_TYPES.tile3d;
+
+export type Tile3DLayerVisConfigSettings = {
+ opacity: VisConfigNumber;
+ pointSize: VisConfigNumber;
+};
+
+export type Tile3DLayerVisConfig = {
+ opacity: number;
+ pointSize: number;
+};
+
+export const tile3DVisConfigs = {
+ opacity: {
+ ...LAYER_VIS_CONFIGS.opacity,
+ defaultValue: 1,
+ property: 'opacity'
+ } as VisConfigNumber,
+ pointSize: {
+ type: 'number' as const,
+ defaultValue: 2,
+ label: 'layerVisConfigs.pointSize',
+ isRanged: false,
+ range: [0.5, 20],
+ step: 0.5,
+ group: 'display' as const,
+ property: 'pointSize',
+ allowCustomValue: false
+ } as VisConfigNumber
+};
+
+const EMPTY_EXTENSIONS: any[] = [];
+const DEPTH_TEST_PARAMS = {depthTest: true};
+
+function getTile3DProviderFromUrl(url = ''): (typeof TILE3D_PROVIDERS)[string] | null {
+ for (const key of Object.keys(TILE3D_PROVIDERS)) {
+ if (url.includes(TILE3D_PROVIDERS[key].urlKey)) {
+ return TILE3D_PROVIDERS[key];
+ }
+ }
+ return null;
+}
+
+export default class Tile3DLayer extends Layer {
+ declare visConfigSettings: Tile3DLayerVisConfigSettings;
+
+ private _cachedDataAndLoader: {
+ data: string;
+ loadOptions?: Record<string, unknown>;
+ loader?: any;
+ _cacheKey?: string;
+ } | null = null;
+
+ private _layerCallbacks: BindedLayerCallbacks | null = null;
+ private _hasFittedBounds = false;
+
+ constructor(props: {dataId: string} & Record<string, any>) {
+ super(props);
+ this.registerVisConfig(tile3DVisConfigs);
+ this.meta = {};
+ }
+
+ static findDefaultLayerProps(dataset: KeplerDataset): FindDefaultLayerPropsReturnValue {
+ if (dataset.type !== DatasetType.TILE_3D) {
+ return {props: []};
+ }
+
+ return {
+ props: [
+ {
+ label: dataset.label,
+ isVisible: true,
+ color: [255, 255, 255] as [number, number, number]
+ }
+ ]
+ };
+ }
+
+ get type(): string {
+ return TILE3D_LAYER_TYPE;
+ }
+
+ get name(): string {
+ return '3D Tile';
+ }
+
+ get requireData(): boolean {
+ return false;
+ }
+
+ get requiredLayerColumns(): string[] {
+ return [];
+ }
+
+ get layerIcon(): typeof Tile3DLayerIcon {
+ return Tile3DLayerIcon;
+ }
+
+ get supportedDatasetTypes(): DatasetType[] {
+ return [DatasetType.TILE_3D];
+ }
+
+ get visualChannels() {
+ return {};
+ }
+
+ shouldRenderLayer(): boolean {
+ return Boolean(this.type && this.config.isVisible);
+ }
+
+ getHoverData(): any {
+ return null;
+ }
+
+ formatLayerData(datasets: KeplerDatasets): Record<string, any> {
+ const {dataId} = this.config;
+ if (!dataId || !datasets[dataId]) {
+ return {};
+ }
+
+ const dataset = datasets[dataId];
+ const metadata = (dataset.metadata || {}) as Tile3DDatasetMetadata;
+
+ return {
+ tile3dUrl: metadata.tile3dUrl,
+ tile3dAccessToken: metadata.tile3dAccessToken
+ };
+ }
+
+ updateLayerMeta(dataset: KeplerDataset): void {
+ if (dataset.type !== DatasetType.TILE_3D) {
+ return;
+ }
+ const metadata = (dataset.metadata || {}) as Tile3DDatasetMetadata;
+ const provider = getTile3DProviderFromUrl(metadata.tile3dUrl);
+ this.updateMeta({provider});
+ }
+
+ _getDataAndLoaderOptions(
+ tileUrl: string,
+ accessToken?: string
+ ): {data: string; loadOptions?: Record<string, unknown>; loader?: any} {
+ const cacheKey = `${tileUrl}::${accessToken || ''}`;
+ if (this._cachedDataAndLoader && this._cachedDataAndLoader._cacheKey === cacheKey) {
+ return this._cachedDataAndLoader;
+ }
+
+ const provider = getTile3DProviderFromUrl(tileUrl);
+ let result: {data: string; loadOptions?: Record<string, unknown>; loader?: any};
+
+ if (provider === TILE3D_PROVIDERS.google) {
+ const separator = tileUrl.includes('?') ? '&' : '?';
+ result = {
+ data: `${tileUrl}${separator}key=${accessToken || ''}`,
+ loader: Tiles3DLoader,
+ loadOptions: {
+ fetch: {headers: {'X-GOOG-API-KEY': accessToken || ''}}
+ }
+ };
+ } else if (provider === TILE3D_PROVIDERS.cesium) {
+ result = {
+ data: tileUrl,
+ loader: CesiumIonLoader,
+ loadOptions: {
+ 'cesium-ion': {accessToken}
+ }
+ };
+ } else if (provider === TILE3D_PROVIDERS.arcgis) {
+ result = {
+ data: tileUrl,
+ loader: I3SLoader,
+ loadOptions: {
+ i3s: {useCompressedTextures: false}
+ }
+ };
+ } else {
+ result = {
+ data: tileUrl,
+ loader: Tiles3DLoader
+ };
+ }
+
+ this._cachedDataAndLoader = {...result, _cacheKey: cacheKey};
+ return this._cachedDataAndLoader;
+ }
+
+ _onTilesetLoad = (tileset3d: Tileset3D): void => {
+ this._extractBoundsFromTileset(tileset3d);
+
+ const tileUrl = tileset3d.url || '';
+ const isGoogle = getTile3DProviderFromUrl(tileUrl) === TILE3D_PROVIDERS.google;
+
+ if (!this._hasFittedBounds && this.meta?.bounds && !isGoogle) {
+ this._hasFittedBounds = true;
+ this._layerCallbacks?.onFitBounds?.(this.meta.bounds);
+ }
+
+ if (isGoogle) {
+ tileset3d.options.onTraversalComplete = selectedTiles => {
+ const credits = new Set<string>();
+ selectedTiles.forEach((tile: Tile3D) => {
+ const {copyright} = (tile as any).content?.gltf?.asset || {};
+ if (copyright) copyright.split(';').forEach(c => credits.add(c));
+ });
+ const title = Array.from(credits).join('; ');
+ this.updateMeta({
+ googleAttribution: title
+ });
+ return selectedTiles;
+ };
+ }
+ };
+
+ _extractBoundsFromTileset(tileset3d: Tileset3D): void {
+ try {
+ const root = tileset3d.root;
+ if (root) {
+ const bbox = (root as any).boundingBox;
+ if (bbox && bbox.length === 2) {
+ const [min, max] = bbox;
+ // bbox = [[westDeg, southDeg, minHeight], [eastDeg, northDeg, maxHeight]]
+ this.updateMeta({
+ bounds: [min[0], min[1], max[0], max[1]]
+ });
+ return;
+ }
+ }
+ } catch {
+ // boundingBox getter may throw for malformed volumes
+ }
+
+ // Fallback: approximate bounds from cartographicCenter and zoom
+ const center = tileset3d.cartographicCenter;
+ if (center) {
+ const lng = center[0];
+ const lat = center[1];
+ const zoom = tileset3d.zoom || 14;
+ // Approximate half-span in degrees based on zoom level
+ const span = 180 / Math.pow(2, zoom);
+ this.updateMeta({
+ bounds: [lng - span, lat - span, lng + span, lat + span]
+ });
+ }
+ }
+
+ _onTileLoad = (tile: Tile3D): void => {
+ // I3S materials often lack metallicFactor/roughnessFactor.
+ // PBR spec defaults metallicFactor to 1 (fully metallic),
+ // causing black surfaces when lighting/shadow effects are active.
+ const pbr = tile.content?.material?.pbrMetallicRoughness;
+ if (pbr) {
+ if (pbr.metallicFactor === undefined) {
+ pbr.metallicFactor = 0;
+ }
+ if (pbr.roughnessFactor === undefined) {
+ pbr.roughnessFactor = 1;
+ }
+ }
+ };
+
+ _onTileUnload = (_tile: Tile3D): void => {
+ /* noop */
+ };
+
+ renderLayer(opts: any): KeplerTile3DLayer[] {
+ const {data, layerCallbacks} = opts;
+ const {tile3dUrl, tile3dAccessToken} = data || {};
+ if (!tile3dUrl) {
+ return [];
+ }
+
+ this._layerCallbacks = layerCallbacks || null;
+
+ const {visConfig} = this.config;
+ const defaultLayerProps = this.getDefaultDeckLayerProps(opts);
+ const {
+ data: tileData,
+ loadOptions,
+ loader
+ } = this._getDataAndLoaderOptions(tile3dUrl, tile3dAccessToken);
+
+ const {color} = this.config;
+ const pointColor: [number, number, number, number] = color
+ ? [color[0], color[1], color[2], 255]
+ : [255, 255, 255, 255];
+
+ return [
+ new KeplerTile3DLayer({
+ id: defaultLayerProps.id,
+ coordinateSystem: defaultLayerProps.coordinateSystem,
+ wrapLongitude: defaultLayerProps.wrapLongitude,
+ visible: defaultLayerProps.visible,
+ data: tileData,
+ loader,
+ loadOptions,
+ onTilesetLoad: this._onTilesetLoad,
+ onTileLoad: this._onTileLoad,
+ onTileUnload: this._onTileUnload,
+ getPointColor: pointColor,
+ pointSize: visConfig.pointSize ?? 2,
+ pickable: false,
+ opacity: visConfig.opacity ?? 1,
+ extensions: EMPTY_EXTENSIONS,
+ parameters: DEPTH_TEST_PARAMS
+ })
+ ];
+ }
+}
diff --git a/src/layers/src/trip-layer/trip-layer.ts b/src/layers/src/trip-layer/trip-layer.ts
index 2f948814b..ac8ab0678 100644
--- a/src/layers/src/trip-layer/trip-layer.ts
+++ b/src/layers/src/trip-layer/trip-layer.ts
@@ -246,7 +246,9 @@ export default class TripLayer extends Layer {
{label, fields = [], dataContainer, id, fieldPairs = []}: KeplerTable,
foundLayers?: any[]
) {
- const geojsonColumns = fields.filter(f => f.type === 'geojson' || f.type === 'geoarrow').map(f => f.name);
+ const geojsonColumns = fields
+ .filter(f => f.type === 'geojson' || f.type === 'geoarrow')
+ .map(f => f.name);
const defaultColumns = {
geojson: uniq([...GEOJSON_FIELDS.geojson, ...geojsonColumns])
@@ -299,12 +301,17 @@ export default class TripLayer extends Layer {
if (tableColumns) {
// Found required columns for table mode
return {
- props: [{
- label: tableColumns.label || (typeof label === 'string' && label.replace(/\.[^/.]+$/, '')) || this.type,
- columns: tableColumns.columns,
- isVisible: true,
- columnMode: COLUMN_MODE_TABLE
- }],
+ props: [
+ {
+ label:
+ tableColumns.label ||
+ (typeof label === 'string' && label.replace(/\.[^/.]+$/, '')) ||
+ this.type,
+ columns: tableColumns.columns,
+ isVisible: true,
+ columnMode: COLUMN_MODE_TABLE
+ }
+ ],
foundLayers
};
}
diff --git a/src/layers/src/trip-layer/trip-utils.ts b/src/layers/src/trip-layer/trip-utils.ts
index 522905cb6..26c416f1d 100644
--- a/src/layers/src/trip-layer/trip-utils.ts
+++ b/src/layers/src/trip-layer/trip-utils.ts
@@ -59,9 +59,11 @@ export function isTripGeoJsonField(dataContainer: DataContainerInterface, field)
return false;
}
- // condition 3:the 4th coordinate of the first feature line strings is valid time
- // @ts-expect-error
- const tsHolder = features[0].geometry.coordinates.map(coord => coord[3]);
+ const geom = features[0].geometry;
+ if (!geom || geom.type === 'GeometryCollection' || !('coordinates' in geom)) {
+ return false;
+ }
+ const tsHolder = (geom.coordinates as number[][]).map(coord => String(coord[3]));
return Boolean(containValidTime(tsHolder));
}
diff --git a/src/layers/src/typedefs/deckgl.d.ts b/src/layers/src/typedefs/deckgl.d.ts
deleted file mode 100644
index c33216387..000000000
--- a/src/layers/src/typedefs/deckgl.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright contributors to the kepler.gl project
-
-// Eslint does not seem to be able to understand the namespace re-export here
-/* eslint-disable */
-
-import * as DeckTypings from '@danmarshall/deckgl-typings';
-
-declare module 'deck.gl' {
- export namespace DeckTypings {}
-}
diff --git a/src/layers/src/vector-tile/mvt-layer.ts b/src/layers/src/vector-tile/mvt-layer.ts
index 8eda79e80..0351cab53 100644
--- a/src/layers/src/vector-tile/mvt-layer.ts
+++ b/src/layers/src/vector-tile/mvt-layer.ts
@@ -1,15 +1,17 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {Layer, LayersList} from '@deck.gl/core/typed';
-import {ClipExtension} from '@deck.gl/extensions/typed';
+import {Layer, LayersList} from '@deck.gl/core';
+import {ClipExtension} from '@deck.gl/extensions';
import {
MVTLayer as _MVTLayer,
TileLayer,
+ // @ts-expect-error deck.gl 9 internal
_getURLFromTemplate,
+ // @ts-expect-error deck.gl 9 internal
_TileLoadProps,
_Tile2DHeader
-} from '@deck.gl/geo-layers/typed';
+} from '@deck.gl/geo-layers';
import {incrementVectorTileLoading, decrementVectorTileLoading} from './loading-counter';
/*
diff --git a/src/layers/src/vector-tile/vector-tile-layer.ts b/src/layers/src/vector-tile/vector-tile-layer.ts
index f8514bc68..ec147502b 100644
--- a/src/layers/src/vector-tile/vector-tile-layer.ts
+++ b/src/layers/src/vector-tile/vector-tile-layer.ts
@@ -3,13 +3,12 @@
import {FeatureCollection, Feature} from 'geojson';
-import {Layer as DeckLayer} from '@deck.gl/core/typed';
-import {_Tile2DHeader as Tile2DHeader} from '@deck.gl/geo-layers/typed';
-import {GeoJsonLayer, PathLayer} from '@deck.gl/layers/typed';
+import {Layer as DeckLayer} from '@deck.gl/core';
+import {_Tile2DHeader as Tile2DHeader} from '@deck.gl/geo-layers';
+import {GeoJsonLayer, PathLayer} from '@deck.gl/layers';
+import {ClipExtension} from '@deck.gl/extensions';
import {MVTSource, MVTTileSource} from '@loaders.gl/mvt';
import {PMTilesSource, PMTilesTileSource} from '@loaders.gl/pmtiles';
-import GL from '@luma.gl/constants';
-import {ClipExtension} from '@deck.gl/extensions/typed';
import {notNullorUndefined} from '@kepler.gl/common-utils';
import {
@@ -21,7 +20,8 @@ import {
SCALE_TYPES,
CHANNEL_SCALES,
DEFAULT_COLOR_UI,
- LAYER_VIS_CONFIGS
+ LAYER_VIS_CONFIGS,
+ CULL_MODE
} from '@kepler.gl/constants';
import {
getTileUrl,
@@ -668,7 +668,7 @@ export default class VectorTileLayer extends AbstractTileLayer<VectorTile, Featu
'polygons-stroke': {opacity: visConfig.strokeOpacity},
'polygons-fill': {
parameters: {
- cullFace: GL.BACK
+ cullMode: CULL_MODE.BACK
}
}
},
diff --git a/src/localization/src/translations/en.ts b/src/localization/src/translations/en.ts
index e2d542805..b668e3c03 100644
--- a/src/localization/src/translations/en.ts
+++ b/src/localization/src/translations/en.ts
@@ -118,7 +118,8 @@ export default {
'3d': '3D',
vectortile: 'vector tile',
rastertile: 'raster tile',
- wms: 'WMS'
+ wms: 'WMS',
+ tile3d: '3D tile'
},
wms: {
hover: 'Value:'
@@ -141,6 +142,7 @@ export default {
billboardDescription: 'Orient geometry towards the camera',
fadeTrail: 'Fade trail',
opacity: 'Opacity',
+ pointSize: 'Point Size',
coverage: 'Coverage',
outline: 'Outline',
colorRange: 'Color range',
@@ -221,7 +223,8 @@ export default {
rowCount: '{rowCount} rows',
vectorTile: 'Vector tile',
rasterTile: 'Raster tile',
- wmsTile: 'WMS tile'
+ wmsTile: 'WMS tile',
+ tile3d: '3D tile'
},
tooltip: {
hideLayer: 'Hide layer',
diff --git a/src/processors/package.json b/src/processors/package.json
index 98c1769e9..4f8f9269c 100644
--- a/src/processors/package.json
+++ b/src/processors/package.json
@@ -30,24 +30,23 @@
"umd"
],
"dependencies": {
- "@danmarshall/deckgl-typings": "4.9.22",
+ "@deck.gl-community/editable-layers": "9.2.8",
"@kepler.gl/common-utils": "3.2.6",
"@kepler.gl/constants": "3.2.6",
"@kepler.gl/schemas": "3.2.6",
"@kepler.gl/table": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
- "@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",
- "@loaders.gl/schema": "^4.3.2",
- "@loaders.gl/wkt": "^4.3.2",
+ "@loaders.gl/arrow": "^4.3.4",
+ "@loaders.gl/core": "^4.3.4",
+ "@loaders.gl/csv": "^4.3.4",
+ "@loaders.gl/gis": "^4.3.4",
+ "@loaders.gl/json": "^4.3.4",
+ "@loaders.gl/loader-utils": "^4.3.4",
+ "@loaders.gl/parquet": "^4.3.4",
+ "@loaders.gl/schema": "^4.3.4",
+ "@loaders.gl/wkt": "^4.3.4",
"@mapbox/geojson-normalize": "0.0.1",
- "@nebula.gl/edit-modes": "1.0.2-alpha.1",
"@turf/helpers": "^6.1.4",
"apache-arrow": ">=15.0.0",
"d3-dsv": "^2.0.0",
diff --git a/src/processors/src/data-processor.ts b/src/processors/src/data-processor.ts
index d18a61bf7..5b0f2af45 100644
--- a/src/processors/src/data-processor.ts
+++ b/src/processors/src/data-processor.ts
@@ -33,7 +33,7 @@ import {
toArray
} from '@kepler.gl/common-utils';
import {KeplerGlSchema, ParsedDataset, SavedMap, LoadedMap} from '@kepler.gl/schemas';
-import {Feature} from '@nebula.gl/edit-modes';
+import {Feature} from '@deck.gl-community/editable-layers';
// if any of these value occurs in csv, parse it to null;
// const CSV_NULLS = ['', 'null', 'NULL', 'Null', 'NaN', '/N'];
diff --git a/src/processors/src/typedefs/deckgl.d.ts b/src/processors/src/typedefs/deckgl.d.ts
deleted file mode 100644
index c33216387..000000000
--- a/src/processors/src/typedefs/deckgl.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright contributors to the kepler.gl project
-
-// Eslint does not seem to be able to understand the namespace re-export here
-/* eslint-disable */
-
-import * as DeckTypings from '@danmarshall/deckgl-typings';
-
-declare module 'deck.gl' {
- export namespace DeckTypings {}
-}
diff --git a/src/reducers/package.json b/src/reducers/package.json
index e82549ab4..e394c88b6 100644
--- a/src/reducers/package.json
+++ b/src/reducers/package.json
@@ -45,9 +45,9 @@
"@kepler.gl/tasks": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
- "@loaders.gl/loader-utils": "^4.3.2",
+ "@loaders.gl/loader-utils": "^4.3.4",
"@mapbox/geo-viewport": "^0.4.1",
- "@math.gl/web-mercator": "^3.6.2",
+ "@math.gl/web-mercator": "^4.1.0",
"@turf/bbox": "^6.0.1",
"@turf/bbox-polygon": "^6.0.1",
"@turf/boolean-within": "^6.0.1",
diff --git a/src/reducers/src/layer-utils.ts b/src/reducers/src/layer-utils.ts
index 477060f4e..032a8a1d2 100644
--- a/src/reducers/src/layer-utils.ts
+++ b/src/reducers/src/layer-utils.ts
@@ -4,7 +4,8 @@
import Console from 'global/console';
import {GEOCODER_LAYER_ID, LIGHT_AND_SHADOW_EFFECT} from '@kepler.gl/constants';
-import {Layer as DeckLayer, LayerProps as DeckLayerProps} from '@deck.gl/core/typed';
+import {Layer as DeckLayer} from '@deck.gl/core';
+type DeckLayerProps = any;
import {
Field,
TooltipField,
diff --git a/src/reducers/src/vis-state-selectors.ts b/src/reducers/src/vis-state-selectors.ts
index 25efef1dd..2d983f81f 100644
--- a/src/reducers/src/vis-state-selectors.ts
+++ b/src/reducers/src/vis-state-selectors.ts
@@ -7,12 +7,17 @@ import {createSelector} from 'reselect';
const DEFAULT_FILE_EXTENSIONS = ['csv', 'json', 'geojson', 'arrow', 'parquet'];
const DEFAULT_FILE_FORMATS = ['CSV', 'Json', 'GeoJSON', 'Arrow', 'Parquet'];
+interface LoaderInfo {
+ name: string;
+ extensions: string[];
+}
+
export const getFileFormatNames = createSelector(
- state => state.loaders,
+ (state: {loaders: LoaderInfo[]}) => state.loaders,
loaders => [...DEFAULT_FILE_FORMATS, ...loaders.map(loader => loader.name)]
);
export const getFileExtensions = createSelector(
- state => state.loaders,
+ (state: {loaders: LoaderInfo[]}) => state.loaders,
loaders => [...DEFAULT_FILE_EXTENSIONS, ...loaders.flatMap(loader => loader.extensions)]
);
diff --git a/src/reducers/src/vis-state-updaters.ts b/src/reducers/src/vis-state-updaters.ts
index 10ddd5574..06de0f428 100644
--- a/src/reducers/src/vis-state-updaters.ts
+++ b/src/reducers/src/vis-state-updaters.ts
@@ -89,6 +89,8 @@ import {
FILTER_VIEW_TYPES,
FPS,
LIGHT_AND_SHADOW_EFFECT,
+ DISTANCE_FOG_TYPE,
+ SURFACE_FOG_TYPE,
MAX_DEFAULT_TOOLTIPS,
PLOT_TYPES,
SORT_ORDER,
@@ -879,7 +881,8 @@ export function setInitialLayerConfig(layer, datasets, layerClasses): Layer {
...props[0],
label: newLayer.config.label,
dataId: newLayer.config.dataId,
- isConfigActive: newLayer.config.isConfigActive
+ isConfigActive: newLayer.config.isConfigActive,
+ isVisible: newLayer.config.isVisible
});
}
return typeof newLayer.setInitialLayerConfig === 'function'
@@ -1913,6 +1916,26 @@ export const addEffectUpdater = (
return state;
}
+ if (
+ action.config?.type === DISTANCE_FOG_TYPE &&
+ state.effects.some(
+ effect => effect.type === DISTANCE_FOG_TYPE || effect.type === SURFACE_FOG_TYPE
+ )
+ ) {
+ Console.warn("Can't add more than one fog effect");
+ return state;
+ }
+
+ if (
+ action.config?.type === SURFACE_FOG_TYPE &&
+ state.effects.some(
+ effect => effect.type === SURFACE_FOG_TYPE || effect.type === DISTANCE_FOG_TYPE
+ )
+ ) {
+ Console.warn("Can't add more than one fog effect");
+ return state;
+ }
+
const newEffect = createEffect(action.config);
// collapse configurators for other effects
diff --git a/src/schemas/package.json b/src/schemas/package.json
index 4ad386801..95bce82f9 100644
--- a/src/schemas/package.json
+++ b/src/schemas/package.json
@@ -36,7 +36,7 @@
"@kepler.gl/table": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
- "@loaders.gl/loader-utils": "^4.3.2",
+ "@loaders.gl/loader-utils": "^4.3.4",
"@types/keymirror": "^0.1.1",
"@types/lodash": "4.17.5",
"apache-arrow": ">=15.0.0",
diff --git a/src/table/package.json b/src/table/package.json
index b30fc5ef6..0adc3cae3 100644
--- a/src/table/package.json
+++ b/src/table/package.json
@@ -34,8 +34,8 @@
"@kepler.gl/constants": "3.2.6",
"@kepler.gl/types": "3.2.6",
"@kepler.gl/utils": "3.2.6",
- "@loaders.gl/mvt": "^4.3.2",
- "@loaders.gl/pmtiles": "^4.3.2",
+ "@loaders.gl/mvt": "^4.3.4",
+ "@loaders.gl/pmtiles": "^4.3.4",
"@types/d3-array": "^2.8.0",
"@types/lodash": "4.17.5",
"d3-array": "^2.8.0",
diff --git a/src/table/src/dataset-utils.ts b/src/table/src/dataset-utils.ts
index 0784e1bbf..6596f75e4 100644
--- a/src/table/src/dataset-utils.ts
+++ b/src/table/src/dataset-utils.ts
@@ -162,6 +162,8 @@ async function refreshRemoteData(datasetInfo: CreateTableProps): Promise<object
return await refreshRasterTileMetadata(datasetInfo);
case DatasetType.WMS_TILE:
return await refreshWMSMetadata(datasetInfo);
+ case DatasetType.TILE_3D:
+ return null;
default:
return null;
}
diff --git a/src/types/layers.d.ts b/src/types/layers.d.ts
index dcfac272c..0f40c6c4c 100644
--- a/src/types/layers.d.ts
+++ b/src/types/layers.d.ts
@@ -427,6 +427,7 @@ export type LayerCallbacks = {
}
) => void;
onRedrawNeeded?: (idx: number) => void;
+ onFitBounds?: (idx: number, bounds: [number, number, number, number]) => void;
};
export type BindedLayerCallbacks = {
@@ -438,6 +439,7 @@ export type BindedLayerCallbacks = {
coordinate?: [number, number]
) => void;
onRedrawNeeded?: () => void;
+ onFitBounds?: (bounds: [number, number, number, number]) => void;
};
export type VisualChannelAggregation = 'colorAggregation' | 'sizeAggregation';
diff --git a/src/types/reducers.d.ts b/src/types/reducers.d.ts
index 26d19454f..ceac88e54 100644
--- a/src/types/reducers.d.ts
+++ b/src/types/reducers.d.ts
@@ -2,7 +2,15 @@
// Copyright contributors to the kepler.gl project
import {Field, Millisecond} from './types';
-import type {MapViewState} from '@deck.gl/core/typed';
+type MapViewState = {
+ latitude: number;
+ longitude: number;
+ zoom: number;
+ bearing?: number;
+ pitch?: number;
+ transitionDuration?: number;
+ transitionInterpolator?: object;
+};
import type {ExportResolutionOption} from '@kepler.gl/constants';
export type MapState = {
@@ -607,4 +615,4 @@ export type TypedFilter =
| TypedTimeRangeFilter
| TypedSelectFilter
| TypedMultiSelectFilter
- | TypedPolygonFilter;
\ No newline at end of file
+ | TypedPolygonFilter;
diff --git a/src/types/types.d.ts b/src/types/types.d.ts
index e9c306b03..a6a23fb32 100644
--- a/src/types/types.d.ts
+++ b/src/types/types.d.ts
@@ -6,6 +6,26 @@ export type RGBAColor = [number, number, number, number];
export type HexColor = string; // this is the best typescript can do at the moment
export type Millisecond = number;
+/**
+ * Deck.gl picking info with relaxed layer generics for compatibility with DeckGL React callbacks.
+ * deck.gl 9's DeckGL component infers callback parameter types that are structurally incompatible
+ * with `PickingInfo` from `@deck.gl/core` (missing `color`/`pixelRatio`, different `Layer` generic).
+ */
+export type PickInfo<DataT = any> = {
+ layer?: {id: string; state?: Record<string, any>} | null;
+ sourceLayer?: {id: string} | null;
+ viewport?: {width?: number; height?: number} | null;
+ index: number;
+ picked?: boolean;
+ object?: DataT;
+ x: number;
+ y: number;
+ pixel?: [number, number];
+ coordinate?: number[];
+ color?: Uint8Array | null;
+ pixelRatio?: number;
+};
+
export type ValueOf<T> = T[keyof T];
export type Merge<A, B> = {[K in keyof A]: K extends keyof B ? B[K] : A[K]} & B extends infer O
diff --git a/src/utils/package.json b/src/utils/package.json
index 324dbbed7..ebfaa19b8 100644
--- a/src/utils/package.json
+++ b/src/utils/package.json
@@ -30,13 +30,13 @@
"umd"
],
"dependencies": {
- "@deck.gl/core": "^8.9.27",
+ "@deck.gl/core": "^9.2.11",
"@kepler.gl/common-utils": "3.2.6",
"@kepler.gl/constants": "3.2.6",
"@kepler.gl/types": "3.2.6",
- "@loaders.gl/arrow": "^4.3.2",
- "@luma.gl/constants": "^8.5.20",
- "@luma.gl/core": "^8.5.20",
+ "@loaders.gl/arrow": "^4.3.4",
+ "@luma.gl/constants": "^9.2.6",
+ "@luma.gl/core": "^9.2.6",
"@mapbox/geo-viewport": "^0.4.1",
"@turf/boolean-within": "^6.0.1",
"@turf/helpers": "^6.1.4",
diff --git a/src/utils/src/data-container-utils.ts b/src/utils/src/data-container-utils.ts
index 8cfeb8373..e55cc3151 100644
--- a/src/utils/src/data-container-utils.ts
+++ b/src/utils/src/data-container-utils.ts
@@ -39,7 +39,11 @@ export function createDataContainer(
if (options.inputDataFormat === DataForm.ROWS_ARRAY) {
return new RowDataContainer({rows: data, fields: options.fields});
} else if (options.inputDataFormat === DataForm.COLS_ARRAY) {
- return new ArrowDataContainer({cols: data, fields: options.fields, arrowTable: options.arrowTable});
+ return new ArrowDataContainer({
+ cols: data,
+ fields: options.fields,
+ arrowTable: options.arrowTable
+ });
}
throw Error('Failed to create a data container: not implemented format');
diff --git a/src/utils/src/data-scale-utils.ts b/src/utils/src/data-scale-utils.ts
index 162d6595f..d82548248 100644
--- a/src/utils/src/data-scale-utils.ts
+++ b/src/utils/src/data-scale-utils.ts
@@ -246,7 +246,7 @@ export function getQuantLegends(scale: D3ScaleFunction, labelFormat: LabelFormat
const data = scale.range();
return labels.map((label, index) => ({
- data: Array.isArray(data[index]) ? rgbToHex(data[index]) : data[index],
+ data: Array.isArray(data[index]) ? rgbToHex(data[index] as RGBColor) : data[index],
...label
}));
}
diff --git a/src/utils/src/effect-utils.ts b/src/utils/src/effect-utils.ts
index c0bd7ac31..a1ccdf305 100644
--- a/src/utils/src/effect-utils.ts
+++ b/src/utils/src/effect-utils.ts
@@ -4,13 +4,15 @@
import SunCalc from 'suncalc';
import cloneDeep from 'lodash/cloneDeep';
-import {PostProcessEffect} from '@deck.gl/core/typed';
+import {PostProcessEffect} from '@deck.gl/core';
import {
LIGHT_AND_SHADOW_EFFECT,
LIGHT_AND_SHADOW_EFFECT_TIME_MODES,
FILTER_TYPES,
- FILTER_VIEW_TYPES
+ FILTER_VIEW_TYPES,
+ DISTANCE_FOG_TYPE,
+ SURFACE_FOG_TYPE
} from '@kepler.gl/constants';
import {arrayMove} from '@kepler.gl/common-utils';
import {MapState, Effect, EffectProps, EffectDescription} from '@kepler.gl/types';
@@ -20,28 +22,67 @@ import {clamp} from './data-utils';
// TODO isolate types - depends on @kepler.gl/schemas
type VisState = any;
+// Retains the last LightingEffect deckEffect so we can keep it in the
+// effects array (with shadows disabled) after the user removes the
+// Light & Shadow effect from the UI. Without this, deck.gl calls
+// cleanup() which removes the shadow shader module, but existing layer
+// models still have shadow_uShadowMap bindings → texture errors.
+let _lastLightingDeckEffect: any = null;
+
export function computeDeckEffects({
visState,
- mapState
+ mapState,
+ isExport
}: {
visState: VisState;
mapState: MapState;
-}): PostProcessEffect[] {
+ isExport?: boolean;
+}): PostProcessEffect<any>[] {
// TODO: 1) deck effects per deck context 2) preserved between draws
- return visState.effectOrder
+ let hasLightingShadow = false;
+
+ const deckEffects = visState.effectOrder
.map(effectId => {
const effect = findById(effectId)(visState.effects) as Effect | undefined;
- if (effect?.isEnabled && effect.deckEffect) {
- updateEffect({visState, mapState, effect});
- return effect.deckEffect;
+ if (effect?.deckEffect) {
+ if (effect.isEnabled) {
+ updateEffect({visState, mapState, effect});
+ } else if (effect.type === LIGHT_AND_SHADOW_EFFECT.type) {
+ // Keep lighting effects in the array even when disabled to avoid
+ // removing the shadow shader module. Composite layer sublayers
+ // don't regenerate models when default shader modules change,
+ // leaving stale pipelines with shadow_uShadowMap bindings.
+ // Disabling shadow on the lights avoids visual effects.
+ disableLightingEffect(effect);
+ }
+ if (effect.isEnabled || effect.type === LIGHT_AND_SHADOW_EFFECT.type) {
+ if (effect.type === LIGHT_AND_SHADOW_EFFECT.type) {
+ hasLightingShadow = true;
+ if (!isExport) {
+ _lastLightingDeckEffect = effect.deckEffect;
+ }
+ }
+ return effect.deckEffect;
+ }
}
return null;
})
.filter(effect => effect);
+
+ if (!hasLightingShadow && _lastLightingDeckEffect) {
+ disableDeckLightingEffect(_lastLightingDeckEffect);
+ deckEffects.unshift(_lastLightingDeckEffect);
+ }
+
+ return deckEffects;
}
/**
- * Always keep light & shadow effect at the top
+ * Always keep light & shadow effect at the top, then distance fog and
+ * surface fog right after it (before other post-processing effects).
+ * Both fog effects read the depth buffer from renderBuffers[0];
+ * subsequent effects clear depth during their render passes, so fog
+ * must run before that happens.
*/
export const fixEffectOrder = (effects: Effect[], effectOrder: string[]): string[] => {
const lightShadowEffect = effects.find(effect => effect.type === LIGHT_AND_SHADOW_EFFECT.type);
@@ -52,6 +93,29 @@ export const fixEffectOrder = (effects: Effect[], effectOrder: string[]): string
effectOrder.unshift(lightShadowEffect.id);
}
}
+
+ const distanceFogEffect = effects.find(effect => effect.type === DISTANCE_FOG_TYPE);
+ if (distanceFogEffect) {
+ const ind = effectOrder.indexOf(distanceFogEffect.id);
+ const targetPos = lightShadowEffect ? 1 : 0;
+ if (ind > targetPos) {
+ effectOrder.splice(ind, 1);
+ effectOrder.splice(targetPos, 0, distanceFogEffect.id);
+ }
+ }
+
+ const surfaceFogEffect = effects.find(effect => effect.type === SURFACE_FOG_TYPE);
+ if (surfaceFogEffect) {
+ const ind = effectOrder.indexOf(surfaceFogEffect.id);
+ let targetPos = 0;
+ if (lightShadowEffect) targetPos++;
+ if (distanceFogEffect) targetPos++;
+ if (ind > targetPos) {
+ effectOrder.splice(ind, 1);
+ effectOrder.splice(targetPos, 0, surfaceFogEffect.id);
+ }
+ }
+
return effectOrder;
};
@@ -78,11 +142,40 @@ function isDaytime(lat, lon, timestamp) {
return date >= sunrise && date <= sunset;
}
+/**
+ * Disable shadow rendering on a lighting effect without removing it.
+ * This keeps the shadow shader module registered and prevents stale
+ * texture binding errors in composite layer sublayers.
+ */
+function disableLightingEffect(effect: Effect) {
+ const deckEffect = effect.deckEffect;
+ if (!deckEffect) return;
+ disableDeckLightingEffect(deckEffect);
+}
+
+/**
+ * Disable shadow rendering directly on a deck.gl LightingEffect instance.
+ */
+function disableDeckLightingEffect(deckEffect: any) {
+ deckEffect.shadow = false;
+ deckEffect.outputUniformShadow = false;
+ for (const light of deckEffect.directionalLights || []) {
+ light.shadow = false;
+ }
+}
+
/**
* Update effect to match latest vis and map states
*/
function updateEffect({visState, mapState, effect}) {
if (effect.type === LIGHT_AND_SHADOW_EFFECT.type) {
+ // Re-enable shadow rendering in case it was previously disabled
+ const deckEffect = effect.deckEffect;
+ for (const light of deckEffect.directionalLights || []) {
+ light.shadow = true;
+ }
+ deckEffect.shadow = deckEffect.directionalLights?.some(l => l.shadow) ?? false;
+
let {timestamp} = effect.parameters;
const {timeMode} = effect.parameters;
const sunLight = effect.deckEffect.directionalLights[0];
diff --git a/src/utils/src/export-map-html.ts b/src/utils/src/export-map-html.ts
index f335a3ac5..ed0abf4ce 100644
--- a/src/utils/src/export-map-html.ts
+++ b/src/utils/src/export-map-html.ts
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-// @ts-nocheck
import {EXPORT_HTML_MAP_MODES, KEPLER_GL_VERSION} from '@kepler.gl/constants';
/**
diff --git a/src/utils/src/export-utils.ts b/src/utils/src/export-utils.ts
index 090f2782e..7843c9aaf 100644
--- a/src/utils/src/export-utils.ts
+++ b/src/utils/src/export-utils.ts
@@ -203,4 +203,4 @@ const exporters = {
exportHtml
};
-export default exporters;
\ No newline at end of file
+export default exporters;
diff --git a/src/utils/src/gl-utils.ts b/src/utils/src/gl-utils.ts
index 77d7650f3..3467fde92 100644
--- a/src/utils/src/gl-utils.ts
+++ b/src/utils/src/gl-utils.ts
@@ -1,25 +1,125 @@
// SPDX-License-Identifier: MIT
// Copyright contributors to the kepler.gl project
-import {setParameters} from '@luma.gl/core';
-import {LAYER_BLENDINGS} from '@kepler.gl/constants';
-import GL from '@luma.gl/constants';
+import {console as Console} from 'global/window';
+import {
+ LAYER_BLENDINGS,
+ GL_BLEND_FUNC_TO_WEBGPU,
+ GL_BLEND_EQ_TO_WEBGPU,
+ BLEND_OPERATION,
+ BLEND_FACTOR,
+ FILTER_MODE,
+ DEPTH_STENCIL_FORMAT,
+ TEXTURE_USAGE
+} from '@kepler.gl/constants';
+import {DeckRenderer} from '@deck.gl/core';
-const getGlConst = d => GL[d];
-
-export function setLayerBlending(gl, layerBlending) {
+/**
+ * Convert layer blending config to deck.gl 9.x parameters format.
+ * In deck.gl 9.x, blending is set via `parameters` prop using WebGPU-style string constants
+ * instead of calling setParameters with GL constants.
+ */
+export function getLayerBlendingParameters(
+ layerBlending: string
+): Record<string, string | boolean> {
const blending = LAYER_BLENDINGS[layerBlending];
+ if (!blending) return {};
const {blendFunc, blendEquation} = blending;
+ if (!blendFunc) return {};
+
+ const params: Record<string, string | boolean> = {
+ blend: true
+ };
+
+ if (blendFunc.length >= 2) {
+ if (!GL_BLEND_FUNC_TO_WEBGPU[blendFunc[0]])
+ Console.warn(`Unmapped blend function: ${blendFunc[0]}, falling back to 'one'`);
+ if (!GL_BLEND_FUNC_TO_WEBGPU[blendFunc[1]])
+ Console.warn(`Unmapped blend function: ${blendFunc[1]}, falling back to 'zero'`);
+ params.blendColorSrcFactor = GL_BLEND_FUNC_TO_WEBGPU[blendFunc[0]] || BLEND_FACTOR.ONE;
+ params.blendColorDstFactor = GL_BLEND_FUNC_TO_WEBGPU[blendFunc[1]] || BLEND_FACTOR.ZERO;
+ }
+ if (blendFunc.length >= 4) {
+ if (!GL_BLEND_FUNC_TO_WEBGPU[blendFunc[2]])
+ Console.warn(`Unmapped blend function: ${blendFunc[2]}, falling back to 'one'`);
+ if (!GL_BLEND_FUNC_TO_WEBGPU[blendFunc[3]])
+ Console.warn(`Unmapped blend function: ${blendFunc[3]}, falling back to 'zero'`);
+ params.blendAlphaSrcFactor = GL_BLEND_FUNC_TO_WEBGPU[blendFunc[2]] || BLEND_FACTOR.ONE;
+ params.blendAlphaDstFactor = GL_BLEND_FUNC_TO_WEBGPU[blendFunc[3]] || BLEND_FACTOR.ZERO;
+ } else {
+ params.blendAlphaSrcFactor = params.blendColorSrcFactor;
+ params.blendAlphaDstFactor = params.blendColorDstFactor;
+ }
+
+ if (Array.isArray(blendEquation)) {
+ params.blendColorOperation = GL_BLEND_EQ_TO_WEBGPU[blendEquation[0]] || BLEND_OPERATION.ADD;
+ params.blendAlphaOperation = GL_BLEND_EQ_TO_WEBGPU[blendEquation[1]] || BLEND_OPERATION.ADD;
+ } else if (blendEquation) {
+ params.blendColorOperation = GL_BLEND_EQ_TO_WEBGPU[blendEquation] || BLEND_OPERATION.ADD;
+ params.blendAlphaOperation = params.blendColorOperation;
+ }
+
+ return params;
+}
+
+/**
+ * Patch DeckRenderer to include depth-stencil attachments on post-processing
+ * framebuffers. In deck.gl 9, _resizeRenderBuffers creates FBOs with only color
+ * attachments, which breaks depth testing when post-processing effects are active.
+ * This was not an issue in deck.gl 8 where Framebuffer() auto-created a depth buffer.
+ */
+interface DeckRendererInternals {
+ _resizeRenderBuffers?: () => void;
+ device: {
+ canvasContext: {getDrawingBufferSize(): [number, number]};
+ createTexture(props: Record<string, unknown>): unknown;
+ createFramebuffer(props: Record<string, unknown>): {resize(size: [number, number]): void};
+ };
+ renderBuffers: {resize(size: [number, number]): void}[];
+}
+
+let _deckRendererPatched = false;
+export function patchDeckRendererForPostProcessing(): void {
+ if (_deckRendererPatched) return;
+ _deckRendererPatched = true;
+
+ const proto = DeckRenderer.prototype as unknown as DeckRendererInternals;
+ const original =
+ typeof proto._resizeRenderBuffers === 'function' ? proto._resizeRenderBuffers : null;
+
+ proto._resizeRenderBuffers = function _resizeRenderBufferPatched(this: DeckRendererInternals) {
+ if (!this.device?.canvasContext) {
+ return original?.call(this);
+ }
- setParameters(gl, {
- [GL.BLEND]: true,
- ...(blendFunc
- ? {
- blendFunc: blendFunc.map(getGlConst),
- blendEquation: Array.isArray(blendEquation)
- ? blendEquation.map(getGlConst)
- : getGlConst(blendEquation)
- }
- : {})
- });
+ const {renderBuffers} = this;
+ const size = this.device.canvasContext.getDrawingBufferSize();
+ const [width, height] = size;
+ if (renderBuffers.length === 0) {
+ [0, 1].map((i: number) => {
+ const colorTexture = this.device.createTexture({
+ sampler: {minFilter: FILTER_MODE.LINEAR, magFilter: FILTER_MODE.LINEAR},
+ width,
+ height
+ });
+ const depthTexture = this.device.createTexture({
+ id: `deck-renderbuffer-${i}-depth`,
+ format: DEPTH_STENCIL_FORMAT.DEPTH24_PLUS,
+ usage: TEXTURE_USAGE.RENDER_ATTACHMENT | TEXTURE_USAGE.SAMPLE,
+ width,
+ height
+ });
+ renderBuffers.push(
+ this.device.createFramebuffer({
+ id: `deck-renderbuffer-${i}`,
+ colorAttachments: [colorTexture],
+ depthStencilAttachment: depthTexture
+ })
+ );
+ });
+ }
+ for (const buffer of renderBuffers) {
+ buffer.resize(size);
+ }
+ };
}
diff --git a/src/utils/src/index.ts b/src/utils/src/index.ts
index f36b0ad8b..3d2f2ec4c 100644
--- a/src/utils/src/index.ts
+++ b/src/utils/src/index.ts
@@ -82,7 +82,7 @@ export {
isMSEdge
} from './export-utils';
export {getFormatValue, getDefaultTimeFormat} from './format';
-export {setLayerBlending} from './gl-utils';
+export {getLayerBlendingParameters, patchDeckRendererForPostProcessing} from './gl-utils';
export {flattenMessages, mergeMessages} from './locale-utils';
export {isValidMapInfo} from './map-info-utils';
export {
diff --git a/test/browser/layer-tests/cluster-layer-specs.js b/test/browser/layer-tests/cluster-layer-specs.js
index 96483e5bf..c46a51482 100644
--- a/test/browser/layer-tests/cluster-layer-specs.js
+++ b/test/browser/layer-tests/cluster-layer-specs.js
@@ -101,16 +101,16 @@ test('#ClusterLayer -> formatLayerData', t => {
// 5: 2016-09-17 00:15:01 1474071301000 - 1
// 7: 2016-09-17 00:17:05 1474071425000 - 1
t.equal(
- // assume all points fall into one bin
+ // getColorValue now counts only filtered points within the bin
layerData.getColorValue(expectedLayerData.data),
- 5,
- 'should return unfiltered point count'
+ 3,
+ 'should return filtered point count'
);
t.equal(
- // assume all points fall into one bin
+ // getElevationValue now counts only filtered points within the bin
layerData.getElevationValue(expectedLayerData.data),
- 5,
- 'should return unfiltered point count'
+ 3,
+ 'should return filtered point count'
);
t.deepEqual(
layerData.data.map(layerData._filterData),
@@ -172,10 +172,12 @@ test('#ClusterLayer -> formatLayerData', t => {
// 4: driver_analytics - 1
// 5: driver_analytics - 1
// 7: driver_analytics - 1
+ // wrapOrdinalAccessor converts the string mode result to a stable
+ // numeric index (required by deck.gl 9's Float32Array aggregation).
+ // 'driver_analytics' is the first unique value → index 0.
t.equal(
- // assume all points fall into one bin
layerData.getColorValue(expectedLayerData.data),
- 'driver_analytics',
+ 0,
'should return filtered mode of (types)'
);
t.deepEqual(
diff --git a/test/browser/layer-tests/grid-layer-specs.js b/test/browser/layer-tests/grid-layer-specs.js
index 0610a89fa..11ad64ced 100644
--- a/test/browser/layer-tests/grid-layer-specs.js
+++ b/test/browser/layer-tests/grid-layer-specs.js
@@ -275,14 +275,11 @@ test('#GridLayer -> renderLayer', t => {
assert: (deckLayers, layer) => {
t.deepEqual(
deckLayers.map(l => l.id),
- ['test_layer_1', 'test_layer_1-grid-cell'],
+ ['test_layer_1', 'test_layer_1-cells'],
'Should create 2 deck.gl layers'
);
const [cpuGridLayer, gridCellLayer] = deckLayers;
const {props} = cpuGridLayer;
- const gridCellLayerProp = gridCellLayer.props;
- const {attributes} = gridCellLayer.state.attributeManager;
- const {instanceFillColors, instancePositions, instanceElevations} = attributes;
const expectedProps = {
coverage: layer.config.visConfig.coverage,
@@ -303,78 +300,115 @@ test('#GridLayer -> renderLayer', t => {
t.deepEqual(props[key], expectedProps[key], `should have correct props.${key}`);
});
- // filterRange [39000, 552000]
- // filter.domain [1474071056000, 1474071489000]
- const expectedColorBins = [
- // i = 0 is filtered out because empty
- {i: 2, value: 1, counts: 1},
- {i: 1, value: 2, counts: 2}
- ];
-
- const expectedElevationBins = [
- {i: 2, value: 1, counts: 1},
- {i: 1, value: 2, counts: 2}
- ];
-
- t.deepEqual(
- gridCellLayerProp.data.length,
+ // deck.gl 9: sublayer data is {length, attributes} with typed arrays
+ const cellData = gridCellLayer.props.data;
+ t.ok(cellData && typeof cellData.length === 'number', 'cell data should have length');
+ t.equal(
+ cellData.length,
expectedGridCellData.length,
- 'should pass correct data to grid cell layer'
+ 'should have correct number of grid cells'
);
- gridCellLayerProp.data.forEach((ac, i) => {
- t.deepEqual(
- gridCellLayerProp.data[i],
- expectedGridCellData[i],
- `should pass correct data:${i} to grid cell layer`
- );
- });
- const expectedLayerDomain = {
- domain: [1, 2],
- aggregatedBins: {1: {i: 1, value: 2, counts: 2}, 2: {i: 2, value: 1, counts: 1}}
- };
- t.deepEqual(
- spyLayerCallbacks.args[0][0],
- expectedLayerDomain,
- 'should call onSetLayerDomain with correct domain'
+ // Verify typed-array attributes on the cell sublayer
+ t.ok(cellData.attributes, 'cell data should have attributes');
+ t.ok(
+ cellData.attributes.getColorValue?.value instanceof Float32Array,
+ 'getColorValue should be a Float32Array'
);
-
- t.deepEqual(
- cpuGridLayer.state.aggregatorState.dimensions.fillColor.sortedBins.sortedBins,
- expectedColorBins,
- 'should create correct color bins'
+ t.ok(
+ cellData.attributes.getElevationValue?.value instanceof Float32Array,
+ 'getElevationValue should be a Float32Array'
);
-
- t.deepEqual(
- cpuGridLayer.state.aggregatorState.dimensions.elevation.sortedBins.sortedBins,
- expectedElevationBins,
- 'should create correct elevation bins'
+ t.equal(
+ cellData.attributes.getColorValue.value.length,
+ expectedGridCellData.length,
+ 'getColorValue array length should match bin count'
);
- // instancePositions
+ // Verify actual attribute array values (deck.gl 9 equivalent of instanceFillColors/instanceElevations)
+ // cellData.attributes contain SCALED values (processed through AttributeWithScale),
+ // not raw aggregated weights. For quantize scale with 3 bins [0, 1, 2],
+ // values are mapped to percentile-like range [0, 50, 99].
+ const colorValues = Array.from(cellData.attributes.getColorValue.value);
+ const elevationValues = Array.from(cellData.attributes.getElevationValue.value);
t.deepEqual(
- instancePositions.value.slice(0, 12),
- // position of each bin
- [
- -122.59661271087748, 37.743177277521255, 0, -122.14283099317691, 37.38384344551697, 0,
- -122.3697218520272, 37.743177277521255, 0, 0, 0, 0
- ],
- 'should create correct attribute.instanceFillColors'
+ colorValues.slice().sort((a, b) => a - b),
+ [0, 50, 99],
+ 'getColorValue typed array should contain scaled values [0, 50, 99] (sorted)'
);
- // instanceFillColors
+ // Elevation uses linear scale (default), so raw values pass through
t.deepEqual(
- instanceFillColors.value.slice(0, 16),
- // color by filtered points count: [0, 2, 1]
- [0, 0, 0, 0, 3, 3, 3, 255, 1, 1, 1, 255, 0, 0, 0, 0],
- 'should create correct attribute.instanceFillColors'
+ elevationValues.slice().sort((a, b) => a - b),
+ [0, 1, 2],
+ 'getElevationValue typed array should contain raw counts [0, 1, 2] (sorted)'
);
- // instanceElevations
- t.deepEqual(
- instanceElevations.value.slice(0, 4),
- // elevation by filtered points count: [0, 2, 1], range: [0, 500]
- [-1, 500, 0, 0],
- 'should create correct attribute.instanceFillColors'
+
+ // getBin contains [col, row] integer IDs per bin (size=2)
+ const binAttr = cellData.attributes.getBin;
+ t.ok(binAttr?.value instanceof Float32Array, 'getBin should be a Float32Array');
+ t.equal(
+ binAttr.value.length,
+ expectedGridCellData.length * 2,
+ 'getBin array length should be binCount * 2 (col, row pairs)'
);
+
+ // deck.gl 9: onSetColorDomain receives [min, max] tuple
+ // count aggregation: bins have 0, 2, and 1 filtered points
+ t.ok(spyLayerCallbacks.called, 'should call onSetLayerDomain');
+ const domainArg = spyLayerCallbacks.args[0][0];
+ t.deepEqual(domainArg, [0, 2], 'onSetLayerDomain should receive exact domain [0, 2]');
+
+ // Verify aggregator state and per-bin values
+ const aggregator = cpuGridLayer.state?.aggregator;
+ t.ok(aggregator, 'cpuGridLayer should have aggregator state');
+ if (aggregator) {
+ t.equal(
+ aggregator.binCount,
+ expectedGridCellData.length,
+ 'bin count should match expected cells'
+ );
+
+ const colorDomain = aggregator.getResultDomain(0);
+ t.deepEqual(colorDomain, [0, 2], 'color domain should be [0, 2]');
+
+ const elevationDomain = aggregator.getResultDomain(1);
+ t.deepEqual(elevationDomain, [0, 2], 'elevation domain should be [0, 2]');
+
+ // Verify per-bin data: collect bins and match by count
+ const binCounts = [];
+ const binColorValues = [];
+ const binElevationValues = [];
+ for (let i = 0; i < aggregator.binCount; i++) {
+ const bin = aggregator.getBin(i);
+ t.ok(bin, `bin ${i} should exist`);
+ binCounts.push(bin.count);
+ binColorValues.push(bin.value[0]);
+ binElevationValues.push(bin.value[1]);
+ }
+ t.deepEqual(
+ binCounts.slice().sort(),
+ [1, 2, 2],
+ 'bin counts (total points per bin) should be [1, 2, 2] (sorted)'
+ );
+ t.deepEqual(
+ binColorValues.slice().sort(),
+ [0, 1, 2],
+ 'bin color values (filtered count agg) should be [0, 1, 2] (sorted)'
+ );
+ t.deepEqual(
+ binElevationValues.slice().sort(),
+ [0, 1, 2],
+ 'bin elevation values (filtered count agg) should be [0, 1, 2] (sorted)'
+ );
+
+ // Verify raw result arrays
+ const colorResult = aggregator.getResult(0);
+ t.ok(colorResult?.value instanceof Float32Array, 'color result should be Float32Array');
+ const sortedColorResult = Array.from(
+ colorResult.value.slice(0, aggregator.binCount)
+ ).sort();
+ t.deepEqual(sortedColorResult, [0, 1, 2], 'color result values should be [0, 1, 2]');
+ }
}
},
{
@@ -415,67 +449,103 @@ test('#GridLayer -> renderLayer', t => {
assert: deckLayers => {
t.deepEqual(
deckLayers.map(l => l.id),
- ['test_layer_2', 'test_layer_2-grid-cell'],
+ ['test_layer_2', 'test_layer_2-cells'],
'Should create 2 deck.gl layers'
);
const [cpuGridLayer, gridCellLayer] = deckLayers;
const {props} = cpuGridLayer;
- const gridCellLayerProp = gridCellLayer.props;
- const {attributes} = gridCellLayer.state.attributeManager;
- const {instanceFillColors} = attributes;
t.equal(props.colorScaleType, 'quantize', 'should pass colorScaleType');
- t.deepEqual(
- gridCellLayerProp.data.length,
+ const cellData = gridCellLayer.props.data;
+ t.equal(
+ cellData.length,
expectedGridCellData.length,
- 'should pass correct data to grid cell layer'
+ 'should have correct number of grid cells'
);
- gridCellLayerProp.data.forEach((ac, i) => {
- t.deepEqual(
- gridCellLayerProp.data[i],
- expectedGridCellData[i],
- `should pass correct data:${i} to grid cell layer`
- );
- });
- const expectedColorBins = [
- // i = 0 is filtered out because empty
- // bins are sorted
- {i: 1, value: 7.13, counts: 2},
- {i: 2, value: 11, counts: 1}
- ];
- const expectedElevationBins = [
- {i: 2, value: 1, counts: 1},
- {i: 1, value: 2, counts: 2}
- ];
- const expectedLayerDomain = {
- domain: [7.13, 11],
- aggregatedBins: {1: {i: 1, value: 7.13, counts: 2}, 2: {i: 2, value: 11, counts: 1}}
- };
- t.deepEqual(
- spyLayerCallbacks.args[1][0],
- expectedLayerDomain,
- 'should call onSetLayerDomain with correct domain'
- );
- t.deepEqual(
- cpuGridLayer.state.aggregatorState.dimensions.fillColor.sortedBins.sortedBins,
- expectedColorBins,
- 'should create correct color bins'
+
+ // Verify typed-array attributes
+ t.ok(
+ cellData.attributes?.getColorValue?.value instanceof Float32Array,
+ 'getColorValue should be a Float32Array'
);
- t.deepEqual(
- cpuGridLayer.state.aggregatorState.dimensions.elevation.sortedBins.sortedBins,
- expectedElevationBins,
- 'should create correct elevation bins'
+ // Verify actual attribute array values for "color by" max trip_distance
+ // bins with filtered points have max trip_distance 7.13 and 11; empty bin has NaN
+ const colorValues = Array.from(cellData.attributes.getColorValue.value);
+ const realColorValues = colorValues.filter(v => !isNaN(v)).sort((a, b) => a - b);
+ t.equal(realColorValues.length, 2, 'should have 2 non-NaN color attribute values');
+ t.ok(
+ Math.abs(realColorValues[0] - 7.13) < 0.001,
+ `first color value should be ~7.13 (got ${realColorValues[0]})`
+ );
+ t.equal(realColorValues[1], 11, 'second color value should be 11');
+ t.equal(
+ colorValues.filter(v => isNaN(v)).length,
+ 1,
+ 'should have exactly 1 NaN color value (empty bin)'
);
- // instanceFillColors
- t.deepEqual(
- instanceFillColors.value.slice(0, 16),
- // color by filtered points color value: [0, 7.13, 11]
- [0, 0, 0, 0, 1, 1, 1, 255, 3, 3, 3, 255, 0, 0, 0, 0],
- 'should create correct attribute.instanceFillColors'
+ // deck.gl 9: onSetColorDomain receives [min, max] tuple
+ // max aggregation of trip_distance: bins with filtered points have max 7.13 and 11
+ // Float32 precision: 7.13 may become 7.130000114440918
+ t.ok(spyLayerCallbacks.called, 'should call onSetLayerDomain');
+ const lastCallIdx = spyLayerCallbacks.args.length - 1;
+ const domainArg = spyLayerCallbacks.args[lastCallIdx][0];
+ t.equal(domainArg.length, 2, 'domain should have 2 elements');
+ t.ok(
+ Math.abs(domainArg[0] - 7.13) < 0.001,
+ `domain[0] should be ~7.13 (got ${domainArg[0]})`
);
+ t.equal(domainArg[1], 11, 'domain[1] should be 11');
+
+ // Verify aggregator state and per-bin values
+ const aggregator = cpuGridLayer.state?.aggregator;
+ t.ok(aggregator, 'cpuGridLayer should have aggregator state');
+ if (aggregator) {
+ t.equal(
+ aggregator.binCount,
+ expectedGridCellData.length,
+ 'bin count should match expected cells'
+ );
+
+ const colorDomain = aggregator.getResultDomain(0);
+ t.equal(colorDomain.length, 2, 'color domain should have 2 elements');
+ t.ok(
+ Math.abs(colorDomain[0] - 7.13) < 0.001,
+ `color domain[0] should be ~7.13 (got ${colorDomain[0]})`
+ );
+ t.equal(colorDomain[1], 11, 'color domain[1] should be 11');
+
+ // Verify per-bin color values (max trip_distance per cell)
+ // One bin is empty (NaN), two bins have real values
+ const binColorValues = [];
+ for (let i = 0; i < aggregator.binCount; i++) {
+ const bin = aggregator.getBin(i);
+ t.ok(bin, `bin ${i} should exist`);
+ binColorValues.push(bin.value[0]);
+ }
+ const realValues = binColorValues.filter(v => !isNaN(v)).sort((a, b) => a - b);
+ t.equal(realValues.length, 2, 'should have 2 non-NaN bin color values');
+ t.ok(
+ Math.abs(realValues[0] - 7.13) < 0.001,
+ `first real bin value should be ~7.13 (got ${realValues[0]})`
+ );
+ t.equal(realValues[1], 11, 'second real bin value should be 11');
+
+ // Verify raw result array
+ const colorResult = aggregator.getResult(0);
+ t.ok(colorResult?.value instanceof Float32Array, 'color result should be Float32Array');
+ const resultValues = Array.from(colorResult.value.slice(0, aggregator.binCount))
+ .filter(v => !isNaN(v))
+ .sort((a, b) => a - b);
+ t.equal(resultValues.length, 2, 'should have 2 non-NaN result values');
+ t.ok(
+ Math.abs(resultValues[0] - 7.13) < 0.001,
+ `first result value should be ~7.13 (got ${resultValues[0]})`
+ );
+ t.equal(resultValues[1], 11, 'second result value should be 11');
+ }
}
}
];
diff --git a/test/browser/layer-tests/hexagon-layer-specs.js b/test/browser/layer-tests/hexagon-layer-specs.js
index 4239fdcff..1fee98a97 100644
--- a/test/browser/layer-tests/hexagon-layer-specs.js
+++ b/test/browser/layer-tests/hexagon-layer-specs.js
@@ -274,14 +274,12 @@ test('#HexagonLayer -> renderLayer', t => {
assert: (deckLayers, layer) => {
t.deepEqual(
deckLayers.map(l => l.id),
- ['test_layer_1', 'test_layer_1-hexagon-cell'],
+ ['test_layer_1', 'test_layer_1-cells'],
'Should create 2 deck.gl layers'
);
const [deckHexLayer, hexCellLayer] = deckLayers;
- const {props, state} = deckHexLayer;
- const {attributes} = hexCellLayer.state.attributeManager;
- const {instanceFillColors, instanceElevations} = attributes;
+ const {props} = deckHexLayer;
const expectedProps = {
coverage: layer.config.visConfig.coverage,
@@ -298,65 +296,119 @@ test('#HexagonLayer -> renderLayer', t => {
lowerPercentile: layer.config.visConfig.percentile[0]
};
- const expectedColorBins = [
- {i: 2, value: 1, counts: 1},
- {i: 1, value: 2, counts: 2}
- ];
- const expectedElevationBins = [
- {i: 2, value: 1, counts: 1},
- {i: 1, value: 2, counts: 2}
- ];
+ // deck.gl 9: sublayer data is {length, attributes} with typed arrays
+ const cellData = hexCellLayer.props.data;
+ t.ok(cellData && typeof cellData.length === 'number', 'cell data should have length');
+ t.equal(
+ cellData.length,
+ expectedHexCellData.length,
+ 'should have correct number of hex cells'
+ );
- t.deepEqual(
- hexCellLayer.props.data,
- expectedHexCellData,
- 'should pass correct data to hexagon cell layer'
+ // Verify typed-array attributes on the cell sublayer
+ t.ok(cellData.attributes, 'cell data should have attributes');
+ t.ok(
+ cellData.attributes.getColorValue?.value instanceof Float32Array,
+ 'getColorValue should be a Float32Array'
);
- expectedHexCellData.forEach((d, i) => {
- t.deepEqual(
- hexCellLayer.props.data[i],
- expectedHexCellData[i],
- 'should pass correct data to hexagon cell layer'
- );
- });
- Object.keys(expectedProps).forEach(key => {
- t.deepEqual(props[key], expectedProps[key], `should have correct props.${key}`);
- });
- const expectedLayerDomain = {
- domain: [1, 2],
- aggregatedBins: {1: {i: 1, value: 2, counts: 2}, 2: {i: 2, value: 1, counts: 1}}
- };
- t.deepEqual(
- spyLayerCallbacks.args[0][0],
- expectedLayerDomain,
- 'should call onSetLayerDomain with correct domain'
+ t.ok(
+ cellData.attributes.getElevationValue?.value instanceof Float32Array,
+ 'getElevationValue should be a Float32Array'
);
-
- t.deepEqual(
- state.aggregatorState.dimensions.fillColor.sortedBins.sortedBins,
- expectedColorBins,
- 'should create correct color bins'
+ t.equal(
+ cellData.attributes.getColorValue.value.length,
+ expectedHexCellData.length,
+ 'getColorValue array length should match bin count'
);
+ // Verify actual attribute array values (deck.gl 9 equivalent of instanceFillColors/instanceElevations)
+ // cellData.attributes contain SCALED values (processed through AttributeWithScale),
+ // not raw aggregated weights. For quantize scale with 3 bins [0, 1, 2],
+ // values are mapped to percentile-like range [0, 50, 99].
+ const colorValues = Array.from(cellData.attributes.getColorValue.value);
+ const elevationValues = Array.from(cellData.attributes.getElevationValue.value);
t.deepEqual(
- state.aggregatorState.dimensions.elevation.sortedBins.sortedBins,
- expectedElevationBins,
- 'should create correct elevation bins'
+ colorValues.slice().sort((a, b) => a - b),
+ [0, 50, 99],
+ 'getColorValue typed array should contain scaled values [0, 50, 99] (sorted)'
);
- // instanceFillColors
+ // Elevation uses linear scale (default), so raw values pass through
t.deepEqual(
- instanceFillColors.value.slice(0, 16),
- // color by filtered points count: [0, 2, 1]
- [0, 0, 0, 0, 3, 3, 3, 255, 1, 1, 1, 255, 0, 0, 0, 0],
- 'should create correct attribute.instanceFillColors'
+ elevationValues.slice().sort((a, b) => a - b),
+ [0, 1, 2],
+ 'getElevationValue typed array should contain raw counts [0, 1, 2] (sorted)'
);
- // instanceElevations
- t.deepEqual(
- instanceElevations.value.slice(0, 4),
- // elevation by filtered points count: [0, 2, 1], range: [0, 500]
- [-1, 500, 0, 0],
- 'should create correct attribute.instanceFillColors'
+
+ // getBin contains [col, row] integer IDs per bin (size=2)
+ const binAttr = cellData.attributes.getBin;
+ t.ok(binAttr?.value instanceof Float32Array, 'getBin should be a Float32Array');
+ t.equal(
+ binAttr.value.length,
+ expectedHexCellData.length * 2,
+ 'getBin array length should be binCount * 2 (col, row pairs)'
);
+
+ Object.keys(expectedProps).forEach(key => {
+ t.deepEqual(props[key], expectedProps[key], `should have correct props.${key}`);
+ });
+
+ // deck.gl 9: onSetColorDomain receives [min, max] tuple
+ // count aggregation: bins have 0, 2, and 1 filtered points
+ t.ok(spyLayerCallbacks.called, 'should call onSetLayerDomain');
+ const domainArg = spyLayerCallbacks.args[0][0];
+ t.deepEqual(domainArg, [0, 2], 'onSetLayerDomain should receive exact domain [0, 2]');
+
+ // Verify aggregator state and per-bin values
+ const aggregator = deckHexLayer.state?.aggregator;
+ t.ok(aggregator, 'deckHexLayer should have aggregator state');
+ if (aggregator) {
+ t.equal(
+ aggregator.binCount,
+ expectedHexCellData.length,
+ 'bin count should match expected cells'
+ );
+
+ const colorDomain = aggregator.getResultDomain(0);
+ t.deepEqual(colorDomain, [0, 2], 'color domain should be [0, 2]');
+
+ const elevationDomain = aggregator.getResultDomain(1);
+ t.deepEqual(elevationDomain, [0, 2], 'elevation domain should be [0, 2]');
+
+ // Verify per-bin data
+ const binCounts = [];
+ const binColorValues = [];
+ const binElevationValues = [];
+ for (let i = 0; i < aggregator.binCount; i++) {
+ const bin = aggregator.getBin(i);
+ t.ok(bin, `bin ${i} should exist`);
+ binCounts.push(bin.count);
+ binColorValues.push(bin.value[0]);
+ binElevationValues.push(bin.value[1]);
+ }
+ t.deepEqual(
+ binCounts.slice().sort(),
+ [1, 2, 2],
+ 'bin counts (total points per bin) should be [1, 2, 2] (sorted)'
+ );
+ t.deepEqual(
+ binColorValues.slice().sort(),
+ [0, 1, 2],
+ 'bin color values (filtered count agg) should be [0, 1, 2] (sorted)'
+ );
+ t.deepEqual(
+ binElevationValues.slice().sort(),
+ [0, 1, 2],
+ 'bin elevation values (filtered count agg) should be [0, 1, 2] (sorted)'
+ );
+
+ // Verify raw result arrays
+ const colorResult = aggregator.getResult(0);
+ t.ok(colorResult?.value instanceof Float32Array, 'color result should be Float32Array');
+ const sortedColorResult = Array.from(
+ colorResult.value.slice(0, aggregator.binCount)
+ ).sort();
+ t.deepEqual(sortedColorResult, [0, 1, 2], 'color result values should be [0, 1, 2]');
+ }
}
},
{
@@ -397,66 +449,103 @@ test('#HexagonLayer -> renderLayer', t => {
assert: deckLayers => {
t.deepEqual(
deckLayers.map(l => l.id),
- ['test_layer_1', 'test_layer_1-hexagon-cell'],
+ ['test_layer_1', 'test_layer_1-cells'],
'Should create 2 deck.gl layers'
);
const [deckHexLayer, hexCellLayer] = deckLayers;
- const {props, state} = deckHexLayer;
- const {attributes} = hexCellLayer.state.attributeManager;
- const {instanceFillColors} = attributes;
+ const {props} = deckHexLayer;
t.equal(props.colorScaleType, 'quantize', 'should pass colorScaleType');
- t.deepEqual(
- hexCellLayer.props.data,
- expectedHexCellData,
- 'should pass correct data to hexagon cell layer'
- );
- expectedHexCellData.forEach((d, i) => {
- t.deepEqual(
- hexCellLayer.props.data[i],
- expectedHexCellData[i],
- 'should pass correct data to hexagon cell layer'
- );
- });
- const expectedColorBins = [
- // i = 0 is filtered out because empty
- // bins are sorted
- {i: 1, value: 7.13, counts: 2},
- {i: 2, value: 11, counts: 1}
- ];
- const expectedElevationBins = [
- {i: 2, value: 1, counts: 1},
- {i: 1, value: 2, counts: 2}
- ];
- const expectedLayerDomain = {
- domain: [7.13, 11],
- aggregatedBins: {1: {i: 1, value: 7.13, counts: 2}, 2: {i: 2, value: 11, counts: 1}}
- };
- t.deepEqual(
- spyLayerCallbacks.args[1][0],
- expectedLayerDomain,
- 'should call onSetLayerDomain with correct domain'
+ const cellData = hexCellLayer.props.data;
+ t.equal(
+ cellData.length,
+ expectedHexCellData.length,
+ 'should have correct number of hex cells'
);
- t.deepEqual(
- state.aggregatorState.dimensions.fillColor.sortedBins.sortedBins,
- expectedColorBins,
- 'should create correct color bins'
+
+ // Verify typed-array attributes
+ t.ok(
+ cellData.attributes?.getColorValue?.value instanceof Float32Array,
+ 'getColorValue should be a Float32Array'
);
- t.deepEqual(
- state.aggregatorState.dimensions.elevation.sortedBins.sortedBins,
- expectedElevationBins,
- 'should create correct elevation bins'
+ // Verify actual attribute array values for "color by" max trip_distance
+ // bins with filtered points have max trip_distance 7.13 and 11; empty bin has NaN
+ const colorValues = Array.from(cellData.attributes.getColorValue.value);
+ const realColorValues = colorValues.filter(v => !isNaN(v)).sort((a, b) => a - b);
+ t.equal(realColorValues.length, 2, 'should have 2 non-NaN color attribute values');
+ t.ok(
+ Math.abs(realColorValues[0] - 7.13) < 0.001,
+ `first color value should be ~7.13 (got ${realColorValues[0]})`
+ );
+ t.equal(realColorValues[1], 11, 'second color value should be 11');
+ t.equal(
+ colorValues.filter(v => isNaN(v)).length,
+ 1,
+ 'should have exactly 1 NaN color value (empty bin)'
);
- // instanceFillColors
- t.deepEqual(
- instanceFillColors.value.slice(0, 16),
- // color by filtered points color value: [0, 7.13, 11]
- [0, 0, 0, 0, 1, 1, 1, 255, 3, 3, 3, 255, 0, 0, 0, 0],
- 'should create correct attribute.instanceFillColors'
+ // deck.gl 9: onSetColorDomain receives [min, max] tuple
+ // max aggregation of trip_distance: bins with filtered points have max 7.13 and 11
+ // Float32 precision: 7.13 may become 7.130000114440918
+ t.ok(spyLayerCallbacks.called, 'should call onSetLayerDomain');
+ const lastCallIdx = spyLayerCallbacks.args.length - 1;
+ const domainArg = spyLayerCallbacks.args[lastCallIdx][0];
+ t.equal(domainArg.length, 2, 'domain should have 2 elements');
+ t.ok(
+ Math.abs(domainArg[0] - 7.13) < 0.001,
+ `domain[0] should be ~7.13 (got ${domainArg[0]})`
);
+ t.equal(domainArg[1], 11, 'domain[1] should be 11');
+
+ // Verify aggregator state and per-bin values
+ const aggregator = deckHexLayer.state?.aggregator;
+ t.ok(aggregator, 'deckHexLayer should have aggregator state');
+ if (aggregator) {
+ t.equal(
+ aggregator.binCount,
+ expectedHexCellData.length,
+ 'bin count should match expected cells'
+ );
+
+ const colorDomain = aggregator.getResultDomain(0);
+ t.equal(colorDomain.length, 2, 'color domain should have 2 elements');
+ t.ok(
+ Math.abs(colorDomain[0] - 7.13) < 0.001,
+ `color domain[0] should be ~7.13 (got ${colorDomain[0]})`
+ );
+ t.equal(colorDomain[1], 11, 'color domain[1] should be 11');
+
+ // Verify per-bin color values (max trip_distance per cell)
+ // One bin is empty (NaN), two bins have real values
+ const binColorValues = [];
+ for (let i = 0; i < aggregator.binCount; i++) {
+ const bin = aggregator.getBin(i);
+ t.ok(bin, `bin ${i} should exist`);
+ binColorValues.push(bin.value[0]);
+ }
+ const realValues = binColorValues.filter(v => !isNaN(v)).sort((a, b) => a - b);
+ t.equal(realValues.length, 2, 'should have 2 non-NaN bin color values');
+ t.ok(
+ Math.abs(realValues[0] - 7.13) < 0.001,
+ `first real bin value should be ~7.13 (got ${realValues[0]})`
+ );
+ t.equal(realValues[1], 11, 'second real bin value should be 11');
+
+ // Verify raw result array
+ const colorResult = aggregator.getResult(0);
+ t.ok(colorResult?.value instanceof Float32Array, 'color result should be Float32Array');
+ const resultValues = Array.from(colorResult.value.slice(0, aggregator.binCount))
+ .filter(v => !isNaN(v))
+ .sort((a, b) => a - b);
+ t.equal(resultValues.length, 2, 'should have 2 non-NaN result values');
+ t.ok(
+ Math.abs(resultValues[0] - 7.13) < 0.001,
+ `first result value should be ~7.13 (got ${resultValues[0]})`
+ );
+ t.equal(resultValues[1], 11, 'second result value should be 11');
+ }
}
}
];
@@ -495,7 +584,16 @@ test('#HexagonLayer -> renderHover', t => {
elevationValue: 1,
position: [-122.56068191457787, 37.71853775731428],
index: 0,
- points: [{}, {}]
+ points: [{}, {}],
+ cellOutline: [
+ [-122.36376320555154, 37.80841570626016],
+ [-122.56068191457787, 37.898184393157855],
+ [-122.75760062360423, 37.80841570626016],
+ [-122.75760062360423, 37.628550634764665],
+ [-122.56068191457787, 37.538454428239675],
+ [-122.36376320555154, 37.628550634764665],
+ [-122.36376320555154, 37.80841570626016]
+ ]
}
});
@@ -528,16 +626,17 @@ test('#HexagonLayer -> renderHover', t => {
objectHovered: testObjectHovered
},
assert: deckLayers => {
- t.deepEqual(
- deckLayers.map(l => l.id),
- [
- 'test_layer_1',
- 'test_layer_1-hexagon-cell',
- 'test_layer_1-hovered',
- 'test_layer_1-hovered-linestrings'
- ],
- 'Should create 4 deck.gl layers'
+ const layerIds = deckLayers.map(l => l.id);
+ t.ok(layerIds.includes('test_layer_1'), 'Should create main hexagon layer');
+ t.ok(
+ layerIds.includes('test_layer_1-hovered'),
+ 'Should create hovered layer when objectHovered has cellOutline'
+ );
+ t.ok(
+ layerIds.includes('test_layer_1-hovered-linestrings'),
+ 'Should create hovered-linestrings sublayer'
);
+
const expectedHoverData = [
{
geometry: {
@@ -551,17 +650,21 @@ test('#HexagonLayer -> renderHover', t => {
[-122.36376320555154, 37.80841570626016]
],
type: 'LineString'
- },
- properties: {}
+ }
}
];
- const hoverLayer = deckLayers[2];
- t.deepEqual(
- hoverLayer.props.data,
- expectedHoverData,
- 'should send correct hover layer data'
- );
+ const hoverLayer = deckLayers.find(l => l.id === 'test_layer_1-hovered');
+ t.ok(hoverLayer, 'Should find the hovered layer');
+ if (hoverLayer) {
+ t.equal(hoverLayer.props.data.length, 1, 'hover layer should have 1 data item');
+ const hoverGeom = hoverLayer.props.data[0];
+ t.deepEqual(
+ hoverGeom.geometry,
+ expectedHoverData[0].geometry,
+ 'should send correct hover geometry with exact coordinates'
+ );
+ }
}
}
];
diff --git a/test/browser/layer-tests/trip-layer-specs.js b/test/browser/layer-tests/trip-layer-specs.js
index d76affc57..584c3fbaf 100644
--- a/test/browser/layer-tests/trip-layer-specs.js
+++ b/test/browser/layer-tests/trip-layer-specs.js
@@ -314,68 +314,91 @@ test('#TripLayer -> renderLayer', t => {
// test attributes
const {attributes} = deckTripLayer.state.attributeManager;
- const fvs = [
- [Number.MIN_SAFE_INTEGER, 0, 0, 0],
- [7 - valueFilterDomain0, 0, 0, 0],
- [6 - valueFilterDomain0, 0, 0, 0]
- ];
- // use picking Colors to determine number numVertexs
- const numVertexs = [];
- let currentIdx = 0;
- let count = 0;
-
- for (let c = 0; c < attributes.instancePickingColors.value.length; c += 3) {
- if (
- attributes.instancePickingColors.value[c] > currentIdx ||
- c === attributes.instancePickingColors.value.length - 3
- ) {
- currentIdx = attributes.instancePickingColors.value[c];
- if (count > 0) {
- numVertexs.push(count);
- }
- count = 1;
- } else if (attributes.instancePickingColors.value[c] === currentIdx) {
- count += 1;
- }
- }
-
- const testLen = numVertexs.reduce((accu, c) => accu + c, 0);
- const expectedFilterValues = new Float32Array(testLen * 4);
- const expectedColors = new Float32Array(testLen * 4);
+ t.ok(attributes.filterValues, 'Should have filterValues attribute');
+ t.ok(
+ attributes.filterValues.value instanceof Float32Array,
+ 'filterValues should be Float32Array'
+ );
+ t.ok(attributes.instanceColors, 'Should have instanceColors attribute');
+ t.ok(attributes.instanceStrokeWidths, 'Should have instanceStrokeWidths attribute');
- let c = 0;
- for (let i = 0; i < 3; i++) {
- for (let n = 0; n < numVertexs[i]; n++) {
- expectedFilterValues[c + 0] = fvs[i][0];
- expectedFilterValues[c + 1] = fvs[i][1];
- expectedFilterValues[c + 2] = fvs[i][2];
- expectedFilterValues[c + 3] = fvs[i][3];
- expectedColors[c + 0] = 1;
- expectedColors[c + 1] = 2;
- expectedColors[c + 2] = 3;
- expectedColors[c + 3] = 255;
- c += 4;
- }
- }
+ // Trip features 0, 2, 4 have 10, 8, 7 coordinates respectively
+ const expectedVerticesPerPath = [10, 8, 7];
+ const expectedNumInstances = expectedVerticesPerPath.reduce((a, b) => a + b, 0); // 25
+ const numInstances = deckTripLayer.state.numInstances ?? 0;
+ t.equal(
+ numInstances,
+ expectedNumInstances,
+ `should have exactly ${expectedNumInstances} instances`
+ );
- const expectedStroke = new Float32Array(testLen).fill(1);
+ // Verify startIndices from PathLayer tesselator
+ const startIndices = deckTripLayer.state.startIndices;
+ t.ok(startIndices, 'should have startIndices');
+ const expectedStartIndices = [0, 10, 18, 25];
t.deepEqual(
- attributes.filterValues.value.slice(0, testLen * 4),
- expectedFilterValues,
- 'Should have correct filterValues'
+ Array.from(startIndices),
+ expectedStartIndices,
+ 'startIndices should be [0, 10, 18, 25]'
);
+ // Build expected instanceColors: all vertices should be [1, 2, 3, 255]
+ const expectedColors = new Uint8ClampedArray(numInstances * 4);
+ for (let v = 0; v < numInstances; v++) {
+ expectedColors[v * 4] = 1;
+ expectedColors[v * 4 + 1] = 2;
+ expectedColors[v * 4 + 2] = 3;
+ expectedColors[v * 4 + 3] = 255;
+ }
t.deepEqual(
- attributes.instanceColors.value.slice(0, testLen * 4),
+ attributes.instanceColors.value.slice(0, numInstances * 4),
expectedColors,
- 'Should have correct instanceColors'
+ 'Should have correct instanceColors for all instances'
);
+ // Build expected instanceStrokeWidths: all should be 1 (defaultLineWidth)
+ const expectedStroke = new Float32Array(numInstances).fill(1);
t.deepEqual(
- attributes.instanceStrokeWidths.value.slice(0, testLen),
+ attributes.instanceStrokeWidths.value.slice(0, numInstances),
expectedStroke,
- 'Should have correct instanceStrokeWidths'
+ 'Should have correct instanceStrokeWidths for all instances'
);
+
+ // Build expected filterValues using startIndices for per-path grouping
+ // Feature 0: MIN_SAFE_INTEGER, Feature 2: 7 - valueFilterDomain0, Feature 4: 6 - valueFilterDomain0
+ const perPathFilterValue = [
+ Number.MIN_SAFE_INTEGER,
+ 7 - valueFilterDomain0,
+ 6 - valueFilterDomain0
+ ];
+ const expectedFilterValues = new Float32Array(numInstances * 4);
+ for (let pathIdx = 0; pathIdx < expectedVerticesPerPath.length; pathIdx++) {
+ const start = expectedStartIndices[pathIdx];
+ const end = expectedStartIndices[pathIdx + 1];
+ for (let v = start; v < end; v++) {
+ expectedFilterValues[v * 4] = perPathFilterValue[pathIdx];
+ expectedFilterValues[v * 4 + 1] = 0;
+ expectedFilterValues[v * 4 + 2] = 0;
+ expectedFilterValues[v * 4 + 3] = 0;
+ }
+ }
+
+ // Verify per-path filter values using startIndices
+ const fv = attributes.filterValues.value;
+ for (let pathIdx = 0; pathIdx < expectedVerticesPerPath.length; pathIdx++) {
+ const start = expectedStartIndices[pathIdx];
+ const end = expectedStartIndices[pathIdx + 1];
+ for (let v = start; v < end; v++) {
+ const base = v * 4;
+ t.ok(
+ Math.abs(fv[base] - perPathFilterValue[pathIdx]) < 2,
+ `filterValues[${v}][0] should be ~${perPathFilterValue[pathIdx]} for path ${pathIdx}`
+ );
+ t.equal(fv[base + 1], 0, `filterValues[${v}][1] should be 0`);
+ t.equal(fv[base + 2], 0, `filterValues[${v}][2] should be 0`);
+ t.equal(fv[base + 3], 0, `filterValues[${v}][3] should be 0`);
+ }
+ }
// TODO: test UpdateTriggers
}
}
diff --git a/test/helpers/layer-utils.js b/test/helpers/layer-utils.js
index 42d4eb92b..aa5984bbb 100644
--- a/test/helpers/layer-utils.js
+++ b/test/helpers/layer-utils.js
@@ -4,7 +4,7 @@
/* eslint-disable enzyme-deprecation/no-mount */
import {LayerManager, MapView} from '@deck.gl/core';
import React from 'react';
-import {gl} from '@deck.gl/test-utils';
+import {device} from '@deck.gl/test-utils';
import sinon from 'sinon';
import {mount} from 'enzyme';
import {console as Console} from 'global/window';
@@ -209,7 +209,7 @@ export function testRenderDeckLayer(t, layerType, deckLayers, {viewport, layerMa
height: viewport.height,
viewState: viewport
});
- deckLayerManager = new LayerManager(gl, {viewport: testViewport});
+ deckLayerManager = new LayerManager(device, {viewport: testViewport});
}
const spy = sinon.spy(Console, 'error');
@@ -322,7 +322,7 @@ export function testUpdateLayer(t, {layerConfig, shouldUpdate}) {
viewState: mapState
});
- const layerManager = new LayerManager(gl, {viewport: testViewport});
+ const layerManager = new LayerManager(device, {viewport: testViewport});
let rendered = renderLayerByState(t, stateWithLayer, layerManager);
const attributeValues = Object.keys(
diff --git a/test/node/utils/editor-utils-test.js b/test/node/utils/editor-utils-test.js
index ebee06ab8..7cebf6d9b 100644
--- a/test/node/utils/editor-utils-test.js
+++ b/test/node/utils/editor-utils-test.js
@@ -2,7 +2,7 @@
// Copyright contributors to the kepler.gl project
import test from 'tape';
-import {EditableGeoJsonLayer} from '@nebula.gl/layers';
+import {EditableGeoJsonLayer} from '@deck.gl-community/editable-layers';
import {INITIAL_VIS_STATE} from '@kepler.gl/reducers';
import {VisStateActions} from '@kepler.gl/actions';
diff --git a/test/node/utils/export-utils-test.js b/test/node/utils/export-utils-test.js
index 3a61a9195..aeb7a95a9 100644
--- a/test/node/utils/export-utils-test.js
+++ b/test/node/utils/export-utils-test.js
@@ -169,4 +169,4 @@ test('exportUtils -> isMSEdge', t => {
test('exportUtils -> exportToJsonString', t => {
t.equal(exportToJsonString({test: 1}), '{"test":1}', 'Should convert object to string');
t.end();
-});
\ No newline at end of file
+});
diff --git a/test/setup-browser-env.js b/test/setup-browser-env.js
index bb5dc5018..9ab1dfb51 100644
--- a/test/setup-browser-env.js
+++ b/test/setup-browser-env.js
@@ -4,7 +4,8 @@
/* setup.js */
import {JSDOM, VirtualConsole} from 'jsdom';
import global from 'global';
-const {gl} = require('@deck.gl/test-utils');
+
+const nop = () => {};
const virtualConsole = new VirtualConsole();
virtualConsole.sendTo(console);
@@ -32,16 +33,6 @@ Object.defineProperty(window, 'prompt', {
writable: true
});
-// TODO: This should be the right wat to mock matchMedia but matchMedia was still undefined so I moved to another way to mock it
-
-// Object.defineProperty(window, 'matchMedia', {
-// value: () => ({
-// matches: false,
-// addListener: function() {},
-// removeListener: function() {}
-// }),
-// writable: true
-// });
window.matchMedia = () => {
return {
matches: false,
@@ -81,8 +72,6 @@ Object.defineProperty(window, 'clipboardData', {
window[prop] = () => {};
});
-const nop = () => {};
-
function mockCanvas(globalWindow) {
globalWindow.HTMLCanvasElement.prototype.getContext = function mockGetContext() {
return {
@@ -126,11 +115,16 @@ global.HTMLElement = window.HTMLElement;
global.Element = window.Element;
global.fetch = window.fetch;
+// deck.gl 9 test-utils: gl may be 1 (number) when no WebGL is available, device will be NullDevice
+const {gl} = require('@deck.gl/test-utils');
+
// Create a dummy canvas for the headless gl context
const canvas = global.document.createElement('canvas');
-canvas.width = gl.drawingBufferWidth;
-canvas.height = gl.drawingBufferHeight;
-gl.canvas = canvas;
+if (gl && typeof gl === 'object') {
+ canvas.width = gl.drawingBufferWidth;
+ canvas.height = gl.drawingBufferHeight;
+ gl.canvas = canvas;
+}
Object.keys(global.window).forEach(property => {
if (typeof global[property] === 'undefined') {
diff --git a/website/src/components/footer.js b/website/src/components/footer.js
index 42581a45a..abf9a75ee 100644
--- a/website/src/components/footer.js
+++ b/website/src/components/footer.js
@@ -177,8 +177,29 @@ export default class Footer extends PureComponent {
</BrandingSection>
<CopyrightSection>
<CopyrightContainer>
- <p>Copyright <a href="https://openjsf.org">OpenJS Foundation</a> and kepler.gl contributors. All rights reserved. The <a href="https://openjsf.org">OpenJS Foundation</a> has registered trademarks and uses trademarks. For a list of trademarks of the <a href="https://openjsf.org">OpenJS Foundation</a>, please see our <a href="https://trademark-policy.openjsf.org">Trademark Policy</a> and <a href="https://trademark-list.openjsf.org">Trademark List</a>. Trademarks and logos not indicated on the <a href="https://trademark-list.openjsf.org">list of OpenJS Foundation trademarks</a> are trademarks&trade; or registered&reg; trademarks of their respective holders. Use of them does not imply any affiliation with or endorsement by them.</p>
- <p><a href="https://openjsf.org">The OpenJS Foundation</a> | <a href="https://terms-of-use.openjsf.org">Terms of Use</a> | <a href="https://privacy-policy.openjsf.org">Privacy Policy</a> | <a href="https://bylaws.openjsf.org">Bylaws</a> | <a href="https://code-of-conduct.openjsf.org">Code of Conduct</a> | <a href="https://trademark-policy.openjsf.org">Trademark Policy</a> | <a href="https://trademark-list.openjsf.org">Trademark List</a> | <a href="https://www.linuxfoundation.org/cookies">Cookie Policy</a></p>
+ <p>
+ Copyright <a href="https://openjsf.org">OpenJS Foundation</a> and kepler.gl
+ contributors. All rights reserved. The{' '}
+ <a href="https://openjsf.org">OpenJS Foundation</a> has registered trademarks and uses
+ trademarks. For a list of trademarks of the{' '}
+ <a href="https://openjsf.org">OpenJS Foundation</a>, please see our{' '}
+ <a href="https://trademark-policy.openjsf.org">Trademark Policy</a> and{' '}
+ <a href="https://trademark-list.openjsf.org">Trademark List</a>. Trademarks and logos
+ not indicated on the{' '}
+ <a href="https://trademark-list.openjsf.org">list of OpenJS Foundation trademarks</a>{' '}
+ are trademarks&trade; or registered&reg; trademarks of their respective holders. Use
+ of them does not imply any affiliation with or endorsement by them.
+ </p>
+ <p>
+ <a href="https://openjsf.org">The OpenJS Foundation</a> |{' '}
+ <a href="https://terms-of-use.openjsf.org">Terms of Use</a> |{' '}
+ <a href="https://privacy-policy.openjsf.org">Privacy Policy</a> |{' '}
+ <a href="https://bylaws.openjsf.org">Bylaws</a> |{' '}
+ <a href="https://code-of-conduct.openjsf.org">Code of Conduct</a> |{' '}
+ <a href="https://trademark-policy.openjsf.org">Trademark Policy</a> |{' '}
+ <a href="https://trademark-list.openjsf.org">Trademark List</a> |{' '}
+ <a href="https://www.linuxfoundation.org/cookies">Cookie Policy</a>
+ </p>
</CopyrightContainer>
</CopyrightSection>
</Container>
diff --git a/website/src/components/header.js b/website/src/components/header.js
index c79151efe..183869478 100644
--- a/website/src/components/header.js
+++ b/website/src/components/header.js
@@ -92,7 +92,7 @@ export default class Header extends Component {
{item.text}
</StyledLink>
))}
- <StyledLogo href="https://openvisualization.org" target="_blank"/>
+ <StyledLogo href="https://openvisualization.org" target="_blank" />
</div>
</StyledHeader>
);
diff --git a/website/src/components/policy.js b/website/src/components/policy.js
index 39328d531..6433f7713 100644
--- a/website/src/components/policy.js
+++ b/website/src/components/policy.js
@@ -71,8 +71,8 @@ export default class Home extends PureComponent {
Please review the applicable{' '}
<a href={CONTRIBUTING_URL}>contributing guidelines</a> and procedures in
connection with your submissions. Please note that the Kepler.gl project and
- OpenJS Foundation do not otherwise provide support for users of
- Kepler.gl software.
+ OpenJS Foundation do not otherwise provide support for users of Kepler.gl
+ software.
</span>
</div>
</StyledCaption>
diff --git a/yarn.lock b/yarn.lock
index 6b7f43cf9..04f515a75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2021,7 +2021,7 @@ __metadata:
languageName: node
linkType: hard
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.3.1, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.2.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
version: 7.25.0
resolution: "@babel/runtime@npm:7.25.0"
dependencies:
@@ -2116,191 +2116,263 @@ __metadata:
languageName: node
linkType: hard
-"@danmarshall/deckgl-typings@npm:4.9.12":
- version: 4.9.12
- resolution: "@danmarshall/deckgl-typings@npm:4.9.12"
+"@deck.gl-community/editable-layers@npm:9.2.8":
+ version: 9.2.8
+ resolution: "@deck.gl-community/editable-layers@npm:9.2.8"
dependencies:
- "@types/hammerjs": "npm:^2.0.36"
- "@types/react": "npm:*"
- indefinitely-typed: "npm:^1.1.0"
- checksum: 10c0/7e2d500f79d0c900771b70c7781cc382deb25d18300163cf8df9eac70f866f89de9b7ac458ec2894252bc947aaf0e8eab4e7a3b0db3e6cb5300221fa10c3e7c1
- languageName: node
- linkType: hard
-
-"@danmarshall/deckgl-typings@npm:4.9.22":
- version: 4.9.22
- resolution: "@danmarshall/deckgl-typings@npm:4.9.22"
- dependencies:
- "@types/hammerjs": "npm:^2.0.36"
- "@types/react": "npm:*"
- indefinitely-typed: "npm:^1.1.0"
- checksum: 10c0/50cdbaaf91505f531e4e14526473b7c911f339ab7e7f91ffe9fdff705f221a0bd3ba3418213509cabd4d32e832a4b0ba63749c449483e93d3e6a7e47a5a08c68
+ "@math.gl/web-mercator": "npm:>=4.0.1"
+ "@turf/along": "npm:^7.2.0"
+ "@turf/area": "npm:^7.2.0"
+ "@turf/bbox": "npm:^7.2.0"
+ "@turf/bbox-polygon": "npm:^7.2.0"
+ "@turf/bearing": "npm:^7.2.0"
+ "@turf/boolean-point-in-polygon": "npm:^7.2.0"
+ "@turf/boolean-within": "npm:^7.2.0"
+ "@turf/buffer": "npm:^7.2.0"
+ "@turf/center": "npm:^7.2.0"
+ "@turf/centroid": "npm:^7.2.0"
+ "@turf/circle": "npm:^7.2.0"
+ "@turf/clone": "npm:^7.2.0"
+ "@turf/destination": "npm:^7.2.0"
+ "@turf/difference": "npm:^7.2.0"
+ "@turf/distance": "npm:^7.2.0"
+ "@turf/ellipse": "npm:^7.2.0"
+ "@turf/helpers": "npm:^7.2.0"
+ "@turf/intersect": "npm:^7.2.0"
+ "@turf/invariant": "npm:^7.2.0"
+ "@turf/kinks": "npm:^7.2.0"
+ "@turf/line-intersect": "npm:^7.2.0"
+ "@turf/meta": "npm:^7.2.0"
+ "@turf/midpoint": "npm:^7.2.0"
+ "@turf/nearest-point-on-line": "npm:^7.2.0"
+ "@turf/point-to-line-distance": "npm:^7.2.0"
+ "@turf/polygon-to-line": "npm:^7.2.0"
+ "@turf/rewind": "npm:^7.2.0"
+ "@turf/rhumb-bearing": "npm:^7.2.0"
+ "@turf/rhumb-destination": "npm:^7.2.0"
+ "@turf/rhumb-distance": "npm:^7.2.0"
+ "@turf/transform-rotate": "npm:^7.2.0"
+ "@turf/transform-scale": "npm:^7.2.0"
+ "@turf/transform-translate": "npm:^7.2.0"
+ "@turf/union": "npm:^7.2.0"
+ "@types/geojson": "npm:^7946.0.16"
+ eventemitter3: "npm:^5.0.0"
+ lodash.omit: "npm:^4.1.1"
+ lodash.throttle: "npm:^4.1.1"
+ preact: "npm:^10.17.0"
+ uuid: "npm:9.0.0"
+ peerDependencies:
+ "@deck.gl-community/layers": ^9.2.0-beta
+ "@deck.gl/core": ~9.2.8
+ "@deck.gl/extensions": ~9.2.8
+ "@deck.gl/geo-layers": ~9.2.8
+ "@deck.gl/layers": ~9.2.8
+ "@deck.gl/mesh-layers": ~9.2.8
+ "@luma.gl/constants": ~9.2.6
+ "@luma.gl/core": ~9.2.6
+ "@luma.gl/engine": ~9.2.6
+ "@math.gl/core": ">=4.0.1"
+ checksum: 10c0/05b141776e699c3616d8d8521eb0d130c516d3adabb403efa85937adc7d5346491a713a580831e0c93f49c7018ae8f4384c543927513e768f92646d887e41073
+ languageName: node
+ linkType: hard
+
+"@deck.gl-community/layers@npm:9.2.8":
+ version: 9.2.8
+ resolution: "@deck.gl-community/layers@npm:9.2.8"
+ dependencies:
+ "@deck.gl/core": "npm:~9.2.8"
+ "@deck.gl/layers": "npm:~9.2.8"
+ "@deck.gl/mesh-layers": "npm:~9.2.8"
+ "@luma.gl/constants": "npm:~9.2.6"
+ "@luma.gl/core": "npm:~9.2.6"
+ "@luma.gl/engine": "npm:~9.2.6"
+ "@luma.gl/shadertools": "npm:~9.2.6"
+ "@math.gl/core": "npm:^4.0.0"
+ checksum: 10c0/43a2a3be7905c49aab4820470fd78a85a416ef05abad532e7be5492048b89f0445733f6b3f59f3cb2c73a9ec169c5334826d348d63d238247bb3aae250288cc7
languageName: node
linkType: hard
-"@deck.gl/aggregation-layers@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/aggregation-layers@npm:8.9.36"
+"@deck.gl/aggregation-layers@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/aggregation-layers@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@luma.gl/constants": "npm:^8.5.21"
- "@luma.gl/shadertools": "npm:^8.5.21"
- "@math.gl/web-mercator": "npm:^3.6.2"
+ "@luma.gl/constants": "npm:~9.2.6"
+ "@luma.gl/shadertools": "npm:~9.2.6"
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/web-mercator": "npm:^4.1.0"
d3-hexbin: "npm:^0.2.1"
peerDependencies:
- "@deck.gl/core": ^8.0.0
- "@deck.gl/layers": ^8.0.0
- "@luma.gl/core": ^8.0.0
- checksum: 10c0/a3ec6a2b6dc664a82302370de503379c9f9fb8f7fa741a5d0d99e5b971bcb4213d0411939a8894b74daa742e9053fc396f0181d1f5c06168d0cb71a0af4e7dfd
+ "@deck.gl/core": ~9.2.0
+ "@deck.gl/layers": ~9.2.0
+ "@luma.gl/core": ~9.2.6
+ "@luma.gl/engine": ~9.2.6
+ checksum: 10c0/78abe322947283e6a55062d8550eb91111ec1d829c6f09800753def4a3a9d862767270b1e98b192ebc7aca851559b74b813982f7c574d2cdbcf0851947d90f43
languageName: node
linkType: hard
-"@deck.gl/core@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/core@npm:8.9.36"
+"@deck.gl/core@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/core@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@loaders.gl/core": "npm:^3.4.13"
- "@loaders.gl/images": "npm:^3.4.13"
- "@luma.gl/constants": "npm:^8.5.21"
- "@luma.gl/core": "npm:^8.5.21"
- "@luma.gl/webgl": "npm:^8.5.21"
- "@math.gl/core": "npm:^3.6.2"
- "@math.gl/sun": "npm:^3.6.2"
- "@math.gl/web-mercator": "npm:^3.6.2"
- "@probe.gl/env": "npm:^3.5.0"
- "@probe.gl/log": "npm:^3.5.0"
- "@probe.gl/stats": "npm:^3.5.0"
+ "@loaders.gl/core": "npm:~4.3.4"
+ "@loaders.gl/images": "npm:~4.3.4"
+ "@luma.gl/constants": "npm:~9.2.6"
+ "@luma.gl/core": "npm:~9.2.6"
+ "@luma.gl/engine": "npm:~9.2.6"
+ "@luma.gl/shadertools": "npm:~9.2.6"
+ "@luma.gl/webgl": "npm:~9.2.6"
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/sun": "npm:^4.1.0"
+ "@math.gl/types": "npm:^4.1.0"
+ "@math.gl/web-mercator": "npm:^4.1.0"
+ "@probe.gl/env": "npm:^4.1.1"
+ "@probe.gl/log": "npm:^4.1.1"
+ "@probe.gl/stats": "npm:^4.1.1"
+ "@types/offscreencanvas": "npm:^2019.6.4"
gl-matrix: "npm:^3.0.0"
- math.gl: "npm:^3.6.2"
- mjolnir.js: "npm:^2.7.0"
- checksum: 10c0/71ae7b6fea9930300f519e56eb7168d613b9366c85bc71ef2d3905f6bd49bad96e8b4b3994aac06df44230be566ebf3d0f9ae6f3f26d893fc952000a84b80085
+ mjolnir.js: "npm:^3.0.0"
+ checksum: 10c0/68d8b3811feca1dd72a5dc8faac8e70e09424e7d5ddd4eaf2a0f56ba35a8e4c5ae742d06bffac4cf8397841b537c9081b8f8c3a01cc3482b8832c126a1c06036
languageName: node
linkType: hard
-"@deck.gl/extensions@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/extensions@npm:8.9.36"
+"@deck.gl/extensions@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/extensions@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@luma.gl/shadertools": "npm:^8.5.21"
+ "@luma.gl/constants": "npm:~9.2.6"
+ "@luma.gl/shadertools": "npm:~9.2.6"
+ "@math.gl/core": "npm:^4.1.0"
peerDependencies:
- "@deck.gl/core": ^8.0.0
- "@luma.gl/constants": ^8.0.0
- "@luma.gl/core": ^8.0.0
- "@math.gl/core": ^3.6.2
- "@math.gl/web-mercator": ^3.6.2
- gl-matrix: ^3.0.0
- checksum: 10c0/8e3f020bfd5febe1feabaf905d5d6e080a242ab463d48eef0ce362298977b28797feaa4d39ff36a0709660e933d661621eb43a29fbbeeb0daf21819c3ccc27a8
+ "@deck.gl/core": ~9.2.0
+ "@luma.gl/core": ~9.2.6
+ "@luma.gl/engine": ~9.2.6
+ checksum: 10c0/209e58d6b5ff912425b5bb3668355c3ec945bd0e24476197a92b4653cac095c7721d3a74f29d1ece4489d6ef8c21d50c8311b1007eefa1e93e72d2cb1de4da92
languageName: node
linkType: hard
-"@deck.gl/geo-layers@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/geo-layers@npm:8.9.36"
+"@deck.gl/geo-layers@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/geo-layers@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@loaders.gl/3d-tiles": "npm:^3.4.13"
- "@loaders.gl/gis": "npm:^3.4.13"
- "@loaders.gl/loader-utils": "npm:^3.4.13"
- "@loaders.gl/mvt": "npm:^3.4.13"
- "@loaders.gl/schema": "npm:^3.4.13"
- "@loaders.gl/terrain": "npm:^3.4.13"
- "@loaders.gl/tiles": "npm:^3.4.13"
- "@loaders.gl/wms": "npm:^3.4.13"
- "@luma.gl/constants": "npm:^8.5.21"
- "@luma.gl/experimental": "npm:^8.5.21"
- "@math.gl/core": "npm:^3.6.2"
- "@math.gl/culling": "npm:^3.6.2"
- "@math.gl/web-mercator": "npm:^3.6.2"
+ "@loaders.gl/3d-tiles": "npm:~4.3.4"
+ "@loaders.gl/gis": "npm:~4.3.4"
+ "@loaders.gl/loader-utils": "npm:~4.3.4"
+ "@loaders.gl/mvt": "npm:~4.3.4"
+ "@loaders.gl/schema": "npm:~4.3.4"
+ "@loaders.gl/terrain": "npm:~4.3.4"
+ "@loaders.gl/tiles": "npm:~4.3.4"
+ "@loaders.gl/wms": "npm:~4.3.4"
+ "@luma.gl/gltf": "npm:~9.2.6"
+ "@luma.gl/shadertools": "npm:~9.2.6"
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/culling": "npm:^4.1.0"
+ "@math.gl/web-mercator": "npm:^4.1.0"
"@types/geojson": "npm:^7946.0.8"
- h3-js: "npm:^3.7.0"
+ a5-js: "npm:^0.5.0"
+ h3-js: "npm:^4.1.0"
long: "npm:^3.2.0"
peerDependencies:
- "@deck.gl/core": ^8.0.0
- "@deck.gl/extensions": ^8.0.0
- "@deck.gl/layers": ^8.0.0
- "@deck.gl/mesh-layers": ^8.0.0
- "@loaders.gl/core": ^3.4.13
- "@luma.gl/core": ^8.0.0
- checksum: 10c0/c5326b3fb22b1eb63bb2dd8abcf0db0e829700a8a20f19900c8e8471ad4dd8d28cc4a18bfe7931515659e83b9e878241743a9b4a47131b4723bb902e7bcf3841
+ "@deck.gl/core": ~9.2.0
+ "@deck.gl/extensions": ~9.2.0
+ "@deck.gl/layers": ~9.2.0
+ "@deck.gl/mesh-layers": ~9.2.0
+ "@loaders.gl/core": ~4.3.4
+ "@luma.gl/core": ~9.2.6
+ "@luma.gl/engine": ~9.2.6
+ checksum: 10c0/3921e0d9eb377dbbad9d50ea310f4fec3b445adde7791c4579e53c280fd1b0ce97d58dd4cc5abfe1726af233677b56df20f661cd6787b5b88fa9b1b999590a7a
languageName: node
linkType: hard
-"@deck.gl/layers@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/layers@npm:8.9.36"
+"@deck.gl/layers@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/layers@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@loaders.gl/images": "npm:^3.4.13"
- "@loaders.gl/schema": "npm:^3.4.13"
- "@luma.gl/constants": "npm:^8.5.21"
+ "@loaders.gl/images": "npm:~4.3.4"
+ "@loaders.gl/schema": "npm:~4.3.4"
+ "@luma.gl/shadertools": "npm:~9.2.6"
"@mapbox/tiny-sdf": "npm:^2.0.5"
- "@math.gl/core": "npm:^3.6.2"
- "@math.gl/polygon": "npm:^3.6.2"
- "@math.gl/web-mercator": "npm:^3.6.2"
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/polygon": "npm:^4.1.0"
+ "@math.gl/web-mercator": "npm:^4.1.0"
earcut: "npm:^2.2.4"
peerDependencies:
- "@deck.gl/core": ^8.0.0
- "@loaders.gl/core": ^3.4.13
- "@luma.gl/core": ^8.0.0
- checksum: 10c0/e3a7d1f57ccbc9c2fe7606bdc0a604d3e3598ef7eaa8d4b1b44ef295318a91a0a241ae3698b414830c8b6589281aa96f239856b071f52e283c552d58830a75da
+ "@deck.gl/core": ~9.2.0
+ "@loaders.gl/core": ~4.3.4
+ "@luma.gl/core": ~9.2.6
+ "@luma.gl/engine": ~9.2.6
+ checksum: 10c0/3f8199a9329f6ac58f1586fd80d5f6654b0613635e488d06cb9f0abcf486c5cc11c60467b0b91b3793b3029e77504f82b51696c92507cbf241c37fa6efce82ce
languageName: node
linkType: hard
-"@deck.gl/mapbox@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/mapbox@npm:8.9.36"
+"@deck.gl/mapbox@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/mapbox@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@types/mapbox-gl": "npm:^2.6.3"
+ "@luma.gl/constants": "npm:~9.2.6"
+ "@math.gl/web-mercator": "npm:^4.1.0"
peerDependencies:
- "@deck.gl/core": ^8.0.0
- checksum: 10c0/b77b77f14373e1db35d1143d0bb94f86545e09e9c1c41fa9db9b86bee34fcaa023ea0bf1b2d4d694b3750d1be99a80239ea38aeb9e09abca7102bf5fdd39864b
+ "@deck.gl/core": ~9.2.0
+ "@luma.gl/constants": ~9.2.6
+ "@luma.gl/core": ~9.2.6
+ "@math.gl/web-mercator": ^4.1.0
+ checksum: 10c0/9a2b57a43d4b26b53aa6e73c1b509d146a1496936dd0f78240bb648b12d30f65b2443e2594bf03a5fbc4a80e1fb7b73ab4132f82b5ef4ff9fd307bf63a8032a1
languageName: node
linkType: hard
-"@deck.gl/mesh-layers@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/mesh-layers@npm:8.9.36"
+"@deck.gl/mesh-layers@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/mesh-layers@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@loaders.gl/gltf": "npm:^3.4.13"
- "@luma.gl/constants": "npm:^8.5.21"
- "@luma.gl/experimental": "npm:^8.5.21"
- "@luma.gl/shadertools": "npm:^8.5.21"
+ "@loaders.gl/gltf": "npm:~4.3.4"
+ "@loaders.gl/schema": "npm:~4.3.4"
+ "@luma.gl/gltf": "npm:~9.2.6"
+ "@luma.gl/shadertools": "npm:~9.2.6"
peerDependencies:
- "@deck.gl/core": ^8.0.0
- "@luma.gl/core": ^8.0.0
- checksum: 10c0/8c1fcf6aeaaf5c710c3d4d0d107255d554799e61d16a12c59015513a3d2abffda354a0ff3d9370979e30189d9a5a68a083cc07cc83e385d7c519f50859d6164f
+ "@deck.gl/core": ~9.2.0
+ "@luma.gl/core": ~9.2.6
+ "@luma.gl/engine": ~9.2.6
+ "@luma.gl/gltf": ~9.2.6
+ "@luma.gl/shadertools": ~9.2.6
+ checksum: 10c0/6e05379b21ea1b218496b3fbc8c328ed0ffe34be7f7bb15fcfd35a04247ea423268307c79bb53555b6be79493b74fc013d9fc48c827ce9dc5125dd33b3ae887f
languageName: node
linkType: hard
-"@deck.gl/react@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/react@npm:8.9.36"
+"@deck.gl/react@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/react@npm:9.2.11"
+ peerDependencies:
+ "@deck.gl/core": ~9.2.0
+ "@deck.gl/widgets": ~9.2.0
+ react: ">=16.3.0"
+ react-dom: ">=16.3.0"
+ checksum: 10c0/0e162ef1b5a21683021145c661b886b5cc94164436f9dff2844710fc98a5c3c5c9a3a5eebe109cd77ca10c9c7823b9f0accce7cd0086bfc2f36c78c945599ce0
+ languageName: node
+ linkType: hard
+
+"@deck.gl/test-utils@npm:^9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/test-utils@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
+ "@luma.gl/test-utils": "npm:~9.2.6"
+ "@luma.gl/webgl": "npm:~9.2.6"
peerDependencies:
- "@deck.gl/core": ^8.0.0
- "@types/react": ">= 16.3"
- react: ">=16.3"
- react-dom: ">=16.3"
- checksum: 10c0/cf5af570c982041d73de0def96d75609db1bb2cecaa8d34f6f891ccf7c3c19a9e177dbbd5d97b537e6fc48daf845d5fa123e183a241cff518d606dee3f794c56
+ "@deck.gl/core": ~9.2.0
+ "@luma.gl/core": ~9.2.6
+ "@luma.gl/engine": ~9.2.6
+ "@probe.gl/test-utils": ^4.1.1
+ checksum: 10c0/d30d48cebe04df4a2690697fea16fe7eacdaaa0a0c46cc1cc977546f6bd284ff12d747b6c29a3b48d11f5c46a616d064575da28fd48867d3b6a1af539f2bd1fa
languageName: node
linkType: hard
-"@deck.gl/test-utils@npm:^8.9.27":
- version: 8.9.36
- resolution: "@deck.gl/test-utils@npm:8.9.36"
+"@deck.gl/widgets@npm:9.2.11":
+ version: 9.2.11
+ resolution: "@deck.gl/widgets@npm:9.2.11"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
+ preact: "npm:^10.17.0"
peerDependencies:
- "@deck.gl/core": ^8.0.0
- "@luma.gl/test-utils": ^8.5.0
- "@luma.gl/webgl": ^8.5.0
- "@probe.gl/test-utils": ^3.5.0
- checksum: 10c0/be595c81c6ad5b3021d84394433dab1a7e80574db1e5184cea7a572aae9b6b78328081eae5f3ed5a1cf3bd65944ca6db3da29b14c74f4f5cd6df186baaffccf3
+ "@deck.gl/core": ~9.2.0
+ "@luma.gl/core": ~9.2.6
+ checksum: 10c0/f4123f4e93aa1f1519d61637a1994b27835bd6a66274b767b1f3665e4d459679aebd57a17fde0f7e56b3f0e6500725e6fd4c263873900a0760b61959da9b022a
languageName: node
linkType: hard
@@ -4373,62 +4445,6 @@ __metadata:
languageName: node
linkType: hard
-"@hubble.gl/core@npm:1.4.0":
- version: 1.4.0
- resolution: "@hubble.gl/core@npm:1.4.0"
- dependencies:
- "@loaders.gl/core": "npm:^3.4.13"
- "@loaders.gl/video": "npm:^3.4.13"
- "@loaders.gl/zip": "npm:^3.4.13"
- "@math.gl/core": "npm:^3.6.0"
- "@math.gl/web-mercator": "npm:^3.6.2"
- "@probe.gl/log": "npm:^4.1.0"
- downloadjs: "npm:^1.4.7"
- popmotion: "npm:9.3.1"
- webm-writer: "npm:^1.0.0"
- peerDependencies:
- "@deck.gl/core": ">=8.3"
- "@luma.gl/core": ">=8.3"
- "@luma.gl/engine": ">=8.3"
- checksum: 10c0/147a05cc9b187a833b197cab5f7fe0e50dcdd0913ee117a5502f534a7b9050d521ee5818ef874935c8ab92db117f44220b4f4ffaebf8a3b9cb667dffad93057a
- languageName: node
- linkType: hard
-
-"@hubble.gl/react@npm:1.4.0":
- version: 1.4.0
- resolution: "@hubble.gl/react@npm:1.4.0"
- dependencies:
- "@kepler.gl/constants": "npm:3.1.0"
- "@loaders.gl/zip": "npm:^3.4.13"
- "@turf/helpers": "npm:^5.1.5"
- "@turf/transform-translate": "npm:^5.1.5"
- classnames: "npm:^2.3.1"
- fuzzy: "npm:^0.1.3"
- global: "npm:^4.4.0"
- lodash.get: "npm:^4.4.2"
- lodash.isequal: "npm:^4.5.0"
- lodash.uniqby: "npm:^4.7.0"
- mapbox-gl: "npm:1.13.1"
- popmotion: "npm:9.3.1"
- prop-types: "npm:^15.7.2"
- react-lifecycles-compat: "npm:^3.0.4"
- react-map-gl: "npm:^7.1.8"
- react-modal: "npm:^3.8.1"
- react-onclickoutside: "npm:^6.9.0"
- reselect: "npm:^3.0.0"
- styled-components: "npm:6.1.8"
- peerDependencies:
- "@deck.gl/core": ">=8.3"
- "@deck.gl/mapbox": ">=8.3"
- "@deck.gl/react": ">=8.3"
- "@hubble.gl/core": ^1.4.0
- "@loaders.gl/core": ^3.4.13
- react: ">=18.2"
- react-dom: ">=18.2"
- checksum: 10c0/56aff2be72a74c61965bf627aff40a3b17d15346d0c221988b14711138251cdc4df038087c2c7b2968a523fc6b0074ae9acdb16d5e38930d1c41ed5124bcb184
- languageName: node
- linkType: hard
-
"@humanwhocodes/config-array@npm:^0.11.13":
version: 0.11.14
resolution: "@humanwhocodes/config-array@npm:0.11.14"
@@ -4837,7 +4853,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@kepler.gl/actions@workspace:src/actions"
dependencies:
- "@deck.gl/core": "npm:^8.9.27"
+ "@deck.gl/core": "npm:^9.2.11"
"@kepler.gl/cloud-providers": "npm:3.2.6"
"@kepler.gl/constants": "npm:3.2.6"
"@kepler.gl/layers": "npm:3.2.6"
@@ -4914,8 +4930,10 @@ __metadata:
version: 0.0.0-use.local
resolution: "@kepler.gl/components@workspace:src/components"
dependencies:
- "@deck.gl/core": "npm:^8.9.27"
- "@deck.gl/react": "npm:^8.9.27"
+ "@deck.gl-community/editable-layers": "npm:9.2.8"
+ "@deck.gl/core": "npm:^9.2.11"
+ "@deck.gl/react": "npm:^9.2.11"
+ "@deck.gl/widgets": "npm:^9.2.11"
"@dnd-kit/core": "npm:^6.1.0"
"@dnd-kit/modifiers": "npm:^7.0.0"
"@dnd-kit/sortable": "npm:^8.0.0"
@@ -4936,11 +4954,10 @@ __metadata:
"@kepler.gl/table": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
"@kepler.gl/utils": "npm:3.2.6"
- "@loaders.gl/mvt": "npm:^4.3.2"
- "@loaders.gl/pmtiles": "npm:^4.3.2"
- "@loaders.gl/wms": "npm:4.3.2"
+ "@loaders.gl/mvt": "npm:^4.3.4"
+ "@loaders.gl/pmtiles": "npm:^4.3.4"
+ "@loaders.gl/wms": "npm:4.3.4"
"@mapbox/mapbox-sdk": "npm:^0.15.3"
- "@nebula.gl/edit-modes": "npm:1.0.2-alpha.1"
"@tippyjs/react": "npm:^4.2.0"
"@types/classnames": "npm:^2.3.1"
"@types/d3-array": "npm:^2.8.0"
@@ -4975,7 +4992,7 @@ __metadata:
mapbox-gl: "npm:1.13.1"
maplibre-gl: "npm:^3.6.2"
markdown-to-jsx: "npm:^7.7.6"
- mjolnir.js: "npm:^2.7.0"
+ mjolnir.js: "npm:^3.0.0"
moment: "npm:^2.10.6"
moment-timezone: "npm:^0.5.35"
prop-types: "npm:^15.6.0"
@@ -5003,28 +5020,6 @@ __metadata:
languageName: unknown
linkType: soft
-"@kepler.gl/constants@npm:3.1.0":
- version: 3.1.0
- resolution: "@kepler.gl/constants@npm:3.1.0"
- dependencies:
- "@dnd-kit/core": "npm:^6.1.0"
- "@dnd-kit/modifiers": "npm:^7.0.0"
- "@kepler.gl/types": "npm:3.1.0"
- "@types/d3-scale": "npm:^3.2.2"
- "@types/keymirror": "npm:^0.1.1"
- chroma-js: "npm:2.1.2"
- colorbrewer: "npm:^1.5.0"
- d3-array: "npm:^2.8.0"
- d3-color: "npm:^2.0.0"
- d3-scale: "npm:^3.2.3"
- d3-scale-chromatic: "npm:2.0.0"
- d3-time: "npm:^2.0.0"
- global: "npm:^4.3.0"
- keymirror: "npm:^0.1.1"
- checksum: 10c0/0ad75545f80e902752fe9046d424d585e58ecef4c1595a8362ad7906f629313d8bf818dc6a9221cb427356c3167c9ab63fd74ffdd3b1a3b45c8a4e5447d24d47
- languageName: node
- linkType: hard
-
"@kepler.gl/constants@npm:3.2.6, @kepler.gl/constants@npm:^3.2.6, @kepler.gl/constants@workspace:src/constants":
version: 0.0.0-use.local
resolution: "@kepler.gl/constants@workspace:src/constants"
@@ -5058,10 +5053,10 @@ __metadata:
apache-arrow: "npm:>=15"
threads: "npm:^1.7.0"
peerDependencies:
- "@deck.gl/aggregation-layers": ^8.9.27
- "@deck.gl/core": ^8.9.27
- "@deck.gl/geo-layers": ^8.9.27
- "@deck.gl/layers": ^8.9.27
+ "@deck.gl/aggregation-layers": ^9.2.11
+ "@deck.gl/core": ^9.2.11
+ "@deck.gl/geo-layers": ^9.2.11
+ "@deck.gl/layers": ^9.2.11
languageName: unknown
linkType: soft
@@ -5069,20 +5064,21 @@ __metadata:
version: 0.0.0-use.local
resolution: "@kepler.gl/deckgl-layers@workspace:src/deckgl-layers"
dependencies:
- "@danmarshall/deckgl-typings": "npm:4.9.22"
- "@deck.gl/aggregation-layers": "npm:^8.9.27"
- "@deck.gl/core": "npm:^8.9.27"
- "@deck.gl/geo-layers": "npm:^8.9.27"
- "@deck.gl/layers": "npm:^8.9.27"
+ "@deck.gl/aggregation-layers": "npm:^9.2.11"
+ "@deck.gl/core": "npm:^9.2.11"
+ "@deck.gl/geo-layers": "npm:^9.2.11"
+ "@deck.gl/layers": "npm:^9.2.11"
"@kepler.gl/constants": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
"@kepler.gl/utils": "npm:3.2.6"
- "@loaders.gl/wms": "npm:4.3.2"
- "@luma.gl/constants": "npm:^8.5.20"
- "@luma.gl/core": "npm:^8.5.20"
+ "@loaders.gl/wms": "npm:4.3.4"
+ "@luma.gl/constants": "npm:^9.2.6"
+ "@luma.gl/core": "npm:^9.2.6"
+ "@luma.gl/engine": "npm:^9.2.6"
+ "@luma.gl/webgl": "npm:^9.2.6"
"@mapbox/geo-viewport": "npm:^0.4.1"
"@mapbox/vector-tile": "npm:^1.3.1"
- "@math.gl/web-mercator": "npm:^3.6.2"
+ "@math.gl/web-mercator": "npm:^4.1.0"
"@types/d3-array": "npm:^2.8.0"
"@types/geojson": "npm:^7946.0.8"
"@types/lodash": "npm:4.17.5"
@@ -5119,13 +5115,15 @@ __metadata:
version: 0.0.0-use.local
resolution: "@kepler.gl/effects@workspace:src/effects"
dependencies:
- "@deck.gl/core": "npm:^8.9.27"
+ "@deck.gl/core": "npm:^9.2.11"
"@kepler.gl/common-utils": "npm:3.2.6"
"@kepler.gl/constants": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
"@kepler.gl/utils": "npm:3.2.6"
- "@luma.gl/core": "npm:^8.5.20"
- "@luma.gl/shadertools": "npm:^8.5.20"
+ "@luma.gl/core": "npm:^9.2.6"
+ "@luma.gl/effects": "npm:^9.2.6"
+ "@luma.gl/engine": "npm:^9.2.6"
+ "@luma.gl/shadertools": "npm:^9.2.6"
moment-timezone: "npm:^0.5.35"
suncalc: "npm:^1.9.0"
languageName: unknown
@@ -5135,12 +5133,12 @@ __metadata:
version: 0.0.0-use.local
resolution: "@kepler.gl/layers@workspace:src/layers"
dependencies:
- "@danmarshall/deckgl-typings": "npm:4.9.22"
- "@deck.gl/core": "npm:^8.9.27"
- "@deck.gl/extensions": "npm:^8.9.27"
- "@deck.gl/geo-layers": "npm:^8.9.27"
- "@deck.gl/layers": "npm:^8.9.27"
- "@deck.gl/mesh-layers": "npm:^8.9.27"
+ "@deck.gl-community/editable-layers": "npm:9.2.8"
+ "@deck.gl/core": "npm:^9.2.11"
+ "@deck.gl/extensions": "npm:^9.2.11"
+ "@deck.gl/geo-layers": "npm:^9.2.11"
+ "@deck.gl/layers": "npm:^9.2.11"
+ "@deck.gl/mesh-layers": "npm:^9.2.11"
"@kepler.gl/common-utils": "npm:3.2.6"
"@kepler.gl/constants": "npm:3.2.6"
"@kepler.gl/deckgl-arrow-layers": "npm:3.2.6"
@@ -5149,19 +5147,20 @@ __metadata:
"@kepler.gl/table": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
"@kepler.gl/utils": "npm:3.2.6"
- "@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/mvt": "npm:^4.3.2"
- "@loaders.gl/parquet": "npm:^4.3.2"
- "@loaders.gl/pmtiles": "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"
+ "@loaders.gl/3d-tiles": "npm:4.3.4"
+ "@loaders.gl/arrow": "npm:^4.3.4"
+ "@loaders.gl/core": "npm:^4.3.4"
+ "@loaders.gl/gis": "npm:^4.3.4"
+ "@loaders.gl/gltf": "npm:^4.3.4"
+ "@loaders.gl/i3s": "npm:4.3.4"
+ "@loaders.gl/mvt": "npm:^4.3.4"
+ "@loaders.gl/parquet": "npm:^4.3.4"
+ "@loaders.gl/pmtiles": "npm:^4.3.4"
+ "@loaders.gl/schema": "npm:^4.3.4"
+ "@loaders.gl/wkt": "npm:^4.3.4"
+ "@luma.gl/constants": "npm:^9.2.6"
+ "@luma.gl/core": "npm:^9.2.6"
"@mapbox/geojson-normalize": "npm:0.0.1"
- "@nebula.gl/edit-modes": "npm:1.0.2-alpha.1"
- "@nebula.gl/layers": "npm:1.0.2-alpha.1"
"@turf/bbox": "npm:^6.0.1"
"@turf/boolean-within": "npm:^6.0.1"
"@turf/center": "npm:^6.0.1"
@@ -5204,24 +5203,23 @@ __metadata:
version: 0.0.0-use.local
resolution: "@kepler.gl/processors@workspace:src/processors"
dependencies:
- "@danmarshall/deckgl-typings": "npm:4.9.22"
+ "@deck.gl-community/editable-layers": "npm:9.2.8"
"@kepler.gl/common-utils": "npm:3.2.6"
"@kepler.gl/constants": "npm:3.2.6"
"@kepler.gl/schemas": "npm:3.2.6"
"@kepler.gl/table": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
"@kepler.gl/utils": "npm:3.2.6"
- "@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"
- "@loaders.gl/schema": "npm:^4.3.2"
- "@loaders.gl/wkt": "npm:^4.3.2"
+ "@loaders.gl/arrow": "npm:^4.3.4"
+ "@loaders.gl/core": "npm:^4.3.4"
+ "@loaders.gl/csv": "npm:^4.3.4"
+ "@loaders.gl/gis": "npm:^4.3.4"
+ "@loaders.gl/json": "npm:^4.3.4"
+ "@loaders.gl/loader-utils": "npm:^4.3.4"
+ "@loaders.gl/parquet": "npm:^4.3.4"
+ "@loaders.gl/schema": "npm:^4.3.4"
+ "@loaders.gl/wkt": "npm:^4.3.4"
"@mapbox/geojson-normalize": "npm:0.0.1"
- "@nebula.gl/edit-modes": "npm:1.0.2-alpha.1"
"@turf/helpers": "npm:^6.1.4"
apache-arrow: "npm:>=15.0.0"
d3-dsv: "npm:^2.0.0"
@@ -5248,9 +5246,9 @@ __metadata:
"@kepler.gl/tasks": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
"@kepler.gl/utils": "npm:3.2.6"
- "@loaders.gl/loader-utils": "npm:^4.3.2"
+ "@loaders.gl/loader-utils": "npm:^4.3.4"
"@mapbox/geo-viewport": "npm:^0.4.1"
- "@math.gl/web-mercator": "npm:^3.6.2"
+ "@math.gl/web-mercator": "npm:^4.1.0"
"@turf/bbox": "npm:^6.0.1"
"@turf/bbox-polygon": "npm:^6.0.1"
"@turf/boolean-within": "npm:^6.0.1"
@@ -5279,7 +5277,7 @@ __metadata:
"@kepler.gl/table": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
"@kepler.gl/utils": "npm:3.2.6"
- "@loaders.gl/loader-utils": "npm:^4.3.2"
+ "@loaders.gl/loader-utils": "npm:^4.3.4"
"@types/keymirror": "npm:^0.1.1"
"@types/lodash": "npm:4.17.5"
apache-arrow: "npm:>=15.0.0"
@@ -5307,8 +5305,8 @@ __metadata:
"@kepler.gl/constants": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
"@kepler.gl/utils": "npm:3.2.6"
- "@loaders.gl/mvt": "npm:^4.3.2"
- "@loaders.gl/pmtiles": "npm:^4.3.2"
+ "@loaders.gl/mvt": "npm:^4.3.4"
+ "@loaders.gl/pmtiles": "npm:^4.3.4"
"@types/d3-array": "npm:^2.8.0"
"@types/lodash": "npm:4.17.5"
d3-array: "npm:^2.8.0"
@@ -5329,13 +5327,6 @@ __metadata:
languageName: unknown
linkType: soft
-"@kepler.gl/types@npm:3.1.0":
- version: 3.1.0
- resolution: "@kepler.gl/types@npm:3.1.0"
- checksum: 10c0/af3e25cf6d04b264f46c9e303f3f0da1a4f9ad993a13ca67ffb7f7e24ead552f48b8a6139b7e58c2e9f39ca8582c7b0b7a370b55ba5783a62a98a0af7250dcca
- languageName: node
- linkType: hard
-
"@kepler.gl/types@npm:3.2.6, @kepler.gl/types@workspace:src/types":
version: 0.0.0-use.local
resolution: "@kepler.gl/types@workspace:src/types"
@@ -5346,13 +5337,13 @@ __metadata:
version: 0.0.0-use.local
resolution: "@kepler.gl/utils@workspace:src/utils"
dependencies:
- "@deck.gl/core": "npm:^8.9.27"
+ "@deck.gl/core": "npm:^9.2.11"
"@kepler.gl/common-utils": "npm:3.2.6"
"@kepler.gl/constants": "npm:3.2.6"
"@kepler.gl/types": "npm:3.2.6"
- "@loaders.gl/arrow": "npm:^4.3.2"
- "@luma.gl/constants": "npm:^8.5.20"
- "@luma.gl/core": "npm:^8.5.20"
+ "@loaders.gl/arrow": "npm:^4.3.4"
+ "@luma.gl/constants": "npm:^9.2.6"
+ "@luma.gl/core": "npm:^9.2.6"
"@mapbox/geo-viewport": "npm:^0.4.1"
"@turf/boolean-within": "npm:^6.0.1"
"@turf/helpers": "npm:^6.1.4"
@@ -5421,62 +5412,68 @@ __metadata:
languageName: node
linkType: hard
-"@loaders.gl/3d-tiles@npm:^3.4.13":
- version: 3.4.15
- resolution: "@loaders.gl/3d-tiles@npm:3.4.15"
- dependencies:
- "@loaders.gl/draco": "npm:3.4.15"
- "@loaders.gl/gltf": "npm:3.4.15"
- "@loaders.gl/loader-utils": "npm:3.4.15"
- "@loaders.gl/math": "npm:3.4.15"
- "@loaders.gl/tiles": "npm:3.4.15"
- "@math.gl/core": "npm:^3.5.1"
- "@math.gl/geospatial": "npm:^3.5.1"
+"@loaders.gl/3d-tiles@npm:4.3.4, @loaders.gl/3d-tiles@npm:~4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/3d-tiles@npm:4.3.4"
+ dependencies:
+ "@loaders.gl/compression": "npm:4.3.4"
+ "@loaders.gl/crypto": "npm:4.3.4"
+ "@loaders.gl/draco": "npm:4.3.4"
+ "@loaders.gl/gltf": "npm:4.3.4"
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/math": "npm:4.3.4"
+ "@loaders.gl/tiles": "npm:4.3.4"
+ "@loaders.gl/zip": "npm:4.3.4"
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/culling": "npm:^4.1.0"
+ "@math.gl/geospatial": "npm:^4.1.0"
+ "@probe.gl/log": "npm:^4.0.4"
long: "npm:^5.2.1"
peerDependencies:
- "@loaders.gl/core": ^3.4.0
- checksum: 10c0/5826642c7dda7277d536705de59b6cb562e6c6f70852fd8b59feaab37c298768d95a9a982756536142c990b711fa4e37c4f6b160bdb6bec30ae9ea4f0f8a0770
+ "@loaders.gl/core": ^4.3.0
+ checksum: 10c0/46517b76c026940f858d0c771b531624279a15773ce2e2d3295fe1611019924d15996c402f33e224383c1113b831533f811c2fa691737ca47dfe2c7d40421b37
languageName: node
linkType: hard
-"@loaders.gl/arrow@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/arrow@npm:4.3.2"
+"@loaders.gl/arrow@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/arrow@npm:4.3.4"
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"
+ "@loaders.gl/gis": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/wkt": "npm:4.3.4"
+ "@loaders.gl/worker-utils": "npm:4.3.4"
"@math.gl/polygon": "npm:^4.1.0"
apache-arrow: "npm:>= 15.0.0"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/009a3cb32fbdcda3806211a4ceab8ac4037c37b93a67e8da361c23005885ae24190132cac4ca67580dfcf513a0a24642b30f23acd1df9d136505eec3475aba76
+ checksum: 10c0/4d30e7088c25faa424527c2d60370b79f758b0ab9f7b557a8a20cdf71d9ef43c6cc988b3bc8638e0628078af861b0b15f28a2076c46da641070fe90f223b70cf
languageName: node
linkType: hard
-"@loaders.gl/bson@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/bson@npm:4.3.2"
+"@loaders.gl/bson@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/bson@npm:4.3.4"
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/gis": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
"@types/bson": "npm:4.2.0"
bson: "npm:4.2.0"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/0b3a9bde4d53db3ba8918e432ff65e35e8c1f98a0b6b84d2c8da55b98055562dc09769933aeb988bdca8349c15baaba484a55790259fcc72ed54c0b076d1acd9
+ checksum: 10c0/b5a653884d6f2384c295ae7aceb91b088932c9e3b8817542ee1045c12b4fe28736a976439e9f5ecfd275c96217db6f9ba4be2a6e1e2b0ae03cb16660a0a6f876
languageName: node
linkType: hard
-"@loaders.gl/compression@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/compression@npm:4.3.2"
+"@loaders.gl/compression@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/compression@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:4.3.2"
- "@loaders.gl/worker-utils": "npm:4.3.2"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/worker-utils": "npm:4.3.4"
"@types/brotli": "npm:^1.3.0"
"@types/pako": "npm:^1.0.1"
brotli: "npm:^1.3.2"
@@ -5495,203 +5492,195 @@ __metadata:
optional: true
zstd-codec:
optional: true
- checksum: 10c0/0fa9ee1d9a57707e069b66966396999e54a23188d94f5dcd98b7409c0654c0cff396971f835d59e368b5e6e55c8517af8cc58c59bd3f7d5e22065779f0aee97a
+ checksum: 10c0/ced3fd4054eb9d54adbfdb5d779f44d7a41b7a2060d73873797a6585f0dfb740f3a481cfd615f4d8ce87f0fd5ed554f436bc29a64cb5230cce1b5fc2cd191f68
languageName: node
linkType: hard
-"@loaders.gl/core@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/core@npm:4.3.2"
+"@loaders.gl/core@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/core@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:4.3.2"
- "@loaders.gl/schema": "npm:4.3.2"
- "@loaders.gl/worker-utils": "npm:4.3.2"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/worker-utils": "npm:4.3.4"
"@probe.gl/log": "npm:^4.0.2"
- checksum: 10c0/3dbc564707996f376221e49f6ceaa53c8ce1b8026af591cbdce5c6eb87ffaeddc5e4174c0f4c4f2b589c5c586a4fa0045b6891d196ea3a6929d9a8ce1a6ae9e5
+ checksum: 10c0/6ca8a1676cbbd700e47d7f1325afd7a6210cced70bdcc5d8d57945b7074597c7a4913eb37410bc25152f30c7dae1b1c32448fee7c6999e851a982a8d4e2576ad
languageName: node
linkType: hard
-"@loaders.gl/crypto@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/crypto@npm:4.3.2"
+"@loaders.gl/crypto@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/crypto@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:4.3.2"
- "@loaders.gl/worker-utils": "npm:4.3.2"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/worker-utils": "npm:4.3.4"
"@types/crypto-js": "npm:^4.0.2"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/0fd54c933dc6fb4545fdfccca9173fc3c6f7324aa4ec190ac2211da31f0054dad18a101caaa469195f9f0ae6ae6e62958e14ceabf458b478f0f27c83c9892255
+ checksum: 10c0/7544f932b25836411eca9a9687c1fe33993405cf912594e0119f44e72ff243959e851db701daec0b29563ddfe70eae69c8d5616424de742a11ff7782b8ae3d28
languageName: node
linkType: hard
-"@loaders.gl/csv@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/csv@npm:4.3.2"
+"@loaders.gl/csv@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/csv@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:4.3.2"
- "@loaders.gl/schema": "npm:4.3.2"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
d3-dsv: "npm:^1.2.0"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/69fb75b0957b4765b0d70dfa2519aa41fcb0da428574d3ab92192db783c140acc4fa417555856456e46258bd087edbac0f9072a1e2f98f9cae1f9c2aaa616185
+ checksum: 10c0/aa591cb65e78d078123ec75953f2b3f5f41f104a6d9a426e37eac9747f1a1163eaf6d4e4368f3125fc729939a46b014273a8104656092a4ceffb40b800238df7
languageName: node
linkType: hard
-"@loaders.gl/draco@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/draco@npm:4.3.2"
+"@loaders.gl/draco@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/draco@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:4.3.2"
- "@loaders.gl/schema": "npm:4.3.2"
- "@loaders.gl/worker-utils": "npm:4.3.2"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/worker-utils": "npm:4.3.4"
draco3d: "npm:1.5.7"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/33f8b992311cd341d5ae0410a2f614c27f8a864c0bb93e3749d9845f14bab06b2262553513e135e9c2ddc390364d1de2798efed1362511b2d4225c320e175dea
+ checksum: 10c0/395b041595209fdbdb3bd846e04b4d5a06990d9a42aab66da4444e0b9b560db11e254beffecab181f61135d849e166de5b939e544b0661a82a72cb54cb3b040c
languageName: node
linkType: hard
-"@loaders.gl/gis@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/gis@npm:4.3.2"
+"@loaders.gl/gis@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/gis@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:4.3.2"
- "@loaders.gl/schema": "npm:4.3.2"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
"@mapbox/vector-tile": "npm:^1.3.1"
"@math.gl/polygon": "npm:^4.1.0"
pbf: "npm:^3.2.1"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/b8c643bc9bddeaf3a34b6ea162a36bd7f1943898a326e441a52e6340f248e7fe1be3a031945b0fb46f004a3a0578e25cf7435d54fab5cdb92597aefc1083a43d
+ checksum: 10c0/45a8a957d29502d50db40b5f17cb7df58eccbea56c4fad31d92b2cce08b7e06b7abc5cd1f9ac1d498091386fd61d588167530099d010424c21dc7f1ca76850f9
languageName: node
linkType: hard
-"@loaders.gl/gltf@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/gltf@npm:4.3.2"
+"@loaders.gl/gltf@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/gltf@npm:4.3.4"
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"
+ "@loaders.gl/draco": "npm:4.3.4"
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/textures": "npm:4.3.4"
"@math.gl/core": "npm:^4.1.0"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/79ac51980b054ae20938f2dfde08389c007efbafe580ffcb43c2ef923cc9af92a21b46d665766a83b832aa3e39d62c27981fea03d5923bead43d94a49810dec6
+ checksum: 10c0/78537dc8e83731563a3aae4679a4544728ce822656a0e2bb520cc1c97efdd2ac36d914e41e8eb3232c3728b58d7e809031538e03c5f4946e3516b5a6708a1ea7
languageName: node
linkType: hard
-"@loaders.gl/images@npm:3.4.15, @loaders.gl/images@npm:^3.4.13":
- version: 3.4.15
- resolution: "@loaders.gl/images@npm:3.4.15"
- dependencies:
- "@loaders.gl/loader-utils": "npm:3.4.15"
- checksum: 10c0/861db0e3a0dd4da84a5c211459662900a546df9abcdddae47aa21f133247b5d623035654e23d0cf84fd5251b4ea265d93c7f4c44f9636019b2b9d3819fe3e1ca
- languageName: node
- linkType: hard
-
-"@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.3.2"
+"@loaders.gl/i3s@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/i3s@npm:4.3.4"
+ dependencies:
+ "@loaders.gl/compression": "npm:4.3.4"
+ "@loaders.gl/crypto": "npm:4.3.4"
+ "@loaders.gl/draco": "npm:4.3.4"
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/math": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/textures": "npm:4.3.4"
+ "@loaders.gl/tiles": "npm:4.3.4"
+ "@loaders.gl/zip": "npm:4.3.4"
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/culling": "npm:^4.1.0"
+ "@math.gl/geospatial": "npm:^4.1.0"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/2fc2f32880436dbf28d14b642fe2007b41372951b65248e5c5c4dd1bc631236af387b0561b4f5fb2ad85fe72852be79b26c91fa206980aa8d57465d21ba332b3
+ checksum: 10c0/bfed6209eecf89833f43106cd88f7c93b262700e587466e58e4f66a056c4d4986edbeea9dfb8352d7db5e6e66a7d2f69119b827b2d897f2910a698e632e04c50
languageName: node
linkType: hard
-"@loaders.gl/images@npm:4.3.3":
- version: 4.3.3
- resolution: "@loaders.gl/images@npm:4.3.3"
+"@loaders.gl/images@npm:4.3.4, @loaders.gl/images@npm:~4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/images@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:4.3.3"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/9b6dbcce46b687532bd8d6b73bd24b3e315ead3ed5601e0b46e9a0232300405dc14a67e9e7e5aa7abcd25e104f475ec7ddf27a136b8eccc3e57043be9b07b4d8
+ checksum: 10c0/f2314b0b02ce92c473054f7e4e7f11466d3f86b27a74d6b10f35ddc02ef3d25254906f7a1fde6b8cc1ae606239c47c1a3fd66f46f1aef4d709d642230d4bc9aa
languageName: node
linkType: hard
-"@loaders.gl/json@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/json@npm:4.3.2"
+"@loaders.gl/json@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/json@npm:4.3.4"
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/gis": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/10101cb63e0fc210e7a61234aff331c4f4a992eee58a88e6379a663bfd881a6e8cead9600b2fecf7500143d45063d9a082d59592246e1aab72cf15b4fa1555a9
+ checksum: 10c0/7e328374c3ecb4fbe63a49728dbf689f05070b8ff6525f9af6a98e534ccf168d9cb23e3aaa242bd6ab7572c5381cf95a2dc058f24b3db3048101e18bcac6f63e
languageName: node
linkType: hard
-"@loaders.gl/loader-utils@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/loader-utils@npm:4.3.2"
+"@loaders.gl/loader-utils@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/loader-utils@npm:4.3.4"
dependencies:
- "@loaders.gl/schema": "npm:4.3.2"
- "@loaders.gl/worker-utils": "npm:4.3.2"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/worker-utils": "npm:4.3.4"
"@probe.gl/log": "npm:^4.0.2"
"@probe.gl/stats": "npm:^4.0.2"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/bbaeb362c63b760569323c50ad3a695737fdc93f5ef68c594aa35668ebb35a8332f53cd0cb74c49cc5cf026b9fad4f889c2efde0dc294a269c10c6b304ec5f0c
+ checksum: 10c0/f303500f8f0c5313cf7c8bd2e63bba3a885cc9db95ec66ba195f52453800f7da45accf458a53d50ef380983dc2ebdd1067c6bcc2118dc5f79963fa7a09c542ec
languageName: node
linkType: hard
-"@loaders.gl/math@npm:3.4.15":
- version: 3.4.15
- resolution: "@loaders.gl/math@npm:3.4.15"
+"@loaders.gl/math@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/math@npm:4.3.4"
dependencies:
- "@loaders.gl/images": "npm:3.4.15"
- "@loaders.gl/loader-utils": "npm:3.4.15"
- "@math.gl/core": "npm:^3.5.1"
- checksum: 10c0/5f101b1e9a041b9613215cde9a90a64dfe7cca34f86c93c57f6a6930385fa8b4f7536a21761cd7fde019fd8dc98eee568bef5a6d16c964d1aac695e5ce1fd8c9
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@math.gl/core": "npm:^4.1.0"
+ peerDependencies:
+ "@loaders.gl/core": ^4.3.0
+ checksum: 10c0/57d2984b465563a67db6c41e7625de14136f9498c8a0c5802ec9d42370fa625e70b645266f78619de7e99e32cbdadbd96b4a62b86784fdd88c1b8db36ec26c97
languageName: node
linkType: hard
-"@loaders.gl/mvt@npm:4.3.3, @loaders.gl/mvt@npm:^4.3.2":
- version: 4.3.3
- resolution: "@loaders.gl/mvt@npm:4.3.3"
+"@loaders.gl/mvt@npm:4.3.4, @loaders.gl/mvt@npm:^4.3.4, @loaders.gl/mvt@npm:~4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/mvt@npm:4.3.4"
dependencies:
- "@loaders.gl/gis": "npm:4.3.3"
- "@loaders.gl/images": "npm:4.3.3"
- "@loaders.gl/loader-utils": "npm:4.3.3"
- "@loaders.gl/schema": "npm:4.3.3"
+ "@loaders.gl/gis": "npm:4.3.4"
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
"@math.gl/polygon": "npm:^4.1.0"
"@probe.gl/stats": "npm:^4.0.0"
pbf: "npm:^3.2.1"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/438061e08d1ca414d798a9414ba71637bfd0a8c1f1175bb4fb19f67553820d275aef664a47d94de6e5b11210be3d6f92cb6c0e2d84caa6a674d7b6c35a94f475
- languageName: node
- linkType: hard
-
-"@loaders.gl/mvt@npm:^3.4.13":
- version: 3.4.15
- resolution: "@loaders.gl/mvt@npm:3.4.15"
- dependencies:
- "@loaders.gl/gis": "npm:3.4.15"
- "@loaders.gl/loader-utils": "npm:3.4.15"
- "@loaders.gl/schema": "npm:3.4.15"
- "@math.gl/polygon": "npm:^3.5.1"
- pbf: "npm:^3.2.1"
- checksum: 10c0/d4d2c07eb5fdcfe1d3e1c4faac0b744757982171c63e810fabba5af6bbc022ebedeee13e8883d25c5a8d4c8f5ddd91e39a66af0528aeb4263684047178d08ee3
+ checksum: 10c0/f578f85ca616ae2f292565112f94165c5626975b09a1155ede06ed1a6d2bbd20d5c67ef0bf352d59595b73daf2b6aeef135054a78051e9798f79db30d5a33252
languageName: node
linkType: 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"
+"@loaders.gl/parquet@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/parquet@npm:4.3.4"
+ dependencies:
+ "@loaders.gl/arrow": "npm:4.3.4"
+ "@loaders.gl/bson": "npm:4.3.4"
+ "@loaders.gl/compression": "npm:4.3.4"
+ "@loaders.gl/gis": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/wkt": "npm:4.3.4"
"@probe.gl/log": "npm:^4.0.9"
async-mutex: "npm:^0.2.2"
base64-js: "npm:^1.3.1"
@@ -5710,31 +5699,31 @@ __metadata:
peerDependencies:
"@loaders.gl/core": ^4.3.0
apache-arrow: ">= 15.0.0"
- checksum: 10c0/5a0996df63a24a1e32b8275fa20f9cfa6018eaae55757b9a43c80f9f8e72e8728617d67c7df54c203df0a558de50ca7f3143f7f6aea4c064ab61cb1b2297335e
+ checksum: 10c0/f8be244b0f6b4f6776d1bb0630b2e95761a3c13cb5d81d882f30bdf6aa4f9625aaf0fcd6b59dfe4a8a67ba0bd771807ff7c3275766531a2cfa32d21e32fcd87e
languageName: node
linkType: hard
-"@loaders.gl/pmtiles@npm:^4.3.2":
- version: 4.3.3
- resolution: "@loaders.gl/pmtiles@npm:4.3.3"
+"@loaders.gl/pmtiles@npm:^4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/pmtiles@npm:4.3.4"
dependencies:
- "@loaders.gl/images": "npm:4.3.3"
- "@loaders.gl/loader-utils": "npm:4.3.3"
- "@loaders.gl/mvt": "npm:4.3.3"
- "@loaders.gl/schema": "npm:4.3.3"
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/mvt": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
pmtiles: "npm:^3.0.4"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/2b77243fcb3f3b61d795ce5344774feeb604b2d419384ca366a52797739d9614ced381df4d3cde30b0e2c4e5914fd9803b634d1fef785ee15a2d22950ac0148c
+ checksum: 10c0/d23c3d7f0826ad16d4bcf88a00ff33e3474b2d0ef03a0f30ce37fe6f8deb52ff25d498f75920ac3e174ed4d9ff771fadb70ea167d5421cd45ceae0abdd10a5eb
languageName: node
linkType: hard
-"@loaders.gl/polyfills@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/polyfills@npm:4.3.2"
+"@loaders.gl/polyfills@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/polyfills@npm:4.3.4"
dependencies:
- "@loaders.gl/crypto": "npm:4.3.2"
- "@loaders.gl/loader-utils": "npm:4.3.2"
+ "@loaders.gl/crypto": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
buffer: "npm:^6.0.3"
get-pixels: "npm:^3.3.3"
ndarray: "npm:^1.0.19"
@@ -5744,253 +5733,251 @@ __metadata:
web-streams-polyfill: "npm:^4.0.0"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/1f89ad827ac73c8cca651ec2d77a36018205f18e8eb3d52ac2cdc08cc76453881c50db0ae6e85775c9a4bdd45b7a7ec25997c9862da61c0dde19841d1c96fad5
+ checksum: 10c0/2168caa4b07a20371cf85c5a37aee48c7ebfaf7af142cd3192ce059c0e6de5a9924cde5073f92961fc53c2f84385d11d60f4c5edbb2912857509648033659c14
languageName: node
linkType: hard
-"@loaders.gl/schema@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/schema@npm:4.3.2"
+"@loaders.gl/schema@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/schema@npm:4.3.4"
dependencies:
"@types/geojson": "npm:^7946.0.7"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/6ba7f1b60b1c746f71a62e0dc627a13e1f7ebedb338630ce8b00972ef8c67dae614bc698be35618f4bc02c7d2536b2e686329af6076ed22ddddaf2269fc5efd1
+ checksum: 10c0/8a1a8d7c3a1c553d02086519252ed37d9311643a1eecae0a037a7c6498fee6c07829054bbdcfd24f040f062857f5a9daa0da4f9d83b773e28723b6281e71ad9c
languageName: node
linkType: hard
-"@loaders.gl/terrain@npm:^3.4.13":
- version: 3.4.15
- resolution: "@loaders.gl/terrain@npm:3.4.15"
+"@loaders.gl/terrain@npm:~4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/terrain@npm:4.3.4"
dependencies:
- "@babel/runtime": "npm:^7.3.1"
- "@loaders.gl/images": "npm:3.4.15"
- "@loaders.gl/loader-utils": "npm:3.4.15"
- "@loaders.gl/schema": "npm:3.4.15"
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
"@mapbox/martini": "npm:^0.2.0"
- checksum: 10c0/50ab91120631e71b8c387476a6b458ed41547db157117716e2d7cc6be855f0f7b54f5c2a3907a02444656f6e109619ff074b70153d5a7a60c94fbebf092ae432
+ peerDependencies:
+ "@loaders.gl/core": ^4.3.0
+ checksum: 10c0/39b99f2e8871595b3bbcdbfa77f35f47dab08d66a17dfb4e1c4b7bfc860b5dcbdbd7c13ccc2ea8dda773ef5b79e231996bbd21633fe3cef33167af252a0c4616
languageName: node
linkType: hard
-"@loaders.gl/textures@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/textures@npm:4.3.2"
+"@loaders.gl/textures@npm:4.3.4, @loaders.gl/textures@npm:^4.2.0":
+ version: 4.3.4
+ resolution: "@loaders.gl/textures@npm:4.3.4"
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"
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/worker-utils": "npm:4.3.4"
"@math.gl/types": "npm:^4.1.0"
ktx-parse: "npm:^0.7.0"
texture-compressor: "npm:^1.0.2"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/f9a379973578533d131a51657675f2589843f16d67be9e37cfc4ce559b32e5725f6e0a2f5cda2d86e30868b8985554a5c42f2867732e56bd099a0e32d76631c2
+ checksum: 10c0/74415f1334f3c07fd8e8d5204bf0f8d8308d0c524551a664f723a908367563f5bd1380f6f5472d88e6bfdf924c37e54095a02932730333123a69ab1c364b010e
languageName: node
linkType: hard
-"@loaders.gl/tiles@npm:3.4.15, @loaders.gl/tiles@npm:^3.4.13":
- version: 3.4.15
- resolution: "@loaders.gl/tiles@npm:3.4.15"
+"@loaders.gl/tiles@npm:4.3.4, @loaders.gl/tiles@npm:~4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/tiles@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:3.4.15"
- "@loaders.gl/math": "npm:3.4.15"
- "@math.gl/core": "npm:^3.5.1"
- "@math.gl/culling": "npm:^3.5.1"
- "@math.gl/geospatial": "npm:^3.5.1"
- "@math.gl/web-mercator": "npm:^3.5.1"
- "@probe.gl/stats": "npm:^3.5.0"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/math": "npm:4.3.4"
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/culling": "npm:^4.1.0"
+ "@math.gl/geospatial": "npm:^4.1.0"
+ "@math.gl/web-mercator": "npm:^4.1.0"
+ "@probe.gl/stats": "npm:^4.0.2"
peerDependencies:
- "@loaders.gl/core": ^3.4.0
- checksum: 10c0/fe5437895ef80379112fb336bd8c875993350be83d194ec7c83098dfc6d985c37026342eb75e7c5e5ae89e36fcfbb8c55a32ba79fe168ae2e5b2e291fffbb3c1
- languageName: node
- linkType: hard
-
-"@loaders.gl/video@npm:^3.4.13":
- version: 3.4.15
- resolution: "@loaders.gl/video@npm:3.4.15"
- dependencies:
- "@loaders.gl/loader-utils": "npm:3.4.15"
- "@loaders.gl/worker-utils": "npm:3.4.15"
- gifshot: "npm:^0.4.5"
- checksum: 10c0/d734a472945ec93babf69b385589a1ce20364ed46591f40431f0d83625d8cafb22ed483d2479290ff0294b2cccfcb425afae2e300e95af3cf73ba5796fbbd250
+ "@loaders.gl/core": ^4.3.0
+ checksum: 10c0/10f2057f6dea95415c64cb0eb1e105af0c125b56b83bc77caec4331cfa42aed5184a65931b7841f8d89458d49364a86694a6a298ab23938b55646bc897985b71
languageName: node
linkType: hard
-"@loaders.gl/wkt@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/wkt@npm:4.3.2"
+"@loaders.gl/wkt@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/wkt@npm:4.3.4"
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/gis": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/dc9809948be2dc1fa2b4da322a9c5ad63501b260c2c76ea0a694944aaddf09e6c8586e0999e4073fa039f6e801b9a6e8b3654ffa56d7e5b32a9ccebb938d9b9e
+ checksum: 10c0/3fdf27b0c64246b6c780ed6f9f5f7b0a363763884dabb8a7a4c821703c0dd5b89e9137d60f0c480b22427f468fd45f240b3822509981597ea927fe1374671685
languageName: node
linkType: hard
-"@loaders.gl/wms@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/wms@npm:4.3.2"
+"@loaders.gl/wms@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/wms@npm:4.3.4"
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/xml": "npm:4.3.2"
+ "@loaders.gl/images": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
+ "@loaders.gl/xml": "npm:4.3.4"
"@turf/rewind": "npm:^5.1.5"
deep-strict-equal: "npm:^0.2.0"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/6ab4e3afb91aa65a53eaee88e0538fa91e422b7c23ee38a94f86f76940cbd193d1ca6effebfbe082ecde63c2f8cc1076a92074be6dbd7ff20ff6cd3dbe8aec94
- languageName: node
- linkType: hard
-
-"@loaders.gl/worker-utils@npm:3.4.15":
- version: 3.4.15
- resolution: "@loaders.gl/worker-utils@npm:3.4.15"
- dependencies:
- "@babel/runtime": "npm:^7.3.1"
- checksum: 10c0/158d5aac65e62e002085cf556e896ef177b6bd0760470c08e556d32e67eadef24b72ca826b55396929007702c664127558c8fe8e5d90569ac9485081ac2772b5
+ checksum: 10c0/2e33d4fe73a5c8db2e02a784affdf81fed314d75198a106ff0d4dd39a4ff66bf2470d2c208a351e580e6deda9956d2c6aded5922cfea19c5800f5fbcbe3c4f2a
languageName: node
linkType: hard
-"@loaders.gl/worker-utils@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/worker-utils@npm:4.3.2"
+"@loaders.gl/worker-utils@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/worker-utils@npm:4.3.4"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/53a2b595f6e85786fb7233e28239dc49b52fb08278d93c85a3f01d9315dcd9404aa0d3458ec586768a43894d7ba1a32e14f10e11a8308dc1c6baed63a06bd8da
+ checksum: 10c0/2ed330bcdfc4d18dea3c5d86ec92d76cd4b4c8f93277e2553c744982fec27ec6041d8f0b33076043d85242d608087e11640eb0a2a4d40b1e02480e1fc938ab12
languageName: node
linkType: hard
-"@loaders.gl/xml@npm:4.3.2":
- version: 4.3.2
- resolution: "@loaders.gl/xml@npm:4.3.2"
+"@loaders.gl/xml@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/xml@npm:4.3.4"
dependencies:
- "@loaders.gl/loader-utils": "npm:4.3.2"
- "@loaders.gl/schema": "npm:4.3.2"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
+ "@loaders.gl/schema": "npm:4.3.4"
fast-xml-parser: "npm:^4.2.5"
peerDependencies:
"@loaders.gl/core": ^4.3.0
- checksum: 10c0/9b0a702fd6d98c4c4f9f26c94cd926fbd6f154b7020d73af93aea2dd93c65bf3cea161053e97269734a2fc80fe85b5288b52b28fea46b74041a0f296798ea39e
+ checksum: 10c0/cee373a69cb5aa53292de8c9709cc2c7d7591dd8242af8390e64ba8c13b7f7bbb6f77445f5bbc21cf2e1389a9ab1e49129f68cf814722ae455232a77334d92b6
languageName: node
linkType: hard
-"@loaders.gl/zip@npm:^3.4.13":
- version: 3.4.15
- resolution: "@loaders.gl/zip@npm:3.4.15"
+"@loaders.gl/zip@npm:4.3.4":
+ version: 4.3.4
+ resolution: "@loaders.gl/zip@npm:4.3.4"
dependencies:
+ "@loaders.gl/compression": "npm:4.3.4"
+ "@loaders.gl/crypto": "npm:4.3.4"
+ "@loaders.gl/loader-utils": "npm:4.3.4"
jszip: "npm:^3.1.5"
- checksum: 10c0/90010ceb67fe1a55f1126fa9f3438207a66bab9e98d7989d6e3650eafd900f34521222335400ba1d0bf9b67410137d735e6acefda80e1b8de7a7c2da015f5291
+ md5: "npm:^2.3.0"
+ peerDependencies:
+ "@loaders.gl/core": ^4.3.0
+ checksum: 10c0/d1e08dd00df6a37e30add231a30bb6f64bcf114b45b7e125e57e731fb3c331c00ab98b9eba9012dd259e508d784ad150dcee5f5ef268b31b38c1efc8037e0559
languageName: node
linkType: hard
-"@luma.gl/constants@npm:8.5.21":
- version: 8.5.21
- resolution: "@luma.gl/constants@npm:8.5.21"
- checksum: 10c0/c444920f69eeaf2bc6c569d90871b1fbcd6e85b24c57d6ea11005ee69ca4e1afdf995bf1a38dd5af060c56490247bd42c802ce0c98c665a87a66ccac17c3ec10
+"@luma.gl/constants@npm:9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/constants@npm:9.2.6"
+ checksum: 10c0/4eaf895de51faba4a90ca98e6a117bc07768da6c3c7f6b5ace463814ceed64c8cdbfce262806d95857f26ce1cefc885b9940779d4461a78bf30317ceeaacc982
languageName: node
linkType: hard
-"@luma.gl/core@npm:8.5.21":
- version: 8.5.21
- resolution: "@luma.gl/core@npm:8.5.21"
+"@luma.gl/core@npm:9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/core@npm:9.2.6"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@luma.gl/constants": "npm:8.5.21"
- "@luma.gl/engine": "npm:8.5.21"
- "@luma.gl/gltools": "npm:8.5.21"
- "@luma.gl/shadertools": "npm:8.5.21"
- "@luma.gl/webgl": "npm:8.5.21"
- checksum: 10c0/4ea497838abc7eddf9aa4aa4ff1b1a087e95eedf55258ac30913e8b61f65f439cb7eb548ee74ee90aca202e0577098341f847e2e732e5da312dc376446bb7b65
+ "@math.gl/types": "npm:^4.1.0"
+ "@probe.gl/env": "npm:^4.0.8"
+ "@probe.gl/log": "npm:^4.0.8"
+ "@probe.gl/stats": "npm:^4.0.8"
+ "@types/offscreencanvas": "npm:^2019.6.4"
+ checksum: 10c0/999a952de7e85abae144598c3d180946a64ebcac0850ac78bbd74f14b31e38dc4477b38d238bd27f0d07d6fa15d1e88bc63fc40f8a9264d1745a63a1807517d4
languageName: node
linkType: hard
-"@luma.gl/engine@npm:8.5.21":
- version: 8.5.21
- resolution: "@luma.gl/engine@npm:8.5.21"
+"@luma.gl/effects@npm:9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/effects@npm:9.2.6"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@luma.gl/constants": "npm:8.5.21"
- "@luma.gl/gltools": "npm:8.5.21"
- "@luma.gl/shadertools": "npm:8.5.21"
- "@luma.gl/webgl": "npm:8.5.21"
- "@math.gl/core": "npm:^3.5.0"
- "@probe.gl/env": "npm:^3.5.0"
- "@probe.gl/stats": "npm:^3.5.0"
- "@types/offscreencanvas": "npm:^2019.7.0"
- checksum: 10c0/e2089447bdcd8425173eb81ad8fdd4b5ce2292d40c13fdd3ba45df79458be84312927d9392ee3f1984c4fa6df11c9ae9a12a2c17faaed205275b5b4303ebe9b9
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/types": "npm:^4.1.0"
+ wgsl_reflect: "npm:^1.0.1"
+ peerDependencies:
+ "@luma.gl/shadertools": ~9.2.0
+ checksum: 10c0/2cc14f2d4f76e01b89a96c83e482ef0b78c7eb6ee050b35bbe873b3de8656c8411e6eebb545a1ad349703014d4e6f14d61670a8fcd39ec1c400dadb0b4bf5b66
languageName: node
linkType: hard
-"@luma.gl/experimental@npm:8.5.21":
- version: 8.5.21
- resolution: "@luma.gl/experimental@npm:8.5.21"
+"@luma.gl/engine@npm:9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/engine@npm:9.2.6"
dependencies:
- "@luma.gl/constants": "npm:8.5.21"
- "@math.gl/core": "npm:^3.5.0"
- earcut: "npm:^2.0.6"
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/types": "npm:^4.1.0"
+ "@probe.gl/log": "npm:^4.0.8"
+ "@probe.gl/stats": "npm:^4.0.8"
peerDependencies:
- "@loaders.gl/gltf": ^3.0.0
- "@loaders.gl/images": ^3.0.0
- "@luma.gl/engine": ^8.4.0
- "@luma.gl/gltools": ^8.4.0
- "@luma.gl/shadertools": ^8.4.0
- "@luma.gl/webgl": ^8.4.0
- checksum: 10c0/ed65e12b71fbabca9dccaf237b5d185eb7303491a92a9b8c438f9f8d1d551fe8ac615503bb86fd46c8d2244e9a7fc0b57e4c6254622f3d537d33c4ae329fe6a3
+ "@luma.gl/core": ~9.2.0
+ "@luma.gl/shadertools": ~9.2.0
+ checksum: 10c0/b1b538fc1b1573b786387954a58dc55c9c97c8e1374e6035a40fc782c45548c7f4c343d4d0de9d50bb2e4f9c93e563f728153682c15c4ba0d662cd30152ad2ad
languageName: node
linkType: hard
-"@luma.gl/gltools@npm:8.5.21":
- version: 8.5.21
- resolution: "@luma.gl/gltools@npm:8.5.21"
+"@luma.gl/gltf@npm:~9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/gltf@npm:9.2.6"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@luma.gl/constants": "npm:8.5.21"
- "@probe.gl/env": "npm:^3.5.0"
- "@probe.gl/log": "npm:^3.5.0"
- "@types/offscreencanvas": "npm:^2019.7.0"
- checksum: 10c0/fa9f57d3c7d364c7754b3ac3f6349c3096ca424802b38bfeb57eb16858e09408515cb59aef681591fab366f4801680e83fe5ba6f7f0f5f73d86ab5f1e1e2c683
+ "@loaders.gl/core": "npm:^4.2.0"
+ "@loaders.gl/gltf": "npm:^4.2.0"
+ "@loaders.gl/textures": "npm:^4.2.0"
+ "@math.gl/core": "npm:^4.1.0"
+ peerDependencies:
+ "@luma.gl/constants": ~9.2.0
+ "@luma.gl/core": ~9.2.0
+ "@luma.gl/engine": ~9.2.0
+ "@luma.gl/shadertools": ~9.2.0
+ checksum: 10c0/64d2fb00e1f9ce249857d9e1191abe5d2a6a8dd84d4a0e5c984e9f85af94241ed70f12428fe7d9dae0f437df3f76d7a8c4f314ac6210f42417f08b1e8d7054e3
languageName: node
linkType: hard
-"@luma.gl/shadertools@npm:8.5.21":
- version: 8.5.21
- resolution: "@luma.gl/shadertools@npm:8.5.21"
+"@luma.gl/shadertools@npm:9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/shadertools@npm:9.2.6"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@math.gl/core": "npm:^3.5.0"
- checksum: 10c0/e5b72b4ef292f33c664c2961d5476fd3c8d971c23e3d6b95d08f6988e39c53421f25cf549206271ebe75d282d0dffa2e198f40e2932f47f16e8f1a6727e5c916
+ "@math.gl/core": "npm:^4.1.0"
+ "@math.gl/types": "npm:^4.1.0"
+ wgsl_reflect: "npm:^1.2.0"
+ peerDependencies:
+ "@luma.gl/core": ~9.2.0
+ checksum: 10c0/60b0d7c62a7a6198d1ddfb611426a271cd31491f22217f37cc46bb5091f88b4bf0bca7f28b093b92c7d1ddbfb6aaa5646ddfae2a50d17e23784e4b0aadefe89c
languageName: node
linkType: hard
-"@luma.gl/test-utils@npm:8.5.21":
- version: 8.5.21
- resolution: "@luma.gl/test-utils@npm:8.5.21"
+"@luma.gl/test-utils@npm:9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/test-utils@npm:9.2.6"
dependencies:
- "@probe.gl/stats": "npm:^3.5.0"
+ "@probe.gl/env": "npm:^4.0.8"
+ "@probe.gl/stats": "npm:^4.0.8"
peerDependencies:
- "@luma.gl/core": ^8.4.0
- "@luma.gl/debug": ^8.4.0
- "@luma.gl/gltools": ^8.4.0
- "@luma.gl/webgl": ^8.4.0
- "@probe.gl/env": ^3.5.0
- "@probe.gl/test-utils": ^3.5.0
- checksum: 10c0/f142f2aae79b1e098557cb16c6ba256c0316a17a2942e2745cca061bf4e2b0e223d19429b87b30345389d83f24593be94c81423f44cdac200b53d2fbca0fd612
+ "@luma.gl/core": ~9.2.0
+ "@luma.gl/engine": ~9.2.0
+ "@luma.gl/shadertools": ~9.2.0
+ "@luma.gl/webgl": ~9.2.0
+ "@luma.gl/webgpu": ~9.2.0
+ checksum: 10c0/a3ec922c0ca2771422311db12e6484da86c3805cb0b66d3225bdd14a8b802164587b5a17867579979c6e91fc1e79de456d122a44f63e6e9d8b9f8c89f16d0410
languageName: node
linkType: hard
-"@luma.gl/webgl@npm:8.5.21":
- version: 8.5.21
- resolution: "@luma.gl/webgl@npm:8.5.21"
+"@luma.gl/webgl@npm:9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/webgl@npm:9.2.6"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- "@luma.gl/constants": "npm:8.5.21"
- "@luma.gl/gltools": "npm:8.5.21"
- "@probe.gl/env": "npm:^3.5.0"
- "@probe.gl/stats": "npm:^3.5.0"
- checksum: 10c0/f4e75f2b95ec0019cf3d3fbb8312bfe6efaa0b787689fb8b35745e2000ccfc1bfdb77239ac13c134e430bec65dba4fb11bb3dd12afc0e9bf451f13cefa971e73
+ "@luma.gl/constants": "npm:9.2.6"
+ "@math.gl/types": "npm:^4.1.0"
+ "@probe.gl/env": "npm:^4.0.8"
+ peerDependencies:
+ "@luma.gl/core": ~9.2.0
+ checksum: 10c0/851d63058307602c0303590f141c4a7995a9f729c7071c3c07d036824f194d76d98432884cdc1e8014e06e1e5da931d521136499e093bdef3e08f03c92035429
+ languageName: node
+ linkType: hard
+
+"@luma.gl/webgpu@npm:9.2.6":
+ version: 9.2.6
+ resolution: "@luma.gl/webgpu@npm:9.2.6"
+ dependencies:
+ "@probe.gl/env": "npm:^4.0.8"
+ "@webgpu/types": "npm:^0.1.34"
+ peerDependencies:
+ "@luma.gl/core": ~9.2.0
+ checksum: 10c0/da5ed48bc04fa60459439fbd89fc3639e28839a2228e7eeb14f4fc1a611953006066e56b0bd982f680079e8f74af4ceb4f51159f606b0c524e47f50d7616ce60
languageName: node
linkType: hard
@@ -6181,17 +6168,6 @@ __metadata:
languageName: node
linkType: hard
-"@math.gl/core@npm:3.6.3, @math.gl/core@npm:^3.5.0, @math.gl/core@npm:^3.5.1, @math.gl/core@npm:^3.6.0, @math.gl/core@npm:^3.6.2":
- version: 3.6.3
- resolution: "@math.gl/core@npm:3.6.3"
- dependencies:
- "@babel/runtime": "npm:^7.12.0"
- "@math.gl/types": "npm:3.6.3"
- gl-matrix: "npm:^3.4.0"
- checksum: 10c0/f26b1f5b6f65061190ef087d0c418c020ba6b8391ebe4ac5ba830b900d4a531d84e2099b05583e44893b45dcfc7faae3e3966c6d1629801d013643cddc42120e
- languageName: node
- linkType: hard
-
"@math.gl/core@npm:4.0.1, @math.gl/core@npm:^4.0.0":
version: 4.0.1
resolution: "@math.gl/core@npm:4.0.1"
@@ -6210,34 +6186,23 @@ __metadata:
languageName: node
linkType: hard
-"@math.gl/culling@npm:^3.5.1, @math.gl/culling@npm:^3.6.2":
- version: 3.6.3
- resolution: "@math.gl/culling@npm:3.6.3"
- dependencies:
- "@babel/runtime": "npm:^7.12.0"
- "@math.gl/core": "npm:3.6.3"
- gl-matrix: "npm:^3.4.0"
- checksum: 10c0/c589e5c1a0b51d2661e4d311e9fb6b2ff18f8a496f186b08c31a2e655f3b9e4d1641b6e285fe795deb9e4e5a07632d2df9b31a3984b57d559b214804c4607e52
- languageName: node
- linkType: hard
-
-"@math.gl/geospatial@npm:^3.5.1":
- version: 3.6.3
- resolution: "@math.gl/geospatial@npm:3.6.3"
+"@math.gl/culling@npm:^4.1.0":
+ version: 4.1.0
+ resolution: "@math.gl/culling@npm:4.1.0"
dependencies:
- "@babel/runtime": "npm:^7.12.0"
- "@math.gl/core": "npm:3.6.3"
- gl-matrix: "npm:^3.4.0"
- checksum: 10c0/67238ec94ea453d3c2c3bcf64508967402d822546d6fdd7eb43afece420e46a6c2a30e073bcf1d672df021bb08ab230d3733f7d07382a325629e65adcca04852
+ "@math.gl/core": "npm:4.1.0"
+ "@math.gl/types": "npm:4.1.0"
+ checksum: 10c0/4489e6379ea4f24480b5a40e6a7dfa90e985b8af4d1051c493cf207e685cf5a09877bad6503f2e53384001fa041c89cb8cf35934570b48acce51b2b94cbfcde5
languageName: node
linkType: hard
-"@math.gl/polygon@npm:^3.5.1, @math.gl/polygon@npm:^3.6.2":
- version: 3.6.3
- resolution: "@math.gl/polygon@npm:3.6.3"
+"@math.gl/geospatial@npm:^4.1.0":
+ version: 4.1.0
+ resolution: "@math.gl/geospatial@npm:4.1.0"
dependencies:
- "@math.gl/core": "npm:3.6.3"
- checksum: 10c0/a4d7a81ed6a2f8dafabaeefb1c9216064ab48b50a5774128b47fa197b58aa4afcf7f4f8279a2fe5a1e5e45b97299b604ae0b1c47ceb029702c3a5ecd6e70452f
+ "@math.gl/core": "npm:4.1.0"
+ "@math.gl/types": "npm:4.1.0"
+ checksum: 10c0/fb7c24dc82dbc32e9982782cda256b242e1a42eb8db69f28fff5653e459d068b44af5dc5eab1da45e43f3502ee4cd741033b656b2adbc7dfc687702a25db7ec2
languageName: node
linkType: hard
@@ -6259,19 +6224,10 @@ __metadata:
languageName: node
linkType: hard
-"@math.gl/sun@npm:^3.6.2":
- version: 3.6.3
- resolution: "@math.gl/sun@npm:3.6.3"
- dependencies:
- "@babel/runtime": "npm:^7.12.0"
- checksum: 10c0/d6453e73c378a1bfaf5a619e752a584b6873f0d733892ae942e2756aef2471ce126420e17f3caaf32571b4f0d45d7b98d62f81652dddb88a893c8452ec8159e4
- languageName: node
- linkType: hard
-
-"@math.gl/types@npm:3.6.3":
- version: 3.6.3
- resolution: "@math.gl/types@npm:3.6.3"
- checksum: 10c0/93beb933ba9a1671c03f728e829ba3653be5ad362d8648aeba7422043bfd323839f08374d85dd7cd03758e0487a84ce0c9f80379eeb19c02d92e0b669a14d294
+"@math.gl/sun@npm:^4.1.0":
+ version: 4.1.0
+ resolution: "@math.gl/sun@npm:4.1.0"
+ checksum: 10c0/baf813f3134124a1701c5f64cc8725fdb1d8d4c9e47c7fbd0d2e960d823f776d35312f82c62a09dcb140ea31d42b3945aa781066495291df190566ae17b5857b
languageName: node
linkType: hard
@@ -6289,13 +6245,12 @@ __metadata:
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.3
- resolution: "@math.gl/web-mercator@npm:3.6.3"
+"@math.gl/web-mercator@npm:>=4.0.1, @math.gl/web-mercator@npm:^4.1.0":
+ version: 4.1.0
+ resolution: "@math.gl/web-mercator@npm:4.1.0"
dependencies:
- "@babel/runtime": "npm:^7.12.0"
- gl-matrix: "npm:^3.4.0"
- checksum: 10c0/95a1267261e03fa0194ec5ac5f3f8c3a13e1182cf3865d4d3bbd669706d42bd067335d1812df2e844c63c1f0f21c50e08af2b90168f2db1d3fa3ba2087f59703
+ "@math.gl/core": "npm:4.1.0"
+ checksum: 10c0/7aa4921b9442da75664ef517f41de65b1eae9970d7eee61d14d2eb0b332e1af6203785e8d198376a8ab5924d62b24856d648ff6478cca95b14d3a8d82822ef93
languageName: node
linkType: hard
@@ -6330,87 +6285,6 @@ __metadata:
languageName: node
linkType: hard
-"@nebula.gl/edit-modes@npm:1.0.2-alpha.1":
- version: 1.0.2-alpha.1
- resolution: "@nebula.gl/edit-modes@npm:1.0.2-alpha.1"
- dependencies:
- "@turf/along": "npm:>=6.3.0"
- "@turf/area": "npm:>=4.0.0"
- "@turf/bbox": "npm:>=4.0.0"
- "@turf/bbox-polygon": "npm:>=4.0.0"
- "@turf/bearing": "npm:>=4.0.0"
- "@turf/boolean-point-in-polygon": "npm:>=4.0.0"
- "@turf/buffer": "npm:>=4.0.0"
- "@turf/center": "npm:>=4.0.0"
- "@turf/centroid": "npm:>=4.0.0"
- "@turf/circle": "npm:>=4.0.0"
- "@turf/destination": "npm:>=4.0.0"
- "@turf/difference": "npm:>=4.0.0"
- "@turf/distance": "npm:>=4.0.0"
- "@turf/ellipse": "npm:>=4.0.0"
- "@turf/helpers": "npm:>=4.0.0"
- "@turf/intersect": "npm:>=4.0.0"
- "@turf/line-intersect": "npm:>=4.0.0"
- "@turf/nearest-point-on-line": "npm:>=4.0.0"
- "@turf/point-to-line-distance": "npm:>=4.0.0"
- "@turf/polygon-to-line": "npm:>=4.0.0"
- "@turf/rewind": "npm:>=4.0.0"
- "@turf/transform-rotate": "npm:>=4.0.0"
- "@turf/transform-scale": "npm:>=4.0.0"
- "@turf/transform-translate": "npm:>=4.0.0"
- "@turf/union": "npm:>=4.0.0"
- geojson: "npm:0.5.0"
- lodash.throttle: "npm:^4.1.1"
- viewport-mercator-project: "npm:>=6.0.0"
- checksum: 10c0/4a96eb463c3c2cb43f1d8caa123f1571d95f4d1d79e25c45bf038b40f2c7b1839756dc4610fbf5afa23d9c6989e32233e6b11f5cadec2babb12c419d9629e79c
- languageName: node
- linkType: hard
-
-"@nebula.gl/layers@npm:1.0.2-alpha.1":
- version: 1.0.2-alpha.1
- resolution: "@nebula.gl/layers@npm:1.0.2-alpha.1"
- dependencies:
- "@danmarshall/deckgl-typings": "npm:4.9.12"
- "@nebula.gl/edit-modes": "npm:1.0.2-alpha.1"
- "@turf/bbox": "npm:>=4.0.0"
- "@turf/bbox-polygon": "npm:>=4.0.0"
- "@turf/bearing": "npm:>=4.0.0"
- "@turf/boolean-point-in-polygon": "npm:>=4.0.0"
- "@turf/buffer": "npm:>=4.0.0"
- "@turf/center": "npm:>=4.0.0"
- "@turf/centroid": "npm:>=4.0.0"
- "@turf/circle": "npm:>=4.0.0"
- "@turf/destination": "npm:>=4.0.0"
- "@turf/difference": "npm:>=4.0.0"
- "@turf/distance": "npm:>=4.0.0"
- "@turf/ellipse": "npm:>=4.0.0"
- "@turf/helpers": "npm:>=4.0.0"
- "@turf/intersect": "npm:>=4.0.0"
- "@turf/line-intersect": "npm:>=4.0.0"
- "@turf/nearest-point-on-line": "npm:>=4.0.0"
- "@turf/point-to-line-distance": "npm:>=4.0.0"
- "@turf/polygon-to-line": "npm:>=4.0.0"
- "@turf/transform-rotate": "npm:>=4.0.0"
- "@turf/transform-scale": "npm:>=4.0.0"
- "@turf/transform-translate": "npm:>=4.0.0"
- "@turf/union": "npm:>=4.0.0"
- cubic-hermite-spline: "npm:^1.0.1"
- geojson-types: "npm:^2.0.1"
- global: "npm:>=4.3.0"
- h3-js: "npm:^3.6.4"
- viewport-mercator-project: "npm:>=6.0.0"
- peerDependencies:
- "@deck.gl/core": ^8.6.0
- "@deck.gl/extensions": ^8.6.0
- "@deck.gl/geo-layers": ^8.6.0
- "@deck.gl/layers": ^8.6.0
- "@deck.gl/mesh-layers": ^8.6.0
- "@luma.gl/constants": ^8.5.10
- "@luma.gl/core": ^8.5.10
- checksum: 10c0/52041841f9ac09e61006200e41f14658faf306c65f671e9ad702da87bcbe36ebc9f279291b536f887d8c60c9ee41f091eec6f0a8948b473b76cecad6325e2c30
- languageName: node
- linkType: hard
-
"@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3":
version: 2.1.8-no-fsevents.3
resolution: "@nicolo-ribaudo/chokidar-2@npm:2.1.8-no-fsevents.3"
@@ -6727,14 +6601,14 @@ __metadata:
languageName: node
linkType: hard
-"@probe.gl/env@npm:4.1.0":
- version: 4.1.0
- resolution: "@probe.gl/env@npm:4.1.0"
- checksum: 10c0/f364124e5b45613528e7c6c4889aa0139db0a3b2287362e7293f499ea191358059218f8d1e7372edd7f0ae6dac5a8d9fa0465c3c15f208dae3c893874f457c70
+"@probe.gl/env@npm:4.1.1, @probe.gl/env@npm:^4.0.8, @probe.gl/env@npm:^4.1.1":
+ version: 4.1.1
+ resolution: "@probe.gl/env@npm:4.1.1"
+ checksum: 10c0/431f53d95936ba1ee08e8d4c155cc3c49d80d528acaff933ae8f32a4725f04d88ee634707e20baa885a505d6f1401f895bdfcfa42c259b3220dd26463d2cfb2d
languageName: node
linkType: hard
-"@probe.gl/log@npm:3.6.0, @probe.gl/log@npm:^3.5.0":
+"@probe.gl/log@npm:3.6.0":
version: 3.6.0
resolution: "@probe.gl/log@npm:3.6.0"
dependencies:
@@ -6753,21 +6627,12 @@ __metadata:
languageName: node
linkType: hard
-"@probe.gl/log@npm:^4.1.0":
- version: 4.1.0
- resolution: "@probe.gl/log@npm:4.1.0"
- dependencies:
- "@probe.gl/env": "npm:4.1.0"
- checksum: 10c0/717f3c306a55419ffc4e7302e564cfa9948b7373dcaf355d2472d72d78a7f65d816cead3b8d942f8867421e30b803ac1060c41ba2bb85e0a1e6931e606c4a495
- languageName: node
- linkType: hard
-
-"@probe.gl/stats@npm:^3.5.0":
- version: 3.6.0
- resolution: "@probe.gl/stats@npm:3.6.0"
+"@probe.gl/log@npm:^4.0.4, @probe.gl/log@npm:^4.0.8, @probe.gl/log@npm:^4.1.1":
+ version: 4.1.1
+ resolution: "@probe.gl/log@npm:4.1.1"
dependencies:
- "@babel/runtime": "npm:^7.0.0"
- checksum: 10c0/81077d458314a5d08ed5f2393cdd7572f40ea68589bc16ff0cc3e690f54db1443df6499e77c44af0a0ca3faff8613d6895df4e0203f785bf9d83801ff402cc66
+ "@probe.gl/env": "npm:4.1.1"
+ checksum: 10c0/713043aea095dbe6e97525a5d254f2563e9e0b6c64fdb888603f41342ed0f0a76a64e6996d2d461c7f1f9c6271a931b2e922d9e47f8c43f3d4116867f4cd5d0a
languageName: node
linkType: hard
@@ -6778,6 +6643,13 @@ __metadata:
languageName: node
linkType: hard
+"@probe.gl/stats@npm:^4.0.8, @probe.gl/stats@npm:^4.1.1":
+ version: 4.1.1
+ resolution: "@probe.gl/stats@npm:4.1.1"
+ checksum: 10c0/7fd49d891e5ecfc82330c0db9180cc6a3fae0f78062570fabdc1860f79f09b612c53af08b9d6e2bb701b79fb7156ec2c9c0ddf53e5dba12b0560c7bbc957afc7
+ languageName: node
+ linkType: hard
+
"@probe.gl/test-utils@npm:^3.5.0":
version: 3.6.0
resolution: "@probe.gl/test-utils@npm:3.6.0"
@@ -9187,38 +9059,30 @@ __metadata:
languageName: node
linkType: hard
-"@turf/along@npm:>=6.3.0":
- version: 7.0.0
- resolution: "@turf/along@npm:7.0.0"
+"@turf/along@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/along@npm:7.3.4"
dependencies:
- "@turf/bearing": "npm:^7.0.0"
- "@turf/destination": "npm:^7.0.0"
- "@turf/distance": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/b5ebe52688ed0a883c7858c7a84c89cb10d1a6247c31225b9ee5b1fb67f3a0b9ee8a619ce5d1adaa72b623c67bf2960cf214412865e24655670704c9b57bbeb7
- languageName: node
- linkType: hard
-
-"@turf/area@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/area@npm:7.0.0"
- dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/00eb589b2c4f2511b82c75ea87ca76f40952e006097c1ad8b0a37a8686ee51039da782fab7079a3d5582d28f4662a46583ed4253922a1d19a4160f938b94e801
+ "@turf/bearing": "npm:7.3.4"
+ "@turf/destination": "npm:7.3.4"
+ "@turf/distance": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/6b0de8232a23bbab2a87465d0c43e4b9f7fe3742eb50ba6f875e222b7db936f5e36c267a9c06c597fa4507d74f87a5b6814ef101381ff13bf1ab05ecff22e1f9
languageName: node
linkType: hard
-"@turf/bbox-polygon@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/bbox-polygon@npm:7.0.0"
+"@turf/area@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/area@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/228b5e677e7941c5bc6037532fd09aa52cae8998f4dc40fce0cb6b84f4435e42e2841e0f85f8cd3cc6623a9b5c2b754646d039ad1fe45241e240098a7ef47699
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/185d5b4b8c23206b3792d5eb8d3830de2da33c6143e774d411ca2c80fae4770491b0e682e163648376a38c5a168e181db93efbc54f16b82459bf1d5a1580b4aa
languageName: node
linkType: hard
@@ -9231,14 +9095,26 @@ __metadata:
languageName: node
linkType: hard
-"@turf/bbox@npm:>=4.0.0, @turf/bbox@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/bbox@npm:7.0.0"
+"@turf/bbox-polygon@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/bbox-polygon@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/4e6f43471db8dee93ec4ab892aa72b4d752bec3310b2f9da9602c190b47466bdd1da555b7298e041812d03af7dd0db76ea3e2b5b5e75291d86c26697d0a59b3e
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/62807160f701986c32a8953185e23ba5a90b7e2a8bbbbd2e50ffb45cb34208339614c232e2a6cebb1bd338e77bd7074ad75aac9cea2191e977bf57c30787f4fb
+ languageName: node
+ linkType: hard
+
+"@turf/bbox@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/bbox@npm:7.3.4"
+ dependencies:
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/d68b9a3a5da99806e66f5b96a62ac639529e0a5f95de391685e5c3a1b21ccf2da113b58dd8b87964756d0a00bca19c024db3ce262b693dbe3c356610ccc68070
languageName: node
linkType: hard
@@ -9264,14 +9140,27 @@ __metadata:
languageName: node
linkType: hard
-"@turf/bearing@npm:>=4.0.0, @turf/bearing@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/bearing@npm:7.0.0"
+"@turf/bearing@npm:7.3.4, @turf/bearing@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/bearing@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/76c83c25345fb2a6ae022f5769d33b029c903c288e6a599e7c184cee1e40e6b588a2202cad3ca4c6b4ea274fa2f2f4ff5fe296442acc473dee40d04469c9428a
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/70d4dfde315e0f060bd971b47992886ad7caa2b655e4f0ea9e8d77e4f01a8d88178dd70b0902550bea7fe09f05cbbacc18ba6789911be76c4bbf0f48b6f3c4d3
+ languageName: node
+ linkType: hard
+
+"@turf/boolean-clockwise@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/boolean-clockwise@npm:7.3.4"
+ dependencies:
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/2113dd1ae05abfbe460aa74e5a87e195fbe081b312816e116968e24c76bd0d6deefaad52339d8dbba90efad2912b6b3a9d4879449c4e8efbe447840ab31c0bfa
languageName: node
linkType: hard
@@ -9285,26 +9174,16 @@ __metadata:
languageName: node
linkType: hard
-"@turf/boolean-clockwise@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/boolean-clockwise@npm:7.0.0"
- dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/ff824981111548e3142fbbaa00f07d5ee766a5ba55c24417f8f9ae5cc5d80ed8bff8e78bc447372d200593474bd5b140cff99a52448619812a2f124b5827a442
- languageName: node
- linkType: hard
-
-"@turf/boolean-point-in-polygon@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/boolean-point-in-polygon@npm:7.0.0"
+"@turf/boolean-point-in-polygon@npm:7.3.4, @turf/boolean-point-in-polygon@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/boolean-point-in-polygon@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
point-in-polygon-hao: "npm:^1.1.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/62fcb6168050ba00f78179759fba50eac6cc824fb67b5d0dac96d64faac94ff14d737812f86b524f7c0a8beafe7df4483340e6f43c33f905fcbb8442c30e05fe
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/047aba73768b0a837c3992955b52e98beba34cad86c2157e8a83fd10e47c80c35c75852cc2943fd54efa901d0eb7c0f6659c0a382a6dc497f2ca3c3f56bf4f0a
languageName: node
linkType: hard
@@ -9318,6 +9197,18 @@ __metadata:
languageName: node
linkType: hard
+"@turf/boolean-point-on-line@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/boolean-point-on-line@npm:7.3.4"
+ dependencies:
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/b3f9226f46429e9e7d250237a39fbe28a40fa9223d6e1471955c6bf37e32e020e191393b75a9b5d8882e06f04b9d5c97eabfbf51384d775180cdad6369532a4b
+ languageName: node
+ linkType: hard
+
"@turf/boolean-point-on-line@npm:^6.5.0":
version: 6.5.0
resolution: "@turf/boolean-point-on-line@npm:6.5.0"
@@ -9341,29 +9232,47 @@ __metadata:
languageName: node
linkType: hard
-"@turf/buffer@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/buffer@npm:7.0.0"
+"@turf/boolean-within@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/boolean-within@npm:7.3.4"
dependencies:
- "@turf/bbox": "npm:^7.0.0"
- "@turf/center": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
+ "@turf/bbox": "npm:7.3.4"
+ "@turf/boolean-point-in-polygon": "npm:7.3.4"
+ "@turf/boolean-point-on-line": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/line-split": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/b06860a7a1541abfc2783a82c28667ecf2805037c4e02ef1212c0197164233b8f5758d52fadffce68942fd7e5b9b830c819a195971d2dd73b96fb572142caa01
+ languageName: node
+ linkType: hard
+
+"@turf/buffer@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/buffer@npm:7.3.4"
+ dependencies:
+ "@turf/bbox": "npm:7.3.4"
+ "@turf/center": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
"@turf/jsts": "npm:^2.7.1"
- "@turf/meta": "npm:^7.0.0"
- "@turf/projection": "npm:^7.0.0"
+ "@turf/meta": "npm:7.3.4"
+ "@turf/projection": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
d3-geo: "npm:1.7.1"
- checksum: 10c0/b3a159c649515bba5467ab536f35f713c466ce8a54ec98089c56824aa49015718a4ede70bf960d2261023b5002c2d3c1fa371d326679bfffe0b5f56da22547f2
+ checksum: 10c0/cfd219c2c83abd65698c598f259b8c222b3ab94786a0d062064de8f67bda57486cbc7fb8ec10e93ba239cac2653ba3a12216006b59d799edaeefda7becfe2f50
languageName: node
linkType: hard
-"@turf/center@npm:>=4.0.0, @turf/center@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/center@npm:7.0.0"
+"@turf/center@npm:7.3.4, @turf/center@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/center@npm:7.3.4"
dependencies:
- "@turf/bbox": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/6346459392c57d7b494ed98fad56a24661caa3f1a6717d32ab25e7001da9294af0f371eae793b7eb515f6b152a61158e4b9b748a475c89986b1914c3f693efe2
+ "@turf/bbox": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/a4a9be38d80a3e7f280127d41f2c9c2eb130b940d3ab5ee21f293851182ef24cd33df622802829a26f870208dc29a5754ace72c556bbbe72d47a94bd183ca00d
languageName: node
linkType: hard
@@ -9377,25 +9286,38 @@ __metadata:
languageName: node
linkType: hard
-"@turf/centroid@npm:>=4.0.0, @turf/centroid@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/centroid@npm:7.0.0"
+"@turf/centroid@npm:7.3.4, @turf/centroid@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/centroid@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/26c389151c30a7c912b98b0b5d67f466b34bbe72f10d542a88c9bb8b712e26300cbfd55b77de40a2610856fb88180d5ff319d0483e2ed23396eb53d072f16af8
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/2cd5064d22b264b11091a6c07767d4addae4e175d3adf3601271fe8c3fa6e86987b48fcb0db125e810c96d22b92cc06d97c4284d7a84e83e05aaf1c1a425d5d5
languageName: node
linkType: hard
-"@turf/circle@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/circle@npm:7.0.0"
+"@turf/circle@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/circle@npm:7.3.4"
dependencies:
- "@turf/destination": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/a318a188b6ef0fadda22f8d9344913d59cec8c9437f33a816a477c07e771cbe53c17367f69aa83fb3a5b232a0de4c265117adad6bc4a9e92b1dd414ec73cc228
+ "@turf/destination": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/23b4e5dae48973c4987c93aed522a0a99e5211e903870b62ca004fb31089bf9324c936f2c1111753f194e1b012934e6d1800f69f1cc522627dee596286e30001
+ languageName: node
+ linkType: hard
+
+"@turf/clone@npm:7.3.4, @turf/clone@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/clone@npm:7.3.4"
+ dependencies:
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/11e39235cd16c443e0ce55ed64d589b39abc19fa5f5440b2ee470451013922f19a7536c251c1a7e4441afdb4d7a26d16b456259cb459b0ea5a5ba6310485c791
languageName: node
linkType: hard
@@ -9408,70 +9330,79 @@ __metadata:
languageName: node
linkType: hard
-"@turf/clone@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/clone@npm:7.0.0"
+"@turf/destination@npm:7.3.4, @turf/destination@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/destination@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/4d59e18b3cafe04f73136b5a1610a16f7ad16ebff11b36708a9e48b0ad98af5776ba1fc1b7ac47537ac356a7e217852e97cefc9878b6ea42b977ddd476056bb7
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/9eb087e7dc1b3aef56fa4199ea419134688623af16b8dfa186ab36da6fa5e860ac10f368fb9ce31b39e1e038476e031ff1a899d971165215a5d2969650c8e420
languageName: node
linkType: hard
-"@turf/destination@npm:>=4.0.0, @turf/destination@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/destination@npm:7.0.0"
+"@turf/difference@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/difference@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/55aa18643cfefee44192b89a3187af2b02aaf2cab2f1a0922c5959cc23b9a6caa83359bc8020b22f7cbe2e187a94c783feb345e3964778d4a725601c058ec697
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ polyclip-ts: "npm:^0.16.8"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/2478079dce8204f3ee6e7e091953691332ab5577d8bd9236cc1157b44d10cb48bf22803efafe60e460081f4de45a63cf4ad88f7d853aa663976804ac79b409bb
languageName: node
linkType: hard
-"@turf/difference@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/difference@npm:7.0.0"
+"@turf/distance@npm:7.3.4, @turf/distance@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/distance@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- polygon-clipping: "npm:^0.15.3"
- tslib: "npm:^2.6.2"
- checksum: 10c0/cce7efe8d382bfd91a8bd91553f738c0994091fd8a1b23164b114e2eb53b1ee85aad02de570974d4cfbe7bd2b8fa1ab24ee26e4ceac93c837fd152da82c49a3e
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/cb91c32ff6fb41b1e3487537dcade88c1366b7acdc6c9af19732fffb9a463d75be1576aa51783802a03bbb4a36f2d3ba2003cd01a418b74e2aee2ee1c7b49d21
languageName: node
linkType: hard
-"@turf/distance@npm:>=4.0.0, @turf/distance@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/distance@npm:7.0.0"
+"@turf/ellipse@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/ellipse@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/f300473be2389ed86fcd00449f1dfb69b4fb30a2db98fd53fefa7198ee22cc7e1329b568acf11e5ba10fd509b5f27623af14aaa7ec31bef182d7c887cf5a2bde
+ "@turf/destination": "npm:7.3.4"
+ "@turf/distance": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/transform-rotate": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/a7af767e463dbf3b4205f8ead3c3f232f947376039c7bd166669162499302710984faf7abe77e571d067c11cdf493e5b71873848127347e323cda7701c8fd4a3
languageName: node
linkType: hard
-"@turf/ellipse@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/ellipse@npm:7.0.0"
+"@turf/geojson-rbush@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/geojson-rbush@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- "@turf/rhumb-destination": "npm:^7.0.0"
- "@turf/transform-rotate": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/382c121b4ae0003d44a7ad296212cb920931d7e8037203149e03291123ecd4ef8bed56fb9ed4404a238cec004afe5d5b3b21ffecff5013d2968254adc8b00cbd
+ "@turf/bbox": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ rbush: "npm:^3.0.1"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/796bfc520c31b88d0380afad05fe6038b5d1ebe9015571775634a61751d2886a305aee3dca7c2e98bbef52aa13025ce0abd401e144bf3605c6fafa602abba919
languageName: node
linkType: hard
-"@turf/helpers@npm:>=4.0.0, @turf/helpers@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/helpers@npm:7.0.0"
+"@turf/helpers@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/helpers@npm:7.3.4"
dependencies:
- deep-equal: "npm:^2.2.3"
- tslib: "npm:^2.6.2"
- checksum: 10c0/33a12478c25551d8238aee6e86cb610485c95baceb725e84628c0726ffe78de809e238a4cfaf3cc8e74522e411ab84826c9090cbe7ec2b84dfc39b24cabc47da
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/e10cc2e9d4e25c46e79310847a9b1a3c8613558defaa8bcc0b2e8622d106c875e4e4c7895942bc89687ab72b12bdce0835cac10362118f8eeb3c0939042a5ccd
languageName: node
linkType: hard
@@ -9499,15 +9430,27 @@ __metadata:
languageName: node
linkType: hard
-"@turf/intersect@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/intersect@npm:7.0.0"
+"@turf/intersect@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/intersect@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- polygon-clipping: "npm:^0.15.3"
- tslib: "npm:^2.6.2"
- checksum: 10c0/4645fd3d432f65afdbd62357643578473c1976bebaa5370462ae5a820a19b07c01ce26e0c55c383222e9789bc7846e631493fa9cc42ab4a3e76a9f9f0ab19fad
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ polyclip-ts: "npm:^0.16.8"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/96b9f08a0ba06e6eb299338a618e7d33bdc1c184f74cb9c8d4ad9141335c27566ae8aa5352661d119a61f6f0eadddfd47dd0715506748422f2fe489b9cd9e49a
+ languageName: node
+ linkType: hard
+
+"@turf/invariant@npm:7.3.4, @turf/invariant@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/invariant@npm:7.3.4"
+ dependencies:
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/8c5c420981d42304ebf32a984892b15150c6dcafabacefd165a5950eaf16024551272071426bfa23e5198b03c7c9495a2547ea9ee455ce3ff77d6449f51df1b3
languageName: node
linkType: hard
@@ -9529,33 +9472,78 @@ __metadata:
languageName: node
linkType: hard
-"@turf/invariant@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/invariant@npm:7.0.0"
+"@turf/jsts@npm:^2.7.1":
+ version: 2.7.1
+ resolution: "@turf/jsts@npm:2.7.1"
+ dependencies:
+ jsts: "npm:2.7.1"
+ checksum: 10c0/d358d7336ea74779d1f4cab025ac0c8a7ed14d9575c0b430b1691570fec05eddef4051f157fe3bf57aebb9e87447dacf780f9a4bb09c10ef44cef457fc74aed0
+ languageName: node
+ linkType: hard
+
+"@turf/kinks@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/kinks@npm:7.3.4"
+ dependencies:
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/6903bf14a7840ffd9c78aefd1aa40c75b96e6d6f3ad2caaa820d64dea23b8573f910103b14982055a972019557d5cad261ea78dcbeb0e20890de16d4d3f368ca
+ languageName: node
+ linkType: hard
+
+"@turf/line-intersect@npm:7.3.4, @turf/line-intersect@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/line-intersect@npm:7.3.4"
+ dependencies:
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ sweepline-intersections: "npm:^1.5.0"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/71fae72dbc388207644639bb33457be177d2e7b78284943a43b2eb299bad70a77a9c70c351de136eb756303d5d03691df53e5163bc0ff52e5711f848548f5565
+ languageName: node
+ linkType: hard
+
+"@turf/line-segment@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/line-segment@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/85f9649350b373284b80495889e79d738b53ef279e967b4e0a58a59cb81b24f430a8148629a1b7ce3132aadbf26fc909db40c7edeba53f80b93cdcdaddc79d43
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/484ec182859b221262d9313b55885a8c56c9b3a1e31c55938d3e99c19bf3dd4286f39b59a17753d496607c1ec5fff251c11b5346faa87db7187d1b51e779e08b
languageName: node
linkType: hard
-"@turf/jsts@npm:^2.7.1":
- version: 2.7.1
- resolution: "@turf/jsts@npm:2.7.1"
+"@turf/line-split@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/line-split@npm:7.3.4"
dependencies:
- jsts: "npm:2.7.1"
- checksum: 10c0/d358d7336ea74779d1f4cab025ac0c8a7ed14d9575c0b430b1691570fec05eddef4051f157fe3bf57aebb9e87447dacf780f9a4bb09c10ef44cef457fc74aed0
+ "@turf/bbox": "npm:7.3.4"
+ "@turf/geojson-rbush": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/line-intersect": "npm:7.3.4"
+ "@turf/line-segment": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@turf/nearest-point-on-line": "npm:7.3.4"
+ "@turf/truncate": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/914afb0a72ab5740adace737f10b2c7e7c55d9008311972c6e022b7ffa2a7a12ae8c80cff18e564ef771abadd229875ea0ee70bf1c3d81232513bcd31d16d196
languageName: node
linkType: hard
-"@turf/line-intersect@npm:>=4.0.0, @turf/line-intersect@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/line-intersect@npm:7.0.0"
+"@turf/meta@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/meta@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- sweepline-intersections: "npm:^1.5.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/e6be1cdeed324215131560d5c42f2f419ea75cfd1d882eed8cdf8073ec16d11f99e698d22d3aa5d9243ebd4227d2788b074fcd3b1814c99ee9573fbeae624295
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/756bb9e227323fbd9262fbe8323962f0d82852a6452e9e4db1ac5f6947081a450b9389a71b15f109d1d0621cc1b45cc1b68ee4b6c8eaf7e01442ef5cb2dee71b
languageName: node
linkType: hard
@@ -9577,15 +9565,6 @@ __metadata:
languageName: node
linkType: hard
-"@turf/meta@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/meta@npm:7.0.0"
- dependencies:
- "@turf/helpers": "npm:^7.0.0"
- checksum: 10c0/0f62736eecfd9a3f2a42452a91ac95bcec3e9fc534191145a957e331828e289523772324a87e47b94244eb02ea6c345089d0c4822e41b9758cf3c9ad6a7622a3
- languageName: node
- linkType: hard
-
"@turf/meta@npm:^7.2.0":
version: 7.2.0
resolution: "@turf/meta@npm:7.2.0"
@@ -9596,73 +9575,75 @@ __metadata:
languageName: node
linkType: hard
-"@turf/nearest-point-on-line@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/nearest-point-on-line@npm:7.0.0"
- dependencies:
- "@turf/bearing": "npm:^7.0.0"
- "@turf/destination": "npm:^7.0.0"
- "@turf/distance": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- "@turf/line-intersect": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/27de2d351097ef152387c70517bb9abf227f3f5cf22eaf54b383154b8ba16ba923c1955d9752a127d6603f6bb7eafc06fe71eb416b7e90c7ac0752c3fa99f5b2
+"@turf/midpoint@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/midpoint@npm:7.3.4"
+ dependencies:
+ "@turf/bearing": "npm:7.3.4"
+ "@turf/destination": "npm:7.3.4"
+ "@turf/distance": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/32b6719b20e1a3b31609a46c0e6b5b94fd2187a5f03603caa505fbb4f2ae3e529cb8a2e292e9ce46d4afca92da6c12726187a1eb5634b98804679a5754a885d1
languageName: node
linkType: hard
-"@turf/point-to-line-distance@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/point-to-line-distance@npm:7.0.0"
- dependencies:
- "@turf/bearing": "npm:^7.0.0"
- "@turf/distance": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- "@turf/projection": "npm:^7.0.0"
- "@turf/rhumb-bearing": "npm:^7.0.0"
- "@turf/rhumb-distance": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/785b1e955665f6f49341e0d79562f69fc367e3ed55f672568f479e1e8bb55a6489f9d57300bcdead582216ad47d6ee24c5445ba6d454796f723867c56146621e
+"@turf/nearest-point-on-line@npm:7.3.4, @turf/nearest-point-on-line@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/nearest-point-on-line@npm:7.3.4"
+ dependencies:
+ "@turf/distance": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/799a3d61ffd7d3130e594e624c0e6ec0fa222b50a6bc02ece07d44a91c232583bd74abbe3a67f5a4e433902436f0ff144bf0d157539bd4f4f0f3159b2bc58361
languageName: node
linkType: hard
-"@turf/polygon-to-line@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/polygon-to-line@npm:7.0.0"
+"@turf/point-to-line-distance@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/point-to-line-distance@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/92f31dfb46b0cf4cfe7e86be27d57a3a437f6d3743b00f6b806b2ef8b9fda90d2b035b5c12b3de28c621ddd260b29483dcc7f69841eb9ced3692f1180eb4b431
+ "@turf/bearing": "npm:7.3.4"
+ "@turf/distance": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@turf/nearest-point-on-line": "npm:7.3.4"
+ "@turf/projection": "npm:7.3.4"
+ "@turf/rhumb-bearing": "npm:7.3.4"
+ "@turf/rhumb-distance": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/b7c95e9f502259d75e647fce95deab7d51495aa1190652435618b05f7dce77b62d2a4631984a16462739e725004dc6fde7d6c898eed7e774391c5b2d4af62729
languageName: node
linkType: hard
-"@turf/projection@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/projection@npm:7.0.0"
+"@turf/polygon-to-line@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/polygon-to-line@npm:7.3.4"
dependencies:
- "@turf/clone": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/3facc71b8d79354a40a1dd05784d7fdb1eb354c896331c9a01027a62c3428bfc3e4c035d1e135c5a6f53339d788916af036589cb0a5bb67c1546a0ba322e097e
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/4da2c48b06cb0aa4d7fa5b37ef40c8ca26ca95b6e00527d9845ef097a1a5b113a305ef787fcb91134be05aa6f4b9fbd80fb0dd2a77bb206e3dfbdad3fe3abee3
languageName: node
linkType: hard
-"@turf/rewind@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/rewind@npm:7.0.0"
+"@turf/projection@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/projection@npm:7.3.4"
dependencies:
- "@turf/boolean-clockwise": "npm:^7.0.0"
- "@turf/clone": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/3129da1e9d9e98c046f2fb95286be690434d822edacc4b139d3392441a76744087db7abe8f432e3c5b84e812a81e3f52314750294c253dc8d3f291bcb87b97be
+ "@turf/clone": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/e95a94b0ebc3c80130f0a1686a5b157aeb7ba347d5253ce04eb540c3a3fff64a7c45ef72af15e526d9cd0e7b9f2c8b602f05ec35715fa87b0334a5cfd4fba3cb
languageName: node
linkType: hard
@@ -9679,118 +9660,132 @@ __metadata:
languageName: node
linkType: hard
-"@turf/rhumb-bearing@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/rhumb-bearing@npm:7.0.0"
+"@turf/rewind@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/rewind@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/6bc8baf90da335929cecf2108079a06a38820ddfd06f25bb06cd3635ff044b06d777ddfdcd57d0e829b8fdc2c8f380722a096053970c7b8a508a73a9777dffe5
+ "@turf/boolean-clockwise": "npm:7.3.4"
+ "@turf/clone": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/c9db4106e4e521f40dbc7233c5ae9d2adcbc9da07a5fc9666ab9043bb850e7a76a73540e32e980b9cd72aa1d08f6f98b99bb33e51883f8fbb656beaf6f087b80
languageName: node
linkType: hard
-"@turf/rhumb-destination@npm:^5.1.5":
- version: 5.1.5
- resolution: "@turf/rhumb-destination@npm:5.1.5"
+"@turf/rhumb-bearing@npm:7.3.4, @turf/rhumb-bearing@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/rhumb-bearing@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^5.1.5"
- "@turf/invariant": "npm:^5.1.5"
- checksum: 10c0/b3774bdf5eeb9528a4492cd2754975edb29cc94e7a6d971bef60a0cf09a4ef860268dce2ebea8b38c8011d2fbcc3874de4dae079d669274902483bd486e1ce10
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/d3661c7988f4fdc80e545ee9c037fd6e54c32e0a2da62d31c68f89f7ce1992b40e9e4948462ab6945f7e310109e1c20604e6288c936e1a0b63f242209b2b663d
languageName: node
linkType: hard
-"@turf/rhumb-destination@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/rhumb-destination@npm:7.0.0"
+"@turf/rhumb-destination@npm:7.3.4, @turf/rhumb-destination@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/rhumb-destination@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/8e2c4b1abcd6969a498ef4f095f9fbd43e70d1cba799697ce20ce832f8e2828605099a9c60804c8ddb91aaff951526f6ffda4df0ca24552afd6650371e38c1c6
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/4f4c514944bd46e34c8b24804150749d822d8189d35a93378d721eb0c2d7e1fe2b7a70493536a0182b67fe0a76c3e0a946f2e2000a2b40319c470a2038e7a269
languageName: node
linkType: hard
-"@turf/rhumb-distance@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/rhumb-distance@npm:7.0.0"
+"@turf/rhumb-distance@npm:7.3.4, @turf/rhumb-distance@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/rhumb-distance@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- tslib: "npm:^2.6.2"
- checksum: 10c0/ce4f734aab6be6f0db7878b2eaa49fa4e633031452c625464a0a50dd32847454c8f3238fb7a47b8783b6a4f3dbd59145c108e7250d4cec99811df14526dff31b
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/a92cfbe237f26e59eec7af1f9238d67c1d660c0250533f9c315b1935c38863e6e48905172ed6cb48e9049550de56347228623f3d52059850a27a7de7269091d1
languageName: node
linkType: hard
-"@turf/transform-rotate@npm:>=4.0.0, @turf/transform-rotate@npm:^7.0.0":
- version: 7.0.0
- resolution: "@turf/transform-rotate@npm:7.0.0"
+"@turf/transform-rotate@npm:7.3.4, @turf/transform-rotate@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/transform-rotate@npm:7.3.4"
dependencies:
- "@turf/centroid": "npm:^7.0.0"
- "@turf/clone": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- "@turf/rhumb-bearing": "npm:^7.0.0"
- "@turf/rhumb-destination": "npm:^7.0.0"
- "@turf/rhumb-distance": "npm:^7.0.0"
- checksum: 10c0/c037446fc81179e847590cfbb4297c96d8f8753b9b7d9f59e6891718bf51a7c76b9800c55e5f7789b6432a9f60a0551cf2165e285b3479ffebc90718eaf94205
+ "@turf/centroid": "npm:7.3.4"
+ "@turf/clone": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@turf/rhumb-bearing": "npm:7.3.4"
+ "@turf/rhumb-destination": "npm:7.3.4"
+ "@turf/rhumb-distance": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/e658f53c95928e38d6d6a595b1da9b9b173243a3af26b944566d95151180a0c42fd6b712b1ffbf845ef4c54cb305e0dfa257f96113f28a1bd5abfb3622240833
languageName: node
linkType: hard
-"@turf/transform-scale@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/transform-scale@npm:7.0.0"
+"@turf/transform-scale@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/transform-scale@npm:7.3.4"
dependencies:
- "@turf/bbox": "npm:^7.0.0"
- "@turf/center": "npm:^7.0.0"
- "@turf/centroid": "npm:^7.0.0"
- "@turf/clone": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- "@turf/rhumb-bearing": "npm:^7.0.0"
- "@turf/rhumb-destination": "npm:^7.0.0"
- "@turf/rhumb-distance": "npm:^7.0.0"
- checksum: 10c0/7425bff9b7a90d56eaaa930b58f669d5ff8d22744a8deb09b075be370463375e8bf94556690e6eb54f4f6751c7be9ff9d1ca0b3eb4c2b5feabcd19b7f40c3765
+ "@turf/bbox": "npm:7.3.4"
+ "@turf/center": "npm:7.3.4"
+ "@turf/centroid": "npm:7.3.4"
+ "@turf/clone": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@turf/rhumb-bearing": "npm:7.3.4"
+ "@turf/rhumb-destination": "npm:7.3.4"
+ "@turf/rhumb-distance": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/e9f3cea1ae20b17d6ae0bbba7df15ab302b43ebb7c6b025e940e7f895a1deeb4bf03e5fff604c80363c62b2c1461732c178c5c051ad65bbcc1ceb65d54992a73
languageName: node
linkType: hard
-"@turf/transform-translate@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/transform-translate@npm:7.0.0"
+"@turf/transform-translate@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/transform-translate@npm:7.3.4"
dependencies:
- "@turf/clone": "npm:^7.0.0"
- "@turf/helpers": "npm:^7.0.0"
- "@turf/invariant": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- "@turf/rhumb-destination": "npm:^7.0.0"
- checksum: 10c0/41121b1de306c19449200a9eb0bc891ddd36b206754bc6847a336c9d1ef70d487bb16c63ac5be3e041e33b895426f3a825343187ed1b301d6c76718831b58a7c
+ "@turf/clone": "npm:7.3.4"
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/invariant": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@turf/rhumb-destination": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/d2a5294b86cc7d3b019e281e6273c69b7ca4b4e6dc7b04474cc6fb9514eed2a7ece9ec2ff4e1b6d7372811019102f60e8762083f844ce508e1464a9acabc35c6
languageName: node
linkType: hard
-"@turf/transform-translate@npm:^5.1.5":
- version: 5.1.5
- resolution: "@turf/transform-translate@npm:5.1.5"
+"@turf/truncate@npm:7.3.4":
+ version: 7.3.4
+ resolution: "@turf/truncate@npm:7.3.4"
dependencies:
- "@turf/clone": "npm:^5.1.5"
- "@turf/helpers": "npm:^5.1.5"
- "@turf/invariant": "npm:^5.1.5"
- "@turf/meta": "npm:^5.1.5"
- "@turf/rhumb-destination": "npm:^5.1.5"
- checksum: 10c0/c53e7777ba5df42f612eb3e93ca596b9510c1375e2c08172a2dd5350149f33158bf9b02fc60b570cc8a406f236ac4dc87f06745cbdb24fa2b002618bd614b95b
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/726224de394bc4fcdfe5643b6c122611b6596bd33f92e2a497a037ef94eaf89c1aedd1a1889952114b14b58017904d9b16d21d5646abad9ca732c90b422f4223
languageName: node
linkType: hard
-"@turf/union@npm:>=4.0.0":
- version: 7.0.0
- resolution: "@turf/union@npm:7.0.0"
+"@turf/union@npm:^7.2.0":
+ version: 7.3.4
+ resolution: "@turf/union@npm:7.3.4"
dependencies:
- "@turf/helpers": "npm:^7.0.0"
- "@turf/meta": "npm:^7.0.0"
- polygon-clipping: "npm:^0.15.3"
- tslib: "npm:^2.6.2"
- checksum: 10c0/8cfc7b1758b7390deaab2797fed8b08de7b1877c8f8c7d60c84134cfb5bb61cd65e28b6558951e19df87b9d312cca275ee45e8834f5fc48765ba8ac6f5171670
+ "@turf/helpers": "npm:7.3.4"
+ "@turf/meta": "npm:7.3.4"
+ "@types/geojson": "npm:^7946.0.10"
+ polyclip-ts: "npm:^0.16.8"
+ tslib: "npm:^2.8.1"
+ checksum: 10c0/44a6b3c5481d69791d4597e0912f5a25735311854b204948e4378f916e3925340be1ec491aff7e031d8ac2af562cf75a0700de086b2c3f5f708bbeb809f71168
languageName: node
linkType: hard
@@ -9994,7 +9989,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/geojson@npm:^7946.0.10":
+"@types/geojson@npm:^7946.0.10, @types/geojson@npm:^7946.0.16":
version: 7946.0.16
resolution: "@types/geojson@npm:7946.0.16"
checksum: 10c0/1ff24a288bd5860b766b073ead337d31d73bdc715e5b50a2cee5cb0af57a1ed02cc04ef295f5fa68dc40fe3e4f104dd31282b2b818a5ba3231bc1001ba084e3c
@@ -10030,13 +10025,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/hammerjs@npm:^2.0.36, @types/hammerjs@npm:^2.0.41":
- version: 2.0.45
- resolution: "@types/hammerjs@npm:2.0.45"
- checksum: 10c0/1f01e3d0260e3cb824fd0ae32c9a8e1b3727e53ef31682612a0a282c4a84bb758dd30b04749b2ae91e621443c80bfe541b38e91e33308f9dea5d9ac92bd0e854
- languageName: node
- linkType: hard
-
"@types/hast@npm:^3.0.0":
version: 3.0.4
resolution: "@types/hast@npm:3.0.4"
@@ -10191,15 +10179,6 @@ __metadata:
languageName: node
linkType: hard
-"@types/mapbox-gl@npm:^2.6.3":
- version: 2.7.21
- resolution: "@types/mapbox-gl@npm:2.7.21"
- dependencies:
- "@types/geojson": "npm:*"
- checksum: 10c0/51bcf2a0481a53a8f8148af9b7f0f9e4d1be2ebdd9390194e4e4a0f8c8375446004c8624e67b4a255384cf0a0ae0c5b9eb99fa865acadca0ac0b0f5853f3f957
- languageName: node
- linkType: hard
-
"@types/mapbox__geo-viewport@npm:^0.4.1":
version: 0.4.1
resolution: "@types/mapbox__geo-viewport@npm:0.4.1"
@@ -10313,7 +10292,7 @@ __metadata:
languageName: node
linkType: hard
-"@types/offscreencanvas@npm:^2019.7.0":
+"@types/offscreencanvas@npm:^2019.6.4":
version: 2019.7.3
resolution: "@types/offscreencanvas@npm:2019.7.3"
checksum: 10c0/6d1dfae721d321cd2b5435f347a0e53b09f33b2f9e9333396480f592823bc323847b8169f7d251d2285cb93dbc1ba2e30741ac5cf4b1c003d660fd4c24526963
@@ -11015,6 +10994,13 @@ __metadata:
languageName: node
linkType: hard
+"@webgpu/types@npm:^0.1.34":
+ version: 0.1.69
+ resolution: "@webgpu/types@npm:0.1.69"
+ checksum: 10c0/52b95a176de5ee918fd1d7132103c35029006a0b4eb321767479a9e430560d272926c0994c3795a5bbaa22cebcc7dce71e66ba8b6496e01c90c0d179a02bd968
+ languageName: node
+ linkType: hard
+
"@wojtekmaj/date-utils@npm:^1.1.3, @wojtekmaj/date-utils@npm:^1.5.0":
version: 1.5.1
resolution: "@wojtekmaj/date-utils@npm:1.5.1"
@@ -11048,6 +11034,15 @@ __metadata:
languageName: node
linkType: hard
+"a5-js@npm:^0.5.0":
+ version: 0.5.0
+ resolution: "a5-js@npm:0.5.0"
+ dependencies:
+ gl-matrix: "npm:^3.4.3"
+ checksum: 10c0/7880ff27bc0b4b03e339e9677a6179f2e7145686da6cf035e58f969696ff5d75f07c2176620ff73a7752b47f40d26f77214e02c7dc8c037c411484fbbbd0ab48
+ languageName: node
+ linkType: hard
+
"abab@npm:^2.0.5, abab@npm:^2.0.6":
version: 2.0.6
resolution: "abab@npm:2.0.6"
@@ -12361,6 +12356,13 @@ __metadata:
languageName: node
linkType: hard
+"bignumber.js@npm:^9.1.0":
+ version: 9.3.1
+ resolution: "bignumber.js@npm:9.3.1"
+ checksum: 10c0/61342ba5fe1c10887f0ecf5be02ff6709271481aff48631f86b4d37d55a99b87ce441cfd54df3d16d10ee07ceab7e272fc0be430c657ffafbbbf7b7d631efb75
+ languageName: node
+ linkType: hard
+
"binary-extensions@npm:^1.0.0":
version: 1.13.1
resolution: "binary-extensions@npm:1.13.1"
@@ -13234,6 +13236,13 @@ __metadata:
languageName: node
linkType: hard
+"charenc@npm:0.0.2":
+ version: 0.0.2
+ resolution: "charenc@npm:0.0.2"
+ checksum: 10c0/a45ec39363a16799d0f9365c8dd0c78e711415113c6f14787a22462ef451f5013efae8a28f1c058f81fc01f2a6a16955f7a5fd0cd56247ce94a45349c89877d8
+ languageName: node
+ linkType: hard
+
"check-types@npm:^8.0.3":
version: 8.0.3
resolution: "check-types@npm:8.0.3"
@@ -13398,7 +13407,7 @@ __metadata:
languageName: node
linkType: hard
-"classnames@npm:*, classnames@npm:^2.2.1, classnames@npm:^2.3.1":
+"classnames@npm:*, classnames@npm:^2.2.1":
version: 2.5.1
resolution: "classnames@npm:2.5.1"
checksum: 10c0/afff4f77e62cea2d79c39962980bf316bacb0d7c49e13a21adaadb9221e1c6b9d3cdb829d8bb1b23c406f4e740507f37e1dcf506f7e3b7113d17c5bab787aa69
@@ -14147,6 +14156,13 @@ __metadata:
languageName: node
linkType: hard
+"crypt@npm:0.0.2":
+ version: 0.0.2
+ resolution: "crypt@npm:0.0.2"
+ checksum: 10c0/adbf263441dd801665d5425f044647533f39f4612544071b1471962209d235042fb703c27eea2795c7c53e1dfc242405173003f83cf4f4761a633d11f9653f18
+ languageName: node
+ linkType: hard
+
"crypto-browserify@npm:^3.0.0, crypto-browserify@npm:^3.11.0":
version: 3.12.0
resolution: "crypto-browserify@npm:3.12.0"
@@ -14315,13 +14331,6 @@ __metadata:
languageName: node
linkType: hard
-"cubic-hermite-spline@npm:^1.0.1":
- version: 1.0.1
- resolution: "cubic-hermite-spline@npm:1.0.1"
- checksum: 10c0/34d84de4deb69a30ff23f726cbc1666129c3a3ab8ac98b66bd779fdc060a695e114b4505637f554998c764485fd311cba4c5df3120aa1fb18bc9ccbeafdfced2
- languageName: node
- linkType: hard
-
"cwise-compiler@npm:^1.0.0, cwise-compiler@npm:^1.1.2":
version: 1.1.3
resolution: "cwise-compiler@npm:1.1.3"
@@ -14858,7 +14867,7 @@ __metadata:
languageName: node
linkType: hard
-"deep-equal@npm:^2.0.5, deep-equal@npm:^2.2.3":
+"deep-equal@npm:^2.0.5":
version: 2.2.3
resolution: "deep-equal@npm:2.2.3"
dependencies:
@@ -15568,13 +15577,6 @@ __metadata:
languageName: node
linkType: hard
-"downloadjs@npm:^1.4.7":
- version: 1.4.7
- resolution: "downloadjs@npm:1.4.7"
- checksum: 10c0/a89af5fc0b0034402ca2d58c8a09e2baaabdd6b7be47bf227755f50bddd3463eae1abaab6bf68b9b4814ce7cc39d63af9066df8a94c5269a30e75eb57c622f38
- languageName: node
- linkType: hard
-
"draco3d@npm:1.5.7":
version: 1.5.7
resolution: "draco3d@npm:1.5.7"
@@ -15637,7 +15639,7 @@ __metadata:
languageName: node
linkType: hard
-"earcut@npm:^2.0.6, earcut@npm:^2.2.2, earcut@npm:^2.2.4":
+"earcut@npm:^2.2.2, earcut@npm:^2.2.4":
version: 2.2.4
resolution: "earcut@npm:2.2.4"
checksum: 10c0/01ca51830edd2787819f904ae580087d37351f6048b4565e7add4b3da8a86b7bc19262ab2aa7fdc64129ab03af2d9cec8cccee4d230c82275f97ef285c79aafb
@@ -16677,6 +16679,13 @@ __metadata:
languageName: node
linkType: hard
+"eventemitter3@npm:^5.0.0":
+ version: 5.0.4
+ resolution: "eventemitter3@npm:5.0.4"
+ checksum: 10c0/575b8cac8d709e1473da46f8f15ef311b57ff7609445a7c71af5cd42598583eee6f098fa7a593e30f27e94b8865642baa0689e8fa97c016f742abdb3b1bf6d9a
+ languageName: node
+ linkType: hard
+
"events@npm:^2.0.0":
version: 2.1.0
resolution: "events@npm:2.1.0"
@@ -17471,13 +17480,6 @@ __metadata:
languageName: node
linkType: hard
-"framesync@npm:5.2.0":
- version: 5.2.0
- resolution: "framesync@npm:5.2.0"
- checksum: 10c0/2d6d50edf1462a50f6b11dacdfd86645b9a89bcbb2480cbb7679a81ea41bc2bd6f25f4f2d36eb8831f75355661d72301024754b0b5d0127bb8a70b4f9c715b06
- languageName: node
- linkType: hard
-
"fresh@npm:0.5.2":
version: 0.5.2
resolution: "fresh@npm:0.5.2"
@@ -17520,17 +17522,6 @@ __metadata:
languageName: node
linkType: hard
-"fs-extra@npm:^7.0.0":
- version: 7.0.1
- resolution: "fs-extra@npm:7.0.1"
- dependencies:
- graceful-fs: "npm:^4.1.2"
- jsonfile: "npm:^4.0.0"
- universalify: "npm:^0.1.0"
- checksum: 10c0/1943bb2150007e3739921b8d13d4109abdc3cc481e53b97b7ea7f77eda1c3c642e27ae49eac3af074e3496ea02fde30f411ef410c760c70a38b92e656e5da784
- languageName: node
- linkType: hard
-
"fs-extra@npm:^9.0.1":
version: 9.1.0
resolution: "fs-extra@npm:9.1.0"
@@ -17693,13 +17684,6 @@ __metadata:
languageName: node
linkType: hard
-"geojson-types@npm:^2.0.1":
- version: 2.0.1
- resolution: "geojson-types@npm:2.0.1"
- checksum: 10c0/e7828f1c8106778f11d2437e10380be512bca5212e87302a5d856f8d35ef7994908c6dfb700e1e9625c58203b7a489b087b2354b1c8379f7ecc6da6360e84af6
- languageName: node
- linkType: hard
-
"geojson-vt@npm:^3.2.1":
version: 3.2.1
resolution: "geojson-vt@npm:3.2.1"
@@ -17707,7 +17691,7 @@ __metadata:
languageName: node
linkType: hard
-"geojson@npm:0.5.0, geojson@npm:^0.5.0":
+"geojson@npm:^0.5.0":
version: 0.5.0
resolution: "geojson@npm:0.5.0"
checksum: 10c0/d7fd376c201933dea1307b7c08032f249f73b9399d6287211f6a523d0efa9260caf2a38319f55075682d53dc4cb4c52b9f9c845f2fd03bef9832903f16177ab0
@@ -17886,13 +17870,6 @@ __metadata:
languageName: node
linkType: hard
-"gifshot@npm:^0.4.5":
- version: 0.4.5
- resolution: "gifshot@npm:0.4.5"
- checksum: 10c0/d26a44cf733cff16927392234b7620b0893ed3eae286231a1dab3067fce3757c232178399398f5c2aaf642c16c126efe3eb9f65a91109abc32b1fa2c7bdd5bb2
- languageName: node
- linkType: hard
-
"git-up@npm:^2.0.0":
version: 2.1.0
resolution: "git-up@npm:2.1.0"
@@ -17935,7 +17912,7 @@ __metadata:
languageName: node
linkType: hard
-"gl-matrix@npm:^3.0.0, gl-matrix@npm:^3.2.0, gl-matrix@npm:^3.2.1, gl-matrix@npm:^3.4.0, gl-matrix@npm:^3.4.3":
+"gl-matrix@npm:^3.0.0, gl-matrix@npm:^3.2.0, gl-matrix@npm:^3.2.1, gl-matrix@npm:^3.4.3":
version: 3.4.3
resolution: "gl-matrix@npm:3.4.3"
checksum: 10c0/c8ee6e2ce2d089b4ba4ae13ec9d4cb99bf2abe5f68f0cb08d94bbd8bafbec13aacc7230b86539ce5ca01b79226ea8c3194f971f5ca0c81838bc5e4e619dc398e
@@ -18103,7 +18080,7 @@ __metadata:
languageName: node
linkType: hard
-"global@npm:>=4.3.0, global@npm:^4.3.0, global@npm:^4.3.1, global@npm:^4.4.0":
+"global@npm:^4.3.0, global@npm:^4.3.1, global@npm:^4.4.0":
version: 4.4.0
resolution: "global@npm:4.4.0"
dependencies:
@@ -18283,17 +18260,17 @@ __metadata:
languageName: node
linkType: hard
-"h3-js@npm:^3.1.0, h3-js@npm:^3.6.4, h3-js@npm:^3.7.0":
+"h3-js@npm:^3.1.0":
version: 3.7.2
resolution: "h3-js@npm:3.7.2"
checksum: 10c0/c5a85743619809b81874630d6583fa6153ffa12e8f0aa4edb44bc9f78b2581a3aa84da47a5b1d0a69a20f127f8d943bf0a9c30c8344f1c7de41025486c0177ae
languageName: node
linkType: hard
-"hammerjs@npm:^2.0.8":
- version: 2.0.8
- resolution: "hammerjs@npm:2.0.8"
- checksum: 10c0/5c95e5774b5ea49492cb3fa8f1949aea67048a0b84af33acb555e7139abfcf3c83aca2b83e0c5008755bc230166df7b5e469d1e3eb6746c48f215f3672609fed
+"h3-js@npm:^4.1.0":
+ version: 4.4.0
+ resolution: "h3-js@npm:4.4.0"
+ checksum: 10c0/3a324b3a879601e1d012c2f67b2f78e9a480b0fa8e51c54b77ee281b421343ae735c3d892ab80c2cc8c47522ad0822ccb457b97b3792a040e41991016801f3ed
languageName: node
linkType: hard
@@ -18593,13 +18570,6 @@ __metadata:
languageName: node
linkType: hard
-"hey-listen@npm:^1.0.8":
- version: 1.0.8
- resolution: "hey-listen@npm:1.0.8"
- checksum: 10c0/38db3028b4756f3d536c0f6a92da53bad577ab649b06dddfd0a4d953f9a46bbc6a7f693c8c5b466a538d6d23dbc469260c848427f0de14198a2bbecbac37b39e
- languageName: node
- linkType: hard
-
"highlight.js@npm:^10.2.0":
version: 10.7.3
resolution: "highlight.js@npm:10.7.3"
@@ -19126,18 +19096,6 @@ __metadata:
languageName: node
linkType: hard
-"indefinitely-typed@npm:^1.1.0":
- version: 1.1.0
- resolution: "indefinitely-typed@npm:1.1.0"
- dependencies:
- fs-extra: "npm:^7.0.0"
- minimist: "npm:^1.2.5"
- bin:
- indefinitely-typed: bin/cli2.js
- checksum: 10c0/935a62479ee7faf3705411f38f72ae65c5a8d5b889211e1ff63a66ca48dc5a902be54dc2e9d18612a90772ce7a89f6de28694ad66196c6aab332d559d27870ff
- languageName: node
- linkType: hard
-
"indent-string@npm:^4.0.0":
version: 4.0.0
resolution: "indent-string@npm:4.0.0"
@@ -19496,7 +19454,7 @@ __metadata:
languageName: node
linkType: hard
-"is-buffer@npm:^1.0.2, is-buffer@npm:^1.1.0, is-buffer@npm:^1.1.4, is-buffer@npm:^1.1.5":
+"is-buffer@npm:^1.0.2, is-buffer@npm:^1.1.0, is-buffer@npm:^1.1.4, is-buffer@npm:^1.1.5, is-buffer@npm:~1.1.6":
version: 1.1.6
resolution: "is-buffer@npm:1.1.6"
checksum: 10c0/ae18aa0b6e113d6c490ad1db5e8df9bdb57758382b313f5a22c9c61084875c6396d50bbf49315f5b1926d142d74dfb8d31b40d993a383e0a158b15fea7a82234
@@ -20995,18 +20953,6 @@ __metadata:
languageName: node
linkType: hard
-"jsonfile@npm:^4.0.0":
- version: 4.0.0
- resolution: "jsonfile@npm:4.0.0"
- dependencies:
- graceful-fs: "npm:^4.1.6"
- dependenciesMeta:
- graceful-fs:
- optional: true
- checksum: 10c0/7dc94b628d57a66b71fb1b79510d460d662eb975b5f876d723f81549c2e9cd316d58a2ddf742b2b93a4fa6b17b2accaf1a738a0e2ea114bdfb13a32e5377e480
- languageName: node
- linkType: hard
-
"jsonfile@npm:^6.0.1":
version: 6.1.0
resolution: "jsonfile@npm:6.1.0"
@@ -21130,14 +21076,14 @@ __metadata:
"@babel/runtime": "npm:^7.12.1"
"@babel/traverse": "npm:^7.12.1"
"@cfaester/enzyme-adapter-react-18": "npm:^0.7.0"
- "@deck.gl/mapbox": "npm:^8.9.27"
- "@deck.gl/test-utils": "npm:^8.9.27"
- "@hubble.gl/core": "npm:1.4.0"
- "@hubble.gl/react": "npm:1.4.0"
+ "@deck.gl-community/editable-layers": "npm:9.2.8"
+ "@deck.gl-community/layers": "npm:9.2.8"
+ "@deck.gl/mapbox": "npm:^9.2.11"
+ "@deck.gl/test-utils": "npm:^9.2.11"
"@kepler.gl/components": "npm:3.2.6"
- "@loaders.gl/polyfills": "npm:^4.3.2"
- "@luma.gl/test-utils": "npm:^8.5.20"
- "@nebula.gl/layers": "npm:1.0.2-alpha.1"
+ "@loaders.gl/polyfills": "npm:^4.3.4"
+ "@luma.gl/test-utils": "npm:^9.2.6"
+ "@luma.gl/webgpu": "npm:^9.2.6"
"@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"
@@ -21190,6 +21136,7 @@ __metadata:
json-loader: "npm:^0.5.4"
mapbox-gl: "npm:1.13.1"
maplibre-gl: "npm:^3.6.2"
+ math.gl: "npm:^4.1.0"
minimist: "npm:^1.2.6"
monaco-editor: "npm:^0.52.0"
nyc: "npm:^15.1.0"
@@ -21215,7 +21162,7 @@ __metadata:
tape-catch: "npm:^1.0.6"
typedoc: "npm:^0.19.2"
typedoc-plugin-markdown: "npm:^3.0.11"
- typescript: "npm:4.7.2"
+ typescript: "npm:5.6.3"
url-loader: "npm:^4.1.1"
usehooks-ts: "npm:^3.1.0"
watchify: "npm:^3.6.1"
@@ -21555,6 +21502,13 @@ __metadata:
languageName: node
linkType: hard
+"lodash.omit@npm:^4.1.1":
+ version: 4.5.0
+ resolution: "lodash.omit@npm:4.5.0"
+ checksum: 10c0/3808b9b6faae35177174b6ab327f1177e29c91f1e98dcbccf13a72a6767bba337306449d537a4e0d8a33d2673f10d39bc732e30c4b803274ea0c1168ea60e549
+ languageName: node
+ linkType: hard
+
"lodash.throttle@npm:^4.1.1":
version: 4.1.1
resolution: "lodash.throttle@npm:4.1.1"
@@ -21569,13 +21523,6 @@ __metadata:
languageName: node
linkType: hard
-"lodash.uniqby@npm:^4.7.0":
- version: 4.7.0
- resolution: "lodash.uniqby@npm:4.7.0"
- checksum: 10c0/c505c0de20ca759599a2ba38710e8fb95ff2d2028e24d86c901ef2c74be8056518571b9b754bfb75053b2818d30dd02243e4a4621a6940c206bbb3f7626db656
- languageName: node
- linkType: hard
-
"lodash@npm:4.17.21":
version: 4.17.21
resolution: "lodash@npm:4.17.21"
@@ -22014,12 +21961,12 @@ __metadata:
languageName: node
linkType: hard
-"math.gl@npm:^3.6.2":
- version: 3.6.3
- resolution: "math.gl@npm:3.6.3"
+"math.gl@npm:^4.1.0":
+ version: 4.1.0
+ resolution: "math.gl@npm:4.1.0"
dependencies:
- "@math.gl/core": "npm:3.6.3"
- checksum: 10c0/7516182bc7f47fd224e991f97c173d9f628f4aafac72749c403d38d4befdaaaac7dea309826b7710e264ae9e142376f237a0f2b6297ff01654b9771eddc701d0
+ "@math.gl/core": "npm:4.1.0"
+ checksum: 10c0/26774938d0434ec598ace7f32c409a877ee3326b9579819dd78fe4d254ad805f2b05edae58cc97a4513df4b156aac48ff4a744a7dfbcd795ec0187e4f3c5fef1
languageName: node
linkType: hard
@@ -22041,6 +21988,17 @@ __metadata:
languageName: node
linkType: hard
+"md5@npm:^2.3.0":
+ version: 2.3.0
+ resolution: "md5@npm:2.3.0"
+ dependencies:
+ charenc: "npm:0.0.2"
+ crypt: "npm:0.0.2"
+ is-buffer: "npm:~1.1.6"
+ checksum: 10c0/14a21d597d92e5b738255fbe7fe379905b8cb97e0a49d44a20b58526a646ec5518c337b817ce0094ca94d3e81a3313879c4c7b510d250c282d53afbbdede9110
+ languageName: node
+ linkType: hard
+
"mdast-util-compact@npm:^1.0.0":
version: 1.0.4
resolution: "mdast-util-compact@npm:1.0.4"
@@ -23139,13 +23097,10 @@ __metadata:
languageName: node
linkType: hard
-"mjolnir.js@npm:^2.7.0":
- version: 2.7.3
- resolution: "mjolnir.js@npm:2.7.3"
- dependencies:
- "@types/hammerjs": "npm:^2.0.41"
- hammerjs: "npm:^2.0.8"
- checksum: 10c0/82f86dedfd410a640e5d0ef6f04e1d72ab292e61d42434bc56f103670ada45b2aacf130527f434d7d4bd0b8d2d5bc82bd36850e7586f1b70ebb72da2fe2c72b2
+"mjolnir.js@npm:^3.0.0":
+ version: 3.0.0
+ resolution: "mjolnir.js@npm:3.0.0"
+ checksum: 10c0/bdbe0b6ab1420917a68fa0faa47351295b189816ad67c9ace36c24ff341f873a7e4d6ea704e33f2a6f9b8fc0ff6b8d17e30ad74aed455da38d97ba52198a6274
languageName: node
linkType: hard
@@ -24985,25 +24940,13 @@ __metadata:
languageName: node
linkType: hard
-"polygon-clipping@npm:^0.15.3":
- version: 0.15.7
- resolution: "polygon-clipping@npm:0.15.7"
- dependencies:
- robust-predicates: "npm:^3.0.2"
- splaytree: "npm:^3.1.0"
- checksum: 10c0/9515283509f1793f22fd87e68662838a6ebbd33cca4fc4bccd9f1b4f366383a4590e9a1cd48287e6897ad018803aeb97ed9ebe38bada5cffa7b4551539a9ab10
- languageName: node
- linkType: hard
-
-"popmotion@npm:9.3.1":
- version: 9.3.1
- resolution: "popmotion@npm:9.3.1"
+"polyclip-ts@npm:^0.16.8":
+ version: 0.16.8
+ resolution: "polyclip-ts@npm:0.16.8"
dependencies:
- framesync: "npm:5.2.0"
- hey-listen: "npm:^1.0.8"
- style-value-types: "npm:4.1.1"
- tslib: "npm:^1.10.0"
- checksum: 10c0/05893e953e228f0935ea532c3fa2b5b7d632204eba905f40f4c0b080d9899401398007ae86f3eaf1bb6185a9eb9f2cb7c29cb63543a06e317e3cba3cb4217f20
+ bignumber.js: "npm:^9.1.0"
+ splaytree-ts: "npm:^1.0.2"
+ checksum: 10c0/8de02c32e566421875c70890fe6d3d7bd55a92fc39867446e65999e042c4632fb27ab1a7e106e96edd12d63b32a643f3a690d9a980aeda655a41ddf4e8750f5d
languageName: node
linkType: hard
@@ -25284,6 +25227,13 @@ __metadata:
languageName: node
linkType: hard
+"preact@npm:^10.17.0":
+ version: 10.29.0
+ resolution: "preact@npm:10.29.0"
+ checksum: 10c0/d111381e5b48335e3a797a03adb83521cf5e9bdf880570fb2eff4fe9da9c82e6dedcbdf54538b1ed8f60bf813a0df0f4891b03dc32140ad93f8f720a8812dd5c
+ languageName: node
+ linkType: hard
+
"prebuild-install@npm:^7.1.1":
version: 7.1.2
resolution: "prebuild-install@npm:7.1.2"
@@ -25850,6 +25800,15 @@ __metadata:
languageName: node
linkType: hard
+"rbush@npm:^3.0.1":
+ version: 3.0.1
+ resolution: "rbush@npm:3.0.1"
+ dependencies:
+ quickselect: "npm:^2.0.0"
+ checksum: 10c0/55311586c30cdedaa2220de6f1da45fe1fa806263afbf7b6f4c0078983830c2abc7771187896d68bfc9078cb279079fb4c84971831da4b74384aab2c2c417758
+ languageName: node
+ linkType: hard
+
"rc@npm:^1.2.7":
version: 1.2.8
resolution: "rc@npm:1.2.8"
@@ -26139,26 +26098,6 @@ __metadata:
languageName: node
linkType: hard
-"react-map-gl@npm:^7.1.8":
- version: 7.1.9
- resolution: "react-map-gl@npm:7.1.9"
- dependencies:
- "@maplibre/maplibre-gl-style-spec": "npm:^19.2.1"
- "@types/mapbox-gl": "npm:>=1.0.0"
- peerDependencies:
- mapbox-gl: ">=1.13.0"
- maplibre-gl: ">=1.13.0 <5.0.0"
- react: ">=16.3.0"
- react-dom: ">=16.3.0"
- peerDependenciesMeta:
- mapbox-gl:
- optional: true
- maplibre-gl:
- optional: true
- checksum: 10c0/3861debf4f898447837570b90af6bf2a16d571f6466ddd04c57d4ac3fc5c379024b73d0517bbd9e1e6f8b7bab9d3708b9c7c9f57643356cff60824101035d285
- languageName: node
- linkType: hard
-
"react-markdown@npm:^10.0.0":
version: 10.0.0
resolution: "react-markdown@npm:10.0.0"
@@ -26196,21 +26135,6 @@ __metadata:
languageName: node
linkType: hard
-"react-modal@npm:^3.8.1":
- version: 3.16.3
- resolution: "react-modal@npm:3.16.3"
- dependencies:
- exenv: "npm:^1.2.0"
- prop-types: "npm:^15.7.2"
- react-lifecycles-compat: "npm:^3.0.0"
- warning: "npm:^4.0.3"
- peerDependencies:
- react: ^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19
- react-dom: ^0.14.0 || ^15.0.0 || ^16 || ^17 || ^18 || ^19
- checksum: 10c0/b541c91aef680c51ee9edf4ec14b3be29787e34d4df174150361b1d42b2416b28336e2280abdc71df082b1380d0786fe2122cdca31e19a74b54b49d17855a0f2
- languageName: node
- linkType: hard
-
"react-motion@npm:^0.5.2":
version: 0.5.2
resolution: "react-motion@npm:0.5.2"
@@ -26224,16 +26148,6 @@ __metadata:
languageName: node
linkType: hard
-"react-onclickoutside@npm:^6.9.0":
- version: 6.13.1
- resolution: "react-onclickoutside@npm:6.13.1"
- peerDependencies:
- react: ^15.5.x || ^16.x || ^17.x || ^18.x
- react-dom: ^15.5.x || ^16.x || ^17.x || ^18.x
- checksum: 10c0/93b02c493332ca7f8b480a1e185386c4af55d1daf33af2f68ddf440e4fc9b22ad13f59d7e204694aa31c1c2e332f0766c7ee302fe3b0cecbd0e0b45d55905c96
- languageName: node
- linkType: hard
-
"react-palm@npm:^3.3.8":
version: 3.3.8
resolution: "react-palm@npm:3.3.8"
@@ -27173,13 +27087,6 @@ __metadata:
languageName: node
linkType: hard
-"reselect@npm:^3.0.0":
- version: 3.0.1
- resolution: "reselect@npm:3.0.1"
- checksum: 10c0/b4bced93369e33832befc245253e2ce2f64ac007bbdf013a260c7b29e23dff8cf82e0415b0d05b85279bc8fc8af4a5f92bd261d3e0e9cbe4e5c1869f8b0ec5a6
- languageName: node
- linkType: hard
-
"reselect@npm:^4.0.0, reselect@npm:^4.1.0, reselect@npm:^4.1.8":
version: 4.1.8
resolution: "reselect@npm:4.1.8"
@@ -27425,13 +27332,6 @@ __metadata:
languageName: node
linkType: hard
-"robust-predicates@npm:^3.0.2":
- version: 3.0.2
- resolution: "robust-predicates@npm:3.0.2"
- checksum: 10c0/4ecd53649f1c2d49529c85518f2fa69ffb2f7a4453f7fd19c042421c7b4d76c3efb48bc1c740c8f7049346d7cb58cf08ee0c9adaae595cc23564d360adb1fde4
- languageName: node
- linkType: hard
-
"rrweb-cssom@npm:^0.6.0":
version: 0.6.0
resolution: "rrweb-cssom@npm:0.6.0"
@@ -28393,10 +28293,10 @@ __metadata:
languageName: node
linkType: hard
-"splaytree@npm:^3.1.0":
- version: 3.1.2
- resolution: "splaytree@npm:3.1.2"
- checksum: 10c0/ba82da4e4185d692eb2b1c9e000a9dde6cd713ec447f5c90ec97264ce9de19ba1f5f90fbef8a9ffa37bbbe2e9f4b031c6ee45d4119acbf1cddb93112ec5ecf86
+"splaytree-ts@npm:^1.0.2":
+ version: 1.0.2
+ resolution: "splaytree-ts@npm:1.0.2"
+ checksum: 10c0/4c34573891a749055ffe22381ea841ae03dbf7b55a3ea4a1d7df5013bfbe128e79f6c468579358ec573734cdbdf5f77a97ae7185f155248eb8be58151428c85e
languageName: node
linkType: hard
@@ -28968,16 +28868,6 @@ __metadata:
languageName: node
linkType: hard
-"style-value-types@npm:4.1.1":
- version: 4.1.1
- resolution: "style-value-types@npm:4.1.1"
- dependencies:
- hey-listen: "npm:^1.0.8"
- tslib: "npm:^1.10.0"
- checksum: 10c0/51b4c595bff050d5e108732cb10b784512f0eb3c947c4b3f42038a6efc8d64cef1d791637acb514ad0ba3365d66bed61862d275ae613732f54f1003aca78f288
- languageName: node
- linkType: hard
-
"styled-components@npm:6.1.8":
version: 6.1.8
resolution: "styled-components@npm:6.1.8"
@@ -30001,7 +29891,7 @@ __metadata:
languageName: node
linkType: hard
-"tslib@npm:^1.10.0, tslib@npm:^1.8.1":
+"tslib@npm:^1.8.1":
version: 1.14.1
resolution: "tslib@npm:1.14.1"
checksum: 10c0/69ae09c49eea644bc5ebe1bca4fa4cc2c82b7b3e02f43b84bd891504edf66dbc6b2ec0eef31a957042de2269139e4acff911e6d186a258fb14069cd7f6febce2
@@ -30247,23 +30137,23 @@ __metadata:
languageName: node
linkType: hard
-"typescript@npm:4.7.2":
- version: 4.7.2
- resolution: "typescript@npm:4.7.2"
+"typescript@npm:5.6.3":
+ version: 5.6.3
+ resolution: "typescript@npm:5.6.3"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
- checksum: 10c0/c458df58a52f1cb1c954109dbc3477abfeb632644bc6552a9ac2152bce86e377afe11bf661466926bc4dcdc945f1e053d492c347ae377f1cba7051226b930ea3
+ checksum: 10c0/44f61d3fb15c35359bc60399cb8127c30bae554cd555b8e2b46d68fa79d680354b83320ad419ff1b81a0bdf324197b29affe6cc28988cd6a74d4ac60c94f9799
languageName: node
linkType: hard
-"typescript@patch:typescript@npm%3A4.7.2#optional!builtin<compat/typescript>":
- version: 4.7.2
- resolution: "typescript@patch:typescript@npm%3A4.7.2#optional!builtin<compat/typescript>::version=4.7.2&hash=65a307"
+"typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>":
+ version: 5.6.3
+ resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=74658d"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
- checksum: 10c0/f454730aef4a8cef2ad5650ce769f38ed4460583fe5867d4f93592282afdbd9b5142b75d448b647e4984edf23575ac1f2adafb2db8614f253f700721d3eb439a
+ checksum: 10c0/ac8307bb06bbfd08ae7137da740769b7d8c3ee5943188743bb622c621f8ad61d244767480f90fbd840277fbf152d8932aa20c33f867dea1bb5e79b187ca1a92f
languageName: node
linkType: hard
@@ -30684,7 +30574,7 @@ __metadata:
languageName: node
linkType: hard
-"universalify@npm:^0.1.0, universalify@npm:^0.1.2":
+"universalify@npm:^0.1.2":
version: 0.1.2
resolution: "universalify@npm:0.1.2"
checksum: 10c0/e70e0339f6b36f34c9816f6bf9662372bd241714dc77508d231d08386d94f2c4aa1ba1318614f92015f40d45aae1b9075cd30bd490efbe39387b60a76ca3f045
@@ -30945,6 +30835,15 @@ __metadata:
languageName: node
linkType: hard
+"uuid@npm:9.0.0":
+ version: 9.0.0
+ resolution: "uuid@npm:9.0.0"
+ bin:
+ uuid: dist/bin/uuid
+ checksum: 10c0/8867e438990d1d33ac61093e2e4e3477a2148b844e4fa9e3c2360fa4399292429c4b6ec64537eb1659c97b2d10db349c673ad58b50e2824a11e0d3630de3c056
+ languageName: node
+ linkType: hard
+
"uuid@npm:^10.0.0":
version: 10.0.0
resolution: "uuid@npm:10.0.0"
@@ -31160,15 +31059,6 @@ __metadata:
languageName: node
linkType: hard
-"viewport-mercator-project@npm:>=6.0.0":
- version: 7.0.4
- resolution: "viewport-mercator-project@npm:7.0.4"
- dependencies:
- "@math.gl/web-mercator": "npm:^3.5.5"
- checksum: 10c0/9a8a12f4bd68355a8162a23d4b161133b45aee71b2453fd8d57f54c55466007428cf502d0c02f58620d4c92ba934c29608613bc3176dd8c1d348f8a9deb34e32
- languageName: node
- linkType: hard
-
"viewport-mercator-project@npm:^6.0.0":
version: 6.2.3
resolution: "viewport-mercator-project@npm:6.2.3"
@@ -31370,13 +31260,6 @@ __metadata:
languageName: node
linkType: hard
-"webm-writer@npm:^1.0.0":
- version: 1.0.0
- resolution: "webm-writer@npm:1.0.0"
- checksum: 10c0/ea1e2bfee4f59e988bba5b9bc1881962fea57cc66df71b9ae2f18f3aa0032542b7308f43e4a9061ce9a21cfc509e51e3760b5d785d93c0870c3b7f06d54794c0
- languageName: node
- linkType: hard
-
"webpack-bundle-analyzer@npm:^3.3.2":
version: 3.9.0
resolution: "webpack-bundle-analyzer@npm:3.9.0"
@@ -31580,6 +31463,13 @@ __metadata:
languageName: node
linkType: hard
+"wgsl_reflect@npm:^1.0.1, wgsl_reflect@npm:^1.2.0":
+ version: 1.2.3
+ resolution: "wgsl_reflect@npm:1.2.3"
+ checksum: 10c0/0ac66a98607a606ea0d9c419de9be63137ab0cbe05a9024f65fe3d606de1ab40d5b6a50a8fc30b8ad5b06dc7d676e7e5f6c4218ce0061f2b4a17d3722ca363b4
+ languageName: node
+ linkType: hard
+
"whatwg-encoding@npm:^2.0.0":
version: 2.0.0
resolution: "whatwg-encoding@npm:2.0.0"