Skip to content

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

[fix] fixes to async merger (#2139)

Igor Dykhtaa6a6b270755e
diff --git a/src/reducers/src/merger-handler.ts b/src/reducers/src/merger-handler.ts
index c6d674fee..57294a179 100644
--- a/src/reducers/src/merger-handler.ts
+++ b/src/reducers/src/merger-handler.ts
@@ -65,6 +65,8 @@ export function mergeStateFromMergers<State extends VisState>(
merger.toMergeProp &&
hasPropsToMerge(state, merger.toMergeProp)
) {
+ // put the rest of mergers and payload for postMergeUpdater in mergerActionPayload
+ // and pass it to current merger, which (if async) knows to continue merging
const mergerActionPayload = {
mergers: mergerQueue,
postMergerPayload
@@ -79,15 +81,16 @@ export function mergeStateFromMergers<State extends VisState>(
const [updatedState, newTasks] = callFunctionGetTask(mergeFunc);
mergedState = updatedState;
- // check if asyncTask was created
+
+ // check if asyncTask was created (time consuming tasks)
if (newTasks.length && merger.waitToFinish) {
- // skip rest
+ // skip rest, the async merger will call applyMergerupdater() to continue
return {mergedState, allMerged: false};
}
}
}
- // if we merged all mergers in the queue we can call post merger
+ // we merged all mergers in the queue, and we can call post merger now
return {mergedState, allMerged: true};
}
diff --git a/src/reducers/src/vis-state-updaters.ts b/src/reducers/src/vis-state-updaters.ts
index 1089f76dc..82a3719c2 100644
--- a/src/reducers/src/vis-state-updaters.ts
+++ b/src/reducers/src/vis-state-updaters.ts
@@ -1620,15 +1620,19 @@ export const updateVisDataUpdater = (
...newDataEntries
}
};
- const newDataIds = Object.keys(newDataEntries);
+ // merge state with config to be merged
+ const layerMergers = state.mergers.filter(m => m.waitForLayerData);
+ const datasetMergers = state.mergers.filter(m => !layerMergers.includes(m));
+
+ const newDataIds = Object.keys(newDataEntries);
const postMergerPayload = {
newDataIds,
- options
+ options,
+ layerMergers
};
- // merge state with config to be merged
- return applyMergersUpdater(mergedState, {mergers: state.mergers, postMergerPayload});
+ return applyMergersUpdater(mergedState, {mergers: datasetMergers, postMergerPayload});
};
/**
@@ -1665,10 +1669,8 @@ export function applyMergersUpdater(
/**
* Add new dataset to `visState`, with option to load a map config along with the datasets
*/
-function postMergeUpdater(
- mergedState: VisState,
- {newDataIds, options}: PostMergerPayload
-): VisState {
+function postMergeUpdater(mergedState: VisState, postMergerPayload: PostMergerPayload): VisState {
+ const {newDataIds, options, layerMergers} = postMergerPayload;
const newFilters = mergedState.filters.filter(f =>
f.dataId.find(fDataId => newDataIds.includes(fDataId))
);
@@ -1725,7 +1727,13 @@ function postMergeUpdater(
// need to be called after layer data is calculated
updatedState = updateAnimationDomain(updatedState);
- return updatedState;
+ // try to process layerMergers after dataset+datasetMergers
+ return layerMergers && layerMergers.length > 0
+ ? applyMergersUpdater(updatedState, {
+ mergers: layerMergers,
+ postMergerPayload: {...postMergerPayload, layerMergers: []}
+ })
+ : updatedState;
}
/**
diff --git a/src/schemas/src/vis-state-schema.ts b/src/schemas/src/vis-state-schema.ts
index 6b7bce092..936fedb39 100644
--- a/src/schemas/src/vis-state-schema.ts
+++ b/src/schemas/src/vis-state-schema.ts
@@ -99,6 +99,7 @@ export interface VisState {
export type PostMergerPayload = {
newDataIds: string[];
options?: AddDataToMapOptions;
+ layerMergers?: Merger<any>[];
};
export type MergerActionPayload<S extends VisState> = {
mergers: Merger<S>[];
@@ -115,6 +116,7 @@ export type Merger<S extends VisState> = {
prop: string | string[];
toMergeProp?: string | string[];
waitToFinish?: boolean;
+ waitForLayerData?: boolean;
};
export type VisStateMergers<S extends VisState> = Merger<S>[];