itowns 2.43.2-next.14 → 2.43.2-next.16

package/examples/potree2_25d_map.html

@@ -63,7 +63,7 @@
                 potreeLayer = new itowns.Potree2Layer('Lion', {
                     source: new itowns.Potree2Source({
                         file: 'metadata.json',
-                        url: 'https://blocinbloc-public-test.s3.fr-par.scw.cloud/lion-potree2',
+                        url: 'https://raw.githubusercontent.com/iTowns/iTowns2-sample-data/master/pointclouds/potree2.0/lion',
                         crs: view.referenceCrs,
                     }),
                 });

package/lib/Core/Potree2Node.js

@@ -105,11 +105,16 @@ class Potree2Node extends PointCloudNode {
   }
   networkOptions(byteOffset, byteSize) {
     const first = byteOffset;
+    // When we specify 'multipart/byteranges' on headers request it trigger a preflight request
+    // Actually github doesn't support it https://github.com/orgs/community/discussions/24659
+    // But if we omit header parameter, github seems to know it's a 'multipart/byteranges' request (thanks to 'Range' parameter)
     const networkOptions = {
       ...this.layer.source.networkOptions,
       headers: {
         ...this.layer.source.networkOptions.headers,
-        'content-type': 'multipart/byteranges',
+        ...(this.url.startsWith('https://raw.githubusercontent.com') ? {} : {
+          'content-type': 'multipart/byteranges'
+        }),
         Range: `bytes=${first}-${first + byteSize - 1n}`
       }
     };

package/lib/Parser/LASParser.js

@@ -1,6 +1,23 @@
 import * as THREE from 'three';
-import LASLoader from "../Loader/LASLoader.js";
-const lasLoader = new LASLoader();
+import { spawn, Thread, Transfer } from 'threads';
+let _lazPerf;
+let _thread;
+function workerInstance() {
+  return new Worker( /* webpackChunkName: "itowns_lasparser" */
+  new URL('../Worker/LASLoaderWorker.js', import.meta.url), {
+    type: 'module'
+  });
+}
+async function loader() {
+  if (_thread) {
+    return _thread;
+  }
+  _thread = await spawn(workerInstance());
+  if (_lazPerf) {
+    _thread.lazPerf(_lazPerf);
+  }
+  return _thread;
+}
 function buildBufferGeometry(attributes) {
   const geometry = new THREE.BufferGeometry();
   const positionBuffer = new THREE.BufferAttribute(attributes.position, 3);
@@ -42,7 +59,16 @@ export default {
     if (!path) {
       throw new Error('Path to laz-perf is mandatory');
     }
-    lasLoader.lazPerf = path;
+    _lazPerf = path;
+  },
+  /**
+   * Terminate all worker instances.
+   * @returns {Promise<void>}
+   */
+  terminate() {
+    const currentThread = _thread;
+    _thread = undefined;
+    return Thread.terminate(currentThread);
   },
   /**
    * Parses a chunk of a LAS or LAZ (LASZip) and returns the corresponding
@@ -66,13 +92,18 @@ export default {
    * @return {Promise<THREE.BufferGeometry>} A promise resolving with a
    * `THREE.BufferGeometry`.
    */
-  parseChunk(data) {
+  async parseChunk(data) {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    return lasLoader.parseChunk(data, options.in).then(parsedData => {
-      const geometry = buildBufferGeometry(parsedData.attributes);
-      geometry.computeBoundingBox();
-      return geometry;
+    const lasLoader = await loader();
+    const parsedData = await lasLoader.parseChunk(Transfer(data), {
+      pointCount: options.in.pointCount,
+      header: options.in.header,
+      eb: options.eb,
+      colorDepth: options.in.colorDepth
     });
+    const geometry = buildBufferGeometry(parsedData.attributes);
+    geometry.computeBoundingBox();
+    return geometry;
   },
   /**
    * Parses a LAS file or a LAZ (LASZip) file and return the corresponding
@@ -88,18 +119,19 @@ export default {
    * @return {Promise} A promise resolving with a `THREE.BufferGeometry`. The
    * header of the file is contained in `userData`.
    */
-  parse(data) {
+  async parse(data) {
     let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     if (options.out?.skip) {
       console.warn("Warning: options 'skip' not supported anymore");
     }
-    return lasLoader.parseFile(data, {
-      colorDepth: options.in?.colorDepth
-    }).then(parsedData => {
-      const geometry = buildBufferGeometry(parsedData.attributes);
-      geometry.userData.header = parsedData.header;
-      geometry.computeBoundingBox();
-      return geometry;
+    const input = options.in;
+    const lasLoader = await loader();
+    const parsedData = await lasLoader.parseFile(Transfer(data), {
+      colorDepth: input?.colorDepth
     });
+    const geometry = buildBufferGeometry(parsedData.attributes);
+    geometry.userData.header = parsedData.header;
+    geometry.computeBoundingBox();
+    return geometry;
   }
 };

package/lib/Worker/LASLoaderWorker.js

@@ -0,0 +1,19 @@
+import { expose, Transfer } from 'threads/worker';
+import LASLoader from "../Loader/LASLoader.js";
+const loader = new LASLoader();
+function transferable(attributes) {
+  return Object.values(attributes).filter(ArrayBuffer.isView).map(a => a.buffer);
+}
+expose({
+  lazPerf(path) {
+    loader.lazPerf = path;
+  },
+  async parseChunk(data, options) {
+    const result = await loader.parseChunk(data, options);
+    return Transfer(result, transferable(result.attributes));
+  },
+  async parseFile(data, options) {
+    const result = await loader.parseFile(data, options);
+    return Transfer(result, transferable(result.attributes));
+  }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itowns",
-  "version": "2.43.2-next.14",
+  "version": "2.43.2-next.16",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",