@openglobus/og 0.14.1 → 0.14.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openglobus/og",
-  "version": "0.14.1",
+  "version": "0.14.3",
   "description": "[OpenGlobus](https://www.openglobus.org/) is a javascript library designed to display interactive 3d maps and planets with map tiles, imagery and vector data, markers and 3d objects. It uses the WebGL technology, open source and completely free.",
   "directories": {
     "example": "./sandbox"

package/src/og/layer/WMS.js

@@ -27,6 +27,7 @@ import { XYZ } from "./XYZ.js";
  * @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,
@@ -36,16 +37,23 @@ import { XYZ } from "./XYZ.js";
  *     zIndex: 50,
  *     attribution: 'USA states - geoserver WMS example',
  *     version: "1.1.1",
- *     visibility: false }
+ *     visibility: false }, {
+ *     transparent: true,
+ *     sld: "style.sld"}	   
  * );
  *
  * @fires og.layer.XYZ#load
  * @fires og.layer.XYZ#loadend
  */
 class WMS extends XYZ {
-    constructor(name, options) {
+
+
+    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)));
         }
@@ -85,10 +93,12 @@ class WMS extends XYZ {
         srs,
         bbox,
         width = 256,
-        height = 256
+        height = 256,
+        extra
+
     ) {
         return `${url}/wms?LAYERS=${layers}&FORMAT=${format}&SERVICE=WMS&VERSION=${version}&REQUEST=${request}
-        &SRS=${srs}&BBOX=${bbox}&WIDTH=${width}&HEIGHT=${height}`;
+        &SRS=${srs}&BBOX=${bbox}&WIDTH=${width}&HEIGHT=${height}&` + extra;
     }
 
     static get_bbox_v1_1_1(extent) {
@@ -133,7 +143,8 @@ class WMS extends XYZ {
             segment._projection.code,
             this._getBbox(segment.getExtent()),
             this.imageWidth,
-            this.imageHeight
+            this.imageHeight,
+            this._extra
         );
     }
 

package/src/og/scene/Planet.js

@@ -967,7 +967,10 @@ export class Planet extends RenderNode {
         this._renderedNodes.length = 0;
         this._renderedNodes = [];
 
-        // clearing nodes in frustums
+        this._clearRenderNodesInFrustum();
+    }
+
+    _clearRenderNodesInFrustum() {
         for (let i = 0, len = this._renderedNodesInFrustum.length; i < len; i++) {
             this._renderedNodesInFrustum[i].length = 0;
             this._renderedNodesInFrustum[i] = [];
@@ -998,19 +1001,17 @@ export class Planet extends RenderNode {
         this.minCurrZoom = math.MAX;
         this.maxCurrZoom = math.MIN;
 
+        this.quadTreeStrategy.collectRenderNodes();
+
         if (cam.slope > this.minEqualZoomCameraSlope && cam._lonLat.height < this.maxEqualZoomAltitude && cam._lonLat.height > this.minEqualZoomAltitude) {
 
             this.minCurrZoom = this.maxCurrZoom;
 
-            let temp = this._renderedNodes, rf = this._renderedNodesInFrustum, temp2 = [];
+            let temp = this._renderedNodes,
+                rf = this._renderedNodesInFrustum,
+                temp2 = [];
 
-            this._renderedNodes = [];
-
-            // clearing nodes in frustums
-            for (let i = 0, len = this._renderedNodesInFrustum.length; i < len; i++) {
-                this._renderedNodesInFrustum[i].length = 0;
-                this._renderedNodesInFrustum[i] = [];
-            }
+            this._clearRenderNodesInFrustum();
 
             for (var i = 0, len = temp.length; i < len; i++) {
                 var ri = temp[i];
@@ -1035,7 +1036,6 @@ export class Planet extends RenderNode {
             }
         }
 
-        this.quadTreeStrategy.collectRenderNodes();
     }
 
     _globalPreDraw() {

package/types/layer/WMS.d.ts

@@ -16,6 +16,7 @@
  * @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,
@@ -25,17 +26,20 @@
  *     zIndex: 50,
  *     attribution: 'USA states - geoserver WMS example',
  *     version: "1.1.1",
- *     visibility: false }
+ *     visibility: false }, {
+ *     transparent: true,
+ *     sld: "style.sld"}
  * );
  *
  * @fires og.layer.XYZ#load
  * @fires og.layer.XYZ#loadend
  */
 export class WMS extends XYZ {
-    static createRequestUrl(url: any, layers: any, format: string, version: string, request: string, srs: any, bbox: any, width?: number, height?: number): string;
+    static createRequestUrl(url: any, layers: any, format: string, version: string, request: string, srs: any, bbox: any, width: number, height: number, extra: any): string;
     static get_bbox_v1_1_1(extent: any): string;
     static get_bbox_v1_3_0(extent: any): string;
-    constructor(name: any, options: any);
+    constructor(name: any, options: any, extra: any);
+    _extra: string;
     /**
      * WMS layers string.
      * @public

package/types/scene/Planet.d.ts

@@ -379,6 +379,7 @@ export class Planet extends RenderNode {
      */
     protected _sortLayers(): void;
     _clearRenderedNodeList(): void;
+    _clearRenderNodesInFrustum(): void;
     /**
      * Collects visible quad nodes.
      * @protected