Merge 2.0 branch to trunk.

git-svn-id: http://svn.openlayers.org/trunk/openlayers@1369 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

lib/OpenLayers/Layer.js

@@ -51,10 +51,7 @@ OpenLayers.Layer.prototype = {
     maxResolution: null,
 
     /** @type int */
-    minZoomLevel: null,
-    
-    /** @type int */
-    maxZoomLevel: null,
+    numZoomLevels: null,
    
     /** @type float */
     minScale: null,
@@ -148,6 +145,12 @@ OpenLayers.Layer.prototype = {
         Object.extend(this, this.options);
     },
     
+    /**
+     * 
+     */
+    onMapResize: function() {
+        //this function can be implemented by subclasses  
+    },
 
     /**
      * @param {OpenLayers.Bounds} bound
@@ -163,19 +166,25 @@ OpenLayers.Layer.prototype = {
      *   so that subclasses can override this and take special action once 
      *   they have their map variable set. 
      * 
+     *  Here we take care to bring over any of the necessary default properties
+     *   from the map. 
+     * 
      * @param {OpenLayers.Map} map
      */
     setMap: function(map) {
         this.map = map;
         
         var properties = new Array(
-          'projection', 'minExtent', 'maxExtent',
-          'minScale', 'maxScale',
+          'projection', 'units',
+          'scales', 'resolutions',
+          'maxScale', 'minScale', 
           'maxResolution', 'minResolution', 
-          'minZoomLevel', 'maxZoomLevel', 'units',
-          'scales', 'resolutions'
-          
+          'minExtent', 'maxExtent',
+          'numZoomLevels'
         );
+        if (this.map.maxZoomLevel && !this.numZoomLevels) {
+            this.numZoomLevels = this.map.maxZoomLevel + 1;
+        }
         for(var i=0; i < properties.length; i++) {
             if (this[properties[i]] == null) {
                 this[properties[i]] = this.map[properties[i]];
@@ -220,6 +229,16 @@ OpenLayers.Layer.prototype = {
   /*                                                      */
   /********************************************************/
     
+    /** 
+     * @param {Boolean} isBaseLayer 
+     */
+    setIsBaseLayer: function(isBaseLayer) {
+        this.isBaseLayer = isBaseLayer;
+        if (this.map != null) {
+            this.map.events.triggerEvent("changelayer");
+        }
+    },
+    
     /**
      * @type String
      */
@@ -242,19 +261,11 @@ OpenLayers.Layer.prototype = {
     },
     
     /**
-     * @returns The minimum zoom level that can be reached in this layer
+     * @returns The total number of zoom levels this layer can reach
      * @type int
      */
-    getMinZoomLevel: function() {
-        return this.minZoomLevel;
-    },
-
-    /**
-     * @returns The maximum zoom level that can be reached in this layer
-     * @type int
-     */
-    getMaxZoomLevel: function() {
-        return this.maxZoomLevel;
+    getNumZoomLevels: function() {
+        return this.numZoomLevels;
     },
 
   /********************************************************/
@@ -272,7 +283,7 @@ OpenLayers.Layer.prototype = {
      */
     getResolution: function() {
         var viewSize = this.map.getSize();
-        var extent = this.map.getExtent();
+        var extent = this.getExtent();
         return Math.max( extent.getWidth()  / viewSize.w,
                          extent.getHeight() / viewSize.h );
     },
@@ -316,7 +327,7 @@ OpenLayers.Layer.prototype = {
     */
     getLonLatFromViewPortPx: function (viewPortPx) {
         var size = this.map.getSize();
-        var center = this.map.getCenter();        //map center lon/lat
+        var center = this.map.getCenter();
         var res  = this.map.getResolution();
     
         var delta_x = viewPortPx.x - (size.w / 2);