@openglobus/og 0.16.3 → 0.17.1

package/src/og/math/Mat3.js

@@ -1,156 +1,152 @@
-/**
- * @module og/math/Mat3
- */
-
-"use strict";
-
-import { Mat4 } from "./Mat4.js";
-import { Vec3 } from "./Vec3.js";
-
-/**
- * Class represents a 3x3 matrix.
- * @class
- */
-export class Mat3 {
-    constructor() {
-        /**
-         * A 3x3 matrix, indexable as a column-major order array.
-         * @public
-         * @type {Array.<number>}
-         */
-        this._m = new Array(9);
-    }
-
-    /**
-     * Sets column-major order array matrix.
-     * @public
-     * @param {Array.<number>} m - Matrix array.
-     * @returns {Mat3}
-     */
-    set(m) {
-        this._m[0] = m[0];
-        this._m[1] = m[1];
-        this._m[2] = m[2];
-        this._m[3] = m[3];
-        this._m[4] = m[4];
-        this._m[5] = m[5];
-        this._m[6] = m[6];
-        this._m[7] = m[7];
-        this._m[8] = m[8];
-        return this;
-    }
-
-    /**
-     * Duplicates a Mat3 instance.
-     * @public
-     * @returns {Mat3}
-     */
-    clone() {
-        var res = new Mat3();
-        res.set(this);
-        return res;
-    }
-
-    /**
-     * Copy matrix.
-     * @public
-     * @param {Mat3} a - Matrix to copy.
-     * @returns {Mat3}
-     */
-    copy(a) {
-        return this.set(a._m);
-    }
-
-    /**
-     * Creates trasposed matrix from the current.
-     * @public
-     * @returns {Mat3}
-     */
-    transposeTo() {
-        var res = new Mat3();
-        var m = this._m;
-        res._m[0] = m[0];
-        res._m[1] = m[3];
-        res._m[2] = m[6];
-        res._m[3] = m[1];
-        res._m[4] = m[4];
-        res._m[5] = m[7];
-        res._m[6] = m[2];
-        res._m[7] = m[5];
-        res._m[8] = m[8];
-        return res;
-    }
-
-    /**
-     * Sets matrix to identity.
-     * @public
-     * @returns {Mat3}
-     */
-    setIdentity() {
-        this._m[0] = 1;
-        this._m[1] = 0;
-        this._m[2] = 0;
-        this._m[3] = 0;
-        this._m[4] = 1;
-        this._m[5] = 0;
-        this._m[6] = 0;
-        this._m[7] = 0;
-        this._m[8] = 1;
-        return this;
-    }
-
-    /**
-     * Multiply to 3d vector.
-     * @public
-     * @params {Vec3} p - 3d vector.
-     * @returns {Vec3}
-     */
-    mulVec(p) {
-        var d = p.x,
-            e = p.y,
-            g = p.z;
-        var m = this._m;
-        return new Vec3(
-            m[0] * d + m[3] * e + m[6] * g,
-            m[1] * d + m[4] * e + m[7] * g,
-            m[2] * d + m[5] * e + m[8] * g
-        );
-    }
-
-    /**
-     * Converts to 4x4 matrix.
-     * @public
-     * @returns {Mat4}
-     */
-    toMatrix4() {
-        var res = new Mat4();
-        var b = res._m;
-        var a = this._m;
-        b[0] = a[0];
-        b[1] = a[1];
-        b[2] = a[2];
-        b[3] = 0;
-        b[4] = a[3];
-        b[5] = a[4];
-        b[6] = a[5];
-        b[7] = 0;
-        b[8] = a[6];
-        b[9] = a[7];
-        b[10] = a[8];
-        b[11] = 0;
-        b[12] = 0;
-        b[13] = 0;
-        b[14] = 0;
-        b[15] = 1;
-        return res;
-    }
-}
-
-/**
- * Mat3 factory.
- * @static
- * @return {Mat3}
- */
-export function mat3() {
-    return new Mat3();
-}
+"use strict";
+
+import { Mat4 } from "./Mat4.js";
+import { Vec3 } from "./Vec3.js";
+
+/**
+ * Class represents a 3x3 matrix.
+ * @class
+ */
+export class Mat3 {
+    constructor() {
+        /**
+         * A 3x3 matrix, indexable as a column-major order array.
+         * @public
+         * @type {Array.<number>}
+         */
+        this._m = new Array(9);
+    }
+
+    /**
+     * Sets column-major order array matrix.
+     * @public
+     * @param {Array.<number>} m - Matrix array.
+     * @returns {Mat3}
+     */
+    set(m) {
+        this._m[0] = m[0];
+        this._m[1] = m[1];
+        this._m[2] = m[2];
+        this._m[3] = m[3];
+        this._m[4] = m[4];
+        this._m[5] = m[5];
+        this._m[6] = m[6];
+        this._m[7] = m[7];
+        this._m[8] = m[8];
+        return this;
+    }
+
+    /**
+     * Duplicates a Mat3 instance.
+     * @public
+     * @returns {Mat3}
+     */
+    clone() {
+        var res = new Mat3();
+        res.set(this);
+        return res;
+    }
+
+    /**
+     * Copy matrix.
+     * @public
+     * @param {Mat3} a - Matrix to copy.
+     * @returns {Mat3}
+     */
+    copy(a) {
+        return this.set(a._m);
+    }
+
+    /**
+     * Creates trasposed matrix from the current.
+     * @public
+     * @returns {Mat3}
+     */
+    transposeTo() {
+        var res = new Mat3();
+        var m = this._m;
+        res._m[0] = m[0];
+        res._m[1] = m[3];
+        res._m[2] = m[6];
+        res._m[3] = m[1];
+        res._m[4] = m[4];
+        res._m[5] = m[7];
+        res._m[6] = m[2];
+        res._m[7] = m[5];
+        res._m[8] = m[8];
+        return res;
+    }
+
+    /**
+     * Sets matrix to identity.
+     * @public
+     * @returns {Mat3}
+     */
+    setIdentity() {
+        this._m[0] = 1;
+        this._m[1] = 0;
+        this._m[2] = 0;
+        this._m[3] = 0;
+        this._m[4] = 1;
+        this._m[5] = 0;
+        this._m[6] = 0;
+        this._m[7] = 0;
+        this._m[8] = 1;
+        return this;
+    }
+
+    /**
+     * Multiply to 3d vector.
+     * @public
+     * @params {Vec3} p - 3d vector.
+     * @returns {Vec3}
+     */
+    mulVec(p) {
+        var d = p.x,
+            e = p.y,
+            g = p.z;
+        var m = this._m;
+        return new Vec3(
+            m[0] * d + m[3] * e + m[6] * g,
+            m[1] * d + m[4] * e + m[7] * g,
+            m[2] * d + m[5] * e + m[8] * g
+        );
+    }
+
+    /**
+     * Converts to 4x4 matrix.
+     * @public
+     * @returns {Mat4}
+     */
+    toMatrix4() {
+        var res = new Mat4();
+        var b = res._m;
+        var a = this._m;
+        b[0] = a[0];
+        b[1] = a[1];
+        b[2] = a[2];
+        b[3] = 0;
+        b[4] = a[3];
+        b[5] = a[4];
+        b[6] = a[5];
+        b[7] = 0;
+        b[8] = a[6];
+        b[9] = a[7];
+        b[10] = a[8];
+        b[11] = 0;
+        b[12] = 0;
+        b[13] = 0;
+        b[14] = 0;
+        b[15] = 1;
+        return res;
+    }
+}
+
+/**
+ * Mat3 factory.
+ * @static
+ * @return {Mat3}
+ */
+export function mat3() {
+    return new Mat3();
+}

