@loaders.gl/las 4.4.0-alpha.1 → 4.4.0-alpha.10

package/src/las-loader.ts

@@ -3,10 +3,9 @@
 // Copyright (c) vis.gl contributors
 
 // LASER (LAS) FILE FORMAT
-import type {Loader, LoaderWithParser, LoaderOptions} from '@loaders.gl/loader-utils';
+import type {Loader, LoaderOptions} from '@loaders.gl/loader-utils';
 import type {LASMesh} from './lib/las-types';
 import {LASFormat} from './las-format';
-import {parseLAS} from './lib/parse-las';
 
 // __VERSION__ is injected by babel-plugin-version-inline
 // @ts-ignore TS2304: Cannot find name '__VERSION__'.
@@ -26,7 +25,6 @@ export type LASLoaderOptions = LoaderOptions & {
 
 /**
  * Loader for the LAS (LASer) point cloud format
- * @note Does not support LAS v1.4
  */
 export const LASWorkerLoader = {
   ...LASFormat,
@@ -34,16 +32,8 @@ export const LASWorkerLoader = {
   dataType: null as unknown as LASMesh,
   batchType: null as never,
 
-  name: 'LAS',
-  id: 'las',
-  module: 'las',
   version: VERSION,
   worker: true,
-  extensions: ['las', 'laz'], // LAZ is the "compressed" flavor of LAS,
-  mimeTypes: ['application/octet-stream'], // TODO - text version?
-  text: true,
-  binary: true,
-  tests: ['LAS'],
   options: {
     las: {
       shape: 'mesh',
@@ -53,15 +43,3 @@ export const LASWorkerLoader = {
     }
   }
 } as const satisfies Loader<LASMesh, never, LASLoaderOptions>;
-
-/**
- * Loader for the LAS (LASer) point cloud format
- * @note Does not support LAS v1.4
- */
-export const LASLoader = {
-  ...LASWorkerLoader,
-  parse: async (arrayBuffer: ArrayBuffer, options?: LASLoaderOptions) =>
-    parseLAS(arrayBuffer, options),
-  parseSync: (arrayBuffer: ArrayBuffer, options?: LASLoaderOptions) =>
-    parseLAS(arrayBuffer, options)
-} as const satisfies LoaderWithParser<LASMesh, never, LASLoaderOptions>;

package/src/laz-rs-loader.ts

@@ -0,0 +1,22 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+// LASER (LAS) FILE FORMAT
+import type {LoaderWithParser} from '@loaders.gl/loader-utils';
+import type {LASLoaderOptions} from './las-loader';
+import {LASWorkerLoader} from './las-loader';
+import type {LASMesh} from './lib/las-types';
+import {parseLAS} from './lib/laz-rs-wasm/parse-las';
+import initLazRsWasm from './libs/laz-rs-wasm/laz_rs_wasm';
+
+/**
+ * Loader for the LAS (LASer) point cloud format
+ */
+export const LAZRsLoader = {
+  ...LASWorkerLoader,
+  parse: async (arrayBuffer: ArrayBuffer, options?: LASLoaderOptions) => {
+    await initLazRsWasm();
+    return parseLAS(arrayBuffer, {...options});
+  }
+} as const satisfies LoaderWithParser<LASMesh, never, LASLoaderOptions>;

package/src/lazperf-loader.ts

@@ -0,0 +1,22 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
+// LASER (LAS) FILE FORMAT
+import type {LoaderWithParser} from '@loaders.gl/loader-utils';
+import type {LASLoaderOptions} from './las-loader';
+import {LASWorkerLoader} from './las-loader';
+import type {LASMesh} from './lib/las-types';
+import {parseLAS} from './lib/laz-perf/parse-las';
+
+/**
+ * Loader for the LAS (LASer) point cloud format
+ * @note Does not support LAS v1.4
+ */
+export const LAZPerfLoader = {
+  ...LASWorkerLoader,
+  parse: async (arrayBuffer: ArrayBuffer, options?: LASLoaderOptions) =>
+    parseLAS(arrayBuffer, options),
+  parseSync: (arrayBuffer: ArrayBuffer, options?: LASLoaderOptions) =>
+    parseLAS(arrayBuffer, options)
+} as const satisfies LoaderWithParser<LASMesh, never, LASLoaderOptions>;

package/src/lib/get-las-schema.ts

@@ -7,7 +7,7 @@ import {deduceMeshSchema} from '@loaders.gl/schema-utils';
 import type {LASHeader} from './las-types';
 
 /**
- * Gets schema from PLY header
+ * Gets schema from LAS header
  * @param lasHeader
  * @param metadata
  * @returns Schema

package/src/lib/las-types.ts

@@ -18,6 +18,7 @@ export type LASHeader = {
   mins?: number[];
   totalToRead: number;
   totalRead: number;
+  hasColor: boolean;
   versionAsString?: string;
   isCompressed?: boolean;
 };

package/src/lib/{laslaz-decoder.ts → laz-perf/laslaz-decoder.ts}

@@ -8,8 +8,8 @@
   MIT License
 */
 // laslaz.js - treat as compiled code
-import type {LASHeader} from './las-types';
-import getModule from './libs/laz-perf';
+import type {LASHeader} from '../las-types';
+import getModule from '../../libs/laz-perf/laz-perf';
 
 let Module: any = null;
 
@@ -130,7 +130,8 @@ class LASLoader {
     totalToRead: 0,
     totalRead: 0,
     versionAsString: '',
-    isCompressed: true
+    isCompressed: true,
+    hasColor: false
   };
 
   constructor(arraybuffer: ArrayBuffer) {

package/src/lib/{parse-las.ts → laz-perf/parse-las.ts}

@@ -4,25 +4,23 @@
 
 // ported and es6-ified from https://github.com/verma/plasio/
 // import type {ArrowTable, ColumnarTable} from '@loaders.gl/schema';
-import type {LASLoaderOptions} from '../las-loader';
-import type {LASMesh, LASHeader} from './las-types';
+import type {LASLoaderOptions} from '../../las-loader';
+import type {LASMesh, LASHeader} from '../las-types';
 import {getMeshBoundingBox /* , convertMeshToTable */} from '@loaders.gl/schema-utils';
+import {getLASSchema} from '../get-las-schema';
 import {LASFile} from './laslaz-decoder';
-import {getLASSchema} from './get-las-schema';
 
 type LASChunk = {
   count: number;
   buffer: ArrayBuffer;
   hasMoreData: boolean;
-  versionAsString?: string;
-  isCompressed?: boolean;
 };
 
 /**
  * Parsing of .las file
  * @param arrayBuffer
  * @param options
- * @returns LASHeader
+ * @returns LASMesh
  */
 export function parseLAS(arrayBuffer: ArrayBuffer, options?: LASLoaderOptions): LASMesh {
   return parseLASMesh(arrayBuffer, options);
@@ -73,7 +71,7 @@ function parseLASMesh(arrayBuffer: ArrayBuffer, options: LASLoaderOptions = {}):
       const PositionsType = options.las?.fp64 ? Float64Array : Float32Array;
       positions = new PositionsType(total * 3);
       // laslaz-decoder.js `pointFormatReaders`
-      colors = lasHeader.pointsFormatId >= 2 ? new Uint8Array(total * 4) : null;
+      colors = lasHeader.hasColor ? new Uint8Array(total * 4) : null;
       intensities = new Uint16Array(total);
       classifications = new Uint8Array(total);
 
@@ -172,13 +170,12 @@ export function parseLASChunked(rawData: ArrayBuffer, skip: number, onParseData:
 
     /* eslint-disable no-constant-condition */
     while (true) {
-      const chunk: LASChunk = dataHandler.readData(1000 * 100, 0, skip);
+      // @ts-ignore TODO - fix this, looks like we are not passing the right params?
+      const chunk: LASChunk = dataHandler.readData(1000 * 100, skip);
 
       totalRead += chunk.count;
 
       header.totalRead = totalRead;
-      header.versionAsString = chunk.versionAsString;
-      header.isCompressed = chunk.isCompressed;
 
       const unpacker = new Unpacker(chunk.buffer, chunk.count, header);