Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
show filtered out and hidden layers as options in polygon filter menu (#2068)
Igor Dykhtaf53188b98fcc
diff --git a/src/components/src/editor/editor.tsx b/src/components/src/editor/editor.tsxindex 95b7cba03..46667b312 100644--- a/src/components/src/editor/editor.tsx+++ b/src/components/src/editor/editor.tsx@@ -26,7 +26,13 @@ import get from 'lodash.get';import {createSelector} from 'reselect';import FeatureActionPanelFactory, {FeatureActionPanelProps} from './feature-action-panel';-import {EDITOR_AVAILABLE_LAYERS, FILTER_TYPES, EDITOR_MODES, KeyEvent} from '@kepler.gl/constants';+import {+ EDITOR_AVAILABLE_LAYERS,+ FILTER_TYPES,+ EDITOR_MODES,+ GEOCODER_LAYER_ID,+ KeyEvent+} from '@kepler.gl/constants';import {Layer, EditorLayerUtils} from '@kepler.gl/layers';import {Filter, FeatureSelectionContext} from '@kepler.gl/types';import {Feature} from '@nebula.gl/edit-modes';@@ -45,7 +51,6 @@ interface EditorProps {layers: Layer[];datasets: Datasets;editor: {selectedFeature: Feature; mode: string; selectionContext?: FeatureSelectionContext};- layersToRender: Record<string, Layer>;index: number;className: string;style: CSSProperties;@@ -74,7 +79,6 @@ export default function EditorFactory(}layerSelector = (props: EditorProps) => props.layers;- layersToRenderSelector = (props: EditorProps) => props.layersToRender;filterSelector = (props: EditorProps) => props.filters;selectedFeatureIdSelector = (props: EditorProps) =>get(props, ['editor', 'selectedFeature', 'id']);@@ -86,13 +90,8 @@ export default function EditorFactory((filters, selectedFeatureId) => filters.find(f => f.value && f.value.id === selectedFeatureId));- availableLayersSeletor = createSelector(- this.layerSelector,- this.layersToRenderSelector,- (layers, layersToRender) =>- layers.filter(editorLayerFilter).filter(layer => {- return layersToRender[layer.id];- })+ availableLayersSelector = createSelector(this.layerSelector, layers =>+ layers.filter(editorLayerFilter).filter(layer => layer.id !== GEOCODER_LAYER_ID));allFeaturesSelector = createSelector(@@ -148,7 +147,7 @@ export default function EditorFactory(const {className, datasets, editor, style, index} = this.props;const {selectedFeature, selectionContext} = editor;const currentFilter = this.currentFilterSelector(this.props);- const availableLayers = this.availableLayersSeletor(this.props);+ const availableLayers = this.availableLayersSelector(this.props);const {rightClick, position, mapIndex} = selectionContext || {};diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsxindex 763e0f2df..6344caf41 100644--- a/src/components/src/map-container.tsx+++ b/src/components/src/map-container.tsx@@ -669,8 +669,6 @@ export default function MapContainerFactory(const {visState, visStateActions, index} = this.props;const {layers, datasets, editor} = visState;- const layersToRender = this.layersToRenderSelector(this.props);-return (<Editorindex={index}@@ -678,7 +676,6 @@ export default function MapContainerFactory(editor={editor}filters={this.polygonFiltersSelector(this.props)}layers={layers}- layersToRender={layersToRender}onDeleteFeature={visStateActions.deleteFeature}onSelect={visStateActions.setSelectedFeature}onTogglePolygonFilter={visStateActions.setPolygonFilterLayer}