package/src/og/math/Ray.js

@@ -1,7 +1,3 @@
-/**
- * @module og/math/Ray
- */
-
 "use strict";
 
 import { EPS10 } from "../math.js";

package/src/og/math/Vec2.js

@@ -1,7 +1,3 @@
-/**
- * @module og/math/Vec2
- */
-
 "use strict";
 
 import { Vec3 } from "./Vec3.js";

package/src/og/math/Vec3.js

@@ -1,7 +1,3 @@
-/**
- * @module og/math/Vec3
- */
-
 "use strict";
 
 import { Quat } from "./Quat.js";
@@ -85,6 +81,11 @@ export class Vec3 {
         return new Vec3(0, 0, 1);
     }
 
+    /** @const */
+    static get NORTH() {
+        return Vec3.UNIT_Z;
+    }
+
     /**
      * Separate 63 bit Vec3 to two Vec3 32 bit float values.
      * @function

package/src/og/math/Vec4.js

@@ -1,7 +1,3 @@
-/**
- * @module og/math/Vec4
- */
-
 "use strict";
 
 import { frac } from "../math.js";

package/src/og/math/coder.js

@@ -1,104 +1,104 @@
-/**
- * @module og/math/coder
- */
-
-"use strict";
-
-import * as math from "../math.js";
-import { Vec4 } from "./Vec4.js";
-
-/**
- * Encode 32 bit float value to the RGBA vector.
- * @function
- * @param {number} v - 32 bit float value.
- * @returns {math.Vec4} - RGBA vector value.
- */
-export function encodeFloatToRGBA(v) {
-    var enc = new Vec4((1.0 * v) % 1, (255.0 * v) % 1, (65025.0 * v) % 1, (160581375.0 * v) % 1);
-    var yzww = new Vec4(enc.y / 255, enc.z / 255, enc.w / 255, 0);
-    return enc.subA(yzww);
-}
-
-/**
- * Decode RGBA vector to 32 bit float value.
- * @function
- * @param {Vec4} rgba - RGBA encoded 32 bit float value.
- * @returns {number} - Float value.
- */
-export function decodeFloatFromRGBA(rgba) {
-    var s = 1.0 - math.step(128.0, rgba.x) * 2.0;
-    var e = 2.0 * math.mod(rgba.x, 128.0) + math.step(128.0, rgba.y) - 127.0;
-    var m = math.mod(rgba.y, 128.0) * 65536.0 + rgba.z * 256.0 + rgba.w + 8388608.0;
-    return s * math.exp2(e) * (m * 1.1920928955078125e-7);
-}
-
-/**
- * Decode RGBA vector to 32 bit float value.
- * @function
- * @param {Vec4} rgba - RGBA encoded 32 bit float value.
- * @returns {number} - Float value.
- */
-export function decodeFloatFromRGBAArr(arr, use32) {
-    var s = 1.0 - math.step(128.0, arr[0]) * 2.0;
-    var e = 2.0 * math.mod(arr[0], 128.0) + math.step(128.0, arr[1]) - 127.0;
-    var m = math.mod(arr[1], 128.0) * 65536.0 + arr[2] * 256.0 + (use32 ? arr[3] : 0.0) + 8388608.0;
-    return s * math.exp2(e) * (m * 1.1920928955078125e-7);
-}
-
-/**
- * Separate 64 bit value to two 32 bit float values.
- * @function
- * @param {number} value - Double type value.
- * @returns {Array.<number>} Encoded array. (exactly 2 entries)
- */
-export function doubleToTwoFloats(value) {
-    var high, low;
-    if (value >= 0.0) {
-        let doubleHigh = Math.floor(value / 65536.0) * 65536.0;
-        high = Math.fround(doubleHigh);
-        low = Math.fround(value - doubleHigh);
-    } else {
-        let doubleHigh = Math.floor(-value / 65536.0) * 65536.0;
-        high = Math.fround(-doubleHigh);
-        low = Math.fround(value + doubleHigh);
-    }
-    return new Float32Array([high, low]);
-}
-
-/**
- * Separate 64 bit value to two 32 bit float values.
- * @function
- * @param {number} value - Double type value.
- * @returns {Array.<number>} Encoded array. (exactly 2 entries)
- */
-export function doubleToTwoFloats2(value, highLowArr) {
-    if (value >= 0.0) {
-        let doubleHigh = Math.floor(value / 65536.0) * 65536.0;
-        highLowArr[0] = Math.fround(doubleHigh);
-        highLowArr[1] = Math.fround(value - doubleHigh);
-    } else {
-        let doubleHigh = Math.floor(-value / 65536.0) * 65536.0;
-        highLowArr[0] = Math.fround(-doubleHigh);
-        highLowArr[1] = Math.fround(value + doubleHigh);
-    }
-    return highLowArr;
-}
-
-/**
- * Separate 64 bit value to two 32 bit float values.
- * @function
- * @param {number} value - Double type value.
- * @returns {Array.<number>} Encoded array. (exactly 2 entries)
- */
-export function doubleToTwoFloatsV2(value, highLowVec) {
-    if (value >= 0.0) {
-        let doubleHigh = Math.floor(value / 65536.0) * 65536.0;
-        highLowVec.x = Math.fround(doubleHigh);
-        highLowVec.y = Math.fround(value - doubleHigh);
-    } else {
-        let doubleHigh = Math.floor(-value / 65536.0) * 65536.0;
-        highLowVec.x = Math.fround(-doubleHigh);
-        highLowVec.y = Math.fround(value + doubleHigh);
-    }
-    return highLowVec;
-}
+/**
+ * @module og/math/coder
+ */
+
+"use strict";
+
+import * as math from "../math.js";
+import { Vec4 } from "./Vec4.js";
+
+/**
+ * Encode 32 bit float value to the RGBA vector.
+ * @function
+ * @param {number} v - 32 bit float value.
+ * @returns {math.Vec4} - RGBA vector value.
+ */
+export function encodeFloatToRGBA(v) {
+    var enc = new Vec4((1.0 * v) % 1, (255.0 * v) % 1, (65025.0 * v) % 1, (160581375.0 * v) % 1);
+    var yzww = new Vec4(enc.y / 255, enc.z / 255, enc.w / 255, 0);
+    return enc.subA(yzww);
+}
+
+/**
+ * Decode RGBA vector to 32 bit float value.
+ * @function
+ * @param {Vec4} rgba - RGBA encoded 32 bit float value.
+ * @returns {number} - Float value.
+ */
+export function decodeFloatFromRGBA(rgba) {
+    var s = 1.0 - math.step(128.0, rgba.x) * 2.0;
+    var e = 2.0 * math.mod(rgba.x, 128.0) + math.step(128.0, rgba.y) - 127.0;
+    var m = math.mod(rgba.y, 128.0) * 65536.0 + rgba.z * 256.0 + rgba.w + 8388608.0;
+    return s * math.exp2(e) * (m * 1.1920928955078125e-7);
+}
+
+/**
+ * Decode RGBA vector to 32 bit float value.
+ * @function
+ * @param {Vec4} rgba - RGBA encoded 32 bit float value.
+ * @returns {number} - Float value.
+ */
+export function decodeFloatFromRGBAArr(arr, use32) {
+    var s = 1.0 - math.step(128.0, arr[0]) * 2.0;
+    var e = 2.0 * math.mod(arr[0], 128.0) + math.step(128.0, arr[1]) - 127.0;
+    var m = math.mod(arr[1], 128.0) * 65536.0 + arr[2] * 256.0 + (use32 ? arr[3] : 0.0) + 8388608.0;
+    return s * math.exp2(e) * (m * 1.1920928955078125e-7);
+}
+
+/**
+ * Separate 64 bit value to two 32 bit float values.
+ * @function
+ * @param {number} value - Double type value.
+ * @returns {Array.<number>} Encoded array. (exactly 2 entries)
+ */
+export function doubleToTwoFloats(value) {
+    var high, low;
+    if (value >= 0.0) {
+        let doubleHigh = Math.floor(value / 65536.0) * 65536.0;
+        high = Math.fround(doubleHigh);
+        low = Math.fround(value - doubleHigh);
+    } else {
+        let doubleHigh = Math.floor(-value / 65536.0) * 65536.0;
+        high = Math.fround(-doubleHigh);
+        low = Math.fround(value + doubleHigh);
+    }
+    return new Float32Array([high, low]);
+}
+
+/**
+ * Separate 64 bit value to two 32 bit float values.
+ * @function
+ * @param {number} value - Double type value.
+ * @returns {Array.<number>} Encoded array. (exactly 2 entries)
+ */
+export function doubleToTwoFloats2(value, highLowArr) {
+    if (value >= 0.0) {
+        let doubleHigh = Math.floor(value / 65536.0) * 65536.0;
+        highLowArr[0] = Math.fround(doubleHigh);
+        highLowArr[1] = Math.fround(value - doubleHigh);
+    } else {
+        let doubleHigh = Math.floor(-value / 65536.0) * 65536.0;
+        highLowArr[0] = Math.fround(-doubleHigh);
+        highLowArr[1] = Math.fround(value + doubleHigh);
+    }
+    return highLowArr;
+}
+
+/**
+ * Separate 64 bit value to two 32 bit float values.
+ * @function
+ * @param {number} value - Double type value.
+ * @returns {Array.<number>} Encoded array. (exactly 2 entries)
+ */
+export function doubleToTwoFloatsV2(value, highLowVec) {
+    if (value >= 0.0) {
+        let doubleHigh = Math.floor(value / 65536.0) * 65536.0;
+        highLowVec.x = Math.fround(doubleHigh);
+        highLowVec.y = Math.fround(value - doubleHigh);
+    } else {
+        let doubleHigh = Math.floor(-value / 65536.0) * 65536.0;
+        highLowVec.x = Math.fround(-doubleHigh);
+        highLowVec.y = Math.fround(value + doubleHigh);
+    }
+    return highLowVec;
+}

