dgeoutils 2.2.10 → 2.2.11

package/dist/DPlane.d.ts

@@ -0,0 +1,25 @@
+import { DPoint } from './DPoint';
+import { DPolygon } from './DPolygon';
+export declare class DPlane {
+    a: number;
+    b: number;
+    c: number;
+    d: number;
+    p1: DPoint;
+    p2: DPoint;
+    p3: DPoint;
+    constructor(a: number, b: number, c: number, d: number, p1?: DPoint, p2?: DPoint, p3?: DPoint);
+    static find(p1: DPoint, p2: DPoint, p3: DPoint): DPlane;
+    x(p: DPoint): DPoint;
+    x(p: DPolygon): DPolygon;
+    y(p: DPoint): DPoint;
+    y(p: DPolygon): DPolygon;
+    z(p: DPoint): DPoint;
+    z(p: DPolygon): DPolygon;
+    clone(): DPlane;
+    distance(p: DPoint): number;
+    distance(p: DPlane): number;
+    equal(p: DPlane): boolean;
+    same(p: DPlane): boolean;
+    parallel(p: DPlane): boolean;
+}

package/dist/DPlane.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DPlane = void 0;
+const DPoint_1 = require("./DPoint");
+const utils_1 = require("./utils");
+const DNumbers_1 = require("./DNumbers");
+class DPlane {
+    constructor(a, b, c, d, p1 = DPoint_1.DPoint.zero(), p2 = DPoint_1.DPoint.zero(), p3 = DPoint_1.DPoint.zero()) {
+        this.a = a;
+        this.b = b;
+        this.c = c;
+        this.d = d;
+        this.p1 = p1;
+        this.p2 = p2;
+        this.p3 = p3;
+    }
+    static find(p1, p2, p3) {
+        if (p1.x === p2.x && p2.x === p3.x) {
+            return new DPlane(1, 0, 0, -p1.x, p1, p2, p3);
+        }
+        if (p1.y === p2.y && p2.y === p3.y) {
+            return new DPlane(0, 1, 0, -p1.y, p1, p2, p3);
+        }
+        if (p1.z === p2.z && p2.z === p3.z) {
+            return new DPlane(0, 0, 1, -p1.z, p1, p2, p3);
+        }
+        const d = 1;
+        const [a, b, c] = (0, utils_1.gaussianElimination)([
+            [p1.x, p1.y, p1.z, -d],
+            [p2.x, p2.y, p2.z, -d],
+            [p3.x, p3.y, p3.z, -d]
+        ]);
+        return new DPlane(a, b, c, d, p1, p2, p3);
+    }
+    x(p) {
+        if (p instanceof DPoint_1.DPoint) {
+            const { a, b, c, d } = this;
+            const { y, z } = p;
+            p.x = -(b * y + c * z + d) / a;
+            return p;
+        }
+        return p.map((t) => this.x(t));
+    }
+    y(p) {
+        if (p instanceof DPoint_1.DPoint) {
+            const { a, b, c, d } = this;
+            const { x, z } = p;
+            p.y = -(a * x + c * z + d) / b;
+            return p;
+        }
+        return p.map((t) => this.y(t));
+    }
+    z(p) {
+        if (p instanceof DPoint_1.DPoint) {
+            const { a, b, c, d } = this;
+            const { x, y } = p;
+            p.z = -(a * x + b * y + d) / c;
+            return p;
+        }
+        return p.map((t) => this.z(t));
+    }
+    clone() {
+        const { a, b, c, d, p1, p2, p3 } = this;
+        return new DPlane(a, b, c, d, p1, p2, p3);
+    }
+    distance(p) {
+        if (p instanceof DPoint_1.DPoint) {
+            const { x, y, z } = p;
+            const { a, b, c, d } = this;
+            return Math.abs(a * x + b * y + c * z + d) / Math.sqrt(a * a + b * b + c * c);
+        }
+        const { a, b, c, d } = p;
+        const { d: r } = this;
+        return Math.abs(d - r) / Math.sqrt(a * a + b * b + c * c);
+    }
+    equal(p) {
+        const { a, b, c, d } = p;
+        const { a: q, b: w, c: e, d: r } = this;
+        return DNumbers_1.DNumbers.like(a, q) &&
+            DNumbers_1.DNumbers.like(b, w) &&
+            DNumbers_1.DNumbers.like(c, e) &&
+            DNumbers_1.DNumbers.like(d, r);
+    }
+    same(p) {
+        const { a, b, c, d } = p;
+        const { a: q, b: w, c: e, d: r } = this;
+        const t = a / q;
+        const y = b / w;
+        const u = c / e;
+        const i = d / r;
+        return DNumbers_1.DNumbers.like(t, y) &&
+            DNumbers_1.DNumbers.like(t, u) &&
+            DNumbers_1.DNumbers.like(t, c) &&
+            DNumbers_1.DNumbers.like(t, i);
+    }
+    parallel(p) {
+        const { a, b, c, d } = p;
+        const { a: q, b: w, c: e, d: r } = this;
+        const t = a / q;
+        const y = b / w;
+        const u = c / e;
+        const i = d / r;
+        return DNumbers_1.DNumbers.like(t, y) &&
+            DNumbers_1.DNumbers.like(t, u) &&
+            DNumbers_1.DNumbers.like(t, c) &&
+            !DNumbers_1.DNumbers.like(t, i);
+    }
+}
+exports.DPlane = DPlane;

