build-dxf 0.1.78 → 0.1.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "build-dxf",
-  "version": "0.1.78",
+  "version": "0.1.79",
   "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,24 @@ 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) {
+    return item.nearId ?? item.nearDoorId;
+  }
   /** 遍历孔洞
    * @param line 
    * @returns 
@@ -3117,16 +3128,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 +3164,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 +3197,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 +3259,10 @@ class WallInsertObject {
     });
     return this;
   }
+  merge(lines = this.lines) {
+    WallInsertObject.merge(lines);
+    return this;
+  }
   /** 添加孔洞
    * @param target 
    * @param insertObject 
@@ -3258,16 +3292,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) => {
@@ -6551,9 +6577,11 @@ 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);
       }
     });
   });
@@ -6572,7 +6600,7 @@ function isPolyHasTrajectoryPoint(lines) {
   return true;
 }
 function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
-  const doorLines = [], otherLines = [];
+  const doorLines = [], otherLines = [], peDoubleDoors = [];
   for (let i = 0; i < lines_.length; i++) {
     const line = lines_[i];
     if (line.userData.isDoor) {
@@ -6582,9 +6610,17 @@ function buildDoubleWallGroup_(lines_, clearInternalLine = false) {
     if (line.userData.isBayWindow) {
       continue;
     }
+    if (line.userData.isPassageEntrance && line.userData.passageEntrance?.length) {
+      const isDoubleDoor = line.userData.passageEntrance.some((item) => typeof WIO.getId(item) === "number");
+      if (isDoubleDoor) peDoubleDoors.push(line);
+      continue;
+    }
     otherLines.push(line);
   }
-  let { internalEdges, circles } = maxiCircles.maxiCircles(otherLines, (circles2) => circles2.filter(isPolyHasTrajectoryPoint));
+  otherLines.push(...peDoubleDoors);
+  let { internalEdges, circles } = maxiCircles.maxiCircles(otherLines, (circles2) => {
+    return circles2.filter(isPolyHasTrajectoryPoint);
+  });
   const finalCircles = circles.filter((circle) => circle.length > 3);
   lines_.forEach((line) => LineGroupType.removeByTypes(line, ["doubleWall", "wall"]));
   const grid = new PointVirtualGrid(), finalCirclesSet = new Set(finalCircles.flat(2));
@@ -8609,7 +8645,9 @@ function axisAlignCorr$1(lines, targettLine, option) {
   if (wallGroup) {
     newLines = DoubleWallHelper.complementSide(newLines);
     WallInsertObject.recomputed(newLines);
+    TEST = true;
     newLines = buildDoubleWallGroup(newLines, true);
+    TEST = false;
     newLines = buildBayWindowGroup(newLines, false);
   }
   new WallInsertObject(lines).recomputed().merge();

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/tools/WallInsertObject.d.ts

@@ -7,7 +7,6 @@ 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 {};