From 29d6d8f017cddfc3844f3e7a196c5075db1115bf Mon Sep 17 00:00:00 2001 From: euzuro Date: Sat, 19 Aug 2006 06:13:09 +0000 Subject: [PATCH] allow 'auto' for minResolution if minExtent is set git-svn-id: http://svn.openlayers.org/branches/openlayers/2.0@1310 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Layer/HTTPRequest.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/OpenLayers/Layer/HTTPRequest.js b/lib/OpenLayers/Layer/HTTPRequest.js index 5fd2492162..b1ef76f2e2 100644 --- a/lib/OpenLayers/Layer/HTTPRequest.js +++ b/lib/OpenLayers/Layer/HTTPRequest.js @@ -177,20 +177,25 @@ OpenLayers.Layer.HTTPRequest.prototype = OpenLayers.Util.getResolutionFromScale(this.minScale, this.units); } else if (this.maxResolution == "auto") { - var maxExtent = this.getMaxExtent(); var viewSize = this.map.getSize(); - var wRes = maxExtent.getWidth() / viewSize.w; - var hRes = maxExtent.getHeight()/ viewSize.h; + var wRes = this.maxExtent.getWidth() / viewSize.w; + var hRes = this.maxExtent.getHeight()/ viewSize.h; this.maxResolution = Math.max(wRes, hRes); } - // determine numZoomLevels - + // determine minResolution if (this.maxScale != null) { this.minResolution = OpenLayers.Util.getResolutionFromScale(this.maxScale); - } + } else if ((this.minResolution == "auto") && + (this.minExtent != null)){ + var viewSize = this.map.getSize(); + var wRes = this.minExtent.getWidth() / viewSize.w; + var hRes = this.minExtent.getHeight()/ viewSize.h; + this.minResolution = Math.max(wRes, hRes); + } + // determine numZoomLevels if (this.minResolution != null) { var ratio = this.maxResolution / this.minResolution; this.numZoomLevels =