Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[fix] fixes the logic to set map overlay type properly when switching layer type (#2135)
Igor Dykhta5cc6faab29ee
diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsxindex 4ae8fdacb..ecfdb0486 100644--- a/src/components/src/map-container.tsx+++ b/src/components/src/map-container.tsx@@ -339,6 +339,15 @@ export default function MapContainerFactory(this.props.visStateActions.onLayerClick(null);};+ _onLayerHover = (+ idx: number,+ info: {+ picked?: boolean;+ } | null+ ) => {+ this.props.visStateActions.onLayerHover(info);+ };+_onLayerSetDomain = (idx: number, colorDomain: VisualChannelDomain) => {this.props.visStateActions.layerConfigChange(this.props.visState.layers[idx], {colorDomain@@ -586,7 +595,10 @@ export default function MapContainerFactory(}: undefined},- this._onLayerSetDomain,+ {+ onLayerHover: this._onLayerHover,+ onSetLayerDomain: this._onLayerSetDomain+ },deckGlProps);diff --git a/src/components/src/map/layer-hover-info.tsx b/src/components/src/map/layer-hover-info.tsxindex a04b1d0f8..9f9f39038 100644--- a/src/components/src/map/layer-hover-info.tsx+++ b/src/components/src/map/layer-hover-info.tsx@@ -31,6 +31,7 @@ import {getTooltipDisplayDeltaValue,getTooltipDisplayValue} from '@kepler.gl/reducers';+import {useIntl} from 'react-intl';export const StyledLayerName = styled(CenterFlexbox)`color: ${props => props.theme.textColorHl};@@ -190,6 +191,7 @@ const CellInfo = ({const LayerHoverInfoFactory = () => {const LayerHoverInfo = props => {const {data, layer} = props;+ const intl = useIntl();if (!data || !layer) {return null;@@ -202,7 +204,17 @@ const LayerHoverInfoFactory = () => {{props.layer.config.label}</StyledLayerName><StyledTable>- {props.layer.isAggregated ? <CellInfo {...props} /> : <EntryInfo {...props} />}+ {data.fieldValues ? (+ <tbody>+ {data.fieldValues.map(({labelMessage, value}, i) => (+ <Row key={i} name={intl.formatMessage({id: labelMessage})} value={value} />+ ))}+ </tbody>+ ) : props.layer.isAggregated ? (+ <CellInfo {...props} />+ ) : (+ <EntryInfo {...props} />+ )}</StyledTable></div>);diff --git a/src/components/src/side-panel/layer-manager.tsx b/src/components/src/side-panel/layer-manager.tsxindex e6c5c0019..5a6420597 100644--- a/src/components/src/side-panel/layer-manager.tsx+++ b/src/components/src/side-panel/layer-manager.tsx@@ -21,6 +21,7 @@import React, {Component, useCallback} from 'react';import {injectIntl, WrappedComponentProps} from 'react-intl';+import styled from 'styled-components';import {FormattedMessage} from '@kepler.gl/localization';import LayerListFactory from './layer-panel/layer-list';@@ -32,6 +33,7 @@ import AddLayerButtonFactory from './layer-panel/add-layer-button';import ItemSelector from '../common/item-selector/item-selector';import {PanelLabel, SidePanelDivider, SidePanelSection} from '../common/styled-components';+import InfoHelperFactory from '../common/info-helper';import {LAYER_BLENDINGS, OVERLAY_BLENDINGS, PANEL_VIEW_TOGGLES} from '@kepler.gl/constants';import {Layer, LayerClassesType} from '@kepler.gl/layers';@@ -48,6 +50,7 @@ type LayerBlendingSelectorProps = {type OverlayBlendingSelectorProps = {overlayBlending: string;updateOverlayBlending: ActionHandler<typeof VisStateActions.updateOverlayBlending>;+ infoHelper: React.ReactNode;} & WrappedComponentProps;type LayerManagerProps = {@@ -100,8 +103,18 @@ const LayerBlendingSelector = React.memo();LayerBlendingSelector.displayName = 'LayerBlendingSelector';+const InfoHelperWrapper = styled.div`+ float: right;+`;++const OverlayBlendingSelectorTitleRow = styled.div`+ display: flex;+ flex-direction: row;+ align-items: center;+`;+const OverlayBlendingSelector = React.memo(- ({overlayBlending, updateOverlayBlending, intl}: OverlayBlendingSelectorProps) => {+ ({overlayBlending, updateOverlayBlending, intl, infoHelper}: OverlayBlendingSelectorProps) => {const labeledOverlayBlendings = Object.keys(OVERLAY_BLENDINGS).reduce((acc, current) => ({...acc,@@ -117,9 +130,12 @@ const OverlayBlendingSelector = React.memo(return (<SidePanelSection>- <PanelLabel>- <FormattedMessage id="overlayBlending.title" />- </PanelLabel>+ <OverlayBlendingSelectorTitleRow>+ <PanelLabel>+ <FormattedMessage id="overlayBlending.title" />+ </PanelLabel>+ <InfoHelperWrapper>{infoHelper}</InfoHelperWrapper>+ </OverlayBlendingSelectorTitleRow><ItemSelectorselectedItems={intl.formatMessage({id: OVERLAY_BLENDINGS[overlayBlending].label})}options={Object.keys(labeledOverlayBlendings)}@@ -139,7 +155,8 @@ LayerManagerFactory.deps = [PanelViewListToggleFactory,PanelTitleFactory,DatasetSectionFactory,- AddLayerButtonFactory+ AddLayerButtonFactory,+ InfoHelperFactory];function LayerManagerFactory(@@ -148,7 +165,8 @@ function LayerManagerFactory(PanelViewListToggle: ReturnType<typeof PanelViewListToggleFactory>,PanelTitle: ReturnType<typeof PanelTitleFactory>,DatasetSection: ReturnType<typeof DatasetSectionFactory>,- AddLayerButton: ReturnType<typeof AddLayerButtonFactory>+ AddLayerButton: ReturnType<typeof AddLayerButtonFactory>,+ InfoHelper: ReturnType<typeof InfoHelperFactory>) {class LayerManager extends Component<LayerManagerProps> {_addLayer = (dataset: string) => {@@ -241,6 +259,12 @@ function LayerManagerFactory(overlayBlending={this.props.overlayBlending}updateOverlayBlending={visStateActions.updateOverlayBlending}intl={intl}+ infoHelper={+ <InfoHelper+ id={`overlayBlending-description`}+ description={'overlayBlending.description'}+ />+ }/></div>);diff --git a/src/components/src/side-panel/layer-panel/layer-type-list-item.tsx b/src/components/src/side-panel/layer-panel/layer-type-list-item.tsxindex 9bcf4b7a6..24eb9e46d 100644--- a/src/components/src/side-panel/layer-panel/layer-type-list-item.tsx+++ b/src/components/src/side-panel/layer-panel/layer-type-list-item.tsx@@ -46,6 +46,8 @@ const StyledListItem = styled.div`color: ${props => props.theme.activeColor};background-size: ${props => props.theme.layerTypeIconSizeSM}px${props => props.theme.layerTypeIconSizeSM}px;+ height: ${props => props.theme.layerTypeIconSizeSM}px;+ width: ${props => props.theme.layerTypeIconSizeSM}px;margin-right: 12px;}}@@ -56,6 +58,8 @@ const StyledListItem = styled.div`background-image: url(${`${CLOUDFRONT}/kepler.gl-layer-icon-bg.png`});background-size: ${props => props.theme.layerTypeIconSizeL}px${props => props.theme.layerTypeIconSizeL}px;+ height: ${props => props.theme.layerTypeIconSizeL}px;+ width: ${props => props.theme.layerTypeIconSizeL}px;}.layer-type-selector__item__label {diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.tsindex e5feb81bf..fca1bc7c2 100644--- a/src/constants/src/default-settings.ts+++ b/src/constants/src/default-settings.ts@@ -231,41 +231,52 @@ export const DEFAULT_LAYER_GROUPS: DEFAULT_LAYER_GROUP[] = [}];+export const BASE_MAP_COLOR_MODES = keyMirror({+ NONE: null,+ DARK: null,+ LIGHT: null+});+export const DEFAULT_MAP_STYLES = [{id: 'dark',label: 'Dark',url: 'mapbox://styles/uberdata/cjoqbbf6l9k302sl96tyvka09',icon: `${ICON_PREFIX}/UBER_DARK_V2.png`,- layerGroups: DEFAULT_LAYER_GROUPS+ layerGroups: DEFAULT_LAYER_GROUPS,+ colorMode: BASE_MAP_COLOR_MODES.DARK},{id: 'light',label: 'Light',url: 'mapbox://styles/uberdata/cjoqb9j339k1f2sl9t5ic5bn4',icon: `${ICON_PREFIX}/UBER_LIGHT_V2.png`,- layerGroups: DEFAULT_LAYER_GROUPS+ layerGroups: DEFAULT_LAYER_GROUPS,+ colorMode: BASE_MAP_COLOR_MODES.LIGHT},{id: 'muted',label: 'Muted Light',url: 'mapbox://styles/uberdata/cjfyl03kp1tul2smf5v2tbdd4',icon: `${ICON_PREFIX}/UBER_MUTED_LIGHT.png`,- layerGroups: DEFAULT_LAYER_GROUPS+ layerGroups: DEFAULT_LAYER_GROUPS,+ colorMode: BASE_MAP_COLOR_MODES.LIGHT},{id: 'muted_night',label: 'Muted Night',url: 'mapbox://styles/uberdata/cjfxhlikmaj1b2soyzevnywgs',icon: `${ICON_PREFIX}/UBER_MUTED_NIGHT.png`,- layerGroups: DEFAULT_LAYER_GROUPS+ layerGroups: DEFAULT_LAYER_GROUPS,+ colorMode: BASE_MAP_COLOR_MODES.DARK},{id: 'satellite',label: 'Satellite',url: `mapbox://styles/mapbox/satellite-v9`,icon: `${ICON_PREFIX}/UBER_SATELLITE.png`,- layerGroups: []+ layerGroups: [],+ colorMode: BASE_MAP_COLOR_MODES.NONE}];diff --git a/src/constants/src/layers.ts b/src/constants/src/layers.tsindex f401eb68c..aed26df26 100644--- a/src/constants/src/layers.ts+++ b/src/constants/src/layers.ts@@ -449,6 +449,13 @@ export const LAYER_VIS_CONFIGS: LayerVisConfigSettings = {group: PROPERTY_GROUPS.cell,property: 'radius',allowCustomValue: true+ },+ darkBaseMapEnabled: {+ type: 'boolean',+ defaultValue: true,+ label: 'layerVisConfigs.darkModeEnabled',+ property: 'darkBaseMapEnabled',+ group: PROPERTY_GROUPS.display}};diff --git a/src/layers/src/aggregation-layer.ts b/src/layers/src/aggregation-layer.tsindex 6cb2f6e12..27ec8af21 100644--- a/src/layers/src/aggregation-layer.ts+++ b/src/layers/src/aggregation-layer.ts@@ -63,7 +63,10 @@ export const getValueAggrFunc = getPointData => (field, aggregation) => points =): points.length;-export const getFilterDataFunc = (filterRange, getFilterValue) => pt =>+export const getFilterDataFunc = (+ filterRange: number[][],+ getFilterValue: (d: any) => number[]+): ((d: any) => boolean) => pt =>getFilterValue(pt).every((val, i) => val >= filterRange[i][0] && val <= filterRange[i][1]);const getLayerColorRange = (colorRange: ColorRange) => colorRange.colors.map(hexToRgb);diff --git a/src/layers/src/arc-layer/arc-layer.ts b/src/layers/src/arc-layer/arc-layer.tsindex adfeb4b95..f37a41e81 100644--- a/src/layers/src/arc-layer/arc-layer.ts+++ b/src/layers/src/arc-layer/arc-layer.ts@@ -239,11 +239,11 @@ export default class ArcLayer extends Layer {// get bounds from arcsconst getPosition = this.getPositionAccessor(dataContainer);- const sBounds = this.getPointsBounds(dataContainer, (d, i) => {+ const sBounds = this.getPointsBounds(dataContainer, d => {const pos = getPosition(d);return [pos[0], pos[1]];});- const tBounds = this.getPointsBounds(dataContainer, (d, i) => {+ const tBounds = this.getPointsBounds(dataContainer, d => {const pos = getPosition(d);return [pos[3], pos[4]];});diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.tsindex 8c8856211..6de66c68f 100644--- a/src/layers/src/base-layer.ts+++ b/src/layers/src/base-layer.ts@@ -160,10 +160,9 @@ export type VisualChannel = {defaultMeasure?: any;accessor?: string;condition?: (config: any) => boolean;+ defaultValue?: ((config: any) => any) | any;getAttributeValue?: (config: any) => (d: any) => any;- // TODO: define defaultValue- defaultValue?: any;// TODO: define fixedfixed?: any;@@ -177,7 +176,12 @@ export type VisualChannelDescription = {measure: string | undefined;};-export type ColumnPairs = {[key: string]: {pair: string; fieldPairKey: string}};+export type ColumnPair = {+ pair: string;+ fieldPairKey: string;+};++export type ColumnPairs = {[key: string]: ColumnPair};type ColumnValidator = (column: LayerColumn, columns: LayerColumns, allFields: Field[]) => boolean;@@ -221,8 +225,7 @@ export const colorMaker = generateColor();class Layer {id: string;- // TODO: define meta- meta: {};+ meta: Record<string, any>;visConfigSettings: {[key: string]: ValueOf<LayerVisConfigSettings>;};@@ -541,7 +544,7 @@ class Layer {* @param pair - field Pair* @returns {object} - Column config*/- assignColumnPairs(key, pair) {+ assignColumnPairs(key: string, pair: string): LayerColumns {if (!this.columnPairs || !this.columnPairs?.[key]) {// should not end in this statereturn this.config.columns;@@ -1000,7 +1003,10 @@ class Layer {* @param {(d: {index: number}, dc: import('utils/table-utils/data-container-interface').DataContainerInterface) => number[]} getPosition Access kepler.gl layer data from deck.gl layer* @return {number[]|null} bounds of the data.*/- getPointsBounds(dataContainer, getPosition) {+ getPointsBounds(+ dataContainer: DataContainerInterface,+ getPosition?: (x: any, dc: DataContainerInterface) => number[]+ ): number[] | null {// no need to loop through the entire dataset// get a sample of data to calculate boundsconst sampleData =@@ -1008,7 +1014,7 @@ class Layer {? getSampleContainerData(dataContainer, MAX_SAMPLE_SIZE): dataContainer;- const points = sampleData.mapIndex(getPosition);+ const points = getPosition ? sampleData.mapIndex(getPosition) : [];const latBounds = getLatLngBounds(points, 1, [-90, 90]);const lngBounds = getLatLngBounds(points, 0, [-180, 180]);@@ -1058,7 +1064,7 @@ class Layer {return attributeValue;}- updateMeta(meta) {+ updateMeta(meta: Layer['meta']) {this.meta = {...this.meta, ...meta};}@@ -1078,7 +1084,7 @@ class Layer {};}- updateData(datasets, oldLayerData) {+ updateData(datasets: Datasets, oldLayerData: any) {if (!this.config.dataId) {return {};}diff --git a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.tsindex a30086941..05a19ebfc 100644--- a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts+++ b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts@@ -277,9 +277,12 @@ export default class HexagonIdLayer extends Layer {const centroidsDataContainer = createDataContainer(centroids);- const bounds = this.getPointsBounds(centroidsDataContainer, (d, dc) => {- return [dc.valueAt(d.index, 0), dc.valueAt(d.index, 1)];- });+ const bounds = this.getPointsBounds(+ centroidsDataContainer,+ (d: any, dc: DataContainerInterface) => {+ return [dc.valueAt(d.index, 0), dc.valueAt(d.index, 1)];+ }+ );this.dataToFeature = {centroids};this.updateMeta({bounds});}diff --git a/src/layers/src/index.ts b/src/layers/src/index.tsindex 3a7bdf708..2c36d8fa8 100644--- a/src/layers/src/index.ts+++ b/src/layers/src/index.ts@@ -108,4 +108,6 @@ export {getEditorLayer} from './editor-layer/editor-layer';import {isDrawingActive, onClick, onHover, getTooltip, getCursor} from './editor-layer/editor-layer-utils';export const EditorLayerUtils = {isDrawingActive, onClick, onHover, getTooltip, getCursor-};\ No newline at end of file+};++export {getFilterDataFunc} from './aggregation-layer';diff --git a/src/localization/src/translations/en.ts b/src/localization/src/translations/en.tsindex b208ae301..802643b3d 100644--- a/src/localization/src/translations/en.ts+++ b/src/localization/src/translations/en.ts@@ -167,7 +167,8 @@ export default {weightIntensity: 'Weight Intensity',zoomScale: 'Zoom Scale',heightRange: 'Height Range',- heightMultiplier: 'Height Multiplier'+ heightMultiplier: 'Height Multiplier',+ darkModeEnabled: 'Dark base map'},layerManager: {addData: 'Add Data',@@ -420,9 +421,10 @@ export default {},overlayBlending: {title: 'Map overlay blending',- screen: 'screen',+ description: 'Blend layers with the base map so that both are visible.',+ screen: 'dark base map',normal: 'normal',- darken: 'darken'+ darken: 'light base map'},columns: {title: 'Columns',diff --git a/src/reducers/src/combined-updaters.ts b/src/reducers/src/combined-updaters.tsindex 3788a7469..91d82602c 100644--- a/src/reducers/src/combined-updaters.ts+++ b/src/reducers/src/combined-updaters.ts@@ -24,20 +24,29 @@ import {} from './ui-state-updaters';import {updateVisDataUpdater as visStateUpdateVisDataUpdater,- setMapInfoUpdater+ setMapInfoUpdater,+ layerTypeChangeUpdater} from './vis-state-updaters';import {receiveMapConfigUpdater as stateMapConfigUpdater} from './map-state-updaters';-import {receiveMapConfigUpdater as styleMapConfigUpdater} from './map-style-updaters';+import {+ mapStyleChangeUpdater,+ receiveMapConfigUpdater as styleMapConfigUpdater+} from './map-style-updaters';import {filesToDataPayload} from '@kepler.gl/processors';import {payload_, apply_, with_, if_, compose_, merge_, pick_} from './composer-helpers';import {MapState, UiState, AddDataToMapPayload, ParsedConfig} from '@kepler.gl/types';import {MapStyle} from './map-style-updaters';import {ProviderState} from './provider-state-updaters';-import {loadFilesSuccessUpdaterAction} from '@kepler.gl/actions';+import {+ loadFilesSuccessUpdaterAction,+ MapStyleChangeUpdaterAction,+ LayerTypeChangeUpdaterAction+} from '@kepler.gl/actions';import {VisState} from '@kepler.gl/schemas';import {Layer} from '@kepler.gl/layers';import {isPlainObject} from '@kepler.gl/utils';import {findMapBounds} from './data-utils';+import {BASE_MAP_COLOR_MODES, OVERLAY_BLENDINGS} from '@kepler.gl/constants';export type KeplerGlState = {visState: VisState;@@ -216,3 +225,123 @@ export const loadFilesSuccessUpdater = (};export const addDataToMapComposed = addDataToMapUpdater;++/**+ * Helper which updates map overlay blending mode in visState,+ * but only if it's not currently in the `normal` mode.+ */+const updateOverlayBlending = overlayBlending => visState => {+ if (visState.overlayBlending !== OVERLAY_BLENDINGS.normal.value) {+ return {+ ...visState,+ overlayBlending+ };+ }+ return visState;+};++/**+ * Helper which updates `darkBaseMapEnabled` in all the layers in visState which+ * have this config setting (or in one specific layer if the `layerId` param is provided).+ */+const updateDarkBaseMapLayers = (+ darkBaseMapEnabled: boolean,+ layerId: string | null = null+) => visState => ({+ ...visState,+ layers: visState.layers.map(layer => {+ if (!layerId || layer.id === layerId) {+ if (layer.visConfigSettings.hasOwnProperty('darkBaseMapEnabled')) {+ const {visConfig} = layer.config;+ return layer.updateLayerConfig({+ visConfig: {...visConfig, darkBaseMapEnabled}+ });+ }+ }+ return layer;+ })+});++/**+ * Updater that changes the map style by calling mapStyleChangeUpdater on visState.+ * In addition to that, it does the following:+ *+ * 1. Update map overlay blending mode in accordance with the colorMode of the+ * base map, but only if it's not in the `normal` mode.+ *+ * 2. Update all the layers which have the `darkBaseMapEnabled` config setting+ * adjusting it in accordance with the colorMode of the base map.+ *+ */+export const combinedMapStyleChangeUpdater = (+ state: KeplerGlState,+ action: MapStyleChangeUpdaterAction+): KeplerGlState => {+ const {payload} = action;+ const {mapStyle} = state;+ const getColorMode = key => mapStyle.mapStyles[key]?.colorMode;+ const prevColorMode = getColorMode(mapStyle.styleType);+ const nextColorMode = getColorMode(payload);+ let {visState} = state;+ if (nextColorMode !== prevColorMode) {+ switch (nextColorMode) {+ case BASE_MAP_COLOR_MODES.DARK:+ visState = compose_([+ updateOverlayBlending(OVERLAY_BLENDINGS.screen.value),+ updateDarkBaseMapLayers(true)+ ])(visState);+ break;+ case BASE_MAP_COLOR_MODES.LIGHT:+ visState = compose_([+ updateOverlayBlending(OVERLAY_BLENDINGS.darken.value),+ updateDarkBaseMapLayers(false)+ ])(visState);+ break;+ default:+ // do nothing+ }+ }+ return {+ ...state,+ visState,+ mapStyle: mapStyleChangeUpdater(mapStyle, {payload})+ };+};++/**+ * Updater that changes the layer type by calling `layerTypeChangeUpdater` on visState.+ * In addition to that, if the new layer type has the `darkBaseMapEnabled` config+ * setting, we adjust it in accordance with the colorMode of the base map.s+ */+export const combinedLayerTypeChangeUpdater = (+ state: KeplerGlState,+ action: LayerTypeChangeUpdaterAction+): KeplerGlState => {+ let {visState} = state;+ const oldLayerIndex = visState.layers.findIndex(layer => layer === action.oldLayer);+ visState = layerTypeChangeUpdater(visState, action);+ const newLayer = visState.layers[oldLayerIndex];+ if (newLayer?.visConfigSettings.hasOwnProperty('darkBaseMapEnabled')) {+ const {mapStyle} = state;+ const {colorMode} = mapStyle.mapStyles[mapStyle.styleType];+ const {darkBaseMapEnabled} = newLayer.config.visConfig;+ switch (colorMode) {+ case BASE_MAP_COLOR_MODES.DARK:+ if (!darkBaseMapEnabled) {+ visState = updateDarkBaseMapLayers(true, newLayer.id)(visState);+ }+ break;+ case BASE_MAP_COLOR_MODES.LIGHT:+ if (darkBaseMapEnabled) {+ visState = updateDarkBaseMapLayers(false, newLayer.id)(visState);+ }+ break;+ default:+ // do nothing+ }+ }+ return {+ ...state,+ visState+ };+};diff --git a/src/reducers/src/composers.ts b/src/reducers/src/composers.tsindex 736bc8096..6796388a3 100644--- a/src/reducers/src/composers.ts+++ b/src/reducers/src/composers.ts@@ -27,6 +27,8 @@ import * as combinedUpdaters from './combined-updaters';*/const actionHandler = {[ActionTypes.ADD_DATA_TO_MAP]: combinedUpdaters.addDataToMapUpdater,+ [ActionTypes.MAP_STYLE_CHANGE]: combinedUpdaters.combinedMapStyleChangeUpdater,+ [ActionTypes.LAYER_TYPE_CHANGE]: combinedUpdaters.combinedLayerTypeChangeUpdater,[ActionTypes.LOAD_FILES_SUCCESS]: combinedUpdaters.loadFilesSuccessUpdater};diff --git a/src/reducers/src/data-utils.ts b/src/reducers/src/data-utils.tsindex 4427d87c8..76e0cf992 100644--- a/src/reducers/src/data-utils.ts+++ b/src/reducers/src/data-utils.ts@@ -34,7 +34,6 @@ export function findMapBounds(layers: Layer[]): Bounds | null {// find bounds in formatted layerData// take ALL layers into account when finding map boundsconst availableLayerBounds: Bounds | [] = layers.reduce((res, l) => {- // @ts-expect-errorif (l.meta && l.meta.bounds) {// @ts-expect-errorres.push(l.meta.bounds);diff --git a/src/reducers/src/layer-utils.ts b/src/reducers/src/layer-utils.tsindex 3184e27e8..2fca7edd7 100644--- a/src/reducers/src/layer-utils.ts+++ b/src/reducers/src/layer-utils.ts@@ -317,11 +317,24 @@ export type ComputeDeckLayersProps = {};};+export function bindLayerCallbacks(layerCallbacks = {}, idx) {+ return Object.keys(layerCallbacks).reduce(+ (accu, key) => ({+ ...accu,+ [key]: val => layerCallbacks[key](idx, val)+ }),+ {}+ );+}+// eslint-disable-next-line complexityexport function computeDeckLayers({visState, mapState, mapStyle}: any,options?: ComputeDeckLayersProps,- onSetLayerDomain?: (idx: number, value: any) => void,+ layerCallbacks?: {+ onLayerHover?: (idx: number, value: any) => void;+ onSetLayerDomain?: (idx: number, value: any) => void;+ },deckGlProps?: any): Layer[] {const {@@ -351,11 +364,7 @@ export function computeDeckLayers(.reverse().filter(idx => currentLayersForDeck[layers[idx].id]).reduce((overlays, idx) => {- const layerCallbacks = onSetLayerDomain- ? {- onSetLayerDomain: val => onSetLayerDomain(idx, val)- }- : {};+ const bindedLayerCallbacks = layerCallbacks ? bindLayerCallbacks(layerCallbacks, idx) : {};const layerOverlay = renderDeckGlLayer({datasets,@@ -368,7 +377,7 @@ export function computeDeckLayers(animationConfig,mapLayers},- layerCallbacks,+ bindedLayerCallbacks,idx);return overlays.concat(layerOverlay || []);diff --git a/src/table/src/gpu-filter-utils.ts b/src/table/src/gpu-filter-utils.tsindex 3d3f6bbac..99656e1d4 100644--- a/src/table/src/gpu-filter-utils.ts+++ b/src/table/src/gpu-filter-utils.ts@@ -227,7 +227,6 @@ export function getGpuFilterProps(filters: Filter[], dataId: string, fields: Fiereturn {filterRange,filterValueUpdateTriggers: triggers,- // @ts-expect-errorfilterValueAccessor};}diff --git a/src/table/src/kepler-table.ts b/src/table/src/kepler-table.tsindex 4a9d106be..f22af35f7 100644--- a/src/table/src/kepler-table.ts+++ b/src/table/src/kepler-table.ts@@ -70,7 +70,7 @@ export type GpuFilter = {) => (getIndex?: (any) => number,getData?: (dc_: DataContainerInterface, d: any, fieldIndex: number) => any- ) => (d: any) => number;+ ) => (d: any) => number[];};// Unique identifier of each fielddiff --git a/src/types/layers.d.ts b/src/types/layers.d.tsindex ecc22b1d3..818af69db 100644--- a/src/types/layers.d.ts+++ b/src/types/layers.d.ts@@ -204,6 +204,7 @@ export type LayerVisConfigSettings = {wireframe: VisConfigBoolean;weight: VisConfigNumber;heatmapRadius: VisConfigNumber;+ darkBaseMapEnabled: VisConfigBoolean;};// TODO: Move this to individual layersdiff --git a/src/types/reducers.d.ts b/src/types/reducers.d.tsindex f3f0c03c0..5bf56b32a 100644--- a/src/types/reducers.d.ts+++ b/src/types/reducers.d.ts@@ -288,6 +288,7 @@ export type BaseMapStyle = {layerGroups: LayerGroup[];accessToken?: string;custom?: boolean;+ colorMode?: BASE_MAP_COLOR_MODES;};export declare type ExportImage = {