From e6399a265dea4b3cb8bdb012aa3554dc4172116d Mon Sep 17 00:00:00 2001
From: tschaub <tim.schaub@gmail.com>
Date: Thu, 25 Oct 2012 11:56:48 -0600
Subject: [PATCH 1/2] Use document fragments to write multiple nodes

For writer functions that need to generate multiple nodes, the
createDocumentFragment method can be used.
---
 lib/OpenLayers/Format/Filter/v1.js | 38 +++++++-----------------------
 lib/OpenLayers/Format/XML.js       | 20 ++++++++++++++++
 tests/Format/XML.html              | 29 +++++++++++++++++++++++
 3 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/lib/OpenLayers/Format/Filter/v1.js b/lib/OpenLayers/Format/Filter/v1.js
index bd7cc32f09..824984828d 100644
--- a/lib/OpenLayers/Format/Filter/v1.js
+++ b/lib/OpenLayers/Format/Filter/v1.js
@@ -281,19 +281,6 @@ OpenLayers.Format.Filter.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
         return this.writers.ogc["Filter"].apply(this, [filter]);
     },
     
-    /**
-     * Method: writeFeatureIdNodes
-     * 
-     * Parameters:
-     * filter - {<OpenLayers.Filter.FeatureId}
-     * node - {DOMElement}
-     */
-    writeFeatureIdNodes: function(filter, node) {
-        for (var i=0, ii=filter.fids.length; i<ii; ++i) {
-            this.writeNode("FeatureId", filter.fids[i], node);
-        }
-    },
-    
     /**
      * Property: writers
      * As a compliment to the readers property, this structure contains public
@@ -304,10 +291,13 @@ OpenLayers.Format.Filter.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
         "ogc": {
             "Filter": function(filter) {
                 var node = this.createElementNSPlus("ogc:Filter");
-                if (filter.type === "FID") {
-                    OpenLayers.Format.Filter.v1.prototype.writeFeatureIdNodes.call(this, filter, node);
-                } else {
-                    this.writeNode(this.getFilterType(filter), filter, node);
+                this.writeNode(this.getFilterType(filter), filter, node);
+                return node;
+            },
+            "_featureIds": function(filter) {
+                var node = this.createDocumentFragment();
+                for (var i=0, ii=filter.fids.length; i<ii; ++i) {
+                    this.writeNode("ogc:FeatureId", filter.fids[i], node);
                 }
                 return node;
             },
@@ -321,14 +311,10 @@ OpenLayers.Format.Filter.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
                 var childFilter;
                 for (var i=0, ii=filter.filters.length; i<ii; ++i) {
                     childFilter = filter.filters[i];
-                    if (childFilter.type === "FID") {
-                        OpenLayers.Format.Filter.v1.prototype.writeFeatureIdNodes.call(this, childFilter, node);
-                    } else {
                     this.writeNode(
                         this.getFilterType(childFilter), childFilter, node
                     );
                 }
-                }
                 return node;
             },
             "Or": function(filter) {
@@ -336,26 +322,18 @@ OpenLayers.Format.Filter.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
                 var childFilter;
                 for (var i=0, ii=filter.filters.length; i<ii; ++i) {
                     childFilter = filter.filters[i];
-                    if (childFilter.type === "FID") {
-                        OpenLayers.Format.Filter.v1.prototype.writeFeatureIdNodes.call(this, childFilter, node);
-                    } else {
                     this.writeNode(
                         this.getFilterType(childFilter), childFilter, node
                     );
                 }
-                }
                 return node;
             },
             "Not": function(filter) {
                 var node = this.createElementNSPlus("ogc:Not");
                 var childFilter = filter.filters[0];
-                if (childFilter.type === "FID") {
-                    OpenLayers.Format.Filter.v1.prototype.writeFeatureIdNodes.call(this, childFilter, node);
-                } else {
                 this.writeNode(
                     this.getFilterType(childFilter), childFilter, node
                 );
-                }
                 return node;
             },
             "PropertyIsLessThan": function(filter) {
@@ -498,7 +476,7 @@ OpenLayers.Format.Filter.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
         "WITHIN": "WITHIN",
         "CONTAINS": "CONTAINS",
         "INTERSECTS": "INTERSECTS",
-        "FID": "FeatureId"
+        "FID": "_featureIds"
     },
 
     CLASS_NAME: "OpenLayers.Format.Filter.v1" 
diff --git a/lib/OpenLayers/Format/XML.js b/lib/OpenLayers/Format/XML.js
index c2969f1f09..32e6666edb 100644
--- a/lib/OpenLayers/Format/XML.js
+++ b/lib/OpenLayers/Format/XML.js
@@ -230,6 +230,26 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, {
         return element;
     },
 
+    /**
+     * APIMethod: createDocumentFragment
+     * Create a document fragment node that can be appended to another node
+     *     created by createElementNS.  This will call 
+     *     document.createDocumentFragment outside of IE.  In IE, the ActiveX
+     *     object's createDocumentFragment method is used.
+     *
+     * Returns:
+     * {Element} A document fragment.
+     */
+    createDocumentFragment: function() {
+        var element;
+        if (this.xmldom) {
+            element = this.xmldom.createDocumentFragment();
+        } else {
+            element = document.createDocumentFragment();
+        }
+        return element;
+    },
+
     /**
      * APIMethod: createTextNode
      * Create a text node.  This node can be appended to another node with
diff --git a/tests/Format/XML.html b/tests/Format/XML.html
index ff663c3f5e..d139506691 100644
--- a/tests/Format/XML.html
+++ b/tests/Format/XML.html
@@ -166,6 +166,35 @@
              "node can be appended to a doc root");
     }
 
+    function test_createDocumentFragment(t) {
+        t.plan(3);
+
+        var format = new OpenLayers.Format.XML();
+        var uri = "http://foo.com";
+        var prefix = "foo";
+        var localName = "bar";
+        var qualifiedName = prefix + ":" + localName;
+        var parent = format.createElementNS(uri, qualifiedName);
+
+        var fragment = format.createDocumentFragment();
+        t.eq(fragment.nodeType, 11, "fragment type");
+
+        try {
+            fragment.appendChild(format.createTextNode("one"));
+            fragment.appendChild(format.createTextNode("two"));
+            t.eq(fragment.childNodes.length, 2, "fragment has two child nodes");
+        } catch (err) {
+            t.fail("trouble appending text nodes to fragment: " + err.message);
+        }
+
+        try {
+            parent.appendChild(fragment);
+            t.eq(parent.childNodes.length, 2, "parent has two child nodes");
+        } catch (err) {
+            t.fail("trouble appending fragment to parent: " + err.message);
+        }
+    }
+
     function test_Format_XML_createTextNode(t) {
         t.plan(10);
 

From 9e21911ca3c0c520d624f40560f37e5e8de03a54 Mon Sep 17 00:00:00 2001
From: tschaub <tim.schaub@gmail.com>
Date: Thu, 25 Oct 2012 12:11:25 -0600
Subject: [PATCH 2/2] Unnecessary call to appendChild

The writeNode function already calls appendChild on the parent.
---
 lib/OpenLayers/Format/Filter/v1.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/OpenLayers/Format/Filter/v1.js b/lib/OpenLayers/Format/Filter/v1.js
index 824984828d..48deb0f9cb 100644
--- a/lib/OpenLayers/Format/Filter/v1.js
+++ b/lib/OpenLayers/Format/Filter/v1.js
@@ -259,9 +259,8 @@ OpenLayers.Format.Filter.v1 = OpenLayers.Class(OpenLayers.Format.XML, {
      * {DOMElement} Updated node element.
      */
     writeOgcExpression: function(value, node) {
-        if(value instanceof OpenLayers.Filter.Function){
-            var child = this.writeNode("Function", value, node);
-            node.appendChild(child);
+        if (value instanceof OpenLayers.Filter.Function){
+            this.writeNode("Function", value, node);
         } else {
             this.writeNode("Literal", value, node);
         }