dgeoutils 2.3.5 → 2.4.0

package/dist/cjs/DLine.js

@@ -263,8 +263,9 @@ var DLine = (function () {
         return "LINESTRING (" + x1 + " " + y1 + ", " + x2 + " " + y2 + ")";
     };
     DLine.prototype.movePoint = function (i, k) {
-        var p = Array.isArray(i) ? i : [i];
-        var d = Array.isArray(k) ? k : [k];
+        var isArray = Array.isArray(i);
+        var p = isArray ? i : [i];
+        var d = (isArray ? 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));
@@ -284,7 +285,7 @@ var DLine = (function () {
                 return -x;
             })); });
         }
-        return res.length === 1 ? res[0] : res;
+        return isArray ? res : res[0];
     };
     DLine.prototype.findFi = function (_a, delta) {
         var a = _a.a, b = _a.b;

package/dist/cjs/DPolygon.d.ts

@@ -97,7 +97,7 @@ export declare class DPolygon {
     static parse(a: number[][]): DPolygon;
     static parse(a: DCoord[]): DPolygon;
     toArrayOfCoords(): DCoord[];
-    divideToPieces(piecesCount: number): DPolygon;
+    divideToPieces(piecesCount: number, withAltitude?: boolean): DPolygon;
     prepareToFastSearch(): void;
     fastHas({ x, y, z }: DPoint): boolean;
     get growingPiecesGenerator(): () => Generator<DPolygon, DPolygon>;

package/dist/cjs/DPolygon.js

@@ -961,8 +961,9 @@ var DPolygon = (function () {
     DPolygon.prototype.toArrayOfCoords = function () {
         return this.mapArray(function (r) { return r.toCoords(); });
     };
-    DPolygon.prototype.divideToPieces = function (piecesCount) {
+    DPolygon.prototype.divideToPieces = function (piecesCount, withAltitude) {
         var e_13, _a;
+        if (withAltitude === void 0) { withAltitude = false; }
         var fullLength = this.fullLength;
         var pieceLength = fullLength / piecesCount;
         var currentPieceLength = pieceLength;
@@ -979,6 +980,10 @@ var DPolygon = (function () {
                     .filter(function (p) { return line_1.inRange(p, CLOSE_TO_INTERSECTION_DISTANCE); })[0];
                 intersectionPoint.properties.pieceBorder = true;
                 this_1.insertAfter(i, intersectionPoint);
+                if (withAltitude) {
+                    var p1z = p1.z;
+                    intersectionPoint.z = p1z - (p1z - p2.z) * (p1.distance(intersectionPoint) / d);
+                }
                 currentPieceLength = pieceLength;
             }
             else {

package/dist/cjs/index.d.ts

@@ -7,4 +7,4 @@ export * from './FastSearch';
 export * from './TraceMatrix';
 export * from './DPolygonLoop';
 export * from './DPlane';
-export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull, DGeo } from './utils';
+export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull, cartesianProduct, getCombinations, DGeo } from './utils';

package/dist/cjs/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 = exports.isDefAndNotNull = exports.createMatrix = exports.createArray = exports.createCanvas = exports.gaussianElimination = void 0;
+exports.DGeo = exports.getCombinations = exports.cartesianProduct = exports.isDefAndNotNull = exports.createMatrix = exports.createArray = exports.createCanvas = exports.gaussianElimination = void 0;
 __exportStar(require("./DCircle"), exports);
 __exportStar(require("./DLine"), exports);
 __exportStar(require("./DNumbers"), exports);
@@ -26,4 +26,6 @@ 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; } });
+Object.defineProperty(exports, "cartesianProduct", { enumerable: true, get: function () { return utils_1.cartesianProduct; } });
+Object.defineProperty(exports, "getCombinations", { enumerable: true, get: function () { return utils_1.getCombinations; } });
 Object.defineProperty(exports, "DGeo", { enumerable: true, get: function () { return utils_1.DGeo; } });

package/dist/cjs/utils.d.ts

@@ -35,4 +35,8 @@ export declare const createCanvas: {
     (size: DPoint, offscreen: True): [OffscreenCanvas, OffscreenCanvasRenderingContext2D];
     document?: Document;
 };
+export declare const cartesianProduct: {
+    <T>(a: T[], ...b: T[][]): T[][];
+};
+export declare const getCombinations: <T>(arr: T[][]) => T[][];
 export {};

package/dist/cjs/utils.js

@@ -25,7 +25,7 @@ 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 = exports.DGeo = void 0;
+exports.getCombinations = exports.cartesianProduct = 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
@@ -191,3 +191,26 @@ var createCanvas = function (a, b, c) {
     return [canvas, canvas.getContext('2d')];
 };
 exports.createCanvas = createCanvas;
+var f = function (a, b) { return [].concat.apply([], __spreadArray([], __read(a.map(function (c) { return b.map(function (d) { return [].concat(c, d); }); })), false)); };
+var cartesianProduct = function (a, b) {
+    var c = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        c[_i - 2] = arguments[_i];
+    }
+    return b ? exports.cartesianProduct.apply(void 0, __spreadArray([f(a, b)], __read(c), false)) : a;
+};
+exports.cartesianProduct = cartesianProduct;
+var getCombinations = function (arr) {
+    if (arr.length === 1) {
+        return arr[0];
+    }
+    var ans = [];
+    var otherCases = (0, exports.getCombinations)(arr.slice(1));
+    for (var i = 0; i < otherCases.length; i++) {
+        for (var j = 0; j < arr[0].length; j++) {
+            ans.push(__spreadArray([arr[0][j]], __read(otherCases[i]), false));
+        }
+    }
+    return ans;
+};
+exports.getCombinations = getCombinations;

package/dist/es2015/DLine.js

@@ -218,8 +218,9 @@ export class DLine {
         return `LINESTRING (${x1} ${y1}, ${x2} ${y2})`;
     }
     movePoint(i, k) {
-        const p = Array.isArray(i) ? i : [i];
-        const d = Array.isArray(k) ? k : [k];
+        const isArray = Array.isArray(i);
+        const p = isArray ? i : [i];
+        const d = (isArray ? 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));
@@ -236,7 +237,7 @@ export class DLine {
                 .move(sinCos.clone().scale(d[index])
                 .setX(({ x }) => -x)));
         }
-        return res.length === 1 ? res[0] : res;
+        return isArray ? res : res[0];
     }
     findFi({ a, b }, delta = 1.0001) {
         const { a: q, b: w } = this;

package/dist/es2015/DPolygon.js

@@ -624,7 +624,7 @@ export class DPolygon {
     toArrayOfCoords() {
         return this.mapArray((r) => r.toCoords());
     }
-    divideToPieces(piecesCount) {
+    divideToPieces(piecesCount, withAltitude = false) {
         const { fullLength } = this;
         const pieceLength = fullLength / piecesCount;
         let currentPieceLength = pieceLength;
@@ -641,6 +641,10 @@ export class DPolygon {
                     .filter((p) => line.inRange(p, CLOSE_TO_INTERSECTION_DISTANCE))[0];
                 intersectionPoint.properties.pieceBorder = true;
                 this.insertAfter(i, intersectionPoint);
+                if (withAltitude) {
+                    const p1z = p1.z;
+                    intersectionPoint.z = p1z - (p1z - p2.z) * (p1.distance(intersectionPoint) / d);
+                }
                 currentPieceLength = pieceLength;
             }
             else {

package/dist/es2015/index.js

@@ -7,4 +7,4 @@ export * from './FastSearch';
 export * from './TraceMatrix';
 export * from './DPolygonLoop';
 export * from './DPlane';
-export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull, DGeo } from './utils';
+export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull, cartesianProduct, getCombinations, DGeo } from './utils';

package/dist/es2015/utils.js

@@ -145,3 +145,18 @@ export const createCanvas = (a, b, c) => {
     }
     return [canvas, canvas.getContext('2d')];
 };
+const f = (a, b) => [].concat(...a.map((c) => b.map((d) => [].concat(c, d))));
+export const cartesianProduct = (a, b, ...c) => b ? cartesianProduct(f(a, b), ...c) : a;
+export const getCombinations = (arr) => {
+    if (arr.length === 1) {
+        return arr[0];
+    }
+    const ans = [];
+    const otherCases = getCombinations(arr.slice(1));
+    for (let i = 0; i < otherCases.length; i++) {
+        for (let j = 0; j < arr[0].length; j++) {
+            ans.push([arr[0][j], ...otherCases[i]]);
+        }
+    }
+    return ans;
+};

package/dist/esm/DLine.js

@@ -260,8 +260,9 @@ var DLine = (function () {
         return "LINESTRING (" + x1 + " " + y1 + ", " + x2 + " " + y2 + ")";
     };
     DLine.prototype.movePoint = function (i, k) {
-        var p = Array.isArray(i) ? i : [i];
-        var d = Array.isArray(k) ? k : [k];
+        var isArray = Array.isArray(i);
+        var p = isArray ? i : [i];
+        var d = (isArray ? 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));
@@ -281,7 +282,7 @@ var DLine = (function () {
                 return -x;
             })); });
         }
