Ticket #650: wms.patch

File wms.patch, 2.6 kB (added by crschmidt, 1 year ago)

tests/Layer/test_WMS.html

old	new
10	10	var url = "http://octo.metacarta.com/cgi-bin/mapserv";
11	11	var params = { map: '/mapdata/vmap_wms.map',
12	12	layers: 'basic',
13		format: 'image/png'};
	13	format: 'image/jpeg'};
14	14
15	15	function test_01_Layer_WMS_constructor (t) {
16		t.plan( 10 );
	16	t.plan( 13 );
17	17
	18	var trans_format = "image/png";
	19	if (OpenLayers.Util.alphaHack()) { trans_format = "image/gif"; }
	20
18	21	var url = "http://octo.metacarta.com/cgi-bin/mapserv";
19	22	layer = new OpenLayers.Layer.WMS(name, url, params);
20	23	t.ok( layer instanceof OpenLayers.Layer.WMS, "new OpenLayers.Layer.WMS returns object" );
…	…
32	35	params.TRANSPARENT = "TRUE";
33	36	var layer3 = new OpenLayers.Layer.WMS(name, url, params);
34	37	t.eq(layer3.isBaseLayer, false, "transparency == 'TRUE', wms is baselayer");
	38	t.eq(layer3.params.FORMAT, trans_format, "transparent = TRUE causes image/gif format");
35	39
36	40	params.TRANSPARENT = "TRuE";
37	41	var layer4 = new OpenLayers.Layer.WMS(name, url, params);
38	42	t.eq(layer4.isBaseLayer, true, "transparency == 'TRuE', wms is not baselayer");
	43	t.eq(layer4.params.FORMAT, trans_format, "transparent = TRuE causes image/gif format");
39	44
40	45	params.TRANSPARENT = true;
41	46	var layer5 = new OpenLayers.Layer.WMS(name, url, params);
42	47	t.eq(layer5.isBaseLayer, false, "transparency == true, wms is baselayer");
	48	t.eq(layer5.params.FORMAT, trans_format, "transparent = true causes image/gif format");
43	49
44	50	params.TRANSPARENT = false;
45	51	var layer6 = new OpenLayers.Layer.WMS(name, url, params);

old	new
51	51	(this.params.TRANSPARENT != "true") &&
52	52	(this.params.TRANSPARENT != true));
53	53	}
	54	if (this.params.TRANSPARENT && this.params.TRANSPARENT.toString().toLowerCase() == "true" && this.params.FORMAT == "image/jpeg") {
	55	if (OpenLayers.Util.alphaHack()) {
	56	this.params.FORMAT = "image/gif";
	57	} else {
	58	this.params.FORMAT = "image/png";
	59	}
	60	}
	61
54	62	},
55	63
56	64	/**