@openglobus/og 0.23.0 → 0.24.1

package/lib/js/control/elevationProfile/ElevationProfileControl.d.ts

@@ -1,4 +1,4 @@
-import { Control, IControlParams } from "../Control";
+import { Control, type IControlParams } from "../Control";
 import { Dialog } from "../../ui/Dialog";
 import { View } from "../../ui/View";
 import { ToggleButton } from "../../ui/ToggleButton";
@@ -6,7 +6,7 @@ import { ElevationProfileView } from "./ElevationProfileView";
 import { ElevationProfileScene } from "./ElevationProfileScene";
 import { ElevationProfileButtonsView } from "./ElevationProfileButtonsView";
 import { PointListDialog } from "./PointListDialog";
-import { GroundItem, TrackItem } from "./ElevationProfile";
+import type { GroundItem, TrackItem } from "./ElevationProfile";
 import { ElevationProfileLegend } from "./ElevationProfileLegend";
 interface IElevationProfileGraphParams extends IControlParams {
 }

package/lib/js/control/elevationProfile/ElevationProfileLegend.d.ts

@@ -1,4 +1,4 @@
-import { IViewParams, View } from '../../ui/View';
+import { type IViewParams, View } from '../../ui/View';
 export interface IElevationProfileLegendParams extends IViewParams {
 }
 export declare class ElevationProfileLegend extends View<null> {

package/lib/js/control/elevationProfile/ElevationProfileScene.d.ts

@@ -1,12 +1,12 @@
 import { Entity } from '../../entity/Entity';
-import { EventsHandler } from '../../Events';
+import { type 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 type { IMouseState } from "../../renderer/RendererEvents";
 import { Ellipsoid } from "../../ellipsoid/Ellipsoid";
 export interface IElevationProfileSceneParams {
     name?: string;

package/lib/js/control/elevationProfile/ElevationProfileScene.js

@@ -8,6 +8,7 @@ import { Vector } from '../../layer/Vector';
 import { Vec2 } from '../../math/Vec2';
 import { Vec3 } from '../../math/Vec3';
 import { Ray } from "../../math/Ray";
+import { Plane } from "../../math/Plane";
 let groundObj3d = Object3d.createCylinder(0.33, 0, 1.0, 20, 1, true, false, 0, 0, 0);
 let headObj3d = Object3d.createCylinder(0.33, 0.33, 1.1, 20, 1, true, true, 0, -0.55, 0);
 const POINTER_RAY_OPTIONS = {
@@ -79,7 +80,7 @@ class ElevationProfileScene extends RenderNode {
                 let p1 = p0.add(groundNormal);
                 let p2 = p0.add(cam.getRight());
                 let px = new Vec3();
-                if (new Ray(cam.eye, e.direction).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
                     let h = Vec3.proj_b_to_a(px, p0);
                     let s = h.sub(p0).dot(p0);
                     let headPos = p0.add(groundNormal.scale(Math.sign(s) * h.distance(p0)));

package/lib/js/control/elevationProfile/ElevationProfileView.d.ts

@@ -1,7 +1,9 @@
-import { EventsHandler } from "../../Events";
-import { IViewParams, View, ViewEventsList } from '../../ui/View';
-import { ElevationProfile, GroundItem, TrackItem } from './ElevationProfile';
-import { MouseEventExt } from "../../input/MouseHandler";
+import type { EventsHandler } from "../../Events";
+import { View } from '../../ui/View';
+import type { IViewParams, ViewEventsList } from '../../ui/View';
+import { ElevationProfile } from './ElevationProfile';
+import type { GroundItem, TrackItem } from './ElevationProfile';
+import type { MouseEventExt } from "../../input/MouseHandler";
 interface IElevationProfileViewParams extends IViewParams {
     fillStyle?: string;
 }

package/lib/js/control/elevationProfile/ElevationProfileView.js

@@ -1,5 +1,5 @@
 import { View } from '../../ui/View';
-import { SAFE, WARNING, COLLISION, ElevationProfile } from './ElevationProfile';
+import { SAFE, WARNING, COLLISION, ElevationProfile, } from './ElevationProfile';
 import { distanceFormatExt, binarySearch } from "../../utils/shared";
 const FILL_COLOR = "rgb(63, 63, 63)";
 const TRACK_COLOR = "rgb(0, 255, 50)";

package/lib/js/control/elevationProfile/PointListDialog.d.ts

@@ -1,4 +1,4 @@
-import { IDialogParams, Dialog } from "../../ui/Dialog";
+import { type IDialogParams, Dialog } from "../../ui/Dialog";
 import { ElevationProfileScene } from "./ElevationProfileScene";
 interface IPointListDialog extends IDialogParams {
     model: ElevationProfileScene;

package/lib/js/control/geoObjectEditor/ArrowEntity.d.ts

@@ -1,4 +1,4 @@
-import { Entity, IEntityParams } from "../../entity/Entity";
+import { Entity, type IEntityParams } from "../../entity/Entity";
 export interface IArrowEntityParams extends IEntityParams {
     yaw?: number;
     pitch?: number;

package/lib/js/control/geoObjectEditor/AxisTrackEntity.d.ts

@@ -1,4 +1,4 @@
-import { Entity, IEntityParams } from "../../entity/Entity";
+import { Entity, type IEntityParams } from "../../entity/Entity";
 import { Vec3 } from "../../math/Vec3";
 export interface IAxisTrackEntityParams extends IEntityParams {
 }

package/lib/js/control/geoObjectEditor/GeoObjectEditor.d.ts

@@ -1,4 +1,4 @@
-import { Control, IControlParams } from "../Control";
+import { Control, type IControlParams } from "../Control";
 import { GeoObjectEditorScene } from "./GeoObjectEditorScene";
 import { GeoObjectPropertiesDialog } from "./GeoObjectEditorDialog";
 export interface IGeoObjectEditorParams extends IControlParams {

package/lib/js/control/geoObjectEditor/GeoObjectEditorDialog.d.ts

@@ -1,4 +1,4 @@
-import { Dialog, IDialogParams } from "../../ui/Dialog";
+import { Dialog, type IDialogParams } from "../../ui/Dialog";
 import { GeoObjectEditorScene } from "./GeoObjectEditorScene";
 import { Entity } from "../../entity/Entity";
 import { Input } from "../../ui/Input";

package/lib/js/control/geoObjectEditor/GeoObjectEditorDialog.js

@@ -4,6 +4,7 @@ import { Checkbox } from "../../ui/Checkbox";
 import { Button } from "../../ui/Button";
 import { Vec3 } from "../../math/Vec3";
 import { ToggleButton } from "../../ui/ToggleButton";
+import { DEGREES, RADIANS } from "../../math";
 const ICON_LOCK_BUTTON_SVG = `<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" id="filter-center-focus">
   <path d="M5 15H3v4c0 1.1.9 2 2 2h4v-2H5v-4zM5 5h4V3H5c-1.1 0-2 .9-2 2v4h2V5zm14-2h-4v2h4v4h2V5c0-1.1-.9-2-2-2zm0 16h-4v2h4c1.1 0 2-.9 2-2v-4h-2v4zM12 9c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z"/>
 </svg>`;
@@ -41,39 +42,24 @@ export class GeoObjectPropertiesDialog extends Dialog {
         };
         this._onPosition = (pos, entity) => {
             this._refresh(entity);
-            // let ll = entity.getLonLat();
-            // this._lonView.stopPropagation();
-            // this._latView.stopPropagation();
-            // this._heightView.stopPropagation();
-            // this._lonView.value = ll.lon;
-            // this._latView.value = ll.lat;
-            // this._heightView.value = ll.height;
-            //
-            // let cart = entity.getCartesian();
-            // this._xView.stopPropagation();
-            // this._yView.stopPropagation();
-            // this._zView.stopPropagation();
-            // this._xView.value = cart.x;
-            // this._yView.value = cart.y;
-            // this._zView.value = cart.z;
         };
         this._onPitch = (a, entity) => {
             this._pitchView.stopPropagation();
-            this._pitchView.value = entity.getPitch();
+            this._pitchView.value = entity.getPitch() * DEGREES;
             this._absolutePitchView.stopPropagation();
-            this._absolutePitchView.value = entity.getAbsolutePitch();
+            this._absolutePitchView.value = entity.getAbsolutePitch() * DEGREES;
         };
         this._onYaw = (a, entity) => {
             this._yawView.stopPropagation();
-            this._yawView.value = entity.getYaw();
+            this._yawView.value = entity.getYaw() * DEGREES;
             this._absoluteYawView.stopPropagation();
-            this._absoluteYawView.value = entity.getAbsoluteYaw();
+            this._absoluteYawView.value = entity.getAbsoluteYaw() * DEGREES;
         };
         this._onRoll = (a, entity) => {
             this._rollView.stopPropagation();
-            this._rollView.value = entity.getRoll();
+            this._rollView.value = entity.getRoll() * DEGREES;
             this._absoluteRollView.stopPropagation();
-            this._absoluteRollView.value = entity.getAbsoluteRoll();
+            this._absoluteRollView.value = entity.getAbsoluteRoll() * DEGREES;
         };
         this._onChangeLon = (val) => {
             let entity = this.model.getSelectedEntity();
@@ -150,42 +136,42 @@ export class GeoObjectPropertiesDialog extends Dialog {
         this._onChangePitch = (val) => {
             let entity = this.model.getSelectedEntity();
             if (entity) {
-                entity.setPitch(parseFloat(val));
+                entity.setPitch(parseFloat(val) * RADIANS);
                 this._refresh(entity);
             }
         };
         this._onChangeYaw = (val) => {
             let entity = this.model.getSelectedEntity();
             if (entity) {
-                entity.setYaw(parseFloat(val));
+                entity.setYaw(parseFloat(val) * RADIANS);
                 this._refresh(entity);
             }
         };
         this._onChangeRoll = (val) => {
             let entity = this.model.getSelectedEntity();
             if (entity) {
-                entity.setRoll(parseFloat(val));
+                entity.setRoll(parseFloat(val) * RADIANS);
                 this._refresh(entity);
             }
         };
         this._onChangeAbsolutePitch = (val) => {
             let entity = this.model.getSelectedEntity();
             if (entity) {
-                entity.setAbsolutePitch(parseFloat(val));
+                entity.setAbsolutePitch(parseFloat(val) * RADIANS);
                 this._refresh(entity);
             }
         };
         this._onChangeAbsoluteYaw = (val) => {
             let entity = this.model.getSelectedEntity();
             if (entity) {
-                entity.setAbsoluteYaw(parseFloat(val));
+                entity.setAbsoluteYaw(parseFloat(val) * RADIANS);
                 this._refresh(entity);
             }
         };
         this._onChangeAbsoluteRoll = (val) => {
             let entity = this.model.getSelectedEntity();
             if (entity) {
-                entity.setAbsoluteRoll(parseFloat(val));
+                entity.setAbsoluteRoll(parseFloat(val) * RADIANS);
                 this._refresh(entity);
             }
         };
@@ -470,15 +456,15 @@ export class GeoObjectPropertiesDialog extends Dialog {
         this._pitchView.stopPropagation();
         this._yawView.stopPropagation();
         this._rollView.stopPropagation();
-        this._pitchView.value = entity.getPitch();
-        this._yawView.value = entity.getYaw();
-        this._rollView.value = entity.getRoll();
+        this._pitchView.value = entity.getPitch() * DEGREES;
+        this._yawView.value = entity.getYaw() * DEGREES;
+        this._rollView.value = entity.getRoll() * DEGREES;
         this._absolutePitchView.stopPropagation();
         this._absoluteYawView.stopPropagation();
         this._absoluteRollView.stopPropagation();
-        this._absolutePitchView.value = entity.getAbsolutePitch();
-        this._absoluteYawView.value = entity.getAbsoluteYaw();
-        this._absoluteRollView.value = entity.getAbsoluteRoll();
+        this._absolutePitchView.value = entity.getAbsolutePitch() * DEGREES;
+        this._absoluteYawView.value = entity.getAbsoluteYaw() * DEGREES;
+        this._absoluteRollView.value = entity.getAbsoluteRoll() * DEGREES;
         this._scaleView.stopPropagation();
         let scl = entity.getScale();
         if ((scl.x === scl.y) && (scl.y === scl.z)) {

package/lib/js/control/geoObjectEditor/GeoObjectEditorScene.d.ts

@@ -1,10 +1,10 @@
-import { EventsHandler } from '../../Events';
+import { type EventsHandler } from '../../Events';
 import { Planet } from "../../scene/Planet";
 import { RenderNode } from '../../scene/RenderNode';
 import { Vec2 } from '../../math/Vec2';
 import { Vec3 } from '../../math/Vec3';
 import { Quat } from '../../math/Quat';
-import { IMouseState } from "../../renderer/RendererEvents";
+import type { IMouseState } from "../../renderer/RendererEvents";
 import { Ellipsoid } from "../../ellipsoid/Ellipsoid";
 import { Entity } from "../../entity/Entity";
 import { MoveAxisEntity } from "./MoveAxisEntity";

package/lib/js/control/geoObjectEditor/GeoObjectEditorScene.js

@@ -1,5 +1,5 @@
 import { createEvents } from '../../Events';
-import { DEGREES, MAX32, RADIANS } from "../../math";
+import { MAX32 } from "../../math";
 import { Plane } from "../../math/Plane";
 import { RenderNode } from '../../scene/RenderNode';
 import { Vec2 } from '../../math/Vec2';
@@ -17,9 +17,9 @@ import { EntityCollection } from "../../entity/EntityCollection";
 function dragSimpleRes(unit, eye, clickDir, direction, p0, res) {
     let p1 = p0.add(Vec3.UP), p2 = p0.add(unit);
     let px = new Vec3();
-    if (new Ray(eye, clickDir).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+    if (new Ray(eye, clickDir).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
         let clickCart = Vec3.proj_b_to_a(px, unit);
-        if (new Ray(eye, direction).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+        if (new Ray(eye, direction).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
             let dragCart = Vec3.proj_b_to_a(px, unit);
             let dragVec = dragCart.sub(clickCart);
             res.copy(p0.add(dragVec));
@@ -148,9 +148,9 @@ class GeoObjectEditorScene extends RenderNode {
             let p2 = p0.add(cam.getRight());
             let px = new Vec3();
             let clickDir = cam.unproject(this._clickPos.x, this._clickPos.y);
-            if (new Ray(cam.eye, clickDir).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+            if (new Ray(cam.eye, clickDir).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
                 let clickCart = Vec3.proj_b_to_a(px, groundNormal);
-                if (new Ray(cam.eye, e.direction).hitPlane(p0, p1, p2, px) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(Plane.fromPoints(p0, p1, p2), px) === Ray.INSIDE) {
                     let dragCart = Vec3.proj_b_to_a(px, groundNormal);
                     let dragVec = dragCart.sub(clickCart);
                     let pos = this._selectedEntityCart.add(dragVec);
@@ -210,8 +210,8 @@ class GeoObjectEditorScene extends RenderNode {
             else {
                 let p1 = p0.add(Vec3.UNIT_X), p2 = p0.add(Vec3.UNIT_Z);
                 let clickCart = new Vec3(), dragCart = new Vec3();
-                if (new Ray(cam.eye, clickDir).hitPlane(p0, p1, p2, clickCart) === Ray.INSIDE) {
-                    if (new Ray(cam.eye, e.direction).hitPlane(p0, p1, p2, dragCart) === Ray.INSIDE) {
+                if (new Ray(cam.eye, clickDir).hitPlaneRes(Plane.fromPoints(p0, p1, p2), clickCart) === Ray.INSIDE) {
+                    if (new Ray(cam.eye, e.direction).hitPlaneRes(Plane.fromPoints(p0, p1, p2), dragCart) === Ray.INSIDE) {
                         let dragVec = dragCart.sub(clickCart);
                         px = p0.add(dragVec);
                     }
@@ -233,7 +233,7 @@ class GeoObjectEditorScene extends RenderNode {
             let cam = this.renderer.activeCamera;
             let p0 = this._selectedEntityCart;
             let qp = Quat.xRotation(0);
-            let qy = Quat.yRotation(this._selectedEntity.getYaw() * RADIANS);
+            let qy = Quat.yRotation(this._selectedEntity.getYaw());
             let qr = Quat.zRotation(0);
             let qRot = qr.mul(qp).mul(qy).mul(this.getFrameRotation(p0)).conjugate();
             //let norm = qNorthFrame.mulVec3(new Vec3(1, 0, 0)).normalize();
@@ -241,11 +241,11 @@ class GeoObjectEditorScene extends RenderNode {
             let clickDir = cam.unproject(this._clickPos.x, this._clickPos.y);
             let pl = new Plane(p0, norm);
             let clickCart = new Vec3(), dragCart = new Vec3();
-            if (new Ray(cam.eye, clickDir).hitPlane2(pl, clickCart) === Ray.INSIDE) {
-                if (new Ray(cam.eye, e.direction).hitPlane2(pl, dragCart) === Ray.INSIDE) {
+            if (new Ray(cam.eye, clickDir).hitPlaneRes(pl, clickCart) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(pl, dragCart) === Ray.INSIDE) {
                     let c0 = clickCart.sub(p0).normalize(), c1 = dragCart.sub(p0).normalize();
                     let sig = Math.sign(c0.cross(c1).dot(norm));
-                    let angle = Math.acos(c0.dot(c1)) * DEGREES;
+                    let angle = Math.acos(c0.dot(c1));
                     let deg = this._selectedEntityPitch + sig * angle;
                     this._selectedEntity.setAbsolutePitch(deg);
                     this.events.dispatch(this.events.pitch, deg, this._selectedEntity);
@@ -263,11 +263,11 @@ class GeoObjectEditorScene extends RenderNode {
             let clickDir = cam.unproject(this._clickPos.x, this._clickPos.y);
             let pl = new Plane(p0, norm);
             let clickCart = new Vec3(), dragCart = new Vec3();
-            if (new Ray(cam.eye, clickDir).hitPlane2(pl, clickCart) === Ray.INSIDE) {
-                if (new Ray(cam.eye, e.direction).hitPlane2(pl, dragCart) === Ray.INSIDE) {
+            if (new Ray(cam.eye, clickDir).hitPlaneRes(pl, clickCart) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(pl, dragCart) === Ray.INSIDE) {
                     let c0 = clickCart.sub(p0).normalize(), c1 = dragCart.sub(p0).normalize();
                     let sig = Math.sign(c1.cross(c0).dot(norm));
-                    let angle = Math.acos(c0.dot(c1)) * DEGREES;
+                    let angle = Math.acos(c0.dot(c1));
                     let deg = this._selectedEntityYaw + sig * angle;
                     this._selectedEntity.setAbsoluteYaw(deg);
                     this.events.dispatch(this.events.yaw, deg, this._selectedEntity);
@@ -282,7 +282,7 @@ class GeoObjectEditorScene extends RenderNode {
             let p0 = this._selectedEntityCart;
             let qNorthFrame = this.getFrameRotation(p0).conjugate();
             let qp = Quat.xRotation(0);
-            let qy = Quat.yRotation(this._selectedEntity.getYaw() * RADIANS);
+            let qy = Quat.yRotation(this._selectedEntity.getYaw());
             let qr = Quat.zRotation(0);
             let qRot = qr.mul(qp).mul(qy).mul(this.getFrameRotation(p0)).conjugate();
             //let norm = qNorthFrame.mulVec3(new Vec3(0, 0, 1)).normalize();
@@ -290,11 +290,11 @@ class GeoObjectEditorScene extends RenderNode {
             let clickDir = cam.unproject(this._clickPos.x, this._clickPos.y);
             let pl = new Plane(p0, norm);
             let clickCart = new Vec3(), dragCart = new Vec3();
-            if (new Ray(cam.eye, clickDir).hitPlane2(pl, clickCart) === Ray.INSIDE) {
-                if (new Ray(cam.eye, e.direction).hitPlane2(pl, dragCart) === Ray.INSIDE) {
+            if (new Ray(cam.eye, clickDir).hitPlaneRes(pl, clickCart) === Ray.INSIDE) {
+                if (new Ray(cam.eye, e.direction).hitPlaneRes(pl, dragCart) === Ray.INSIDE) {
                     let c0 = clickCart.sub(p0).normalize(), c1 = dragCart.sub(p0).normalize();
                     let sig = Math.sign(c0.cross(c1).dot(norm));
-                    let angle = Math.acos(c0.dot(c1)) * DEGREES;
+                    let angle = Math.acos(c0.dot(c1));
                     let deg = this._selectedEntityRoll + sig * angle;
                     this._selectedEntity.setAbsoluteRoll(deg);
                     this.events.dispatch(this.events.roll, deg, this._selectedEntity);

package/lib/js/control/geoObjectEditor/MoveAxisEntity.d.ts

@@ -1,4 +1,4 @@
-import { Entity, IEntityParams } from "../../entity/Entity";
+import { Entity, type IEntityParams } from "../../entity/Entity";
 import { Vec3 } from "../../math/Vec3";
 import { ArrowEntity } from "./ArrowEntity";
 export interface IAxisEntityParams extends IEntityParams {

package/lib/js/control/geoObjectEditor/MoveAxisEntity.js

@@ -2,6 +2,7 @@ import { Entity } from "../../entity/Entity";
 import { Vec3 } from "../../math/Vec3";
 import { SEL_X_COLOR, SEL_Y_COLOR, SEL_Z_COLOR, X_COLOR, Y_COLOR, Z_COLOR } from "./colors";
 import { ArrowEntity } from "./ArrowEntity";
+import { RADIANS } from "../../math";
 export class MoveAxisEntity extends Entity {
     constructor(params = {}) {
         super(params);
@@ -14,7 +15,7 @@ export class MoveAxisEntity extends Entity {
             color: X_COLOR,
             yaw: 0,
             pitch: 0,
-            roll: 90,
+            roll: 90 * RADIANS,
             properties: {
                 opName: "move_x",
                 noEdit: true,
@@ -41,7 +42,7 @@ export class MoveAxisEntity extends Entity {
         let arrowZ = new ArrowEntity({
             color: Z_COLOR,
             yaw: 0,
-            pitch: 90,
+            pitch: 90 * RADIANS,
             roll: 0,
             properties: {
                 opName: "move_z",

package/lib/js/control/geoObjectEditor/MovePlaneEntity.d.ts

@@ -1,4 +1,4 @@
-import { Entity, IEntityParams } from "../../entity/Entity";
+import { Entity, type IEntityParams } from "../../entity/Entity";
 export interface IMovePlaneEntityParams extends IEntityParams {
 }
 export declare class MovePlaneEntity extends Entity {

package/lib/js/control/geoObjectEditor/MovePlaneEntity.js

@@ -15,10 +15,7 @@ export class MovePlaneEntity extends Entity {
             geoObject: {
                 color: XZ_COLOR,
                 tag: "plane",
-                object3d: planeObj,
-                yaw: 0,
-                pitch: 0,
-                roll: 0
+                object3d: planeObj
             },
             properties: {
                 opName: "move_xz",

package/lib/js/control/geoObjectEditor/RotateEntity.d.ts

@@ -1,4 +1,4 @@
-import { Entity, IEntityParams } from "../../entity/Entity";
+import { Entity, type IEntityParams } from "../../entity/Entity";
 import { Vec3 } from "../../math/Vec3";
 export interface IRotationEntityParams extends IEntityParams {
 }

package/lib/js/control/geoObjectEditor/RotateEntity.js

@@ -78,7 +78,7 @@ export class RotateEntity extends Entity {
             let qNorthFrame = rn.getFrameRotation(cart).conjugate();
             let r = cam.eye.distance(cart) * 0.15;
             let qp = Quat.xRotation(0);
-            let qy = Quat.yRotation(yaw * RADIANS);
+            let qy = Quat.yRotation(yaw);
             let qr = Quat.zRotation(0);
             let qRot = qr.mul(qp).mul(qy).mul(rn.getFrameRotation(cart)).conjugate();
             for (let i = 0, j = 0, step = 360 / SEG_SIZE; i < SEG_SIZE; i += step, j++) {

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

@@ -1,4 +1,4 @@
-import { Ruler, IRulerParams } from "../ruler/Ruler";
+import { Ruler, type IRulerParams } from "../ruler/Ruler";
 interface IHeightRulerParams extends IRulerParams {
 }
 export declare class HeightRuler extends Ruler {

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

@@ -1,6 +1,6 @@
 import { Entity } from '../../entity/Entity';
 import { LonLat } from "../../LonLat";
-import { RulerScene, IRulerSceneParams } from "../ruler/RulerScene";
+import { RulerScene, type IRulerSceneParams } from "../ruler/RulerScene";
 import { Vector } from "../../layer/Vector";
 import { Vec3 } from "../../math/Vec3";
 interface IHeightRulerSceneParams extends IRulerSceneParams {

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

@@ -3,14 +3,13 @@ export * from "./Control";
 export * from "./DebugInfo";
 export * from "./DrawingSwitcher";
 export * from "./EarthCoordinates";
-export * from "./EarthNavigation";
 export * from "./GeoImageDragControl";
 export * from "./KeyboardNavigation";
 export * from "./LayerAnimation";
 export * from "./LayerSwitcher";
 export * from "./Lighting";
+export * from "./OldMouseNavigation";
 export * from "./MouseNavigation";
-export * from "./MouseWheelZoomControl";
 export * from "./RulerSwitcher";
 export * from "./ScaleControl";
 export * from "./ShowFps";

package/lib/js/control/index.js

@@ -3,14 +3,13 @@ export * from "./Control";
 export * from "./DebugInfo";
 export * from "./DrawingSwitcher";
 export * from "./EarthCoordinates";
-export * from "./EarthNavigation";
 export * from "./GeoImageDragControl";
 export * from "./KeyboardNavigation";
 export * from "./LayerAnimation";
 export * from "./LayerSwitcher";
 export * from "./Lighting";
+export * from "./OldMouseNavigation";
 export * from "./MouseNavigation";
-export * from "./MouseWheelZoomControl";
 export * from "./RulerSwitcher";
 export * from "./ScaleControl";
 export * from "./ShowFps";

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

@@ -1,4 +1,5 @@
-import { Control, IControlParams } from "../Control";
+import { Control } from "../Control";
+import type { IControlParams } from "../Control";
 import { RulerScene } from "./RulerScene";
 export interface IRulerParams extends IControlParams {
     ignoreTerrain?: boolean;

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

@@ -1,12 +1,12 @@
 import { Entity } from '../../entity/Entity';
-import { EventsHandler } from '../../Events';
+import type { 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 type { IMouseState } from "../../renderer/RendererEvents";
 import { Ellipsoid } from "../../ellipsoid/Ellipsoid";
 export interface IRulerSceneParams {
     name?: string;

package/lib/js/control/selection/Selection.d.ts

@@ -1,4 +1,5 @@
-import { Control, IControlParams } from "../Control";
+import { Control } from "../Control";
+import type { IControlParams } from "../Control";
 import { SelectionScene } from "./SelectionScene";
 import { ToggleButton } from "../../ui/ToggleButton";
 interface ISelectionParams extends IControlParams {

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

@@ -1,6 +1,6 @@
 import { Dialog } from "../../ui/Dialog";
 import { ToggleButton } from "../../ui/ToggleButton";
-import { Control, IControlParams } from '../Control';
+import { Control, type IControlParams } from '../Control';
 import { TimelineView } from './TimelineView';
 interface ITimelineControlParams extends IControlParams {
     name?: string;

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

@@ -1,4 +1,4 @@
-import { EventsHandler } from '../../Events';
+import { type EventsHandler } from '../../Events';
 type TimelineEventsList = ["change", "current"];
 interface ITimelineParams {
     current?: Date;

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

@@ -1,9 +1,10 @@
-import { EventsHandler } from "../../Events";
+import type { EventsHandler } from "../../Events";
 import { ButtonGroup } from "../../ui/ButtonGroup";
-import { IViewParams, View, ViewEventsList } from '../../ui/View';
+import { View } from '../../ui/View';
+import type { IViewParams, ViewEventsList } from '../../ui/View';
 import { ToggleButton } from "../../ui/ToggleButton";
 import { TimelineModel } from './TimelineModel';
-import { MouseEventExt } from "../../input/MouseHandler";
+import type { MouseEventExt } from "../../input/MouseHandler";
 interface ITimelineViewParams extends IViewParams {
     currentDate?: Date;
     rangeStart?: Date;

package/lib/js/control/visibleExtent/Segment.js

@@ -240,25 +240,25 @@ class Segment {
             _v0.set(verts[ind_v0], verts[ind_v0 + 1], verts[ind_v0 + 2]);
             _v1.set(verts[ind_v0 + 3], verts[ind_v0 + 4], verts[ind_v0 + 5]);
             _v2.set(verts[ind_v2], verts[ind_v2 + 1], verts[ind_v2 + 2]);
-            let d = _ray.hitTriangle(_v0, _v1, _v2, res);
+            let d = _ray.hitTriangleRes(_v0, _v1, _v2, res);
             if (d === Ray.INSIDE) {
                 return xyz.distance(res);
             }
             else if (d === Ray.AWAY) {
                 _rayEx.set(xyz, norm);
-                let d = _rayEx.hitTriangle(_v0, _v1, _v2, res);
+                let d = _rayEx.hitTriangleRes(_v0, _v1, _v2, res);
                 if (d === Ray.INSIDE) {
                     return -xyz.distance(res);
                 }
             }
             _v3.set(verts[ind_v2 + 3], verts[ind_v2 + 4], verts[ind_v2 + 5]);
-            d = _ray.hitTriangle(_v1, _v3, _v2, res);
+            d = _ray.hitTriangleRes(_v1, _v3, _v2, res);
             if (d === Ray.INSIDE) {
                 return xyz.distance(res);
             }
             else if (d === Ray.AWAY) {
                 _rayEx.set(xyz, norm);
-                let d = _rayEx.hitTriangle(_v1, _v3, _v2, res);
+                let d = _rayEx.hitTriangleRes(_v1, _v3, _v2, res);
                 if (d === Ray.INSIDE) {
                     return -xyz.distance(res);
                 }

package/lib/js/ellipsoid/Ellipsoid.d.ts

@@ -159,7 +159,7 @@ declare class Ellipsoid {
      * @param {LonLat} lonLat - Origin coordinates
      * @param {number} azimuth - View azimuth in degrees
      * @param {number} dist - Distance to the destination point coordinates in meters
-     * @returns {{ destination: LonLat; finalAzimuth: number }} - Destination point coordinates
+     * @returns {{destination: LonLat, finalAzimuth: number}} - Destination point coordinates
      */
     direct(lonLat: LonLat, azimuth: number, dist: number): IDirectResult;
     /**

package/lib/js/ellipsoid/Ellipsoid.js

@@ -288,7 +288,7 @@ class Ellipsoid {
      * @param {LonLat} lonLat - Origin coordinates
      * @param {number} azimuth - View azimuth in degrees
      * @param {number} dist - Distance to the destination point coordinates in meters
-     * @returns {{ destination: LonLat; finalAzimuth: number }} - Destination point coordinates
+     * @returns {{destination: LonLat, finalAzimuth: number}} - Destination point coordinates
      */
     direct(lonLat, azimuth, dist) {
         let lon1 = lonLat.lon, lat1 = lonLat.lat;

package/lib/js/entity/BaseBillboard.d.ts

@@ -1,7 +1,10 @@
 import { Entity } from "./Entity";
-import { NumberArray2, Vec2 } from "../math/Vec2";
-import { NumberArray3, Vec3 } from "../math/Vec3";
-import { NumberArray4, Vec4 } from "../math/Vec4";
+import { Vec2 } from "../math/Vec2";
+import { Vec3 } from "../math/Vec3";
+import { Vec4 } from "../math/Vec4";
+import type { NumberArray2 } from "../math/Vec2";
+import type { NumberArray3 } from "../math/Vec3";
+import type { NumberArray4 } from "../math/Vec4";
 import { BaseBillboardHandler } from "./BaseBillboardHandler";
 export interface IBaseBillboardParams {
     position?: NumberArray3 | Vec3;

package/lib/js/entity/BaseBillboardHandler.d.ts

@@ -1,9 +1,9 @@
-import { TypedArray } from "../utils/shared";
+import type { TypedArray } from "../utils/shared";
 import { EntityCollection } from "./EntityCollection";
 import { Renderer } from "../renderer/Renderer";
 import { Vec3 } from "../math/Vec3";
 import { Vec4 } from "../math/Vec4";
-import { WebGLBufferExt } from "../webgl/Handler";
+import type { WebGLBufferExt } from "../webgl/Handler";
 import { BaseBillboard } from "./BaseBillboard";
 /**
  * @class BaseBillboardHandler