@openglobus/og 0.15.4 → 0.15.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.15.4",
+  "version": "0.15.5",
   "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/LonLat.js

@@ -1,193 +1,207 @@
-/**
- * @module og/LonLat
- */
-
-"use strict";
-
-import * as mercator from "./mercator.js";
-
-const HALF_PI = Math.PI * 0.5;
-const INV_PI_BY_180 = 180.0 / Math.PI;
-const INV_PI_BY_360 = INV_PI_BY_180 * 2.0;
-const PI_BY_360 = Math.PI / 360.0;
-const INV_PI_BY_180_HALF_PI = INV_PI_BY_180 * HALF_PI;
-
-/**
- * Represents a geographical point with a certain latitude, longitude and height.
- * @class
- * @param {number} [lon] - Longitude.
- * @param {number} [lat] - Latitude.
- * @param {number} [height] - Height over the surface.
- */
-export class LonLat {
-    /**
-     * @param {number} [lon] - Longitude.
-     * @param {number} [lat] - Latitude.
-     * @param {number} [height] - Height over the surface.
-     */
-    constructor(lon = 0 , lat = 0, height = 0) {
-        /**
-         * Longitude.
-         * @public
-         * @type {number}
-         */
-        this.lon = lon;
-
-        /**
-         * Latitude.
-         * @public
-         * @type {number}
-         */
-        this.lat = lat;
-
-        /**
-         * Height.
-         * @public
-         * @type {number}
-         */
-        this.height = height;
-    }
-
-    isZero() {
-        return this.lon === 0.0 && this.lat === 0.0 && this.height === 0.0;
-    }
-
-    /**
-     * Creates coordinates array.
-     * @static
-     * @param{Array.<Array<number>>} arr - Coordinates array data. (exactly 3 entries)
-     * @return{Array.<LonLat>} the same coordinates array but each element is LonLat instance.
-     */
-    static join(arr) {
-        var res = [];
-        for (var i = 0; i < arr.length; i++) {
-            var ai = arr[i];
-            res[i] = new LonLat(ai[0], ai[1], ai[2]);
-        }
-        return res;
-    }
-
-    /**
-     * Creates an object by coordinate array.
-     * @static
-     * @param {Array.<number>} arr - Coordiante array, where first is longitude, second is latitude and third is a height. (exactly 3 entries)
-     * @returns {LonLat} -
-     */
-    static createFromArray(arr) {
-        return new LonLat(arr[0], arr[1], arr[2]);
-    }
-
-    /**
-     * Converts degrees to mercator coordinates.
-     * @static
-     * @param {number} lon - Degrees longitude.
-     * @param {number} lat - Degrees latitude.
-     * @param {number} [height] - Height.
-     * @returns {LonLat} -
-     */
-    static forwardMercator(lon, lat, height) {
-        return new LonLat(
-            lon * mercator.POLE_BY_180,
-            Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * mercator.POLE_BY_PI,
-            height
-        );
-    }
-
-    /**
-     * Converts mercator to degrees coordinates.
-     * @static
-     * @param {number} x - Mercator longitude.
-     * @param {number} y - Mercator latitude.
-     * @param {number} [height] - Height.
-     * @returns {LonLat} -
-     */
-    static inverseMercator(x, y, height = 0) {
-        return new LonLat(
-            x * mercator.INV_POLE_BY_180,
-            INV_PI_BY_360 * Math.atan(Math.exp(y * mercator.PI_BY_POLE)) - INV_PI_BY_180_HALF_PI,
-            height
-        );
-    }
-
-    /**
-     * Sets coordinates.
-     * @public
-     * @param {number} [lon] - Longitude.
-     * @param {number} [lat] - Latitude.
-     * @param {number} [height] - Height.
-     * @returns {LonLat} -
-     */
-    set(lon = 0, lat = 0, height = 0) {
-        this.lon = lon;
-        this.lat = lat;
-        this.height = height;
-        return this;
-    }
-
-    /**
-     * Copy coordinates.
-     * @public
-     * @param {LonLat} [lonLat] - Coordinates to copy.
-     * @returns {LonLat} -
-     */
-    copy(lonLat) {
-        this.lon = lonLat.lon;
-        this.lat = lonLat.lat;
-        this.height = lonLat.height;
-        return this;
-    }
-
-    /**
-     * Clone the coordiante.
-     * @public
-     * @returns {LonLat} -
-     */
-    clone() {
-        return new LonLat(this.lon, this.lat, this.height);
-    }
-
-    /**
-     * Converts to mercator coordinates.
-     * @public
-     * @returns {LonLat} -
-     */
-    forwardMercator() {
-        return LonLat.forwardMercator(this.lon, this.lat, this.height);
-    }
-
-    forwardMercatorEPS01() {
-        var lat = this.lat;
-        if (lat > 89.9) {
-            lat = 89.9;
-        } else if (lat < -89.9) {
-            lat = -89.9;
-        }
-        return new LonLat(
-            this.lon * mercator.POLE_BY_180,
-            Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * mercator.POLE_BY_PI
-        );
-    }
-
-    /**
-     * Converts from mercator coordinates.
-     * @public
-     * @returns {LonLat} -
-     */
-    inverseMercator() {
-        return LonLat.inverseMercator(this.lon, this.lat, this.height);
-    }
-
-    /**
-     * Compares coordinates.
-     * @public
-     * @param {LonLat} b - Coordinate to compare with.
-     * @returns {boolean} -
-     */
-    equal(b) {
-        if (b.height) {
-            return this.lon === b.lon && this.lat === b.lat && this.height === b.height;
-        } else {
-            return this.lon === b.lon && this.lat === b.lat;
-        }
-    }
-}
+/**
+ * @module og/LonLat
+ */
+
+"use strict";
+
+import * as mercator from "./mercator.js";
+
+const HALF_PI = Math.PI * 0.5;
+const INV_PI_BY_180 = 180.0 / Math.PI;
+const INV_PI_BY_360 = INV_PI_BY_180 * 2.0;
+const PI_BY_360 = Math.PI / 360.0;
+const INV_PI_BY_180_HALF_PI = INV_PI_BY_180 * HALF_PI;
+
+/**
+ * Represents a geographical point with a certain latitude, longitude and height.
+ * @class
+ * @param {number} [lon] - Longitude.
+ * @param {number} [lat] - Latitude.
+ * @param {number} [height] - Height over the surface.
+ */
+export class LonLat {
+    /**
+     * @param {number} [lon] - Longitude.
+     * @param {number} [lat] - Latitude.
+     * @param {number} [height] - Height over the surface.
+     */
+    constructor(lon = 0, lat = 0, height = 0) {
+        /**
+         * Longitude.
+         * @public
+         * @type {number}
+         */
+        this.lon = lon;
+
+        /**
+         * Latitude.
+         * @public
+         * @type {number}
+         */
+        this.lat = lat;
+
+        /**
+         * Height.
+         * @public
+         * @type {number}
+         */
+        this.height = height;
+    }
+
+    isZero() {
+        return this.lon === 0.0 && this.lat === 0.0 && this.height === 0.0;
+    }
+
+    /**
+     * Creates coordinates array.
+     * @static
+     * @param{Array.<Array<number>>} arr - Coordinates array data. (exactly 3 entries)
+     * @return{Array.<LonLat>} the same coordinates array but each element is LonLat instance.
+     */
+    static join(arr) {
+        var res = [];
+        for (var i = 0; i < arr.length; i++) {
+            var ai = arr[i];
+            res[i] = new LonLat(ai[0], ai[1], ai[2]);
+        }
+        return res;
+    }
+
+    /**
+     * Creates an object by coordinate array.
+     * @static
+     * @param {Array.<number>} arr - Coordiante array, where first is longitude, second is latitude and third is a height. (exactly 3 entries)
+     * @returns {LonLat} -
+     */
+    static createFromArray(arr) {
+        return new LonLat(arr[0], arr[1], arr[2]);
+    }
+
+    /**
+     * Converts degrees to mercator coordinates.
+     * @static
+     * @param {number} lon - Degrees longitude.
+     * @param {number} lat - Degrees latitude.
+     * @param {number} [height] - Height.
+     * @returns {LonLat} -
+     */
+    static forwardMercator(lon, lat, height) {
+        return new LonLat(
+            lon * mercator.POLE_BY_180,
+            Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * mercator.POLE_BY_PI,
+            height
+        );
+    }
+
+    /**
+     * Converts degrees to mercator coordinates.
+     * @static
+     * @param {LonLat} lonLat - Input geodetic degree coordinates
+     * @param {LonLat} res - Output mercator coordinates
+     * @returns {LonLat} - Output mercator coordinates
+     */
+    static forwardMercatorRes(lonLat, res) {
+        res.lon = lonLat.lon * mercator.POLE_BY_180;
+        res.lat = Math.log(Math.tan((90.0 + lonLat.lat) * PI_BY_360)) * mercator.POLE_BY_PI,
+            res.height = lonLat.height;
+        return res;
+    }
+
+    /**
+     * Converts mercator to degrees coordinates.
+     * @static
+     * @param {number} x - Mercator longitude.
+     * @param {number} y - Mercator latitude.
+     * @param {number} [height] - Height.
+     * @returns {LonLat} -
+     */
+    static inverseMercator(x, y, height = 0) {
+        return new LonLat(
+            x * mercator.INV_POLE_BY_180,
+            INV_PI_BY_360 * Math.atan(Math.exp(y * mercator.PI_BY_POLE)) - INV_PI_BY_180_HALF_PI,
+            height
+        );
+    }
+
+    /**
+     * Sets coordinates.
+     * @public
+     * @param {number} [lon] - Longitude.
+     * @param {number} [lat] - Latitude.
+     * @param {number} [height] - Height.
+     * @returns {LonLat} -
+     */
+    set(lon = 0, lat = 0, height = 0) {
+        this.lon = lon;
+        this.lat = lat;
+        this.height = height;
+        return this;
+    }
+
+    /**
+     * Copy coordinates.
+     * @public
+     * @param {LonLat} [lonLat] - Coordinates to copy.
+     * @returns {LonLat} -
+     */
+    copy(lonLat) {
+        this.lon = lonLat.lon;
+        this.lat = lonLat.lat;
+        this.height = lonLat.height;
+        return this;
+    }
+
+    /**
+     * Clone the coordiante.
+     * @public
+     * @returns {LonLat} -
+     */
+    clone() {
+        return new LonLat(this.lon, this.lat, this.height);
+    }
+
+    /**
+     * Converts to mercator coordinates.
+     * @public
+     * @returns {LonLat} -
+     */
+    forwardMercator() {
+        return LonLat.forwardMercator(this.lon, this.lat, this.height);
+    }
+
+    forwardMercatorEPS01() {
+        var lat = this.lat;
+        if (lat > 89.9) {
+            lat = 89.9;
+        } else if (lat < -89.9) {
+            lat = -89.9;
+        }
+        return new LonLat(
+            this.lon * mercator.POLE_BY_180,
+            Math.log(Math.tan((90.0 + lat) * PI_BY_360)) * mercator.POLE_BY_PI
+        );
+    }
+
+    /**
+     * Converts from mercator coordinates.
+     * @public
+     * @returns {LonLat} -
+     */
+    inverseMercator() {
+        return LonLat.inverseMercator(this.lon, this.lat, this.height);
+    }
+
+    /**
+     * Compares coordinates.
+     * @public
+     * @param {LonLat} b - Coordinate to compare with.
+     * @returns {boolean} -
+     */
+    equal(b) {
+        if (b.height) {
+            return this.lon === b.lon && this.lat === b.lat && this.height === b.height;
+        } else {
+            return this.lon === b.lon && this.lat === b.lat;
+        }
+    }
+}

