@openglobus/og 0.18.0 → 0.18.2

package/{src/control/Control.ts → lib/js/control/Control.js}

@@ -1,121 +1,63 @@
-import {Planet, Renderer} from "../index";
-
-export interface IControlParams {
-    name?: string;
-    autoActivate?: boolean
-}
-
 /**
  * Base control class. All other controls extend from this class.
  * @class Control
- * @param {Boolean} [options.autoActivated=true] - If true - calls initialize function after the renderer assigning.
+ * @param {Boolean} [options.autoActivate=true] - If true - calls initialize function after the renderer assigning.
  */
 export class Control {
-    static __counter__: number = 0;
-    protected __id: number;
-    protected _name: string;
-
-    /**
-     * Control activity.
-     * @protected
-     * @type {boolean}
-     */
-    protected _active: boolean;
-
-    /**
-     * Control initialized.
-     * @protected
-     * @type {boolean}
-     */
-    protected _initialized: boolean;
-
-    public planet: Planet | null;
-
-    /**
-     * Assigned renderer.
-     * @public
-     * @type {Renderer}
-     */
-    public renderer: Renderer | null;
-
-    /**
-     * Auto activation flag.
-     * @public
-     * @type {boolean}
-     */
-    public autoActivate: boolean;
-
-    protected _deferredActive: boolean;
-
-    constructor(options: IControlParams = {}) {
-
+    constructor(options = {}) {
         this.__id = Control.__counter__++;
-
         this._name = options.name || `_control_${this.__id.toString()}`;
-
         this.planet = null;
-
         this._initialized = false;
-
         this.renderer = null;
-
         this.autoActivate = options.autoActivate || false;
-
         this._active = false;
-
         this._deferredActive = true;
     }
-
     /**
      * Returns control name.
      * @public
      * @return {string} -
      */
-    public get name(): string {
+    get name() {
         return this._name;
     }
-
     /**
      * Control initialization function have to be overridden.
      * @public
      */
-    public oninit() {
+    oninit() {
     }
-
     /**
      * Control renderer assigning function have to be overridden.
      * @public
      */
-    public onadd() {
+    onadd() {
     }
-
     /**
      * Control remove function have to be overridden.
      * @public
      */
-    public onremove() {
+    onremove() {
     }
-
     /**
      * Control activation function have to be overridden.
      * @public
      */
-    public onactivate() {
+    onactivate() {
     }
-
     /**
      * Control deactivation function have to be overriden.
      * @public
      */
-    public ondeactivate() {
+    ondeactivate() {
     }
-
     /**
      * Assign renderer to the control.
      * @public
      * @type {Renderer}
      */
-    public addTo(renderer: Renderer) {
+    addTo(renderer) {
         if (renderer) {
             this.renderer = renderer;
             renderer.controls[this.name] = this;
@@ -129,40 +71,31 @@ export class Control {
             }
         }
     }
-
     /**
      * Removes control.
      * @public
      */
-    public remove() {
-
+    remove() {
         this.deactivate();
-
         this.onremove && this.onremove();
-
-        let r = this.renderer,
-            n = this.name;
-
-        if (!r) return;
-
+        let r = this.renderer, n = this.name;
+        if (!r)
+            return;
         let c = r.controls[n];
-
         if (c) {
             if (this.isEqual(c)) {
                 delete r.controls[n];
             }
         }
-
         this.renderer = null;
         this._active = false;
         this._initialized = false;
     }
-
     /**
      * Activate control.
      * @public
      */
-    public activate() {
+    activate() {
         if (!this._active) {
             if (!this._initialized) {
                 this._initialized = true;
@@ -171,34 +104,34 @@ export class Control {
             if (this._deferredActive) {
                 this._active = true;
                 this.onactivate && this.onactivate();
-            } else {
+            }
+            else {
                 this._deferredActive = true;
             }
         }
     }
-
     /**
      * Deactivate control.
      * @public
      */
-    public deactivate() {
+    deactivate() {
         if (this._active) {
             this._active = false;
             this.ondeactivate && this.ondeactivate();
-        } else if (!this._initialized) {
+        }
+        else if (!this._initialized) {
             this._deferredActive = false;
         }
     }
-
     /**
      * Is control active.
      * @public
      */
-    public isActive(): boolean {
+    isActive() {
         return this._active;
     }
-
-    public isEqual(control: Control): boolean {
+    isEqual(control) {
         return control.__id === this.__id;
     }
 }
+Control.__counter__ = 0;

package/lib/js/control/DebugInfo.d.ts

@@ -0,0 +1,25 @@
+import { Control, IControlParams } from "./Control";
+import { Dialog } from "../ui/Dialog";
+import { ToggleButton } from "../ui/ToggleButton";
+import { CanvasTiles } from "../layer/CanvasTiles";
+export interface IDebugInfoWatch {
+    label: string;
+    valEl?: HTMLElement;
+    frame?: () => string | number;
+}
+interface IDebugInfoParams extends IControlParams {
+    watch?: IDebugInfoWatch[];
+}
+export declare class DebugInfo extends Control {
+    el: HTMLElement | null;
+    protected _watch: IDebugInfoWatch[];
+    protected _toggleBtn: ToggleButton;
+    protected _dialog: Dialog<null>;
+    protected _canvasTiles: CanvasTiles;
+    constructor(options?: IDebugInfoParams);
+    addWatches(watches: IDebugInfoWatch[]): void;
+    addWatch(watch: IDebugInfoWatch): void;
+    oninit(): void;
+    protected _frame(): void;
+}
+export {};

package/{src/control/DebugInfo.ts → lib/js/control/DebugInfo.js}

@@ -1,16 +1,13 @@
-import {Control, IControlParams} from "./Control";
-import {Dialog} from "../ui/Dialog";
-import {ToggleButton} from "../ui/ToggleButton";
-import {GlobusTerrain} from "../terrain/GlobusTerrain";
-import {CanvasTiles} from "../layer/CanvasTiles";
-
+import { Control } from "./Control";
+import { Dialog } from "../ui/Dialog";
+import { ToggleButton } from "../ui/ToggleButton";
+import { CanvasTiles } from "../layer/CanvasTiles";
 const ICON_LOCK_BUTTON_SVG = `<?xml version="1.0" encoding="utf-8"?>
 <!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
 <svg fill="#000000" width="800px" height="800px" viewBox="-7.5 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
 <title>lock</title>
 <path d="M14.625 15.156h2.094c0.281 0 0.5 0.25 0.5 0.531v11c0 0.281-0.219 0.5-0.5 0.5h-16.219c-0.281 0-0.5-0.219-0.5-0.5v-11c0-0.281 0.219-0.531 0.5-0.531h2.031v-5.125c0-2.875 1.844-5.25 4.688-5.25h2.688c2.875 0 4.719 2.375 4.719 5.25v5.125zM5.188 15.156h6.813v-4.875c0-1.594-1.313-2.938-2.938-2.938h-0.969c-1.594 0-2.906 1.344-2.906 2.938v4.875zM7.156 24h2.906l-0.719-3.156c0.5-0.25 0.844-0.781 0.844-1.375 0-0.906-0.719-1.594-1.594-1.594s-1.563 0.688-1.563 1.594c0 0.594 0.344 1.125 0.844 1.375z"></path>
 </svg>`;
-
 const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
@@ -51,43 +48,22 @@ const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="iso-8859-1"?>
 \t\tC302.1,704.538,332,675.438,368.3,675.837z"/>
 </g>
 </svg>`;
-
 const ICON_CANVASTILES_SVG = `<?xml version="1.0"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
     <path d="M 4 4 L 4 8 L 8 8 L 8 4 L 4 4 z M 10 4 L 10 8 L 14 8 L 14 4 L 10 4 z M 16 4 L 16 8 L 20 8 L 20 4 L 16 4 z M 4 10 L 4 14 L 8 14 L 8 10 L 4 10 z M 10 10 L 10 14 L 14 14 L 14 10 L 10 10 z M 16 10 L 16 14 L 20 14 L 20 10 L 16 10 z M 4 16 L 4 20 L 8 20 L 8 16 L 4 16 z M 10 16 L 10 20 L 14 20 L 14 16 L 10 16 z M 16 16 L 16 20 L 20 20 L 20 16 L 16 16 z"/>
 </svg>`;
-
-export interface IDebugInfoWatch {
-    label: string;
-    valEl?: HTMLElement;
-    frame?: () => string | number;
-}
-
-interface IDebugInfoParams extends IControlParams {
-    watch?: IDebugInfoWatch[];
-}
-
 export class DebugInfo extends Control {
-    public el: HTMLElement | null;
-    protected _watch: IDebugInfoWatch[];
-    protected _toggleBtn: ToggleButton;
-    protected _dialog: Dialog<null>;
-
-    protected _canvasTiles: CanvasTiles;
-
-    constructor(options: IDebugInfoParams = {}) {
+    constructor(options = {}) {
         if (!options.name || options.name === "") {
             options.name = "DebugInfo";
         }
         super(options);
         this.el = null;
         this._watch = options.watch || [];
-
         this._toggleBtn = new ToggleButton({
             classList: ["og-map-button", "og-debuginfo_button"],
             icon: ICON_BUTTON_SVG
         });
-
         this._dialog = new Dialog({
             title: "Debug Info",
             visible: false,
@@ -96,50 +72,43 @@ export class DebugInfo extends Control {
             left: 60,
             width: 480
         });
-
-        this._dialog.events.on("visibility", (v: boolean) => {
+        this._dialog.events.on("visibility", (v) => {
             this._toggleBtn.setActive(v);
         });
-
         this._canvasTiles = new CanvasTiles("Tile grid", {
             visibility: true,
             isBaseLayer: false,
-            drawTile: function (material: any, applyCanvas: any) {
-
+            drawTile: function (material, applyCanvas) {
                 //
                 // This is important create canvas here!
                 //
                 let cnv = document.createElement("canvas");
-                let ctx = cnv.getContext("2d")!;
+                let ctx = cnv.getContext("2d");
                 cnv.width = 256;
                 cnv.height = 256;
-
                 //Clear canvas
                 ctx.clearRect(0, 0, cnv.width, cnv.height);
-
                 //Draw border
                 ctx.beginPath();
                 ctx.rect(0, 0, cnv.width, cnv.height);
                 ctx.lineWidth = 2;
                 ctx.strokeStyle = 'black';
                 ctx.stroke();
-
                 let size;
-
                 if (material.segment.isPole) {
                     let ext = material.segment.getExtentLonLat();
-
                     ctx.fillStyle = 'black';
                     ctx.font = 'normal ' + 29 + 'px Verdana';
-
                     ctx.textAlign = 'center';
                     ctx.fillText(`${ext.northEast.lon.toFixed(3)} ${ext.northEast.lat.toFixed(3)}`, cnv.width / 2, cnv.height / 2 + 20);
                     ctx.fillText(`${ext.southWest.lon.toFixed(3)} ${ext.southWest.lat.toFixed(3)}`, cnv.width / 2, cnv.height / 2 - 20);
-                } else {
+                }
+                else {
                     //Draw text
                     if (material.segment.tileZoom > 14) {
                         size = "26";
-                    } else {
+                    }
+                    else {
                         size = "32";
                     }
                     ctx.fillStyle = 'black';
@@ -147,58 +116,48 @@ export class DebugInfo extends Control {
                     ctx.textAlign = 'center';
                     ctx.fillText(material.segment.tileX + "," + material.segment.tileY + "," + material.segment.tileZoom, cnv.width / 2, cnv.height / 2);
                 }
-
                 //Draw canvas tile
                 applyCanvas(cnv);
             }
         });
     }
-
-    public addWatches(watches: IDebugInfoWatch[]) {
+    addWatches(watches) {
         for (let i = 0; i < watches.length; i++) {
             this.addWatch(watches[i]);
         }
     }
-
-    public addWatch(watch: IDebugInfoWatch) {
+    addWatch(watch) {
         this._watch.push(watch);
         let watchEl = document.createElement("div");
         watchEl.classList.add("og-watch-line");
         watchEl.innerHTML = `<div class="og-watch-label">${watch.label}</div><div class="og-watch-value"></div>`;
-        watch.valEl = watchEl.querySelector<HTMLElement>(".og-watch-value")!;
-        this.el!.appendChild(watchEl);
+        watch.valEl = watchEl.querySelector(".og-watch-value");
+        this.el.appendChild(watchEl);
     }
-
-    public override oninit() {
-
-        this._toggleBtn.appendTo(this.renderer!.div!);
-        this._dialog.appendTo(this.renderer!.div!);
-        this._toggleBtn.events.on("change", (isActive: boolean) => {
+    oninit() {
+        this._toggleBtn.appendTo(this.renderer.div);
+        this._dialog.appendTo(this.renderer.div);
+        this._toggleBtn.events.on("change", (isActive) => {
             this._dialog.setVisibility(isActive);
         });
-
         this.el = document.createElement("div");
         this.el.className = "og-debug-info";
-
         let $controls = document.createElement("div");
         $controls.classList.add("og-debuginfo_controls");
         this.el.appendChild($controls);
-
         let temp = this._watch;
         this._watch = [];
         for (let i = 0; i < temp.length; i++) {
             this.addWatch(temp[i]);
         }
         this._dialog.container?.appendChild(this.el);
-        this.renderer!.events.on("draw", this._frame, this);
-
-        let p = this.planet!;
-
+        this.renderer.events.on("draw", this._frame, this);
+        let p = this.planet;
         if (p) {
             this.addWatches([
                 {
                     label: "Nodes count",
-                    frame: () => p!._renderedNodes.length
+                    frame: () => p._renderedNodes.length
                 },
                 {
                     label: "createdNodes",
@@ -222,8 +181,7 @@ export class DebugInfo extends Control {
                 },
                 {
                     label: "height/alt (km)",
-                    frame: () =>
-                        `<div style="width:190px">${(p.camera._lonLat.height / 1000.0).toFixed(2) +
+                    frame: () => `<div style="width:190px">${(p.camera._lonLat.height / 1000.0).toFixed(2) +
                         " / " +
                         (p.camera.getAltitude() / 1000.0).toFixed(2)}</div>`
                 },
@@ -237,11 +195,10 @@ export class DebugInfo extends Control {
                 },
                 {
                     label: "deltaTime/FPS",
-                    frame: () =>
-                        `<div style="width:70px"><div style="width:20px; float: left;">
-                        ${Math.round(p.renderer!.handler.deltaTime)}
+                    frame: () => `<div style="width:70px"><div style="width:20px; float: left;">
+                        ${Math.round(p.renderer.handler.deltaTime)}
                         </div> <div style="float: left">
-                        ${Math.round(1000.0 / p.renderer!.handler.deltaTime)}
+                        ${Math.round(1000.0 / p.renderer.handler.deltaTime)}
                         </div></div>`
                 },
                 {
@@ -267,7 +224,7 @@ export class DebugInfo extends Control {
                     label: "TerrainLoader",
                     frame: () => {
                         if (p.terrain && !p.terrain.isEmpty) {
-                            return `${(p.terrain as GlobusTerrain).loader.loading}  ${(p.terrain as GlobusTerrain).loader.queue.length}`
+                            return `${p.terrain.loader.loading}  ${p.terrain.loader.queue.length}`;
                         }
                         return "";
                     }
@@ -286,42 +243,39 @@ export class DebugInfo extends Control {
                 }
             ]);
         }
-
         let lockTreeBtn = new ToggleButton({
             classList: ["og-debuginfo_controls-button"],
             icon: ICON_LOCK_BUTTON_SVG,
             title: "Lock/Unlock quad tree"
         });
         lockTreeBtn.appendTo($controls);
-
-        lockTreeBtn.events.on("change", (isActive: boolean) => {
+        lockTreeBtn.events.on("change", (isActive) => {
             if (isActive) {
                 p.lockQuadTree();
-            } else {
+            }
+            else {
                 p.unlockQuadTree();
             }
         });
-
         let canvasTilesBtn = new ToggleButton({
             classList: ["og-debuginfo_controls-button"],
             icon: ICON_CANVASTILES_SVG,
             title: "Show/Hide grid"
         });
         canvasTilesBtn.appendTo($controls);
-
-        canvasTilesBtn.events.on("change", (isActive: boolean) => {
+        canvasTilesBtn.events.on("change", (isActive) => {
             if (isActive) {
-                this.planet!.addLayer(this._canvasTiles);
-            } else {
+                this.planet.addLayer(this._canvasTiles);
+            }
+            else {
                 this._canvasTiles.remove();
             }
         });
     }
-
-    protected _frame() {
+    _frame() {
         for (let i = 0; i < this._watch.length; i++) {
             let w = this._watch[i];
-            w.valEl!.innerHTML = w.frame ? String(w.frame()) : "";
+            w.valEl.innerHTML = w.frame ? String(w.frame()) : "";
         }
     }
-}
+}

package/lib/js/control/DrawingSwitcher.d.ts

@@ -0,0 +1,13 @@
+import { Control } from "./Control";
+import { DrawingControl } from "./drawing/DrawingControl";
+/**
+ * Activate drawing control
+ */
+export declare class DrawingSwitcher extends Control {
+    drawingControl: DrawingControl;
+    constructor(options?: {});
+    oninit(): void;
+    onactivate(): void;
+    ondeactivate(): void;
+    protected _createMenu(): void;
+}

package/{src/control/DrawingSwitcher.ts → lib/js/control/DrawingSwitcher.js}

@@ -1,8 +1,7 @@
-import {ButtonGroup} from "../ui/ButtonGroup";
-import {Control} from "./Control";
-import {DrawingControl} from "./drawing/DrawingControl";
-import {ToggleButton} from "../ui/ToggleButton";
-
+import { ButtonGroup } from "../ui/ButtonGroup";
+import { Control } from "./Control";
+import { DrawingControl } from "./drawing/DrawingControl";
+import { ToggleButton } from "../ui/ToggleButton";
 const ICON_POLYGON_SVG = `<?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <svg version="1.1" id="Layer_2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
@@ -31,68 +30,53 @@ const ICON_POLYGON_SVG = `<?xml version="1.0" encoding="utf-8"?>
 \t\tc0-11.75,6.14-22.05,15.36-28c5.2-3.35,11.35-5.35,17.99-5.35C944.41,385.78,959.36,400.75,959.36,419.13z"/>
 </g>
 </svg>`;
-
 const ICON_LINESTRING_SVG = `<?xml version="1.0" encoding="utf-8"?><!-- License: MIT. Made by Esri: https://github.com/Esri/calcite-ui-icons -->
     <svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="M21 6h.046l-5.25 9h-.944L10 9.455V7H7v2.926L1.862 18H0v3h3v-2.926L8.138 10h1.01L14 15.545V18h3v-3h-.046l5.25-9H24V3h-3zM8 8h1v1H8zM2 20H1v-1h1zm14-3h-1v-1h1zm7-13v1h-1V4z"/></svg>`;
-
 const ICON_DEFAULT_SVG = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M4 0l16 12.279-6.951 1.17 4.325 8.817-3.596 1.734-4.35-8.879-5.428 4.702z"/></svg>`;
-
 /**
  * Activate drawing control
  */
 export class DrawingSwitcher extends Control {
-    public drawingControl: DrawingControl;
-
     constructor(options = {}) {
         super({
             name: "DrawingSwitcher",
             ...options
         });
-
         this.drawingControl = new DrawingControl();
     }
-
-    public override oninit() {
-        this.planet!.addControl(this.drawingControl);
+    oninit() {
+        this.planet.addControl(this.drawingControl);
         this._createMenu();
     }
-
-    public override onactivate() {
+    onactivate() {
         this.drawingControl.activate();
     }
-
-    public override ondeactivate() {
+    ondeactivate() {
         this.drawingControl.deactivate();
     }
-
-    protected _createMenu() {
-
+    _createMenu() {
         let defaultBtn = new ToggleButton({
             classList: ["og-map-button", "og-drawing-default_button"],
             icon: ICON_DEFAULT_SVG,
             name: "default",
             isActive: true
         });
-
         let polyBtn = new ToggleButton({
             classList: ["og-map-button", "og-drawing-polygon_button"],
             icon: ICON_POLYGON_SVG,
             name: "polygon"
         });
-
         let lineBtn = new ToggleButton({
             classList: ["og-map-button", "og-drawing-linestring_button"],
             icon: ICON_LINESTRING_SVG,
             name: "linestring"
         });
-
         let buttons = new ButtonGroup({
             buttons: [
                 defaultBtn, polyBtn, lineBtn
             ]
         });
-
-        buttons.events.on("change", (btn: ToggleButton) => {
+        buttons.events.on("change", (btn) => {
             this.drawingControl.deactivate();
             switch (btn.name) {
                 case "polygon":
@@ -103,9 +87,8 @@ export class DrawingSwitcher extends Control {
                     break;
             }
         });
-
-        defaultBtn.appendTo(this.renderer!.div!)
-        polyBtn.appendTo(this.renderer!.div!);
-        lineBtn.appendTo(this.renderer!.div!);
+        defaultBtn.appendTo(this.renderer.div);
+        polyBtn.appendTo(this.renderer.div);
+        lineBtn.appendTo(this.renderer.div);
     }
 }

package/lib/js/control/EarthCoordinates.d.ts

@@ -0,0 +1,41 @@
+import { Control, IControlParams } from './Control';
+import { LonLat } from '../LonLat';
+import { IMouseState } from "../renderer/RendererEvents";
+interface IEarthCoordinatesParams extends IControlParams {
+    heightMode?: string;
+    centerMode?: boolean;
+    altitudeUnit?: string;
+    type?: number;
+}
+/**
+ * Control displays mouse or screen center Earth coordinates.
+ * @param {Boolean} [options.center] - Earth coordinates by screen center otherwise mouse pointer. False is default.
+ * @param {Boolean} [options.type] - Coordinates shown: 0 - is decimal degrees, 1 - degrees, 2 - mercator geodetic coordinates.
+ */
+export declare class EarthCoordinates extends Control {
+    protected _type: number;
+    protected _TYPE_FUNC: ((ll?: LonLat | null) => void)[];
+    protected _showFn: ((ll?: LonLat | null) => void) | null;
+    protected _lonLat: LonLat | null;
+    protected _latSideEl: HTMLElement | null;
+    protected _lonSideEl: HTMLElement | null;
+    protected _latValEl: HTMLElement | null;
+    protected _lonValEl: HTMLElement | null;
+    protected _heightEl: HTMLElement | null;
+    protected _altUnitVal: string;
+    protected _heightModeVal: string;
+    protected _altUnit: number;
+    protected _heightMode: number;
+    protected _centerMode: boolean;
+    protected _el: HTMLElement | null;
+    constructor(options?: IEarthCoordinatesParams);
+    protected _SHOW_DECIMAL(ll?: LonLat | null): void;
+    protected _SHOW_DEGREE(ll?: LonLat | null): void;
+    protected _createCenterEl(): HTMLElement;
+    protected _updateUnits(): void;
+    protected _refreshCoordinates(): void;
+    oninit(): void;
+    protected _grabCoordinates(e: IMouseState): void;
+    protected _showHeight(): Promise<void>;
+}
+export {};