dgeoutils 2.2.11 → 2.2.15

package/README.md

@@ -13,6 +13,8 @@
 [![Coverage branches](https://edejin.github.io/DGeoUtils/media/badges/badge-branches.svg)](https://edejin.github.io/DGeoUtils/media/lcov-report/index.html)
 [![Coverage statements](https://edejin.github.io/DGeoUtils/media/badges/badge-statements.svg)](https://edejin.github.io/DGeoUtils/media/lcov-report/index.html)
 
+[Test time report](https://edejin.github.io/DGeoUtils/media/time-report.html)
+
 [Docs](https://edejin.github.io/DGeoUtils/index.html)
 
 [ESLint Report](https://edejin.github.io/DGeoUtils/media/eslit.html)

package/dist/DCircle.d.ts

@@ -12,7 +12,7 @@ export declare class DCircle {
     clone(): DCircle;
     findPoints(c: DCircle): DPoint[] | number;
     equal({ center, r }: DCircle): boolean;
-    findPolygonInside(pointCount?: number): DPolygon;
-    findPolygonInsideOnSphere(pointCount?: number): DPolygon;
+    findPolygonInside(pointCount?: number, startAngle?: number, stopAngle?: number): DPolygon;
+    findPolygonInsideOnSphere(pointCount?: number, startAngle?: number, stopAngle?: number): DPolygon;
     private sphereOffset;
 }

package/dist/DCircle.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DCircle = void 0;
 const DPoint_1 = require("./DPoint");
 const DPolygon_1 = require("./DPolygon");
-const DNumbers_1 = require("./DNumbers");
 const utils_1 = require("./utils");
 class DCircle {
     constructor(center = DPoint_1.DPoint.zero(), r = 0) {
@@ -51,36 +50,42 @@ class DCircle {
     equal({ center, r }) {
         return this.center.equal(center) && this.r === r;
     }
-    findPolygonInside(pointCount = 64) {
-        const preAngle = 2 * Math.PI / pointCount;
+    findPolygonInside(pointCount = 64, startAngle = 0, stopAngle = 2 * Math.PI) {
+        const step = 2 * Math.PI / pointCount;
         const points = [];
-        for (let i = 0; i < pointCount; i++) {
-            const angle = preAngle * i;
-            const x = this.r * Math.cos(angle) + this.center.x;
-            const y = this.r * Math.sin(angle) + this.center.y;
-            points.push(new DPoint_1.DPoint(x, y));
+        let angle = startAngle;
+        while (angle < stopAngle - step) {
+            points.push(new DPoint_1.DPoint(this.r).scale(Math.cos(angle), Math.sin(angle))
+                .move(this.center));
+            angle += step;
         }
-        return new DPolygon_1.DPolygon([...points, points[0]]);
+        const x = this.r * Math.cos(stopAngle) + this.center.x;
+        const y = this.r * Math.sin(stopAngle) + this.center.y;
+        points.push(new DPoint_1.DPoint(x, y));
+        return new DPolygon_1.DPolygon(points);
     }
-    findPolygonInsideOnSphere(pointCount = 64) {
+    findPolygonInsideOnSphere(pointCount = 64, startAngle = 0, stopAngle = 2 * Math.PI) {
         (0, utils_1.checkFunction)('findPolygonInsideOnSphere')
             .checkArgument('center')
             .shouldBeDegree(this.center);
-        const res = new DPolygon_1.DPolygon();
-        for (let i = 0; i < pointCount; i++) {
-            res.push(this.sphereOffset(2 * Math.PI * i / pointCount));
+        const step = 2 * Math.PI / pointCount;
+        const points = [];
+        let angle = startAngle;
+        while (angle < stopAngle - step) {
+            points.push(this.sphereOffset(angle));
+            angle += step;
         }
-        return res.close();
+        points.push(this.sphereOffset(stopAngle));
+        return new DPolygon_1.DPolygon(points);
     }
     sphereOffset(bearing, earthRadius = DPoint_1.EARTH_RADIUS_IN_METERS) {
-        const lat1 = DNumbers_1.DNumbers.deg2Rad(this.center.y);
-        const lon1 = DNumbers_1.DNumbers.deg2Rad(this.center.x);
+        const { x: lon1, y: lat1 } = this.center.clone().degreeToRadians();
         const dByR = this.r / earthRadius;
         const lat = Math.asin(Math.sin(lat1) * Math.cos(dByR) +
             Math.cos(lat1) * Math.sin(dByR) * Math.cos(bearing));
         const lon = lon1 +
             Math.atan2(Math.sin(bearing) * Math.sin(dByR) * Math.cos(lat1), Math.cos(dByR) - Math.sin(lat1) * Math.sin(lat));
-        return new DPoint_1.DPoint(DNumbers_1.DNumbers.rad2Deg(lon), DNumbers_1.DNumbers.rad2Deg(lat));
+        return new DPoint_1.DPoint(lon, lat).radiansToDegrees();
     }
 }
 exports.DCircle = DCircle;

package/dist/DPoint.d.ts

@@ -37,6 +37,7 @@ export declare class DPoint {
     height(z: number): DPoint;
     toWKT(): string;
     distance(p: DPoint): number;
+    distance3d(p: DPoint): number;
     setX(x: number): DPoint;
     setX(f: SetterFunction): DPoint;
     setZ(z: number): DPoint;
@@ -70,9 +71,11 @@ export declare class DPoint {
     scale(v: number): DPoint;
     scale(p: DPoint): DPoint;
     scale(x: number, y: number): DPoint;
+    scale(x: number, y: number, z: number): DPoint;
     divide(v: number): DPoint;
     divide(p: DPoint): DPoint;
     divide(x: number, y: number): DPoint;
+    divide(x: number, y: number, z: number): DPoint;
     equal(p: DPoint): boolean;
     like(p: DPoint, d?: number): boolean;
     flipVertically(size: DPoint): DPoint;
@@ -99,4 +102,5 @@ export declare class DPoint {
     setIfLessThan(p: DPoint): DPoint;
     minus(): DPoint;
     orthodromicPath(point: DPoint, pointsCount?: number): DPolygon;
+    findCloserPoint(p: DPolygon): DPoint;
 }

package/dist/DPoint.js

@@ -128,6 +128,21 @@ class DPoint {
         const dy = p.y - this.y;
         return Math.sqrt(dx * dx + dy * dy);
     }
+    distance3d(p) {
+        (0, utils_1.checkFunction)('distance3d')
+            .checkArgument('this')
+            .shouldBeMeters(this)
+            .checkArgument('p')
+            .shouldBeMeters(p)
+            .checkArgument('this.z')
+            .shouldExist(this.z)
+            .checkArgument('p.z')
+            .shouldExist(p.z);
+        const dx = p.x - this.x;
+        const dy = p.y - this.y;
+        const dz = p.z - this.z;
+        return Math.sqrt(dx * dx + dy * dy + dz * dz);
+    }
     setX(x) {
         this.x = typeof x === 'number' ? x : x(this);
         return this;
@@ -182,27 +197,27 @@ class DPoint {
         this.y = -x * Math.sin(a) + y * Math.cos(a);
         return this;
     }
-    move(x, y = x, z = x) {
+    move(x, y = x, z) {
         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) {
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(x.z)) {
                 zV = this.z + x.z;
             }
         }
         else {
             xV = this.x + x;
             yV = this.y + y;
-            if (this.z && z) {
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(z)) {
                 zV = this.z + z;
             }
         }
         this.x = xV;
         this.y = yV;
-        if (zV) {
+        if ((0, utils_1.isDefAndNotNull)(zV)) {
             this.z = zV;
         }
         return this;
@@ -278,34 +293,54 @@ class DPoint {
         this.y = Math.abs(this.y);
         return this;
     }
-    scale(x, y = x) {
+    scale(x, y = x, z) {
         let xV = 0;
         let yV = 0;
+        let zV = undefined;
         if (x instanceof DPoint) {
             xV = this.x * x.x;
             yV = this.y * x.y;
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(x.z)) {
+                zV = this.z * x.z;
+            }
         }
         else {
             xV = this.x * x;
             yV = this.y * y;
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(z)) {
+                zV = this.z * z;
+            }
         }
         this.x = xV;
         this.y = yV;
+        if ((0, utils_1.isDefAndNotNull)(zV)) {
+            this.z = zV;
+        }
         return this;
     }
-    divide(x, y = x) {
+    divide(x, y = x, z) {
         let xV = 0;
         let yV = 0;
+        let zV = undefined;
         if (x instanceof DPoint) {
             xV = this.x / x.x;
             yV = this.y / x.y;
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(x.z)) {
+                zV = this.z / x.z;
+            }
         }
         else {
             xV = this.x / x;
             yV = this.y / y;
+            if ((0, utils_1.isDefAndNotNull)(this.z) && (0, utils_1.isDefAndNotNull)(z)) {
+                zV = this.z / z;
+            }
         }
         this.x = xV;
         this.y = yV;
+        if ((0, utils_1.isDefAndNotNull)(zV)) {
+            this.z = zV;
+        }
         return this;
     }
     equal(p) {
@@ -407,7 +442,7 @@ class DPoint {
         return this;
     }
     minus() {
-        return this.clone().scale(-1);
+        return this.scale(-1);
     }
     orthodromicPath(point, pointsCount = 360) {
         (0, utils_1.checkFunction)('orthodromicPath')
@@ -427,5 +462,17 @@ 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;
+    }
 }
 exports.DPoint = DPoint;

package/dist/DPolygon.d.ts

@@ -101,6 +101,8 @@ export declare class DPolygon {
     getTrianglesPointIndexes(): number[];
     get closed(): boolean;
     buffer(v: number, quadrantSegments?: number, type?: number): DPolygon;
+    bezier(step?: number): DPolygon;
+    private getBezierPoint;
     private simpleIncludeX;
     private simpleIncludeY;
     private douglasPeucker;

package/dist/DPolygon.js

@@ -807,6 +807,26 @@ class DPolygon {
             .getCoordinates();
         return new DPolygon(points.map(({ x, y }) => new DPoint_1.DPoint(x, y)));
     }
+    bezier(step = 0.1) {
+        const res = new DPolygon();
+        for (let i = 0; i < 1; i += step) {
+            res.push(this.clone().getBezierPoint(i));
+        }
+        return res;
+    }
+    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);
+            p1.move(p2.clone().move(p1.clone().minus())
+                .scale(v));
+        }
+        this.pop();
+        return this.getBezierPoint(v);
+    }
     simpleIncludeX(p) {
         const { x } = p;
         return this.minX <= x && this.maxX >= x;

package/dist/index.d.ts

@@ -7,6 +7,7 @@ export * from './FastSearch';
 export * from './TraceMatrix';
 export * from './DPolygonLoop';
 export * from './DPlane';
+export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull } from './utils';
 export declare const DGeo: {
     DEBUG: boolean;
 };

package/dist/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DGeo = void 0;
+exports.DGeo = exports.isDefAndNotNull = exports.createMatrix = exports.createArray = exports.createCanvas = exports.gaussianElimination = void 0;
 __exportStar(require("./DCircle"), exports);
 __exportStar(require("./DLine"), exports);
 __exportStar(require("./DNumbers"), exports);
@@ -20,6 +20,12 @@ __exportStar(require("./FastSearch"), exports);
 __exportStar(require("./TraceMatrix"), exports);
 __exportStar(require("./DPolygonLoop"), exports);
 __exportStar(require("./DPlane"), exports);
+var utils_1 = require("./utils");
+Object.defineProperty(exports, "gaussianElimination", { enumerable: true, get: function () { return utils_1.gaussianElimination; } });
+Object.defineProperty(exports, "createCanvas", { enumerable: true, get: function () { return utils_1.createCanvas; } });
+Object.defineProperty(exports, "createArray", { enumerable: true, get: function () { return utils_1.createArray; } });
+Object.defineProperty(exports, "createMatrix", { enumerable: true, get: function () { return utils_1.createMatrix; } });
+Object.defineProperty(exports, "isDefAndNotNull", { enumerable: true, get: function () { return utils_1.isDefAndNotNull; } });
 exports.DGeo = {
     DEBUG: false
 };

package/dist/utils.d.ts

@@ -1,18 +1,35 @@
+/// <reference types="offscreencanvas" />
 import { DPoint } from './DPoint';
 export declare const warn: (...args: any[]) => void;
+export declare const isDefAndNotNull: (a: any) => boolean;
 declare type CheckFunc = (p: DPoint) => CheckFunction;
+declare type CheckFunc2 = (p: any) => CheckFunction;
 interface CheckArgument {
     shouldBeDegree: CheckFunc;
     shouldBeMeters: CheckFunc;
     shouldBeInt: CheckFunc;
     shouldBeUInt: CheckFunc;
     shouldBeRadians: CheckFunc;
+    shouldExist: CheckFunc2;
 }
 interface CheckFunction {
     checkArgument: (argName: string) => CheckArgument;
 }
 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 declare const createArray: (v: number, fillSymbol?: any) => number[];
+export declare const createMatrix: ({ h, w }: DPoint, fillSymbol?: any) => number[][];
+export declare const gaussianElimination: {
+    (matrix: number[][]): number[];
+    MIN: number;
+};
+declare type True = true;
+export declare const createCanvas: {
+    (size: number): [HTMLCanvasElement, CanvasRenderingContext2D];
+    (size: number, offscreen: True): [OffscreenCanvas, OffscreenCanvasRenderingContext2D];
+    (w: number, h: number): [HTMLCanvasElement, CanvasRenderingContext2D];
+    (w: number, h: number, offscreen: True): [OffscreenCanvas, OffscreenCanvasRenderingContext2D];
+    (size: DPoint): [HTMLCanvasElement, CanvasRenderingContext2D];
+    (size: DPoint, offscreen: True): [OffscreenCanvas, OffscreenCanvasRenderingContext2D];
+    document?: Document;
+};
 export {};

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.warn = void 0;
+exports.createCanvas = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.isDefAndNotNull = exports.warn = void 0;
 const index_1 = require("./index");
 const DPoint_1 = require("./DPoint");
 const warn = (...args) => {
@@ -9,6 +9,8 @@ const warn = (...args) => {
     }
 };
 exports.warn = warn;
+const isDefAndNotNull = (a) => a != undefined;
+exports.isDefAndNotNull = isDefAndNotNull;
 const hook = (scope) => () => scope;
 const shouldBeInt = (scope, funcName, argName) => (p) => {
     if (!p.clone().round()
@@ -36,6 +38,12 @@ const shouldBeRadians = (scope, funcName, argName) => (p) => {
     }
     return scope;
 };
+const shouldExist = (scope, funcName, argName) => (p) => {
+    if (!(0, exports.isDefAndNotNull)(p)) {
+        (0, exports.warn)(`"${funcName}" -> "${argName}" should exist!`);
+    }
+    return scope;
+};
 const shouldBeMeters = (scope, funcName, argName) => (p) => {
     if (!p.likePseudoMercator) {
         (0, exports.warn)(`"${funcName}" -> "${argName}" should be meters!`);
@@ -50,7 +58,8 @@ const checkFunction = (funcName) => ({
                 shouldBeMeters: hook(this),
                 shouldBeInt: hook(this),
                 shouldBeUInt: hook(this),
-                shouldBeRadians: hook(this)
+                shouldBeRadians: hook(this),
+                shouldExist: hook(this)
             };
         }
         return {
@@ -58,22 +67,23 @@ const checkFunction = (funcName) => ({
             shouldBeMeters: shouldBeMeters(this, funcName, argName),
             shouldBeInt: shouldBeInt(this, funcName, argName),
             shouldBeUInt: shouldBeUInt(this, funcName, argName),
-            shouldBeRadians: shouldBeRadians(this, funcName, argName)
+            shouldBeRadians: shouldBeRadians(this, funcName, argName),
+            shouldExist: shouldExist(this, funcName, argName)
         };
     }
 });
 exports.checkFunction = checkFunction;
-const createArray = (v) => new Array(v).fill(0);
+const createArray = (v, fillSymbol = 0) => new Array(v).fill(fillSymbol);
 exports.createArray = createArray;
-const createMatrix = ({ h, w }) => (0, exports.createArray)(h).map(() => (0, exports.createArray)(w));
+const createMatrix = ({ h, w }, fillSymbol = 0) => (0, exports.createArray)(h)
+    .map(() => (0, exports.createArray)(w, fillSymbol));
 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];
+            matrix[i][j] = matrix[i][j] === 0 ? exports.gaussianElimination.MIN : matrix[i][j];
             matrixClone[i][j] = matrix[i][j];
         }
     }
@@ -111,3 +121,35 @@ const gaussianElimination = (matrix) => {
     return answer;
 };
 exports.gaussianElimination = gaussianElimination;
+exports.gaussianElimination.MIN = 1e-10;
+const createCanvas = (a, b, c) => {
+    var _a;
+    let w = 0;
+    let h = 0;
+    let offscreen = false;
+    if (a instanceof DPoint_1.DPoint) {
+        const { x, y } = a;
+        w = x;
+        h = y;
+    }
+    else {
+        w = a;
+        h = a;
+    }
+    if (typeof b === 'boolean') {
+        offscreen = b;
+    }
+    else if (typeof b === 'number') {
+        h = b;
+    }
+    if (typeof c === 'boolean') {
+        offscreen = c;
+    }
+    const canvas = offscreen ? new OffscreenCanvas(w, h) : ((_a = exports.createCanvas.document) !== null && _a !== void 0 ? _a : document).createElement('canvas');
+    if (!offscreen) {
+        canvas.width = w;
+        canvas.height = h;
+    }
+    return [canvas, canvas.getContext('2d')];
+};
+exports.createCanvas = createCanvas;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgeoutils",
-  "version": "2.2.11",
+  "version": "2.2.15",
   "description": "",
   "scripts": {
     "build": "node_modules/.bin/tsc",
@@ -42,6 +42,7 @@
     "jest": "^27.0.6",
     "jest-canvas-mock": "^2.3.1",
     "jest-coverage-badges": "^1.1.2",
+    "jest-html-reporter": "^3.4.2",
     "jsdom": "^17.0.0",
     "ts-jest": "^27.0.4",
     "typedoc": "^0.21.9",