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

fix for #678 - WMS specs say that *values* and not *parameters* are case sensitive, and the parameter 'transparent' is to be interpreted as true only when its value is 'TRUE'. Previous to this patch, we were only testing if it was equal to 'true'. Now we test for both. This patch applies the same logic to WMS.js and to WMS/Untiled.js, as well as providing some tests to make sure that it works. Thanks and a shout out to gmailer kablukiw wherever s/he may be for the great bug find and report

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@3290 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2007-06-07 22:03:15 +00:00
parent 79acc45db6
commit a98da53818
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/OpenLayers/Layer/WMS.js
View File

@@ -47,7 +47,8 @@ OpenLayers.Layer.WMS.prototype =
// unless explicitly set in options, if the layer is transparent,
// it will be an overlay
if (options == null || options.isBaseLayer == null) {
this.isBaseLayer = ((this.params.TRANSPARENT != "true") &&
this.isBaseLayer = ((this.params.TRANSPARENT != "TRUE") &&
(this.params.TRANSPARENT != "true") &&
(this.params.TRANSPARENT != true));
}
},

3
lib/OpenLayers/Layer/WMS/Untiled.js
View File

@@ -57,7 +57,8 @@ OpenLayers.Layer.WMS.Untiled.prototype =
// unless explicitly set in options, if the layer is transparent,
// it will be an overlay
if ((options == null) || (options.isBaseLayer == null)) {
this.isBaseLayer = ((this.params.TRANSPARENT != "true") &&
this.isBaseLayer = ((this.params.TRANSPARENT != "TRUE") &&
(this.params.TRANSPARENT != "true") &&
(this.params.TRANSPARENT != true));
}
},

22
tests/Layer/test_WMS.html
View File

@@ -13,7 +13,7 @@
format: 'image/png'};
function test_01_Layer_WMS_constructor (t) {
t.plan( 4 );
t.plan( 10 );
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
layer = new OpenLayers.Layer.WMS(name, url, params);
@@ -23,7 +23,27 @@
t.eq( layer.params.SERVICE, "WMS", "default params correclty uppercased and copied");
t.eq(layer.isBaseLayer, true, "no transparency setting, wms is baselayer");
params.TRANSPARENT = "true";
var layer2 = new OpenLayers.Layer.WMS(name, url, params);
t.eq(layer2.isBaseLayer, false, "transparency == 'true', wms is baselayer");
params.TRANSPARENT = "TRUE";
var layer3 = new OpenLayers.Layer.WMS(name, url, params);
t.eq(layer3.isBaseLayer, false, "transparency == 'TRUE', wms is baselayer");
params.TRANSPARENT = "TRuE";
var layer4 = new OpenLayers.Layer.WMS(name, url, params);
t.eq(layer4.isBaseLayer, true, "transparency == 'TRuE', wms is not baselayer");
params.TRANSPARENT = true;
var layer5 = new OpenLayers.Layer.WMS(name, url, params);
t.eq(layer5.isBaseLayer, false, "transparency == true, wms is baselayer");
params.TRANSPARENT = false;
var layer6 = new OpenLayers.Layer.WMS(name, url, params);
t.eq(layer6.isBaseLayer, true, "transparency == false, wms is not baselayer");
}
function test_02_Layer_WMS_addtile (t) {