@openglobus/og 0.11.5 → 0.12.0

package/src/og/layer/WMS.js

@@ -2,12 +2,12 @@
  * @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.
@@ -17,7 +17,6 @@ import { XYZ } from './XYZ.js';
  * @param {string} name - Layer name.
  * @param {Object} options - Options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @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 +28,19 @@ 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', 
- *     transparentColor: [1.0, 1.0, 1.0],
+ *     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 }
  * );
  *
  * @fires og.layer.XYZ#load
- * @fires og.layer.XYZ#loadend 
+ * @fires og.layer.XYZ#loadend
  */
 class WMS extends XYZ {
     constructor(name, options) {
@@ -87,17 +85,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) {
@@ -156,4 +171,4 @@ class WMS extends XYZ {
     }
 }
 
-export { WMS };
+export { WMS };

package/src/og/layer/XYZ.js

@@ -17,7 +17,6 @@ import { RENDERING } from "../quadTree/quadTree.js";
  * @param {string} name - Layer name.
  * @param {Object} options:
  * @param {number} [options.opacity=1.0] - Layer opacity.
- * @param {Array.<number>} [options.transparentColor=[-1,-1,-1]] - RGB color that defines transparent color. (exactly 3 entries)
  * @param {Array.<string>} [options.subdomains=['a','b','c']] - Subdomains of the tile service.
  * @param {number} [options.minZoom=0] - Minimal visibility zoom level.
  * @param {number} [options.maxZoom=0] - Maximal visibility zoom level.
@@ -51,8 +50,6 @@ class XYZ extends Layer {
 
         this.events.registerNames(EVENT_NAMES);
 
-        this.transparentColor = options.transparentColor || [-1, -1, -1];
-
         /**
          * Tile url source template.
          * @public
@@ -103,8 +100,10 @@ class XYZ extends Layer {
      * Abort loading tiles.
      * @public
      */
-    abortLoading() {
-        this._planet._tileLoader.abort();
+    abortLoading() {
+        if (this._planet) {
+            this._planet._tileLoader.abort();
+        }
     }
 
     /**
@@ -238,9 +237,6 @@ class XYZ extends Layer {
         if (material.isReady) {
             return material.texOffset;
         } else {
-            // if (material.loadingAttempts > 20) {
-            //     debugger;
-            // }
 
             let segment = material.segment,
                 pn = segment.node,
@@ -258,25 +254,27 @@ class XYZ extends Layer {
             }
 
             let maxNativeZoom = material.layer.maxNativeZoom;
-
-            if (pn.segment.tileZoom === maxNativeZoom) {
-                material.textureNotExists();
-            } else if (material.segment.tileZoom <= maxNativeZoom) {
-                !material.isLoading && !material.isReady && this.loadMaterial(material);
-            } else {
-                let pn = segment.node;
-                while (pn.segment.tileZoom > material.layer.maxNativeZoom) {
-                    pn = pn.parentNode;
-                }
-                let pnm = pn.segment.materials[material.layer._id];
-                if (pnm) {
-                    !pnm.isLoading && !pnm.isReady && this.loadMaterial(pnm, true);
+
+            if (segment.loadTile) {
+                if (pn.segment.tileZoom === maxNativeZoom) {
+                    material.textureNotExists();
+                } else if (material.segment.tileZoom <= maxNativeZoom) {
+                    !material.isLoading && !material.isReady && this.loadMaterial(material);
                 } else {
-                    pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(
-                        pn.segment
-                    );
-                    this.loadMaterial(pnm, true);
-                }
+                    let pn = segment.node;
+                    while (pn.segment.tileZoom > material.layer.maxNativeZoom) {
+                        pn = pn.parentNode;
+                    }
+                    let pnm = pn.segment.materials[material.layer._id];
+                    if (pnm) {
+                        !pnm.isLoading && !pnm.isReady && this.loadMaterial(pnm, true);
+                    } else {
+                        pnm = pn.segment.materials[material.layer._id] = material.layer.createMaterial(
+                            pn.segment
+                        );
+                        this.loadMaterial(pnm, true);
+                    }
+                }
             }
 
             if (notEmpty) {

package/src/og/light/LightSource.js

@@ -2,9 +2,9 @@
  * @module og/light/LightSource
  */
 
-'use strict';
+"use strict";
 
-import { Vec3 } from '../math/Vec3.js';
+import { Vec3 } from "../math/Vec3.js";
 
 /**
  * Represents basic light source.
@@ -37,7 +37,7 @@ class LightSource {
          * @protected
          * @type {string}
          */
-        this._name = name || ("light_" + LightSource._staticCounter++);
+        this._name = name || "light_" + LightSource._staticCounter++;
 
         /**
          * Render node where light is shines.
@@ -221,11 +221,11 @@ class LightSource {
     }
 
     /**
- * Set ambient color.
- * @public
- * @param {Vec3} rgb - Ambient color.
- * @returns {LightSource}
- */
+     * Set ambient color.
+     * @public
+     * @param {Vec3} rgb - Ambient color.
+     * @returns {LightSource}
+     */
     setAmbient(r, g, b) {
         this._ambient.set(r, g, b);
         var rn = this._renderNode;
@@ -309,9 +309,16 @@ class LightSource {
         if (rn) {
             var index = 9 * rn._lightsNames.indexOf(this._name);
             if (index != -1) {
-                rn._lightsParamsv[index] = rn._lightsParamsv[index + 1] = rn._lightsParamsv[index + 2] =
-                    rn._lightsParamsv[index + 3] = rn._lightsParamsv[index + 4] = rn._lightsParamsv[index + 5] =
-                    rn._lightsParamsv[index + 6] = rn._lightsParamsv[index + 7] = rn._lightsParamsv[index + 8] = 0;
+                rn._lightsParamsv[index] =
+                    rn._lightsParamsv[index + 1] =
+                    rn._lightsParamsv[index + 2] =
+                    rn._lightsParamsv[index + 3] =
+                    rn._lightsParamsv[index + 4] =
+                    rn._lightsParamsv[index + 5] =
+                    rn._lightsParamsv[index + 6] =
+                    rn._lightsParamsv[index + 7] =
+                    rn._lightsParamsv[index + 8] =
+                        0;
             }
         }
         return this;
@@ -353,4 +360,4 @@ class LightSource {
     }
 }
 
-export { LightSource };
+export { LightSource };

package/src/og/math/Mat3.js

@@ -2,17 +2,16 @@
  * @module og/math/Mat3
  */
 
-'use strict';
+"use strict";
 
-import { Mat4 } from './Mat4.js';
-import { Vec3 } from './Vec3.js';
+import { Mat4 } from "./Mat4.js";
+import { Vec3 } from "./Vec3.js";
 
 /**
  * Class represents a 3x3 matrix.
  * @class
  */
 export class Mat3 {
-
     constructor() {
         /**
          * A 3x3 matrix, indexable as a column-major order array.
@@ -70,9 +69,15 @@ export class Mat3 {
     transposeTo() {
         var res = new Mat3();
         var m = this._m;
-        res._m[0] = m[0]; res._m[1] = m[3]; res._m[2] = m[6];
-        res._m[3] = m[1]; res._m[4] = m[4]; res._m[5] = m[7];
-        res._m[6] = m[2]; res._m[7] = m[5]; res._m[8] = m[8];
+        res._m[0] = m[0];
+        res._m[1] = m[3];
+        res._m[2] = m[6];
+        res._m[3] = m[1];
+        res._m[4] = m[4];
+        res._m[5] = m[7];
+        res._m[6] = m[2];
+        res._m[7] = m[5];
+        res._m[8] = m[8];
         return res;
     }
 
@@ -82,9 +87,15 @@ export class Mat3 {
      * @returns {Mat3}
      */
     setIdentity() {
-        this._m[0] = 1; this._m[1] = 0; this._m[2] = 0;
-        this._m[3] = 0; this._m[4] = 1; this._m[5] = 0;
-        this._m[6] = 0; this._m[7] = 0; this._m[8] = 1;
+        this._m[0] = 1;
+        this._m[1] = 0;
+        this._m[2] = 0;
+        this._m[3] = 0;
+        this._m[4] = 1;
+        this._m[5] = 0;
+        this._m[6] = 0;
+        this._m[7] = 0;
+        this._m[8] = 1;
         return this;
     }
 
@@ -95,7 +106,9 @@ export class Mat3 {
      * @returns {Vec3}
      */
     mulVec(p) {
-        var d = p.x, e = p.y, g = p.z;
+        var d = p.x,
+            e = p.y,
+            g = p.z;
         var m = this._m;
         return new Vec3(
             m[0] * d + m[3] * e + m[6] * g,
@@ -131,7 +144,6 @@ export class Mat3 {
         b[15] = 1;
         return res;
     }
-
 }
 
 /**