Navigation

Changeset 1907

Timestamp:

11/18/06 10:19:42 (2 years ago)

Author:

crschmidt

Message:

Fix for #380 from Tim Schaub, with test. Don't overwrite already-existing parameters
in the URL. This makes the precedence of parameters:

Files:

r1872	r1907
122	122	// new params together. then convert to string
123	123	var allParams = OpenLayers.Util.extend(new Object(), this.params);
124		var allParams = OpenLayers.Util.extend(allParams, newParams);
	124	allParams = OpenLayers.Util.extend(allParams, newParams);
	125	// ignore parameters that are already in the url search string
	126	var urlParams = OpenLayers.Util.upperCaseObject(
	127	OpenLayers.Util.getArgs(url));
	128	for(var key in allParams) {
	129	if(key.toUpperCase() in urlParams) {
	130	delete allParams[key];
	131	}
	132	}
125	133	var paramsString = OpenLayers.Util.getParameterString(allParams);
126	134	if (paramsString != "") {

r1424	r1907
90	90	format: 'image/png'};
91	91
92		t.plan( 8 );
	92	t.plan( 9 );
93	93
94	94	// without ?
…	…
110	110	str = layer.getFullRequestString();
111	111	t.eq(str, "http://octo.metacarta.com/cgi-bin/mapserv?param1=5&layers=basic&format=image/png", "getFullRequestString() works for url with ?param1=5");
	112
	113	// with ?param1=5&
	114	tUrl = "http://octo.metacarta.com/cgi-bin/mapserv?param1=5&format=image/jpeg";
	115	layer = new OpenLayers.Layer.HTTPRequest(name, tUrl, tParams, null);
	116	str = layer.getFullRequestString();
	117	t.eq(str, "http://octo.metacarta.com/cgi-bin/mapserv?param1=5&format=image/jpeg&layers=basic", "getFullRequestString() doesn't override already-existing params in URL");
112	118
113	119
…	…
117	123	str = layer.getFullRequestString();
118	124	t.eq(str, "http://octo.metacarta.com/cgi-bin/mapserv?param1=5&layers=basic&format=image/png", "getFullRequestString() works for url with ?param1=5&");
	125
	126
119	127
120	128	// passing in new params