@math.gl/geoarrow 5.0.0-alpha.2 → 5.0.0-alpha.3

package/src/layout.ts

@@ -298,7 +298,7 @@ function visitUnionRowCoordinates(
   const valueOffset = union.valueOffsets[physicalIndex];
   const child = union.children.find(candidate => candidate.typeId === typeId);
   if (!child) return;
-  const encoding = getEncodingFromChildName(child.name);
+  const encoding = child.encoding || getEncodingFromChildName(child.name);
   if (encoding === 'geoarrow.geometrycollection' && child.data.kind === 'list') {
     const [first, last] = getListRange(child.data, valueOffset);
     if (child.data.child.kind === 'dense-union') {
@@ -386,7 +386,11 @@ function materializeUnionRow(
   const valueOffset = union.valueOffsets[physicalIndex];
   const child = union.children.find(candidate => candidate.typeId === typeId);
   if (!child || valueOffset < 0 || valueOffset >= child.data.length) return null;
-  return materializeGeometryRow(child.data, valueOffset, getEncodingFromChildName(child.name));
+  return materializeGeometryRow(
+    child.data,
+    valueOffset,
+    child.encoding || getEncodingFromChildName(child.name)
+  );
 }
 
 function getEncodingFromChildName(name: string): GeoArrowEncoding {
@@ -538,15 +542,26 @@ function validateArray(
       break;
     }
     case 'serialized': {
-      validateOffsets(
-        array.offsets,
-        array.offset || 0,
-        array.length,
-        array.values.length,
-        array.offsetBase,
-        path,
-        issues
-      );
+      if (array.views) {
+        const requiredWords = ((array.offset || 0) + array.length) * 4;
+        if (requiredWords > array.views.length) {
+          issues.push({
+            code: 'invalid-length',
+            path,
+            message: 'Serialized view records are too short.'
+          });
+        }
+      } else {
+        validateOffsets(
+          array.offsets,
+          array.offset || 0,
+          array.length,
+          array.values.length,
+          array.offsetBase,
+          path,
+          issues
+        );
+      }
       break;
     }
   }
@@ -711,12 +726,20 @@ function validateUnionLayouts(
   for (const child of union.children) {
     let encoding: GeoArrowEncoding;
     try {
-      encoding = getEncodingFromChildName(child.name);
+      encoding = child.encoding || getEncodingFromChildName(child.name);
     } catch (error) {
       addInvalidLayout(`${path}.${child.name}`, (error as Error).message, issues);
       continue;
     }
-    validateGeometryLayout(child.data, encoding, column, `${path}.${child.name}`, issues);
+    const childColumn =
+      child.dimension || child.coordinateLayout
+        ? {
+            ...column,
+            dimension: child.dimension || column.dimension,
+            coordinateLayout: child.coordinateLayout || column.coordinateLayout
+          }
+        : column;
+    validateGeometryLayout(child.data, encoding, childColumn, `${path}.${child.name}`, issues);
   }
 }
 
@@ -814,6 +837,8 @@ function collectArrayBuffers(array: GeoArrowArray, buffers: Set<ArrayBuffer>): v
     case 'serialized':
       addBuffer(array.offsets.buffer, buffers);
       addBuffer(array.values.buffer, buffers);
+      if (array.views) addBuffer(array.views.buffer, buffers);
+      for (const data of array.dataBuffers || []) addBuffer(data.buffer, buffers);
       break;
   }
 }

package/src/tessellation-entry.ts

@@ -0,0 +1,7 @@
+// math.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+/** Optional polygon tessellation subpath. */
+export type {GeoArrowTessellation, TessellateGeoArrowPolygonsOptions} from './tessellate';
+export {tessellateGeoArrowPolygons} from './tessellate';

package/src/types.ts

@@ -4,7 +4,19 @@
 
 import type {SpatialReference} from '@math.gl/crs';
 import type {TypedArray} from '@math.gl/types';
-import type {WellKnownGeometry} from '@math.gl/wkb';
+/** Minimal tagged geometry shape used only by compatibility builders.
+ *
+ * The physical GeoArrow APIs never create these values. Keeping the structural type here avoids
+ * making the descriptor package depend on the WKB format package.
+ */
+export type GeoArrowGeometryValue =
+  | {type: 'Point'; coordinates: readonly number[]}
+  | {type: 'LineString'; coordinates: readonly (readonly number[])[]}
+  | {type: 'Polygon'; coordinates: readonly (readonly (readonly number[])[])[]}
+  | {type: 'MultiPoint'; coordinates: readonly (readonly number[])[]}
+  | {type: 'MultiLineString'; coordinates: readonly (readonly (readonly number[])[])[]}
+  | {type: 'MultiPolygon'; coordinates: readonly (readonly (readonly (readonly number[])[])[])[]}
+  | {type: 'GeometryCollection'; geometries: readonly GeoArrowGeometryValue[]};
 
 /** GeoArrow concrete, mixed, bounding-box, and serialized encodings. */
 export type GeoArrowEncoding =
@@ -96,6 +108,12 @@ export type GeoArrowBox = GeoArrowStruct;
 export type GeoArrowDenseUnionChild = Readonly<{
   name: string;
   typeId: number;
+  /** Child-specific physical encoding (required for mixed-dimensional unions). */
+  encoding?: GeoArrowEncoding;
+  /** Child-specific semantic dimension. Falls back to the column dimension for legacy data. */
+  dimension?: GeoArrowDimension;
+  /** Child-specific coordinate layout. Falls back to the column layout for legacy data. */
+  coordinateLayout?: GeoArrowCoordinateLayout | null;
   data: GeoArrowArray;
 }>;
 
@@ -117,6 +135,10 @@ export type GeoArrowSerialized = GeoArrowArrayBase &
     encoding: 'binary' | 'utf8';
     offsets: GeoArrowOffsets;
     values: Uint8Array;
+    /** Optional Arrow BinaryView-style records (four uint32 words per row). */
+    views?: Uint32Array;
+    /** Borrowed out-of-line buffers referenced by BinaryView records. */
+    dataBuffers?: readonly Uint8Array[];
     /** Index of logical row zero in `offsets`. */
     offset?: number;
     /** Value subtracted from offsets before indexing `values`. */
@@ -143,9 +165,6 @@ export type GeoArrowColumn = Readonly<{
   metadata?: Readonly<Record<string, unknown>>;
 }>;
 
-/** Materialized geometry value used at codec and builder boundaries. */
-export type GeoArrowGeometryValue = WellKnownGeometry;
-
 /** Coordinate callback used by mapping kernels. */
 export type GeoArrowCoordinateMapper = (
   coordinate: readonly number[],

package/src/wkb-entry.ts

@@ -0,0 +1,11 @@
+// math.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+/** Optional serialized-format bridge. The parser implementation lives in @math.gl/wkb. */
+export {
+  decodeGeoArrowWKB,
+  decodeGeoArrowWKT,
+  encodeGeoArrowWKB,
+  encodeGeoArrowWKT
+} from './codecs';