package/src/og/math.js

@@ -1,6 +1,7 @@
 /**
  * @module og/math
  */
+
 "use strict";
 
 /** @const */
@@ -49,12 +50,12 @@ export const DEGREES_TO_HOURS = 1.0 / 15.0;
 /** @const */
 export const SQRT_HALF = Math.sqrt(0.5);
 
-export const EPS1 = 0.1;
-export const EPS2 = 0.01;
-export const EPS3 = 0.001;
-export const EPS4 = 0.0001;
-export const EPS5 = 0.00001;
-export const EPS6 = 0.000001;
+export const EPS1 = 1e-1;
+export const EPS2 = 1e-2;
+export const EPS3 = 1e-3;
+export const EPS4 = 1e-4;
+export const EPS5 = 1e-5;
+export const EPS6 = 1e-6;
 export const EPS7 = 1e-7;
 export const EPS8 = 1e-8;
 export const EPS9 = 1e-9;
@@ -137,7 +138,7 @@ export function isPowerOfTwo(x) {
  */
 export function nextHighestPowerOfTwo(x, maxValue = 4096) {
     --x;
-    for (var i = 1; i < 32; i <<= 1) {
+    for (let i = 1; i < 32; i <<= 1) {
         x = x | (x >> i);
     }
     return (x + 1) > maxValue ? maxValue : x + 1
@@ -226,7 +227,7 @@ export function step(edge, x) {
  */
 export function frac(x) {
     const mx = Math.abs(x)
-    return  mx - Math.floor(mx);
+    return mx - Math.floor(mx);
 }
 
 /**
@@ -361,7 +362,7 @@ export function negativePItoPI(a) {
 export function solve_iteration_fixed(f, x0, maxIter) {
     var x = 0;
     var x2 = x0;
-    for (var i = 0; i < maxIter; i++) {
+    for (let i = 0; i < maxIter; i++) {
         x = x2;
         x2 = f(x);
     }
@@ -381,7 +382,7 @@ export function solve_iteration_fixed(f, x0, maxIter) {
 export function solve_iteration(f, x0, err, maxIter = 50) {
     var x = 0;
     var x2 = x0;
-    for (var i = 0; i < maxIter; i++) {
+    for (let i = 0; i < maxIter; i++) {
         x = x2;
         x2 = f(x);
         if (Math.abs(x2 - x) < err) {
@@ -396,3 +397,34 @@ export function solve_iteration(f, x0, err, maxIter = 50) {
  * @callback equationCallback
  * @param {number} x - Equation variable.
  */
+
+/**
+ *
+ * @param a - First bearing angle
+ * @param b - Second bearing angle
+ * @returns {number}
+ */
+function getAngleDirection(a, b) {
+    let a_y = Math.cos(a),
+        a_x = Math.sin(a),
+        b_y = Math.cos(b),
+        b_x = Math.sin(b);
+    let c = a_y * b_x - b_y * a_x,
+        d = a_x * b_x + a_y * b_y;
+    if (c > 0.0) {
+        return Math.acos(d);
+    }
+    return -Math.acos(d);
+}
+
+/**
+ * Returns angle between two azimuths
+ * @param {number} a - First azimuth angle
+ * @param {number} b - Second azimuth angle
+ * @returns {number}
+ */
+export function getAngleBetweenAzimuths(a, b) {
+    a = zeroTwoPI(a);
+    b = zeroTwoPI(b);
+    return ((((a - b) % 360) + 360 + 180) % 360) - 180;
+}

package/src/og/mercator.js

@@ -122,7 +122,7 @@ export function getTileY(lat, zoom) {
  */
 export function forwardArray(lonlatArr) {
     var res = [];
-    for (var i = 0; i < lonlatArr.length; i++) {
+    for (let i = 0; i < lonlatArr.length; i++) {
         res.push(lonlatArr[i].forwardMercator());
     }
     return res;