dgeoutils 2.4.52 → 2.5.0

package/dist/cjs/DPoint.d.ts

@@ -51,6 +51,7 @@ export declare class DPoint {
     height(z: number): DPoint;
     toWKT(): string;
     distance(p: DPoint): number;
+    distanceLatLon(p: DPoint): number;
     distance3d(p: DPoint): number;
     setX(x: number): DPoint;
     setX(f: SetterFunction<number>): DPoint;

package/dist/cjs/DPoint.js

@@ -266,6 +266,23 @@ var DPoint = (function () {
         var dy = p.y - this.y;
         return Math.sqrt(dx * dx + dy * dy);
     };
+    DPoint.prototype.distanceLatLon = function (p) {
+        (0, utils_1.checkFunction)('distance')
+            .checkArgument('this')
+            .shouldBeDegree(this)
+            .checkArgument('p')
+            .shouldBeDegree(p);
+        var d = p.clone().move(this.clone().minus())
+            .degreeToRadians();
+        var t1 = this.clone().degreeToRadians();
+        var t2 = p.clone().degreeToRadians();
+        var a = Math.pow(Math.sin(d.lat / 2), 2) +
+            Math.cos(t1.lat) *
+                Math.cos(t2.lat) *
+                (Math.pow((Math.sin(d.lon / 2)), 2));
+        var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        return exports.EARTH_RADIUS_IN_METERS * c;
+    };
     DPoint.prototype.distance3d = function (p) {
         (0, utils_1.checkFunction)('distance3d')
             .checkArgument('this')

package/dist/cjs/DPolygon.d.ts

@@ -44,7 +44,9 @@ export declare class DPolygon {
     get maxPoint(): DPoint;
     get length(): number;
     get fullLength(): number;
+    get fullLengthLatLon(): number;
     get perimeter(): number;
+    get perimeterLatLon(): number;
     get area(): number;
     get filledDeintersection(): DPolygon;
     get deintersection(): DPolygon;

package/dist/cjs/DPolygon.js

@@ -395,6 +395,13 @@ var DPolygon = (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(DPolygon.prototype, "fullLengthLatLon", {
+        get: function () {
+            return this.clone().open().perimeterLatLon;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(DPolygon.prototype, "perimeter", {
         get: function () {
             var e_4, _a;
@@ -417,9 +424,31 @@ var DPolygon = (function () {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(DPolygon.prototype, "area", {
+    Object.defineProperty(DPolygon.prototype, "perimeterLatLon", {
         get: function () {
             var e_5, _a;
+            var p = 0;
+            try {
+                for (var _b = __values(this.loopPointsGenerator()()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var _d = __read(_c.value, 2), p1 = _d[0], p2 = _d[1];
+                    p += p1.distanceLatLon(p2);
+                }
+            }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_5) throw e_5.error; }
+            }
+            return p;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(DPolygon.prototype, "area", {
+        get: function () {
+            var e_6, _a;
             var sum = 0;
             try {
                 for (var _b = __values(this.deintersection.loopPointsGenerator()()), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -427,12 +456,12 @@ var DPolygon = (function () {
                     sum += x * b - y * a;
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_5) throw e_5.error; }
+                finally { if (e_6) throw e_6.error; }
             }
             return Math.abs(sum / 2) - this.holes.reduce(function (a, hole) { return a + hole.area; }, 0);
         },
@@ -475,7 +504,7 @@ var DPolygon = (function () {
     });
     Object.defineProperty(DPolygon.prototype, "deintersection", {
         get: function () {
-            var e_6, _a;
+            var e_7, _a;
             var p = this.clone().close();
             var store = {};
             for (var i = 0; i < p.length - 1; i++) {
@@ -521,12 +550,12 @@ var DPolygon = (function () {
                     }
                 }
             }
-            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_6) throw e_6.error; }
+                finally { if (e_7) throw e_7.error; }
             }
             return p;
         },
@@ -563,7 +592,7 @@ var DPolygon = (function () {
     });
     Object.defineProperty(DPolygon.prototype, "minAreaRectangle", {
         get: function () {
-            var e_7, _a, e_8, _b;
+            var e_8, _a, e_9, _b;
             var p = this.convex;
             var resultPolygon = new DPolygon();
             var resultArea = Infinity;
@@ -576,7 +605,7 @@ var DPolygon = (function () {
                     var maxHeight = 0;
                     var maxHeightPoint = null;
                     try {
-                        for (var _f = (e_8 = void 0, __values(p.loopPointsGenerator()())), _g = _f.next(); !_g.done; _g = _f.next()) {
+                        for (var _f = (e_9 = void 0, __values(p.loopPointsGenerator()())), _g = _f.next(); !_g.done; _g = _f.next()) {
                             var _h = __read(_g.value, 4), z = _h[0], i = _h[3];
                             var p1 = l.findPoint(l.findPerpendicular(z));
                             var h = p1.distance(z);
@@ -595,12 +624,12 @@ var DPolygon = (function () {
                             }
                         }
                     }
-                    catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                    catch (e_9_1) { e_9 = { error: e_9_1 }; }
                     finally {
                         try {
                             if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                         }
-                        finally { if (e_8) throw e_8.error; }
+                        finally { if (e_9) throw e_9.error; }
                     }
                     if (!maxWidthPoint1 || !maxWidthPoint2 || !maxHeightPoint) {
                         continue;
@@ -620,12 +649,12 @@ var DPolygon = (function () {
                     }
                 }
             }
-            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
             finally {
                 try {
                     if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                finally { if (e_7) throw e_7.error; }
+                finally { if (e_8) throw e_8.error; }
             }
             return resultPolygon;
         },
@@ -678,7 +707,7 @@ var DPolygon = (function () {
     });
     Object.defineProperty(DPolygon.prototype, "isClockwise", {
         get: function () {
-            var e_9, _a;
+            var e_10, _a;
             var sum = 0;
             try {
                 for (var _b = __values(this.clone().close()
@@ -687,12 +716,12 @@ var DPolygon = (function () {
                     sum += (a - x) * (b + y);
                 }
             }
-            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_9) throw e_9.error; }
+                finally { if (e_10) throw e_10.error; }
             }
             return sum < 0;
         },
@@ -722,7 +751,7 @@ var DPolygon = (function () {
         return this.pPoints.reduce(f, v);
     };
     DPolygon.prototype.intersection = function (l, includeOnly) {
-        var e_10, _a;
+        var e_11, _a;
         if (includeOnly === void 0) { includeOnly = false; }
         var res = [];
         try {
@@ -734,12 +763,12 @@ var DPolygon = (function () {
                 }
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_11) throw e_11.error; }
         }
         return res;
     };
@@ -945,7 +974,7 @@ var DPolygon = (function () {
         ctx.globalCompositeOperation = old;
     };
     DPolygon.prototype.contain = function (p, isBorderInside) {
-        var e_11, _a;
+        var e_12, _a;
         if (isBorderInside === void 0) { isBorderInside = false; }
         var simpleInclude = this.simpleInclude(p);
         if (!simpleInclude) {
@@ -971,12 +1000,12 @@ var DPolygon = (function () {
                 }
             }
         }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_11) throw e_11.error; }
+            finally { if (e_12) throw e_12.error; }
         }
         var eps = Math.PI / 10000;
         var absTotalFi = Math.abs(totalFi);
@@ -989,7 +1018,7 @@ var DPolygon = (function () {
         throw new Error('contains2 faild');
     };
     DPolygon.prototype.onBorder = function (p) {
-        var e_12, _a;
+        var e_13, _a;
         var simpleInclude = this.simpleInclude(p);
         if (simpleInclude) {
             var poly = this.deintersection;
@@ -1006,12 +1035,12 @@ var DPolygon = (function () {
                     }
                 }
             }
-            catch (e_12_1) { e_12 = { error: e_12_1 }; }
+            catch (e_13_1) { e_13 = { error: e_13_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_12) throw e_12.error; }
+                finally { if (e_13) throw e_13.error; }
             }
         }
         return false;
@@ -1135,7 +1164,7 @@ var DPolygon = (function () {
         };
     };
     DPolygon.prototype.divideToPieces = function (piecesCount, withAltitude) {
-        var e_13, _a;
+        var e_14, _a;
         if (withAltitude === void 0) { withAltitude = false; }
         var fullLength = this.fullLength;
         var pieceLength = fullLength / piecesCount;
@@ -1170,17 +1199,17 @@ var DPolygon = (function () {
                 _loop_3(p1, p2, i);
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_14) throw e_14.error; }
         }
         return this;
     };
     DPolygon.prototype.prepareToFastSearch = function () {
-        var e_14, _a;
+        var e_15, _a;
         this.searchStore = {};
         try {
             for (var _b = __values(this.points), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -1194,12 +1223,12 @@ var DPolygon = (function () {
                 this.searchStore[x][y][z || 'undefined'] = true;
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_15) throw e_15.error; }
         }
     };
     DPolygon.prototype.fastHas = function (_a) {
@@ -1219,8 +1248,8 @@ var DPolygon = (function () {
         get: function () {
             var polygon = this;
             return function () {
-                var r, _a, _b, p, e_15_1;
-                var e_15, _c;
+                var r, _a, _b, p, e_16_1;
+                var e_16, _c;
                 return __generator(this, function (_d) {
                     switch (_d.label) {
                         case 0:
@@ -1244,14 +1273,14 @@ var DPolygon = (function () {
                             return [3, 2];
                         case 5: return [3, 8];
                         case 6:
-                            e_15_1 = _d.sent();
-                            e_15 = { error: e_15_1 };
+                            e_16_1 = _d.sent();
+                            e_16 = { error: e_16_1 };
                             return [3, 8];
                         case 7:
                             try {
                                 if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                             }
-                            finally { if (e_15) throw e_15.error; }
+                            finally { if (e_16) throw e_16.error; }
                             return [7];
                         case 8: return [2, r.clone()];
                     }
@@ -1283,12 +1312,12 @@ var DPolygon = (function () {
         return this.simpleLogicFunction(p, true, false);
     };
     DPolygon.prototype.smartUnion = function (p) {
-        var e_16, _a;
+        var e_17, _a;
         var res = this.clone().simpleUnion(p);
         if (res) {
             var allHoles = __spreadArray(__spreadArray(__spreadArray([], __read(this.holes), false), __read(p.holes), false), __read(res.holes), false).map(function (h) { return h.clone(); });
             var _loop_4 = function (a) {
-                var e_17, _b;
+                var e_18, _b;
                 var _loop_5 = function (b) {
                     if (a.equal(b)) {
                         return "continue";
@@ -1300,17 +1329,17 @@ var DPolygon = (function () {
                     }
                 };
                 try {
-                    for (var allHoles_2 = (e_17 = void 0, __values(allHoles)), allHoles_2_1 = allHoles_2.next(); !allHoles_2_1.done; allHoles_2_1 = allHoles_2.next()) {
+                    for (var allHoles_2 = (e_18 = void 0, __values(allHoles)), allHoles_2_1 = allHoles_2.next(); !allHoles_2_1.done; allHoles_2_1 = allHoles_2.next()) {
                         var b = allHoles_2_1.value;
                         _loop_5(b);
                     }
                 }
-                catch (e_17_1) { e_17 = { error: e_17_1 }; }
+                catch (e_18_1) { e_18 = { error: e_18_1 }; }
                 finally {
                     try {
                         if (allHoles_2_1 && !allHoles_2_1.done && (_b = allHoles_2.return)) _b.call(allHoles_2);
                     }
-                    finally { if (e_17) throw e_17.error; }
+                    finally { if (e_18) throw e_18.error; }
                 }
             };
             try {
@@ -1319,12 +1348,12 @@ var DPolygon = (function () {
                     _loop_4(a);
                 }
             }
-            catch (e_16_1) { e_16 = { error: e_16_1 }; }
+            catch (e_17_1) { e_17 = { error: e_17_1 }; }
             finally {
                 try {
                     if (allHoles_1_1 && !allHoles_1_1.done && (_a = allHoles_1.return)) _a.call(allHoles_1);
                 }
-                finally { if (e_16) throw e_16.error; }
+                finally { if (e_17) throw e_17.error; }
             }
             res.holes = allHoles;
         }
@@ -1540,7 +1569,7 @@ var DPolygon = (function () {
         };
     };
     DPolygon.prototype.getBezierPoint = function (v) {
-        var e_18, _a;
+        var e_19, _a;
         if (this.length === 1) {
             return this.first;
         }
@@ -1551,12 +1580,12 @@ var DPolygon = (function () {
                     .scale(v));
             }
         }
-        catch (e_18_1) { e_18 = { error: e_18_1 }; }
+        catch (e_19_1) { e_19 = { error: e_19_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_18) throw e_18.error; }
+            finally { if (e_19) throw e_19.error; }
         }
         this.pop();
         return this.getBezierPoint(v);
@@ -1615,7 +1644,7 @@ var DPolygon = (function () {
         return undefined;
     };
     DPolygon.prototype.simpleLogicFunction = function (p, unionThis, unionThat) {
-        var e_19, _a, e_20, _b, e_21, _c, e_22, _d;
+        var e_20, _a, e_21, _b, e_22, _c, e_23, _d;
         var c = this.getJSTSGeometry(p, unionThis, unionThat);
         if (c) {
             var coordinates_1 = c.getCoordinates();
@@ -1655,31 +1684,31 @@ var DPolygon = (function () {
                                 }
                             };
                             try {
-                                for (var result_2 = (e_20 = void 0, __values(result)), result_2_1 = result_2.next(); !result_2_1.done; result_2_1 = result_2.next()) {
+                                for (var result_2 = (e_21 = void 0, __values(result)), result_2_1 = result_2.next(); !result_2_1.done; result_2_1 = result_2.next()) {
                                     var r = result_2_1.value;
                                     var state_1 = _loop_6(r);
                                     if (state_1 === "break")
                                         break;
                                 }
                             }
-                            catch (e_20_1) { e_20 = { error: e_20_1 }; }
+                            catch (e_21_1) { e_21 = { error: e_21_1 }; }
                             finally {
                                 try {
                                     if (result_2_1 && !result_2_1.done && (_b = result_2.return)) _b.call(result_2);
                                 }
-                                finally { if (e_20) throw e_20.error; }
+                                finally { if (e_21) throw e_21.error; }
                             }
                             if (result.length < 2) {
                                 break;
                             }
                         }
                     }
-                    catch (e_19_1) { e_19 = { error: e_19_1 }; }
+                    catch (e_20_1) { e_20 = { error: e_20_1 }; }
                     finally {
                         try {
                             if (result_1_1 && !result_1_1.done && (_a = result_1.return)) _a.call(result_1);
                         }
-                        finally { if (e_19) throw e_19.error; }
+                        finally { if (e_20) throw e_20.error; }
                     }
                 }
                 result = result.filter(function (h) { return h.length > 2; }).map(function (h) { return h.close(); });
@@ -1698,31 +1727,31 @@ var DPolygon = (function () {
                             }
                         };
                         try {
-                            for (var result_4 = (e_22 = void 0, __values(result)), result_4_1 = result_4.next(); !result_4_1.done; result_4_1 = result_4.next()) {
+                            for (var result_4 = (e_23 = void 0, __values(result)), result_4_1 = result_4.next(); !result_4_1.done; result_4_1 = result_4.next()) {
                                 var r = result_4_1.value;
                                 var state_2 = _loop_7(r);
                                 if (state_2 === "break")
                                     break;
                             }
                         }
-                        catch (e_22_1) { e_22 = { error: e_22_1 }; }
+                        catch (e_23_1) { e_23 = { error: e_23_1 }; }
                         finally {
                             try {
                                 if (result_4_1 && !result_4_1.done && (_d = result_4.return)) _d.call(result_4);
                             }
-                            finally { if (e_22) throw e_22.error; }
+                            finally { if (e_23) throw e_23.error; }
                         }
                         if (result.length < 2) {
                             break;
                         }
                     }
                 }
-                catch (e_21_1) { e_21 = { error: e_21_1 }; }
+                catch (e_22_1) { e_22 = { error: e_22_1 }; }
                 finally {
                     try {
                         if (result_3_1 && !result_3_1.done && (_c = result_3.return)) _c.call(result_3);
                     }
-                    finally { if (e_21) throw e_21.error; }
+                    finally { if (e_22) throw e_22.error; }
                 }
                 if (result.length === 0) {
                     return null;

package/dist/es2015/DPoint.js

@@ -226,6 +226,23 @@ export class DPoint {
         const dy = p.y - this.y;
         return Math.sqrt(dx * dx + dy * dy);
     }
+    distanceLatLon(p) {
+        checkFunction('distance')
+            .checkArgument('this')
+            .shouldBeDegree(this)
+            .checkArgument('p')
+            .shouldBeDegree(p);
+        const d = p.clone().move(this.clone().minus())
+            .degreeToRadians();
+        const t1 = this.clone().degreeToRadians();
+        const t2 = p.clone().degreeToRadians();
+        const a = Math.pow(Math.sin(d.lat / 2), 2) +
+            Math.cos(t1.lat) *
+                Math.cos(t2.lat) *
+                (Math.pow((Math.sin(d.lon / 2)), 2));
+        const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        return EARTH_RADIUS_IN_METERS * c;
+    }
     distance3d(p) {
         checkFunction('distance3d')
             .checkArgument('this')

package/dist/es2015/DPolygon.js

@@ -209,6 +209,9 @@ export class DPolygon {
     get fullLength() {
         return this.clone().open().perimeter;
     }
+    get fullLengthLatLon() {
+        return this.clone().open().perimeterLatLon;
+    }
     get perimeter() {
         let p = 0;
         for (const [p1, p2] of this.loopPointsGenerator()()) {
@@ -216,6 +219,13 @@ export class DPolygon {
         }
         return p;
     }
+    get perimeterLatLon() {
+        let p = 0;
+        for (const [p1, p2] of this.loopPointsGenerator()()) {
+            p += p1.distanceLatLon(p2);
+        }
+        return p;
+    }
     get area() {
         let sum = 0;
         for (const [{ x, y }, { x: a, y: b }] of this.deintersection.loopPointsGenerator()()) {

package/dist/esm/DPoint.js

@@ -263,6 +263,23 @@ var DPoint = (function () {
         var dy = p.y - this.y;
         return Math.sqrt(dx * dx + dy * dy);
     };
+    DPoint.prototype.distanceLatLon = function (p) {
+        checkFunction('distance')
+            .checkArgument('this')
+            .shouldBeDegree(this)
+            .checkArgument('p')
+            .shouldBeDegree(p);
+        var d = p.clone().move(this.clone().minus())
+            .degreeToRadians();
+        var t1 = this.clone().degreeToRadians();
+        var t2 = p.clone().degreeToRadians();
+        var a = Math.pow(Math.sin(d.lat / 2), 2) +
+            Math.cos(t1.lat) *
+                Math.cos(t2.lat) *
+                (Math.pow((Math.sin(d.lon / 2)), 2));
+        var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        return EARTH_RADIUS_IN_METERS * c;
+    };
     DPoint.prototype.distance3d = function (p) {
         checkFunction('distance3d')
             .checkArgument('this')