@openglobus/og 0.17.1 → 0.18.0

package/src/{og/camera/PlanetCamera.js → camera/PlanetCamera.ts}

@@ -1,23 +1,35 @@
-"use strict";
-
-import { Key } from "../Lock.js";
-import { LonLat } from "../LonLat.js";
-import * as math from "../math.js";
-import { Mat4 } from "../math/Mat4.js";
-import { Quat } from "../math/Quat.js";
-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";
+import * as mercator from "../mercator";
+import * as math from "../math";
+import {Camera, ICameraParams} from "./Camera";
+import {Key} from "../Lock";
+import {LonLat} from "../LonLat";
+import {Mat4} from "../math/Mat4";
+import {Planet} from "../scene/Planet";
+import {Quat} from "../math/Quat";
+import {Ray} from "../math/Ray";
+import {Vec3} from "../math/Vec3";
+import {Extent} from "../Extent";
+import {Segment} from "../segment/Segment";
+
+interface IPlanetCameraParams extends ICameraParams {
+    minAltitude?: number;
+    maxAltitude?: number;
+}
+
+type CameraFrame = {
+    eye: Vec3;
+    n: Vec3;
+    u: Vec3;
+    v: Vec3;
+}
 
 /**
  * Planet camera.
  * @class
  * @extends {Camera}
- * @param {RenderNode} planet - Planet render node.
- * @param {Object} [options] - Planet camera options:
- * @param {Object} [options.name] - Camera name.
+ * @param {Planet} planet - Planet render node.
+ * @param {IPlanetCameraParams} [options] - Planet camera options:
+ * @param {string} [options.name] - Camera name.
  * @param {number} [options.viewAngle] - Camera angle of view.
  * @param {number} [options.near] - Camera near plane distance. Default is 1.0
  * @param {number} [options.far] - Camera far plane distance. Default is og.math.MAX
@@ -29,89 +41,115 @@ import { Ellipsoid } from "../ellipsoid/index.js";
  */
 class PlanetCamera extends Camera {
     /**
-     * @param {RenderNode} planet - Planet render node.
-     * @param {Object} [options] - Planet camera options:
+     * Assigned camera's planet.
+     * @public
+     * @type {Planet}
+     */
+    public planet: Planet;
+
+    /**
+     * Minimal altitude that camera can reach over the terrain.
+     * @public
+     * @type {number}
+     */
+    public minAltitude: number;
+
+    /**
+     * Maximal altitude that camera can reach over the globe.
+     * @public
+     * @type {number}
+     */
+    public maxAltitude: number;
+
+    /**
+     * Current geographical degree position.
+     * @public
+     * @type {LonLat}
+     */
+    public _lonLat: LonLat;
+
+    /**
+     * Current geographical mercator position.
+     * @public
+     * @type {LonLat}
+     */
+    public _lonLatMerc: LonLat;
+
+    /**
+     * Current altitude.
+     * @protected
+     * @type {number}
+     */
+    protected _terrainAltitude: number;
+
+    /**
+     * Cartesian coordinates on the terrain.
+     * @protected
+     * @type {Vec3}
      */
-    constructor(planet, options) {
+    protected _terrainPoint: Vec3;
+
+    /**
+     * Quad node that camera flies over.
+     * @protected
+     * @type {Segment}
+     */
+
+    public _insideSegment: Segment | null;
+
+    public slope: number;
+
+    protected _keyLock: Key;
+    protected _framesArr: CameraFrame[];
+    protected _framesCounter: number;
+    protected _numFrames: number;
+    protected _completeCallback: Function | null;
+    protected _frameCallback: Function | null;
+
+    protected _flying: boolean;
+    protected _checkTerrainCollision: boolean;
+
+    public eyeNorm: Vec3;
+
+    constructor(planet: Planet, options: IPlanetCameraParams = {}) {
         super(planet.renderer, {
-                frustums: [
-                    [[1, 100], [100, 1000 + 7.0], [1000 - 7.0, 1e6 + 17], [1e6 - 17, 1e9]]
-                ], //[[1, 1e3 + 100], [1e3, 1e6 + 10000], [1e6, 1e9]]*/
-                ...options
+                ...options,
+                frustums: options.frustums || [[1, 100 + 0.075], [100, 1000 + 0.075], [1000, 1e6 + 10000], [1e6, 1e9]],
             }
         );
-        /**
-         * Assigned camera's planet.
-         * @public
-         * @type {Planet}
-         */
+
         this.planet = planet;
 
-        /**
-         * Minimal alltitude that camera can reach over the terrain.
-         * @public
-         * @type {number}
-         */
         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
-         * @type {LonLat}
-         */
         this._lonLat = this.planet.ellipsoid.cartesianToLonLat(this.eye);
 
-        /**
-         * Current geographical mercator position.
-         * @protected
-         * @type {LonLat}
-         */
         this._lonLatMerc = this._lonLat.forwardMercator();
 
-        /**
-         * Current altitude.
-         * @protected
-         * @type {number}
-         */
         this._terrainAltitude = this._lonLat.height;
 
-        /**
-         * Cartesian coordinates on the terrain.
-         * @protected
-         * @type {Vec3}
-         */
         this._terrainPoint = new Vec3();
 
-        /**
-         * Quad node that camera flies over.
-         * @protected
-         * @type {quadTree.Node}
-         */
         this._insideSegment = null;
 
         this.slope = 0;
 
         this._keyLock = new Key();
 
-        // Camera's flying frames
         this._framesArr = [];
         this._framesCounter = 0;
         this._numFrames = 50;
         this._completeCallback = null;
+        this._frameCallback = null;
         this._flying = false;
         this._checkTerrainCollision = true;
 
-        this._velCart = new Vec3(0.0, 0.0, 0.0);
+        this.eyeNorm = this.eye.getNormal();
     }
 
-    setTerrainCollisionActivity(isActive) {
+    public setTerrainCollisionActivity(isActive: boolean) {
         this._checkTerrainCollision = isActive;
     }
 
@@ -120,26 +158,26 @@ class PlanetCamera extends Camera {
      * @public
      * @virtual
      */
-    update() {
+    public override update() {
         this.events.stopPropagation();
 
-        let maxAlt = this.maxAltitude + this.planet.ellipsoid._a;
+        let maxAlt = this.maxAltitude + this.planet.ellipsoid.getEquatorialSize();
 
         if (this.eye.length() > maxAlt) {
-            this.eye.copy(this.eye.normal().scale(maxAlt));
+            this.eye.copy(this.eye.getNormal().scale(maxAlt));
         }
 
         super.update();
 
         this.updateGeodeticPosition();
 
-        this.eyeNorm = this.eye.normal();
+        this.eyeNorm = this.eye.getNormal();
         this.slope = this._b.dot(this.eyeNorm);
 
         this.events.dispatch(this.events.viewchange, this);
     }
 
-    updateGeodeticPosition() {
+    public updateGeodeticPosition() {
         this.planet.ellipsoid.cartesianToLonLatRes(this.eye, this._lonLat);
         if (Math.abs(this._lonLat.lat) <= mercator.MAX_LAT) {
             LonLat.forwardMercatorRes(this._lonLat, this._lonLatMerc);
@@ -151,7 +189,7 @@ class PlanetCamera extends Camera {
      * @public
      * @param {number} alt - Altitude over the terrain.
      */
-    setAltitude(alt) {
+    public setAltitude(alt: number) {
 
         let t = this._terrainPoint;
         let n = this.planet.ellipsoid.getSurfaceNormal3v(this.eye);
@@ -167,7 +205,7 @@ class PlanetCamera extends Camera {
      * Gets altitude over the terrain.
      * @public
      */
-    getAltitude() {
+    public getAltitude(): number {
         return this._terrainAltitude;
     }
 
@@ -178,12 +216,12 @@ class PlanetCamera extends Camera {
      * @param {LonLat} [lookLonLat] - Look up coordinates.
      * @param {Vec3} [up] - Camera UP vector. Default (0,1,0)
      */
-    setLonLat(lonlat, lookLonLat, up) {
+    public setLonLat(lonlat: LonLat, lookLonLat?: LonLat, up?: Vec3) {
         this.stopFlying();
         this._lonLat.set(lonlat.lon, lonlat.lat, lonlat.height || this._lonLat.height);
-        var el = this.planet.ellipsoid;
-        var newEye = el.lonLatToCartesian(this._lonLat);
-        var newLook = lookLonLat ? el.lonLatToCartesian(lookLonLat) : Vec3.ZERO;
+        let el = this.planet.ellipsoid;
+        let newEye = el.lonLatToCartesian(this._lonLat);
+        let newLook = lookLonLat ? el.lonLatToCartesian(lookLonLat) : Vec3.ZERO;
         this.set(newEye, newLook, up || Vec3.NORTH);
         this.update();
     }
@@ -193,7 +231,7 @@ class PlanetCamera extends Camera {
      * @public
      * @returns {LonLat}
      */
-    getLonLat() {
+    public getLonLat(): LonLat {
         return this._lonLat;
     }
 
@@ -202,7 +240,7 @@ class PlanetCamera extends Camera {
      * @public
      * @returns {number}
      */
-    getHeight() {
+    public getHeight(): number {
         return this._lonLat.height;
     }
 
@@ -213,30 +251,30 @@ class PlanetCamera extends Camera {
      * @param {Number} height - Camera height
      * @returns {Vec3}
      */
-    getExtentPosition(extent, height) {
-        var north = extent.getNorth();
-        var south = extent.getSouth();
-        var east = extent.getEast();
-        var west = extent.getWest();
+    public getExtentPosition(extent: Extent, height: number = 0): Vec3 {
+        let north = extent.getNorth();
+        let south = extent.getSouth();
+        let east = extent.getEast();
+        let west = extent.getWest();
 
         if (west > east) {
             east += 360;
         }
 
-        var e = this.planet.ellipsoid;
+        let e = this.planet.ellipsoid;
 
-        var cart = new LonLat(east, north);
-        var northEast = e.lonLatToCartesian(cart);
+        let cart = new LonLat(east, north);
+        let northEast = e.lonLatToCartesian(cart);
         cart.lat = south;
-        var southEast = e.lonLatToCartesian(cart);
+        let southEast = e.lonLatToCartesian(cart);
         cart.lon = west;
-        var southWest = e.lonLatToCartesian(cart);
+        let southWest = e.lonLatToCartesian(cart);
         cart.lat = north;
-        var northWest = e.lonLatToCartesian(cart);
+        let northWest = e.lonLatToCartesian(cart);
 
-        var center = Vec3.sub(northEast, southWest).scale(0.5).addA(southWest);
+        let center = Vec3.sub(northEast, southWest).scale(0.5).addA(southWest);
 
-        var mag = center.length();
+        let mag = center.length();
         if (mag < 0.000001) {
             cart.lon = (east + west) * 0.5;
             cart.lat = (north + south) * 0.5;
@@ -248,30 +286,30 @@ class PlanetCamera extends Camera {
         northEast.subA(center);
         southWest.subA(center);
 
-        var direction = center.normal(); // ellipsoid.getSurfaceNormal(center).negate().normalize();
-        var right = direction.cross(Vec3.NORTH).normalize();
-        var up = right.cross(direction).normalize();
+        let direction = center.getNormal(); // ellipsoid.getSurfaceNormal(center).negate().normalize();
+        let right = direction.cross(Vec3.NORTH).normalize();
+        let up = right.cross(direction).normalize();
 
-        var _h = Math.max(
+        let _h = Math.max(
             Math.abs(up.dot(northWest)),
             Math.abs(up.dot(southEast)),
             Math.abs(up.dot(northEast)),
             Math.abs(up.dot(southWest))
         );
 
-        var _w = Math.max(
+        let _w = Math.max(
             Math.abs(right.dot(northWest)),
             Math.abs(right.dot(southEast)),
             Math.abs(right.dot(northEast)),
             Math.abs(right.dot(southWest))
         );
 
-        var tanPhi = Math.tan(this._viewAngle * math.RADIANS * 0.5);
-        var tanTheta = this._aspect * tanPhi;
-        var d = Math.max(_w / tanTheta, _h / tanPhi);
+        let tanPhi = Math.tan(this._viewAngle * math.RADIANS * 0.5);
+        let tanTheta = this._aspect * tanPhi;
+        let d = Math.max(_w / tanTheta, _h / tanPhi);
 
         center.normalize();
-        center.scale(mag + d + (height || 0));
+        center.scale(mag + d + height);
 
         return center;
     }
@@ -280,8 +318,9 @@ class PlanetCamera extends Camera {
      * View current extent.
      * @public
      * @param {Extent} extent - Current extent.
+     * @param {number} [height]
      */
-    viewExtent(extent, height) {
+    public viewExtent(extent: Extent, height?: number) {
         this.stopFlying();
         this.set(this.getExtentPosition(extent, height), Vec3.ZERO, Vec3.NORTH);
         this.update();
@@ -291,13 +330,21 @@ class PlanetCamera extends Camera {
      * Flies to the current extent.
      * @public
      * @param {Extent} extent - Current extent.
+     * @param {number} [height] - Destination height.
      * @param {Vec3} [up] - Camera UP in the end of flying. Default - (0,1,0)
      * @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]
+     * @param {Function} [completeCallback] - Callback that calls after flying when flying is finished.
+     * @param {Function} [startCallback] - Callback that calls before the flying begins.
+     * @param {Function} [frameCallback] - Each frame callback
      */
-    flyExtent(extent, height, up, ampl, completeCallback, startCallback, frameCallback) {
+    public flyExtent(
+        extent: Extent,
+        height?: number,
+        up?: Vec3,
+        ampl?: number,
+        completeCallback?: Function,
+        startCallback?: Function,
+        frameCallback?: Function) {
         this.flyCartesian(
             this.getExtentPosition(extent, height),
             Vec3.ZERO,
@@ -309,9 +356,9 @@ class PlanetCamera extends Camera {
         );
     }
 
-    viewDistance(cartesian, distance = 10000.0) {
+    public viewDistance(cartesian: Vec3, distance: number = 10000.0) {
         let p0 = this.eye.add(this.getForward().scaleTo(distance));
-        let _rot = Quat.getRotationBetweenVectors(p0.normal(), cartesian.normal());
+        let _rot = Quat.getRotationBetweenVectors(p0.getNormal(), cartesian.getNormal());
         if (_rot.isZero()) {
             let newPos = cartesian.add(this.getBackward().scaleTo(distance));
             this.set(newPos, cartesian);
@@ -323,16 +370,16 @@ class PlanetCamera extends Camera {
         this.update();
     }
 
-    flyDistance(
-        cartesian,
-        distance = 10000.0,
-        ampl = 0.0,
-        completeCallback,
-        startCallback,
-        frameCallback
+    public flyDistance(
+        cartesian: Vec3,
+        distance: number = 10000.0,
+        ampl: number = 0.0,
+        completeCallback?: Function,
+        startCallback?: Function,
+        frameCallback?: Function
     ) {
         let p0 = this.eye.add(this.getForward().scaleTo(distance));
-        let _rot = Quat.getRotationBetweenVectors(p0.normal(), cartesian.normal());
+        let _rot = Quat.getRotationBetweenVectors(p0.getNormal(), cartesian.getNormal());
         if (_rot.isZero()) {
             let newPos = cartesian.add(this.getBackward().scaleTo(distance));
             this.set(newPos, cartesian);
@@ -358,14 +405,21 @@ class PlanetCamera extends Camera {
      * @param {Vec3} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
      * @param {Vec3} [up] - Camera UP vector in the end of flying. Default - (0,1,0)
      * @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]
+     * @param {Function} [completeCallback] - Callback that calls after flying when flying is finished.
+     * @param {Function} [startCallback] - Callback that calls before the flying begins.
+     * @param {Function} [frameCallback] - Each frame callback
      */
-    flyCartesian(cartesian, look = Vec3.ZERO, up = Vec3.NORTH, ampl = 1.0, completeCallback = () => {
-    }, startCallback = () => {
-    }, frameCallback = () => {
-    }) {
+    flyCartesian(
+        cartesian: Vec3,
+        look: Vec3 | LonLat | null = Vec3.ZERO,
+        up: Vec3 | null = Vec3.NORTH,
+        ampl: number = 1.0,
+        completeCallback: Function | null = () => {
+        },
+        startCallback: Function | null = () => {
+        },
+        frameCallback: Function | null = () => {
+        }) {
 
         this.stopFlying();
 
@@ -384,63 +438,62 @@ class PlanetCamera extends Camera {
             look = this.planet.ellipsoid.lonLatToCartesian(look);
         }
 
-        var ground_a = this.planet.ellipsoid.lonLatToCartesian(
+        let ground_a = this.planet.ellipsoid.lonLatToCartesian(
             new LonLat(this._lonLat.lon, this._lonLat.lat)
         );
-        var v_a = this._u,
+
+        let v_a = this._u,
             n_a = this._b;
 
-        var lonlat_b = this.planet.ellipsoid.cartesianToLonLat(cartesian);
-        var up_b = up;
-        var ground_b = this.planet.ellipsoid.lonLatToCartesian(
+        let lonlat_b = this.planet.ellipsoid.cartesianToLonLat(cartesian);
+        let up_b = up;
+        let 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);
+        let n_b = Vec3.sub(cartesian, look as Vec3);
+        let u_b = up_b.cross(n_b);
         n_b.normalize();
         u_b.normalize();
-        var v_b = n_b.cross(u_b);
+        let v_b = n_b.cross(u_b);
 
-        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);
+        let an = ground_a.getNormal();
+        let bn = ground_b.getNormal();
+        let anbn = 1.0 - an.dot(bn);
+        let 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);
+        let maxHeight = 6639613;
+        let currMaxHeight = Math.max(this._lonLat.height, lonlat_b.height);
         if (currMaxHeight > maxHeight) {
             maxHeight = currMaxHeight;
         }
-        var max_h = currMaxHeight + 2.5 * hM_a * (maxHeight - currMaxHeight);
-        var zero = Vec3.ZERO;
+        let max_h = currMaxHeight + 2.5 * hM_a * (maxHeight - currMaxHeight);
+        let zero = Vec3.ZERO;
 
         // camera path and orientations calculation
         for (let i = 0; i <= this._numFrames; i++) {
-            var d = 1 - i / this._numFrames;
+            let d = 1 - i / this._numFrames;
             d = d * d * (3 - 2 * d);
             d *= d;
 
-            // Error here
-            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 =
+            let g_i = ground_a.smerp(ground_b, d).normalize();
+            let ground_i = this.planet.getRayIntersectionEllipsoid(new Ray(zero, g_i));
+            let t = 1 - d;
+            let 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);
-            var look_i = Vec3.add(eye_i, n_a.smerp(n_b, d).negateTo());
+            let eye_i = ground_i!.addA(g_i.scale(height_i));
+            let up_i = v_a.smerp(v_b, d);
+            let look_i = Vec3.add(eye_i, n_a.smerp(n_b, d).negateTo());
 
-            var n = new Vec3(eye_i.x - look_i.x, eye_i.y - look_i.y, eye_i.z - look_i.z);
-            var u = up_i.cross(n);
+            let n = new Vec3(eye_i.x - look_i.x, eye_i.y - look_i.y, eye_i.z - look_i.z);
+            let u = up_i.cross(n);
             n.normalize();
             u.normalize();
 
-            var v = n.cross(u);
+            let v = n.cross(u);
             this._framesArr[i] = {
                 eye: eye_i,
                 n: n,
@@ -457,21 +510,31 @@ class PlanetCamera extends Camera {
      * Flies to the geo coordinates.
      * @public
      * @param {LonLat} lonlat - Finish coordinates.
-     * @param {Vec3} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
+     * @param {Vec3 | LonLat} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
      * @param {Vec3} [up] - Camera UP vector in the end of flying. Default - (0,1,0)
-     * @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 {number} [ampl] - Altitude amplitude factor.
+     * @param {Function} [completeCallback] - Callback that calls after flying when flying is finished.
+     * @param {Function} [startCallback] - Callback that calls befor the flying begins.
+     * @param {Function} [frameCallback] - each frame callback
      */
-    flyLonLat(lonlat, look, up, ampl, completeCallback, startCallback) {
-        var _lonLat = new LonLat(lonlat.lon, lonlat.lat, lonlat.height || this._lonLat.height);
+    flyLonLat(
+        lonlat: LonLat,
+        look?: Vec3 | LonLat,
+        up?: Vec3,
+        ampl?: number,
+        completeCallback?: Function,
+        startCallback?: Function,
+        frameCallbak?: Function
+    ) {
+        let _lonLat = new LonLat(lonlat.lon, lonlat.lat, lonlat.height || this._lonLat.height);
         this.flyCartesian(
             this.planet.ellipsoid.lonLatToCartesian(_lonLat),
             look,
             up,
             ampl,
             completeCallback,
-            startCallback
+            startCallback,
+            frameCallbak
         );
     }
 
@@ -482,7 +545,7 @@ class PlanetCamera extends Camera {
     stopFlying() {
         this.planet.layerLock.free(this._keyLock);
         this.planet.terrainLock.free(this._keyLock);
-        this.planet._normalMapCreator.free(this._keyLock);
+        this.planet.normalMapCreator.free(this._keyLock);
 
         this._flying = false;
         this._framesArr.length = 0;
@@ -506,8 +569,8 @@ class PlanetCamera extends Camera {
      * @param {number} angle - Rotation angle.
      * @param {boolean} [spin] - If its true rotates around globe spin.
      */
-    rotateLeft(angle, spin) {
-        this.rotateHorizontal(angle * math.RADIANS, spin ^ true, Vec3.ZERO);
+    public rotateLeft(angle: number, spin: boolean) {
+        this.rotateHorizontal(angle * math.RADIANS, spin !== true, Vec3.ZERO);
         this.update();
     }
 
@@ -517,43 +580,43 @@ class PlanetCamera extends Camera {
      * @param {number} angle - Rotation angle.
      * @param {boolean} [spin] - If its true rotates around globe spin.
      */
-    rotateRight(angle, spin) {
-        this.rotateHorizontal(-angle * math.RADIANS, spin ^ true, Vec3.ZERO);
+    public rotateRight(angle: number, spin: boolean) {
+        this.rotateHorizontal(-angle * math.RADIANS, spin !== true, Vec3.ZERO);
         this.update();
     }
 
     /**
-     * Rotates around planet to the north pole.
+     * Rotates around planet to the North Pole.
      * @public
      * @param {number} angle - Rotation angle.
      */
-    rotateUp(angle) {
+    public rotateUp(angle: number) {
         this.rotateVertical(angle * math.RADIANS, Vec3.ZERO);
         this.update();
     }
 
     /**
-     * Rotates around planet to the south pole.
+     * Rotates around planet to the South Pole.
      * @public
      * @param {number} angle - Rotation angle.
      */
-    rotateDown(angle) {
+    public rotateDown(angle: number) {
         this.rotateVertical(-angle * math.RADIANS, Vec3.ZERO);
         this.update();
     }
 
-    rotateVertical(angle, center, minSlope = 0) {
-        var rot = new Mat4().setRotation(this._r, angle);
-        var tr = new Mat4().setIdentity().translate(center);
-        var ntr = new Mat4().setIdentity().translate(center.negateTo());
-        var trm = tr.mul(rot).mul(ntr);
+    public override rotateVertical(angle: number, center: Vec3, minSlope: number = 0) {
+        let rot = new Mat4().setRotation(this._r, angle);
+        let tr = new Mat4().setIdentity().translate(center);
+        let ntr = new Mat4().setIdentity().translate(center.negateTo());
+        let trm = tr.mul(rot).mul(ntr);
 
         let eye = trm.mulVec3(this.eye);
         let u = rot.mulVec3(this._u).normalize();
         let r = rot.mulVec3(this._r).normalize();
         let b = rot.mulVec3(this._b).normalize();
 
-        let eyeNorm = eye.normal();
+        let eyeNorm = eye.getNormal();
         let slope = b.dot(eyeNorm);
 
         if (minSlope) {
@@ -564,7 +627,7 @@ class PlanetCamera extends Camera {
             if (
                 (slope > 0.1 && u.dot(eyeNorm) > 0) ||
                 this.slope <= 0.1 ||
-                this._u.dot(this.eye.normal()) <= 0.0
+                this._u.dot(this.eye.getNormal()) <= 0.0
             ) {
                 this.eye = eye;
                 this._u = u;
@@ -583,13 +646,13 @@ class PlanetCamera extends Camera {
      * Prepare camera to the frame. Used in render node frame function.
      * @public
      */
-    checkFly() {
+    public checkFly() {
         if (this._flying) {
-            var c = this._numFrames - this._framesCounter;
+            let c = this._numFrames - this._framesCounter;
 
             this.planet.layerLock.lock(this._keyLock);
             this.planet.terrainLock.lock(this._keyLock);
-            this.planet._normalMapCreator.lock(this._keyLock);
+            this.planet.normalMapCreator.lock(this._keyLock);
 
             this.eye = this._framesArr[c].eye;
             this._r = this._framesArr[c].u;
@@ -614,7 +677,7 @@ class PlanetCamera extends Camera {
         }
     }
 
-    checkTerrainCollision() {
+    public checkTerrainCollision() {
         this._terrainAltitude = this._lonLat.height;
         if (this._insideSegment && this._insideSegment.planet) {
             this._terrainAltitude = this._insideSegment.getTerrainPoint(
@@ -629,13 +692,13 @@ class PlanetCamera extends Camera {
         }
     }
 
-    getSurfaceVisibleDistance(d) {
-        let R = this.planet.ellipsoid._a;
+    public getSurfaceVisibleDistance(d: number): number {
+        let R = this.planet.ellipsoid.equatorialSize;
         return R * Math.acos(R / (R + this._lonLat.height + d));
     }
 
-    getHeading() {
-        let u = this.eye.normal();
+    public getHeading(): number {
+        let u = this.eye.getNormal();
         let f = Vec3.proj_b_to_plane(
                 this.slope >= 0.97 ? this.getUp() : this.getForward(),
                 u
@@ -648,9 +711,9 @@ class PlanetCamera extends Camera {
         return res;
     }
 
-    isVisible(poi) {
+    public isVisible(poi: Vec3): boolean {
         let e = this.eye.length();
-        return this.eye.distance(poi) < Math.sqrt(e * e - this.planet.ellipsoid._a2);
+        return this.eye.distance(poi) < Math.sqrt(e * e - this.planet.ellipsoid.equatorialSizeSqr);
     }
 
     // _calcOrientation() {
@@ -672,4 +735,4 @@ class PlanetCamera extends Camera {
     // }
 }
 
-export { PlanetCamera };
+export {PlanetCamera};