Changeset 7688

Timestamp:

08/04/08 05:20:23 (4 months ago)

Author:

elemoine

Message:

if scales is set on the map, you cannot use minScale and maxScale on the layer, p=pgiraud, r=me,euzuro (closes #1199)

Files:

• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -688 +688 @@
-        }
-
-/resolutions at the map level if
-minScale/minResolution and maxScale/maxResolution ar
-specified at the 
-this.options.minScale != null &&
-this.options.maxScale != null
+ array set at the map level if 
+either minScale or maxScale or both are set at th
+
+(this.options.minScale != null ||
+ this.options.maxScale != null)
-            this.options.scales == null) {
+
-            confProps.scales = null;
-        }
-
-
+
+
+
+
+
-            this.options.resolutions == null) {
+
-            confProps.resolutions = null;
-        }