@openglobus/og 0.17.0 → 0.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "description": "[OpenGlobus](https://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

@@ -57,7 +57,7 @@ class Events {
      * @param {Array.<string>} eventNames - Specified event names list.
      */
     registerNames(eventNames) {
-        for (var i = 0; i < eventNames.length; i++) {
+        for (let i = 0; i < eventNames.length; i++) {
             this[eventNames[i]] = { active: true, handlers: [] };
             this._eventNames.push(eventNames[i]);
         }
@@ -172,7 +172,7 @@ class Events {
      * @public
      */
     clear() {
-        for (var i = 0; i < this._eventNames.length; i++) {
+        for (let i = 0; i < this._eventNames.length; i++) {
             var e = this[this._eventNames[i]];
             e.handlers.length = 0;
             e.handlers = [];

package/src/og/Globe.js

@@ -222,7 +222,7 @@ class Globe {
         }
 
         var _controls = this.renderer.controls;
-        for (var i in _controls) {
+        for (let i in _controls) {
             if (_controls[i] instanceof Sun) {
                 this.sun = _controls[i];
                 break;

package/src/og/ImageCanvas.js

@@ -54,7 +54,7 @@ class ImageCanvas {
     fillEmpty() {
         var imgd = this._context.getImageData(0, 0, this._canvas.width, this._canvas.height);
         var pixels = imgd.data;
-        for (var i = 0, n = pixels.length; i < n; i += 4) {
+        for (let i = 0, n = pixels.length; i < n; i += 4) {
             pixels[i] = pixels[i + 1] = pixels[i + 2] = pixels[i + 3] = 0;
         }
         this._context.putImageData(imgd, 0, 0);
@@ -64,7 +64,7 @@ class ImageCanvas {
      * Fills canvas RGBA with color.
      * @public
      */
-    fill(c) {
+    fill(color) {
         this._context.fillStyle = color
         this._context.fill()
     }

package/src/og/LonLat.js

@@ -56,7 +56,7 @@ export class LonLat {
      */
     static join(arr) {
         var res = [];
-        for (var i = 0; i < arr.length; i++) {
+        for (let i = 0; i < arr.length; i++) {
             var ai = arr[i];
             res[i] = new LonLat(ai[0], ai[1], ai[2]);
         }

package/src/og/Object3d.js

@@ -140,7 +140,7 @@ class Object3d {
     static getNormals(vertices) {
         let res = new Array(vertices.length);
 
-        for (var i = 0; i < vertices.length; i += 9) {
+        for (let i = 0; i < vertices.length; i += 9) {
 
             let t03 = i, t13 = i + 3, t23 = i + 6, v0_x = vertices[t03], v0_y = vertices[t03 + 1],
                 v0_z = vertices[t03 + 2], v1_x = vertices[t13], v1_y = vertices[t13 + 1], v1_z = vertices[t13 + 2],

package/src/og/QueueArray.js

@@ -66,7 +66,7 @@ class QueueArray {
     }
 
     each(callback) {
-        for (var i = this._shiftIndex; i < this._popIndex; i++) {
+        for (let i = this._shiftIndex; i < this._popIndex; i++) {
             callback(this._array[i]);
         }
     }

package/src/og/Stack.js

@@ -17,7 +17,7 @@ class Stack {
         this._current = new Node();
         this._head = this._current;
 
-        for (var i = 0; i < size; i++) {
+        for (let i = 0; i < size; i++) {
             var n = new Node();
             n.prev = this._current;
             this._current.next = n;

package/src/og/astro/earth.js

@@ -98,11 +98,11 @@ export function getSunPosition(jDate) {
 
     var theta = math.TWO_PI * ((d * 24.0) / 23.9344694 - 259.853 / 360.0); // Siderial spin time
 
-    return Quat.yRotation(-theta).mulVec3(
+    return Quat.zRotation(-theta).mulVec3(
         new Vec3(
+            -xequat * astro.AU_TO_METERS,
             -yequat * astro.AU_TO_METERS,
-            zequat * astro.AU_TO_METERS,
-            -xequat * astro.AU_TO_METERS
+            zequat * astro.AU_TO_METERS
         )
     );
 

package/src/og/camera/Frustum.js

@@ -25,7 +25,7 @@ class Frustum {
          * @type {Array.<Array.<number>>}
          */
         this._f = new Array(6);
-        for (var i = 0; i < 6; i++) {
+        for (let i = 0; i < 6; i++) {
             this._f[i] = new Array(4);
         }
 
@@ -224,7 +224,7 @@ class Frustum {
      */
     containsPoint(point) {
         var d;
-        for (var p = 0; p < 6; p++) {
+        for (let p = 0; p < 6; p++) {
             d = point.dotArr(this._f[p]) + this._f[p][3];
             if (d <= 0) {
                 return false;
@@ -304,11 +304,11 @@ class Frustum {
             cout,
             cin;
 
-        for (var i = 0; i < 6; i++) {
+        for (let i = 0; i < 6; i++) {
             cout = 0;
             cin = 0;
 
-            for (var k = 0; k < 8 && (cin === 0 || cout === 0); k++) {
+            for (let k = 0; k < 8 && (cin === 0 || cout === 0); k++) {
                 var d = box.vertices[k].dotArr(this._f[i]) + this._f[i][3];
                 if (d < 0) {
                     cout++;

package/src/og/camera/PlanetCamera.js

@@ -184,7 +184,7 @@ class PlanetCamera extends Camera {
         var el = this.planet.ellipsoid;
         var newEye = el.lonLatToCartesian(this._lonLat);
         var newLook = lookLonLat ? el.lonLatToCartesian(lookLonLat) : Vec3.ZERO;
-        this.set(newEye, newLook, up || Vec3.UP);
+        this.set(newEye, newLook, up || Vec3.NORTH);
         this.update();
     }
 
@@ -249,7 +249,7 @@ class PlanetCamera extends Camera {
         southWest.subA(center);
 
         var direction = center.normal(); // ellipsoid.getSurfaceNormal(center).negate().normalize();
-        var right = direction.cross(Vec3.UP).normalize();
+        var right = direction.cross(Vec3.NORTH).normalize();
         var up = right.cross(direction).normalize();
 
         var _h = Math.max(
@@ -283,7 +283,7 @@ class PlanetCamera extends Camera {
      */
     viewExtent(extent, height) {
         this.stopFlying();
-        this.set(this.getExtentPosition(extent, height), Vec3.ZERO, Vec3.UP);
+        this.set(this.getExtentPosition(extent, height), Vec3.ZERO, Vec3.NORTH);
         this.update();
     }
 
@@ -362,7 +362,7 @@ class PlanetCamera extends Camera {
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
      * @param [frameCallback]
      */
-    flyCartesian(cartesian, look = Vec3.ZERO, up = Vec3.UP, ampl = 1.0, completeCallback = () => {
+    flyCartesian(cartesian, look = Vec3.ZERO, up = Vec3.NORTH, ampl = 1.0, completeCallback = () => {
     }, startCallback = () => {
     }, frameCallback = () => {
     }) {
@@ -370,7 +370,7 @@ class PlanetCamera extends Camera {
         this.stopFlying();
 
         look = look || Vec3.ZERO;
-        up = up || Vec3.UP;
+        up = up || Vec3.NORTH;
 
         this._completeCallback = completeCallback;
 
@@ -416,7 +416,7 @@ class PlanetCamera extends Camera {
         var zero = Vec3.ZERO;
 
         // camera path and orientations calculation
-        for (var i = 0; i <= this._numFrames; i++) {
+        for (let i = 0; i <= this._numFrames; i++) {
             var d = 1 - i / this._numFrames;
             d = d * d * (3 - 2 * d);
             d *= d;
@@ -640,7 +640,7 @@ class PlanetCamera extends Camera {
                 this.slope >= 0.97 ? this.getUp() : this.getForward(),
                 u
             ).normalize(),
-            n = Vec3.proj_b_to_plane(Vec3.UP, u).normalize();
+            n = Vec3.proj_b_to_plane(Vec3.NORTH, u).normalize();
         let res = Math.sign(u.dot(f.cross(n))) * Math.acos(f.dot(n)) * math.DEGREES;
         if (res < 0.0) {
             return 360.0 + res;

package/src/og/cons.js

@@ -94,7 +94,7 @@ export class Cons {
         var d = document.createElement("div");
         d.classList.add("ogConsole-text");
         if (style) {
-            for (var s in style) {
+            for (let s in style) {
                 d.style[s] = style[s];
             }
         }

package/src/og/control/DebugInfo.js

@@ -90,7 +90,7 @@ class DebugInfo extends Control {
     }
 
     addWatches(watches) {
-        for (var i = 0; i < watches.length; i++) {
+        for (let i = 0; i < watches.length; i++) {
             this.addWatch(watches[i]);
         }
     }
@@ -124,7 +124,7 @@ class DebugInfo extends Control {
 
         var temp = this._watch;
         this._watch = [];
-        for (var i = 0; i < temp.length; i++) {
+        for (let i = 0; i < temp.length; i++) {
             this.addWatch(temp[i]);
         }
         this._dialog.container.appendChild(this.el);
@@ -245,7 +245,7 @@ class DebugInfo extends Control {
     }
 
     _frame() {
-        for (var i = 0; i < this._watch.length; i++) {
+        for (let i = 0; i < this._watch.length; i++) {
             var w = this._watch[i];
             w.valEl.innerHTML = w.frame ? w.frame() : "";
         }

package/src/og/control/EarthNavigation.js

@@ -153,12 +153,12 @@ class EarthNavigation extends Control {
                 var rot = this._hRot.mul(this._vRot);
 
                 var state = this.positionState[this.currState];
-                var lim = rot.mulVec3(cam.eye).normal().dot(Vec3.UP);
+                var lim = rot.mulVec3(cam.eye).normal().dot(Vec3.NORTH);
                 if (lim > state.max || lim < state.min) {
                     rot = Quat.yRotation(rot.getYaw());
                 }
 
-                cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, Vec3.UP);
+                cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, Vec3.NORTH);
                 cam.update();
             }
         }
@@ -204,7 +204,6 @@ class EarthNavigation extends Control {
                 let rot = this._vRot = Quat.axisAngleToQuat(cam._u, this._a);
 
                 cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, rot.mulVec3(cam.getUp()));
-                //cam.update();
 
                 this._hRot = Quat.getRotationBetweenVectors(
                     new Vec3(targetPoint.x, 0.0, targetPoint.z).normal(),
@@ -213,14 +212,8 @@ class EarthNavigation extends Control {
 
                 rot = this._hRot;
 
-                //var state = this.positionState[this.currState];
-                //var lim = cam.eye.normal().dot(Vec3.UP);
-
-                //if (lim > state.max || lim < state.min) {
-                //    rot = Quat.yRotation(rot.getYaw());
-                    cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, rot.mulVec3(cam.getUp()));
-                    cam.update();
-                //}
+                cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, rot.mulVec3(cam.getUp()));
+                cam.update();
             }
         } else {
             this.scaleRot = 0;
@@ -240,7 +233,7 @@ class EarthNavigation extends Control {
             this._vRot = Quat.axisAngleToQuat(cam._u, this._a);
             var rot = this._vRot.mul(this._hRot);
 
-            var lim = rot.mulVec3(cam.eye).normal().dot(Vec3.UP);
+            var lim = rot.mulVec3(cam.eye).normal().dot(Vec3.NORTH);
 
             var state = this.positionState[this.currState];
 
@@ -256,7 +249,7 @@ class EarthNavigation extends Control {
                 this.scaleRot = 0;
             }
 
-            cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, Vec3.UP);
+            cam.set(rot.mulVec3(cam.eye), Vec3.ZERO, Vec3.NORTH);
             cam.update();
         }
     }

package/src/og/control/Lighting.js

@@ -465,7 +465,7 @@ class Lighting extends Control {
 
     _fetchLayers() {
         if (this.planet) {
-            for (var i = 0; i < this.planet.layers.length; i++) {
+            for (let i = 0; i < this.planet.layers.length; i++) {
                 this._onLayerAdd(this.planet.layers[i]);
             }
         }

package/src/og/control/MouseNavigation.js

@@ -88,7 +88,7 @@ class MouseNavigation extends Control {
                     eyeArr = [];
 
                 var breaked = false;
-                for (var i = 0; i < stepsCount; i++) {
+                for (let i = 0; i < stepsCount; i++) {
                     eye.addA(scaled_n);
                     var b = new Ray(eye, dir).hitSphere(grabbedSpheroid);
                     eyeArr[i] = eye.clone();

package/src/og/control/visibleExtent/Segment.js

@@ -861,7 +861,7 @@ class Segment {
      */
     deleteMaterials() {
         var m = this.materials;
-        for (var i = 0; i < m.length; i++) {
+        for (let i = 0; i < m.length; i++) {
             var mi = m[i];
             if (mi) {
                 mi.clear();
@@ -1368,7 +1368,7 @@ class Segment {
             nmVertsLow = this.normalMapVerticesLow,
             nmNorms = this.normalMapNormals;
 
-        for (var k = 0; k < gsgs; k++) {
+        for (let k = 0; k < gsgs; k++) {
             var j = k % gs,
                 i = ~~(k / gs);
 

package/src/og/ellipsoid/Ellipsoid.js

@@ -3,6 +3,7 @@
 import { LonLat } from "../LonLat.js";
 import { DEGREES, EPS1, EPS12, EPS15, RADIANS, zeroTwoPI } from "../math.js";
 import { Vec3 } from "../math/Vec3.js";
+import { Quat } from "../math/Quat.js";
 
 /**
  * Class represents a plant ellipsoid.
@@ -33,10 +34,10 @@ class Ellipsoid {
         this._k = qa2b2 / polarSize;
         this._k2 = this._k * this._k;
 
-        this._radii = new Vec3(equatorialSize, polarSize, equatorialSize);
-        this._radii2 = new Vec3(this._a2, this._b2, this._a2);
-        this._invRadii = new Vec3(1.0 / equatorialSize, 1.0 / polarSize, 1.0 / equatorialSize);
-        this._invRadii2 = new Vec3(1.0 / this._a2, 1.0 / this._b2, 1.0 / this._a2);
+        this._radii = new Vec3(equatorialSize, equatorialSize, polarSize);
+        this._radii2 = new Vec3(this._a2, this._a2, this._b2);
+        this._invRadii = new Vec3(1.0 / equatorialSize, 1.0 / equatorialSize, 1.0 / polarSize);
+        this._invRadii2 = new Vec3(1.0 / this._a2, 1.0 / this._a2, 1.0 / this._b2);
     }
 
     /**
@@ -120,19 +121,7 @@ class Ellipsoid {
      * @returns {Vec3} -
      */
     lonLatToCartesian(lonlat) {
-        var latrad = RADIANS * lonlat.lat,
-            lonrad = RADIANS * lonlat.lon;
-
-        var slt = Math.sin(latrad);
-
-        var N = this._a / Math.sqrt(1.0 - this._e2 * slt * slt);
-        var nc = (N + lonlat.height) * Math.cos(latrad);
-
-        return new Vec3(
-            nc * Math.sin(lonrad),
-            (N * (1.0 - this._e2) + lonlat.height) * slt,
-            nc * Math.cos(lonrad)
-        );
+        return this.geodeticToCartesian(lonlat.lon, lonlat.lat, lonlat.height);
     }
 
     /**
@@ -143,19 +132,7 @@ class Ellipsoid {
      * @returns {Vec3} -
      */
     lonLatToCartesianRes(lonlat, res) {
-        var latrad = RADIANS * lonlat.lat,
-            lonrad = RADIANS * lonlat.lon;
-
-        var slt = Math.sin(latrad);
-
-        var N = this._a / Math.sqrt(1.0 - this._e2 * slt * slt);
-        var nc = (N + lonlat.height) * Math.cos(latrad);
-
-        res.x = nc * Math.sin(lonrad);
-        res.y = (N * (1.0 - this._e2) + lonlat.height) * slt;
-        res.z = nc * Math.cos(lonrad);
-
-        return res;
+        return this.geodeticToCartesian(lonlat.lon, lonlat.lat, lonlat.height, res);
     }
 
     /**
@@ -166,20 +143,22 @@ class Ellipsoid {
      * @param {Number} height - Height.
      * @returns {Vec3} -
      */
-    geodeticToCartesian(lon, lat, height = 0) {
-        var latrad = RADIANS * lat,
+    geodeticToCartesian(lon, lat, height = 0, res) {
+        res = res || new Vec3();
+
+        let latrad = RADIANS * lat,
             lonrad = RADIANS * lon;
 
-        var slt = Math.sin(latrad);
+        let slt = Math.sin(latrad);
 
-        var N = this._a / Math.sqrt(1 - this._e2 * slt * slt);
-        var nc = (N + height) * Math.cos(latrad);
+        let N = this._a / Math.sqrt(1 - this._e2 * slt * slt);
+        let nc = (N + height) * Math.cos(latrad);
 
-        return new Vec3(
-            nc * Math.sin(lonrad),
-            (N * (1 - this._e2) + height) * slt,
-            nc * Math.cos(lonrad)
-        );
+        res.x = nc * Math.cos(lonrad);
+        res.y = nc * Math.sin(lonrad);
+        res.z = (N * (1 - this._e2) + height) * slt;
+
+        return res;
     }
 
     /**
@@ -248,14 +227,7 @@ class Ellipsoid {
      * @returns {LonLat} - Geodetic coordinates
      */
     cartesianToLonLat(cart) {
-        let p = this.projToSurface(cart);
-        let n = this.getSurfaceNormal3v(p),
-            h = cart.sub(p);
-        return new LonLat(
-            Math.atan2(n.x, n.z) * DEGREES,
-            Math.asin(n.y) * DEGREES,
-            Math.sign(h.dot(cart)) * h.length()
-        );
+        return this.cartesianToLonLatRes(cart);
     }
 
     /**
@@ -265,12 +237,15 @@ class Ellipsoid {
      * @returns {LonLat} - Geodetic coordinates
      */
     cartesianToLonLatRes(cart, res) {
+        res = res || new LonLat();
         let p = this.projToSurface(cart);
         let n = this.getSurfaceNormal3v(p),
             h = cart.sub(p);
-        res.lon = Math.atan2(n.x, n.z) * DEGREES;
-        res.lat = Math.asin(n.y) * DEGREES;
+
+        res.lon = Math.atan2(n.y, n.x) * DEGREES;
+        res.lat = Math.asin(n.z) * DEGREES;
         res.height = Math.sign(h.dot(cart)) * h.length();
+
         return res;
     }
 
@@ -495,6 +470,12 @@ class Ellipsoid {
         }
     }
 
+    getNorthFrameRotation(cartesian) {
+        let n = this.getSurfaceNormal3v(cartesian);
+        let t = Vec3.proj_b_to_plane(Vec3.NORTH, n);
+        return Quat.getLookRotation(t, n);
+    }
+
     /**
      * @todo this is not precise function, needs to be replaced or removed
      * @param lonLat1

package/src/og/entity/BillboardHandler.js

@@ -91,7 +91,7 @@ class BillboardHandler {
     }
 
     static concArr(dest, curr) {
-        for (var i = 0; i < curr.length; i++) {
+        for (let i = 0; i < curr.length; i++) {
             dest.push(curr[i]);
         }
     }
@@ -463,7 +463,7 @@ class BillboardHandler {
 
     reindexBillbordsArray(startIndex) {
         var b = this._billboards;
-        for (var i = startIndex; i < b.length; i++) {
+        for (let i = startIndex; i < b.length; i++) {
             b[i]._handlerIndex = i;
         }
     }
@@ -866,7 +866,7 @@ class BillboardHandler {
         var bc = this._entityCollection;
         if (bc && this._renderer) {
             var ta = this._renderer.billboardsTextureAtlas;
-            for (var i = 0; i < this._billboards.length; i++) {
+            for (let i = 0; i < this._billboards.length; i++) {
                 var bi = this._billboards[i];
                 var img = bi._image;
                 if (img) {

package/src/og/entity/EntityCollection.js

@@ -303,7 +303,7 @@ class EntityCollection {
 
         this.events.dispatch(this.events.entityadd, entity);
 
-        for (var i = 0; i < entity.childrenNodes.length; i++) {
+        for (let i = 0; i < entity.childrenNodes.length; i++) {
             entity.childrenNodes[i]._entityCollection = this;
             entity.childrenNodes[i]._entityCollectionIndex = entity._entityCollectionIndex;
             entity.childrenNodes[i]._pickingColor = entity._pickingColor;
@@ -386,7 +386,7 @@ class EntityCollection {
         // geoObject
         entity.geoObject && this.geoObjectHandler.remove(entity.geoObject);
 
-        for (var i = 0; i < entity.childrenNodes.length; i++) {
+        for (let i = 0; i < entity.childrenNodes.length; i++) {
             this._removeRecursively(entity.childrenNodes[i]);
         }
     }
@@ -434,7 +434,7 @@ class EntityCollection {
      */
     createPickingColors() {
         var e = this._entities;
-        for (var i = 0; i < e.length; i++) {
+        for (let i = 0; i < e.length; i++) {
             if (!e[i].parent) {
                 this.renderNode.renderer.assignPickingColor(e[i]);
                 e[i].setPickingColor();
@@ -449,7 +449,7 @@ class EntityCollection {
      */
     reindexEntitiesArray(startIndex) {
         var e = this._entities;
-        for (var i = startIndex; i < e.length; i++) {
+        for (let i = startIndex; i < e.length; i++) {
             e[i]._entityCollectionIndex = i;
         }
     }
@@ -521,7 +521,7 @@ class EntityCollection {
      */
     updateBillboardsTextureAtlas() {
         var b = this.billboardHandler._billboards;
-        for (var i = 0; i < b.length; i++) {
+        for (let i = 0; i < b.length; i++) {
             b[i].setSrc(b[i]._src);
         }
     }
@@ -534,7 +534,7 @@ class EntityCollection {
         if (this.renderNode) {
             var l = [].concat(this.labelHandler._billboards);
             this.labelHandler._billboards = [];
-            for (var i = 0; i < l.length; i++) {
+            for (let i = 0; i < l.length; i++) {
                 this.labelHandler.assignFontAtlas(l[i]);
             }
         }
@@ -621,7 +621,7 @@ class EntityCollection {
     _clearEntity(entity) {
         entity._entityCollection = null;
         entity._entityCollectionIndex = -1;
-        for (var i = 0; i < entity.childrenNodes.length; i++) {
+        for (let i = 0; i < entity.childrenNodes.length; i++) {
             this._clearEntity(entity.childrenNodes[i]);
         }
     }

package/src/og/entity/GeoObject.js

@@ -232,10 +232,12 @@ class GeoObject {
     }
 
     updateDirection() {
-        this._qNorthFrame = Planet.getBearingNorthRotationQuat(this._position);
-        let qq = Quat.yRotation(this._yaw).mul(this._qNorthFrame).conjugate();
-        this._direction = qq.mulVec3(new Vec3(0.0, 0.0, -1.0)).normalize();
-        this._handler && this._handler.setDirectionArr(this._tagData, this._tagDataIndex, this._direction);
+        if (this._handler && this._handler._planet) {
+            this._qNorthFrame = this._handler._planet.getNorthFrameRotation(this._position);
+            let qq = Quat.yRotation(this._yaw).mul(this._qNorthFrame).conjugate();
+            this._direction = qq.mulVec3(new Vec3(0.0, 0.0, -1.0)).normalize();
+            this._handler.setDirectionArr(this._tagData, this._tagDataIndex, this._direction);
+        }
     }
 }