@openglobus/og 0.16.2 → 0.17.0

package/src/og/layer/Vector.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/Vector
- */
-
 "use strict";
 
 import { Entity } from "../entity/Entity.js";
@@ -198,6 +194,13 @@ class Vector extends Layer {
         return this;
     }
 
+    remove() {
+        super.remove();
+        this._polylineEntityCollection.remove();
+        this._stripEntityCollection.remove();
+        this._geoObjectEntityCollection.remove();
+    }
+
     /**
      * Returns stored entities.
      * @public
@@ -300,21 +303,21 @@ class Vector extends Layer {
             }
         }
 
-        if (entity.billboard || entity.label) {
+        if (entity.billboard || entity.label || entity.geoObject) {
             if (this._planet) {
-                if (entity._cartesian.isZero() && !entity._lonlat.isZero()) {
+                if (entity._cartesian.isZero() && !entity._lonLat.isZero()) {
                     entity._setCartesian3vSilent(
-                        this._planet.ellipsoid.lonLatToCartesian(entity._lonlat)
+                        this._planet.ellipsoid.lonLatToCartesian(entity._lonLat)
                     );
                 } else {
-                    entity._lonlat = this._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
+                    entity._lonLat = this._planet.ellipsoid.cartesianToLonLat(entity._cartesian);
                 }
 
                 // north tree
-                if (entity._lonlat.lat > mercator.MAX_LAT) {
+                if (entity._lonLat.lat > mercator.MAX_LAT) {
                     this._entityCollectionsTreeNorth.__setLonLat__(entity);
                     this._entityCollectionsTreeNorth.insertEntity(entity, rightNow);
-                } else if (entity._lonlat.lat < mercator.MIN_LAT) {
+                } else if (entity._lonLat.lat < mercator.MIN_LAT) {
                     // south tree
                     this._entityCollectionsTreeSouth.__setLonLat__(entity);
                     this._entityCollectionsTreeSouth.insertEntity(entity, rightNow);
@@ -609,9 +612,9 @@ class Vector extends Layer {
             for (let i = 0, len = entitiesForTree.length; i < len; i++) {
                 let entity = entitiesForTree[i];
                 // north tree
-                if (entity._lonlat.lat > mercator.MAX_LAT) {
+                if (entity._lonLat.lat > mercator.MAX_LAT) {
                     this._entityCollectionsTreeNorth.__setLonLat__(entity);
-                } else if (entity._lonlat.lat < mercator.MIN_LAT) {
+                } else if (entity._lonLat.lat < mercator.MIN_LAT) {
                     // south tree
                     this._entityCollectionsTreeSouth.__setLonLat__(entity);
                 } else {
@@ -845,7 +848,7 @@ class Vector extends Layer {
             // Merc nodes
             this._secondPASS = [];
             this._entityCollectionsTree &&
-                this._entityCollectionsTree.collectRenderCollectionsPASS1(p._visibleNodes, outArr);
+            this._entityCollectionsTree.collectRenderCollectionsPASS1(p._visibleNodes, outArr);
             var i = this._secondPASS.length;
             while (i--) {
                 this._secondPASS[i].collectRenderCollectionsPASS2(
@@ -858,9 +861,9 @@ class Vector extends Layer {
             // North nodes
             this._secondPASS = [];
             this._entityCollectionsTreeNorth &&
-                this._entityCollectionsTreeNorth.collectRenderCollectionsPASS1(
-                    p._visibleNodesNorth,
-                    outArr
+            this._entityCollectionsTreeNorth.collectRenderCollectionsPASS1(
+                p._visibleNodesNorth,
+                outArr
             );
             i = this._secondPASS.length;
             while (i--) {
@@ -874,10 +877,10 @@ class Vector extends Layer {
             // South nodes
             this._secondPASS = [];
             this._entityCollectionsTreeSouth &&
-                this._entityCollectionsTreeSouth.collectRenderCollectionsPASS1(
-                    p._visibleNodesSouth,
-                    outArr
-                );
+            this._entityCollectionsTreeSouth.collectRenderCollectionsPASS1(
+                p._visibleNodesSouth,
+                outArr
+            );
             i = this._secondPASS.length;
             while (i--) {
                 this._secondPASS[i].collectRenderCollectionsPASS2(

package/src/og/layer/WMS.js

@@ -1,186 +1,182 @@
-/**
- * @module og/layer/WMS
- */
-
-"use strict";
-
-import { Extent } from "../Extent.js";
-import { LonLat } from "../LonLat.js";
-import * as mercator from "../mercator.js";
-import { XYZ } from "./XYZ.js";
-
-/**
- * Used to display WMS services as tile layers on the globe.
- * @class
- * @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 {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.
- * @param {boolean} [options.isBaseLayer=false] - Base layer flag.
- * @param {boolean} [options.visibility=true] - Layer visibility.
- * @param {string} options.url - WMS url source.
- * @param {number} [options.width=256] - Tile width.
- * @param {number} [options.height=256] - Tile height.
- * @param {string} options.layers - WMS layers string.
- * @param {string} [options.version="1.1.1"] - WMS version.
- * @param {Object} extra  - Extra parameters (by WMS rreference or by WMS service vendors) to pass to WMS service.
- * @example:
- * 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',
- *     version: "1.1.1",
- *     visibility: false }, {
- *     transparent: true,
- *     sld: "style.sld"}	   
- * );
- *
- * @fires og.layer.XYZ#load
- * @fires og.layer.XYZ#loadend
- */
-class WMS extends XYZ {
-
-
-    constructor(name, options, extra) {
-        super(name, options);
-
-        this._extra = new URLSearchParams(extra).toString();
-
-
-        if (!options.extent) {
-            this.setExtent(new Extent(new LonLat(-180.0, -90), new LonLat(180.0, 90)));
-        }
-
-        /**
-         * WMS layers string.
-         * @public
-         * @type {string}
-         */
-        this.layers = options.layers;
-
-        /**
-         * WMS tile width.
-         * @public
-         * @type {number}
-         */
-        this.imageWidth = options.imageWidth || 256;
-
-        /**
-         * WMS tile height.
-         * @public
-         * @type {number}
-         */
-        this.imageHeight = options.imageHeight || 256;
-
-        this._getBbox = WMS.get_bbox_v1_1_1;
-
-        this.setVersion(options.version);
-    }
-
-    static createRequestUrl(
-        url,
-        layers,
-        format = "image/png",
-        version = "1.1.1",
-        request = "GetMap",
-        srs,
-        bbox,
-        width = 256,
-        height = 256,
-        extra
-
-    ) {
-       return `${url}/?LAYERS=${layers}&FORMAT=${format}&SERVICE=WMS&VERSION=${version}&REQUEST=${request}&SRS=${srs}&BBOX=${bbox}&WIDTH=${width}&HEIGHT=${height}` +
-            (extra ? `&${extra}` : "");
-    }
-
-    static get_bbox_v1_1_1(extent) {
-        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()
-        );
-    }
-
-    _checkSegment(segment) {
-        return true;
-    }
-
-    get instanceName() {
-        return "WMS";
-    }
-
-    _createUrl(segment) {
-        return WMS.createRequestUrl(
-            this.url,
-            this.layers,
-            "image/png",
-            this._version,
-            "GetMap",
-            segment._projection.code,
-            this._getBbox(segment.getExtent()),
-            this.imageWidth,
-            this.imageHeight,
-            this._extra
-        );
-    }
-
-    setVersion(version) {
-        if (version) {
-            this._version = version;
-        } else {
-            this._version = "1.1.1";
-        }
-
-        if (this._version === "1.1.1") {
-            this._getBbox = WMS.get_bbox_v1_1_1;
-        } else if (version === "1.3.0") {
-            this._getBbox = WMS.get_bbox_v1_3_0;
-        }
-    }
-
-    _correctFullExtent() {
-        var e = this._extent,
-            em = this._extentMerc;
-        var ENLARGE_MERCATOR_LON = mercator.POLE + 50000;
-        var ENLARGE_MERCATOR_LAT = mercator.POLE + 50000;
-        if (e.northEast.lat === 90.0) {
-            em.northEast.lat = ENLARGE_MERCATOR_LAT;
-        }
-        if (e.northEast.lon === 180.0) {
-            em.northEast.lon = ENLARGE_MERCATOR_LON;
-        }
-        if (e.southWest.lat === -90.0) {
-            em.southWest.lat = -ENLARGE_MERCATOR_LAT;
-        }
-        if (e.southWest.lon === -180.0) {
-            em.southWest.lon = -ENLARGE_MERCATOR_LON;
-        }
-    }
-}
-
-export { WMS };
-
+"use strict";
+
+import { Extent } from "../Extent.js";
+import { LonLat } from "../LonLat.js";
+import * as mercator from "../mercator.js";
+import { XYZ } from "./XYZ.js";
+
+/**
+ * Used to display WMS services as tile layers on the globe.
+ * @class
+ * @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 {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.
+ * @param {boolean} [options.isBaseLayer=false] - Base layer flag.
+ * @param {boolean} [options.visibility=true] - Layer visibility.
+ * @param {string} options.url - WMS url source.
+ * @param {number} [options.width=256] - Tile width.
+ * @param {number} [options.height=256] - Tile height.
+ * @param {string} options.layers - WMS layers string.
+ * @param {string} [options.version="1.1.1"] - WMS version.
+ * @param {Object} extra  - Extra parameters (by WMS rreference or by WMS service vendors) to pass to WMS service.
+ * @example:
+ * 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',
+ *     version: "1.1.1",
+ *     visibility: false }, {
+ *     transparent: true,
+ *     sld: "style.sld"}	   
+ * );
+ *
+ * @fires og.layer.XYZ#load
+ * @fires og.layer.XYZ#loadend
+ */
+class WMS extends XYZ {
+
+
+    constructor(name, options, extra) {
+        super(name, options);
+
+        this._extra = new URLSearchParams(extra).toString();
+
+
+        if (!options.extent) {
+            this.setExtent(new Extent(new LonLat(-180.0, -90), new LonLat(180.0, 90)));
+        }
+
+        /**
+         * WMS layers string.
+         * @public
+         * @type {string}
+         */
+        this.layers = options.layers;
+
+        /**
+         * WMS tile width.
+         * @public
+         * @type {number}
+         */
+        this.imageWidth = options.imageWidth || 256;
+
+        /**
+         * WMS tile height.
+         * @public
+         * @type {number}
+         */
+        this.imageHeight = options.imageHeight || 256;
+
+        this._getBbox = WMS.get_bbox_v1_1_1;
+
+        this.setVersion(options.version);
+    }
+
+    static createRequestUrl(
+        url,
+        layers,
+        format = "image/png",
+        version = "1.1.1",
+        request = "GetMap",
+        srs,
+        bbox,
+        width = 256,
+        height = 256,
+        extra
+
+    ) {
+       return `${url}/?LAYERS=${layers}&FORMAT=${format}&SERVICE=WMS&VERSION=${version}&REQUEST=${request}&SRS=${srs}&BBOX=${bbox}&WIDTH=${width}&HEIGHT=${height}` +
+            (extra ? `&${extra}` : "");
+    }
+
+    static get_bbox_v1_1_1(extent) {
+        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()
+        );
+    }
+
+    _checkSegment(segment) {
+        return true;
+    }
+
+    get instanceName() {
+        return "WMS";
+    }
+
+    _createUrl(segment) {
+        return WMS.createRequestUrl(
+            this.url,
+            this.layers,
+            "image/png",
+            this._version,
+            "GetMap",
+            segment._projection.code,
+            this._getBbox(segment.getExtent()),
+            this.imageWidth,
+            this.imageHeight,
+            this._extra
+        );
+    }
+
+    setVersion(version) {
+        if (version) {
+            this._version = version;
+        } else {
+            this._version = "1.1.1";
+        }
+
+        if (this._version === "1.1.1") {
+            this._getBbox = WMS.get_bbox_v1_1_1;
+        } else if (version === "1.3.0") {
+            this._getBbox = WMS.get_bbox_v1_3_0;
+        }
+    }
+
+    _correctFullExtent() {
+        var e = this._extent,
+            em = this._extentMerc;
+        var ENLARGE_MERCATOR_LON = mercator.POLE + 50000;
+        var ENLARGE_MERCATOR_LAT = mercator.POLE + 50000;
+        if (e.northEast.lat === 90.0) {
+            em.northEast.lat = ENLARGE_MERCATOR_LAT;
+        }
+        if (e.northEast.lon === 180.0) {
+            em.northEast.lon = ENLARGE_MERCATOR_LON;
+        }
+        if (e.southWest.lat === -90.0) {
+            em.southWest.lat = -ENLARGE_MERCATOR_LAT;
+        }
+        if (e.southWest.lon === -180.0) {
+            em.southWest.lon = -ENLARGE_MERCATOR_LON;
+        }
+    }
+}
+
+export { WMS };
+

