@openglobus/og 0.18.3 → 0.18.5

package/lib/js/renderer/Renderer.js

@@ -7,7 +7,6 @@ import { FontAtlas } from "../utils/FontAtlas";
 import { input } from "../input/input";
 import { isEmpty } from "../utils/shared";
 import { LabelWorker } from "../entity/LabelWorker";
-import { pickingMask } from "../shaders/pickingMask";
 import { randomi } from "../math";
 import { screenFrame } from "../shaders/screenFrame";
 import { toneMapping } from "../shaders/toneMapping";
@@ -197,7 +196,6 @@ class Renderer {
         this.screenFramePositionBuffer = null;
         this.screenTexture = {};
         this.outputTexture = null;
-        this._pickingMaskCoordinatesBuffer = null;
         this._skipDistanceFrame = false;
         this._distancePixelBuffer = null;
         this._skipPickingFrame = false;
@@ -418,7 +416,7 @@ class Renderer {
         });
         this.handler.addProgram(screenFrame());
         this.pickingFramebuffer = new Framebuffer(this.handler, {
-            width: 640, height: 480, depthComponent: "DEPTH_STENCIL", renderbufferTarget: "DEPTH_STENCIL_ATTACHMENT"
+            width: 640, height: 480
         });
         this.pickingFramebuffer.init();
         this._tempPickingPix_ = new Uint8Array(this.pickingFramebuffer.width * this.pickingFramebuffer.height * 4);
@@ -491,7 +489,6 @@ class Renderer {
             };
             this._initReadPixelsBuffers();
         }
-        this.handler.addProgram(pickingMask());
         this.handler.ONCANVASRESIZE = () => {
             this._resizeStart();
             this.events.dispatch(this.events.resize, this.handler.canvas);
@@ -505,7 +502,6 @@ class Renderer {
         };
         this.screenFramePositionBuffer = this.handler.createArrayBuffer(new Float32Array([1, 1, -1, 1, 1, -1, -1, -1]), 2, 4);
         this.outputTexture = this.screenTexture.screen;
-        this._pickingMaskCoordinatesBuffer = this.handler.createArrayBuffer(new Float32Array([0, 0]), 2, 1);
         this._initializeRenderNodes();
         this._initializeControls();
     }
@@ -815,34 +811,14 @@ class Renderer {
         let gl = h.gl;
         if (this.activeCamera.isFirstPass) {
             gl.clearColor(0.0, 0.0, 0.0, 1.0);
-            gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT | gl.STENCIL_BUFFER_BIT);
+            gl.clear(gl.COLOR_BUFFER_BIT | gl.DEPTH_BUFFER_BIT);
         }
         else {
-            gl.clear(gl.DEPTH_BUFFER_BIT | gl.STENCIL_BUFFER_BIT);
+            gl.clear(gl.DEPTH_BUFFER_BIT);
         }
         //
-        // draw picking mask
-        //
-        h.programs.pickingMask.activate();
-        let sh = h.programs.pickingMask._program;
-        let shu = sh.uniforms, sha = sh.attributes;
-        let /*ts = this.events.touchState,*/ ms = this.events.mouseState;
-        gl.disable(gl.DEPTH_TEST);
-        gl.enable(gl.STENCIL_TEST);
-        gl.colorMask(false, false, false, false);
-        gl.stencilFunc(gl.ALWAYS, 2, 0xFF);
-        gl.stencilOp(gl.REPLACE, gl.ZERO, gl.REPLACE);
-        gl.uniform2f(shu.offset, (ms.nx - 0.5) * 2, (0.5 - ms.ny) * 2);
-        gl.bindBuffer(gl.ARRAY_BUFFER, this._pickingMaskCoordinatesBuffer);
-        gl.vertexAttribPointer(sha.coordinates, this._pickingMaskCoordinatesBuffer.itemSize, gl.FLOAT, false, 0, 0);
-        gl.drawArrays(gl.POINTS, 0, this._pickingMaskCoordinatesBuffer.numItems);
-        gl.enable(gl.DEPTH_TEST);
-        //
         // draw picking scenes
         //
