@loaders.gl/schema 3.1.7 → 3.2.0-alpha.2

package/src/category/image/image.ts

@@ -0,0 +1,19 @@
+/**
+ * data images
+ */
+export type ImageDataType = {
+  data: Uint8Array;
+  width: number;
+  height: number;
+  compressed?: boolean;
+};
+
+/**
+ * Supported Image Types
+ */
+export type ImageType = ImageBitmap | typeof Image | ImageDataType;
+
+/**
+ * Image type string used to control or determine the type of images returned from ImageLoader
+ */
+export type ImageTypeEnum = 'imagebitmap' | 'image' | 'data';

package/src/category/mesh/convert-mesh.ts

@@ -1,6 +1,6 @@
 import type {Mesh} from './mesh-types';
 import type {ColumnarTable, ArrowTable} from '../table/table-types';
-// import {convertMeshToArrowTable} from './mesh-to-arrow-table';
+import {convertMeshToArrowTable} from './mesh-to-arrow-table';
 
 type TargetShape = 'mesh' | 'columnar-table' | 'arrow-table';
 
@@ -17,11 +17,11 @@ export function convertMesh(
       return mesh;
     case 'columnar-table':
       return convertMeshToColumnarTable(mesh);
-    // case 'arrow-table':
-    //   return {
-    //     shape: 'arrow-table',
-    //     data: convertMeshToArrowTable(mesh)
-    //   };
+    case 'arrow-table':
+      return {
+        shape: 'arrow-table',
+        data: convertMeshToArrowTable(mesh)
+      };
     default:
       throw new Error(`Unsupported shape ${options?.shape}`);
   }

package/src/category/mesh/mesh-to-arrow-table.ts

