build-dxf 0.1.100 → 0.1.101

package/package.json

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

package/src/build.js

@@ -21052,20 +21052,6 @@ function removeShortDoor(lines) {
   return lines;
 }
 function correction(lines, targettLine, option) {
-  lines.forEach((line) => {
-    if (line.userData.isDoor) {
-      delete line.userData.isDoor;
-      line.userData.isPassageEntrance = true;
-      line.userData.passageEntrance = [{
-        p: line.center.toJson(option?.originalZ),
-        width: line.len,
-        full: false,
-        groundClearance: 0,
-        type: "door",
-        height: line.userData.height
-      }];
-    }
-  });
   lines = breakpointMerging(lines);
   lines = lineSegmentClipping(lines, 1e-9);
   lines = preprocessing(lines);
@@ -21649,8 +21635,26 @@ function removeShortDoubleWall(lineSegments) {
   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));
 }
+function doorToHole(lines, option) {
+  lines.forEach((line) => {
+    if (line.userData.isDoor) {
+      delete line.userData.isDoor;
+      line.userData.isPassageEntrance = true;
+      line.userData.passageEntrance = [{
+        p: line.center.toJson(option?.originalZ),
+        width: line.len,
+        full: false,
+        groundClearance: 0,
+        type: "door",
+        height: line.userData.height
+      }];
+    }
+  });
+  return lines;
+}
 const builtinFun = {
   init,
+  DoorToHole: doorToHole,
   AxisAlignCorr: axisAlignCorr,
   /** 门落点查找
    */
@@ -22468,7 +22472,7 @@ async function buildJson(opt, dxfSystem = new DxfSystem()) {
       } else throw new Error("非node环境不允许使用路径");
     }
   }
-  dxfSystem.Dxf.linePipeline.add(LinePipeline.builtin.init).add(LinePipeline.builtin.WallHeightHandle);
+  dxfSystem.Dxf.linePipeline.add(LinePipeline.builtin.init).add(LinePipeline.builtin.WallHeightHandle).add(LinePipeline.builtin.DoorToHole);
   doorFind && dxfSystem.Dxf.linePipeline.add(LinePipeline.builtin.DoorFind);
   if (opt.axisAlignCorr !== false) {
     dxfSystem.Dxf.linePipeline.add(LinePipeline.builtin.AxisAlignCorr).add(LinePipeline.builtin.RemoveShortDoubleWall);

package/src/dxfSystem/utils/linePipeline/builtin/boundExt.d.ts

@@ -1,5 +1,6 @@
 import { LineUserData, OriginalDataItem, SetDataOption } from '../../../type';
-import { LineSegment, Point } from '../../../../utils';
+import { LineSegment } from '../../../../utils/algorithms/LineSegment';
+import { Point } from '../../../../utils/algorithms/Point';
 interface IByTraj {
     lines: LineSegment[];
     trajectory: any;
@@ -23,7 +24,7 @@ export declare class BoundExt {
     static findExtWallByTraj(lines: LineSegment<LineUserData & {
         expandDirect?: 'left' | 'right' | 'on';
     }>[], trajectoryPoints: Point[], minWidth?: number): LineSegment<{
-        quadtreeNode?: import('../../../../utils').QuadtreeNode;
+        quadtreeNode?: import('../../../../utils/algorithms/Quadtree').QuadtreeNode;
     } & import('../../../type').WallLineGlobalOption & {
         expandDirect?: "left" | "right" | "on";
     }>[];

package/src/dxfSystem/utils/linePipeline/builtin/doorToHole.d.ts

@@ -0,0 +1,9 @@
+import { LineUserData, SetDataOption } from '../../../type';
+import { LineSegment } from '../../../../utils';
+/**
+ * 轴对齐垂直修正
+ * @param lines 待调整线段组
+ * @param targettLine 轴线段
+ * @returns
+ */
+export declare function doorToHole(lines: LineSegment<LineUserData>[], option?: SetDataOption): LineSegment<any>[];

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

@@ -6,11 +6,13 @@ import { doubleWallAlignment } from './doubleWallAlignment';
 import { wallHeightHandle } from './wallHeightHandle';
 import { doorSpaceHandle } from './doorSpaceHandle';
 import { removeShortDoubleWall } from './removeShortDoubleWall';
+import { doorToHole } from './doorToHole';
 /**
 * 默认提供的预处理函数
 */
 export declare const builtinFun: {
     init: typeof init;
+    DoorToHole: typeof doorToHole;
     AxisAlignCorr: typeof axisAlignCorr;
     /** 门落点查找
      */

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

@@ -4,6 +4,7 @@ import { LineUserData, SetDataOption } from '../../type';
 export declare class LinePipeline extends Pipeline<LineSegment[], SetDataOption> {
     static get builtin(): {
         init: typeof import('./builtin/init').init;
+        DoorToHole: typeof import('./builtin/doorToHole').doorToHole;
         AxisAlignCorr: typeof import('./builtin/axisAlignCorr').axisAlignCorr;
         DoorFind: (lines: LineSegment[]) => LineSegment<Record<string, any>>[];
         BoundExt: typeof import('./builtin/boundExt').boundExt;