-        gl.colorMask(true, true, true, true);
-        gl.stencilFunc(gl.EQUAL, 2, 0xFF);
-        gl.stencilOp(gl.KEEP, gl.KEEP, gl.KEEP);
         gl.disable(gl.BLEND);
         let dp = this._pickingCallbacks;
         for (let i = 0, len = dp.length; i < len; i++) {
@@ -852,7 +828,6 @@ class Renderer {
             dp[i].callback.call(dp[i].sender);
         }
         gl.enable(gl.BLEND);
-        gl.disable(gl.STENCIL_TEST);
         this.pickingFramebuffer.deactivate();
     }
     /**

package/lib/js/renderer/RendererEvents.js

@@ -11,8 +11,6 @@ export function createRendererEvents(renderer) {
 const LB_M = 0b0001;
 const RB_M = 0b0010;
 const MB_M = 0b0100;
-let __skipFrames__ = 0;
-const MAX_SKIP_FRAMES_ON_BLACK = 15;
 const ISBLACK = (c) => !(c[0] || c[1] || c[2]);
 const NOTBLACK = (c) => !!(c[0] || c[1] || c[2]);
 /**
@@ -454,11 +452,6 @@ class RendererEvents extends Events {
             else {
                 r.readPickingColor(ms.nx, 1 - ms.ny, t);
             }
-            // current is black
-            if (ISBLACK(t) && __skipFrames__++ < MAX_SKIP_FRAMES_ON_BLACK) {
-                return;
-            }
-            __skipFrames__ = 0;
             p[0] = c[0];
             p[1] = c[1];
             p[2] = c[2];

package/lib/js/scene/Planet.d.ts

@@ -315,6 +315,10 @@ export declare class Planet extends RenderNode {
     protected _nightTextureSrc: string | null;
     protected _specularTextureSrc: string | null;
     constructor(options?: IPlanetParams);
+    /**
+     * Returns true if current terrain data set is loaded
+     */
+    get terrainReady(): boolean;
     get maxGridSize(): number;
     getNorthFrameRotation(cartesian: Vec3): Quat;
     set atmosphereMaxOpacity(opacity: number);

package/lib/js/scene/Planet.js