package/src/og/layer/XYZ.js

@@ -1,7 +1,3 @@
-/**
- * @module og/layer/XYZ
- */
-
 "use strict";
 
 import * as mercator from "../mercator.js";

package/src/og/light/LightSource.js

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

package/src/og/math/Line2.js

@@ -1,32 +1,28 @@
-/**
- * @module og/math/Line2
- */
-
-'use strict';
-
-import { Vec2 } from './Vec2.js';
-
-export class Line2 {
-    constructor(a = 0, b = 0, c = 0) {
-        this.a = a;
-        this.b = b;
-        this.c = c;
-    }
-
-    static get(p0, p1) {
-        return new Line2(p1.y - p0.y, p0.x - p1.x, p1.x * p0.y - p0.x * p1.y);
-    }
-
-    static getParallel(l, p) {
-        return new Line2(l.a, l.b, -l.a * p.x - l.b * p.y);
-    }
-
-    static getIntersection(L0, L1) {
-        var x = (L1.b * L0.c - L0.b * L1.c) / (L0.b * L1.a - L1.b * L0.a);
-        return new Vec2(x, -(L0.c + L0.a * x) / L0.b);
-    }
-
-    intersects(l) {
-        return Line2.getIntersection(this, l);
-    }
-}
+'use strict';
+
+import { Vec2 } from './Vec2.js';
+
+export class Line2 {
+    constructor(a = 0, b = 0, c = 0) {
+        this.a = a;
+        this.b = b;
+        this.c = c;
+    }
+
+    static get(p0, p1) {
+        return new Line2(p1.y - p0.y, p0.x - p1.x, p1.x * p0.y - p0.x * p1.y);
+    }
+
+    static getParallel(l, p) {
+        return new Line2(l.a, l.b, -l.a * p.x - l.b * p.y);
+    }
+
+    static getIntersection(L0, L1) {
+        var x = (L1.b * L0.c - L0.b * L1.c) / (L0.b * L1.a - L1.b * L0.a);
+        return new Vec2(x, -(L0.c + L0.a * x) / L0.b);
+    }
+
+    intersects(l) {
+        return Line2.getIntersection(this, l);
+    }
+}