@openglobus/og 0.16.2 → 0.17.0

package/src/og/entity/Billboard.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/Billboard
- */
-
 "use strict";
 
 import { BaseBillboard } from "./BaseBillboard.js";

package/src/og/entity/BillboardHandler.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/BillboardHandler
- */
-
 "use strict";
 
 import * as shaders from "../shaders/billboard.js";

package/src/og/entity/Entity.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/Entity
- */
-
 "use strict";
 
 import { Extent } from "../Extent.js";
@@ -90,14 +86,14 @@ class Entity {
          * @protected
          * @type {LonLat}
          */
-        this._lonlat = utils.createLonLat(options.lonlat);
+        this._lonLat = utils.createLonLat(options.lonlat);
 
         /**
          * World Mercator entity coordinates.
          * @protected
          * @type {LonLat}
          */
-        this._lonlatMerc = null;
+        this._lonLatMerc = null;
 
         /**
          * Entity visible terrain altitude.
@@ -227,6 +223,10 @@ class Entity {
         this._counter = n;
     }
 
+    get layerIndex() {
+        return this._layerIndex;
+    }
+
     get instanceName() {
         return "Entity";
     }
@@ -343,12 +343,12 @@ class Entity {
         let ec = this._entityCollection;
 
         if (ec && ec.renderNode && ec.renderNode.ellipsoid) {
-            this._lonlat = ec.renderNode.ellipsoid.cartesianToLonLat(p);
+            this._lonLat = ec.renderNode.ellipsoid.cartesianToLonLat(p);
 
-            if (Math.abs(this._lonlat.lat) < mercator.MAX_LAT) {
-                this._lonlatMerc = this._lonlat.forwardMercator();
+            if (Math.abs(this._lonLat.lat) < mercator.MAX_LAT) {
+                this._lonLatMerc = this._lonLat.forwardMercator();
             } else {
-                this._lonlatMerc = null;
+                this._lonLatMerc = null;
             }
         }
 
@@ -384,12 +384,12 @@ class Entity {
         let ec = this._entityCollection;
 
         if (!skipLonLat && ec && ec.renderNode && ec.renderNode.ellipsoid) {
-            this._lonlat = ec.renderNode.ellipsoid.cartesianToLonLat(p);
+            this._lonLat = ec.renderNode.ellipsoid.cartesianToLonLat(p);
 
-            if (Math.abs(this._lonlat.lat) < mercator.MAX_LAT) {
-                this._lonlatMerc = this._lonlat.forwardMercator();
+            if (Math.abs(this._lonLat.lat) < mercator.MAX_LAT) {
+                this._lonLatMerc = this._lonLat.forwardMercator();
             } else {
-                this._lonlatMerc = null;
+                this._lonLatMerc = null;
             }
         }
     }
@@ -400,7 +400,7 @@ class Entity {
      * @returns {LonLat} -
      */
     getLonLat() {
-        return this._lonlat.clone();
+        return this._lonLat.clone();
     }
 
     /**
@@ -409,7 +409,7 @@ class Entity {
      * @param {LonLat} lonlat - WGS84 coordinates.
      */
     setLonLat(lonlat) {
-        let l = this._lonlat;
+        let l = this._lonLat;
 
         l.lon = lonlat.lon;
         l.lat = lonlat.lat;
@@ -418,9 +418,9 @@ class Entity {
         let ec = this._entityCollection;
         if (ec && ec.renderNode && ec.renderNode.ellipsoid) {
             if (Math.abs(l.lat) < mercator.MAX_LAT) {
-                this._lonlatMerc = l.forwardMercator();
+                this._lonLatMerc = l.forwardMercator();
             } else {
-                this._lonlatMerc = null;
+                this._lonLatMerc = null;
             }
 
             ec.renderNode.ellipsoid.lonLatToCartesianRes(l, this._cartesian);
@@ -436,7 +436,7 @@ class Entity {
      * @param {number} [height] - Height
      */
     setLonLat2(lon, lat, height) {
-        let l = this._lonlat;
+        let l = this._lonLat;
 
         l.lon = lon;
         l.lat = lat;
@@ -445,9 +445,9 @@ class Entity {
         let ec = this._entityCollection;
         if (ec && ec.renderNode && ec.renderNode.ellipsoid) {
             if (Math.abs(l.lat) < mercator.MAX_LAT) {
-                this._lonlatMerc = l.forwardMercator();
+                this._lonLatMerc = l.forwardMercator();
             } else {
-                this._lonlatMerc = null;
+                this._lonLatMerc = null;
             }
 
             ec.renderNode.ellipsoid.lonLatToCartesianRes(l, this._cartesian);
@@ -683,7 +683,7 @@ class Entity {
      */
     getExtent() {
         let res;
-        let c = this._lonlat;
+        let c = this._lonLat;
         if (this.billboard || this.label) {
             res = new Extent(new LonLat(c.lon, c.lat), new LonLat(c.lon, c.lat));
         } else {

package/src/og/entity/EntityCollection.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/EntityCollection
- */
-
 "use strict";
 
 import { Events } from "../Events.js";
@@ -213,10 +209,6 @@ class EntityCollection {
         this._counter = n;
     }
 
-    // setPolygonOffset(factor, units) {
-    //     this.polygonOffsetUnits = units;
-    // }
-
     /**
      * Sets collection visibility.
      * @public
@@ -334,7 +326,7 @@ class EntityCollection {
             if (rn) {
                 rn.renderer && rn.renderer.assignPickingColor(entity);
                 if (rn.ellipsoid && entity._cartesian.isZero()) {
-                    entity.setCartesian3v(rn.ellipsoid.lonLatToCartesian(entity._lonlat));
+                    entity.setCartesian3v(rn.ellipsoid.lonLatToCartesian(entity._lonLat));
                 }
             }
             this._addRecursively(entity);
@@ -472,10 +464,12 @@ class EntityCollection {
     addTo(renderNode, isHidden) {
         if (!this.renderNode) {
             this.renderNode = renderNode;
+
             if (!isHidden) {
                 this._renderNodeIndex = renderNode.entityCollections.length;
                 renderNode.entityCollections.push(this);
             }
+
             renderNode.ellipsoid && this._updateGeodeticCoordinates(renderNode.ellipsoid);
 
             this.bindRenderNode(renderNode);
@@ -490,10 +484,12 @@ class EntityCollection {
      * @param {RenderNode} renderNode
      */
     bindRenderNode(renderNode) {
-        if (renderNode.renderer) {
+        if (renderNode.renderer && renderNode.renderer.isInitialized()) {
+
             this.billboardHandler.setRenderer(renderNode.renderer);
             this.labelHandler.setRenderer(renderNode.renderer);
             this.rayHandler.setRenderer(renderNode.renderer);
+
             this.geoObjectHandler.setRenderNode(renderNode);
             this.polylineHandler.setRenderNode(renderNode);
             this.pointCloudHandler.setRenderNode(renderNode);
@@ -515,7 +511,7 @@ class EntityCollection {
         var i = e.length;
         while (i--) {
             var ei = e[i];
-            ei._lonlat && ei.setCartesian3v(ellipsoid.lonLatToCartesian(ei._lonlat));
+            ei._lonLat && ei.setCartesian3v(ellipsoid.lonLatToCartesian(ei._lonLat));
         }
     }
 

package/src/og/entity/GeoObject.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/GeoObject
- */
-
 "use strict";
 
 import { Quat, Vec3 } from "../math/index.js";

package/src/og/entity/GeoObjectHandler.js

@@ -1,9 +1,5 @@
 "use strict";
 
-/**
- * @module og/entity/GeoObjectHandler
- */
-
 import * as shaders from "../shaders/geoObject.js";
 import { concatArrays, loadImage, makeArrayTyped, spliceArray } from "../utils/shared.js";
 

package/src/og/entity/Geometry.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/Geometry
- */
-
 "use strict";
 
 import { Extent } from "../Extent.js";
@@ -192,6 +188,11 @@ class Geometry {
         return res;
     }
 
+    /**
+     * @todo ASAP need test for this method
+     * @param geoJson
+     * @returns {Geometry}
+     */
     setGeometry(geoJson) {
         var h = this._handler;
         this.remove();

package/src/og/entity/GeometryHandler.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/GeometryHandler
- */
-
 "use strict";
 
 import { doubleToTwoFloatsV2 } from "../math/coder.js";
@@ -527,6 +523,9 @@ class GeometryHandler {
     assignHandler(handler) {
         this._handler = handler;
         this.refresh();
+        if (handler.isInitialized()) {
+            this.update();
+        }
     }
 
     /**

package/src/og/entity/Label.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/Label
- */
-
 "use strict";
 
 import { Vec4 } from "../math/Vec4.js";

package/src/og/entity/LabelHandler.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/LabelHandler
- */
-
 "use strict";
 
 import * as shaders from "../shaders/label.js";

package/src/og/entity/PointCloud.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/PointCloud
- */
-
 "use strict";
 
 import { Vec3 } from "../math/Vec3.js";

package/src/og/entity/PointCloudHandler.js

@@ -1,126 +1,122 @@
-/**
- * @module og/entity/PointCloudHandler
- */
-
-"use strict";
-
-import * as shaders from "../shaders/pointCloud.js";
-
-class PointCloudHandler {
-    constructor(entityCollection) {
-        /**
-         * Picking rendering option.
-         * @public
-         * @type {boolean}
-         */
-        this.pickingEnabled = true;
-
-        /**
-         * Parent collection
-         * @private
-         * @type {EntityCollection}
-         */
-        this._entityCollection = entityCollection;
-
-        /**
-         * Renderer
-         * @private
-         * @type {Renderer}
-         */
-        this._renderer = null;
-
-        /**
-         * Point cloud array
-         * @private
-         * @type {Array.<PointCloud>}
-         */
-        this._pointClouds = [];
-
-        this.__staticId = PointCloudHandler._staticCounter++;
-    }
-
-    static get _staticCounter() {
-        if (!this._counter && this._counter !== 0) {
-            this._counter = 0;
-        }
-        return this._counter;
-    }
-
-    static set _staticCounter(n) {
-        this._counter = n;
-    }
-
-    _initProgram() {
-        if (this._renderer.handler) {
-            if (!this._renderer.handler.programs.pointCloud) {
-                this._renderer.handler.addProgram(shaders.pointCloud());
-            }
-        }
-    }
-
-    setRenderNode(renderNode) {
-        this._renderer = renderNode.renderer;
-        this._initProgram();
-        for (var i = 0; i < this._pointClouds.length; i++) {
-            this._pointClouds[i].setRenderNode(renderNode);
-        }
-    }
-
-    add(pointCloud) {
-        if (pointCloud._handlerIndex === -1) {
-            pointCloud._handler = this;
-            pointCloud._handlerIndex = this._pointClouds.length;
-            this._pointClouds.push(pointCloud);
-            this._entityCollection &&
-                this._entityCollection.renderNode &&
-                pointCloud.setRenderNode(this._entityCollection.renderNode);
-        }
-    }
-
-    remove(pointCloud) {
-        var index = pointCloud._handlerIndex;
-        if (index !== -1) {
-            pointCloud._deleteBuffers();
-            pointCloud._handlerIndex = -1;
-            pointCloud._handler = null;
-            this._pointClouds.splice(index, 1);
-            this.reindexPointCloudArray(index);
-        }
-    }
-
-    reindexPointCloudArray(startIndex) {
-        var pc = this._pointClouds;
-        for (var i = startIndex; i < pc.length; i++) {
-            pc[i]._handlerIndex = i;
-        }
-    }
-
-    draw() {
-        var i = this._pointClouds.length;
-        while (i--) {
-            this._pointClouds[i].draw();
-        }
-    }
-
-    drawPicking() {
-        if (this.pickingEnabled) {
-            var i = this._pointClouds.length;
-            while (i--) {
-                this._pointClouds[i].drawPicking();
-            }
-        }
-    }
-
-    clear() {
-        var i = this._pointClouds.length;
-        while (i--) {
-            this._pointClouds[i]._deleteBuffers();
-            this._pointClouds[i]._handler = null;
-            this._pointClouds[i]._handlerIndex = -1;
-        }
-        this._pointClouds.length = 0;
-        this._pointClouds = [];
-    }
-}
-
-export { PointCloudHandler };
+"use strict";
+
+import * as shaders from "../shaders/pointCloud.js";
+
+class PointCloudHandler {
+    constructor(entityCollection) {
+        /**
+         * Picking rendering option.
+         * @public
+         * @type {boolean}
+         */
+        this.pickingEnabled = true;
+
+        /**
+         * Parent collection
+         * @private
+         * @type {EntityCollection}
+         */
+        this._entityCollection = entityCollection;
+
+        /**
+         * Renderer
+         * @private
+         * @type {Renderer}
+         */
+        this._renderer = null;
+
+        /**
+         * Point cloud array
+         * @private
+         * @type {Array.<PointCloud>}
+         */
+        this._pointClouds = [];
+
+        this.__staticId = PointCloudHandler._staticCounter++;
+    }
+
+    static get _staticCounter() {
+        if (!this._counter && this._counter !== 0) {
+            this._counter = 0;
+        }
+        return this._counter;
+    }
+
+    static set _staticCounter(n) {
+        this._counter = n;
+    }
+
+    _initProgram() {
+        if (this._renderer.handler) {
+            if (!this._renderer.handler.programs.pointCloud) {
+                this._renderer.handler.addProgram(shaders.pointCloud());
+            }
+        }
+    }
+
+    setRenderNode(renderNode) {
+        this._renderer = renderNode.renderer;
+        this._initProgram();
+        for (var i = 0; i < this._pointClouds.length; i++) {
+            this._pointClouds[i].setRenderNode(renderNode);
+        }
+    }
+
+    add(pointCloud) {
+        if (pointCloud._handlerIndex === -1) {
+            pointCloud._handler = this;
+            pointCloud._handlerIndex = this._pointClouds.length;
+            this._pointClouds.push(pointCloud);
+            this._entityCollection &&
+                this._entityCollection.renderNode &&
+                pointCloud.setRenderNode(this._entityCollection.renderNode);
+        }
+    }
+
+    remove(pointCloud) {
+        var index = pointCloud._handlerIndex;
+        if (index !== -1) {
+            pointCloud._deleteBuffers();
+            pointCloud._handlerIndex = -1;
+            pointCloud._handler = null;
+            this._pointClouds.splice(index, 1);
+            this.reindexPointCloudArray(index);
+        }
+    }
+
+    reindexPointCloudArray(startIndex) {
+        var pc = this._pointClouds;
+        for (var i = startIndex; i < pc.length; i++) {
+            pc[i]._handlerIndex = i;
+        }
+    }
+
+    draw() {
+        var i = this._pointClouds.length;
+        while (i--) {
+            this._pointClouds[i].draw();
+        }
+    }
+
+    drawPicking() {
+        if (this.pickingEnabled) {
+            var i = this._pointClouds.length;
+            while (i--) {
+                this._pointClouds[i].drawPicking();
+            }
+        }
+    }
+
+    clear() {
+        var i = this._pointClouds.length;
+        while (i--) {
+            this._pointClouds[i]._deleteBuffers();
+            this._pointClouds[i]._handler = null;
+            this._pointClouds[i]._handlerIndex = -1;
+        }
+        this._pointClouds.length = 0;
+        this._pointClouds = [];
+    }
+}
+
+export { PointCloudHandler };

package/src/og/entity/Polyline.js

@@ -1,7 +1,3 @@
-/**
- * @module og/entity/Polyline
- */
-
 "use strict";
 
 import { Extent } from "../Extent.js";
@@ -96,7 +92,7 @@ class Polyline {
         this._pathLengths = [];
 
         /**
-         * Polyline geodetic degrees coordiantes.
+         * Polyline geodetic degrees coordinates.
          * @private
          * @type {Array.<LonLat>}
          */
@@ -1763,7 +1759,9 @@ class Polyline {
                 this._createData3v([].concat(this._path3v));
             }
             this._refresh();
-            this._update();
+            if (renderNode.renderer.isInitialized()) {
+                this._update();
+            }
         }
     }