@openglobus/og 0.13.5 → 0.13.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.13.5",
+  "version": "0.13.6",
   "description": "[OpenGlobus](http://www.openglobus.org/) is a javascript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers and 3d objects. It uses the WebGL technology, open source and completely free.",
   "directories": {
     "example": "./sandbox"

package/src/og/Events.js

@@ -1,188 +1,188 @@
-/**
- * @module og/Events
- */
-
-"use strict";
-
-import { stamp, binaryInsert } from "./utils/shared.js";
-
-/**
- * Base events class to handle custom events.
- * @class
- */
-class Events {
-    /**
-     *
-     * @param {Array.<string>} [eventNames] - Event names that could be dispatched.
-     * @param {*} [sender]
-     */
-    constructor(eventNames, sender) {
-        /**
-         * Registered event names.
-         * @protected
-         * @type {Array.<string>}
-         */
-        this._eventNames = [];
-
-        eventNames && this.registerNames(eventNames);
-
-        this._sender = sender || this;
-
-        /**
-         * Stop propagation flag
-         * @protected
-         * @type {boolean}
-         */
-        this._stopPropagation = false;
-
-        this._stampCache = {};
-
-        this.__id = Events._staticCounter++;
-    }
-
-    static get _staticCounter() {
-        if (!this.__counter__ && this.__counter__ !== 0) {
-            this.__counter__ = 0;
-        }
-        return this.__counter__;
-    }
-
-    static set _staticCounter(n) {
-        this.__counter__ = n;
-    }
-
-    bindSender(sender) {
-        this._sender = sender || this;
-    }
-
-    /**
-     * Function that creates event object properties that would be dispatched.
-     * @public
-     * @param {Array.<string>} eventNames - Specified event names list.
-     */
-    registerNames(eventNames) {
-        for (var i = 0; i < eventNames.length; i++) {
-            this[eventNames[i]] = { active: true, handlers: [] };
-            this._eventNames.push(eventNames[i]);
-        }
-    }
-
-    _getStamp(name, id, ogid) {
-        return `${name}_${id}_${ogid}`;
-    }
-
-    /**
-     * Returns true if event callback has stamped.
-     * @protected
-     * @param {Object} name - Event identifier.
-     * @param {Object} obj - Event callback.
-     * @return {boolean} -
-     */
-    _stamp(name, obj) {
-        var ogid = stamp(obj);
-
-        var st = this._getStamp(name, this.__id, ogid);
-
-        if (!this._stampCache[st]) {
-            this._stampCache[st] = ogid;
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Attach listener.
-     * @public
-     * @param {string} name - Event name to listen.
-     * @param {eventCallback} callback - Event callback function.
-     * @param {Object} sender - Event callback function owner.
-     */
-    on(name, callback, sender, priority = 0) {
-        if (this._stamp(name, callback)) {
-            if (this[name]) {
-                let c = callback.bind(sender || this._sender);
-                c._openglobus_id = callback._openglobus_id;
-                c._openglobus_priority = priority;
-                binaryInsert(this[name].handlers, c, (a, b) => {
-                    return b._openglobus_priority - a._openglobus_priority;
-                });
-            }
-        }
-    }
-
-    /**
-     * Stop listening event name with specified callback function.
-     * @public
-     * @param {string} name - Event name.
-     * @param {eventCallback} callback - Attached  event callback.
-     */
-    off(name, callback) {
-        if (callback) {
-            var st = this._getStamp(name, this.__id, callback._openglobus_id);
-            if (callback._openglobus_id && this._stampCache[st]) {
-                var h = this[name].handlers;
-                var i = h.length;
-                var indexToRemove = -1;
-                while (i--) {
-                    var hi = h[i];
-                    if (hi._openglobus_id === callback._openglobus_id) {
-                        indexToRemove = i;
-                        break;
-                    }
-                }
-
-                if (indexToRemove !== -1) {
-                    h.splice(indexToRemove, 1);
-                    this._stampCache[st] = undefined;
-                    delete this._stampCache[st];
-                }
-            }
-        }
-    }
-
-    /**
-     * Dispatch event.
-     * @public
-     * @param {Object} event - Event instance property that created by event name.
-     * @param {Object} [obj] - Event object.
-     */
-    dispatch(event, ...args) {
-        let result = true;
-        if (event && event.active && !this._stopPropagation) {
-            let h = event.handlers,
-                i = h.length;
-            while (i--) {
-                if (h[i](...args) === false) {
-                    result = false;
-                }
-            }
-        }
-        this._stopPropagation = false;
-        return result;
-    }
-
-    /**
-     * Brakes events propagation.
-     * @public
-     */
-    stopPropagation() {
-        this._stopPropagation = true;
-    }
-
-    /**
-     * Removes all events.
-     * @public
-     */
-    clear() {
-        for (var i = 0; i < this._eventNames.length; i++) {
-            var e = this[this._eventNames[i]];
-            e.handlers.length = 0;
-            e.handlers = [];
-        }
-        this._eventNames.length = 0;
-        this._eventNames = [];
-    }
-}
-
-export { Events };
+/**
+ * @module og/Events
+ */
+
+"use strict";
+
+import { stamp, binaryInsert } from "./utils/shared.js";
+
+/**
+ * Base events class to handle custom events.
+ * @class
+ */
+class Events {
+    /**
+     *
+     * @param {Array.<string>} [eventNames] - Event names that could be dispatched.
+     * @param {*} [sender]
+     */
+    constructor(eventNames, sender) {
+        /**
+         * Registered event names.
+         * @protected
+         * @type {Array.<string>}
+         */
+        this._eventNames = [];
+
+        eventNames && this.registerNames(eventNames);
+
+        this._sender = sender || this;
+
+        /**
+         * Stop propagation flag
+         * @protected
+         * @type {boolean}
+         */
+        this._stopPropagation = false;
+
+        this._stampCache = {};
+
+        this.__id = Events._staticCounter++;
+    }
+
+    static get _staticCounter() {
+        if (!this.__counter__ && this.__counter__ !== 0) {
+            this.__counter__ = 0;
+        }
+        return this.__counter__;
+    }
+
+    static set _staticCounter(n) {
+        this.__counter__ = n;
+    }
+
+    bindSender(sender) {
+        this._sender = sender || this;
+    }
+
+    /**
+     * Function that creates event object properties that would be dispatched.
+     * @public
+     * @param {Array.<string>} eventNames - Specified event names list.
+     */
+    registerNames(eventNames) {
+        for (var i = 0; i < eventNames.length; i++) {
+            this[eventNames[i]] = { active: true, handlers: [] };
+            this._eventNames.push(eventNames[i]);
+        }
+    }
+
+    _getStamp(name, id, ogid) {
+        return `${name}_${id}_${ogid}`;
+    }
+
+    /**
+     * Returns true if event callback has stamped.
+     * @protected
+     * @param {Object} name - Event identifier.
+     * @param {Object} obj - Event callback.
+     * @return {boolean} -
+     */
+    _stamp(name, obj) {
+        var ogid = stamp(obj);
+
+        var st = this._getStamp(name, this.__id, ogid);
+
+        if (!this._stampCache[st]) {
+            this._stampCache[st] = ogid;
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Attach listener.
+     * @public
+     * @param {string} name - Event name to listen.
+     * @param {eventCallback} callback - Event callback function.
+     * @param {Object} sender - Event callback function owner.
+     */
+    on(name, callback, sender, priority = 0) {
+        if (this._stamp(name, callback)) {
+            if (this[name]) {
+                let c = callback.bind(sender || this._sender);
+                c._openglobus_id = callback._openglobus_id;
+                c._openglobus_priority = priority;
+                binaryInsert(this[name].handlers, c, (a, b) => {
+                    return b._openglobus_priority - a._openglobus_priority;
+                });
+            }
+        }
+    }
+
+    /**
+     * Stop listening event name with specified callback function.
+     * @public
+     * @param {string} name - Event name.
+     * @param {eventCallback} callback - Attached  event callback.
+     */
+    off(name, callback) {
+        if (callback) {
+            var st = this._getStamp(name, this.__id, callback._openglobus_id);
+            if (callback._openglobus_id && this._stampCache[st]) {
+                var h = this[name].handlers;
+                var i = h.length;
+                var indexToRemove = -1;
+                while (i--) {
+                    var hi = h[i];
+                    if (hi._openglobus_id === callback._openglobus_id) {
+                        indexToRemove = i;
+                        break;
+                    }
+                }
+
+                if (indexToRemove !== -1) {
+                    h.splice(indexToRemove, 1);
+                    this._stampCache[st] = undefined;
+                    delete this._stampCache[st];
+                }
+            }
+        }
+    }
+
+    /**
+     * Dispatch event.
+     * @public
+     * @param {Object} event - Event instance property that created by event name.
+     * @param {Object} [obj] - Event object.
+     */
+    dispatch(event, ...args) {
+        let result = true;
+        if (event && event.active && !this._stopPropagation) {
+            let h = event.handlers.slice(0),
+                i = h.length;
+            while (i--) {
+                if (h[i](...args) === false) {
+                    result = false;
+                }
+            }
+        }
+        this._stopPropagation = false;
+        return result;
+    }
+
+    /**
+     * Brakes events propagation.
+     * @public
+     */
+    stopPropagation() {
+        this._stopPropagation = true;
+    }
+
+    /**
+     * Removes all events.
+     * @public
+     */
+    clear() {
+        for (var i = 0; i < this._eventNames.length; i++) {
+            var e = this[this._eventNames[i]];
+            e.handlers.length = 0;
+            e.handlers = [];
+        }
+        this._eventNames.length = 0;
+        this._eventNames = [];
+    }
+}
+
+export { Events };

package/src/og/Globe.js

@@ -8,6 +8,7 @@ import { CompassButton } from "./control/CompassButton.js";
 import { EarthCoordinates } from "./control/EarthCoordinates.js";
 import { EarthNavigation } from "./control/EarthNavigation.js";
 import { MouseNavigation } from "./control/MouseNavigation.js";
+import { KeyboardNavigation } from "./control/KeyboardNavigation.js";
 import { ScaleControl } from "./control/ScaleControl.js";
 import { Sun } from "./control/Sun.js";
 import { TouchNavigation } from "./control/TouchNavigation.js";

package/src/og/control/KeyboardNavigation.js

@@ -24,16 +24,22 @@ class KeyboardNavigation extends Control {
     }
 
     oninit() {
+        this.renderer.events.on("keypress", input.KEY_PGUP, this.onCameraMoveForward, this);
+        this.renderer.events.on("keypress", input.KEY_PGDN, this.onCameraMoveBackward, this);
+        this.renderer.events.on("keypress", input.KEY_PLUS, this.onCameraMoveForward, this);
+        this.renderer.events.on("keypress", input.KEY_EQUALS, this.onCameraMoveForward, this);
+        this.renderer.events.on("keypress", input.KEY_MINUS, this.onCameraMoveBackward, this);
         this.renderer.events.on("keypress", input.KEY_W, this.onCameraMoveForward, this);
         this.renderer.events.on("keypress", input.KEY_S, this.onCameraMoveBackward, this);
         this.renderer.events.on("keypress", input.KEY_A, this.onCameraStrifeLeft, this);
         this.renderer.events.on("keypress", input.KEY_D, this.onCameraStrifeRight, this);
         this.renderer.events.on("keypress", input.KEY_UP, this.onCameraLookUp, this);
         this.renderer.events.on("keypress", input.KEY_DOWN, this.onCameraLookDown, this);
-        this.renderer.events.on("keypress", input.KEY_LEFT, this.onCameraTurnLeft, this);
-        this.renderer.events.on("keypress", input.KEY_RIGHT, this.onCameraTurnRight, this);
+        this.renderer.events.on("keypress", input.KEY_LEFT, this.onCameraLookLeft, this);
+        this.renderer.events.on("keypress", input.KEY_RIGHT, this.onCameraLookRight, this);
         this.renderer.events.on("keypress", input.KEY_Q, this.onCameraRollLeft, this);
         this.renderer.events.on("keypress", input.KEY_E, this.onCameraRollRight, this);
+        this.renderer.events.on("keypress", input.KEY_N, this.onCameraRollNorth, this);
     }
 
     onCameraMoveForward(event) {
@@ -84,6 +90,26 @@ class KeyboardNavigation extends Control {
         cam.update();
     }
 
+    onCameraLookLeft(event) {
+        var cam = this.renderer.activeCamera;
+        if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
+            cam.roll(15 / this.renderer.handler.deltaTime);
+        } else {
+            cam.rotateHorizontal((cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
+        }
+        cam.update();
+    }
+
+    onCameraLookRight(event) {
+        var cam = this.renderer.activeCamera;
+        if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
+            cam.roll(-15 / this.renderer.handler.deltaTime);
+        } else {
+            cam.rotateHorizontal((-cam._lonLat.height / 3000000) * math.RADIANS, Vec3.ZERO);
+        }
+        cam.update();
+    }
+
     onCameraTurnLeft(event) {
         var cam = this.renderer.activeCamera;
         if (this.renderer.events.isKeyPressed(input.KEY_SHIFT)) {
@@ -104,6 +130,26 @@ class KeyboardNavigation extends Control {
         cam.update();
     }
 
+    // from CompassButton._onClick()
+    onCameraRollNorth(event) {
+      let c = this.planet.getCartesianFromPixelTerrain(this.renderer.handler.getCenter());
+      if (c) {
+        this.planet.flyCartesian(
+          c.normal().scaleTo(c.length() + c.distance(this.planet.camera.eye)),
+          null,
+          null,
+          0,
+          null,
+          null,
+          () => {
+            this.planet.camera.look(c);
+          }
+          );
+      } else {
+        this.planet.flyCartesian(this.planet.camera.eye);
+      }
+    }
+
     onCameraRollLeft(event) {
         this.renderer.activeCamera.roll(-15 / this.renderer.handler.deltaTime);
         this.renderer.activeCamera.update();

package/src/og/control/TouchNavigation.js

@@ -83,13 +83,13 @@ class TouchNavigation extends Control {
             t0.y = e.sys.touches.item(0).clientY - e.sys.offsetTop;
             t0.prev_x = e.sys.touches.item(0).clientX - e.sys.offsetLeft;
             t0.prev_y = e.sys.touches.item(0).clientY - e.sys.offsetTop;
-            t0.grabbedPoint = this.planet.getCartesianFromPixelTerrain(t0, true);
+            t0.grabbedPoint = this.planet.getCartesianFromPixelTerrain(e, true);
 
             t1.x = e.sys.touches.item(1).clientX - e.sys.offsetLeft;
             t1.y = e.sys.touches.item(1).clientY - e.sys.offsetTop;
             t1.prev_x = e.sys.touches.item(1).clientX - e.sys.offsetLeft;
             t1.prev_y = e.sys.touches.item(1).clientY - e.sys.offsetTop;
-            t1.grabbedPoint = this.planet.getCartesianFromPixelTerrain(t1, true);
+            t1.grabbedPoint = this.planet.getCartesianFromPixelTerrain(e, true);
 
             // this.planet._viewChanged = true;
             this.pointOnEarth = this.planet.getCartesianFromPixelTerrain(
@@ -119,7 +119,7 @@ class TouchNavigation extends Control {
         t.prev_x = e.sys.touches.item(0).clientX - e.sys.offsetLeft;
         t.prev_y = e.sys.touches.item(0).clientY - e.sys.offsetTop;
 
-        t.grabbedPoint = this.planet.getCartesianFromPixelTerrain(t, true);
+        t.grabbedPoint = this.planet.getCartesianFromPixelTerrain(e, true);
         this._eye0.copy(this.renderer.activeCamera.eye);
 
         if (t.grabbedPoint) {
@@ -142,7 +142,8 @@ class TouchNavigation extends Control {
 
         this.planet.stopFlying();
         this.stopRotation();
-        var p = this.planet.getCartesianFromPixelTerrain(this.touches[0], true);
+
+        var p = this.planet.getCartesianFromPixelTerrain(e);
         if (p) {
             var g = this.planet.ellipsoid.cartesianToLonLat(p);
             this.planet.flyLonLat(
@@ -199,11 +200,6 @@ class TouchNavigation extends Control {
             // distance < 0 --> zoomIn; distance > 0 --> zoomOut
             var t0t1Distance = Math.abs(t0.prev_x - t1.prev_x) + Math.abs(t0.prev_y - t1.prev_y)  - (Math.abs(t0.x - t1.x)  + Math.abs(t0.y - t1.y))
             var _move = 0
-            var _targetPoint = this.renderer.getCenter()
-            var d =
-                cam.eye.distance(
-                    this.planet.getCartesianFromPixelTerrain(_targetPoint, true)
-                ) * 0.075;
             if (t0t1Distance < 0) {
                 _move = 1
             }
@@ -211,9 +207,13 @@ class TouchNavigation extends Control {
                 _move = -1
             }
             if (_move !== 0) {
-                cam.eye.addA(cam.getForward().scale(_move * d));
-                cam.checkTerrainCollision();
-                cam.update();
+                let pos = this.planet.getCartesianFromPixelTerrain(e);
+                if (pos) {
+                    let d = cam.eye.distance(pos) * 0.075;
+                    cam.eye.addA(cam.getForward().scale(_move * d));
+                    cam.checkTerrainCollision();
+                    cam.update();
+                }
             }
 
             if (
@@ -246,7 +246,7 @@ class TouchNavigation extends Control {
 
             this.planet.stopFlying();
 
-            var direction = cam.unproject(t.x, t.y);
+            var direction = e.direction
             var targetPoint = new Ray(cam.eye, direction).hitSphere(t.grabbedSpheroid);
 
             if (targetPoint) {

package/src/og/control/ZoomControl.js

@@ -114,7 +114,7 @@ class ZoomControl extends Control {
         var cam = this.renderer.activeCamera;
 
         if (this._move !== 0) {
-            let pos = this.planet.getCartesianFromPixelTerrain(this._targetPoint);
+            let pos = this.planet.getCartesianFromPixelTerrain(e);
             if (pos) {
                 let d = cam.eye.distance(pos) * 0.035;
                 cam.eye.addA(cam.getForward().scale(this._move * d));

package/src/og/ellipsoid/Ellipsoid.js

@@ -536,7 +536,7 @@ class Ellipsoid {
 
             let eps = Math.abs(qw2 - product);
 
-            if (eps > math.EPSILON10 && qw2 < product) {
+            if (eps > math.EPSILON15 && qw2 < product) {
                 // Imaginary roots (0 intersections).
                 return null;
             } else if (qw2 > product) {

package/src/og/entity/LabelHandler.js

@@ -385,14 +385,14 @@ class LabelHandler extends BillboardHandler {
         if (isRTL) {
             _rtl_ = RTL;
         }
-        let n = fa.get(text[c].charCodeAt());
+        
         let offset = 0.0;
         let kern = fa.kernings;
 
         for (c = 0; c < len; c++) {
             let j = i + c * 24;
             let char = text[c];
-            n = fa.get(char.charCodeAt()) || fa.get(" ".charCodeAt());
+            let n = fa.get(char.charCodeAt()) || fa.get(" ".charCodeAt());
             let tc = n.texCoords;
 
             let m = n.metrics;

package/src/og/input/input.js

@@ -9,11 +9,14 @@ export const input = {
     KEY_ALT: 18,
     KEY_SHIFT: 16,
     KEY_SPACE: 32,
+    KEY_PGUP: 33,
+    KEY_PGDN: 34,
     KEY_LEFT: 37,
     KEY_UP: 38,
     KEY_RIGHT: 39,
     KEY_DOWN: 40,
     KEY_PRINTSCREEN: 44,
+    KEY_EQUALS: 61,
     KEY_A: 65,
     KEY_C: 67,
     KEY_D: 68,
@@ -23,6 +26,7 @@ export const input = {
     KEY_I: 73,
     KEY_K: 75,
     KEY_L: 76,
+    KEY_N: 78,
     KEY_O: 79,
     KEY_P: 80,
     KEY_Q: 81,
@@ -32,9 +36,11 @@ export const input = {
     KEY_W: 87,
     KEY_X: 88,
     KEY_Z: 90,
+    KEY_PLUS: 107,
     KEY_F1: 112,
+    KEY_MINUS: 173,
     KEY_APOSTROPHE: 192,
     MB_LEFT: 0,
     MB_RIGHT: 2,
     MB_MIDDLE: 1
-};
+};