@openglobus/og 0.18.0 → 0.18.1

package/{src/ImageCanvas.ts → lib/js/ImageCanvas.js}

@@ -5,54 +5,35 @@
  * @param {number} [height] - Canvas height. Default 256.
  */
 class ImageCanvas {
-
-    /**
-     * Canvas object.
-     * @protected
-     * @type {HTMLCanvasElement}
-     */
-    protected _canvas: HTMLCanvasElement;
-
-    /**
-     * Canvas context.
-     * @protected
-     * @type {CanvasRenderingContext2D}
-     */
-    protected _context: CanvasRenderingContext2D;
-
-    constructor(width: number = 256, height: number = 256) {
+    constructor(width = 256, height = 256) {
         this._canvas = document.createElement("canvas");
         this._canvas.width = width;
         this._canvas.height = height;
-
         this._context = this._canvas.getContext("2d", {
             willReadFrequently: true
-        })!;
+        });
     }
-
     /**
      * Returns canvas object.
      * @public
      * @returns {HTMLCanvasElement}
      */
-    public getCanvas(): HTMLCanvasElement {
+    getCanvas() {
         return this._canvas;
     }
-
     /**
      * Returns canvas context pointer.
      * @public
      * @returns {CanvasRenderingContext2D}
      */
-    public getContext(): CanvasRenderingContext2D {
+    getContext() {
         return this._context;
     }
-
     /**
      * Fills canvas RGBA with zeroes.
      * @public
      */
-    public fillEmpty() {
+    fillEmpty() {
         let imgd = this._context.getImageData(0, 0, this._canvas.width, this._canvas.height);
         let pixels = imgd.data;
         for (let i = 0, n = pixels.length; i < n; i += 4) {
@@ -60,60 +41,54 @@ class ImageCanvas {
         }
         this._context.putImageData(imgd, 0, 0);
     }
-
     /**
      * Fills canvas RGBA with color.
      * @public
      * @param {string} color - CSS string color.
      */
-    public fill(color: string) {
-        this._context.fillStyle = color
-        this._context.fill()
+    fill(color) {
+        this._context.fillStyle = color;
+        this._context.fill();
     }
-
     /**
      * Gets canvas pixels RGBA data.
      * @public
      * @returns {Uint8ClampedArray}
      */
-    public getData(): Uint8ClampedArray {
+    getData() {
         let imgd = this._context.getImageData(0, 0, this._canvas.width, this._canvas.height);
         return imgd.data;
     }
-
     /**
      * Fill the canvas by color.
      * @public
      * @param {string} color - CSS string color.
      */
-    public fillColor(color: string) {
+    fillColor(color) {
         this._context.fillStyle = color;
         this._context.fillRect(0, 0, this._canvas.width, this._canvas.height);
     }
-
     /**
      * Sets RGBA pixel data.
      * @public
      * @param {Array.<number>} data - Array RGBA data.
      */
-    public setData(data: ArrayLike<number>) {
+    setData(data) {
         let imageData = this._context.createImageData(this._canvas.width, this._canvas.height);
         imageData.data.set(data);
         this._context.putImageData(imageData, 0, 0);
     }
-
     /**
      * Resize canvas.
      * @public
      * @param {number} width - Width.
      * @param {number} height - Height.
      */
-    public resize(width: number, height: number) {
+    resize(width, height) {
         this._canvas.width = width;
         this._canvas.height = height;
-        this._context = this._canvas.getContext("2d") as CanvasRenderingContext2D;
+        this._context = this._canvas.getContext("2d");
     }
-
     /**
      * Draw an image on the canvas.
      * @public
@@ -123,34 +98,31 @@ class ImageCanvas {
      * @param {number} [width] - Image width slice. Image width is default.
      * @param {number} [height] - Image height slice. Image height is default.
      */
-    public drawImage(img: HTMLImageElement, x: number, y: number, width: number, height: number) {
+    drawImage(img, x, y, width, height) {
         this._context.drawImage(img, x || 0, y || 0, width || img.width, height || img.height);
     }
-
     /**
      * Converts canvas to JS image object.
      * @public
      * @returns {Image}
      */
-    public getImage(): HTMLImageElement {
+    getImage() {
         let img = new Image();
         img.width = this.getWidth();
         img.height = this.getHeight();
         img.src = this._canvas.toDataURL("image/png");
         return img;
     }
-
     /**
      * Get measured text width.
      * @public
      * @param {string} text - Measured text.
      * @returns {number}
      */
-    public getTextWidth(text: string): number {
+    getTextWidth(text) {
         let metrics = this._context.measureText(text);
         return Math.round(metrics.width);
     }
-
     /**
      * Draw a text on the canvas.
      * @public
@@ -160,37 +132,34 @@ class ImageCanvas {
      * @param {string} [font] - Font style. 'normal 14px Verdana' - is default.
      * @param {string} [color] - Css font color.
      */
-    public drawText(text: string, x: number = 0, y: number = 14, font: string = "normal 14px Verdana", color: string = "black") {
+    drawText(text, x = 0, y = 14, font = "normal 14px Verdana", color = "black") {
         this._context.fillStyle = color;
         this._context.font = font;
         this._context.fillText(text, x, y);
     }
-
     /**
      * Gets canvas width.
      * @public
      * @returns {number}
      */
-    public getWidth(): number {
+    getWidth() {
         return this._canvas.width;
     }
-
     /**
      * Gets canvas height.
      * @public
      * @returns {number}
      */
-    public getHeight(): number {
+    getHeight() {
         return this._canvas.height;
     }
-
     /**
      * Load image to canvas.
      * @public
      * @param {string} url - Image url.
      * @param {Function} [callback] - Image onload callback.
      */
-    public load(url: string, callback: Function) {
+    load(url, callback) {
         let img = new Image();
         let that = this;
         img.onload = function () {
@@ -200,15 +169,13 @@ class ImageCanvas {
         };
         img.src = url;
     }
-
     /**
      * Open canvas image in the new window.
      * @public
      */
-    public openImage() {
+    openImage() {
         let img = this.getImage();
         let dataUrl = img.src;
-
         let windowContent = "<!DOCTYPE html>";
         windowContent += "<html>";
         windowContent += "<head><title>Print</title></head>";
@@ -216,13 +183,7 @@ class ImageCanvas {
         windowContent += '<img src="' + dataUrl + '">';
         windowContent += "</body>";
         windowContent += "</html>";
-
-        let printWin = window.open(
-            "",
-            "",
-            "width=" + img.width + "px ,height=" + img.height + "px"
-        );
-
+        let printWin = window.open("", "", "width=" + img.width + "px ,height=" + img.height + "px");
         if (printWin) {
             printWin.document.open();
             printWin.document.write(windowContent);
@@ -230,8 +191,7 @@ class ImageCanvas {
             printWin.focus();
         }
     }
-
-    public destroy() {
+    destroy() {
         this._canvas.width = 1;
         this._canvas.height = 1;
         //@ts-ignore
@@ -240,5 +200,4 @@ class ImageCanvas {
         this._context = null;
     }
 }
-
-export {ImageCanvas};
+export { ImageCanvas };

package/lib/js/Lock.d.ts

@@ -0,0 +1,15 @@
+declare class Lock {
+    protected _lock: number;
+    constructor();
+    lock(key: Key): void;
+    free(key: Key): void;
+    isFree(): boolean;
+    isLocked(): boolean;
+}
+declare class Key {
+    static __counter__: number;
+    protected __id: number;
+    constructor();
+    get id(): number;
+}
+export { Lock, Key };

package/{src/Lock.ts → lib/js/Lock.js}

@@ -1,41 +1,27 @@
 class Lock {
-
-    protected _lock: number;
-
     constructor() {
         this._lock = 0;
     }
-
-    public lock(key: Key) {
+    lock(key) {
         this._lock |= (1 << key.id);
     }
-
-    public free(key: Key) {
+    free(key) {
         this._lock &= ~(1 << key.id);
     }
-
-    public isFree(): boolean {
+    isFree() {
         return this._lock === 0;
     }
-
-    public isLocked(): boolean {
+    isLocked() {
         return this._lock !== 0;
     }
 }
-
 class Key {
-
-    static __counter__: number = 0;
-
-    protected __id: number;
-
     constructor() {
         this.__id = Key.__counter__++;
     }
-
-    public get id(): number {
+    get id() {
         return this.__id;
     }
 }
-
-export {Lock, Key};
+Key.__counter__ = 0;
+export { Lock, Key };

package/lib/js/LonLat.d.ts

@@ -0,0 +1,128 @@
+import { NumberArray2 } from "./math/Vec2";
+import { NumberArray3 } from "./math/Vec3";
+/**
+ * Represents a geographical point with a certain latitude, longitude and height.
+ * @class
+ * @param {number} [lon] - Longitude.
+ * @param {number} [lat] - Latitude.
+ * @param {number} [height] - Height over the surface.
+ */
+export declare class LonLat {
+    /**
+     * Longitude.
+     * @public
+     * @type {number}
+     */
+    lon: number;
+    /**
+     * Latitude.
+     * @public
+     * @type {number}
+     */
+    lat: number;
+    /**
+     * Height.
+     * @public
+     * @type {number}
+     */
+    height: number;
+    constructor(lon?: number, lat?: number, height?: number);
+    /**
+     * Check zero coordinates
+     * @returns {boolean} -
+     */
+    isZero(): boolean;
+    /**
+     * Creates coordinates array.
+     * @static
+     * @param{Array.<Array<number>>} arr - Coordinates array data. (exactly 3 entries)
+     * @return{Array.<LonLat>} the same coordinates array but each element is LonLat instance.
+     */
+    static join(arr: NumberArray2[] | NumberArray3[]): LonLat[];
+    /**
+     * Creates an object by coordinate array.
+     * @static
+     * @param {Array.<number>} arr - Coordinates array, where first is longitude, second is latitude and third is a height. (exactly 3 entries)
+     * @returns {LonLat} -
+     */
+    static createFromArray(arr: [number, number, number]): LonLat;
+    /**
+     * Create array from lonLat
+     * @param lonLat
+     * @returns {number[]}
+     */
+    static toArray(lonLat: LonLat): [number, number, number];
+    /**
+     * Create array from lonLat
+     * @returns {number[]}
+     */
+    toArray(): [number, number, number];
+    /**
+     * Converts degrees to mercator coordinates.
+     * @static
+     * @param {number} lon - Degrees longitude.
+     * @param {number} lat - Degrees latitude.
+     * @param {number} [height] - Height.
+     * @returns {LonLat} -
+     */
+    static forwardMercator(lon: number, lat: number, height: number): LonLat;
+    /**
+     * Converts degrees to mercator coordinates.
+     * @static
+     * @param {LonLat} lonLat - Input geodetic degree coordinates
+     * @param {LonLat} res - Output mercator coordinates
+     * @returns {LonLat} - Output mercator coordinates
+     */
+    static forwardMercatorRes(lonLat: LonLat, res: LonLat): LonLat;
+    /**
+     * Converts mercator to degrees coordinates.
+     * @static
+     * @param {number} x - Mercator longitude.
+     * @param {number} y - Mercator latitude.
+     * @param {number} [height] - Height.
+     * @returns {LonLat} -
+     */
+    static inverseMercator(x: number, y: number, height?: number): LonLat;
+    /**
+     * Sets coordinates.
+     * @public
+     * @param {number} [lon] - Longitude.
+     * @param {number} [lat] - Latitude.
+     * @param {number} [height] - Height.
+     * @returns {LonLat} -
+     */
+    set(lon?: number, lat?: number, height?: number): LonLat;
+    /**
+     * Copy coordinates.
+     * @public
+     * @param {LonLat} [lonLat] - Coordinates to copy.
+     * @returns {LonLat} -
+     */
+    copy(lonLat: LonLat): LonLat;
+    /**
+     * Clone the coordinates.
+     * @public
+     * @returns {LonLat} -
+     */
+    clone(): LonLat;
+    /**
+     * Converts to mercator coordinates.
+     * @public
+     * @returns {LonLat} -
+     */
+    forwardMercator(): LonLat;
+    forwardMercatorEPS01(): LonLat;
+    /**
+     * Converts from mercator coordinates.
+     * @public
+     * @returns {LonLat} -
+     */
+    inverseMercator(): LonLat;
+    /**
+     * Compares coordinates.
+     * @public
+     * @param {LonLat} b - Coordinate to compare with.
+     * @returns {boolean} -
+     */
+    equal(b: LonLat): boolean;
+}