dgeoutils 2.4.10 → 2.4.13

package/dist/es2015/DPolygonLoop.js

@@ -32,138 +32,153 @@ var LoopFunctions;
     LoopFunctions[LoopFunctions["degreeToMeters"] = 29] = "degreeToMeters";
     LoopFunctions[LoopFunctions["metersToDegree"] = 30] = "metersToDegree";
     LoopFunctions[LoopFunctions["flipVertically"] = 31] = "flipVertically";
+    LoopFunctions[LoopFunctions["setProperties"] = 32] = "setProperties";
+    LoopFunctions[LoopFunctions["div"] = 33] = "div";
+    LoopFunctions[LoopFunctions["mod"] = 34] = "mod";
 })(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.div:
+            res = (k, index) => a(k, index)
+                .div(numberPointArg, numberArg);
+            break;
+        case LoopFunctions.mod:
+            res = (k, index) => a(k, index)
+                .mod(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 +221,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,
@@ -303,6 +325,22 @@ export class DPolygonLoop {
         });
         return this;
     }
+    div(x, y) {
+        this.pool.push({
+            functionName: LoopFunctions.div,
+            numberPointArg: x,
+            numberArg: y
+        });
+        return this;
+    }
+    mod(x, y) {
+        this.pool.push({
+            functionName: LoopFunctions.mod,
+            numberPointArg: x,
+            numberArg: y
+        });
+        return this;
+    }
     degreeToRadians() {
         this.pool.push({
             functionName: LoopFunctions.degreeToRadians

package/dist/es2015/utils.js

@@ -160,3 +160,4 @@ export const getCombinations = (arr) => {
     }
     return ans;
 };
+export const div = (a, b) => Math.floor(a / b);

package/dist/esm/DPoint.js

@@ -27,16 +27,16 @@ var __read = (this && this.__read) || function (o, n) {
 };
 import { DLine } from './DLine';
 import { DPolygon } from './DPolygon';
-import { checkFunction, createArray, isDefAndNotNull } from './utils';
+import { checkFunction, createArray, div, isDefAndNotNull } from './utils';
 var diff = 0;
 var radiansPolygon = new DPolygon();
 var pseudoMercatorPolygon = new DPolygon();
 var worldGeodeticPolygon = new DPolygon();
-export var EARTH_RADIUS_IN_METERS = 6371008.8;
-var EARTH_IN_MITERS = 20037508.34;
+export var EARTH_RADIUS_IN_METERS = 6378137;
+var EARTH_IN_METERS = 20037508.34;
 var DEGREES_IN_EARTH = 180;
-var MITERS_IN_ONE_DEGREE = EARTH_IN_MITERS / DEGREES_IN_EARTH;
-var DEGREES_IN_ONE_MITER = DEGREES_IN_EARTH / EARTH_IN_MITERS;
+var METERS_IN_ONE_DEGREE = EARTH_IN_METERS / DEGREES_IN_EARTH;
+var DEGREES_IN_ONE_METER = DEGREES_IN_EARTH / EARTH_IN_METERS;
 export var HALF_PI_IN_DEGREE = 90;
 export var PI_IN_DEGREE = 180;
 export var DOUBLE_PI_IN_DEGREE = 360;
@@ -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);
@@ -328,9 +332,9 @@ var DPoint = (function () {
         checkFunction('degreeToMeters')
             .checkArgument('this')
             .shouldBeDegree(this);
-        var x = ((this.x + PI_IN_DEGREE) % DOUBLE_PI_IN_DEGREE - PI_IN_DEGREE) * MITERS_IN_ONE_DEGREE;
+        var x = ((this.x + PI_IN_DEGREE) % DOUBLE_PI_IN_DEGREE - PI_IN_DEGREE) * METERS_IN_ONE_DEGREE;
         var y = (Math.log(Math.tan(((this.y + HALF_PI_IN_DEGREE) % PI_IN_DEGREE) *
-            (Math.PI / DOUBLE_PI_IN_DEGREE))) / PI_TO_DEGREE) * MITERS_IN_ONE_DEGREE;
+            (Math.PI / DOUBLE_PI_IN_DEGREE))) / PI_TO_DEGREE) * METERS_IN_ONE_DEGREE;
         this.x = x;
         this.y = y;
         return this;
