diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js index e8e371488d..e8938f827a 100644 --- a/lib/OpenLayers/Layer/Grid.js +++ b/lib/OpenLayers/Layer/Grid.js @@ -78,8 +78,11 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, { * {Integer} Used only when in gridded mode, this specifies the number of * extra rows and colums of tiles on each side which will * surround the minimum grid tiles to cover the map. + * For very slow loading layers, a larger value may increase + * performance somewhat when dragging, but will increase bandwidth + * use significantly. */ - buffer: 2, + buffer: 0, /** * APIProperty: numLoadingTiles diff --git a/tests/Layer/ArcGIS93Rest.html b/tests/Layer/ArcGIS93Rest.html index 1b2693bd54..a8ff410bdc 100644 --- a/tests/Layer/ArcGIS93Rest.html +++ b/tests/Layer/ArcGIS93Rest.html @@ -94,7 +94,7 @@ var params = {layers: "show:0,2"}; t.plan( 2 ); var map = new OpenLayers.Map('map'); - layer = new OpenLayers.Layer.ArcGIS93Rest(name, url, params); + layer = new OpenLayers.Layer.ArcGIS93Rest(name, url, params, {buffer: 2}); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0),5); t.eq( layer.grid.length, 7, "Grid rows is correct." ); diff --git a/tests/Layer/Grid.html b/tests/Layer/Grid.html index ac4f35cf51..80dd7300bd 100644 --- a/tests/Layer/Grid.html +++ b/tests/Layer/Grid.html @@ -27,7 +27,7 @@ layer = new OpenLayers.Layer.Grid(name, url, params, null); t.ok( layer instanceof OpenLayers.Layer.Grid, "returns OpenLayers.Layer.Grid object" ); - t.eq( layer.buffer, 2, "buffer default is 2"); + t.eq( layer.buffer, 0, "buffer default is 0"); t.eq( layer.ratio, 1.5, "ratio default is 1.5"); t.eq( layer.numLoadingTiles, 0, "numLoadingTiles starts at 0"); t.ok( layer.events.listeners["tileloaded"] != null, "'tileloaded' event added to layer's event types"); @@ -47,7 +47,7 @@ function test_Layer_Grid_inittiles (t) { t.plan( 2 ); var map = new OpenLayers.Map('map'); - layer = new OpenLayers.Layer.WMS(name, url, params); + layer = new OpenLayers.Layer.WMS(name, url, params, {buffer:2}); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0),5); t.eq( layer.grid.length, 7, "Grid rows is correct." ); diff --git a/tests/Layer/KaMap.html b/tests/Layer/KaMap.html index 013d36dd11..af2003a1d2 100644 --- a/tests/Layer/KaMap.html +++ b/tests/Layer/KaMap.html @@ -65,8 +65,8 @@ layer = new OpenLayers.Layer.KaMap(name, url, params, units); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0),5); - t.eq( layer.grid.length, 8, "KaMap rows is correct." ); - t.eq( layer.grid[0].length, 6, "KaMap cols is correct." ); + t.eq( layer.grid.length, 4, "KaMap rows is correct." ); + t.eq( layer.grid[0].length, 3, "KaMap cols is correct." ); map.destroy(); } diff --git a/tests/Layer/MapGuide.html b/tests/Layer/MapGuide.html index d0ffd16dbf..b1eb386c27 100644 --- a/tests/Layer/MapGuide.html +++ b/tests/Layer/MapGuide.html @@ -69,7 +69,7 @@ layer = new OpenLayers.Layer.MapGuide(name, url, paramsTiled); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,400000),5); - t.eq( layer.grid.length, 6, "Grid rows is correct." ); + t.eq( layer.grid.length, 3, "Grid rows is correct." ); // t.eq( layer.grid[0].length, 6, "Grid cols is correct." ); map.destroy(); } diff --git a/tests/Layer/MapServer.html b/tests/Layer/MapServer.html index 8c4314ddf1..1e4e52d48f 100644 --- a/tests/Layer/MapServer.html +++ b/tests/Layer/MapServer.html @@ -74,11 +74,11 @@ function test_Layer_MapServer_inittiles (t) { t.plan( 2 ); var map = new OpenLayers.Map('map'); - layer = new OpenLayers.Layer.MapServer(name, url, params); + layer = new OpenLayers.Layer.MapServer(name, url, params, {buffer: 0}); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0),5); - t.eq( layer.grid.length, 7, "Grid rows is correct." ); - t.eq( layer.grid[0].length, 6, "Grid cols is correct." ); + t.eq( layer.grid.length, 4, "Grid rows is correct." ); + t.eq( layer.grid[0].length, 3, "Grid cols is correct." ); map.destroy(); } @@ -234,7 +234,7 @@ var map = new OpenLayers.Map('map'); var layer = new OpenLayers.Layer.Google("Google"); map.addLayer(layer); - layer = new OpenLayers.Layer.MapServer(name, url, params, {isBaseLayer: false, reproject: true}); + layer = new OpenLayers.Layer.MapServer(name, url, params, {isBaseLayer: false, reproject: true, buffer: 2}); layer.isBaseLayer=false; map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0), 5); @@ -251,7 +251,7 @@ } var map = new OpenLayers.Map('map'); - layer = new OpenLayers.Layer.MapServer(name, url, params); + layer = new OpenLayers.Layer.MapServer(name, url, params, {buffer:2}); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0), 5); var tile = layer.grid[0][0]; diff --git a/tests/Layer/TMS.html b/tests/Layer/TMS.html index 3bfc3cb856..c55d02bda7 100644 --- a/tests/Layer/TMS.html +++ b/tests/Layer/TMS.html @@ -134,7 +134,7 @@ t.plan(1); m = new OpenLayers.Map("map", {'maxExtent':new OpenLayers.Bounds(-122.6579,37.4901,-122.0738,37.8795)}); layer = new OpenLayers.Layer.TMS( "TMS", - "http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png', resolutions:[0.000634956337608418]} ); + "http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png', resolutions:[0.000634956337608418], buffer: 2} ); m.addLayer(layer); m.zoomToMaxExtent(); t.eq(layer.getURL(layer.grid[3][3].bounds), "http://labs.metacarta.com/wms-c/Basic.py/1.0.0/basic/0/1/1.png", "TMS tiles around rounded properly."); diff --git a/tests/Layer/WMS.html b/tests/Layer/WMS.html index 839c77c348..30d4e6b5c6 100644 --- a/tests/Layer/WMS.html +++ b/tests/Layer/WMS.html @@ -146,7 +146,7 @@ function test_Layer_WMS_inittiles (t) { t.plan( 2 ); var map = new OpenLayers.Map('map'); - layer = new OpenLayers.Layer.WMS(name, url, params); + layer = new OpenLayers.Layer.WMS(name, url, params, {buffer:2}); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0),5); t.eq( layer.grid.length, 7, "Grid rows is correct." ); @@ -312,7 +312,7 @@ var layer = new OpenLayers.Layer.Google("Google"); map.addLayer(layer); var wmslayer = new OpenLayers.Layer.WMS(name, url, params, - {isBaseLayer: false, reproject:true}); + {isBaseLayer: false, reproject:true, buffer: 2}); wmslayer.isBaseLayer=false; map.addLayer(wmslayer); map.setCenter(new OpenLayers.LonLat(0,0), 5); @@ -329,7 +329,7 @@ } var map = new OpenLayers.Map('map'); - layer = new OpenLayers.Layer.WMS(name, url, params); + layer = new OpenLayers.Layer.WMS(name, url, params, {buffer: 2}); map.addLayer(layer); map.setCenter(new OpenLayers.LonLat(0,0), 5); var tile = layer.grid[0][0]; diff --git a/tests/Layer/WrapDateLine.html b/tests/Layer/WrapDateLine.html index deeb874778..8739b8d7b4 100644 --- a/tests/Layer/WrapDateLine.html +++ b/tests/Layer/WrapDateLine.html @@ -130,7 +130,7 @@ t.plan( 3 ); var url = "http://octo.metacarta.com/cgi-bin/mapserv"; - layer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true,encodeBBOX:true}); + layer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true,encodeBBOX:true, buffer: 2}); var m = new OpenLayers.Map('map'); m.addLayer(layer); m.zoomToMaxExtent(); @@ -146,7 +146,7 @@ var layer = new OpenLayers.Layer.KaMap( "Blue Marble NG", "http://www.openlayers.org/world/index.php", {g: "satellite", map: "world"}, - {wrapDateLine: true} ); + {wrapDateLine: true, buffer: 2} ); var m = new OpenLayers.Map('map'); m.addLayer(layer); m.zoomToMaxExtent(); @@ -158,13 +158,13 @@ function test_Layer_WrapDateLine_WMS_Overlay (t) { t.plan( 3 ); var url = "http://octo.metacarta.com/cgi-bin/mapserv"; - baselayer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true}); + baselayer = new OpenLayers.Layer.WMS(name, url, params, {'wrapDateLine':true, buffer: 2}); var layer = new OpenLayers.Layer.WMS( "DM Solutions Demo", "http://www2.dmsolutions.ca/cgi-bin/mswms_gmap", {layers: "bathymetry,land_fn,park,drain_fn,drainage," + "prov_bound,fedlimit,rail,road,popplace", transparent: "true", format: "image/png"}, - {wrapDateLine: true, reproject: false,encodeBBOX:true}); + {wrapDateLine: true, reproject: false,encodeBBOX:true, buffer:2}); var m = new OpenLayers.Map('map'); m.addLayers([baselayer,layer]); m.zoomToMaxExtent(); diff --git a/tests/Layer/XYZ.html b/tests/Layer/XYZ.html index c59cb76b6c..dd15b56d7d 100644 --- a/tests/Layer/XYZ.html +++ b/tests/Layer/XYZ.html @@ -126,7 +126,7 @@ t.plan(1); m = new OpenLayers.Map("map", {'maxExtent':new OpenLayers.Bounds(-122.6579,37.4901,-122.0738,37.8795)}); layer = new OpenLayers.Layer.XYZ( "XYZ", - url, {layername: 'basic', type:'png', resolutions:[0.000634956337608418]} ); + url, {layername: 'basic', type:'png', resolutions:[0.000634956337608418], buffer: 2} ); m.addLayer(layer); m.zoomToMaxExtent() t.eq(layer.getURL(layer.grid[3][3].bounds), "http://labs.metacarta.com/wms-c/Basic.py/1.0.0/basic/0/1/0.png", "XYZ tiles around rounded properly.");