@openglobus/og 0.18.0 → 0.18.1

package/{src/layer/GeoImage.ts → lib/js/layer/GeoImage.js}

@@ -1,58 +1,32 @@
-import {nextHighestPowerOfTwo} from "../math";
-import {BaseGeoImage, IBaseGeoImageParams} from "./BaseGeoImage";
-import {isImageLoaded} from "../utils/shared";
-import {Material} from "./Material";
-
-interface IGeoImageParams extends IBaseGeoImageParams {
-    image?: HTMLImageElement | HTMLCanvasElement | ImageBitmap;
-    src?: string;
-}
-
+import { nextHighestPowerOfTwo } from "../math";
+import { BaseGeoImage } from "./BaseGeoImage";
+import { isImageLoaded } from "../utils/shared";
 /**
  * Used to load and display a single image over specific corner coordinates on the globe.
  * @class
  * @extends {BaseGeoImage}
  */
 class GeoImage extends BaseGeoImage {
-    /**
-     * Image object.
-     * @protected
-     * @type {HTMLImageElement | HTMLCanvasElement | ImageBitmap}
-     */
-    protected _image: HTMLImageElement | HTMLCanvasElement | ImageBitmap | null;
-
-    /**
-     * Image source url path.
-     * @protected
-     * @type {string}
-     */
-    protected _src: string | null;
-
-    protected _onLoad_: ((this: HTMLImageElement, ev: Event) => void) | null;
-
-    constructor(name: string | null, options: IGeoImageParams = {}) {
+    constructor(name, options = {}) {
         super(name, options);
         this._image = options.image || null;
         this._src = options.src || null;
         this._onLoad_ = null;
     }
-
-    public override get instanceName(): string {
+    get instanceName() {
         return "GeoImage";
     }
-
-    public override abortLoading() {
+    abortLoading() {
         if (this._image instanceof HTMLImageElement) {
             this._image.src = "";
         }
     }
-
     /**
      * Sets image source url path.
      * @public
      * @param {string} srs - Image url path.
      */
-    public setSrc(src: string) {
+    setSrc(src) {
         this._planet && this._planet._geoImageCreator.remove(this);
         this._src = src;
         this._sourceReady = false;
@@ -62,13 +36,12 @@ class GeoImage extends BaseGeoImage {
         this._image.addEventListener("load", this._onLoad_);
         this._image.src = src;
     }
-
     /**
      * Sets image object.
      * @public
      * @param {Image} image - Image object.
      */
-    public setImage(image: HTMLImageElement) {
+    setImage(image) {
         this._planet && this._planet._geoImageCreator.remove(this);
         this._sourceCreated = false;
         this._sourceReady = false;
@@ -76,33 +49,31 @@ class GeoImage extends BaseGeoImage {
         this._src = image.src;
         if (isImageLoaded(this._image)) {
             this._applyImage(this._image);
-        } else {
+        }
+        else {
             this._onLoad_ = this._onLoad.bind(this);
             this._image.addEventListener("load", this._onLoad_);
         }
     }
-
     /**
      * Creates source gl texture.
      * @virtual
      * @protected
      */
-    protected override _createSourceTexture() {
+    _createSourceTexture() {
         if (!this._sourceCreated && this._image) {
-            this._sourceTexture = this._planet!.renderer!.handler.createTexture_l(this._image);
+            this._sourceTexture = this._planet.renderer.handler.createTexture_l(this._image);
             this._sourceCreated = true;
         }
     }
-
-    protected _onLoad(ev: Event) {
+    _onLoad(ev) {
         this._applyImage(this._image);
         if (this._image instanceof HTMLImageElement) {
-            this._image.removeEventListener("load", this._onLoad_!);
+            this._image.removeEventListener("load", this._onLoad_);
         }
         this._onLoad_ = null;
     }
-
-    protected _applyImage(img: HTMLImageElement | HTMLCanvasElement | ImageBitmap | null) {
+    _applyImage(img) {
         if (img) {
             this._frameWidth = nextHighestPowerOfTwo(img.width * 2, 4096);
             this._frameHeight = nextHighestPowerOfTwo(img.height * 3, 4096);
@@ -112,14 +83,12 @@ class GeoImage extends BaseGeoImage {
             }
         }
     }
-
-
     /**
      * Loads planet segment material. In this case - GeoImage source image.
      * @public
      * @param {Material} material - GeoImage planet material.
      */
-    public override loadMaterial(material: Material) {
+    loadMaterial(material) {
         material.isLoading = true;
         this._creationProceeding = true;
         if (!this._sourceReady && this._src) {
@@ -127,27 +96,29 @@ class GeoImage extends BaseGeoImage {
                 if (this._image instanceof HTMLImageElement) {
                     if (isImageLoaded(this._image)) {
                         this._applyImage(this._image);
-                    } else {
+                    }
+                    else {
                         this._onLoad_ = this._onLoad.bind(this);
                         this._image.addEventListener("load", this._onLoad_);
                     }
                 }
-            } else {
+            }
+            else {
                 this._image = new Image();
                 this._onLoad_ = this._onLoad.bind(this);
                 this._image.addEventListener("load", this._onLoad_);
                 this._image.src = this._src;
             }
-        } else if (this._planet) {
+        }
+        else if (this._planet) {
             this._planet._geoImageCreator.add(this);
         }
     }
-
     /**
      * @public
      * @param {Material} material - GeoImage material.
      */
-    public override abortMaterialLoading(material: Material) {
+    abortMaterialLoading(material) {
         if (this._image && this._image instanceof HTMLImageElement) {
             this._image.src = "";
         }
@@ -156,5 +127,4 @@ class GeoImage extends BaseGeoImage {
         material.isReady = false;
     }
 }
-
-export {GeoImage};
+export { GeoImage };

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

@@ -0,0 +1,17 @@
+import { BaseGeoImage, IBaseGeoImageParams } from './BaseGeoImage';
+import { Material } from "../layer/Material";
+import { WebGLTextureExt } from "../webgl/Handler";
+interface IGeoTexture2dParams extends IBaseGeoImageParams {
+    texture?: WebGLTextureExt;
+    frameWidth?: number;
+    frameHeight?: number;
+}
+declare class GeoTexture2d extends BaseGeoImage {
+    constructor(name: string | null, options?: IGeoTexture2dParams);
+    get instanceName(): string;
+    loadMaterial(material: Material): void;
+    bindTexture(texture: WebGLTextureExt): void;
+    setSize(width: number, height: number): void;
+    abortMaterialLoading(material: Material): void;
+}
+export { GeoTexture2d };

package/lib/js/layer/GeoTexture2d.js

@@ -0,0 +1,37 @@
+import { BaseGeoImage } from './BaseGeoImage';
+import { nextHighestPowerOfTwo } from '../math';
+class GeoTexture2d extends BaseGeoImage {
+    constructor(name, options = {}) {
+        super(name, options);
+        this._sourceTexture = options.texture || null;
+        if (options.texture) {
+            this._sourceReady = true;
+            this._sourceCreated = true;
+        }
+        this._frameWidth = options.frameWidth != undefined ? nextHighestPowerOfTwo(options.frameWidth) : 256;
+        this._frameHeight = options.frameHeight != undefined ? nextHighestPowerOfTwo(options.frameHeight) : 256;
+        this._animate = true;
+    }
+    get instanceName() {
+        return "GeoTexture2d";
+    }
+    loadMaterial(material) {
+        this._planet._geoImageCreator.add(this);
+    }
+    bindTexture(texture) {
+        this._sourceReady = true;
+        this._sourceCreated = true;
+        this._sourceTexture = texture;
+    }
+    setSize(width, height) {
+        this._frameWidth = width;
+        this._frameHeight = height;
+        this._frameCreated = false;
+    }
+    abortMaterialLoading(material) {
+        this._creationProceeding = false;
+        material.isLoading = false;
+        material.isReady = false;
+    }
+}
+export { GeoTexture2d };

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

@@ -0,0 +1,68 @@
+import { BaseGeoImage, IBaseGeoImageParams } from "./BaseGeoImage";
+import { Material } from "./Material";
+interface IGeoVideoParams extends IBaseGeoImageParams {
+    videoElement?: HTMLVideoElement;
+    src?: string;
+}
+/**
+ * Used to load and display a video stream by specific corners coordinates on the globe.
+ * @class
+ * @extends {BaseGeoImage}
+ */
+declare class GeoVideo extends BaseGeoImage {
+    /**
+     * HTML5 video element object.
+     * @protected
+     * @type {HTMLVideoElement}
+     */
+    protected _video: HTMLVideoElement | null;
+    /**
+     * Video source url path.
+     * @protected
+     * @type {string}
+     */
+    protected _src: string | null;
+    constructor(name: string | null, options?: IGeoVideoParams);
+    get instanceName(): string;
+    /**
+     * Sets video source url path.
+     * @public
+     * @param {string} src - Video url path.
+     */
+    setSrc(src: string): void;
+    /**
+     * Sets HTML5 video object.
+     * @public
+     * @param {HTMLVideoElement} video - HTML5 video element object.
+     */
+    setVideoElement(video: HTMLVideoElement): void;
+    /**
+     * Sets layer visibility.
+     * @public
+     * @param {boolean} visibility - Layer visibility.
+     */
+    setVisibility(visibility: boolean): void;
+    /**
+     * Creates or refresh source video GL texture.
+     * @virtual
+     * @protected
+     */
+    protected _createSourceTexture(): void;
+    /**
+     * @private
+     */
+    protected _onCanPlay(video: HTMLVideoElement): void;
+    protected _onError(video: HTMLVideoElement): void;
+    /**
+     * Loads planet segment material. In this case - GeoImage source video.
+     * @public
+     * @param {Material} material - GeoImage planet material.
+     */
+    loadMaterial(material: Material): void;
+    /**
+     * @virtual
+     * @param {Material} material - GeoImage material.
+     */
+    abortMaterialLoading(material: Material): void;
+}
+export { GeoVideo };

package/{src/layer/GeoVideo.ts → lib/js/layer/GeoVideo.js}

@@ -1,121 +1,91 @@
-import {BaseGeoImage, IBaseGeoImageParams} from "./BaseGeoImage";
-import {Material} from "./Material";
-
-interface IGeoVideoParams extends IBaseGeoImageParams {
-    videoElement?: HTMLVideoElement;
-    src?: string;
-}
-
+import { BaseGeoImage } from "./BaseGeoImage";
 /**
  * Used to load and display a video stream by specific corners coordinates on the globe.
  * @class
  * @extends {BaseGeoImage}
  */
 class GeoVideo extends BaseGeoImage {
-
-    /**
-     * HTML5 video element object.
-     * @protected
-     * @type {HTMLVideoElement}
-     */
-    protected _video: HTMLVideoElement | null;
-
-    /**
-     * Video source url path.
-     * @protected
-     * @type {string}
-     */
-    protected _src: string | null;
-
-    constructor(name: string | null, options: IGeoVideoParams = {}) {
+    constructor(name, options = {}) {
         super(name, options);
-
         this._animate = true;
-
         this._video = options.videoElement || null;
-
         this._src = options.src || null;
     }
-
-    public override get instanceName(): string {
+    get instanceName() {
         return "GeoVideo";
     }
-
     /**
      * Sets video source url path.
      * @public
      * @param {string} src - Video url path.
      */
-    public setSrc(src: string) {
+    setSrc(src) {
         this._planet && this._planet._geoImageCreator.remove(this);
         this._src = src;
         this._sourceReady = false;
     }
-
     /**
      * Sets HTML5 video object.
      * @public
      * @param {HTMLVideoElement} video - HTML5 video element object.
      */
-    public setVideoElement(video: HTMLVideoElement) {
+    setVideoElement(video) {
         this._planet && this._planet._geoImageCreator.remove(this);
         this._video = video;
         this._src = video.src;
         this._sourceReady = false;
     }
-
     /**
      * Sets layer visibility.
      * @public
      * @param {boolean} visibility - Layer visibility.
      */
-    public override setVisibility(visibility: boolean) {
+    setVisibility(visibility) {
         if (visibility != this._visibility) {
             super.setVisibility(visibility);
             if (this._planet) {
                 if (visibility) {
                     this._sourceReady && this._planet._geoImageCreator.add(this);
                     this._video && this._video.play();
-                } else {
+                }
+                else {
                     this._sourceReady && this._planet._geoImageCreator.remove(this);
                     this._video && this._video.pause();
                 }
             }
         }
     }
-
     /**
      * Creates or refresh source video GL texture.
      * @virtual
      * @protected
      */
-    protected override _createSourceTexture() {
-        let gl = this._planet!.renderer!.handler.gl!;
+    _createSourceTexture() {
+        let gl = this._planet.renderer.handler.gl;
         if (this._sourceCreated) {
-            gl.bindTexture(gl.TEXTURE_2D, this._sourceTexture!);
-            gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, this._video!);
-        } else {
-            this._sourceTexture = this._planet!.renderer!.handler.createTexture_n_webgl1(this._video!);
+            gl.bindTexture(gl.TEXTURE_2D, this._sourceTexture);
+            gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, this._video);
+        }
+        else {
+            this._sourceTexture = this._planet.renderer.handler.createTexture_n_webgl1(this._video);
             this._sourceCreated = true;
         }
     }
-
     /**
      * @private
      */
-    protected _onCanPlay(video: HTMLVideoElement) {
+    _onCanPlay(video) {
         this._frameWidth = video.videoWidth;
         this._frameHeight = video.videoHeight;
         video.width = video.videoWidth;
         video.height = video.videoHeight;
         video.play();
         this._sourceReady = true;
-        this._planet!._geoImageCreator.add(this);
+        this._planet._geoImageCreator.add(this);
     }
-
-    protected _onError(video: HTMLVideoElement) {
+    _onError(video) {
         let err = "unknown error";
-        switch (video.error!.code) {
+        switch (video.error.code) {
             case 1:
                 err = "video loading aborted";
                 break;
@@ -129,28 +99,29 @@ class GeoVideo extends BaseGeoImage {
                 err = "video not supported";
                 break;
         }
-        console.warn(`Error: ${err} error-code=${video.error!.code})`);
+        console.warn(`Error: ${err} error-code=${video.error.code})`);
     }
-
     /**
      * Loads planet segment material. In this case - GeoImage source video.
      * @public
      * @param {Material} material - GeoImage planet material.
      */
-    public override loadMaterial(material: Material) {
+    loadMaterial(material) {
         material.isLoading = true;
         this._creationProceeding = true;
         if (!this._sourceReady && this._src) {
             if (this._video) {
                 if (this._video.readyState === this._video.HAVE_ENOUGH_DATA) {
                     this._onCanPlay(this._video);
-                } else if (this._video.src) {
+                }
+                else if (this._video.src) {
                     let that = this;
-                    this._video.addEventListener("canplay", function (e: Event) {
+                    this._video.addEventListener("canplay", function (e) {
                         that._onCanPlay(this);
                     });
                 }
-            } else {
+            }
+            else {
                 this._video = document.createElement("video");
                 this._video.crossOrigin = "Anonymous";
                 let that = this;
@@ -167,21 +138,20 @@ class GeoVideo extends BaseGeoImage {
             this._video.muted = true;
             this._video.setAttribute("playsinline", "true");
             this._video.setAttribute("webkit-playsinline", "true");
-        } else {
-            this._planet!._geoImageCreator.add(this);
+        }
+        else {
+            this._planet._geoImageCreator.add(this);
         }
     }
-
     /**
      * @virtual
      * @param {Material} material - GeoImage material.
      */
-    public override abortMaterialLoading(material: Material) {
+    abortMaterialLoading(material) {
         this._video && (this._video.src = "");
         this._creationProceeding = false;
         material.isLoading = false;
         material.isReady = false;
     }
 }
-
-export {GeoVideo};
+export { GeoVideo };

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

@@ -0,0 +1,72 @@
+import { Billboard, IBillboardParams } from "../entity/Billboard";
+import { Entity } from "../entity/Entity";
+import { Extent } from "../Extent";
+import { Vector, IVectorParams } from "./Vector";
+interface IKMLParams extends IVectorParams {
+    color?: string;
+    billboard?: IBillboardParams;
+}
+/**
+ * Layer to render KMLs files
+ * @class
+ * @extends {Vector}
+ * @param {string} name
+ * @param {*} [options]
+ */
+export declare class KML extends Vector {
+    protected _color: string;
+    protected _billboard: IBillboardParams;
+    constructor(name: string, options?: IKMLParams);
+    get instanceName(): string;
+    protected _extractCoordonatesFromKml(xmlDoc: XMLDocument): number[][][];
+    protected _AGBRtoRGBA(agbr: string): string | undefined;
+    /**
+     * @protected
+     returns array of longitude, latitude, altitude (altitude optional)
+     */
+    protected _parseKMLcoordinates(coords: Element): number[][];
+    protected _kmlPlacemarkToEntity(placemark: Element | undefined | null, extent: Extent): Entity | undefined;
+    protected _extractStyle(placemark: Element): any;
+    protected _parseKML(xml: XMLDocument, extent: Extent, entities?: Entity[]): Entity[];
+    protected _convertKMLintoEntities(xml: XMLDocument): any;
+    /**
+     * Creates billboards or polylines from array of lonlat.
+     * @protected
+     * @param {Array} coordonates
+     * @param {string} color
+     * @returns {any}
+     */
+    protected _convertCoordonatesIntoEntities(coordinates: number[][][][], color: string, billboard?: IBillboardParams): any;
+    /**
+     * @protected
+     * @returns {Document}
+     */
+    protected _getXmlContent(file: Blob): Promise<XMLDocument>;
+    protected _expandExtents(extent1: Extent | null | undefined, extent2: Extent): Extent;
+    /**
+     * @public
+     * @param {File[]} kmls
+     * @param {string} [color]
+     * @param {Billboard} [billboard]
+     * @returns {Promise<{entities: Entity[], extent: Extent}>}
+     */
+    addKmlFromFiles(kmls: Blob[], color?: string, billboard?: IBillboardParams): Promise<{
+        entities: any;
+        extent: any;
+    } | null>;
+    /**
+     * @param {string} color
+     * @public
+     */
+    setColor(color: string): void;
+    protected _getKmlFromUrl(url: string): Promise<Document>;
+    /**
+     * @public
+     * @param {string} url - Url of the KML to display. './myFile.kml' or 'http://mySite/myFile.kml' for example.
+     * @param {string} [color]
+     * @param {Billboard} [billboard]
+     * @returns {Promise<{entities: Entity[], extent: Extent}>}
+     */
+    addKmlFromUrl(url: string, color?: string, billboard?: Billboard | IBillboardParams): Promise<any>;
+}
+export {};