dgeoutils 2.4.15 → 2.4.18

package/dist/cjs/DPoint.d.ts

@@ -1,6 +1,6 @@
 import { DLine } from './DLine';
 import { DPolygon } from './DPolygon';
-import { Point } from 'geojson';
+import { Point, Feature } from 'geojson';
 export declare const EARTH_RADIUS_IN_METERS = 6378137;
 export declare type DCoord = [number, number] | [number, number, number];
 export interface LatLng {
@@ -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,7 +30,7 @@ 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, 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;
@@ -34,6 +39,7 @@ export declare class DPoint {
     getCoordsFromTile(zoom?: number): DPoint;
     toCoords(format?: string): DCoord;
     toGeoJSON(format?: string): Point;
+    toGeoJSONFeature(format?: string): Feature<Point>;
     findLine(p: DPoint): DLine;
     findInnerAngle(p1: DPoint, p3: DPoint): number;
     toString(): string;

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,10 +74,19 @@ 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;
         }
+        if (c.type === 'Feature') {
+            var f = DPoint.parse(c.geometry, format);
+            f.properties = __assign({}, c.properties);
+            return f;
+        }
         return format.replace(/[^x-z]/gmiu, '')
             .split('')
             .reduce(function (a, k, index) {
@@ -173,6 +193,14 @@ var DPoint = (function () {
             coordinates: this.toCoords(format)
         };
     };
+    DPoint.prototype.toGeoJSONFeature = function (format) {
+        if (format === void 0) { format = utils_1.DGeo.parseFormat; }
+        return {
+            type: 'Feature',
+            properties: __assign({}, this.properties),
+            geometry: this.toGeoJSON(format)
+        };
+    };
     DPoint.prototype.findLine = function (p) {
         (0, utils_1.checkFunction)('findLine')
             .checkArgument('this')

package/dist/es2015/DPoint.js

@@ -1,3 +1,14 @@
+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';
@@ -30,10 +41,19 @@ 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;
         }
+        if (c.type === 'Feature') {
+            const f = DPoint.parse(c.geometry, format);
+            f.properties = Object.assign({}, c.properties);
+            return f;
+        }
         return format.replace(/[^x-z]/gmiu, '')
             .split('')
             .reduce((a, k, index) => {
@@ -134,6 +154,13 @@ export class DPoint {
             coordinates: this.toCoords(format)
         };
     }
+    toGeoJSONFeature(format = DGeo.parseFormat) {
+        return {
+            type: 'Feature',
+            properties: Object.assign({}, this.properties),
+            geometry: this.toGeoJSON(format)
+        };
+    }
     findLine(p) {
         checkFunction('findLine')
             .checkArgument('this')

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;
@@ -60,10 +71,19 @@ 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;
         }
+        if (c.type === 'Feature') {
+            var f = DPoint.parse(c.geometry, format);
+            f.properties = __assign({}, c.properties);
+            return f;
+        }
         return format.replace(/[^x-z]/gmiu, '')
             .split('')
             .reduce(function (a, k, index) {
@@ -170,6 +190,14 @@ var DPoint = (function () {
             coordinates: this.toCoords(format)
         };
     };
+    DPoint.prototype.toGeoJSONFeature = function (format) {
+        if (format === void 0) { format = DGeo.parseFormat; }
+        return {
+            type: 'Feature',
+            properties: __assign({}, this.properties),
+            geometry: this.toGeoJSON(format)
+        };
+    };
     DPoint.prototype.findLine = function (p) {
         checkFunction('findLine')
             .checkArgument('this')