Skip to content

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

[Enhanment] extract valdiate layer and validate filter function (#1349)

Shan He223af2b6ebb0
diff --git a/src/components/common/data-table/index.js b/src/components/common/data-table/index.js
index d90884725..d2f7611af 100644
--- a/src/components/common/data-table/index.js
+++ b/src/components/common/data-table/index.js
@@ -383,13 +383,7 @@ function DataTableFactory(FieldToken) {
// eslint-disable-next-line react/display-name
return cellInfo => {
const {columnIndex, key, style} = cellInfo;
- const {
- colMeta,
- sortColumn,
- sortTableColumn,
- pinTableColumn,
- copyTableColumn
- } = props;
+ const {colMeta, sortColumn, sortTableColumn, pinTableColumn, copyTableColumn} = props;
const column = columns[columnIndex];
const isGhost = column.ghost;
diff --git a/src/layers/index.d.ts b/src/layers/index.d.ts
index 8e0fbe397..0929fec43 100644
--- a/src/layers/index.d.ts
+++ b/src/layers/index.d.ts
@@ -1,5 +1,5 @@
import {RGBColor, RGBAColor} from '../reducers/types';
-import {Dataset, Field, Datasets} from '../reducers/vis-state-updaters';
+import {Dataset, Field, Filter, Datasets} from '../reducers/vis-state-updaters';
import {LayerTextLabel, ColorRange, ColorUI} from './layer-factory';
export type LayerVisConfig = {
@@ -45,6 +45,21 @@ export type LayerConfig = {
};
};
+export type VisualChannel = {
+ property: string;
+ field: string;
+ scale: string;
+ domain: string;
+ range: string;
+ key: string;
+ channelScaleType: string;
+ nullValue: any;
+ defaultValue: any;
+ accessor?: string;
+ condition?: (config: any) => boolean;
+ getAttributeValue?: (config: any) => (d: any) => any;
+};
+
export class Layer {
constructor(
prop?: {
@@ -55,12 +70,18 @@ export class Layer {
type: string;
config: LayerConfig;
visConfigSettings: any;
+ visualChannels: {[key: string]: VisualChannel};
hasAllColumns(): boolean;
updateLayerConfig(p: Partial<LayerConfig>): Layer;
+ updateLayerDomain(datasets: Datasets, fitler?: Filter): Layer;
updateLayerVisualChannel(dataset: Dataset, channel: string): Layer;
shouldCalculateLayerData(props: string[]): boolean;
formatLayerData(datasets: Datasets, oldLayerData?: any);
updateLayerColorUI(prop: string, newConfig: Partial<ColorUI>): Layer;
+ validateVisualChannel(channel: string): void;
+ isValidToSave(): boolean;
+ isLayerHovered(objectInfo: any): boolean;
+ getHoverData(object: any, allData?: Dataset['allData'], fields?: Dataset['fields']): any;
}
export type LayerClassesType = {
@@ -77,8 +98,6 @@ export type LayerClassesType = {
'3D': Layer;
trip: Layer;
s2: Layer;
-}
-export const LayerClasses: LayerClassesType
-export const LAYER_TYPES: {
- [key in keyof LayerClassesType]: string;
};
+export const LayerClasses: LayerClassesType;
+export const LAYER_TYPES: {[key in keyof LayerClassesType]: string};
diff --git a/src/reducers/core.d.ts b/src/reducers/core.d.ts
new file mode 100644
index 000000000..1b8fa6e58
--- /dev/null
+++ b/src/reducers/core.d.ts
@@ -0,0 +1,25 @@
+import {Reducer} from 'redux';
+import {ReduxCompatibleReducer} from 'redux-actions';
+import {VisState} from './vis-state-updaters';
+import {MapState} from './map-state-updaters';
+import {MapStyle} from './map-style-updaters';
+import {ProviderState} from './provider-state-updaters';
+import {UiState} from './ui-state-updaters';
+
+export type KeplerGlState = {
+ visState: VisState;
+ mapState: MapState;
+ mapStyle: MapStyle;
+ uiState: UiState;
+ providerState: ProviderState;
+};
+
+export function combineReducers_(r: {[key: string]: ReduxCompatibleReducer<any>}): Reducer<any>;
+
+export function mapStateLens(st: KeplerGlState): {mapState: MapState};
+export function mapStyleLens(st: KeplerGlState): {mapStyle: MapStyle};
+export function visStateLens(st: KeplerGlState): {visState: VisState};
+export function uiStateLens(st: KeplerGlState): {uiState: UiState};
+export function providerStateLens(st: KeplerGlState): {providerState: ProviderState};
+
+export function coreReducerFactory(initialState: any): (state: any, action: any) => any;
diff --git a/src/reducers/core.js b/src/reducers/core.js
index 1e4c177d4..9cb0a388f 100644
--- a/src/reducers/core.js
+++ b/src/reducers/core.js
@@ -28,8 +28,13 @@ import {providerStateReducerFactory} from './provider-state';
import composers from './composers';
+/**
+ * @type {typeof import('./core').combineReducers_}
+ */
+const combineReducers_ = combineReducers;
+
const combined = (initialState = {}) =>
- combineReducers({
+ combineReducers_({
visState: visStateReducerFactory(initialState.visState),
mapState: mapStateReducerFactory(initialState.mapState),
mapStyle: mapStyleReducerFactory(initialState.mapStyle),
diff --git a/src/reducers/vis-state-merger.d.ts b/src/reducers/vis-state-merger.d.ts
index e374c4456..097e9cf68 100644
--- a/src/reducers/vis-state-merger.d.ts
+++ b/src/reducers/vis-state-merger.d.ts
@@ -1,5 +1,6 @@
-import {VisState} from './vis-state-updaters';
-import {ParsedConfig} from 'schemas';
+import {VisState, Datasets, Dataset} from './vis-state-updaters';
+import {ParsedConfig, ParsedLayer} from 'schemas';
+import {Layer} from 'layers';
export function mergeAnimationConfig(
state: VisState,
@@ -21,7 +22,11 @@ export function mergeLayerBlending(
layerBlending: ParsedConfig['visState']['layerBlending'],
fromConfig?: boolean
): VisState;
-export function mergeLayers(state: VisState, layers: ParsedConfig['visState']['layers'], fromConfig?: boolean): VisState;
+export function mergeLayers(
+ state: VisState,
+ layers: ParsedConfig['visState']['layers'],
+ fromConfig?: boolean
+): VisState;
export function mergeSplitMaps(
state: VisState,
splitMaps: ParsedConfig['visState']['splitMaps'],
@@ -32,23 +37,32 @@ export function mergeInteractionTooltipConfig(state: VisState);
export function isValidMerger(arg: any): boolean;
export type Merger = {
- merge: (state: VisState, config: any, fromConfig?: boolean) => VisState,
- prop: string,
- toMergeProp?: string
+ merge: (state: VisState, config: any, fromConfig?: boolean) => VisState;
+ prop: string;
+ toMergeProp?: string;
};
-export function validateSavedVisualChannels(fields, newLayer, savedLayer);
+export function validateSavedVisualChannels(
+ fields: Dataset['fields'],
+ newLayer: Layer,
+ savedLayer: ParsedLayer
+): null | Layer;
+
export function validateLayerWithData(
- dataset: {fields, id: dataId},
- savedLayer: savedLayer,
- layerClasses: {
- [key: string]: LayerClass
- },
+ dataset: Dataset,
+ savedLayer: ParsedLayer,
+ layerClasses: VisState['layerClasses'],
option?: {
allowEmptyColumn?: boolean;
}
): Layer | null;
+export function validateLayersByDatasets(
+ datasets: Datasets,
+ layerClasses: VisState['layerClasses'],
+ layers: ParsedConfig['visState']['layers']
+): {validated: Layer[]; failed: ParsedConfig['visState']['layers']};
+
export type VisStateMergers = Merger[];
export const VIS_STATE_MERGERS: VisStateMergers;
diff --git a/src/reducers/vis-state-merger.js b/src/reducers/vis-state-merger.js
index e81a79805..68ddff36d 100644
--- a/src/reducers/vis-state-merger.js
+++ b/src/reducers/vis-state-merger.js
@@ -20,19 +20,12 @@
import uniq from 'lodash.uniq';
import pick from 'lodash.pick';
-import isEqual from 'lodash.isequal';
import flattenDeep from 'lodash.flattendeep';
-import {toArray, isObject, arrayInsert} from 'utils/utils';
-
-import {
- applyFiltersToDatasets,
- mergeFilterDomainStep,
- validateFilterWithData
-} from 'utils/filter-utils';
+import {isObject, arrayInsert} from 'utils/utils';
+import {applyFiltersToDatasets, validateFiltersUpdateDatasets} from 'utils/filter-utils';
import {getInitialMapLayersForSplitMap} from 'utils/split-map-utils';
import {resetFilterGpuMode, assignGpuChannels} from 'utils/gpu-filter-utils';
-
import {LAYER_BLENDINGS} from 'constants/default-settings';
/**
@@ -42,80 +35,18 @@ import {LAYER_BLENDINGS} from 'constants/default-settings';
* @type {typeof import('./vis-state-merger').mergeFilters}
*/
export function mergeFilters(state, filtersToMerge) {
- const merged = [];
- const unmerged = [];
- const {datasets} = state;
- let updatedDatasets = datasets;
-
if (!Array.isArray(filtersToMerge) || !filtersToMerge.length) {
return state;
}
- // merge filters
- filtersToMerge.forEach(filter => {
- // we can only look for datasets define in the filter dataId
- const datasetIds = toArray(filter.dataId);
-
- // we can merge a filter only if all datasets in filter.dataId are loaded
- if (datasetIds.every(d => datasets[d])) {
- // all datasetIds in filter must be present the state datasets
- const {filter: validatedFilter, applyToDatasets, augmentedDatasets} = datasetIds.reduce(
- (acc, datasetId) => {
- const dataset = updatedDatasets[datasetId];
- const layers = state.layers.filter(l => l.config.dataId === dataset.id);
- const {filter: updatedFilter, dataset: updatedDataset} = validateFilterWithData(
- acc.augmentedDatasets[datasetId] || dataset,
- filter,
- layers
- );
-
- if (updatedFilter) {
- return {
- ...acc,
- // merge filter props
- filter: acc.filter
- ? {
- ...acc.filter,
- ...mergeFilterDomainStep(acc, updatedFilter)
- }
- : updatedFilter,
-
- applyToDatasets: [...acc.applyToDatasets, datasetId],
-
- augmentedDatasets: {
- ...acc.augmentedDatasets,
- [datasetId]: updatedDataset
- }
- };
- }
-
- return acc;
- },
- {
- filter: null,
- applyToDatasets: [],
- augmentedDatasets: {}
- }
- );
-
- if (validatedFilter && isEqual(datasetIds, applyToDatasets)) {
- merged.push(validatedFilter);
- updatedDatasets = {
- ...updatedDatasets,
- ...augmentedDatasets
- };
- }
- } else {
- unmerged.push(filter);
- }
- });
+ const {validated, failed, updatedDatasets} = validateFiltersUpdateDatasets(state, filtersToMerge);
// merge filter with existing
- let updatedFilters = [...(state.filters || []), ...merged];
+ let updatedFilters = [...(state.filters || []), ...validated];
updatedFilters = resetFilterGpuMode(updatedFilters);
updatedFilters = assignGpuChannels(updatedFilters);
// filter data
- const datasetsToFilter = uniq(flattenDeep(merged.map(f => f.dataId)));
+ const datasetsToFilter = uniq(flattenDeep(validated.map(f => f.dataId)));
const filtered = applyFiltersToDatasets(
datasetsToFilter,
@@ -128,7 +59,7 @@ export function mergeFilters(state, filtersToMerge) {
...state,
filters: updatedFilters,
datasets: filtered,
- filterToBeMerged: [...state.filterToBeMerged, ...unmerged]
+ filterToBeMerged: [...state.filterToBeMerged, ...failed]
};
}
@@ -141,33 +72,15 @@ export function mergeFilters(state, filtersToMerge) {
export function mergeLayers(state, layersToMerge, fromConfig) {
const preserveLayerOrder = fromConfig ? layersToMerge.map(l => l.id) : state.preserveLayerOrder;
- const mergedLayer = [];
- const unmerged = [];
-
- const {datasets} = state;
-
if (!Array.isArray(layersToMerge) || !layersToMerge.length) {
return state;
}
- layersToMerge.forEach(layer => {
- let validateLayer;
- if (datasets[layer.config.dataId]) {
- // datasets are already loaded
- validateLayer = validateLayerWithData(
- datasets[layer.config.dataId],
- layer,
- state.layerClasses
- );
- }
-
- if (validateLayer) {
- mergedLayer.push(validateLayer);
- } else {
- // datasets not yet loaded
- unmerged.push(layer);
- }
- });
+ const {validated: mergedLayer, failed: unmerged} = validateLayersByDatasets(
+ state.datasets,
+ state.layerClasses,
+ layersToMerge
+ );
// put new layers in front of current layers
const {newLayerOrder, newLayers} = insertLayerAtRightOrder(
@@ -176,6 +89,7 @@ export function mergeLayers(state, layersToMerge, fromConfig) {
state.layerOrder,
preserveLayerOrder
);
+
return {
...state,
layers: newLayers,
@@ -478,35 +392,54 @@ export function validateSavedTextLabel(fields, [layerTextLabel], savedTextLabel)
/**
* Validate saved visual channels config with new data,
* refer to vis-state-schema.js VisualChannelSchemaV1
- *
- * @param {Array<Object>} fields
- * @param {Object} newLayer
- * @param {Object} savedLayer
- * @return {Object} - newLayer
+ * @type {typeof import('./vis-state-merger').validateSavedVisualChannels}
*/
export function validateSavedVisualChannels(fields, newLayer, savedLayer) {
Object.values(newLayer.visualChannels).forEach(({field, scale, key}) => {
let foundField;
- if (savedLayer.config[field]) {
- foundField = fields.find(fd =>
- Object.keys(savedLayer.config[field]).every(
- prop => savedLayer.config[field][prop] === fd[prop]
- )
- );
- }
+ if (savedLayer.config) {
+ if (savedLayer.config[field]) {
+ foundField = fields.find(
+ fd => savedLayer.config && fd.name === savedLayer.config[field].name
+ );
+ }
- const foundChannel = {
- ...(foundField ? {[field]: foundField} : {}),
- ...(savedLayer.config[scale] ? {[scale]: savedLayer.config[scale]} : {})
- };
- if (Object.keys(foundChannel).length) {
- newLayer.updateLayerConfig(foundChannel);
- newLayer.validateVisualChannel(key);
+ const foundChannel = {
+ ...(foundField ? {[field]: foundField} : {}),
+ ...(savedLayer.config[scale] ? {[scale]: savedLayer.config[scale]} : {})
+ };
+ if (Object.keys(foundChannel).length) {
+ newLayer.updateLayerConfig(foundChannel);
+ newLayer.validateVisualChannel(key);
+ }
}
});
return newLayer;
}
+export function validateLayersByDatasets(datasets, layerClasses, layers) {
+ const validated = [];
+ const failed = [];
+
+ layers.forEach(layer => {
+ let validateLayer;
+ if (!layer || !layer.config) {
+ validateLayer = null;
+ } else if (datasets[layer.config.dataId]) {
+ // datasets are already loaded
+ validateLayer = validateLayerWithData(datasets[layer.config.dataId], layer, layerClasses);
+ }
+
+ if (validateLayer) {
+ validated.push(validateLayer);
+ } else {
+ // datasets not yet loaded
+ failed.push(layer);
+ }
+ });
+
+ return {validated, failed};
+}
/**
* Validate saved layer config with new data,
* update fieldIdx based on new fields
@@ -520,7 +453,7 @@ export function validateLayerWithData(
) {
const {type} = savedLayer;
// layer doesnt have a valid type
- if (!layerClasses.hasOwnProperty(type) || !savedLayer.config || !savedLayer.config.columns) {
+ if (!type || !layerClasses.hasOwnProperty(type) || !savedLayer.config) {
return null;
}
diff --git a/src/reducers/vis-state-updaters.d.ts b/src/reducers/vis-state-updaters.d.ts
index 229013021..c50d5687a 100644
--- a/src/reducers/vis-state-updaters.d.ts
+++ b/src/reducers/vis-state-updaters.d.ts
@@ -6,7 +6,7 @@ import ActionTypes from 'constants/action-types';
import {LoaderObject} from '@loaders.gl/loader-utils';
import {VisStateMergers} from './vis-state-merger';
import KeplerGLSchema from 'schemas';
-import {LayerClassesType} from 'layers';
+import {LayerClassesType, Layer} from 'layers';
export type HistogramBin = {
x0: number | undefined;
diff --git a/src/reducers/vis-state-updaters.js b/src/reducers/vis-state-updaters.js
index bac0541d4..adf8addfb 100644
--- a/src/reducers/vis-state-updaters.js
+++ b/src/reducers/vis-state-updaters.js
@@ -263,7 +263,9 @@ export function layerConfigChangeUpdater(state, action) {
newConfig: {dataId}
});
const nextLayer = stateWithDataId.layers.find(l => l.id === oldLayer.id);
- return layerConfigChangeUpdater(state, {oldLayer: nextLayer, newConfig: restConfig});
+ return nextLayer
+ ? layerConfigChangeUpdater(state, {oldLayer: nextLayer, newConfig: restConfig})
+ : stateWithDataId;
}
let newLayer = oldLayer.updateLayerConfig(action.newConfig);
@@ -353,7 +355,6 @@ export function layerTextLabelChangeUpdater(state, action) {
} else {
newTextLabel = updateTextLabelPropAndValue(idx, prop, value, newTextLabel);
}
-
// update text label prop and value
return layerConfigChangeUpdater(state, {
oldLayer,
@@ -968,6 +969,7 @@ export const removeDatasetUpdater = (state, action) => {
const indexes = layers.reduce((listOfIndexes, layer, index) => {
if (layer.config.dataId === datasetKey) {
+ // @ts-ignore
listOfIndexes.push(index);
}
return listOfIndexes;
@@ -1260,7 +1262,7 @@ export const updateVisDataUpdater = (state, action) => {
}
let newLayers = !dataEmpty
- ? mergedState.layers.filter(l => l.config.dataId in newDataEntries)
+ ? mergedState.layers.filter(l => l.config.dataId && l.config.dataId in newDataEntries)
: [];
if (!newLayers.length && (options || {}).autoCreateLayers !== false) {
@@ -1272,7 +1274,9 @@ export const updateVisDataUpdater = (state, action) => {
if (mergedState.splitMaps.length) {
// if map is split, add new layers to splitMaps
- newLayers = mergedState.layers.filter(l => l.config.dataId in newDataEntries);
+ newLayers = mergedState.layers.filter(
+ l => l.config.dataId && l.config.dataId in newDataEntries
+ );
mergedState = {
...mergedState,
splitMaps: addNewLayersToSplitMap(mergedState.splitMaps, newLayers)
diff --git a/src/schemas/index.d.ts b/src/schemas/index.d.ts
index 15b824c6b..e0a1b9411 100644
--- a/src/schemas/index.d.ts
+++ b/src/schemas/index.d.ts
@@ -6,6 +6,8 @@ export {
default as KeplerGlSchema,
ParsedConfig,
ParsedDataset,
+ ParsedLayer,
+ ParsedFilter,
SavedConfigV1,
SavedDatasetV1,
SavedMap,
diff --git a/src/schemas/schema-manager.d.ts b/src/schemas/schema-manager.d.ts
index fea28b40d..ffeb3cdec 100644
--- a/src/schemas/schema-manager.d.ts
+++ b/src/schemas/schema-manager.d.ts
@@ -74,7 +74,7 @@ export type SavedLayer = {
export type ParsedLayer = {
id?: string;
type?: string;
- config?: Partial<SavedLayer['config']> & SavedVisualChannels;
+ config?: Partial<SavedLayer['config']>;
};
export type SavedAnimationConfig = {
diff --git a/src/utils/dataset-utils.js b/src/utils/dataset-utils.js
index 777174c05..8a6d762ac 100644
--- a/src/utils/dataset-utils.js
+++ b/src/utils/dataset-utils.js
@@ -213,4 +213,3 @@ export function sortDatasetByColumn(dataset, column, mode) {
sortOrder
};
}
-
diff --git a/src/utils/filter-utils.d.ts b/src/utils/filter-utils.d.ts
index e9d875f11..256ebef7c 100644
--- a/src/utils/filter-utils.d.ts
+++ b/src/utils/filter-utils.d.ts
@@ -16,6 +16,7 @@ import {
} from '../reducers/vis-state-updaters';
import {Layer} from 'layers';
import {Field} from 'reducers/types';
+import {ParsedConfig} from 'schemas';
export function applyFilterFieldName(
filter: Filter,
@@ -160,6 +161,11 @@ export function getFilterPlot(
export function getFilterIdInFeature(f: FeatureValue): string;
export function isInRange(v: any, domain: number[]): boolean;
export function updateFilterDataId(dataId: string): FilterBase;
+export function validateFiltersUpdateDatasets(state: VisState, filtersToValidate: ParsedConfig['visState']['filters']): {
+ validated: Filter[],
+ failed: Filter[],
+ updatedDatasets: Datasets
+}
export const FILTER_UPDATER_PROPS: {
dataId: string;
diff --git a/src/utils/filter-utils.js b/src/utils/filter-utils.js
index c7f800521..1ac5f921b 100644
--- a/src/utils/filter-utils.js
+++ b/src/utils/filter-utils.js
@@ -21,6 +21,8 @@
import {ascending, extent, histogram as d3Histogram, ticks} from 'd3-array';
import keyMirror from 'keymirror';
import get from 'lodash.get';
+import isEqual from 'lodash.isequal';
+
import booleanWithin from '@turf/boolean-within';
import {point as turfPoint} from '@turf/helpers';
import {Decimal} from 'decimal.js';
@@ -970,9 +972,10 @@ export function applyFilterFieldName(filter, dataset, fieldName, filterDatasetIn
// TODO: validate field type
const field = fields[fieldIndex];
- const filterProps = field.hasOwnProperty('filterProps')
- ? field.filterProps
- : getFilterProps(allData, field);
+ const filterProps =
+ field.hasOwnProperty('filterProps') && field.filterProps
+ ? field.filterProps
+ : getFilterProps(allData, field);
const newFilter = {
...(mergeDomain ? mergeFilterDomainStep(filter, filterProps) : {...filter, ...filterProps}),
@@ -1146,3 +1149,75 @@ export function filterDatasetCPU(state, dataId) {
return set(['datasets', dataId], cpuFilteredDataset, state);
}
+
+/**
+ * Validate parsed filters with datasets and add filterProps to field
+ * @type {typeof import('./filter-utils').validateFiltersUpdateDatasets}
+ */
+export function validateFiltersUpdateDatasets(state, filtersToValidate = []) {
+ const validated = [];
+ const failed = [];
+ const {datasets} = state;
+ let updatedDatasets = datasets;
+
+ // merge filters
+ filtersToValidate.forEach(filter => {
+ // we can only look for datasets define in the filter dataId
+ const datasetIds = toArray(filter.dataId);
+
+ // we can merge a filter only if all datasets in filter.dataId are loaded
+ if (datasetIds.every(d => datasets[d])) {
+ // all datasetIds in filter must be present the state datasets
+ const {filter: validatedFilter, applyToDatasets, augmentedDatasets} = datasetIds.reduce(
+ (acc, datasetId) => {
+ const dataset = updatedDatasets[datasetId];
+ const layers = state.layers.filter(l => l.config.dataId === dataset.id);
+ const {filter: updatedFilter, dataset: updatedDataset} = validateFilterWithData(
+ acc.augmentedDatasets[datasetId] || dataset,
+ filter,
+ layers
+ );
+
+ if (updatedFilter) {
+ return {
+ ...acc,
+ // merge filter props
+ filter: acc.filter
+ ? {
+ ...acc.filter,
+ ...mergeFilterDomainStep(acc, updatedFilter)
+ }
+ : updatedFilter,
+
+ applyToDatasets: [...acc.applyToDatasets, datasetId],
+
+ augmentedDatasets: {
+ ...acc.augmentedDatasets,
+ [datasetId]: updatedDataset
+ }
+ };
+ }
+
+ return acc;
+ },
+ {
+ filter: null,
+ applyToDatasets: [],
+ augmentedDatasets: {}
+ }
+ );
+
+ if (validatedFilter && isEqual(datasetIds, applyToDatasets)) {
+ validated.push(validatedFilter);
+ updatedDatasets = {
+ ...updatedDatasets,
+ ...augmentedDatasets
+ };
+ }
+ } else {
+ failed.push(filter);
+ }
+ });
+
+ return {validated, failed, updatedDatasets};
+}
diff --git a/src/utils/index.js b/src/utils/index.js
index 6c993bd55..d08726a07 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -31,12 +31,20 @@ export {hexToRgb} from './color-utils';
export {errorNotification} from './notifications-utils';
export {dataURItoBlob, downloadFile} from './export-utils';
export {calculateLayerData} from './layer-utils';
-export {applyFilterFieldName, applyFiltersToDatasets} from 'utils/filter-utils';
+export {
+ applyFilterFieldName,
+ applyFiltersToDatasets,
+ validateFilterWithData,
+ validateFiltersUpdateDatasets
+} from 'utils/filter-utils';
+
+export {resetFilterGpuMode, assignGpuChannels} from 'utils/gpu-filter-utils';
// REDUCER UTILS
export {updateAllLayerDomainData} from '../reducers/vis-state-updaters';
export {
validateLayerWithData,
+ validateLayersByDatasets,
validateSavedVisualChannels,
mergeLayers
} from '../reducers/vis-state-merger';
diff --git a/src/utils/layer-utils.js b/src/utils/layer-utils.js
index 2f9a8c0fc..2f624111e 100644
--- a/src/utils/layer-utils.js
+++ b/src/utils/layer-utils.js
@@ -92,6 +92,9 @@ export function getLayerHoverProp({
const {
config: {dataId}
} = layer;
+ if (!dataId) {
+ return null;
+ }
const {allData, fields} = datasets[dataId];
const data = layer.getHoverData(object, allData);
const fieldsToShow = interactionConfig.tooltip.config.fieldsToShow[dataId];
diff --git a/test/browser.js b/test/browser.js
index a52ff851a..b941f1c32 100644
--- a/test/browser.js
+++ b/test/browser.js
@@ -29,7 +29,7 @@ test.onFinish(window.browserTestDriver_finish);
test.onFailure(window.browserTestDriver_fail);
test('Browser tests', t => {
- // require('./node/index.js');
+ require('./node/index.js');
require('./browser/index.js');
t.end();
diff --git a/test/fixtures/test-trip-data.js b/test/fixtures/test-trip-data.js
index aa87a96a7..6177782c5 100644
--- a/test/fixtures/test-trip-data.js
+++ b/test/fixtures/test-trip-data.js
@@ -176,7 +176,20 @@ export const config = {
category: 'Uber',
colors: ['#5A1846', '#900C3F', '#C70039', '#E3611C', '#F1920E', '#FFC300']
}
- }
+ },
+ textLabel: [
+ {
+ field: {
+ name: 'pickup_latitude',
+ type: 'real'
+ },
+ color: [255, 255, 255],
+ size: 18,
+ offset: [0, 0],
+ anchor: 'start',
+ alignment: 'center'
+ }
+ ]
},
visualChannels: {
colorField: {
diff --git a/test/node/reducers/vis-state-merger-test.js b/test/node/reducers/vis-state-merger-test.js
index 81640e320..ec9bf4ddd 100644
--- a/test/node/reducers/vis-state-merger-test.js
+++ b/test/node/reducers/vis-state-merger-test.js
@@ -247,6 +247,22 @@ test('VisStateMerger.v1 -> mergeFilters -> toWorkingState', t => {
t.end();
});
+test('VisStateMerger -> mergeLayers -> invalid layer config', t => {
+ const oldState = cloneDeep(InitialState);
+ const oldVisState = oldState.visState;
+
+ const layers = [
+ {id: 'abc'},
+ {type: 'taro'}, // no type
+ {type: 'point', id: 'yes'} // no config
+ ];
+ const mergedState = mergeLayers(oldVisState, layers, true);
+
+ t.equal(mergedState.layers, oldVisState.layers, 'merge invalid layer should not error');
+ t.deepEqual(mergedState.layerToBeMerged, layers, 'layerToBeMerged should contain invalid layers');
+ t.end();
+});
+
test('VisStateMerger.current -> mergeLayers -> toEmptyState', t => {
const stateToSave = cloneDeep(StateWFilesFiltersLayerColor);
const appStateToSave = SchemaManager.save(stateToSave);