@openglobus/og 0.11.1 → 0.11.6

package/src/og/control/EarthNavigation.js

@@ -1,15 +1,28 @@
 "use strict";
 
-import * as math from "../math.js";
-import { Control } from "./Control.js";
-import { input } from "../input/input.js";
-import { Key } from "../Lock.js";
+import { Sphere } from "../bv/Sphere.js";
 import { LonLat } from "../LonLat.js";
-import { Mat4 } from "../math/Mat4.js";
 import { Quat } from "../math/Quat.js";
 import { Ray } from "../math/Ray.js";
-import { Sphere } from "../bv/Sphere.js";
 import { Vec3 } from "../math/Vec3.js";
+import { Control } from "./Control.js";
+
+class Touch {
+    constructor() {
+        this.x = 0;
+        this.y = 0;
+        this.prev_x = 0;
+        this.prev_y = 0;
+        this.grabbedPoint = new Vec3();
+        this.grabbedSpheroid = new Sphere();
+        this.dX = function () {
+            return this.x - this.prev_x;
+        };
+        this.dY = function () {
+            return this.y - this.prev_y;
+        };
+    }
+}
 
 class EarthNavigation extends Control {
     constructor(options) {
@@ -33,21 +46,6 @@ class EarthNavigation extends Control {
             { h: 500000, max: 0.99, min: -0.99 }
         ];
 
-        var Touch = function () {
-            this.x = 0;
-            this.y = 0;
-            this.prev_x = 0;
-            this.prev_y = 0;
-            this.grabbedPoint = new Vec3();
-            this.grabbedSpheroid = new Sphere();
-            this.dX = function () {
-                return this.x - this.prev_x;
-            };
-            this.dY = function () {
-                return this.y - this.prev_y;
-            };
-        };
-
         this.touches = [new Touch(), new Touch()];
     }
 
@@ -70,7 +68,7 @@ class EarthNavigation extends Control {
 
         var ll = this.renderer.activeCamera._lonLat;
 
-        globus.planet.flyLonLat(new LonLat(ll.lon, ll.lat, this.positionState[this.currState].h));
+        this.planet.flyLonLat(new LonLat(ll.lon, ll.lat, this.positionState[this.currState].h));
     }
 
     onMouseWheel(event) {

package/src/og/control/GeoImageDragControl.js

@@ -71,6 +71,6 @@ class GeoImageDragControl extends Control {
             }, this);
         }
     }
-};
+}
 
 export { GeoImageDragControl };

package/src/og/control/KeyboardNavigation.js

@@ -2,17 +2,17 @@
  * @module og/control/KeyboardNavigation
  */
 
-'use strict';
+"use strict";
 
