build-dxf 0.1.43 → 0.1.44

package/package.json

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

package/src/build.js

@@ -366,6 +366,13 @@ class PointVirtualGrid {
     }
     return null;
   }
+  /** 
+   * @param point 
+   */
+  isFreePoint(point2) {
+    const list = this.queryPoint(point2, true);
+    return list.length === 0;
+  }
   /** 查找游离的点
    */
   getFreePoint() {
@@ -14641,13 +14648,81 @@ class DoorFind {
   grid;
   quadtree;
   constructor(lines) {
+    lines = this.findBrotherDoor(lines);
     this.lines = lines;
-    const doors = lines.filter((line) => line.userData.isDoor), noDoorLines = lines.filter((line) => !line.userData.isDoor), openDoors = doors.filter((line) => !line.userData.doorDirectConnection), closeDoors = doors.filter((line) => line.userData.doorDirectConnection);
+    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.quadtree = createQuadtree([...noDoorLines, ...closeDoors]);
+    openDoors.forEach((l) => l.userData.doorDirectConnection = true);
     closeDoors.forEach((line) => this.findCloseDoors(line));
     openDoors.forEach((line) => this.findOpenDoors(line));
   }
+  /**
+   * 查找兄弟门(双开门)
+   */
+  findBrotherDoor(lines) {
+    const grid = createPointVirtualGrid(lines);
+    const doorLines = [];
+    findDiscretePointLine2(lines).forEach((line) => line.userData.isDoor && doorLines.push(line));
+    const searchedList = [];
+    doorLines.forEach((line) => {
+      const pointStartIsFree = grid.isFreePoint(line.start);
+      const pointEndIsFree = grid.isFreePoint(line.end);
+      if (pointStartIsFree && pointEndIsFree) return;
+      else if (pointStartIsFree) {
+        searchedList.push({
+          door: line,
+          point: line.end
+        });
+      } else {
+        searchedList.push({
+          door: line,
+          point: line.start
+        });
+      }
+    });
+    searchedList.forEach((item) => {
+      let list = grid.queryPoint(item.point, true);
+      if (list.length > 1) {
+        list = list.filter((target) => {
+          const otherPoint = target.userData.getAnotherPoint(target.point);
+          return !grid.isFreePoint(otherPoint);
+        });
+      }
+      item.line = list[0]?.userData;
+      item.linePoint = list[0]?.point;
+    });
+    const doorGrid = new PointVirtualGrid(), minAngle = Math.PI / 180 * 170;
+    searchedList.forEach((item, index2) => item.line && doorGrid.insert(item.point, index2));
+    const removeLines = [];
+    searchedList.forEach((item) => {
+      if (!item.line || item.found) return;
+      const dir = item.line?.getAnotherPoint(item.linePoint).direction(item.linePoint);
+      const list = doorGrid.queryCircle(item.point, item.door.length() * 2.5).filter((result) => {
+        const { line } = searchedList[result.userData];
+        return line.parallel(item.line, 10);
+      }).filter((result) => {
+        const { line, linePoint } = searchedList[result.userData];
+        const dir2 = line?.getAnotherPoint(linePoint).direction(linePoint);
+        return dir.angleBetween(dir2) > minAngle;
+      }).filter((result) => {
+        const { point: point2 } = searchedList[result.userData];
+        const dir2 = item.point.direction(point2);
+        const dir3 = item.linePoint.direction(item.line.getAnotherPoint(item.linePoint));
+        return dir2.angleBetween(dir3) > Math.PI / 180 * 75;
+      });
+      if (list.length) {
+        const item2 = searchedList[list[0].userData];
+        item2.found = true;
+        item.door.getAnotherPoint(item.point).copy(item2.point);
+        item.door.userData.doorDirectConnection = true;
+        removeLines.push(item2.door);
+      }
+    });
+    const set2 = new Set(removeLines);
+    return lines.filter((line) => !set2.has(line));
+  }
   /** 处理封闭门
    * @param line 
    * @returns 

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

@@ -7,20 +7,30 @@ export interface GroupItem {
     id: string;
     type?: string;
 }
-export type LineUserData = {
-    doorDirectConnection?: boolean;
-    isDoor?: boolean;
-    isWindow?: boolean;
-    isVerticalReferenceLine?: boolean;
-    wallWidth?: number;
-    rooftopPz?: number;
-    height?: number;
+export type WallLineGlobalOption = {
+    uuid?: string;
     groupId?: string;
     groupType?: string;
     groups?: GroupItem[];
-    doorAutomaticFind?: boolean;
+    rooftopPz?: number;
+    height?: number;
+    wallWidth?: number;
+    sillHeight?: number;
+    length?: number;
+    isWindow?: boolean;
     isBayWindow?: boolean;
-    uuid?: string;
+    isDoor?: boolean;
+    doorAutomaticFind?: boolean;
+    doorDirectConnection?: boolean;
+    isVerticalReferenceLine?: boolean;
+    insetionArr?: {
+        index: number;
+        p: {
+            x: number;
+            y: number;
+            z?: number;
+        };
+    }[];
     drawWindow?: {
         p: {
             x: number;
@@ -32,33 +42,6 @@ export type LineUserData = {
         rooftopPz?: number;
         uuid?: string;
     }[];
-    sillHeight?: number;
-    drawDoorData?: any;
-    quadtreeNode?: QuadtreeNode;
-};
-export interface OriginalDataItem {
-    start: {
-        x: number;
-        y: number;
-        z?: number;
-    };
-    end: {
-        x: number;
-        y: number;
-        z?: number;
-    };
-    insetionArr: {
-        index: number;
-        p: {
-            x: number;
-            y: number;
-            z?: number;
-        };
-    }[];
-    length: number;
-    isDoor?: boolean;
-    doorDirectConnection?: boolean;
-    doorAutomaticFind?: boolean;
     drawDoorData?: {
         start: {
             x: number;
@@ -71,24 +54,22 @@ export interface OriginalDataItem {
             z?: number;
         };
     };
-    wallWidth?: number;
-    isWindow?: boolean;
-    isBayWindow?: boolean;
-    rooftopPz?: number;
-    isVerticalReferenceLine?: boolean;
-    groupId?: string;
-    uuid?: string;
-    drawWindow?: {
-        p: {
-            x: number;
-            y: number;
-            z?: number;
-        };
-        width: number;
-        full: boolean;
-        uuid?: string;
-    }[];
-}
+};
+export type LineUserData = {
+    quadtreeNode?: QuadtreeNode;
+} & WallLineGlobalOption;
+export type OriginalDataItem = {
+    start: {
+        x: number;
+        y: number;
+        z?: number;
+    };
+    end: {
+        x: number;
+        y: number;
+        z?: number;
+    };
+} & WallLineGlobalOption;
 /**
  * [开始点, 结束点, 相交点, 是否是门, 索引]
  */

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

@@ -23,7 +23,9 @@ export declare class BoundExt {
      */
     static findExtWallByTraj(lines: LineSegment<LineUserData & {
         expandDirect?: 'left' | 'right' | 'on';
-    }>[], trajectoryPoints: Point[], minWidth?: number): LineSegment<LineUserData & {
+    }>[], trajectoryPoints: Point[], minWidth?: number): LineSegment<{
+        quadtreeNode?: import('../../Quadtree').QuadtreeNode;
+    } & import('../type').WallLineGlobalOption & {
         expandDirect?: "left" | "right" | "on";
     }>[];
     /** 通过轨迹点外扩边线

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

@@ -23,7 +23,9 @@ export declare class BoundExt {
      */
     static findExtWallByTraj(lines: LineSegment<LineUserData & {
         expandDirect?: 'left' | 'right' | 'on';
-    }>[], trajectoryPoints: Point[], minWidth?: number): LineSegment<LineUserData & {
+    }>[], trajectoryPoints: Point[], minWidth?: number): LineSegment<{
+        quadtreeNode?: import('../../Quadtree').QuadtreeNode;
+    } & import('../type').WallLineGlobalOption & {
         expandDirect?: "left" | "right" | "on";
     }>[];
     /** 通过轨迹点外扩边线

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

@@ -14,6 +14,10 @@ export declare class DoorFind {
     grid: PointVirtualGrid<LineSegment<LineUserData>>;
     quadtree: Quadtree<LineSegment<LineUserData>>;
     constructor(lines: LineSegment<LineUserData>[]);
+    /**
+     * 查找兄弟门(双开门)
+     */
+    findBrotherDoor(lines: LineSegment<LineUserData>[]): LineSegment<LineUserData>[];
     /** 处理封闭门
      * @param line
      * @returns

package/src/utils/PointVirtualGrid.d.ts

@@ -100,6 +100,10 @@ export declare class PointVirtualGrid<T = Record<string, any>> {
         point: Point;
         userData: T;
     } | null;
+    /**
+     * @param point
+     */
+    isFreePoint(point: Point): boolean;
     /** 查找游离的点
      */
     getFreePoint(): Target<T>[];