dgeoutils 2.2.15 → 2.2.19

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;
@@ -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

@@ -7,6 +7,7 @@ const DCircle_1 = require("./DCircle");
 const DNumbers_1 = require("./DNumbers");
 const jsts_1 = require("jsts");
 const DPolygonLoop_1 = require("./DPolygonLoop");
+const utils_1 = require("./utils");
 const { buffer: { BufferParameters: { CAP_ROUND, CAP_FLAT, CAP_SQUARE } } } = jsts_1.operation;
 exports.MIN_POINTS_IN_VALID_POLYGON = 3;
 const APPROXIMATION_VALUE = 0.1;
@@ -19,11 +20,11 @@ class DPolygon {
         this.holes = [];
         this.searchStore = {};
     }
-    static arrayOfTrianglesToVertices(triangles, height = 0) {
-        return triangles.map((v) => v
+    static arrayOfTrianglesToVertices(triangles, height) {
+        return triangles.map((v) => ((0, utils_1.isDefAndNotNull)(height) ? v
             .loop()
             .height(height)
-            .run()
+            .run() : v)
             .toArrayOfCoords())
             .flat(2);
     }
@@ -348,6 +349,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];
@@ -814,6 +819,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.15",
+  "version": "2.2.19",
   "description": "",
   "scripts": {
     "build": "node_modules/.bin/tsc",