Ticket #678: transparent.patch

File transparent.patch, 3.1 kB (added by euzuro, 1 year ago)
taking sde's patch and applying the same logic to WMS/Untiled. Goodness knows that it is embarrassing and wrong the way those two classes are the same and yet different. but those are the breaks right now. anyways. i've also augmented the wms layer's tests (not those of untiled because there are no those of untiled). alas alas. sigh

tests/Layer/test_WMS.html

old	new
13	13	format: 'image/png'};
14	14
15	15	function test_01_Layer_WMS_constructor (t) {
16		t.plan( 4 );
	16	t.plan( 10 );
17	17
18	18	var url = "http://octo.metacarta.com/cgi-bin/mapserv";
19	19	layer = new OpenLayers.Layer.WMS(name, url, params);
…	…
23	23
24	24	t.eq( layer.params.SERVICE, "WMS", "default params correclty uppercased and copied");
25	25
	26	t.eq(layer.isBaseLayer, true, "no transparency setting, wms is baselayer");
26	27
	28	params.TRANSPARENT = "true";
	29	var layer2 = new OpenLayers.Layer.WMS(name, url, params);
	30	t.eq(layer2.isBaseLayer, false, "transparency == 'true', wms is baselayer");
	31
	32	params.TRANSPARENT = "TRUE";
	33	var layer3 = new OpenLayers.Layer.WMS(name, url, params);
	34	t.eq(layer3.isBaseLayer, false, "transparency == 'TRUE', wms is baselayer");
	35
	36	params.TRANSPARENT = "TRuE";
	37	var layer4 = new OpenLayers.Layer.WMS(name, url, params);
	38	t.eq(layer4.isBaseLayer, true, "transparency == 'TRuE', wms is not baselayer");
	39
	40	params.TRANSPARENT = true;
	41	var layer5 = new OpenLayers.Layer.WMS(name, url, params);
	42	t.eq(layer5.isBaseLayer, false, "transparency == true, wms is baselayer");
	43
	44	params.TRANSPARENT = false;
	45	var layer6 = new OpenLayers.Layer.WMS(name, url, params);
	46	t.eq(layer6.isBaseLayer, true, "transparency == false, wms is not baselayer");
27	47	}
28	48
29	49	function test_02_Layer_WMS_addtile (t) {

old	new
47	47	// unless explicitly set in options, if the layer is transparent,
48	48	// it will be an overlay
49	49	if (options == null \|\| options.isBaseLayer == null) {
50		this.isBaseLayer = ((this.params.TRANSPARENT != "true") &&
	50	this.isBaseLayer = ((this.params.TRANSPARENT != "TRUE") &&
	51	(this.params.TRANSPARENT != "true") &&
51	52	(this.params.TRANSPARENT != true));
52	53	}
53	54	},

old	new
57	57	// unless explicitly set in options, if the layer is transparent,
58	58	// it will be an overlay
59	59	if ((options == null) \|\| (options.isBaseLayer == null)) {
60		this.isBaseLayer = ((this.params.TRANSPARENT != "true") &&
	60	this.isBaseLayer = ((this.params.TRANSPARENT != "TRUE") &&
	61	(this.params.TRANSPARENT != "true") &&
61	62	(this.params.TRANSPARENT != true));
62	63	}
63	64	},