Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[fix] Hexbin layer color aggregation incorrect on load (#2415)
Igor Dykhtab995c9b5eb91
diff --git a/src/components/src/side-panel/layer-panel/layer-configurator.tsx b/src/components/src/side-panel/layer-panel/layer-configurator.tsxindex fd6519748..0e87ae6c0 100644--- a/src/components/src/side-panel/layer-panel/layer-configurator.tsx+++ b/src/components/src/side-panel/layer-panel/layer-configurator.tsx@@ -45,7 +45,11 @@ import LayerErrorMessage from './layer-error-message';import {capitalizeFirstLetter} from '@kepler.gl/utils';-import {CHANNEL_SCALE_SUPPORTED_FIELDS, LAYER_TYPES} from '@kepler.gl/constants';+import {+ CHANNEL_SCALE_SUPPORTED_FIELDS,+ LAYER_TYPES,+ AGGREGATION_TYPE_OPTIONS+} from '@kepler.gl/constants';import {Layer, LayerBaseConfig, VisualChannel, AggregationLayer} from '@kepler.gl/layers';import {NestedPartial, LayerVisConfig, ColorUI, Field} from '@kepler.gl/types';@@ -1183,16 +1187,31 @@ export const AggregationTypeSelector = ({channel, layer, onChange}: AggregationSconst {visConfig} = layer.config;// aggregation should only be selectable when field is selected- const aggregationOptions = layer.getAggregationOptions(key);+ const layerAggregationTypes = layer.getAggregationOptions(key);++ const aggregationOptions = AGGREGATION_TYPE_OPTIONS.filter(({id}) =>+ layerAggregationTypes.includes(id)+ );++ const selectedAggregation = aggregation+ ? aggregationOptions.find(({id}) => id === visConfig[aggregation])+ : [];return (<SidePanelSection><PanelLabel>- <FormattedMessage id={'layer.aggregateBy'} values={{field: selectedField.name}} />+ <FormattedMessage+ id={'layer.aggregateBy'}+ values={{+ field: selectedField.displayName+ }}+ /></PanelLabel><ItemSelector- selectedItems={visConfig[aggregation as string]}+ selectedItems={selectedAggregation}options={aggregationOptions}+ displayOption="label"+ getOptionValue="id"multiSelect={false}searchable={false}onChange={value =>diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.tsindex ee7e673d0..1bb70f125 100644--- a/src/constants/src/default-settings.ts+++ b/src/constants/src/default-settings.ts@@ -565,7 +565,7 @@ export const AGGREGATION_TYPES: {variance: 'variance';// ordinalmode: 'mode';- countUnique: 'count unique';+ countUnique: 'countUnique';} = {// defaultcount: 'count',@@ -579,9 +579,23 @@ export const AGGREGATION_TYPES: {variance: 'variance',// ordinalmode: 'mode',- countUnique: 'count unique'+ countUnique: 'countUnique'};+export const AGGREGATION_TYPE_OPTIONS: {id: string; label: string}[] = Object.entries(+ AGGREGATION_TYPES+).map(([key, value]) => ({+ id: key,+ label:+ key === 'stdev'+ ? 'Std Deviation'+ : key === 'countUnique'+ ? 'Count Unique'+ : typeof value === 'string'+ ? value.charAt(0).toUpperCase() + value.slice(1)+ : value+}));+export const linearFieldScaleFunctions = {[CHANNEL_SCALES.color]: [SCALE_TYPES.quantize, SCALE_TYPES.quantile],[CHANNEL_SCALES.radius]: [SCALE_TYPES.sqrt],diff --git a/src/reducers/src/vis-state-merger.ts b/src/reducers/src/vis-state-merger.tsindex b3f457ddc..e8abdf618 100644--- a/src/reducers/src/vis-state-merger.ts+++ b/src/reducers/src/vis-state-merger.ts@@ -831,11 +831,6 @@ export function validateLayerWithData(}}- // visual channel field is saved to be {name, type}- // find visual channel field by matching both name and type- // refer to vis-state-schema.js VisualChannelSchemaV1- newLayer = validateSavedVisualChannels(fields, newLayer, savedLayer, options);-const textLabel =savedLayer.config.textLabel && newLayer.config.textLabel? validateSavedTextLabel(@@ -850,7 +845,9 @@ export function validateLayerWithData(const visConfig = newLayer.copyLayerConfig(newLayer.config.visConfig,savedLayer.config.visConfig || {},- {shallowCopy: ['colorRange', 'strokeColorRange']}+ {+ shallowCopy: ['colorRange', 'strokeColorRange']+ });newLayer.updateLayerConfig({@@ -858,6 +855,11 @@ export function validateLayerWithData(textLabel});+ // visual channel field is saved to be {name, type}+ // find visual channel field by matching both name and type+ // refer to vis-state-schema.js VisualChannelSchemaV1+ newLayer = validateSavedVisualChannels(fields, newLayer, savedLayer, options);+if (throwOnError) {if (!newLayer.isValidToSave()) {throw new Error(`Layer is not valid to save: ${newLayer.id}`);diff --git a/test/fixtures/state-saved-v0.js b/test/fixtures/state-saved-v0.jsindex 791c59c5a..b10ff3a7d 100644--- a/test/fixtures/state-saved-v0.js+++ b/test/fixtures/state-saved-v0.js@@ -1267,7 +1267,7 @@ mergedLayer3.config = {},visConfig: {colorAggregation: 'maximum',- sizeAggregation: 'average',+ sizeAggregation: 'count',enable3d: true,opacity: 0.8,worldUnitSize: 0.5,diff --git a/test/fixtures/state-saved-v1-3.js b/test/fixtures/state-saved-v1-3.jsindex e700dd48d..7e1d9dcaa 100644--- a/test/fixtures/state-saved-v1-3.js+++ b/test/fixtures/state-saved-v1-3.js@@ -263,7 +263,7 @@ export const savedStateV1 = {percentile: [0, 96.54],elevationPercentile: [0, 100],elevationScale: 5,- colorAggregation: 'average',+ colorAggregation: 'count', // if associated visualChannel colorField value is null, it can only default to 'count'sizeAggregation: 'average',enable3d: false}@@ -468,8 +468,8 @@ mergedLayer1.config = {elevationPercentile: [0, 100],elevationScale: 5,enableElevationZoomFactor: true,- colorAggregation: 'average',- sizeAggregation: 'average',+ colorAggregation: 'count', // if associated colorField value is null, it can only default to 'count'+ sizeAggregation: 'count', // if associated sizeField value is null, it can only default to 'count'enable3d: false},animation: {enabled: false}diff --git a/test/node/utils/aggregate-utils-test.js b/test/node/utils/aggregate-utils-test.jsindex 5a955411d..b7ece04ce 100644--- a/test/node/utils/aggregate-utils-test.js+++ b/test/node/utils/aggregate-utils-test.js@@ -45,12 +45,12 @@ test('AggregateUtils - GetMode', t => {test('AggregateUtils - aggregate', t => {const data = [1, 2, 3, 1, 2, 3, 4, 3];- const results = [8, 2.375, 4, 1, 2.5, 1.0606601717798212, 19, 1.125, '3', 8];+ const results = [8, 2.375, 4, 1, 2.5, 1.0606601717798212, 19, 1.125, '3', 4];Object.keys(AGGREGATION_TYPES).map((technique, index) => {t.equal(aggregate(data, technique),results[index],- `Should compute the right aggregation using ${technique} - ${index}`+ `Should compute the right aggregation using ${technique} - ${aggregate(data, technique)}`);});