@@ -1,4 +1,3 @@
-/*
 import {
   Table,
   Schema,
@@ -7,7 +6,7 @@ import {
   Field,
   Data,
   FixedSizeListVector
-} from 'apache-arrow';
+} from 'apache-arrow/Arrow.dom';
 import {AbstractVector} from 'apache-arrow/vector';
 import {getArrowType, getArrowVector} from '../../lib/arrow/arrow-type-utils';
 import type {Mesh} from './mesh-types';
@@ -19,7 +18,7 @@ import {makeMeshAttributeMetadata} from './deduce-mesh-schema';
  * @param metadata
  * @param batchSize
  * @returns
- *
+ */
 export function convertMeshToArrowTable(mesh: Mesh, batchSize?: number): Table {
   const vectors: AbstractVector[] = [];
   const fields: Field[] = [];
@@ -40,4 +39,3 @@ export function convertMeshToArrowTable(mesh: Mesh, batchSize?: number): Table {
   const table = new Table(schema, recordBatch);
   return table;
 }
-*/

package/src/category/table/table-types.ts

@@ -1,21 +1,25 @@
 import type {Schema} from '../../lib/schema/schema';
+import type {Table as ApacheArrowTable, RecordBatch} from 'apache-arrow/Arrow.dom';
 import type {AnyArray} from '../../types';
 import type {Batch} from '../common';
-// TODO Arrow dependency causes issues
-// import type {Table as ApacheArrowTable, RecordBatch} from 'apache-arrow/Arrow.dom';
-type ApacheArrowTable = any;
-type RecordBatch = any;
+import type {Feature} from '../gis';
 
 /** A general table */
 export interface Table {
-  shape: 'row-table' | 'array-row-table' | 'object-row-table' | 'columnar-table' | 'arrow-table';
+  shape:
+    | 'row-table'
+    | 'array-row-table'
+    | 'object-row-table'
+    | 'geojson-row-table'
+    | 'columnar-table'
+    | 'arrow-table';
   schema?: Schema;
   schemaType?: 'explicit' | 'deduced';
 }
 
 /** A table organized as an array of rows */
 export interface RowTable extends Table {
-  shape: 'row-table' | 'array-row-table' | 'object-row-table';
+  shape: 'row-table' | 'array-row-table' | 'object-row-table' | 'geojson-row-table';
   data: any[];
 }
 
@@ -31,6 +35,12 @@ export interface ObjectRowTable extends RowTable {
   data: {[columnName: string]: any}[];
 }
 
+/** A table organized as an array of rows, each row is a GeoJSON Feature */
+export interface GeoJSONRowTable extends RowTable {
+  shape: 'geojson-row-table';
+  data: Feature[];
+}
+
 /** A table organized as a map of columns, each column is an array of value */
 export interface ColumnarTable extends Table {
   shape: 'columnar-table';
@@ -43,6 +53,12 @@ export interface ArrowTable extends Table {
   data: ApacheArrowTable;
 }
 
+/** A collection of tables */
+export type Tables<TableType extends Table = Table> = {
+  shape: 'tables';
+  tables: {name: string; table: TableType}[];
+};
+
 // Batches
 
 /** Batch for a general table */
@@ -71,6 +87,12 @@ export type RowObjectTableBatch = RowTableBatch & {
   data: {[columnName: string]: any}[];
 };
 
+/** Batch for a table organized as an array of rows, each row is an array of values */
+export type GeoJSONRowTableBatch = RowTableBatch & {
+  shape: 'geojson-row-table';
+  data: Feature[];
+};
+
 /** Batch for a table organized as a map of columns, each column is an array of value */
 export type ColumnarTableBatch = TableBatch & {
   shape: 'columnar-table';

package/src/category/texture/texture.ts

@@ -0,0 +1,28 @@
+import type {ImageType} from '../image/image';
+
+/**
+ * These represent the main compressed texture formats
+ * Each format typically has a number of more specific subformats
+ */
+export type GPUTextureFormat =
+  | 'dxt'
+  | 'dxt-srgb'
+  | 'etc1'
+  | 'etc2'
+  | 'pvrtc'
+  | 'atc'
+  | 'astc'
+  | 'rgtc';
+
+/** One mip level */
+export type TextureLevel = {
+  compressed: boolean;
+  format?: number;
+  data: Uint8Array;
+  width: number;
+  height: number;
+  levelSize?: number;
+  hasAlpha?: boolean;
+};
+
+export type TextureOrImage = ImageType | (TextureLevel | ImageType);

package/src/index.ts

@@ -4,18 +4,20 @@ export type {TypedArray, NumberArray, AnyArray} from './types';
 export type {Batch} from './category/common';
 
 // TABLE CATEGORY TYPES
-
 export type {
   Table,
   ArrayRowTable,
   ObjectRowTable,
+  GeoJSONRowTable,
   ColumnarTable,
-  ArrowTable
+  ArrowTable,
+  Tables
 } from './category/table/table-types';
 export type {
   TableBatch,
   RowArrayTableBatch,
   RowObjectTableBatch,
+  GeoJSONRowTableBatch,
   ColumnarTableBatch,
   ArrowTableBatch
 } from './category/table/table-types';
@@ -46,10 +48,21 @@ export {
   makeMeshAttributeMetadata
 } from './category/mesh/deduce-mesh-schema';
 
+// TEXTURES
+export type {TextureLevel, GPUTextureFormat} from './category/texture/texture';
+
+// IMAGES
+export type {ImageDataType, ImageType, ImageTypeEnum} from './category/image/image';
+
 // TYPES
 // GIS CATEGORY - GEOJSON
-export type {GeoJSON, Feature, Geometry, Position, GeoJsonProperties} from './category/gis';
 export type {
+  GeoJSON,
+  Feature,
+  FeatureCollection,
+  Geometry,
+  Position,
+  GeoJsonProperties,
   Point,
   MultiPoint,
   LineString,

package/src/lib/arrow/arrow-type-utils.ts

@@ -1,4 +1,3 @@
-/*
 import type {TypedArray} from '../../types';
 import {
   DataType,
@@ -66,4 +65,3 @@ export function getArrowVector(array: TypedArray): AbstractVector {
       throw new Error('array type not supported');
   }
 }
-*/