@openglobus/og 0.13.12 → 0.14.1

package/src/og/math/Vec3.js

@@ -39,38 +39,47 @@ export class Vec3 {
     static get UP() {
         return new Vec3(0, 1, 0);
     }
+
     /** @const */
     static get DOWN() {
         return new Vec3(0, -1, 0);
     }
+
     /** @const */
     static get RIGHT() {
         return new Vec3(1, 0, 0);
     }
+
     /** @const */
     static get LEFT() {
         return new Vec3(-1, 0, 0);
     }
+
     /** @const */
     static get FORWARD() {
         return new Vec3(0, 0, -1);
     }
+
     /** @const */
     static get BACKWARD() {
         return new Vec3(0, 0, 1);
     }
+
     /** @const */
     static get ZERO() {
         return new Vec3();
     }
+
     /** @const */
     static get UNIT_X() {
         return new Vec3(1, 0, 0);
     }
+
     /** @const */
     static get UNIT_Y() {
         return new Vec3(0, 1, 0);
     }
+
     /** @const */
     static get UNIT_Z() {
         return new Vec3(0, 0, 1);
@@ -231,9 +240,7 @@ export class Vec3 {
      * @returns {Vec3} -
      */
     static scale(a, scale) {
-        var res = new Vec3(a.x, a.y, a.z);
-        res.scale(scale);
-        return res;
+        return a.scaleTo(scale);
     }
 
     /**
@@ -314,6 +321,18 @@ export class Vec3 {
         return res;
     }
 
+    static length2(a) {
+        return a.length2();
+    }
+
+    static length(a) {
+        return a.length();
+    }
+
+    static dot(a, b) {
+        return a.dot(b);
+    }
+
     /**
      * Converts to 4d vector, Fourth value is 1.0.
      * @public
@@ -372,13 +391,13 @@ export class Vec3 {
 
     /**
      * Copy input vector's values.
-     * @param {Vec3} point3 - Vector to copy.
+     * @param {Vec3} p - Vector to copy.
      * @returns {Vec3} -
      */
-    copy(point3) {
-        this.x = point3.x;
-        this.y = point3.y;
-        this.z = point3.z;
+    copy(p) {
+        this.x = p.x;
+        this.y = p.y;
+        this.z = p.z;
         return this;
     }
 
@@ -412,47 +431,47 @@ export class Vec3 {
     /**
      * Adds vector to the current.
      * @public
-     * @param {Vec3} point3 - Point to add.
+     * @param {Vec3} p - Point to add.
      * @returns {Vec3} -
      */
-    addA(point3) {
-        this.x += point3.x;
-        this.y += point3.y;
-        this.z += point3.z;
+    addA(p) {
+        this.x += p.x;
+        this.y += p.y;
+        this.z += p.z;
         return this;
     }
 
     /**
      * Gets two vectors summarization.
      * @public
-     * @param {Vec3} point3 - Vector to add.
+     * @param {Vec3} p - Vector to add.
      * @returns {Vec3} Returns a sum vector.
      */
-    add(point3) {
-        return new Vec3(this.x + point3.x, this.y + point3.y, this.z + point3.z);
+    add(p) {
+        return new Vec3(this.x + p.x, this.y + p.y, this.z + p.z);
     }
 
     /**
      * Subtract vector from the current.
      * @public
-     * @param {Vec3} point3 - Subtract vector.
+     * @param {Vec3} p - Subtract vector.
      * @returns {Vec3} -
      */
-    subA(point3) {
-        this.x -= point3.x;
-        this.y -= point3.y;
-        this.z -= point3.z;
+    subA(p) {
+        this.x -= p.x;
+        this.y -= p.y;
+        this.z -= p.z;
         return this;
     }
 
     /**
      * Gets vector subtraction.
      * @public
-     * @param {Vec3} point3 - Subtract vector.
+     * @param {Vec3} p - Subtract vector.
      * @return {Vec3} Returns new instance of a subtraction
      */
-    sub(point3) {
-        return new Vec3(this.x - point3.x, this.y - point3.y, this.z - point3.z);
+    sub(p) {
+        return new Vec3(this.x - p.x, this.y - p.y, this.z - p.z);
     }
 
     /**
@@ -527,11 +546,11 @@ export class Vec3 {
     /**
      * Gets vectors dot production.
      * @public
-     * @param {Vec3} point3 - Another vector.
+     * @param {Vec3} a - Another vector.
      * @returns {number} -
      */
-    dot(point3) {
-        return point3.x * this.x + point3.y * this.y + point3.z * this.z;
+    dot(a) {
+        return a.x * this.x + a.y * this.y + a.z * this.z;
     }
 
     /**
@@ -696,26 +715,26 @@ export class Vec3 {
     /**
      * Gets distance to point.
      * @public
-     * @param {Vec3} point3 - Distant point.
+     * @param {Vec3} p - Distant point.
      * @returns {number} -
      */
-    distance(point3) {
-        let dx = this.x - point3.x,
-            dy = this.y - point3.y,
-            dz = this.z - point3.z;
+    distance(p) {
+        let dx = this.x - p.x,
+            dy = this.y - p.y,
+            dz = this.z - p.z;
         return Math.sqrt(dx * dx + dy * dy + dz * dz);
     }
 
     /**
      * Gets square distance to point.
      * @public
-     * @param {Vec3} point3 - Distant point.
+     * @param {Vec3} p - Distant point.
      * @returns {number} -
      */
-    distance2(point3) {
-        let dx = this.x - point3.x,
-            dy = this.y - point3.y,
-            dz = this.z - point3.z;
+    distance2(p) {
+        let dx = this.x - p.x,
+            dy = this.y - p.y,
+            dz = this.z - p.z;
         return dx * dx + dy * dy + dz * dz;
     }
 

package/src/og/math/Vec4.js

@@ -106,9 +106,8 @@ export class Vec4 {
      * Converts vector to a number array.
      * @public
      * @returns {Array.<number>} - (exactly 4 entries)
-     * @deprecated
      */
-    toVec() {
+    toArray() {
         return [this.x, this.y, this.z, this.w];
     }
 
@@ -117,8 +116,8 @@ export class Vec4 {
      * @public
      * @returns {Array.<number>} - (exactly 4 entries)
      */
-    toArray() {
-        return [this.x, this.y, this.z, this.w];
+    toArray3() {
+        return [this.x, this.y, this.z];
     }
 
     /**

package/src/og/math.js

@@ -49,26 +49,26 @@ export const DEGREES_TO_HOURS = 1.0 / 15.0;
 /** @const */
 export const SQRT_HALF = Math.sqrt(0.5);
 
-export const EPSILON1 = 0.1;
-export const EPSILON2 = 0.01;
-export const EPSILON3 = 0.001;
-export const EPSILON4 = 0.0001;
-export const EPSILON5 = 0.00001;
-export const EPSILON6 = 0.000001;
-export const EPSILON7 = 1e-7;
-export const EPSILON8 = 1e-8;
-export const EPSILON9 = 1e-9;
-export const EPSILON10 = 1e-10;
-export const EPSILON11 = 1e-11;
-export const EPSILON12 = 1e-12;
-export const EPSILON13 = 1e-13;
-export const EPSILON14 = 1e-14;
-export const EPSILON15 = 1e-15;
-export const EPSILON16 = 1e-16;
-export const EPSILON17 = 1e-17;
-export const EPSILON18 = 1e-18;
-export const EPSILON19 = 1e-19;
-export const EPSILON20 = 1e-20;
+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 EPS7 = 1e-7;
+export const EPS8 = 1e-8;
+export const EPS9 = 1e-9;
+export const EPS10 = 1e-10;
+export const EPS11 = 1e-11;
+export const EPS12 = 1e-12;
+export const EPS13 = 1e-13;
+export const EPS14 = 1e-14;
+export const EPS15 = 1e-15;
+export const EPS16 = 1e-16;
+export const EPS17 = 1e-17;
+export const EPS18 = 1e-18;
+export const EPS19 = 1e-19;
+export const EPS20 = 1e-20;
 
 /**
  * The log function returns the power to which the base value has to be raised to produce n.
@@ -201,7 +201,7 @@ export function mod(m, n) {
  */
 export function zeroTwoPI(a) {
     const res = mod(a, TWO_PI);
-    if (Math.abs(res) < EPSILON14 && Math.abs(a) > EPSILON14) {
+    if (Math.abs(res) < EPS14 && Math.abs(a) > EPS14) {
         return TWO_PI;
     }
     return res;

package/src/og/quadTree/EarthQuadTreeStrategy.js

@@ -0,0 +1,29 @@
+"use strict";
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js"
+import * as mercator from "../mercator.js";
+import { Segment } from "../segment/Segment.js";
+import { SegmentLonLat } from "../segment/SegmentLonLat.js";
+import * as quadTree from "../quadTree/quadTree.js";
+import { Extent } from "../Extent.js";
+import { Node } from "../quadTree/Node.js";
+
+export class EarthQuadTreeStrategy extends QuadTreeStrategy {
+    constructor(options = {}) {
+        super(options);
+        this.name = "earth";
+    }
+
+    init() {
+        this._quadTreeList = [
+            new Node(Segment, this.planet, quadTree.NW, null, 0, 0,
+                Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34])
+            ),
+            new Node(SegmentLonLat, this.planet, quadTree.NW, null, 0, 0,
+                Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90])
+            ),
+            new Node(SegmentLonLat, this.planet, quadTree.NW, null, 0, 0,
+                Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT])
+            )
+        ];
+    }
+}

package/src/og/quadTree/MarsQuadTreeStrategy.js

@@ -0,0 +1,27 @@
+"use strict";
+import { QuadTreeStrategy } from "./QuadTreeStrategy.js"
+import { SegmentLonLatWgs84 } from "../segment/SegmentLonLatWgs84.js";
+import * as quadTree from "../quadTree/quadTree.js";
+import { Extent } from "../Extent.js";
+import { Node } from "../quadTree/Node.js";
+import { EPSG4326 } from "../proj/EPSG4326.js";
+
+
+export class MarsQuadTreeStrategy extends QuadTreeStrategy {
+    constructor(options = {}) {
+        super(options);
+        this.name = "mars";
+        this.projection = EPSG4326;
+    }
+
+    init() {
+        let earthQuadTreeSouth = new Node(SegmentLonLatWgs84, this.planet, quadTree.NW, null, 0, 0,
+            Extent.createFromArray([-180, -90, 0, 90])
+        );
+        let earthQuadTreeWest = new Node(SegmentLonLatWgs84, this.planet, quadTree.NW, null, 0, 0,
+            Extent.createFromArray([0, -90, 180, 90])
+        );
+        this._quadTreeList.push(earthQuadTreeSouth);
+        this._quadTreeList.push(earthQuadTreeWest);
+    }
+}