build-dxf 0.1.155 → 0.1.157

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.155",
+  "version": "0.1.157",
   "description": "",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/build.js

@@ -9711,7 +9711,7 @@ class DoubleWallFinder {
    * @returns 
    */
   static find(lines, obstacle = [], esp = 0.4) {
-    lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => WallHole.isBeam(line) ? "beam" : "lines")).handle("lines", (lines2) => {
+    lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (_line) => "lines")).handle("lines", (lines2) => {
       const parallelAxis = lines2[0], verticalAxis = parallelAxis.clone().rotate(Math.PI * 0.5), [group1, group2] = LineSegmentUtils.groupByParallelToAxis(lines2, lines2[0], 5), newLines1 = this.group(group1, parallelAxis, verticalAxis, esp), newLines2 = this.group(group2, verticalAxis, parallelAxis, esp), appendLines = newLines1.concat(newLines2);
       lines2 = lines2.concat(appendLines);
       return lines2;
@@ -22947,12 +22947,71 @@ function beamSupportLine(lines, {}) {
         const line2 = list[0];
         const point2 = line2.projectPoint(center, false);
         line.userData.expansionWidth = point2.distance(center);
-        line.userData.expansionDirction = point2.directionFrom(center);
+        line.userData.expansionDirction = point2.directionFrom(center).toJson2D();
       }
     }
   });
   return lines;
 }
