@openglobus/og 0.22.0 → 0.22.2

package/lib/js/Globe.js

@@ -123,7 +123,8 @@ class Globe {
             context: {
                 //alpha: false,
                 antialias: false,
-                premultipliedAlpha: false
+                premultipliedAlpha: false,
+                preserveDrawingBuffer: false
             }
         }), {
             autoActivate: false,
@@ -143,8 +144,8 @@ class Globe {
             frustums: options.frustums,
             ellipsoid: options.ellipsoid,
             maxGridSize: options.maxGridSize,
-            nightTextureSrc: options.nightTextureSrc === null ? null : `${options.resourcesSrc || DEFAULT_RESOURCES_SRC}${DEFAULT_NIGHT_SRC}`,
-            specularTextureSrc: options.specularTextureSrc === null ? null : `${options.resourcesSrc || DEFAULT_RESOURCES_SRC}${DEFAULT_SPEC_SRC}`,
+            nightTextureSrc: options.nightTextureSrc === null ? null : options.nightTextureSrc || `${options.resourcesSrc || DEFAULT_RESOURCES_SRC}${DEFAULT_NIGHT_SRC}`,
+            specularTextureSrc: options.specularTextureSrc === null ? null : options.specularTextureSrc || `${options.resourcesSrc || DEFAULT_RESOURCES_SRC}${DEFAULT_SPEC_SRC}`,
             minAltitude: options.minAltitude,
             maxAltitude: options.maxAltitude || 15000000,
             maxEqualZoomAltitude: options.maxEqualZoomAltitude,

package/lib/js/ellipsoid/Ellipsoid.d.ts

@@ -189,5 +189,6 @@ declare class Ellipsoid {
      */
     static getIntermediatePointOnGreatCircle(lonLat1: LonLat, lonLat2: LonLat, fraction: number): LonLat;
     static getRhumbBearing(lonLat1: LonLat, lonLat2: LonLat): number;
+    getLonLatVisibilitySimple(eye: Vec3, lonLat: LonLat, forward?: Vec3): boolean;
 }
 export { Ellipsoid };

package/lib/js/ellipsoid/Ellipsoid.js

@@ -439,5 +439,21 @@ class Ellipsoid {
         }
         return (Math.atan2(dLon, dPhi) * DEGREES + 360) % 360;
     }
+    getLonLatVisibilitySimple(eye, lonLat, forward) {
+        const cart = this.lonLatToCartesian(lonLat);
+        const height = lonLat.height;
+        const f = this.polarSize + height;
+        const g = Math.max(eye.length() - this.polarSize, 0);
+        const look = cart.sub(eye);
+        let maxVisibleDistance;
+        if (g > 0) {
+            maxVisibleDistance = Math.sqrt((f + g) ** 2 - f ** 2);
+        }
+        else {
+            maxVisibleDistance = f;
+        }
+        return maxVisibleDistance > look.length() &&
+            (!forward || forward.dot(look.normalize()) > 0.0);
+    }
 }
 export { Ellipsoid };

package/lib/js/layer/CanvasTiles.js

