@openglobus/og 0.10.4 → 0.11.1

package/src/og/Globe.js

@@ -13,6 +13,7 @@ import { isEmpty } from "./utils/shared.js";
 
 import { EarthCoordinates } from "./control/EarthCoordinates.js";
 import { MouseNavigation } from "./control/MouseNavigation.js";
+import { EarthNavigation } from "./control/EarthNavigation.js";
 import { TouchNavigation } from "./control/TouchNavigation.js";
 import { Sun } from "./control/Sun.js";
 import { ZoomControl } from "./control/ZoomControl.js";
@@ -81,7 +82,8 @@ class Globe {
          * @public
          * @type {Element}
          */
-        this.div = document.getElementById(options.target);
+        this.div =
+            document.getElementById(options.target) || document.querySelector(options.target);
         this.div.appendChild(this._canvas);
         this.div.classList.add("ogViewport");
 
@@ -151,7 +153,9 @@ class Globe {
                 ellipsoid: options.ellipsoid,
                 maxGridSize: options.maxGridSize,
                 useNightTexture: options.useNightTexture,
-                useSpecularTexture: options.useSpecularTexture
+                useSpecularTexture: options.useSpecularTexture,
+                minAltitude: options.minAltitude,
+                maxAltitude: options.maxAltitude
             });
         }
 
