Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[fix] arrow text labels from non-string source vectors (#2990)
Igor Dykhta547ffeb0c778
diff --git a/src/deckgl-arrow-layers/src/layers/geo-arrow-text-layer.ts b/src/deckgl-arrow-layers/src/layers/geo-arrow-text-layer.tsindex 14dc2df6d..935695546 100644--- a/src/deckgl-arrow-layers/src/layers/geo-arrow-text-layer.ts+++ b/src/deckgl-arrow-layers/src/layers/geo-arrow-text-layer.ts@@ -196,9 +196,10 @@ export class GeoArrowTextLayer<ExtraProps extends object = object> extends Compoconst geometryData = geometryColumn.data[recordBatchIdx];const flatCoordsData = ga.child.getPointChild(geometryData);const flatCoordinateArray = flatCoordsData.values;+const textData = this.props.getText.data[recordBatchIdx];+ const numLabels = textData.length;const textValues = textData.values;- // ! TODO valueOffsets are only present for string columnsconst characterOffsets = textData.valueOffsets;// @ts-expect-error how to properly retrieve batch offset?@@ -226,7 +227,8 @@ export class GeoArrowTextLayer<ExtraProps extends object = object> extends Compovalue: expandArrayToCoords(flatCoordinateArray,geometryData.type.listSize,- characterOffsets+ characterOffsets,+ numLabels),size: geometryData.type.listSize},diff --git a/src/deckgl-arrow-layers/src/utils/utils.ts b/src/deckgl-arrow-layers/src/utils/utils.tsindex 0ccbb748c..2bf23dc76 100644--- a/src/deckgl-arrow-layers/src/utils/utils.ts+++ b/src/deckgl-arrow-layers/src/utils/utils.ts@@ -214,21 +214,24 @@ export function assignAccessor(args: AssignAccessorProps) {* @param input: the input array to expand* @param size : the number of nested elements in the input array per geometry. So for example, for RGB data this would be 3, for RGBA this would be 4. For radius, this would be 1.* @param geomOffsets : an offsets array mapping from the geometry to the coordinate indexes. So in the case of a LineStringArray, this is retrieved directly from the GeoArrow storage. In the case of a PolygonArray, this comes from the resolved indexes that need to be given to the SolidPolygonLayer anyways.+ * @param numPositions : end position in geomOffsets, as geomOffsets can potentially contain preallocated zeroes in the end of the buffer.** @return {TypedArray} values expanded to be per-coordinate*/export function expandArrayToCoords<T extends TypedArray>(input: T,size: number,- geomOffsets: Int32Array+ geomOffsets: Int32Array,+ numPositions?: number): T {- const numCoords = geomOffsets[geomOffsets.length - 1];+ const lastIndex = numPositions || geomOffsets.length - 1;+ const numCoords = geomOffsets[lastIndex];// @ts-expect-errorconst outputArray: T = new input.constructor(numCoords * size);// geomIdx is an index into the geomOffsets array// geomIdx is also the geometry/table index- for (let geomIdx = 0; geomIdx < geomOffsets.length - 1; geomIdx++) {+ for (let geomIdx = 0; geomIdx < lastIndex; geomIdx++) {// geomOffsets maps from the geometry index to the coord index// So here we get the range of coords that this geometry coversconst lastCoordIdx = geomOffsets[geomIdx];diff --git a/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts b/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.tsindex b7640bb8b..2bfd50ac5 100644--- a/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts+++ b/src/deckgl-layers/src/deckgl-extensions/filter-shader-module.ts@@ -15,10 +15,11 @@ const vs = `const fs = ``;const inject = {- // create degenerate vertices instead of discarding pixels in the fragment shader- 'vs:DECKGL_FILTER_GL_POSITION': `+ // create degenerate vertices in vertex shader instead of discarding pixels in the fragment shader.+ 'vs:#main-start': `if (FILTER_ARROW_ATTRIB == 0.) {- position = vec4(0., 0., 0., 0.);+ gl_Position = vec4(0.0, 0.0, 0.0, 1.0);+ return;}`};diff --git a/src/layers/src/layer-text-label.ts b/src/layers/src/layer-text-label.tsindex d90607734..d9e81a76e 100644--- a/src/layers/src/layer-text-label.ts+++ b/src/layers/src/layer-text-label.ts@@ -69,7 +69,9 @@ export const formatTextLabelData = ({const getTextAccessor: (d: {index: number}) => string = textLabelAccessor(tl)(dataContainer);let characterSet;+ let getText: typeof getTextAccessor | arrow.Vector = getTextAccessor;+ let rebuildArrowTextVector = true;if (!triggerChanged?.[`getLabelCharacterSet-${i}`] &&oldLayerData &&@@ -77,6 +79,8 @@ export const formatTextLabelData = ({oldLayerData.textLabels[i]) {characterSet = oldLayerData.textLabels[i].characterSet;+ getText = oldLayerData.textLabels[i].getText;+ rebuildArrowTextVector = false;} else {if (data instanceof arrow.Table) {// we don't filter out arrow tables,@@ -100,13 +104,20 @@ export const formatTextLabelData = ({}}- let getText: typeof getTextAccessor | arrow.Vector = getTextAccessor;// For Arrow Layers getText has to be an arrow vector.// For now check here for ArrowTable, not ArrowDataContainer.- if (data instanceof arrow.Table && dataContainer instanceof ArrowDataContainer) {- // TODO the data has to be a column of string type.- // as numerical and other columns types lack valueOffsets prop.+ if (+ rebuildArrowTextVector &&+ data instanceof arrow.Table &&+ dataContainer instanceof ArrowDataContainer+ ) {getText = dataContainer.getColumn(tl.field.fieldIdx);+ try {+ getText = getArrowTextVector(getText as arrow.Vector, getTextAccessor);+ } catch (error) {+ // empty text labels+ getText = getArrowTextVector(getText, () => ' ');+ }}return {@@ -115,3 +126,41 @@ export const formatTextLabelData = ({};});};++/**+ * Get an arrow vector suitable to render text labels with arrow layers.+ * @param getText A candidate arrow vector to use for text labels.+ * @param getTextAccessor Text label accessor.+ */+export const getArrowTextVector = (+ candidateTextVector: arrow.Vector,+ getTextAccessor: ({index}: {index: number}) => string+): arrow.Vector => {+ // if the passed vector is suitable for text labels+ if (arrow.DataType.isUtf8(candidateTextVector?.type)) {+ return candidateTextVector;+ }++ // create utf8 vector from source vector with the same number of batches.+ // @ts-expect-error+ const offsets = candidateTextVector._offsets;+ const numOffsets = offsets.length;+ const batchVectors: arrow.Vector[] = [];+ const datum = {index: 0};+ for (let batchIndex = 0; batchIndex < numOffsets - 1; batchIndex++) {+ const batchStart = offsets[batchIndex];+ const batchEnd = offsets[batchIndex + 1];++ const batchLabels: string[] = [];+ for (let rowIndex = batchStart; rowIndex < batchEnd; ++rowIndex) {+ datum.index = rowIndex;+ batchLabels.push(getTextAccessor(datum));+ }++ batchVectors.push(arrow.vectorFromArray(batchLabels, new arrow.Utf8()));+ }++ const input = batchVectors.flatMap(x => x.data).flat(Number.POSITIVE_INFINITY);++ return new arrow.Vector(input);+};