@openglobus/og 0.18.0 → 0.18.2

package/{src/control/heightRuler/HeightRulerScene.ts → lib/js/control/heightRuler/HeightRulerScene.js}

@@ -1,20 +1,14 @@
-import {Entity} from '../../entity/Entity';
-import {LonLat} from "../../LonLat";
-import {Object3d} from "../../Object3d";
-import {RulerScene, IRulerSceneParams} from "../ruler/RulerScene";
-import {Vector} from "../../layer/Vector";
-import {Vec3} from "../../math/Vec3";
-import {ILabelParams} from "../../entity/Label";
-import {IRayParams} from "../../entity/Ray";
-
+import { Entity } from '../../entity/Entity';
+import { Object3d } from "../../Object3d";
+import { RulerScene } from "../ruler/RulerScene";
+import { Vector } from "../../layer/Vector";
 let obj3d = Object3d.createCylinder(1.1, 0, 2, 6, 1, true, true, 0, 0, 0);
-
-const RAYS_OPTIONS: IRayParams = {
+const RAYS_OPTIONS = {
     startColor: "rgb(255,131,0)",
     endColor: "rgb(255,131,0)",
     thickness: 5
-}
-const LABEL_OPTIONS: ILabelParams = {
+};
+const LABEL_OPTIONS = {
     text: "",
     size: 11,
     color: "rgba(455,455,455,1.0)",
@@ -23,7 +17,6 @@ const LABEL_OPTIONS: ILabelParams = {
     align: "center",
     offset: [0, 18, 0]
 };
-
 const RULER_CORNER_OPTIONS = {
     scale: 1,
     instanced: true,
@@ -31,20 +24,9 @@ const RULER_CORNER_OPTIONS = {
     color: "rgb(255,131,0)",
     object3d: obj3d
 };
-
-interface IHeightRulerSceneParams extends IRulerSceneParams {
-
-}
-
 class HeightRulerScene extends RulerScene {
-    protected _geoRulerLayer: Vector;
-    protected _heightLabels: Entity[];
-    protected _rayH: Entity;
-    protected _rayV: Entity;
-
-    constructor(options: IHeightRulerSceneParams = {}) {
+    constructor(options = {}) {
         super(options);
-
         this._geoRulerLayer = new Vector("rayHeightRuler", {
             entities: [],
             pickingEnabled: false,
@@ -52,17 +34,14 @@ class HeightRulerScene extends RulerScene {
             relativeToGround: false,
             displayInLayerSwitcher: false
         });
-
         this._rayV = new Entity({
             name: 'verticalRay',
             ray: RAYS_OPTIONS
         });
-
         this._rayH = new Entity({
             name: 'heightRay',
             ray: RAYS_OPTIONS
         });
-
         this._heightLabels = [
             new Entity({
                 name: 'startCornerLabel',
@@ -84,101 +63,80 @@ class HeightRulerScene extends RulerScene {
             })
         ];
     }
-
-    public override setVisibility(visibility: boolean) {
+    setVisibility(visibility) {
         super.setVisibility(visibility);
         this._geoRulerLayer.setVisibility(visibility);
     }
-
-    public get deltaLabel(): Entity {
+    get deltaLabel() {
         return this._heightLabels[2];
     }
-
-    public get startLabel(): Entity {
-        return this._heightLabels[0]
+    get startLabel() {
+        return this._heightLabels[0];
     }
-
-    public get endLabel(): Entity {
-        return this._heightLabels[1]
+    get endLabel() {
+        return this._heightLabels[1];
     }
-
-    public get corners(): Entity[] {
+    get corners() {
         return this._cornerEntity;
     }
-
-    public get startCorner(): Entity {
+    get startCorner() {
         return this.corners[0];
     }
-
-    public get endCorner(): Entity {
+    get endCorner() {
         return this.corners[1];
     }
-
-    public get startCornerLonLat(): LonLat {
+    get startCornerLonLat() {
         return this.startCorner.getLonLat();
     }
-
-    public get startCornerHeight(): number {
+    get startCornerHeight() {
         return this.startCornerLonLat.height;
     }
-
-    public get endCornerLonLat(): LonLat {
+    get endCornerLonLat() {
         return this.endCorner.getLonLat();
     }
-
-    public get endCornerHeight(): number {
+    get endCornerHeight() {
         return this.endCornerLonLat.height;
     }
-
-    public get maxHeightCornerLonLat(): LonLat {
+    get maxHeightCornerLonLat() {
         if (this.startCornerHeight <= this.endCornerHeight) {
             return this.endCornerLonLat;
-        } else {
+        }
+        else {
             return this.startCornerLonLat;
         }
     }
-
-    public get minHeightCornerLonLat(): LonLat {
+    get minHeightCornerLonLat() {
         if (this.startCornerHeight > this.endCornerHeight) {
             return this.endCornerLonLat;
-        } else {
+        }
+        else {
             return this.startCornerLonLat;
         }
     }
-
-    public get deltaHeight(): number {
+    get deltaHeight() {
         return Math.abs(this.startCornerHeight - this.endCornerHeight);
     }
-
-    public override _drawLine(startLonLat: LonLat, endLonLat: LonLat, startPos?: Vec3) {
+    _drawLine(startLonLat, endLonLat, startPos) {
         super._drawLine(startLonLat, endLonLat, startPos);
         this._updateHeightRaysAndLabels();
     }
-
-    protected async _updateHeightRaysAndLabels() {
+    async _updateHeightRaysAndLabels() {
         const middleLonLat = this.minHeightCornerLonLat.clone();
         middleLonLat.height = this.maxHeightCornerLonLat.height;
-
-        this._rayH.ray!.setStartPosition3v(this._planet!.ellipsoid.lonLatToCartesian(this.maxHeightCornerLonLat))
-        this._rayH.ray!.setEndPosition3v(this._planet!.ellipsoid.lonLatToCartesian(middleLonLat))
-        this._rayV.ray!.setStartPosition3v(this._planet!.ellipsoid.lonLatToCartesian(this.minHeightCornerLonLat));
-        this._rayV.ray!.setEndPosition3v(this._planet!.ellipsoid.lonLatToCartesian(middleLonLat));
-
+        this._rayH.ray.setStartPosition3v(this._planet.ellipsoid.lonLatToCartesian(this.maxHeightCornerLonLat));
+        this._rayH.ray.setEndPosition3v(this._planet.ellipsoid.lonLatToCartesian(middleLonLat));
+        this._rayV.ray.setStartPosition3v(this._planet.ellipsoid.lonLatToCartesian(this.minHeightCornerLonLat));
+        this._rayV.ray.setEndPosition3v(this._planet.ellipsoid.lonLatToCartesian(middleLonLat));
         middleLonLat.height = this.minHeightCornerLonLat.height + this.deltaHeight / 2;
-
         this.deltaLabel.setLonLat(middleLonLat);
         this.startLabel.setLonLat(this.startCornerLonLat);
         this.endLabel.setLonLat(this.endCornerLonLat);
-
-        const startHeight = await this._planet!.getHeightDefault(this.startCornerLonLat),
-            endHeight = await this._planet!.getHeightDefault(this.endCornerLonLat)
-
-        this.deltaLabel.label!.setText(`\u0394 ${Math.abs(startHeight - endHeight).toFixed(1)} m`);
-        this.startLabel.label!.setText(`P1 ${startHeight.toFixed(1)} m`)
-        this.endLabel.label!.setText(`P2 ${endHeight.toFixed(1)} m`)
-    }
-
-    public override clear() {
+        const startHeight = await this._planet.getHeightDefault(this.startCornerLonLat), endHeight = await this._planet.getHeightDefault(this.endCornerLonLat);
+        this.deltaLabel.label.setText(`\u0394 ${Math.abs(startHeight - endHeight).toFixed(1)} m`);
+        this.startLabel.label.setText(`P1 ${startHeight.toFixed(1)} m`);
+        this.endLabel.label.setText(`P2 ${endHeight.toFixed(1)} m`);
+    }
+    clear() {
         this._rayH.remove();
         this._rayV.remove();
         this.startCorner.remove();
@@ -187,14 +145,11 @@ class HeightRulerScene extends RulerScene {
         this.endLabel.remove();
         this.deltaLabel.remove();
         super.clear();
-
         // this._rayH = null;
         // this._rayV = null;
-
-        this._planet!.removeLayer(this._geoRulerLayer);
+        this._planet.removeLayer(this._geoRulerLayer);
     }
-
-    public override _createCorners() {
+    _createCorners() {
         this._cornerEntity = [
             new Entity({
                 geoObject: RULER_CORNER_OPTIONS,
@@ -209,25 +164,18 @@ class HeightRulerScene extends RulerScene {
                 }
             })
         ];
-
         this._cornersLayer.setEntities(this._cornerEntity);
     }
-
-    public override init() {
+    init() {
         super.init();
         this._createCorners();
-
         this._labelLayer.addEntities(this._heightLabels);
         this._geoRulerLayer.addEntities([this._rayH, this._rayV]);
-
-        this._planet!.addLayer(this._geoRulerLayer);
+        this._planet.addLayer(this._geoRulerLayer);
     }
-
-    public override frame() {
-        super.frame()
+    frame() {
+        super.frame();
         this._updateHeightRaysAndLabels();
     }
 }
-
-
-export {HeightRulerScene};
+export { HeightRulerScene };

package/lib/js/control/heightRuler/HeightRulerSwitcher.d.ts

@@ -0,0 +1,6 @@
+import { RulerSwitcher } from "../RulerSwitcher";
+export declare class HeightRulerSwitcher extends RulerSwitcher {
+    constructor(options?: {
+        ignoreTerrain?: boolean;
+    });
+}

package/{src/control/heightRuler/HeightRulerSwitcher.ts → lib/js/control/heightRuler/HeightRulerSwitcher.js}

@@ -1,8 +1,7 @@
 import { RulerSwitcher } from "../RulerSwitcher";
 import { HeightRuler } from "./HeightRuler";
-
 export class HeightRulerSwitcher extends RulerSwitcher {
-    constructor(options: { ignoreTerrain?: boolean } = {}) {
+    constructor(options = {}) {
         super({
             name: `HeightRulerSwitcher`,
             ...options
@@ -11,5 +10,4 @@ export class HeightRulerSwitcher extends RulerSwitcher {
             ignoreTerrain: options.ignoreTerrain
         });
     }
-
-}
+}

package/{src/control/index.ts → lib/js/control/index.d.ts}

@@ -25,21 +25,4 @@ import { HeightRuler } from "./heightRuler/HeightRuler";
 import { Ruler } from "./ruler/Ruler";
 import { Selection } from "./selection/Selection";
 import { TimelineControl } from "./timeline/TimelineControl";
-
-export {
-    CompassButton, Control, DebugInfo, DrawingControl, DrawingSwitcher, EarthCoordinates, EarthNavigation, GeoImageDragControl,
-    HeightRuler,
-    KeyboardNavigation, LayerAnimation, LayerSwitcher,
-    Lighting, MouseNavigation,
-    MouseWheelZoomControl,
-    Ruler,
-    RulerSwitcher,
-    ScaleControl, Selection, ShowFps,
-    SimpleNavigation,
-    SimpleSkyBackground,
-    Sun, TimelineControl,
-    ToggleWireframe,
-    TouchNavigation,
-    ZoomControl
-};
-
+export { CompassButton, Control, DebugInfo, DrawingControl, DrawingSwitcher, EarthCoordinates, EarthNavigation, GeoImageDragControl, HeightRuler, KeyboardNavigation, LayerAnimation, LayerSwitcher, Lighting, MouseNavigation, MouseWheelZoomControl, Ruler, RulerSwitcher, ScaleControl, Selection, ShowFps, SimpleNavigation, SimpleSkyBackground, Sun, TimelineControl, ToggleWireframe, TouchNavigation, ZoomControl };

package/lib/js/control/index.js

@@ -0,0 +1,28 @@
+import { CompassButton } from "./CompassButton";
+import { Control } from "./Control";
+import { DebugInfo } from "./DebugInfo";
+import { DrawingSwitcher } from "./DrawingSwitcher";
+import { EarthCoordinates } from "./EarthCoordinates";
+import { EarthNavigation } from "./EarthNavigation";
+import { GeoImageDragControl } from "./GeoImageDragControl";
+import { KeyboardNavigation } from "./KeyboardNavigation";
+import { LayerAnimation } from "./LayerAnimation";
+import { LayerSwitcher } from "./LayerSwitcher";
+import { Lighting } from "./Lighting";
+import { MouseNavigation } from "./MouseNavigation";
+import { MouseWheelZoomControl } from "./MouseWheelZoomControl";
+import { RulerSwitcher } from "./RulerSwitcher";
+import { ScaleControl } from "./ScaleControl";
+import { ShowFps } from "./ShowFps";
+import { SimpleNavigation } from "./SimpleNavigation";
+import { SimpleSkyBackground } from "./SimpleSkyBackground";
+import { Sun } from "./Sun";
+import { ToggleWireframe } from "./ToggleWireframe";
+import { TouchNavigation } from "./TouchNavigation";
+import { ZoomControl } from "./ZoomControl";
+import { DrawingControl } from "./drawing/DrawingControl";
+import { HeightRuler } from "./heightRuler/HeightRuler";
+import { Ruler } from "./ruler/Ruler";
+import { Selection } from "./selection/Selection";
+import { TimelineControl } from "./timeline/TimelineControl";
+export { CompassButton, Control, DebugInfo, DrawingControl, DrawingSwitcher, EarthCoordinates, EarthNavigation, GeoImageDragControl, HeightRuler, KeyboardNavigation, LayerAnimation, LayerSwitcher, Lighting, MouseNavigation, MouseWheelZoomControl, Ruler, RulerSwitcher, ScaleControl, Selection, ShowFps, SimpleNavigation, SimpleSkyBackground, Sun, TimelineControl, ToggleWireframe, TouchNavigation, ZoomControl };

package/lib/js/control/ruler/Ruler.d.ts

@@ -0,0 +1,13 @@
+import { Control, IControlParams } from "../Control";
+import { RulerScene } from "./RulerScene";
+export interface IRulerParams extends IControlParams {
+    ignoreTerrain?: boolean;
+}
+export declare class Ruler extends Control {
+    protected _rulerScene: RulerScene;
+    constructor(options?: IRulerParams);
+    set ignoreTerrain(v: boolean);
+    oninit(): void;
+    onactivate(): void;
+    ondeactivate(): void;
+}

package/lib/js/control/ruler/Ruler.js

@@ -0,0 +1,23 @@
+import { Control } from "../Control";
+import { RulerScene } from "./RulerScene";
+export class Ruler extends Control {
+    constructor(options = {}) {
+        super(options);
+        this._rulerScene = new RulerScene({
+            name: `rulerScene:${this.__id}`,
+            ignoreTerrain: options.ignoreTerrain
+        });
+    }
+    set ignoreTerrain(v) {
+        this._rulerScene.ignoreTerrain = v;
+    }
+    oninit() {
+        this._rulerScene.bindPlanet(this.planet);
+    }
+    onactivate() {
+        this.renderer && this.renderer.addNode(this._rulerScene);
+    }
+    ondeactivate() {
+        this.renderer && this.renderer.removeNode(this._rulerScene);
+    }
+}

package/lib/js/control/ruler/RulerScene.d.ts

@@ -0,0 +1,88 @@
+import { Entity } from '../../entity/Entity';
+import { EventsHandler } from '../../Events';
+import { LonLat } from "../../LonLat";
+import { Planet } from "../../scene/Planet";
+import { RenderNode } from '../../scene/RenderNode';
+import { Vector } from '../../layer/Vector';
+import { Vec2 } from '../../math/Vec2';
+import { Vec3 } from '../../math/Vec3';
+import { IMouseState } from "../../renderer/RendererEvents";
+import { Ellipsoid } from "../../ellipsoid/Ellipsoid";
+export interface IRulerSceneParams {
+    name?: string;
+    ignoreTerrain?: boolean;
+    planet?: Planet;
+}
+export declare const distanceFormat: (v: number) => string;
+type RulerSceneEventsList = [
+    "add",
+    "remove",
+    "mousemove",
+    "mouseenter",
+    "mouseleave",
+    "lclick",
+    "rclick",
+    "mclick",
+    "ldblclick",
+    "rdblclick",
+    "mdblclick",
+    "lup",
+    "rup",
+    "mup",
+    "ldown",
+    "rdown",
+    "mdown",
+    "lhold",
+    "rhold",
+    "mhold",
+    "mousewheel",
+    "touchmove",
+    "touchstart",
+    "touchend",
+    "doubletouch",
+    "touchleave",
+    "touchenter"
+];
+declare class RulerScene extends RenderNode {
+    events: EventsHandler<RulerSceneEventsList>;
+    protected _ignoreTerrain: boolean;
+    protected _planet: Planet | null;
+    protected _startLonLat: LonLat | null;
+    protected _preventClick: boolean;
+    protected _stopDrawing: boolean;
+    protected _pickedCorner: Entity | null;
+    protected _startPos: Vec2 | null;
+    protected _startClick: Vec2;
+    protected _heading: number;
+    protected _trackLayer: Vector;
+    protected _labelLayer: Vector;
+    protected _cornersLayer: Vector;
+    protected _cornerEntity: Entity[];
+    protected _propsLabel: Entity;
+    protected _trackEntity: Entity;
+    protected _anchorLonLat: LonLat | null;
+    protected _timeout: any;
+    constructor(options?: IRulerSceneParams);
+    set ignoreTerrain(v: boolean);
+    bindPlanet(planet: Planet): void;
+    protected _createCorners(): void;
+    init(): void;
+    onremove(): void;
+    _activate(): void;
+    protected _deactivate(): void;
+    protected _onCornerLdown: (e: IMouseState) => void;
+    protected _onLUp: () => void;
+    protected _onCornerLup: () => void;
+    protected _onCornerEnter: (e: IMouseState) => void;
+    protected _onCornerLeave: (e: IMouseState) => void;
+    protected _onLdblclick: () => void;
+    setVisibility(visibility: boolean): void;
+    protected _onLclick: (e: IMouseState) => void;
+    protected _drawLine(startLonLat: LonLat, endLonLat: LonLat, startPos?: Vec3): void;
+    protected _onMouseMove: (e: IMouseState) => void;
+    clear(): void;
+    isCornersPositionChanged(): boolean;
+    frame(): void;
+    get ellipsoid(): Ellipsoid | null;
+}
+export { RulerScene };