dgeoutils 2.2.14 → 2.2.15

package/dist/DPoint.d.ts

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

package/dist/DPoint.js

@@ -128,6 +128,21 @@ class DPoint {
         const dy = p.y - this.y;
         return Math.sqrt(dx * dx + dy * dy);
     }
+    distance3d(p) {
+        (0, utils_1.checkFunction)('distance3d')
+            .checkArgument('this')
+            .shouldBeMeters(this)
+            .checkArgument('p')
+            .shouldBeMeters(p)
+            .checkArgument('this.z')
+            .shouldExist(this.z)
+            .checkArgument('p.z')
+            .shouldExist(p.z);
+        const dx = p.x - this.x;
+        const dy = p.y - this.y;
+        const dz = p.z - this.z;
+        return Math.sqrt(dx * dx + dy * dy + dz * dz);
+    }
     setX(x) {
         this.x = typeof x === 'number' ? x : x(this);
         return this;

package/dist/utils.d.ts

@@ -1,13 +1,16 @@
 /// <reference types="offscreencanvas" />
 import { DPoint } from './DPoint';
 export declare const warn: (...args: any[]) => void;
+export declare const isDefAndNotNull: (a: any) => boolean;
 declare type CheckFunc = (p: DPoint) => CheckFunction;
+declare type CheckFunc2 = (p: any) => CheckFunction;
 interface CheckArgument {
     shouldBeDegree: CheckFunc;
     shouldBeMeters: CheckFunc;
     shouldBeInt: CheckFunc;
     shouldBeUInt: CheckFunc;
     shouldBeRadians: CheckFunc;
+    shouldExist: CheckFunc2;
 }
 interface CheckFunction {
     checkArgument: (argName: string) => CheckArgument;
@@ -19,7 +22,6 @@ export declare const gaussianElimination: {
     (matrix: number[][]): number[];
     MIN: number;
 };
-export declare const isDefAndNotNull: (a: any) => boolean;
 declare type True = true;
 export declare const createCanvas: {
     (size: number): [HTMLCanvasElement, CanvasRenderingContext2D];

package/dist/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCanvas = exports.isDefAndNotNull = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.warn = void 0;
+exports.createCanvas = exports.gaussianElimination = exports.createMatrix = exports.createArray = exports.checkFunction = exports.isDefAndNotNull = exports.warn = void 0;
 const index_1 = require("./index");
 const DPoint_1 = require("./DPoint");
 const warn = (...args) => {
@@ -9,6 +9,8 @@ const warn = (...args) => {
     }
 };
 exports.warn = warn;
+const isDefAndNotNull = (a) => a != undefined;
+exports.isDefAndNotNull = isDefAndNotNull;
 const hook = (scope) => () => scope;
 const shouldBeInt = (scope, funcName, argName) => (p) => {
     if (!p.clone().round()
@@ -36,6 +38,12 @@ const shouldBeRadians = (scope, funcName, argName) => (p) => {
     }
     return scope;
 };
+const shouldExist = (scope, funcName, argName) => (p) => {
+    if (!(0, exports.isDefAndNotNull)(p)) {
+        (0, exports.warn)(`"${funcName}" -> "${argName}" should exist!`);
+    }
+    return scope;
+};
 const shouldBeMeters = (scope, funcName, argName) => (p) => {
     if (!p.likePseudoMercator) {
         (0, exports.warn)(`"${funcName}" -> "${argName}" should be meters!`);
@@ -50,7 +58,8 @@ const checkFunction = (funcName) => ({
                 shouldBeMeters: hook(this),
                 shouldBeInt: hook(this),
                 shouldBeUInt: hook(this),
-                shouldBeRadians: hook(this)
+                shouldBeRadians: hook(this),
+                shouldExist: hook(this)
             };
         }
         return {
@@ -58,7 +67,8 @@ const checkFunction = (funcName) => ({
             shouldBeMeters: shouldBeMeters(this, funcName, argName),
             shouldBeInt: shouldBeInt(this, funcName, argName),
             shouldBeUInt: shouldBeUInt(this, funcName, argName),
-            shouldBeRadians: shouldBeRadians(this, funcName, argName)
+            shouldBeRadians: shouldBeRadians(this, funcName, argName),
+            shouldExist: shouldExist(this, funcName, argName)
         };
     }
 });
@@ -112,8 +122,6 @@ const gaussianElimination = (matrix) => {
 };
 exports.gaussianElimination = gaussianElimination;
 exports.gaussianElimination.MIN = 1e-10;
-const isDefAndNotNull = (a) => a != undefined;
-exports.isDefAndNotNull = isDefAndNotNull;
 const createCanvas = (a, b, c) => {
     var _a;
     let w = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dgeoutils",
-  "version": "2.2.14",
+  "version": "2.2.15",
   "description": "",
   "scripts": {
     "build": "node_modules/.bin/tsc",