diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js index ce6332a3c9..c6d21fc811 100644 --- a/lib/OpenLayers/Layer/Grid.js +++ b/lib/OpenLayers/Layer/Grid.js @@ -559,23 +559,6 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, { } OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this, [size]); }, - - /** - * Method: getGridBounds - * Deprecated. This function will be removed in 3.0. Please use - * getTilesBounds() instead. - * - * Returns: - * {} A Bounds object representing the bounds of all the - * currently loaded tiles (including those partially or not at all seen - * onscreen) - */ - getGridBounds: function() { - var msg = "The getGridBounds() function is deprecated. It will be " + - "removed in 3.0. Please use getTilesBounds() instead."; - OpenLayers.Console.warn(msg); - return this.getTilesBounds(); - }, /** * APIMethod: getTilesBounds diff --git a/lib/deprecated.js b/lib/deprecated.js index 266dffbeb5..46004f3ede 100644 --- a/lib/deprecated.js +++ b/lib/deprecated.js @@ -1805,6 +1805,30 @@ OpenLayers.Control.MouseToolbar = OpenLayers.Class( OpenLayers.Control.MouseToolbar.X = 6; OpenLayers.Control.MouseToolbar.Y = 300; +/** + * Class: OpenLayers.Layer.Grid + */ + +OpenLayers.Util.extend(OpenLayers.Layer.Grid.prototype, { + + /** + * Method: getGridBounds + * Deprecated. This function will be removed in 3.0. Please use + * getTilesBounds() instead. + * + * Returns: + * {} A Bounds object representing the bounds of all the + * currently loaded tiles (including those partially or not at all seen + * onscreen) + */ + getGridBounds: function() { + var msg = "The getGridBounds() function is deprecated. It will be " + + "removed in 3.0. Please use getTilesBounds() instead."; + OpenLayers.Console.warn(msg); + return this.getTilesBounds(); + } +}); + /** * Class: OpenLayers.Format.XML */ diff --git a/tests/Layer/Grid.html b/tests/Layer/Grid.html index afeb1ec850..cd773bb268 100644 --- a/tests/Layer/Grid.html +++ b/tests/Layer/Grid.html @@ -94,7 +94,7 @@ function test_Layer_Grid_getTilesBounds(t) { - t.plan( 4 ); + t.plan(3); layer = new OpenLayers.Layer.WMS(name, url, params); @@ -110,10 +110,6 @@ t.ok( bounds.equals(testBounds), "getTilesBounds() returns correct bounds"); - var bounds = layer.getGridBounds(); - - t.ok( bounds.equals(testBounds), "getGridBounds() wrapper works the same as getTilesBounds."); - //no tiles layer.grid = []; bounds = layer.getTilesBounds();