dgeoutils 2.4.9 → 2.4.12

package/dist/cjs/DPoint.d.ts

@@ -14,7 +14,7 @@ export declare const PI_IN_DEGREE = 180;
 export declare const DOUBLE_PI_IN_DEGREE = 360;
 export declare const PI_TO_DEGREE: number;
 export declare const DEGREE_TO_PI: number;
-export declare type SetterFunction = (t: DPoint) => number;
+declare type SetterFunction<T> = (t: DPoint) => T;
 export declare class DPoint {
     x: number;
     y: number;
@@ -45,11 +45,12 @@ export declare class DPoint {
     distance(p: DPoint): number;
     distance3d(p: DPoint): number;
     setX(x: number): DPoint;
-    setX(f: SetterFunction): DPoint;
+    setX(f: SetterFunction<number>): DPoint;
     setZ(z: number): DPoint;
-    setZ(f: SetterFunction): DPoint;
+    setZ(f: SetterFunction<number>): DPoint;
     setY(y: number): DPoint;
-    setY(f: SetterFunction): DPoint;
+    setY(f: SetterFunction<number>): DPoint;
+    setProperties(v: SetterFunction<Record<string, any>> | Record<string, any>): DPoint;
     clone(): DPoint;
     gt(p: DPoint): boolean;
     lt(p: DPoint): boolean;
@@ -103,9 +104,13 @@ export declare class DPoint {
     get wPoint(): DPoint;
     get hPoint(): DPoint;
     get lat(): number;
+    set lat(v: number);
     get lng(): number;
+    set lng(v: number);
     get lon(): number;
+    set lon(v: number);
     get alt(): number | undefined;
+    set alt(v: number | undefined);
     simple(xKey?: string, yKey?: string): {
         [key: string]: number;
     };
@@ -113,4 +118,6 @@ export declare class DPoint {
     minus(): DPoint;
     orthodromicPath(point: DPoint, pointsCount?: number): DPolygon;
     sortByDistance(p: DPolygon): DPolygon;
+    calculateAltitudeByDistanceBetweenPoints(p1: DPoint, p2: DPoint): DPoint;
 }
+export {};

package/dist/cjs/DPoint.js

@@ -259,6 +259,10 @@ var DPoint = (function () {
         this.y = typeof y === 'number' ? y : y(this);
         return this;
     };
+    DPoint.prototype.setProperties = function (v) {
+        this.properties = typeof v === 'object' ? v : v(this);
+        return this;
+    };
     DPoint.prototype.clone = function () {
         var p = new DPoint(this.x, this.y, this.z);
         p.properties = __assign({}, this.properties);
@@ -599,6 +603,9 @@ var DPoint = (function () {
         get: function () {
             return this.y;
         },
+        set: function (v) {
+            this.y = v;
+        },
         enumerable: false,
         configurable: true
     });
@@ -606,6 +613,9 @@ var DPoint = (function () {
         get: function () {
             return this.x;
         },
+        set: function (v) {
+            this.x = v;
+        },
         enumerable: false,
         configurable: true
     });
@@ -613,6 +623,9 @@ var DPoint = (function () {
         get: function () {
             return this.x;
         },
+        set: function (v) {
+            this.x = v;
+        },
         enumerable: false,
         configurable: true
     });
@@ -620,6 +633,9 @@ var DPoint = (function () {
         get: function () {
             return this.z;
         },
+        set: function (v) {
+            this.z = v;
+        },
         enumerable: false,
         configurable: true
     });
@@ -670,6 +686,27 @@ var DPoint = (function () {
         })
             .sort(function (a, b) { return a.properties.distance - b.properties.distance; });
     };
+    DPoint.prototype.calculateAltitudeByDistanceBetweenPoints = function (p1, p2) {
+        var _a, _b, _c, _d;
+        if (p1.alt === p2.alt) {
+            this.alt = p1.alt;
+        }
+        else {
+            var minAlt = Math.min((_a = p1.alt) !== null && _a !== void 0 ? _a : 0, (_b = p2.alt) !== null && _b !== void 0 ? _b : 0);
+            var maxAlt = Math.max((_c = p1.alt) !== null && _c !== void 0 ? _c : 0, (_d = p2.alt) !== null && _d !== void 0 ? _d : 0);
+            var dAlt = maxAlt - minAlt;
+            var distance1 = this.distance(p1);
+            var distance2 = this.distance(p2);
+            var totalDistance = distance1 + distance2;
+            if (p1.alt === minAlt) {
+                this.alt = minAlt + distance1 / totalDistance * dAlt;
+            }
+            else {
+                this.alt = minAlt + distance2 / totalDistance * dAlt;
+            }
+        }
+        return this;
+    };
     return DPoint;
 }());
 exports.DPoint = DPoint;

package/dist/cjs/DPolygonLoop.d.ts

@@ -1,6 +1,7 @@
 import { DPolygon } from './DPolygon';
-import { DPoint, SetterFunction } from './DPoint';
-export declare type LoopFunction = (k: DPoint) => DPoint;
+import { DPoint } from './DPoint';
+export declare type SetterFunction<T> = (t: DPoint, index: number) => T;
+export declare type LoopFunction = (k: DPoint, index: number) => DPoint;
 export declare class DPolygonLoop {
     private readonly parent;
     private pool;
@@ -11,11 +12,12 @@ export declare class DPolygonLoop {
     getCoordsFromTile(zoom?: number): DPolygonLoop;
     height(z: number): DPolygonLoop;
     setX(x: number): DPolygonLoop;
-    setX(f: SetterFunction): DPolygonLoop;
+    setX(f: SetterFunction<number>): DPolygonLoop;
+    setProperties(setterArgByObject: SetterFunction<Record<string, any>> | Record<string, any>): DPolygonLoop;
     setY(y: number): DPolygonLoop;
-    setY(f: SetterFunction): DPolygonLoop;
+    setY(f: SetterFunction<number>): DPolygonLoop;
     setZ(z: number): DPolygonLoop;
-    setZ(f: SetterFunction): DPolygonLoop;
+    setZ(f: SetterFunction<number>): DPolygonLoop;
     rotate(a: number): DPolygonLoop;
     rotate3dX(a: number): DPolygonLoop;
     rotate3dY(a: number): DPolygonLoop;

package/dist/cjs/DPolygonLoop.js

@@ -35,139 +35,144 @@ var LoopFunctions;
     LoopFunctions[LoopFunctions["degreeToMeters"] = 29] = "degreeToMeters";
     LoopFunctions[LoopFunctions["metersToDegree"] = 30] = "metersToDegree";
     LoopFunctions[LoopFunctions["flipVertically"] = 31] = "flipVertically";
+    LoopFunctions[LoopFunctions["setProperties"] = 32] = "setProperties";
 })(LoopFunctions || (LoopFunctions = {}));
 var decodePoolRecord = function (a, _a) {
-    var functionName = _a.functionName, pointArg = _a.pointArg, numberPointArg = _a.numberPointArg, numberArg = _a.numberArg, setterArg = _a.setterArg;
+    var functionName = _a.functionName, pointArg = _a.pointArg, numberPointArg = _a.numberPointArg, numberArg = _a.numberArg, setterArg = _a.setterArg, setterArgByObject = _a.setterArgByObject;
     var res = a;
     switch (functionName) {
         case LoopFunctions.getTileFromCoords:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .getTileFromCoords(numberArg); };
             break;
         case LoopFunctions.getCoordsFromTile:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .getCoordsFromTile(numberArg); };
             break;
         case LoopFunctions.height:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .height(numberArg); };
             break;
         case LoopFunctions.setX:
-            res = function (k) { return a(k)
-                .setX(setterArg); };
+            res = function (k, index) { return typeof setterArg === 'number' ? a(k, index)
+                .setX(setterArg) : a(k, index).setX(function (p) { return setterArg(p, index); }); };
             break;
         case LoopFunctions.setY:
-            res = function (k) { return a(k)
-                .setY(setterArg); };
+            res = function (k, index) { return typeof setterArg === 'number' ? a(k, index)
+                .setY(setterArg) : a(k, index).setY(function (p) { return setterArg(p, index); }); };
             break;
         case LoopFunctions.setZ:
-            res = function (k) { return a(k)
-                .setZ(setterArg); };
+            res = function (k, index) { return typeof setterArg === 'number' ? a(k, index)
+                .setZ(setterArg) : a(k, index).setZ(function (p) { return setterArg(p, index); }); };
             break;
         case LoopFunctions.rotate:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .rotate(numberArg); };
             break;
         case LoopFunctions.rotate3dX:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .rotate3dX(numberArg); };
             break;
         case LoopFunctions.rotate3dY:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .rotate3dY(numberArg); };
             break;
         case LoopFunctions.rotate3dZ:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .rotate3dZ(numberArg); };
             break;
         case LoopFunctions.move:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .move(numberPointArg, numberArg); };
             break;
         case LoopFunctions.round:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .round(); };
             break;
         case LoopFunctions.ceil:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .ceil(); };
             break;
         case LoopFunctions.floor:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .floor(); };
             break;
         case LoopFunctions.toFixed:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .toFixed(numberArg); };
             break;
         case LoopFunctions.abs:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .abs(); };
             break;
         case LoopFunctions.scale:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .scale(numberPointArg, numberArg); };
             break;
         case LoopFunctions.divide:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .divide(numberPointArg, numberArg); };
             break;
         case LoopFunctions.degreeToRadians:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .degreeToRadians(); };
             break;
         case LoopFunctions.radiansToDegrees:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .radiansToDegrees(); };
             break;
         case LoopFunctions.radiansToMeters:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .radiansToMeters(); };
             break;
         case LoopFunctions.metersToRadians:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .metersToRadians(); };
             break;
         case LoopFunctions.hipPoint:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .hipPoint; };
             break;
         case LoopFunctions.xPoint:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .xPoint; };
             break;
         case LoopFunctions.yPoint:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .yPoint; };
             break;
         case LoopFunctions.wPoint:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .wPoint; };
             break;
         case LoopFunctions.hPoint:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .hPoint; };
             break;
         case LoopFunctions.setIfLessThan:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .setIfLessThan(pointArg); };
             break;
         case LoopFunctions.minus:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .minus(); };
             break;
         case LoopFunctions.degreeToMeters:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .degreeToMeters(); };
             break;
         case LoopFunctions.metersToDegree:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .metersToDegree(); };
             break;
         case LoopFunctions.flipVertically:
