support 3d coords (#31)

Author: kylebarron

package-lock.json

@@ -133,7 +133,7 @@ export class GeoArrowPathLayer<
   renderLayers(): Layer<{}> | LayersList | null {
     const { data: table } = this.props;
 
-    const geometryColumn =
+    const geometryColumn: LineStringVector =
       this.props.getPath || getGeometryVector(table, "geoarrow.linestring");
 
     if (this.props._validate) {
@@ -160,7 +160,8 @@ export class GeoArrowPathLayer<
     ) {
       const geometryData = geometryColumn.data[recordBatchIdx];
       const geomOffsets = geometryData.valueOffsets;
-      const coordsArray = geometryData.children[0].children[0].values;
+      const nDim = geometryData.type.children[0].type.listSize;
+      const flatCoordinateArray = geometryData.children[0].children[0].values;
 
       const props: PathLayerProps = {
         id: `${this.props.id}-geoarrow-linestring-${recordBatchIdx}`,
@@ -178,7 +179,7 @@ export class GeoArrowPathLayer<
           // @ts-ignore
           startIndices: geomOffsets,
           attributes: {
-            getPath: { value: coordsArray, size: 2 },
+            getPath: { value: flatCoordinateArray, size: nDim },
           },
         },
       };

src/path-layer.ts

@@ -165,7 +165,7 @@ export class GeoArrowScatterplotLayer<
   renderLayers(): Layer<{}> | LayersList | null {
     const { data: table } = this.props;
 
-    const geometryColumn =
+    const geometryColumn: PointVector =
       this.props.getPosition || getGeometryVector(table, "geoarrow.point");
 
     if (this.props._validate) {
@@ -199,7 +199,7 @@ export class GeoArrowScatterplotLayer<
       recordBatchIdx++
     ) {
       const geometryData = geometryColumn.data[recordBatchIdx];
-      const coordsArray = geometryData.children[0].values;
+      const flatCoordinateArray = geometryData.children[0].values;
 
       const props: ScatterplotLayerProps = {
         id: `${this.props.id}-geoarrow-scatterplot-${recordBatchIdx}`,
@@ -218,7 +218,10 @@ export class GeoArrowScatterplotLayer<
         data: {
           length: geometryData.length,
           attributes: {
-            getPosition: { value: coordsArray, size: 2 },
+            getPosition: {
+              value: flatCoordinateArray,
+              size: geometryData.type.listSize,
+            },
           },
         },
       };

src/scatterplot-layer.ts

@@ -132,7 +132,7 @@ export class GeoArrowSolidPolygonLayer<
   renderLayers(): Layer<{}> | LayersList | null {
     const { data: table } = this.props;
 
-    const geometryColumn =
+    const geometryColumn: PolygonVector =
       this.props.getPolygon || getGeometryVector(table, "geoarrow.polygon");
 
     if (this.props._validate) {
@@ -165,6 +165,7 @@ export class GeoArrowSolidPolygonLayer<
       recordBatchIdx++
     ) {
       const geometryData = geometryColumn.data[recordBatchIdx];
+      const nDim = geometryData.type.children[0].type.children[0].type.listSize;
       const geomOffsets = geometryData.valueOffsets;
       const ringOffsets = geometryData.children[0].valueOffsets;
       const flatCoordinateArray =
@@ -194,7 +195,7 @@ export class GeoArrowSolidPolygonLayer<
           // @ts-ignore
           startIndices: resolvedRingOffsets,
           attributes: {
-            getPolygon: { value: flatCoordinateArray, size: 2 },
+            getPolygon: { value: flatCoordinateArray, size: nDim },
           },
         },
       };

src/solid-polygon-layer.ts

@@ -5,7 +5,8 @@ export type SeparatedCoord = arrow.Struct<{
   x: arrow.Float;
   y: arrow.Float;
 }>;
-export type Coord = InterleavedCoord | SeparatedCoord;
+// TODO: support separated coords
+export type Coord = InterleavedCoord; // | SeparatedCoord;
 export type Point = Coord;
 export type LineString = arrow.List<Coord>;
 export type Polygon = arrow.List<arrow.List<Coord>>;