Skip to content

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

[Enhancement] add changedFilters to datasets when filter data is called (#1396)

Shan Hef0e51743d582
diff --git a/src/components/common/item-selector/chickleted-input.js b/src/components/common/item-selector/chickleted-input.js
index e0963345e..fbc1792f3 100644
--- a/src/components/common/item-selector/chickleted-input.js
+++ b/src/components/common/item-selector/chickleted-input.js
@@ -132,7 +132,7 @@ const ChickletedInput = ({
})
) : (
<span className={`${className} chickleted-input__placeholder`}>
- <FormattedMessage id={placeholder} />
+ <FormattedMessage id={placeholder || 'placeholder.enterValue'} />
</span>
)}
</ChickletedInputContainer>
diff --git a/src/components/common/item-selector/item-selector.js b/src/components/common/item-selector/item-selector.js
index 4114c9646..10e09afaf 100644
--- a/src/components/common/item-selector/item-selector.js
+++ b/src/components/common/item-selector/item-selector.js
@@ -313,7 +313,9 @@ class ItemSelector extends Component {
light={this.props.inputTheme === 'light'}
/>
) : (
- <FormattedMessage id={this.props.placeholder} />
+ <FormattedMessage
+ id={this.props.placeholder || 'placeholder.selectValue'}
+ />
)}
</DropdownSelectValue>
{this.props.erasable && hasValue ? (
diff --git a/src/components/filters/filter-panels/filter-panel-with-field-select.js b/src/components/filters/filter-panels/filter-panel-with-field-select.js
index 3560a2634..6dc8f97f8 100644
--- a/src/components/filters/filter-panels/filter-panel-with-field-select.js
+++ b/src/components/filters/filter-panels/filter-panel-with-field-select.js
@@ -61,7 +61,7 @@ function FieldPanelWithFieldSelectFactory(
]);
const fieldValue = useMemo(
- () => (Array.isArray(filter.name) ? filter.name[0] : filter.name),
+ () => ((Array.isArray(filter.name) ? filter.name[0] : filter.name)),
[filter.name]
);
diff --git a/src/layers/layer-factory.d.ts b/src/layers/layer-factory.d.ts
index 327e4acee..fe6016b14 100644
--- a/src/layers/layer-factory.d.ts
+++ b/src/layers/layer-factory.d.ts
@@ -6,6 +6,7 @@ export type ColorRange = {
category: string;
colors: HexColor[];
reversed?: boolean;
+ colorMap?: Map | object;
};
export type LayerTextLabel = {
diff --git a/src/reducers/vis-state-updaters.js b/src/reducers/vis-state-updaters.js
index 90df82e75..e3dff7e2d 100644
--- a/src/reducers/vis-state-updaters.js
+++ b/src/reducers/vis-state-updaters.js
@@ -557,8 +557,8 @@ export function setFilterAnimationWindowUpdater(state, {id, animationWindow}) {
*/
export function setFilterUpdater(state, action) {
const {idx, prop, value, valueIndex = 0} = action;
-
const oldFilter = state.filters[idx];
+
if (!oldFilter) {
Console.error(`filters.${idx} is undefined`);
return state;
diff --git a/src/utils/filter-utils.js b/src/utils/filter-utils.js
index e174f9814..e178f6fe9 100644
--- a/src/utils/filter-utils.js
+++ b/src/utils/filter-utils.js
@@ -488,7 +488,7 @@ export function filterDataset(dataset, filters, layers, opt) {
// if there is no filters
const filterRecord = getFilterRecord(dataId, filters, opt || {});
- const newDataset = set(['filterRecord'], filterRecord, dataset);
+ let newDataset = set(['filterRecord'], filterRecord, dataset);
if (!filters.length) {
return {
@@ -500,6 +500,7 @@ export function filterDataset(dataset, filters, layers, opt) {
}
const changedFilters = diffFilters(filterRecord, oldFilterRecord);
+ newDataset = set(['changedFilters'], changedFilters, newDataset);
// generate 2 sets of filter result
// filteredIndex used to calculate layer data
diff --git a/src/utils/layer-utils.js b/src/utils/layer-utils.js
index 0b85aa303..32a117514 100644
--- a/src/utils/layer-utils.js
+++ b/src/utils/layer-utils.js
@@ -96,7 +96,7 @@ export function getLayerHoverProp({
return null;
}
const {allData, fields} = datasets[dataId];
- const data = layer.getHoverData(object, allData);
+ const data = layer.getHoverData(object, allData, fields);
const fieldsToShow = interactionConfig.tooltip.config.fieldsToShow[dataId];
return {
diff --git a/test/fixtures/test-hex-id-data.js b/test/fixtures/test-hex-id-data.js
index 05fcf6fa9..8b6eb09b8 100644
--- a/test/fixtures/test-hex-id-data.js
+++ b/test/fixtures/test-hex-id-data.js
@@ -455,5 +455,11 @@ export const expectedMergedDataset = {
fixedDomain: [],
cpu: [],
gpu: [mergedFilters[0]]
+ },
+ changedFilters: {
+ dynamicDomain: {byjasfp0u: 'added'},
+ fixedDomain: null,
+ cpu: null,
+ gpu: {byjasfp0u: 'added'}
}
};
diff --git a/test/node/reducers/vis-state-merger-test.js b/test/node/reducers/vis-state-merger-test.js
index 717bd45d7..e730486a7 100644
--- a/test/node/reducers/vis-state-merger-test.js
+++ b/test/node/reducers/vis-state-merger-test.js
@@ -1615,6 +1615,12 @@ test('VisStateMerger.v1 -> mergeFilters -> multiFilters', t => {
],
result: [1474588800000 - 1474588800000, 1472688000000 - 1472688000000, 0, 0]
}
+ },
+ changedFilters: {
+ dynamicDomain: {'date-2': 'added'},
+ fixedDomain: {'time-0': 'added', 'epoch-4': 'added'},
+ cpu: {'date-2': 'added'},
+ gpu: {'time-0': 'added', 'epoch-4': 'added'}
}
},
[testGeoJsonDataId]: {
@@ -1667,7 +1673,13 @@ test('VisStateMerger.v1 -> mergeFilters -> multiFilters', t => {
color: 'donot test me',
filteredIndex: [0],
filteredIndexForDomain: [0],
- fieldPairs: oldGeoJsonData.fieldPairs
+ fieldPairs: oldGeoJsonData.fieldPairs,
+ changedFilters: {
+ dynamicDomain: {'RATE-1': 'added', 'TRIPS-3': 'added'},
+ fixedDomain: null,
+ cpu: {'RATE-1': 'added'},
+ gpu: {'TRIPS-3': 'added'}
+ }
}
};
diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.js
index d304a33d2..455a54f79 100644
--- a/test/node/reducers/vis-state-test.js
+++ b/test/node/reducers/vis-state-test.js
@@ -1624,7 +1624,13 @@ test('#visStateReducer -> UPDATE_VIS_DATA -> mergeFilters', t => {
},
suffix: ['lat', 'lng']
}
- ]
+ ],
+ changedFilters: {
+ dynamicDomain: {'38chejr': 'added'},
+ fixedDomain: null,
+ cpu: null,
+ gpu: {'38chejr': 'added'}
+ }
}
};
@@ -1904,7 +1910,8 @@ test('#visStateReducer -> setFilter.dynamicDomain & cpu', t => {
},
suffix: ['lat', 'lng']
}
- ]
+ ],
+ changedFilters: {dynamicDomain: null, fixedDomain: null, cpu: null, gpu: null}
};
cmpDataset(t, expectedDataset, stateWithFilterName.datasets.smoothie);
@@ -1924,7 +1931,6 @@ test('#visStateReducer -> setFilter.dynamicDomain & cpu', t => {
cmpFilters(t, expectedFilterWValue, stateWithFilterValue.filters[0]);
const updatedFilterWValue = stateWithFilterValue.filters[0];
-
const expectedFilteredDataset = {
...expectedDataset,
filterRecord: {
@@ -1935,7 +1941,13 @@ test('#visStateReducer -> setFilter.dynamicDomain & cpu', t => {
},
allData,
filteredIndex: [17, 18, 19, 20, 21, 22],
- filteredIndexForDomain: [17, 18, 19, 20, 21, 22]
+ filteredIndexForDomain: [17, 18, 19, 20, 21, 22],
+ changedFilters: {
+ dynamicDomain: {[updatedFilterWValue.id]: 'added'},
+ fixedDomain: null,
+ cpu: {[updatedFilterWValue.id]: 'added'},
+ gpu: null
+ }
};
cmpDataset(t, expectedFilteredDataset, stateWithFilterValue.datasets.smoothie);
@@ -2101,7 +2113,7 @@ function testSetFilterDynamicDomainGPU(t, setFilter) {
// set filter value
const stateWithFilterValue = reducer(stateWithFilterName, setFilter(0, 'value', [8, 20]));
-
+ const filterId = stateWithFilterName.filters[0].id;
const expectedFilterWValue = {
...expectedFilterWName,
value: [8, 20]
@@ -2150,7 +2162,13 @@ function testSetFilterDynamicDomainGPU(t, setFilter) {
},
filteredIndex: geojsonData.features.map((_, i) => i),
filteredIndexForDomain: [0, 2],
- allIndexes: geojsonData.features.map((_, i) => i)
+ allIndexes: geojsonData.features.map((_, i) => i),
+ changedFilters: {
+ dynamicDomain: {[filterId]: 'value_changed'},
+ fixedDomain: null,
+ cpu: null,
+ gpu: {[filterId]: 'value_changed'}
+ }
};
const actualTripField = stateWithFilterValue.datasets.milkshake.fields[4];
@@ -2243,11 +2261,13 @@ test('#visStateReducer -> setFilter.fixedDomain & DynamicDomain & gpu & cpu', t
}
]);
+ const filterId = stateWidthTsFilter.filters[0].id;
+
const expectedFilterTs = {
dataId: ['smoothie'],
freeze: true,
fixedDomain: true,
- id: 'dont test me',
+ id: filterId,
name: ['gps_data.utc_timestamp'],
type: 'timeRange',
fieldIdx: [0],
@@ -2345,7 +2365,13 @@ test('#visStateReducer -> setFilter.fixedDomain & DynamicDomain & gpu & cpu', t
},
// copy everything
filteredIndex: datasetSmoothie.allData.map((d, i) => i),
- filteredIndexForDomain: datasetSmoothie.allData.map((d, i) => i)
+ filteredIndexForDomain: datasetSmoothie.allData.map((d, i) => i),
+ changedFilters: {
+ dynamicDomain: null,
+ fixedDomain: {[filterId]: 'value_changed'},
+ cpu: null,
+ gpu: {[filterId]: 'value_changed'}
+ }
};
// check filter by ts
@@ -2367,7 +2393,7 @@ test('#visStateReducer -> setFilter.fixedDomain & DynamicDomain & gpu & cpu', t
payload: [1, 'value', ['2016-09-24', '2016-10-10']]
}
]);
-
+ const filterId1 = stateWidthTsAndNameFilter.filters[1].id;
const expectedFilteredDataset = {
...stateWidthTsFilter.datasets.smoothie,
fields: stateWidthTsFilter.datasets.smoothie.fields.map(f =>
@@ -2409,7 +2435,13 @@ test('#visStateReducer -> setFilter.fixedDomain & DynamicDomain & gpu & cpu', t
gpu: [stateWidthTsAndNameFilter.filters[0]]
},
filteredIndex: [7, 8, 9, 10, 11, 12, 17, 18, 19, 20, 21, 22],
- filteredIndexForDomain: [7, 8, 9, 10, 11, 12, 17, 18, 19, 20, 21, 22]
+ filteredIndexForDomain: [7, 8, 9, 10, 11, 12, 17, 18, 19, 20, 21, 22],
+ changedFilters: {
+ dynamicDomain: {[filterId1]: 'added'},
+ fixedDomain: null,
+ cpu: {[filterId1]: 'added'},
+ gpu: null
+ }
};
cmpDataset(t, expectedFilteredDataset, stateWidthTsAndNameFilter.datasets.smoothie);