Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[fix] aggregation layers fixes for custom color scale (#3129)
Igor Dykhta49fbf8faa70c
diff --git a/src/deckgl-layers/src/cluster-layer/cluster-layer.ts b/src/deckgl-layers/src/cluster-layer/cluster-layer.tsindex 364b17e07..25f84e42a 100644--- a/src/deckgl-layers/src/cluster-layer/cluster-layer.ts+++ b/src/deckgl-layers/src/cluster-layer/cluster-layer.ts@@ -135,7 +135,10 @@ const clusterLayerDimensions: [DimensionType<RGBAColor>, DimensionType<number>]getSubLayerAccessor: getSubLayerRadius,getPickingInfo: (dimensionState, cell, layerProps) => {const radiusValue = layerProps.getRadiusValue(cell);- return {radiusValue};+ const {scaleFunc} = dimensionState;+ const scaledRadiusValue = scaleFunc ? scaleFunc(radiusValue) : radiusValue;++ return {radiusValue, scaledRadiusValue};}}];@@ -187,7 +190,15 @@ export default class ClusterLayer extends AggregationLayer<}getPickingInfo({info}) {- return this.state.cpuAggregator.getPickingInfo({info}, this.props);+ const obj = this.state.cpuAggregator.getPickingInfo({info}, this.props);+ if (obj?.object) {+ // @ts-expect-error+ const distanceScale = getDistanceScales(this.context.viewport);+ const metersPerPixel = distanceScale.metersPerPixel[0];+ obj.object.scaledRadiusValue = obj.object.scaledRadiusValue * metersPerPixel;+ }++ return obj;}_getSublayerUpdateTriggers() {diff --git a/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts b/src/deckgl-layers/src/layer-utils/cpu-aggregator.tsindex 3c7d539d2..9eee7a14c 100644--- a/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts+++ b/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts@@ -163,6 +163,7 @@ export function getDimensionScale(this: CPUAggregator, step, props, dimensionUpdconst scaleFunc = scaleFunctor.domain(dimensionDomain).range(dimensionFixed ? dimensionDomain : dimensionRange);+ scaleFunc.scaleType = props.colorScaleType;if (typeof onSet === 'object' && typeof props[onSet.props] === 'function') {const sortedBins = this.state.dimensions[key].sortedBins;diff --git a/src/layers/src/aggregation-layer.ts b/src/layers/src/aggregation-layer.tsindex 288b9f00c..ac6c79c43 100644--- a/src/layers/src/aggregation-layer.ts+++ b/src/layers/src/aggregation-layer.ts@@ -365,7 +365,9 @@ export default class AggregationLayer extends Layer {const updateTriggers = {getColorValue: {colorField: this.config.colorField,- colorAggregation: this.config.visConfig.colorAggregation+ colorAggregation: this.config.visConfig.colorAggregation,+ colorRange: visConfig.colorRange,+ colorMap: visConfig.colorRange.colorMap},getElevationValue: {sizeField: this.config.sizeField,diff --git a/src/layers/src/cluster-layer/cluster-layer.ts b/src/layers/src/cluster-layer/cluster-layer.tsindex acca7038e..728a985e7 100644--- a/src/layers/src/cluster-layer/cluster-layer.ts+++ b/src/layers/src/cluster-layer/cluster-layer.ts@@ -92,7 +92,9 @@ export default class ClusterLayer extends AggregationLayer {const updateTriggers = {getColorValue: {colorField: this.config.colorField,- colorAggregation: this.config.visConfig.colorAggregation+ colorAggregation: this.config.visConfig.colorAggregation,+ colorRange: visConfig.colorRange,+ colorMap: visConfig.colorRange.colorMap},filterData: {filterRange: gpuFilter.filterRange,@@ -135,12 +137,12 @@ export default class ClusterLayer extends AggregationLayer {// hover layer...(hoveredObject? [- new ScatterplotLayer<{radius: number}>({+ new ScatterplotLayer<{scaledRadiusValue: number}>({id: `${this.id}-hovered`,visible: defaultLayerProps.visible,data: [hoveredObject],getFillColor: this.config.highlightColor,- getRadius: d => d.radius,+ getRadius: (d: {scaledRadiusValue: number}) => d.scaledRadiusValue,radiusScale: 1,pickable: false})diff --git a/src/layers/src/hexagon-layer/hexagon-layer.ts b/src/layers/src/hexagon-layer/hexagon-layer.tsindex ac31e66e4..8a95cfaab 100644--- a/src/layers/src/hexagon-layer/hexagon-layer.ts+++ b/src/layers/src/hexagon-layer/hexagon-layer.ts@@ -6,7 +6,6 @@ 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 {clamp} from '@kepler.gl/utils';import {ColorRange,VisConfigBoolean,@@ -135,7 +134,7 @@ export default class HexagonLayer extends AggregationLayer {hexagonToPolygonGeo(hoveredObject, {}, radius * visConfig.coverage, mapState)].filter(d => d),getLineColor: this.config.highlightColor,- lineWidthScale: clamp([1, 100], radius * 0.1 * zoomFactor)+ lineWidthScale: 8 * zoomFactor})]: [])diff --git a/src/utils/src/data-scale-utils.ts b/src/utils/src/data-scale-utils.tsindex c5e071faf..c0700c110 100644--- a/src/utils/src/data-scale-utils.ts+++ b/src/utils/src/data-scale-utils.ts@@ -706,12 +706,12 @@ export function initCustomPaletteByCustomScale({colorBreaks}: {scale: string;- field: Field;+ field?: Field;ordinalDomain?: number[] | string[];range: ColorRange;colorBreaks: ColorBreakOrdinal[] | null;}): ColorUI['customPalette'] {- const customPaletteName = `color.customPalette.${scale}.${field.name}`;+ const customPaletteName = `color.customPalette.${scale}.${field?.name || 'point-count'}`;// reuse range.colorMap if the field and scale not changedconst reuseColorMap = range.colorMap && range.name === customPaletteName && range.type === scale;const colorMap = reuseColorMap