Removed modifications to Array.prototype and moved them into OL.Util instead. All tests pass.

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

lib/OpenLayers/BaseTypes.js

@@ -367,24 +367,21 @@ OpenLayers.Bounds.prototype = {
     },
 
     /** 
-     * @param {int} decimal How many significant digits in the bbox coords?
+    * @return Simple String representation of OpenLayers.Bounds object.
-     *                      Default is 6
+    *         (ex. <i>"5,42,10,45"</i>)
-     * 
+    * @type String
-     * @returns Simple String representation of OpenLayers.Bounds object.
+    */
-     *         (ex. <i>"5,42,10,45"</i>)
+    toBBOX:function(power) {
-     * @type String
+        var mult;
-     */
+        if (power) {
-    toBBOX:function(decimal) {
+            mult = Math.pow(10,power);
-        if (decimal== null) {
+        } else { 
-            decimal = 6; 
+            mult = Math.pow(10,6); 
-        }
+        }  
-        var mult = Math.pow(10, decimal);
+        return (Math.round(this.left*mult)/mult + "," + 
-        var bbox = Math.round(this.left*mult)/mult + "," + 
+               Math.round(this.bottom*mult)/mult + "," + 
-                   Math.round(this.bottom*mult)/mult + "," + 
+               Math.round(this.right*mult)/mult + "," + 
-                   Math.round(this.right*mult)/mult + "," + 
+               Math.round(this.top*mult)/mult);
-                   Math.round(this.top*mult)/mult;
-
-        return bbox;
     },
     
     /**
@@ -812,52 +809,6 @@ String.prototype.camelize = function() {
 };
 
 
-
-/*********************
- *                   *
- *      ARRAY        * 
- *                   * 
- *********************/
-
-
-
-/** Remove an object from an array. Iterates through the array
-*    to find the item, then removes it.
-*
-* @param {Object} item
-* 
-* @returns A reference to the array
-* @type Array
-*/
-Array.prototype.remove = function(item) {
-    for(var i=0; i < this.length; i++) {
-        if(this[i] == item) {
-            this.splice(i,1);
-            //break;more than once??
-        }
-    }
-    return this;
-}
-
-/**
-* @returns A fresh copy of the array
-* @type Array
-*/
-Array.prototype.clone = function() {
-  var clone = new Array();
-  for (var i = 0; i < this.length; i++) {
-      clone[i] = this[i];
-  }
-  return clone;
-};
-
-/**
-*/
-Array.prototype.clear = function() {
-    this.length = 0;
-};
-
-
 /*********************
  *                   *
  *      NUMBER       * 

lib/OpenLayers/Layer/GeoRSS.js

@@ -148,7 +148,7 @@ OpenLayers.Layer.GeoRSS.prototype =
         if (this.features != null) {
             while(this.features.length > 0) {
                 var feature = this.features[0];
-                this.features.remove(feature);
+                OpenLayers.Util.removeItem(this.features, feature);
                 feature.destroy();
             }
         }        

lib/OpenLayers/Layer/Grid.js

@@ -324,7 +324,7 @@ OpenLayers.Layer.Grid.prototype =
             for(var iRow=0; iRow < this.grid.length; iRow++) {
                 var row = this.grid[iRow];
                 for(var iCol=0; iCol < row.length; iCol++) {
-                    row[iCol].clear();
+                    OpenLayers.Util.clearArray(row[iCol]);
                 }
             }
         }

lib/OpenLayers/Layer/Markers.js

@@ -70,7 +70,7 @@ OpenLayers.Layer.Markers.prototype =
      * @param {OpenLayers.Marker} marker
      */
     removeMarker: function(marker) {
-        this.markers.remove(marker);
+        OpenLayers.Util.removeItem(this.markers, marker);
         if ((marker.icon != null) && (marker.icon.imageDiv != null) &&
             (marker.icon.imageDiv.parentNode == this.div) ) {
             this.div.removeChild(marker.icon.imageDiv);    

lib/OpenLayers/Layer/Text.js

@@ -155,7 +155,7 @@ OpenLayers.Layer.Text.prototype =
         if (this.features != null) {
             while(this.features.length > 0) {
                 var feature = this.features[0];
-                this.features.remove(feature);
+                OpenLayers.Util.removeItem(this.features, feature);
                 feature.destroy();
             }
         }        

lib/OpenLayers/Layer/WMS/Untiled.js

@@ -124,7 +124,7 @@ OpenLayers.Layer.WMS.Untiled.prototype =
 
             //clear out the old tile 
             if (this.tile) {
-                this.tile.clear();
+                OpenLayers.Util.clearArray(this.tile);
             }
 
             //determine new tile bounds

lib/OpenLayers/Map.js

@@ -327,7 +327,7 @@ OpenLayers.Map.prototype = {
             this.layerContainerDiv.removeChild(layer.div);
         }
         layer.map = null;
-        this.layers.remove(layer);
+        OpenLayers.Util.removeItem(this.layers, layer);
 
         // if we removed the base layer, need to set a new one
         if (this.baseLayer == layer) {
@@ -432,7 +432,7 @@ OpenLayers.Map.prototype = {
     * @param {OpenLayers.Popup} popup
     */
     removePopup: function(popup) {
-        this.popups.remove(popup);
+        OpenLayers.Util.removeItem(this.popups, popup);
         if (popup.div) {
             try { this.layerContainerDiv.removeChild(popup.div); }
             catch (e) { } // Popups sometimes apparently get disconnected

lib/OpenLayers/Popup/AnchoredBubble.js

@@ -175,7 +175,7 @@ OpenLayers.Popup.AnchoredBubble.prototype =
 
         //we want to round all the corners _except_ the opposite one. 
         var corner = OpenLayers.Bounds.oppositeQuadrant(this.relativePosition);
-        corners.remove(corner);
+        OpenLayers.Util.removeItem(corners, corner);
 
         return corners.join(" ");
     },

lib/OpenLayers/Tile.js

@@ -84,7 +84,7 @@ OpenLayers.Tile.prototype = {
             redraw = true;
         }
 
-        this.clear();
+        OpenLayers.Util.clearArray(this);
         this.bounds = bounds.clone();
         this.position = position.clone();
         if (redraw) {

lib/OpenLayers/Tile/WFS.js

@@ -60,7 +60,7 @@ OpenLayers.Tile.WFS.prototype =
      */
     draw:function() {
         if (this.drawn) {
-            this.clear();
+            OpenLayers.Util.clearArray(this);
         }
         OpenLayers.Tile.prototype.draw.apply(this, arguments);
         if (this.layer.displayOutsideMaxExtent || (this.layer.maxExtent && 

lib/OpenLayers/Util.js

@@ -35,6 +35,31 @@ OpenLayers.Util.extend = function(destination, source) {
     return destination;
 };
 
+
+/** Remove an object from an array. Iterates through the array
+*    to find the item, then removes it.
+*
+* @param {Object} item
+* 
+* @returns A reference to the array
+* @type Array
+*/
+OpenLayers.Util.removeItem = function(array, item) {
+    for(var i=0; i < array.length; i++) {
+        if(array[i] == item) {
+            array.splice(i,1);
+            //break;more than once??
+        }
+    }
+    return array;
+};
+
+/**
+*/
+OpenLayers.Util.clearArray = function(array) {
+    array.length = 0;
+};
+
 /**
  * @param {String} id
  * @param {OpenLayers.Pixel} px

tests/test_Util.html

@@ -30,21 +30,15 @@
     }
 
     function test_03_Util_Array(t) {
-        t.plan( 5 );
+        t.plan( 2 );
 
         var array = new Array(1,2,3,4,5);
 
-        array.remove(3);
+        OpenLayers.Util.removeItem(array, 3);
-        t.eq( array.toString(), "1,2,4,5", "array.remove works");    
+        t.eq( array.toString(), "1,2,4,5", "Util.removeItem works");    
 
-        copy = array.clone();
+        OpenLayers.Util.clearArray(array);
-        t.eq( copy.toString(), "1,2,4,5", "array.clone() works");    
+        t.eq( array.toString(), "", "Util.clearArray works");    
-        array.push(7);
-        t.eq( copy.toString(), "1,2,4,5", "changing a value in the copied array doesnt affect the new array");    
-
-        
-        t.eq( copy.indexOf(5), 3, "indexOf function returns index of value in an array");    
-        t.eq( copy.indexOf(75), -1, "indexOf function returns -1 when element not found in array");    
         
     }