Skip to content

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

[fix] previous drawn-selected geometries are lost after click Select geometry (#2175)

Igor Dykhta4c6e99e382b2
diff --git a/src/components/src/map-container.tsx b/src/components/src/map-container.tsx
index b8900edbf..096bd89f0 100644
--- a/src/components/src/map-container.tsx
+++ b/src/components/src/map-container.tsx
@@ -620,6 +620,7 @@ export default function MapContainerFactory(
isBase={compareMode}
onSetFeatures={this.props.visStateActions.setFeatures}
setSelectedFeature={this.props.visStateActions.setSelectedFeature}
+ featureCollection={this.featureCollectionSelector(this.props)}
/>
)}
{layerHoverProp && (!layerPinnedProp || compareMode) && (
@@ -632,6 +633,7 @@ export default function MapContainerFactory(
coordinate={interactionConfig.coordinate.enabled && coordinate}
onSetFeatures={this.props.visStateActions.setFeatures}
setSelectedFeature={this.props.visStateActions.setSelectedFeature}
+ featureCollection={this.featureCollectionSelector(this.props)}
/>
)}
</ErrorBoundary>
diff --git a/src/components/src/map/map-popover.tsx b/src/components/src/map/map-popover.tsx
index dc403a163..918115d6c 100644
--- a/src/components/src/map/map-popover.tsx
+++ b/src/components/src/map/map-popover.tsx
@@ -229,6 +229,10 @@ export type MapPopoverProps = {
onClose: () => void;
onSetFeatures: (features: Feature[]) => any;
setSelectedFeature: (feature: Feature, clickContext: object) => any;
+ featureCollection?: {
+ type: string;
+ features: Feature[];
+ };
};
type IntlProps = {
@@ -249,7 +253,8 @@ export default function MapPopoverFactory(
container,
onClose,
onSetFeatures,
- setSelectedFeature
+ setSelectedFeature,
+ featureCollection
}) => {
const [horizontalPlacement, setHorizontalPlacement] = useState('start');
const moveLeft = () => setHorizontalPlacement('end');
@@ -264,10 +269,13 @@ export default function MapPopoverFactory(
const selectedFeature = getSelectedFeature(layerHoverProp);
if (selectedFeature) {
setSelectedFeature(selectedFeature, clickContext);
- onSetFeatures([selectedFeature]);
+ const updatedFeatures = featureCollection
+ ? [...featureCollection.features, selectedFeature]
+ : [selectedFeature];
+ onSetFeatures(updatedFeatures);
}
onClose();
- }, [onClose, onSetFeatures, x, y, setSelectedFeature, layerHoverProp]);
+ }, [onClose, onSetFeatures, x, y, setSelectedFeature, layerHoverProp, featureCollection]);
return (
<RootContext.Consumer>
diff --git a/test/browser-headless/component/map-container-test.js b/test/browser-headless/component/map-container-test.js
index 9e83f3c87..9f90e7468 100644
--- a/test/browser-headless/component/map-container-test.js
+++ b/test/browser-headless/component/map-container-test.js
@@ -301,7 +301,8 @@ function testMapPopoverProp(t, mapPopoverProp) {
y: 200,
zoom: 13,
onSetFeatures: sinon.spy(),
- setSelectedFeature: sinon.spy()
+ setSelectedFeature: sinon.spy(),
+ featureCollection: {type: 'FeatureCollection', features: []}
};
t.deepEqual(
Object.keys(mapPopoverProp).sort(),