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

removing use of getArgs from the library (closes #860).

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@4080 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2007-08-28 20:18:47 +00:00
parent f2ea9b4afa
commit a1c040e3c0
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Control/ArgParser.js
View File

@@ -61,7 +61,7 @@ OpenLayers.Control.ArgParser = OpenLayers.Class(OpenLayers.Control, {
} }
if (i == this.map.controls.length) { if (i == this.map.controls.length) {
var args = OpenLayers.Util.getArgs(); var args = OpenLayers.Util.getParameters();
if (args.lat && args.lon) { if (args.lat && args.lon) {
this.center = new OpenLayers.LonLat(parseFloat(args.lon), this.center = new OpenLayers.LonLat(parseFloat(args.lon),
parseFloat(args.lat)); parseFloat(args.lat));

2
lib/OpenLayers/Layer/HTTPRequest.js
View File

@@ -181,7 +181,7 @@ OpenLayers.Layer.HTTPRequest = OpenLayers.Class(OpenLayers.Layer, {
// ignore parameters that are already in the url search string // ignore parameters that are already in the url search string
var urlParams = var urlParams =
OpenLayers.Util.upperCaseObject(OpenLayers.Util.getArgs(url)); OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(url));
for(var key in allParams) { for(var key in allParams) {
if(key.toUpperCase() in urlParams) { if(key.toUpperCase() in urlParams) {
delete allParams[key]; delete allParams[key];

2
lib/OpenLayers/Layer/MapServer.js
View File

@@ -157,7 +157,7 @@ OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
allParams = OpenLayers.Util.extend(allParams, newParams); allParams = OpenLayers.Util.extend(allParams, newParams);
// ignore parameters that are already in the url search string // ignore parameters that are already in the url search string
var urlParams = OpenLayers.Util.upperCaseObject( var urlParams = OpenLayers.Util.upperCaseObject(
OpenLayers.Util.getArgs(url)); OpenLayers.Util.getParameters(url));
for(var key in allParams) { for(var key in allParams) {
if(key.toUpperCase() in urlParams) { if(key.toUpperCase() in urlParams) {
delete allParams[key]; delete allParams[key];

2
lib/OpenLayers/Util.js
View File

@@ -1155,7 +1155,7 @@ OpenLayers.Util.createUrlObject = function(url, options) {
var qMark = url.indexOf("?"); var qMark = url.indexOf("?");
queryString = (qMark != -1) ? url.substr(qMark) : ""; queryString = (qMark != -1) ? url.substr(qMark) : "";
} }
urlObject.args = OpenLayers.Util.getArgs(queryString); urlObject.args = OpenLayers.Util.getParameters(queryString);
//pathname (this part allows for relative <-> absolute comparison) //pathname (this part allows for relative <-> absolute comparison)

4
tests/Layer/test_WMS.html
View File

@@ -317,7 +317,7 @@
map.setCenter(new OpenLayers.LonLat(0,0), 5); map.setCenter(new OpenLayers.LonLat(0,0), 5);
var tile = layer.grid[0][0]; var tile = layer.grid[0][0];
var request = layer.getURL(tile.bounds); var request = layer.getURL(tile.bounds);
var args = OpenLayers.Util.getArgs(request); var args = OpenLayers.Util.getParameters(request);
t.eq(parseInt(args['WIDTH']), t.eq(parseInt(args['WIDTH']),
tile.size.w, tile.size.w,
"layer without gutter requests images that are as wide as the tile"); "layer without gutter requests images that are as wide as the tile");
@@ -338,7 +338,7 @@
map.setCenter(new OpenLayers.LonLat(0,0), 5); map.setCenter(new OpenLayers.LonLat(0,0), 5);
var tile = layer.grid[0][0]; var tile = layer.grid[0][0];
var request = layer.getURL(tile.bounds); var request = layer.getURL(tile.bounds);
var args = OpenLayers.Util.getArgs(request); var args = OpenLayers.Util.getParameters(request);
t.eq(parseInt(args['WIDTH']), t.eq(parseInt(args['WIDTH']),
tile.size.w + (2 * gutter), tile.size.w + (2 * gutter),
"layer with gutter requests images that are wider by twice the gutter"); "layer with gutter requests images that are wider by twice the gutter");

18
tests/test_Util.html
View File

@@ -569,16 +569,22 @@
function test_Util_getParameters(t) { function test_Util_getParameters(t) {
t.plan(6); t.plan(6);
t.eq(OpenLayers.Util.getParameters('http://www.example.com'), {}, "getArgs works when args = ''"); t.eq(OpenLayers.Util.getParameters('http://www.example.com'), {},
t.eq(OpenLayers.Util.getParameters('http://www.example.com?'), {}, "getArgs works when args = '?'"); "getParameters works when args = ''");
t.eq(OpenLayers.Util.getParameters('http://www.example.com?'), {},
"getParameters works when args = '?'");
t.eq(OpenLayers.Util.getParameters('http://www.example.com?hello=world&foo=bar'), t.eq(OpenLayers.Util.getParameters('http://www.example.com?hello=world&foo=bar'),
{'hello' : 'world', 'foo': 'bar'}, "getArgs works when args = '?hello=world&foo=bar'"); {'hello' : 'world', 'foo': 'bar'},
"getParameters works when args = '?hello=world&foo=bar'");
t.eq(OpenLayers.Util.getParameters('http://www.example.com?hello=&foo=bar'), t.eq(OpenLayers.Util.getParameters('http://www.example.com?hello=&foo=bar'),
{'hello' : '', 'foo': 'bar'}, "getArgs works when args = '?hello=&foo=bar'"); {'hello' : '', 'foo': 'bar'},
"getParameters works when args = '?hello=&foo=bar'");
t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar#bugssucks'), t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar#bugssucks'),
{'foo': 'bar'}, "getArgs works when using a fragment identifier"); {'foo': 'bar'},
"getParameters works when using a fragment identifier");
t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar,pub,disco'), t.eq(OpenLayers.Util.getParameters('http://www.example.com?foo=bar,pub,disco'),
{'foo': ['bar', 'pub', 'disco']}, "getArgs works with a comma-separated value (parses into array)"); {'foo': ['bar', 'pub', 'disco']},
"getParameters works with a comma-separated value (parses into array)");
} }
function test_Util_getArgs(t) { function test_Util_getArgs(t) {