dgeoutils 2.4.17 → 2.4.20

package/dist/cjs/DPoint.d.ts

@@ -9,6 +9,11 @@ export interface LatLng {
     lon?: number;
     alt?: number;
 }
+export interface XYZ extends Record<string, any> {
+    x: number;
+    y: number;
+    z?: number;
+}
 export declare const HALF_PI_IN_DEGREE = 90;
 export declare const PI_IN_DEGREE = 180;
 export declare const DOUBLE_PI_IN_DEGREE = 360;
@@ -25,10 +30,14 @@ export declare class DPoint {
     constructor(x: number, y: number);
     constructor(x: number, y: number, z?: number);
     static zero(): DPoint;
-    static parse(c: LatLng | number[] | DCoord | Point | Feature<Point>, format?: string): DPoint;
+    static parse(c: LatLng | number[] | DCoord | Point | Feature<Point> | XYZ, format?: string): DPoint;
     static parseFromWKT(wkt: string): DPoint;
     static random(): DPoint;
     static getTileFromQuadKey(quadKey: string): DPoint;
+    toDegreesMinutesSeconds(): {
+        x: string;
+        y: string;
+    };
     getTileFromCoords(zoom?: number): DPoint;
     getQuadKeyFromTile(zoom?: number): string;
     getCoordsFromTile(zoom?: number): DPoint;
@@ -120,6 +129,7 @@ export declare class DPoint {
     set alt(v: number | undefined);
     simple<T extends Record<string, number>>(xKey?: string, yKey?: string, zKey?: string): T;
     setIfLessThan(p: DPoint): DPoint;
+    setIfMoreThan(p: DPoint): DPoint;
     minus(): DPoint;
     orthodromicPath(point: DPoint, pointsCount?: number): DPolygon;
     sortByDistance(p: DPolygon): DPolygon;

package/dist/cjs/DPoint.js

@@ -10,6 +10,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -63,6 +74,10 @@ var DPoint = (function () {
         if (lat && lng) {
             return new DPoint(lng, lat, alt !== null && alt !== void 0 ? alt : 0);
         }
+        var _c = c, x = _c.x, y = _c.y, z = _c.z, properties = __rest(_c, ["x", "y", "z"]);
+        if ((0, utils_1.isDefAndNotNull)(x) && (0, utils_1.isDefAndNotNull)(y)) {
+            return new DPoint(x, y, z).setProperties(properties);
+        }
         var t = c;
         if (c.type === 'Point') {
             t = c.coordinates;
@@ -124,6 +139,12 @@ var DPoint = (function () {
         }
         return p;
     };
+    DPoint.prototype.toDegreesMinutesSeconds = function () {
+        return {
+            x: (0, utils_1.toDegreesMinutesSeconds)(this.x),
+            y: (0, utils_1.toDegreesMinutesSeconds)(this.y)
+        };
+    };
     DPoint.prototype.getTileFromCoords = function (zoom) {
         if (zoom === void 0) { zoom = this.z; }
         (0, utils_1.checkFunction)('getTileFromCoords')
@@ -718,6 +739,11 @@ var DPoint = (function () {
         this.y = Math.max(this.y, p.y);
         return this;
     };
+    DPoint.prototype.setIfMoreThan = function (p) {
+        this.x = Math.min(this.x, p.x);
+        this.y = Math.min(this.y, p.y);
+        return this;
+    };
     DPoint.prototype.minus = function () {
         return this.scale(-1);
     };

package/dist/cjs/index.d.ts

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

package/dist/cjs/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DGeo = exports.getCombinations = exports.cartesianProduct = exports.isDefAndNotNull = exports.createMatrix = exports.createArray = exports.createCanvas = exports.gaussianElimination = void 0;
+exports.DGeo = exports.parseDegreesMinutesSeconds = exports.getCombinations = exports.cartesianProduct = exports.isDefAndNotNull = exports.createMatrix = exports.createArray = exports.createCanvas = exports.gaussianElimination = void 0;
 __exportStar(require("./DCircle"), exports);
 __exportStar(require("./DLine"), exports);
 __exportStar(require("./DNumbers"), exports);
@@ -32,4 +32,5 @@ Object.defineProperty(exports, "createMatrix", { enumerable: true, get: function
 Object.defineProperty(exports, "isDefAndNotNull", { enumerable: true, get: function () { return utils_1.isDefAndNotNull; } });
 Object.defineProperty(exports, "cartesianProduct", { enumerable: true, get: function () { return utils_1.cartesianProduct; } });
 Object.defineProperty(exports, "getCombinations", { enumerable: true, get: function () { return utils_1.getCombinations; } });
+Object.defineProperty(exports, "parseDegreesMinutesSeconds", { enumerable: true, get: function () { return utils_1.parseDegreesMinutesSeconds; } });
 Object.defineProperty(exports, "DGeo", { enumerable: true, get: function () { return utils_1.DGeo; } });

package/dist/cjs/utils.d.ts

@@ -44,4 +44,6 @@ export declare const cartesianProduct: {
 };
 export declare const getCombinations: <T>(arr: T[][]) => T[][];
 export declare const div: (a: number, b: number) => number;
+export declare const toDegreesMinutesSeconds: (v: number) => string;
+export declare const parseDegreesMinutesSeconds: (i: string) => number;
 export {};

package/dist/cjs/utils.js

@@ -24,8 +24,19 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.div = exports.getCombinations = exports.cartesianProduct = exports.createCanvas = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.isDefAndNotNull = exports.warn = exports.DGeo = void 0;
+exports.parseDegreesMinutesSeconds = exports.toDegreesMinutesSeconds = exports.div = exports.getCombinations = exports.cartesianProduct = exports.createCanvas = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.isDefAndNotNull = exports.warn = exports.DGeo = void 0;
 var DPoint_1 = require("./DPoint");
 exports.DGeo = {
     DEBUG: false,
@@ -223,3 +234,46 @@ var getCombinations = function (arr) {
 exports.getCombinations = getCombinations;
 var div = function (a, b) { return Math.floor(a / b); };
 exports.div = div;
+var toDegreesMinutesSeconds = function (v) {
+    var degrees = Math.floor(v);
+    var t = (v % 1) * 60;
+    var minutes = Math.floor(t);
+    var t2 = (t % 1) * 60;
+    var seconds = t2.toFixed(2);
+    return "".concat(degrees, "\u00B0 ").concat(minutes, "' ").concat(seconds, "\"");
+};
+exports.toDegreesMinutesSeconds = toDegreesMinutesSeconds;
+var parseDegreesMinutesSeconds = function (i) {
+    var e_1, _a;
+    var _b, _c, _d, _e, _f, _g, _h;
+    var parts = i.matchAll(/(?<value>-?\d+(?<tail>\.\d{0,})?)(?<type>°|'|")/gmiu);
+    var d = 0;
+    var m = 0;
+    var s = 0;
+    try {
+        for (var parts_1 = __values(parts), parts_1_1 = parts_1.next(); !parts_1_1.done; parts_1_1 = parts_1.next()) {
+            var part = parts_1_1.value;
+            switch ((_b = part === null || part === void 0 ? void 0 : part.groups) === null || _b === void 0 ? void 0 : _b.type) {
+                case '°':
+                    d = Number((_d = (_c = part === null || part === void 0 ? void 0 : part.groups) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '0');
+                    break;
+                case '\'':
+                    m = Number((_f = (_e = part === null || part === void 0 ? void 0 : part.groups) === null || _e === void 0 ? void 0 : _e.value) !== null && _f !== void 0 ? _f : '0');
+                    break;
+                case '"':
+                    s = Number((_h = (_g = part === null || part === void 0 ? void 0 : part.groups) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : '0');
+                    break;
+                default:
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (parts_1_1 && !parts_1_1.done && (_a = parts_1.return)) _a.call(parts_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return d + m / 60 + s / 3600;
+};
+exports.parseDegreesMinutesSeconds = parseDegreesMinutesSeconds;

package/dist/es2015/DPoint.js

@@ -1,6 +1,17 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import { DLine } from './DLine';
 import { DPolygon } from './DPolygon';
-import { checkFunction, createArray, DGeo, div, isDefAndNotNull } from './utils';
+import { checkFunction, createArray, DGeo, div, isDefAndNotNull, toDegreesMinutesSeconds } from './utils';
 const diff = 0;
 const radiansPolygon = new DPolygon();
 const pseudoMercatorPolygon = new DPolygon();
@@ -30,6 +41,10 @@ export class DPoint {
         if (lat && lng) {
             return new DPoint(lng, lat, alt !== null && alt !== void 0 ? alt : 0);
         }
+        const _a = c, { x, y, z } = _a, properties = __rest(_a, ["x", "y", "z"]);
+        if (isDefAndNotNull(x) && isDefAndNotNull(y)) {
+            return new DPoint(x, y, z).setProperties(properties);
+        }
         let t = c;
         if (c.type === 'Point') {
             t = c.coordinates;
@@ -91,6 +106,12 @@ export class DPoint {
         }
         return p;
     }
+    toDegreesMinutesSeconds() {
+        return {
+            x: toDegreesMinutesSeconds(this.x),
+            y: toDegreesMinutesSeconds(this.y)
+        };
+    }
     getTileFromCoords(zoom = this.z) {
         checkFunction('getTileFromCoords')
             .checkArgument('this')
@@ -595,6 +616,11 @@ export class DPoint {
         this.y = Math.max(this.y, p.y);
         return this;
     }
+    setIfMoreThan(p) {
+        this.x = Math.min(this.x, p.x);
+        this.y = Math.min(this.y, p.y);
+        return this;
+    }
     minus() {
         return this.scale(-1);
     }

package/dist/es2015/index.js

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

package/dist/es2015/utils.js

@@ -174,3 +174,33 @@ export const getCombinations = (arr) => {
     return ans;
 };
 export const div = (a, b) => Math.floor(a / b);
+export const toDegreesMinutesSeconds = (v) => {
+    const degrees = Math.floor(v);
+    const t = (v % 1) * 60;
+    const minutes = Math.floor(t);
+    const t2 = (t % 1) * 60;
+    const seconds = t2.toFixed(2);
+    return `${degrees}° ${minutes}' ${seconds}"`;
+};
+export const parseDegreesMinutesSeconds = (i) => {
+    var _a, _b, _c, _d, _e, _f, _g;
+    const parts = i.matchAll(/(?<value>-?\d+(?<tail>\.\d{0,})?)(?<type>°|'|")/gmiu);
+    let d = 0;
+    let m = 0;
+    let s = 0;
+    for (const part of parts) {
+        switch ((_a = part === null || part === void 0 ? void 0 : part.groups) === null || _a === void 0 ? void 0 : _a.type) {
+            case '°':
+                d = Number((_c = (_b = part === null || part === void 0 ? void 0 : part.groups) === null || _b === void 0 ? void 0 : _b.value) !== null && _c !== void 0 ? _c : '0');
+                break;
+            case '\'':
+                m = Number((_e = (_d = part === null || part === void 0 ? void 0 : part.groups) === null || _d === void 0 ? void 0 : _d.value) !== null && _e !== void 0 ? _e : '0');
+                break;
+            case '"':
+                s = Number((_g = (_f = part === null || part === void 0 ? void 0 : part.groups) === null || _f === void 0 ? void 0 : _f.value) !== null && _g !== void 0 ? _g : '0');
+                break;
+            default:
+        }
+    }
+    return d + m / 60 + s / 3600;
+};

package/dist/esm/DPoint.js

@@ -9,6 +9,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -27,7 +38,7 @@ var __read = (this && this.__read) || function (o, n) {
 };
 import { DLine } from './DLine';
 import { DPolygon } from './DPolygon';
-import { checkFunction, createArray, DGeo, div, isDefAndNotNull } from './utils';
+import { checkFunction, createArray, DGeo, div, isDefAndNotNull, toDegreesMinutesSeconds } from './utils';
 var diff = 0;
 var radiansPolygon = new DPolygon();
 var pseudoMercatorPolygon = new DPolygon();
@@ -60,6 +71,10 @@ var DPoint = (function () {
         if (lat && lng) {
             return new DPoint(lng, lat, alt !== null && alt !== void 0 ? alt : 0);
         }
+        var _c = c, x = _c.x, y = _c.y, z = _c.z, properties = __rest(_c, ["x", "y", "z"]);
+        if (isDefAndNotNull(x) && isDefAndNotNull(y)) {
+            return new DPoint(x, y, z).setProperties(properties);
+        }
         var t = c;
         if (c.type === 'Point') {
             t = c.coordinates;
@@ -121,6 +136,12 @@ var DPoint = (function () {
         }
         return p;
     };
+    DPoint.prototype.toDegreesMinutesSeconds = function () {
+        return {
+            x: toDegreesMinutesSeconds(this.x),
+            y: toDegreesMinutesSeconds(this.y)
+        };
+    };
     DPoint.prototype.getTileFromCoords = function (zoom) {
         if (zoom === void 0) { zoom = this.z; }
         checkFunction('getTileFromCoords')
@@ -715,6 +736,11 @@ var DPoint = (function () {
         this.y = Math.max(this.y, p.y);
         return this;
     };
+    DPoint.prototype.setIfMoreThan = function (p) {
+        this.x = Math.min(this.x, p.x);
+        this.y = Math.min(this.y, p.y);
+        return this;
+    };
     DPoint.prototype.minus = function () {
         return this.scale(-1);
     };

package/dist/esm/index.js

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

package/dist/esm/utils.js

@@ -23,6 +23,17 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 import { DPoint } from './DPoint';
 export var DGeo = {
     DEBUG: false,
@@ -210,3 +221,44 @@ export var getCombinations = function (arr) {
     return ans;
 };
 export var div = function (a, b) { return Math.floor(a / b); };
+export var toDegreesMinutesSeconds = function (v) {
+    var degrees = Math.floor(v);
+    var t = (v % 1) * 60;
+    var minutes = Math.floor(t);
+    var t2 = (t % 1) * 60;
+    var seconds = t2.toFixed(2);
+    return "".concat(degrees, "\u00B0 ").concat(minutes, "' ").concat(seconds, "\"");
+};
+export var parseDegreesMinutesSeconds = function (i) {
+    var e_1, _a;
+    var _b, _c, _d, _e, _f, _g, _h;
+    var parts = i.matchAll(/(?<value>-?\d+(?<tail>\.\d{0,})?)(?<type>°|'|")/gmiu);
+    var d = 0;
+    var m = 0;
+    var s = 0;
+    try {
+        for (var parts_1 = __values(parts), parts_1_1 = parts_1.next(); !parts_1_1.done; parts_1_1 = parts_1.next()) {
+            var part = parts_1_1.value;
+            switch ((_b = part === null || part === void 0 ? void 0 : part.groups) === null || _b === void 0 ? void 0 : _b.type) {
+                case '°':
+                    d = Number((_d = (_c = part === null || part === void 0 ? void 0 : part.groups) === null || _c === void 0 ? void 0 : _c.value) !== null && _d !== void 0 ? _d : '0');
+                    break;
+                case '\'':
+                    m = Number((_f = (_e = part === null || part === void 0 ? void 0 : part.groups) === null || _e === void 0 ? void 0 : _e.value) !== null && _f !== void 0 ? _f : '0');
+                    break;
+                case '"':
+                    s = Number((_h = (_g = part === null || part === void 0 ? void 0 : part.groups) === null || _g === void 0 ? void 0 : _g.value) !== null && _h !== void 0 ? _h : '0');
+                    break;
+                default:
+            }
+        }
+    }
+    catch (e_1_1) { e_1 = { error: e_1_1 }; }
+    finally {
+        try {
+            if (parts_1_1 && !parts_1_1.done && (_a = parts_1.return)) _a.call(parts_1);
+        }
+        finally { if (e_1) throw e_1.error; }
+    }
+    return d + m / 60 + s / 3600;
+};