dgeoutils 2.3.7 → 2.4.2

package/dist/{es2015/DPolygon.js → DPolygon.js}

@@ -1,12 +1,15 @@
-import { DPoint } from './DPoint';
-import { DLine } from './DLine';
-import { DCircle } from './DCircle';
-import { DNumbers } from './DNumbers';
-import { io as jstsIo, operation } from 'jsts';
-import { DPolygonLoop } from './DPolygonLoop';
-import { isDefAndNotNull } from './utils';
-const { buffer: { BufferParameters: { CAP_ROUND, CAP_FLAT, CAP_SQUARE } } } = operation;
-export const MIN_POINTS_IN_VALID_POLYGON = 3;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DPolygon = exports.MIN_POINTS_IN_VALID_POLYGON = void 0;
+const DPoint_1 = require("./DPoint");
+const DLine_1 = require("./DLine");
+const DCircle_1 = require("./DCircle");
+const DNumbers_1 = require("./DNumbers");
+const jsts_1 = require("jsts");
+const DPolygonLoop_1 = require("./DPolygonLoop");
+const utils_1 = require("./utils");
+const { buffer: { BufferParameters: { CAP_ROUND, CAP_FLAT, CAP_SQUARE } } } = jsts_1.operation;
+exports.MIN_POINTS_IN_VALID_POLYGON = 3;
 const APPROXIMATION_VALUE = 0.1;
 const MAX_CONVEX_ITERATIONS = 100;
 const CLOSE_TO_INTERSECTION_DISTANCE = 0.001;
