Merge pull request #1231 from snkashis/fix_wms_params

handle existing query strings for WMS urls , #973

spec/suites/core/UtilSpec.js

@@ -61,6 +61,35 @@ describe('Util', function() {
 		});
 	});
 
+
+	describe('#getParamString', function() {
+		it('should create a valid query string for appending depending on url input', function() {
+			var a = {
+				url: "http://example.com/get",
+				obj: {bar: 7, baz: 3},
+				result: "?bar=7&baz=3"
+			};
+
+			expect(L.Util.getParamString(a.obj,a.url)).toEqual(a.result);
+			
+			var b = {	
+				url: "http://example.com/get?justone=qs",
+				obj: {bar: 7, baz: 3},
+				result: "&bar=7&baz=3"
+			};
+			
+			expect(L.Util.getParamString(b.obj,b.url)).toEqual(b.result);
+
+			var c = {	
+				url: undefined,
+				obj: {bar: 7, baz: 3},
+				result: "?bar=7&baz=3"
+			};
+			
+			expect(L.Util.getParamString(c.obj,c.url)).toEqual(c.result);
+		});
+	});
+
 	// TODO cancel/requestAnimFrame?
 
 	// TODO limitExecByInterval
@@ -71,7 +100,5 @@ describe('Util', function() {
 
 	// TODO setOptions
 
-	// TODO getParamString
-
 	// TODO template
-});
+});

src/core/Util.js

@@ -77,14 +77,14 @@ L.Util = {
 		return obj.options;
 	},
 
-	getParamString: function (obj) {
+	getParamString: function (obj, existingUrl) {
 		var params = [];
 		for (var i in obj) {
 			if (obj.hasOwnProperty(i)) {
 				params.push(i + '=' + obj[i]);
 			}
 		}
-		return '?' + params.join('&');
+		return ((!existingUrl || existingUrl.indexOf('?') === -1) ? '?' : '&') + params.join('&');
 	},
 
 	template: function (str, data) {

src/layer/tile/TileLayer.WMS.js

@@ -64,7 +64,7 @@ L.TileLayer.WMS = L.TileLayer.extend({
 
 		    url = L.Util.template(this._url, {s: this._getSubdomain(tilePoint)});
 
-		return url + L.Util.getParamString(this.wmsParams) + "&bbox=" + bbox;
+		return url + L.Util.getParamString(this.wmsParams, url) + "&bbox=" + bbox;
 	},
 
 	setParams: function (params, noRedraw) {