Skip to content

fix: polygon filter not working for point layers in GeoJSON column mode #3310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pierreeurope wants to merge 1 commit into from
Closed

fix: polygon filter not working for point layers in GeoJSON column mode #3310

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 29 additions & 4 deletions src/layers/src/point-layer/point-layer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,34 @@ export const pointPosAccessor =
altitude && altitude.fieldIdx > -1 ? dc.valueAt(d.index, altitude.fieldIdx) : 0
];

/**
* Parse a WKT POINT string (e.g. "POINT (7.63 45.04)") into [lng, lat] coordinates.
* Returns null if the string cannot be parsed.
*/
export function parseWktPoint(wkt: string): [number, number] | null {
if (typeof wkt !== 'string') return null;
const match = wkt.match(/POINT\s*\(\s*([-\d.eE+]+)\s+([-\d.eE+]+)\s*\)/i);
if (!match) return null;
return [parseFloat(match[1]), parseFloat(match[2])];
}

export const geojsonPosAccessor =
({geojson}: {geojson: LayerColumn}) =>
d =>
d[geojson.fieldIdx];
(dataContainer: DataContainerInterface) =>
(d: {index: number}): number[] => {
const value = dataContainer.valueAt(d.index, geojson.fieldIdx);
if (value == null) return [NaN, NaN, 0];
// Handle WKT point strings (e.g. "POINT (7.63 45.04)")
if (typeof value === 'string') {
const parsed = parseWktPoint(value);
return parsed ? [parsed[0], parsed[1], 0] : [NaN, NaN, 0];
}
// Handle GeoJSON objects with coordinates
if (value.coordinates) {
return [value.coordinates[0], value.coordinates[1], 0];
}
return [NaN, NaN, 0];
};

export const geoarrowPosAccessor =
({geoarrow}: PointLayerColumnsConfig) =>
Expand Down Expand Up @@ -243,7 +267,7 @@ export default class PointLayer extends Layer {
case COLUMN_MODE_GEOARROW:
return geoarrowPosAccessor(this.config.columns)(dataContainer);
case COLUMN_MODE_GEOJSON:
return geojsonPosAccessor(this.config.columns);
return geojsonPosAccessor(this.config.columns)(dataContainer);
default:
// COLUMN_MODE_POINTS
return pointPosAccessor(this.config.columns)(dataContainer);
Expand Down Expand Up @@ -497,7 +521,8 @@ export default class PointLayer extends Layer {
this.dataContainer = dataContainer;

if (this.config.columnMode === COLUMN_MODE_GEOJSON) {
const getFeature = this.getPositionAccessor();
const {geojson} = this.config.columns;
const getFeature = d => d[geojson.fieldIdx];
this.dataToFeature = getGeojsonPointDataMaps(dataContainer, getFeature);
} else if (this.config.columnMode === COLUMN_MODE_GEOARROW) {
const boundsFromMetadata = getBoundsFromArrowMetadata(
Expand Down