Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
fix: create trip layer from duckdb table (#3344)
Xun Lica30df0e1a74
diff --git a/.github/workflows/test.yml b/.github/workflows/test.ymlindex 90781c7d0..c581fa765 100644--- a/.github/workflows/test.yml+++ b/.github/workflows/test.yml@@ -39,5 +39,6 @@ jobs:- name: Coverallsuses: coverallsapp/github-action@master+ continue-on-error: truewith:github-token: ${{ secrets.GITHUB_TOKEN }}diff --git a/src/duckdb/src/table/duckdb-table.ts b/src/duckdb/src/table/duckdb-table.tsindex aeee75b7e..71ded7e8e 100644--- a/src/duckdb/src/table/duckdb-table.ts+++ b/src/duckdb/src/table/duckdb-table.ts@@ -144,7 +144,7 @@ export class KeplerGlDuckDbTable extends KeplerTable {const createTableSql = `install spatial;load spatial;- CREATE TABLE '${this.label}' AS+ CREATE TABLE '${this.label}' ASSELECT *FROM ST_READ('${this.id}', keep_wkb = TRUE);ALTER TABLE '${this.label}' RENAME '${DUCKDB_WKB_COLUMN}' TO '${KEPLER_GEOM_FROM_GEOJSON_COLUMN}';diff --git a/src/layers/src/geojson-layer/geojson-utils.ts b/src/layers/src/geojson-layer/geojson-utils.tsindex caf18474a..fa4271934 100644--- a/src/layers/src/geojson-layer/geojson-utils.ts+++ b/src/layers/src/geojson-layer/geojson-utils.ts@@ -360,7 +360,14 @@ export function groupColumnsAsGeoJson(for (let index = 0; index < dataContainer.numRows(); index++) {// note: can materialize the rowconst datum = dataContainer.rowAsArray(index);- const id = datum[columns.id.fieldIdx];+ // Convert id to string to ensure consistent object key behavior+ // (numeric keys are sorted differently than string keys in Object.entries)+ const rawId = datum[columns.id.fieldIdx];+ if (rawId == null) {+ // Skip rows with missing IDs to avoid grouping them under "null"/"undefined"+ continue;+ }+ const id = String(rawId);const lat = datum[columns.lat.fieldIdx];const lon = datum[columns.lng.fieldIdx];const altitude = columns.altitude ? datum[columns.altitude.fieldIdx] : 0;@@ -419,8 +426,8 @@ export function detectTableColumns(}// find sort by fieldconst sortByFieldIdx = fields.findIndex(f => f.type === ALL_FIELD_TYPES.timestamp);- // find id column- const idFieldIdx = fields.findIndex(f => f.name?.toLowerCase().match(/^(id|uuid)$/g));+ // find id column: support id, uuid, xxx_id and xxx_uuid columns+ const idFieldIdx = fields.findIndex(f => f.name?.toLowerCase().match(/^(id|uuid|._id|._uuid)$/g));if (sortByFieldIdx > -1 && idFieldIdx > -1) {const pointColumns = assignPointPairToLayerColumn(fieldPairs[0], true);diff --git a/src/layers/src/trip-layer/trip-layer.ts b/src/layers/src/trip-layer/trip-layer.tsindex 63ee82f15..560a168ca 100644--- a/src/layers/src/trip-layer/trip-layer.ts+++ b/src/layers/src/trip-layer/trip-layer.ts@@ -243,10 +243,10 @@ export default class TripLayer extends Layer {}static findDefaultLayerProps(- {label, fields = [], dataContainer, id}: KeplerTable,+ {label, fields = [], dataContainer, id, fieldPairs = []}: KeplerTable,foundLayers?: any[]) {- const geojsonColumns = fields.filter(f => f.type === 'geojson').map(f => f.name);+ const geojsonColumns = fields.filter(f => f.type === 'geojson' || f.type === 'geoarrow').map(f => f.name);const defaultColumns = {geojson: uniq([...GEOJSON_FIELDS.geojson, ...geojsonColumns])@@ -277,6 +277,39 @@ export default class TripLayer extends Layer {};}+ // Try to detect table columns (id/lat/lng/timestamp) for table column mode+ // This allows creating trip layers from tabular data without GeoJSON+ if (fieldPairs.length && fields.length) {+ // Default layer columns for table mode+ const defaultTableColumns = {+ id: {value: null, fieldIdx: -1},+ lat: {value: null, fieldIdx: -1},+ lng: {value: null, fieldIdx: -1},+ timestamp: {value: null, fieldIdx: -1},+ altitude: {value: null, fieldIdx: -1, optional: true},+ geojson: {value: null, fieldIdx: -1}+ };++ const tableColumns = detectTableColumns(+ {fields, fieldPairs} as KeplerTable,+ defaultTableColumns,+ 'timestamp'+ );++ if (tableColumns) {+ // Found required columns for table mode+ return {+ props: [{+ label: tableColumns.label || (typeof label === 'string' && label.replace(/\.[^/.]+$/, '')) || this.type,+ columns: tableColumns.columns,+ isVisible: true,+ columnMode: COLUMN_MODE_TABLE+ }],+ foundLayers+ };+ }+ }+return {props: []};}