+function roomTest(trajectory2) {
+  return (lines) => {
+    const doubleLines = lines.filter((line) => WH.isDouble(line));
+    if (WH.isPairing(doubleLines)) {
+      return false;
+    }
+    const ply = Polygon.fromByLinePath(lines);
+    if (trajectory2) {
+      let has = Object.keys(trajectory2).some((k) => {
+        const p2 = trajectory2[k];
+        if (ply.pointWithin(p2)) return true;
+        return false;
+      });
+      if (!has) return false;
+    }
+    return true;
+  };
+}
+function findRooms(lines, trajectory2) {
+  lines = lines.map((line) => line.clone());
+  lines = splitIntersectedLine(lines, 0);
+  const rooms = [];
+  const maxiCircles = new MaxiCircles();
+  LineSegmentUtils.groupByPath(lines).forEach((group2) => {
+    const removeSet = findDiscretePointLine2(group2, null, true);
+    lines = group2.filter((line) => !removeSet.has(line) && !line.userData.isBayWindow);
+    const circles = maxiCircles.miniCircle(lines).circles.filter(roomTest(trajectory2));
+    const ploys = circles.map(((p2) => Polygon.fromByLinePath(p2)));
+    ploys.forEach((ploy, i) => {
+      const xList = [];
+      const yList = [];
+      ploy.forEach((p2) => {
+        xList.push(p2.x);
+        yList.push(p2.y);
+      });
+      const minX = Math.min(...xList), maxX = Math.max(...xList), minY = Math.min(...yList), maxY = Math.max(...yList), center = new Point((maxX - minX) * 0.5 + minX, (maxY - minY) * 0.5 + minY);
+      rooms.push({
+        lines: circles[i],
+        ploy,
+        center
+      });
+    });
+  });
+  return rooms;
+}
+function removeRoomSundries(lines, { trajectory: trajectory2 }) {
+  if (trajectory2) {
+    const rooms = findRooms(lines, trajectory2), counterMap = new CounterMap();
+    findDiscretePoint(lines).forEach((l) => counterMap.increment(l));
+    const ls2 = counterMap.getByCount(2), removeLines = ls2.filter((line) => {
+      const center = line.center;
+      return !!rooms.find((room) => {
+        return room.ploy.pointWithin(center) && !room.lines.find((l) => l == line);
+      });
+    }), set2 = new Set(removeLines);
+    lines = lines.filter((line) => !set2.has(line));
+  }
+  return lines;
+}
 const builtinFun = {
   init,
   DoorToHole: doorToHole,
@@ -22975,7 +23034,8 @@ const builtinFun = {
   /** 移除与双线墙链接的短线段
    */
   RemoveShortDoubleWall: removeShortDoubleWall,
-  BeamSupportLine: beamSupportLine
+  BeamSupportLine: beamSupportLine,
+  RemoveRoomSundries: removeRoomSundries
 };
 const TYPE = "LINE";
 class LinePipeline extends Pipeline {
@@ -23466,51 +23526,6 @@ class CorrectionDxf extends Dxf {
     return this.rotateCorrCad?.downloadDxf(filename, unit);
   }
 }
-function roomTest(trajectory2) {
-  return (lines) => {
-    const doubleLines = lines.filter((line) => WH.isDouble(line));
-    if (WH.isPairing(doubleLines)) {
-      return false;
-    }
-    const ply = Polygon.fromByLinePath(lines);
-    if (trajectory2) {
-      let has = Object.keys(trajectory2).some((k) => {
-        const p2 = trajectory2[k];
-        if (ply.pointWithin(p2)) return true;
-        return false;
-      });
-      if (!has) return false;
-    }
-    return true;
-  };
-}
-function findRooms(lines, trajectory2) {
-  lines = lines.map((line) => line.clone());
-  lines = splitIntersectedLine(lines, 0);
-  const rooms = [];
-  const maxiCircles = new MaxiCircles();
-  LineSegmentUtils.groupByPath(lines).forEach((group2) => {
-    const removeSet = findDiscretePointLine2(group2, null, true);
-    lines = group2.filter((line) => !removeSet.has(line) && !line.userData.isBayWindow);
-    const circles = maxiCircles.miniCircle(lines).circles.filter(roomTest(trajectory2));
-    const ploys = circles.map(((p2) => Polygon.fromByLinePath(p2)));
-    ploys.forEach((ploy, i) => {
-      const xList = [];
-      const yList = [];
-      ploy.forEach((p2) => {
-        xList.push(p2.x);
-        yList.push(p2.y);
-      });
-      const minX = Math.min(...xList), maxX = Math.max(...xList), minY = Math.min(...yList), maxY = Math.max(...yList), center = new Point((maxX - minX) * 0.5 + minX, (maxY - minY) * 0.5 + minY);
-      rooms.push({
-        lines: circles[i],
-        ploy,
-        center
-      });
-    });
-  });
-  return rooms;
-}
 class ThreeVJia extends Component {
   static name = "ThreeVJia";
   lineSegments = [];
@@ -23998,7 +24013,7 @@ async function buildJson(opt, dxfSystem2 = new DxfSystem()) {
   dxfSystem2.Dxf.linePipeline.add(LinePipeline.builtin.init).add(LinePipeline.builtin.WallHeightHandle).add(LinePipeline.builtin.DoorToHole);
   doorFind && dxfSystem2.Dxf.linePipeline.add(LinePipeline.builtin.DoorFind);
   if (opt.axisAlignCorr !== false) {
-    dxfSystem2.Dxf.linePipeline.add(LinePipeline.builtin.AxisAlignCorr).add(LinePipeline.builtin.RemoveShortDoubleWall).add(LinePipeline.builtin.BeamSupportLine);
+    dxfSystem2.Dxf.linePipeline.add(LinePipeline.builtin.AxisAlignCorr).add(LinePipeline.builtin.RemoveShortDoubleWall).add(LinePipeline.builtin.BeamSupportLine).add(LinePipeline.builtin.RemoveRoomSundries);
   }
   if (trajectory2) {
     if (typeof trajectory2 === "string") {

package/src/dxf-system/utils/line-pipeline/builtin/index.d.ts

@@ -8,6 +8,7 @@ import { removeShortDoubleWall } from './remove-short-double-wall';
 import { doorToHole } from './door-to-hole';
 import { LineSegment } from '../../../../utils/algorithms/LineSegment';
 import { beamSupportLine } from './beam-support-line';
+import { removeRoomSundries } from './remove-room-sundries';
 /**
 * 默认提供的预处理函数
 */
@@ -34,4 +35,5 @@ export declare const builtinFun: {
      */
     RemoveShortDoubleWall: typeof removeShortDoubleWall;
     BeamSupportLine: typeof beamSupportLine;
+    RemoveRoomSundries: typeof removeRoomSundries;
 };

package/src/dxf-system/utils/line-pipeline/builtin/remove-room-sundries.d.ts

@@ -0,0 +1,3 @@
+import { LineUserData, SetDataOption } from '../../../type';
+import { LineSegment } from '../../../../utils';
+export declare function removeRoomSundries(lines: LineSegment<LineUserData>[], { trajectory }: SetDataOption): LineSegment<LineUserData>[];

package/src/dxf-system/utils/line-pipeline/index.d.ts

@@ -13,6 +13,7 @@ export declare class LinePipeline<T = SetDataOption> extends Pipeline<LineSegmen
         DoorSpaceHandle: typeof import('./builtin/door-space-handle').doorSpaceHandle;
         RemoveShortDoubleWall: typeof import('./builtin/remove-short-double-wall').removeShortDoubleWall;
         BeamSupportLine: typeof import('./builtin/beam-support-line').beamSupportLine;
+        RemoveRoomSundries: typeof import('./builtin/remove-room-sundries').removeRoomSundries;
     };
     constructor();
     add(handle: (lines: LineSegment<LineUserData>[], option: T) => LineSegment<LineUserData>[]): this;