dgeoutils 2.2.19 → 2.2.22

package/dist/DLine.js

@@ -50,7 +50,7 @@ class DLine {
     intersectionWithCircle(circle) {
         const { center, r } = circle;
         const per = this.findPerpendicular(center);
-        const t = this.intersection(per, Infinity);
+        const t = this.findPoint(per);
         let distance = t.distance(center);
         if (this.begin.equal(center)) {
             distance = 0;

package/dist/DPolygon.js

@@ -13,6 +13,48 @@ exports.MIN_POINTS_IN_VALID_POLYGON = 3;
 const APPROXIMATION_VALUE = 0.1;
 const MAX_CONVEX_ITERATIONS = 100;
 const CLOSE_TO_INTERSECTION_DISTANCE = 0.001;
+const containCalculator = (poly, p) => {
+    const hasSamePoint = poly.points.some((point) => point.equal(p));
+    if (hasSamePoint) {
+        return true;
+    }
+    for (let i = 0; i < poly.length - 1; i++) {
+        const p0 = poly.at(i);
+        const p1 = poly.at(i + 1);
+        const polygonLine = p0.findLine(p1);
+        const onBorder = polygonLine.x(p).equal(p) && polygonLine.inRange(p);
+        if (onBorder) {
+            return true;
+        }
+    }
+    let totalFi = 0;
+    for (let i = 0; i < poly.length - 1; i++) {
+        const p1 = poly.at(i);
+        const p2 = poly.at(i + 1);
+        const line1 = new DLine_1.DLine(p1.x - p.x, p1.y - p.y, 0);
+        const line2 = new DLine_1.DLine(p2.x - p.x, p2.y - p.y, 0);
+        const fiDif = line1.findFi(line2);
+        if (line1.vectorProduct(line2).c > 0) {
+            totalFi += fiDif;
+        }
+        else {
+            totalFi -= fiDif;
+        }
+    }
+    const eps = Math.PI / 10000;
+    let result = false;
+    const absTotalFi = Math.abs(totalFi);
+    if (absTotalFi < eps) {
+        result = false;
+    }
+    else if (Math.abs(2 * Math.PI - absTotalFi) < eps) {
+        result = true;
+    }
+    else {
+        throw new Error('contains2 faild');
+    }
+    return result;
+};
 class DPolygon {
     constructor(pPoints = []) {
         this.pPoints = pPoints;
@@ -172,8 +214,12 @@ class DPolygon {
         return Math.abs(sum / 2) - this.holes.reduce((a, hole) => a + hole.area, 0);
     }
     get deintersection() {
-        const p = this.clone().close();
+        let p = this.clone().close();
+        const store = {};
         for (let i = 0; i < p.length - 1; i++) {
+            const k = p.at(i).toString();
+            store[k] = store[k] || [];
+            store[k].push(i);
             for (let j = i + 2; j < p.length - 1; j++) {
                 const firstLine = p.at(i).findLine(p.at(i + 1));
                 const secondLine = p.at(j).findLine(p.at(j + 1));
@@ -187,6 +233,24 @@ class DPolygon {
                 }
             }
         }
+        for (const key of Object.keys(store)) {
+            const record = store[key];
+            if (record.length > 1) {
+                for (let j = record.length - 1; j > 0; j--) {
+                    const origin = p.clone();
+                    const d = record[j] - record[j - 1];
+                    if (d > 1) {
+                        const part = new DPolygon(origin.removePart(record[j - 1], d));
+                        const allInside = part.points
+                            .reduce((a, e) => a && containCalculator(origin, e), true);
+                        if (allInside && origin.isClockwise === part.isClockwise) {
+                            origin.insertAfter(record[j - 1] - 1, ...part.reverse().points);
+                            p = origin;
+                        }
+                    }
+                }
+            }
+        }
         return p;
     }
     get valid() {
@@ -522,18 +586,14 @@ class DPolygon {
             }
         }
         const eps = Math.PI / 10000;
-        let result = false;
         const absTotalFi = Math.abs(totalFi);
         if (absTotalFi < eps) {
-            result = false;
+            return false;
         }
         else if (Math.abs(2 * Math.PI - absTotalFi) < eps) {
-            result = true;
+            return true;
         }
-        else {
-            throw new Error('contains2 faild');
-        }
-        return result;
+        throw new Error('contains2 faild');
     }
     onBorder(p) {
         const simpleInclude = this.simpleInclude(p);
@@ -582,26 +642,25 @@ class DPolygon {
         const { fullLength } = this;
         const pieceLength = fullLength / piecesCount;
         let currentPieceLength = pieceLength;
-        for (let i = 0; i < this.pPoints.length - 1; i++) {
-            const p1 = this.pPoints[i];
-            const p2 = this.pPoints[i + 1];
-            if (p1.distance(p2) === currentPieceLength) {
+        for (let i = 1; i < this.length; i++) {
+            const p1 = this.at(i - 1);
+            const p2 = this.at(i);
+            const d = p1.distance(p2);
+            if (d === currentPieceLength) {
                 p2.properties.pieceBorder = true;
                 currentPieceLength = pieceLength;
-                continue;
             }
-            if (p1.distance(p2) - currentPieceLength > 0) {
+            else if (d - currentPieceLength > 0) {
                 const circle = new DCircle_1.DCircle(p1, currentPieceLength);
                 const line = p1.findLine(p2);
                 const intersectionPoint = line.intersectionWithCircle(circle)
                     .filter((p) => line.inRange(p, CLOSE_TO_INTERSECTION_DISTANCE))[0];
                 intersectionPoint.properties.pieceBorder = true;
-                this.insertAfter(i, intersectionPoint);
+                this.insertAfter(i - 1, intersectionPoint);
                 currentPieceLength = pieceLength;
-                continue;
             }
-            if (p1.distance(p2) - currentPieceLength < 0) {
-                currentPieceLength -= p1.distance(p2);
+            else {
+                currentPieceLength -= d;
             }
         }
         return this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgeoutils",
-  "version": "2.2.19",
+  "version": "2.2.22",
   "description": "",
   "scripts": {
     "build": "node_modules/.bin/tsc",
@@ -45,7 +45,7 @@
     "jest-html-reporter": "^3.4.2",
     "jsdom": "^17.0.0",
     "ts-jest": "^27.0.4",
-    "typedoc": "^0.21.9",
+    "typedoc": "^0.22.11",
     "typescript": "^4.4.3"
   },
   "jest": {