From 98fb795f97b37a1980ad7029172384f0cf6ed62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Sat, 5 May 2012 14:27:12 +0200 Subject: [PATCH 1/2] set VERSION_NUMBER to 2.12-rc3 --- lib/OpenLayers.js | 2 +- lib/OpenLayers/SingleFile.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js index f6df5e1915..24c7d0e8b5 100644 --- a/lib/OpenLayers.js +++ b/lib/OpenLayers.js @@ -414,4 +414,4 @@ /** * Constant: VERSION_NUMBER */ -OpenLayers.VERSION_NUMBER="Release 2.12-rc2"; +OpenLayers.VERSION_NUMBER="Release 2.12-rc3"; diff --git a/lib/OpenLayers/SingleFile.js b/lib/OpenLayers/SingleFile.js index 5ea5ae5a31..53060cc956 100644 --- a/lib/OpenLayers/SingleFile.js +++ b/lib/OpenLayers/SingleFile.js @@ -7,7 +7,7 @@ var OpenLayers = { /** * Constant: VERSION_NUMBER */ - VERSION_NUMBER: "Release 2.12-rc2", + VERSION_NUMBER: "Release 2.12-rc3", /** * Constant: singleFile From 4ad6bacc5d1507aa379e11e534491acdf5186731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Thu, 10 May 2012 15:42:59 +0200 Subject: [PATCH 2/2] when calculating maxResolution from maxExtent and tileSize we dont want to the actual tile size for single layers --- lib/OpenLayers/Layer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js index 73ce4e8024..d152400977 100644 --- a/lib/OpenLayers/Layer.js +++ b/lib/OpenLayers/Layer.js @@ -1010,7 +1010,7 @@ OpenLayers.Layer = OpenLayers.Class({ this.maxExtent != null) { // maxResolution for default grid sets assumes that at zoom // level zero, the whole world fits on one tile. - var tileSize = this.tileSize || this.map.getTileSize(); + var tileSize = this.map.getTileSize(); maxResolution = Math.max( this.maxExtent.getWidth() / tileSize.w, this.maxExtent.getHeight() / tileSize.h