Merge pull request #852 from bartvde/ogcfilter2

Add parser for OGC Filter 1.0 and 1.1 (read/write) (r=@tschaub,@ahocevar)

test/spec/ol/expr/expression.test.js

@@ -758,6 +758,74 @@ describe('ol.expr.lib', function() {
 
   });
 
+  describe('like()', function() {
+
+    var one = new ol.Feature({foo: 'bar'});
+    var two = new ol.Feature({foo: 'baz'});
+    var three = new ol.Feature({foo: 'foo'});
+
+    var like = parse('like(foo, "ba")');
+
+    it('First and second feature match, third does not', function() {
+      expect(evaluate(like, one), true);
+      expect(evaluate(like, two), true);
+      expect(evaluate(like, three), false);
+    });
+
+    var uclike = parse('like(foo, "BA")');
+    it('Matchcase is true by default', function() {
+      expect(evaluate(uclike, one), false);
+      expect(evaluate(uclike, two), false);
+      expect(evaluate(uclike, three), false);
+    });
+
+    var ilike = parse('like(foo, "BA", "*", ".", "!", false)');
+    it('Using matchcase false, first two features match again', function() {
+      expect(evaluate(ilike, one), true);
+      expect(evaluate(ilike, two), true);
+      expect(evaluate(uclike, three), false);
+    });
+
+  });
+
+  describe('ieq()', function() {
+
+    var one = new ol.Feature({foo: 'Bar'});
+    var two = new ol.Feature({bar: 'Foo'});
+
+    var ieq1 = parse('ieq(foo, "bar")');
+    var ieq2 = parse('ieq("foo", bar)');
+
+    it('case-insensitive equality for an attribute', function() {
+      expect(evaluate(ieq1, one), true);
+    });
+
+    it('case-insensitive equality for an attribute as second argument',
+        function() {
+          expect(evaluate(ieq2, two), true);
+        });
+
+  });
+
+  describe('ineq()', function() {
+
+    var one = new ol.Feature({foo: 'Bar'});
+    var two = new ol.Feature({bar: 'Foo'});
+
+    var ieq1 = parse('ineq(foo, "bar")');
+    var ieq2 = parse('ineq("foo", bar)');
+
+    it('case-insensitive non-equality for an attribute', function() {
+      expect(evaluate(ieq1, one), false);
+    });
+
+    it('case-insensitive non-equality for an attribute as second argument',
+        function() {
+          expect(evaluate(ieq2, two), false);
+        });
+
+  });
+
 });
 
 describe('ol.expr.register()', function() {

test/spec/ol/parser/ogc/filter_v1_0_0.test.js

@@ -0,0 +1,270 @@
+goog.provide('ol.test.parser.ogc.Filter_v1_0_0');
+
+describe('ol.parser.ogc.Filter_v1_0_0', function() {
+
+  var parser = new ol.parser.ogc.Filter_v1_0_0();
+
+  describe('reading and writing', function() {
+
+    it('handles intersects', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/intersects.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        expect(filter instanceof ol.expr.Call).to.be(true);
+        expect(filter.getCallee().getName()).to.equal(
+            ol.expr.functions.INTERSECTS);
+        var args = filter.getArgs();
+        var geom = args[0];
+        expect(geom.getValue() instanceof ol.geom.Polygon).to.be(true);
+        expect(args[2].getName()).to.equal('Geometry');
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('handles within', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/within.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        expect(filter instanceof ol.expr.Call).to.be(true);
+        expect(filter.getCallee().getName()).to.equal(ol.expr.functions.WITHIN);
+        var args = filter.getArgs();
+        var geom = args[0];
+        expect(geom.getValue() instanceof ol.geom.Polygon).to.be(true);
+        expect(args[2].getName()).to.equal('Geometry');
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('handles contains', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/contains.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        expect(filter instanceof ol.expr.Call).to.be(true);
+        expect(filter.getCallee().getName()).to.equal(
+            ol.expr.functions.CONTAINS);
+        var args = filter.getArgs();
+        var geom = args[0];
+        expect(geom.getValue() instanceof ol.geom.Polygon).to.be(true);
+        expect(args[2].getName()).to.equal('Geometry');
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('handles between', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/between.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        expect(filter).to.be.a(ol.expr.Logical);
+        expect(filter.getOperator()).to.equal(ol.expr.LogicalOp.AND);
+        expect(filter.getLeft()).to.be.a(ol.expr.Comparison);
+        expect(filter.getLeft().getOperator()).to.equal(
+            ol.expr.ComparisonOp.GTE);
+        expect(filter.getLeft().getLeft().getName()).to.equal('number');
+        expect(filter.getLeft().getRight().getValue()).to.equal(0);
+        expect(filter.getRight()).to.be.a(ol.expr.Comparison);
+        expect(filter.getRight().getOperator()).to.equal(
+            ol.expr.ComparisonOp.LTE);
+        expect(filter.getRight().getLeft().getName()).to.equal('number');
+        expect(filter.getRight().getRight().getValue()).to.equal(100);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('handles between without literals', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/between2.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        expect(filter).to.be.a(ol.expr.Logical);
+        expect(filter.getOperator()).to.equal(ol.expr.LogicalOp.AND);
+        expect(filter.getLeft()).to.be.a(ol.expr.Comparison);
+        expect(filter.getLeft().getOperator()).to.equal(
+            ol.expr.ComparisonOp.GTE);
+        expect(filter.getLeft().getLeft().getName()).to.equal('number');
+        expect(filter.getLeft().getRight().getValue()).to.equal(0);
+        expect(filter.getRight()).to.be.a(ol.expr.Comparison);
+        expect(filter.getRight().getOperator()).to.equal(
+            ol.expr.ComparisonOp.LTE);
+        expect(filter.getRight().getLeft().getName()).to.equal('number');
+        expect(filter.getRight().getRight().getValue()).to.equal(100);
+        done();
+      });
+    });
+
+    it('handles null', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/null.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        expect(filter).to.be.a(ol.expr.Comparison);
+        expect(filter.getLeft().getName()).to.equal('prop');
+        expect(filter.getRight().getValue()).to.equal(null);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('writes BBOX', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/bbox.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = new ol.expr.Call(
+            new ol.expr.Identifier(ol.expr.functions.EXTENT),
+            [new ol.expr.Literal(-180), new ol.expr.Literal(-90),
+              new ol.expr.Literal(180), new ol.expr.Literal(90),
+              new ol.expr.Literal('EPSG:4326'),
+              new ol.expr.Identifier('the_geom')]);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('writes BBOX without geometry name', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/bbox_nogeom.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = new ol.expr.Call(
+            new ol.expr.Identifier(ol.expr.functions.EXTENT),
+            [new ol.expr.Literal(-180), new ol.expr.Literal(-90),
+              new ol.expr.Literal(180), new ol.expr.Literal(90),
+              new ol.expr.Literal('EPSG:4326')]);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('reads DWithin', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/dwithin.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        expect(filter).to.be.a(ol.expr.Call);
+        var callee = filter.getCallee();
+        expect(callee).to.be.a(ol.expr.Identifier);
+        var name = callee.getName();
+        expect(name).to.equal(ol.expr.functions.DWITHIN);
+        var args = filter.getArgs();
+        expect(args.length).to.equal(5);
+        var distance = args[1];
+        expect(distance).to.be.a(ol.expr.Literal);
+        expect(distance.getValue()).to.equal(1000);
+        var units = args[2];
+        expect(units).to.be.a(ol.expr.Literal);
+        expect(units.getValue()).to.equal('m');
+        done();
+      });
+    });
+
+    it('writes DWithin', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/dwithin.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = new ol.expr.Call(new ol.expr.Identifier(
+            ol.expr.functions.DWITHIN),
+            [new ol.expr.Literal(new ol.geom.Point([2488789, 289552])),
+              new ol.expr.Literal(1000), new ol.expr.Literal('m'),
+              new ol.expr.Literal(null), new ol.expr.Identifier('Geometry')]);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        filter = parser.read(xml);
+        output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+  });
+
+  // the Filter Encoding spec doesn't allow for FID filters inside logical
+  // filters however, to be liberal, we will write them without complaining
+  describe('logical fid', function() {
+
+    it('writes logical [OR] with fid', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/logicalfeatureid.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = new ol.expr.Logical(ol.expr.LogicalOp.OR,
+            new ol.expr.Call(new ol.expr.Identifier(ol.expr.functions.LIKE),
+            [new ol.expr.Identifier('person'), new ol.expr.Literal('me'),
+              new ol.expr.Literal('*'), new ol.expr.Literal('.'),
+              new ol.expr.Literal('!')]),
+            new ol.expr.Call(new ol.expr.Identifier(ol.expr.functions.FID),
+            [new ol.expr.Literal('foo.1'), new ol.expr.Literal('foo.2')]));
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('writes logical [AND] with fid',
+        function(done) {
+          var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/' +
+              'logicalfeatureidand.xml';
+          afterLoadXml(url, function(xml) {
+            var filter = new ol.expr.Logical(ol.expr.LogicalOp.AND,
+                new ol.expr.Call(new ol.expr.Identifier(ol.expr.functions.LIKE),
+                [new ol.expr.Identifier('person'), new ol.expr.Literal('me'),
+                  new ol.expr.Literal('*'), new ol.expr.Literal('.'),
+                  new ol.expr.Literal('!')]),
+                new ol.expr.Call(new ol.expr.Identifier(ol.expr.functions.FID),
+                [new ol.expr.Literal('foo.1'), new ol.expr.Literal('foo.2')]));
+            var output = parser.write(filter);
+            expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+            done();
+          });
+        });
+
+    it('writes logical [NOT] with fid',
+        function(done) {
+          var url = 'spec/ol/parser/ogc/xml/filter_v1_0_0/' +
+              'logicalfeatureidnot.xml';
+          afterLoadXml(url, function(xml) {
+            var filter = new ol.expr.Not(
+                new ol.expr.Call(new ol.expr.Identifier(ol.expr.functions.FID),
+                    [new ol.expr.Literal('foo.2')]));
+            var output = parser.write(filter);
+            expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+            done();
+          });
+        });
+
+  });
+
+  describe('_expression reader', function() {
+    it('handles combined propertyname and literal',
+        function() {
+          var xml = '<ogc:UpperBoundary xmlns:ogc="' +
+              'http://www.opengis.net/ogc">10</ogc:UpperBoundary>';
+          var reader = parser.readers['http://www.opengis.net/ogc'][
+              '_expression'];
+          var expr = reader.call(parser, goog.dom.xml.loadXml(
+              xml).documentElement);
+          expect(expr).to.be.a(ol.expr.Literal);
+          expect(expr.getValue()).to.equal(10);
+          xml = '<ogc:UpperBoundary xmlns:ogc="http://www.opengis.net/ogc">' +
+              'foo<ogc:PropertyName>x</ogc:PropertyName>bar</ogc:UpperBoundary>';
+          expr = reader.call(parser, goog.dom.xml.loadXml(xml).documentElement);
+          expect(expr.evaluate({x: 4})).to.eql('foo4bar');
+        });
+  });
+
+});
+
+goog.require('goog.dom.xml');
+goog.require('ol.expr');
+goog.require('ol.expr.Call');
+goog.require('ol.expr.Comparison');
+goog.require('ol.expr.ComparisonOp');
+goog.require('ol.expr.Identifier');
+goog.require('ol.expr.Literal');
+goog.require('ol.expr.Logical');
+goog.require('ol.expr.LogicalOp');
+goog.require('ol.expr.Not');
+goog.require('ol.expr.functions');
+goog.require('ol.geom.Point');
+goog.require('ol.geom.Polygon');
+goog.require('ol.parser.ogc.Filter_v1_0_0');

test/spec/ol/parser/ogc/filter_v1_1_0.test.js

@@ -0,0 +1,245 @@
+goog.provide('ol.test.parser.ogc.Filter_v1_1_0');
+
+describe('ol.parser.ogc.Filter_v1_1_0', function() {
+
+  var parser = new ol.parser.ogc.Filter_v1_1_0();
+
+  describe('reading and writing', function() {
+
+    it('reads filter', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/test.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        expect(filter instanceof ol.expr.Logical).to.be(true);
+        expect(filter.getOperator()).to.equal(ol.expr.LogicalOp.OR);
+        var filters = [];
+        parser.getSubfiltersForLogical_(filter, filters);
+        expect(filters.length).to.equal(5);
+        expect(filters[0]).to.eql(new ol.expr.Logical(ol.expr.LogicalOp.AND,
+            new ol.expr.Comparison(
+                ol.expr.ComparisonOp.GTE, new ol.expr.Identifier('number'),
+                new ol.expr.Literal(1064866676)),
+            new ol.expr.Comparison(
+                ol.expr.ComparisonOp.LTE, new ol.expr.Identifier('number'),
+                new ol.expr.Literal(1065512599))));
+        expect(filters[1]).to.eql(new ol.expr.Not(new ol.expr.Comparison(
+            ol.expr.ComparisonOp.LTE, new ol.expr.Identifier('FOO'),
+            new ol.expr.Literal(5000))));
+        expect(filters[2] instanceof ol.expr.Call).to.be(true);
+        expect(filters[2].getCallee().getName()).to.equal(
+            ol.expr.functions.LIKE);
+        expect(filters[2].getArgs()).to.eql([new ol.expr.Identifier('cat'),
+              new ol.expr.Literal('*dog.food!*good'), new ol.expr.Literal('*'),
+              new ol.expr.Literal('.'), new ol.expr.Literal('!'),
+              new ol.expr.Literal(null)]);
+        expect(filters[3] instanceof ol.expr.Call).to.be(true);
+        expect(filters[3].getCallee().getName()).to.equal(
+            ol.expr.functions.IEQ);
+        expect(filters[3].getArgs()).to.eql([new ol.expr.Identifier('cat'),
+              new ol.expr.Literal('dog')]);
+        expect(filters[4] instanceof ol.expr.Comparison).to.be(true);
+        expect(filters[4].getOperator()).to.equal(ol.expr.ComparisonOp.EQ);
+        expect(filters[4].getLeft().getName()).to.equal('cat');
+        expect(filters[4].getRight().getValue()).to.equal('dog');
+        done();
+      });
+    });
+
+    it('reads matchCase', function() {
+      var cases = [{
+        str:
+            '<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
+                '<ogc:PropertyIsEqualTo>' +
+                    '<ogc:PropertyName>cat</ogc:PropertyName>' +
+                    '<ogc:Literal>dog</ogc:Literal>' +
+                '</ogc:PropertyIsEqualTo>' +
+            '</ogc:Filter>',
+        exp: true
+      }, {
+        str:
+            '<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
+                '<ogc:PropertyIsEqualTo matchCase="1">' +
+                    '<ogc:PropertyName>cat</ogc:PropertyName>' +
+                    '<ogc:Literal>dog</ogc:Literal>' +
+                '</ogc:PropertyIsEqualTo>' +
+            '</ogc:Filter>',
+        exp: true
+      }, {
+        str:
+            '<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
+                '<ogc:PropertyIsEqualTo matchCase="true">' +
+                    '<ogc:PropertyName>cat</ogc:PropertyName>' +
+                    '<ogc:Literal>dog</ogc:Literal>' +
+                '</ogc:PropertyIsEqualTo>' +
+            '</ogc:Filter>',
+        exp: true
+      }, {
+        str:
+            '<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
+                '<ogc:PropertyIsEqualTo matchCase="0">' +
+                    '<ogc:PropertyName>cat</ogc:PropertyName>' +
+                    '<ogc:Literal>dog</ogc:Literal>' +
+                '</ogc:PropertyIsEqualTo>' +
+            '</ogc:Filter>',
+        exp: false
+      }, {
+        str:
+            '<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
+                '<ogc:PropertyIsEqualTo matchCase="0">' +
+                    '<ogc:PropertyName>cat</ogc:PropertyName>' +
+                    '<ogc:Literal>dog</ogc:Literal>' +
+                '</ogc:PropertyIsEqualTo>' +
+            '</ogc:Filter>',
+        exp: false
+      }, {
+        str:
+            '<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
+                '<ogc:PropertyIsNotEqualTo matchCase="true">' +
+                    '<ogc:PropertyName>cat</ogc:PropertyName>' +
+                    '<ogc:Literal>dog</ogc:Literal>' +
+                '</ogc:PropertyIsNotEqualTo>' +
+            '</ogc:Filter>',
+        exp: true
+      }, {
+        str:
+            '<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
+                '<ogc:PropertyIsNotEqualTo matchCase="false">' +
+                    '<ogc:PropertyName>cat</ogc:PropertyName>' +
+                    '<ogc:Literal>dog</ogc:Literal>' +
+                '</ogc:PropertyIsNotEqualTo>' +
+            '</ogc:Filter>',
+        exp: false
+      }];
+      var filter, c;
+      for (var i = 0; i < cases.length; ++i) {
+        c = cases[i];
+        filter = parser.read(c.str);
+        var matchCase = (filter instanceof ol.expr.Call) ? false : true;
+        expect(matchCase).to.equal(c.exp);
+      }
+    });
+
+    it('writes BBOX', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/bbox.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('writes BBOX without property name', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/bbox_nogeomname.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('handles intersects', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/intersects.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = parser.read(xml);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('handles functions', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/function.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = new ol.expr.Call(new ol.expr.Identifier(
+            ol.expr.functions.INTERSECTS),
+            [new ol.expr.Call(new ol.expr.Identifier('querySingle'),
+             [new ol.expr.Literal('sf:restricted'),
+               new ol.expr.Literal('the_geom'),
+               new ol.expr.Literal('cat=3')]), new ol.expr.Literal(null),
+             new ol.expr.Identifier('the_geom')]);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('writes custom functions', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/customfunction.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = new ol.expr.Logical(ol.expr.LogicalOp.AND,
+            new ol.expr.Call(new ol.expr.Identifier(ol.expr.functions.INEQ),
+            [new ol.expr.Identifier('FOO'), new ol.expr.Call(
+            new ol.expr.Identifier('customFunction'),
+            [new ol.expr.Literal('param1'), new ol.expr.Literal('param2')])]));
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('writes nested functions', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/nestedfunction.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = new ol.expr.Call(new ol.expr.Identifier(
+            ol.expr.functions.DWITHIN),
+            [new ol.expr.Call(new ol.expr.Identifier('collectGeometries'),
+             [new ol.expr.Call(new ol.expr.Identifier('queryCollection'),
+              [new ol.expr.Literal('sf:roads'),
+               new ol.expr.Literal('the_geom'),
+               new ol.expr.Literal('INCLUDE')])]), new ol.expr.Literal(200),
+              new ol.expr.Literal('meters'),
+             new ol.expr.Literal(null), new ol.expr.Identifier('the_geom')]);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('writes matchCase on like', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/likematchcase.xml';
+      afterLoadXml(url, function(xml) {
+        var filter = new ol.expr.Call(
+            new ol.expr.Identifier(ol.expr.functions.LIKE),
+            [new ol.expr.Identifier('person'), new ol.expr.Literal('*me*'),
+             new ol.expr.Literal('*'), new ol.expr.Literal('.'),
+             new ol.expr.Literal('!'), new ol.expr.Literal(false)]);
+        var output = parser.write(filter);
+        expect(goog.dom.xml.loadXml(output)).to.xmleql(xml);
+        done();
+      });
+    });
+
+    it('writes sortBy on like', function(done) {
+      var url = 'spec/ol/parser/ogc/xml/filter_v1_1_0/sortby.xml';
+      afterLoadXml(url, function(xml) {
+        var writer = parser.writers['http://www.opengis.net/ogc']['SortBy'];
+        var output = writer.call(parser, [{
+          'property': new ol.expr.Identifier('Title'),
+          'order': new ol.expr.Literal('ASC')
+        },{
+          'property': new ol.expr.Identifier('Relevance'),
+          'order': new ol.expr.Literal('DESC')
+        }]);
+        expect(output).to.xmleql(xml);
+        done();
+      });
+    });
+
+  });
+
+});
+
+goog.require('goog.dom.xml');
+goog.require('ol.expr');
+goog.require('ol.expr.Call');
+goog.require('ol.expr.Comparison');
+goog.require('ol.expr.ComparisonOp');
+goog.require('ol.expr.Identifier');
+goog.require('ol.expr.Literal');
+goog.require('ol.expr.Logical');
+goog.require('ol.expr.LogicalOp');
+goog.require('ol.expr.Not');
+goog.require('ol.expr.functions');
+goog.require('ol.parser.ogc.Filter_v1_1_0');

test/spec/ol/parser/ogc/gml_v2.test.js

@@ -19,7 +19,7 @@ describe('ol.parser.gml_v2', function() {
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
         parser.applyWriteOptions(obj);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
         delete parser.srsName;
@@ -47,7 +47,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/multipoint-coordinates.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -77,7 +77,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/linestring-coordinates.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -106,7 +106,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/multilinestring-coordinates.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -141,7 +141,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/polygon-coordinates.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -166,7 +166,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/multipolygon-coordinates.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -185,7 +185,7 @@ describe('ol.parser.gml_v2', function() {
       afterLoadXml(url, function(xml) {
         var p = new ol.parser.ogc.GML_v2({featureNS: 'http://foo'});
         var obj = p.read(xml);
-        var geom = p.createGeometry_({geometry: obj.geometry});
+        var geom = p.createGeometry({geometry: obj.geometry});
         p.applyWriteOptions(obj);
         var node = p.featureNSWiters_['_geometry'].apply(p,
             [geom]).firstChild;
@@ -230,7 +230,7 @@ describe('ol.parser.gml_v2', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v2/linearring-coordinates.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;

test/spec/ol/parser/ogc/gml_v3.test.js

@@ -17,7 +17,7 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/linearring.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -34,7 +34,7 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/linestring.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -61,7 +61,7 @@ describe('ol.parser.gml_v3', function() {
       afterLoadXml(url, function(xml) {
         var p = new ol.parser.ogc.GML_v3({curve: true});
         var obj = p.read(xml);
-        var geom = p.createGeometry_({geometry: obj.geometry});
+        var geom = p.createGeometry({geometry: obj.geometry});
         p.applyWriteOptions(obj);
         var node = p.featureNSWiters_['_geometry'].apply(p,
             [geom]).firstChild;
@@ -89,7 +89,7 @@ describe('ol.parser.gml_v3', function() {
       afterLoadXml(url, function(xml) {
         var p = new ol.parser.ogc.GML_v3({multiCurve: false});
         var obj = p.read(xml);
-        var geom = p.createGeometry_({geometry: obj.geometry});
+        var geom = p.createGeometry({geometry: obj.geometry});
         p.applyWriteOptions(obj);
         var node = p.featureNSWiters_['_geometry'].apply(p,
             [geom]).firstChild;
@@ -106,7 +106,7 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/multicurve-singular.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -125,7 +125,7 @@ describe('ol.parser.gml_v3', function() {
       afterLoadXml(url, function(xml) {
         var p = new ol.parser.ogc.GML_v3({curve: true});
         var obj = p.read(xml);
-        var geom = p.createGeometry_({geometry: obj.geometry});
+        var geom = p.createGeometry({geometry: obj.geometry});
         p.applyWriteOptions(obj);
         var node = p.featureNSWiters_['_geometry'].apply(p,
             [geom]).firstChild;
@@ -154,7 +154,7 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/multipoint-singular.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -183,7 +183,7 @@ describe('ol.parser.gml_v3', function() {
       afterLoadXml(url, function(xml) {
         var p = new ol.parser.ogc.GML_v3({multiSurface: false});
         var obj = p.read(xml);
-        var geom = p.createGeometry_({geometry: obj.geometry});
+        var geom = p.createGeometry({geometry: obj.geometry});
         p.applyWriteOptions(obj);
         var node = p.featureNSWiters_['_geometry'].apply(p,
             [geom]).firstChild;
@@ -210,7 +210,7 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/multisurface-singular.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -228,7 +228,7 @@ describe('ol.parser.gml_v3', function() {
       afterLoadXml(url, function(xml) {
         var p = new ol.parser.ogc.GML_v3({surface: true});
         var obj = p.read(xml);
-        var geom = p.createGeometry_({geometry: obj.geometry});
+        var geom = p.createGeometry({geometry: obj.geometry});
         p.applyWriteOptions(obj);
         var node = p.featureNSWiters_['_geometry'].apply(p,
             [geom]).firstChild;
@@ -245,7 +245,7 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/point.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -261,7 +261,7 @@ describe('ol.parser.gml_v3', function() {
       var url = 'spec/ol/parser/ogc/xml/gml_v3/polygon.xml';
       afterLoadXml(url, function(xml) {
         var obj = parser.read(xml);
-        var geom = parser.createGeometry_({geometry: obj.geometry});
+        var geom = parser.createGeometry({geometry: obj.geometry});
         parser.applyWriteOptions(obj);
         var node = parser.featureNSWiters_['_geometry'].apply(parser,
             [geom]).firstChild;
@@ -277,7 +277,7 @@ describe('ol.parser.gml_v3', function() {
       afterLoadXml(url, function(xml) {
         var p = new ol.parser.ogc.GML_v3({surface: true});
         var obj = p.read(xml);
-        var geom = p.createGeometry_({geometry: obj.geometry});
+        var geom = p.createGeometry({geometry: obj.geometry});
         p.applyWriteOptions(obj, {srsName: 'foo'});
         var node = p.featureNSWiters_['_geometry'].apply(p,
             [geom]).firstChild;

test/spec/ol/parser/ogc/xml/filter_v1_0_0.xml

@@ -0,0 +1,23 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
+  <ogc:Or>
+    <ogc:PropertyIsBetween>
+      <ogc:PropertyName>number</ogc:PropertyName>
+      <ogc:LowerBoundary>
+        <ogc:Literal>1064866676</ogc:Literal>
+      </ogc:LowerBoundary>
+      <ogc:UpperBoundary>
+        <ogc:Literal>1065512599</ogc:Literal>
+      </ogc:UpperBoundary>
+    </ogc:PropertyIsBetween>
+    <ogc:PropertyIsLike wildCard="*" singleChar="." escape="!">
+      <ogc:PropertyName>cat</ogc:PropertyName>
+      <ogc:Literal>*dog.food!*good</ogc:Literal>
+    </ogc:PropertyIsLike>
+    <ogc:Not>
+      <ogc:PropertyIsLessThanOrEqualTo>
+        <ogc:PropertyName>FOO</ogc:PropertyName>
+        <ogc:Literal>5000</ogc:Literal>
+      </ogc:PropertyIsLessThanOrEqualTo>
+    </ogc:Not>
+  </ogc:Or>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/bbox.xml

@@ -0,0 +1,8 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
+  <ogc:BBOX>
+    <ogc:PropertyName>the_geom</ogc:PropertyName>
+    <gml:Box xmlns:gml="http://www.opengis.net/gml" srsName="EPSG:4326">
+      <gml:coordinates decimal="." cs="," ts=" ">-180,-90 180,90</gml:coordinates>
+    </gml:Box>
+  </ogc:BBOX>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/bbox_nogeom.xml

@@ -0,0 +1,7 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
+  <ogc:BBOX>
+    <gml:Box xmlns:gml="http://www.opengis.net/gml" srsName="EPSG:4326">
+      <gml:coordinates decimal="." cs="," ts=" ">-180,-90 180,90</gml:coordinates>
+    </gml:Box>
+  </ogc:BBOX>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/between.xml

@@ -0,0 +1,11 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
+  <ogc:PropertyIsBetween>
+    <ogc:PropertyName>number</ogc:PropertyName>
+    <ogc:LowerBoundary>
+      <ogc:Literal>0</ogc:Literal>
+    </ogc:LowerBoundary>
+    <ogc:UpperBoundary>
+      <ogc:Literal>100</ogc:Literal>
+    </ogc:UpperBoundary>
+  </ogc:PropertyIsBetween>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/between2.xml

@@ -0,0 +1,7 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">
+  <ogc:PropertyIsBetween>
+    <ogc:PropertyName>number</ogc:PropertyName>
+    <ogc:LowerBoundary>0</ogc:LowerBoundary>
+    <ogc:UpperBoundary>100</ogc:UpperBoundary>
+  </ogc:PropertyIsBetween>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/contains.xml

@@ -0,0 +1,12 @@
+<Filter xmlns="http://www.opengis.net/ogc" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Contains>
+    <PropertyName>Geometry</PropertyName>
+    <gml:Polygon xmlns:gml="http://www.opengis.net/gml">
+      <gml:outerBoundaryIs>
+        <gml:LinearRing>
+          <gml:coordinates decimal="." cs="," ts=" ">2488789,289552 2588789,289552 2588789,389552 2488789,389552 2488789,289552</gml:coordinates>
+        </gml:LinearRing>
+      </gml:outerBoundaryIs>
+    </gml:Polygon>
+  </Contains>
+</Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/dwithin.xml

@@ -0,0 +1,9 @@
+<Filter xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
+  <DWithin>
+    <PropertyName>Geometry</PropertyName>
+    <gml:Point xmlns:gml="http://www.opengis.net/gml">
+      <gml:coordinates decimal="." cs="," ts=" ">2488789,289552</gml:coordinates>
+    </gml:Point>
+    <Distance units="m">1000</Distance>
+  </DWithin>
+</Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/intersects.xml

@@ -0,0 +1,12 @@
+<Filter xmlns="http://www.opengis.net/ogc" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Intersects>
+    <PropertyName>Geometry</PropertyName>
+    <gml:Polygon xmlns:gml="http://www.opengis.net/gml">
+      <gml:outerBoundaryIs>
+        <gml:LinearRing>
+          <gml:coordinates decimal="." cs="," ts=" ">2488789,289552 2588789,289552 2588789,389552 2488789,389552 2488789,289552</gml:coordinates>
+        </gml:LinearRing>
+      </gml:outerBoundaryIs>
+    </gml:Polygon>
+  </Intersects>
+</Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/logicalfeatureid.xml

@@ -0,0 +1,10 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
+    <ogc:Or>
+        <ogc:PropertyIsLike wildCard="*" singleChar="." escape="!">
+            <ogc:PropertyName>person</ogc:PropertyName>
+            <ogc:Literal>me</ogc:Literal>
+        </ogc:PropertyIsLike>
+        <ogc:FeatureId fid="foo.1"/>
+        <ogc:FeatureId fid="foo.2"/>
+    </ogc:Or>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/logicalfeatureidand.xml

@@ -0,0 +1,10 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
+    <ogc:And>
+        <ogc:PropertyIsLike wildCard="*" singleChar="." escape="!">
+            <ogc:PropertyName>person</ogc:PropertyName>
+            <ogc:Literal>me</ogc:Literal>
+        </ogc:PropertyIsLike>
+        <ogc:FeatureId fid="foo.1"/>
+        <ogc:FeatureId fid="foo.2"/>
+    </ogc:And>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/logicalfeatureidnot.xml

@@ -0,0 +1,5 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
+    <ogc:Not>
+        <ogc:FeatureId fid="foo.2"/>
+    </ogc:Not>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/null.xml

@@ -0,0 +1,5 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd">
+  <ogc:PropertyIsNull>
+    <ogc:PropertyName>prop</ogc:PropertyName>
+  </ogc:PropertyIsNull>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_0_0/within.xml

@@ -0,0 +1,12 @@
+<Filter xmlns="http://www.opengis.net/ogc" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.0.0/filter.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Within>
+    <PropertyName>Geometry</PropertyName>
+    <gml:Polygon xmlns:gml="http://www.opengis.net/gml">
+      <gml:outerBoundaryIs>
+        <gml:LinearRing>
+          <gml:coordinates decimal="." cs="," ts=" ">2488789,289552 2588789,289552 2588789,389552 2488789,389552 2488789,289552</gml:coordinates>
+        </gml:LinearRing>
+      </gml:outerBoundaryIs>
+    </gml:Polygon>
+  </Within>
+</Filter>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/bbox.xml

@@ -0,0 +1,9 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd">
+  <ogc:BBOX>
+    <ogc:PropertyName>the_geom</ogc:PropertyName>
+    <gml:Envelope xmlns:gml="http://www.opengis.net/gml" srsName="EPSG:4326">
+      <gml:lowerCorner>-180 -90</gml:lowerCorner>
+      <gml:upperCorner>180 90</gml:upperCorner>
+    </gml:Envelope>
+  </ogc:BBOX>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/bbox_nogeomname.xml

@@ -0,0 +1,8 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd">
+  <ogc:BBOX>
+    <gml:Envelope xmlns:gml="http://www.opengis.net/gml" srsName="EPSG:4326">
+      <gml:lowerCorner>-180 -90</gml:lowerCorner>
+      <gml:upperCorner>180 90</gml:upperCorner>
+    </gml:Envelope>
+  </ogc:BBOX>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/customfunction.xml

@@ -0,0 +1,11 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd">
+  <ogc:And>
+    <ogc:PropertyIsNotEqualTo matchCase="false">
+      <ogc:PropertyName>FOO</ogc:PropertyName>
+      <ogc:Function name="customFunction">
+        <ogc:Literal>param1</ogc:Literal>
+        <ogc:Literal>param2</ogc:Literal>
+      </ogc:Function>
+    </ogc:PropertyIsNotEqualTo>
+  </ogc:And>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/function.xml

@@ -0,0 +1,10 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd">
+  <ogc:Intersects>
+    <ogc:PropertyName>the_geom</ogc:PropertyName>
+    <ogc:Function name="querySingle">
+      <ogc:Literal>sf:restricted</ogc:Literal>
+      <ogc:Literal>the_geom</ogc:Literal>
+      <ogc:Literal>cat=3</ogc:Literal>
+    </ogc:Function>
+  </ogc:Intersects>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/intersects.xml

@@ -0,0 +1,9 @@
+<Filter xmlns="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd">
+  <Intersects>
+    <PropertyName>Geometry</PropertyName>
+    <gml:Envelope xmlns:gml="http://www.opengis.net/gml" srsName="EPSG:4326">
+      <gml:lowerCorner>-180 -90</gml:lowerCorner>
+      <gml:upperCorner>180 90</gml:upperCorner>
+    </gml:Envelope>
+  </Intersects>
+</Filter>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/likematchcase.xml

@@ -0,0 +1,6 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd">
+    <ogc:PropertyIsLike wildCard="*" singleChar="." escapeChar="!" matchCase="false">
+        <ogc:PropertyName>person</ogc:PropertyName>
+        <ogc:Literal>*me*</ogc:Literal>
+    </ogc:PropertyIsLike>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/nestedfunction.xml

@@ -0,0 +1,13 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd">
+  <ogc:DWithin>
+    <ogc:PropertyName>the_geom</ogc:PropertyName>
+      <ogc:Function name="collectGeometries">
+        <ogc:Function name="queryCollection">
+          <ogc:Literal>sf:roads</ogc:Literal>
+          <ogc:Literal>the_geom</ogc:Literal>
+          <ogc:Literal>INCLUDE</ogc:Literal>
+        </ogc:Function>
+      </ogc:Function>
+    <ogc:Distance units="meters">200</ogc:Distance>
+  </ogc:DWithin>
+</ogc:Filter>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/sortby.xml

@@ -0,0 +1,10 @@
+<ogc:SortBy xmlns:ogc="http://www.opengis.net/ogc">
+  <ogc:SortProperty>
+    <ogc:PropertyName>Title</ogc:PropertyName>
+    <ogc:SortOrder>ASC</ogc:SortOrder>
+  </ogc:SortProperty>
+  <ogc:SortProperty>
+    <ogc:PropertyName>Relevance</ogc:PropertyName>
+    <ogc:SortOrder>DESC</ogc:SortOrder>
+  </ogc:SortProperty>
+</ogc:SortBy>

test/spec/ol/parser/ogc/xml/filter_v1_1_0/test.xml

@@ -0,0 +1,31 @@
+<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/ogc http://schemas.opengis.net/filter/1.1.0/filter.xsd">
+  <ogc:Or>
+    <ogc:PropertyIsBetween>
+      <ogc:PropertyName>number</ogc:PropertyName>
+        <ogc:LowerBoundary>
+          <ogc:Literal>1064866676</ogc:Literal>
+        </ogc:LowerBoundary>
+      <ogc:UpperBoundary>
+        <ogc:Literal>1065512599</ogc:Literal>
+      </ogc:UpperBoundary>
+    </ogc:PropertyIsBetween>
+    <ogc:PropertyIsLike wildCard="*" singleChar="." escapeChar="!">
+      <ogc:PropertyName>cat</ogc:PropertyName>
+      <ogc:Literal>*dog.food!*good</ogc:Literal>
+    </ogc:PropertyIsLike>
+    <ogc:Not>
+      <ogc:PropertyIsLessThanOrEqualTo>
+        <ogc:PropertyName>FOO</ogc:PropertyName>
+        <ogc:Literal>5000</ogc:Literal>
+      </ogc:PropertyIsLessThanOrEqualTo>
+    </ogc:Not>
+    <ogc:PropertyIsEqualTo>
+      <ogc:PropertyName>cat</ogc:PropertyName>
+      <ogc:Literal>dog</ogc:Literal>
+    </ogc:PropertyIsEqualTo>
+    <ogc:PropertyIsEqualTo matchCase="false">
+      <ogc:PropertyName>cat</ogc:PropertyName>
+      <ogc:Literal>dog</ogc:Literal>
+    </ogc:PropertyIsEqualTo>
+  </ogc:Or>
+</ogc:Filter>