@@ -23,8 +26,8 @@ const containCalculator = (poly, p) => {
     }
     let totalFi = 0;
     for (const [{ x, y }, { x: a, y: b }] of poly.loopPointsGenerator()()) {
-        const line1 = new DLine(x - p.x, y - p.y, 0);
-        const line2 = new DLine(a - p.x, b - p.y, 0);
+        const line1 = new DLine_1.DLine(x - p.x, y - p.y, 0);
+        const line2 = new DLine_1.DLine(a - p.x, b - p.y, 0);
         const fiDif = line1.findFi(line2);
         if (line1.vectorProduct(line2).c > 0) {
             totalFi += fiDif;
@@ -47,7 +50,7 @@ const containCalculator = (poly, p) => {
     }
     return result;
 };
-export class DPolygon {
+class DPolygon {
     constructor(pPoints = []) {
         this.pPoints = pPoints;
         this.properties = {};
@@ -55,7 +58,7 @@ export class DPolygon {
         this.searchStore = {};
     }
     static arrayOfTrianglesToVertices(triangles, height) {
-        return triangles.map((v) => (isDefAndNotNull(height) ? v
+        return triangles.map((v) => ((0, utils_1.isDefAndNotNull)(height) ? v
             .loop()
             .height(height)
             .run() : v)
@@ -64,7 +67,7 @@ export class DPolygon {
     }
     static minAreaRectangleSize(poly) {
         const { first, second, last } = poly.clone().open();
-        return new DPoint(first.distance(second), first.distance(last));
+        return new DPoint_1.DPoint(first.distance(second), first.distance(last));
     }
     static toDash(poly) {
         let p = new DPolygon();
@@ -104,7 +107,7 @@ export class DPolygon {
             const [path, ...holes] = reg.groups.data
                 .split('), (')
                 .map((p) => new DPolygon(p.split(', ')
-                .map((pares) => DPoint.parse(pares.split(' ').map(Number)))));
+                .map((pares) => DPoint_1.DPoint.parse(pares.split(' ').map(Number)))));
             if (holes && holes.length) {
                 path.holes = holes;
             }
@@ -114,18 +117,18 @@ export class DPolygon {
             const regexp = /LINESTRING \((?<data>(?:(?!\)$).)*?)\)$/miu;
             const reg = regexp.exec(data);
             res = new DPolygon(reg.groups.data
-                .split(', ').map((t) => DPoint.parse(t.split(' ').map(Number))));
+                .split(', ').map((t) => DPoint_1.DPoint.parse(t.split(' ').map(Number))));
         }
         if (data.indexOf('POINT') === 0) {
-            res = new DPolygon([DPoint.parseFromWKT(data)]);
+            res = new DPolygon([DPoint_1.DPoint.parseFromWKT(data)]);
         }
         return res;
     }
     static createSquareBySize(size) {
-        return new DPolygon([DPoint.zero(), size.clone().setX(0), size.clone(), size.clone().setY(0)]).close();
+        return new DPolygon([DPoint_1.DPoint.zero(), size.clone().setX(0), size.clone(), size.clone().setY(0)]).close();
     }
     loop() {
-        return new DPolygonLoop(this);
+        return new DPolygonLoop_1.DPolygonLoop(this);
     }
     set points(p) {
         this.pPoints = p;
@@ -163,24 +166,24 @@ export class DPolygon {
     get extend() {
         const { minX, minY, maxX, maxY } = this;
         return new DPolygon([
-            new DPoint(minX, minY),
-            new DPoint(maxX, minY),
-            new DPoint(maxX, maxY),
-            new DPoint(minX, maxY),
-            new DPoint(minX, minY)
+            new DPoint_1.DPoint(minX, minY),
+            new DPoint_1.DPoint(maxX, minY),
+            new DPoint_1.DPoint(maxX, maxY),
+            new DPoint_1.DPoint(minX, maxY),
+            new DPoint_1.DPoint(minX, minY)
         ]);
     }
     get size() {
         const { w, h } = this;
-        return new DPoint(w, h);
+        return new DPoint_1.DPoint(w, h);
     }
     get leftTop() {
         const { minX, minY } = this;
-        return new DPoint(minX, minY);
+        return new DPoint_1.DPoint(minX, minY);
     }
     get rightBottom() {
         const { maxX, maxY } = this;
-        return new DPoint(maxX, maxY);
+        return new DPoint_1.DPoint(maxX, maxY);
     }
     get length() {
         return this.pPoints.length;
@@ -242,7 +245,7 @@ export class DPolygon {
         return p;
     }
     get valid() {
-        return this.length > MIN_POINTS_IN_VALID_POLYGON;
+        return this.length > exports.MIN_POINTS_IN_VALID_POLYGON;
     }
     get first() {
         return this.at(0);
@@ -311,7 +314,7 @@ export class DPolygon {
             const p2 = p.first;
             const p3 = p.second;
             const d = p2.findInnerAngle(p1, p3);
-            if (d > Math.PI || DNumbers.likeZero(DNumbers.rad2Deg(d)) || DNumbers.likePI(d) || DNumbers.like2PI(d)) {
+            if (d > Math.PI || DNumbers_1.DNumbers.likeZero(DNumbers_1.DNumbers.rad2Deg(d)) || DNumbers_1.DNumbers.likePI(d) || DNumbers_1.DNumbers.like2PI(d)) {
                 p.removePart(-1, 1);
             }
             else {
@@ -328,7 +331,7 @@ export class DPolygon {
                 const p2 = p.at(i);
                 const p3 = p.at(i + 1);
                 const d = p2.findInnerAngle(p1, p3);
-                if (d > Math.PI || DNumbers.likeZero(DNumbers.rad2Deg(d)) || DNumbers.likePI(d) || DNumbers.like2PI(d)) {
+                if (d > Math.PI || DNumbers_1.DNumbers.likeZero(DNumbers_1.DNumbers.rad2Deg(d)) || DNumbers_1.DNumbers.likePI(d) || DNumbers_1.DNumbers.like2PI(d)) {
                     p.removePart(--i, 1);
                 }
             }
@@ -486,7 +489,7 @@ export class DPolygon {
         return false;
     }
     findIndex(a) {
-        if (a instanceof DPoint) {
+        if (a instanceof DPoint_1.DPoint) {
             return this.points.findIndex((t) => t.equal(a));
         }
         return this.points.findIndex(a);
@@ -564,8 +567,8 @@ export class DPolygon {
         const poly = this.deintersection;
         let totalFi = 0;
         for (const [{ x, y }, { x: a, y: b }] of poly.loopPointsGenerator()()) {
-            const line1 = new DLine(x - p.x, y - p.y, 0);
-            const line2 = new DLine(a - p.x, b - p.y, 0);
+            const line1 = new DLine_1.DLine(x - p.x, y - p.y, 0);
+            const line2 = new DLine_1.DLine(a - p.x, b - p.y, 0);
             const fiDif = line1.findFi(line2);
             if (line1.vectorProduct(line2).c > 0) {
                 totalFi += fiDif;
@@ -619,12 +622,12 @@ export class DPolygon {
         return this;
     }
     static parse(a) {
-        return new DPolygon(a.map((r) => DPoint.parse(r)));
+        return new DPolygon(a.map((r) => DPoint_1.DPoint.parse(r)));
     }
     toArrayOfCoords() {
         return this.mapArray((r) => r.toCoords());
     }
-    divideToPieces(piecesCount) {
+    divideToPieces(piecesCount, withAltitude = false) {
         const { fullLength } = this;
         const pieceLength = fullLength / piecesCount;
         let currentPieceLength = pieceLength;
@@ -635,12 +638,16 @@ export class DPolygon {
                 currentPieceLength = pieceLength;
             }
             else if (d - currentPieceLength > 0) {
-                const circle = new DCircle(p1, currentPieceLength);
+                const circle = new DCircle_1.DCircle(p1, currentPieceLength);
                 const line = p1.findLine(p2);
                 const intersectionPoint = line.intersectionWithCircle(circle)
                     .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 {
@@ -847,13 +854,13 @@ export class DPolygon {
         return this.first.equal(this.last);
     }
     buffer(v, quadrantSegments = 64, type = DPolygon.CAP_ROUND) {
-        const reader = new jstsIo.WKTReader();
+        const reader = new jsts_1.io.WKTReader();
         const { noHoles, closed } = this;
         const points = reader
             .read(noHoles.toWKT(closed ? DPolygon.WKT_POLYGON : DPolygon.WKT_LINESTRING))
             .buffer(v, quadrantSegments, type)
             .getCoordinates();
-        return new DPolygon(points.map(({ x, y }) => new DPoint(x, y)));
+        return new DPolygon(points.map(({ x, y }) => new DPoint_1.DPoint(x, y)));
     }
     sideBuffers(v, quadrantSegments = 64) {
         const { first, last } = this;
@@ -946,7 +953,7 @@ export class DPolygon {
     }
     getJSTSGeometry(p, unionThis, unionThat) {
         const unionOrIntersection = unionThat === unionThis;
-        const reader = new jstsIo.WKTReader();
+        const reader = new jsts_1.io.WKTReader();
         const a = reader.read(this.noHoles.toWKT());
         const b = reader.read(p.noHoles.toWKT());
         if (!unionOrIntersection) {
@@ -967,11 +974,11 @@ export class DPolygon {
             if (coordinates.length) {
                 let result = coordinates.reduce((ak, { x, y }, index) => {
                     const lastIndex = ak.length - 1;
-                    const t = new DPoint(x, y);
+                    const t = new DPoint_1.DPoint(x, y);
                     const { first } = ak[lastIndex];
                     if (t.equal(first)) {
                         if (coordinates[index + 1]) {
-                            const nextPoint = new DPoint(coordinates[index + 1].x, coordinates[index + 1].y);
+                            const nextPoint = new DPoint_1.DPoint(coordinates[index + 1].x, coordinates[index + 1].y);
                             if (ak[lastIndex].length > 1) {
                                 ak.push(new DPolygon([nextPoint]));
                             }
@@ -981,7 +988,7 @@ export class DPolygon {
                         ak[lastIndex].push(t);
                     }
                     return ak;
-                }, [new DPolygon([new DPoint(coordinates[0].x, coordinates[0].y)])]);
+                }, [new DPolygon([new DPoint_1.DPoint(coordinates[0].x, coordinates[0].y)])]);
                 if (unionThat && unionThis && result.length > 1) {
                     for (const q of result) {
                         for (const r of result) {
@@ -1029,6 +1036,7 @@ export class DPolygon {
         return null;
     }
 }
+exports.DPolygon = DPolygon;
 DPolygon.CAP_ROUND = CAP_ROUND;
 DPolygon.CAP_FLAT = CAP_FLAT;
 DPolygon.CAP_SQUARE = CAP_SQUARE;

package/dist/{es2015/DPolygonLoop.js → DPolygonLoop.js}

@@ -1,3 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DPolygonLoop = void 0;
 var LoopFunctions;
 (function (LoopFunctions) {
     LoopFunctions[LoopFunctions["getTileFromCoords"] = 0] = "getTileFromCoords";
@@ -167,7 +170,7 @@ const decodePoolRecord = (a, { functionName, pointArg, numberPointArg, numberArg
     }
     return res;
 };
-export class DPolygonLoop {
+class DPolygonLoop {
     constructor(parent) {
         this.parent = parent;
         this.pool = [];
@@ -390,3 +393,4 @@ export class DPolygonLoop {
         return this;
     }
 }
+exports.DPolygonLoop = DPolygonLoop;

package/dist/{es2015/FastSearch.js → FastSearch.js}

@@ -1,4 +1,7 @@
-export class FastSearch {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FastSearch = void 0;
+class FastSearch {
     constructor() {
         this.searchStore = {};
     }
@@ -23,3 +26,4 @@ export class FastSearch {
         return this.searchStore[x][y][z || 'undefined'];
     }
 }
+exports.FastSearch = FastSearch;

package/dist/{es2015/TraceMatrix.js → TraceMatrix.js}

@@ -1,12 +1,15 @@
-import { DPoint } from './DPoint';
-import { DPolygon, MIN_POINTS_IN_VALID_POLYGON } from './DPolygon';
-import { FastSearch } from './FastSearch';
-import { createArray } from './utils';
-export var TraceMatrixValues;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TraceMatrix = exports.TraceMatrixValues = void 0;
+const DPoint_1 = require("./DPoint");
+const DPolygon_1 = require("./DPolygon");
+const FastSearch_1 = require("./FastSearch");
+const utils_1 = require("./utils");
+var TraceMatrixValues;
 (function (TraceMatrixValues) {
     TraceMatrixValues[TraceMatrixValues["f"] = 0] = "f";
     TraceMatrixValues[TraceMatrixValues["t"] = 1] = "t";
-})(TraceMatrixValues || (TraceMatrixValues = {}));
+})(TraceMatrixValues = exports.TraceMatrixValues || (exports.TraceMatrixValues = {}));
 const getByPosition = (m, p, defaultValue = TraceMatrixValues.f) => {
     if (m[p.y] === undefined || m[p.y][p.x] === undefined) {
         return defaultValue;
@@ -20,11 +23,11 @@ const setByPosition = (m, p, value) => {
     m[p.y][p.x] = value;
     return m[p.y][p.x];
 };
-export class TraceMatrix {
+class TraceMatrix {
     constructor(size, f) {
         this.size = size;
         this.findGroupByIndex = (m, s) => {
-            const res = new DPolygon();
+            const res = new DPolygon_1.DPolygon();
             if (s && getByPosition(m, s) === TraceMatrixValues.t) {
                 res.push(s);
                 let startIndex = 0;
@@ -34,7 +37,7 @@ export class TraceMatrix {
                     const r = res.at(startIndex);
                     for (let i = -1; i < 2; i++) {
                         for (let j = -1; j < 2; j++) {
-                            const t = new DPoint(r.x + i, r.y + j);
+                            const t = new DPoint_1.DPoint(r.x + i, r.y + j);
                             if (getByPosition(marked, t, TraceMatrixValues.t) === TraceMatrixValues.f &&
                                 getByPosition(m, t, TraceMatrixValues.f) === TraceMatrixValues.t) {
                                 res.push(t);
@@ -56,7 +59,7 @@ export class TraceMatrix {
             const groups = [group];
             let groupSum = group.length;
             let allGroups = [...group.points];
-            const fs = new FastSearch();
+            const fs = new FastSearch_1.FastSearch();
             fs.add(allGroups);
             while (groupSum < this.totalCountInMatrix(m)) {
                 let mark = this.findMarked(m);
@@ -73,22 +76,22 @@ export class TraceMatrix {
         };
         this.traceGroup = (m, group) => {
             const traceDirections = [
-                new DPoint(-1, -1),
-                new DPoint(-1, 0),
-                new DPoint(-1, 1),
-                new DPoint(0, 1),
-                new DPoint(1, 1),
-                new DPoint(1, 0),
-                new DPoint(1, -1),
-                new DPoint(0, -1)
+                new DPoint_1.DPoint(-1, -1),
+                new DPoint_1.DPoint(-1, 0),
+                new DPoint_1.DPoint(-1, 1),
+                new DPoint_1.DPoint(0, 1),
+                new DPoint_1.DPoint(1, 1),
+                new DPoint_1.DPoint(1, 0),
+                new DPoint_1.DPoint(1, -1),
+                new DPoint_1.DPoint(0, -1)
             ];
             const left = (d) => (d + traceDirections.length + 1) % traceDirections.length;
             const right = (d) => (d + traceDirections.length - 1) % traceDirections.length;
             if (group.length < 2) {
                 const t = group.at(0).clone();
-                return new DPolygon([t, t, t]);
+                return new DPolygon_1.DPolygon([t, t, t]);
             }
-            const points = new DPolygon();
+            const points = new DPolygon_1.DPolygon();
             let direction = 0;
             let prevDirection = Infinity;
             let p = group.at(0);
@@ -112,22 +115,22 @@ export class TraceMatrix {
         };
         this.createHoleMatrix = (group) => {
             const fullTraceDirections = [
-                new DPoint(-1, 0),
-                new DPoint(0, 1),
-                new DPoint(1, 0),
-                new DPoint(0, -1)
+                new DPoint_1.DPoint(-1, 0),
+                new DPoint_1.DPoint(0, 1),
+                new DPoint_1.DPoint(1, 0),
+                new DPoint_1.DPoint(0, -1)
             ];
             group.prepareToFastSearch();
             const tmpMatrix = TraceMatrix
                 .createMatrix(this.size, (p) => group.fastHas(p) ? TraceMatrixValues.t : TraceMatrixValues.f);
-            const startCoords = new DPolygon();
+            const startCoords = new DPolygon_1.DPolygon();
             for (let i = 0; i < this.size.w; i++) {
-                startCoords.push(new DPoint(i, -1));
-                startCoords.push(new DPoint(i, this.size.h));
+                startCoords.push(new DPoint_1.DPoint(i, -1));
+                startCoords.push(new DPoint_1.DPoint(i, this.size.h));
             }
             for (let i = 0; i < this.size.h; i++) {
-                startCoords.push(new DPoint(-1, i));
-                startCoords.push(new DPoint(this.size.w, i));
+                startCoords.push(new DPoint_1.DPoint(-1, i));
+                startCoords.push(new DPoint_1.DPoint(this.size.w, i));
             }
             while (startCoords.length) {
                 const point = startCoords.pop();
@@ -151,7 +154,7 @@ export class TraceMatrix {
         const holeMatrixs = groups.map(this.createHoleMatrix);
         const holesGroups = holeMatrixs.map((m) => m && this.findAllGroupsInMatrix(m));
         const holesPaths = holesGroups.map((hg, index) => hg && hg.map((g) => this
-            .traceGroup(holeMatrixs[index], g)).filter((r) => r.length > MIN_POINTS_IN_VALID_POLYGON));
+            .traceGroup(holeMatrixs[index], g)).filter((r) => r.length > DPolygon_1.MIN_POINTS_IN_VALID_POLYGON));
         return groups.map((g, index) => {
             const res = paths[index];
             if (holesGroups[index] && holesGroups[index].length) {
@@ -174,8 +177,8 @@ export class TraceMatrix {
                     ini = true;
                     continue;
                 }
-                if (getByPosition(m, new DPoint(i, j)) === TraceMatrixValues.t) {
-                    return new DPoint(i, j);
+                if (getByPosition(m, new DPoint_1.DPoint(i, j)) === TraceMatrixValues.t) {
+                    return new DPoint_1.DPoint(i, j);
                 }
             }
         }
@@ -186,7 +189,7 @@ export class TraceMatrix {
         const s = this.size;
         for (let i = 0; i < s.w; i++) {
             for (let j = 0; j < s.h; j++) {
-                if (getByPosition(m, new DPoint(i, j))) {
+                if (getByPosition(m, new DPoint_1.DPoint(i, j))) {
                     res++;
                 }
             }
@@ -194,7 +197,8 @@ export class TraceMatrix {
         return res;
     }
     static createMatrix(size, f = () => TraceMatrixValues.f) {
-        return createArray(size.h)
-            .map((v, i) => createArray(size.w).map((v2, j) => f(new DPoint(j, i))));
+        return (0, utils_1.createArray)(size.h)
+            .map((v, i) => (0, utils_1.createArray)(size.w).map((v2, j) => f(new DPoint_1.DPoint(j, i))));
     }
 }
+exports.TraceMatrix = TraceMatrix;

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 {