build-dxf 0.1.88 → 0.1.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.88",
+  "version": "0.1.89",
   "description": "线段构建双线墙壁的dxf版本",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",

package/src/api/index.d.ts

@@ -1,4 +1,4 @@
-import { IRegion, ISpace } from './type';
+import { IModelItem, IRegion, ISpace } from './type';
 export declare function getSpaceListApi(): Promise<ISpace[]>;
 /** 获取区域列表api
  * @param idSpace
@@ -20,3 +20,4 @@ export declare function updateThreeJiaJsonApi(body: {
     models: string;
     dxf: string;
 }): Promise<boolean>;
+export declare function getModelsApi(idRegion: string): Promise<IModelItem[]>;

package/src/build.js

@@ -266,6 +266,13 @@ class PointVirtualGrid {
     }
     return this;
   }
+  /** 移除点
+   * @param point 
+   */
+  removes(point2) {
+    point2.map(this.remove.bind(this));
+    return this;
+  }
   update(point2) {
     const { target, set: set2 } = point2.currentData[this.id];
     if (!target) return false;
@@ -2049,11 +2056,11 @@ class LineSegment {
   static mergeLines(...lines) {
     if (lines.length === 1) return lines[0];
     const list = lines.slice(0).sort((a2, b4) => b4.length() - a2.length());
+    const principal = list[0].direction().normalize();
     const endpoints = [];
     lines.forEach((line) => {
       endpoints.push(line.start.clone(), line.end.clone());
     });
-    const principal = list[0].direction().normalize();
     let minProj = Infinity, maxProj = -Infinity;
     let sumX = 0, sumY = 0;
     endpoints.forEach((pt2) => {
@@ -2071,6 +2078,41 @@ class LineSegment {
     lines.forEach((line) => line.currentData.fittedLine = fittedLine);
     return fittedLine;
   }
+  /** 传入的线段全部投影为一条线段，默认以最长线线段为位置和方向
+   * @param lines 请确保共线
+   * @returns 
+   */
+  static mergeCollinearSegments(lines) {
+    if (lines.length === 1) return lines[0];
+    let mainLine = lines[0];
+    for (const l of lines) if (l.length() > mainLine.length()) mainLine = l;
+    let maxPValue = -Infinity, minPValue = Infinity;
+    let maxPoint = null;
+    let minPoint = null;
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      for (let j = 0; j < line.points.length; j++) {
+        const p2 = line.points[j];
+        const pValue = mainLine.projectPointValue(p2);
+        if (pValue > maxPValue) {
+          maxPValue = pValue;
+          maxPoint = p2;
+        }
+        if (pValue < minPValue) {
+          minPValue = pValue;
+          minPoint = p2;
+        }
+      }
+    }
+    if (!minPoint || !maxPoint) {
+      throw new Error("mergeCollinearSegments: 无效输入");
+    }
+    const newStart = minPoint.clone();
+    const newEnd = maxPoint.clone();
+    const fittedLine = new LineSegment(newStart, newEnd);
+    lines.forEach((line) => line.currentData.fittedLine = fittedLine);
+    return fittedLine;
+  }
   /** 合并满足平行的线段
    * @param selectLines 
    */
@@ -2098,7 +2140,7 @@ class LineSegment {
    * @param callBack 
    * @returns 
    */
-  static mergeCollinearSegments(lines, callBack, removeLines = /* @__PURE__ */ new Set(), newLines = []) {
+  static mergeCollinearSegmentsAll(lines, callBack, removeLines = /* @__PURE__ */ new Set(), newLines = []) {
     const map = /* @__PURE__ */ new Map();
     lines.forEach((line) => line.points.forEach((p2) => {
       const id = `${p2.X.toFixed(6)}_${p2.Y.toFixed(6)}`;
@@ -2260,6 +2302,20 @@ class LineSegment {
     }
     return line;
   }
+  /** 通过线段提取所有点
+   * @param lines 
+   * @returns 
+   */
+  static flatPoints(lines) {
+    if (lines instanceof LineSegment) return [...lines.points];
+    const points = new Array(lines.length * 2);
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      points[i * 2] = line.start;
+      points[i * 2 + 1] = line.end;
+    }
+    return points;
+  }
   /** 创建线段修改管理器
    * @returns 
    */
@@ -2339,7 +2395,7 @@ class Point {
    * @param point 
    * @returns 
    */
-  equal(point2, eps = 1e-9) {
+  equal(point2) {
     return Math.abs(point2.x - this.x) < 1e-9 && Math.abs(point2.y - this.y) < 1e-9;
   }
   /**
@@ -2648,7 +2704,7 @@ class Point {
    * @param tolerance 
    * @returns 
    */
-  static adsorb(points, tolerance = 1e-3, mode = "average") {
+  static adsorb(points, tolerance = 1e-4, mode = "average") {
     const grid = new PointVirtualGrid();
     points.forEach((p2) => grid.insert(p2));
     const visited = /* @__PURE__ */ new Set();
@@ -2707,6 +2763,30 @@ class Point {
     });
   }
 }
+class PointUtils {
+  /** 值网格化
+   * @param points 
+   * @param tolerance 
+   */
+  static quantize(points, tolerance = 2e-3) {
+    const gridSize = tolerance;
+    for (const p2 of points) {
+      p2.x = Math.round(p2.x / gridSize) * gridSize;
+      p2.y = Math.round(p2.y / gridSize) * gridSize;
+    }
+    return points;
+  }
+  /**保留小数位数
+   * @param points 
+   */
+  static round(points, scale2 = 1e4) {
+    for (const p2 of points) {
+      p2.x = Math.round(p2.x * scale2) / scale2;
+      p2.y = Math.round(p2.y * scale2) / scale2;
+    }
+    return points;
+  }
+}
 class Box2 {
   minX = 0;
   maxX = 0;
@@ -3632,7 +3712,7 @@ class LineSegmentUndirectedGraph extends UndirectedGraph {
     });
     unionFindSet.getAllSets().forEach((list) => {
       if (list.length <= 1) return;
-      const lines = list.map((i) => lineIndexGenerator.getLine(i)), newLine = LineSegment.mergeLines(...lines);
+      const lines = list.map((i) => lineIndexGenerator.getLine(i)), newLine = LineSegment.mergeCollinearSegments(lines);
       callBack && callBack(newLine, lines);
       lines.forEach((line) => removeLines.add(line));
       newLines.push(newLine);
@@ -3648,7 +3728,7 @@ class LineSegmentUndirectedGraph extends UndirectedGraph {
    * @returns 
    */
   static breakpointMerging(lines, callBack, removeLines = /* @__PURE__ */ new Set(), newLines = []) {
-    Point.adsorb(lines.flatMap((line) => line.points), 1e-4);
+    Point.adsorb(LineSegment.flatPoints(lines), 1e-4);
     const lud = new LineSegmentUndirectedGraph(lines);
     lud.breakpointMerging(callBack, removeLines, newLines);
     lines = lud.getLineAll();
@@ -5952,6 +6032,14 @@ function lineSegmentClipping(lines, minLen = 1e-9, dedup = true) {
           newLines2[i].userData.isBayWindow = false;
         }
       }
+      if (line.userData.isBalconyRailing) {
+        const len = line.length();
+        newLines2.forEach((line2) => {
+          if (line2.length() / len < 0.2) {
+            delete line2.userData.isBalconyRailing;
+          }
+        });
+      }
       return newLines2;
     }
     return line;
@@ -5973,7 +6061,7 @@ class MiniCircles {
     angle: false,
     edges: false
   };
-  scope = 1e-3;
+  scope = 1e-4;
   /** 通过并查集，查找为环的一部分边
    * @description 
    * @param lines 
@@ -6551,7 +6639,8 @@ class MaxiCircles extends MiniCircles {
     const linesGroup = LineSegment.groupByPath(lines), circles = [], internalEdges = [];
     linesGroup.forEach((lines2, _) => {
       try {
-        const findCircles = findMinCirclesFilter(this.miniCircle(lines2).circles);
+        const miniCircles2 = this.miniCircle(lines2).circles;
+        const findCircles = findMinCirclesFilter(miniCircles2);
         const result = this.mergeCircles(findCircles);
         circles.push(...result.circles);
         internalEdges.push(...result.internalEdges);
@@ -6703,7 +6792,7 @@ function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
   });
   const internalEdgesSet = new Set(internalEdges);
   lines_ = lines_.filter((line) => !internalEdgesSet.has(line));
-  return LineSegmentUndirectedGraph.breakpointMerging(lines_, mergeLineUserData).filter((line) => line.length() > 1e-9);
+  return lines_;
 }
 const buildDoubleWallGroup = Object.assign(buildDoubleWallGroup_, {
   setTrajectory(trajectory_) {
@@ -6756,7 +6845,7 @@ class DoubleWallHelper {
    * @returns 
    */
   static findDoubleLine(lines, wallWidth = 0.4) {
-    let walls = lines.filter((line) => !line.userData.isDoor && !LineGroupType.hasType(line, "doubleWall")), visited = /* @__PURE__ */ new Set(), resultList = [];
+    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 }));
@@ -6773,6 +6862,12 @@ class DoubleWallHelper {
         }
       });
     });
+    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,
@@ -6784,7 +6879,7 @@ class DoubleWallHelper {
    * @param wallWidth 
    * @returns 
    */
-  static complementSide(lines, wallWidth = 0.4) {
+  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) {
@@ -6806,9 +6901,6 @@ class DoubleWallHelper {
     }
     resultList.forEach((result) => {
       const project0 = result.project, project1 = result.project2, line0 = result.source, line1 = result.target;
-      if (project0.angle(project1, { unit: "degree", range: "180" }) > 135) {
-        project1.points = [project1.points[1], project1.points[0]];
-      }
       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;
@@ -6823,11 +6915,10 @@ class DoubleWallHelper {
     });
     lines = lines.filter((line) => !removeLines.has(line));
     quadtree.clear();
-    quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
-    lines.forEach((line) => line.userData.isDoor || quadtree.insert(line));
+    quadtree = createQuadtree([...lines, ...otherLines, ...obstacleAegment]);
     appendLines = lineSegmentClipping(appendLines, 1e-9);
     appendLines.flatMap((line) => {
-      const queryLines = quadtree.queryLineSegment(line).filter((item) => item.line.isParallelTo(line)).map((item) => item.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 = LineSegment.clippingByLines(line, queryLines);
         if (newLines) return newLines.forEach((line2) => {
@@ -6848,19 +6939,22 @@ class DoubleWallHelper {
    * 创建分组
    */
   static buildGroup(lineSegments) {
-    const doors = [];
+    const otherLines = [];
     lineSegments = lineSegments.filter((line) => {
-      if (line.userData.isDoor || line.userData.isBalconyRailing || line.userData.isBayWindow) {
-        doors.push(line);
+      if (line.userData.isDoor || line.userData.isBalconyRailing || line.userData.isWindowWall || line.userData.isBayWindow) {
+        otherLines.push(line);
         return false;
       }
       return true;
     });
     lineSegments = buildDoubleWallGroup(lineSegments, true);
-    lineSegments = this.complementSide(lineSegments);
+    lineSegments = this.complementSide(lineSegments, otherLines);
     WallInsertObject.recomputed(lineSegments);
     lineSegments = buildDoubleWallGroup(lineSegments, true);
-    return [...lineSegments, ...doors];
+    PointUtils.round(
+      PointUtils.quantize(LineSegment.flatPoints(lineSegments), 1e-4)
+    );
+    return [...lineSegments, ...otherLines];
   }
 }
 class WallGroupManager {
@@ -7659,8 +7753,8 @@ function findVerticalReference(lineSegments) {
     if (!lineMap.has(angle)) lineMap.set(angle, []);
     lineMap.get(angle)?.push(lines[index2]);
   });
-  const line = [...lineMap.values()].sort((a2, b4) => b4.length - a2.length)[0].sort((a2, b4) => b4.length() - a2.length())[0];
-  return line;
+  const line = [...lineMap.values()].sort((a2, b4) => b4.length - a2.length)[0]?.sort((a2, b4) => b4.length() - a2.length())[0];
+  return line ?? new LineSegment();
 }
 class Group {
   type = "";
@@ -8239,7 +8333,7 @@ class DxfDrawPlugin {
       type: ["bayWindow"],
       handler({ drawDottedLine, setColor, group }) {
         group.lines.forEach((line) => {
-          setColor("yellow");
+          setColor("cyan");
           line = line.clone().extendAlongDirection(-DEFAULT_WALL_WIDTH * 0.5);
           drawDottedLine(line.start, line.end);
         });
@@ -8427,7 +8521,7 @@ class BoundExt {
     lines = lineSegmentClipping(lines, 1e-9);
     const doors = lines.filter((line) => line.userData.isDoor);
     const walls = lines.filter((line) => !line.userData.isDoor);
-    lines = [...LineSegment.mergeCollinearSegments(walls, mergeLineUserData), ...doors];
+    lines = [...LineSegment.mergeCollinearSegmentsAll(walls, mergeLineUserData), ...doors];
     WallInsertObject.recomputed(lines);
     lines = lines.filter((line) => line.length() > 1e-4).filter((line) => line.userData.isDoor ? line.length() > 0.25 : true);
     findCallBack && findCallBack([...exteriorLines, ...appendLines], trajectoryPoints);
@@ -18814,6 +18908,8 @@ class AxisAlignCorr {
       if (this.visited.has(line)) continue;
       this.correction(line);
     }
+    const quadtree = createQuadtree(this.lines);
+    this.newLines = this.newLines.filter((line) => quadtree.queryCircle(line.center, 1e-4).length === 0);
     return [
       ...this.lines,
       ...this.newLines
@@ -18948,6 +19044,163 @@ class LineQueryer {
     return null;
   }
 }
+function removeDangline(lines, len = 0.01, consecutive = false) {
+  const grid = createPointVirtualGrid(lines);
+  let defaultLines = [];
+  const doorLines = [];
+  const removeLineSet = /* @__PURE__ */ new Set();
+  lines.forEach((line) => {
+    if (line.userData.isDoor) doorLines.push(line);
+    else defaultLines.push(line);
+  });
+  function find(lines2) {
+    removeLineSet.clear();
+    const shortLine = lines2.filter((line) => line.length() <= len);
+    for (let i = 0; i < shortLine.length; i++) {
+      const line = shortLine[i];
+      const is2 = line.points.every((p2) => grid.queryCircle(p2, 1e-4).length > 1);
+      if (!is2) removeLineSet.add(line);
+    }
+    return removeLineSet;
+  }
+  while (find(defaultLines).size != 0 && consecutive) {
+    defaultLines = defaultLines.filter((line) => !removeLineSet.has(line));
+    removeLineSet.forEach((line) => {
+      grid.removes(line.points);
+    });
+  }
+  defaultLines = LineSegmentUndirectedGraph.breakpointMerging(defaultLines, (newLine, lines2) => {
+    lines2 = lines2.filter((line) => line.length() > 0);
+    mergeLineUserData(newLine, lines2);
+    newLine.userData.isBayWindow = lines2.some((line) => line.userData.isBayWindow);
+  });
+  WallInsertObject.recomputed(defaultLines);
+  return [...defaultLines, ...doorLines];
+}
+function getNextPoint(point2, line, next, width) {
+  if (next.length === 0) {
+    const direct = point2.directionFrom(line.getAnotherPoint(point2));
+    return point2.clone().add(direct.multiplyScalar(width));
+  }
+  const p2 = next[0].userData.projectPoint(point2, false);
+  if (!p2) return false;
+  return p2;
+}
+function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
+  const grid = createPointVirtualGrid(lineSegments);
+  function getIntersInfo(line, point2) {
+    const intersList = grid.queryCircle(point2, 1e-4).filter((item) => item.point !== point2);
+    if (intersList.length == 0) return;
+    let firstLine = null, firstPoint = null;
+    let count = 0;
+    let parallel2 = new PvgList();
+    for (let i = 0; i < intersList.length; i++) {
+      const res = intersList[i];
+      if (line.isPerpendicularTo(res.userData, 5)) {
+        count++;
+        firstLine = res.userData;
+        firstPoint = res.point;
+      } else {
+        parallel2.push(res);
+      }
+    }
+    if (count !== 1) return;
+    if (!firstLine || !firstPoint) return;
+    const firstOtherPoint = firstLine.getAnotherPoint(firstPoint);
+    const nextResult = grid.queryCircle(firstOtherPoint, 1e-4).filter((item) => item.point !== firstOtherPoint);
+    return {
+      length: firstLine.length(),
+      firstLine,
+      firstPoint,
+      firstOtherPoint,
+      direction: firstOtherPoint.directionFrom(firstPoint),
+      nextOnlyVertical: nextResult.every((d2) => d2.userData.isPerpendicularTo(firstLine)),
+      next: nextResult,
+      parallel: parallel2
+    };
+  }
+  const removeLinesSet = /* @__PURE__ */ new Set();
+  for (let i = 0; i < lineSegments.length; i++) {
+    const line = lineSegments[i];
+    if (removeLinesSet.has(line)) continue;
+    const len = line.length();
+    if (len > findMinWidth) continue;
+    const startInfo = getIntersInfo(line, line.start);
+    if (!startInfo) continue;
+    const endInfo = getIntersInfo(line, line.end);
+    if (!endInfo) continue;
+    const angle = startInfo.direction.angle(endInfo.direction, { unit: "degree", range: "180" });
+    if (angle < 177) continue;
+    if (!startInfo.nextOnlyVertical && !endInfo.nextOnlyVertical) continue;
+    let mainInfo = startInfo, secondaryInfo = endInfo;
+    if (startInfo.nextOnlyVertical && endInfo.nextOnlyVertical) {
+      if (startInfo.length < endInfo.length) {
+        mainInfo = endInfo;
+        secondaryInfo = startInfo;
+      }
+    } else if (startInfo.nextOnlyVertical) {
+      mainInfo = endInfo;
+      secondaryInfo = startInfo;
+    }
+    const parallel2 = startInfo.parallel.concat(endInfo.parallel);
+    const newPoint = getNextPoint(mainInfo.firstPoint, mainInfo.firstLine, secondaryInfo.next, secondaryInfo.length);
+    if (!newPoint) continue;
+    removeLinesSet.add(line);
+    line.points.forEach((p2) => grid.remove(p2));
+    if (parallel2.length === 0) {
+      const oldLine = mainInfo.firstLine.clone();
+      mainInfo.firstPoint.copy(newPoint);
+      secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
+      removeLinesSet.add(secondaryInfo.firstLine);
+      secondaryInfo.firstLine.points.forEach((p2) => grid.remove(p2));
+      mainInfo.firstLine.points.forEach((p2) => grid.update(p2));
+      if (typeof onMerge === "function") onMerge(mainInfo.firstLine, line, secondaryInfo.firstLine, oldLine);
+    } else {
+      secondaryInfo.firstPoint.copy(mainInfo.firstPoint);
+      secondaryInfo.firstOtherPoint.copy(newPoint);
+      secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
+      startInfo.parallel.concat(endInfo.parallel).forEach((item) => item.point.copy(mainInfo.firstPoint));
+      secondaryInfo.firstLine.points.forEach((p2) => grid.update(p2));
+      secondaryInfo.next.forEach((d2) => grid.update(d2.point));
+      startInfo.parallel.concat(endInfo.parallel).forEach((item) => grid.update(item.point));
+    }
+  }
+  lineSegments = lineSegments.filter((line) => !removeLinesSet.has(line));
+  return lineSegments;
+}
+function repetitiveTask(count, callfun) {
+  for (let i = 0; i < count; i++) {
+    callfun(i);
+  }
+}
+function stepEliminationMerge(target, _, source, oldLine) {
+  if (source.userData.isDoor) WallInsertObject.addInsertObject(target, {
+    p: source.center.toJson(),
+    width: source.length(),
+    full: false,
+    type: "door",
+    height: source.userData.drawDoorData.height,
+    groundClearance: source.userData.drawDoorData.groundClearance
+  });
+  if (target.userData.isDoor) {
+    delete target.userData.isDoor;
+    WallInsertObject.addInsertObject(target, {
+      p: oldLine.center.toJson(),
+      width: oldLine.length(),
+      full: false,
+      type: "door",
+      height: target.userData.drawDoorData?.height,
+      groundClearance: target.userData.drawDoorData?.groundClearance ?? 0
+    });
+  }
+  WallInsertObject.copyInsertObject(target, source);
+  WallInsertObject.recomputed([target]);
+}
+function linesSmoothing(lines, _) {
+  repetitiveTask(2, () => lines = stepElimination(lines, 0.15, stepEliminationMerge));
+  WallInsertObject.recomputed(lines);
+  return lines;
+}
 function shortDistanceLink(lines, radius = 0.1) {
   const dpSet = findDiscretePoint(lines.filter((line) => !line.userData.isDoor)), pointVirtualGrid = createPointVirtualGrid(dpSet.map((v2) => v2)), appendLines = [], visited = /* @__PURE__ */ new Set();
   const getWeight2 = (target, point2, line) => {
@@ -19025,34 +19278,9 @@ function adsorption(lines, option) {
   }
   modifyManager.modify();
   lineQueryer.clear();
-  Point.adsorb(lines.flatMap((line) => line.points), 1e-3);
+  Point.adsorb(lines.flatMap((line) => line.points), 1e-4);
   return lines;
 }
-function removeShortLine(lines, len = 0.01) {
-  let defaultLines = [], doorLines = [];
-  Point.adsorb(lines.flatMap((line) => line.points), 1e-3);
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    if (line.userData.isDoor) doorLines.push(line);
-    else defaultLines.push(line);
-  }
-  const lineSet = findDiscretePointLine2(lines);
-  const grid = createPointVirtualGrid([...lineSet]);
-  for (let i = 0; i < doorLines.length; i++) {
-    const doorLine = doorLines[i];
-    doorLine.points.forEach((p2) => {
-      grid.queryPoint(p2, true).forEach((item) => lineSet.delete(item.userData));
-    });
-  }
-  defaultLines = defaultLines.filter((line) => !lineSet.has(line) || line.length() > len);
-  defaultLines = LineSegmentUndirectedGraph.breakpointMerging(defaultLines, (newLine, lines2) => {
-    lines2 = lines2.filter((line) => line.length() > 0);
-    mergeLineUserData(newLine, lines2);
-    newLine.userData.isBayWindow = lines2.some((line) => line.userData.isBayWindow);
-  });
-  WallInsertObject.recomputed(defaultLines);
-  return [...defaultLines, ...doorLines];
-}
 function breakpointMerging(lines) {
   let defaultLines = [], doorLines = [];
   for (let i = 0; i < lines.length; i++) {
@@ -19072,25 +19300,32 @@ function correction(lines, targettLine, option) {
   lines = AxisAlignCorr.start(lines, targettLine);
   lines = adsorption(lines, option);
   lines = lineSegmentClipping(lines, 1e-9);
-  lines = removeShortLine(lines, 0.15);
+  lines = removeDangline(lines, 0.15, true);
+  lines = linesSmoothing(lines);
   let newLines = lines.filter((line) => !line.userData.isDoor);
   let doorLines = lines.filter((line) => line.userData.isDoor);
   newLines = buildBayWindowGroup(newLines, false);
   const { wallGroup = true } = option ?? {};
   if (wallGroup) {
     newLines = DoubleWallHelper.buildGroup(newLines);
+    newLines = breakpointMerging(newLines);
     newLines = buildBayWindowGroup(newLines, false);
   }
   new WallInsertObject(newLines).recomputed().merge();
   newLines.push(...doorLines);
-  newLines = removeShortLine(newLines, 0.05);
-  newLines = breakpointMerging(newLines);
-  return newLines.filter((line) => line.len > 7e-9);
+  newLines = removeDangline(newLines, 0.15, true);
+  return newLines.filter((line) => line.len > 1e-9);
 }
 function axisAlignCorr(lines, option, verticalReferenceLine) {
   verticalReferenceLine = verticalReferenceLine ?? findVerticalReference(lines.filter((line) => !line.userData.isDoor));
   if (verticalReferenceLine) {
     const t2 = performance.now();
+    lines.forEach((line) => {
+      const id = LineGroupType.getIdByType(line, "bayWindow");
+      if (id && line.userData.isWindow) {
+        line.userData.isWindowWall = true;
+      }
+    });
     const lineSegments = correction(lines, verticalReferenceLine, option);
     console.log("垂直纠正总消耗时间：", (performance.now() - t2).toFixed(2), "ms", "处理线段数量：", lines.length);
     return lineSegments;
@@ -19164,11 +19399,11 @@ function doubleWallAlignment(lines) {
     return [newLines, doubleWall].flat(10);
   });
   lines = [singleWall, newDoubleWalls].flat(10);
-  lines = LineSegmentUndirectedGraph.breakpointMerging(lines, mergeLineUserData);
   lines = lineSegmentClipping(lines, 1e-9);
   lines = buildDoubleWallGroup(lines);
   lines.push(...doorLines);
   WallInsertObject.recomputed(lines);
+  lines = LineSegmentUndirectedGraph.breakpointMerging(lines, mergeLineUserData);
   return lines;
 }
 const point = new Point();
@@ -19260,130 +19495,6 @@ function removeShortDoubleWall(lineSegments) {
   const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall"), freePointLines = [...findDiscretePointLine2(lineSegments)].filter((line) => line.length() < 0.3), grid = createPointVirtualGrid(doubleWalls.flat(4)), lines = freePointLines.filter((line) => grid.queryPoint(line.start).length > 0 || grid.queryPoint(line.end).length > 0), removeSet = new Set(lines);
   return lineSegments.filter((line) => !removeSet.has(line));
 }
-function getNextPoint(point2, line, next, width) {
-  if (next.length === 0) {
-    const direct = point2.directionFrom(line.getAnotherPoint(point2));
-    return point2.clone().add(direct.multiplyScalar(width));
-  }
-  const p2 = next[0].userData.projectPoint(point2, false);
-  if (!p2) return false;
-  return p2;
-}
-function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
-  const grid = createPointVirtualGrid(lineSegments);
-  function getIntersInfo(line, point2) {
-    const intersList = grid.queryCircle(point2, 1e-4).filter((item) => item.point !== point2);
-    if (intersList.length == 0) return;
-    let firstLine = null, firstPoint = null;
-    let count = 0;
-    let parallel2 = new PvgList();
-    for (let i = 0; i < intersList.length; i++) {
-      const res = intersList[i];
-      if (line.isPerpendicularTo(res.userData, 5)) {
-        count++;
-        firstLine = res.userData;
-        firstPoint = res.point;
-      } else {
-        parallel2.push(res);
-      }
-    }
-    if (count !== 1) return;
-    if (!firstLine || !firstPoint) return;
-    const firstOtherPoint = firstLine.getAnotherPoint(firstPoint);
-    const nextResult = grid.queryCircle(firstOtherPoint, 1e-4).filter((item) => item.point !== firstOtherPoint);
-    return {
-      length: firstLine.length(),
-      firstLine,
-      firstPoint,
-      firstOtherPoint,
-      direction: firstOtherPoint.directionFrom(firstPoint),
-      nextOnlyVertical: nextResult.every((d2) => d2.userData.isPerpendicularTo(firstLine)),
-      next: nextResult,
-      parallel: parallel2
-    };
-  }
-  const removeLinesSet = /* @__PURE__ */ new Set();
-  for (let i = 0; i < lineSegments.length; i++) {
-    const line = lineSegments[i];
-    if (removeLinesSet.has(line)) continue;
-    const len = line.length();
-    if (len > findMinWidth) continue;
-    const startInfo = getIntersInfo(line, line.start);
-    if (!startInfo) continue;
-    const endInfo = getIntersInfo(line, line.end);
-    if (!endInfo) continue;
-    const angle = startInfo.direction.angle(endInfo.direction, { unit: "degree", range: "180" });
-    if (angle < 177) continue;
-    if (!startInfo.nextOnlyVertical && !endInfo.nextOnlyVertical) continue;
-    let mainInfo = startInfo, secondaryInfo = endInfo;
-    if (startInfo.nextOnlyVertical && endInfo.nextOnlyVertical) {
-      if (startInfo.length < endInfo.length) {
-        mainInfo = endInfo;
-        secondaryInfo = startInfo;
-      }
-    } else if (startInfo.nextOnlyVertical) {
-      mainInfo = endInfo;
-      secondaryInfo = startInfo;
-    }
-    const parallel2 = startInfo.parallel.concat(endInfo.parallel);
-    const newPoint = getNextPoint(mainInfo.firstPoint, mainInfo.firstLine, secondaryInfo.next, secondaryInfo.length);
-    if (!newPoint) continue;
-    removeLinesSet.add(line);
-    line.points.forEach((p2) => grid.remove(p2));
-    if (parallel2.length === 0) {
-      const oldLine = mainInfo.firstLine.clone();
-      mainInfo.firstPoint.copy(newPoint);
-      secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
-      removeLinesSet.add(secondaryInfo.firstLine);
-      secondaryInfo.firstLine.points.forEach((p2) => grid.remove(p2));
-      mainInfo.firstLine.points.forEach((p2) => grid.update(p2));
-      if (typeof onMerge === "function") onMerge(mainInfo.firstLine, line, secondaryInfo.firstLine, oldLine);
-    } else {
-      secondaryInfo.firstPoint.copy(mainInfo.firstPoint);
-      secondaryInfo.firstOtherPoint.copy(newPoint);
-      secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
-      startInfo.parallel.concat(endInfo.parallel).forEach((item) => item.point.copy(mainInfo.firstPoint));
-      secondaryInfo.firstLine.points.forEach((p2) => grid.update(p2));
-      secondaryInfo.next.forEach((d2) => grid.update(d2.point));
-      startInfo.parallel.concat(endInfo.parallel).forEach((item) => grid.update(item.point));
-    }
-  }
-  lineSegments = lineSegments.filter((line) => !removeLinesSet.has(line));
-  return lineSegments;
-}
-function repetitiveTask(count, callfun) {
-  for (let i = 0; i < count; i++) {
-    callfun(i);
-  }
-}
-function stepEliminationMerge(target, _, source, oldLine) {
-  if (source.userData.isDoor) WallInsertObject.addInsertObject(target, {
-    p: source.center.toJson(),
-    width: source.length(),
-    full: false,
-    type: "door",
-    height: source.userData.drawDoorData.height,
-    groundClearance: source.userData.drawDoorData.groundClearance
-  });
-  if (target.userData.isDoor) {
-    delete target.userData.isDoor;
-    WallInsertObject.addInsertObject(target, {
-      p: oldLine.center.toJson(),
-      width: oldLine.length(),
-      full: false,
-      type: "door",
-      height: target.userData.drawDoorData?.height,
-      groundClearance: target.userData.drawDoorData?.groundClearance ?? 0
-    });
-  }
-  WallInsertObject.copyInsertObject(target, source);
-  WallInsertObject.recomputed([target]);
-}
-function linesSmoothing(lines, _) {
-  repetitiveTask(2, () => lines = stepElimination(lines, 0.1, stepEliminationMerge));
-  WallInsertObject.recomputed(lines);
-  return lines;
-}
 const PRE_PROCESSOR = {
   init,
   AxisAlignCorr: axisAlignCorr,
@@ -19631,6 +19742,7 @@ class CorrectionDxf extends Dxf {
   onAddFromParent(parent) {
     parent.Dxf.addEventListener("cadChange", (e) => {
       e.options.trajectory && this.addPreProcessor(PRE_PROCESSOR.BoundExt);
+      this.addPreProcessor(PRE_PROCESSOR.DoubleWallAlignment);
       const lines = parent.Dxf.getLineSegments(true);
       this.set(lineDataToOriginalData(lines, parent.Dxf.originalZAverage), {
         trajectory: e.options.trajectory,
@@ -21920,6 +22032,7 @@ const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   OBB: OBB2,
   PCSparseOctree,
   Point,
+  PointUtils,
   PointVirtualGrid,
   Polygon,
   PvgList,

package/src/index3.js

@@ -15904,7 +15904,7 @@ function modifyWindow(context, winLine, line2, index2) {
       dragPoint.copy(p.toJson());
       lineMesh.setPoint(winLine.start.toVector3(), winLine.end.toVector3());
       editBtn.setPosition(winLine.center);
-      const [l1, l2] = LineSegment.clippingByLine(line2, winLine);
+      const [l1, l2] = LineSegment.clippingByLine(line2, winLine) ?? [];
       if (l1) {
         text1.visible = true;
         text1.position.copy(l1.center.toJson(0));

package/src/utils/DxfSystem/components/CorrectionDxf.d.ts

@@ -15,7 +15,7 @@ export declare class CorrectionDxf<TEventMap extends {} = {}> extends Dxf<{} & T
         DoubleWallAlignment: typeof import('../utils/lineHandle/CadPreProcessor/doubleWallAlignment').doubleWallAlignment;
         WallHeightHandle: typeof import('../utils/lineHandle/CadPreProcessor/wallHeightHandle').wallHeightHandle;
         DoorSpaceHandle: typeof import('../utils/lineHandle/CadPreProcessor/doorSpaceHandle').doorSpaceHandle;
-        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/linesSmoothing').linesSmoothing;
+        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/axisAlignCorr/linesSmoothing').linesSmoothing;
         RemoveShortDoubleWall: typeof import('../utils/lineHandle/CadPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     rotateCorrCad?: CAD;

package/src/utils/DxfSystem/components/Dxf.d.ts

@@ -29,7 +29,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
         DoubleWallAlignment: typeof import('../utils/lineHandle/CadPreProcessor/doubleWallAlignment').doubleWallAlignment;
         WallHeightHandle: typeof import('../utils/lineHandle/CadPreProcessor/wallHeightHandle').wallHeightHandle;
         DoorSpaceHandle: typeof import('../utils/lineHandle/CadPreProcessor/doorSpaceHandle').doorSpaceHandle;
-        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/linesSmoothing').linesSmoothing;
+        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/axisAlignCorr/linesSmoothing').linesSmoothing;
         RemoveShortDoubleWall: typeof import('../utils/lineHandle/CadPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     width: number;

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/{axisAlignCorr.d.ts → axisAlignCorr/index.d.ts}

@@ -1,5 +1,5 @@
-import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
-import { SetDataOption, LineUserData } from '../../../type';
+import { LineSegment } from '../../../../../algorithmsStructures/LineSegment';
+import { SetDataOption, LineUserData } from '../../../../type';
 /**
  * 轴对齐垂直修正
  * @param lines 待调整线段组

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/axisAlignCorr/linesSmoothing.d.ts

@@ -0,0 +1,3 @@
+import { LineSegment } from '../../../../../algorithmsStructures/LineSegment';
+import { SetDataOption } from '../../../../type';
+export declare function linesSmoothing(lines: LineSegment[], _?: SetDataOption): LineSegment<Record<string, any>>[];

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/axisAlignCorr/removeQuad.d.ts

@@ -0,0 +1,6 @@
+import { LineSegment } from '../../../../../algorithmsStructures/LineSegment';
+/** 路径阶梯合并
+ * @param lineSegments
+ * @returns
+ */
+export declare function removeQuad(lineSegments: LineSegment[], findMinWidth?: number, onMerge?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/index.d.ts

@@ -6,7 +6,7 @@ import { doubleWallAlignment } from './doubleWallAlignment';
 import { wallHeightHandle } from './wallHeightHandle';
 import { doorSpaceHandle } from './doorSpaceHandle';
 import { removeShortDoubleWall } from './removeShortDoubleWall';
-import { linesSmoothing } from './linesSmoothing';
+import { linesSmoothing } from './axisAlignCorr/linesSmoothing';
 /**
  * 默认提供的预处理函数
  */

package/src/utils/DxfSystem/utils/lineHandle/DoubleWallHelper.d.ts

@@ -34,7 +34,7 @@ export declare class DoubleWallHelper {
      * @param wallWidth
      * @returns
      */
-    static complementSide(lines: LineSegment<LineUserData>[], wallWidth?: number): LineSegment<LineUserData>[];
+    static complementSide(lines: LineSegment<LineUserData>[], obstacleAegment?: LineSegment[], wallWidth?: number): LineSegment<LineUserData>[];
     /**
      * 创建分组
      */

package/src/utils/DxfSystem/utils/lineHandle/buildGroup/buildDoubleWallGroup.d.ts

@@ -5,7 +5,7 @@ import { LineUserData } from '../../../type';
  * @param clearInternalLine
  * @returns
  */
-export declare function buildDoubleWallGroup_(lines_: LineSegment<LineUserData>[], clearInternalLine?: boolean): LineSegment<Record<string, any>>[];
+export declare function buildDoubleWallGroup_(lines_: LineSegment<LineUserData>[], clearInternalLine?: boolean): LineSegment<LineUserData>[];
 /** */
 export declare const buildDoubleWallGroup: typeof buildDoubleWallGroup_ & {
     setTrajectory(trajectory_: Record<string, any> | undefined): void;

package/src/utils/DxfSystem/utils/tools/removeDangline.d.ts

@@ -0,0 +1,7 @@
+import { LineSegment } from '../../../algorithmsStructures/LineSegment';
+/** 移除游离短线段
+ * @param lines
+ * @param len
+ * @returns
+ */
+export declare function removeDangline(lines: LineSegment[], len?: number, consecutive?: boolean): LineSegment<Record<string, any>>[];

package/src/utils/algorithmsStructures/LineSegment.d.ts

@@ -279,6 +279,11 @@ export declare class LineSegment<T = Record<string, any>> {
      * @returns
      */
     static mergeLines(...lines: LineSegment[]): LineSegment<Record<string, any>>;
+    /** 传入的线段全部投影为一条线段，默认以最长线线段为位置和方向
+     * @param lines 请确保共线
+     * @returns
+     */
+    static mergeCollinearSegments(lines: LineSegment[]): LineSegment<Record<string, any>>;
     /** 合并满足平行的线段
      * @param selectLines
      */
@@ -292,7 +297,7 @@ export declare class LineSegment<T = Record<string, any>> {
      * @param callBack
      * @returns
      */
-    static mergeCollinearSegments(lines: LineSegment[], callBack?: (newLine: LineSegment, group: LineSegment[]) => void, removeLines?: Set<LineSegment<Record<string, any>>>, newLines?: LineSegment[]): LineSegment<Record<string, any>>[];
+    static mergeCollinearSegmentsAll(lines: LineSegment[], callBack?: (newLine: LineSegment, group: LineSegment[]) => void, removeLines?: Set<LineSegment<Record<string, any>>>, newLines?: LineSegment[]): LineSegment<Record<string, any>>[];
     /** 去重
      * @param lines
      * @returns
@@ -317,6 +322,11 @@ export declare class LineSegment<T = Record<string, any>> {
      */
     static clippingByLines(target: LineSegment, clippingLines: LineSegment[], callBack?: (newLine: LineSegment, line: LineSegment) => void): LineSegment<Record<string, any>>[] | undefined;
     static constrainLine(line: LineSegment, base: LineSegment): LineSegment<Record<string, any>>;
+    /** 通过线段提取所有点
+     * @param lines
+     * @returns
+     */
+    static flatPoints(lines: LineSegment[] | LineSegment): any[];
     /** 创建线段修改管理器
      * @returns
      */

package/src/utils/algorithmsStructures/Point.d.ts

@@ -22,7 +22,7 @@ export declare class Point<T = Record<string, any>> {
      * @param point
      * @returns
      */
-    equal(point: Point, eps?: number): boolean;
+    equal(point: Point): boolean;
     /**
      *
      * @param arr
@@ -196,3 +196,14 @@ export declare class Point<T = Record<string, any>> {
     private static distanceClearQueue;
     private static addDistanceCacheClear;
 }
+export declare class PointUtils {
+    /** 值网格化
+     * @param points
+     * @param tolerance
+     */
+    static quantize(points: Point[], tolerance?: number): Point<Record<string, any>>[];
+    /**保留小数位数
+     * @param points
+     */
+    static round(points: Point[], scale?: number): Point<Record<string, any>>[];
+}

package/src/utils/algorithmsStructures/PointVirtualGrid.d.ts

@@ -35,6 +35,10 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
      * @param point
      */
     remove(point: Point): this;
+    /** 移除点
+     * @param point
+     */
+    removes(point: Point[]): this;
     update(point: Point): boolean;
     /**
      * 获取通过坐标，获取唯一网格索引

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/linesSmoothing.d.ts

@@ -1,3 +0,0 @@
-import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
-import { SetDataOption } from '../../../type';
-export declare function linesSmoothing(lines: LineSegment[], _?: SetDataOption): LineSegment<Record<string, any>>[];