landxml 0.6.1 → 0.6.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # landxml
 
+## 0.6.3
+
+### Patch Changes
+
+- e25e54b: bugfix: Parsing large LandXMLs now correctly parses on web workers
+
+## 0.6.2
+
+### Patch Changes
+
+- 0ce99bd: optimized surface outline identification
+
 ## 0.6.1
 
 ### Patch Changes

package/dist/index.js

@@ -150,26 +150,43 @@ var import_xml_js = __toESM(require("xml-js"));
 var surfaceDefWorker = (0, import_easy_web_worker.createEasyWebWorker)(
   ({ onMessage }) => {
     onMessage((message) => {
-      const { isPoint, arr, idMap } = message.payload;
-      if (isPoint) {
-        message.resolve(
-          arr.map((pt) => [pt.attr.id, pt.content.split(" ").map(Number)]).map((v) => [v[0], [v[1][1], v[1][0], v[1][2]]])
-        );
-      } else {
-        message.resolve(
-          arr.flatMap((f) => {
-            var _a;
-            if (typeof f === "string")
-              return [f.split(" ").map((id) => idMap == null ? void 0 : idMap.indexOf(id))];
-            if (((_a = f == null ? void 0 : f.attr) == null ? void 0 : _a.i) === "1")
-              return [];
-            return [f.content.split(" ").map((id) => idMap == null ? void 0 : idMap.indexOf(id))];
-          })
-        );
+      try {
+        const { task } = message.payload;
+        if (task === "parse-surface-points") {
+          const { points } = message.payload;
+          message.resolve(
+            points.map((pt) => [pt.attr.id, pt.content.split(" ").map(Number)]).map((v) => [v[0], [v[1][1], v[1][0], v[1][2]]])
+          );
+        } else if (task === "parse-surface-faces") {
+          const { faces, idMap } = message.payload;
+          message.resolve(
+            faces.flatMap((f) => {
+              var _a;
+              if (typeof f === "string")
+                return [f.split(" ").map((id) => idMap == null ? void 0 : idMap.indexOf(id))];
+              if (((_a = f == null ? void 0 : f.attr) == null ? void 0 : _a.i) === "1")
+                return [];
+              return [f.content.split(" ").map((id) => idMap == null ? void 0 : idMap.indexOf(id))];
+            })
+          );
+        } else if (task === "find-neighboring-faces") {
+          const { faces, range: { start, end } } = message.payload;
+          const faceNeighbors = [];
+          for (let i = start; i < end; i++) {
+            const sourceFace = faces[i];
+            const neighborA = faces.findIndex((f, j) => f.findIndex((v) => v === sourceFace[0]) >= 0 && f.findIndex((v) => v === sourceFace[1]) >= 0 && j !== i);
+            const neighborB = faces.findIndex((f, j) => f.findIndex((v) => v === sourceFace[1]) >= 0 && f.findIndex((v) => v === sourceFace[2]) >= 0 && j !== i);
+            const neighborC = faces.findIndex((f, j) => f.findIndex((v) => v === sourceFace[0]) >= 0 && f.findIndex((v) => v === sourceFace[2]) >= 0 && j !== i);
+            faceNeighbors.push([neighborA, neighborB, neighborC]);
+          }
+          message.resolve(faceNeighbors);
+        }
+      } catch (e) {
+        message.reject(e);
       }
     });
   },
-  { maxWorkers: 10 }
+  { maxWorkers: 16 }
 );
 var parseXML = (xmlString) => __async(void 0, null, function* () {
   return new Promise((resolve, reject) => __async(void 0, null, function* () {
@@ -197,21 +214,22 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
           const Faces = surface.Definition.Faces.F;
           let ptsIdArray = [];
           let faces = [];
+          let faceNeighbors = [];
           if (Pnts.length > 1e4) {
             const sliceIndexes = [...Array(20).keys()].map((i) => Math.round(Pnts.length / 20 * i));
             ptsIdArray = (yield Promise.all(
               sliceIndexes.map(
                 (v, i, a) => new Promise((resolve3, reject3) => __async(void 0, null, function* () {
                   const pts = yield surfaceDefWorker.send({
-                    isPoint: true,
-                    arr: Pnts.slice(a[i], a[i + 1] || Pnts.length)
+                    task: "parse-surface-points",
+                    points: Pnts.slice(a[i], a[i + 1] || Pnts.length)
                   });
                   resolve3(pts);
                 }))
               )
             )).reduce((prev, curr) => [...prev, ...curr], []);
           } else {
-            ptsIdArray = yield surfaceDefWorker.send({ arr: Pnts, isPoint: true });
+            ptsIdArray = yield surfaceDefWorker.send({ task: "parse-surface-points", points: Pnts });
           }
           const points = ptsIdArray.map((v) => v[1]);
           const pointsIdMap = ptsIdArray.map((v) => v[0]);
@@ -221,8 +239,8 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
               sliceIndexes.map(
                 (v, i, a) => new Promise((resolve3, reject3) => __async(void 0, null, function* () {
                   const fcs = yield surfaceDefWorker.send({
-                    isPoint: false,
-                    arr: Faces.slice(a[i], a[i + 1] || Faces.length),
+                    task: "parse-surface-faces",
+                    faces: Faces.slice(a[i], a[i + 1] || Faces.length),
                     idMap: pointsIdMap
                   });
                   resolve3(fcs);
@@ -230,7 +248,38 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
               )
             )).reduce((prev, curr) => [...prev, ...curr], []);
           } else {
-            faces = yield surfaceDefWorker.send({ arr: Faces, isPoint: false, idMap: pointsIdMap });
+            faces = yield surfaceDefWorker.send({
+              task: "parse-surface-faces",
+              faces: Faces,
+              idMap: pointsIdMap
+            });
+          }
+          if (Faces.length > 1e4) {
+            const sliceIndexes = [...Array(20).keys()].map((i) => Math.round((faces.length - 1) / 20 * i));
+            faceNeighbors = (yield Promise.all(
+              sliceIndexes.map(
+                (v, i, a) => new Promise((resolve3, reject3) => __async(void 0, null, function* () {
+                  const fcs = yield surfaceDefWorker.send({
+                    task: "find-neighboring-faces",
+                    faces,
+                    range: {
+                      start: a[i],
+                      end: a[i + 1] || faces.length
+                    }
+                  });
+                  resolve3(fcs);
+                }))
+              )
+            )).reduce((prev, curr) => [...prev, ...curr], []);
+          } else {
+            faceNeighbors = yield surfaceDefWorker.send({
+              task: "find-neighboring-faces",
+              faces,
+              range: {
+                start: 0,
+                end: faces.length - 1
+              }
+            });
           }
           resolve2({
             sourceFile,
@@ -240,7 +289,8 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
             wktString,
             surfaceDefinition: {
               points,
-              faces
+              faces,
+              faceNeighbors
             }
           });
         }));
@@ -478,39 +528,21 @@ var get_contours_default = getContours;
 
 // src/private/get-outline.ts
 var getOutline = (surface) => {
-  const triangleVertexIdEdgePairs = [];
-  let i = -1;
-  let pairs = [];
-  surface.surfaceDefinition.faces.forEach((f) => {
-    pairs = [];
-    [
-      [f[0], f[1]],
-      [f[1], f[2]],
-      [f[2], f[0]]
-    ].forEach(([a, b]) => {
-      if (a < b) {
-        pairs.push(`${a};${b}`);
-      } else {
-        pairs.push(`${b};${a}`);
-      }
-    });
-    pairs.forEach((pair) => {
-      i = triangleVertexIdEdgePairs.indexOf(pair);
-      if (i >= 0) {
-        triangleVertexIdEdgePairs.splice(i, 1);
-      } else {
-        triangleVertexIdEdgePairs.push(pair);
-      }
-    });
+  const vertexIndexPairEdges = [];
+  surface.surfaceDefinition.faces.forEach((f, i) => {
+    const neighbors = surface.surfaceDefinition.faceNeighbors[i];
+    if (neighbors[0] === -1)
+      vertexIndexPairEdges.push([f[0], f[1]]);
+    if (neighbors[1] === -1)
+      vertexIndexPairEdges.push([f[1], f[2]]);
+    if (neighbors[2] === -1)
+      vertexIndexPairEdges.push([f[0], f[2]]);
   });
   const edges = [];
-  triangleVertexIdEdgePairs.map((pair) => {
-    const [v1, v2] = pair.split(";").map((v) => {
-      var _a;
-      return (_a = surface.surfaceDefinition.points[parseInt(v, 10)]) == null ? void 0 : _a.slice(0, 2);
-    });
-    if (v1 && v2)
-      edges.push([v1, v2]);
+  vertexIndexPairEdges.map((pair) => {
+    const [v1, v2] = pair.map((vertexIndex) => surface.surfaceDefinition.points[vertexIndex]);
+    if (typeof v1 !== "undefined" && typeof v2 !== "undefined")
+      edges.push([v1.slice(0, 2), v2.slice(0, 2)]);
   });
   return constructGeojson([{ elevation: 0, polylines: linesToPolyLines(edges) }]);
 };

package/dist/index.mjs

@@ -115,26 +115,43 @@ import convert from "xml-js";
 var surfaceDefWorker = createEasyWebWorker(
   ({ onMessage }) => {
     onMessage((message) => {
-      const { isPoint, arr, idMap } = message.payload;
-      if (isPoint) {
-        message.resolve(
-          arr.map((pt) => [pt.attr.id, pt.content.split(" ").map(Number)]).map((v) => [v[0], [v[1][1], v[1][0], v[1][2]]])
-        );
-      } else {
-        message.resolve(
-          arr.flatMap((f) => {
-            var _a;
-            if (typeof f === "string")
-              return [f.split(" ").map((id) => idMap == null ? void 0 : idMap.indexOf(id))];
-            if (((_a = f == null ? void 0 : f.attr) == null ? void 0 : _a.i) === "1")
-              return [];
-            return [f.content.split(" ").map((id) => idMap == null ? void 0 : idMap.indexOf(id))];
-          })
-        );
+      try {
+        const { task } = message.payload;
+        if (task === "parse-surface-points") {
+          const { points } = message.payload;
+          message.resolve(
+            points.map((pt) => [pt.attr.id, pt.content.split(" ").map(Number)]).map((v) => [v[0], [v[1][1], v[1][0], v[1][2]]])
+          );
+        } else if (task === "parse-surface-faces") {
+          const { faces, idMap } = message.payload;
+          message.resolve(
+            faces.flatMap((f) => {
+              var _a;
+              if (typeof f === "string")
+                return [f.split(" ").map((id) => idMap == null ? void 0 : idMap.indexOf(id))];
+              if (((_a = f == null ? void 0 : f.attr) == null ? void 0 : _a.i) === "1")
+                return [];
+              return [f.content.split(" ").map((id) => idMap == null ? void 0 : idMap.indexOf(id))];
+            })
+          );
+        } else if (task === "find-neighboring-faces") {
+          const { faces, range: { start, end } } = message.payload;
+          const faceNeighbors = [];
+          for (let i = start; i < end; i++) {
+            const sourceFace = faces[i];
+            const neighborA = faces.findIndex((f, j) => f.findIndex((v) => v === sourceFace[0]) >= 0 && f.findIndex((v) => v === sourceFace[1]) >= 0 && j !== i);
+            const neighborB = faces.findIndex((f, j) => f.findIndex((v) => v === sourceFace[1]) >= 0 && f.findIndex((v) => v === sourceFace[2]) >= 0 && j !== i);
+            const neighborC = faces.findIndex((f, j) => f.findIndex((v) => v === sourceFace[0]) >= 0 && f.findIndex((v) => v === sourceFace[2]) >= 0 && j !== i);
+            faceNeighbors.push([neighborA, neighborB, neighborC]);
+          }
+          message.resolve(faceNeighbors);
+        }
+      } catch (e) {
+        message.reject(e);
       }
     });
   },
-  { maxWorkers: 10 }
+  { maxWorkers: 16 }
 );
 var parseXML = (xmlString) => __async(void 0, null, function* () {
   return new Promise((resolve, reject) => __async(void 0, null, function* () {
@@ -162,21 +179,22 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
           const Faces = surface.Definition.Faces.F;
           let ptsIdArray = [];
           let faces = [];
+          let faceNeighbors = [];
           if (Pnts.length > 1e4) {
             const sliceIndexes = [...Array(20).keys()].map((i) => Math.round(Pnts.length / 20 * i));
             ptsIdArray = (yield Promise.all(
               sliceIndexes.map(
                 (v, i, a) => new Promise((resolve3, reject3) => __async(void 0, null, function* () {
                   const pts = yield surfaceDefWorker.send({
-                    isPoint: true,
-                    arr: Pnts.slice(a[i], a[i + 1] || Pnts.length)
+                    task: "parse-surface-points",
+                    points: Pnts.slice(a[i], a[i + 1] || Pnts.length)
                   });
                   resolve3(pts);
                 }))
               )
             )).reduce((prev, curr) => [...prev, ...curr], []);
           } else {
-            ptsIdArray = yield surfaceDefWorker.send({ arr: Pnts, isPoint: true });
+            ptsIdArray = yield surfaceDefWorker.send({ task: "parse-surface-points", points: Pnts });
           }
           const points = ptsIdArray.map((v) => v[1]);
           const pointsIdMap = ptsIdArray.map((v) => v[0]);
@@ -186,8 +204,8 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
               sliceIndexes.map(
                 (v, i, a) => new Promise((resolve3, reject3) => __async(void 0, null, function* () {
                   const fcs = yield surfaceDefWorker.send({
-                    isPoint: false,
-                    arr: Faces.slice(a[i], a[i + 1] || Faces.length),
+                    task: "parse-surface-faces",
+                    faces: Faces.slice(a[i], a[i + 1] || Faces.length),
                     idMap: pointsIdMap
                   });
                   resolve3(fcs);
@@ -195,7 +213,38 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
               )
             )).reduce((prev, curr) => [...prev, ...curr], []);
           } else {
-            faces = yield surfaceDefWorker.send({ arr: Faces, isPoint: false, idMap: pointsIdMap });
+            faces = yield surfaceDefWorker.send({
+              task: "parse-surface-faces",
+              faces: Faces,
+              idMap: pointsIdMap
+            });
+          }
+          if (Faces.length > 1e4) {
+            const sliceIndexes = [...Array(20).keys()].map((i) => Math.round((faces.length - 1) / 20 * i));
+            faceNeighbors = (yield Promise.all(
+              sliceIndexes.map(
+                (v, i, a) => new Promise((resolve3, reject3) => __async(void 0, null, function* () {
+                  const fcs = yield surfaceDefWorker.send({
+                    task: "find-neighboring-faces",
+                    faces,
+                    range: {
+                      start: a[i],
+                      end: a[i + 1] || faces.length
+                    }
+                  });
+                  resolve3(fcs);
+                }))
+              )
+            )).reduce((prev, curr) => [...prev, ...curr], []);
+          } else {
+            faceNeighbors = yield surfaceDefWorker.send({
+              task: "find-neighboring-faces",
+              faces,
+              range: {
+                start: 0,
+                end: faces.length - 1
+              }
+            });
           }
           resolve2({
             sourceFile,
@@ -205,7 +254,8 @@ var parseXML = (xmlString) => __async(void 0, null, function* () {
             wktString,
             surfaceDefinition: {
               points,
-              faces
+              faces,
+              faceNeighbors
             }
           });
         }));
@@ -443,39 +493,21 @@ var get_contours_default = getContours;
 
 // src/private/get-outline.ts
 var getOutline = (surface) => {
-  const triangleVertexIdEdgePairs = [];
-  let i = -1;
-  let pairs = [];
-  surface.surfaceDefinition.faces.forEach((f) => {
-    pairs = [];
-    [
-      [f[0], f[1]],
-      [f[1], f[2]],
-      [f[2], f[0]]
-    ].forEach(([a, b]) => {
-      if (a < b) {
-        pairs.push(`${a};${b}`);
-      } else {
-        pairs.push(`${b};${a}`);
-      }
-    });
-    pairs.forEach((pair) => {
-      i = triangleVertexIdEdgePairs.indexOf(pair);
-      if (i >= 0) {
-        triangleVertexIdEdgePairs.splice(i, 1);
-      } else {
-        triangleVertexIdEdgePairs.push(pair);
-      }
-    });
+  const vertexIndexPairEdges = [];
+  surface.surfaceDefinition.faces.forEach((f, i) => {
+    const neighbors = surface.surfaceDefinition.faceNeighbors[i];
+    if (neighbors[0] === -1)
+      vertexIndexPairEdges.push([f[0], f[1]]);
+    if (neighbors[1] === -1)
+      vertexIndexPairEdges.push([f[1], f[2]]);
+    if (neighbors[2] === -1)
+      vertexIndexPairEdges.push([f[0], f[2]]);
   });
   const edges = [];
-  triangleVertexIdEdgePairs.map((pair) => {
-    const [v1, v2] = pair.split(";").map((v) => {
-      var _a;
-      return (_a = surface.surfaceDefinition.points[parseInt(v, 10)]) == null ? void 0 : _a.slice(0, 2);
-    });
-    if (v1 && v2)
-      edges.push([v1, v2]);
+  vertexIndexPairEdges.map((pair) => {
+    const [v1, v2] = pair.map((vertexIndex) => surface.surfaceDefinition.points[vertexIndex]);
+    if (typeof v1 !== "undefined" && typeof v2 !== "undefined")
+      edges.push([v1.slice(0, 2), v2.slice(0, 2)]);
   });
   return constructGeojson([{ elevation: 0, polylines: linesToPolyLines(edges) }]);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "landxml",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Parse LandXML surfaces on the modern web.",
   "main": "dist/index.js",
   "module": "dist/index.mjs",