From 2d95488906057cad48da88e85d086364bacd3792 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 14 Aug 2013 11:26:01 -0400 Subject: [PATCH] Remove special write-only handling for dates --- src/ol/parser/ogc/filter_v1.js | 6 +---- test/spec/ol/parser/ogc/filter_v1_0_0.test.js | 22 ------------------- .../ogc/xml/filter_v1_0_0/betweendates.xml | 11 ---------- .../xml/filter_v1_0_0/custombetweendates.xml | 11 ---------- 4 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 test/spec/ol/parser/ogc/xml/filter_v1_0_0/betweendates.xml delete mode 100644 test/spec/ol/parser/ogc/xml/filter_v1_0_0/custombetweendates.xml diff --git a/src/ol/parser/ogc/filter_v1.js b/src/ol/parser/ogc/filter_v1.js index 72ba5453fd..1deca301fa 100644 --- a/src/ol/parser/ogc/filter_v1.js +++ b/src/ol/parser/ogc/filter_v1.js @@ -346,12 +346,8 @@ ol.parser.ogc.Filter_v1 = function() { }, 'Literal': function(expr) { goog.asserts.assert(expr instanceof ol.expr.Literal); - var value = expr.getValue(); - if (value instanceof Date) { - value = value.toISOString(); - } var node = this.createElementNS('ogc:Literal'); - node.appendChild(this.createTextNode(value)); + node.appendChild(this.createTextNode(expr.getValue())); return node; }, 'LowerBoundary': function(expr) { diff --git a/test/spec/ol/parser/ogc/filter_v1_0_0.test.js b/test/spec/ol/parser/ogc/filter_v1_0_0.test.js index e3cb981bc6..3fb30a9486 100644 --- a/test/spec/ol/parser/ogc/filter_v1_0_0.test.js +++ b/test/spec/ol/parser/ogc/filter_v1_0_0.test.js @@ -234,28 +234,6 @@ describe('ol.parser.ogc.Filter_v1_0_0', function() { }); - describe('#date', function() { - - it('date writing works as expected', function(done) { - var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/betweendates.xml'; - afterLoadXml(url, function(xml) { - // ISO 8601: 2010-11-27T18:19:15.123Z - var start = new Date(Date.UTC(2010, 10, 27, 18, 19, 15, 123)); - // ISO 8601: 2011-12-27T18:19:15.123Z - var end = new Date(Date.UTC(2011, 11, 27, 18, 19, 15, 123)); - var filter = new ol.expr.Logical(ol.expr.LogicalOp.AND, - new ol.expr.Comparison(ol.expr.ComparisonOp.GTE, - new ol.expr.Identifier('when'), new ol.expr.Literal(start)), - new ol.expr.Comparison(ol.expr.ComparisonOp.LTE, - new ol.expr.Identifier('when'), new ol.expr.Literal(end))); - var output = parser.write(filter); - expect(goog.dom.xml.loadXml(output)).to.xmleql(xml); - done(); - }); - }); - - }); - describe('_expression reader works as expected', function() { it('_expression reader handles combined propertyname and literal', function() { diff --git a/test/spec/ol/parser/ogc/xml/filter_v1_0_0/betweendates.xml b/test/spec/ol/parser/ogc/xml/filter_v1_0_0/betweendates.xml deleted file mode 100644 index 3ad5b0131e..0000000000 --- a/test/spec/ol/parser/ogc/xml/filter_v1_0_0/betweendates.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - when - - 2010-11-27T18:19:15.123Z - - - 2011-12-27T18:19:15.123Z - - - diff --git a/test/spec/ol/parser/ogc/xml/filter_v1_0_0/custombetweendates.xml b/test/spec/ol/parser/ogc/xml/filter_v1_0_0/custombetweendates.xml deleted file mode 100644 index f12024a9dd..0000000000 --- a/test/spec/ol/parser/ogc/xml/filter_v1_0_0/custombetweendates.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - when - - 2010-11-27 - - - 2011-12-27 - - -