package/dist/DPoint.d.ts

@@ -49,9 +49,13 @@ export declare class DPoint {
     gtOrEqual(p: DPoint): boolean;
     ltOrEqual(p: DPoint): boolean;
     rotate(a: number): DPoint;
+    rotate3dX(a: number): DPoint;
+    rotate3dY(a: number): DPoint;
+    rotate3dZ(a: number): DPoint;
     move(v: number): DPoint;
     move(p: DPoint): DPoint;
     move(x: number, y: number): DPoint;
+    move(x: number, y: number, z: number): DPoint;
     degreeToMeters(): DPoint;
     metersToDegree(): DPoint;
     degreeToRadians(): DPoint;

package/dist/DPoint.js

@@ -164,19 +164,47 @@ class DPoint {
         this.y = y;
         return this;
     }
-    move(x, y = x) {
+    rotate3dX(a) {
+        const { y, z } = this;
+        this.y = y * Math.cos(a) + z * Math.sin(a);
+        this.z = -y * Math.sin(a) + z * Math.cos(a);
+        return this;
+    }
+    rotate3dY(a) {
+        const { x, z } = this;
+        this.x = x * Math.cos(a) + z * Math.sin(a);
+        this.z = -x * Math.sin(a) + z * Math.cos(a);
+        return this;
+    }
+    rotate3dZ(a) {
+        const { x, y } = this;
+        this.x = x * Math.cos(a) - y * Math.sin(a);
+        this.y = -x * Math.sin(a) + y * Math.cos(a);
+        return this;
+    }
+    move(x, y = x, z = x) {
         let xV = 0;
         let yV = 0;
+        let zV = undefined;
         if (x instanceof DPoint) {
             xV = this.x + x.x;
             yV = this.y + x.y;
+            if (this.z && x.z) {
+                zV = this.z + x.z;
+            }
         }
         else {
             xV = this.x + x;
             yV = this.y + y;
+            if (this.z && z) {
+                zV = this.z + z;
+            }
         }
         this.x = xV;
         this.y = yV;
+        if (zV) {
+            this.z = zV;
+        }
         return this;
     }
     degreeToMeters() {

package/dist/DPolygon.d.ts

@@ -54,7 +54,7 @@ export declare class DPolygon {
     setCenter(newCenter: DPoint): DPolygon;
     static WKT_LINESTRING: string;
     static WKT_POLYGON: string;
-    toWKT(type?: string): string;
+    toWKT(type?: string, withZ?: boolean): string;
     filter(f: (p: DPoint) => boolean): DPolygon;
     map(f: (r: DPoint) => DPoint): DPolygon;
     map(f: (r: DPoint, index: number) => DPoint): DPolygon;

package/dist/DPolygon.js

@@ -326,17 +326,17 @@ class DPolygon {
             .move(newCenter.clone().move(this.center.minus()))
             .run();
     }
-    toWKT(type = DPolygon.WKT_POLYGON) {
+    toWKT(type = DPolygon.WKT_POLYGON, withZ = false) {
         if (type === DPolygon.WKT_POLYGON) {
             let h = '';
             if (this.holes && this.holes.length) {
                 h = `, ${this.holes.map((hole) => hole.toString())
                     .join(', ')}`;
             }
-            return `POLYGON ((${this.deintersection.pPoints.map((r) => `${r.x} ${r.y}`)
+            return `POLYGON ((${this.deintersection.pPoints.map((r) => `${r.x} ${r.y}${withZ ? ` ${r.z}` : ''}`)
                 .join(', ')})${h})`;
         }
-        return `LINESTRING (${this.pPoints.map((r) => `${r.x} ${r.y}`)
+        return `LINESTRING (${this.pPoints.map((r) => `${r.x} ${r.y}${withZ ? ` ${r.z}` : ''}`)
             .join(', ')})`;
     }
     filter(f) {

package/dist/DPolygonLoop.d.ts

@@ -17,6 +17,9 @@ export declare class DPolygonLoop {
     setZ(z: number): DPolygonLoop;
     setZ(f: SetterFunction): DPolygonLoop;
     rotate(a: number): DPolygonLoop;
+    rotate3dX(a: number): DPolygonLoop;
+    rotate3dY(a: number): DPolygonLoop;
+    rotate3dZ(a: number): DPolygonLoop;
     move(v: number): DPolygonLoop;
     move(p: DPoint): DPolygonLoop;
     move(x: number, y: number): DPolygonLoop;

package/dist/DPolygonLoop.js

@@ -10,28 +10,31 @@ var LoopFunctions;
     LoopFunctions[LoopFunctions["setY"] = 4] = "setY";
     LoopFunctions[LoopFunctions["setZ"] = 5] = "setZ";
     LoopFunctions[LoopFunctions["rotate"] = 6] = "rotate";
-    LoopFunctions[LoopFunctions["move"] = 7] = "move";
-    LoopFunctions[LoopFunctions["round"] = 8] = "round";
-    LoopFunctions[LoopFunctions["ceil"] = 9] = "ceil";
-    LoopFunctions[LoopFunctions["floor"] = 10] = "floor";
-    LoopFunctions[LoopFunctions["toFixed"] = 11] = "toFixed";
-    LoopFunctions[LoopFunctions["abs"] = 12] = "abs";
-    LoopFunctions[LoopFunctions["scale"] = 13] = "scale";
-    LoopFunctions[LoopFunctions["divide"] = 14] = "divide";
-    LoopFunctions[LoopFunctions["degreeToRadians"] = 15] = "degreeToRadians";
-    LoopFunctions[LoopFunctions["radiansToDegrees"] = 16] = "radiansToDegrees";
-    LoopFunctions[LoopFunctions["radiansToMeters"] = 17] = "radiansToMeters";
-    LoopFunctions[LoopFunctions["metersToRadians"] = 18] = "metersToRadians";
-    LoopFunctions[LoopFunctions["hipPoint"] = 19] = "hipPoint";
-    LoopFunctions[LoopFunctions["xPoint"] = 20] = "xPoint";
-    LoopFunctions[LoopFunctions["yPoint"] = 21] = "yPoint";
-    LoopFunctions[LoopFunctions["wPoint"] = 22] = "wPoint";
-    LoopFunctions[LoopFunctions["hPoint"] = 23] = "hPoint";
-    LoopFunctions[LoopFunctions["setIfLessThan"] = 24] = "setIfLessThan";
-    LoopFunctions[LoopFunctions["minus"] = 25] = "minus";
-    LoopFunctions[LoopFunctions["degreeToMeters"] = 26] = "degreeToMeters";
-    LoopFunctions[LoopFunctions["metersToDegree"] = 27] = "metersToDegree";
-    LoopFunctions[LoopFunctions["flipVertically"] = 28] = "flipVertically";
+    LoopFunctions[LoopFunctions["rotate3dX"] = 7] = "rotate3dX";
+    LoopFunctions[LoopFunctions["rotate3dY"] = 8] = "rotate3dY";
+    LoopFunctions[LoopFunctions["rotate3dZ"] = 9] = "rotate3dZ";
+    LoopFunctions[LoopFunctions["move"] = 10] = "move";
+    LoopFunctions[LoopFunctions["round"] = 11] = "round";
+    LoopFunctions[LoopFunctions["ceil"] = 12] = "ceil";
+    LoopFunctions[LoopFunctions["floor"] = 13] = "floor";
+    LoopFunctions[LoopFunctions["toFixed"] = 14] = "toFixed";
+    LoopFunctions[LoopFunctions["abs"] = 15] = "abs";
+    LoopFunctions[LoopFunctions["scale"] = 16] = "scale";
+    LoopFunctions[LoopFunctions["divide"] = 17] = "divide";
+    LoopFunctions[LoopFunctions["degreeToRadians"] = 18] = "degreeToRadians";
+    LoopFunctions[LoopFunctions["radiansToDegrees"] = 19] = "radiansToDegrees";
+    LoopFunctions[LoopFunctions["radiansToMeters"] = 20] = "radiansToMeters";
+    LoopFunctions[LoopFunctions["metersToRadians"] = 21] = "metersToRadians";
+    LoopFunctions[LoopFunctions["hipPoint"] = 22] = "hipPoint";
+    LoopFunctions[LoopFunctions["xPoint"] = 23] = "xPoint";
+    LoopFunctions[LoopFunctions["yPoint"] = 24] = "yPoint";
+    LoopFunctions[LoopFunctions["wPoint"] = 25] = "wPoint";
+    LoopFunctions[LoopFunctions["hPoint"] = 26] = "hPoint";
+    LoopFunctions[LoopFunctions["setIfLessThan"] = 27] = "setIfLessThan";
+    LoopFunctions[LoopFunctions["minus"] = 28] = "minus";
+    LoopFunctions[LoopFunctions["degreeToMeters"] = 29] = "degreeToMeters";
+    LoopFunctions[LoopFunctions["metersToDegree"] = 30] = "metersToDegree";
+    LoopFunctions[LoopFunctions["flipVertically"] = 31] = "flipVertically";
 })(LoopFunctions || (LoopFunctions = {}));
 const decodePoolRecord = (a, { functionName, pointArg, numberPointArg, numberArg, setterArg }) => {
     let res = a;
@@ -64,6 +67,18 @@ const decodePoolRecord = (a, { functionName, pointArg, numberPointArg, numberArg
             res = (k) => a(k)
                 .rotate(numberArg);
             break;
+        case LoopFunctions.rotate3dX:
+            res = (k) => a(k)
+                .rotate3dX(numberArg);
+            break;
+        case LoopFunctions.rotate3dY:
+            res = (k) => a(k)
+                .rotate3dY(numberArg);
+            break;
+        case LoopFunctions.rotate3dZ:
+            res = (k) => a(k)
+                .rotate3dZ(numberArg);
+            break;
         case LoopFunctions.move:
             res = (k) => a(k)
                 .move(numberPointArg, numberArg);
@@ -215,6 +230,27 @@ class DPolygonLoop {
         });
         return this;
     }
+    rotate3dX(a) {
+        this.pool.push({
+            functionName: LoopFunctions.rotate3dX,
+            numberArg: a
+        });
+        return this;
+    }
+    rotate3dY(a) {
+        this.pool.push({
+            functionName: LoopFunctions.rotate3dY,
+            numberArg: a
+        });
+        return this;
+    }
+    rotate3dZ(a) {
+        this.pool.push({
+            functionName: LoopFunctions.rotate3dZ,
+            numberArg: a
+        });
+        return this;
+    }
     move(x, y = x) {
         this.pool.push({
             functionName: LoopFunctions.move,

package/dist/index.d.ts

@@ -6,6 +6,7 @@ export * from './DPolygon';
 export * from './FastSearch';
 export * from './TraceMatrix';
 export * from './DPolygonLoop';
+export * from './DPlane';
 export declare const DGeo: {
     DEBUG: boolean;
 };

package/dist/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./DPolygon"), exports);
 __exportStar(require("./FastSearch"), exports);
 __exportStar(require("./TraceMatrix"), exports);
 __exportStar(require("./DPolygonLoop"), exports);
+__exportStar(require("./DPlane"), exports);
 exports.DGeo = {
     DEBUG: false
 };

package/dist/utils.d.ts

@@ -13,4 +13,6 @@ interface CheckFunction {
 }
 export declare const checkFunction: (funcName: string) => CheckFunction;
 export declare const createArray: (v: number) => number[];
+export declare const createMatrix: ({ h, w }: DPoint) => number[][];
+export declare const gaussianElimination: (matrix: number[][]) => number[];
 export {};

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createArray = exports.checkFunction = exports.warn = void 0;
+exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.warn = void 0;
 const index_1 = require("./index");
 const DPoint_1 = require("./DPoint");
 const warn = (...args) => {
@@ -65,3 +65,49 @@ const checkFunction = (funcName) => ({
 exports.checkFunction = checkFunction;
 const createArray = (v) => new Array(v).fill(0);
 exports.createArray = createArray;
+const createMatrix = ({ h, w }) => (0, exports.createArray)(h).map(() => (0, exports.createArray)(w));
+exports.createMatrix = createMatrix;
+const GAUSSIAN_ELIMINATION_MIN = 1e-10;
+const gaussianElimination = (matrix) => {
+    const n = matrix.length;
+    const matrixClone = (0, exports.createMatrix)(new DPoint_1.DPoint(n + 1, n));
+    for (let i = 0; i < n; i++) {
+        for (let j = 0; j < n + 1; j++) {
+            matrix[i][j] = matrix[i][j] === 0 ? GAUSSIAN_ELIMINATION_MIN : matrix[i][j];
+            matrixClone[i][j] = matrix[i][j];
+        }
+    }
+    for (let k = 0; k < n; k++) {
+        for (let i = 0; i < n + 1; i++) {
+            matrixClone[k][i] /= matrix[k][k];
+        }
+        for (let i = k + 1; i < n; i++) {
+            const K = matrixClone[i][k] / matrixClone[k][k];
+            for (let j = 0; j < n + 1; j++) {
+                matrixClone[i][j] -= matrixClone[k][j] * K;
+            }
+        }
+        for (let i = 0; i < n; i++) {
+            for (let j = 0; j < n + 1; j++) {
+                matrix[i][j] = matrixClone[i][j];
+            }
+        }
+    }
+    for (let k = n - 1; k > -1; k--) {
+        for (let i = n; i > -1; i--) {
+            matrixClone[k][i] /= matrix[k][k];
+        }
+        for (let i = k - 1; i > -1; i--) {
+            const K = matrixClone[i][k] / matrixClone[k][k];
+            for (let j = n; j > -1; j--) {
+                matrixClone[i][j] -= matrixClone[k][j] * K;
+            }
+        }
+    }
+    const answer = (0, exports.createArray)(n);
+    for (let i = 0; i < n; i++) {
+        answer[i] = matrixClone[i][n];
+    }
+    return answer;
+};
+exports.gaussianElimination = gaussianElimination;

package/package.json

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