From 7128e86e3c1ecc4fd6fdc808e958e6f34bc4a998 Mon Sep 17 00:00:00 2001
From: tsauerwein <tobias.sauerwein@camptocamp.com>
Date: Mon, 29 Aug 2016 09:34:52 +0200
Subject: [PATCH] Wrap values in <Literal>

---
 src/ol/format/wfs.js            | 10 ++++++++--
 test/spec/ol/format/wfs.test.js |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/ol/format/wfs.js b/src/ol/format/wfs.js
index 185e5c97e2..9199f025fe 100644
--- a/src/ol/format/wfs.js
+++ b/src/ol/format/wfs.js
@@ -667,8 +667,14 @@ ol.format.WFS.writeIsNullFilter_ = function(node, filter, objectStack) {
  */
 ol.format.WFS.writeIsBetweenFilter_ = function(node, filter, objectStack) {
   ol.format.WFS.writeOgcPropertyName_(node, filter.propertyName);
-  ol.format.WFS.writeOgcExpression_('LowerBoundary', node, '' + filter.lowerBoundary);
-  ol.format.WFS.writeOgcExpression_('UpperBoundary', node, '' + filter.upperBoundary);
+
+  var lowerBoundary = ol.xml.createElementNS('http://www.opengis.net/ogc', 'LowerBoundary');
+  node.appendChild(lowerBoundary);
+  ol.format.WFS.writeOgcLiteral_(lowerBoundary, '' + filter.lowerBoundary);
+
+  var upperBoundary = ol.xml.createElementNS('http://www.opengis.net/ogc', 'UpperBoundary');
+  node.appendChild(upperBoundary);
+  ol.format.WFS.writeOgcLiteral_(upperBoundary, '' + filter.upperBoundary);
 };
 
 
diff --git a/test/spec/ol/format/wfs.test.js b/test/spec/ol/format/wfs.test.js
index 908417d849..0ad2a86673 100644
--- a/test/spec/ol/format/wfs.test.js
+++ b/test/spec/ol/format/wfs.test.js
@@ -369,8 +369,8 @@ describe('ol.format.WFS', function() {
           '  <ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
           '    <ogc:PropertyIsBetween>' +
           '      <ogc:PropertyName>area</ogc:PropertyName>' +
-          '      <ogc:LowerBoundary>100</ogc:LowerBoundary>' +
-          '      <ogc:UpperBoundary>1000</ogc:UpperBoundary>' +
+          '      <ogc:LowerBoundary><ogc:Literal>100</ogc:Literal></ogc:LowerBoundary>' +
+          '      <ogc:UpperBoundary><ogc:Literal>1000</ogc:Literal></ogc:UpperBoundary>' +
           '    </ogc:PropertyIsBetween>' +
           '  </ogc:Filter>' +
           '</wfs:Query>';