build-dxf 0.1.153 → 0.1.154

package/package.json

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

package/src/build.js

@@ -9665,148 +9665,6 @@ class BuildGroup {
   }
 }
 class DoubleWallFinder {
-  static errorAngle = 4;
-  /** 线段投影分析
-   * @param index 
-   * @param sourceLineSegment 
-   * @param lineSegmentList 
-   * @returns 
-   */
-  static projectionAnalysis(index2, sourceIndex, sourceLineSegment, lineSegmentList) {
-    const temLineSegment = lineSegmentList[index2], direct = sourceLineSegment.direction(), temDirect = temLineSegment.direction(), angle = direct.angle(temDirect, { unit: "degree", range: "180" });
-    if (angle < this.errorAngle || angle > 180 - this.errorAngle) {
-      let data;
-      let dist = sourceLineSegment.distanceToSegment(temLineSegment);
-      const p1 = temLineSegment.projectLineSegment(sourceLineSegment), p2 = sourceLineSegment.projectLineSegment(temLineSegment);
-      if (p1.length > p2.length) {
-        data = {
-          target: temLineSegment,
-          targetIndex: index2,
-          source: sourceLineSegment,
-          sourceIndex,
-          project: p1,
-          project2: p2,
-          minDistance: dist
-        };
-      } else {
-        data = {
-          target: sourceLineSegment,
-          targetIndex: sourceIndex,
-          source: temLineSegment,
-          sourceIndex: index2,
-          project: p2,
-          project2: p1,
-          minDistance: dist
-        };
-      }
-      if (!data || data.project.length < 0.08 || data.project2.length < 0.08) return;
-      return data;
-    }
-  }
-  /** 查找
-   * @param lines 
-   * @param wallWidth 
-   * @returns 
-   */
-  static findDoubleLine(lines, wallWidth = 0.4) {
-    let walls = lines.filter((line) => !line.userData.isDoor), visited = /* @__PURE__ */ new Set(), resultList = [];
-    walls = walls.filter((line) => !line.userData.isWindowWall);
-    let quadtree = new Quadtree(Box2.fromByLineSegment(...walls));
-    walls.forEach((line, index2) => quadtree.insert({ line, userData: index2 }));
-    walls.forEach((sourceLineSegment, i) => {
-      const rectangle = Rectangle.fromByLineSegment(sourceLineSegment, wallWidth * 2, false, -0.01), ids = quadtree.queryRect(rectangle).map((i2) => i2.userData).filter((index2) => index2 !== i);
-      ids.forEach((id) => {
-        try {
-          if (visited.has(`${i}-${id}`) || visited.has(`${id}-${i}`)) return;
-          const res = this.projectionAnalysis(id, i, sourceLineSegment, walls);
-          if (res) resultList.push(res);
-          visited.add(`${i}-${id}`);
-        } catch (error) {
-          console.log(error);
-        }
-      });
-    });
-    resultList.forEach((result) => {
-      const project0 = result.project, project1 = result.project2;
-      if (project0.angle(project1, { unit: "degree", range: "180" }) > 135) {
-        project1.points = [project1.points[1], project1.points[0]];
-      }
-    });
-    return {
-      resultList,
-      walls,
-      quadtree
-    };
-  }
-  /** 补双线墙壁
-   * @param lines 
-   * @param wallWidth 
-   * @returns 
-   */
-  static complementSide(lines, obstacleAegment = [], wallWidth = 0.4) {
-    const otherLines = [];
-    lines = lines.filter((line) => {
-      if (line.userData.isBayWindow || line.userData.isBalconyRailing || LineGroupType.hasType(line, "bayWindow") && line.userData.isWindow) {
-        otherLines.push(line);
-        return false;
-      }
-      return true;
-    });
-    let { resultList, quadtree } = this.findDoubleLine(lines, wallWidth), removeLines = /* @__PURE__ */ new Set(), clipingMap = /* @__PURE__ */ new Map(), appendLines = [];
-    function addClipingMap(line, line1) {
-      if (!clipingMap.has(line)) clipingMap.set(line, []);
-      const startProj = line.projectPoint(line1.start);
-      const endProj = line.projectPoint(line1.end);
-      const list = clipingMap.get(line);
-      if (startProj) list.push(startProj);
-      if (endProj) list.push(endProj);
-      removeLines.add(line);
-      quadtree.remove(line);
-    }
-    resultList.forEach((result) => {
-      const project0 = result.project, project1 = result.project2, line0 = result.source, line1 = result.target;
-      const newLine1 = new LineSegment(project0.start.clone(), project1.start.clone());
-      const newLine2 = new LineSegment(project0.end.clone(), project1.end.clone());
-      newLine1.userData.height = line0.userData.height;
-      newLine1.userData.rooftopPz = line0.userData.rooftopPz;
-      newLine2.userData.height = line1.userData.height;
-      newLine2.userData.rooftopPz = line1.userData.rooftopPz;
-      appendLines.push(newLine1, newLine2);
-      addClipingMap(line0, project0);
-      addClipingMap(line1, project1);
-    });
-    clipingMap.forEach((list, line) => {
-      const newLines = LineSegmentUtils.clippingByPoints(line, list);
-      newLines.forEach((newLine) => {
-        newLine.userData.height = line.userData.height;
-        newLine.userData.rooftopPz = line.userData.rooftopPz;
-      });
-      lines.push(...newLines);
-    });
-    lines = lines.filter((line) => !removeLines.has(line));
-    quadtree.clear();
-    quadtree = Quadtree.from([...lines, ...otherLines, ...obstacleAegment]);
-    appendLines = splitIntersectedLine(appendLines, 1e-9);
-    appendLines.flatMap((line) => {
-      const queryLines = quadtree.queryRect(line.toRectangle(1e-3, "butt")).filter((item) => item.line.isParallelTo(line)).map((item) => item.line);
-      if (queryLines.length) {
-        const newLines = LineSegmentUtils.clippingByLines(line, queryLines);
-        if (newLines) return newLines.forEach((newLine) => {
-          newLine.userData.height = line.userData.height;
-          newLine.userData.rooftopPz = line.userData.rooftopPz;
-          quadtree.insert(newLine);
-          lines.push(newLine);
-        });
-      }
-      quadtree.insert(line);
-      lines.push(line);
-    });
-    quadtree.clear();
-    lines.push(...otherLines);
-    lines = splitIntersectedLine(lines, 1e-9);
-    PointUtils.adsorb(lines.flatMap((line) => line.points), 1e-4);
-    return lines.filter((line) => line.length > 1e-9);
-  }
   /**
    * @param lines 
    * @param parallelAxis 
@@ -9854,7 +9712,7 @@ class DoubleWallFinder {
    */
   static find(lines, obstacle = [], esp = 0.4) {
     lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => WallHole.isBeam(line) ? "beam" : "lines")).handle("lines", (lines2) => {
-      const parallelAxis = lines2[0], verticalAxis = parallelAxis.clone().rotate(Math.PI * 0.5), [group1, group2] = LineSegmentUtils.groupByParallelToAxis(lines2, lines2[0]), newLines1 = this.group(group1, parallelAxis, verticalAxis, esp), newLines2 = this.group(group2, verticalAxis, parallelAxis, esp), appendLines = newLines1.concat(newLines2);
+      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;
     }).merge();
