@openglobus/og 0.18.1 → 0.18.2

package/lib/js/Globe.js

@@ -117,7 +117,7 @@ class Globe {
             autoActivate: false,
             pixelRatio: options.dpi || (window.devicePixelRatio + 0.15),
             context: {
-                alpha: false,
+                //alpha: false,
                 antialias: false,
                 premultipliedAlpha: false
             }

package/lib/js/ellipsoid/Ellipsoid.js

@@ -153,6 +153,9 @@ class Ellipsoid {
     projToSurface(p) {
         let pX = p.x || 0.0, pY = p.y || 0.0, pZ = p.z || 0.0;
         let length = Math.sqrt(pX * pX + pY * pY + pZ * pZ);
+        if (length === 0) {
+            return this.lonLatToCartesian(new LonLat());
+        }
         let invRadii2X = this._invRadii2.x, invRadii2Y = this._invRadii2.y, invRadii2Z = this._invRadii2.z;
         let x2 = pX * pX * invRadii2X, y2 = pY * pY * invRadii2Y, z2 = pZ * pZ * invRadii2Z;
         let norm = x2 + y2 + z2;

package/lib/js/entity/Entity.js

@@ -178,7 +178,7 @@ class Entity {
                 this._lonLatMerc.lon = this._lonLatMerc.lat = this._lonLatMerc.height = 0;
             }
         }
-        ec && ec.events.dispatch(ec.events.entitymove, this);
+        //ec && ec.events.dispatch(ec.events.entitymove, this);
     }
     /**
      * Sets entity cartesian position without event dispatching.

package/lib/js/entity/EntityCollection.d.ts

@@ -37,7 +37,7 @@ interface IEntityCollectionParams {
  * @param {number} [options.opacity] - Entity global opacity.
  * @param {boolean} [options.pickingEnabled=true] - Entity picking enable.
  * @param {Number} [options.polygonOffsetUnits=0.0] - The multiplier by which an implementation-specific value is multiplied with to create a constant depth offset. The default value is 0.
- * @fires EntityCollection#entitymove
+ * //@fires EntityCollection#entitymove
  * @fires EntityCollection#draw
  * @fires EntityCollection#drawend
  * @fires EntityCollection#add
@@ -327,7 +327,6 @@ declare class EntityCollection {
     protected _clearEntity(entity: Entity): void;
 }
 type EntityCollectionEventList = [
-    "entitymove",
     "draw",
     "drawend",
     "add",

package/lib/js/entity/EntityCollection.js

@@ -21,7 +21,7 @@ import { StripHandler } from "./StripHandler";
  * @param {number} [options.opacity] - Entity global opacity.
  * @param {boolean} [options.pickingEnabled=true] - Entity picking enable.
  * @param {Number} [options.polygonOffsetUnits=0.0] - The multiplier by which an implementation-specific value is multiplied with to create a constant depth offset. The default value is 0.
- * @fires EntityCollection#entitymove
+ * //@fires EntityCollection#entitymove
  * @fires EntityCollection#draw
  * @fires EntityCollection#drawend
  * @fires EntityCollection#add
@@ -452,11 +452,11 @@ class EntityCollection {
 }
 EntityCollection.__counter__ = 0;
 const ENTITYCOLLECTION_EVENTS = [
-    /**
-     * Triggered when entity has moved.
-     * @event EntityCollection#entitymove
-     */
-    "entitymove",
+    // /**
+    //  * Triggered when entity has moved.
+    //  * @event EntityCollection#entitymove
+    //  */
+    // "entitymove",
     /**
      * Triggered when collection entities begin draw.
      * @event EntityCollection#draw

package/lib/js/entity/Label.js

@@ -99,7 +99,7 @@ class Label extends BaseBillboard {
      * @param {string} face - Font face family.
      */
     setFace(face) {
-        this._face = face.trim().toLowerCase();
+        this._face = face.trim();
         this.update();
     }
     /**

package/lib/js/layer/Vector.d.ts

@@ -21,7 +21,6 @@ export interface IVectorParams extends ILayerParams {
     labelMaxLetters?: number;
 }
 type VectorEventsList = [
-    "entitymove",
     "draw",
     "entityadd",
     "entityremove"
@@ -51,7 +50,7 @@ export type VectorEventsType = EventsHandler<VectorEventsList> & EventsHandler<L
  * @param {boolean} [options.relativeToGround = false] - Place vector data relative to the ground relief.
  * @param {Number} [options.polygonOffsetUnits=0.0] - The multiplier by which an implementation-specific value is multiplied with to create a constant depth offset.
  *
- * @fires EventsHandler<VectorEventsList>#entitymove
+ * //@fires EventsHandler<VectorEventsList>#entitymove
  * @fires EventsHandler<VectorEventsList>#draw
  * @fires EventsHandler<VectorEventsList>#add
  * @fires EventsHandler<VectorEventsList>#remove

package/lib/js/layer/Vector.js

@@ -51,7 +51,7 @@ function _entitiesConstructor(entities) {
  * @param {boolean} [options.relativeToGround = false] - Place vector data relative to the ground relief.
  * @param {Number} [options.polygonOffsetUnits=0.0] - The multiplier by which an implementation-specific value is multiplied with to create a constant depth offset.
  *
- * @fires EventsHandler<VectorEventsList>#entitymove
+ * //@fires EventsHandler<VectorEventsList>#entitymove
  * @fires EventsHandler<VectorEventsList>#draw
  * @fires EventsHandler<VectorEventsList>#add
  * @fires EventsHandler<VectorEventsList>#remove
@@ -480,82 +480,82 @@ class Vector extends Layer {
         //
         // @todo: replace with arrow functions and '...e'
         //
-        entityCollection.events.on("entitymove", function (e) {
-            ve.dispatch(ve.entitymove, e);
-        });
-        entityCollection.events.on("mousemove", function (e) {
+        // entityCollection.events.on("entitymove", (e: any) => {
+        //     ve.dispatch(ve.entitymove, e);
+        // });
+        entityCollection.events.on("mousemove", (e) => {
             ve.dispatch(ve.mousemove, e);
         });
-        entityCollection.events.on("mouseenter", function (e) {
+        entityCollection.events.on("mouseenter", (e) => {
             ve.dispatch(ve.mouseenter, e);
         });
-        entityCollection.events.on("mouseleave", function (e) {
+        entityCollection.events.on("mouseleave", (e) => {
             ve.dispatch(ve.mouseleave, e);
         });
-        entityCollection.events.on("lclick", function (e) {
+        entityCollection.events.on("lclick", (e) => {
             ve.dispatch(ve.lclick, e);
         });
-        entityCollection.events.on("rclick", function (e) {
+        entityCollection.events.on("rclick", (e) => {
             ve.dispatch(ve.rclick, e);
         });
-        entityCollection.events.on("mclick", function (e) {
+        entityCollection.events.on("mclick", (e) => {
             ve.dispatch(ve.mclick, e);
         });
-        entityCollection.events.on("ldblclick", function (e) {
+        entityCollection.events.on("ldblclick", (e) => {
             ve.dispatch(ve.ldblclick, e);
         });
-        entityCollection.events.on("rdblclick", function (e) {
+        entityCollection.events.on("rdblclick", (e) => {
             ve.dispatch(ve.rdblclick, e);
         });
-        entityCollection.events.on("mdblclick", function (e) {
+        entityCollection.events.on("mdblclick", (e) => {
             ve.dispatch(ve.mdblclick, e);
         });
-        entityCollection.events.on("lup", function (e) {
+        entityCollection.events.on("lup", (e) => {
             ve.dispatch(ve.lup, e);
         });
-        entityCollection.events.on("rup", function (e) {
+        entityCollection.events.on("rup", (e) => {
             ve.dispatch(ve.rup, e);
         });
-        entityCollection.events.on("mup", function (e) {
+        entityCollection.events.on("mup", (e) => {
             ve.dispatch(ve.mup, e);
         });
-        entityCollection.events.on("ldown", function (e) {
+        entityCollection.events.on("ldown", (e) => {
             ve.dispatch(ve.ldown, e);
         });
-        entityCollection.events.on("rdown", function (e) {
+        entityCollection.events.on("rdown", (e) => {
             ve.dispatch(ve.rdown, e);
         });
-        entityCollection.events.on("mdown", function (e) {
+        entityCollection.events.on("mdown", (e) => {
             ve.dispatch(ve.mdown, e);
         });
-        entityCollection.events.on("lhold", function (e) {
+        entityCollection.events.on("lhold", (e) => {
             ve.dispatch(ve.lhold, e);
         });
-        entityCollection.events.on("rhold", function (e) {
+        entityCollection.events.on("rhold", (e) => {
             ve.dispatch(ve.rhold, e);
         });
-        entityCollection.events.on("mhold", function (e) {
+        entityCollection.events.on("mhold", (e) => {
             ve.dispatch(ve.mhold, e);
         });
-        entityCollection.events.on("mousewheel", function (e) {
+        entityCollection.events.on("mousewheel", (e) => {
             ve.dispatch(ve.mousewheel, e);
         });
-        entityCollection.events.on("touchmove", function (e) {
+        entityCollection.events.on("touchmove", (e) => {
             ve.dispatch(ve.touchmove, e);
         });
-        entityCollection.events.on("touchstart", function (e) {
+        entityCollection.events.on("touchstart", (e) => {
             ve.dispatch(ve.touchstart, e);
         });
-        entityCollection.events.on("touchend", function (e) {
+        entityCollection.events.on("touchend", (e) => {
             ve.dispatch(ve.touchend, e);
         });
-        entityCollection.events.on("doubletouch", function (e) {
+        entityCollection.events.on("doubletouch", (e) => {
             ve.dispatch(ve.doubletouch, e);
         });
-        entityCollection.events.on("touchleave", function (e) {
+        entityCollection.events.on("touchleave", (e) => {
             ve.dispatch(ve.touchleave, e);
         });
-        entityCollection.events.on("touchenter", function (e) {
+        entityCollection.events.on("touchenter", (e) => {
             ve.dispatch(ve.touchenter, e);
         });
     }
@@ -825,11 +825,11 @@ class Vector extends Layer {
     }
 }
 const VECTOR_EVENTS = [
-    /**
-     * Triggered when entity has moved.
-     * @event EventsHandler<VectorEventsList>#draw
-     */
-    "entitymove",
+    // /**
+    //  * Triggered when entity has moved.
+    //  * @event EventsHandler<VectorEventsList>#draw
+    //  */
+    // "entitymove",
     /**
      * Triggered when layer begin draw.
      * @event EventsHandler<VectorEventsList>#draw

package/lib/js/renderer/Renderer.d.ts

@@ -152,6 +152,12 @@ declare class Renderer {
     screenTexture: Record<string, WebGLTexture>;
     outputTexture: WebGLTexture | null;
     protected _pickingMaskCoordinatesBuffer: WebGLBufferExt | null;
+    protected _skipDistanceFrame: boolean;
+    protected _distancePixelBuffer: WebGLBuffer | null;
+    protected _skipPickingFrame: boolean;
+    protected _pickingPixelBuffer: WebGLBuffer | null;
+    protected _readDistanceBuffer: () => void;
+    protected _readPickingBuffer: () => void;
     constructor(handler: Handler, params?: IRendererParams);
     enableBlendOneSrcAlpha(): void;
     enableBlendDefault(): void;
@@ -236,6 +242,7 @@ declare class Renderer {
      * @public
      */
     initialize(): void;
+    _initReadPixelsBuffers(): void;
     _initializeControls(): void;
     resize(): void;
     setCurrentScreen(screenName: string): void;
@@ -293,12 +300,14 @@ declare class Renderer {
     protected _drawPickingBuffer(): void;
     /**
      * Draw picking objects framebuffer.
-     * @private
+     * @protected
      */
     protected _drawDistanceBuffer(): void;
     protected _drawDepthBuffer(): void;
-    protected _readPickingBuffer(): void;
-    protected _readDistanceBuffer(): void;
+    protected _readPickingBuffer_webgl1: () => void;
+    protected _readPickingBuffer_webgl2: () => void;
+    protected _readDistanceBuffer_webgl1: () => void;
+    protected _readDistanceBuffer_webgl2: () => void;
     readPickingColor(x: number, y: number, outColor: NumberArray3 | Uint8Array): void;
     readDistanceColor(x: number, y: number, outColor: NumberArray3 | Uint8Array): void;
     /**

package/lib/js/renderer/Renderer.js

@@ -18,6 +18,23 @@ const MSAA_DEFAULT = 0;
 let __pickingCallbackCounter__ = 0;
 let __depthCallbackCounter__ = 0;
 let __distanceCallbackCounter__ = 0;
+function clientWaitAsync(gl, sync, flags) {
+    return new Promise((resolve, reject) => {
+        function check() {
+            const res = gl.clientWaitSync(sync, flags, 0);
+            if (res == gl.WAIT_FAILED) {
+                reject();
+            }
+            else if (res == gl.TIMEOUT_EXPIRED) {
+                requestAnimationFrame(check);
+            }
+            else {
+                resolve();
+            }
+        }
+        check();
+    });
+}
 /**
  * Represents high level WebGL context interface that starts WebGL handler working in real time.
  * @class
@@ -54,6 +71,64 @@ let __distanceCallbackCounter__ = 0;
 let __resizeTimeout;
 class Renderer {
     constructor(handler, params = {}) {
+        this._readPickingBuffer_webgl1 = () => {
+            this.pickingFramebuffer.activate();
+            this.pickingFramebuffer.readAllPixels(this._tempPickingPix_);
+            this.pickingFramebuffer.deactivate();
+        };
+        this._readPickingBuffer_webgl2 = () => {
+            const gl = this.handler.gl;
+            const buf = this._pickingPixelBuffer;
+            if (!this._skipPickingFrame) {
+                this._skipPickingFrame = true;
+                let dest = this._tempPickingPix_;
+                let w = this.pickingFramebuffer.width, h = this.pickingFramebuffer.height;
+                this.pickingFramebuffer.activate();
+                gl.bindBuffer(gl.PIXEL_PACK_BUFFER, buf);
+                gl.bufferData(gl.PIXEL_PACK_BUFFER, dest.byteLength, gl.STREAM_READ);
+                gl.readPixels(0, 0, w, h, gl.RGBA, gl.UNSIGNED_BYTE, 0);
+                gl.bindBuffer(gl.PIXEL_PACK_BUFFER, null);
+                this.pickingFramebuffer.deactivate();
+                const sync = gl.fenceSync(gl.SYNC_GPU_COMMANDS_COMPLETE, 0);
+                gl.flush();
+                clientWaitAsync(gl, sync, 0).then(() => {
+                    this._skipPickingFrame = false;
+                    gl.deleteSync(sync);
+                    gl.bindBuffer(gl.PIXEL_PACK_BUFFER, buf);
+                    gl.getBufferSubData(gl.PIXEL_PACK_BUFFER, 0, dest);
+                    gl.bindBuffer(gl.PIXEL_PACK_BUFFER, null);
+                });
+            }
+        };
+        this._readDistanceBuffer_webgl1 = () => {
+            this.distanceFramebuffer.activate();
+            this.distanceFramebuffer.readAllPixels(this._tempDistancePix_);
+            this.distanceFramebuffer.deactivate();
+        };
+        this._readDistanceBuffer_webgl2 = () => {
+            const gl = this.handler.gl;
+            const buf = this._distancePixelBuffer;
+            if (!this._skipDistanceFrame) {
+                this._skipDistanceFrame = true;
+                let dest = this._tempDistancePix_;
+                let w = this.distanceFramebuffer.width, h = this.distanceFramebuffer.height;
+                this.distanceFramebuffer.activate();
+                gl.bindBuffer(gl.PIXEL_PACK_BUFFER, buf);
+                gl.bufferData(gl.PIXEL_PACK_BUFFER, dest.byteLength, gl.STREAM_READ);
+                gl.readPixels(0, 0, w, h, gl.RGBA, gl.UNSIGNED_BYTE, 0);
+                gl.bindBuffer(gl.PIXEL_PACK_BUFFER, null);
+                this.distanceFramebuffer.deactivate();
+                const sync = gl.fenceSync(gl.SYNC_GPU_COMMANDS_COMPLETE, 0);
+                gl.flush();
+                clientWaitAsync(gl, sync, 0).then(() => {
+                    this._skipDistanceFrame = false;
+                    gl.deleteSync(sync);
+                    gl.bindBuffer(gl.PIXEL_PACK_BUFFER, buf);
+                    gl.getBufferSubData(gl.PIXEL_PACK_BUFFER, 0, dest);
+                    gl.bindBuffer(gl.PIXEL_PACK_BUFFER, null);
+                });
+            }
+        };
         this.div = null;
         this.handler = handler;
         this.exposure = 3.01;
@@ -123,6 +198,12 @@ class Renderer {
         this.screenTexture = {};
         this.outputTexture = null;
         this._pickingMaskCoordinatesBuffer = null;
+        this._skipDistanceFrame = false;
+        this._distancePixelBuffer = null;
+        this._skipPickingFrame = false;
+        this._pickingPixelBuffer = null;
+        this._readDistanceBuffer = this._readDistanceBuffer_webgl2;
+        this._readPickingBuffer = this._readPickingBuffer_webgl2;
         if (params.autoActivate || isEmpty(params.autoActivate)) {
             this.start();
         }
@@ -346,6 +427,7 @@ class Renderer {
         });
         this.distanceFramebuffer.init();
         this._tempDistancePix_ = new Uint8Array(this.distanceFramebuffer.width * this.distanceFramebuffer.height * 4);
+        //this._tempDistancePix_ = new Uint8Array(4);
         this.depthFramebuffer = new Framebuffer(this.handler, {
             size: 2,
             internalFormat: ["RGBA", "DEPTH_COMPONENT24"],
@@ -360,6 +442,8 @@ class Renderer {
         });
         this.screenDepthFramebuffer.init();
         if (this.handler.gl.type === "webgl") {
+            this._readDistanceBuffer = this._readDistanceBuffer_webgl1;
+            this._readPickingBuffer = this._readPickingBuffer_webgl1;
             this.sceneFramebuffer = new Framebuffer(this.handler);
             this.sceneFramebuffer.init();
             this._fnScreenFrame = this._screenFrameNoMSAA;
@@ -405,16 +489,19 @@ class Renderer {
                 depth: this.screenDepthFramebuffer.textures[0],
                 frustum: this.depthFramebuffer.textures[0]
             };
+            this._initReadPixelsBuffers();
         }
         this.handler.addProgram(pickingMask());
         this.handler.ONCANVASRESIZE = () => {
             this._resizeStart();
             this.events.dispatch(this.events.resize, this.handler.canvas);
-            clearTimeout(__resizeTimeout);
-            __resizeTimeout = setTimeout(() => {
-                this._resizeEnd();
-                this.events.dispatch(this.events.resizeend, this.handler.canvas);
-            }, 320);
+            this._resizeEnd();
+            //clearTimeout(__resizeTimeout);
+            // __resizeTimeout = setTimeout(() => {
+            //     this._resizeEnd();
+            //     this.events.dispatch(this.events.resizeend, this.handler.canvas);
+            // }, 320);
+            this.events.dispatch(this.events.resizeend, this.handler.canvas);
         };
         this.screenFramePositionBuffer = this.handler.createArrayBuffer(new Float32Array([1, 1, -1, 1, 1, -1, -1, -1]), 2, 4);
         this.outputTexture = this.screenTexture.screen;
@@ -422,6 +509,17 @@ class Renderer {
         this._initializeRenderNodes();
         this._initializeControls();
     }
+    _initReadPixelsBuffers() {
+        let gl = this.handler.gl;
+        this._distancePixelBuffer = gl.createBuffer();
+        gl.bindBuffer(gl.PIXEL_PACK_BUFFER, this._distancePixelBuffer);
+        gl.bufferData(gl.PIXEL_PACK_BUFFER, this.distanceFramebuffer.width * this.distanceFramebuffer.height * 4, gl.STREAM_READ);
+        gl.bindBuffer(gl.PIXEL_PACK_BUFFER, null);
+        this._pickingPixelBuffer = gl.createBuffer();
+        gl.bindBuffer(gl.PIXEL_PACK_BUFFER, this._pickingPixelBuffer);
+        gl.bufferData(gl.PIXEL_PACK_BUFFER, this.pickingFramebuffer.width * this.pickingFramebuffer.height * 4, gl.STREAM_READ);
+        gl.bindBuffer(gl.PIXEL_PACK_BUFFER, null);
+    }
     _initializeControls() {
         let temp = this.controls;
         this.controls = {};
@@ -750,7 +848,6 @@ class Renderer {
         for (let i = 0, len = dp.length; i < len; i++) {
             /**
              * This callback renders picking frame.
-             * @callback og.Renderer~pickingCallback
              */
             dp[i].callback.call(dp[i].sender);
         }
@@ -760,7 +857,7 @@ class Renderer {
     }
     /**
      * Draw picking objects framebuffer.
-     * @private
+     * @protected
      */
     _drawDistanceBuffer() {
         this.distanceFramebuffer.activate();
@@ -779,7 +876,6 @@ class Renderer {
         while (i--) {
             /**
              * This callback renders distance frame.
-             * @callback og.Renderer~distanceCallback
              */
             dp[i].callback.call(dp[i].sender);
         }
@@ -798,7 +894,6 @@ class Renderer {
         while (i--) {
             /**
              * This callback renders depth frame.
-             * @callback og.Renderer~depthCallback
              */
             dp[i].callback.call(dp[i].sender);
         }
@@ -816,16 +911,6 @@ class Renderer {
         gl.drawArrays(gl.TRIANGLE_STRIP, 0, 4);
         this.screenDepthFramebuffer.deactivate();
     }
-    _readPickingBuffer() {
-        this.pickingFramebuffer.activate();
-        this.pickingFramebuffer.readAllPixels(this._tempPickingPix_);
-        this.pickingFramebuffer.deactivate();
-    }
-    _readDistanceBuffer() {
-        this.distanceFramebuffer.activate();
-        this.distanceFramebuffer.readAllPixels(this._tempDistancePix_);
-        this.distanceFramebuffer.deactivate();
-    }
     readPickingColor(x, y, outColor) {
         let w = this.pickingFramebuffer.width;
         let h = this.pickingFramebuffer.height;

package/lib/js/renderer/RendererEvents.d.ts

@@ -186,6 +186,8 @@ declare class RendererEvents extends Events<RendererEventsType> implements Rende
     protected _rclickY: number;
     protected _mclickX: number;
     protected _mclickY: number;
+    protected _isMouseInside: boolean;
+    protected _entityPickingEventsActive: boolean;
     constructor(renderer: Renderer);
     pointerEvent(): boolean;
     get active(): boolean;

package/lib/js/renderer/RendererEvents.js

@@ -97,6 +97,8 @@ class RendererEvents extends Events {
             pickingObject: null,
             renderer: renderer
         };
+        this._isMouseInside = false;
+        this._entityPickingEventsActive = true;
         this._dblTchCoords = new Vec2();
         this._oneTouchStart = false;
         this._dblTchBegins = 0;
@@ -257,10 +259,12 @@ class RendererEvents extends Events {
         }, 100);
     }
     onMouseLeave(sys) {
+        this._isMouseInside = false;
         this.mouseState.sys = sys;
         this.dispatch(this.mouseleave, this.mouseState);
     }
     onMouseEnter(sys) {
+        this._isMouseInside = true;
         this.mouseState.sys = sys;
         this.dispatch(this.mouseenter, this.mouseState);
     }
@@ -422,7 +426,26 @@ class RendererEvents extends Events {
     }
     entityPickingEvents() {
         let ts = this.touchState, ms = this.mouseState;
-        if (!(ms.leftButtonHold || ms.rightButtonHold || ms.middleButtonHold)) {
+        // Triggers mouseleave when mouse goes outside the viewport
+        if (this._isMouseInside !== this._entityPickingEventsActive) {
+            this._entityPickingEventsActive = this._isMouseInside;
+            if (!this._entityPickingEventsActive) {
+                let r = this.renderer;
+                let c = _currPickingColor;
+                let co = r.getPickingObjectArr(c);
+                if (co) {
+                    let pe = co.rendererEvents;
+                    ms.pickingObject = co;
+                    pe && pe.dispatch(pe.mouseleave, ms);
+                    ts.pickingObject = co;
+                    pe && pe.dispatch(pe.touchleave, ts);
+                }
+                _currPickingColor[0] = _currPickingColor[1] = _currPickingColor[2] = _currPickingColor[3] =
+                    _prevPickingColor[0] = _prevPickingColor[1] = _prevPickingColor[2] = _prevPickingColor[3] =
+                        _tempCurrPickingColor[0] = _tempCurrPickingColor[1] = _tempCurrPickingColor[2] = _tempCurrPickingColor[3] = 0.0;
+            }
+        }
+        if (this._isMouseInside && !(ms.leftButtonHold || ms.rightButtonHold || ms.middleButtonHold)) {
             let r = this.renderer;
             let c = _currPickingColor, p = _prevPickingColor, t = _tempCurrPickingColor;
             if (ts.x || ts.y) {

package/lib/js/scene/Planet.js

@@ -1368,7 +1368,9 @@ export class Planet extends RenderNode {
                     resolve(alt);
                 });
             }
-            resolve(0);
+            else {
+                resolve(0);
+            }
         });
     }
     async getHeightAboveELL(lonLat) {
@@ -1378,7 +1380,9 @@ export class Planet extends RenderNode {
                     resolve(alt + this.terrain.geoid.getHeightLonLat(lonLat));
                 });
             }
-            resolve(0);
+            else {
+                resolve(0);
+            }
         });
     }
     onremove() {

package/lib/js/terrain/GlobusTerrain.js

@@ -92,11 +92,11 @@ class GlobusTerrain extends EmptyTerrain {
         let tileIndex = Layer.getTileIndex(x, y, z);
         let cache = this._elevationCache[tileIndex];
         if (cache) {
-            if (!cache.heights) {
-                callback(0);
+            if (cache.heights) {
+                callback(this._getGroundHeightMerc(merc, cache));
             }
             else {
-                callback(this._getGroundHeightMerc(merc, cache));
+                callback(0);
             }
             return true;
         }

package/lib/js/utils/FontAtlas.js

@@ -62,7 +62,7 @@ class FontAtlas {
         let fullName = this.getFullIndex(face);
         // Try to load font from the directory
         if (!this.atlasIndexes[fullName]) {
-            this.loadFont(fullName, this.catalogSrc, `${fullName}.json`);
+            this.loadFont(face, this.catalogSrc, `${face}.json`);
         }
         if (!this.atlasIndexesDeferred[fullName]) {
             this.atlasIndexesDeferred[fullName] = new Deferred();

package/lib/js/utils/shared.js

@@ -146,7 +146,7 @@ export function print2d(id, text, x, y) {
     el.style.top = `${y}px`;
 }
 export function defaultString(str, def = "") {
-    return str ? str.trim().toLowerCase() : def;
+    return str ? str.trim() : def;
 }
 export function createVector3(v, def) {
     if (v) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "description": "[openglobus](https://www.openglobus.org/) is a javascript/typescript 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"