From f2168d13b7559d487afe5de8e9ea08eb581420da Mon Sep 17 00:00:00 2001 From: tschaub Date: Mon, 2 Jan 2012 16:07:40 -0700 Subject: [PATCH] Increase timeout to avoid flashes. Without this change, flashes are fairly frequent while zooming around a full screen map. --- examples/fullScreen.html | 6 +++--- examples/fullScreen.js | 32 +++++++++++++++++++------------- lib/OpenLayers/Layer/Grid.js | 2 +- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/examples/fullScreen.html b/examples/fullScreen.html index 7a92debd56..f5df04a21f 100644 --- a/examples/fullScreen.html +++ b/examples/fullScreen.html @@ -25,9 +25,8 @@ } - - +
@@ -38,7 +37,7 @@

Full Screen Example

- Demonstrate a map that fill the entire browser window. + Demonstrate a map that fills the entire browser window.

@@ -48,6 +47,7 @@

Full Screen Example

fullScreen.js source to see how this is done.

+ diff --git a/examples/fullScreen.js b/examples/fullScreen.js index 93ed57a027..e2ad311d19 100644 --- a/examples/fullScreen.js +++ b/examples/fullScreen.js @@ -1,15 +1,21 @@ -var map; -function init(){ - map = new OpenLayers.Map('map'); +var urls = [ + "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png", + "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png", + "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png" +]; - var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", - "http://vmap0.tiles.osgeo.org/wms/vmap0", - {layers: 'basic'} ); - var ol_wms_nobuffer = new OpenLayers.Layer.WMS( "OpenLayers WMS (no tile buffer)", - "http://vmap0.tiles.osgeo.org/wms/vmap0", - {layers: 'basic'}, {buffer: 0}); +var map = new OpenLayers.Map({ + div: "map", + layers: [ + new OpenLayers.Layer.XYZ("OSM (with buffer)", urls, { + transitionEffect: "resize", buffer: 2, sphericalMercator: true + }), + new OpenLayers.Layer.XYZ("OSM (without buffer)", urls, { + transitionEffect: "resize", buffer: 0, sphericalMercator: true + }) + ], + center: [0, 0], + zoom: 3 +}); - map.addLayers([ol_wms, ol_wms_nobuffer]); - map.addControl(new OpenLayers.Control.LayerSwitcher()); - map.setCenter(new OpenLayers.LonLat(0, 0), 6); -} +map.addControl(new OpenLayers.Control.LayerSwitcher()); \ No newline at end of file diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js index b75edc91f7..976eb674ef 100644 --- a/lib/OpenLayers/Layer/Grid.js +++ b/lib/OpenLayers/Layer/Grid.js @@ -549,7 +549,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, { window.clearTimeout(this.backBufferTimerId); } this.backBufferTimerId = window.setTimeout( - OpenLayers.Function.bind(this.removeBackBuffer, this), 800); + OpenLayers.Function.bind(this.removeBackBuffer, this), 2500); }, /**