@@ -12140,7 +11998,10 @@ function correction(lines, targettLine, option) {
   const bayWindow = lines.filter((line) => line.userData.isBayWindow).map((line) => line.center);
   lines = splitIntersectedLine(lines, 1e-9);
   WallHole.filterIllegal(lines).merge(lines);
-  lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => line.userData.isBalconyRailing ? "balconyRailing" : "lines")).handle("lines", (lines2) => {
+  lines = LineSegmentUtils.GroupBuilder(LineSegmentUtils.group(lines, (line) => {
+    if (WallHole.isBeam(line)) return "beam";
+    return line.userData.isBalconyRailing ? "balconyRailing" : "lines";
+  })).handle("lines", (lines2) => {
     lines2 = AlignToParallelSegments.align(lines2, {
       onMergeLine: mergeLineUserData,
       onGroup(group2, projValues, axis) {

package/src/dxf-system/utils/DoubleWallFinder.d.ts

@@ -1,40 +1,6 @@
 import { LineSegment } from '../../utils/algorithms/LineSegment';
-import { Quadtree } from '../../utils/algorithms/Quadtree';
 import { LineUserData } from '../type';
-type ProjectionAnalysisResult = {
-    source: LineSegment;
-    sourceIndex: number;
-    target: LineSegment;
-    targetIndex: number;
-    project: LineSegment;
-    project2: LineSegment;
-    minDistance: number;
-};
 export declare class DoubleWallFinder {
-    static errorAngle: number;
-    /** 线段投影分析
-     * @param index
-     * @param sourceLineSegment
-     * @param lineSegmentList
-     * @returns
-     */
-    private static projectionAnalysis;
-    /** 查找
-     * @param lines
-     * @param wallWidth
-     * @returns
-     */
-    static findDoubleLine(lines: LineSegment<LineUserData>[], wallWidth?: number): {
-        resultList: ProjectionAnalysisResult[];
-        walls: LineSegment<LineUserData>[];
-        quadtree: Quadtree<number>;
-    };
-    /** 补双线墙壁
-     * @param lines
-     * @param wallWidth
-     * @returns
-     */
-    static complementSide(lines: LineSegment<LineUserData>[], obstacleAegment?: LineSegment[], wallWidth?: number): LineSegment<LineUserData>[];
     /**
      * @param lines
      * @param parallelAxis
@@ -56,4 +22,3 @@ export declare class DoubleWallFinder {
      */
     static buildGroup(lineSegments: LineSegment<LineUserData>[]): (LineSegment<Record<string, any>> | LineSegment<LineUserData>)[];
 }
-export {};