@loaders.gl/schema 4.0.0-alpha.9 → 4.0.0-beta.1

package/dist/types/schema.d.ts

@@ -1,4 +1,3 @@
-import type { RecordBatch } from 'apache-arrow';
 /** For dictionary type */
 export type KeyType = 'int8' | 'int16' | 'int32' | 'uint8' | 'uint16' | 'uint32';
 /** ArrowLike DataType class */
@@ -60,18 +59,4 @@ export type Schema = {
     fields: Field[];
     metadata: SchemaMetadata;
 };
-export type Batch = {
-    batchType: 'data' | 'metadata' | 'partial-result' | 'final-result';
-    batch?: number;
-    mimeType?: string;
-    shape: string;
-    data: any;
-    recordBatch?: RecordBatch;
-    length: number;
-    schema?: Schema;
-    bytesUsed?: number;
-    count?: number;
-    cursor?: number;
-    [key: string]: any;
-};
 //# sourceMappingURL=schema.d.ts.map

package/dist/types/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/types/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/types/schema.ts"],"names":[],"mappings":"AAEA,0BAA0B;AAC1B,MAAM,MAAM,OAAO,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,GAAG,OAAO,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEjF,+BAA+B;AAC/B,MAAM,MAAM,QAAQ,GAChB,MAAM,GAEN,MAAM,GACN,KAAK,GACL,MAAM,GACN,OAAO,GACP,OAAO,GACP,OAAO,GACP,OAAO,GACP,QAAQ,GACR,QAAQ,GACR,QAAQ,GACR,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,GACT,QAAQ,GACR,MAAM,GACN,UAAU,GACV,kBAAkB,GAClB,aAAa,GACb,kBAAkB,GAClB,kBAAkB,GAClB,iBAAiB,GACjB,kBAAkB,GAClB,uBAAuB,GACvB,uBAAuB,GACvB,sBAAsB,GACtB,kBAAkB,GAClB,oBAAoB,GAEpB;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAC,GACjC;IAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAC,GACnC;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,kBAAkB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;CAC7C,GACD;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,EAAE,KAAK,EAAE,CAAC;IAClB,kBAAkB,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAC,CAAC;CAC7C,GACD;IAAC,IAAI,EAAE,mBAAmB,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAC,GAC9C;IAAC,IAAI,EAAE,iBAAiB,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAC,GAC9D;IAAC,IAAI,EAAE,KAAK,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,KAAK,EAAE,CAAA;CAAC,GACrD;IAAC,IAAI,EAAE,YAAY,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,UAAU,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,OAAO,CAAA;CAAC,CAAC;AAGjG;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AACpD,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEnD,MAAM,MAAM,KAAK,GAAG;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,aAAa,CAAC;CAC1B,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/schema",
-  "version": "4.0.0-alpha.9",
+  "version": "4.0.0-beta.1",
   "description": "Table format APIs for JSON, CSV, etc...",
   "license": "MIT",
   "publishConfig": {
@@ -34,5 +34,5 @@
   "dependencies": {
     "@types/geojson": "^7946.0.7"
   },
-  "gitHead": "03ff81ab468f20f3bddeec787aa88d477a7e1c72"
+  "gitHead": "35c625e67132b0784e597d9ddabae8aefea29ff2"
 }

package/src/index.ts

@@ -1,13 +1,17 @@
 // COMMON CATEGORY
 export type {
   TypedArray,
+  BigTypedArray,
   TypedArrayConstructor,
+  BigTypedArrayConstructor,
   NumberArray,
   ArrayType,
   AnyArray
 } from './types/types';
 