@@ -67,16 +67,6 @@ class CanvasTiles extends Layer {
      * @public
      */
     abortLoading() {
-        //const q = this._pendingsQueue;
-        // for (let i = q._shiftIndex + 1; i < q._popIndex + 1; i++) {
-        //     if (q._array[i]) {
-        //         this.abortMaterialLoading(q._array[i]);
-        //     }
-        // }
-        // this._pendingsQueue.clear();
-        // for (let i = 0; i < q.length; i++) {
-        //     this.abortMaterialLoading(q[i]);
-        // }
         this._pendingsQueue.forEach((qi) => {
             this.abortMaterialLoading(qi);
         });
@@ -104,7 +94,7 @@ class CanvasTiles extends Layer {
     loadMaterial(material) {
         let seg = material.segment;
         if (this._isBaseLayer) {
-            material.texture = seg._isNorth ? seg.planet.solidTextureOne : seg.planet.solidTextureTwo;
+            material.texture = seg.getDefaultTexture();
         }
         else {
             material.texture = seg.planet.transparentTexture;

package/lib/js/layer/Layer.js

@@ -75,7 +75,7 @@ class Layer {
         this._fading = options.fading || false;
         this._fadingFactor = this._opacity / FADING_RATIO;
         if (this._fading) {
-            this._fadingOpacity = this._visibility ? this._opacity : 0.0;
+            this._fadingOpacity = 0;
         }
         else {
             this._fadingOpacity = this._opacity;
@@ -581,29 +581,7 @@ class Layer {
         return new Material(segment, this);
     }
     redraw() {
-        if (this._planet) {
-            this._planet.quadTreeStrategy.clearLayerMaterial(this);
-            // this._planet._quadTree.traverseTree((n: Node) => {
-            //         if (n.segment.materials[this.__id]) {
-            //             n.segment.materials[this.__id].clear();
-            //         }
-            //     }
-            // );
-            //
-            // this._planet._quadTreeNorth.traverseTree((n: Node) => {
-            //         if (n.segment.materials[this.__id]) {
-            //             n.segment.materials[this.__id].clear();
-            //         }
-            //     }
-            // );
-            //
-            // this._planet._quadTreeSouth.traverseTree((n: Node) => {
-            //         if (n.segment.materials[this.__id]) {
-            //             n.segment.materials[this.__id].clear();
-            //         }
-            //     }
-            // );
-        }
+        this._planet?.quadTreeStrategy.clearLayerMaterial(this);
     }
     abortMaterialLoading(material) {
     }

package/lib/js/layer/Vector.js

@@ -4,6 +4,7 @@ import { EntityCollection } from "../entity/EntityCollection";
 import { GeometryHandler } from "../entity/GeometryHandler";
 import { Layer } from "./Layer";
 import { Vec3 } from "../math/Vec3";
+import * as mercator from "../mercator";
 /**
  * Creates entity instance array.
  * @param {Entity[] | IEntityParams[]} entities - Entity array.
@@ -216,6 +217,13 @@ class Vector extends Layer {
                 }
                 else {
                     entity._lonLat = this._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
+                    // IT's important event for degrees proj strategies
+                    if (Math.abs(entity._lonLat.lat) < mercator.MAX_LAT) {
+                        entity._lonLatMerc = entity._lonLat.forwardMercator();
+                    }
+                    else {
+                        entity._lonLatMerc.lon = entity._lonLatMerc.lat = entity._lonLatMerc.height = 0;
+                    }
                 }
             }
             if (entity.billboard || entity.label) {
@@ -612,7 +620,9 @@ class Vector extends Layer {
             this._collectStripCollectionPASS(outArr);
             this._collectPolylineCollectionPASS(outArr);
             this._collectGeoObjectCollectionPASS(outArr);
-            this._entityCollectionsTreeStrategy.collectVisibleEntityCollections(outArr);
+            if (this._entityCollectionsTreeStrategy) {
+                this._entityCollectionsTreeStrategy.collectVisibleEntityCollections(outArr);
+            }
         }
     }
     /**

package/lib/js/layer/XYZ.js

@@ -142,9 +142,7 @@ export class XYZ extends Layer {
                             material.textureNotExists();
                         }
                     }
-                }
-                //,this.__id
-                );
+                });
             }
             else {
                 material.textureNotExists();
@@ -277,12 +275,14 @@ export class XYZ extends Layer {
         if (e.southWest.lon === -180.0) {
             em.southWest.lon = -ENLARGE_MERCATOR_LON;
         }
-        if (e.northEast.lat >= mercator.MAX_LAT) {
-            e.northEast.lat = mercator.MAX_LAT;
-        }
-        if (e.northEast.lat <= mercator.MIN_LAT) {
-            e.northEast.lat = mercator.MIN_LAT;
-        }
+        // WHY!???
+        // if (e.northEast.lat >= mercator.MAX_LAT) {
+        //     e.northEast.lat = mercator.MAX_LAT;
+        // }
+        //
+        // if (e.northEast.lat <= mercator.MIN_LAT) {
+        //     e.northEast.lat = mercator.MIN_LAT;
+        // }
     }
 }
 const XYZ_EVENTS = [

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

@@ -292,6 +292,7 @@ declare class Renderer {
      * @public
      */
     draw(): void;
+    getImageDataURL(type?: string, quality?: number): string;
     protected _screenFrameMSAA(): void;
     protected _screenFrameNoMSAA(): void;
     /**

package/lib/js/renderer/Renderer.js

@@ -764,6 +764,10 @@ class Renderer {
         e.mouseState.moving = false;
         e.touchState.moving = false;
     }
+    getImageDataURL(type = "image/png", quality = 1.0) {
+        this.draw();
+        return this.handler.canvas ? this.handler.canvas.toDataURL(type, quality) : "";
+    }
     _screenFrameMSAA() {
         let h = this.handler;
         let sh = h.programs.toneMapping, p = sh._program, gl = h.gl;

package/lib/js/segment/SegmentLonLatEqui.d.ts

@@ -2,9 +2,12 @@ import { Extent } from "../Extent";
 import { Node } from "../quadTree/Node";
 import { Planet } from "../scene/Planet";
 import { SegmentLonLat } from "./SegmentLonLat";
+import { WebGLTextureExt } from "../webgl/Handler";
+export declare const POLE_PIECE_SIZE: number;
 export declare class SegmentLonLatEqui extends SegmentLonLat {
     constructor(node: Node, planet: Planet, tileZoom: number, extent: Extent);
     protected _getMaxZoom(): number;
     protected _assignTileYIndexes(extent: Extent): void;
     protected _assignTileXIndexes(extent: Extent): void;
+    getDefaultTexture(): WebGLTextureExt | null;
 }

package/lib/js/segment/SegmentLonLatEqui.js

@@ -1,6 +1,8 @@
 import { SegmentLonLat } from "./SegmentLonLat";
 import { getTileCellIndex, TILEGROUP_COMMON } from "./Segment";
 import { equi } from "../proj/equi";
+const MAX_POLE_ZOOM = 5;
+export const POLE_PIECE_SIZE = 5 / Math.pow(2, MAX_POLE_ZOOM);
 export class SegmentLonLatEqui extends SegmentLonLat {
     constructor(node, planet, tileZoom, extent) {
         super(node, planet, tileZoom, extent);
@@ -9,7 +11,21 @@ export class SegmentLonLatEqui extends SegmentLonLat {
         this._tileGroup = TILEGROUP_COMMON;
     }
     _getMaxZoom() {
-        return 150;
+        let maxPoleZoom = 0;
+        if (this._extent.northEast.lat > 85) {
+            //north pole limits
+            let Yz = Math.floor((90.0 - this._extent.northEast.lat) / POLE_PIECE_SIZE);
+            maxPoleZoom = Math.floor(Yz / 16) + MAX_POLE_ZOOM;
+        }
+        else if (this._extent.southWest.lat < -85) {
+            //south pole limits
+            let Yz = Math.floor((90 + this._extent.southWest.lat) / POLE_PIECE_SIZE);
+            maxPoleZoom = Math.floor(Yz / 16) + MAX_POLE_ZOOM;
+        }
+        else {
+            maxPoleZoom = 50;
+        }
+        return maxPoleZoom;
     }
     _assignTileYIndexes(extent) {
         const lat = extent.getCenter().lat;
@@ -24,4 +40,7 @@ export class SegmentLonLatEqui extends SegmentLonLat {
         this.tileXE = (this.tileX + 1) % p2;
         this.tileXW = (p2 + this.tileX - 1) % p2;
     }
+    getDefaultTexture() {
+        return this.planet.solidTextureOne;
+    }
 }

package/lib/js/webgl/Handler.d.ts

@@ -28,6 +28,7 @@ export interface IHandlerParameters {
         alpha?: boolean;
         antialias?: boolean;
         premultipliedAlpha?: boolean;
+        preserveDrawingBuffer?: boolean;
     };
     extensions?: string[];
     autoActivate?: boolean;
@@ -120,6 +121,7 @@ declare class Handler {
             alpha?: boolean;
             antialias?: boolean;
             premultipliedAlpha?: boolean;
+            preserveDrawingBuffer?: boolean;
         };
         extensions: string[];
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "[openglobus](https://www.openglobus.org/) is a javascript/typescript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers, and 3D objects. It uses the WebGL technology, open source, and completely free.",
   "directories": {
     "example": "./sandbox"
@@ -11,7 +11,7 @@
   "scripts": {
     "docs": "jsdoc -r ./src/ -c ./jsdoc.conf.json -d ./docs",
     "serve_docs": "cd docs; ws -p 8088",
-    "serve": "ws -p 8080",
+    "serve": "ws -p 3000",
     "build": "rollup -c --bundleConfigAsCjs",
     "clean": "rm -rf ./lib ./docs",
     "prepublishOnly": "npm run build; npm run gen_js",
@@ -57,7 +57,7 @@
     "local-web-server": "^5.4.0",
     "postcss": "^8.4.45",
     "prettier": "^3.3.3",
-    "rollup": "^4.21.2",
+    "rollup": "^4.22.4",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-postcss": "^4.0.2",
     "ts-jest": "^29.2.5",