Changeset 5854

Timestamp:

01/23/08 15:29:46 (10 months ago)

Author:

pagameba

Message:

Add clone methods to Tile and Tile.Image, and add associated tests. r=crschmidt (closes #1296)

Files:

• trunk/openlayers/lib/OpenLayers/Tile.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Tile/Image.js (modified) (1 diff)
• trunk/openlayers/tests/Tile/test_Image.html (modified) (4 diffs)
• trunk/openlayers/tests/test_Tile.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Tile.js

@@ -119 +119 @@
-        this.events.destroy();
-        this.events = null;
+    },
+    
+    /**
+     * Method: clone
+     *
+     * Parameters:
+     * obj - {<OpenLayers.Tile>} The tile to be cloned
+     *
+     * Returns:
+     * {<OpenLayers.Tile>} An exact clone of this <OpenLayers.Tile>
+     */
+    clone: function (obj) {
+        if (obj == null) {
+            obj = new OpenLayers.Tile(this.layer, 
+                                      this.position, 
+                                      this.bounds, 
+                                      this.url, 
+                                      this.size);
+        } 
+        
+        // catch any randomly tagged-on properties
+        OpenLayers.Util.applyDefaults(obj, this);
+        
+        return obj;
-    },
-

trunk/openlayers/lib/OpenLayers/Tile/Image.js

@@ -92 +92 @@
-    },
-
+    /**
+     * Method: clone
+     *
+     * Parameters:
+     * obj - {<OpenLayers.Tile.Image>} The tile to be cloned
+     *
+     * Returns:
+     * {<OpenLayers.Tile.Image>} An exact clone of this <OpenLayers.Tile.Image>
+     */
+    clone: function (obj) {
+        if (obj == null) {
+            obj = new OpenLayers.Tile.Image(this.layer, 
+                                            this.position, 
+                                            this.bounds, 
+                                            this.url, 
+                                            this.size);        
+        } 
+        
+        //pick up properties from superclass
+        obj = OpenLayers.Tile.prototype.clone.apply(this, [obj]);
+        
+        //dont want to directly copy the image div
+        obj.imgDiv = null;
+            
+        
+        return obj;
+    },
+    
-    /**
-     * Method: draw

trunk/openlayers/tests/Tile/test_Image.html

@@ -25 +25 @@
-        t.ok( tile.size.equals(size), "tile.size is set correctly");
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        t.plan( 7 );
-
@@ -79 +105 @@
-        
-    }
-3
+4
-        t.plan( 11 );
-        var position = new OpenLayers.Pixel(20,30);
@@ -161 +187 @@
-             "Image covering more than all of extent loads");
-    } 
-4
+5
-        t.plan(2);
-        var position = new OpenLayers.Pixel(20,30);
@@ -186 +212 @@
-    }
-
-5
+6
-        t.plan(5);
-        

trunk/openlayers/tests/test_Tile.html

@@ -32 +32 @@
-    }
-
+    function test_02_Tile_clone (t) {
+        t.plan( 10 );
+     
+        var layer = {}; // bogus layer
+        var position = new OpenLayers.Pixel(10,20);
+        var bounds = new OpenLayers.Bounds(1,2,3,4);
+        var url = "bobob";
+        var size = new OpenLayers.Size(5,6);
+        
+        tile = new OpenLayers.Tile(layer, position, bounds, url, size);
+        var clone = tile.clone();
+        
+        t.ok( clone instanceof OpenLayers.Tile, "OpenLayers.Tile.clone returns Tile object" );
+        t.eq( clone.layer, layer, "clone.layer set correctly");
+        t.ok( clone.position.equals(position), "clone.position set correctly");
+        t.ok( clone.bounds.equals(bounds), "clone.bounds set correctly");
+        t.eq( clone.url, url, "clone.url set correctly");        
+        t.ok( clone.size.equals(size), "clone.size is set correctly" );
+
+        t.ok( clone.id != null, "clone is given an id");
+        t.ok( clone.id != tile.id, "clone is given a new id");
+        t.ok(OpenLayers.String.startsWith(clone.id, "Tile_"),
+             "clone's id starts correctly");
+        t.ok( clone.events != null, "clone's events intitialized");
+    }
+
-    function test_99_Tile_destroy(t) {
-        t.plan( 6 );