build-dxf 0.1.78 → 0.1.80

package/package.json

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

package/src/build.js

@@ -3073,10 +3073,8 @@ class Box2 {
 class WallInsertObject {
   static mountedObjectType = [];
   lines;
-  mountedObjectLines;
   constructor(lines) {
     this.lines = lines;
-    this.mountedObjectLines = lines.filter((line) => this.isInsertObject(line));
   }
   /** 是否是墙体嵌入物
    * @param line 
@@ -3093,11 +3091,26 @@ class WallInsertObject {
    * @returns 
    */
   static isDoor(line) {
-    if (line.userData.isPassageEntrance) {
+    if (line.userData.isPassageEntrance && line.userData.passageEntrance?.length) {
       return line.userData.passageEntrance?.some((insertObject) => insertObject.type === "door");
     }
     return false;
   }
+  static isDoubleDoor(line) {
+    if (line.userData.isPassageEntrance && line.userData.passageEntrance?.length) {
+      const isDoubleDoor = line.userData.passageEntrance.some((item) => item.type === "door" && typeof this.getId(item) === "number");
+      return isDoubleDoor;
+    }
+    return false;
+  }
+  static getId(item) {
+    return item.id ?? item.doorId;
+  }
+  static getNearId(item) {
+    let nearId = item.nearId ?? item.nearDoorId;
+    if (nearId === -1) nearId = void 0;
+    return nearId;
+  }
   /** 遍历孔洞
    * @param line 
    * @returns 
@@ -3117,16 +3130,27 @@ class WallInsertObject {
    * @param line 
    * @returns 
    */
-  getMinWidth(key) {
+  static getMinWidth(key, type) {
     if (key === "drawWindow") return 0.3;
-    if (key === "passageEntrance") return 0;
+    if (key === "passageEntrance") {
+      if (type === "door") return 0.3;
+    }
     return 0;
   }
+  getMinWidth(key, type) {
+    return WallInsertObject.getMinWidth(key, type);
+  }
+  static clear(target, key) {
+    const eabledKey = key === "drawWindow" ? "isWindow" : "isPassageEntrance";
+    const key_ = key === "drawWindow" ? "drawWindow" : "passageEntrance";
+    target.userData[eabledKey] = false;
+    delete target.userData[key_];
+  }
   /**
    * 重新计算
    */
-  recomputed() {
-    this.mountedObjectLines.forEach((line) => {
+  static recomputed(lines) {
+    lines.forEach((line) => {
       this.forEachInsertObjectData(line, (data, key) => {
         data.forEach((w) => {
           try {
@@ -3142,17 +3166,21 @@ class WallInsertObject {
           } catch (error) {
           }
         });
-        const minW = this.getMinWidth(key);
-        line.userData[key] = data.filter((w) => w.width > minW);
+        line.userData[key] = data.filter((w) => w.width > WallInsertObject.getMinWidth(key, w.type));
+        if (line.userData[key].length === 0) WallInsertObject.clear(line, key);
       });
     });
     return this;
   }
+  recomputed(lines = this.lines) {
+    WallInsertObject.recomputed(lines);
+    return this;
+  }
   /**
    * 重新计算位置
    */
-  recomputedCenter() {
-    this.mountedObjectLines.forEach((line) => {
+  static recomputedCenter(lines) {
+    lines.forEach((line) => {
       this.forEachInsertObjectData(line, (data, key) => {
         data.forEach((w) => {
           try {
@@ -3171,11 +3199,15 @@ class WallInsertObject {
     });
     return this;
   }
+  recomputedCenter(lines = this.lines) {
+    WallInsertObject.recomputedCenter(lines);
+    return this;
+  }
   /**
    * 对重合的进行合并
    */
-  merge() {
-    this.mountedObjectLines.forEach((line) => {
+  static merge(lines) {
+    lines.forEach((line) => {
       this.forEachInsertObjectData(line, (data, key) => {
         const direction = line.direction();
         const embeddedLines = data.map((w) => {
@@ -3229,6 +3261,10 @@ class WallInsertObject {
     });
     return this;
   }
+  merge(lines = this.lines) {
+    WallInsertObject.merge(lines);
+    return this;
+  }
   /** 添加孔洞
    * @param target 
    * @param insertObject 
@@ -3258,16 +3294,8 @@ class WallInsertObject {
   copyInsertObject(target, source) {
     WallInsertObject.copyInsertObject(target, source);
   }
-  static recomputed(lines) {
-    new WallInsertObject(lines).recomputed();
-  }
-  static recomputedCenter(lines) {
-    new WallInsertObject(lines).recomputedCenter();
-  }
-  static merge(lines) {
-    new WallInsertObject(lines).merge();
-  }
 }
+const WIO = WallInsertObject;
 function clippingLineUserData(newLine, line2) {
   const { drawWindow, passageEntrance, ...opt } = line2.userData;
   WallInsertObject.forEachInsertObjectData(line2, (data, key) => {
@@ -6545,22 +6573,56 @@ class MaxiCircles extends MiniCircles {
     };
   }
 }
+const maxiCircles$1 = new MaxiCircles();
+function buildBayWindowGroup(lines, clear = true) {
+  const bayWindowLines = lines.filter((line) => line.userData.isBayWindow), groupedLineSet = /* @__PURE__ */ new Set();
+  const removeSet = findDiscretePointLine2(lines, null, true);
+  const lines_ = lines.filter((line) => !removeSet.has(line));
+  lines.forEach((line) => {
+    if (LineGroupType.hasType(line, "bayWindow")) {
+      if (line.userData.isWindow) line.currentData.isBayWindowLine = true;
+      LineGroupType.removeByType(line, "bayWindow");
+    }
+  });
+  const grid = createPointVirtualGrid(lines);
+  removeSet.clear();
+  bayWindowLines.forEach((bayWindowLine) => {
+    let { circles } = maxiCircles$1.miniCircle(lines_, { circleEdges: [bayWindowLine] });
+    circles = circles.filter((group) => group.some((line) => line.userData.isWindow && line.currentData.isBayWindowLine));
+    if (circles.length) {
+      grid.queryPolygon(Polygon.fromByLines(circles[0]), "inside").forEach((res) => removeSet.add(res.userData));
+    }
+    const id = uuid();
+    if (circles.length) {
+      const group = circles[0];
+      group.forEach((line) => {
+        clear && LineGroupType.clear(line);
+        LineGroupType.set(line, id, "bayWindow", true);
+        groupedLineSet.add(line);
+      });
+    } else clear && LineGroupType.clear(bayWindowLine);
+  });
+  lines = lines.filter((line) => !removeSet.has(line));
+  clear && lines.forEach((line) => groupedLineSet.has(line) || LineGroupType.clear(line));
+  return lines;
+}
 const maxiCircles = new MaxiCircles();
 let trajectory;
 function isDoublePeDoorCircle(circle) {
   const doors = circle.filter((line) => line.userData.passageEntrance?.some((item) => item.type === "door")), map = /* @__PURE__ */ new Map(), matching = [];
   doors.forEach((door) => {
     door.userData.passageEntrance.forEach((item) => {
-      if (typeof item.doorId === "number" && typeof item.nearDoorId === "number") {
-        if (map.has(item.nearDoorId)) matching.push([map.get(item.nearDoorId), door]);
-        map.set(item.doorId, door);
+      const id = WIO.getId(item);
+      const nearId = WIO.getNearId(item);
+      if (typeof id === "number" && typeof nearId === "number") {
+        if (map.has(nearId)) matching.push([map.get(nearId), door]);
+        map.set(id, door);
       }
     });
   });
   return matching.length > 0;
 }
 function isPolyHasTrajectoryPoint(lines) {
-  if (isDoublePeDoorCircle(lines)) return true;
   if (!trajectory) return true;
   const ploy = Polygon.fromByLines2(lines);
   const box = ploy.getBox2();
@@ -6571,21 +6633,56 @@ function isPolyHasTrajectoryPoint(lines) {
   }
   return true;
 }
-function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
-  const doorLines = [], otherLines = [];
-  for (let i = 0; i < lines_.length; i++) {
-    const line = lines_[i];
+function initData(lines) {
+  const doorLines = [], otherLines = [], bayWindowLines = [], peDoors = [], peDoubleDoors = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
     if (line.userData.isDoor) {
       doorLines.push(line);
       continue;
     }
     if (line.userData.isBayWindow) {
+      bayWindowLines.push(line);
+      continue;
+    }
+    if (line.userData.isPassageEntrance && line.userData.passageEntrance?.length) {
+      const isDoubleDoor = line.userData.passageEntrance.some((item) => typeof WIO.getNearId(item) === "number");
+      if (isDoubleDoor) peDoubleDoors.push(line);
+      else peDoors.push(line);
       continue;
     }
     otherLines.push(line);
   }
+  return { doorLines, otherLines, bayWindowLines, peDoors, peDoubleDoors };
+}
+function getPeDoubleDoorCircles(lines, peDoubleDoorLines) {
+  let allLines = [...lines, ...peDoubleDoorLines];
+  const notFoundLines = [];
+  const circlesList = [];
+  for (let i = 0; i < peDoubleDoorLines.length; i++) {
+    const line = peDoubleDoorLines[i];
+    let { circles } = maxiCircles.miniCircle(allLines, { circleEdges: [line] });
+    const finalCircles = circles.filter(isDoublePeDoorCircle);
+    if (finalCircles.length) circlesList.push(...finalCircles);
+    else notFoundLines.push(line);
+  }
+  return {
+    circlesList,
+    notFoundLines
+  };
+}
+function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
+  const {
+    doorLines,
+    otherLines,
+    // bayWindowLines,
+    // peDoors,
+    peDoubleDoors
+  } = initData(lines_);
+  const { notFoundLines, circlesList } = getPeDoubleDoorCircles(otherLines, peDoubleDoors);
+  otherLines.push(...notFoundLines);
   let { internalEdges, circles } = maxiCircles.maxiCircles(otherLines, (circles2) => circles2.filter(isPolyHasTrajectoryPoint));
-  const finalCircles = circles.filter((circle) => circle.length > 3);
+  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));
   otherLines.forEach((line) => !finalCirclesSet.has(line) && grid.insert(line.center, line));
@@ -6614,38 +6711,6 @@ const buildDoubleWallGroup = Object.assign(buildDoubleWallGroup_, {
     else trajectory = void 0;
   }
 });
-function buildBayWindowGroup(lines, clear = true) {
-  const bayWindowLines = lines.filter((line) => line.userData.isBayWindow), groupedLineSet = /* @__PURE__ */ new Set();
-  const removeSet = findDiscretePointLine2(lines, null, true);
-  const lines_ = lines.filter((line) => !removeSet.has(line));
-  lines.forEach((line) => {
-    if (LineGroupType.hasType(line, "bayWindow")) {
-      if (line.userData.isWindow) line.currentData.isBayWindowLine = true;
-      LineGroupType.removeByType(line, "bayWindow");
-    }
-  });
-  const grid = createPointVirtualGrid(lines);
-  removeSet.clear();
-  bayWindowLines.forEach((bayWindowLine) => {
-    let { circles } = maxiCircles.miniCircle(lines_, { circleEdges: [bayWindowLine] });
-    circles = circles.filter((group) => group.some((line) => line.userData.isWindow && line.currentData.isBayWindowLine));
-    if (circles.length) {
-      grid.queryPolygon(Polygon.fromByLines(circles[0]), "inside").forEach((res) => removeSet.add(res.userData));
-    }
-    const id = uuid();
-    if (circles.length) {
-      const group = circles[0];
-      group.forEach((line) => {
-        clear && LineGroupType.clear(line);
-        LineGroupType.set(line, id, "bayWindow", true);
-        groupedLineSet.add(line);
-      });
-    } else clear && LineGroupType.clear(bayWindowLine);
-  });
-  lines = lines.filter((line) => !removeSet.has(line));
-  clear && lines.forEach((line) => groupedLineSet.has(line) || LineGroupType.clear(line));
-  return lines;
-}
 class DoubleWallHelper {
   static errorAngle = 4;
   /** 线段投影分析
@@ -8448,7 +8513,7 @@ class AxisAlignCorr {
   }
 }
 function shortDistanceLink(lines, radius = 0.1) {
-  const dpLines = [...findDiscretePointLine2(lines.filter((line) => !line.userData.isDoor), void 0, false)], pointVirtualGrid = createPointVirtualGrid(dpLines), appendLines = [], visited = /* @__PURE__ */ new Set();
+  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) => {
     if (target.weight) return target.weight;
     const targetLine = target.userData, targetPoint = target.point;
@@ -8456,24 +8521,21 @@ function shortDistanceLink(lines, radius = 0.1) {
     target.weight = weight;
     return weight;
   };
-  for (let i = 0; i < dpLines.length; i++) {
-    const line = dpLines[i];
+  for (const [point2, line] of dpSet) {
     if (line.userData.isDoor) continue;
-    line.points.forEach((point2) => {
-      if (visited.has(point2)) return false;
-      const list = pointVirtualGrid.queryCircle(point2, radius, true).map((item) => Object.assign({}, item)).filter((item) => {
-        const targetLine2 = item.userData, targetPoint2 = item.point, direct1 = line.getAnotherPoint(point2).directionFrom(point2), direct2 = targetLine2.getAnotherPoint(targetPoint2).directionFrom(targetPoint2), angle = direct1.angleBetween(direct2, "angle");
-        return angle > 90;
-      }).sort((a2, b4) => getWeight2(b4, point2, line) - getWeight2(a2, point2, line));
-      if (list.length === 0) return;
-      const { point: targetPoint } = list[0];
-      const targetLine = list[0].userData;
-      visited.add(point2);
-      visited.add(targetPoint);
-      const projectLine1 = line.projectLineSegment(targetLine), projectLine2 = targetLine.projectLineSegment(line), len1 = projectLine1.length(), len2 = projectLine2.length();
-      if (len1 === 0 && len2 === 0) appendLines.push(new LineSegment(point2.clone(), list[0].point.clone()));
-      else appendLines.push(new LineSegment(projectLine1.center, projectLine2.center));
-    });
+    if (visited.has(point2)) continue;
+    const list = pointVirtualGrid.queryCircle(point2, radius, true).map((item) => Object.assign({}, item)).filter((item) => {
+      const targetLine2 = item.userData, targetPoint2 = item.point, direct1 = line.getAnotherPoint(point2).directionFrom(point2), direct2 = targetLine2.getAnotherPoint(targetPoint2).directionFrom(targetPoint2), angle = direct1.angleBetween(direct2, "angle");
+      return angle > 90;
+    }).sort((a2, b4) => getWeight2(b4, point2, line) - getWeight2(a2, point2, line));
+    if (list.length === 0) continue;
+    const { point: targetPoint } = list[0];
+    const targetLine = list[0].userData;
+    visited.add(point2);
+    visited.add(targetPoint);
+    const projectLine1 = line.projectLineSegment(targetLine), projectLine2 = targetLine.projectLineSegment(line), len1 = projectLine1.length(), len2 = projectLine2.length();
+    if (len1 === 0 && len2 === 0) appendLines.push(new LineSegment(point2.clone(), list[0].point.clone()));
+    else appendLines.push(new LineSegment(projectLine1.center, projectLine2.center));
   }
   return [...lines, ...appendLines];
 }
@@ -19229,19 +19291,16 @@ 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 connectionCorr(point2, next, line, width) {
+function getNextPoint(point2, line, next, width) {
   if (next.length === 0) {
     const direct = point2.directionFrom(line.getAnotherPoint(point2));
-    point2.add(direct.multiplyScalar(width));
-    return true;
+    return direct.multiplyScalar(width);
   }
   const p2 = next[0].userData.projectPoint(point2, false);
   if (!p2) return false;
-  point2.copy(p2);
-  next.forEach((d2) => d2.point.copy(p2));
-  return true;
+  return p2;
 }
-function stepElimination$1(lineSegments, callBack) {
+function stepElimination(lineSegments, onMerge) {
   const grid = createPointVirtualGrid(lineSegments);
   const minWidth = 0.1;
   function getIntersInfo(line, point2) {
@@ -19262,7 +19321,6 @@ function stepElimination$1(lineSegments, callBack) {
     }
     if (count !== 1) return;
     if (!firstLine || !firstPoint) return;
-    if (parallel2.length !== 0) return;
     const firstOtherPoint = firstLine.getAnotherPoint(firstPoint);
     const nextResult = grid.queryPoint(firstOtherPoint, true);
     return {
@@ -19298,16 +19356,22 @@ function stepElimination$1(lineSegments, callBack) {
       mainInfo = endInfo;
       secondaryInfo = startInfo;
     }
-    const oldLine = mainInfo.firstLine.clone();
-    if (!connectionCorr(mainInfo.firstPoint, secondaryInfo.next, mainInfo.firstLine, secondaryInfo.length)) continue;
-    removeLines.push(secondaryInfo.firstLine, line);
-    secondaryInfo.firstLine.points.forEach((p2) => grid.remove(p2));
-    line.points.forEach((p2) => grid.remove(p2));
-    mainInfo.firstLine.points.forEach((p2) => grid.update(p2));
-    if (typeof callBack === "function") callBack(mainInfo.firstLine, line, secondaryInfo.firstLine, oldLine);
+    const parallel2 = startInfo.parallel.concat(endInfo.parallel);
+    const newPoint = getNextPoint(mainInfo.firstPoint, mainInfo.firstLine, secondaryInfo.next, secondaryInfo.length);
+    if (!newPoint) continue;
+    if (parallel2.length === 0) {
+      const oldLine = mainInfo.firstLine.clone();
+      mainInfo.firstPoint.copy(newPoint);
+      secondaryInfo.next.forEach((d2) => d2.point.copy(newPoint));
+      removeLines.push(secondaryInfo.firstLine, line);
+      line.points.concat(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);
+    }
   }
   const removeLinesSet = new Set(removeLines);
   lineSegments = lineSegments.filter((line) => !removeLinesSet.has(line));
+  lineSegments = lineSegmentClipping(lineSegments, 0);
   return lineSegments;
 }
 function repetitiveTask(count, callfun) {
@@ -19315,32 +19379,31 @@ function repetitiveTask(count, callfun) {
     callfun(i);
   }
 }
-function stepElimination(lines, opt) {
-  repetitiveTask(2, () => {
-    lines = stepElimination$1(lines, (target, _, source, oldLine) => {
-      if (source.userData.isDoor) WallInsertObject.addInsertObject(target, {
-        p: source.center.toJson(opt?.originalZ),
-        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(opt?.originalZ),
-          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 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(1, () => lines = stepElimination(lines, stepEliminationMerge));
   return lines;
 }
 const PRE_PROCESSOR = {
@@ -19361,9 +19424,9 @@ const PRE_PROCESSOR = {
   /** 处理门线垂直方向有其他线段遮挡的情况
    */
   DoorSpaceHandle: doorSpaceHandle,
-  /** 阶梯合并
+  /** 线段平滑处理
    */
-  StepElimination: stepElimination,
+  LinesSmoothing: linesSmoothing,
   /** 移除与双线墙链接的短线段
    */
   RemoveShortDoubleWall: removeShortDoubleWall
@@ -22104,7 +22167,7 @@ async function buildJson(opt) {
   doorFind && (dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorSpaceHandle), dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorFind), dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.DoorSpaceHandle));
   if (opt.axisAlignCorr !== false) {
     dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.AxisAlignCorr);
-    dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.StepElimination);
+    dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.LinesSmoothing);
     dxfSystem.Dxf.addPreProcessor(PRE_PROCESSOR.RemoveShortDoubleWall);
   }
   if (trajectory2) {

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;
-        StepElimination: typeof import('../utils/lineHandle/CadPreProcessor/stepElimination').stepElimination;
+        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/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;
-        StepElimination: typeof import('../utils/lineHandle/CadPreProcessor/stepElimination').stepElimination;
+        LinesSmoothing: typeof import('../utils/lineHandle/CadPreProcessor/linesSmoothing').linesSmoothing;
         RemoveShortDoubleWall: typeof import('../utils/lineHandle/CadPreProcessor/removeShortDoubleWall').removeShortDoubleWall;
     };
     width: number;

package/src/utils/DxfSystem/type.d.ts

@@ -20,6 +20,8 @@ export interface InsertObject {
     height?: number;
     groundClearance?: number;
     type?: "door";
+    id?: number;
+    nearId?: number;
     doorId?: number;
     nearDoorId?: number;
 }

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 { stepElimination } from './stepElimination';
+import { linesSmoothing } from './linesSmoothing';
 /**
  * 默认提供的预处理函数
  */
@@ -28,9 +28,9 @@ export declare const PRE_PROCESSOR: {
     /** 处理门线垂直方向有其他线段遮挡的情况
      */
     DoorSpaceHandle: typeof doorSpaceHandle;
-    /** 阶梯合并
+    /** 线段平滑处理
      */
-    StepElimination: typeof stepElimination;
+    LinesSmoothing: typeof linesSmoothing;
     /** 移除与双线墙链接的短线段
      */
     RemoveShortDoubleWall: typeof removeShortDoubleWall;

package/src/utils/DxfSystem/utils/lineHandle/CadPreProcessor/{stepElimination.d.ts → linesSmoothing.d.ts}

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

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

@@ -0,0 +1,7 @@
+import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
+import { LineUserData } from '../../../type';
+/** 构建飘窗组组结构
+ * @param lines
+ * @returns
+ */
+export declare function buildBayWindowGroup(lines: LineSegment<LineUserData>[], clear?: boolean): LineSegment<LineUserData>[];

package/src/utils/DxfSystem/utils/lineHandle/{buildGroup.d.ts → buildGroup/buildDoubleWallGroup.d.ts}

@@ -1,5 +1,5 @@
-import { LineSegment } from '../../../algorithmsStructures/LineSegment';
-import { LineUserData } from '../../type';
+import { LineSegment } from '../../../../algorithmsStructures/LineSegment';
+import { LineUserData } from '../../../type';
 /** 双线墙
  * @param lines_
  * @param clearInternalLine
@@ -10,8 +10,3 @@ export declare function buildDoubleWallGroup_(lines_: LineSegment<LineUserData>[
 export declare const buildDoubleWallGroup: typeof buildDoubleWallGroup_ & {
     setTrajectory(trajectory_: Record<string, any> | undefined): void;
 };
-/** 构建飘窗组组结构
- * @param lines
- * @returns
- */
-export declare function buildBayWindowGroup(lines: LineSegment<LineUserData>[], clear?: boolean): LineSegment<LineUserData>[];

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

@@ -0,0 +1,2 @@
+export * from './buildBayWindowGroup';
+export * from './buildDoubleWallGroup';

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

@@ -2,12 +2,11 @@ import { LineSegment } from '../../../algorithmsStructures/LineSegment';
 import { InsertObject, LineUserData } from '../../type';
 type InsertObjectKey = 'drawWindow' | 'passageEntrance';
 /**
- * 墙体嵌入物（窗户、空洞）
+ * 墙体嵌入物（窗户、空洞）处理
  */
 export declare class WallInsertObject {
     static mountedObjectType: never[];
     lines: LineSegment<LineUserData>[];
-    mountedObjectLines: LineSegment<LineUserData>[];
     constructor(lines: LineSegment<LineUserData>[]);
     /** 是否是墙体嵌入物
      * @param line
@@ -19,7 +18,10 @@ export declare class WallInsertObject {
      * @param line
      * @returns
      */
-    static isDoor(line: LineSegment<LineUserData>): boolean | undefined;
+    static isDoor(line: LineSegment<LineUserData>): boolean;
+    static isDoubleDoor(line: LineSegment<LineUserData>): boolean;
+    static getId(item: InsertObject): number | undefined;
+    static getNearId(item: InsertObject): number | undefined;
     /** 遍历孔洞
      * @param line
      * @returns
@@ -30,19 +32,24 @@ export declare class WallInsertObject {
      * @param line
      * @returns
      */
-    getMinWidth(key: InsertObjectKey): 0 | 0.3;
+    static getMinWidth(key: InsertObjectKey, type?: 'door'): 0 | 0.3;
+    getMinWidth(key: InsertObjectKey, type?: 'door'): 0 | 0.3;
+    static clear(target: LineSegment, key: InsertObjectKey): void;
     /**
      * 重新计算
      */
-    recomputed(): this;
+    static recomputed(lines: LineSegment[]): typeof WallInsertObject;
+    recomputed(lines?: LineSegment<LineUserData>[]): this;
     /**
      * 重新计算位置
      */
-    recomputedCenter(): this;
+    static recomputedCenter(lines: LineSegment[]): typeof WallInsertObject;
+    recomputedCenter(lines?: LineSegment[]): this;
     /**
      * 对重合的进行合并
      */
-    merge(): this;
+    static merge(lines: LineSegment[]): typeof WallInsertObject;
+    merge(lines?: LineSegment[]): this;
     /** 添加孔洞
      * @param target
      * @param insertObject
@@ -56,8 +63,6 @@ export declare class WallInsertObject {
      */
     static copyInsertObject(target: LineSegment<LineUserData>, source: LineSegment<LineUserData>): void;
     copyInsertObject(target: LineSegment<LineUserData>, source: LineSegment<LineUserData>): void;
-    static recomputed(lines: LineSegment[]): void;
-    static recomputedCenter(lines: LineSegment[]): void;
-    static merge(lines: LineSegment[]): void;
 }
+export declare const WIO: typeof WallInsertObject;
 export {};

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

@@ -3,4 +3,4 @@ import { LineSegment } from './LineSegment';
  * @param lineSegments
  * @returns
  */
-export declare function stepElimination(lineSegments: LineSegment[], callBack?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];
+export declare function stepElimination(lineSegments: LineSegment[], onMerge?: (mainLine: LineSegment, sortLine: LineSegment, secondaryLine: LineSegment, oldLine: LineSegment) => void): LineSegment<Record<string, any>>[];