@@ -339,8 +343,8 @@ var DPoint = (function () {
         checkFunction('metersToDegree')
             .checkArgument('this')
             .shouldBeMeters(this);
-        var lon = this.x * DEGREES_IN_ONE_MITER;
-        var lat = Math.atan(Math.pow(Math.E, ((this.y / MITERS_IN_ONE_DEGREE) * PI_TO_DEGREE))) *
+        var lon = this.x * DEGREES_IN_ONE_METER;
+        var lat = Math.atan(Math.pow(Math.E, ((this.y / METERS_IN_ONE_DEGREE) * PI_TO_DEGREE))) *
             (DOUBLE_PI_IN_DEGREE / Math.PI) - HALF_PI_IN_DEGREE;
         this.x = lon;
         this.y = lat;
@@ -448,6 +452,58 @@ var DPoint = (function () {
         }
         return this;
     };
+    DPoint.prototype.mod = function (x, y, z) {
+        if (y === void 0) { y = x; }
+        var xV = 0;
+        var yV = 0;
+        var zV = undefined;
+        if (x instanceof DPoint) {
+            xV = this.x % x.x;
+            yV = this.y % x.y;
+            if (isDefAndNotNull(this.z) && isDefAndNotNull(x.z)) {
+                zV = this.z % x.z;
+            }
+        }
+        else {
+            xV = this.x % x;
+            yV = this.y % y;
+            if (isDefAndNotNull(this.z) && isDefAndNotNull(z)) {
+                zV = this.z % z;
+            }
+        }
+        this.x = xV;
+        this.y = yV;
+        if (isDefAndNotNull(zV)) {
+            this.z = zV;
+        }
+        return this;
+    };
+    DPoint.prototype.div = function (x, y, z) {
+        if (y === void 0) { y = x; }
+        var xV = 0;
+        var yV = 0;
+        var zV = undefined;
+        if (x instanceof DPoint) {
+            xV = div(this.x, x.x);
+            yV = div(this.y, x.y);
+            if (isDefAndNotNull(this.z) && isDefAndNotNull(x.z)) {
+                zV = div(this.z, x.z);
+            }
+        }
+        else {
+            xV = div(this.x, x);
+            yV = div(this.y, y);
+            if (isDefAndNotNull(this.z) && isDefAndNotNull(z)) {
+                zV = div(this.z, z);
+            }
+        }
+        this.x = xV;
+        this.y = yV;
+        if (isDefAndNotNull(zV)) {
+            this.z = zV;
+        }
+        return this;
+    };
     DPoint.prototype.equal = function (p) {
         return this.x === p.x && this.y === p.y && this.z === p.z;
     };
@@ -679,6 +735,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 };

package/dist/esm/DPolygonLoop.js

@@ -32,139 +32,154 @@ var LoopFunctions;
     LoopFunctions[LoopFunctions["degreeToMeters"] = 29] = "degreeToMeters";
     LoopFunctions[LoopFunctions["metersToDegree"] = 30] = "metersToDegree";
     LoopFunctions[LoopFunctions["flipVertically"] = 31] = "flipVertically";
+    LoopFunctions[LoopFunctions["setProperties"] = 32] = "setProperties";
+    LoopFunctions[LoopFunctions["div"] = 33] = "div";
+    LoopFunctions[LoopFunctions["mod"] = 34] = "mod";
 })(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.div:
+            res = function (k, index) { return a(k, index)
+                .div(numberPointArg, numberArg); };
+            break;
+        case LoopFunctions.mod:
+            res = function (k, index) { return a(k, index)
+                .mod(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;
 };
@@ -207,6 +222,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,
@@ -307,6 +329,22 @@ var DPolygonLoop = (function () {
         });
         return this;
     };
+    DPolygonLoop.prototype.div = function (x, y) {
+        this.pool.push({
+            functionName: LoopFunctions.div,
+            numberPointArg: x,
+            numberArg: y
+        });
+        return this;
+    };
+    DPolygonLoop.prototype.mod = function (x, y) {
+        this.pool.push({
+            functionName: LoopFunctions.mod,
+            numberPointArg: x,
+            numberArg: y
+        });
+        return this;
+    };
     DPolygonLoop.prototype.degreeToRadians = function () {
         this.pool.push({
             functionName: LoopFunctions.degreeToRadians

package/dist/esm/utils.js

@@ -202,3 +202,4 @@ export var getCombinations = function (arr) {
     }
     return ans;
 };
+export var div = function (a, b) { return Math.floor(a / b); };