@openglobus/og 0.11.5 → 0.12.0

package/src/og/Popup.js

@@ -1,11 +1,10 @@
-'use strict';
+"use strict";
 
-import { Events } from './Events.js';
-import { Vec3 } from './math/Vec3.js';
-import { getHTML, parseHTML, createLonLat } from './utils/shared.js';
+import { Events } from "./Events.js";
+import { Vec3 } from "./math/Vec3.js";
+import { getHTML, parseHTML, createLonLat } from "./utils/shared.js";
 
-const TEMPLATE =
-    `<div class="og-popup {className}">
+const TEMPLATE = `<div class="og-popup {className}">
       <div class="og-popup-content-wrapper">
         <div class="og-popup-content"></div>
       </div>
@@ -20,13 +19,11 @@ const TEMPLATE =
     </div>`;
 
 class Popup {
-
     /**
-     * 
-     * @param {*} options 
+     *
+     * @param {*} options
      */
     constructor(options) {
-
         this._id = Popup._staticCounter++;
 
         this.events = new Events(["open", "close"]);
@@ -77,7 +74,13 @@ class Popup {
 
     setScreen(p) {
         if (this._planet) {
-            this.el.style.transform = "translate(" + (p.x - this.clientWidth * 0.5) + "px, " + (p.y - this._planet.renderer.handler.canvas.height - this._tipEl.clientHeight) + "px)"
+            let r = this._planet.renderer.handler.pixelRatio;
+            this.el.style.transform =
+                "translate(" +
+                (p.x / r - this.clientWidth * 0.5) +
+                "px, " +
+                (p.y / r - this._planet.renderer.handler.canvas.clientHeight - this._tipEl.clientHeight) +
+                "px)";
         }
     }
 
@@ -102,8 +105,8 @@ class Popup {
     render(params) {
         this.el = this._renderTemplate(params);
         this._contentEl = this.el.querySelector(".og-popup-content");
-        this._titleEl = this.el.querySelector(".og-popup-title")
-        this._tipEl = this.el.querySelector(".og-popup-tip-container")
+        this._titleEl = this.el.querySelector(".og-popup-title");
+        this._tipEl = this.el.querySelector(".og-popup-tip-container");
         this.setOffset(this._offset[0], this._offset[1]);
         this.setContent(this._content);
         this.setTitle(this._title);
@@ -153,7 +156,6 @@ class Popup {
     }
 
     setCartesian3v(cart, height = 0) {
-
         this._cartPos = cart;
 
         if (this._planet) {
@@ -192,10 +194,10 @@ class Popup {
         if (content) {
             this.clear();
             this._content = content;
-            if (typeof content === 'string') {
+            if (typeof content === "string") {
                 this._contentEl.innerHTML = content;
             } else {
-                this._contentEl.appendChild(content)
+                this._contentEl.appendChild(content);
             }
         }
         return this;
@@ -207,4 +209,4 @@ class Popup {
     }
 }
 
-export { Popup };
+export { Popup };

package/src/og/QueueArray.js

@@ -1,9 +1,8 @@
-'use strict';
+"use strict";
 
 class QueueArray {
-
     /**
-     * 
+     *
      * @param {number} [size]
      */
     constructor(size) {
@@ -73,4 +72,4 @@ class QueueArray {
     }
 }
 
-export { QueueArray };
+export { QueueArray };

package/src/og/Rectangle.js

@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 /**
  * 2D Rectangle class.
@@ -7,9 +7,8 @@
  * @param {number} [top] - Top coordinate. 0 - default.
  * @param {number} [right] - Right coordinate. 0 - default.
  * @param {number} [bottom] - Bottom coordinate. 0 - default.
-*/
+ */
 class Rectangle {
-
     /**
      * @param {number} [left] - Left coordinate. 0 - default.
      * @param {number} [top] - Top coordinate. 0 - default.
@@ -17,7 +16,6 @@ class Rectangle {
      * @param {number} [bottom] - Bottom coordinate. 0 - default.
      */
     constructor(left, top, right, bottom) {
-
         /**
          * Left coordinate.
          * @public
@@ -102,7 +100,7 @@ class Rectangle {
      * @type {boolean}
      */
     fit(width, height) {
-        return (this.getWidth() == width && this.getHeight() == height);
+        return this.getWidth() == width && this.getHeight() == height;
     }
 
     isInside(x, y) {
@@ -110,4 +108,4 @@ class Rectangle {
     }
 }
 
-export { Rectangle };
+export { Rectangle };

package/src/og/Stack.js

@@ -2,7 +2,7 @@
  * @module og/Stack
  */
 
-'use strict';
+"use strict";
 
 class Node {
     constructor() {
@@ -13,13 +13,11 @@ class Node {
 }
 
 class Stack {
-
     /**
-     * 
+     *
      * @param {number} [size]
      */
     constructor(size = 256) {
-
         this._current = new Node();
         this._head = this._current;
 

package/src/og/ajax.js

@@ -2,7 +2,7 @@
  * @module og/ajax
  */
 
-'use strict';
+"use strict";
 
 /**
  * Ajax parameters.
@@ -13,8 +13,7 @@ const ajax = {
      * Ajax ready state result.
      * @enum
      */
-    ReadyState:
-    {
+    ReadyState: {
         Uninitialized: 0,
         Loading: 1,
         Loaded: 2,
@@ -25,8 +24,7 @@ const ajax = {
      * Ajax status code.
      * @enum
      */
-    Status:
-    {
+    Status: {
         OK: 200,
         Created: 201,
         Accepted: 202,
@@ -104,10 +102,10 @@ const defaultParams = {
  * @returns {ajax.Xhr} - Returns object that could be aborted.
  */
 ajax.request = function (url, params) {
-
     params = params || {};
 
-    var p = {}, i;
+    var p = {},
+        i;
 
     for (i in defaultParams) {
         p[i] = defaultParams[i];
@@ -123,14 +121,19 @@ ajax.request = function (url, params) {
 
     var customXhr = new Xhr(xhr);
 
-    var body = null, d;
+    var body = null,
+        d;
 
     if (p.type === ajax.Method.Post) {
         if (p.data) {
             body = "";
             for (let key in p.data) {
                 d = p.data[key];
-                body += key + "=" + encodeURIComponent(d instanceof Object ? JSON.stringify(d) : d) + "&";
+                body +=
+                    key +
+                    "=" +
+                    encodeURIComponent(d instanceof Object ? JSON.stringify(d) : d) +
+                    "&";
             }
             body = body.slice(0, -1);
         }
@@ -140,7 +143,8 @@ ajax.request = function (url, params) {
         var tail = "?";
         for (let key in p.data) {
             d = p.data[key];
-            tail += key + "=" + encodeURIComponent(d instanceof Object ? JSON.stringify(d) : d) + "&";
+            tail +=
+                key + "=" + encodeURIComponent(d instanceof Object ? JSON.stringify(d) : d) + "&";
         }
         tail = tail.slice(0, -1);
         xhr.open(p.type, url + tail, p.async);
@@ -172,7 +176,8 @@ ajax.request = function (url, params) {
                  * @param {Object} Response data
                  * @param {Object} Status object
                  */
-                params.abort && params.abort.call(params.sender || customXhr, xhr.response, xhr.status);
+                params.abort &&
+                    params.abort.call(params.sender || customXhr, xhr.response, xhr.status);
             } else {
                 /**
                  * Error callback.
@@ -180,9 +185,10 @@ ajax.request = function (url, params) {
                  * @param {Object} Response data
                  * @param {Object} Status object
                  */
-                params.error && params.error.call(params.sender || customXhr, xhr.response, xhr.status);
+                params.error &&
+                    params.error.call(params.sender || customXhr, xhr.response, xhr.status);
             }
-            delete xhr['onreadystatechange'];
+            delete xhr["onreadystatechange"];
             xhr.onreadystatechange = null;
             xhr = null;
         } else {
@@ -195,4 +201,4 @@ ajax.request = function (url, params) {
     return customXhr;
 };
 
-export { ajax };
+export { ajax };

package/src/og/astro/earth.js

@@ -2,13 +2,13 @@
  * @module og/astro/earth
  */
 
-'use strict';
+"use strict";
 
-import * as jd from './jd.js';
-import * as math from '../math.js';
-import * as astro from './astro.js';
-import { Quat } from '../math/Quat.js';
-import { Vec3 } from '../math/Vec3.js';
+import * as jd from "./jd.js";
+import * as math from "../math.js";
+import * as astro from "./astro.js";
+import { Quat } from "../math/Quat.js";
+import { Vec3 } from "../math/Vec3.js";
 
 /**
  * Returns Sun position in the geocentric coordinate system by the time.
@@ -21,7 +21,7 @@ export function getSunPosition(jDate) {
     // e  Eccentricity
     // T  Time at perihelion
 
-    // q  Perihelion distance  = a * (1 - e)    
+    // q  Perihelion distance  = a * (1 - e)
     // Q  Aphelion distance    = a * (1 + e)
 
     // i  Inclination, i.e. the "tilt" of the orbit relative to the
@@ -70,16 +70,17 @@ export function getSunPosition(jDate) {
 
     var d = jDate - jd.J2000;
 
-    var w = 282.9404 + 4.70935E-5 * d; // longitude of perihelion
+    var w = 282.9404 + 4.70935e-5 * d; // longitude of perihelion
     // var a = 1.000000; // mean distance, a.u.
-    var e = 0.016709 - 1.151E-9 * d; // eccentricity
-    var M = math.rev(356.0470 + 0.9856002585 * d); // mean anomaly
+    var e = 0.016709 - 1.151e-9 * d; // eccentricity
+    var M = math.rev(356.047 + 0.9856002585 * d); // mean anomaly
 
-    var oblecl = astro.J2000_OBLIQUITY - 3.563E-7 * d; // obliquity of the ecliptic
+    var oblecl = astro.J2000_OBLIQUITY - 3.563e-7 * d; // obliquity of the ecliptic
 
     // var L = math.rev(w + M); // Sun's mean longitude
 
-    var E = M + math.DEGREES * e * Math.sin(M * math.RADIANS) * (1 + e * Math.cos(M * math.RADIANS)); // eccentric anomaly
+    var E =
+        M + math.DEGREES * e * Math.sin(M * math.RADIANS) * (1 + e * Math.cos(M * math.RADIANS)); // eccentric anomaly
 
     // Sun rectangular coordiantes, where the X axis points towards the perihelion
     var x = Math.cos(E * math.RADIANS) - e;
@@ -99,10 +100,15 @@ export function getSunPosition(jDate) {
     var yequat = y * Math.cos(oblecl * math.RADIANS);
     var zequat = y * Math.sin(oblecl * math.RADIANS);
 
-    var theta = math.TWO_PI * (d * 24.0 / 23.9344694 - 259.853 / 360.0); // Siderial spin time
+    var theta = math.TWO_PI * ((d * 24.0) / 23.9344694 - 259.853 / 360.0); // Siderial spin time
 
-    return Quat.yRotation(-theta).mulVec3(new Vec3(-yequat * astro.AU_TO_METERS,
-        zequat * astro.AU_TO_METERS, -xequat * astro.AU_TO_METERS));
+    return Quat.yRotation(-theta).mulVec3(
+        new Vec3(
+            -yequat * astro.AU_TO_METERS,
+            zequat * astro.AU_TO_METERS,
+            -xequat * astro.AU_TO_METERS
+        )
+    );
 
     // Convert to RA and Decl
     // var RA = Math.atan2(yequat, xequat) * math.DEGREES;

package/src/og/bv/Box.js

@@ -11,10 +11,9 @@ import { Vec3 } from "../math/Vec3.js";
  * @class
  */
 class Box {
-
     /**
-     * 
-     * @param {*} boundsArr 
+     *
+     * @param {*} boundsArr
      */
     constructor(boundsArr) {
         /**

package/src/og/bv/Sphere.js

@@ -2,9 +2,9 @@
  * @module og/bv/Sphere
  */
 
-'use strict';
+"use strict";
 
-import { Vec3 } from '../math/Vec3.js';
+import { Vec3 } from "../math/Vec3.js";
 
 /**
  * Bounding sphere class.
@@ -14,12 +14,11 @@ import { Vec3 } from '../math/Vec3.js';
  */
 class Sphere {
     /**
-     * 
-     * @param {number} radius 
-     * @param {Vec3} center 
+     *
+     * @param {number} radius
+     * @param {Vec3} center
      */
     constructor(radius, center) {
-
         /**
          * Sphere radius.
          * @public
@@ -41,7 +40,11 @@ class Sphere {
      */
     setFromBounds(bounds) {
         let m = new Vec3(bounds[0], bounds[1], bounds[2]);
-        this.center.set(m.x + (bounds[3] - m.x) * 0.5, m.y + (bounds[3] - m.y) * 0.5, m.z + (bounds[5] - m.z) * 0.5);
+        this.center.set(
+            m.x + (bounds[3] - m.x) * 0.5,
+            m.y + (bounds[3] - m.y) * 0.5,
+            m.z + (bounds[5] - m.z) * 0.5
+        );
         this.radius = this.center.distance(m);
     }
 

package/src/og/camera/Camera.js

@@ -98,26 +98,26 @@ class Camera {
          * @protected
          * @type {Vec3}
          */
-        this._u = new Vec3(0.0, 1.0, 0.0); // up x n
+        this._r = new Vec3(1.0, 0.0, 0.0); // up x n
 
         /**
          * Camera up vector.
          * @protected
          * @type {Vec3}
          */
-        this._v = new Vec3(1.0, 0.0, 0.0); // n x u - UP
+        this._u = new Vec3(0.0, 1.0, 0.0); // n x u - UP
 
         /**
          * Camera forward vector.
          * @protected
          * @type {Vec3}
          */
-        this._n = new Vec3(0.0, 0.0, 1.0); // eye - look - FORWARD
+        this._b = new Vec3(0.0, 0.0, 1.0); // eye - look - FORWARD
 
         // Previous frame values
-        this._pu = this._u.clone();
-        this._pv = this._v.clone();
-        this._pn = this._n.clone();
+        this._pu = this._r.clone();
+        this._pv = this._u.clone();
+        this._pn = this._b.clone();
         this._peye = this.eye.clone();
         this.isMoved = false;
 
@@ -173,9 +173,9 @@ class Camera {
     }
 
     checkMoveEnd() {
-        var u = this._u,
-            v = this._v,
-            n = this._n,
+        var u = this._r,
+            v = this._u,
+            n = this._b,
             eye = this.eye;
 
         if (this._peye.equal(eye) && this._pu.equal(u) && this._pv.equal(v) && this._pn.equal(n)) {
@@ -216,27 +216,27 @@ class Camera {
     }
 
     getUp() {
-        return this._v.clone();
+        return this._u.clone();
     }
 
     getDown() {
-        return this._v.negateTo();
+        return this._u.negateTo();
     }
 
     getRight() {
-        return this._u.clone();
+        return this._r.clone();
     }
 
     getLeft() {
-        return this._u.negateTo();
+        return this._r.negateTo();
     }
 
     getForward() {
-        return this._n.negateTo();
+        return this._b.negateTo();
     }
 
     getBackward() {
-        return this._n.clone();
+        return this._b.clone();
     }
 
     /**
@@ -245,9 +245,9 @@ class Camera {
      * @virtual
      */
     update() {
-        var u = this._u,
-            v = this._v,
-            n = this._n,
+        var u = this._r,
+            v = this._u,
+            n = this._b,
             eye = this.eye;
 
         Vec3.doubleToTwoFloat32Array(eye, this.eyeHigh, this.eyeLow);
@@ -321,12 +321,7 @@ class Camera {
         this._tanViewAngle_hradOneByHeight =
             this._tanViewAngle_hrad * this.renderer.handler._oneByHeight;
         var c = this.renderer.handler.canvas;
-        this._projSizeConst =
-            Math.min(
-                c.clientWidth < 256 ? 256 : c.clientWidth,
-                c.clientHeight < 256 ? 256 : c.clientHeight
-            ) /
-            (angle * math.RADIANS);
+        this._projSizeConst = Math.min(c.clientWidth < 256 ? 256 : c.clientWidth, c.clientHeight < 256 ? 256 : c.clientHeight) / (angle * math.RADIANS);
         for (let i = 0, len = this.frustums.length; i < len; i++) {
             this.frustums[i].setProjectionMatrix(
                 angle,
@@ -368,15 +363,15 @@ class Camera {
         this.eye.x = eye.x;
         this.eye.y = eye.y;
         this.eye.z = eye.z;
-        look = look || this._n;
-        up = up || this._v;
-        this._n.x = eye.x - look.x;
-        this._n.y = eye.y - look.y;
-        this._n.z = eye.z - look.z;
-        this._u.copy(up.cross(this._n));
-        this._n.normalize();
-        this._u.normalize();
-        this._v.copy(this._n.cross(this._u));
+        look = look || this._b;
+        up = up || this._u;
+        this._b.x = eye.x - look.x;
+        this._b.y = eye.y - look.y;
+        this._b.z = eye.z - look.z;
+        this._r.copy(up.cross(this._b));
+        this._b.normalize();
+        this._r.normalize();
+        this._u.copy(this._b.cross(this._r));
         return this;
     }
 
@@ -384,14 +379,14 @@ class Camera {
      * Sets camera look point
      * @public
      * @param {Vec3} look - Look point
-     * @param {Vec3} [up] - Camera up vector otherwise camera current up vector(this._v)
+     * @param {Vec3} [up] - Camera up vector otherwise camera current up vector(this._u)
      */
     look(look, up) {
-        this._n.set(this.eye.x - look.x, this.eye.y - look.y, this.eye.z - look.z);
-        this._u.copy((up || this._v).cross(this._n));
-        this._n.normalize();
-        this._u.normalize();
-        this._v.copy(this._n.cross(this._u));
+        this._b.set(this.eye.x - look.x, this.eye.y - look.y, this.eye.z - look.z);
+        this._r.copy((up || this._u).cross(this._b));
+        this._b.normalize();
+        this._r.normalize();
+        this._u.copy(this._b.cross(this._r));
     }
 
     /**
@@ -402,9 +397,9 @@ class Camera {
      * @param {number} dn - delta Z
      */
     slide(du, dv, dn) {
-        this.eye.x += du * this._u.x + dv * this._v.x + dn * this._n.x;
-        this.eye.y += du * this._u.y + dv * this._v.y + dn * this._n.y;
-        this.eye.z += du * this._u.z + dv * this._v.z + dn * this._n.z;
+        this.eye.x += du * this._r.x + dv * this._u.x + dn * this._b.x;
+        this.eye.y += du * this._r.y + dv * this._u.y + dn * this._b.y;
+        this.eye.z += du * this._r.z + dv * this._u.z + dn * this._b.z;
     }
 
     /**
@@ -415,16 +410,16 @@ class Camera {
     roll(angle) {
         var cs = Math.cos(math.RADIANS * angle);
         var sn = Math.sin(math.RADIANS * angle);
-        var t = this._u.clone();
-        this._u.set(
-            cs * t.x - sn * this._v.x,
-            cs * t.y - sn * this._v.y,
-            cs * t.z - sn * this._v.z
+        var t = this._r.clone();
+        this._r.set(
+            cs * t.x - sn * this._u.x,
+            cs * t.y - sn * this._u.y,
+            cs * t.z - sn * this._u.z
         );
-        this._v.set(
-            sn * t.x + cs * this._v.x,
-            sn * t.y + cs * this._v.y,
-            sn * t.z + cs * this._v.z
+        this._u.set(
+            sn * t.x + cs * this._u.x,
+            sn * t.y + cs * this._u.y,
+            sn * t.z + cs * this._u.z
         );
     }
 
@@ -436,16 +431,16 @@ class Camera {
     pitch(angle) {
         var cs = Math.cos(math.RADIANS * angle);
         var sn = Math.sin(math.RADIANS * angle);
-        var t = this._n.clone();
-        this._n.set(
-            cs * t.x - sn * this._v.x,
-            cs * t.y - sn * this._v.y,
-            cs * t.z - sn * this._v.z
+        var t = this._b.clone();
+        this._b.set(
+            cs * t.x - sn * this._u.x,
+            cs * t.y - sn * this._u.y,
+            cs * t.z - sn * this._u.z
         );
-        this._v.set(
-            sn * t.x + cs * this._v.x,
-            sn * t.y + cs * this._v.y,
-            sn * t.z + cs * this._v.z
+        this._u.set(
+            sn * t.x + cs * this._u.x,
+            sn * t.y + cs * this._u.y,
+            sn * t.z + cs * this._u.z
         );
     }
 
@@ -457,16 +452,16 @@ class Camera {
     yaw(angle) {
         var cs = Math.cos(math.RADIANS * angle);
         var sn = Math.sin(math.RADIANS * angle);
-        var t = this._u.clone();
-        this._u.set(
-            cs * t.x - sn * this._n.x,
-            cs * t.y - sn * this._n.y,
-            cs * t.z - sn * this._n.z
+        var t = this._r.clone();
+        this._r.set(
+            cs * t.x - sn * this._b.x,
+            cs * t.y - sn * this._b.y,
+            cs * t.z - sn * this._b.z
         );
-        this._n.set(
-            sn * t.x + cs * this._n.x,
-            sn * t.y + cs * this._n.y,
-            sn * t.z + cs * this._n.z
+        this._b.set(
+            sn * t.x + cs * this._b.x,
+            sn * t.y + cs * this._b.y,
+            sn * t.z + cs * this._b.z
         );
     }
 
@@ -485,12 +480,8 @@ class Camera {
         var px = (x - w) / w,
             py = -(y - h) / h;
 
-        var world1 = this.frustums[0]._inverseProjectionViewMatrix
-                .mulVec4(new Vec4(px, py, -1.0, 1.0))
-                .affinity(),
-            world2 = this.frustums[0]._inverseProjectionViewMatrix
-                .mulVec4(new Vec4(px, py, 0.0, 1.0))
-                .affinity();
+        var world1 = this.frustums[0]._inverseProjectionViewMatrix.mulVec4(new Vec4(px, py, -1.0, 1.0)).affinity(),
+            world2 = this.frustums[0]._inverseProjectionViewMatrix.mulVec4(new Vec4(px, py, 0.0, 1.0)).affinity();
 
         return world2.subA(world1).toVec3().normalize();
     }
@@ -520,16 +511,16 @@ class Camera {
         center = center || Vec3.ZERO;
         up = up || Vec3.UP;
 
-        var rot = new Mat4().setRotation(isArc ? this._v : up, angle);
+        var rot = new Mat4().setRotation(isArc ? this._u : up, angle);
         var tr = new Mat4().setIdentity().translate(center);
         var ntr = new Mat4().setIdentity().translate(center.negateTo());
 
         var trm = tr.mul(rot).mul(ntr);
 
         this.eye = trm.mulVec3(this.eye);
-        this._v = rot.mulVec3(this._v).normalize();
         this._u = rot.mulVec3(this._u).normalize();
-        this._n = rot.mulVec3(this._n).normalize();
+        this._r = rot.mulVec3(this._r).normalize();
+        this._b = rot.mulVec3(this._b).normalize();
     }
 
     /**
@@ -551,7 +542,7 @@ class Camera {
      * @param {Vec3} center - Point that the camera rotates around.
      */
     rotateVertical(angle, center) {
-        this.rotateAround(angle, false, center, this._u);
+        this.rotateAround(angle, false, center, this._r);
     }
 
     /**