@@ -170,7 +174,11 @@ class Globe {
         } else {
             this.planet.addControls([
                 new ZoomControl(),
-                new MouseNavigation(),
+                options.useEarthNavigation
+                    ? new EarthNavigation()
+                    : new MouseNavigation({
+                          minSlope: options.minSlope
+                      }),
                 new TouchNavigation(),
                 new EarthCoordinates(),
                 new ScaleControl(),

package/src/og/LonLat.js

@@ -19,166 +19,172 @@ const INV_PI_BY_180_HALF_PI = INV_PI_BY_180 * HALF_PI;
  * @param {number} [lat] - Latitude.
  * @param {number} [height] - Height over the surface.
  */
-const LonLat = function (lon, lat, height) {
+export class LonLat {
 
     /**
-     * Longitude.
-     * @public
-     * @type {number}
+     * @param {number} [lon] 
+     * @param {number} [lat] 
+     * @param {number} [height] 
      */
-    this.lon = lon || 0;
+    constructor(lon, lat, height) {
+
+        /**
+         * Longitude.
+         * @public
+         * @type {number}
+         */
+        this.lon = lon || 0;
+
+        /**
+         * Latitude.
+         * @public
+         * @type {number}
+         */
+        this.lat = lat || 0;
+
+        /**
+         * Height.
+         * @public
+         * @type {number}
+         */
+        this.height = height || 0;
+    };
+
+    isZero() {
+        return this.lon === 0.0 && this.lat === 0.0 && this.height === 0.0;
+    };
 
     /**
-     * Latitude.
-     * @public
-     * @type {number}
+     * Creates coordinates array.
+     * @static
+     * @param{Array.<Array<number>>} arr - Coordinates array data. (exactly 3 entries)
+     * @return{Array.<og.LonLat>} the same coordinates array but each element is LonLat instance.
      */
-    this.lat = lat || 0;
+    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;
+    };
 
     /**
-     * Height.
-     * @public
-     * @type {number}
+     * 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 {og.LonLat} -
      */
-    this.height = height || 0;
-};
-
-LonLat.prototype.isZero = function () {
-    return this.lon === 0.0 && this.lat === 0.0 && this.height === 0.0;
-};
-
-/**
- * Creates coordinates array.
- * @static
- * @param{Array.<Array<number,number,number>>} arr - Coordinates array data.
- * @return{Array.<og.LonLat>} the same coordinates array but each element is LonLat instance.
- */
-LonLat.join = function (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;
-};
+    static createFromArray(arr) {
+        return new LonLat(arr[0], arr[1], arr[2]);
+    };
 
-/**
- * Creates an object by coordinate array.
- * @static
- * @param {Array.<number,number,number>} arr - Coordiante array, where first is longitude, second is latitude and third is a height.
- * @returns {og.LonLat} -
- */
-LonLat.createFromArray = function (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 {og.LonLat} -
- */
-LonLat.forwardMercator = function (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 {number} lon - Degrees longitude.
+     * @param {number} lat - Degrees latitude.
+     * @param {number} [height] - Height.
+     * @returns {og.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 {og.LonLat} -
- */
-LonLat.inverseMercator = function (x, y, height) {
-    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);
-};
+    /**
+     * Converts mercator to degrees coordinates.
+     * @static
+     * @param {number} x - Mercator longitude.
+     * @param {number} y - Mercator latitude.
+     * @param {number} [height] - Height.
+     * @returns {og.LonLat} -
+     */
+    static inverseMercator(x, y, height) {
+        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 {og.LonLat} -
- */
-LonLat.prototype.set = function (lon, lat, height) {
-    this.lon = lon || 0;
-    this.lat = lat || 0;
-    this.height = height || 0;
-    return this;
-};
+    /**
+     * Sets coordinates.
+     * @public
+     * @param {number} [lon] - Longitude.
+     * @param {number} [lat] - Latitude.
+     * @param {number} [height] - Height.
+     * @returns {og.LonLat} -
+     */
+    set(lon, lat, height) {
+        this.lon = lon || 0;
+        this.lat = lat || 0;
+        this.height = height || 0;
+        return this;
+    };
 
-/**
- * Copy coordinates.
- * @public
- * @param {og.LonLat} [lonLat] - Coordinates to copy.
- * @returns {og.LonLat} -
- */
-LonLat.prototype.copy = function (lonLat) {
-    this.lon = lonLat.lon;
-    this.lat = lonLat.lat;
-    this.height = lonLat.height;
-    return this;
-};
+    /**
+     * Copy coordinates.
+     * @public
+     * @param {og.LonLat} [lonLat] - Coordinates to copy.
+     * @returns {og.LonLat} -
+     */
+    copy(lonLat) {
+        this.lon = lonLat.lon;
+        this.lat = lonLat.lat;
+        this.height = lonLat.height;
+        return this;
+    };
 
-/**
- * Clone the coordiante.
- * @public
- * @returns {og.LonLat} -
- */
-LonLat.prototype.clone = function () {
-    return new LonLat(this.lon, this.lat, this.height);
-};
+    /**
+     * Clone the coordiante.
+     * @public
+     * @returns {og.LonLat} -
+     */
+    clone() {
+        return new LonLat(this.lon, this.lat, this.height);
+    };
 
-/**
- * Converts to mercator coordinates.
- * @public
- * @returns {og.LonLat} -
- */
-LonLat.prototype.forwardMercator = function () {
-    return LonLat.forwardMercator(this.lon, this.lat, this.height);
-};
-
-LonLat.prototype.forwardMercatorEPS01 = function () {
-    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 to mercator coordinates.
+     * @public
+     * @returns {og.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 {og.LonLat} -
- */
-LonLat.prototype.inverseMercator = function () {
-    return LonLat.inverseMercator(this.lon, this.lat, this.height);
-};
+    /**
+     * Converts from mercator coordinates.
+     * @public
+     * @returns {og.LonLat} -
+     */
+    inverseMercator() {
+        return LonLat.inverseMercator(this.lon, this.lat, this.height);
+    };
 
-/**
- * Compares coordinates.
- * @public
- * @param {og.LonLat} b - Coordinate to compare with.
- * @returns {boolean} -
- */
-LonLat.prototype.equal = function (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;
-    }
-};
-
-export { LonLat };
+    /**
+     * Compares coordinates.
+     * @public
+     * @param {og.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/Popup.js

@@ -72,7 +72,7 @@ class Popup {
 
     setScreen(p) {
         if (this._planet) {
-            this.el.style.transform = "translate(" + (p.x - this.clientWidth * 0.5) + "px, " + (p.y - this._planet.renderer.handler.canvas.height - this.clientHeight * 0.5) + "px)"
+            this.el.style.transform = "translate(" + (p.x - this.clientWidth * 0.5) + "px, " + (p.y - this._planet.renderer.handler.canvas.height - this._tipEl.clientHeight) + "px)"
         }
     }
 
@@ -98,6 +98,7 @@ class Popup {
         this.el = this._renderTemplate(params);
         this._contentEl = this.el.querySelector(".og-popup-content");
         this._titleEl = this.el.querySelector(".og-popup-title")
+        this._tipEl = this.el.querySelector(".og-popup-tip-container")
         this.setOffset(this._offset[0], this._offset[1]);
         this.setContent(this._content);
         this.setTitle(this._title);

package/src/og/camera/PlanetCamera.js

@@ -2,17 +2,17 @@
  * @module og/camera/PlanetCamera
  */
 
-'use strict';
-
-import * as math from '../math.js';
-import * as mercator from '../mercator.js';
-import { Camera } from './Camera.js';
-import { Vec3 } from '../math/Vec3.js';
-import { Key } from '../Lock.js';
-import { LonLat } from '../LonLat.js';
-import { Ray } from '../math/Ray.js';
-import { Quat } from '../math/Quat.js';
-import { Mat4 } from '../math/Mat4.js';
+"use strict";
+
+import * as math from "../math.js";
+import * as mercator from "../mercator.js";
+import { Camera } from "./Camera.js";
+import { Vec3 } from "../math/Vec3.js";
+import { Key } from "../Lock.js";
+import { LonLat } from "../LonLat.js";
+import { Ray } from "../math/Ray.js";
+import { Quat } from "../math/Quat.js";
+import { Mat4 } from "../math/Mat4.js";
 
 /**
  * Planet camera.
@@ -24,17 +24,28 @@ import { Mat4 } from '../math/Mat4.js';
  * @param {number} [options.viewAngle=37] - Camera angle of view. Default is 35.0
  * @param {number} [options.near] - Camera near plane distance. Default is 1.0
  * @param {number} [options.far] - Camera far plane distance. Deafult is og.math.MAX
- * @param {number} [options.minAltitude] - Minimal altitude for the camera. Deafult is 50
+ * @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)
  */
 class PlanetCamera extends Camera {
     constructor(planet, options) {
-        super(planet.renderer,
-            Object.assign({}, {
-                frustums: /*[[100, 10000000]]*/[[1, 100 + 0.075], [100, 1000 + 0.075], [1000, 1e6 + 10000], [1e6, 1e9]] //[[1, 1e3 + 100], [1e3, 1e6 + 10000], [1e6, 1e9]]*/
-            }, options)
+        super(
+            planet.renderer,
+            Object.assign(
+                {},
+                {
+                    frustums: /*[[100, 10000000]]*/ [
+                        [1, 100 + 0.075],
+                        [100, 1000 + 0.075],
+                        [1000, 1e6 + 10000],
+                        [1e6, 1e9]
+                    ] //[[1, 1e3 + 100], [1e3, 1e6 + 10000], [1e6, 1e9]]*/
+                },
+                options
+            )
         );
         /**
          * Assigned camera's planet.
@@ -50,6 +61,13 @@ class PlanetCamera extends Camera {
          */
         this.minAltitude = options.minAltitude || 1;
 
+        /**
+         * Maximal alltitude that camera can reach over the globe.
+         * @public
+         * @type {number}
+         */
+        this.maxAltitude = options.maxAltitude || 20000000;
+
         /**
          * Current geographical degree position.
          * @protected
@@ -112,6 +130,13 @@ class PlanetCamera extends Camera {
      */
     update() {
         this.events.stopPropagation();
+
+        let maxAlt = this.maxAltitude + this.planet.ellipsoid._a;
+
+        if (this.eye.length() > maxAlt) {
+            this.eye.copy(this.eye.normal().scale(maxAlt));
+        }
+
         super.update();
         this.updateGeodeticPosition();
         this.eyeNorm = this.eye.normal();
@@ -191,7 +216,6 @@ class PlanetCamera extends Camera {
      * @returns {og.Vec3}
      */
     getExtentPosition(extent, height) {
-
         var north = extent.getNorth();
         var south = extent.getSouth();
         var east = extent.getEast();
@@ -273,10 +297,18 @@ class PlanetCamera extends Camera {
      * @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.
+     * @param [frameCallback]
      */
     flyExtent(extent, height, up, ampl, completeCallback, startCallback, frameCallback) {
-        this.flyCartesian(this.getExtentPosition(extent, height), Vec3.ZERO,
-            up, ampl, completeCallback, startCallback, frameCallback);
+        this.flyCartesian(
+            this.getExtentPosition(extent, height),
+            Vec3.ZERO,
+            up,
+            ampl,
+            completeCallback,
+            startCallback,
+            frameCallback
+        );
     }
 
     viewDistance(cartesian, distance = 10000.0) {
@@ -293,7 +325,14 @@ class PlanetCamera extends Camera {
         this.update();
     }
 
-    flyDistance(cartesian, distance = 10000.0, ampl = 0.0, completeCallback, startCallback, frameCallback) {
+    flyDistance(
+        cartesian,
+        distance = 10000.0,
+        ampl = 0.0,
+        completeCallback,
+        startCallback,
+        frameCallback
+    ) {
         let p0 = this.eye.add(this.getForward().scaleTo(distance));
         let _rot = Quat.getRotationBetweenVectors(p0.normal(), cartesian.normal());
         if (_rot.isZero()) {
@@ -302,7 +341,15 @@ class PlanetCamera extends Camera {
         } else {
             let newPos = cartesian.add(_rot.mulVec3(this.getBackward()).scale(distance)),
                 newUp = _rot.mulVec3(this.getUp());
-            this.flyCartesian(newPos, cartesian, newUp, ampl, completeCallback, startCallback, frameCallback);
+            this.flyCartesian(
+                newPos,
+                cartesian,
+                newUp,
+                ampl,
+                completeCallback,
+                startCallback,
+                frameCallback
+            );
         }
     }
 
@@ -315,9 +362,9 @@ class PlanetCamera extends Camera {
      * @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.
+     * @param [frameCallback]
      */
     flyCartesian(cartesian, look, up, ampl = 1.0, completeCallback, startCallback, frameCallback) {
-
         this.stopFlying();
 
         this._completeCallback = completeCallback;
@@ -333,13 +380,17 @@ class PlanetCamera extends Camera {
             look = this.planet.ellipsoid.lonLatToCartesian(look);
         }
 
-        var ground_a = this.planet.ellipsoid.lonLatToCartesian(new LonLat(this._lonLat.lon, this._lonLat.lat));
+        var ground_a = this.planet.ellipsoid.lonLatToCartesian(
+            new LonLat(this._lonLat.lon, this._lonLat.lat)
+        );
         var v_a = this._v,
             n_a = this._n;
 
         var lonlat_b = this.planet.ellipsoid.cartesianToLonLat(cartesian);
         var up_b = up || Vec3.UP;
-        var ground_b = this.planet.ellipsoid.lonLatToCartesian(new LonLat(lonlat_b.lon, lonlat_b.lat, 0));
+        var ground_b = this.planet.ellipsoid.lonLatToCartesian(
+            new LonLat(lonlat_b.lon, lonlat_b.lat, 0)
+        );
         var eye_b = cartesian;
         var n_b = Vec3.sub(eye_b, look);
         var u_b = up_b.cross(n_b);
@@ -350,7 +401,7 @@ class PlanetCamera extends Camera {
         var an = ground_a.normal();
         var bn = ground_b.normal();
         var anbn = 1.0 - an.dot(bn);
-        var hM_a = ampl * math.SQRT_HALF * Math.sqrt((anbn) > 0.0 ? anbn : 0.0);
+        var hM_a = ampl * math.SQRT_HALF * Math.sqrt(anbn > 0.0 ? anbn : 0.0);
 
         var maxHeight = 6639613;
         var currMaxHeight = Math.max(this._lonLat.height, lonlat_b.height);
@@ -370,7 +421,11 @@ class PlanetCamera extends Camera {
             var g_i = ground_a.smerp(ground_b, d).normalize();
             var ground_i = this.planet.getRayIntersectionEllipsoid(new Ray(zero, g_i));
             var t = 1 - d;
-            var height_i = this._lonLat.height * d * d * d + max_h * 3 * d * d * t + max_h * 3 * d * t * t + lonlat_b.height * t * t * t;
+            var height_i =
+                this._lonLat.height * d * d * d +
+                max_h * 3 * d * d * t +
+                max_h * 3 * d * t * t +
+                lonlat_b.height * t * t * t;
 
             var eye_i = ground_i.addA(g_i.scale(height_i));
             var up_i = v_a.smerp(v_b, d);
@@ -406,7 +461,14 @@ class PlanetCamera extends Camera {
      */
     flyLonLat(lonlat, look, up, ampl, completeCallback, startCallback) {
         var _lonlat = new LonLat(lonlat.lon, lonlat.lat, lonlat.height || this._lonLat.height);
-        this.flyCartesian(this.planet.ellipsoid.lonLatToCartesian(_lonlat), look, up, ampl, completeCallback, startCallback);
+        this.flyCartesian(
+            this.planet.ellipsoid.lonLatToCartesian(_lonlat),
+            look,
+            up,
+            ampl,
+            completeCallback,
+            startCallback
+        );
     }
 
     /**
@@ -414,7 +476,6 @@ class PlanetCamera extends Camera {
      * @public
      */
     stopFlying() {
-
         this.planet.layerLock.free(this._keyLock);
         this.planet.terrainLock.free(this._keyLock);
         this.planet._normalMapCreator.free(this._keyLock);
@@ -477,7 +538,7 @@ class PlanetCamera extends Camera {
         this.update();
     }
 
-    rotateVertical(angle, center, isLimited) {
+    rotateVertical(angle, center, minSlope = 0) {
         var rot = new Mat4().setRotation(this._u, angle);
         var tr = new Mat4().setIdentity().translate(center);
         var ntr = new Mat4().setIdentity().translate(center.negateTo());
@@ -491,9 +552,16 @@ class PlanetCamera extends Camera {
         let eyeNorm = eye.normal();
         let slope = n.dot(eyeNorm);
 
-        if (isLimited) {
-            if (slope > 0.1 && v.dot(eyeNorm) > 0 ||
-                this.slope <= 0.1 || this._v.dot(this.eye.normal()) <= 0.0) {
+        if (minSlope) {
+            let dSlope = slope - this.slope;
+
+            if (slope < minSlope && dSlope < 0) return;
+
+            if (
+                (slope > 0.1 && v.dot(eyeNorm) > 0) ||
+                this.slope <= 0.1 ||
+                this._v.dot(this.eye.normal()) <= 0.0
+            ) {
                 this.eye = eye;
                 this._v = v;
                 this._u = u;
@@ -544,8 +612,12 @@ class PlanetCamera extends Camera {
 
     checkTerrainCollision() {
         this._terrainAltitude = this._lonLat.height;
-        if (this._lonLat.height < 1000000 && this._insideSegment && this._insideSegment.planet) {
-            this._terrainAltitude = this._insideSegment.getTerrainPoint(this.eye, this._insideSegmentPosition, this._terrainPoint);
+        if (this._insideSegment && this._insideSegment.planet) {
+            this._terrainAltitude = this._insideSegment.getTerrainPoint(
+                this.eye,
+                this._insideSegmentPosition,
+                this._terrainPoint
+            );
             if (this._terrainAltitude < this.minAltitude) {
                 this.setAltitude(this.minAltitude);
             }
@@ -559,7 +631,10 @@ class PlanetCamera extends Camera {
 
     getHeading() {
         let u = this.eye.normal();
-        let f = Vec3.proj_b_to_plane(this.slope >= 0.97 ? this.getUp() : this.getForward(), u).normalize(),
+        let f = Vec3.proj_b_to_plane(
+                this.slope >= 0.97 ? this.getUp() : this.getForward(),
+                u
+            ).normalize(),
             n = Vec3.proj_b_to_plane(Vec3.UP, u).normalize();
         let res = Math.sign(u.dot(f.cross(n))) * Math.acos(f.dot(n)) * math.DEGREES;
         if (res < 0.0) {
@@ -567,7 +642,6 @@ class PlanetCamera extends Camera {
         }
         return res;
     }
+}
 
-};
-
-export { PlanetCamera };
+export { PlanetCamera };