-        return res.length === 1 ? res[0] : res;
+        return isArray ? res : res[0];
     };
     DLine.prototype.findFi = function (_a, delta) {
         var a = _a.a, b = _a.b;

package/dist/esm/DPolygon.js

@@ -958,8 +958,9 @@ var DPolygon = (function () {
     DPolygon.prototype.toArrayOfCoords = function () {
         return this.mapArray(function (r) { return r.toCoords(); });
     };
-    DPolygon.prototype.divideToPieces = function (piecesCount) {
+    DPolygon.prototype.divideToPieces = function (piecesCount, withAltitude) {
         var e_13, _a;
+        if (withAltitude === void 0) { withAltitude = false; }
         var fullLength = this.fullLength;
         var pieceLength = fullLength / piecesCount;
         var currentPieceLength = pieceLength;
@@ -976,6 +977,10 @@ var DPolygon = (function () {
                     .filter(function (p) { return line_1.inRange(p, CLOSE_TO_INTERSECTION_DISTANCE); })[0];
                 intersectionPoint.properties.pieceBorder = true;
                 this_1.insertAfter(i, intersectionPoint);
+                if (withAltitude) {
+                    var p1z = p1.z;
+                    intersectionPoint.z = p1z - (p1z - p2.z) * (p1.distance(intersectionPoint) / d);
+                }
                 currentPieceLength = pieceLength;
             }
             else {

package/dist/esm/index.js

@@ -7,4 +7,4 @@ export * from './FastSearch';
 export * from './TraceMatrix';
 export * from './DPolygonLoop';
 export * from './DPlane';
-export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull, DGeo } from './utils';
+export { gaussianElimination, createCanvas, createArray, createMatrix, isDefAndNotNull, cartesianProduct, getCombinations, DGeo } from './utils';

package/dist/esm/utils.js

@@ -181,3 +181,24 @@ export var createCanvas = function (a, b, c) {
     }
     return [canvas, canvas.getContext('2d')];
 };
+var f = function (a, b) { return [].concat.apply([], __spreadArray([], __read(a.map(function (c) { return b.map(function (d) { return [].concat(c, d); }); })), false)); };
+export var cartesianProduct = function (a, b) {
+    var c = [];
+    for (var _i = 2; _i < arguments.length; _i++) {
+        c[_i - 2] = arguments[_i];
+    }
+    return b ? cartesianProduct.apply(void 0, __spreadArray([f(a, b)], __read(c), false)) : a;
+};
+export var getCombinations = function (arr) {
+    if (arr.length === 1) {
+        return arr[0];
+    }
+    var ans = [];
+    var otherCases = getCombinations(arr.slice(1));
+    for (var i = 0; i < otherCases.length; i++) {
+        for (var j = 0; j < arr[0].length; j++) {
+            ans.push(__spreadArray([arr[0][j]], __read(otherCases[i]), false));
+        }
+    }
+    return ans;
+};