@openglobus/og 0.19.3 → 0.20.0

package/lib/js/segment/SegmentLonLat.js

@@ -1,14 +1,11 @@
 import * as mercator from "../mercator";
-import * as quadTree from "../quadTree/quadTree";
 import { EPSG4326 } from "../proj/EPSG4326";
 import { Extent } from "../Extent";
 import { Layer } from "../layer/Layer";
-import { Segment, TILEGROUP_NORTH, TILEGROUP_SOUTH } from "./Segment";
+import { getTileCellIndex, Segment, TILEGROUP_NORTH, TILEGROUP_SOUTH } from "./Segment";
 import { LonLat } from "../LonLat";
-import { Vec3 } from "../math/Vec3";
 const MAX_POLE_ZOOM = 7;
 export const POLE_PIECE_SIZE = (90.0 - mercator.MAX_LAT) / Math.pow(2, MAX_POLE_ZOOM);
-let _tempHigh = new Vec3(), _tempLow = new Vec3();
 /**
  * Planet segment Web Mercator tile class that stored and rendered with quad tree.
  * @class
@@ -52,105 +49,29 @@ class SegmentLonLat extends Segment {
     _assignTileIndexes() {
         this._assignTileXIndexes(this._extent);
         this._assignTileYIndexes(this._extent);
-        this.tileIndex = Layer.getTileIndex(this.tileX, this.tileY, this.tileZoom);
+        this.tileIndex = Layer.getTileIndex(this.tileX, this.tileY, this.tileZoom, this._tileGroup);
     }
     _assignTileXIndexes(extent) {
-        this.tileX = Math.round(Math.abs(-180.0 - extent.southWest.lon) / (extent.northEast.lon - extent.southWest.lon));
+        this.tileX = getTileCellIndex(extent.getCenter().lon, extent.getWidth(), -180);
         let p2 = 1 << this.tileZoom;
         this.tileXE = (this.tileX + 1) % p2;
         this.tileXW = (p2 + this.tileX - 1) % p2;
     }
     _assignTileYIndexes(extent) {
-        const lat = extent.northEast.lat;
+        const lat = extent.getCenter().lat; //extent.northEast.lat;
         if (lat > 0) {
             this._tileGroup = TILEGROUP_NORTH;
-            this.tileY = Math.round((90.0 - lat) / (extent.northEast.lat - extent.southWest.lat));
+            this.tileY = getTileCellIndex(lat, extent.getHeight(), 90.0);
         }
         else {
             this._tileGroup = TILEGROUP_SOUTH;
-            this.tileY = Math.round((mercator.MIN_LAT - lat) / (extent.northEast.lat - extent.southWest.lat));
+            this.tileY = getTileCellIndex(lat, extent.getHeight(), mercator.MIN_LAT);
         }
         this.tileYN = this.tileY - 1;
         this.tileYS = this.tileY + 1;
     }
-    _createPlainVertices() {
-        const gridSize = this.planet.terrain.gridSizeByZoom[this.tileZoom];
-        const e = this._extent;
-        const fgs = this.planet.terrain.plainGridSize;
-        const lonSize = e.getWidth();
-        const latSize = e.getHeight();
-        const llStep = lonSize / Math.max(fgs, gridSize);
-        const ltStep = latSize / gridSize;
-        const esw_lon = e.southWest.lon;
-        const ene_lat = e.northEast.lat;
-        const dg = Math.max(fgs / gridSize, 1);
-        const gs = Math.max(fgs, gridSize) + 1;
-        const r2 = this.planet.ellipsoid._invRadii2;
-        let ind = 0, nmInd = 0;
-        const gsgs = gs * gs;
-        const gridSize3 = (gridSize + 1) * (gridSize + 1) * 3;
-        this.plainNormals = new Float32Array(gridSize3);
-        this.plainVertices = new Float64Array(gridSize3);
-        this.plainVerticesHigh = new Float32Array(gridSize3);
-        this.plainVerticesLow = new Float32Array(gridSize3);
-        this.normalMapNormals = new Float32Array(gsgs * 3);
-        this.normalMapVertices = new Float64Array(gsgs * 3);
-        this.normalMapVerticesHigh = new Float32Array(gsgs * 3);
-        this.normalMapVerticesLow = new Float32Array(gsgs * 3);
-        let xmin = 549755748352.0, xmax = -549755748352.0, ymin = 549755748352.0, ymax = -549755748352.0, zmin = 549755748352.0, zmax = -549755748352.0;
-        let verts = this.plainVertices, vertsHigh = this.plainVerticesHigh, vertsLow = this.plainVerticesLow, norms = this.plainNormals, nmVerts = this.normalMapVertices, nmVertsHigh = this.normalMapVerticesHigh, nmVertsLow = this.normalMapVerticesLow, nmNorms = this.normalMapNormals;
-        for (let k = 0; k < gsgs; k++) {
-            let j = k % gs, i = ~~(k / gs);
-            const v = this.planet.ellipsoid.lonLatToCartesian(new LonLat(esw_lon + j * llStep, ene_lat - i * ltStep));
-            let nx = v.x * r2.x, ny = v.y * r2.y, nz = v.z * r2.z;
-            let l = 1.0 / Math.sqrt(nx * nx + ny * ny + nz * nz);
-            let nxl = nx * l, nyl = ny * l, nzl = nz * l;
-            Vec3.doubleToTwoFloats(v, _tempHigh, _tempLow);
-            nmVerts[nmInd] = v.x;
-            nmVertsHigh[nmInd] = _tempHigh.x;
-            nmVertsLow[nmInd] = _tempLow.x;
-            nmNorms[nmInd++] = nxl;
-            nmVerts[nmInd] = v.y;
-            nmVertsHigh[nmInd] = _tempHigh.y;
-            nmVertsLow[nmInd] = _tempLow.y;
-            nmNorms[nmInd++] = nyl;
-            nmVerts[nmInd] = v.z;
-            nmVertsHigh[nmInd] = _tempHigh.z;
-            nmVertsLow[nmInd] = _tempLow.z;
-            nmNorms[nmInd++] = nzl;
-            if (i % dg === 0 && j % dg === 0) {
-                verts[ind] = v.x;
-                vertsHigh[ind] = _tempHigh.x;
-                vertsLow[ind] = _tempLow.x;
-                norms[ind++] = nxl;
-                verts[ind] = v.y;
-                vertsHigh[ind] = _tempHigh.y;
-                vertsLow[ind] = _tempLow.y;
-                norms[ind++] = nyl;
-                verts[ind] = v.z;
-                vertsHigh[ind] = _tempHigh.z;
-                vertsLow[ind] = _tempLow.z;
-                norms[ind++] = nzl;
-                if (v.x < xmin)
-                    xmin = v.x;
-                if (v.x > xmax)
-                    xmax = v.x;
-                if (v.y < ymin)
-                    ymin = v.y;
-                if (v.y > ymax)
-                    ymax = v.y;
-                if (v.z < zmin)
-                    zmin = v.z;
-                if (v.z > zmax)
-                    zmax = v.z;
-            }
-        }
-        this.terrainVertices = verts;
-        this.terrainVerticesHigh = vertsHigh;
-        this.terrainVerticesLow = vertsLow;
-        let x = (xmax - xmin) * 0.5, y = (ymax - ymin) * 0.5, z = (zmax - zmin) * 0.5;
-        this._plainRadius = Math.sqrt(x * x + y * y + z * z);
-        this.plainReady = true;
+    _projToDeg(lon, lat) {
+        return new LonLat(lon, lat);
     }
     _assignGlobalTextureCoordinates() {
         const e = this._extent;
@@ -197,18 +118,5 @@ class SegmentLonLat extends Segment {
     getExtentLonLat() {
         return this._extent;
     }
-    /**
-     * @todo: replace to the strategy
-     */
-    getNodeState() {
-        let vn;
-        if (this._isNorth) {
-            vn = this.planet._visibleNodesNorth[this.node.nodeId];
-        }
-        else {
-            vn = this.planet._visibleNodesSouth[this.node.nodeId];
-        }
-        return (vn && vn.state) || quadTree.NOTRENDERING;
-    }
 }
 export { SegmentLonLat };

