dgeoutils 2.2.16 → 2.2.22

package/dist/DLine.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DLine = void 0;
 const DPoint_1 = require("./DPoint");
 const utils_1 = require("./utils");
+const DNumbers_1 = require("./DNumbers");
 class DLine {
     constructor(a, b, c, begin = DPoint_1.DPoint.zero(), end = DPoint_1.DPoint.zero()) {
         this.a = a;
@@ -49,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;
@@ -221,19 +222,15 @@ class DLine {
     }
     movePoint(p, d) {
         const fi = this.findFi(new DLine(1, 0, 0));
-        const td = this.begin.distance(this.end) / 2;
-        const dcosT = td * Math.cos(fi);
-        const dsinT = td * Math.sin(fi);
-        const p1T = new DPoint_1.DPoint(p.x - dsinT, p.y - dcosT);
-        const p2T = new DPoint_1.DPoint(p.x + dsinT, p.y + dcosT);
-        const dcos = d * Math.cos(fi);
-        const dsin = d * Math.sin(fi);
-        const p2 = new DPoint_1.DPoint(p.x + dsin, p.y + dcos);
-        const p3 = new DPoint_1.DPoint(p.x - dsin, p.y + dcos);
-        if (this.inRange(p1T) || this.inRange(p2T)) {
-            return p2;
-        }
-        return p3;
+        const td = this.x(new DPoint_1.DPoint(1, 1)).distance(this.x(new DPoint_1.DPoint(2, 2))) / 2;
+        const sinCos = new DPoint_1.DPoint(Math.sin(fi), Math.cos(fi));
+        const dt = sinCos.clone().scale(td);
+        const p1T = p.clone().move(dt.clone().minus());
+        const p2T = p.clone().move(dt);
+        if (DNumbers_1.DNumbers.like(this.y(p1T).y, p1T.y) || DNumbers_1.DNumbers.like(this.y(p2T).y, p2T.y)) {
+            return p.clone().move(sinCos.scale(d));
+        }
+        return p.clone().move(sinCos.scale(d).setX(({ x }) => -x));
     }
     findFi({ a, b }, delta = 1.0001) {
         const { a: q, b: w } = this;

package/dist/DPoint.d.ts

@@ -102,5 +102,5 @@ export declare class DPoint {
     setIfLessThan(p: DPoint): DPoint;
     minus(): DPoint;
     orthodromicPath(point: DPoint, pointsCount?: number): DPolygon;
-    findCloserPoint(p: DPolygon): DPoint;
+    sortByDistance(p: DPolygon): DPolygon;
 }

package/dist/DPoint.js

@@ -462,17 +462,15 @@ class DPoint {
             return new DPoint(x, y).radiansToDegrees();
         }));
     }
-    findCloserPoint(p) {
-        let d = Infinity;
-        let res = DPoint.zero();
-        for (const t of p.points) {
-            const td = this.distance(t);
-            if (td < d) {
-                d = td;
-                res = t.clone();
-            }
-        }
-        return res;
+    sortByDistance(p) {
+        return p
+            .clone()
+            .map((d, index) => {
+            d.properties.distance = d.distance(this);
+            d.properties.index = index;
+            return d;
+        })
+            .sort((a, b) => a.properties.distance - b.properties.distance);
     }
 }
 exports.DPoint = DPoint;

package/dist/DPolygon.d.ts

@@ -58,6 +58,7 @@ export declare class DPolygon {
     filter(f: (p: DPoint) => boolean): DPolygon;
     map(f: (r: DPoint) => DPoint): DPolygon;
     map(f: (r: DPoint, index: number) => DPoint): DPolygon;
+    sort(f: (a: DPoint, b: DPoint) => number): DPolygon;
     at(index: number): DPoint;
     pop(): DPoint;
     push(...args: DPoint[]): number;
@@ -102,6 +103,7 @@ export declare class DPolygon {
     get closed(): boolean;
     buffer(v: number, quadrantSegments?: number, type?: number): DPolygon;
     bezier(step?: number): DPolygon;
+    setGrowingHeight(from: number, to: number): DPolygon;
     private getBezierPoint;
     private simpleIncludeX;
     private simpleIncludeY;

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() {
@@ -349,6 +413,10 @@ class DPolygon {
         this.holes = this.holes.map((h) => h.map(f));
         return this;
     }
+    sort(f) {
+        this.points.sort(f);
+        return this;
+    }
     at(index) {
         const { length } = this;
         return this.points[(index % length + length) % length];
@@ -518,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;
-        }
-        else {
-            throw new Error('contains2 faild');
+            return true;
         }
-        return result;
+        throw new Error('contains2 faild');
     }
     onBorder(p) {
         const simpleInclude = this.simpleInclude(p);
@@ -578,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;
@@ -815,6 +878,20 @@ class DPolygon {
         }
         return res;
     }
+    setGrowingHeight(from, to) {
+        const { fullLength } = this;
+        let { first: prevPoint } = this;
+        const d = to - from;
+        let currentDistance = 0;
+        this.loop()
+            .setZ((p) => {
+            currentDistance += prevPoint.distance(p);
+            prevPoint = p;
+            return from + currentDistance / fullLength * d;
+        })
+            .run();
+        return this;
+    }
     getBezierPoint(v) {
         if (this.length === 1) {
             return this.first;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgeoutils",
-  "version": "2.2.16",
+  "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": {