rm-graphical-computing-node 1.0.41 → 1.0.43

package/dist/index.mjs

@@ -4641,8 +4641,6 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
             let afterDoorLen = doorTmpEd.distanceTo(doorTmpSt);
             if (afterDoorLen < 0.4 && !isDoor || afterDoorLen < 0.3 && isDoor)
               continue;
-            if (!findDoorIndexs.includes(index))
-              findDoorIndexs.push(index);
             let dataType = "";
             let doorType = isDoor ? "singleDoor" : "";
             doorType = isPullOutDoor ? "pullOutDoor" : doorType;
@@ -4694,11 +4692,23 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
                 let isPPP = getParallelism(startPt2, endPt2, doorTmpSt, doorTmpEd);
                 if (result && result.maxPerpendicularDistance < 0.5) {
                   if (isPPP && isPPP.isParallel) {
+                    let lineLen = startPt2.distanceTo(endPt2);
+                    let doorLen = doorTmpSt.distanceTo(doorTmpEd);
                     let tmpLine66 = new THREE5.Line3(startPt2, endPt2);
                     let tmpPt66 = new THREE5.Vector3(doorTmpSt.x, doorTmpSt.y, startPt2.z);
                     let ptClose66 = tmpLine66.closestPointToPoint(tmpPt66, true, new THREE5.Vector3());
                     let isPPPP = perpendicularInfo(ptClose66, tmpPt66, doorTmpSt, doorTmpEd);
-                    if (isPPPP && isPPPP.angle > 85) {
+                    if (doorLen > lineLen) {
+                      tmpLine66 = new THREE5.Line3(
+                        new THREE5.Vector3(doorTmpSt.x, doorTmpSt.y, startPt2.z),
+                        new THREE5.Vector3(doorTmpEd.x, doorTmpEd.y, startPt2.z)
+                      );
+                      tmpPt66 = startPt2.clone();
+                      ptClose66 = tmpLine66.closestPointToPoint(tmpPt66, true, new THREE5.Vector3());
+                      isPPPP = perpendicularInfo(ptClose66, tmpPt66, doorTmpSt, doorTmpEd);
+                      [ptClose66, tmpPt66] = [tmpPt66, ptClose66];
+                    }
+                    if (isPPPP && isPPPP.angle > 85 && !wallBelowBeam) {
                       doorAndBeamDataObj.beamNearWallVec = new THREE5.Vector3().subVectors(ptClose66, tmpPt66).normalize();
                       if (doorAndBeamDataObj.beamStart.z > lines[x].rooftopPz - 0.03 && length2 > 1) {
                         wallBelowBeam = true;
@@ -4987,8 +4997,12 @@ var getBeamLine = async (lines, runDataList, pcdData, lineReader, lineEditor, on
             });
             allDoorLines1.push({
               start: doorTmpSt,
-              end: doorTmpEd
+              end: doorTmpEd,
+              index,
+              id: doorAndBeamDataObj.id
             });
+            if (!findDoorIndexs.includes(index))
+              findDoorIndexs.push(index);
             id++;
             if (isPullOutDoor && length2 < 2) break;
           }
@@ -5597,7 +5611,8 @@ function clonePoint(p) {
 }
 
 // src/geometry/colLine.mjs
-var getColLine = (lines, runDataList) => {
+import * as gfx from "rm-gxf-computing-rusts";
+var getColLine = (lines, runDataList, collectDataPath, pointCloudCluster = null) => {
   if (!lines || lines.length <= 0) return;
   let colDatas = {
     rectangles: [],
@@ -5815,6 +5830,7 @@ var getColLine = (lines, runDataList) => {
       continue;
     let colIndexs = {
       uuids: [],
+      rooftopPz: 0,
       missingEdge: {
         start: new THREE6.Vector3(),
         end: new THREE6.Vector3()
@@ -5913,6 +5929,7 @@ var getColLine = (lines, runDataList) => {
         let area2 = length1 * length2;
         if (area2 < minArea || area2 > maxArea) continue;
         colIndexs.uuids = [lines[i].uuid, lines[j].uuid, lines[k].uuid];
+        colIndexs.rooftopPz = Math.max(lines[i].rooftopPz, lines[j].rooftopPz, lines[k].rooftopPz);
         colIndexs.missingEdge.start = nextNextEndPt;
         colIndexs.missingEdge.end = startPt;
         break;
@@ -8814,17 +8831,25 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
             const isMaxBox = compareBoxVolume(obb1, obb2);
             if (type1 !== "wall" && type1 !== "floor" && type1 !== "roof") {
               if (type1 === "window") {
-                if (type2 === "balcony railing" && containsObbPoints(obb1, array2[k].points)) {
-                  array2[k].isDel = true;
-                  continue;
-                }
-                if (type2 === "balcony railing" && containsObbPoints(obb2, array1[e].points)) {
-                  array1[e].isDel = true;
-                  break;
-                }
-                if (type2 === "balcony railing" && checkBundingBox(obb1, obb2, array1[e].points, array2[k].points) && (Math.abs(minz1 - minz2) < 0.1 || Math.abs(minz2 - averagePz3) > 0.3)) {
-                  array2[k].isDel = true;
-                  continue;
+                const size1 = new THREE8.Vector3();
+                obb1.getSize(size1);
+                let maxLen1 = size1.x > size1.y ? size1.x : size1.y;
+                const size2 = new THREE8.Vector3();
+                obb2.getSize(size2);
+                let maxLen2 = size2.x > size2.y ? size2.x : size2.y;
+                if (Math.abs(maxLen1 - maxLen2) < 0.5 || maxLen1 > maxLen2) {
+                  if (type2 === "balcony railing" && containsObbPoints(obb1, array2[k].points)) {
+                    array2[k].isDel = true;
+                    continue;
+                  }
+                  if (type2 === "balcony railing" && containsObbPoints(obb2, array1[e].points)) {
+                    array1[e].isDel = true;
+                    break;
+                  }
+                  if (type2 === "balcony railing" && checkBundingBox(obb1, obb2, array1[e].points, array2[k].points) && (Math.abs(minz1 - minz2) < 0.1 || Math.abs(minz2 - averagePz3) > 0.3)) {
+                    array2[k].isDel = true;
+                    continue;
+                  }
                 }
                 if (type2 === "door" && containsObbPoints(obb1, array2[k].points)) {
                   array2[k].isDel = true;
@@ -8837,17 +8862,25 @@ var getMergeMeaning = (allProjectionResults, averagePz2, pointCloudCluster = nul
                 if (type2 === "window sill")
                   continue;
               } else if (type1 === "balcony railing") {
-                if (type2 === "window" && containsObbPoints(obb1, array2[k].points)) {
-                  array2[k].isDel = true;
-                  continue;
-                }
-                if (type2 === "window" && containsObbPoints(obb2, array1[e].points)) {
-                  array1[e].isDel = true;
-                  break;
-                }
-                if (type2 === "window" && checkBundingBox(obb1, obb2, array1[e].points, array2[k].points) && (Math.abs(minz1 - minz2) < 0.1 || Math.abs(minz1 - averagePz3) > 0.3)) {
-                  array1[e].isDel = true;
-                  break;
+                const size1 = new THREE8.Vector3();
+                obb1.getSize(size1);
+                let maxLen1 = size1.x > size1.y ? size1.x : size1.y;
+                const size2 = new THREE8.Vector3();
+                obb2.getSize(size2);
+                let maxLen2 = size2.x > size2.y ? size2.x : size2.y;
+                if (Math.abs(maxLen1 - maxLen2) < 0.5 || maxLen1 < maxLen2) {
+                  if (type2 === "window" && containsObbPoints(obb1, array2[k].points)) {
+                    array2[k].isDel = true;
+                    continue;
+                  }
+                  if (type2 === "window" && containsObbPoints(obb2, array1[e].points)) {
+                    array1[e].isDel = true;
+                    break;
+                  }
+                  if (type2 === "window" && checkBundingBox(obb1, obb2, array1[e].points, array2[k].points) && (Math.abs(minz1 - minz2) < 0.1 || Math.abs(minz1 - averagePz3) > 0.3)) {
+                    array1[e].isDel = true;
+                    break;
+                  }
                 }
                 if (type2 === "Staircase" && containsObbPoints(obb1, array2[k].points)) {
                   array1[e].isStaircaseBalconyRailing = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rm-graphical-computing-node",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "description": "墙体/梁线/点云语义计算库（依赖 Python 与 three.js）",
   "type": "module",
   "main": "dist/index.mjs",
@@ -21,6 +21,7 @@
     "d3-delaunay": "^6.0.4",
     "geojson-minimum-bounding-rectangle": "^2.0.3",
     "rm-graphical-computing-node": "^1.0.24",
+    "rm-gxf-computing-rusts": "^0.0.61",
     "rm-point-cloud-calculation": "^1.0.4",
     "rm-point-cloud-calculation-napi": "^1.0.9",
     "three": "^0.184.0"