package/lib/js/segment/SegmentLonLatWgs84.js

@@ -1,5 +1,5 @@
 import { SegmentLonLat } from "./SegmentLonLat";
-import { TILEGROUP_COMMON } from "./Segment";
+import { getTileCellIndex, TILEGROUP_COMMON } from "./Segment";
 export class SegmentLonLatWgs84 extends SegmentLonLat {
     constructor(node, planet, tileZoom, extent) {
         super(node, planet, tileZoom, extent);
@@ -10,12 +10,14 @@ export class SegmentLonLatWgs84 extends SegmentLonLat {
         return 150;
     }
     _assignTileYIndexes(extent) {
-        this.tileY = Math.round((90.0 - extent.northEast.lat) / (extent.northEast.lat - extent.southWest.lat));
+        const lat = extent.getCenter().lat;
+        this.tileY = getTileCellIndex(lat, extent.getHeight(), 90.0);
         this.tileYN = this.tileY - 1;
         this.tileYS = this.tileY + 1;
     }
     _assignTileXIndexes(extent) {
-        this.tileX = Math.round(Math.abs(-180.0 - extent.southWest.lon) / (extent.northEast.lon - extent.southWest.lon));
+        let lon = extent.getCenter().lon;
+        this.tileX = getTileCellIndex(lon, extent.getWidth(), -180);
         let p2 = (1 << this.tileZoom) * 2;
         this.tileXE = (this.tileX + 1) % p2;
         this.tileXW = (p2 + this.tileX - 1) % p2;

package/lib/js/shaders/billboard.js

@@ -68,8 +68,8 @@ export function billboardPicking() {
                     return;
                 }
 
-                vec3 up = vec3( viewMatrix[0][1], viewMatrix[1][1], viewMatrix[2][1] );
-                vec3 right = vec3( viewMatrix[0][0], viewMatrix[1][0], viewMatrix[2][0] );
+                //vec3 up = vec3( viewMatrix[0][1], viewMatrix[1][1], viewMatrix[2][1] );
+                //vec3 right = vec3( viewMatrix[0][0], viewMatrix[1][0], viewMatrix[2][0] );
 
                 float scd = (1.0 - smoothstep(uScaleByDistance[0], uScaleByDistance[1], lookDist)) * (1.0 - step(uScaleByDistance[2], lookDist));
 
@@ -171,8 +171,8 @@ export function billboard_screen() {
                     return;
                 }
 
-                vec3 up = vec3( viewMatrix[0][1], viewMatrix[1][1], viewMatrix[2][1] );
-                vec3 right = vec3( viewMatrix[0][0], viewMatrix[1][0], viewMatrix[2][0] );
+                //vec3 up = vec3( viewMatrix[0][1], viewMatrix[1][1], viewMatrix[2][1] );
+                //vec3 right = vec3( viewMatrix[0][0], viewMatrix[1][0], viewMatrix[2][0] );
 
                 float scd = (1.0 - smoothstep(uScaleByDistance[0], uScaleByDistance[1], lookDist)) * (1.0 - step(uScaleByDistance[2], lookDist));
 

package/lib/js/shaders/drawnode.js

@@ -64,7 +64,7 @@ export function drawnode_screen_nl() {
                 vec3 lowDiff = aVertexPositionLow - eyePositionLow + nh;
                 
                 // This is works for Mac Chrome, prevent some weird optimization I suppose
-                gl_Position =  m * vec4(highDiff + lowDiff, 1.0);
+                gl_Position =  m * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);
             }`,
         fragmentShader: `precision highp float;
             #define SLICE_SIZE ${SLICE_SIZE + 1}
@@ -149,14 +149,13 @@ export function drawnode_screen_wl_webgl1NoAtmos() {
 
             void main(void) {
 
-                // I replace it here (from the bottom) because it 
-                // somehow affects on float precision on MacPC Chrome
+                vec3 aVertexPosition = aVertexPositionHigh + aVertexPositionLow;                
+                vec3 nh = height * normalize(aVertexPosition);
+
                 vTextureCoord.xy = aTextureCoord;
                 vGlobalTextureCoord = uGlobalTextureCoord.xy + (uGlobalTextureCoord.zw - uGlobalTextureCoord.xy) * aTextureCoord;
                 vTextureCoord.zw = uNormalMapBias.z * ( aTextureCoord + uNormalMapBias.xy );
 
-                vec3 aVertexPosition = aVertexPositionHigh + aVertexPositionLow;                
-                vec3 nh = height * normalize(aVertexPosition);
                 cameraPosition = eyePositionHigh + eyePositionLow;
                 
                 vec3 highDiff = aVertexPositionHigh - eyePositionHigh;
@@ -168,7 +167,7 @@ export function drawnode_screen_wl_webgl1NoAtmos() {
                 v_height = height;
                 v_vertex = aVertexPosition + nh;
                             
-                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
+                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);
             }`,
         fragmentShader: `
             precision highp float;
@@ -330,14 +329,13 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
 
             void main(void) {
 
-                // I replace it here (from the bottom) because it 
-                // somehow affects on float precision on MacPC Chrome
+                vec3 aVertexPosition = aVertexPositionHigh + aVertexPositionLow;                
+                vec3 nh = height * normalize(aVertexPosition);
+                
                 vTextureCoord.xy = aTextureCoord;
                 vGlobalTextureCoord = uGlobalTextureCoord.xy + (uGlobalTextureCoord.zw - uGlobalTextureCoord.xy) * aTextureCoord;
                 vTextureCoord.zw = uNormalMapBias.z * ( aTextureCoord + uNormalMapBias.xy );
 
-                vec3 aVertexPosition = aVertexPositionHigh + aVertexPositionLow;                
-                vec3 nh = height * normalize(aVertexPosition);
                 cameraPosition = eyePositionHigh + eyePositionLow;
                 
                 vec3 highDiff = aVertexPositionHigh - eyePositionHigh;
@@ -349,7 +347,7 @@ export function drawnode_screen_wl_webgl2NoAtmos() {
                 v_height = height;
                 v_vertex = aVertexPosition + nh;
                             
-                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
+                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);
             }`,
         fragmentShader: `#version 300 es
 
@@ -527,14 +525,13 @@ export function drawnode_screen_wl_webgl2Atmos() {
 
             void main(void) {
 
-                // I replace it here (from the bottom) because it 
-                // somehow affects on float precision on MacPC Chrome
+                vec3 aVertexPosition = aVertexPositionHigh + aVertexPositionLow;                
+                vec3 nh = height * normalize(aVertexPosition);
+
                 vTextureCoord.xy = aTextureCoord;
                 vGlobalTextureCoord = uGlobalTextureCoord.xy + (uGlobalTextureCoord.zw - uGlobalTextureCoord.xy) * aTextureCoord;
                 vTextureCoord.zw = uNormalMapBias.z * ( aTextureCoord + uNormalMapBias.xy );
 
-                vec3 aVertexPosition = aVertexPositionHigh + aVertexPositionLow;                
-                vec3 nh = height * normalize(aVertexPosition);
                 cameraPosition = eyePositionHigh + eyePositionLow;
                 
                 vec3 highDiff = aVertexPositionHigh - eyePositionHigh;
@@ -546,7 +543,7 @@ export function drawnode_screen_wl_webgl2Atmos() {
                 v_height = height;
                 v_vertex = aVertexPosition + nh;
                             
-                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff + lowDiff, 1.0);
+                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);
             }`,
         fragmentShader: `#version 300 es
 
@@ -850,7 +847,7 @@ export function drawnode_colorPicking() {
                 vec3 highDiff = aVertexPositionHigh - eyePositionHigh;
                 vec3 lowDiff = aVertexPositionLow - eyePositionLow + nh;
 
-                gl_Position = m * vec4(highDiff + lowDiff, 1.0);
+                gl_Position = m * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);
             }`,
         fragmentShader: `precision highp float;
             #define SLICE_SIZE ${SLICE_SIZE + 1}
@@ -930,7 +927,7 @@ export function drawnode_heightPicking() {
                 vec3 highDiff = aVertexPositionHigh - eyePositionHigh;
                 vec3 lowDiff = aVertexPositionLow - eyePositionLow + nh;
                 
-                gl_Position =  m * vec4(highDiff + lowDiff, 1.0);         
+                gl_Position =  m * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);         
             }`,
         fragmentShader: `precision highp float;
 
@@ -997,7 +994,7 @@ export function drawnode_depth() {
                 vec3 highDiff = aVertexPositionHigh - eyePositionHigh;
                 vec3 lowDiff = aVertexPositionLow - eyePositionLow + nh;
                 
-                gl_Position =  m * vec4(highDiff + lowDiff, 1.0);    
+                gl_Position =  m * vec4(highDiff * step(1.0, length(highDiff)) + lowDiff, 1.0);    
             }`,
         fragmentShader: `precision highp float;
             uniform vec3 frustumPickingColor;

package/lib/js/shaders/geoObject.js

@@ -21,7 +21,7 @@ export const geo_object = () => new Program("geo_object", {
         aDirection: { type: "vec3", divisor: 1 },
         aPitchRoll: { type: "vec2", divisor: 1 },
         aColor: { type: "vec4", divisor: 1 },
-        aScale: { type: "float", divisor: 1 },
+        aScale: { type: "vec3", divisor: 1 },
         aDispose: { type: "float", divisor: 1 }
     },
     vertexShader: `precision highp float;
@@ -33,7 +33,7 @@ export const geo_object = () => new Program("geo_object", {
             attribute vec3 aDirection;
             attribute vec2 aPitchRoll;
             attribute vec4 aColor;
-            attribute float aScale;
+            attribute vec3 aScale;
             attribute float aDispose;
             attribute float aUseTexture;
             attribute vec2 aTexCoord;
@@ -118,14 +118,13 @@ export const geo_object = () => new Program("geo_object", {
                 // ... is the same math
                 float scd = uScaleByDistance[2] * clamp(lookLength, uScaleByDistance[0], uScaleByDistance[1]) / uScaleByDistance[0];
                 
-                vec3 vert = modelMatrix * aVertexPosition * aScale * scd;
-                v_vertex = position + vert;
+                vec3 vert = modelMatrix * (aVertexPosition * aScale) * scd;
                 
-                // @hack
-                // Mac/Safari affects on lowDiff somehow. 
                 vert += lowDiff;
                                
-                gl_Position = projectionMatrix * viewMatrixRTE  * vec4(highDiff + vert, 1.0);
+                gl_Position = projectionMatrix * viewMatrixRTE  * vec4(highDiff * step(1.0, length(highDiff)) + vert, 1.0);
+                
+                v_vertex = position + vert;
             }`,
     fragmentShader: `precision highp float;
 
@@ -183,7 +182,7 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
         aDirection: { type: "vec3", divisor: 1 },
         aPitchRoll: { type: "vec2", divisor: 1 },
         aPickingColor: { type: "vec3", divisor: 1 },
-        aScale: { type: "float", divisor: 1 },
+        aScale: { type: "vec3", divisor: 1 },
         aDispose: { type: "float", divisor: 1 }
     },
     vertexShader: `precision highp float;
@@ -194,7 +193,7 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
             attribute vec3 aDirection;
             attribute vec3 aPickingColor;
             attribute vec2 aPitchRoll;
-            attribute float aScale;
+            attribute vec3 aScale;
             attribute float aDispose;
             
             uniform vec3 eyePositionHigh;
@@ -262,11 +261,11 @@ export const geo_object_picking = () => new Program("geo_object_picking", {
                  // tays in the vert above it affects on Mac Safari jitter
                  float scd = pickingScale * uScaleByDistance[2] * clamp(lookLength, uScaleByDistance[0], uScaleByDistance[1]) / uScaleByDistance[0];
 
-                 vec3 vert = modelMatrix * aVertexPosition * aScale * scd;
+                 vec3 vert = modelMatrix * (aVertexPosition * aScale) * scd;
                  
                  vert += lowDiff;
                                 
-                 gl_Position = projectionMatrix * viewMatrixRTE  * vec4(highDiff + vert, 1.0);
+                 gl_Position = projectionMatrix * viewMatrixRTE  * vec4(highDiff * step(1.0, length(highDiff)) + vert, 1.0);
             }`,
     fragmentShader: `precision highp float;
             varying vec3 vColor;

package/lib/js/shaders/ray.js

@@ -52,8 +52,6 @@ export function rayScreen() {
                 vec3 vert = right * a_thickness * focalSize * a_vertices.x;
 
                 vec3 highDiff;
-                vec3 lowDiff;
-
                 if(a_vertices.y == 0.0){
                     highDiff = a_startPosHigh - eyePositionHigh;
                     vert += a_startPosLow - eyePositionLow;
@@ -65,7 +63,13 @@ export function rayScreen() {
                 mat4 viewMatrixRTE = viewMatrix;
                 viewMatrixRTE[3] = vec4(0.0, 0.0, 0.0, 1.0);
                 
-                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff + vert, 1.0);
+                // Hack for iMac M1, looks like it doesnt 
+                // work correctly with zeroes in highDiff
+                // if(length(highDiff) < 1.0){
+                //     highDiff = vec3(0.0);
+                // }
+                
+                gl_Position = projectionMatrix * viewMatrixRTE * vec4(highDiff * step(1.0, length(highDiff)) + vert, 1.0);
             }`,
         fragmentShader: `precision highp float;
             varying vec4 v_rgba;

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

@@ -13,6 +13,6 @@ declare class BilTerrain extends GlobusTerrain {
     constructor(options?: IBilTerrainParams);
     isBlur(segment: Segment): boolean;
     protected _createUrl(segment: Segment): string;
-    protected _createHeights(data: number[], tileIndex: string, tileX: number, tileY: number, tileZoom: number, extent: Extent, preventChildren: boolean): TypedArray | number[];
+    protected _createHeights(data: number[], segment: Segment | null, tileGroup: number, tileX: number, tileY: number, tileZoom: number, extent: Extent, preventChildren: boolean): TypedArray | number[];
 }
 export { BilTerrain };

package/lib/js/terrain/BilTerrain.js

@@ -26,7 +26,7 @@ class BilTerrain extends GlobusTerrain {
     _createUrl(segment) {
         return WMS.createRequestUrl(this.url, this._layers, this._format, "1.1.1", "GetMap", segment._projection.code, WMS.get_bbox_v1_1_1(segment.getExtent()), this._imageSize, this._imageSize);
     }
-    _createHeights(data, tileIndex, tileX, tileY, tileZoom, extent, preventChildren) {
+    _createHeights(data, segment, tileGroup, tileX, tileY, tileZoom, extent, preventChildren) {
         let bil16 = new Int16Array(data);
         //
         //Non-power of two images
@@ -48,19 +48,20 @@ class BilTerrain extends GlobusTerrain {
         }
         let outCurrenElevations = new Float32Array(elevationsSize);
         extractElevationTiles(bil16, this.noDataValues, outCurrenElevations, outChildrenElevations);
-        this._elevationCache[tileIndex] = {
+        let tileIndex = Layer.getTileIndex(tileX, tileY, tileZoom, tileGroup);
+        this.setElevationCache(tileIndex, {
             heights: outCurrenElevations,
             extent: extent
-        };
+        });
         let dd = this._imageSize / this.plainGridSize;
         for (let i = 0; i < dd; i++) {
             for (let j = 0; j < dd; j++) {
                 let x = tileX * 2 + j, y = tileY * 2 + i, z = tileZoom + 1;
-                let tileIndex = Layer.getTileIndex(x, y, z);
-                this._elevationCache[tileIndex] = {
+                let tileIndex = Layer.getTileIndex(x, y, z, tileGroup);
+                this.setElevationCache(tileIndex, {
                     heights: outChildrenElevations[i][j],
                     extent: getTileExtent(x, y, z)
-                };
+                });
             }
         }
         return outCurrenElevations;

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

@@ -13,6 +13,7 @@ export interface IEmptyTerrainParams {
     geoid?: Geoid;
     gridSizeByZoom?: number[];
 }
+export type UrlRewriteFunc = (tileX: number, tileY: number, tileZoom: number, tileGroup: number) => string | null | undefined;
 /**
  * Class represents terrain provider without elevation data.
  * @param {IEmptyTerrainParams} [options] - Provider options:
@@ -82,6 +83,12 @@ declare class EmptyTerrain {
     _geoid: Geoid;
     _isReady: boolean;
     constructor(options?: IEmptyTerrainParams);
+    /**
+     * Sets url rewrite callback, used for custom url rewriting for every tile loading.
+     * @public
+     * @param {UrlRewriteFunc} ur - The callback that returns tile custom created url.
+     */
+    setUrlRewriteCallback(ur: UrlRewriteFunc): void;
     get isIdle(): boolean;
     isEqual(obj: this): boolean;
     static checkNoDataValue(noDataValues: number[] | TypedArray, value: number): boolean;

package/lib/js/terrain/EmptyTerrain.js

@@ -48,6 +48,13 @@ class EmptyTerrain {
         //     },
         // ];
     }
+    /**
+     * Sets url rewrite callback, used for custom url rewriting for every tile loading.
+     * @public
+     * @param {UrlRewriteFunc} ur - The callback that returns tile custom created url.
+     */
+    setUrlRewriteCallback(ur) {
+    }
     get isIdle() {
         return true;
     }

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

@@ -0,0 +1,6 @@
+import { IRgbTerrainParams, RgbTerrain } from "./RgbTerrain";
+import { Segment } from "../segment/Segment";
+export declare class GlobusRgbTerrain extends RgbTerrain {
+    constructor(name?: string | null, options?: IRgbTerrainParams);
+    isReadyToLoad(segment: Segment): boolean;
+}

package/lib/js/terrain/GlobusRgbTerrain.js

@@ -0,0 +1,25 @@
+import { RgbTerrain } from "./RgbTerrain";
+import { TILEGROUP_NORTH, TILEGROUP_SOUTH } from "../segment/Segment";
+const urlPref = {
+    [TILEGROUP_NORTH]: "north",
+    [TILEGROUP_SOUTH]: "south"
+};
+const urlRewriteFunc = (tileX, tileY, tileZoom, tileGroup) => {
+    let g = urlPref[tileGroup];
+    if (g)
+        return `https://terrain.openglobus.org/public/poles/${g}/${tileZoom}/${tileX}/${tileY}.png`;
+};
+export class GlobusRgbTerrain extends RgbTerrain {
+    constructor(name, options) {
+        super(name || "GlobusEarthRgb", {
+            maxNativeZoom: 6,
+            maxZoom: 17,
+            url: "https://{s}.terrain.openglobus.org/public/all/{z}/{x}/{y}.png",
+            urlRewrite: urlRewriteFunc,
+            ...options
+        });
+    }
+    isReadyToLoad(segment) {
+        return this._extent.overlaps(segment.getExtentLonLat());
+    }
+}

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

@@ -1,6 +1,6 @@
 import { EventsHandler } from "../Events";
 import { TypedArray } from "../utils/shared";
-import { EmptyTerrain, IEmptyTerrainParams } from "./EmptyTerrain";
+import { EmptyTerrain, IEmptyTerrainParams, UrlRewriteFunc } from "./EmptyTerrain";
 import { Extent } from "../Extent";
 import { Loader } from "../utils/Loader";
 import { LonLat } from "../LonLat";
@@ -18,7 +18,6 @@ type TileData = {
     heights: number[] | TypedArray | null;
     extent: Extent | null;
 };
-type UrlRewriteFunc = (segment: Segment, url: string) => string;
 /**
  * Class that loads segment elevation data, converts it to the array and passes it to the planet segment.
  * @class
@@ -66,8 +65,9 @@ declare class GlobusTerrain extends EmptyTerrain {
     get loader(): Loader<GlobusTerrain>;
     clearCache(): void;
     isBlur(segment: Segment): boolean;
+    setElevationCache(tileIndex: string, tileData: TileData): void;
+    getElevationCache(tileIndex: string): TileData | undefined;
     getHeightAsync(lonLat: LonLat, callback: (h: number) => void, zoom?: number, firstAttempt?: boolean): boolean;
-    getTileCache(lonLat: LonLat, z: number): TileData | undefined;
     protected _getGroundHeightMerc(merc: LonLat, tileData: TileData): number;
     /**
      * Stop loading.
@@ -97,7 +97,7 @@ declare class GlobusTerrain extends EmptyTerrain {
      */
     loadTerrain(segment: Segment, forceLoading?: boolean): void;
     protected _getSubdomain(): string;
-    _buildURL(x: number, y: number, z: number): string;
+    buildURL(x: number, y: number, z: number, tileGroup: number): string;
     /**
      * Creates default query url string.
      * @protected
@@ -123,7 +123,7 @@ declare class GlobusTerrain extends EmptyTerrain {
      * @public
      * @returns {Array.<number>} -
      */
-    protected _createHeights(data: any, tileIndex?: string, x?: number, y?: number, z?: number, extent?: Extent, isMaxZoom?: boolean): TypedArray | number[];
+    protected _createHeights(data: any, segment?: Segment | null, tileGroup?: number, x?: number, y?: number, z?: number, extent?: Extent, isMaxZoom?: boolean): TypedArray | number[];
     /**
      * @protected
      */