-            res = function (k) { return a(k)
+            res = function (k, index) { return a(k, index)
                 .flipVertically(numberPointArg); };
             break;
+        case LoopFunctions.setProperties:
+            res = function (k, index) { return typeof setterArgByObject === 'object' ? a(k, index)
+                .setProperties(setterArgByObject) : a(k, index).setProperties(function (p) { return setterArgByObject(p, index); }); };
+            break;
     }
     return res;
 };
@@ -210,6 +215,13 @@ var DPolygonLoop = (function () {
         });
         return this;
     };
+    DPolygonLoop.prototype.setProperties = function (setterArgByObject) {
+        this.pool.push({
+            functionName: LoopFunctions.setProperties,
+            setterArgByObject: setterArgByObject
+        });
+        return this;
+    };
     DPolygonLoop.prototype.setY = function (y) {
         this.pool.push({
             functionName: LoopFunctions.setY,

package/dist/es2015/DPoint.js

@@ -220,6 +220,10 @@ export class DPoint {
         this.y = typeof y === 'number' ? y : y(this);
         return this;
     }
+    setProperties(v) {
+        this.properties = typeof v === 'object' ? v : v(this);
+        return this;
+    }
     clone() {
         const p = new DPoint(this.x, this.y, this.z);
         p.properties = Object.assign({}, this.properties);
@@ -498,15 +502,27 @@ export class DPoint {
     get lat() {
         return this.y;
     }
+    set lat(v) {
+        this.y = v;
+    }
     get lng() {
         return this.x;
     }
+    set lng(v) {
+        this.x = v;
+    }
     get lon() {
         return this.x;
     }
+    set lon(v) {
+        this.x = v;
+    }
     get alt() {
         return this.z;
     }
+    set alt(v) {
+        this.z = v;
+    }
     simple(xKey = 'x', yKey = 'y') {
         return {
             [xKey]: this.x,
@@ -549,4 +565,25 @@ export class DPoint {
         })
             .sort((a, b) => a.properties.distance - b.properties.distance);
     }
+    calculateAltitudeByDistanceBetweenPoints(p1, p2) {
+        var _a, _b, _c, _d;
+        if (p1.alt === p2.alt) {
+            this.alt = p1.alt;
+        }
+        else {
+            const minAlt = Math.min((_a = p1.alt) !== null && _a !== void 0 ? _a : 0, (_b = p2.alt) !== null && _b !== void 0 ? _b : 0);
+            const maxAlt = Math.max((_c = p1.alt) !== null && _c !== void 0 ? _c : 0, (_d = p2.alt) !== null && _d !== void 0 ? _d : 0);
+            const dAlt = maxAlt - minAlt;
+            const distance1 = this.distance(p1);
+            const distance2 = this.distance(p2);
+            const totalDistance = distance1 + distance2;
+            if (p1.alt === minAlt) {
+                this.alt = minAlt + distance1 / totalDistance * dAlt;
+            }
+            else {
+                this.alt = minAlt + distance2 / totalDistance * dAlt;
+            }
+        }
+        return this;
+    }
 }

package/dist/es2015/DPolygonLoop.js

@@ -32,138 +32,143 @@ var LoopFunctions;
     LoopFunctions[LoopFunctions["degreeToMeters"] = 29] = "degreeToMeters";
     LoopFunctions[LoopFunctions["metersToDegree"] = 30] = "metersToDegree";
     LoopFunctions[LoopFunctions["flipVertically"] = 31] = "flipVertically";
+    LoopFunctions[LoopFunctions["setProperties"] = 32] = "setProperties";
 })(LoopFunctions || (LoopFunctions = {}));
-const decodePoolRecord = (a, { functionName, pointArg, numberPointArg, numberArg, setterArg }) => {
+const decodePoolRecord = (a, { functionName, pointArg, numberPointArg, numberArg, setterArg, setterArgByObject }) => {
     let res = a;
     switch (functionName) {
         case LoopFunctions.getTileFromCoords:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .getTileFromCoords(numberArg);
             break;
         case LoopFunctions.getCoordsFromTile:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .getCoordsFromTile(numberArg);
             break;
         case LoopFunctions.height:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .height(numberArg);
             break;
         case LoopFunctions.setX:
-            res = (k) => a(k)
-                .setX(setterArg);
+            res = (k, index) => typeof setterArg === 'number' ? a(k, index)
+                .setX(setterArg) : a(k, index).setX((p) => setterArg(p, index));
             break;
         case LoopFunctions.setY:
-            res = (k) => a(k)
-                .setY(setterArg);
+            res = (k, index) => typeof setterArg === 'number' ? a(k, index)
+                .setY(setterArg) : a(k, index).setY((p) => setterArg(p, index));
             break;
         case LoopFunctions.setZ:
-            res = (k) => a(k)
-                .setZ(setterArg);
+            res = (k, index) => typeof setterArg === 'number' ? a(k, index)
+                .setZ(setterArg) : a(k, index).setZ((p) => setterArg(p, index));
             break;
         case LoopFunctions.rotate:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .rotate(numberArg);
             break;
         case LoopFunctions.rotate3dX:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .rotate3dX(numberArg);
             break;
         case LoopFunctions.rotate3dY:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .rotate3dY(numberArg);
             break;
         case LoopFunctions.rotate3dZ:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .rotate3dZ(numberArg);
             break;
         case LoopFunctions.move:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .move(numberPointArg, numberArg);
             break;
         case LoopFunctions.round:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .round();
             break;
         case LoopFunctions.ceil:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .ceil();
             break;
         case LoopFunctions.floor:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .floor();
             break;
         case LoopFunctions.toFixed:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .toFixed(numberArg);
             break;
         case LoopFunctions.abs:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .abs();
             break;
         case LoopFunctions.scale:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .scale(numberPointArg, numberArg);
             break;
         case LoopFunctions.divide:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .divide(numberPointArg, numberArg);
             break;
         case LoopFunctions.degreeToRadians:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .degreeToRadians();
             break;
         case LoopFunctions.radiansToDegrees:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .radiansToDegrees();
             break;
         case LoopFunctions.radiansToMeters:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .radiansToMeters();
             break;
         case LoopFunctions.metersToRadians:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .metersToRadians();
             break;
         case LoopFunctions.hipPoint:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .hipPoint;
             break;
         case LoopFunctions.xPoint:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .xPoint;
             break;
         case LoopFunctions.yPoint:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .yPoint;
             break;
         case LoopFunctions.wPoint:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .wPoint;
             break;
         case LoopFunctions.hPoint:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .hPoint;
             break;
         case LoopFunctions.setIfLessThan:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .setIfLessThan(pointArg);
             break;
         case LoopFunctions.minus:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .minus();
             break;
         case LoopFunctions.degreeToMeters:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .degreeToMeters();
             break;
         case LoopFunctions.metersToDegree:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .metersToDegree();
             break;
         case LoopFunctions.flipVertically:
-            res = (k) => a(k)
+            res = (k, index) => a(k, index)
                 .flipVertically(numberPointArg);
             break;
+        case LoopFunctions.setProperties:
+            res = (k, index) => typeof setterArgByObject === 'object' ? a(k, index)
+                .setProperties(setterArgByObject) : a(k, index).setProperties((p) => setterArgByObject(p, index));
+            break;
     }
     return res;
 };
@@ -206,6 +211,13 @@ export class DPolygonLoop {
         });
         return this;
     }
+    setProperties(setterArgByObject) {
+        this.pool.push({
+            functionName: LoopFunctions.setProperties,
+            setterArgByObject
+        });
+        return this;
+    }
     setY(y) {
         this.pool.push({
             functionName: LoopFunctions.setY,

package/dist/esm/DPoint.js

@@ -256,6 +256,10 @@ var DPoint = (function () {
         this.y = typeof y === 'number' ? y : y(this);
         return this;
     };
+    DPoint.prototype.setProperties = function (v) {
+        this.properties = typeof v === 'object' ? v : v(this);
+        return this;
+    };
     DPoint.prototype.clone = function () {
         var p = new DPoint(this.x, this.y, this.z);
         p.properties = __assign({}, this.properties);
@@ -596,6 +600,9 @@ var DPoint = (function () {
         get: function () {
             return this.y;
         },
+        set: function (v) {
+            this.y = v;
+        },
         enumerable: false,
         configurable: true
     });
@@ -603,6 +610,9 @@ var DPoint = (function () {
         get: function () {
             return this.x;
         },
+        set: function (v) {
+            this.x = v;
+        },
         enumerable: false,
         configurable: true
     });
@@ -610,6 +620,9 @@ var DPoint = (function () {
         get: function () {
             return this.x;
         },
+        set: function (v) {
+            this.x = v;
+        },
         enumerable: false,
         configurable: true
     });
@@ -617,6 +630,9 @@ var DPoint = (function () {
         get: function () {
             return this.z;
         },
+        set: function (v) {
+            this.z = v;
+        },
         enumerable: false,
         configurable: true
     });
@@ -667,6 +683,27 @@ var DPoint = (function () {
         })
             .sort(function (a, b) { return a.properties.distance - b.properties.distance; });
     };
+    DPoint.prototype.calculateAltitudeByDistanceBetweenPoints = function (p1, p2) {
+        var _a, _b, _c, _d;
+        if (p1.alt === p2.alt) {
+            this.alt = p1.alt;
+        }
+        else {
+            var minAlt = Math.min((_a = p1.alt) !== null && _a !== void 0 ? _a : 0, (_b = p2.alt) !== null && _b !== void 0 ? _b : 0);
+            var maxAlt = Math.max((_c = p1.alt) !== null && _c !== void 0 ? _c : 0, (_d = p2.alt) !== null && _d !== void 0 ? _d : 0);
+            var dAlt = maxAlt - minAlt;
+            var distance1 = this.distance(p1);
+            var distance2 = this.distance(p2);
+            var totalDistance = distance1 + distance2;
+            if (p1.alt === minAlt) {
+                this.alt = minAlt + distance1 / totalDistance * dAlt;
+            }
+            else {
+                this.alt = minAlt + distance2 / totalDistance * dAlt;
+            }
+        }
+        return this;
+    };
     return DPoint;
 }());
 export { DPoint };