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

Merge pull request #407 from ahocevar/alwaysInRange

Browse Source 
alwaysInRange not updated when using addOptions. r=@elemoine,@bartvde
This commit is contained in:
ahocevar
2012-04-19 09:00:26 -07:00
parent 70161c5628 ef33f01504
commit a73d9e3804
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/OpenLayers/Layer.js
View File

@@ -338,6 +338,11 @@ OpenLayers.Layer = OpenLayers.Class({
this.metadata = {};
options = OpenLayers.Util.extend({}, options);
// make sure we respect alwaysInRange if set on the prototype
if (this.alwaysInRange != null) {
options.alwaysInRange = this.alwaysInRange;
}
this.addOptions(options);
this.name = name;
@@ -858,7 +863,7 @@ OpenLayers.Layer = OpenLayers.Class({
alwaysInRange = false;
}
}
if(this.alwaysInRange == null) {
if(this.options.alwaysInRange == null) {
this.alwaysInRange = alwaysInRange;
}

10
tests/Layer.html
View File

@@ -174,6 +174,16 @@
t.eq(log, 0, "addOptions doesn't call initResolutions when layer is not in map");
}
function test_addOptionsScale(t) {
t.plan(1);
var map = new OpenLayers.Map("map");
var layer = new OpenLayers.Layer.WMS();
map.addLayer(layer);
map.zoomToMaxExtent();
layer.addOptions({maxResolution: 0.5, numZoomLevels: 15});
t.eq(layer.alwaysInRange, false, "alwaysInRange should not be true anymore");
}
function test_Layer_StandardOptionsAccessors (t) {
t.plan( 4 );