Update from openglobus/openglobus@cde0f77

openglobus · Oct 9, 2024 · bbc51d9 · bbc51d9
1 parent d80e782
commit bbc51d9
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 56 deletions.
diff --git a/docs/BaseGeoImage.html b/docs/BaseGeoImage.html
diff --git a/docs/CanvasTiles.html b/docs/CanvasTiles.html
diff --git a/docs/GeoImage.html b/docs/GeoImage.html
diff --git a/docs/GeoVideo.html b/docs/GeoVideo.html
diff --git a/docs/KML.html b/docs/KML.html
diff --git a/docs/Layer.html b/docs/Layer.html
diff --git a/docs/Vector.html b/docs/Vector.html
diff --git a/docs/WMS.html b/docs/WMS.html
diff --git a/docs/XYZ.html b/docs/XYZ.html
diff --git a/docs/layer_CanvasTiles.ts.html b/docs/layer_CanvasTiles.ts.html
@@ -141,16 +141,6 @@
      * @public
      */
     public override abortLoading() {
-        //const q = this._pendingsQueue;
-        // for (let i = q._shiftIndex + 1; i &lt; q._popIndex + 1; i++) {
-        //     if (q._array[i]) {
-        //         this.abortMaterialLoading(q._array[i]);
-        //     }
-        // }
-        // this._pendingsQueue.clear();
-        // for (let i = 0; i &lt; q.length; i++) {
-        //     this.abortMaterialLoading(q[i]);
-        // }
         this._pendingsQueue.forEach((qi: Material) => {
             this.abortMaterialLoading(qi);
         })
@@ -182,7 +172,7 @@
         let seg = material.segment;
 
         if (this._isBaseLayer) {
-            material.texture = seg._isNorth ? seg.planet.solidTextureOne : seg.planet.solidTextureTwo;
+            material.texture = seg.getDefaultTexture();
         } else {
             material.texture = seg.planet.transparentTexture;
         }

diff --git a/docs/layer_Layer.ts.html b/docs/layer_Layer.ts.html
@@ -745,7 +745,6 @@
             for (let i = 0, len = p.quadTreeStrategy.quadTreeList.length; i &lt; len; i++) {
                 this._preLoadRecursive(p.quadTreeStrategy.quadTreeList[i], maxZoom);
             }
-
         }
     }
 
@@ -878,31 +877,7 @@
     }
 
     public redraw() {
-        if (this._planet) {
-
-            this._planet.quadTreeStrategy.clearLayerMaterial(this);
-
-            // this._planet._quadTree.traverseTree((n: Node) => {
-            //         if (n.segment.materials[this.__id]) {
-            //             n.segment.materials[this.__id].clear();
-            //         }
-            //     }
-            // );
-            //
-            // this._planet._quadTreeNorth.traverseTree((n: Node) => {
-            //         if (n.segment.materials[this.__id]) {
-            //             n.segment.materials[this.__id].clear();
-            //         }
-            //     }
-            // );
-            //
-            // this._planet._quadTreeSouth.traverseTree((n: Node) => {
-            //         if (n.segment.materials[this.__id]) {
-            //             n.segment.materials[this.__id].clear();
-            //         }
-            //     }
-            // );
-        }
+        this._planet?.quadTreeStrategy.clearLayerMaterial(this);
     }
 
     public abortMaterialLoading(material: Material) {

diff --git a/docs/layer_XYZ.ts.html b/docs/layer_XYZ.ts.html
@@ -227,7 +227,6 @@
                             }
                         }
                     }
-                    //,this.__id
                 );
             } else {
                 material.textureNotExists();
@@ -373,13 +372,14 @@
             em.southWest.lon = -ENLARGE_MERCATOR_LON;
         }
 
-        if (e.northEast.lat >= mercator.MAX_LAT) {
-            e.northEast.lat = mercator.MAX_LAT;
-        }
-
-        if (e.northEast.lat &lt;= mercator.MIN_LAT) {
-            e.northEast.lat = mercator.MIN_LAT;
-        }
+        // WHY!???
+        // if (e.northEast.lat >= mercator.MAX_LAT) {
+        //     e.northEast.lat = mercator.MAX_LAT;
+        // }
+        //
+        // if (e.northEast.lat &lt;= mercator.MIN_LAT) {
+        //     e.northEast.lat = mercator.MIN_LAT;
+        // }
     }
 }