@openglobus/og 0.18.0 → 0.18.2

package/{src/control/selection/SelectionScene.ts → lib/js/control/selection/SelectionScene.js}

@@ -1,62 +1,36 @@
-import { Entity } from '../../entity/Entity';
+import { Entity } from '../../entity/Entity';
 import { Events } from '../../Events';
 import { Vector } from '../../layer/Vector';
 import { LonLat } from '../../LonLat';
 import { Object3d } from '../../Object3d';
 import { RenderNode } from '../../scene/RenderNode';
-
 const OUTLINE_COUNT = 120;
-
 const MAX_SCALE = 0.005;
 const MIN_SCALE = 0.001;
 const MAX_SCALE_HEIGHT = 3000.0;
 const MIN_SCALE_HEIGHT = 19000000.0;
-
-function distanceFormat(v: number) {
+function distanceFormat(v) {
     if (v > 1000) {
         return `${(v / 1000).toFixed(1)} km`;
-    } else if (v > 9) {
+    }
+    else if (v > 9) {
         return `${Math.round(v)} m`;
-    } else {
+    }
+    else {
         return `${v.toFixed(1)} m`;
     }
 }
-
 class SelectionScene extends RenderNode {
-    events: Events<string[]>;
-    _ignoreTerrain = false;
-    _onSelect: any;
-    _autoSelectionHide: any;
-    _planet: any;
-    _startLonLat: any;
-    _heading: number;
-    _propsLabel: Entity;
-    _trackEntity: Entity;
-    _cornerEntity: Entity[];
-    _trackLayer: Vector;
-    _cornersLayer: Vector;
-    _onMouseMove_: any;
-    _onMouseLdown_: any;
-    _onMouseLup_: any;
-    _pickedCorner: any;
-    _anchorLonLat: any;
-    constructor(options: { name?: string, ignoreTerrain?: boolean, onSelect?: any, autoSelectionHide?: boolean, planet?: any } = {}) {
+    constructor(options = {}) {
         super(options.name);
-
+        this._ignoreTerrain = false;
         this.events = new Events(EVENT_NAMES);
-
         this._ignoreTerrain = options.ignoreTerrain != undefined ? options.ignoreTerrain : true;
-
         this._onSelect = options.onSelect || null;
-
         this._autoSelectionHide = options.autoSelectionHide || false;
-
         this._planet = options.planet || null;
-
         this._startLonLat = null;
-
         this._heading = 0;
-
         this._propsLabel = new Entity({
             'name': 'propsLabel',
             'label': {
@@ -68,10 +42,8 @@ class SelectionScene extends RenderNode {
                 align: "center",
                 offset: [0, 18]
             }
-        } as any);
-
+        });
         this._propsLabel?.label?.setVisibility(false);
-
         this._trackEntity = new Entity({
             polyline: {
                 path3v: [],
@@ -79,12 +51,9 @@ class SelectionScene extends RenderNode {
                 color: "rgb(455,455,455)",
                 isClosed: false
             }
-        } as any);
-
-        (this._trackEntity as any).polyline.altitude = 0.01;
-
-        let obj3d = Object3d.createCylinder(1.1, 0, 2.7, 20, 1, true, false, 0, 0, 0)
-
+        });
+        this._trackEntity.polyline.altitude = 0.01;
+        let obj3d = Object3d.createCylinder(1.1, 0, 2.7, 20, 1, true, false, 0, 0, 0);
         this._cornerEntity = [
             new Entity({
                 geoObject: {
@@ -97,7 +66,7 @@ class SelectionScene extends RenderNode {
                 properties: {
                     name: "start"
                 }
-            } as any),
+            }),
             new Entity({
                 geoObject: {
                     scale: 1,
@@ -109,9 +78,8 @@ class SelectionScene extends RenderNode {
                 properties: {
                     name: "end"
                 }
-            } as any)
+            })
         ];
-
         this._trackLayer = new Vector("track", {
             entities: [this._trackEntity, this._propsLabel],
             pickingEnabled: false,
@@ -119,7 +87,6 @@ class SelectionScene extends RenderNode {
             relativeToGround: true,
             displayInLayerSwitcher: false
         });
-
         this._cornersLayer = new Vector("corners", {
             entities: [this._cornerEntity[0], this._cornerEntity[1]],
             pickingEnabled: true,
@@ -128,44 +95,32 @@ class SelectionScene extends RenderNode {
             pickingScale: 2
         });
     }
-
-    set ignoreTerrain(v: boolean) {
+    set ignoreTerrain(v) {
         this._ignoreTerrain = v;
         if (v) {
             //...redraw line
         }
     }
-
-    bindPlanet(planet: any) {
+    bindPlanet(planet) {
         this._planet = planet;
     }
-
-    override init() {
+    init() {
         this._activate();
     }
-
-    override onremove() {
+    onremove() {
         this._deactivate();
     }
-
     _activate() {
         this._propsLabel?.label?.setVisibility(false);
-
         this._onMouseMove_ = this._onMouseMove.bind(this);
         this.renderer?.events.on("mousemove", this._onMouseMove_, this);
-
         this._onMouseLdown_ = this._onMouseLdown.bind(this);
         this.renderer?.events.on("ldown", this._onMouseLdown_, this);
-
         this._onMouseLup_ = this._onMouseLup.bind(this);
         this.renderer?.events.on("lup", this._onMouseLup_, this);
-
         this._planet.addLayer(this._trackLayer);
-
         this._planet.addLayer(this._cornersLayer);
-
     }
-
     _deactivate() {
         this._startLonLat = null;
         this._trackLayer.remove();
@@ -173,53 +128,35 @@ class SelectionScene extends RenderNode {
         this.renderer?.events.off("mousemove", this._onMouseMove_);
         this.renderer?.events.off("ldown", this._onMouseLdown_);
         this.renderer?.events.off("lup", this._onMouseLup_);
-
         this.clear();
-
         this._onMouseMove_ = null;
         this._onMouseLdown_ = null;
         this._onMouseLup_ = null;
     }
-
-    _onMouseLdown(e: any) {
-
+    _onMouseLdown(e) {
         //workaround to show pointer, because ogGrabbingPoiner keep !importanti which override pointer style
         e.renderer.handler.canvas.classList.remove('ogGrabbingPoiner');
-
         e.renderer.handler.canvas.style.cursor = 'pointer';
-
         if (!this._startLonLat) {
-
-
             this._propsLabel.label?.setVisibility(false);
-
             this._trackEntity.polyline?.setPath3v([]);
-
-
             this._cornerEntity[0].geoObject?.setVisibility(true);
             this._cornerEntity[1].geoObject?.setVisibility(true);
-
             this.renderer?.controls.mouseNavigation?.deactivate();
             this._startLonLat = this._planet.getLonLatFromPixelTerrain(e);
-
             let startPos = this._planet.ellipsoid.lonLatToCartesian(this._startLonLat);
             this._cornerEntity[0].setCartesian3v(startPos);
             this._cornerEntity[1].setCartesian3v(startPos);
         }
     }
-
-    _onMouseLup(e: any) {
+    _onMouseLup(e) {
         if (this._startLonLat) {
-
             this._pickedCorner = null;
             this._anchorLonLat = null;
-
             this._propsLabel.label?.setVisibility(true);
-
             if (this._onSelect && typeof this._onSelect === 'function') {
                 let startLonLat = this._cornerEntity[0].getLonLat();
                 let endLonLat = this._cornerEntity[1].getLonLat();
-
                 let extent = [
                     Math.min(startLonLat.lon, endLonLat.lon),
                     Math.min(startLonLat.lat, endLonLat.lat),
@@ -228,34 +165,24 @@ class SelectionScene extends RenderNode {
                 ];
                 this._onSelect(extent);
             }
-
             if (this._autoSelectionHide) {
                 this.clear();
             }
-
             this._startLonLat = null;
         }
         e.renderer.handler.canvas.style.cursor = 'default';
         this.renderer?.controls.mouseNavigation?.activate();
     }
-
-    _drawLine(startLonLat: any, endLonLat: any, startPos?: any) {
-
+    _drawLine(startLonLat, endLonLat, startPos) {
         if (!startPos) {
             startPos = this._planet.ellipsoid.lonLatToCartesian(startLonLat);
         }
-
         let endPos = this._planet.ellipsoid.lonLatToCartesian(endLonLat);
-
         let res = this._planet.ellipsoid.direct(startLonLat, endLonLat);
-
         this._heading = res.initialAzimuth;
-
         let path = [];
-
         this._cornerEntity[0].setCartesian3v(startPos);
         this._cornerEntity[1].setCartesian3v(endPos);
-
         let corners = [
             startPos,
             this._planet.ellipsoid.lonLatToCartesian(new LonLat(endLonLat.lon, startLonLat.lat, startLonLat.height)),
@@ -263,34 +190,26 @@ class SelectionScene extends RenderNode {
             this._planet.ellipsoid.lonLatToCartesian(new LonLat(startLonLat.lon, endLonLat.lat, startLonLat.height)),
             startPos
         ];
-
-
         path.push(startPos);
-
-        let createPath = (sideA: any, sideB: any) => {
+        let createPath = (sideA, sideB) => {
             let dir = sideB.sub(sideA);
             let dist = dir.length();
             dir.normalize();
-
             for (let i = 0; i < OUTLINE_COUNT; i++) {
                 let f = dir.scaleTo(i * dist / OUTLINE_COUNT).addA(sideA);
                 path.push(f);
             }
         };
-
         for (let i = 0; i < corners.length - 1; i++) {
             createPath(corners[i], corners[i + 1]);
         }
-
         this._trackEntity.polyline?.setPath3v([path]);
-
         if (this._ignoreTerrain) {
             // this._propsLabel.setCartesian3v(path[Math.floor(path.length / 2)]);
             // this._propsLabel.label.setText(`${distanceFormat(length)}, ${Math.round(this._heading)} deg`);
         }
     }
-
-    _onMouseMove(e: any) {
+    _onMouseMove(e) {
         if (this._startLonLat) {
             this._propsLabel.label?.setVisibility(true);
             let endLonLat = this._planet.getLonLatFromPixelTerrain(e);
@@ -299,33 +218,28 @@ class SelectionScene extends RenderNode {
             this._drawLine(this._startLonLat, endLonLat);
         }
     }
-
     clear() {
         this._trackEntity.polyline?.clear();
         this._cornerEntity[0].geoObject?.setVisibility(false);
         this._cornerEntity[1].geoObject?.setVisibility(false);
     }
-
-    override frame() {
+    frame() {
         let t = this._trackEntity.polyline?.getPath3v()[0];
         if (t) {
             if (!this._ignoreTerrain) {
                 let res = 0;
                 for (let i = 0, len = t.length - 1; i < len; i++) {
-                    res += (t[i + 1] as any).distance(t[i]);
+                    res += t[i + 1].distance(t[i]);
                 }
-
-                this._propsLabel.setCartesian3v(t[Math.floor(t.length / 2)] as any);
+                this._propsLabel.setCartesian3v(t[Math.floor(t.length / 2)]);
                 this._propsLabel.label?.setText(`${distanceFormat(res)}, ${Math.round(this._heading)} deg`);
             }
         }
     }
-
     get ellipsoid() {
         return this._planet ? this._planet.ellipsoid : null;
     }
 }
-
 const EVENT_NAMES = [
     "add",
     "remove",
@@ -355,5 +269,4 @@ const EVENT_NAMES = [
     "touchleave",
     "touchenter"
 ];
-
 export { SelectionScene };

package/lib/js/control/timeline/TimelineControl.d.ts

@@ -0,0 +1,18 @@
+import { Dialog } from "../../ui/Dialog";
+import { ToggleButton } from "../../ui/ToggleButton";
+import { Control, IControlParams } from '../Control';
+import { TimelineView } from './TimelineView';
+interface ITimelineControlParams extends IControlParams {
+    name?: string;
+    current?: Date;
+    rangeStart?: Date;
+    rangeEnd?: Date;
+}
+declare class TimelineControl extends Control {
+    protected _timelineView: TimelineView;
+    protected _toggleBtn: ToggleButton;
+    protected _dialog: Dialog<null>;
+    constructor(options?: ITimelineControlParams);
+    oninit(): void;
+}
+export { TimelineControl };

package/{src/control/timeline/TimelineControl.ts → lib/js/control/timeline/TimelineControl.js}

@@ -1,21 +1,12 @@
-import {Dialog} from "../../ui/Dialog";
-import {ToggleButton} from "../../ui/ToggleButton";
-import {Control, IControlParams} from '../Control';
-import {TimelineView} from './TimelineView';
-
-interface ITimelineControlParams extends IControlParams {
-    name?: string;
-    current?: Date;
-    rangeStart?: Date;
-    rangeEnd?: Date;
-}
-
-function addHours(date: Date, hours: number): Date {
+import { Dialog } from "../../ui/Dialog";
+import { ToggleButton } from "../../ui/ToggleButton";
+import { Control } from '../Control';
+import { TimelineView } from './TimelineView';
+function addHours(date, hours) {
     const temp = new Date(date);
     temp.setHours(temp.getHours() + hours);
     return temp;
 }
-
 const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="utf-8"?>
 <!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
     <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
@@ -23,33 +14,24 @@ const ICON_BUTTON_SVG = `<?xml version="1.0" encoding="utf-8"?>
     <metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
     <g><path d="M500,10C229.4,10,10,229.4,10,500s219.4,490,490,490s490-219.4,490-490S770.6,10,500,10z M800.3,800.3c-39,39-84.5,69.7-135,91C613,913.5,557.4,924.7,500,924.7s-112.9-11.2-165.3-33.3c-50.5-21.3-95.9-52-135-91c-39-39-69.7-84.5-91-135C86.5,612.9,75.3,557.4,75.3,500s11.2-112.9,33.3-165.3c21.3-50.5,52-95.9,91-135c39-39,84.5-69.7,135-91C387.1,86.5,442.6,75.3,500,75.3s112.9,11.2,165.3,33.3c50.5,21.3,95.9,52,135,91c39,39,69.7,84.5,91,135c22.1,52.3,33.3,107.9,33.3,165.3s-11.2,112.9-33.3,165.3C869.9,715.8,839.3,761.2,800.3,800.3z"/><path d="M761.3,532.7H532.7V304c0-18.1-14.6-32.7-32.7-32.7s-32.7,14.6-32.7,32.7v261.3l0,0c0,18.1,14.6,32.7,32.7,32.7h261.3c18.1,0,32.7-14.6,32.7-32.7l0,0C794,547.3,779.4,532.7,761.3,532.7z"/></g>
 </svg>`;
-
 class TimelineControl extends Control {
-    protected _timelineView: TimelineView;
-    protected _toggleBtn: ToggleButton;
-    protected _dialog: Dialog<null>;
-
-    constructor(options: ITimelineControlParams = {}) {
+    constructor(options = {}) {
         super({
             name: "timeline",
             ...options
         });
-
         let currentDate = options.current || new Date();
         let startDate = options.rangeStart || addHours(currentDate, -12);
         let endDate = options.rangeEnd || addHours(currentDate, 12);
-
         this._timelineView = new TimelineView({
             rangeStart: startDate,
             rangeEnd: endDate,
             currentDate: currentDate
         });
-
         this._toggleBtn = new ToggleButton({
             classList: ["og-map-button", "og-timeline_button"],
             icon: ICON_BUTTON_SVG
         });
-
         this._dialog = new Dialog({
             title: "Timeline",
             visible: false,
@@ -62,48 +44,36 @@ class TimelineControl extends Control {
             minHeight: 115,
             maxHeight: 110
         });
-
-        this._dialog.events.on("visibility", (v: boolean) => {
+        this._dialog.events.on("visibility", (v) => {
             this._toggleBtn.setActive(v);
         });
     }
-
-    public override oninit() {
-
-        let $container = this.renderer!.div!;
-
+    oninit() {
+        let $container = this.renderer.div;
         this._toggleBtn.appendTo($container);
         this._dialog.appendTo($container);
-
-        this._toggleBtn.events.on("change", (isActive: boolean) => {
+        this._toggleBtn.events.on("change", (isActive) => {
             this._dialog.setVisibility(isActive);
             if (isActive) {
                 this._timelineView.resize();
             }
         });
-
-        this._timelineView.appendTo(this._dialog.container!);
-
-        this._timelineView.events.on("setcurrent", (d: Date) => {
+        this._timelineView.appendTo(this._dialog.container);
+        this._timelineView.events.on("setcurrent", (d) => {
             this.renderer && this.renderer.handler.defaultClock.setDate(d);
         });
-
         this._timelineView.events.on("startdrag", () => {
             this.renderer && this.renderer.controls.mouseNavigation.deactivate();
         });
-
         this._timelineView.events.on("stopdrag", () => {
             this.renderer && this.renderer.controls.mouseNavigation.activate();
         });
-
         this._timelineView.events.on("startdragcurrent", () => {
             this.renderer && this.renderer.controls.mouseNavigation.deactivate();
         });
-
         this._timelineView.events.on("stopdragcurrent", () => {
             this.renderer && this.renderer.controls.mouseNavigation.activate();
         });
     }
 }
-
-export {TimelineControl};
+export { TimelineControl };

package/lib/js/control/timeline/TimelineModel.d.ts

@@ -0,0 +1,41 @@
+import { EventsHandler } from '../../Events';
+type TimelineEventsList = ["change", "current"];
+interface ITimelineParams {
+    current?: Date;
+    rangeStart?: Date;
+    rangeEnd?: Date;
+    minDate?: Date | null;
+    maxDate?: Date | null;
+    multiplier?: number;
+}
+declare class TimelineModel {
+    events: EventsHandler<TimelineEventsList>;
+    protected _current: Date;
+    protected _rangeStart: Date;
+    protected _rangeEnd: Date;
+    protected _range: number;
+    protected _minDate: Date | null;
+    protected _maxDate: Date | null;
+    protected _requestAnimationFrameId: number;
+    protected _prevNow: number;
+    multiplier: number;
+    dt: number;
+    constructor(options?: ITimelineParams);
+    play(): void;
+    stop(): void;
+    stopped(): boolean;
+    protected _animationFrameCallback(): void;
+    protected _frame(): void;
+    get range(): number;
+    set(rangeStart: Date, rangeEnd: Date): void;
+    get current(): Date;
+    get rangeStart(): Date;
+    get rangeEnd(): Date;
+    get rangeStartTime(): number;
+    get rangeEndTime(): number;
+    get currentTime(): number;
+    set current(current: Date);
+    set rangeStart(date: Date);
+    set rangeEnd(date: Date);
+}
+export { TimelineModel };