Merge remote-tracking branch 'upstream/master' into utfgrid

lib/OpenLayers/Layer/ArcIMS.js

@@ -205,12 +205,10 @@ OpenLayers.Layer.ArcIMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
      * Parameters:
      * bounds - {<OpenLayers.Bounds>} A bounds representing the bbox for the
      *     request.
-     * scope - {Object} The scope of the callback method.
-     * prop - {String} The name of the property in the scoped object to 
-     *     recieve the image url.
      * callback - {Function} Function to call when image url is retrieved.
+     * scope - {Object} The scope of the callback method.
      */
-    getURLasync: function(bounds, scope, prop, callback) {
+    getURLasync: function(bounds, callback, scope) {
         bounds = this.adjustBounds(bounds);
         
         // create an arcxml request to generate the image
@@ -239,11 +237,7 @@ OpenLayers.Layer.ArcIMS = OpenLayers.Class(OpenLayers.Layer.Grid, {
                 var axlResp = new OpenLayers.Format.ArcXML();
                 var arcxml = axlResp.read(doc);
                 
-                scope[prop] = this.getUrlOrImage(arcxml.image.output);
-
-                // call the callback function to recieve the updated property on the
-                // scoped object
-                callback.apply(scope);
+                callback.call(scope, this.getUrlOrImage(arcxml.image.output));
             },
             scope: this
         });

lib/OpenLayers/Layer/Boxes.js

@@ -25,9 +25,6 @@ OpenLayers.Layer.Boxes = OpenLayers.Class(OpenLayers.Layer.Markers, {
      * name - {String} 
      * options - {Object} Hashtable of extra options to tag onto the layer
      */
-    initialize: function (name, options) {
-        OpenLayers.Layer.Markers.prototype.initialize.apply(this, arguments);
-    },
     
     /**
      * Method: drawMarker 

lib/OpenLayers/Layer/FixedZoomLevels.js

@@ -77,7 +77,7 @@ OpenLayers.Layer.FixedZoomLevels = OpenLayers.Class({
      */
     initResolutions: function() {
 
-        var props = new Array('minZoomLevel', 'maxZoomLevel', 'numZoomLevels');
+        var props = ['minZoomLevel', 'maxZoomLevel', 'numZoomLevels'];
           
         for(var i=0, len=props.length; i<len; i++) {
             var property = props[i];

lib/OpenLayers/Layer/Grid.js

@@ -677,8 +677,10 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
      * Generate parameters for the grid layout.
      *
      * Parameters:
-     * bounds - {<OpenLayers.Bound>}
-     * origin - {<OpenLayers.LonLat>}
+     * bounds - {<OpenLayers.Bound>|Object} OpenLayers.Bounds or an
+     *     object with a 'left' and 'top' properties.
+     * origin - {<OpenLayers.LonLat>|Object} OpenLayers.LonLat or an
+     *     object with a 'lon' and 'lat' properties.
      * resolution - {Number}
      *
      * Returns:
@@ -686,8 +688,6 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
      * tileoffsetlat, tileoffsetx, tileoffsety
      */
     calculateGridLayout: function(bounds, origin, resolution) {
-        bounds = bounds.clone();
-        
         var tilelon = resolution * this.tileSize.w;
         var tilelat = resolution * this.tileSize.h;
         

lib/OpenLayers/Layer/MapServer.js

@@ -39,9 +39,7 @@ OpenLayers.Layer.MapServer = OpenLayers.Class(OpenLayers.Layer.Grid, {
      * options - {Object} Hashtable of extra options to tag onto the layer
      */
     initialize: function(name, url, params, options) {
-        var newArguments = [];
-        newArguments.push(name, url, params, options);
-        OpenLayers.Layer.Grid.prototype.initialize.apply(this, newArguments);
+        OpenLayers.Layer.Grid.prototype.initialize.apply(this, arguments);
 
         this.params = OpenLayers.Util.applyDefaults(
             this.params, this.DEFAULT_PARAMS

lib/OpenLayers/Layer/PointTrack.js

@@ -44,9 +44,6 @@ OpenLayers.Layer.PointTrack = OpenLayers.Class(OpenLayers.Layer.Vector, {
      * options  - {Object} Optional object with properties to tag onto the
      *            instance.
      */    
-    initialize: function(name, options) {
-        OpenLayers.Layer.Vector.prototype.initialize.apply(this, arguments);
-    },
         
     /**
      * APIMethod: addNodes

lib/OpenLayers/Layer/Text.js

@@ -80,7 +80,7 @@ OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
      */
     initialize: function(name, options) {
         OpenLayers.Layer.Markers.prototype.initialize.apply(this, arguments);
-        this.features = new Array();
+        this.features = [];
     },
 
     /**

lib/OpenLayers/Layer/Zoomify.js

@@ -21,12 +21,6 @@
  */
 OpenLayers.Layer.Zoomify = OpenLayers.Class(OpenLayers.Layer.Grid, {
 
-    /**
-     * Property: url
-     * {String} URL for root directory with TileGroupX subdirectories.
-     */
-    url: null,
-
     /**
      * Property: size
      * {<OpenLayers.Size>} The Zoomify image size in pixels.