package/src/og/camera/Camera.js

@@ -255,22 +255,10 @@ class Camera {
         Vec3.doubleToTwoFloat32Array(eye, this.eyeHigh, this.eyeLow);
 
         this._viewMatrix.set([
-            u.x,
-            v.x,
-            n.x,
-            0.0,
-            u.y,
-            v.y,
-            n.y,
-            0.0,
-            u.z,
-            v.z,
-            n.z,
-            0.0,
-            -eye.dot(u),
-            -eye.dot(v),
-            -eye.dot(n),
-            1.0
+            u.x, v.x, n.x, 0.0,
+            u.y, v.y, n.y, 0.0,
+            u.z, v.z, n.z, 0.0,
+            -eye.dot(u), -eye.dot(v), -eye.dot(n), 1.0
         ]);
 
         // do not cleanup, someday it will be using

package/src/og/camera/PlanetCamera.js

@@ -13,6 +13,7 @@ import { Ray } from "../math/Ray.js";
 import { Vec3 } from "../math/Vec3.js";
 import * as mercator from "../mercator.js";
 import { Camera } from "./Camera.js";
+import { Ellipsoid } from "../ellipsoid/index.js";
 
 /**
  * Planet camera.
@@ -122,7 +123,7 @@ class PlanetCamera extends Camera {
         this._flying = false;
         this._checkTerrainCollision = true;
 
-        this._velCart = new Vec3(0.0,0.0,0.0);
+        this._velCart = new Vec3(0.0, 0.0, 0.0);
     }
 
     setTerrainCollisionActivity(isActive) {
@@ -144,16 +145,17 @@ class PlanetCamera extends Camera {
         }
 
         super.update();
-        this.updateGeodeticPosition();
+
         this.eyeNorm = this.eye.normal();
         this.slope = this._b.dot(this.eyeNorm);
+
         this.events.dispatch(this.events.viewchange, this);
     }
 
     updateGeodeticPosition() {
-        this._lonLat = this.planet.ellipsoid.cartesianToLonLat(this.eye);
+        this.planet.ellipsoid.cartesianToLonLatRes(this.eye, this._lonLat);
         if (Math.abs(this._lonLat.lat) <= mercator.MAX_LAT) {
-            this._lonLatMerc = this._lonLat.forwardMercator();
+            LonLat.forwardMercatorRes(this._lonLat, this._lonLatMerc);
         }
     }
 
@@ -163,11 +165,14 @@ class PlanetCamera extends Camera {
      * @param {number} alt - Altitude over the terrain.
      */
     setAltitude(alt) {
-        var n = this.eye.normal();
-        var t = this._terrainPoint;
+
+        let t = this._terrainPoint;
+        let n = this.planet.ellipsoid.getSurfaceNormal3v(this.eye);
+
         this.eye.x = n.x * alt + t.x;
         this.eye.y = n.y * alt + t.y;
         this.eye.z = n.z * alt + t.z;
+
         this._terrainAltitude = alt;
     }
 
@@ -633,6 +638,7 @@ class PlanetCamera extends Camera {
             if (this._terrainAltitude < this.minAltitude && this._checkTerrainCollision) {
                 this.setAltitude(this.minAltitude);
             }
+            return this._terrainPoint;
         }
     }