@openglobus/og 0.11.1 → 0.11.6

package/src/og/camera/Frustum.js

@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 
-import { Mat4 } from '../math/Mat4.js';
+import { Mat4 } from "../math/Mat4.js";
 
 function planeNormalize(plane) {
     var t = 1.0 / Math.sqrt(plane[0] * plane[0] + plane[1] * plane[1] + plane[2] * plane[2]);
@@ -15,6 +15,9 @@ function planeNormalize(plane) {
  * @class
  */
 class Frustum {
+    /**
+     * @param {*} options
+     */
     constructor(options = {}) {
         /**
          * Frustum planes.
@@ -29,28 +32,28 @@ class Frustum {
         /**
          * Camera projection matrix.
          * @protected
-         * @type {og.Mat4}
+         * @type {Mat4}
          */
         this._projectionMatrix = new Mat4();
 
         /**
          * Camera inverse projection matrix.
          * @protected
-         * @type {og.Mat4}
+         * @type {Mat4}
          */
         this._inverseProjectionMatrix = new Mat4();
 
         /**
          * Product of projection and view matrices.
          * @protected
-         * @type {og.Mat4}
+         * @type {Mat4}
          */
         this._projectionViewMatrix = new Mat4();
 
         /**
          * Inverse projectionView Matrix.
          * @protected
-         * @type {og.Mat4}
+         * @type {Mat4}
          */
         this._inverseProjectionViewMatrix = new Mat4();
 
@@ -85,7 +88,8 @@ class Frustum {
          */
         this.far = 0.0;
 
-        this._cameraFrustumIndex = options.cameraFrustumIndex != undefined ? options.cameraFrustumIndex : -1;
+        this._cameraFrustumIndex =
+            options.cameraFrustumIndex != undefined ? options.cameraFrustumIndex : -1;
 
         this.setProjectionMatrix(
             options.fov || 30.0,
@@ -140,15 +144,21 @@ class Frustum {
      * @param {number} far - Far camera distance.
      */
     setProjectionMatrix(angle, aspect, near, far) {
-
-        this.top = near * Math.tan(angle * Math.PI / 360);
+        this.top = near * Math.tan((angle * Math.PI) / 360);
         this.bottom = -this.top;
         this.right = this.top * aspect;
         this.left = -this.right;
         this.near = near;
         this.far = far;
 
-        this._projectionMatrix.setPerspective(this.left, this.right, this.bottom, this.top, near, far);
+        this._projectionMatrix.setPerspective(
+            this.left,
+            this.right,
+            this.bottom,
+            this.top,
+            near,
+            far
+        );
         this._projectionMatrix.inverseTo(this._inverseProjectionMatrix);
     }
 
@@ -158,7 +168,6 @@ class Frustum {
      * @param {Mat4} projectionView - projectionView matrix.
      */
     setViewMatrix(viewMatrix) {
-
         this._projectionViewMatrix = this._projectionMatrix.mul(viewMatrix);
         this._projectionViewMatrix.inverseTo(this._inverseProjectionViewMatrix);
 
@@ -210,7 +219,7 @@ class Frustum {
     /**
      * Returns true if a point in the frustum.
      * @public
-     * @param {og.Vec3} point - Cartesian point.
+     * @param {Vec3} point - Cartesian point.
      * @returns {boolean} -
      */
     containsPoint(point) {
@@ -227,7 +236,7 @@ class Frustum {
     /**
      * Returns true if the frustum contains a bonding sphere, but bottom plane exclude.
      * @public
-     * @param {og.bv.Sphere} sphere - Bounding sphere.
+     * @param {Sphere} sphere - Bounding sphere.
      * @returns {boolean} -
      */
     containsSphereBottomExc(sphere) {
@@ -251,7 +260,7 @@ class Frustum {
     /**
      * Returns true if the frustum contains a bonding sphere.
      * @public
-     * @param {og.bv.Sphere} sphere - Bounding sphere.
+     * @param {Sphere} sphere - Bounding sphere.
      * @returns {boolean} -
      */
     containsSphere(sphere) {
@@ -287,15 +296,17 @@ class Frustum {
     /**
      * Returns true if the frustum contains a bounding box.
      * @public
-     * @param {og.bv.Box} box - Bounding box.
+     * @param {Box} box - Bounding box.
      * @returns {boolean} -
      */
     containsBox(box) {
-        var result = true, cout, cin;
+        var result = true,
+            cout,
+            cin;
 
         for (var i = 0; i < 6; i++) {
-
-            cout = 0; cin = 0;
+            cout = 0;
+            cin = 0;
 
             for (var k = 0; k < 8 && (cin === 0 || cout === 0); k++) {
                 var d = box.vertices[k].dotArr(this._f[i]) + this._f[i][3];
@@ -315,6 +326,6 @@ class Frustum {
 
         return result;
     }
-};
+}
 
 export { Frustum };

package/src/og/camera/PlanetCamera.js

@@ -17,8 +17,8 @@ import { Mat4 } from "../math/Mat4.js";
 /**
  * Planet camera.
  * @class
- * @extends {og.Camera}
- * @param {og.RenderNode} planet - Planet render node.
+ * @extends {Camera}
+ * @param {RenderNode} planet - Planet render node.
  * @param {Object} [options] - Planet camera options:
  * @param {Object} [options.name] - Camera name.
  * @param {number} [options.viewAngle=37] - Camera angle of view. Default is 35.0
@@ -26,11 +26,15 @@ import { Mat4 } from "../math/Mat4.js";
  * @param {number} [options.far] - Camera far plane distance. Deafult is og.math.MAX
  * @param {number} [options.minAltitude] - Minimal altitude for the camera. Deafult is 1
  * @param {number} [options.maxAltitude] - Maximal altitude for the camera. Deafult is 20000000
- * @param {og.Vec3} [options.eye] - Camera eye position. Default (0,0,0)
- * @param {og.Vec3} [options.look] - Camera look position. Default (0,0,0)
- * @param {og.Vec3} [options.up] - Camera eye position. Default (0,1,0)
+ * @param {Vec3} [options.eye] - Camera eye position. Default (0,0,0)
+ * @param {Vec3} [options.look] - Camera look position. Default (0,0,0)
+ * @param {Vec3} [options.up] - Camera eye position. Default (0,1,0)
  */
 class PlanetCamera extends Camera {
+    /**
+     * @param {RenderNode} planet - Planet render node.
+     * @param {Object} [options] - Planet camera options:
+     */
     constructor(planet, options) {
         super(
             planet.renderer,
@@ -50,7 +54,7 @@ class PlanetCamera extends Camera {
         /**
          * Assigned camera's planet.
          * @public
-         * @type {og.scene.Planet}
+         * @type {Planet}
          */
         this.planet = planet;
 
@@ -71,14 +75,14 @@ class PlanetCamera extends Camera {
         /**
          * Current geographical degree position.
          * @protected
-         * @type {og.LonLat}
+         * @type {LonLat}
          */
         this._lonLat = this.planet.ellipsoid.cartesianToLonLat(this.eye);
 
         /**
          * Current geographical mercator position.
          * @protected
-         * @type {og.LonLat}
+         * @type {LonLat}
          */
         this._lonLatMerc = this._lonLat.forwardMercator();
 
@@ -92,14 +96,14 @@ class PlanetCamera extends Camera {
         /**
          * Cartesian coordinates on the terrain.
          * @protected
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this._terrainPoint = new Vec3();
 
         /**
          * Quad node that camera flies over.
          * @protected
-         * @type {og.quadTree.Node}
+         * @type {quadTree.Node}
          */
         this._insideSegment = null;
 
@@ -107,7 +111,7 @@ class PlanetCamera extends Camera {
          * Coordinates that depends on what segment class we are fling over.
          * It can be WGS84 or Mercator coordinates. Gets in og.quadTree.Node
          * @protected
-         * @type {og.LonLat}
+         * @type {LonLat}
          */
         this._insideSegmentPosition = new LonLat();
 
@@ -176,9 +180,9 @@ class PlanetCamera extends Camera {
     /**
      * Places camera to view to the geographical point.
      * @public
-     * @param {og.LonLat} lonlat - New camera and camera view position.
-     * @param {og.LonLat} [lookLonLat] - Look up coordinates.
-     * @param {og.Vec3} [up] - Camera UP vector. Default (0,1,0)
+     * @param {LonLat} lonlat - New camera and camera view position.
+     * @param {LonLat} [lookLonLat] - Look up coordinates.
+     * @param {Vec3} [up] - Camera UP vector. Default (0,1,0)
      */
     setLonLat(lonlat, lookLonLat, up) {
         this.stopFlying();
@@ -193,7 +197,7 @@ class PlanetCamera extends Camera {
     /**
      * Returns camera geographical position.
      * @public
-     * @returns {og.LonLat}
+     * @returns {LonLat}
      */
     getLonLat() {
         return this._lonLat;
@@ -211,9 +215,9 @@ class PlanetCamera extends Camera {
     /**
      * Gets position by viewable extent.
      * @public
-     * @param {og.Extent} extent - Viewable extent.
+     * @param {Extent} extent - Viewable extent.
      * @param {Number} height - Camera height
-     * @returns {og.Vec3}
+     * @returns {Vec3}
      */
     getExtentPosition(extent, height) {
         var north = extent.getNorth();
@@ -281,7 +285,7 @@ class PlanetCamera extends Camera {
     /**
      * View current extent.
      * @public
-     * @param {og.Extent} extent - Current extent.
+     * @param {Extent} extent - Current extent.
      */
     viewExtent(extent, height) {
         this.stopFlying();
@@ -292,8 +296,8 @@ class PlanetCamera extends Camera {
     /**
      * Flies to the current extent.
      * @public
-     * @param {og.Extent} extent - Current extent.
-     * @param {og.Vec3} [up] - Camera UP in the end of flying. Default - (0,1,0)
+     * @param {Extent} extent - Current extent.
+     * @param {Vec3} [up] - Camera UP in the end of flying. Default - (0,1,0)
      * @param {Number} [ampl] - Altitude amplitude factor.
      * @param {cameraCallback} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
@@ -356,9 +360,9 @@ class PlanetCamera extends Camera {
     /**
      * Flies to the cartesian coordinates.
      * @public
-     * @param {og.Vec3} cartesian - Finish cartesian coordinates.
-     * @param {og.Vec3} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
-     * @param {og.Vec3} [up] - Camera UP vector in the end of flying. Default - (0,1,0)
+     * @param {Vec3} cartesian - Finish cartesian coordinates.
+     * @param {Vec3} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
+     * @param {Vec3} [up] - Camera UP vector in the end of flying. Default - (0,1,0)
      * @param {Number} [ampl=1.0] - Altitude amplitude factor.
      * @param {cameraCallback} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
@@ -452,9 +456,9 @@ class PlanetCamera extends Camera {
     /**
      * Flies to the geo coordiantes.
      * @public
-     * @param {og.LonLat} lonlat - Finish coordinates.
-     * @param {og.Vec3} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
-     * @param {og.Vec3} [up] - Camera UP vector in the end of flying. Default - (0,1,0)
+     * @param {LonLat} lonlat - Finish coordinates.
+     * @param {Vec3} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
+     * @param {Vec3} [up] - Camera UP vector in the end of flying. Default - (0,1,0)
      * @param {Number} [ampl] - Altitude amplitude factor.
      * @param {cameraCallback} [completeCallback] - Callback that calls after flying when flying is finished.
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.

package/src/og/control/CompassButton.js

@@ -82,10 +82,14 @@ let svg = `<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 /**
  * Planet compass button
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @params {Object} [options] - Control options.
  */
 class CompassButton extends Control {
+    /**
+     *
+     * @params {Object} [options] - Control options.
+     */
     constructor(options) {
         super(options);
 
@@ -93,13 +97,15 @@ class CompassButton extends Control {
 
         this.planet = null;
 
+        this.compassSvg = options.compassSvg || svg;
+
         this._heading = null;
 
         this._svg = null;
     }
 
     oninit() {
-        var btnEl = parseHTML(`<div class="og-compass-button">${svg}</div>`)[0];
+        var btnEl = parseHTML(`<div class="og-compass-button">${this.compassSvg}</div>`)[0];
 
         this._svg = btnEl.querySelector("svg");
 

package/src/og/control/Control.js

@@ -2,7 +2,7 @@
  * @module og/control/Control
  */
 
-'use strict';
+"use strict";
 
 /**
  * Base control class for implementing renderer controls.
@@ -12,6 +12,9 @@
  * @param {Boolean} [options.autoActivated=true] - If true - calls initialize function after the renderer assigning.
  */
 class Control {
+    /**
+     * @param {Object} [options] - Control activation options:
+     */
     constructor(options) {
         options = options || {};
 
@@ -29,7 +32,7 @@ class Control {
         /**
          * Assigned renderer.
          * @public
-         * @type {og.Renderer}
+         * @type {Renderer}
          */
         this.renderer = null;
 
@@ -73,40 +76,40 @@ class Control {
      * @public
      * @virtual
      */
-    oninit() { }
+    oninit() {}
 
     /**
      * Control renderer assigning function have to be overriden.
      * @public
      * @virtual
      */
-    onadd() { }
+    onadd() {}
 
     /**
      * Control remove function have to be overriden.
      * @public
      * @virtual
      */
-    onremove() { }
+    onremove() {}
 
     /**
      * Control activation function have to be overriden.
      * @public
      * @virtual
      */
-    onactivate() { }
+    onactivate() {}
 
     /**
      * Control deactivation function have to be overriden.
      * @public
      * @virtual
      */
-    ondeactivate() { }
+    ondeactivate() {}
 
     /**
      * Assign renderer to the control.
      * @public
-     * @type {og.Renderer}
+     * @type {Renderer}
      */
     addTo(renderer) {
         if (renderer) {
@@ -126,7 +129,6 @@ class Control {
      * @public
      */
     remove() {
-
         this.onremove && this.onremove();
 
         let r = this.renderer,
@@ -181,6 +183,6 @@ class Control {
     isEqual(control) {
         return control._id === this._id;
     }
-};
+}
 
-export { Control };
+export { Control };

package/src/og/control/DebugInfo.js

@@ -9,10 +9,13 @@ import { Control } from "./Control.js";
 /**
  * Debug information
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 class DebugInfo extends Control {
+    /**
+     * @param {Object} [options] - Control options.
+     */
     constructor(options) {
         options = options || {};
         if (!options.name || options.name === "") {

package/src/og/control/EarthCoordinates.js

@@ -2,58 +2,63 @@
  * @module og/control/EarthCoordinates
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
+import { Control } from "./Control.js";
 
 function dec2deg(base) {
     var t;
     var degrees = base < 0 ? Math.ceil(base) : Math.floor(base);
-    var minutes = Math.floor(t = Math.abs((base - degrees)) * 60);
+    var minutes = Math.floor((t = Math.abs(base - degrees) * 60));
     var seconds = Math.floor((t - minutes) * 6000);
-    seconds = seconds / 100.00;
-    return (numToFixedString(degrees, 3) + "\u00B0" +
-        numToFixedString(minutes, 2) + "\u0027" +
-        numToFixedString(seconds.toFixed(2), 2) + "\u0022");
-};
+    seconds = seconds / 100.0;
+    return (
+        numToFixedString(degrees, 3) +
+        "\u00B0" +
+        numToFixedString(minutes, 2) +
+        "\u0027" +
+        numToFixedString(seconds.toFixed(2), 2) +
+        "\u0022"
+    );
+}
 
 function numToFixedString(num, fixed) {
-    var dl = num.toString().split('.')[0].length;
+    var dl = num.toString().split(".")[0].length;
     var white = "&nbsp;";
     for (var i = dl; i < fixed; i++) {
-        white += '&nbsp;&nbsp;';
+        white += "&nbsp;&nbsp;";
     }
     return white + num.toString();
-};
+}
 
 function toDecimal(ll) {
     return ll.lat.toFixed(5) + ", " + ll.lon.toFixed(5);
-};
+}
 
 function toDegrees(ll) {
     return dec2deg(ll.lat) + ", " + dec2deg(ll.lon);
-};
+}
 
 function toMercator(ll) {
     var m = ll.forwardMercator();
     return m.lat.toFixed(5) + ", " + m.lon.toFixed(5);
-};
+}
 
-const DisplayTypesConverters = [
-    toDecimal,
-    toDegrees,
-    toMercator
-];
+const DisplayTypesConverters = [toDecimal, toDegrees, toMercator];
 
 /**
  * Control displays mouse or screen center Earth coordinates.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Options:
  * @param {Boolean} [options.center] - Earth coordiantes by screen center otherwise mouse pointer. False is default.
  * @param {Boolean} [options.type] - Coordinates shown: 0 - is decimal degrees, 1 - degrees, 2 - mercator geodetic coordinates.
  */
 class EarthCoordinates extends Control {
+    /**
+     *
+     * @param {Object} [options] - Options:
+     */
     constructor(options) {
         super(options);
 
@@ -87,27 +92,32 @@ class EarthCoordinates extends Control {
          */
 
         var pad = false;
-        if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
+        if (
+            /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(
+                navigator.userAgent
+            )
+        ) {
             pad = true;
         }
 
         this._center = options.center || pad;
 
+        this._centerDiv = null;
+
         /**
          * Current position.
          * @public
-         * @type {og.Vec3}
+         * @type {Vec3}
          */
         this.position = null;
     }
 
     oninit() {
-        this._display = document.createElement('div');
-        this._display.className = 'ogEarthCoordinatesControl';
+        this._display = document.createElement("div");
+        this._display.className = "ogEarthCoordinatesControl";
         var that = this;
 
         function _refresh(el) {
-
             if (that._displayType >= DisplayTypesConverters.length) {
                 that._displayType = 0;
             }
@@ -121,7 +131,7 @@ class EarthCoordinates extends Control {
             }
             that._converter = DisplayTypesConverters[that._displayType];
             that._showPosition();
-        };
+        }
 
         this._display.onclick = function (e) {
             that._displayType += 1;
@@ -132,19 +142,19 @@ class EarthCoordinates extends Control {
 
         _refresh(this._display);
 
-        let centerDiv = document.createElement('div');
-        centerDiv.className = 'ogCenterIcon';
-        centerDiv.innerHTML = '<svg width="12" height="12"><g><path stroke-width="1" stroke-opacity="1" d="M6 0L6 12M0 6L12 6" stroke="#009DFF"></path></g></svg>';
-        this.renderer.div.appendChild(centerDiv);
+        this._centerDiv = document.createElement("div");
+        this._centerDiv.className = "ogCenterIcon";
+        this._centerDiv.innerHTML =
+            '<svg width="12" height="12"><g><path stroke-width="1" stroke-opacity="1" d="M6 0L6 12M0 6L12 6" stroke="#009DFF"></path></g></svg>';
+        this.renderer.div.appendChild(this._centerDiv);
 
         if (this._center) {
             this.renderer.activeCamera.events.on("moveend", this._grabCoordinates, this);
-            centerDiv.style.display = "block";
+            this._centerDiv.style.display = "block";
         } else {
             this.renderer.events.on("mousemove", this._onMouseMove, this);
-            centerDiv.style.display = "none";
+            this._centerDiv.style.display = "none";
         }
-
     }
 
     /**
@@ -158,19 +168,28 @@ class EarthCoordinates extends Control {
             if (center) {
                 this.renderer.events.off("mousemove", this._onMouseMove);
                 this.renderer.activeCamera.events.on("moveend", this._grabCoordinates, this);
-                centerDiv.style.display = "block";
+                this._centerDiv.style.display = "block";
             } else {
                 this.renderer.events.off("draw", this._draw);
                 this.renderer.events.on("mousemove", this._onMouseMove, this);
-                centerDiv.style.display = "none";
+                this._centerDiv.style.display = "none";
             }
         }
     }
 
     _showPosition() {
         if (this.position) {
-            this.position.height = ((this.position.height > 10000 || this.position.height < -10000) ? 0 : this.position.height);
-            this._display.innerHTML = "Lat/Lon: " + this._converter(this.position) + " h(m): " + (this.position.height > 0 ? "~" + (Math.round(this.position.height) / 1000).toFixed(3) * 1000 : "-");
+            this.position.height =
+                this.position.height > 10000 || this.position.height < -10000
+                    ? 0
+                    : this.position.height;
+            this._display.innerHTML =
+                "Lat/Lon: " +
+                this._converter(this.position) +
+                " h(m): " +
+                (this.position.height > 0
+                    ? "~" + (Math.round(this.position.height) / 1000).toFixed(3) * 1000
+                    : "-");
         } else {
             this._display.innerHTML = "Lat/Lon: " + "_____________________";
         }
@@ -185,17 +204,19 @@ class EarthCoordinates extends Control {
     _onMouseMove() {
         var r = this.renderer;
         var ms = r.events.mouseState;
-        if (!(ms.leftButtonDown || ms.rightButtonDown) &&
+        if (
+            !(ms.leftButtonDown || ms.rightButtonDown) &&
             r.controlsBag.scaleRot <= 0 &&
-            !r.activeCamera._flying) {
+            !r.activeCamera._flying
+        ) {
             this.position = this.planet.getLonLatFromPixelTerrain(ms, true);
             this._showPosition();
         }
     }
-};
+}
 
 export function earthCoordinates(options) {
     return new EarthCoordinates(options);
-};
+}
 
 export { EarthCoordinates };