From 21191ad0b95a0dd2fa4aac6cf104c4998d257f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@camptocamp.com>
Date: Mon, 4 Aug 2008 09:20:23 +0000
Subject: [PATCH] if scales is set on the map, you cannot use minScale and
 maxScale on the layer, p=pgiraud, r=me,euzuro (closes #1199)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@7688 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Layer.js | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js
index 8266597e18..fb2b4e130a 100644
--- a/lib/OpenLayers/Layer.js
+++ b/lib/OpenLayers/Layer.js
@@ -687,17 +687,22 @@ OpenLayers.Layer = OpenLayers.Class({
             confProps[property] = this.options[property] || this.map[property];
         }
 
-        // Do not use the scales/resolutions at the map level if
-        // minScale/minResolution and maxScale/maxResolution are
-        // specified at the layer level
-        if (this.options.minScale != null &&
-            this.options.maxScale != null &&
+        // Do not use the scales array set at the map level if 
+        // either minScale or maxScale or both are set at the
+        // layer level
+        if ((this.options.minScale != null ||
+             this.options.maxScale != null) &&
             this.options.scales == null) {
+
             confProps.scales = null;
         }
-        if (this.options.minResolution != null &&
-            this.options.maxResolution != null &&
+        // Do not use the resolutions array set at the map level if 
+        // either minResolution or maxResolution or both are set at the
+        // layer level
+        if ((this.options.minResolution != null ||
+             this.options.maxResolution != null) &&
             this.options.resolutions == null) {
+
             confProps.resolutions = null;
         }