Skip to content

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

fix: polygon filter - add missing layer types (#3545)

Igor Dykhta67216fada1b8
diff --git a/src/components/src/filters/polygon-filter.tsx b/src/components/src/filters/polygon-filter.tsx
index 4421808ad..521ac01c4 100644
--- a/src/components/src/filters/polygon-filter.tsx
+++ b/src/components/src/filters/polygon-filter.tsx
@@ -4,12 +4,11 @@
import React, {useMemo, useCallback} from 'react';
import ItemSelector from '../common/item-selector/item-selector';
import {Layer} from '@kepler.gl/layers';
-import {LAYER_TYPES} from '@kepler.gl/constants';
+import {EDITOR_AVAILABLE_LAYERS} from '@kepler.gl/constants';
import {PolygonFilterProps} from './types';
import {StyledFilterPanel} from './components';
-const layerFilter = (layer: Layer) =>
- layer.type === LAYER_TYPES.point || layer.type === LAYER_TYPES.heatmap;
+const layerFilter = (layer: Layer) => EDITOR_AVAILABLE_LAYERS.includes(layer.type || '');
const isAlreadySelected = (selectedLayers: Layer[], layerId: string) =>
selectedLayers.findIndex(l => l.id === layerId) === -1;
diff --git a/src/constants/src/layers.ts b/src/constants/src/layers.ts
index b398d02fb..e514e98de 100644
--- a/src/constants/src/layers.ts
+++ b/src/constants/src/layers.ts
@@ -617,7 +617,10 @@ export const LAYER_TYPES = keyMirror({
export const EDITOR_AVAILABLE_LAYERS: string[] = [
LAYER_TYPES.point,
+ LAYER_TYPES.icon,
+ LAYER_TYPES.grid,
LAYER_TYPES.hexagon,
+ LAYER_TYPES.cluster,
LAYER_TYPES.arc,
LAYER_TYPES.line,
LAYER_TYPES.hexagonId,
diff --git a/src/utils/src/filter-utils.ts b/src/utils/src/filter-utils.ts
index 1b52974be..d2cc3c2b8 100644
--- a/src/utils/src/filter-utils.ts
+++ b/src/utils/src/filter-utils.ts
@@ -405,6 +405,21 @@ export const getPolygonFilterFunctor = (layer, filter, dataContainer) => {
const pos = getPosition(data);
return pos.every(Number.isFinite) && isInPolygon(pos, filter.value);
};
+ case LAYER_TYPES.grid:
+ case LAYER_TYPES.hexagon:
+ case LAYER_TYPES.cluster:
+ // Aggregation layers store parsed GeoJSON Features (not coordinate arrays)
+ // in dataToFeature, but precompute per-row centroids for both column modes.
+ if (layer.centroids?.length) {
+ return data => {
+ const centroid = layer.centroids[data.index];
+ return centroid && isInPolygon(centroid, filter.value);
+ };
+ }
+ return data => {
+ const pos = getPosition(data);
+ return pos.every(Number.isFinite) && isInPolygon(pos, filter.value);
+ };
case LAYER_TYPES.arc:
case LAYER_TYPES.line:
return data => {
diff --git a/test/node/utils/filter-utils-test.js b/test/node/utils/filter-utils-test.js
index 301788fde..8ef54b5bb 100644
--- a/test/node/utils/filter-utils-test.js
+++ b/test/node/utils/filter-utils-test.js
@@ -734,3 +734,73 @@ test('filterUtils -> getPolygonFilterFunctor -> point layer with dataToFeature (
t.end();
});
+
+test('filterUtils -> getPolygonFilterFunctor -> aggregation layers (grid/hexagon/cluster)', t => {
+ const squarePolygon = {
+ type: 'Feature',
+ properties: {},
+ geometry: {
+ type: 'Polygon',
+ coordinates: [
+ [
+ [-1, -1],
+ [1, -1],
+ [1, 1],
+ [-1, 1],
+ [-1, -1]
+ ]
+ ]
+ }
+ };
+
+ const filter = {value: squarePolygon};
+
+ ['grid', 'hexagon', 'cluster'].forEach(type => {
+ // GeoJSON column mode: aggregation layers store parsed Features in
+ // dataToFeature but precompute per-row centroids used for filtering.
+ const geojsonLayer = {
+ type,
+ config: {columnMode: 'geojson'},
+ getPositionAccessor: () => () => null,
+ // dataToFeature holds Feature objects (must NOT be used for the point test)
+ dataToFeature: [
+ {type: 'Feature', geometry: {type: 'Point', coordinates: [0.5, 0.5]}},
+ {type: 'Feature', geometry: {type: 'Point', coordinates: [10, 10]}},
+ null
+ ],
+ centroids: [
+ [0.5, 0.5], // inside
+ [10, 10], // outside
+ null // no geometry
+ ]
+ };
+
+ const fn = getPolygonFilterFunctor(geojsonLayer, filter, null);
+ t.equal(fn({index: 0}), true, `${type} geojson: centroid inside should return true`);
+ t.equal(fn({index: 1}), false, `${type} geojson: centroid outside should return false`);
+ t.equal(fn({index: 2}), null, `${type} geojson: missing centroid should be falsy`);
+
+ // Point column mode: no centroids, falls back to the position accessor.
+ const pointLayer = {
+ type,
+ config: {columnMode: 'points'},
+ getPositionAccessor: () => d => d.position,
+ dataToFeature: [],
+ centroids: []
+ };
+
+ const fn2 = getPolygonFilterFunctor(pointLayer, filter, null);
+ t.equal(
+ fn2({position: [0.5, 0.5]}),
+ true,
+ `${type} points: point inside should return true`
+ );
+ t.equal(
+ fn2({position: [10, 10]}),
+ false,
+ `${type} points: point outside should return false`
+ );
+ });
+
+ t.end();
+});