ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BBOX strategy should not request data if its layer is out of range when changing layer visibility

Browse Source
This commit is contained in:
Bart van den Eijnden
2012-05-15 12:18:42 +02:00
parent 685eae7c04
commit bca3e45940
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Strategy/BBOX.js
+2 -2
View File
@@ -87,7 +87,7 @@ OpenLayers.Strategy.BBOX = OpenLayers.Class(OpenLayers.Strategy, {
"refresh": this.update, "refresh": this.update,
scope: this scope: this
}); });
if(this.layer.visibility === true && this.layer.inRange === true) { if(this.layer.visibility === true) {
this.update(); this.update();
} else { } else {
this.layer.events.on({ this.layer.events.on({
@@ -134,7 +134,7 @@ OpenLayers.Strategy.BBOX = OpenLayers.Class(OpenLayers.Strategy, {
update: function(options) { update: function(options) {
var mapBounds = this.getMapBounds(); var mapBounds = this.getMapBounds();
if (mapBounds !== null && ((options && options.force) || if (mapBounds !== null && ((options && options.force) ||
this.invalidBounds(mapBounds))) { (this.layer.calculateInRange() && this.invalidBounds(mapBounds)))) {
this.calculateBounds(mapBounds); this.calculateBounds(mapBounds);
this.resolution = this.layer.map.getResolution(); this.resolution = this.layer.map.getResolution();
this.triggerRead(options); this.triggerRead(options);
tests/Strategy/BBOX.html
+6 -1
View File
@@ -305,7 +305,7 @@
// Test fix for Ticket #3142 // Test fix for Ticket #3142
function test_layerLoadedAfterBeingAdded(t) { function test_layerLoadedAfterBeingAdded(t) {
t.plan(2); t.plan(3);
var dummy = new OpenLayers.Layer(null, {isBaseLayer: true}); var dummy = new OpenLayers.Layer(null, {isBaseLayer: true});
@@ -341,6 +341,11 @@
// test that the strategy bounds were set // test that the strategy bounds were set
t.ok(map.getExtent().equals(strategy.bounds), "[set center] bounds set to map extent"); 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"); 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(); map.destroy();
} }