build-dxf 0.1.94 → 0.1.95

package/package.json

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

package/src/build.js

@@ -604,8 +604,8 @@ class LineSegment {
    * @param t 
    * @returns 
    */
-  pointAt(t2) {
-    return new Point(this.start.x + (this.end.x - this.start.x) * t2, this.start.y + (this.end.y - this.start.y) * t2);
+  pointAt(t2, point2 = new Point()) {
+    return point2.set(this.start.x + (this.end.x - this.start.x) * t2, this.start.y + (this.end.y - this.start.y) * t2);
   }
   /** 膨胀为矩形
    * 
@@ -1099,6 +1099,16 @@ class Point {
     this.y += point2.y;
     return this;
   }
+  /**
+  * 加法
+  * @description 将当前点的坐标加上指定点的坐标
+  * @param point 
+  * @returns 
+  */
+  addScalar(value) {
+    this.x += value;
+    this.y += value;
+  }
   parseInt() {
     this.x = ~~this.x;
     this.y = ~~this.y;
@@ -1666,7 +1676,7 @@ class PvgList extends Array {
     return this.map((item) => item.point);
   }
 }
-class PointVirtualGrid {
+class PointSpatialHash {
   map = /* @__PURE__ */ new Map();
   gridSize;
   id;
@@ -1701,7 +1711,7 @@ class PointVirtualGrid {
       return this;
     }
     if (point2.currentData[this.id]) this.remove(point2);
-    const id = this.getGridId(point2);
+    const id = this.getGridIdByPoint(point2);
     if (!this.map.has(id)) this.map.set(id, /* @__PURE__ */ new Set());
     const set2 = this.map.get(id);
     const target = { point: point2, userData };
@@ -1745,7 +1755,7 @@ class PointVirtualGrid {
   update(point2) {
     const { target, set: set2 } = point2.currentData[this.id];
     if (!target) return false;
-    const id = this.getGridId(point2);
+    const id = this.getGridIdByPoint(point2);
     let newSet = this.map.get(id);
     if (newSet === set2) return false;
     set2.delete(target);
@@ -1766,8 +1776,11 @@ class PointVirtualGrid {
    * @param point 
    * @returns 
    */
-  getGridId(point2) {
+  getGridIdByPoint(point2) {
     const i = Math.ceil(point2.x / this.gridSize), j = Math.ceil(point2.y / this.gridSize);
+    return this.getGridId(i, j);
+  }
+  getGridId(i, j) {
     return `${i}.${j}`;
   }
   /**
@@ -1782,15 +1795,6 @@ class PointVirtualGrid {
     }
     this.map.clear();
   }
-  /**
-   * 
-   * @param gridId 
-   * @returns 
-   */
-  decodeGridId(gridId) {
-    const [i, j] = gridId.split(".").map(Number);
-    return new Point(i, j);
-  }
   /**
    * 查询与矩形相交的点
    * @param rectangle 矩形
@@ -1822,7 +1826,7 @@ class PointVirtualGrid {
     const minI = Math.ceil(box2.minX / this.gridSize), maxI = Math.ceil(box2.maxX / this.gridSize), minJ = Math.ceil(box2.minY / this.gridSize), maxJ = Math.ceil(box2.maxY / this.gridSize), list = new PvgList();
     for (let i = minI; i <= maxI; i++) {
       for (let j = minJ; j <= maxJ; j++) {
-        const id = `${i}.${j}`;
+        const id = this.getGridId(i, j);
         if (!this.map.has(id)) continue;
         const set2 = this.map.get(id);
         set2?.forEach((item) => {
@@ -1842,7 +1846,7 @@ class PointVirtualGrid {
     const minI = Math.ceil(box2.minX / this.gridSize), maxI = Math.ceil(box2.maxX / this.gridSize), minJ = Math.ceil(box2.minY / this.gridSize), maxJ = Math.ceil(box2.maxY / this.gridSize), list = [];
     for (let i = minI; i <= maxI; i++) {
       for (let j = minJ; j <= maxJ; j++) {
-        const id = `${i}.${j}`;
+        const id = this.getGridId(i, j);
         if (!this.map.has(id)) continue;
         const set2 = this.map.get(id);
         set2?.forEach((item) => {
@@ -1862,7 +1866,7 @@ class PointVirtualGrid {
     if (point2.currentData[this.id]) {
       set2 = point2.currentData[this.id]?.set;
     } else {
-      const id = this.getGridId(point2);
+      const id = this.getGridIdByPoint(point2);
       if (this.map.has(id)) set2 = this.map.get(id);
     }
     set2?.forEach((item) => {
@@ -1922,6 +1926,15 @@ class PointVirtualGrid {
       if (list.size === 1) return [...list][0];
     }
   }
+  /** 通过线段快速创建
+   * @param lines 
+   * @returns 
+   */
+  static fromByLines(lines) {
+    const psh = new PointSpatialHash();
+    lines.forEach((line) => psh.insert(line.start, line).insert(line.end, line));
+    return psh;
+  }
 }
 class Quadtree {
   bounds;
@@ -2795,7 +2808,7 @@ class CounterMap extends MapEnhance {
 function findDiscretePointLine(lines, grid0, lineSet, deep = true) {
   lineSet = lineSet ?? /* @__PURE__ */ new Set();
   const is2 = grid0 ? true : false;
-  const grid = grid0 || createPointVirtualGrid(lines);
+  const grid = grid0 || createPointSpatialHash(lines);
   function handle(line) {
     if (!(line instanceof LineSegment)) return;
     if (lineSet?.has(line)) return;
@@ -2867,7 +2880,7 @@ function findDiscretePoint(lines) {
 }
 function findDiscretePoint2(lines) {
   const pointMap = new MapEnhance();
-  const pvg = createPointVirtualGrid(lines);
+  const pvg = createPointSpatialHash(lines);
   lines.forEach((line) => {
     const qr2 = Math.min(1e-3, line.length() * 9e-3);
     line.points.forEach((p2) => {
@@ -2907,7 +2920,7 @@ class PointUtils {
    * @returns 
    */
   static adsorb(points, tolerance = 1e-4, mode = "average") {
-    const grid = new PointVirtualGrid();
+    const grid = new PointSpatialHash();
     points.forEach((p2) => grid.insert(p2));
     const visited = /* @__PURE__ */ new Set();
     for (let i = 0; i < points.length; i++) {
@@ -2980,7 +2993,7 @@ class LineSegmentUtils {
    * @param lines 
    */
   static maxLengthLineIndex(lines, excludeCallBack) {
-    let maxLength = 0, maxIndex = -1;
+    let maxLength = -Infinity, maxIndex = -1;
     for (let i = 0; i < lines.length; i++) {
       if (excludeCallBack && excludeCallBack(lines[i])) continue;
       const length = lines[i].length();
@@ -2991,11 +3004,27 @@ class LineSegmentUtils {
     }
     return maxIndex;
   }
+  /** 获取线段组的中心
+   * @param lines 
+   */
+  static getLinesCenter(lines) {
+    let totalWeight = 0;
+    let x = 0;
+    let y = 0;
+    for (const line of lines) {
+      const len = line.length();
+      const center = line.center;
+      x += center.x * len;
+      y += center.y * len;
+      totalWeight += len;
+    }
+    return new Point(x / totalWeight, y / totalWeight);
+  }
   /** 通过在同一路径上且平行的线段分组
    * @param lines 
    */
   static groupByPathAndParallel(lines) {
-    const pointVirtualGrid = new PointVirtualGrid(), quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
+    const pointVirtualGrid = new PointSpatialHash(), quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
     lines.forEach((line) => {
       line.points.forEach((p2) => pointVirtualGrid.insert(p2, line));
       quadtree.insert(line);
@@ -3047,7 +3076,7 @@ class LineSegmentUtils {
    * @returns 
    */
   static groupByPath(lines) {
-    const pointVirtualGrid = new PointVirtualGrid();
+    const pointVirtualGrid = new PointSpatialHash();
     lines.forEach((line) => line.points.forEach((p2) => pointVirtualGrid.insert(p2, line)));
     function dfs(point2, group, visted2) {
       const list = pointVirtualGrid.queryPoint(point2, true);
@@ -3093,7 +3122,7 @@ class LineSegmentUtils {
    */
   static groupByLeafPath(lines) {
     PointUtils.adsorb(lines.flatMap((line) => line.points));
-    const grid = new PointVirtualGrid(), visited = /* @__PURE__ */ new Set();
+    const grid = new PointSpatialHash(), visited = /* @__PURE__ */ new Set();
     lines.forEach((line) => line.points.forEach((p2) => grid.insert(p2, line)));
     function dfs(point2, path, maxPath = []) {
       const list = grid.queryPoint(point2, true);
@@ -3178,7 +3207,7 @@ class LineSegmentUtils {
     lines.forEach((line) => line.currentData.fittedLine = fittedLine);
     return fittedLine;
   }
-  /** 传入的线段全部投影为一条线段，默认以最长线线段为位置和方向
+  /** 传入的线段全部投影为一条线段
    * @param lines 请确保共线
    * @returns 
    */
@@ -5579,7 +5608,7 @@ class Polygon extends Array {
    * @returns 
    */
   static fromByLines(lines) {
-    const grid = new PointVirtualGrid(), points = /* @__PURE__ */ new Set();
+    const grid = new PointSpatialHash(), points = /* @__PURE__ */ new Set();
     lines.forEach((line) => line.points.forEach((p2) => grid.insert(p2, line)));
     const start = lines[0].start;
     let current = start;
@@ -5606,7 +5635,7 @@ class Polygon extends Array {
       lines = LineSegmentUtils.groupByLeafPath(lines).sort((a2, b4) => b4.length - a2.length)[0];
     }
     if (lines.length === 1) return new Polygon(lines[0].points.map((p2) => p2.clone()));
-    const grid = new PointVirtualGrid(), points = /* @__PURE__ */ new Set();
+    const grid = new PointSpatialHash(), points = /* @__PURE__ */ new Set();
     lines.forEach((line) => line.points.forEach((p2) => grid.insert(p2, line)));
     let start = lines[0].isSameEndpointAsEnd(lines[1]) ? lines[0].end : lines[0].start;
     let current = start;
@@ -6148,7 +6177,7 @@ class MiniCircles {
     let { A, B, exitPoint = A, grid, path = /* @__PURE__ */ new Set() } = opt;
     if (Array.isArray(grid)) {
       const lines = grid;
-      grid = new PointVirtualGrid();
+      grid = new PointSpatialHash();
       for (let i = 0; i < lines.length; i++) grid.insert(lines[i].start, lines[i]).insert(lines[i].end, lines[i]);
     }
     while (true) {
@@ -6188,7 +6217,7 @@ class MiniCircles {
    * @param ringEdges 
    */
   miniCircle(lines, option) {
-    const { side = 2, circleEdges = this.findCycleEntryEdges(lines) } = option ?? {}, grid = createPointVirtualGrid(lines), findSetMap = new ArrayMap();
+    const { side = 2, circleEdges = this.findCycleEntryEdges(lines) } = option ?? {}, grid = createPointSpatialHash(lines), findSetMap = new ArrayMap();
     const getBaseCircle = (line) => {
       const circles = [];
       line.points.forEach((point2) => {
@@ -6733,7 +6762,7 @@ function buildBayWindowGroup(lines, clear = true) {
       LineGroupType.removeByType(line, "bayWindow");
     }
   });
-  const grid = createPointVirtualGrid(lines);
+  const grid = createPointSpatialHash(lines);
   removeSet.clear();
   bayWindowLines.forEach((bayWindowLine) => {
     let { circles } = maxiCircles$1.miniCircle(lines_, { circleEdges: [bayWindowLine] });
@@ -6827,7 +6856,7 @@ function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
   let { internalEdges, circles } = maxiCircles.maxiCircles(queryLines, (circles2) => circles2.filter(isPolyHasTrajectoryPoint));
   const { circles: finalCircles } = maxiCircles.mergeCircles([...circlesList, ...circles], internalEdges);
   lines_.forEach((line) => LineGroupType.removeByTypes(line, ["doubleWall", "wall"]));
-  const grid = new PointVirtualGrid(), finalCirclesSet = new Set(finalCircles.flat(2));
+  const grid = new PointSpatialHash(), finalCirclesSet = new Set(finalCircles.flat(2));
   otherLines.forEach((line) => !finalCirclesSet.has(line) && grid.insert(line.center, line));
   finalCircles.forEach((group) => {
     const id2 = uuid();
@@ -7236,7 +7265,7 @@ class WallInsertObjectDrawData {
    * @returns 
    */
   static handleHoleDrawData(doubleWallGroup, wall, lines = []) {
-    const grid = new PointVirtualGrid();
+    const grid = new PointSpatialHash();
     lines.forEach((line) => line.points.forEach((p2) => grid.insert(p2, line)));
     const holes = new ArrayMap();
     const newLines = [];
@@ -7684,8 +7713,8 @@ function lineDataToThreeVJiaJson(lineSegments, angle = 0, updateGroup = true) {
     }
   };
 }
-function createPointVirtualGrid(lines) {
-  const grid = new PointVirtualGrid();
+function createPointSpatialHash(lines) {
+  const grid = new PointSpatialHash();
   for (const seg of lines) {
     grid.insert(seg.start, seg);
     grid.insert(seg.end, seg);
@@ -7782,7 +7811,7 @@ const index$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   __proto__: null,
   ThreeVJiaJson,
   WallGroupManager,
-  createPointVirtualGrid,
+  createPointSpatialHash,
   createQuadtree,
   getLineIndexByCenter,
   lineDataToOriginalData,
@@ -8550,7 +8579,7 @@ class BoundExt {
     let exteriorLines = findLines.filter((line) => line.userData.expandDirect).filter((line) => !line.userData.isBalconyRailing).filter((line) => !LineGroupType.hasType(line, "bayWindow"));
     lines = lines.filter((line) => !exteriorLines.includes(line));
     lines.push(...exteriorLines);
-    const grid = createPointVirtualGrid(lines), quadtree = createQuadtree(lines), arrayMap = new ArrayMap(), pointMap = /* @__PURE__ */ new Map();
+    const grid = createPointSpatialHash(lines), quadtree = createQuadtree(lines), arrayMap = new ArrayMap(), pointMap = /* @__PURE__ */ new Map();
     let appendLines = [];
     exteriorLines.forEach((line) => {
       const mode = line.userData.expandDirect, direction = mode === "left" ? line.getRightDirection() : line.getLeftDirection();
@@ -8773,7 +8802,7 @@ class BayWindow {
   // 飘窗处理
   overhangTreatment(data, singleLine) {
     this.singleLine = singleLine;
-    const grid = createPointVirtualGrid(Scenario.Instance.lines);
+    const grid = createPointSpatialHash(Scenario.Instance.lines);
     for (const i in data) {
       this.bayWindowGroup = new THREE.Group();
       this.dottedLinePoints.push(data[i].dottedLine);
@@ -8911,7 +8940,7 @@ class BayWindow {
     let startingPoint;
     let finishLine;
     if (statuc) {
-      const dottedGrid = createPointVirtualGrid(this.singleLine);
+      const dottedGrid = createPointSpatialHash(this.singleLine);
       const a2 = new Point(data.start.x, data.start.y);
       const b4 = new Point(data.end.x, data.end.y);
       if (dottedGrid.queryCircle(a2, 1e-4).length > 0 || dottedGrid.queryCircle(b4, 1e-4).length > 0) {
@@ -8942,7 +8971,7 @@ class BayWindow {
       startingPoint = this.xinLine(MobileX, MobileY, data.start, data.direction);
       finishLine = this.xinLine(MobileX, MobileY, data.end, data.direction);
     }
-    const grid = createPointVirtualGrid(Scenario.Instance.lines);
+    const grid = createPointSpatialHash(Scenario.Instance.lines);
     const isDouble = grid.queryCircle(Point.from(data.start), 1e-3).some((item2) => LineGroupType.hasType(item2.userData, "doubleWall") || item2.userData?.userData.isDoor);
     const isDouble1 = grid.queryCircle(Point.from(data.end), 1e-3).some((item2) => LineGroupType.hasType(item2.userData, "doubleWall") || item2.userData?.userData.isDoor);
     let startingPoint1 = this.xinLine1(MobileY, MobileX, startingPoint[0], startingPoint[1], 0, wallHeightc);
@@ -9838,7 +9867,7 @@ class Scenario {
     });
     BayWindow.Instance?.overhangTreatment(bayWinList, singleLineWall);
     this.TheHandlingOfTheDoor(menList);
-    this.singleLineWallValue = createPointVirtualGrid(singleLineWall);
+    this.singleLineWallValue = createPointSpatialHash(singleLineWall);
     this.overallTreatmentOfSingleLineWalls(singleLineWall);
     for (const g in groups) {
       let wallHeight = 0;
@@ -10027,7 +10056,7 @@ class Scenario {
     const MobileY = this.angleToXAxisDegrees(data.start.x, data.start.y, data.end.x, data.end.y, DEFAULT_WALL_HALF_WIDTH + 0.01, false);
     let startingPoint = this.xinLine(MobileX, MobileY, data.start, 0);
     let finishLine = this.xinLine(MobileX, MobileY, data.end, 1);
-    const grid = createPointVirtualGrid(this.lines);
+    const grid = createPointSpatialHash(this.lines);
     const isDouble = grid.queryCircle(Point.from(data.start), 1e-3).some((item) => LineGroupType.hasType(item.userData, "doubleWall") || item.userData?.userData.isDoor);
     const isDouble1 = grid.queryCircle(Point.from(data.end), 1e-3).some((item) => LineGroupType.hasType(item.userData, "doubleWall") || item.userData?.userData.isDoor);
     let startingPoint1 = this.xinLine1(MobileY, MobileX, startingPoint[0], startingPoint[1], 0, wallHeightc);
@@ -10753,7 +10782,7 @@ class Scenario {
     for (const o in balconyLins) {
       this.installBalconys(balconyLins[o], o);
     }
-    const grid = createPointVirtualGrid(this.lines);
+    const grid = createPointSpatialHash(this.lines);
     let listS = this.correctionSorting(data);
     for (const i in listS) {
       if (Number(i) % 2 === 0 && Number(i) !== listS.length - 1) {
@@ -18702,7 +18731,7 @@ class DoorFind {
     this.lines = lines;
     const doors = lines.filter((line) => line.userData.isDoor), noDoorLines = lines.filter((line) => !line.userData.isDoor);
     const openDoors = doors.filter((line) => !line.userData.doorDirectConnection), closeDoors = doors.filter((line) => line.userData.doorDirectConnection);
-    this.grid = createPointVirtualGrid(noDoorLines);
+    this.grid = createPointSpatialHash(noDoorLines);
     this.quadtree = createQuadtree([...noDoorLines, ...closeDoors]);
     openDoors.forEach((l) => l.userData.doorDirectConnection = true);
     closeDoors.forEach((line) => this.findCloseDoors(line));
@@ -18712,7 +18741,7 @@ class DoorFind {
    * 查找兄弟门(双开门)
    */
   findBrotherDoor(lines) {
-    const grid = createPointVirtualGrid(lines);
+    const grid = createPointSpatialHash(lines);
     const doorLines = [];
     findDiscretePointLine2(lines).forEach((line) => line.userData.isDoor && doorLines.push(line));
     const searchedList = [];
@@ -18743,7 +18772,7 @@ class DoorFind {
       item.line = list[0]?.userData;
       item.linePoint = list[0]?.point;
     });
-    const doorGrid = new PointVirtualGrid(), minAngle = Math.PI / 180 * 170;
+    const doorGrid = new PointSpatialHash(), minAngle = Math.PI / 180 * 170;
     searchedList.forEach((item, index2) => item.line && doorGrid.insert(item.point, index2));
     const removeLines = [];
     searchedList.forEach((item) => {
@@ -18966,7 +18995,7 @@ class AxisAlignCorr {
     this.lines = lines;
     this.baseline = baseline;
     this.excludeLines = excludeLines ?? [];
-    this.grid = createPointVirtualGrid(lines);
+    this.grid = createPointSpatialHash(lines);
   }
   visited = /* @__PURE__ */ new Set();
   newLines = [];
@@ -19057,12 +19086,12 @@ class LineQueryer {
   pointVirtualGrid;
   quadtree;
   constructor(lines) {
-    this.pointVirtualGrid = createPointVirtualGrid(lines);
+    this.pointVirtualGrid = createPointSpatialHash(lines);
     this.quadtree = createQuadtree(lines);
   }
   update(lines) {
     this.clear();
-    this.pointVirtualGrid = createPointVirtualGrid(lines);
+    this.pointVirtualGrid = createPointSpatialHash(lines);
     this.quadtree = createQuadtree(lines);
   }
   clear() {
@@ -19115,7 +19144,7 @@ class LineQueryer {
   }
 }
 function removeDangline(lines, len = 0.01, consecutive = false) {
-  const grid = createPointVirtualGrid(lines);
+  const grid = createPointSpatialHash(lines);
   let defaultLines = [];
   const doorLines = [];
   const removeLineSet = /* @__PURE__ */ new Set();
@@ -19148,6 +19177,128 @@ function removeDangline(lines, len = 0.01, consecutive = false) {
   WallInsertObject.recomputed(defaultLines);
   return [...defaultLines, ...doorLines];
 }
+const DELETE_SYMBOL = /* @__PURE__ */ Symbol("DELETE_SYMBOL");
+const INTERSECT_COUNT = /* @__PURE__ */ Symbol("INTERSECT_COUNT");
+function fitting(lines) {
+  const index2 = LineSegmentUtils.maxLengthLineIndex(lines);
+  if (index2 === -1) throw Error("未找到最长线段");
+  const maxLine = lines[index2], center = LineSegmentUtils.getLinesCenter(lines), direct = maxLine.direction(), start = center.clone().add(direct.clone().multiplyScalar(-1)), end = center.clone().add(direct.clone().multiplyScalar(1));
+  return new LineSegment(start, end);
+}
+function layoutDesign(lines, axis) {
+  const blocks = lines.map((line, index2) => {
+    const sv = axis.projectPointValue(line.start), ev = axis.projectPointValue(line.end), range = sv < ev ? [sv, ev] : [ev, sv];
+    return { range, index: index2, rangeSize: range[1] - range[0] };
+  });
+  blocks.sort((a2, b4) => {
+    if (Math.abs(a2.range[0] - b4.range[0]) < 1e-4) return b4.rangeSize - a2.rangeSize;
+    return a2.range[0] - b4.range[0];
+  });
+  const newLines = [];
+  for (let i = 0; i < blocks.length; i++) {
+    const block = blocks[i], line = lines[block.index], ranges = [];
+    let start = block.range[0];
+    for (let j = i + 1; j < blocks.length; j++) {
+      const nextBlock = blocks[j], nextLine = lines[nextBlock.index];
+      const overlap = Math.min(block.range[1], nextBlock.range[1]) - Math.max(block.range[0], nextBlock.range[0]);
+      if (overlap < 0) break;
+      else if (!(overlap >= nextBlock.rangeSize && nextLine?.currentData[INTERSECT_COUNT] === 0) && nextBlock.range[0] > start) {
+        ranges.push([start, nextBlock.range[0]]);
+      }
+      start = Math.max(start, nextBlock.range[1]);
+    }
+    if (start < block.range[1]) ranges.push([start, block.range[1]]);
+    for (let j = 0; j < ranges.length; j++) {
+      const range = ranges[j], start2 = axis.pointAt(range[0]), end = axis.pointAt(range[1]);
+      if (j === 0) line.set(start2, end);
+      else {
+        let newLine = line.clone();
+        newLine.set(start2, end);
+        newLines.push(newLine);
+      }
+    }
+    if (ranges.length === 0) line.currentData[DELETE_SYMBOL] = true;
+  }
+  lines.push(...newLines);
+  return lines;
+}
+class AlignToParallelSegments {
+  /** 通过平行轴和垂直轴分组
+   * @param verticalLines 
+   * @param parallelAxis 平行轴
+   * @param verticalAxis 垂直轴
+   * @param esp 垂直投影值分组距离
+   * @param gap 平行轴投影区间间隙
+   */
+  static group(lines, parallelAxis, verticalAxis, esp = 0.05, gap = 0.01) {
+    const vls = lines.map((line) => [
+      verticalAxis.projectPointValue(line.start),
+      line,
+      [parallelAxis.projectPointValue(line.start), parallelAxis.projectPointValue(line.end)].sort((a2, b4) => a2 - b4)
+    ]).sort((a2, b4) => a2[0] - b4[0]), unionFindSet = new UnionFindSet(vls.length);
+    for (let i = 0; i < vls.length; i++) {
+      const [ipv, _iline, [istart, iend]] = vls[i];
+      for (let j = i + 1; j < vls.length; j++) {
+        const [jpv, _jline, [jstart, jend]] = vls[j];
+        if (jpv - ipv > esp) break;
+        const overlap = Math.min(iend, jend) - Math.max(istart, jstart);
+        if (overlap > -gap) unionFindSet.union(i, j);
+      }
+    }
+    const groups = unionFindSet.getAllSets().map((v2) => v2.map((v22) => vls[v22][1]));
+    return groups;
+  }
+  /** 拟合并对齐线段
+   * @param groups 
+   * @param verticalLines 
+   */
+  static fittingAlignment(groups, verticalLines) {
+    const grid = PointSpatialHash.fromByLines(verticalLines);
+    for (let i = 0; i < groups.length; i++) {
+      const group = groups[i];
+      if (group.length <= 1) continue;
+      const axisLine = fitting(group);
+      for (let j = 0; j < group.length; j++) {
+        const line = group[j];
+        let intersectCount = 0;
+        line.points.forEach((p2) => {
+          const intersectPoints = grid.queryCircle(p2, 1e-4).map((result) => result.point);
+          axisLine.pointAt(axisLine.projectPointValue(p2), p2);
+          intersectPoints.forEach((point2) => point2.copy(p2));
+          intersectCount += intersectPoints.length;
+        });
+        line.currentData[INTERSECT_COUNT] = intersectCount;
+      }
+      layoutDesign(group, axisLine);
+    }
+    return groups.flat().filter((line) => {
+      delete line.currentData[INTERSECT_COUNT];
+      if (line.length() < 1e-9) return false;
+      if (line.currentData[DELETE_SYMBOL]) {
+        delete line.currentData[DELETE_SYMBOL];
+        return false;
+      }
+      return true;
+    });
+  }
+  /** 对齐到平行线段, 请在垂直纠正（AxisAlignCorr）后使用
+   * @param lines 
+   * @returns 
+   */
+  static align(lines, esp = 0.05, gap = 0.01) {
+    const axisLine = lines[0], axisLineV = axisLine.clone().rotate(Math.PI * 0.5, axisLine.center);
+    let [pllLines, verticalLines] = LineSegmentUtils.groupByParallelToAxis(lines, axisLine);
+    const groups = this.group(pllLines, axisLine, axisLineV, esp, gap);
+    pllLines = this.fittingAlignment(groups, verticalLines);
+    verticalLines = verticalLines.filter((line) => line.length() > 1e-9);
+    const groups2 = this.group(verticalLines, axisLineV, axisLine, esp, gap);
+    verticalLines = this.fittingAlignment(groups2, pllLines);
+    return [
+      ...pllLines,
+      ...verticalLines
+    ];
+  }
+}
 function getNextPoint(point2, line, next, width) {
   if (next.length === 0) {
     const direct = point2.directionFrom(line.getAnotherPoint(point2));
@@ -19158,7 +19309,7 @@ function getNextPoint(point2, line, next, width) {
   return p2;
 }
 function stepElimination(lineSegments, findMinWidth = 0.1, onMerge) {
-  const grid = createPointVirtualGrid(lineSegments);
+  const grid = createPointSpatialHash(lineSegments);
   function getIntersInfo(line, point2) {
     const intersList = grid.queryCircle(point2, 1e-4).filter((item) => item.point !== point2);
     if (intersList.length == 0) return;
@@ -19268,12 +19419,20 @@ function stepEliminationMerge(target, _, source, oldLine) {
   WallInsertObject.recomputed([target]);
 }
 function linesSmoothing(lines, _) {
+  const other = [];
+  lines = lines.filter((line) => {
+    if (line.userData.isBayWindow) {
+      other.push(line);
+      return false;
+    }
+    return true;
+  });
   repetitiveTask(2, () => lines = stepElimination(lines, 0.1, stepEliminationMerge));
   WallInsertObject.recomputed(lines);
-  return lines;
+  return [...lines, ...other];
 }
 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 dpSet = findDiscretePoint(lines.filter((line) => !line.userData.isDoor)), pointVirtualGrid = createPointSpatialHash(dpSet.map((v2) => v2)), appendLines = [], visited = /* @__PURE__ */ new Set();
   const getWeight2 = (target, point2, line) => {
     if (target.weight) return target.weight;
     const targetLine = target.userData, targetPoint = target.point;
@@ -19300,7 +19459,7 @@ function shortDistanceLink(lines, radius = 0.1) {
   return [...lines, ...appendLines];
 }
 function linkByWindow(lines, radius = 0.1) {
-  const pvg = createPointVirtualGrid(lines);
+  const pvg = createPointSpatialHash(lines);
   lines.forEach((line) => {
     line.points.forEach((p2) => {
       if (pvg.queryCircle(p2, 1e-3, true).length !== 0) return;
@@ -19319,7 +19478,7 @@ function linkByWindow(lines, radius = 0.1) {
   return lines;
 }
 function preprocessing(lines) {
-  const pointVirtualGrid = new PointVirtualGrid(), quadtree = new Quadtree(Box2.fromByLineSegment(...lines)), doors = [];
+  const pointVirtualGrid = new PointSpatialHash(), quadtree = new Quadtree(Box2.fromByLineSegment(...lines)), doors = [];
   lines.forEach((line) => {
     if (line.userData.isDoor) doors.push(line);
     else {
@@ -19388,12 +19547,14 @@ function correction(lines, targettLine, option) {
   lines = lineSegmentClipping(lines, 1e-9);
   lines = preprocessing(lines);
   lines = AxisAlignCorr.start(lines, targettLine);
+  lines = lineSegmentClipping(lines, 1e-9);
+  lines = AlignToParallelSegments.align(lines);
+  new WallInsertObject(lines).recomputed().merge();
   lines = adsorption(lines, option);
   lines = lineSegmentClipping(lines, 1e-9);
   lines = removeDangline(lines, 0.1, false);
-  lines = linesSmoothing(lines);
   let newLines = lines.filter((line) => !line.userData.isDoor && !line.userData.isBalconyRailing);
-  let doorLines = lines.filter((line) => line.userData.isDoor || line.userData.isBalconyRailing);
+  let otherLines = lines.filter((line) => line.userData.isDoor || line.userData.isBalconyRailing);
   newLines = buildBayWindowGroup(newLines, false);
   const { wallGroup = true } = option ?? {};
   if (wallGroup) {
@@ -19402,9 +19563,9 @@ function correction(lines, targettLine, option) {
     newLines = buildBayWindowGroup(newLines, false);
   }
   new WallInsertObject(newLines).recomputed().merge();
-  newLines.push(...doorLines);
   newLines = removeDangline(newLines, 0.15, true);
   newLines = linesSmoothing(newLines);
+  newLines.push(...otherLines);
   return newLines.filter((line) => line.length() > 1e-9);
 }
 function axisAlignCorr(lines, option, verticalReferenceLine) {
@@ -19436,7 +19597,7 @@ function boundExt(lines, { trajectory: trajectory2, onBoundExt }) {
   return lines;
 }
 function doubleWallAlignment(lines) {
-  const singleWall = lines.filter((line) => !LineGroupType.hasType(line, "doubleWall") && !line.userData.isDoor), doorLines = lines.filter((line) => line.userData.isDoor), grid = createPointVirtualGrid(singleWall.filter((line) => !line.userData.isDoor)), allGrid = createPointVirtualGrid(lines), doubleWalls = LineGroupType.getGroupsByType(lines, "doubleWall"), offset = -DEFAULT_WALL_WIDTH * 0.5, tree = createQuadtree(doubleWalls.flat());
+  const singleWall = lines.filter((line) => !LineGroupType.hasType(line, "doubleWall") && !line.userData.isDoor), doorLines = lines.filter((line) => line.userData.isDoor), grid = createPointSpatialHash(singleWall.filter((line) => !line.userData.isDoor)), allGrid = createPointSpatialHash(lines), doubleWalls = LineGroupType.getGroupsByType(lines, "doubleWall"), offset = -DEFAULT_WALL_WIDTH * 0.5, tree = createQuadtree(doubleWalls.flat());
   const newDoubleWalls = doubleWalls.flatMap((doubleWall) => {
     const poly = Polygon.fromByLines2(doubleWall);
     Polygon.ensureCCW(poly);
@@ -19510,7 +19671,7 @@ function doubleWallAlignment(lines) {
   lines = lineSegmentClipping(lines);
   lines.push(...doorLines);
   WallInsertObject.recomputed(lines);
-  return lines;
+  return lines.filter((line) => line.length() > 1e-4);
 }
 const point = new Point();
 class HeightQuery {
@@ -19570,7 +19731,7 @@ function wallHeightHandle(lineSegments, option) {
   return lineSegments;
 }
 function doorSpaceHandle(lineSegments) {
-  const noDoorLines = lineSegments.filter((line) => !line.userData.isDoor), quadtree = createQuadtree(noDoorLines), pvg = createPointVirtualGrid(noDoorLines), doors = lineSegments.filter((line) => {
+  const noDoorLines = lineSegments.filter((line) => !line.userData.isDoor), quadtree = createQuadtree(noDoorLines), pvg = createPointSpatialHash(noDoorLines), doors = lineSegments.filter((line) => {
     if (!line.userData.isDoor) return false;
     let startCount = pvg.queryPoint(line.start, true).length;
     let endCount = pvg.queryPoint(line.end, true).length;
@@ -19600,7 +19761,7 @@ function doorSpaceHandle(lineSegments) {
   return lineSegments;
 }
 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);
+  const doubleWalls = LineGroupType.getGroupsByType(lineSegments, "doubleWall"), freePointLines = [...findDiscretePointLine2(lineSegments)].filter((line) => line.length() < 0.3), grid = createPointSpatialHash(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));
 }
 const PRE_PROCESSOR = {
@@ -22135,8 +22296,8 @@ const index$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   OBB: OBB2,
   PCSparseOctree,
   Point,
+  PointSpatialHash,
   PointUtils,
-  PointVirtualGrid,
   Polygon,
   PvgList,
   Quadtree,
@@ -22459,7 +22620,7 @@ export {
   HeightQuery as H,
   LineDashed as L,
   MiniCircles as M,
-  PointVirtualGrid as P,
+  PointSpatialHash as P,
   Quadtree as Q,
   SelectLocalFile as S,
   ThreeVJia as T,