Skip to content

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

[Bug] Fixed geo-filter extra layer issue (#936)

Giuseppe Macrìd568cff989f0
diff --git a/package.json b/package.json
index 3296a33f1..3e720357f 100644
--- a/package.json
+++ b/package.json
@@ -104,6 +104,7 @@
"lodash.throttle": "^4.1.1",
"lodash.uniq": "^4.0.1",
"lodash.uniqby": "^4.7.0",
+ "lodash.xor": "^4.5.0",
"luma.gl": "^7.3.2",
"mini-svg-data-uri": "^1.0.3",
"moment": "^2.10.6",
diff --git a/src/reducers/vis-state-updaters.js b/src/reducers/vis-state-updaters.js
index 4041da716..73c15b367 100644
--- a/src/reducers/vis-state-updaters.js
+++ b/src/reducers/vis-state-updaters.js
@@ -23,6 +23,7 @@ import Task, {disableStackCapturing, withTask} from 'react-palm/tasks';
import cloneDeep from 'lodash.clonedeep';
import uniq from 'lodash.uniq';
import get from 'lodash.get';
+import xor from 'lodash.xor';
// Tasks
import {LOAD_FILE_TASK} from 'tasks/tasks';
@@ -537,7 +538,8 @@ export function setFilterUpdater(state, action) {
valueIndex = 0
} = action;
- let newFilter = set([prop], value, state.filters[idx]);
+ const oldFilter = state.filters[idx];
+ let newFilter = set([prop], value, oldFilter);
let newState = state;
const {dataId} = newFilter;
@@ -585,23 +587,30 @@ export function setFilterUpdater(state, action) {
// only filter the current dataset
break;
case FILTER_UPDATER_PROPS.layerId:
- // const layers = state.layers.filter(l => value.includes(l.id));
+ // We need to update only datasetId/s if we have added/removed layers
+ // - check for layerId changes (XOR works because of string values)
+ // if no differences between layerIds, don't do any filtering
+ const layerIdDifference = xor(newFilter.layerId, oldFilter.layerId);
const layerDataIds = uniq(
- value
+ layerIdDifference
.map(lid => get(state.layers.find(l => l.id === lid), ['config', 'dataId']))
.filter(d => d)
);
- // diff filter.dataId with layerDataIds, to determine which dataset to run filter on
- datasetIds = [
- ...layerDataIds.filter(lid => !datasetIds.includes(lid)),
- ...datasetIds.filter(did => !layerDataIds.includes(did))
- ];
+ // only filter datasetsIds
+ datasetIds = layerDataIds;
+
+ // Update newFilter dataIds
+ const newDataIds = uniq(
+ newFilter.layerId
+ .map(lid => get(state.layers.find(l => l.id === lid), ['config', 'dataId']))
+ .filter(d => d)
+ );
newFilter = {
...newFilter,
- dataId: layerDataIds
+ dataId: newDataIds
};
break;
diff --git a/test/fixtures/polygon.js b/test/fixtures/polygon.js
index 32ce8a7d4..8e181a5dd 100644
--- a/test/fixtures/polygon.js
+++ b/test/fixtures/polygon.js
@@ -25,24 +25,24 @@ export const mockPolygonFeature = {
coordinates: [
[
[
- 12.0,
- 30.0
+ 28.66601562502387,
+ 15.343585399424173
],
[
- 12.0,
- 36.0
+ 28.66601562502387,
+ 11.109477534559822
],
[
- 12.5,
- 36.0
+ 32.75292968752382,
+ 11.109477534559822
],
[
- 12.5,
- 30.0
+ 32.75292968752382,
+ 15.343585399424173
],
[
- 12.0,
- 30.0
+ 28.66601562502387,
+ 15.343585399424173
]
]
]
@@ -51,9 +51,9 @@ export const mockPolygonFeature = {
renderType: 'Polygon',
isClosed: true,
bbox: {
- xmin: 12,
+ xmin: 28.094726562479867,
xmax: null,
- ymin: 36,
+ ymin: 10.872211827249156,
ymax: null
}
},
diff --git a/test/node/reducers/vis-state-test.js b/test/node/reducers/vis-state-test.js
index 302fe2c50..6bc255cc6 100644
--- a/test/node/reducers/vis-state-test.js
+++ b/test/node/reducers/vis-state-test.js
@@ -1993,7 +1993,7 @@ test('#visStateReducer -> setFilter.dynamicDomain & cpu', t => {
}
]
};
- console.log('cmpDataset')
+
cmpDataset(t, expectedDataset, stateWithFilterName.datasets.smoothie);
// set filter value
@@ -3828,28 +3828,58 @@ test('#visStateReducer -> POLYGON: Add/Remove new polygon feature', t => {
/* eslint-disable max-statements */
test('#visStateReducer -> POLYGON: Create polygon filter', t => {
const state = {
- ...INITIAL_VIS_STATE,
- datasets: {
- puppy: {
- data: mockPolygonData.data,
- allData: mockPolygonData.data,
- fields: mockPolygonData.fields
+ ...INITIAL_VIS_STATE
+ };
+
+ const datasets = [
+ {
+ data: {
+ fields: [
+ {
+ name: 'start_point_lat',
+ format: '',
+ tableFieldIndex: 1,
+ type: 'real',
+ analyzerType: 'FLOAT'
+ },
+ {
+ name: 'start_point_lng',
+ format: '',
+ tableFieldIndex: 2,
+ type: 'real',
+ analyzerType: 'FLOAT'
+ },
+ {
+ name: 'end_point_lat',
+ format: '',
+ tableFieldIndex: 3,
+ type: 'real',
+ analyzerType: 'FLOAT'
+ },
+ {
+ name: 'end_point_lng',
+ format: '',
+ tableFieldIndex: 4,
+ type: 'real',
+ analyzerType: 'FLOAT'
+ }
+ ],
+ rows: mockPolygonData.data
},
- cat: {
- data: mockPolygonData.data,
- allData: mockPolygonData.data,
- fields: mockPolygonData.fields
+ info: {
+ label: 'test.csv',
+ size: 144
}
}
- };
+ ];
- let newReducer = reducer(state, VisStateActions.addLayer());
+ const options = {
+ centerMap: true,
+ keepExistingConfig: false
+ };
- t.equal(
- newReducer.layers.length,
- 1,
- 'Should have created a new layer'
- );
+ // visStateUpdateVisDataUpdater - creates 4 layers
+ let newReducer = reducer(state, VisStateActions.updateVisData(datasets, options, {}));
// add new polygon feature
newReducer = reducer(newReducer, VisStateActions.setFeatures([mockPolygonFeature]));
@@ -3868,11 +3898,10 @@ test('#visStateReducer -> POLYGON: Create polygon filter', t => {
const newFilter = newReducer.filters[0];
- const filterFeature = newReducer.filters[0].value;
-
+ const firstDataset = Object.keys(newReducer.datasets)[0];
const expectedFilter = {
id: newFilter.id,
- dataId: ['puppy'],
+ dataId: [firstDataset],
freeze: false,
fixedDomain: true,
enlarged: false,
@@ -3903,15 +3932,20 @@ test('#visStateReducer -> POLYGON: Create polygon filter', t => {
'Should have created a polygon filter'
);
- // Add a second layer to the same dataset
- newReducer = reducer(newReducer, VisStateActions.addLayer());
+ t.equal(
+ newReducer.layerData[0].data.length,
+ 2,
+ 'Layer Point 1 should only show 2 points'
+ );
t.equal(
- newReducer.layers.length,
+ newReducer.layerData[1].data.length,
2,
- 'Should have created a second layer'
+ 'Layer Point 2 should only show 2 points'
);
+ const filterFeature = newReducer.filters[0].value;
+
// set polygon filter for the second layer
newReducer = reducer(
newReducer,
@@ -3930,18 +3964,31 @@ test('#visStateReducer -> POLYGON: Create polygon filter', t => {
'Should have two values in filter.layerId'
);
- // Add a new dataset layer to the same dataset
- newReducer = reducer(newReducer, VisStateActions.addLayer({dataId: 'cat'}));
t.equal(
- newReducer.layers.length,
- 3,
- 'Should have created a third layer'
+ newReducer.layerData[0].data.length,
+ 0,
+ 'Layer Point 1 should show 0 points'
+ );
+
+ t.equal(
+ newReducer.layerData[1].data.length,
+ 0,
+ 'Layer Point 2 show show 0 points'
+ );
+
+ // Adding a new dataset - creates extra 4 layers
+ newReducer = reducer(newReducer, VisStateActions.updateVisData(datasets, options, {}));
+
+ t.equal(
+ newReducer.layerData[4].data.length,
+ 4,
+ 'Layer Point 5 should full data'
);
// Set polygon for a different dataset layer
newReducer = reducer(
newReducer,
- VisStateActions.setPolygonFilterLayer(newReducer.layers[2], filterFeature)
+ VisStateActions.setPolygonFilterLayer(newReducer.layers[4], filterFeature)
);
t.equal(
@@ -3956,9 +4003,13 @@ test('#visStateReducer -> POLYGON: Create polygon filter', t => {
'Should have two values in filter.dataId'
);
- // TODO: invert filter
+ t.equal(
+ newReducer.layerData[4].data.length,
+ 2,
+ 'Layer Point 5 should 2 points because filtered'
+ );
- // remove the second layer from the filter
+ // Remove second layer from filter
newReducer = reducer(
newReducer,
VisStateActions.setPolygonFilterLayer(newReducer.layers[1], filterFeature)
@@ -3967,31 +4018,31 @@ test('#visStateReducer -> POLYGON: Create polygon filter', t => {
t.equal(
newReducer.filters[0].layerId.length,
2,
- 'Should have two values in filter.layerId after removing second element'
+ 'Should 3 values in filter.layerId'
);
t.equal(
newReducer.filters[0].dataId.length,
2,
- 'Should have two values in filter.dataId after removing one layer'
+ 'Should have two values in filter.dataId'
);
- // remove the first layer from the filter
- newReducer = reducer(
- newReducer,
- VisStateActions.setPolygonFilterLayer(newReducer.layers[0], filterFeature)
+ t.equal(
+ newReducer.layerData[0].data.length,
+ 2,
+ 'Layer Point 1 show 2 points because we removed layer 2'
);
t.equal(
- newReducer.filters[0].layerId.length,
- 1,
- 'Should have one value in filter.layerId after removing first element'
+ newReducer.layerData[4].data.length,
+ 2,
+ 'Layer Point 5 should 2 points because filtered'
);
t.equal(
- newReducer.filters[0].dataId.length,
- 1,
- 'Should have one value in filter.dataId after removing first layer'
+ newReducer.layerData[2].data.length,
+ 2,
+ 'Layer Point 2 should still show 2 filters because layer 1 is still filtered'
);
t.end();
diff --git a/yarn.lock b/yarn.lock
index 7260eea3d..bcabd1727 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8566,6 +8566,11 @@ lodash.uniqby@^4.7.0:
resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
+lodash.xor@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
+ integrity sha1-TUjtfpgJWwYyWCunFNP/iuj7HbY=
+
lodash@^3.6.0:
version "3.10.1"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"