From 892a4042a19109fcf56fdcda5e0d6f03c0d244bb Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Mon, 23 Jul 2007 19:54:58 +0000
Subject: [PATCH] #856 - fix up clone method for vector features - give the
 geometry base class a clone (though it will likely never be used)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@3788 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
---
 lib/OpenLayers/Feature/Vector.js | 17 +++++++----------
 lib/OpenLayers/Geometry.js       | 12 ++++++++++++
 tests/Feature/test_Vector.html   | 23 +++++++++++++++++++++++
 tests/test_Geometry.html         |  9 +++++++++
 4 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/lib/OpenLayers/Feature/Vector.js b/lib/OpenLayers/Feature/Vector.js
index 50746c55b1..d3433869e3 100644
--- a/lib/OpenLayers/Feature/Vector.js
+++ b/lib/OpenLayers/Feature/Vector.js
@@ -98,19 +98,16 @@ OpenLayers.Feature.Vector = OpenLayers.Class(OpenLayers.Feature, {
     
    /**
     * Method: clone
+    * Create a clone of this vector feature.  Does not set any non-standard
+    *     properties.
     *
     * Returns:
-    * <OpenLayers.Feature> An exact clone of this OpenLayers.Feature
+    * {<OpenLayers.Feature.Vector>} An exact clone of this vector feature.
     */
-    clone: function (obj) {
-        if (obj == null) {
-            obj = new OpenLayers.Feature(null, this.geometry.clone(), this.data);
-        } 
-        
-        // catch any randomly tagged-on properties
-        OpenLayers.Util.applyDefaults(obj, this);
-        
-        return obj;
+    clone: function () {
+        return new OpenLayers.Feature.Vector(this.geometry.clone(),
+                                             this.attributes,
+                                             this.style);
     },
 
     /**
diff --git a/lib/OpenLayers/Geometry.js b/lib/OpenLayers/Geometry.js
index 108d1eb0e3..c376244335 100644
--- a/lib/OpenLayers/Geometry.js
+++ b/lib/OpenLayers/Geometry.js
@@ -49,6 +49,18 @@ OpenLayers.Geometry = OpenLayers.Class({
         this.bounds = null;
     },
     
+    /**
+     * APIMethod: clone
+     * Create a clone of this geometry.  Does not set any non-standard
+     *     properties of the cloned geometry.
+     * 
+     * Return:
+     * {<OpenLayers.Geometry>} An exact clone of this geometry.
+     */
+    clone: function() {
+        return new OpenLayers.Geometry();
+    },
+    
     /**
      * Set the bounds for this Geometry.
      * 
diff --git a/tests/Feature/test_Vector.html b/tests/Feature/test_Vector.html
index 681a459c6f..882c126417 100644
--- a/tests/Feature/test_Vector.html
+++ b/tests/Feature/test_Vector.html
@@ -23,6 +23,29 @@
              "geometry.property set properly" );
     }
     
+    function test_Feature_Vector_clone(t) {
+        t.plan(5);
+
+        var geometry = new OpenLayers.Geometry.Point(Math.random(),
+                                                     Math.random());
+        var style = {foo: "bar"};
+        var attributes = {bar: "foo"};
+
+        feature = new OpenLayers.Feature.Vector(geometry, attributes, style);
+        var clone = feature.clone();
+
+        t.ok(clone instanceof OpenLayers.Feature.Vector,
+             "new OpenLayers.Feature.Vector returns Feature.Vector object");
+        t.eq(clone.attributes, attributes,
+             "attributes property set properly");
+        t.eq(clone.style, style,
+             "style property set properly");
+        t.eq(clone.geometry.x, geometry.x,
+             "geometry.x property set properly");
+        t.eq(clone.geometry.y, geometry.y,
+             "geometry.y property set properly");
+    }
+        
 
   // -->
   </script>
diff --git a/tests/test_Geometry.html b/tests/test_Geometry.html
index 3d099446f1..94e14f8d31 100644
--- a/tests/test_Geometry.html
+++ b/tests/test_Geometry.html
@@ -14,6 +14,15 @@
     }
 
 
+    function test_Geometry_clone(t) {
+        t.plan(2);
+        var geometry = new OpenLayers.Geometry();
+        var clone = geometry.clone();
+
+        t.eq(clone.CLASS_NAME, "OpenLayers.Geometry", "correct CLASS_NAME")
+        t.ok(clone.id.startsWith("OpenLayers.Geometry_"), "id correctly set");
+    }
+
     function test_02_Geometry_setBounds(t) {
         t.plan( 2 );