@openglobus/og 0.12.4 → 0.13.0

package/src/og/control/LayerSwitcher.js

@@ -55,7 +55,7 @@ class LayerSwitcher extends Control {
         layer._removeCallback = null;
     }
 
-    addSwitcher(type, obj, container, id) {
+    addSwitcher(type, obj, container, id = "") {
         var lineDiv = document.createElement("div");
 
         var that = this;

package/src/og/control/MouseNavigation.js

@@ -46,8 +46,8 @@ class MouseNavigation extends Control {
 
         this._lmbDoubleClickActive = true;
 
-        this.minSlope = options.minSlope || 0.1;
-
+        this.minSlope = options.minSlope || 0.1;
+
         this._wheelDirection = +1;
 
         this._keyLock = new Key();
@@ -75,7 +75,7 @@ class MouseNavigation extends Control {
             var d = a ? (delta * cam.eye.distance(a)) / stepsCount : 1000;
 
             if (forward) {
-                d = -1.25*d;
+                d = -1.25 * d;
             } else {
                 d *= 2;
             }
@@ -214,7 +214,7 @@ class MouseNavigation extends Control {
         this._deactivate = true;
 
         this.planet.layerLock.lock(this._keyLock);
-        this.planet.terrainLock.lock(this._keyLock);
+        //this.planet.terrainLock.lock(this._keyLock);
         this.planet._normalMapCreator.lock(this._keyLock);
 
         var ms = this.renderer.events.mouseState;
@@ -226,9 +226,9 @@ class MouseNavigation extends Control {
             ms,
             event.wheelDelta > 0,
             ms.direction
-        );
-
-        this._wheelDirection = event.wheelDelta;
+        );
+
+        this._wheelDirection = event.wheelDelta;
 
         if (this.stepsForward) {
             this.stepIndex = this.stepsCount;
@@ -247,14 +247,23 @@ class MouseNavigation extends Control {
         this.stopRotation();
         var p = this.planet.getCartesianFromPixelTerrain(this.renderer.events.mouseState);
         if (p) {
+            var cam = this.renderer.activeCamera;
+            let maxAlt = cam.maxAltitude + this.planet.ellipsoid._b;
+            let minAlt = cam.minAltitude + this.planet.ellipsoid._b;
+            const camAlt = cam.eye.length();
             var g = this.planet.ellipsoid.cartesianToLonLat(p);
+            if (camAlt > maxAlt || camAlt < minAlt) {
+                this.planet.flyLonLat(new LonLat(g.lon, g.lat))
+                return;
+            }
+
             if (this.renderer.events.isKeyPressed(input.KEY_ALT)) {
                 this.planet.flyLonLat(
-                    new LonLat(g.lon, g.lat, this.renderer.activeCamera.eye.distance(p) * 2.0)
+                    new LonLat(g.lon, g.lat, cam.eye.distance(p) * 2.0)
                 );
             } else {
                 this.planet.flyLonLat(
-                    new LonLat(g.lon, g.lat, this.renderer.activeCamera.eye.distance(p) * 0.57)
+                    new LonLat(g.lon, g.lat, cam.eye.distance(p) * 0.57)
                 );
             }
         }
@@ -264,7 +273,7 @@ class MouseNavigation extends Control {
         if (this._active) {
             this.renderer.handler.canvas.classList.add("ogGrabbingPoiner");
             this.grabbedPoint = this.planet.getCartesianFromMouseTerrain();
-            if (this.grabbedPoint) {
+            if (this.grabbedPoint) {
                 this._eye0.copy(this.renderer.activeCamera.eye);
                 this.grabbedSpheroid.radius = this.grabbedPoint.length();
                 this.stopRotation();
@@ -279,7 +288,7 @@ class MouseNavigation extends Control {
         this.planet._normalMapCreator.free(this._keyLock);
     }
 
-    onMouseLeftButtonUp(e) {
+    onMouseLeftButtonUp(e) {
         this.renderer.handler.canvas.classList.remove("ogGrabbingPoiner");
         if (e.x === e.prev_x && e.y === e.prev_y) {
             this.scaleRot = 0.0;
@@ -343,7 +352,7 @@ class MouseNavigation extends Control {
     }
 
     onMouseRightButtonDown(e) {
-        var cam = this.renderer.activeCamera;
+        var cam = this.renderer.activeCamera;
 
         if (this.pointOnEarth && this.renderer.events.mouseState.moving) {
             this.renderer.controlsBag.scaleRot = 1.0;
@@ -387,7 +396,7 @@ class MouseNavigation extends Control {
                 let maxAlt = cam.maxAltitude + this.planet.ellipsoid._b;
                 let minAlt = cam.minAltitude + this.planet.ellipsoid._b;
                 const camAlt = sf.eye.length();
-                if (camAlt > maxAlt || camAlt < minAlt && this._wheelDirection > 0) {
+                if (camAlt > maxAlt || camAlt < minAlt && this._wheelDirection > 0) {
                     this._wheelDirection = +1;
                     return;
                 }

package/src/og/control/MouseWheelZoomControl.js

@@ -120,7 +120,7 @@ class MouseWheelZoomControl extends Control {
             this.planet,
             this.stepsCount,
             this.distDiff,
-            this.renderer.getCenter(),
+            this.renderer.handler.getCenter(),
             true,
            null
         );
@@ -153,7 +153,7 @@ class MouseWheelZoomControl extends Control {
             this.planet,
             this.stepsCount,
             this.distDiff,
-            this.renderer.getCenter(),
+            this.renderer.handler.getCenter(),
             false,
            null
         );

package/src/og/control/ScaleControl.js

@@ -52,7 +52,7 @@ class ScaleControl extends Control {
         this.renderer.div.appendChild(this.el);
 
         this.renderer.events.on("draw", (e) => {
-            if (e.events.mouseState.anyEvent()) {
+            if (e.events.pointerEvent()) {
                 this._draw();
             }
         });