Adding support for cloning rules and filters. r=ahocevar (closes #1919)

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

lib/OpenLayers/Filter.js

@@ -51,5 +51,16 @@ OpenLayers.Filter = OpenLayers.Class({
         return true;
     },
     
+    /**
+     * APIMethod: clone
+     * Clones this filter. Should be implementted by subclasses.
+     * 
+     * Returns:
+     * {<OpenLayers.Filter>} Clone of this filter.
+     */
+    clone: function() {
+        return null;
+    },
+    
     CLASS_NAME: "OpenLayers.Filter"
-});
+});

lib/OpenLayers/Filter/Comparison.js

@@ -230,6 +230,17 @@ OpenLayers.Filter.Comparison = OpenLayers.Class(OpenLayers.Filter, {
         return value;
     },
     
+    /**
+     * APIMethod: clone
+     * Clones this filter.
+     * 
+     * Returns:
+     * {<OpenLayers.Filter.Comparison>} Clone of this filter.
+     */
+    clone: function() {
+        return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison(), this);
+    },
+    
     CLASS_NAME: "OpenLayers.Filter.Comparison"
 });
 

lib/OpenLayers/Filter/FeatureId.js

@@ -62,5 +62,19 @@ OpenLayers.Filter.FeatureId = OpenLayers.Class(OpenLayers.Filter, {
         return false;
     },
     
+    /**
+     * APIMethod: clone
+     * Clones this filter.
+     * 
+     * Returns:
+     * {<OpenLayers.Filter.FeatureId>} Clone of this filter.
+     */
+    clone: function() {
+        var filter = new OpenLayers.Filter.FeatureId();
+        OpenLayers.Util.extend(filter, this);
+        filter.fids = this.fids.slice();
+        return filter;
+    },
+    
     CLASS_NAME: "OpenLayers.Filter.FeatureId"
 });

lib/OpenLayers/Filter/Logical.js

@@ -90,6 +90,24 @@ OpenLayers.Filter.Logical = OpenLayers.Class(OpenLayers.Filter, {
         }
     },
     
+    /**
+     * APIMethod: clone
+     * Clones this filter.
+     * 
+     * Returns:
+     * {<OpenLayers.Filter.Logical>} Clone of this filter.
+     */
+    clone: function() {
+        var filters = [];        
+        for(var i=0, len=this.filters.length; i<len; ++i) {
+            filters.push(this.filters[i].clone());
+        }
+        return new OpenLayers.Filter.Logical({
+            type: this.type,
+            filters: filters
+        });
+    },
+    
     CLASS_NAME: "OpenLayers.Filter.Logical"
 });
 

lib/OpenLayers/Filter/Spatial.js

@@ -104,6 +104,19 @@ OpenLayers.Filter.Spatial = OpenLayers.Class(OpenLayers.Filter, {
         return intersect;
     },
 
+    /**
+     * APIMethod: clone
+     * Clones this filter.
+     * 
+     * Returns:
+     * {<OpenLayers.Filter.Spatial>} Clone of this filter.
+     */
+    clone: function() {
+        var options = OpenLayers.Util.applyDefaults({
+            value: this.value && this.value.clone && this.value.clone()
+        }, this);
+        return new OpenLayers.Filter.Spatial(options);
+    },
     CLASS_NAME: "OpenLayers.Filter.Spatial"
 });
 

lib/OpenLayers/Rule.js

@@ -101,10 +101,9 @@ OpenLayers.Rule = OpenLayers.Class({
      * {<OpenLayers.Rule>}
      */
     initialize: function(options) {
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
         this.symbolizer = {};
-
         OpenLayers.Util.extend(this, options);
+        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
     },
 
     /** 
@@ -178,6 +177,33 @@ OpenLayers.Rule = OpenLayers.Class({
         }
         return context;
     },
+    
+    /**
+     * APIMethod: clone
+     * Clones this rule.
+     * 
+     * Returns:
+     * {<OpenLayers.Rule>} Clone of this rule.
+     */
+    clone: function() {
+        var options = OpenLayers.Util.extend({}, this);
+        // clone symbolizer
+        options.symbolizer = {};
+        for(var key in this.symbolizer) {
+            value = this.symbolizer[key];
+            type = typeof value;
+            if(type === "object") {
+                options.symbolizer[key] = OpenLayers.Util.extend({}, value);
+            } else if(type === "string") {
+                options.symbolizer[key] = value;
+            }
+        }
+        // clone filter
+        options.filter = this.filter && this.filter.clone();
+        // clone context
+        options.context = this.context && OpenLayers.Util.extend({}, this.context);
+        return new OpenLayers.Rule(options);
+    },
         
     CLASS_NAME: "OpenLayers.Rule"
 });