-export type {Schema, Field, DataType, Batch, SchemaMetadata, FieldMetadata} from './types/schema';
+export type {Schema, Field, DataType, SchemaMetadata, FieldMetadata} from './types/schema';
+
+export type {Batch} from './types/batch';
 
 // TABLE CATEGORY TYPES
 export type {
@@ -15,7 +19,7 @@ export type {
   RowTable,
   ArrayRowTable,
   ObjectRowTable,
-  GeoJSONRowTable,
+  GeoJSONTable,
   ColumnarTable,
   ArrowTable,
   Tables
@@ -24,7 +28,7 @@ export type {
   TableBatch,
   ArrayRowTableBatch,
   ObjectRowTableBatch,
-  GeoJSONRowTableBatch,
+  GeoJSONTableBatch,
   ColumnarTableBatch,
   ArrowTableBatch
 } from './types/category-table';
@@ -52,6 +56,7 @@ export {
 export {ArrowLikeTable} from './lib/table/arrow-api/arrow-like-table';
 
 export {makeTableFromData} from './lib/table/simple-table/make-table';
+export {convertTable} from './lib/table/simple-table/convert-table';
 export {deduceTableSchema} from './lib/table/simple-table/table-schema';
 export {convertToObjectRow, convertToArrayRow} from './lib/table/simple-table/row-utils';
 export {getDataTypeFromArray} from './lib/table/simple-table/data-type';
@@ -122,10 +127,11 @@ export type {
   BinaryAttribute
 } from './types/category-gis';
 export type {
-  BinaryFeatures,
-  BinaryPointFeatures,
-  BinaryLineFeatures,
-  BinaryPolygonFeatures
+  BinaryFeatureCollection,
+  BinaryFeature,
+  BinaryPointFeature,
+  BinaryLineFeature,
+  BinaryPolygonFeature
 } from './types/category-gis';
 
 // SCHEMA

package/src/lib/table/arrow-api/arrow-like-table.ts

@@ -34,7 +34,8 @@ class ArrowLikeVector {
   toArray(): ArrayLike<unknown> {
     switch (this.table.shape) {
       case 'arrow-table':
-        return this.table.data.getChild(this.columnName)?.toArray();
+        const arrowTable = this.table.data as any;
+        return arrowTable.getChild(this.columnName)?.toArray();
       case 'columnar-table':
         return this.table.data[this.columnName];
       default:
@@ -62,7 +63,7 @@ export class ArrowLikeTable {
   // }
 
   get data() {
-    return this.table.data;
+    return this.table.shape === 'geojson-table' ? this.table.features : this.table.data;
   }
 
   get numCols(): number {

package/src/lib/table/batches/row-table-batch-aggregator.ts

@@ -13,8 +13,8 @@ export class RowTableBatchAggregator implements TableBatchAggregator {
   options: TableBatchOptions;
 
   length: number = 0;
-  objectRows: {[columnName: string]: any} | null = null;
-  arrayRows: any[] | null = null;
+  objectRows: {[columnName: string]: unknown}[] | null = null;
+  arrayRows: unknown[][] | null = null;
   cursor: number = 0;
   private _headers: string[] = [];
 

package/src/lib/table/simple-table/convert-table.ts

@@ -5,10 +5,57 @@ import {
   getTableRowAsArray,
   getTableRowAsObject
 } from './table-accessors';
-import {Table, ArrayRowTable, ObjectRowTable, ColumnarTable} from '../../../types/category-table';
+import {
+  Table,
+  ArrayRowTable,
+  ObjectRowTable,
+  ColumnarTable,
+  ArrowTable
+} from '../../../types/category-table';
 import {deduceTableSchema} from './table-schema';
 import {makeColumnFromField} from './table-column';
 
+export function convertTable(table: Table, shape: 'object-row-table'): ObjectRowTable;
+export function convertTable(table: Table, shape: 'array-row-table'): ArrayRowTable;
+export function convertTable(table: Table, shape: 'columnar-table'): ColumnarTable;
+export function convertTable(table: Table, shape: 'arrow-table'): ArrowTable;
+
+/**
+ * Convert a table to a different shape
+ * @param table
+ * @param shape
+ * @returns
+ */
+export function convertTable(
+  table: Table,
+  shape: 'object-row-table' | 'array-row-table' | 'columnar-table' | 'arrow-table'
+) {
+  switch (shape) {
+    case 'object-row-table':
+      return makeObjectRowTable(table);
+    case 'array-row-table':
+      return makeArrayRowTable(table);
+    case 'columnar-table':
+      return makeColumnarTable(table);
+    case 'arrow-table':
+      return makeArrowTable(table);
+    default:
+      throw new Error(shape);
+  }
+}
+
+/**
+ * Convert a table to apache arrow format
+ * @note this depends on the `@loaders.gl/arrow module being imported
+ */
+export function makeArrowTable(table: Table): Table {
+  const _makeArrowTable = globalThis.__luma?._makeArrowTable;
+  if (!_makeArrowTable) {
+    throw new Error('');
+  }
+  return _makeArrowTable(table);
+}
+
 /** Convert any simple table into columnar format */
 export function makeColumnarTable(table: Table): ColumnarTable {
   // TODO - should schema really be optional?
@@ -70,3 +117,28 @@ export function makeObjectRowTable(table: Table): ObjectRowTable {
     data
   };
 }
+
+/**
+/**
+ *
+ * @note - should be part of schema module
+export function convertColumnarToRowFormatTable(columnarTable: ColumnarTable): ObjectRowTable {
+  const tableKeys = ;
+  const tableRowsCount = columnarTable[tableKeys[0]].length;
+
+  const objectRows: ObjectRowTable['data'] = [];
+
+  for (let index = 0; index < tableRowsCount; index++) {
+    const objectRow = {};
+    for (const fieldName of Object.keys(columnarTable.data)) {
+      objectRow[fieldName] = columnarTable[fieldName][index];
+    }
+    objectRows.push(objectRow);
+  }
+
+  return {
+    shape: 'object-row-table',
+    data: objectRows
+  };
+}
+ */

package/src/lib/table/simple-table/table-accessors.ts

@@ -11,11 +11,14 @@ export function getTableLength(table: Table): number {
   switch (table.shape) {
     case 'array-row-table':
     case 'object-row-table':
-    case 'geojson-row-table':
       return table.data.length;
 
+    case 'geojson-table':
+      return table.features.length;
+
     case 'arrow-table':
-      return table.data.numRows;
+      const arrowTable = table.data as any;
+      return arrowTable.numRows;
 
     case 'columnar-table':
       for (const column of Object.values(table.data)) {
@@ -42,14 +45,14 @@ export function getTableNumCols(table: Table): number {
     case 'array-row-table':
       return table.data[0].length;
     case 'object-row-table':
-    case 'geojson-row-table':
       return Object.keys(table.data[0]).length;
-
+    case 'geojson-table':
+      return Object.keys(table.features[0]).length;
     case 'columnar-table':
       return Object.keys(table.data).length;
-
     case 'arrow-table':
-      return table.data.numCols;
+      const arrowTable = table.data as any;
+      return arrowTable.numCols;
     default:
       throw new Error('table');
   }
@@ -63,18 +66,21 @@ export function getTableCell(table: Table, rowIndex: number, columnName: string)
       return table.data[rowIndex][columnIndex];
 
     case 'object-row-table':
-    case 'geojson-row-table':
       return table.data[rowIndex][columnName];
 
+    case 'geojson-table':
+      return table.features[rowIndex][columnName];
+
     case 'columnar-table':
       const column = table.data[columnName];
       return column[rowIndex];
 
     case 'arrow-table':
-      const arrowColumnIndex = table.data.schema.fields.findIndex(
+      const arrowTable = table.data as any;
+      const arrowColumnIndex = arrowTable.schema.fields.findIndex(
         (field) => field.name === columnName
       );
-      return table.data.getChildAt(arrowColumnIndex)?.get(rowIndex);
+      return arrowTable.getChildAt(arrowColumnIndex)?.get(rowIndex);
 
     default:
       throw new Error('todo');
@@ -88,17 +94,21 @@ export function getTableCellAt(table: Table, rowIndex: number, columnIndex: numb
       return table.data[rowIndex][columnIndex];
 
     case 'object-row-table':
-    case 'geojson-row-table':
-      let columnName = getTableColumnName(table, columnIndex);
-      return table.data[rowIndex][columnName];
+      const columnName1 = getTableColumnName(table, columnIndex);
+      return table.data[rowIndex][columnName1];
+
+    case 'geojson-table':
+      const columnName2 = getTableColumnName(table, columnIndex);
+      return table.features[rowIndex][columnName2];
 
     case 'columnar-table':
-      columnName = getTableColumnName(table, columnIndex);
-      const column = table.data[columnName];
+      const columnName3 = getTableColumnName(table, columnIndex);
+      const column = table.data[columnName3];
       return column[rowIndex];
 
     case 'arrow-table':
-      return table.data.getChildAt(columnIndex)?.get(rowIndex);
+      const arrowTable = table.data as any;
+      return arrowTable.getChildAt(columnIndex)?.get(rowIndex);
 
     default:
       throw new Error('todo');
@@ -112,7 +122,8 @@ export function getTableRowShape(table: Table): 'array-row-table' | 'object-row-
     case 'object-row-table':
       return table.shape;
 
-    case 'geojson-row-table':
+    case 'geojson-table':
+      // TODO - this is not correct, geojson-table is not a row table
       return 'object-row-table';
 
     case 'columnar-table':
@@ -156,7 +167,6 @@ export function getTableRowAsObject(
       return copy ? Object.fromEntries(Object.entries(table.data[rowIndex])) : table.data[rowIndex];
 
     case 'array-row-table':
-    case 'geojson-row-table':
       if (table.schema) {
         const objectRow: {[columnName: string]: unknown} = target || {};
         for (let i = 0; i < table.schema.fields.length; i++) {
@@ -166,6 +176,17 @@ export function getTableRowAsObject(
       }
       throw new Error('no schema');
 
+    case 'geojson-table':
+      if (table.schema) {
+        const objectRow: {[columnName: string]: unknown} = target || {};
+        // TODO - should lift properties to top level
+        for (let i = 0; i < table.schema.fields.length; i++) {
+          objectRow[table.schema.fields[i].name] = table.features[rowIndex][i];
+        }
+        return objectRow;
+      }
+      throw new Error('no schema');
+
     case 'columnar-table':
       if (table.schema) {
         const objectRow: {[columnName: string]: unknown} = target || {};
@@ -184,9 +205,10 @@ export function getTableRowAsObject(
       }
 
     case 'arrow-table':
+      const arrowTable = table.data as any;
       const objectRow: {[columnName: string]: unknown} = target || {};
-      const row = table.data.get(rowIndex);
-      const schema = table.data.schema;
+      const row = arrowTable.get(rowIndex);
+      const schema = arrowTable.schema;
       for (let i = 0; i < schema.fields.length; i++) {
         objectRow[schema.fields[i].name] = row?.[schema.fields[i].name];
       }
@@ -214,7 +236,6 @@ export function getTableRowAsArray(
       return copy ? Array.from(table.data[rowIndex]) : table.data[rowIndex];
 
     case 'object-row-table':
-    case 'geojson-row-table':
       if (table.schema) {
         const arrayRow: unknown[] = target || [];
         for (let i = 0; i < table.schema.fields.length; i++) {
@@ -225,6 +246,18 @@ export function getTableRowAsArray(
       // Warning: just slap on the values, this risks mismatches between rows
       return Object.values(table.data[rowIndex]);
 
+    case 'geojson-table':
+      if (table.schema) {
+        const arrayRow: unknown[] = target || [];
+        // TODO - should lift properties to top level
+        for (let i = 0; i < table.schema.fields.length; i++) {
+          arrayRow[i] = table.features[rowIndex][table.schema.fields[i].name];
+        }
+        return arrayRow;
+      }
+      // Warning: just slap on the values, this risks mismatches between rows
+      return Object.values(table.features[rowIndex]);
+
     case 'columnar-table':
       if (table.schema) {
         const arrayRow: unknown[] = target || [];
@@ -244,9 +277,10 @@ export function getTableRowAsArray(
       }
 
     case 'arrow-table':
+      const arrowTable = table.data as any;
       const arrayRow: unknown[] = target || [];
-      const row = table.data.get(rowIndex);
-      const schema = table.data.schema;
+      const row = arrowTable.get(rowIndex);
+      const schema = arrowTable.schema;
       for (let i = 0; i < schema.fields.length; i++) {
         arrayRow[i] = row?.[schema.fields[i].name];
       }

package/src/types/batch.ts

@@ -0,0 +1,41 @@
+// loaders.gl, MIT license
+
+import {Schema} from './schema';
+import type {RecordBatch} from 'apache-arrow';
+
+/**
+ * A batch of data (or metadata/schema), from a streaming loader
+ * @see parseInBatches()
+ * @see loadInBatches()
+ */
+export type Batch = {
+  /** A batch can contain metadata, data, or in case of unstructured data (JSON) */
+  batchType: 'data' | 'metadata' | 'partial-result' | 'final-result';
+  /** A string identifying the shape of data in this batch (table, etc) */
+  shape: string;
+  /** Schema of the data in this batch */
+  schema?: Schema;
+  /** Data in this batch */
+  data: unknown;
+  /**  If this is an arrow table. @deprecated Use `data` */
+  recordBatch?: RecordBatch;
+  /** Length of data in this batch */
+  length: number;
+
+  /** A count of batches received */
+  batch?: number;
+
+  /** A count of batches received */
+  count?: number;
+
+  /** Bytes used so far */
+  bytesUsed?: number;
+  /** cursor is the  */
+  cursor?: number;
+
+  /** MIME type of the data generating this batch */
+  mimeType?: string;
+
+  /** Any other data */
+  [key: string]: unknown;
+};

package/src/types/binary-geometries.ts

@@ -0,0 +1,62 @@
+// GIS
+import type {TypedArray} from './types';
+
+// BINARY FORMAT GEOMETRY
+
+export type BinaryAttribute = {value: TypedArray; size: number};
+export type BinaryGeometryType = 'Point' | 'LineString' | 'Polygon';
+
+type NumericProps = {[key: string]: BinaryAttribute};
+type Properties = object[];
+
+/**
+ * Represent a single Geometry, similar to a GeoJSON Geometry
+ */
+export type BinaryGeometry = BinaryPointGeometry | BinaryLineGeometry | BinaryPolygonGeometry;
+
+/** Binary point geometry: an array of positions */
+export type BinaryPointGeometry = {
+  type: 'Point';
+  positions: BinaryAttribute;
+};
+
+/** Binary line geometry, array of positions and indices to the start of each line */
+export type BinaryLineGeometry = {
+  type: 'LineString';
+  positions: BinaryAttribute;
+  pathIndices: BinaryAttribute;
+};
+
+/** Binary polygon geometry, an array of positions to each primitite polygon and polygon */
+export type BinaryPolygonGeometry = {
+  type: 'Polygon';
+  positions: BinaryAttribute;
+  polygonIndices: BinaryAttribute;
+  primitivePolygonIndices: BinaryAttribute;
+  triangles?: BinaryAttribute;
+};
+
+/** Common properties for binary geometries */
+export type BinaryProperties = {
+  featureIds: BinaryAttribute;
+  globalFeatureIds: BinaryAttribute;
+  numericProps: NumericProps;
+  properties: Properties;
+  fields?: Properties;
+};
+
+/** Binary feature + binary attributes */
+export type BinaryFeature = BinaryPointFeature | BinaryLineFeature | BinaryPolygonFeature;
+
+export type BinaryPointFeature = BinaryPointGeometry & BinaryProperties;
+export type BinaryLineFeature = BinaryLineGeometry & BinaryProperties;
+export type BinaryPolygonFeature = BinaryPolygonGeometry & BinaryProperties;
+
+/**
+ * Represent a collection of Features, similar to a GeoJSON FeatureCollection
+ */
+export type BinaryFeatureCollection = {
+  points?: BinaryPointFeature;
+  lines?: BinaryLineFeature;
+  polygons?: BinaryPolygonFeature;
+};

package/src/types/category-gis.ts

@@ -1,10 +1,6 @@
 // GIS
-import type {TypedArray} from './types';
-import type {Feature, Geometry, Point, LineString, Polygon} from 'geojson';
 
-// GEOJSON FORMAT GEOMETRY
-
-// eslint-disable-next-line import/no-unresolved
+// NORMAL GEOJSON FORMAT GEOMETRY
 export type {
   GeoJSON,
   Feature,
@@ -13,7 +9,7 @@ export type {
   Position,
   GeoJsonProperties
 } from 'geojson';
-// eslint-disable-next-line import/no-unresolved
+
 export type {
   Point,
   MultiPoint,
@@ -24,7 +20,34 @@ export type {
   GeometryCollection
 } from 'geojson';
 
-// Aggregate information for converting GeoJSON into other formats
+// FLAT GEOJSON FORMAT GEOMETRY
+export type {
+  FlatGeometryType,
+  FlatIndexedGeometry,
+  FlatPoint,
+  FlatLineString,
+  FlatPolygon,
+  FlatGeometry,
+  FlatFeature
+} from './flat-geometries';
+
+// BINARY FORMAT GEOMETRY
+export type {
+  BinaryAttribute,
+  BinaryGeometryType,
+  BinaryGeometry,
+  BinaryPointGeometry,
+  BinaryLineGeometry,
+  BinaryPolygonGeometry,
+  BinaryProperties,
+  BinaryFeatureCollection,
+  BinaryFeature,
+  BinaryPointFeature,
+  BinaryLineFeature,
+  BinaryPolygonFeature
+} from './binary-geometries';
+
+/** Aggregate information for converting GeoJSON into other formats */
 export type GeojsonGeometryInfo = {
   coordLength: number;
   pointPositionsCount: number;
@@ -37,100 +60,3 @@ export type GeojsonGeometryInfo = {
   polygonRingsCount: number;
   polygonFeaturesCount: number;
 };
-
-// FLAT GEOJSON FORMAT GEOMETRY
-export type FlatGeometryType = 'Point' | 'LineString' | 'Polygon';
-type RemoveCoordinatesField<Type> = {
-  [Property in keyof Type as Exclude<Property, 'coordinates'>]: Type[Property];
-};
-
-/**
- * Generic flat geometry data storage type
- */
-export type FlatIndexedGeometry = {
-  data: number[];
-  indices: number[];
-};
-
-/**
- * GeoJSON (Multi)Point geometry with coordinate data flattened into `data` array and indexed by `indices`
- */
-export type FlatPoint = RemoveCoordinatesField<Point> & FlatIndexedGeometry;
-
-/**
- * GeoJSON (Multi)LineString geometry with coordinate data flattened into `data` array and indexed by `indices`
- */
-export type FlatLineString = RemoveCoordinatesField<LineString> & FlatIndexedGeometry;
-
-/**
- * GeoJSON (Multi)Polygon geometry with coordinate data flattened into `data` array and indexed by 2D `indices`
- */
-export type FlatPolygon = RemoveCoordinatesField<Polygon> & {
-  data: number[];
-  indices: number[][];
-  areas: number[][];
-};
-
-export type FlatGeometry = FlatPoint | FlatLineString | FlatPolygon;
-
-type FlattenGeometry<Type> = {
-  [Property in keyof Type]: Type[Property] extends Geometry ? FlatGeometry : Type[Property];
-};
-
-/**
- * GeoJSON Feature with Geometry replaced by FlatGeometry
- */
-export type FlatFeature = FlattenGeometry<Feature>;
-
-// BINARY FORMAT GEOMETRY
-
-export type BinaryAttribute = {value: TypedArray; size: number};
-export type BinaryGeometryType = 'Point' | 'LineString' | 'Polygon';
-
-type NumericProps = {[key: string]: BinaryAttribute};
-type Properties = object[];
-
-/**
- * Represent a single Geometry, similar to a GeoJSON Geometry
- */
-export type BinaryGeometry = BinaryPointGeometry | BinaryLineGeometry | BinaryPolygonGeometry;
-
-export type BinaryPointGeometry = {
-  type: 'Point';
-  positions: BinaryAttribute;
-};
-
-export type BinaryLineGeometry = {
-  type: 'LineString';
-  positions: BinaryAttribute;
-  pathIndices: BinaryAttribute;
-};
-
-export type BinaryPolygonGeometry = {
-  type: 'Polygon';
-  positions: BinaryAttribute;
-  polygonIndices: BinaryAttribute;
-  primitivePolygonIndices: BinaryAttribute;
-  triangles?: BinaryAttribute;
-};
-
-export type BinaryProperties = {
-  featureIds: BinaryAttribute;
-  globalFeatureIds: BinaryAttribute;
-  numericProps: NumericProps;
-  properties: Properties;
-  fields?: Properties;
-};
-
-export type BinaryPointFeatures = BinaryPointGeometry & BinaryProperties;
-export type BinaryLineFeatures = BinaryLineGeometry & BinaryProperties;
-export type BinaryPolygonFeatures = BinaryPolygonGeometry & BinaryProperties;
-
-/**
- * Represent a collection of Features, similar to a GeoJSON FeatureCollection
- */
-export type BinaryFeatures = {
-  points?: BinaryPointFeatures;
-  lines?: BinaryLineFeatures;
-  polygons?: BinaryPolygonFeatures;
-};

package/src/types/category-image.ts

@@ -11,7 +11,7 @@ export type ImageDataType = {
 /**
  * Supported Image Types
  */
-export type ImageType = ImageBitmap | typeof Image | ImageDataType;
+export type ImageType = ImageBitmap | ImageDataType | HTMLImageElement;
 
 /**
  * Image type string used to control or determine the type of images returned from ImageLoader