@openglobus/og 0.13.7 → 0.13.10

package/src/og/layer/XYZ.js

@@ -76,11 +76,6 @@ class XYZ extends Layer {
          */
         this.maxNativeZoom = options.maxNativeZoom || 19;
 
-        /**
-         * @protected
-         */
-        this._crossOrigin = options.crossOrigin === undefined ? "" : options.crossOrigin;
-
         /**
          * Rewrites imagery tile url query.
          * @private
@@ -90,6 +85,16 @@ class XYZ extends Layer {
          * @returns {string} - Url query string.
          */
         this._urlRewriteCallback = options.urlRewrite || null;
+
+        this._requestsPeerSubdomian = 4;
+        this._requestCount = 0;
+    }
+
+    /**
+     * @warning Use XYZ.isIdle in requesAnimationFrame(after setVisibility)
+     */
+    get isIdle() {
+        return super.isIdle && this._planet._tileLoader.getRequestCounter(this) === 0;
     }
 
     get instanceName() {
@@ -102,7 +107,7 @@ class XYZ extends Layer {
      */
     abortLoading() {
         if (this._planet) {
-            this._planet._tileLoader.abort();
+            this._planet._tileLoader.abort(this);
         }
     }
 
@@ -114,13 +119,17 @@ class XYZ extends Layer {
     setVisibility(visibility) {
         if (visibility !== this._visibility) {
             super.setVisibility(visibility);
-
             if (!visibility) {
                 this.abortLoading();
             }
         }
     }
 
+    remove() {
+        this.abortLoading();
+        super.remove();
+    }
+
     /**
      * Sets imagery tiles url source template.
      * @public
@@ -144,6 +153,7 @@ class XYZ extends Layer {
      * @param {Material} material - Loads current material.
      */
     loadMaterial(material, forceLoading) {
+
         let seg = material.segment;
 
         if (this._isBaseLayer) {
@@ -212,7 +222,9 @@ class XYZ extends Layer {
     }
 
     _getSubdomain() {
-        return this._s[Math.floor(Math.random() * this._s.length)];
+        this._requestCount++;
+        return this._s[Math.floor(this._requestCount % (this._requestsPeerSubdomian * this._s.length) / this._requestsPeerSubdomian)];
+
     }
 
     /**
@@ -236,7 +248,7 @@ class XYZ extends Layer {
         this._urlRewriteCallback = ur;
     }
 
-    applyMaterial(material) {
+    applyMaterial(material, forceLoading) {
         if (material.isReady) {
             return material.texOffset;
         } else if (material.segment.tileZoom <= this.minNativeZoom) {
@@ -263,7 +275,7 @@ class XYZ extends Layer {
                 if (pn.segment.tileZoom === maxNativeZoom) {
                     material.textureNotExists();
                 } else if (material.segment.tileZoom <= maxNativeZoom) {
-                    !material.isLoading && !material.isReady && this.loadMaterial(material);
+                    !material.isLoading && !material.isReady && this.loadMaterial(material, forceLoading);
                 } else {
                     let pn = segment.node;
                     while (pn.segment.tileZoom > material.layer.maxNativeZoom) {
@@ -305,7 +317,7 @@ class XYZ extends Layer {
     clearMaterial(material) {
         if (material.isReady && material.textureExists) {
             !material.texture.default &&
-                material.segment.handler.gl.deleteTexture(material.texture);
+            material.segment.handler.gl.deleteTexture(material.texture);
             material.texture = null;
 
             if (material.image) {