build-dxf 0.1.107 → 0.1.109

package/package.json

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

package/src/build.js

@@ -905,6 +905,7 @@ class LineSegment {
    * @returns 
    */
   intersectLineSegment(line, endpoint = true) {
+    const EPSILON = 1e-10;
     const p1 = this.start;
     const p2 = this.end;
     const p3 = line.start;
@@ -913,7 +914,7 @@ class LineSegment {
       return (b4.x - a2.x) * (c.y - a2.y) - (b4.y - a2.y) * (c.x - a2.x);
     }
     function isPointOnSegment(pt2, segStart, segEnd) {
-      return Math.min(segStart.x, segEnd.x) - 1e-10 <= pt2.x && pt2.x <= Math.max(segStart.x, segEnd.x) + 1e-10 && Math.min(segStart.y, segEnd.y) - 1e-10 <= pt2.y && pt2.y <= Math.max(segStart.y, segEnd.y) + 1e-10;
+      return Math.min(segStart.x, segEnd.x) - EPSILON <= pt2.x && pt2.x <= Math.max(segStart.x, segEnd.x) + EPSILON && Math.min(segStart.y, segEnd.y) - EPSILON <= pt2.y && pt2.y <= Math.max(segStart.y, segEnd.y) + EPSILON;
     }
     const d1 = crossProduct(p1, p2, p3);
     const d2 = crossProduct(p1, p2, p4);
@@ -923,16 +924,16 @@ class LineSegment {
       return true;
     }
     if (endpoint) {
-      if (Math.abs(d1) < 1e-10 && isPointOnSegment(p3, p1, p2)) {
+      if (Math.abs(d1) < EPSILON && isPointOnSegment(p3, p1, p2)) {
         return true;
       }
-      if (Math.abs(d2) < 1e-10 && isPointOnSegment(p4, p1, p2)) {
+      if (Math.abs(d2) < EPSILON && isPointOnSegment(p4, p1, p2)) {
         return true;
       }
-      if (Math.abs(d3) < 1e-10 && isPointOnSegment(p1, p3, p4)) {
+      if (Math.abs(d3) < EPSILON && isPointOnSegment(p1, p3, p4)) {
         return true;
       }
-      if (Math.abs(d4) < 1e-10 && isPointOnSegment(p2, p3, p4)) {
+      if (Math.abs(d4) < EPSILON && isPointOnSegment(p2, p3, p4)) {
         return true;
       }
     }
@@ -2460,7 +2461,11 @@ class WallInsertObject {
    */
   static isDouble(line) {
     if (line.userData.isPassageEntrance && line.userData.passageEntrance?.length) {
-      return line.userData.passageEntrance.some((item) => typeof this.getNearId(item) === "number");
+      return line.userData.passageEntrance.some((item) => {
+        const nearId = this.getNearId(item);
+        const id = this.getId(item);
+        return typeof nearId === "number" && typeof id === "number" && id !== nearId;
+      });
     }
     return false;
   }
@@ -3193,6 +3198,23 @@ class LineSegmentUtils {
     }
     return new Point(x / totalWeight, y / totalWeight);
   }
+  /** 自定义分组
+   * @param lines 
+   * @returns 
+   */
+  static group(lines, callBackFun) {
+    const arrayMap = new ArrayMap();
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      const key = callBackFun(line);
+      arrayMap.append(key, line);
+    }
+    const result = arrayMap.reduce((list, lines2, key) => {
+      list[key] = lines2;
+      return list;
+    }, {});
+    return result;
+  }
   /** 通过在同一路径上且平行的线段分组
    * @param lines 
    */
@@ -5991,7 +6013,7 @@ function lineSegmentClipping(lines, minLen = 1e-9, dedup = true) {
   const quadtree = new Quadtree(Box2.fromByLineSegment(...lines));
   lines.forEach((line) => quadtree.insert({ line, userData: void 0 }));
   let newLines = lines.flatMap((line) => {
-    const points = quadtree.queryRect(line.toRectangle(0.01, "butt")).map((res) => {
+    const points = quadtree.queryLineSegment(line).map((res) => {
       if (res.line === line) return;
       const point2 = res.line.getIntersection(line);
       if (!point2 || line.start.equal(point2) || line.end.equal(point2)) return;
@@ -9479,7 +9501,7 @@ function initData(lines) {
       continue;
     }
     if (line.userData.isPassageEntrance && line.userData.passageEntrance?.length) {
-      const isDoubleDoor = line.userData.passageEntrance.some((item) => typeof WIO.getNearId(item) === "number");
+      const isDoubleDoor = WIO.isDouble(line);
       if (isDoubleDoor) peDoubleDoors.push(line);
       else peDoors.push(line);
       continue;
@@ -9572,6 +9594,10 @@ const holeTypeMap = {
   passageEntrance: "WALL_HOLE",
   bay_window: "BAY_WINDOW"
 };
+const placeHoldersMap = {
+  switch: "开关",
+  socket: "插座"
+};
 const WALL_HEIGHT_KEY = /* @__PURE__ */ Symbol("height");
 class ThreeVJiaPipeline extends Pipeline {
   manager;
@@ -9604,17 +9630,10 @@ class ThreeVJiaPipeline extends Pipeline {
       if (lines2.length < 4) return lines2;
       let newLine = null;
       let wallWidth = 0;
-      const poly = Polygon.fromByLinePath(lines2).getMinimumBoundingRectangle();
-      if (poly) {
-        const len1 = poly[0].distance(poly[1]), len2 = poly[1].distance(poly[2]), direct = len1 > len2 ? poly[0].directionFrom(poly[1]) : poly[1].directionFrom(poly[2]), center = poly.getCenter(), len = Math.max(len1, len2);
-        newLine = center.expandAsLine(direct, len).translate(-len * 0.5, direct);
-        wallWidth = Math.min(len1, len2);
-      } else {
-        lines2 = [...lines2].sort((a2, b4) => a2.length() - b4.length());
-        const line1 = lines2[0], line2 = lines2[1];
-        newLine = new LineSegment(line1.center.clone(), line2.center.clone());
-        wallWidth = line1.length();
-      }
+      lines2 = [...lines2].sort((a2, b4) => a2.length() - b4.length());
+      const line1 = lines2[0], line2 = lines2[1];
+      newLine = new LineSegment(line1.center.clone(), line2.center.clone());
+      wallWidth = line1.length();
       mergeLineUserData(newLine, lines2);
       newLine.userData.wallWidth = wallWidth;
       return [newLine];
@@ -9795,13 +9814,13 @@ class ThreeVJiaPipeline extends Pipeline {
     const rooms = json.rooms, roomPloys = rooms.map((room) => new Polygon(room.polygon.map((p2) => Point.from(p2))));
     if (roomPloys.length === 0) return json;
     publicInfo.itemInfo.forEach((item, i) => {
-      if (item.category !== "switch" && item.category !== "socket") return;
+      if (!placeHoldersMap[item.category]) return;
       const itemPoly = new Polygon(item.contour.map((p2) => Point.from(p2).rotate(json.center, json.angle))), center = itemPoly.getCenter(), index2 = roomPloys.findIndex((poly) => poly.pointWithin(center));
       if (index2 < 0) return;
       json.placeHolders.push({
-        name: item.category,
-        polygon: item.contour,
-        direction: item.direction,
+        name: placeHoldersMap[item.category],
+        polygon: itemPoly.getMinimumBoundingRectangle().map((p2) => p2.toJson2D()),
+        direction: Point.from(item.direction).rotate(Point.zero(), json.angle),
         height: item.box.max.z - item.box.min.z,
         sillHeight: item.box.min.z - z,
         roomId: rooms[index2].roomTypeId,
@@ -10568,6 +10587,10 @@ class DxfDataPlugin extends Pipeline {
     super();
     this.lines = lines;
     this.manager = WallGroupManager.fromByLines(lines);
+    this.init();
+  }
+  init() {
+    this.manager.forEach((group) => this.run(group.type, { lines: group.lines }));
   }
   install(cad) {
     const wallGroupManager = this.manager, lines = this.lines;
@@ -10610,168 +10633,6 @@ class DxfDataPlugin extends Pipeline {
     cad.addGroup(bayWindowLines, "bayWindow");
   }
 }
-class DoubleWallHelper {
-  static errorAngle = 4;
-  /** 线段投影分析
-   * @param index 
-   * @param sourceLineSegment 
-   * @param lineSegmentList 
-   * @returns 
-   */
-  static projectionAnalysis(index2, sourceIndex, sourceLineSegment, lineSegmentList) {
-    const temLineSegment = lineSegmentList[index2], direct = sourceLineSegment.direction(), temDirect = temLineSegment.direction(), angle = direct.angle(temDirect, { unit: "degree", range: "180" });
-    if (angle < this.errorAngle || angle > 180 - this.errorAngle) {
-      let data;
-      let dist = sourceLineSegment.distanceToSegment(temLineSegment);
-      const p1 = temLineSegment.projectLineSegment(sourceLineSegment), p2 = sourceLineSegment.projectLineSegment(temLineSegment);
-      if (p1.length() > p2.length()) {
-        data = {
-          target: temLineSegment,
-          targetIndex: index2,
-          source: sourceLineSegment,
-          sourceIndex,
-          project: p1,
-          project2: p2,
-          minDistance: dist
-        };
-      } else {
-        data = {
-          target: sourceLineSegment,
-          targetIndex: sourceIndex,
-          source: temLineSegment,
-          sourceIndex: index2,
-          project: p2,
-          project2: p1,
-          minDistance: dist
-        };
-      }
-      if (!data || data.project.length() < 0.08 || data.project2.length() < 0.08) return;
-      return data;
-    }
-  }
-  /** 查找
-   * @param lines 
-   * @param wallWidth 
-   * @returns 
-   */
-  static findDoubleLine(lines, wallWidth = 0.4) {
-    let walls = lines.filter((line) => !line.userData.isDoor), visited = /* @__PURE__ */ new Set(), resultList = [];
-    walls = walls.filter((line) => !line.userData.isWindowWall);
-    let quadtree = new Quadtree(Box2.fromByLineSegment(...walls));
-    walls.forEach((line, index2) => quadtree.insert({ line, userData: index2 }));
-    walls.forEach((sourceLineSegment, i) => {
-      const rectangle = Rectangle.fromByLineSegment(sourceLineSegment, wallWidth * 2, false, -0.01), ids = quadtree.queryRect(rectangle).map((i2) => i2.userData).filter((index2) => index2 !== i);
-      ids.forEach((id) => {
-        try {
-          if (visited.has(`${i}-${id}`) || visited.has(`${id}-${i}`)) return;
-          const res = this.projectionAnalysis(id, i, sourceLineSegment, walls);
-          if (res) resultList.push(res);
-          visited.add(`${i}-${id}`);
-        } catch (error) {
-          console.log(error);
-        }
-      });
-    });
-    resultList.forEach((result) => {
-      const project0 = result.project, project1 = result.project2;
-      if (project0.angle(project1, { unit: "degree", range: "180" }) > 135) {
-        project1.points = [project1.points[1], project1.points[0]];
-      }
-    });
-    return {
-      resultList,
-      walls,
-      quadtree
-    };
-  }
-  /** 补双线墙壁
-   * @param lines 
-   * @param wallWidth 
-   * @returns 
-   */
-  static complementSide(lines, obstacleAegment = [], wallWidth = 0.4) {
-    const otherLines = [];
-    lines = lines.filter((line) => {
-      if (line.userData.isBayWindow || line.userData.isBalconyRailing || LineGroupType.hasType(line, "bayWindow") && line.userData.isWindow) {
-        otherLines.push(line);
-        return false;
-      }
-      return true;
-    });
-    let { resultList, quadtree } = this.findDoubleLine(lines, wallWidth), removeLines = /* @__PURE__ */ new Set(), clipingMap = /* @__PURE__ */ new Map(), appendLines = [];
-    function addClipingMap(line, line1) {
-      if (!clipingMap.has(line)) clipingMap.set(line, []);
-      const startProj = line.projectPoint(line1.start);
-      const endProj = line.projectPoint(line1.end);
-      const list = clipingMap.get(line);
-      if (startProj) list.push(startProj);
-      if (endProj) list.push(endProj);
-      removeLines.add(line);
-      quadtree.remove(line);
-    }
-    resultList.forEach((result) => {
-      const project0 = result.project, project1 = result.project2, line0 = result.source, line1 = result.target;
-      const newLine1 = new LineSegment(project0.start.clone(), project1.start.clone());
-      const newLine2 = new LineSegment(project0.end.clone(), project1.end.clone());
-      newLine1.userData.height = line0.userData.height;
-      newLine1.userData.rooftopPz = line0.userData.rooftopPz;
-      newLine2.userData.height = line1.userData.height;
-      newLine2.userData.rooftopPz = line1.userData.rooftopPz;
-      appendLines.push(newLine1, newLine2);
-      addClipingMap(line0, project0);
-      addClipingMap(line1, project1);
-    });
-    clipingMap.forEach((list, line) => {
-      const newLines = LineSegmentUtils.clippingByPoints(line, list);
-      newLines.forEach((newLine) => {
-        newLine.userData.height = line.userData.height;
-        newLine.userData.rooftopPz = line.userData.rooftopPz;
-      });
-      lines.push(...newLines);
-    });
-    lines = lines.filter((line) => !removeLines.has(line));
-    quadtree.clear();
-    quadtree = createQuadtree([...lines, ...otherLines, ...obstacleAegment]);
-    appendLines = lineSegmentClipping(appendLines, 1e-9);
-    appendLines.flatMap((line) => {
-      const queryLines = quadtree.queryRect(line.toRectangle(1e-3, "butt")).filter((item) => item.line.isParallelTo(line)).map((item) => item.line);
-      if (queryLines.length) {
-        const newLines = LineSegmentUtils.clippingByLines(line, queryLines);
-        if (newLines) return newLines.forEach((newLine) => {
-          newLine.userData.height = line.userData.height;
-          newLine.userData.rooftopPz = line.userData.rooftopPz;
-          quadtree.insert(newLine);
-          lines.push(newLine);
-        });
-      }
-      quadtree.insert(line);
-      lines.push(line);
-    });
-    lines = lineSegmentClipping(lines, 1e-9);
-    quadtree.clear();
-    lines.push(...otherLines);
-    PointUtils.adsorb(lines.flatMap((line) => line.points), 1e-4);
-    return lines.filter((line) => line.length() > 1e-9);
-  }
-  /**
-   * 创建分组
-   */
-  static buildGroup(lineSegments) {
-    const otherLines = [];
-    lineSegments = lineSegments.filter((line) => {
-      if (line.userData.isDoor || line.userData.isBalconyRailing || line.userData.isBayWindowWin || line.userData.isBayWindow) {
-        otherLines.push(line);
-        return false;
-      }
-      return true;
-    });
-    lineSegments = BuildGroup.doubleWall(lineSegments, true);
-    lineSegments = this.complementSide(lineSegments, otherLines);
-    WIO.recomputed(lineSegments);
-    lineSegments = BuildGroup.doubleWall(lineSegments, true);
-    return [...lineSegments, ...otherLines];
-  }
-}
 function parallel(line, baseline) {
   const currentAngle = Math.atan2(line.end.y - line.start.y, line.end.x - line.start.x);
   const targetAngle = Math.atan2(baseline.end.y - baseline.start.y, baseline.end.x - baseline.start.x);
@@ -11159,6 +11020,168 @@ class AlignToParallelSegments {
     ];
   }
 }
+class DoubleWallHelper {
+  static errorAngle = 4;
+  /** 线段投影分析
+   * @param index 
+   * @param sourceLineSegment 
+   * @param lineSegmentList 
+   * @returns 
+   */
+  static projectionAnalysis(index2, sourceIndex, sourceLineSegment, lineSegmentList) {
+    const temLineSegment = lineSegmentList[index2], direct = sourceLineSegment.direction(), temDirect = temLineSegment.direction(), angle = direct.angle(temDirect, { unit: "degree", range: "180" });
+    if (angle < this.errorAngle || angle > 180 - this.errorAngle) {
+      let data;
+      let dist = sourceLineSegment.distanceToSegment(temLineSegment);
+      const p1 = temLineSegment.projectLineSegment(sourceLineSegment), p2 = sourceLineSegment.projectLineSegment(temLineSegment);
+      if (p1.length() > p2.length()) {
+        data = {
+          target: temLineSegment,
+          targetIndex: index2,
+          source: sourceLineSegment,
+          sourceIndex,
+          project: p1,
+          project2: p2,
+          minDistance: dist
+        };
+      } else {
+        data = {
+          target: sourceLineSegment,
+          targetIndex: sourceIndex,
+          source: temLineSegment,
+          sourceIndex: index2,
+          project: p2,
+          project2: p1,
+          minDistance: dist
+        };
+      }
+      if (!data || data.project.length() < 0.08 || data.project2.length() < 0.08) return;
+      return data;
+    }
+  }
+  /** 查找
+   * @param lines 
+   * @param wallWidth 
+   * @returns 
+   */
+  static findDoubleLine(lines, wallWidth = 0.4) {
+    let walls = lines.filter((line) => !line.userData.isDoor), visited = /* @__PURE__ */ new Set(), resultList = [];
+    walls = walls.filter((line) => !line.userData.isWindowWall);
+    let quadtree = new Quadtree(Box2.fromByLineSegment(...walls));
+    walls.forEach((line, index2) => quadtree.insert({ line, userData: index2 }));
+    walls.forEach((sourceLineSegment, i) => {
+      const rectangle = Rectangle.fromByLineSegment(sourceLineSegment, wallWidth * 2, false, -0.01), ids = quadtree.queryRect(rectangle).map((i2) => i2.userData).filter((index2) => index2 !== i);
+      ids.forEach((id) => {
+        try {
+          if (visited.has(`${i}-${id}`) || visited.has(`${id}-${i}`)) return;
+          const res = this.projectionAnalysis(id, i, sourceLineSegment, walls);
+          if (res) resultList.push(res);
+          visited.add(`${i}-${id}`);
+        } catch (error) {
+          console.log(error);
+        }
+      });
+    });
+    resultList.forEach((result) => {
+      const project0 = result.project, project1 = result.project2;
+      if (project0.angle(project1, { unit: "degree", range: "180" }) > 135) {
+        project1.points = [project1.points[1], project1.points[0]];
+      }
+    });
+    return {
+      resultList,
+      walls,
+      quadtree
+    };
+  }
+  /** 补双线墙壁
+   * @param lines 
+   * @param wallWidth 
+   * @returns 
+   */
+  static complementSide(lines, obstacleAegment = [], wallWidth = 0.4) {
+    const otherLines = [];
+    lines = lines.filter((line) => {
+      if (line.userData.isBayWindow || line.userData.isBalconyRailing || LineGroupType.hasType(line, "bayWindow") && line.userData.isWindow) {
+        otherLines.push(line);
+        return false;
+      }
+      return true;
+    });
+    let { resultList, quadtree } = this.findDoubleLine(lines, wallWidth), removeLines = /* @__PURE__ */ new Set(), clipingMap = /* @__PURE__ */ new Map(), appendLines = [];
+    function addClipingMap(line, line1) {
+      if (!clipingMap.has(line)) clipingMap.set(line, []);
+      const startProj = line.projectPoint(line1.start);
+      const endProj = line.projectPoint(line1.end);
+      const list = clipingMap.get(line);
+      if (startProj) list.push(startProj);
+      if (endProj) list.push(endProj);
+      removeLines.add(line);
+      quadtree.remove(line);
+    }
+    resultList.forEach((result) => {
+      const project0 = result.project, project1 = result.project2, line0 = result.source, line1 = result.target;
+      const newLine1 = new LineSegment(project0.start.clone(), project1.start.clone());
+      const newLine2 = new LineSegment(project0.end.clone(), project1.end.clone());
+      newLine1.userData.height = line0.userData.height;
+      newLine1.userData.rooftopPz = line0.userData.rooftopPz;
+      newLine2.userData.height = line1.userData.height;
+      newLine2.userData.rooftopPz = line1.userData.rooftopPz;
+      appendLines.push(newLine1, newLine2);
+      addClipingMap(line0, project0);
+      addClipingMap(line1, project1);
+    });
+    clipingMap.forEach((list, line) => {
+      const newLines = LineSegmentUtils.clippingByPoints(line, list);
+      newLines.forEach((newLine) => {
+        newLine.userData.height = line.userData.height;
+        newLine.userData.rooftopPz = line.userData.rooftopPz;
+      });
+      lines.push(...newLines);
+    });
+    lines = lines.filter((line) => !removeLines.has(line));
+    quadtree.clear();
+    quadtree = createQuadtree([...lines, ...otherLines, ...obstacleAegment]);
+    appendLines = lineSegmentClipping(appendLines, 1e-9);
+    appendLines.flatMap((line) => {
+      const queryLines = quadtree.queryRect(line.toRectangle(1e-3, "butt")).filter((item) => item.line.isParallelTo(line)).map((item) => item.line);
+      if (queryLines.length) {
+        const newLines = LineSegmentUtils.clippingByLines(line, queryLines);
+        if (newLines) return newLines.forEach((newLine) => {
+          newLine.userData.height = line.userData.height;
+          newLine.userData.rooftopPz = line.userData.rooftopPz;
+          quadtree.insert(newLine);
+          lines.push(newLine);
+        });
+      }
+      quadtree.insert(line);
+      lines.push(line);
+    });
+    lines = lineSegmentClipping(lines, 1e-9);
+    quadtree.clear();
+    lines.push(...otherLines);
+    PointUtils.adsorb(lines.flatMap((line) => line.points), 1e-4);
+    return lines.filter((line) => line.length() > 1e-9);
+  }
+  /**
+   * 创建分组
+   */
+  static buildGroup(lineSegments) {
+    const otherLines = [];
+    lineSegments = lineSegments.filter((line) => {
+      if (line.userData.isDoor || line.userData.isBalconyRailing || line.userData.isBayWindowWin || line.userData.isBayWindow) {
+        otherLines.push(line);
+        return false;
+      }
+      return true;
+    });
+    lineSegments = BuildGroup.doubleWall(lineSegments, true);
+    lineSegments = this.complementSide(lineSegments, otherLines);
+    WIO.recomputed(lineSegments);
+    lineSegments = BuildGroup.doubleWall(lineSegments, true);
+    return [...lineSegments, ...otherLines];
+  }
+}
 function shortDistanceLink(lines, radius = 0.1) {
   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) => {
@@ -11303,8 +11326,10 @@ function correction(lines, targettLine, option) {
   lines = lineSegmentClipping(lines, 1e-9);
   lines = removeDangline(lines, 0.1, false);
   lines = removeShortDoor(lines);
-  let newLines = lines.filter((line) => !line.userData.isDoor && !line.userData.isBalconyRailing);
-  let otherLines = lines.filter((line) => line.userData.isDoor || line.userData.isBalconyRailing);
+  let { otherLines = [], newLines = [] } = LineSegmentUtils.group(lines, (line) => {
+    if (line.userData.isDoor || line.userData.isBalconyRailing) return "otherLines";
+    return "newLines";
+  });
   newLines = BuildGroup.bayWindow(newLines, false);
   const { wallGroup = true } = option ?? {};
   if (wallGroup) {
@@ -11335,7 +11360,22 @@ function axisAlignCorr(lines, option, verticalReferenceLine) {
   }
   return lines;
 }
+function sparse(trajectory2, size2 = 0.4) {
+  const idSet = /* @__PURE__ */ new Set();
+  Object.keys(trajectory2 ?? {}).forEach((key) => {
+    const p2 = trajectory2[key], i = Math.round(p2.x / size2), j = Math.round(p2.y / size2), id = BigInt(i) << 32n | BigInt(j) & 0xffffffffn;
+    if (idSet.has(id)) {
+      delete trajectory2[key];
+      return;
+    }
+    idSet.add(id);
+  });
+}
 function init(lines, option) {
+  if (option.trajectory) {
+    sparse(option.trajectory, 0.2);
+    sparse(option.trajectory, 0.5);
+  }
   BuildGroup.doubleWall.setTrajectory(option.trajectory);
   lines = lines.map((line) => line.clone());
   return lines;
@@ -11652,6 +11692,8 @@ class BoundExt {
     let appendLines = [];
     exteriorLines.forEach((line) => {
       const mode = line.userData.expandDirect, direction = mode === "left" ? line.getRightDirection() : line.getLeftDirection();
+      const intersectCount = quadtree.raycaster(line.center, direction, 1e-3, wallWidth).length;
+      if (intersectCount > 0) return;
       line.points.forEach((point2) => {
         const id = point2.hashCode();
         arrayMap.append(id, { point: point2, line });

package/src/dxfSystem/components/Dxf.d.ts

@@ -30,7 +30,7 @@ export declare class Dxf<TEventMap extends {} = {}> extends Component<{
     doorLineSegment: LineSegment[];
     verticalReferenceLine?: LineSegment<LineUserData>;
     originalZAverage: number;
-    linePipeline: LinePipeline;
+    linePipeline: LinePipeline<SetDataOption>;
     /** 原始数据组
      */
     get lines(): LineSegment<LineUserData>[];

package/src/dxfSystem/plugins/editor/components/UIService.d.ts

@@ -0,0 +1 @@
+export {};

package/src/dxfSystem/plugins/editor/pages/EditorTool/EditorTool.vue.d.ts

@@ -1,4 +1,4 @@
-import { DxfSystem } from '../../../../build';
+import { DxfSystem } from '../../../../DxfSystem';
 type __VLS_Props = {
     dxfSystem: DxfSystem;
     permission?: "admin";

package/src/dxfSystem/plugins/index.d.ts

@@ -0,0 +1 @@
+export {};

package/src/dxfSystem/utils/CAD.d.ts

@@ -152,17 +152,8 @@ export declare class DxfDrawPlugin implements ICADPlugin {
     private getArcAngleRange;
     install(cad: CAD): void;
 }
-type DrawDataOption = {
-    openPaths: LineSegment[][];
-    closedPath: LineSegment[][];
-    hole: {
-        line: LineSegment;
-        belong: number;
-    }[];
-};
 type DataOption = {
     lines: LineSegment[];
-    drawData: DrawDataOption;
 };
 /** dxf 数据处理插件
  */
@@ -170,6 +161,7 @@ export declare class DxfDataPlugin extends Pipeline<DataOption> implements ICADP
     manager: WallGroupManager;
     lines: LineSegment<LineUserData>[];
     constructor(lines: LineSegment<LineUserData>[]);
+    init(): void;
     install(cad: CAD): void;
 }
 export {};

package/src/dxfSystem/utils/index.d.ts

@@ -1,5 +1,5 @@
 export * from './lineSegmentClipping';
-export * from './DoubleWallHelper';
+export * from './linePipeline/builtin/DoubleWallHelper';
 export * from './clippingDoubleWall';
 export * from './clippingLineUserData';
 export * from './findDiscrete';

package/src/dxfSystem/utils/{DoubleWallHelper.d.ts → linePipeline/builtin/DoubleWallHelper.d.ts}

@@ -1,6 +1,6 @@
-import { LineSegment } from '../../utils/algorithms/LineSegment';
-import { Quadtree } from '../../utils/algorithms/Quadtree';
-import { LineUserData } from '../type';
+import { LineSegment } from '../../../../utils/algorithms/LineSegment';
+import { Quadtree } from '../../../../utils/algorithms/Quadtree';
+import { LineUserData } from '../../../type';
 type ProjectionAnalysisResult = {
     source: LineSegment;
     sourceIndex: number;

package/src/dxfSystem/utils/linePipeline/index.d.ts

@@ -1,7 +1,7 @@
 import { LineSegment } from '../../../utils/algorithms/LineSegment';
 import { Pipeline } from '../../../utils/algorithms/Pipeline';
 import { LineUserData, SetDataOption } from '../../type';
-export declare class LinePipeline extends Pipeline<LineSegment[], SetDataOption> {
+export declare class LinePipeline<T = SetDataOption> extends Pipeline<LineSegment[], T> {
     static get builtin(): {
         init: typeof import('./builtin/init').init;
         DoorToHole: typeof import('./builtin/doorToHole').doorToHole;
@@ -14,7 +14,7 @@ export declare class LinePipeline extends Pipeline<LineSegment[], SetDataOption>
         RemoveShortDoubleWall: typeof import('./builtin/removeShortDoubleWall').removeShortDoubleWall;
     };
     constructor();
-    add(handle: (lines: LineSegment<LineUserData>[], option: SetDataOption) => LineSegment<LineUserData>[]): this;
+    add(handle: (lines: LineSegment<LineUserData>[], option: T) => LineSegment<LineUserData>[]): this;
     clear(): this;
-    execute(data: LineSegment<Record<string, any>>[], option: SetDataOption): LineSegment<Record<string, any>>[];
+    execute(data: LineSegment<Record<string, any>>[], option: T): LineSegment<Record<string, any>>[];
 }

package/src/index.css

@@ -1236,10 +1236,10 @@ button[data-v-624dc8f8]:active {
     color: #a7a7a7
 }
 
-[data-v-978973e0] {
+[data-v-e23c82bd] {
     font-family: 宋体;
 }
-.button[data-v-978973e0] {
+.button[data-v-e23c82bd] {
     padding: 5px 10px;
     border: none;
     background: var(--primary-color);

package/src/index3.js

@@ -16663,6 +16663,22 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         line1.angle(line2, { unit: "degree", range: "180" })
       );
     }
+    function intersectionTest() {
+      if (defaultComponent.selectLines.length !== 2) {
+        ElMessage.warning({ message: "请选择两条线段" });
+        return;
+      }
+      const line1 = defaultComponent.selectLines[0];
+      const line2 = defaultComponent.selectLines[1];
+      const point = line1.getIntersection(line2);
+      if (point) {
+        drawPoint(point);
+      } else {
+        ElMessage.warning({
+          message: "没有交点"
+        });
+      }
+    }
     function commandConfirm() {
       variable.set("currentKeyDown", "enter");
       queueMicrotask(() => variable.set("currentKeyUp", "enter"));
@@ -16919,7 +16935,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       title: "取消命令(Esc)",
                       class: "active:scale-[0.7] transition-all flex items-center justify-center",
                       onClick: _cache[0] || (_cache[0] = (e) => (unref(editor).cancelCommand(), e.stopPropagation()))
-                    }, [..._cache[21] || (_cache[21] = [
+                    }, [..._cache[22] || (_cache[22] = [
                       createElementVNode("svg", {
                         fill: "#fff",
                         width: "16",
@@ -16937,7 +16953,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       onClick: commandConfirm,
                       title: "确认命令(Enter)",
                       class: "active:scale-[0.7] transition-all flex items-center justify-center"
-                    }, [..._cache[22] || (_cache[22] = [
+                    }, [..._cache[23] || (_cache[23] = [
                       createElementVNode("svg", {
                         fill: "#fff",
                         width: "16",
@@ -16960,7 +16976,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               modelValue: dxfVisible.value,
               "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => dxfVisible.value = $event)
             }, {
-              default: withCtx(() => [..._cache[23] || (_cache[23] = [
+              default: withCtx(() => [..._cache[24] || (_cache[24] = [
                 createTextVNode("Dxf", -1)
               ])]),
               _: 1
@@ -16970,7 +16986,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               modelValue: unref(editor).renderManager.lineAdsorption.value,
               "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => unref(editor).renderManager.lineAdsorption.value = $event)
             }, {
-              default: withCtx(() => [..._cache[24] || (_cache[24] = [
+              default: withCtx(() => [..._cache[25] || (_cache[25] = [
                 createTextVNode("线吸附", -1)
               ])]),
               _: 1
@@ -16981,7 +16997,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               modelValue: unref(editor).renderManager.pointAdsorption.value,
               "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => unref(editor).renderManager.pointAdsorption.value = $event)
             }, {
-              default: withCtx(() => [..._cache[25] || (_cache[25] = [
+              default: withCtx(() => [..._cache[26] || (_cache[26] = [
                 createTextVNode("点吸附", -1)
               ])]),
               _: 1
@@ -17027,7 +17043,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               createVNode(unref(ElDropdownMenu), null, {
                 default: withCtx(() => [
                   createVNode(unref(ElDropdownItem), { onClick: selectLocalFile }, {
-                    default: withCtx(() => [..._cache[27] || (_cache[27] = [
+                    default: withCtx(() => [..._cache[28] || (_cache[28] = [
                       createTextVNode(" 选择文件 ", -1)
                     ])]),
                     _: 1
@@ -17035,7 +17051,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[4] || (_cache[4] = ($event) => unref(dxfSystem).CorrectionDxf.downloadOriginalData("json.json"))
                   }, {
-                    default: withCtx(() => [..._cache[28] || (_cache[28] = [
+                    default: withCtx(() => [..._cache[29] || (_cache[29] = [
                       createTextVNode(" 下载Json ", -1)
                     ])]),
                     _: 1
@@ -17043,7 +17059,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[5] || (_cache[5] = ($event) => unref(dxfSystem).CorrectionDxf.downloadDxf("test.dxf"))
                   }, {
-                    default: withCtx(() => [..._cache[29] || (_cache[29] = [
+                    default: withCtx(() => [..._cache[30] || (_cache[30] = [
                       createTextVNode(" 下载DXF ", -1)
                     ])]),
                     _: 1
@@ -17051,7 +17067,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[6] || (_cache[6] = ($event) => unref(dxfSystem).CorrectionDxf.downloadDxfImage("dxf.jpg"))
                   }, {
-                    default: withCtx(() => [..._cache[30] || (_cache[30] = [
+                    default: withCtx(() => [..._cache[31] || (_cache[31] = [
                       createTextVNode(" 下载JPG ", -1)
                     ])]),
                     _: 1
@@ -17059,7 +17075,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[7] || (_cache[7] = ($event) => unref(whiteModel).downloadGltf("test.glb", true))
                   }, {
-                    default: withCtx(() => [..._cache[31] || (_cache[31] = [
+                    default: withCtx(() => [..._cache[32] || (_cache[32] = [
                       createTextVNode(" 下载白膜 ", -1)
                     ])]),
                     _: 1
@@ -17067,7 +17083,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                   createVNode(unref(ElDropdownItem), {
                     onClick: _cache[8] || (_cache[8] = ($event) => unref(threeVJia).download())
                   }, {
-                    default: withCtx(() => [..._cache[32] || (_cache[32] = [
+                    default: withCtx(() => [..._cache[33] || (_cache[33] = [
                       createTextVNode(" 下载三维家JSON ", -1)
                     ])]),
                     _: 1
@@ -17089,7 +17105,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                           }, null, 8, ["modelValue"])
                         ]),
                         default: withCtx(() => [
-                          _cache[33] || (_cache[33] = createElementVNode("div", { class: "w-full" }, "z值调整", -1))
+                          _cache[34] || (_cache[34] = createElementVNode("div", { class: "w-full" }, "z值调整", -1))
                         ]),
                         _: 1
                       })) : createCommentVNode("", true)
@@ -17128,6 +17144,17 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                       }, "角度测试", 32)
                     ]),
                     _: 1
+                  }),
+                  createVNode(unref(ElDropdownItem), null, {
+                    default: withCtx(() => [
+                      createElementVNode("div", {
+                        class: "w-full",
+                        onMousedown: _cache[14] || (_cache[14] = withModifiers(() => {
+                        }, ["stop"])),
+                        onClick: withModifiers(intersectionTest, ["stop", "prevent"])
+                      }, "交点测试", 32)
+                    ]),
+                    _: 1
                   })
                 ]),
                 _: 1
@@ -17138,7 +17165,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 size: "small",
                 class: "mt-[10px] w-full"
               }, {
-                default: withCtx(() => [..._cache[26] || (_cache[26] = [
+                default: withCtx(() => [..._cache[27] || (_cache[27] = [
                   createTextVNode("其他功能", -1)
                 ])]),
                 _: 1
@@ -17149,16 +17176,16 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         ])) : (openBlock(), createElementBlock("div", {
           key: 1,
           class: normalizeClass([{ "translate-y-full": isMainCommand.value }, "z-8 absolute left-0 bottom-0 transition-transform w-full bg-white p-[5px] box-border text-[14px]"]),
-          onMousedown: _cache[17] || (_cache[17] = (e) => e.stopPropagation()),
-          onPointerdown: _cache[18] || (_cache[18] = (e) => e.stopPropagation())
+          onMousedown: _cache[18] || (_cache[18] = (e) => e.stopPropagation()),
+          onPointerdown: _cache[19] || (_cache[19] = (e) => e.stopPropagation())
         }, [
           createElementVNode("div", _hoisted_14, [
             createVNode(unref(ElCheckbox), {
               size: "small",
               modelValue: dxfVisible.value,
-              "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => dxfVisible.value = $event)
+              "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => dxfVisible.value = $event)
             }, {
-              default: withCtx(() => [..._cache[34] || (_cache[34] = [
+              default: withCtx(() => [..._cache[35] || (_cache[35] = [
                 createTextVNode("Dxf", -1)
               ])]),
               _: 1
@@ -17166,9 +17193,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             createVNode(unref(ElCheckbox), {
               size: "small",
               modelValue: unref(editor).renderManager.lineAdsorption.value,
-              "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => unref(editor).renderManager.lineAdsorption.value = $event)
+              "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => unref(editor).renderManager.lineAdsorption.value = $event)
             }, {
-              default: withCtx(() => [..._cache[35] || (_cache[35] = [
+              default: withCtx(() => [..._cache[36] || (_cache[36] = [
                 createTextVNode("线吸附", -1)
               ])]),
               _: 1
@@ -17177,9 +17204,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               disabled: !unref(editor).renderManager.lineAdsorption.value,
               size: "small",
               modelValue: unref(editor).renderManager.pointAdsorption.value,
-              "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => unref(editor).renderManager.pointAdsorption.value = $event)
+              "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => unref(editor).renderManager.pointAdsorption.value = $event)
             }, {
-              default: withCtx(() => [..._cache[36] || (_cache[36] = [
+              default: withCtx(() => [..._cache[37] || (_cache[37] = [
                 createTextVNode("点吸附", -1)
               ])]),
               _: 1
@@ -17238,13 +17265,13 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         }, [
           isMainCommand.value ? (openBlock(), createElementBlock("div", {
             key: 0,
-            onMousemove: _cache[20] || (_cache[20] = (e) => e.stopPropagation()),
+            onMousemove: _cache[21] || (_cache[21] = (e) => e.stopPropagation()),
             class: "cursor-pointer z-8 box-border bg-[rgba(0,0,0,0.5)] rounded-[6px] p-[5px] absolute left-[50%] translate-x-[-50%] top-[20px] flex gap-[5px] items-center"
           }, [
             createElementVNode("button", {
-              onClick: _cache[19] || (_cache[19] = (e) => (unref(editor).cancelCommand(), e.stopPropagation())),
+              onClick: _cache[20] || (_cache[20] = (e) => (unref(editor).cancelCommand(), e.stopPropagation())),
               class: "bg-transparent! button cursor-pointer"
-            }, [..._cache[37] || (_cache[37] = [
+            }, [..._cache[38] || (_cache[38] = [
               createElementVNode("svg", {
                 fill: "#fff",
                 viewBox: "0 0 1024 1024",
@@ -17260,7 +17287,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               key: 0,
               onClick: commandConfirm,
               class: "button bg-transparent! cursor-pointer"
-            }, [..._cache[38] || (_cache[38] = [
+            }, [..._cache[39] || (_cache[39] = [
               createElementVNode("svg", {
                 fill: "#28c932",
                 viewBox: "0 0 1026 1024",
@@ -17281,7 +17308,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-978973e0"]]);
+const EditorToolContent = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-e23c82bd"]]);
 class StorageHelper {
   static get(key, defaultValue = void 0) {
     const value = localStorage.getItem(key);

package/src/utils/algorithms/LineSegmentUtils.d.ts

@@ -18,6 +18,11 @@ export declare class LineSegmentUtils {
      * @param lines
      */
     static getLinesCenter(lines: LineSegment[]): Point<Record<string, any>>;
+    /** 自定义分组
+     * @param lines
+     * @returns
+     */
+    static group<T = any, K extends string | number | symbol = string>(lines: LineSegment<T>[], callBackFun: (line: LineSegment<T>) => K): Partial<Record<K, LineSegment<T>[]>>;
     /** 通过在同一路径上且平行的线段分组
      * @param lines
      */