@openglobus/og 0.11.1 → 0.11.6

package/src/og/layer/Vector.js

@@ -2,19 +2,22 @@
  * @module og/layer/Vector
  */
 
-'use strict';
-
-import * as math from '../math.js';
-import * as mercator from '../mercator.js';
-import * as quadTree from '../quadTree/quadTree.js';
-import { Entity } from '../entity/Entity.js';
-import { EntityCollection } from '../entity/EntityCollection.js';
-import { Extent } from '../Extent.js';
-import { EntityCollectionNode, EntityCollectionNodeWGS84 } from '../quadTree/EntityCollectionNode.js';
-import { GeometryHandler } from '../entity/GeometryHandler.js';
-import { Layer } from './Layer.js';
-import { QueueArray } from '../QueueArray.js';
-import { Vec3 } from '../math/Vec3.js';
+"use strict";
+
+import * as math from "../math.js";
+import * as mercator from "../mercator.js";
+import * as quadTree from "../quadTree/quadTree.js";
+import { Entity } from "../entity/Entity.js";
+import { EntityCollection } from "../entity/EntityCollection.js";
+import { Extent } from "../Extent.js";
+import {
+    EntityCollectionNode,
+    EntityCollectionNodeWGS84
+} from "../quadTree/EntityCollectionNode.js";
+import { GeometryHandler } from "../entity/GeometryHandler.js";
+import { Layer } from "./Layer.js";
+import { QueueArray } from "../QueueArray.js";
+import { Vec3 } from "../math/Vec3.js";
 
 /**
  * Creates entity instance array.
@@ -32,13 +35,13 @@ function _entitiesConstructor(entities) {
         }
     }
     return res;
-};
+}
 
 /**
  * Vector layer represents alternative entities store. Used for geospatial data rendering like
  * points, lines, polygons, geometry objects etc.
  * @class
- * @extends {og.Layer}
+ * @extends {Layer}
  * @param {string} [name="noname"] - Layer name.
  * @param {Object} [options] - Layer options:
  * @param {number} [options.minZoom=0] - Minimal visible zoom. 0 is default
@@ -47,8 +50,8 @@ function _entitiesConstructor(entities) {
  * @param {string} [options.zIndex=0] - Layer Z-order index. 0 is default.
  * @param {boolean} [options.visibility=true] - Layer visibility. True is default.
  * @param {boolean} [options.isBaseLayer=false] - Layer base layer. False is default.
- * @param {Array.<og.Entity>} [options.entities] - Entities array.
- * @param {Array.<number,number,number>} [options.scaleByDistance] - Scale by distance parameters.
+ * @param {Array.<Entity>} [options.entities] - Entities array.
+ * @param {Array.<number>} [options.scaleByDistance] - Scale by distance parameters. (exactly 3 entries)
  *      First index - near distance to the entity, after entity becomes full scale.
  *      Second index - far distance to the entity, when entity becomes zero scale.
  *      Third index - far distance to the entity, when entity becomes invisible.
@@ -68,13 +71,11 @@ function _entitiesConstructor(entities) {
  * @fires og.layer.Vector#visibilitychange
  */
 class Vector extends Layer {
-
     /**
-     * @param {string} name 
+     * @param {string} name
      * @param {*} [options]
      */
     constructor(name, options = {}) {
-
         super(name, options);
 
         this.events.registerNames(EVENT_NAMES);
@@ -88,7 +89,7 @@ class Vector extends Layer {
          * Second index - far distance to the entity, when entity becomes zero scale.
          * Third index - far distance to the entity, when entity becomes invisible.
          * @public
-         * @type {Array.<number,number,number>}
+         * @type {Array.<number>} - (exactly 3 entries)
          */
         this.scaleByDistance = options.scaleByDistance || [math.MAX32, math.MAX32, math.MAX32];
 
@@ -160,14 +161,16 @@ class Vector extends Layer {
          * @public
          * @type {Number}
          */
-        this.polygonOffsetFactor = options.polygonOffsetFactor != undefined ? options.polygonOffsetFactor : 0.0;
+        this.polygonOffsetFactor =
+            options.polygonOffsetFactor != undefined ? options.polygonOffsetFactor : 0.0;
 
         /**
          * Specifies the scale Units for gl.polygonOffset function to calculate depth values, 0.0 is default.
          * @public
          * @type {Number}
          */
-        this.polygonOffsetUnits = options.polygonOffsetUnits != undefined ? options.polygonOffsetUnits : -637000.0;
+        this.polygonOffsetUnits =
+            options.polygonOffsetUnits != undefined ? options.polygonOffsetUnits : -637000.0;
 
         this.pickingEnabled = this._pickingEnabled;
     }
@@ -183,8 +186,8 @@ class Vector extends Layer {
     /**
      * Adds layer to the planet.
      * @public
-     * @param {og.Planet} planet - Planet scene object.
-     * @returns {og.layer.Vector} -
+     * @param {Planet} planet - Planet scene object.
+     * @returns {layer.Vector} -
      */
     addTo(planet) {
         if (!this._planet) {
@@ -200,7 +203,7 @@ class Vector extends Layer {
     /**
      * Returns stored entities.
      * @public
-     * @returns {Array.<og.Entity>} -
+     * @returns {Array.<Entity>} -
      */
     getEntities() {
         return [].concat(this._entities);
@@ -237,9 +240,9 @@ class Vector extends Layer {
     /**
      * Adds entity to the layer.
      * @public
-     * @param {og.Entity} entity - Entity.
+     * @param {Entity} entity - Entity.
      * @param {boolean} [rightNow] - Entity insertion option. False is deafult.
-     * @returns {og.layer.Vector} - Returns this layer.
+     * @returns {layer.Vector} - Returns this layer.
      */
     add(entity, rightNow) {
         if (!(entity._layer || entity._entityCollection)) {
@@ -255,10 +258,10 @@ class Vector extends Layer {
     /**
      * Adds entity to the layer in the index position.
      * @public
-     * @param {og.Entity} entity - Entity.
+     * @param {Entity} entity - Entity.
      * @param {Number} index - Index position.
      * @param {boolean} [rightNow] - Entity insertion option. False is deafult.
-     * @returns {og.layer.Vector} - Returns this layer.
+     * @returns {layer.Vector} - Returns this layer.
      */
     insert(entity, index, rightNow) {
         if (!(entity._layer || entity._entityCollection)) {
@@ -277,7 +280,6 @@ class Vector extends Layer {
     }
 
     _proceedEntity(entity, rightNow) {
-
         let temp = this._hasImageryTiles;
 
         //
@@ -302,9 +304,10 @@ class Vector extends Layer {
 
         if (entity.billboard || entity.label) {
             if (this._planet) {
-
                 if (entity._cartesian.isZero() && !entity._lonlat.isZero()) {
-                    entity._setCartesian3vSilent(this._planet.ellipsoid.lonLatToCartesian(entity._lonlat));
+                    entity._setCartesian3vSilent(
+                        this._planet.ellipsoid.lonLatToCartesian(entity._lonlat)
+                    );
                 } else {
                     entity._lonlat = this._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
                 }
@@ -334,9 +337,9 @@ class Vector extends Layer {
     /**
      * Adds entity array to the layer.
      * @public
-     * @param {Array.<og.Entity>} entities - Entities array.
+     * @param {Array.<Entity>} entities - Entities array.
      * @param {boolean} [rightNow] - Entity insertion option. False is deafult.
-     * @returns {og.layer.Vector} - Returns this layer.
+     * @returns {layer.Vector} - Returns this layer.
      */
     addEntities(entities, rightNow) {
         var i = entities.length;
@@ -350,8 +353,8 @@ class Vector extends Layer {
      * Remove entity from layer.
      * TODO: memory leaks.
      * @public
-     * @param {og.Entity} entity - Entity to remove.
-     * @returns {og.layer.Vector} - Returns this layer.
+     * @param {Entity} entity - Entity to remove.
+     * @returns {layer.Vector} - Returns this layer.
      */
     removeEntity(entity) {
         if (entity._layer && this.isEqual(entity._layer)) {
@@ -367,15 +370,17 @@ class Vector extends Layer {
                     node.count--;
                     node = node.parentNode;
                 }
-                if (entity._nodePtr && entity._nodePtr.count === 0 &&
-                    entity._nodePtr.deferredEntities.length === 0) {
+                if (
+                    entity._nodePtr &&
+                    entity._nodePtr.count === 0 &&
+                    entity._nodePtr.deferredEntities.length === 0
+                ) {
                     entity._nodePtr.entityCollection = null;
                     //
                     // ...
                     //
                 }
-            } else if (entity._nodePtr &&
-                entity._nodePtr.deferredEntities.length) {
+            } else if (entity._nodePtr && entity._nodePtr.deferredEntities.length) {
                 var defEntities = entity._nodePtr.deferredEntities;
                 var j = defEntities.length;
                 while (j--) {
@@ -447,8 +452,8 @@ class Vector extends Layer {
     /**
      * Removes entities from layer.
      * @public
-     * @param {Array.<og.Entity>} entities - Entity array.
-     * @returns {og.layer.Vector} - Returns this layer.
+     * @param {Array.<Entity>} entities - Entity array.
+     * @returns {layer.Vector} - Returns this layer.
      */
     removeEntities(entities) {
         var i = entities.length;
@@ -464,7 +469,7 @@ class Vector extends Layer {
      * @param {number} near - Full scale entity distance.
      * @param {number} far - Zerol scale entity distance.
      * @param {number} [farInvisible] - Entity visibility distance.
-     * @returns {og.layer.Vector} -
+     * @returns {layer.Vector} -
      */
     setScaleByDistance(near, far, farInvisible) {
         this.scaleByDistance[0] = near;
@@ -478,7 +483,6 @@ class Vector extends Layer {
      * @public
      */
     clear() {
-
         let temp = new Array(this._entities.length);
 
         for (let i = 0; i < temp.length; i++) {
@@ -517,11 +521,10 @@ class Vector extends Layer {
     /**
      * Removes current entities from layer and adds new entities.
      * @public
-     * @param {Array.<og.Entity>} entities - New entity array.
-     * @returns {og.layer.Vector} - Returns layer instance.
+     * @param {Array.<Entity>} entities - New entity array.
+     * @returns {layer.Vector} - Returns layer instance.
      */
     setEntities(entities) {
-
         let temp = new Array(entities.length);
         for (let i = 0, len = entities.length; i < len; i++) {
             temp[i] = entities[i];
@@ -573,12 +576,33 @@ class Vector extends Layer {
 
     _createEntityCollectionsTree(entitiesForTree) {
         if (this._planet) {
-            this._entityCollectionsTree = new EntityCollectionNode(this, quadTree.NW, null, 0,
-                Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34]), this._planet, 0);
-            this._entityCollectionsTreeNorth = new EntityCollectionNodeWGS84(this, quadTree.NW, null, 0,
-                Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90]), this._planet, 0);
-            this._entityCollectionsTreeSouth = new EntityCollectionNodeWGS84(this, quadTree.NW, null, 0,
-                Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT]), this._planet, 0);
+            this._entityCollectionsTree = new EntityCollectionNode(
+                this,
+                quadTree.NW,
+                null,
+                0,
+                Extent.createFromArray([-20037508.34, -20037508.34, 20037508.34, 20037508.34]),
+                this._planet,
+                0
+            );
+            this._entityCollectionsTreeNorth = new EntityCollectionNodeWGS84(
+                this,
+                quadTree.NW,
+                null,
+                0,
+                Extent.createFromArray([-180, mercator.MAX_LAT, 180, 90]),
+                this._planet,
+                0
+            );
+            this._entityCollectionsTreeSouth = new EntityCollectionNodeWGS84(
+                this,
+                quadTree.NW,
+                null,
+                0,
+                Extent.createFromArray([-180, -90, 180, mercator.MIN_LAT]),
+                this._planet,
+                0
+            );
 
             for (let i = 0, len = entitiesForTree.length; i < len; i++) {
                 let entity = entitiesForTree[i];
@@ -682,7 +706,6 @@ class Vector extends Layer {
     }
 
     _collectStripCollectionPASS(outArr) {
-
         var ec = this._stripEntityCollection;
 
         ec._fadingOpacity = this._fadingOpacity;
@@ -699,7 +722,6 @@ class Vector extends Layer {
     }
 
     _collectPolylineCollectionPASS(outArr) {
-
         var ec = this._polylineEntityCollection;
 
         ec._fadingOpacity = this._fadingOpacity;
@@ -737,7 +759,12 @@ class Vector extends Layer {
                                 if (seg._extent.isInside(ll)) {
                                     let cart = p._path3v[c_j][c_j_h];
                                     seg.getTerrainPoint(cart, ll, res);
-                                    p.setPoint3v(res.addA(res.normal().scale((rtg && p.altitude) || 0.0)), c_j_h, c_j, true);
+                                    p.setPoint3v(
+                                        res.addA(res.normal().scale((rtg && p.altitude) || 0.0)),
+                                        c_j_h,
+                                        c_j,
+                                        true
+                                    );
                                     break;
                                 }
                             }
@@ -751,9 +778,10 @@ class Vector extends Layer {
     collectVisibleCollections(outArr) {
         var p = this._planet;
 
-        if ((this._fading && this._fadingOpacity > 0.0) ||
-            (this.minZoom <= this._planet.maxCurrZoom && this.maxZoom >= p.maxCurrZoom)) {
-
+        if (
+            (this._fading && this._fadingOpacity > 0.0) ||
+            (this.minZoom <= this._planet.maxCurrZoom && this.maxZoom >= p.maxCurrZoom)
+        ) {
             this._renderingNodes = {};
             this._renderingNodesNorth = {};
             this._renderingNodesSouth = {};
@@ -768,23 +796,41 @@ class Vector extends Layer {
             this._entityCollectionsTree.collectRenderCollectionsPASS1(p._visibleNodes, outArr);
             var i = this._secondPASS.length;
             while (i--) {
-                this._secondPASS[i].collectRenderCollectionsPASS2(p._visibleNodes, outArr, this._secondPASS[i].nodeId);
+                this._secondPASS[i].collectRenderCollectionsPASS2(
+                    p._visibleNodes,
+                    outArr,
+                    this._secondPASS[i].nodeId
+                );
             }
 
             // North nodes
             this._secondPASS = [];
-            this._entityCollectionsTreeNorth.collectRenderCollectionsPASS1(p._visibleNodesNorth, outArr);
+            this._entityCollectionsTreeNorth.collectRenderCollectionsPASS1(
+                p._visibleNodesNorth,
+                outArr
+            );
             i = this._secondPASS.length;
             while (i--) {
-                this._secondPASS[i].collectRenderCollectionsPASS2(p._visibleNodesNorth, outArr, this._secondPASS[i].nodeId);
+                this._secondPASS[i].collectRenderCollectionsPASS2(
+                    p._visibleNodesNorth,
+                    outArr,
+                    this._secondPASS[i].nodeId
+                );
             }
 
             // South nodes
             this._secondPASS = [];
-            this._entityCollectionsTreeSouth.collectRenderCollectionsPASS1(p._visibleNodesSouth, outArr);
+            this._entityCollectionsTreeSouth.collectRenderCollectionsPASS1(
+                p._visibleNodesSouth,
+                outArr
+            );
             i = this._secondPASS.length;
             while (i--) {
-                this._secondPASS[i].collectRenderCollectionsPASS2(p._visibleNodesSouth, outArr, this._secondPASS[i].nodeId);
+                this._secondPASS[i].collectRenderCollectionsPASS2(
+                    p._visibleNodesSouth,
+                    outArr,
+                    this._secondPASS[i].nodeId
+                );
             }
         }
     }
@@ -823,14 +869,15 @@ class Vector extends Layer {
      * Start to load tile material.
      * @public
      * @virtual
-     * @param {og.Segment.Material} material - Current material.
+     * @param {Segment.Material} material - Current material.
      */
     loadMaterial(material) {
-
         var seg = material.segment;
 
         if (this._isBaseLayer) {
-            material.texture = seg._isNorth ? seg.planet.solidTextureOne : seg.planet.solidTextureTwo;
+            material.texture = seg._isNorth
+                ? seg.planet.solidTextureOne
+                : seg.planet.solidTextureTwo;
         } else {
             material.texture = seg.planet.transparentTexture;
         }
@@ -845,7 +892,7 @@ class Vector extends Layer {
     /**
      * Abort exact material loading.
      * @public
-     * @param {og.planetSegment.Material} material - Segment material.
+     * @param {Material} material - Segment material.
      */
     abortMaterialLoading(material) {
         material.isLoading = false;
@@ -856,7 +903,6 @@ class Vector extends Layer {
         if (material.isReady) {
             return [0, 0, 1, 1];
         } else {
-
             !material.isLoading && this.loadMaterial(material);
 
             var segment = material.segment;
@@ -933,7 +979,7 @@ class Vector extends Layer {
         this._geometryHandler.update();
         this.events.dispatch(this.events.draw, this);
     }
-};
+}
 
 const EVENT_NAMES = [
     /**
@@ -961,4 +1007,4 @@ const EVENT_NAMES = [
     "entityremove"
 ];
 
-export { Vector };
+export { Vector };

package/src/og/layer/WMS.js

@@ -2,22 +2,22 @@
  * @module og/layer/WMS
  */
 
-'use strict';
+"use strict";
 
-import * as mercator from '../mercator.js';
-import { Extent } from '../Extent.js';
-import { LonLat } from '../LonLat.js';
-import { XYZ } from './XYZ.js';
+import * as mercator from "../mercator.js";
+import { Extent } from "../Extent.js";
+import { LonLat } from "../LonLat.js";
+import { XYZ } from "./XYZ.js";
 
 /**
  * Used to display WMS services as tile layers on the globe.
  * @class
- * @extends {og.layer.XYZ}
+ * @extends {XYZ}
  * //TODO: WMS version, format, and custom srs cpecification.
  * @param {string} name - Layer name.
  * @param {Object} options - Options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number,number,number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color.
+ * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color.
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
  * @param {string} [options.attribution] - Layer attribution that displayed in the attribution area on the screen.
@@ -29,20 +29,20 @@ import { XYZ } from './XYZ.js';
  * @param {string} options.layers - WMS layers string.
  * @param {string} [options.version="1.1.1"] - WMS version.
  * @example:
- * new og.layer.WMS("USA States", { 
+ * new og.layer.WMS("USA States", {
  *     isBaseLayer: false,
- *     url: "http://openglobus.org/geoserver/", 
- *     layers: "topp:states", 
- *     opacity: 0.5, 
- *     zIndex: 50, 
- *     attribution: 'USA states - geoserver WMS example', 
+ *     url: "http://openglobus.org/geoserver/",
+ *     layers: "topp:states",
+ *     opacity: 0.5,
+ *     zIndex: 50,
+ *     attribution: 'USA states - geoserver WMS example',
  *     transparentColor: [1.0, 1.0, 1.0],
  *     version: "1.1.1",
  *     visibility: false }
  * );
  *
  * @fires og.layer.XYZ#load
- * @fires og.layer.XYZ#loadend 
+ * @fires og.layer.XYZ#loadend
  */
 class WMS extends XYZ {
     constructor(name, options) {
@@ -87,17 +87,34 @@ class WMS extends XYZ {
         srs,
         bbox,
         width = 256,
-        height = 256) {
+        height = 256
+    ) {
         return `${url}/wms?LAYERS=${layers}&FORMAT=${format}&SERVICE=WMS&VERSION=${version}&REQUEST=${request}
         &SRS=${srs}&BBOX=${bbox}&WIDTH=${width}&HEIGHT=${height}`;
     }
 
     static get_bbox_v1_1_1(extent) {
-        return extent.getWest() + "," + extent.getSouth() + "," + extent.getEast() + "," + extent.getNorth();
+        return (
+            extent.getWest() +
+            "," +
+            extent.getSouth() +
+            "," +
+            extent.getEast() +
+            "," +
+            extent.getNorth()
+        );
     }
 
     static get_bbox_v1_3_0(extent) {
-        return extent.getSouth() + "," + extent.getWest() + "," + extent.getNorth() + "," + extent.getEast();
+        return (
+            extent.getSouth() +
+            "," +
+            extent.getWest() +
+            "," +
+            extent.getNorth() +
+            "," +
+            extent.getEast()
+        );
     }
 
     _checkSegment(segment) {
@@ -154,6 +171,6 @@ class WMS extends XYZ {
             em.southWest.lon = -ENLARGE_MERCATOR_LON;
         }
     }
-};
+}
 
-export { WMS };
+export { WMS };