@openglobus/og 0.16.3 → 0.17.1

package/src/og/camera/Camera.js

@@ -49,7 +49,7 @@ class Camera {
          * @public
          * @type {Vec3}
          */
-        this.eye = new Vec3();
+        this.eye = options.eye || new Vec3();
 
         /**
          * Camera RTE high position
@@ -70,7 +70,7 @@ class Camera {
          * @protected
          * @type {Number}
          */
-        this._aspect = options.aspect || this.renderer.handler.getClientAspect();
+        this._aspect = options.aspect || 1.0;
 
         /**
          * Camera view angle in degrees
@@ -143,7 +143,6 @@ class Camera {
 
                 fr._cameraFrustumIndex = this.frustums.length;
                 this.frustums.push(fr);
-                this.renderer.assignPickingColor(fr);
                 this.nearFarArr.push.apply(this.nearFarArr, [fi[0], fi[1]]);
                 this.frustumColors.push.apply(this.frustumColors, fr._pickingColorU);
             }
@@ -160,7 +159,6 @@ class Camera {
 
             fr._cameraFrustumIndex = this.frustums.length;
             this.frustums.push(fr);
-            this.renderer.assignPickingColor(fr);
             this.nearFarArr = new Array([near, far]);
             this.frustumColors.push.apply(this.frustumColors, fr._pickingColorU);
         }
@@ -171,7 +169,11 @@ class Camera {
 
         this.isFirstPass = false;
 
-        renderer && this._init(options);
+        this.set(
+            options.eye || new Vec3(0.0, 0.0, 1.0),
+            options.look || new Vec3(),
+            options.up || new Vec3(0.0, 1.0, 0.0)
+        );
     }
 
     checkMoveEnd() {
@@ -195,6 +197,16 @@ class Camera {
         this._peye.copy(eye);
     }
 
+    bindRenderer(renderer) {
+        this.renderer = renderer;
+        for (let i = 0; i < this.frustums.length; i++) {
+            this.renderer.assignPickingColor(this.frustums[i]);
+        }
+        this._aspect = this.renderer.handler.getClientAspect();
+
+        this._setProj(this._viewAngle, this._aspect);
+    }
+
     /**
      * Camera initialization.
      * @public
@@ -208,6 +220,7 @@ class Camera {
      * @param {Vec3} [options.up] - Camera eye position. Default (0,1,0)
      */
     _init(options) {
+
         this._setProj(this._viewAngle, this._aspect);
 
         this.set(
@@ -478,9 +491,9 @@ class Camera {
     }
 
     /**
-     * Gets projected 3d point to the 2d screen coordiantes
+     * Gets projected 3d point to the 2d screen coordinates
      * @public
-     * @param {Vec3} v - Cartesian 3d coordiantes
+     * @param {Vec3} v - Cartesian 3d coordinates
      * @returns {Vec2} - Screen point coordinates
      */
     project(v) {

package/src/og/camera/Frustum.js

@@ -25,7 +25,7 @@ class Frustum {
          * @type {Array.<Array.<number>>}
          */
         this._f = new Array(6);
-        for (var i = 0; i < 6; i++) {
+        for (let i = 0; i < 6; i++) {
             this._f[i] = new Array(4);
         }
 
@@ -224,7 +224,7 @@ class Frustum {
      */
     containsPoint(point) {
         var d;
-        for (var p = 0; p < 6; p++) {
+        for (let p = 0; p < 6; p++) {
             d = point.dotArr(this._f[p]) + this._f[p][3];
             if (d <= 0) {
                 return false;
@@ -304,11 +304,11 @@ class Frustum {
             cout,
             cin;
 
-        for (var i = 0; i < 6; i++) {
+        for (let i = 0; i < 6; i++) {
             cout = 0;
             cin = 0;
 
-            for (var k = 0; k < 8 && (cin === 0 || cout === 0); k++) {
+            for (let k = 0; k < 8 && (cin === 0 || cout === 0); k++) {
                 var d = box.vertices[k].dotArr(this._f[i]) + this._f[i][3];
                 if (d < 0) {
                     cout++;

package/src/og/camera/PlanetCamera.js

@@ -1,7 +1,3 @@
-/**
- * @module og/camera/PlanetCamera
- */
-
 "use strict";
 
 import { Key } from "../Lock.js";
@@ -24,9 +20,9 @@ import { Ellipsoid } from "../ellipsoid/index.js";
  * @param {Object} [options.name] - Camera name.
  * @param {number} [options.viewAngle] - Camera angle of view.
  * @param {number} [options.near] - Camera near plane distance. Default is 1.0
- * @param {number} [options.far] - Camera far plane distance. Deafult is og.math.MAX
- * @param {number} [options.minAltitude] - Minimal altitude for the camera. Deafult is 5
- * @param {number} [options.maxAltitude] - Maximal altitude for the camera. Deafult is 20000000
+ * @param {number} [options.far] - Camera far plane distance. Default is og.math.MAX
+ * @param {number} [options.minAltitude] - Minimal altitude for the camera. Default is 5
+ * @param {number} [options.maxAltitude] - Maximal altitude for the camera. Default is 20000000
  * @param {Vec3} [options.eye] - Camera eye position. Default (0,0,0)
  * @param {Vec3} [options.look] - Camera look position. Default (0,0,0)
  * @param {Vec3} [options.up] - Camera eye position. Default (0,1,0)
@@ -39,10 +35,7 @@ class PlanetCamera extends Camera {
     constructor(planet, options) {
         super(planet.renderer, {
                 frustums: [
-                    [1, 100 + 0.075],
-                    [100, 1000 + 0.075],
-                    [1000, 1e6 + 10000],
-                    [1e6, 1e9]
+                    [[1, 100], [100, 1000 + 7.0], [1000 - 7.0, 1e6 + 17], [1e6 - 17, 1e9]]
                 ], //[[1, 1e3 + 100], [1e3, 1e6 + 10000], [1e6, 1e9]]*/
                 ...options
             }
@@ -191,7 +184,7 @@ class PlanetCamera extends Camera {
         var el = this.planet.ellipsoid;
         var newEye = el.lonLatToCartesian(this._lonLat);
         var newLook = lookLonLat ? el.lonLatToCartesian(lookLonLat) : Vec3.ZERO;
-        this.set(newEye, newLook, up || Vec3.UP);
+        this.set(newEye, newLook, up || Vec3.NORTH);
         this.update();
     }
 
@@ -256,7 +249,7 @@ class PlanetCamera extends Camera {
         southWest.subA(center);
 
         var direction = center.normal(); // ellipsoid.getSurfaceNormal(center).negate().normalize();
-        var right = direction.cross(Vec3.UP).normalize();
+        var right = direction.cross(Vec3.NORTH).normalize();
         var up = right.cross(direction).normalize();
 
         var _h = Math.max(
@@ -290,7 +283,7 @@ class PlanetCamera extends Camera {
      */
     viewExtent(extent, height) {
         this.stopFlying();
-        this.set(this.getExtentPosition(extent, height), Vec3.ZERO, Vec3.UP);
+        this.set(this.getExtentPosition(extent, height), Vec3.ZERO, Vec3.NORTH);
         this.update();
     }
 
@@ -369,7 +362,7 @@ class PlanetCamera extends Camera {
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
      * @param [frameCallback]
      */
-    flyCartesian(cartesian, look = Vec3.ZERO, up = Vec3.UP, ampl = 1.0, completeCallback = () => {
+    flyCartesian(cartesian, look = Vec3.ZERO, up = Vec3.NORTH, ampl = 1.0, completeCallback = () => {
     }, startCallback = () => {
     }, frameCallback = () => {
     }) {
@@ -377,7 +370,7 @@ class PlanetCamera extends Camera {
         this.stopFlying();
 
         look = look || Vec3.ZERO;
-        up = up || Vec3.UP;
+        up = up || Vec3.NORTH;
 
         this._completeCallback = completeCallback;
 
@@ -423,7 +416,7 @@ class PlanetCamera extends Camera {
         var zero = Vec3.ZERO;
 
         // camera path and orientations calculation
-        for (var i = 0; i <= this._numFrames; i++) {
+        for (let i = 0; i <= this._numFrames; i++) {
             var d = 1 - i / this._numFrames;
             d = d * d * (3 - 2 * d);
             d *= d;
@@ -461,7 +454,7 @@ class PlanetCamera extends Camera {
     }
 
     /**
-     * Flies to the geo coordiantes.
+     * Flies to the geo coordinates.
      * @public
      * @param {LonLat} lonlat - Finish coordinates.
      * @param {Vec3} [look] - Camera LOOK in the end of flying. Default - (0,0,0)
@@ -471,9 +464,9 @@ class PlanetCamera extends Camera {
      * @param {cameraCallback} [startCallback] - Callback that calls befor the flying begins.
      */
     flyLonLat(lonlat, look, up, ampl, completeCallback, startCallback) {
-        var _lonlat = new LonLat(lonlat.lon, lonlat.lat, lonlat.height || this._lonLat.height);
+        var _lonLat = new LonLat(lonlat.lon, lonlat.lat, lonlat.height || this._lonLat.height);
         this.flyCartesian(
-            this.planet.ellipsoid.lonLatToCartesian(_lonlat),
+            this.planet.ellipsoid.lonLatToCartesian(_lonLat),
             look,
             up,
             ampl,
@@ -626,7 +619,7 @@ class PlanetCamera extends Camera {
         if (this._insideSegment && this._insideSegment.planet) {
             this._terrainAltitude = this._insideSegment.getTerrainPoint(
                 this.eye,
-                this._lonLatMerc,
+                this._insideSegment.getInsideLonLat(this),
                 this._terrainPoint
             );
             if (this._terrainAltitude < this.minAltitude && this._checkTerrainCollision) {
@@ -647,7 +640,7 @@ class PlanetCamera extends Camera {
                 this.slope >= 0.97 ? this.getUp() : this.getForward(),
                 u
             ).normalize(),
-            n = Vec3.proj_b_to_plane(Vec3.UP, u).normalize();
+            n = Vec3.proj_b_to_plane(Vec3.NORTH, u).normalize();
         let res = Math.sign(u.dot(f.cross(n))) * Math.acos(f.dot(n)) * math.DEGREES;
         if (res < 0.0) {
             return 360.0 + res;

package/src/og/cons.js

@@ -94,7 +94,7 @@ export class Cons {
         var d = document.createElement("div");
         d.classList.add("ogConsole-text");
         if (style) {
-            for (var s in style) {
+            for (let s in style) {
                 d.style[s] = style[s];
             }
         }

package/src/og/control/Atmosphere.js

@@ -1,7 +1,3 @@
-/**
- * @module og/control/Atmosphere
- */
-
 "use strict";
 
 import * as atmos from "../shaders/atmos.js";

package/src/og/control/Control.js

@@ -1,7 +1,3 @@
-/**
- * @module og/control/Control
- */
-
 "use strict";
 
 /**
@@ -121,10 +117,12 @@ class Control {
             this.renderer = renderer;
             renderer.controls[this.name] = this;
             this.onadd && this.onadd();
-            this._initialized = true;
-            this.oninit && this.oninit();
-            if (this.autoActivate) {
-                this.activate();
+            if (renderer.isInitialized()) {
+                this._initialized = true;
+                this.oninit && this.oninit();
+                if (this.autoActivate) {
+                    this.activate();
+                }
             }
         }
     }
@@ -134,6 +132,9 @@ class Control {
      * @public
      */
     remove() {
+
+        this.deactivate();
+
         this.onremove && this.onremove();
 
         let r = this.renderer,

package/src/og/control/DebugInfo.js

@@ -1,7 +1,3 @@
-/**
- * @module og/control/DebugInfo
- */
-
 "use strict";
 
 import { Control } from "./Control.js";
@@ -94,7 +90,7 @@ class DebugInfo extends Control {
     }
 
     addWatches(watches) {
-        for (var i = 0; i < watches.length; i++) {
+        for (let i = 0; i < watches.length; i++) {
             this.addWatch(watches[i]);
         }
     }
@@ -128,7 +124,7 @@ class DebugInfo extends Control {
 
         var temp = this._watch;
         this._watch = [];
-        for (var i = 0; i < temp.length; i++) {
+        for (let i = 0; i < temp.length; i++) {
             this.addWatch(temp[i]);
         }
         this._dialog.container.appendChild(this.el);
@@ -249,7 +245,7 @@ class DebugInfo extends Control {
     }
 
     _frame() {
-        for (var i = 0; i < this._watch.length; i++) {
+        for (let i = 0; i < this._watch.length; i++) {
             var w = this._watch[i];
             w.valEl.innerHTML = w.frame ? w.frame() : "";
         }

package/src/og/control/DrawingSwitcher.js

@@ -0,0 +1,117 @@
+"use strict";
+
+import { ToggleButton } from "../ui/ToggleButton.js";
+import { Control } from "./Control.js";
+import { DrawingControl } from "./drawing/DrawingControl.js";
+import { ButtonGroup } from "../ui/ButtonGroup.js";
+
+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"
+\t viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<g>
+\t<path d="M926.03,321.16c-16.02,0-31.11,3.94-44.48,10.79l-263.43-191.4c2.69-8.94,4.18-18.4,4.18-28.2
+\t\tc0-54.02-43.95-97.97-97.97-97.97c-54.03,0-97.98,43.95-97.98,97.97c0,9.81,1.49,19.27,4.18,28.21L155.75,340.18
+\t\tc-16.22-11.91-36.16-19.03-57.78-19.03C43.95,321.16,0,365.11,0,419.13c0,52.58,41.67,95.5,93.71,97.75l102.63,315.86
+\t\tc-24.28,17.85-40.13,46.52-40.13,78.9c0,54.02,43.95,97.98,97.98,97.98c37.54,0,70.18-21.25,86.62-52.34h367.26
+\t\tc16.44,31.08,49.08,52.34,86.63,52.34c54.03,0,97.98-43.95,97.98-97.98c0-32.46-15.94-61.21-40.33-79.05l104.11-320.4
+\t\tc39.15-12.84,67.54-49.68,67.54-93.07C1024,365.11,980.05,321.16,926.03,321.16z M828.05,911.65c0,8.5-3.3,16.19-8.55,22.09
+\t\tc-6.11,6.85-14.9,11.26-24.79,11.26c-13.65,0-25.37-8.26-30.52-20.02c-1.79-4.09-2.82-8.58-2.82-13.33
+\t\tc0-18.39,14.95-33.35,33.34-33.35c2.93,0,5.72,0.5,8.43,1.21c13.27,3.49,23.21,14.91,24.59,28.9
+\t\tC827.83,909.5,828.05,910.54,828.05,911.65z M790.48,813.89c-45.63,1.96-83.27,35.16-91.87,78.77H350.28
+\t\tc-8.62-43.69-46.38-76.93-92.11-78.79L155.59,498.19c24.41-17.84,40.36-46.59,40.36-79.06c0-8.9-1.3-17.49-3.53-25.7L468.57,192.8
+\t\tc15.84,11.01,35.05,17.52,55.76,17.52c20.71,0,39.92-6.5,55.76-17.52l256.56,186.4c-5.48,12.21-8.59,25.7-8.59,39.93
+\t\tc0,41.02,25.36,76.17,61.21,90.75L790.48,813.89z M254.19,945c-10.11,0-19.07-4.62-25.19-11.75c-5.01-5.84-8.15-13.32-8.15-21.6
+\t\tc0-0.91,0.2-1.76,0.27-2.66c1.14-14.18,11.08-25.8,24.43-29.41c2.78-0.75,5.64-1.28,8.65-1.28c18.38,0,33.33,14.96,33.33,33.35
+\t\tc0,4.74-1.03,9.24-2.82,13.33C279.55,936.74,267.83,945,254.19,945z M64.88,421.49c-0.06-0.79-0.24-1.55-0.24-2.35
+\t\tc0-16.41,11.93-30.01,27.55-32.76c1.89-0.33,3.8-0.58,5.78-0.58c11.94,0,22.35,6.36,28.24,15.81c3.18,5.11,5.11,11.09,5.11,17.53
+\t\tc0,15.47-10.63,28.39-24.94,32.14c-2.7,0.71-5.48,1.2-8.4,1.2C80.4,452.47,66.11,438.76,64.88,421.49z M549.41,90.62
+\t\tc5.07,5.85,8.25,13.39,8.25,21.72c0,7.32-2.44,14.03-6.45,19.54c-6.07,8.33-15.82,13.81-26.88,13.81
+\t\tc-11.07,0-20.83-5.48-26.89-13.81c-4.01-5.51-6.45-12.22-6.45-19.54c0-8.33,3.17-15.86,8.24-21.71
+\t\tc6.12-7.07,15.04-11.64,25.1-11.64C534.38,79,543.29,83.57,549.41,90.62z M959.36,419.13c0,11.94-6.36,22.35-15.82,28.24
+\t\tc-5.1,3.18-11.07,5.1-17.52,5.1c-6.08,0-11.71-1.76-16.62-4.61c-9.71-5.64-16.33-15.94-16.64-27.89c-0.01-0.29-0.09-0.56-0.09-0.85
+\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
+ * @class
+ * @extends {Control}
+ * @param {Object} [options] - Control options.
+ */
+class DrawingSwitcher extends Control {
+    constructor(options = {}) {
+        super({
+            name: "DrawingSwitcher",
+            ...options
+        });
+
+        this.drawingControl = new DrawingControl();
+    }
+
+    oninit() {
+        this.planet.addControl(this.drawingControl);
+        this._createMenu();
+    }
+
+    onactivate() {
+        this.drawingControl.activate();
+    }
+
+    ondeactivate() {
+        this.drawingControl.deactivate();
+    }
+
+    _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.on("change", (btn) => {
+            this.drawingControl.deactivate();
+            switch (btn.name) {
+                case "polygon":
+                    this.drawingControl.activatePolygonDrawing();
+                    break;
+                case "linestring":
+                    this.drawingControl.activateLineStringDrawing();
+                    break;
+            }
+        });
+
+        defaultBtn.appendTo(this.renderer.div)
+        polyBtn.appendTo(this.renderer.div);
+        lineBtn.appendTo(this.renderer.div);
+    }
+}
+
+export { DrawingSwitcher };
+