Update additional layers to support struct coordinate arrow table

Author: gmoney1729

src/layers/arc-layer.ts

@@ -15,7 +15,7 @@ import { ArcLayer } from "@deck.gl/layers";
 import type { ArcLayerProps } from "@deck.gl/layers";
 import * as arrow from "apache-arrow";
 import * as ga from "@geoarrow/geoarrow-js";
-import { assignAccessor, extractAccessorsFromProps } from "../utils/utils";
+import { assignAccessor, convertStructToFixedSizeList, extractAccessorsFromProps, isGeomSeparate } from "../utils/utils";
 import { child } from "@geoarrow/geoarrow-js";
 import {
   GeoArrowExtraPickingProps,
@@ -157,9 +157,15 @@ export class GeoArrowArcLayer<
       recordBatchIdx < table.batches.length;
       recordBatchIdx++
     ) {
-      const sourceData = sourcePosition.data[recordBatchIdx];
+      let sourceData = sourcePosition.data[recordBatchIdx];
+      if (isGeomSeparate(sourceData)) {
+        sourceData = convertStructToFixedSizeList(sourceData);
+      }
       const sourceValues = child.getPointChild(sourceData).values;
-      const targetData = targetPosition.data[recordBatchIdx];
+      let targetData = targetPosition.data[recordBatchIdx];
+      if (isGeomSeparate(targetData)) {
+        targetData = convertStructToFixedSizeList(targetData);
+      }
       const targetValues = child.getPointChild(targetData).values;
 
       const props: ArcLayerProps = {

src/layers/column-layer.ts

@@ -16,8 +16,10 @@ import type { ColumnLayerProps } from "@deck.gl/layers";
 import * as arrow from "apache-arrow";
 import {
   assignAccessor,
+  convertStructToFixedSizeList,
   extractAccessorsFromProps,
   getGeometryVector,
+  isGeomSeparate,
 } from "../utils/utils";
 import * as ga from "@geoarrow/geoarrow-js";
 import { ColorAccessor, FloatAccessor, GeoArrowPickingInfo } from "../types";
@@ -161,7 +163,10 @@ export class GeoArrowColumnLayer<
       recordBatchIdx < table.batches.length;
       recordBatchIdx++
     ) {
-      const geometryData = geometryColumn.data[recordBatchIdx];
+      let geometryData = geometryColumn.data[recordBatchIdx];
+      if (isGeomSeparate(geometryData)) {
+        geometryData = convertStructToFixedSizeList(geometryData);
+      }
       const flatCoordsData = ga.child.getPointChild(geometryData);
       const flatCoordinateArray = flatCoordsData.values;
 

src/layers/heatmap-layer.ts

@@ -16,8 +16,10 @@ import * as arrow from "apache-arrow";
 import * as ga from "@geoarrow/geoarrow-js";
 import {
   assignAccessor,
+  convertStructToFixedSizeList,
   extractAccessorsFromProps,
   getGeometryVector,
+  isGeomSeparate,
 } from "../utils/utils";
 import { FloatAccessor } from "../types";
 import { EXTENSION_NAME } from "../constants";
@@ -128,7 +130,10 @@ export class GeoArrowHeatmapLayer<
       recordBatchIdx < table.batches.length;
       recordBatchIdx++
     ) {
-      const geometryData = geometryColumn.data[recordBatchIdx];
+      let geometryData = geometryColumn.data[recordBatchIdx];
+      if (isGeomSeparate(geometryData)) {
+        geometryData = convertStructToFixedSizeList(geometryData);
+      }
       const flatCoordsData = ga.child.getPointChild(geometryData);
       const flatCoordinateArray = flatCoordsData.values;
 

src/layers/path-layer.ts

@@ -19,8 +19,10 @@ import {
   assignAccessor,
   extractAccessorsFromProps,
   getGeometryVector,
+  getInterleavedLineString,
   getMultiLineStringResolvedOffsets,
   invertOffsets,
+  isGeomSeparate,
 } from "../utils/utils";
 import {
   GeoArrowExtraPickingProps,
@@ -172,7 +174,10 @@ export class GeoArrowPathLayer<
       recordBatchIdx < table.batches.length;
       recordBatchIdx++
     ) {
-      const lineStringData = geometryColumn.data[recordBatchIdx];
+      let lineStringData = geometryColumn.data[recordBatchIdx];
+      if (isGeomSeparate(lineStringData)) {
+        lineStringData = getInterleavedLineString(lineStringData);
+      }
       const geomOffsets = lineStringData.valueOffsets;
       const pointData = ga.child.getLineStringChild(lineStringData);
       const nDim = pointData.type.listSize;
@@ -243,8 +248,11 @@ export class GeoArrowPathLayer<
       recordBatchIdx++
     ) {
       const multiLineStringData = geometryColumn.data[recordBatchIdx];
-      const lineStringData =
+      let lineStringData =
         ga.child.getMultiLineStringChild(multiLineStringData);
+      if (isGeomSeparate(lineStringData)) {
+        lineStringData = getInterleavedLineString(lineStringData);
+      }
       const pointData = ga.child.getLineStringChild(lineStringData);
       const coordData = ga.child.getPointChild(pointData);
 

src/layers/point-cloud-layer.ts

@@ -19,8 +19,10 @@ import * as arrow from "apache-arrow";
 import * as ga from "@geoarrow/geoarrow-js";
 import {
   assignAccessor,
+  convertStructToFixedSizeList,
   extractAccessorsFromProps,
   getGeometryVector,
+  isGeomSeparate,
 } from "../utils/utils";
 import {
   GeoArrowExtraPickingProps,
@@ -156,7 +158,10 @@ export class GeoArrowPointCloudLayer<
       recordBatchIdx < table.batches.length;
       recordBatchIdx++
     ) {
-      const geometryData = geometryColumn.data[recordBatchIdx];
+      let geometryData = geometryColumn.data[recordBatchIdx];
+      if (isGeomSeparate(geometryData)) {
+        geometryData = convertStructToFixedSizeList(geometryData);
+      }
       const flatCoordsData = ga.child.getPointChild(geometryData);
       const flatCoordinateArray = flatCoordsData.values;
 

src/layers/scatterplot-layer.ts

@@ -17,9 +17,11 @@ import * as arrow from "apache-arrow";
 import * as ga from "@geoarrow/geoarrow-js";
 import {
   assignAccessor,
+  convertStructToFixedSizeList,
   extractAccessorsFromProps,
   getGeometryVector,
   invertOffsets,
+  isGeomSeparate,
 } from "../utils/utils";
 import {
   GeoArrowExtraPickingProps,
@@ -169,7 +171,10 @@ export class GeoArrowScatterplotLayer<
       recordBatchIdx < table.batches.length;
       recordBatchIdx++
     ) {
-      const geometryData = geometryColumn.data[recordBatchIdx];
+      let geometryData = geometryColumn.data[recordBatchIdx];
+      if (isGeomSeparate(geometryData)) {
+        geometryData = convertStructToFixedSizeList(geometryData);
+      }
       const flatCoordsData = ga.child.getPointChild(geometryData);
       const flatCoordinateArray = flatCoordsData.values;
 
@@ -238,7 +243,10 @@ export class GeoArrowScatterplotLayer<
       recordBatchIdx++
     ) {
       const multiPointData = geometryColumn.data[recordBatchIdx];
-      const pointData = ga.child.getMultiPointChild(multiPointData);
+      let pointData = ga.child.getMultiPointChild(multiPointData);
+      if (isGeomSeparate(pointData)) {
+        pointData = convertStructToFixedSizeList(pointData);
+      }
       const geomOffsets = multiPointData.valueOffsets;
       const flatCoordsData = ga.child.getPointChild(pointData);
       const flatCoordinateArray = flatCoordsData.values;

src/layers/text-layer.ts

@@ -17,9 +17,11 @@ import * as arrow from "apache-arrow";
 import * as ga from "@geoarrow/geoarrow-js";
 import {
   assignAccessor,
+  convertStructToFixedSizeList,
   expandArrayToCoords,
   extractAccessorsFromProps,
   getGeometryVector,
+  isGeomSeparate,
 } from "../utils/utils";
 import {
   GeoArrowExtraPickingProps,
@@ -207,7 +209,10 @@ export class GeoArrowTextLayer<
       recordBatchIdx < table.batches.length;
       recordBatchIdx++
     ) {
-      const geometryData = geometryColumn.data[recordBatchIdx];
+      let geometryData = geometryColumn.data[recordBatchIdx];
+      if (isGeomSeparate(geometryData)) {
+        geometryData = convertStructToFixedSizeList(geometryData);
+      }
       const flatCoordsData = ga.child.getPointChild(geometryData);
       const flatCoordinateArray = flatCoordsData.values;
       const textData = this.props.getText.data[recordBatchIdx];

src/layers/trips-layer.ts

@@ -17,6 +17,8 @@ import {
   assignAccessor,
   extractAccessorsFromProps,
   getGeometryVector,
+  getInterleavedLineString,
+  isGeomSeparate,
 } from "../utils/utils";
 import { TimestampAccessor, ColorAccessor, FloatAccessor } from "../types";
 import {
@@ -146,7 +148,10 @@ export class GeoArrowTripsLayer<
       recordBatchIdx < table.batches.length;
       recordBatchIdx++
     ) {
-      const lineStringData = geometryColumn.data[recordBatchIdx];
+      let lineStringData = geometryColumn.data[recordBatchIdx];
+      if (isGeomSeparate(lineStringData)) {
+        lineStringData = getInterleavedLineString(lineStringData);
+      }
       const geomOffsets = lineStringData.valueOffsets;
       const pointData = ga.child.getLineStringChild(lineStringData);
       const nDim = pointData.type.listSize;

src/utils/utils.ts

@@ -108,7 +108,7 @@ export function isGeomSeparate(data: arrow.Data): boolean {
  * The GeoArrow spec allows for either separated or interleaved coords, but at
  * this time deck.gl only supports interleaved.
  */
-function convertStructToFixedSizeList(
+export function convertStructToFixedSizeList(
   coords:
     | ga.data.PointData
     | arrow.Data<arrow.FixedSizeList<arrow.Float64>>