dgeoutils 2.3.0 → 2.3.4

package/README.md

@@ -19,6 +19,13 @@
 
 [ESLint Report](https://edejin.github.io/DGeoUtils/media/eslit.html)
 
+```html
+  <script src="https://unpkg.com/jsts@latest/dist/jsts.js"></script>
+  <script src="https://unpkg.com/dgeoutils@latest/dist/umd/dgeoutils.js"></script>
+```
+
+[Sandbox](https://jsbin.com/yaxaqif/edit?js,output)
+
 ### For new release
 ```
 npm run release-fix

package/dist/cjs/DLine.d.ts

@@ -30,7 +30,8 @@ export declare class DLine {
     get points(): [DPoint, DPoint];
     getFi(): number;
     toWKT(): string;
-    movePoint(p: DPoint, d: number): DPoint;
+    movePoint(point: DPoint, distance: number): DPoint;
+    movePoint(points: DPoint[], distances: number[]): DPoint[];
     findFi({ a, b }: DLine, delta?: number): number;
     vectorProduct({ a, b, c }: DLine): DLine;
 }

package/dist/cjs/DLine.js

@@ -262,20 +262,28 @@ var DLine = (function () {
         var _a = this, _b = _a.begin, x1 = _b.x, y1 = _b.y, _c = _a.end, x2 = _c.x, y2 = _c.y;
         return "LINESTRING (" + x1 + " " + y1 + ", " + x2 + " " + y2 + ")";
     };
-    DLine.prototype.movePoint = function (p, d) {
+    DLine.prototype.movePoint = function (i, k) {
+        var p = Array.isArray(i) ? i : [i];
+        var d = Array.isArray(k) ? k : [k];
         var fi = this.findFi(new DLine(1, 0, 0));
         var td = this.x(new DPoint_1.DPoint(1, 1)).distance(this.x(new DPoint_1.DPoint(2, 2))) / 2;
         var sinCos = new DPoint_1.DPoint(Math.sin(fi), Math.cos(fi));
         var dt = sinCos.clone().scale(td);
-        var p1T = p.clone().move(dt.clone().minus());
-        var p2T = p.clone().move(dt);
+        var p1T = p[0].clone().move(dt.clone().minus());
+        var p2T = p[0].clone().move(dt);
+        var res = [];
         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));
+            res = p.map(function (t, index) { return t.clone().move(sinCos.scale(d[index])); });
         }
-        return p.clone().move(sinCos.scale(d).setX(function (_a) {
-            var x = _a.x;
-            return -x;
-        }));
+        else {
+            res = p.map(function (t, index) { return t.clone()
+                .move(sinCos.scale(d[index])
+                .setX(function (_a) {
+                var x = _a.x;
+                return -x;
+            })); });
+        }
+        return res.length === 1 ? res[0] : res;
     };
     DLine.prototype.findFi = function (_a, delta) {
         var a = _a.a, b = _a.b;

package/dist/cjs/DPolygon.d.ts

@@ -87,7 +87,7 @@ export declare class DPolygon {
     removePart(index: number, count: number): DPoint[];
     hasSimpleIntersection(p: DPolygon): boolean;
     simpleInclude(p: DPoint): boolean;
-    drawPolygonOnCanvas(canvas: HTMLCanvasElement | OffscreenCanvas, fillColor?: string, strokeColor?: string, shadowColor?: string, lineWidth?: number, steps?: number): void;
+    drawPolygonOnCanvas(canvas: HTMLCanvasElement | OffscreenCanvas, fillColor?: string, strokeColor?: string, shadowColor?: string, lineWidth?: number, steps?: number): DPolygon;
     clearPolygonOnCanvas(canvas: HTMLCanvasElement | OffscreenCanvas): void;
     contain(p: DPoint, isBorderInside?: boolean): boolean;
     onBorder(p: DPoint): boolean;

package/dist/cjs/DPolygon.js

@@ -827,36 +827,36 @@ var DPolygon = (function () {
     DPolygon.prototype.drawPolygonOnCanvas = function (canvas, fillColor, strokeColor, shadowColor, lineWidth, steps) {
         if (lineWidth === void 0) { lineWidth = 1; }
         if (steps === void 0) { steps = this.length - 1; }
-        if (this.length < 2) {
-            return;
-        }
-        var ctx = canvas.getContext('2d');
-        if (fillColor) {
-            ctx.fillStyle = fillColor;
-        }
-        if (strokeColor) {
-            ctx.strokeStyle = strokeColor;
-        }
-        if (lineWidth) {
-            ctx.lineWidth = lineWidth;
-        }
-        if (fillColor || strokeColor) {
-            ctx.beginPath();
-        }
-        this.goByPath(ctx, steps % this.length);
-        if (shadowColor) {
-            ctx.shadowColor = shadowColor;
-            ctx.shadowBlur = 0;
-            ctx.shadowOffsetX = 1;
-            ctx.shadowOffsetY = 1;
-        }
-        if (fillColor) {
-            ctx.closePath();
-            ctx.fill();
-        }
-        if (strokeColor) {
-            ctx.stroke();
+        if (this.length > 1) {
+            var ctx = canvas.getContext('2d');
+            if (fillColor) {
+                ctx.fillStyle = fillColor;
+            }
+            if (strokeColor) {
+                ctx.strokeStyle = strokeColor;
+            }
+            if (lineWidth) {
+                ctx.lineWidth = lineWidth;
+            }
+            if (fillColor || strokeColor) {
+                ctx.beginPath();
+            }
+            this.goByPath(ctx, steps % this.length);
+            if (shadowColor) {
+                ctx.shadowColor = shadowColor;
+                ctx.shadowBlur = 0;
+                ctx.shadowOffsetX = 1;
+                ctx.shadowOffsetY = 1;
+            }
+            if (fillColor) {
+                ctx.closePath();
+                ctx.fill();
+            }
+            if (strokeColor) {
+                ctx.stroke();
+            }
         }
+        return this;
     };
     DPolygon.prototype.clearPolygonOnCanvas = function (canvas) {
         var ctx = canvas.getContext('2d');
@@ -1299,7 +1299,7 @@ var DPolygon = (function () {
         var toPoint = Math.max(Math.min(start0, start1), Math.min(end0, end1));
         var linePart = new DPolygon(buffer.removePart(fromPoint - 1, toPoint - fromPoint + 1));
         buffer.unshift(buffer.pop());
-        return [linePart, buffer];
+        return [linePart.reverse(), buffer];
     };
     DPolygon.prototype.bezier = function (step) {
         if (step === void 0) { step = 0.1; }

package/dist/cjs/TraceMatrix.d.ts

@@ -4,7 +4,7 @@ export declare enum TraceMatrixValues {
     f = 0,
     t = 1
 }
-declare type SimpleMatrix = TraceMatrixValues[][];
+export declare type SimpleMatrix = TraceMatrixValues[][];
 export declare class TraceMatrix {
     private readonly size;
     private readonly m;
@@ -19,4 +19,3 @@ export declare class TraceMatrix {
     private createHoleMatrix;
     static createMatrix(size: DPoint, f?: (pos: DPoint) => TraceMatrixValues): SimpleMatrix;
 }
-export {};

package/dist/cjs/index.d.ts

@@ -7,7 +7,4 @@ 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;
-};
+export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull, DGeo } from './utils';

package/dist/cjs/index.js

@@ -26,6 +26,4 @@ Object.defineProperty(exports, "createCanvas", { enumerable: true, get: function
 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
-};
+Object.defineProperty(exports, "DGeo", { enumerable: true, get: function () { return utils_1.DGeo; } });

package/dist/cjs/utils.d.ts

@@ -1,5 +1,8 @@
 /// <reference types="offscreencanvas" />
 import { DPoint } from './DPoint';
+export declare const DGeo: {
+    DEBUG: boolean;
+};
 export declare const warn: (...args: any[]) => void;
 export declare const isDefAndNotNull: (a: any) => boolean;
 declare type CheckFunc = (p: DPoint) => CheckFunction;

package/dist/cjs/utils.js

@@ -25,15 +25,17 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCanvas = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.isDefAndNotNull = exports.warn = void 0;
-var index_1 = require("./index");
+exports.createCanvas = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.isDefAndNotNull = exports.warn = exports.DGeo = void 0;
 var DPoint_1 = require("./DPoint");
+exports.DGeo = {
+    DEBUG: false
+};
 var warn = function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
-    if (index_1.DGeo.DEBUG) {
+    if (exports.DGeo.DEBUG) {
         console.warn.apply(console, __spreadArray([], __read(args), false));
     }
 };
@@ -81,7 +83,7 @@ var shouldBeMeters = function (scope, funcName, argName) { return function (p) {
 }; };
 var checkFunction = function (funcName) { return ({
     checkArgument: function (argName) {
-        if (!index_1.DGeo.DEBUG) {
+        if (!exports.DGeo.DEBUG) {
             return {
                 shouldBeDegree: hook(this),
                 shouldBeMeters: hook(this),

package/dist/es2015/DLine.js

@@ -217,17 +217,25 @@ export class DLine {
         const { begin: { x: x1, y: y1 }, end: { x: x2, y: y2 } } = this;
         return `LINESTRING (${x1} ${y1}, ${x2} ${y2})`;
     }
-    movePoint(p, d) {
+    movePoint(i, k) {
+        const p = Array.isArray(i) ? i : [i];
+        const d = Array.isArray(k) ? k : [k];
         const fi = this.findFi(new DLine(1, 0, 0));
         const td = this.x(new DPoint(1, 1)).distance(this.x(new DPoint(2, 2))) / 2;
         const sinCos = new 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);
+        const p1T = p[0].clone().move(dt.clone().minus());
+        const p2T = p[0].clone().move(dt);
+        let res = [];
         if (DNumbers.like(this.y(p1T).y, p1T.y) || DNumbers.like(this.y(p2T).y, p2T.y)) {
-            return p.clone().move(sinCos.scale(d));
+            res = p.map((t, index) => t.clone().move(sinCos.scale(d[index])));
         }
-        return p.clone().move(sinCos.scale(d).setX(({ x }) => -x));
+        else {
+            res = p.map((t, index) => t.clone()
+                .move(sinCos.scale(d[index])
+                .setX(({ x }) => -x)));
+        }
+        return res.length === 1 ? res[0] : res;
     }
     findFi({ a, b }, delta = 1.0001) {
         const { a: q, b: w } = this;

package/dist/es2015/DPolygon.js

@@ -513,36 +513,36 @@ export class DPolygon {
         return this.simpleIncludeX(p) && this.simpleIncludeY(p);
     }
     drawPolygonOnCanvas(canvas, fillColor, strokeColor, shadowColor, lineWidth = 1, steps = this.length - 1) {
-        if (this.length < 2) {
-            return;
-        }
-        const ctx = canvas.getContext('2d');
-        if (fillColor) {
-            ctx.fillStyle = fillColor;
-        }
-        if (strokeColor) {
-            ctx.strokeStyle = strokeColor;
-        }
-        if (lineWidth) {
-            ctx.lineWidth = lineWidth;
-        }
-        if (fillColor || strokeColor) {
-            ctx.beginPath();
-        }
-        this.goByPath(ctx, steps % this.length);
-        if (shadowColor) {
-            ctx.shadowColor = shadowColor;
-            ctx.shadowBlur = 0;
-            ctx.shadowOffsetX = 1;
-            ctx.shadowOffsetY = 1;
-        }
-        if (fillColor) {
-            ctx.closePath();
-            ctx.fill();
-        }
-        if (strokeColor) {
-            ctx.stroke();
+        if (this.length > 1) {
+            const ctx = canvas.getContext('2d');
+            if (fillColor) {
+                ctx.fillStyle = fillColor;
+            }
+            if (strokeColor) {
+                ctx.strokeStyle = strokeColor;
+            }
+            if (lineWidth) {
+                ctx.lineWidth = lineWidth;
+            }
+            if (fillColor || strokeColor) {
+                ctx.beginPath();
+            }
+            this.goByPath(ctx, steps % this.length);
+            if (shadowColor) {
+                ctx.shadowColor = shadowColor;
+                ctx.shadowBlur = 0;
+                ctx.shadowOffsetX = 1;
+                ctx.shadowOffsetY = 1;
+            }
+            if (fillColor) {
+                ctx.closePath();
+                ctx.fill();
+            }
+            if (strokeColor) {
+                ctx.stroke();
+            }
         }
+        return this;
     }
     clearPolygonOnCanvas(canvas) {
         const ctx = canvas.getContext('2d');
@@ -864,7 +864,7 @@ export class DPolygon {
         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];
+        return [linePart.reverse(), buffer];
     }
     bezier(step = 0.1) {
         const res = new DPolygon();

package/dist/es2015/index.js

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

package/dist/es2015/utils.js

@@ -1,5 +1,7 @@
-import { DGeo } from './index';
 import { DPoint } from './DPoint';
+export const DGeo = {
+    DEBUG: false
+};
 export const warn = (...args) => {
     if (DGeo.DEBUG) {
         console.warn(...args);

package/dist/esm/DLine.js

@@ -259,20 +259,28 @@ var DLine = (function () {
         var _a = this, _b = _a.begin, x1 = _b.x, y1 = _b.y, _c = _a.end, x2 = _c.x, y2 = _c.y;
         return "LINESTRING (" + x1 + " " + y1 + ", " + x2 + " " + y2 + ")";
     };
-    DLine.prototype.movePoint = function (p, d) {
+    DLine.prototype.movePoint = function (i, k) {
+        var p = Array.isArray(i) ? i : [i];
+        var d = Array.isArray(k) ? k : [k];
         var fi = this.findFi(new DLine(1, 0, 0));
         var td = this.x(new DPoint(1, 1)).distance(this.x(new DPoint(2, 2))) / 2;
         var sinCos = new DPoint(Math.sin(fi), Math.cos(fi));
         var dt = sinCos.clone().scale(td);
-        var p1T = p.clone().move(dt.clone().minus());
-        var p2T = p.clone().move(dt);
+        var p1T = p[0].clone().move(dt.clone().minus());
+        var p2T = p[0].clone().move(dt);
+        var res = [];
         if (DNumbers.like(this.y(p1T).y, p1T.y) || DNumbers.like(this.y(p2T).y, p2T.y)) {
-            return p.clone().move(sinCos.scale(d));
+            res = p.map(function (t, index) { return t.clone().move(sinCos.scale(d[index])); });
         }
-        return p.clone().move(sinCos.scale(d).setX(function (_a) {
-            var x = _a.x;
-            return -x;
-        }));
+        else {
+            res = p.map(function (t, index) { return t.clone()
+                .move(sinCos.scale(d[index])
+                .setX(function (_a) {
+                var x = _a.x;
+                return -x;
+            })); });
+        }
+        return res.length === 1 ? res[0] : res;
     };
     DLine.prototype.findFi = function (_a, delta) {
         var a = _a.a, b = _a.b;

package/dist/esm/DPolygon.js

@@ -824,36 +824,36 @@ var DPolygon = (function () {
     DPolygon.prototype.drawPolygonOnCanvas = function (canvas, fillColor, strokeColor, shadowColor, lineWidth, steps) {
         if (lineWidth === void 0) { lineWidth = 1; }
         if (steps === void 0) { steps = this.length - 1; }
-        if (this.length < 2) {
-            return;
-        }
-        var ctx = canvas.getContext('2d');
-        if (fillColor) {
-            ctx.fillStyle = fillColor;
-        }
-        if (strokeColor) {
-            ctx.strokeStyle = strokeColor;
-        }
-        if (lineWidth) {
-            ctx.lineWidth = lineWidth;
-        }
-        if (fillColor || strokeColor) {
-            ctx.beginPath();
-        }
-        this.goByPath(ctx, steps % this.length);
-        if (shadowColor) {
-            ctx.shadowColor = shadowColor;
-            ctx.shadowBlur = 0;
-            ctx.shadowOffsetX = 1;
-            ctx.shadowOffsetY = 1;
-        }
-        if (fillColor) {
-            ctx.closePath();
-            ctx.fill();
-        }
-        if (strokeColor) {
-            ctx.stroke();
+        if (this.length > 1) {
+            var ctx = canvas.getContext('2d');
+            if (fillColor) {
+                ctx.fillStyle = fillColor;
+            }
+            if (strokeColor) {
+                ctx.strokeStyle = strokeColor;
+            }
+            if (lineWidth) {
+                ctx.lineWidth = lineWidth;
+            }
+            if (fillColor || strokeColor) {
+                ctx.beginPath();
+            }
+            this.goByPath(ctx, steps % this.length);
+            if (shadowColor) {
+                ctx.shadowColor = shadowColor;
+                ctx.shadowBlur = 0;
+                ctx.shadowOffsetX = 1;
+                ctx.shadowOffsetY = 1;
+            }
+            if (fillColor) {
+                ctx.closePath();
+                ctx.fill();
+            }
+            if (strokeColor) {
+                ctx.stroke();
+            }
         }
+        return this;
     };
     DPolygon.prototype.clearPolygonOnCanvas = function (canvas) {
         var ctx = canvas.getContext('2d');
@@ -1296,7 +1296,7 @@ var DPolygon = (function () {
         var toPoint = Math.max(Math.min(start0, start1), Math.min(end0, end1));
         var linePart = new DPolygon(buffer.removePart(fromPoint - 1, toPoint - fromPoint + 1));
         buffer.unshift(buffer.pop());
-        return [linePart, buffer];
+        return [linePart.reverse(), buffer];
     };
     DPolygon.prototype.bezier = function (step) {
         if (step === void 0) { step = 0.1; }

package/dist/esm/index.js

@@ -7,7 +7,4 @@ export * from './FastSearch';
 export * from './TraceMatrix';
 export * from './DPolygonLoop';
 export * from './DPlane';
-export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull } from './utils';
-export var DGeo = {
-    DEBUG: false
-};
+export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull, DGeo } from './utils';

package/dist/esm/utils.js

@@ -23,8 +23,10 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { DGeo } from './index';
 import { DPoint } from './DPoint';
+export var DGeo = {
+    DEBUG: false
+};
 export var warn = function () {
     var args = [];
     for (var _i = 0; _i < arguments.length; _i++) {