@openglobus/og 0.20.3 → 0.21.0

package/lib/js/terrain/RgbTerrain.js

@@ -3,13 +3,6 @@ import { GlobusTerrain } from "./GlobusTerrain";
 import { isPowerOfTwo } from "../math";
 import { Layer } from "../layer/Layer";
 import { binarySearchFast } from "../utils/shared";
-const rgb2Height = (r, g, b) => {
-    // Filter for "yellowish" pixels
-    if (r === 255) {
-        return -10000;
-    }
-    return -10000 + 0.1 * (r * 256 * 256 + g * 256 + b);
-};
 class RgbTerrain extends GlobusTerrain {
     constructor(name, options = {}) {
         super(name || "RgbTerrain", {
@@ -30,6 +23,8 @@ class RgbTerrain extends GlobusTerrain {
         this._imageSize = options.imageSize || 256;
         this._ctx = this._createTemporalCanvas(this._imageSize);
         this._imageDataCache = {};
+        this._minHeight = options.minHeight || -10000.0;
+        this._resolution = options.resolution || 0.1;
     }
     static checkNoDataValue(noDataValues, value) {
         if (value > 50000) {
@@ -37,6 +32,13 @@ class RgbTerrain extends GlobusTerrain {
         }
         return binarySearchFast(noDataValues, value) !== -1;
     }
+    rgb2Height(r, g, b) {
+        // Filter for "yellowish" pixels
+        if (r === 255) {
+            return this._minHeight;
+        }
+        return this._minHeight + this._resolution * (r * 256 * 256 + g * 256 + b);
+    }
     isBlur(segment) {
         return segment.tileZoom >= 16;
     }
@@ -78,7 +80,7 @@ class RgbTerrain extends GlobusTerrain {
         //
         if (!isPowerOfTwo(this._imageSize) && SIZE === this._imageSize) {
             let outCurrenElevations = new Float32Array(SIZE * SIZE);
-            extractElevationTilesRgbNonPowerOfTwo(rgbaData, outCurrenElevations, this._heightFactor);
+            this.extractElevationTilesRgbNonPowerOfTwo(rgbaData, outCurrenElevations, this._heightFactor);
             return outCurrenElevations;
         }
         //
@@ -88,7 +90,7 @@ class RgbTerrain extends GlobusTerrain {
             let elevationsSize = (this.plainGridSize + 1) * (this.plainGridSize + 1);
             let outCurrenElevations = new Float32Array(elevationsSize);
             let [availableParentOffsetX, availableParentOffsetY, availableZoomDiff] = segment ? getTileOffset(segment.tileX, segment.tileY, segment.tileZoom, availableParentTileX, availableParentTileY, availableParentTileZoom) : [0, 0, 0];
-            extractElevationSimple(rgbaData, this.noDataValues, availableParentData, availableParentOffsetX, availableParentOffsetY, availableZoomDiff, skipPositiveHeights, outCurrenElevations, this._heightFactor, this._imageSize);
+            this.extractElevationSimple(rgbaData, this.noDataValues, availableParentData, availableParentOffsetX, availableParentOffsetY, availableZoomDiff, skipPositiveHeights, outCurrenElevations, this._heightFactor, this._imageSize);
             return outCurrenElevations;
         }
         //
@@ -105,7 +107,7 @@ class RgbTerrain extends GlobusTerrain {
             }
         }
         if (!preventChildren) {
-            extractElevationTilesRgb(rgbaData, this._heightFactor, this.noDataValues, availableParentData, availableParentTileX, availableParentTileY, availableParentTileZoom, segment ? segment.tileX : 0, segment ? segment.tileY : 0, segment ? segment.tileZoom : 0, skipPositiveHeights, outCurrenElevations, outChildrenElevations);
+            this.extractElevationTilesRgb(rgbaData, this._heightFactor, this.noDataValues, availableParentData, availableParentTileX, availableParentTileY, availableParentTileZoom, segment ? segment.tileX : 0, segment ? segment.tileY : 0, segment ? segment.tileZoom : 0, skipPositiveHeights, outCurrenElevations, outChildrenElevations);
             // Save children data to cache
             for (let i = 0; i < d; i++) {
                 for (let j = 0; j < d; j++) {
@@ -122,7 +124,7 @@ class RgbTerrain extends GlobusTerrain {
             }
         }
         else {
-            extractElevationTilesRgbNoChildren(rgbaData, this._heightFactor, this.noDataValues, availableParentData, availableParentTileX, availableParentTileY, availableParentTileZoom, segment ? segment.tileX : 0, segment ? segment.tileY : 0, segment ? segment.tileZoom : 0, skipPositiveHeights, outCurrenElevations);
+            this.extractElevationTilesRgbNoChildren(rgbaData, this._heightFactor, this.noDataValues, availableParentData, availableParentTileX, availableParentTileY, availableParentTileZoom, segment ? segment.tileX : 0, segment ? segment.tileY : 0, segment ? segment.tileZoom : 0, skipPositiveHeights, outCurrenElevations);
         }
         let tileIndex = Layer.getTileIndex(tileX, tileY, tileZoom, tileGroup);
         // Save current data to cache
@@ -145,13 +147,13 @@ class RgbTerrain extends GlobusTerrain {
         const tileIndex = Layer.getTileIndex(x, y, z, tileGroup);
         if (this._imageDataCache[tileIndex]) {
             let data = this._imageDataCache[tileIndex];
-            let height = this._heightFactor * rgb2Height(data[index], data[index + 1], data[index + 2]);
+            let height = this._heightFactor * this.rgb2Height(data[index], data[index + 1], data[index + 2]);
             let isNoData = RgbTerrain.checkNoDataValue(this.noDataValues, height);
             if (isNoData) {
                 return this.getHeightAsync(lonLat, callback, zoom - 1);
             }
             else {
-                callback(this._heightFactor * rgb2Height(data[index], data[index + 1], data[index + 2]));
+                callback(this._heightFactor * this.rgb2Height(data[index], data[index + 1], data[index + 2]));
                 return true;
             }
         }
@@ -169,13 +171,13 @@ class RgbTerrain extends GlobusTerrain {
                 this._ctx.drawImage(response.data, 0, 0);
                 let data = this._ctx.getImageData(0, 0, 256, 256).data;
                 this._imageDataCache[tileIndex] = data;
-                let height = this._heightFactor * rgb2Height(data[index], data[index + 1], data[index + 2]);
+                let height = this._heightFactor * this.rgb2Height(data[index], data[index + 1], data[index + 2]);
                 let isNoData = RgbTerrain.checkNoDataValue(this.noDataValues, height);
                 if (isNoData) {
                     return this.getHeightAsync(lonLat, callback, zoom - 1);
                 }
                 else {
-                    callback(this._heightFactor * rgb2Height(data[index], data[index + 1], data[index + 2]));
+                    callback(this._heightFactor * this.rgb2Height(data[index], data[index + 1], data[index + 2]));
                 }
             }
             else if (response.status === "error") {
@@ -189,227 +191,227 @@ class RgbTerrain extends GlobusTerrain {
         });
         return false;
     }
-}
-function getTileOffset(currentTileX, currentTileY, currentTileZoom, parentTileX, parentTileY, parentTileZoom) {
-    let dz2 = 2 << (currentTileZoom - parentTileZoom - 1);
-    return [currentTileX - dz2 * parentTileX, currentTileY - dz2 * parentTileY, 1.0 / dz2];
-}
-function getChildTileIndex(currentParentTileX, currentParentTileY, currentParentTileZoom, childOffsetX, childOffsetY) {
-    return [currentParentTileX * 2 + childOffsetX, currentParentTileY * 2 + childOffsetY, currentParentTileZoom + 1];
-}
-function getParentHeight(oneByDz2, offsetX, offsetY, heights, i, j, skipPositiveHeights) {
-    let parentGridSize = Math.sqrt(heights.length);
-    let pi = Math.floor(offsetY * oneByDz2 * parentGridSize + i * oneByDz2), pj = Math.floor(offsetX * oneByDz2 * parentGridSize + j * oneByDz2);
-    let h = heights[pi * parentGridSize + pj];
-    return skipPositiveHeights ? (h > 0 ? 0 : h) : h;
-}
-function extractElevationSimple(rgbaData, noDataValues, availableParentData = null, availableParentOffsetX, availableParentOffsetY, availableZoomDiff, skipPositiveHeights, outCurrenElevations, heightFactor = 1, imageSize) {
-    for (let k = 0, len = imageSize * imageSize; k < len; k++) {
-        let j = k % imageSize, i = Math.floor(k / imageSize);
-        let fromInd4 = k * 4;
-        let height = heightFactor * rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
-        let isNoData = RgbTerrain.checkNoDataValue(noDataValues, height);
-        if ((isNoData || height === 0) && availableParentData) {
-            height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, i, j, skipPositiveHeights);
+    extractElevationSimple(rgbaData, noDataValues, availableParentData = null, availableParentOffsetX, availableParentOffsetY, availableZoomDiff, skipPositiveHeights, outCurrenElevations, heightFactor = 1, imageSize) {
+        for (let k = 0, len = imageSize * imageSize; k < len; k++) {
+            let j = k % imageSize, i = Math.floor(k / imageSize);
+            let fromInd4 = k * 4;
+            let height = heightFactor * this.rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
+            let isNoData = RgbTerrain.checkNoDataValue(noDataValues, height);
+            if ((isNoData || height === 0) && availableParentData) {
+                height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, i, j, skipPositiveHeights);
+            }
+            outCurrenElevations[i * (imageSize + 1) + j] = height;
         }
-        outCurrenElevations[i * (imageSize + 1) + j] = height;
-    }
-    for (let i = 0, len = imageSize; i < len; i++) {
-        let j = imageSize - 1;
-        let fromInd4 = (i * imageSize + j) * 4;
-        let height = heightFactor * rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
-        let isNoData = RgbTerrain.checkNoDataValue(noDataValues, height);
-        if ((isNoData || height === 0) && availableParentData) {
-            height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, i, j, skipPositiveHeights);
+        for (let i = 0, len = imageSize; i < len; i++) {
+            let j = imageSize - 1;
+            let fromInd4 = (i * imageSize + j) * 4;
+            let height = heightFactor * this.rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
+            let isNoData = RgbTerrain.checkNoDataValue(noDataValues, height);
+            if ((isNoData || height === 0) && availableParentData) {
+                height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, i, j, skipPositiveHeights);
+            }
+            outCurrenElevations[i * (imageSize + 1) + imageSize] = height;
         }
-        outCurrenElevations[i * (imageSize + 1) + imageSize] = height;
-    }
-    for (let j = 0, len = imageSize; j < len; j++) {
-        let i = imageSize - 1;
-        let fromInd4 = (i * imageSize + j) * 4;
-        let height = heightFactor * rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
+        for (let j = 0, len = imageSize; j < len; j++) {
+            let i = imageSize - 1;
+            let fromInd4 = (i * imageSize + j) * 4;
+            let height = heightFactor * this.rgb2Height(rgbaData[fromInd4], rgbaData[fromInd4 + 1], rgbaData[fromInd4 + 2]);
+            let isNoData = RgbTerrain.checkNoDataValue(noDataValues, height);
+            if ((isNoData || height === 0) && availableParentData) {
+                height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, i, j, skipPositiveHeights);
+            }
+            outCurrenElevations[imageSize * (imageSize + 1) + j] = height;
+        }
+        let height = heightFactor * this.rgb2Height(rgbaData[rgbaData.length - 4], rgbaData[rgbaData.length - 3], rgbaData[rgbaData.length - 2]);
         let isNoData = RgbTerrain.checkNoDataValue(noDataValues, height);
         if ((isNoData || height === 0) && availableParentData) {
-            height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, i, j, skipPositiveHeights);
+            height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, imageSize - 1, imageSize - 1, skipPositiveHeights);
         }
-        outCurrenElevations[imageSize * (imageSize + 1) + j] = height;
-    }
-    let height = heightFactor * rgb2Height(rgbaData[rgbaData.length - 4], rgbaData[rgbaData.length - 3], rgbaData[rgbaData.length - 2]);
-    let isNoData = RgbTerrain.checkNoDataValue(noDataValues, height);
-    if ((isNoData || height === 0) && availableParentData) {
-        height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, imageSize - 1, imageSize - 1, skipPositiveHeights);
-    }
-    outCurrenElevations[outCurrenElevations.length - 1] = height;
-}
-function extractElevationTilesRgbNonPowerOfTwo(rgbaData, outCurrenElevations, heightFactor = 1) {
-    for (let i = 0, len = outCurrenElevations.length; i < len; i++) {
-        let i4 = i * 4;
-        outCurrenElevations[i] = heightFactor * rgb2Height(rgbaData[i4], rgbaData[i4 + 1], rgbaData[i4 + 2]);
+        outCurrenElevations[outCurrenElevations.length - 1] = height;
     }
-}
-function extractElevationTilesRgb(rgbaData, heightFactor, noDataValues, availableParentData = null, availableParentTileX, availableParentTileY, availableParentTileZoom, currentTileX, currentTileY, currentTileZoom, skipPositiveHeights, outCurrenElevations, outChildrenElevations) {
-    let destSize = Math.sqrt(outCurrenElevations.length) - 1;
-    let destSizeOne = destSize + 1;
-    let sourceSize = Math.sqrt(rgbaData.length / 4);
-    let dt = sourceSize / destSize;
-    let rightHeight = 0, bottomHeight = 0, sourceSize4 = 0;
-    let [availableParentOffsetX, availableParentOffsetY, availableZoomDiff] = getTileOffset(currentTileX, currentTileY, currentTileZoom, availableParentTileX, availableParentTileY, availableParentTileZoom);
-    for (let k = 0, currIndex = 0, sourceDataLength = rgbaData.length / 4; k < sourceDataLength; k++) {
-        let k4 = k * 4;
-        let height = heightFactor * rgb2Height(rgbaData[k4], rgbaData[k4 + 1], rgbaData[k4 + 2]);
-        let isNoDataCurrent = RgbTerrain.checkNoDataValue(noDataValues, height), isNoDataRight = false, isNoDataBottom = false;
-        let i = Math.floor(k / sourceSize), j = k % sourceSize;
-        //
-        // Try to get current height from the parent data
-        if ((isNoDataCurrent || height === 0) && availableParentData) {
-            height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(i / dt), Math.floor(j / dt), skipPositiveHeights);
-        }
-        let tileX = Math.floor(j / destSize), tileY = Math.floor(i / destSize);
-        let destArr = outChildrenElevations[tileY][tileX];
-        let ii = i % destSize, jj = j % destSize;
-        let destIndex = (ii + tileY) * destSizeOne + jj + tileX;
-        destArr[destIndex] = height;
-        if ((i + tileY) % dt === 0 && (j + tileX) % dt === 0) {
-            outCurrenElevations[currIndex++] = height;
+    extractElevationTilesRgbNonPowerOfTwo(rgbaData, outCurrenElevations, heightFactor = 1) {
+        for (let i = 0, len = outCurrenElevations.length; i < len; i++) {
+            let i4 = i * 4;
+            outCurrenElevations[i] = heightFactor * this.rgb2Height(rgbaData[i4], rgbaData[i4 + 1], rgbaData[i4 + 2]);
         }
-        if ((j + 1) % destSize === 0 && j !== sourceSize - 1) {
-            //current tile
-            rightHeight = heightFactor * rgb2Height(rgbaData[k4 + 4], rgbaData[k4 + 5], rgbaData[k4 + 6]);
-            isNoDataRight = RgbTerrain.checkNoDataValue(noDataValues, rightHeight);
+    }
+    extractElevationTilesRgb(rgbaData, heightFactor, noDataValues, availableParentData = null, availableParentTileX, availableParentTileY, availableParentTileZoom, currentTileX, currentTileY, currentTileZoom, skipPositiveHeights, outCurrenElevations, outChildrenElevations) {
+        let destSize = Math.sqrt(outCurrenElevations.length) - 1;
+        let destSizeOne = destSize + 1;
+        let sourceSize = Math.sqrt(rgbaData.length / 4);
+        let dt = sourceSize / destSize;
+        let rightHeight = 0, bottomHeight = 0, sourceSize4 = 0;
+        let [availableParentOffsetX, availableParentOffsetY, availableZoomDiff] = getTileOffset(currentTileX, currentTileY, currentTileZoom, availableParentTileX, availableParentTileY, availableParentTileZoom);
+        for (let k = 0, currIndex = 0, sourceDataLength = rgbaData.length / 4; k < sourceDataLength; k++) {
+            let k4 = k * 4;
+            let height = heightFactor * this.rgb2Height(rgbaData[k4], rgbaData[k4 + 1], rgbaData[k4 + 2]);
+            let isNoDataCurrent = RgbTerrain.checkNoDataValue(noDataValues, height), isNoDataRight = false, isNoDataBottom = false;
+            let i = Math.floor(k / sourceSize), j = k % sourceSize;
             //
-            // Try to get right height from the parent data
-            if ((isNoDataRight || rightHeight === 0) && availableParentData) {
-                rightHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(i / dt), Math.floor((j + 1) / dt), skipPositiveHeights);
-            }
-            let middleHeight = height;
-            if (!(isNoDataCurrent || isNoDataRight)) {
-                middleHeight = (height + rightHeight) * 0.5;
+            // Try to get current height from the parent data
+            if ((isNoDataCurrent || height === 0) && availableParentData) {
+                height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(i / dt), Math.floor(j / dt), skipPositiveHeights);
             }
-            destIndex = (ii + tileY) * destSizeOne + jj + 1;
-            destArr[destIndex] = middleHeight;
-            if ((i + tileY) % dt === 0) {
-                outCurrenElevations[currIndex++] = middleHeight;
+            let tileX = Math.floor(j / destSize), tileY = Math.floor(i / destSize);
+            let destArr = outChildrenElevations[tileY][tileX];
+            let ii = i % destSize, jj = j % destSize;
+            let destIndex = (ii + tileY) * destSizeOne + jj + tileX;
+            destArr[destIndex] = height;
+            if ((i + tileY) % dt === 0 && (j + tileX) % dt === 0) {
+                outCurrenElevations[currIndex++] = height;
             }
-            //next right tile
-            let rightindex = (ii + tileY) * destSizeOne + ((jj + 1) % destSize);
-            outChildrenElevations[tileY][tileX + 1][rightindex] = middleHeight;
-        }
-        if ((i + 1) % destSize === 0 && i !== sourceSize - 1) {
-            //current tile
-            sourceSize4 = sourceSize * 4;
-            bottomHeight = heightFactor * rgb2Height(rgbaData[k4 + sourceSize4], rgbaData[k4 + sourceSize4 + 1], rgbaData[k4 + sourceSize4 + 2]);
-            isNoDataBottom = RgbTerrain.checkNoDataValue(noDataValues, bottomHeight);
-            //
-            // Try to get bottom height from the parent data
-            if ((isNoDataBottom || bottomHeight === 0) && availableParentData) {
-                bottomHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor((i + 1) / dt), Math.floor(j / dt), skipPositiveHeights);
+            if ((j + 1) % destSize === 0 && j !== sourceSize - 1) {
+                //current tile
+                rightHeight = heightFactor * this.rgb2Height(rgbaData[k4 + 4], rgbaData[k4 + 5], rgbaData[k4 + 6]);
+                isNoDataRight = RgbTerrain.checkNoDataValue(noDataValues, rightHeight);
+                //
+                // Try to get right height from the parent data
+                if ((isNoDataRight || rightHeight === 0) && availableParentData) {
+                    rightHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(i / dt), Math.floor((j + 1) / dt), skipPositiveHeights);
+                }
+                let middleHeight = height;
+                if (!(isNoDataCurrent || isNoDataRight)) {
+                    middleHeight = (height + rightHeight) * 0.5;
+                }
+                destIndex = (ii + tileY) * destSizeOne + jj + 1;
+                destArr[destIndex] = middleHeight;
+                if ((i + tileY) % dt === 0) {
+                    outCurrenElevations[currIndex++] = middleHeight;
+                }
+                //next right tile
+                let rightindex = (ii + tileY) * destSizeOne + ((jj + 1) % destSize);
+                outChildrenElevations[tileY][tileX + 1][rightindex] = middleHeight;
             }
-            let middleHeight = (height + bottomHeight) * 0.5;
-            if (!(isNoDataCurrent || isNoDataBottom)) {
-                middleHeight = (height + bottomHeight) * 0.5;
+            if ((i + 1) % destSize === 0 && i !== sourceSize - 1) {
+                //current tile
+                sourceSize4 = sourceSize * 4;
+                bottomHeight = heightFactor * this.rgb2Height(rgbaData[k4 + sourceSize4], rgbaData[k4 + sourceSize4 + 1], rgbaData[k4 + sourceSize4 + 2]);
+                isNoDataBottom = RgbTerrain.checkNoDataValue(noDataValues, bottomHeight);
+                //
+                // Try to get bottom height from the parent data
+                if ((isNoDataBottom || bottomHeight === 0) && availableParentData) {
+                    bottomHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor((i + 1) / dt), Math.floor(j / dt), skipPositiveHeights);
+                }
+                let middleHeight = (height + bottomHeight) * 0.5;
+                if (!(isNoDataCurrent || isNoDataBottom)) {
+                    middleHeight = (height + bottomHeight) * 0.5;
+                }
+                destIndex = (ii + 1) * destSizeOne + jj + tileX;
+                destArr[destIndex] = middleHeight;
+                if ((j + tileX) % dt === 0) {
+                    outCurrenElevations[currIndex++] = middleHeight;
+                }
+                //next bottom tile
+                let bottomindex = ((ii + 1) % destSize) * destSizeOne + jj + tileX;
+                outChildrenElevations[tileY + 1][tileX][bottomindex] = middleHeight;
             }
-            destIndex = (ii + 1) * destSizeOne + jj + tileX;
-            destArr[destIndex] = middleHeight;
-            if ((j + tileX) % dt === 0) {
+            if ((j + 1) % destSize === 0 && j !== sourceSize - 1 &&
+                (i + 1) % destSize === 0 && i !== sourceSize - 1) {
+                //current tile
+                let rightBottomHeight = heightFactor * this.rgb2Height(rgbaData[k4 + sourceSize4 + 4], rgbaData[k4 + sourceSize4 + 5], rgbaData[k4 + sourceSize4 + 6]);
+                let isNoDataRightBottom = RgbTerrain.checkNoDataValue(noDataValues, rightBottomHeight);
+                //
+                // Try to get right bottom height from the parent data
+                if ((isNoDataRightBottom || rightBottomHeight === 0) && availableParentData) {
+                    rightBottomHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor((i + 1) / dt), Math.floor((j + 1) / dt), skipPositiveHeights);
+                }
+                let middleHeight = height;
+                if (!(isNoDataCurrent || isNoDataRight || isNoDataBottom || isNoDataRightBottom)) {
+                    middleHeight = (height + rightHeight + bottomHeight + rightBottomHeight) * 0.25;
+                }
+                destIndex = (ii + 1) * destSizeOne + (jj + 1);
+                destArr[destIndex] = middleHeight;
                 outCurrenElevations[currIndex++] = middleHeight;
+                //next right tile
+                let rightindex = (ii + 1) * destSizeOne;
+                outChildrenElevations[tileY][tileX + 1][rightindex] = middleHeight;
+                //next bottom tile
+                let bottomindex = destSize;
+                outChildrenElevations[tileY + 1][tileX][bottomindex] = middleHeight;
+                //next right bottom tile
+                let rightBottomindex = 0;
+                outChildrenElevations[tileY + 1][tileX + 1][rightBottomindex] = middleHeight;
             }
-            //next bottom tile
-            let bottomindex = ((ii + 1) % destSize) * destSizeOne + jj + tileX;
-            outChildrenElevations[tileY + 1][tileX][bottomindex] = middleHeight;
-        }
-        if ((j + 1) % destSize === 0 && j !== sourceSize - 1 &&
-            (i + 1) % destSize === 0 && i !== sourceSize - 1) {
-            //current tile
-            let rightBottomHeight = heightFactor * rgb2Height(rgbaData[k4 + sourceSize4 + 4], rgbaData[k4 + sourceSize4 + 5], rgbaData[k4 + sourceSize4 + 6]);
-            let isNoDataRightBottom = RgbTerrain.checkNoDataValue(noDataValues, rightBottomHeight);
-            //
-            // Try to get right bottom height from the parent data
-            if ((isNoDataRightBottom || rightBottomHeight === 0) && availableParentData) {
-                rightBottomHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor((i + 1) / dt), Math.floor((j + 1) / dt), skipPositiveHeights);
-            }
-            let middleHeight = height;
-            if (!(isNoDataCurrent || isNoDataRight || isNoDataBottom || isNoDataRightBottom)) {
-                middleHeight = (height + rightHeight + bottomHeight + rightBottomHeight) * 0.25;
-            }
-            destIndex = (ii + 1) * destSizeOne + (jj + 1);
-            destArr[destIndex] = middleHeight;
-            outCurrenElevations[currIndex++] = middleHeight;
-            //next right tile
-            let rightindex = (ii + 1) * destSizeOne;
-            outChildrenElevations[tileY][tileX + 1][rightindex] = middleHeight;
-            //next bottom tile
-            let bottomindex = destSize;
-            outChildrenElevations[tileY + 1][tileX][bottomindex] = middleHeight;
-            //next right bottom tile
-            let rightBottomindex = 0;
-            outChildrenElevations[tileY + 1][tileX + 1][rightBottomindex] = middleHeight;
         }
     }
-}
-function extractElevationTilesRgbNoChildren(rgbaData, heightFactor, noDataValues, availableParentData = null, availableParentTileX, availableParentTileY, availableParentTileZoom, currentTileX, currentTileY, currentTileZoom, skipPositiveHeights, outCurrenElevations) {
-    let destSize = Math.sqrt(outCurrenElevations.length) - 1;
-    let destSizeOne = destSize + 1;
-    let sourceSize = Math.sqrt(rgbaData.length / 4);
-    let dt = sourceSize / destSize;
-    let rightHeight = 0, bottomHeight = 0, sourceSize4 = 0;
-    let [availableParentOffsetX, availableParentOffsetY, availableZoomDiff] = getTileOffset(currentTileX, currentTileY, currentTileZoom, availableParentTileX, availableParentTileY, availableParentTileZoom);
-    for (let k = 0, currIndex = 0, sourceDataLength = rgbaData.length / 4; k < sourceDataLength; k++) {
-        let k4 = k * 4;
-        let height = heightFactor * rgb2Height(rgbaData[k4], rgbaData[k4 + 1], rgbaData[k4 + 2]);
-        let isNoDataCurrent = RgbTerrain.checkNoDataValue(noDataValues, height), isNoDataRight = false, isNoDataBottom = false;
-        let i = Math.floor(k / sourceSize), j = k % sourceSize;
-        if ((isNoDataCurrent || height === 0) && availableParentData) {
-            height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(currIndex / destSizeOne), currIndex % destSizeOne, skipPositiveHeights);
-        }
-        let tileX = Math.floor(j / destSize), tileY = Math.floor(i / destSize);
-        if ((i + tileY) % dt === 0 && (j + tileX) % dt === 0) {
-            outCurrenElevations[currIndex++] = height;
-        }
-        if ((j + 1) % destSize === 0 && j !== sourceSize - 1) {
-            //current tile
-            rightHeight = heightFactor * rgb2Height(rgbaData[k4 + 4], rgbaData[k4 + 5], rgbaData[k4 + 6]);
-            isNoDataRight = RgbTerrain.checkNoDataValue(noDataValues, rightHeight);
-            if ((isNoDataRight || rightHeight === 0) && availableParentData) {
-                rightHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(currIndex / destSizeOne), currIndex % destSizeOne, skipPositiveHeights);
+    extractElevationTilesRgbNoChildren(rgbaData, heightFactor, noDataValues, availableParentData = null, availableParentTileX, availableParentTileY, availableParentTileZoom, currentTileX, currentTileY, currentTileZoom, skipPositiveHeights, outCurrenElevations) {
+        let destSize = Math.sqrt(outCurrenElevations.length) - 1;
+        let destSizeOne = destSize + 1;
+        let sourceSize = Math.sqrt(rgbaData.length / 4);
+        let dt = sourceSize / destSize;
+        let rightHeight = 0, bottomHeight = 0, sourceSize4 = 0;
+        let [availableParentOffsetX, availableParentOffsetY, availableZoomDiff] = getTileOffset(currentTileX, currentTileY, currentTileZoom, availableParentTileX, availableParentTileY, availableParentTileZoom);
+        for (let k = 0, currIndex = 0, sourceDataLength = rgbaData.length / 4; k < sourceDataLength; k++) {
+            let k4 = k * 4;
+            let height = heightFactor * this.rgb2Height(rgbaData[k4], rgbaData[k4 + 1], rgbaData[k4 + 2]);
+            let isNoDataCurrent = RgbTerrain.checkNoDataValue(noDataValues, height), isNoDataRight = false, isNoDataBottom = false;
+            let i = Math.floor(k / sourceSize), j = k % sourceSize;
+            if ((isNoDataCurrent || height === 0) && availableParentData) {
+                height = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(currIndex / destSizeOne), currIndex % destSizeOne, skipPositiveHeights);
             }
-            let middleHeight = height;
-            if (!(isNoDataCurrent || isNoDataRight)) {
-                middleHeight = (height + rightHeight) * 0.5;
-            }
-            if ((i + tileY) % dt === 0) {
-                outCurrenElevations[currIndex++] = middleHeight;
+            let tileX = Math.floor(j / destSize), tileY = Math.floor(i / destSize);
+            if ((i + tileY) % dt === 0 && (j + tileX) % dt === 0) {
+                outCurrenElevations[currIndex++] = height;
             }
-        }
-        if ((i + 1) % destSize === 0 && i !== sourceSize - 1) {
-            //current tile
-            sourceSize4 = sourceSize * 4;
-            bottomHeight = heightFactor * rgb2Height(rgbaData[k4 + sourceSize4], rgbaData[k4 + sourceSize4 + 1], rgbaData[k4 + sourceSize4 + 2]);
-            isNoDataBottom = RgbTerrain.checkNoDataValue(noDataValues, bottomHeight);
-            if ((isNoDataBottom || bottomHeight === 0) && availableParentData) {
-                bottomHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(currIndex / destSizeOne), currIndex % destSizeOne, skipPositiveHeights);
+            if ((j + 1) % destSize === 0 && j !== sourceSize - 1) {
+                //current tile
+                rightHeight = heightFactor * this.rgb2Height(rgbaData[k4 + 4], rgbaData[k4 + 5], rgbaData[k4 + 6]);
+                isNoDataRight = RgbTerrain.checkNoDataValue(noDataValues, rightHeight);
+                if ((isNoDataRight || rightHeight === 0) && availableParentData) {
+                    rightHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(currIndex / destSizeOne), currIndex % destSizeOne, skipPositiveHeights);
+                }
+                let middleHeight = height;
+                if (!(isNoDataCurrent || isNoDataRight)) {
+                    middleHeight = (height + rightHeight) * 0.5;
+                }
+                if ((i + tileY) % dt === 0) {
+                    outCurrenElevations[currIndex++] = middleHeight;
+                }
             }
-            let middleHeight = (height + bottomHeight) * 0.5;
-            if (!(isNoDataCurrent || isNoDataBottom)) {
-                middleHeight = (height + bottomHeight) * 0.5;
+            if ((i + 1) % destSize === 0 && i !== sourceSize - 1) {
+                //current tile
+                sourceSize4 = sourceSize * 4;
+                bottomHeight = heightFactor * this.rgb2Height(rgbaData[k4 + sourceSize4], rgbaData[k4 + sourceSize4 + 1], rgbaData[k4 + sourceSize4 + 2]);
+                isNoDataBottom = RgbTerrain.checkNoDataValue(noDataValues, bottomHeight);
+                if ((isNoDataBottom || bottomHeight === 0) && availableParentData) {
+                    bottomHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(currIndex / destSizeOne), currIndex % destSizeOne, skipPositiveHeights);
+                }
+                let middleHeight = (height + bottomHeight) * 0.5;
+                if (!(isNoDataCurrent || isNoDataBottom)) {
+                    middleHeight = (height + bottomHeight) * 0.5;
+                }
+                if ((j + tileX) % dt === 0) {
+                    outCurrenElevations[currIndex++] = middleHeight;
+                }
             }
-            if ((j + tileX) % dt === 0) {
+            if ((j + 1) % destSize === 0 && j !== sourceSize - 1 &&
+                (i + 1) % destSize === 0 && i !== sourceSize - 1) {
+                //current tile
+                let rightBottomHeight = heightFactor * this.rgb2Height(rgbaData[k4 + sourceSize4 + 4], rgbaData[k4 + sourceSize4 + 5], rgbaData[k4 + sourceSize4 + 6]);
+                let isNoDataRightBottom = RgbTerrain.checkNoDataValue(noDataValues, rightBottomHeight);
+                if ((isNoDataRightBottom || rightBottomHeight === 0) && availableParentData) {
+                    rightBottomHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(currIndex / destSizeOne), currIndex % destSizeOne, skipPositiveHeights);
+                }
+                let middleHeight = height;
+                if (!(isNoDataCurrent || isNoDataRight || isNoDataBottom || isNoDataRightBottom)) {
+                    middleHeight = (height + rightHeight + bottomHeight + rightBottomHeight) * 0.25;
+                }
                 outCurrenElevations[currIndex++] = middleHeight;
             }
         }
-        if ((j + 1) % destSize === 0 && j !== sourceSize - 1 &&
-            (i + 1) % destSize === 0 && i !== sourceSize - 1) {
-            //current tile
-            let rightBottomHeight = heightFactor * rgb2Height(rgbaData[k4 + sourceSize4 + 4], rgbaData[k4 + sourceSize4 + 5], rgbaData[k4 + sourceSize4 + 6]);
-            let isNoDataRightBottom = RgbTerrain.checkNoDataValue(noDataValues, rightBottomHeight);
-            if ((isNoDataRightBottom || rightBottomHeight === 0) && availableParentData) {
-                rightBottomHeight = getParentHeight(availableZoomDiff, availableParentOffsetX, availableParentOffsetY, availableParentData, Math.floor(currIndex / destSizeOne), currIndex % destSizeOne, skipPositiveHeights);
-            }
-            let middleHeight = height;
-            if (!(isNoDataCurrent || isNoDataRight || isNoDataBottom || isNoDataRightBottom)) {
-                middleHeight = (height + rightHeight + bottomHeight + rightBottomHeight) * 0.25;
-            }
-            outCurrenElevations[currIndex++] = middleHeight;
-        }
     }
 }
+function getTileOffset(currentTileX, currentTileY, currentTileZoom, parentTileX, parentTileY, parentTileZoom) {
+    let dz2 = 2 << (currentTileZoom - parentTileZoom - 1);
+    return [currentTileX - dz2 * parentTileX, currentTileY - dz2 * parentTileY, 1.0 / dz2];
+}
+function getChildTileIndex(currentParentTileX, currentParentTileY, currentParentTileZoom, childOffsetX, childOffsetY) {
+    return [currentParentTileX * 2 + childOffsetX, currentParentTileY * 2 + childOffsetY, currentParentTileZoom + 1];
+}
+function getParentHeight(oneByDz2, offsetX, offsetY, heights, i, j, skipPositiveHeights) {
+    let parentGridSize = Math.sqrt(heights.length);
+    let pi = Math.floor(offsetY * oneByDz2 * parentGridSize + i * oneByDz2), pj = Math.floor(offsetX * oneByDz2 * parentGridSize + j * oneByDz2);
+    let h = heights[pi * parentGridSize + pj];
+    return skipPositiveHeights ? (h > 0 ? 0 : h) : h;
+}
 export { RgbTerrain };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.20.3",
+  "version": "0.21.0",
   "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"
@@ -34,34 +34,34 @@
   },
   "homepage": "https://www.openglobus.org",
   "devDependencies": {
-    "@babel/cli": "^7.24.7",
-    "@babel/core": "^7.24.7",
+    "@babel/cli": "^7.25.6",
+    "@babel/core": "^7.25.2",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/preset-env": "^7.24.7",
+    "@babel/preset-env": "^7.25.4",
     "@babel/preset-typescript": "^7.24.7",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.14.1",
-    "@typescript-eslint/parser": "^7.14.1",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
+    "@typescript-eslint/parser": "^8.4.0",
     "clean-jsdoc-theme": "^4.3.0",
-    "eslint": "^8.57.0",
+    "eslint": "^9.9.1",
     "jest": "^29.7.0",
     "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "^29.7.0",
     "jsdoc": "^4.0.3",
     "jsdoc-babel": "^0.5.0",
-    "lint-staged": "^15.2.7",
-    "local-web-server": "^5.3.3",
-    "postcss": "^8.4.39",
-    "prettier": "^3.3.2",
-    "rollup": "^4.18.0",
+    "lint-staged": "^15.2.10",
+    "local-web-server": "^5.4.0",
+    "postcss": "^8.4.45",
+    "prettier": "^3.3.3",
+    "rollup": "^4.21.2",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "ts-jest": "^29.1.5",
-    "typescript": "^5.5.2"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.5.4"
   },
   "lint-staged": {
     "*.{js,ts}": [