dgeoutils 2.2.18 → 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/package.json

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