dgeoutils 2.2.22 → 2.2.23

package/dist/DPolygon.d.ts

@@ -2,6 +2,7 @@
 import { DCoord, DPoint, LatLng } from './DPoint';
 import { DLine } from './DLine';
 import { DPolygonLoop } from './DPolygonLoop';
+import { True } from './utils';
 export declare const MIN_POINTS_IN_VALID_POLYGON = 3;
 export declare class DPolygon {
     private pPoints;
@@ -102,8 +103,11 @@ export declare class DPolygon {
     getTrianglesPointIndexes(): number[];
     get closed(): boolean;
     buffer(v: number, quadrantSegments?: number, type?: number): DPolygon;
+    sideBuffers(v: number, quadrantSegments?: number): [DPolygon, DPolygon];
     bezier(step?: number): DPolygon;
     setGrowingHeight(from: number, to: number): DPolygon;
+    loopPointsGenerator(): () => Generator<[DPoint, DPoint, undefined, number]>;
+    loopPointsGenerator(withLine: True): () => Generator<[DPoint, DPoint, DLine, number]>;
     private getBezierPoint;
     private simpleIncludeX;
     private simpleIncludeY;

package/dist/DPolygon.js

@@ -18,21 +18,16 @@ const containCalculator = (poly, 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);
+    for (const [, , polygonLine] of poly.loopPointsGenerator(true)()) {
         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);
+    for (const [{ x, y }, { x: a, y: b }] of poly.loopPointsGenerator()()) {
+        const line1 = new DLine_1.DLine(x - p.x, y - p.y, 0);
+        const line2 = new DLine_1.DLine(a - p.x, b - p.y, 0);
         const fiDif = line1.findFi(line2);
         if (line1.vectorProduct(line2).c > 0) {
             totalFi += fiDif;
@@ -198,18 +193,15 @@ class DPolygon {
     }
     get perimeter() {
         let p = 0;
-        for (let i = 1; i < this.pPoints.length; i++) {
-            p += this.pPoints[i - 1].distance(this.pPoints[i]);
+        for (const [p1, p2] of this.loopPointsGenerator()()) {
+            p += p1.distance(p2);
         }
         return p;
     }
     get area() {
-        const closed = this.deintersection;
         let sum = 0;
-        for (let i = 1; i < closed.length; i++) {
-            const cur = closed.at(i);
-            const prev = closed.at(i - 1);
-            sum += prev.x * cur.y - prev.y * cur.x;
+        for (const [{ x, y }, { x: a, y: b }] of this.deintersection.loopPointsGenerator()()) {
+            sum += x * b - y * a;
         }
         return Math.abs(sum / 2) - this.holes.reduce((a, hole) => a + hole.area, 0);
     }
@@ -269,19 +261,18 @@ class DPolygon {
         const p = this.convex;
         let resultPolygon = new DPolygon();
         let resultArea = Infinity;
-        for (let k = 0; k < p.length - 1; k++) {
-            const l = p.at(k).findLine(p.at(k + 1));
+        for (const [, , l] of p.loopPointsGenerator(true)()) {
             let maxWidth = 0;
             let maxWidthPoint1 = null;
             let maxWidthPoint2 = null;
             let maxHeight = 0;
             let maxHeightPoint = null;
-            for (let i = 0; i < p.length - 1; i++) {
-                const p1 = l.findPoint(l.findPerpendicular(p.at(i)));
-                const h = p1.distance(p.at(i));
+            for (const [z, , , i] of p.loopPointsGenerator()()) {
+                const p1 = l.findPoint(l.findPerpendicular(z));
+                const h = p1.distance(z);
                 if (h >= maxHeight) {
                     maxHeight = h;
-                    maxHeightPoint = p.at(i);
+                    maxHeightPoint = z;
                 }
                 for (let j = i; j < p.length - 1; j++) {
                     const p2 = l.findPoint(l.findPerpendicular(p.at(j)));
@@ -354,11 +345,9 @@ class DPolygon {
     }
     get isClockwise() {
         let sum = 0;
-        const p = this.clone().close();
-        for (let i = 1; i < p.length; i++) {
-            const p1 = p.at(i - 1);
-            const p2 = p.at(i);
-            sum += (p2.x - p1.x) * (p2.y + p1.y);
+        for (const [{ x, y }, { x: a, y: b }] of this.clone().close()
+            .loopPointsGenerator()()) {
+            sum += (a - x) * (b + y);
         }
         return sum < 0;
     }
@@ -375,10 +364,7 @@ class DPolygon {
     }
     intersection(l, includeOnly = false) {
         const res = [];
-        for (let i = 0; i < this.pPoints.length - 1; i++) {
-            const p1 = this.pPoints[i];
-            const p2 = this.pPoints[i + 1];
-            const line = p1.findLine(p2);
+        for (const [, , line] of this.loopPointsGenerator(true)()) {
             const intersect = line.intersection(l, 0, includeOnly);
             if (intersect) {
                 res.push(intersect);
@@ -572,11 +558,9 @@ class DPolygon {
         }
         const poly = this.deintersection;
         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);
+        for (const [{ x, y }, { x: a, y: b }] of poly.loopPointsGenerator()()) {
+            const line1 = new DLine_1.DLine(x - p.x, y - p.y, 0);
+            const line2 = new DLine_1.DLine(a - p.x, b - p.y, 0);
             const fiDif = line1.findFi(line2);
             if (line1.vectorProduct(line2).c > 0) {
                 totalFi += fiDif;
@@ -603,10 +587,7 @@ class DPolygon {
             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);
+            for (const [, , polygonLine] of poly.loopPointsGenerator(true)()) {
                 const onBorder = polygonLine.x(p).equal(p) && polygonLine.inRange(p);
                 if (onBorder) {
                     return true;
@@ -642,9 +623,7 @@ class DPolygon {
         const { fullLength } = this;
         const pieceLength = fullLength / piecesCount;
         let currentPieceLength = pieceLength;
-        for (let i = 1; i < this.length; i++) {
-            const p1 = this.at(i - 1);
-            const p2 = this.at(i);
+        for (const [p1, p2, , i] of this.loopPointsGenerator()()) {
             const d = p1.distance(p2);
             if (d === currentPieceLength) {
                 p2.properties.pieceBorder = true;
@@ -656,7 +635,7 @@ class DPolygon {
                 const intersectionPoint = line.intersectionWithCircle(circle)
                     .filter((p) => line.inRange(p, CLOSE_TO_INTERSECTION_DISTANCE))[0];
                 intersectionPoint.properties.pieceBorder = true;
-                this.insertAfter(i - 1, intersectionPoint);
+                this.insertAfter(i, intersectionPoint);
                 currentPieceLength = pieceLength;
             }
             else {
@@ -871,6 +850,17 @@ class DPolygon {
             .getCoordinates();
         return new DPolygon(points.map(({ x, y }) => new DPoint_1.DPoint(x, y)));
     }
+    sideBuffers(v, quadrantSegments = 64) {
+        const { first, last } = this;
+        const buffer = this.buffer(v, quadrantSegments, DPolygon.CAP_FLAT).open();
+        const [start0, start1] = first.sortByDistance(buffer).points.map((r) => r.properties.index);
+        const [end0, end1] = last.sortByDistance(buffer).points.map((r) => r.properties.index);
+        const fromPoint = Math.min(Math.max(start0, start1), Math.max(end0, end1));
+        const toPoint = Math.max(Math.min(start0, start1), Math.min(end0, end1));
+        const linePart = new DPolygon(buffer.removePart(fromPoint - 1, toPoint - fromPoint + 1));
+        buffer.unshift(buffer.pop());
+        return [linePart, buffer];
+    }
     bezier(step = 0.1) {
         const res = new DPolygon();
         for (let i = 0; i < 1; i += step) {
@@ -892,13 +882,21 @@ class DPolygon {
             .run();
         return this;
     }
+    loopPointsGenerator(withLine = false) {
+        const that = this;
+        return function* () {
+            for (let i = 0; i < that.length - 1; i++) {
+                const p1 = that.at(i);
+                const p2 = that.at(i + 1);
+                yield [p1, p2, withLine ? p1.findLine(p2) : undefined, i];
+            }
+        };
+    }
     getBezierPoint(v) {
         if (this.length === 1) {
             return this.first;
         }
-        for (let i = 0; i < this.length - 1; i++) {
-            const p1 = this.at(i);
-            const p2 = this.at(i + 1);
+        for (const [p1, p2] of this.loopPointsGenerator()()) {
             p1.move(p2.clone().move(p1.clone().minus())
                 .scale(v));
         }

package/dist/utils.d.ts

@@ -22,7 +22,7 @@ export declare const gaussianElimination: {
     (matrix: number[][]): number[];
     MIN: number;
 };
-declare type True = true;
+export declare type True = true;
 export declare const createCanvas: {
     (size: number): [HTMLCanvasElement, CanvasRenderingContext2D];
     (size: number, offscreen: True): [OffscreenCanvas, OffscreenCanvasRenderingContext2D];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgeoutils",
-  "version": "2.2.22",
+  "version": "2.2.23",
   "description": "",
   "scripts": {
     "build": "node_modules/.bin/tsc",