Changeset 4761

Timestamp:

10/02/07 21:39:08 (1 year ago)

Author:

euzuro

Message:

Even though we're deprecating them, we can't go back. WMS.Untiled and MapServer.Untiled both need to be able to clone correctly. Patch with tests. (See #1013)

Files:

• trunk/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_MapServer.html (modified) (1 diff)
• trunk/openlayers/tests/Layer/test_WMS.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer/MapServer/Untiled.js

@@ -41 +41 @@
-    },    
-
+    /**
+     * Method: clone
+     * Create a clone of this layer
+     *
+     * Returns:
+     * {<OpenLayers.Layer.MapServer.Untiled>} An exact clone of this layer
+     */
+    clone: function (obj) {
+        
+        if (obj == null) {
+            obj = new OpenLayers.Layer.MapServer.Untiled(this.name,
+                                                         this.url,
+                                                         this.params,
+                                                         this.options);
+        }
+
+        //get all additions from superclasses
+        obj = OpenLayers.Layer.MapServer.prototype.clone.apply(this, [obj]);
+
+        // copy/set any non-init, non-simple values here
+
+        return obj;
+    }, 
+
-    CLASS_NAME: "OpenLayers.Layer.MapServer.Untiled"
-});

trunk/openlayers/lib/OpenLayers/Layer/WMS/Untiled.js

@@ -41 +41 @@
-    },    
-
+    /**
+     * Method: clone
+     * Create a clone of this layer
+     *
+     * Returns:
+     * {<OpenLayers.Layer.WMS.Untiled>} An exact clone of this layer
+     */
+    clone: function (obj) {
+        
+        if (obj == null) {
+            obj = new OpenLayers.Layer.WMS.Untiled(this.name,
+                                                   this.url,
+                                                   this.params,
+                                                   this.options);
+        }
+
+        //get all additions from superclasses
+        obj = OpenLayers.Layer.WMS.prototype.clone.apply(this, [obj]);
+
+        // copy/set any non-init, non-simple values here
+
+        return obj;
+    }, 
+
-    CLASS_NAME: "OpenLayers.Layer.WMS.Untiled"
-});

trunk/openlayers/tests/Layer/test_MapServer.html

@@ -400 +400 @@
-
-    }    
+
+    // DEPRECATED -- REMOVE IN 3.0
+    function test_Layer_Untiled_MapServer(t) { 
+        t.plan(1);
+        
+        var layer = new OpenLayers.Layer.MapServer.Untiled();
+        
+        var clone = layer.clone();
+        
+        t.ok(clone.singleTile, "regression test: clone works. this is for #1013");
+    }
-    
-    function test_99_Layer_MapServer_Untiled_destroy (t) {

trunk/openlayers/tests/Layer/test_WMS.html

@@ -353 +353 @@
-
-    }
+
+    // DEPRECATED -- REMOVE IN 3.0
+    function test_Layer_Untiled_WMS(t) { 
+        t.plan(1);
+        
+        var layer = new OpenLayers.Layer.WMS.Untiled();
+        
+        var clone = layer.clone();
+        
+        t.ok(clone.singleTile, "regression test: clone works. this is for #1013");
+    }
-    
-    function test_99_Layer_WMS_destroy (t) {