Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[feat] h3 layer from decimal format (#3066)
Igor Dykhtaabb3fd473363
diff --git a/src/layers/src/base-layer.ts b/src/layers/src/base-layer.tsindex 34a7c6408..5d555731d 100644--- a/src/layers/src/base-layer.ts+++ b/src/layers/src/base-layer.ts@@ -1323,7 +1323,7 @@ class Layer implements KeplerLayer {const layerDataset = datasets[this.config.dataId];const {dataContainer} = layerDataset;- const getPosition = this.getPositionAccessor(dataContainer);+ const getPosition = this.getPositionAccessor(dataContainer, layerDataset);const dataUpdateTriggers = this.getDataUpdateTriggers(layerDataset);const triggerChanged = this.getChangedTriggers(dataUpdateTriggers);@@ -1664,7 +1664,11 @@ class Layer implements KeplerLayer {}// eslint-disable-next-line @typescript-eslint/no-unused-vars- getPositionAccessor(dataContainer?: DataContainerInterface): (...args: any[]) => any {+ getPositionAccessor(+ _dataContainer?: DataContainerInterface,+ // TODO refactor for the next major version to pass only dataset+ _dataset?: KeplerTable+ ): (...args: any[]) => any {// implemented in subclassesreturn () => null;}diff --git a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.tsindex cde756657..e52c69aa2 100644--- a/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts+++ b/src/layers/src/h3-hexagon-layer/h3-hexagon-layer.ts@@ -22,6 +22,7 @@ import {import {findDefaultColorField, DataContainerInterface, createDataContainer} from '@kepler.gl/utils';import H3HexagonLayerIcon from './h3-hexagon-layer-icon';import {+ ALL_FIELD_TYPES,CHANNEL_SCALES,HIGHLIGH_COLOR_3D,DEFAULT_COLOR_UI,@@ -38,7 +39,7 @@ import {Merge,LayerColumn} from '@kepler.gl/types';-import {KeplerTable} from '@kepler.gl/table';+import {Datasets, KeplerTable} from '@kepler.gl/table';import {getTextOffsetByRadius, formatTextLabelData} from '../layer-text-label';@@ -96,6 +97,22 @@ export const hexIdAccessor =d =>dc.valueAt(d.index, hex_id.fieldIdx);+/** Accessor that tries to convert h3 indicies in decimal form to hex form */+export const hexIdExAccessor =+ ({hex_id}: HexagonIdLayerColumnsConfig) =>+ (dc: DataContainerInterface) =>+ d => {+ const value = dc.valueAt(d.index, hex_id.fieldIdx);+ if (h3IsValid(value)) {+ return value;+ }+ try {+ return BigInt(value).toString(16);+ } catch {+ return null;+ }+ };+export const defaultElevation = 500;export const defaultCoverage = 1;@@ -156,8 +173,12 @@ export default class HexagonIdLayer extends Layer {super(props);this.dataToFeature = {centroids: []};this.registerVisConfig(HexagonIdVisConfigs);- this.getPositionAccessor = (dataContainer: DataContainerInterface) =>- hexIdAccessor(this.config.columns)(dataContainer);+ this.getPositionAccessor = (dataContainer: DataContainerInterface, dataset?: KeplerTable) => {+ const fieldType = dataset?.fields[this.config.columns.hex_id.fieldIdx].type;+ return fieldType === ALL_FIELD_TYPES.h3+ ? hexIdAccessor(this.config.columns)(dataContainer)+ : hexIdExAccessor(this.config.columns)(dataContainer);+ };}get type(): 'hexagonId' {@@ -308,12 +329,14 @@ export default class HexagonIdLayer extends Layer {// TODO: fix complexity/* eslint-disable complexity */- formatLayerData(datasets, oldLayerData) {+ formatLayerData(datasets: Datasets, oldLayerData) {if (this.config.dataId === null) {return {};}- const {gpuFilter, dataContainer} = datasets[this.config.dataId];- const getHexId = this.getPositionAccessor(dataContainer);++ const dataset = datasets[this.config.dataId];+ const {gpuFilter, dataContainer} = dataset;+ const getHexId = this.getPositionAccessor(dataContainer, dataset);const {data, triggerChanged} = this.updateData(datasets, oldLayerData);const accessors = this.getAttributeAccessors({dataContainer});const {textLabel} = this.config;