Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[fix] check for geoarrow extension in geojson layer (#2916)
Igor Dykhta933a91a2f814
diff --git a/src/layers/src/geojson-layer/geojson-layer.ts b/src/layers/src/geojson-layer/geojson-layer.tsindex 27f049da2..656bf9f92 100644--- a/src/layers/src/geojson-layer/geojson-layer.ts+++ b/src/layers/src/geojson-layer/geojson-layer.ts@@ -25,7 +25,8 @@ import {DeckGlGeoTypes,detectTableColumns,COLUMN_MODE_GEOJSON,- applyFiltersToTableColumns+ applyFiltersToTableColumns,+ fieldIsGeoArrow} from './geojson-utils';import {getGeojsonLayerMetaFromArrow,@@ -234,6 +235,7 @@ export default class GeoJsonLayer extends Layer {declare config: GeoJsonLayerConfig;declare visConfigSettings: GeoJsonVisConfigSettings;declare meta: GeoJsonLayerMeta;+ declare geoArrowMode: boolean;dataToFeature: GeojsonDataMaps = [];dataContainer: DataContainerInterface | null = null;@@ -430,7 +432,7 @@ export default class GeoJsonLayer extends Layer {getHoverData(object, dataContainer) {// index of dataContainer is saved to feature.properties// for arrow format, `object` is the index of the row returned from deck- const index = dataContainer instanceof ArrowDataContainer ? object : object?.properties?.index;+ const index = this.geoArrowMode ? object : object?.properties?.index;if (index >= 0) {return dataContainer.row(index);}@@ -456,8 +458,12 @@ export default class GeoJsonLayer extends Layer {}calculateDataAttribute(dataset: KeplerTable) {+ this.geoArrowMode = fieldIsGeoArrow(+ geoFieldAccessor(this.config.columns)(dataset.dataContainer)+ );+const {dataContainer, filteredIndex} = dataset;- if (dataContainer instanceof ArrowDataContainer) {+ if (this.geoArrowMode) {// TODO add columnMode logic here for ArrowDataContainer?// filter geojson/arrow table by values and make a partial copy of the raw table are expensive// so we will use filteredIndex to create an attribute e.g. filteredIndex [0|1] for GPU filtering@@ -552,7 +558,11 @@ export default class GeoJsonLayer extends Layer {this.dataContainer = dataContainer;- if (dataContainer instanceof ArrowDataContainer) {+ this.geoArrowMode = fieldIsGeoArrow(+ geoFieldAccessor(this.config.columns)(dataset.dataContainer)+ );++ if (this.geoArrowMode && dataContainer instanceof ArrowDataContainer) {const geoColumn = geoColumnAccessor(this.config.columns)(dataContainer);const geoField = geoFieldAccessor(this.config.columns)(dataContainer);@@ -625,13 +635,13 @@ export default class GeoJsonLayer extends Layer {}isLayerHovered(objectInfo: ObjectInfo): boolean {- return this.dataContainer instanceof ArrowDataContainer+ return this.geoArrowMode? isLayerHoveredFromArrow(objectInfo, this.id): super.isLayerHovered(objectInfo);}hasHoveredObject(objectInfo: ObjectInfo): Feature | null {- return this.dataContainer instanceof ArrowDataContainer+ return this.geoArrowMode? getHoveredObjectFromArrow(objectInfo,this.dataContainer,@@ -680,7 +690,7 @@ export default class GeoJsonLayer extends Layer {const {data, ...props} = dataProps;// arrow table can have multiple chunks, a deck.gl layer is created for each chunk- const deckLayerData = this.dataContainer instanceof ArrowDataContainer ? data : [data];+ const deckLayerData = this.geoArrowMode ? data : [data];const deckLayers = deckLayerData.map((d, i) => {return new DeckGLGeoJsonLayer({...defaultLayerProps,diff --git a/src/layers/src/geojson-layer/geojson-utils.ts b/src/layers/src/geojson-layer/geojson-utils.tsindex 8f545f25f..ad7e83399 100644--- a/src/layers/src/geojson-layer/geojson-utils.ts+++ b/src/layers/src/geojson-layer/geojson-utils.ts@@ -13,7 +13,7 @@ import {binaryToGeometry} from '@loaders.gl/gis';import {BinaryFeatureCollection} from '@loaders.gl/schema';import {DataContainerInterface, getSampleData} from '@kepler.gl/utils';import {ALL_FIELD_TYPES} from '@kepler.gl/constants';-import {LayerColumns} from '@kepler.gl/types';+import {LayerColumns, ProtoDatasetField} from '@kepler.gl/types';import {KeplerTable} from '@kepler.gl/table';import {GeojsonLayerMetaProps, assignPointPairToLayerColumn} from '../layer-utils';@@ -43,6 +43,15 @@ type FeatureTypeMap = {/* eslint-enable */+/**+ * Returns true if the field has geoarrow extension.+ * @param geoField A field to test.+ * @returns+ */+export function fieldIsGeoArrow(geoField?: ProtoDatasetField | null): boolean {+ return Boolean(geoField?.metadata?.get('ARROW:extension:name'));+}+export function parseGeoJsonRawFeature(rawFeature: unknown): Feature | null {const properties = null; // help ensure that properties is present on the returned geojson featureif (typeof rawFeature === 'object') {