@@ -112,7 +112,7 @@ export class Planet extends RenderNode {
         this._ambient = new Float32Array([a.x, a.y, a.z]);
         this._diffuse = new Float32Array([d.x, d.y, d.z]);
         this._specular = new Float32Array([s.x, s.y, s.z, shininess]);
-        this._maxGridSize = Math.log2(options.maxGridSize || 128);
+        this._maxGridSize = Math.log2(options.maxGridSize || 256);
         this.SLICE_SIZE = 4;
         this.SLICE_SIZE_4 = this.SLICE_SIZE * 4;
         this.SLICE_SIZE_3 = this.SLICE_SIZE * 3;
@@ -149,6 +149,12 @@ export class Planet extends RenderNode {
         this._nightTextureSrc = options.nightTextureSrc || null;
         this._specularTextureSrc = options.specularTextureSrc || null;
     }
+    /**
+     * Returns true if current terrain data set is loaded
+     */
+    get terrainReady() {
+        return this._terrainCompleted && this._terrainCompletedActivated;
+    }
     get maxGridSize() {
         return this._maxGridSize;
     }
@@ -483,6 +489,7 @@ export class Planet extends RenderNode {
         // loading Earth night glowing texture
         if (this._nightTextureSrc) {
             let img = new Image();
+            img.crossOrigin = "Anonymous";
             img.onload = () => {
                 this._nightTexture = this.renderer.handler.createTextureDefault(img);
                 this._nightTexture.default = true;
@@ -495,6 +502,7 @@ export class Planet extends RenderNode {
         // load water specular mask
         if (this._specularTextureSrc) {
             let img = new Image();
+            img.crossOrigin = "Anonymous";
             img.onload = () => {
                 this._specularTexture = this.renderer.handler.createTextureDefault(img);
                 this._specularTexture.default = true;

package/lib/js/terrain/GlobusTerrain.d.ts

@@ -12,6 +12,7 @@ export interface IGlobusTerrainParams extends IEmptyTerrainParams {
     urlRewrite?: UrlRewriteFunc;
     noDataValues?: number[];
     plainGridSize?: number;
+    heightFactor?: number;
 }
 type TileData = {
     heights: number[] | TypedArray | null;
@@ -33,6 +34,7 @@ type UrlRewriteFunc = (segment: Segment, url: string) => string;
  * @param {string} [options.responseType="arraybuffer"] - Response type.
  * @param {number} [options.MAX_LOADING_TILES] - Maximum at one time loading tiles.
  * @param {Array.<number>} [gridSizeByZoom] - Array of values, where each value corresponds to the size of a tile(or segment) on the globe. Each value must be power of two.
+ * @param {number} [heightFactor=1] - Elevation height multiplier.
  *
  * @fires GlobusTerrainEvents#load
  * @fires GlobusTerrainEvents#loadend
@@ -59,6 +61,7 @@ declare class GlobusTerrain extends EmptyTerrain {
      * @type {Function} -
      */
     protected _urlRewriteCallback: UrlRewriteFunc | null;
+    protected _heightFactor: number;
     constructor(name?: string, options?: IGlobusTerrainParams);
     get loader(): Loader<GlobusTerrain>;
     clearCache(): void;

package/lib/js/terrain/GlobusTerrain.js

@@ -26,6 +26,7 @@ import { Vec3 } from "../math/Vec3";
  * @param {string} [options.responseType="arraybuffer"] - Response type.
  * @param {number} [options.MAX_LOADING_TILES] - Maximum at one time loading tiles.
  * @param {Array.<number>} [gridSizeByZoom] - Array of values, where each value corresponds to the size of a tile(or segment) on the globe. Each value must be power of two.
+ * @param {number} [heightFactor=1] - Elevation height multiplier.
  *
  * @fires GlobusTerrainEvents#load
  * @fires GlobusTerrainEvents#loadend
@@ -33,7 +34,7 @@ import { Vec3 } from "../math/Vec3";
 class GlobusTerrain extends EmptyTerrain {
     constructor(name = "", options = {}) {
         super({
-            geoidSrc: "//openglobus.org/geoid/egm84-30.pgm",
+            geoidSrc: "https://openglobus.org/geoid/egm84-30.pgm",
             maxNativeZoom: options.maxNativeZoom || 14,
             ...options
         });
@@ -44,11 +45,15 @@ class GlobusTerrain extends EmptyTerrain {
         this.isEmpty = false;
         this.equalizeNormals = true;
         this.name = name || "openglobus";
-        this.url = options.url || "//{s}.srtm3.openglobus.org/{z}/{y}/{x}.ddm";
+        this.url = options.url || "https://{s}.srtm3.openglobus.org/{z}/{y}/{x}.ddm";
         this.gridSizeByZoom = options.gridSizeByZoom || [
             64, 32, 32, 16, 16, 8, 8, 8, 8, 16, 16, 16, 16, 32, 32, 16, 8, 4, 2, 2, 2, 2, 2, 2
         ];
+        this._heightFactor = options.heightFactor != undefined ? options.heightFactor : 1.0;
         this.noDataValues = options.noDataValues || [];
+        for (let i = 0; i < this.noDataValues.length; i++) {
+            this.noDataValues[i] *= this._heightFactor;
+        }
         this.plainGridSize = options.plainGridSize || 32;
         this._extent = createExtent(options.extent, new Extent(new LonLat(-180.0, -90.0), new LonLat(180.0, 90.0)));
         this._dataType = "arrayBuffer";
@@ -299,6 +304,13 @@ class GlobusTerrain extends EmptyTerrain {
      * @returns {Array.<number>} -
      */
     _createHeights(data, tileIndex, x, y, z, extent, isMaxZoom) {
+        if (this._heightFactor !== 1) {
+            let res = new Float32Array(data);
+            for (let i = 0, len = res.length; i < len; i++) {
+                res[i] = res[i] * this._heightFactor;
+            }
+            return res;
+        }
         return new Float32Array(data);
     }
     /**

package/lib/js/terrain/MapboxTerrain.js

@@ -15,17 +15,17 @@ class MapboxTerrain extends GlobusTerrain {
         super(name || "MapboxTerrain", {
             equalizeVertices: options.equalizeVertices != undefined ? options.equalizeVertices : true,
             maxZoom: options.maxZoom || 17,
+            noDataValues: options.noDataValues || [-65537, -10000],
+            plainGridSize: options.plainGridSize || 128,
+            url: options.url != undefined
+                ? options.url
+                : `//api.mapbox.com/v4/mapbox.terrain-rgb/{z}/{x}/{y}.pngraw?access_token=${options.key || KEY}`,
+            gridSizeByZoom: options.gridSizeByZoom || [
+                64, 32, 16, 8, 8, 8, 8, 16, 16, 16, 16, 16, 32, 16, 32, 16, 32, 16, 32, 16, 8, 4
+            ],
             ...options
         });
         this.equalizeNormals = options.equalizeNormals || false;
-        this.gridSizeByZoom = options.gridSizeByZoom || [
-            64, 32, 16, 8, 8, 8, 8, 16, 16, 16, 16, 16, 32, 16, 32, 16, 32, 16, 32, 16, 8, 4
-        ];
-        this.url = options.url != undefined
-            ? options.url
-            : `//api.mapbox.com/v4/mapbox.terrain-rgb/{z}/{x}/{y}.pngraw?access_token=${options.key || KEY}`;
-        this.noDataValues = options.noDataValues || [-65537, -10000];
-        this.plainGridSize = options.plainGridSize || 128;
         this._dataType = "imageBitmap";
         this._imageSize = options.imageSize || 256;
         this._ctx = this._createTemporalCanvas(this._imageSize);
@@ -52,7 +52,7 @@ class MapboxTerrain extends GlobusTerrain {
         //
         if (!isPowerOfTwo(this._imageSize) && SIZE === this._imageSize) {
             let outCurrenElevations = new Float32Array(SIZE * SIZE);
-            extractElevationTilesMapboxNonPowerOfTwo(rgbaData, outCurrenElevations);
+            extractElevationTilesMapboxNonPowerOfTwo(rgbaData, outCurrenElevations, this._heightFactor);
             return outCurrenElevations;
         }
         if (this._imageSize === this.plainGridSize) {
@@ -61,22 +61,22 @@ class MapboxTerrain extends GlobusTerrain {
             for (let k = 0, len = this._imageSize * this._imageSize; k < len; k++) {
                 let j = k % this._imageSize, i = Math.floor(k / this._imageSize);
                 let fromInd4 = k * 4;
-                let h = rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
+                let h = this._heightFactor * rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
                 outCurrenElevations[i * (this._imageSize + 1) + j] = h;
             }
             for (let i = 0, len = this._imageSize; i < len; i++) {
                 let j = this._imageSize - 1;
                 let fromInd4 = (i * this._imageSize + j) * 4;
-                let h = rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
+                let h = this._heightFactor * rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
                 outCurrenElevations[i * (this._imageSize + 1) + this._imageSize] = h;
             }
             for (let j = 0, len = this._imageSize; j < len; j++) {
                 let i = this._imageSize - 1;
                 let fromInd4 = (i * this._imageSize + j) * 4;
-                let h = rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
+                let h = this._heightFactor * rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
                 outCurrenElevations[this._imageSize * (this._imageSize + 1) + j] = h;
             }
-            let h = rgb2Height(rgbaData[rgbaData.length - 4], rgbaData[rgbaData.length - 3], rgbaData[rgbaData.length - 2]);
+            let h = this._heightFactor * rgb2Height(rgbaData[rgbaData.length - 4], rgbaData[rgbaData.length - 3], rgbaData[rgbaData.length - 2]);
             outCurrenElevations[outCurrenElevations.length - 1] = h;
             return outCurrenElevations;
         }
@@ -94,10 +94,10 @@ class MapboxTerrain extends GlobusTerrain {
             }
         }
         if (preventChildren) {
-            extractElevationTilesMapboxNoChildren(rgbaData, this.noDataValues, outCurrenElevations);
+            extractElevationTilesMapboxNoChildren(rgbaData, this._heightFactor, this.noDataValues, outCurrenElevations);
         }
         else {
-            extractElevationTilesMapbox(rgbaData, this.noDataValues, outCurrenElevations, outChildrenElevations);
+            extractElevationTilesMapbox(rgbaData, this._heightFactor, this.noDataValues, outCurrenElevations, outChildrenElevations);
         }
         this._elevationCache[tileIndex] = {
             heights: outCurrenElevations,
@@ -129,7 +129,7 @@ class MapboxTerrain extends GlobusTerrain {
         let index = (i * this._imageSize + j) * 4;
         if (this._imageDataCache[tileIndex]) {
             let data = this._imageDataCache[tileIndex];
-            callback(rgb2Height(data[index], data[index + 1], data[index + 2]));
+            callback(this._heightFactor * rgb2Height(data[index], data[index + 1], data[index + 2]));
             return true;
         }
         if (!this._fetchCache[tileIndex]) {
@@ -145,7 +145,7 @@ class MapboxTerrain extends GlobusTerrain {
                 this._ctx.drawImage(response.data, 0, 0);
                 let data = this._ctx.getImageData(0, 0, 256, 256).data;
                 this._imageDataCache[tileIndex] = data;
-                callback(rgb2Height(data[index], data[index + 1], data[index + 2]));
+                callback(this._heightFactor * rgb2Height(data[index], data[index + 1], data[index + 2]));
             }
             else if (response.status === "error") {
                 callback(0);
@@ -159,13 +159,13 @@ class MapboxTerrain extends GlobusTerrain {
         return false;
     }
 }
-function extractElevationTilesMapboxNonPowerOfTwo(rgbaData, outCurrenElevations) {
+function extractElevationTilesMapboxNonPowerOfTwo(rgbaData, outCurrenElevations, heightFactor = 1) {
     for (let i = 0, len = outCurrenElevations.length; i < len; i++) {
         let i4 = i * 4;
-        outCurrenElevations[i] = rgb2Height(rgbaData[i4], rgbaData[i4 + 1], rgbaData[i4 + 2]);
+        outCurrenElevations[i] = heightFactor * rgb2Height(rgbaData[i4], rgbaData[i4 + 1], rgbaData[i4 + 2]);
     }
 }
-function extractElevationTilesMapbox(rgbaData, noDataValues, outCurrenElevations, outChildrenElevations) {
+function extractElevationTilesMapbox(rgbaData, heightFactor, noDataValues, outCurrenElevations, outChildrenElevations) {
     let destSize = Math.sqrt(outCurrenElevations.length) - 1;
     let destSizeOne = destSize + 1;
     let sourceSize = Math.sqrt(rgbaData.length / 4);
@@ -173,7 +173,7 @@ function extractElevationTilesMapbox(rgbaData, noDataValues, outCurrenElevations
     let rightHeight = 0, bottomHeight = 0, sourceSize4 = 0;
     for (let k = 0, currIndex = 0, sourceDataLength = rgbaData.length / 4; k < sourceDataLength; k++) {
         let k4 = k * 4;
-        let height = rgb2Height(rgbaData[k4], rgbaData[k4 + 1], rgbaData[k4 + 2]);
+        let height = heightFactor * rgb2Height(rgbaData[k4], rgbaData[k4 + 1], rgbaData[k4 + 2]);
         let isNoDataCurrent = MapboxTerrain.checkNoDataValue(noDataValues, height), isNoDataRight = false, isNoDataBottom = false;
         let i = Math.floor(k / sourceSize), j = k % sourceSize;
         let tileX = Math.floor(j / destSize), tileY = Math.floor(i / destSize);
@@ -186,7 +186,7 @@ function extractElevationTilesMapbox(rgbaData, noDataValues, outCurrenElevations
         }
         if ((j + 1) % destSize === 0 && j !== sourceSize - 1) {
             //current tile
-            rightHeight = rgb2Height(rgbaData[k4 + 4], rgbaData[k4 + 5], rgbaData[k4 + 6]);
+            rightHeight = heightFactor * rgb2Height(rgbaData[k4 + 4], rgbaData[k4 + 5], rgbaData[k4 + 6]);
             isNoDataRight = MapboxTerrain.checkNoDataValue(noDataValues, rightHeight);
             let middleHeight = height;
             if (!(isNoDataCurrent || isNoDataRight)) {
@@ -204,7 +204,7 @@ function extractElevationTilesMapbox(rgbaData, noDataValues, outCurrenElevations
         if ((i + 1) % destSize === 0 && i !== sourceSize - 1) {
             //current tile
             sourceSize4 = sourceSize * 4;
-            bottomHeight = rgb2Height(rgbaData[k4 + sourceSize4], rgbaData[k4 + sourceSize4 + 1], rgbaData[k4 + sourceSize4 + 2]);
+            bottomHeight = heightFactor * rgb2Height(rgbaData[k4 + sourceSize4], rgbaData[k4 + sourceSize4 + 1], rgbaData[k4 + sourceSize4 + 2]);
             isNoDataBottom = MapboxTerrain.checkNoDataValue(noDataValues, bottomHeight);
             let middleHeight = (height + bottomHeight) * 0.5;
             if (!(isNoDataCurrent || isNoDataBottom)) {
@@ -222,7 +222,7 @@ function extractElevationTilesMapbox(rgbaData, noDataValues, outCurrenElevations
         if ((j + 1) % destSize === 0 && j !== sourceSize - 1 &&
             (i + 1) % destSize === 0 && i !== sourceSize - 1) {
             //current tile
-            let rightBottomHeight = rgb2Height(rgbaData[k4 + sourceSize4 + 4], rgbaData[k4 + sourceSize4 + 5], rgbaData[k4 + sourceSize4 + 6]);
+            let rightBottomHeight = heightFactor * rgb2Height(rgbaData[k4 + sourceSize4 + 4], rgbaData[k4 + sourceSize4 + 5], rgbaData[k4 + sourceSize4 + 6]);
             let isNoDataRightBottom = MapboxTerrain.checkNoDataValue(noDataValues, rightBottomHeight);
             let middleHeight = height;
             if (!(isNoDataCurrent || isNoDataRight || isNoDataBottom || isNoDataRightBottom)) {
@@ -243,14 +243,14 @@ function extractElevationTilesMapbox(rgbaData, noDataValues, outCurrenElevations
         }
     }
 }
-function extractElevationTilesMapboxNoChildren(rgbaData, noDataValues, outCurrenElevations) {
+function extractElevationTilesMapboxNoChildren(rgbaData, heightFactor, noDataValues, outCurrenElevations) {
     let destSize = Math.sqrt(outCurrenElevations.length) - 1;
     let sourceSize = Math.sqrt(rgbaData.length / 4);
     let dt = sourceSize / destSize;
     let rightHeight = 0, bottomHeight = 0, sourceSize4 = 0;
     for (let k = 0, currIndex = 0, sourceDataLength = rgbaData.length / 4; k < sourceDataLength; k++) {
         let k4 = k * 4;
-        let height = rgb2Height(rgbaData[k4], rgbaData[k4 + 1], rgbaData[k4 + 2]);
+        let height = heightFactor * rgb2Height(rgbaData[k4], rgbaData[k4 + 1], rgbaData[k4 + 2]);
         let isNoDataCurrent = MapboxTerrain.checkNoDataValue(noDataValues, height), isNoDataRight = false, isNoDataBottom = false;
         let i = Math.floor(k / sourceSize), j = k % sourceSize;
         let tileX = Math.floor(j / destSize), tileY = Math.floor(i / destSize);
@@ -259,7 +259,7 @@ function extractElevationTilesMapboxNoChildren(rgbaData, noDataValues, outCurren
         }
         if ((j + 1) % destSize === 0 && j !== sourceSize - 1) {
             //current tile
-            rightHeight = rgb2Height(rgbaData[k4 + 4], rgbaData[k4 + 5], rgbaData[k4 + 6]);
+            rightHeight = heightFactor * rgb2Height(rgbaData[k4 + 4], rgbaData[k4 + 5], rgbaData[k4 + 6]);
             isNoDataRight = MapboxTerrain.checkNoDataValue(noDataValues, rightHeight);
             let middleHeight = height;
             if (!(isNoDataCurrent || isNoDataRight)) {
@@ -272,7 +272,7 @@ function extractElevationTilesMapboxNoChildren(rgbaData, noDataValues, outCurren
         if ((i + 1) % destSize === 0 && i !== sourceSize - 1) {
             //current tile
             sourceSize4 = sourceSize * 4;
-            bottomHeight = rgb2Height(rgbaData[k4 + sourceSize4], rgbaData[k4 + sourceSize4 + 1], rgbaData[k4 + sourceSize4 + 2]);
+            bottomHeight = heightFactor * rgb2Height(rgbaData[k4 + sourceSize4], rgbaData[k4 + sourceSize4 + 1], rgbaData[k4 + sourceSize4 + 2]);
             isNoDataBottom = MapboxTerrain.checkNoDataValue(noDataValues, bottomHeight);
             let middleHeight = (height + bottomHeight) * 0.5;
             if (!(isNoDataCurrent || isNoDataBottom)) {
@@ -285,7 +285,7 @@ function extractElevationTilesMapboxNoChildren(rgbaData, noDataValues, outCurren
         if ((j + 1) % destSize === 0 && j !== sourceSize - 1 &&
             (i + 1) % destSize === 0 && i !== sourceSize - 1) {
             //current tile
-            let rightBottomHeight = rgb2Height(rgbaData[k4 + sourceSize4 + 4], rgbaData[k4 + sourceSize4 + 5], rgbaData[k4 + sourceSize4 + 6]);
+            let rightBottomHeight = heightFactor * rgb2Height(rgbaData[k4 + sourceSize4 + 4], rgbaData[k4 + sourceSize4 + 5], rgbaData[k4 + sourceSize4 + 6]);
             let isNoDataRightBottom = MapboxTerrain.checkNoDataValue(noDataValues, rightBottomHeight);
             let middleHeight = height;
             if (!(isNoDataCurrent || isNoDataRight || isNoDataBottom || isNoDataRightBottom)) {

package/lib/js/ui/Dialog.js

@@ -19,7 +19,7 @@ class Dialog extends View {
                 display: getDefault(options.visible, true) ? "flex" : "none",
                 resize: getDefault(options.resizable, true) ? "both" : "none",
                 width: options.width || 300,
-                height: options.height ? `height:${options.height || 200}` : "",
+                height: options.height ? `height: ${options.height || 200}px` : "",
                 left: options.left || 0,
                 top: options.top || 0,
                 minHeight: options.minHeight ? `${options.minHeight}px` : 'unset',

package/lib/js/utils/TerrainWorker.js

@@ -59,7 +59,7 @@ const TERRAIN_PROGRAM = `'use strict';
             end = arr.length - 1;
         while (start <= end) {
             let k = Math.floor((start + end) * 0.5); 
-            if (arr[k] === x)
+            if (Math.abs(arr[k] - x) < 1e-3)
                 return k;
             else if (arr[k] < x)
                 start = k + 1;

package/lib/js/utils/shared.d.ts

@@ -132,7 +132,7 @@ export declare function base64StringToBlog(string: string): Blob;
  * @param {Number} limit
  * @param {boolean} [skip]
  */
-export declare function throttle(func: Function, limit: number, skip: boolean): () => void;
+export declare function throttle(func: Function, limit: number, skip?: boolean): () => void;
 /**
  *
  * y2-----Q12--------------Q22---
@@ -264,4 +264,5 @@ export declare function loadImage(url: string): Promise<HTMLImageElement>;
  */
 export declare function isImageLoaded(image: HTMLImageElement): boolean;
 export declare function distanceFormat(v: number): string;
+export declare function distanceFormatExt(v: number): [string, string];
 export declare function getUrlParam(paramName: string): number | undefined;

package/lib/js/utils/shared.js

@@ -245,7 +245,7 @@ export function binarySearchFast(arr, x) {
     let start = 0, end = arr.length - 1;
     while (start <= end) {
         let k = Math.floor((start + end) * 0.5);
-        if (arr[k] === x) {
+        if (Math.abs(arr[k] - x) < 1e-3) {
             return k;
         }
         else if (arr[k] < x) {
@@ -510,7 +510,7 @@ export function base64StringToBlog(string) {
  * @param {Number} limit
  * @param {boolean} [skip]
  */
-export function throttle(func, limit, skip) {
+export function throttle(func, limit, skip = false) {
     let lastFunc;
     let lastRan = 0;
     return function () {
@@ -875,7 +875,7 @@ export function isImageLoaded(image) {
 }
 export function distanceFormat(v) {
     if (v > 1000) {
-        return `${(v / 1000).toFixed(1)} km`;
+        return `${(v / 1000).toFixed(2)} km`;
     }
     else if (v > 9) {
         return `${Math.round(v)} m`;
@@ -884,6 +884,24 @@ export function distanceFormat(v) {
         return `${v.toFixed(1)} m`;
     }
 }
+export function distanceFormatExt(v) {
+    if (v > 1000) {
+        let d = v - Math.floor(v);
+        if (d !== 0) {
+            return [(v / 1000).toFixed(2), "km"];
+        }
+        return [(v / 1000).toFixed(0), "km"];
+    }
+    else if (v > 9) {
+        return [Math.round(v).toString(), "m"];
+    }
+    else {
+        if (v <= 0.01) {
+            return ["0", "m"];
+        }
+        return [v.toFixed(1), "m"];
+    }
+}
 export function getUrlParam(paramName) {
     let urlParams = new URLSearchParams(location.search);
     let param = urlParams.get(paramName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.18.3",
+  "version": "0.18.5",
   "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"

package/lib/js/shaders/pickingMask.d.ts

@@ -1,2 +0,0 @@
-import { Program } from '../webgl/Program';
-export declare function pickingMask(): Program;

package/lib/js/shaders/pickingMask.js

@@ -1,22 +0,0 @@
-import { Program } from '../webgl/Program';
-export function pickingMask() {
-    return new Program("pickingMask", {
-        uniforms: {
-            offset: "vec2"
-        },
-        attributes: {
-            coordinates: "vec2"
-        },
-        vertexShader: `attribute vec2 coordinates;
-            uniform vec2 offset;
-            void main() {
-            
-                gl_Position = vec4(coordinates + offset, 0.0, 1.0);
-                gl_PointSize = 5.0;
-            }`,
-        fragmentShader: `precision highp float;
-            void main(void) {
-                gl_FragColor = vec4(1.0);
-            }`
-    });
-}