-import * as math from '../math.js';
-import { Control } from './Control.js';
-import { input } from '../input/input.js';
-import { Vec3 } from '../math/Vec3.js';
+import * as math from "../math.js";
+import { Control } from "./Control.js";
+import { input } from "../input/input.js";
+import { Vec3 } from "../math/Vec3.js";
 
 /**
  * Planet camera keyboard navigation. Use W,S,A,D and left shift key for fly around a planet.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 
@@ -69,7 +69,7 @@ class KeyboardNavigation extends Control {
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
             cam.pitch(15 / this.renderer.handler.deltaTime);
         } else {
-            cam.rotateVertical(cam._lonLat.height / 3000000 * math.RADIANS, Vec3.ZERO);
+            cam.rotateVertical((cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
         }
         cam.update();
     }
@@ -79,7 +79,7 @@ class KeyboardNavigation extends Control {
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
             cam.pitch(-15 / this.renderer.handler.deltaTime);
         } else {
-            cam.rotateVertical(-cam._lonLat.height / 3000000 * math.RADIANS, Vec3.ZERO);
+            cam.rotateVertical((-cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
         }
         cam.update();
     }
@@ -89,7 +89,7 @@ class KeyboardNavigation extends Control {
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
             cam.yaw(15 / this.renderer.handler.deltaTime);
         } else {
-            cam.rotateHorizontal(cam._lonLat.height / 3000000 * math.RADIANS, false, Vec3.ZERO);
+            cam.rotateHorizontal((cam._lonLat.height / 3000000) * math.RADIANS, false, Vec3.ZERO);
         }
         cam.update();
     }
@@ -99,7 +99,7 @@ class KeyboardNavigation extends Control {
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
             cam.yaw(-15 / this.renderer.handler.deltaTime);
         } else {
-            cam.rotateHorizontal(-cam._lonLat.height / 3000000 * math.RADIANS, false, Vec3.ZERO);
+            cam.rotateHorizontal((-cam._lonLat.height / 3000000) * math.RADIANS, false, Vec3.ZERO);
         }
         cam.update();
     }
@@ -113,10 +113,10 @@ class KeyboardNavigation extends Control {
         this.renderer.activeCamera.roll(15 / this.renderer.handler.deltaTime);
         this.renderer.activeCamera.update();
     }
-};
+}
 
 export function keyboardNavigation(options) {
     return new KeyboardNavigation(options);
-};
+}
 
 export { KeyboardNavigation };

package/src/og/control/LayerSwitcher.js

@@ -2,14 +2,14 @@
  * @module og/control/LayerSwitcher
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
+import { Control } from "./Control.js";
 
 /**
  * Simple(OpenLayers like)layer switcher, includes base layers, overlays, geo images etc. groups.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 class LayerSwitcher extends Control {
@@ -48,7 +48,7 @@ class LayerSwitcher extends Control {
                 this.addSwitcher("checkbox", layer, this.overlaysDiv, this._id);
             }
         }
-    };
+    }
 
     onLayerRemoved(layer) {
         layer._removeCallback();
@@ -56,16 +56,16 @@ class LayerSwitcher extends Control {
     }
 
     addSwitcher(type, obj, container, id) {
-        var lineDiv = document.createElement('div');
+        var lineDiv = document.createElement("div");
 
         var that = this;
-        var center = document.createElement('div');
-        center.classList.add('ogViewExtentBtn');
+        var center = document.createElement("div");
+        center.classList.add("ogViewExtentBtn");
         center.onclick = function () {
             that.planet.flyExtent(obj.getExtent());
         };
 
-        var inp = document.createElement('input');
+        var inp = document.createElement("input");
         inp.type = type;
         inp.name = "ogBaseLayerRadiosId" + (id || "");
         inp.checked = obj.getVisibility();
@@ -74,11 +74,12 @@ class LayerSwitcher extends Control {
             obj.setVisibility(this.checked);
         };
 
-        obj.events && obj.events.on("visibilitychange", function (e) {
-            inp.checked = e.getVisibility();
-        });
+        obj.events &&
+            obj.events.on("visibilitychange", function (e) {
+                inp.checked = e.getVisibility();
+            });
 
-        var lbl = document.createElement('label');
+        var lbl = document.createElement("label");
         lbl.className = "ogLayerSwitcherLabel";
         lbl.innerHTML = (obj.name || obj.src || "noname") + "</br>";
 
@@ -94,35 +95,35 @@ class LayerSwitcher extends Control {
     }
 
     createBaseLayersContainer() {
-        var layersDiv = document.createElement('div');
+        var layersDiv = document.createElement("div");
         layersDiv.className = "layersDiv";
         this.dialog.appendChild(layersDiv);
 
-        var baseLayersLbl = document.createElement('div');
+        var baseLayersLbl = document.createElement("div");
         baseLayersLbl.className = "layersDiv";
         baseLayersLbl.innerHTML = "Base Layer";
         layersDiv.appendChild(baseLayersLbl);
 
-        this.baseLayersDiv = document.createElement('div');
+        this.baseLayersDiv = document.createElement("div");
         layersDiv.appendChild(this.baseLayersDiv);
     }
 
     createOverlaysContainer() {
-        var overlaysDiv = document.createElement('div');
+        var overlaysDiv = document.createElement("div");
         overlaysDiv.className = "layersDiv";
         this.dialog.appendChild(overlaysDiv);
 
-        var overlaysLbl = document.createElement('div');
+        var overlaysLbl = document.createElement("div");
         overlaysLbl.className = "layersDiv";
         overlaysLbl.innerHTML = "Overlays";
         overlaysDiv.appendChild(overlaysLbl);
 
-        this.overlaysDiv = document.createElement('div');
+        this.overlaysDiv = document.createElement("div");
         overlaysDiv.appendChild(this.overlaysDiv);
     }
 
     createDialog() {
-        this.dialog = document.createElement('div');
+        this.dialog = document.createElement("div");
         this.dialog.id = "ogLayerSwitcherDialog";
         this.dialog.className = "displayNone";
         this.renderer.div.appendChild(this.dialog);
@@ -138,8 +139,8 @@ class LayerSwitcher extends Control {
     }
 
     createSwitcher() {
-        var button = document.createElement('div');
-        button.className = 'ogLayerSwitcherButton';
+        var button = document.createElement("div");
+        button.className = "ogLayerSwitcherButton";
         button.id = "ogLayerSwitcherButtonMaximize";
         var that = this;
         button.onclick = function (e) {
@@ -153,6 +154,6 @@ class LayerSwitcher extends Control {
         };
         this.renderer.div.appendChild(button);
     }
-};
+}
 
-export { LayerSwitcher };
+export { LayerSwitcher };

package/src/og/control/Lighting.js

@@ -115,7 +115,7 @@ const TEMPLATE = `<div class="og-lighing">
 /**
  * Helps to setup lighting.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] -
  */
 class Lighting extends Control {

package/src/og/control/MouseNavigation.js

@@ -18,7 +18,7 @@ import { Vec3 } from "../math/Vec3.js";
 /**
  * Mouse planet camera dragging control.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 class MouseNavigation extends Control {

package/src/og/control/ScaleControl.js

@@ -21,7 +21,7 @@ const TEMPLATE = `<div class="og-scale-container">
 /**
  * Planet zoom buttons control.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @params {Object} [options] - Control options.
  */
 class ScaleControl extends Control {

package/src/og/control/SegmentBoundVisualization.js

@@ -1,13 +1,13 @@
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { EntityCollection } from '../entity/EntityCollection.js';
-import { Entity } from '../entity/Entity.js';
+import { Control } from "./Control.js";
+import { EntityCollection } from "../entity/EntityCollection.js";
+import { Entity } from "../entity/Entity.js";
 
 /**
  * Frame per second(FPS) display control.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 class SegmentBoundVisualization extends Control {
@@ -18,7 +18,6 @@ class SegmentBoundVisualization extends Control {
     }
 
     oninit() {
-
         this.planet.addEntityCollection(this._boundingSphereCollection);
 
         this.renderer.events.on("draw", this._predraw, this);
@@ -28,7 +27,7 @@ class SegmentBoundVisualization extends Control {
     _predraw() {
         this._boundingSphereCollection.clear();
     }
-    
+
     _draw() {
         for (let i = 0; i < this.planet._renderedNodes.length; i++) {
             let si = this.planet._renderedNodes[i].segment;
@@ -46,10 +45,10 @@ class SegmentBoundVisualization extends Control {
             this._boundingSphereCollection.add(si._sphereEntity);
         }
     }
-};
+}
 
 export function segmentBoundVisualization(options) {
     return new SegmentBoundVisualization(options);
-};
+}
 
 export { SegmentBoundVisualization };

package/src/og/control/ShowFps.js

@@ -2,15 +2,15 @@
  * @module og/control/ShowFps
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { print2d } from '../utils/shared.js';
+import { Control } from "./Control.js";
+import { print2d } from "../utils/shared.js";
 
 /**
  * Frame per second(FPS) display control.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 class ShowFps extends Control {
@@ -19,20 +19,25 @@ class ShowFps extends Control {
     }
 
     oninit() {
-        var d = document.createElement('div');
-        d.className = 'defaultText ';
+        var d = document.createElement("div");
+        d.className = "defaultText ";
         d.id = "ogShowFpsControl";
         document.body.appendChild(d);
         this.renderer.events.on("draw", this._draw, this);
     }
-    
+
     _draw() {
-        print2d("ogShowFpsControl", (1000.0 / this.renderer.handler.deltaTime).toFixed(1), this.renderer.handler.canvas.clientWidth - 60, 0);
+        print2d(
+            "ogShowFpsControl",
+            (1000.0 / this.renderer.handler.deltaTime).toFixed(1),
+            this.renderer.handler.canvas.clientWidth - 60,
+            0
+        );
     }
-};
+}
 
 export function showFps(options) {
     return new ShowFps(options);
-};
+}
 
 export { ShowFps };

package/src/og/control/SimpleNavigation.js

@@ -1,12 +1,12 @@
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { input } from '../input/input.js';
+import { Control } from "./Control.js";
+import { input } from "../input/input.js";
 
 /**
  * Simple keyboard camera navigation with W,S,A,D and shift keys to fly around the scene.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 class SimpleNavigation extends Control {
@@ -18,11 +18,9 @@ class SimpleNavigation extends Control {
         this.speed = options.speed || 1.0;
     }
 
-    onactivate() {
-    }
+    onactivate() {}
 
-    ondeactivate() {
-    }
+    ondeactivate() {}
 
     oninit() {
         this.camera = this.renderer.activeCamera;
@@ -117,13 +115,13 @@ class SimpleNavigation extends Control {
             cam.update();
         }
     }
-};
+}
 
 /**
  * Creates simple navigation control instance.
  */
 export function simpleNavigation(options) {
     return new SimpleNavigation(options);
-};
+}
 
 export { SimpleNavigation };

package/src/og/control/Sun.js

@@ -2,19 +2,19 @@
  * @module og/control/Sun
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { getSunPosition } from '../astro/earth.js';
-import { LightSource } from '../light/LightSource.js';
-import { Quat } from '../math/Quat.js';
-import { Vec3 } from '../math/Vec3.js';
+import { Control } from "./Control.js";
+import { getSunPosition } from "../astro/earth.js";
+import { LightSource } from "../light/LightSource.js";
+import { Quat } from "../math/Quat.js";
+import { Vec3 } from "../math/Vec3.js";
 
 const ACTIVATION_HEIGHT = 12079000.0;
 /**
  * Real Sun geocentric position control that place the Sun on the right place by the Earth.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 class Sun extends Control {
@@ -28,7 +28,7 @@ class Sun extends Control {
         /**
          * Earth planet node.
          * @public
-         * @type {og.scene.Planet}
+         * @type {Planet}
          */
         this.planet = null;
 
@@ -46,7 +46,7 @@ class Sun extends Control {
         /**
          * Light source.
          * @public
-         * @type {og.LightSource}
+         * @type {LightSource}
          */
         this.sunlight = null;
 
@@ -72,7 +72,6 @@ class Sun extends Control {
     }
 
     oninit() {
-
         this.planet.lightEnabled = true;
 
         // sunlight initialization
@@ -120,12 +119,17 @@ class Sun extends Control {
                 }
 
                 var tu = Vec3.proj_b_to_plane(u, n, u).normalize().scale(this.offsetVertical);
-                var tr = Vec3.proj_b_to_plane(cam._u, n, cam._u).normalize().scale(this.offsetHorizontal); // right
+                var tr = Vec3.proj_b_to_plane(cam._u, n, cam._u)
+                    .normalize()
+                    .scale(this.offsetHorizontal); // right
                 var d = tu.add(tr);
                 var pos = cam.eye.add(d);
                 if (this._k > 0) {
                     this._k -= 0.01;
-                    let rot = Quat.getRotationBetweenVectors(this.sunlight._position.normal(), pos.normal());
+                    let rot = Quat.getRotationBetweenVectors(
+                        this.sunlight._position.normal(),
+                        pos.normal()
+                    );
                     let r = rot.slerp(Quat.IDENTITY, this._k).normalize();
                     this.sunlight.setPosition3v(r.mulVec3(this.sunlight._position));
                 } else {
@@ -135,11 +139,17 @@ class Sun extends Control {
                 this._k = 1;
                 if (this._f > 0) {
                     this._f -= 0.01;
-                    let rot = Quat.getRotationBetweenVectors(this.sunlight._position.normal(), getSunPosition(this._currDate).normal());
+                    let rot = Quat.getRotationBetweenVectors(
+                        this.sunlight._position.normal(),
+                        getSunPosition(this._currDate).normal()
+                    );
                     let r = rot.slerp(Quat.IDENTITY, this._f).normalize();
                     this.sunlight.setPosition3v(r.mulVec3(this.sunlight._position));
                 } else {
-                    if ((Math.abs(this._currDate - this._prevDate) > 0.00034 && this._active) || this._lightOn) {
+                    if (
+                        (Math.abs(this._currDate - this._prevDate) > 0.00034 && this._active) ||
+                        this._lightOn
+                    ) {
                         this._lightOn = false;
                         this._prevDate = this._currDate;
                         this.sunlight.setPosition3v(getSunPosition(this._currDate));
@@ -157,4 +167,4 @@ export function sun(options) {
     return Sun(options);
 }
 
-export { Sun };
+export { Sun };

package/src/og/control/ToggleWireframe.js

@@ -2,15 +2,15 @@
  * @module og/control/ToggleWireframe
  */
 
-'use strict';
+"use strict";
 
-import { Control } from './Control.js';
-import { input } from '../input/input.js';
+import { Control } from "./Control.js";
+import { input } from "../input/input.js";
 
 /**
  * Planet GL draw mode(TRIANGLE_STRIP/LINE_STRING) changer.
  * @class
- * @extends {og.control.Control}
+ * @extends {Control}
  * @param {Object} [options] - Control options.
  */
 class ToggleWireframe extends Control {
@@ -33,6 +33,6 @@ class ToggleWireframe extends Control {
             this.planet.setDrawMode(this.renderer.handler.gl.LINE_STRIP);
         }
     }
-};
+}
 
 export { ToggleWireframe };