Merge pull request openlayers#468 from bartvde/bboxstrategy

Fix visibility and inRange issues with the BBOX strategy (r=@elemoine)
kochizufan · May 15, 2012 · adcf5bb · adcf5bb
2 parents 4e42dec + 44f9b81
commit adcf5bb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/lib/OpenLayers/Strategy/BBOX.js b/lib/OpenLayers/Strategy/BBOX.js
@@ -81,20 +81,11 @@ OpenLayers.Strategy.BBOX = OpenLayers.Class(OpenLayers.Strategy, {
         if(activated) {
             this.layer.events.on({
                 "moveend": this.update,
-                scope: this
-            });
-            this.layer.events.on({
                 "refresh": this.update,
+                "visibilitychanged": this.update,
                 scope: this
             });
-            if(this.layer.visibility === true && this.layer.inRange === true) {
-                this.update();
-            } else {
-                this.layer.events.on({
-                    "visibilitychanged": this.update,
-                    scope: this
-                });
-            }
+            this.update();
         }
         return activated;
     },
@@ -134,7 +125,7 @@ OpenLayers.Strategy.BBOX = OpenLayers.Class(OpenLayers.Strategy, {
     update: function(options) {
         var mapBounds = this.getMapBounds();
         if (mapBounds !== null && ((options && options.force) ||
-                                   this.invalidBounds(mapBounds))) {
+          (this.layer.visibility && this.layer.calculateInRange() && this.invalidBounds(mapBounds)))) {
             this.calculateBounds(mapBounds);
             this.resolution = this.layer.map.getResolution(); 
             this.triggerRead(options);

diff --git a/tests/Strategy/BBOX.html b/tests/Strategy/BBOX.html
@@ -305,7 +305,7 @@
 
     // Test fix for Ticket #3142
     function test_layerLoadedAfterBeingAdded(t) {
-        t.plan(2);
+        t.plan(3);
 
         var dummy = new OpenLayers.Layer(null, {isBaseLayer: true});
 
@@ -341,6 +341,11 @@
         // test that the strategy bounds were set
         t.ok(map.getExtent().equals(strategy.bounds), "[set center] bounds set to map extent");
         t.eq(layerOutOfRange.strategies[0].bounds, null, "Data not requested if layer is out of range");
+
+        layerOutOfRange.setVisibility(false);
+        layerOutOfRange.setVisibility(true);
+        t.eq(layerOutOfRange.strategies[0].bounds, null, "Data not requested if layer is out of range when switching visibility");
+
         map.destroy();
     }