ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Geoserver filter Functions support in OL filter encoding, p=igrcic,r=me (closes #3053)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@11712 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
bartvde
2011-03-17 15:47:28 +00:00
parent 2e00e2e442
commit dbd08a10a3
7 changed files with 349 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
tests/Format/Filter/v1_0_0.html
View File

@@ -152,6 +152,116 @@
}
function test_FilterFunctions(t) {
t.plan(2);
var parser = new OpenLayers.Format.Filter.v1_0_0();
//test spatial intersects with filter function
var filter = new OpenLayers.Filter.Spatial({
property: 'the_geom',
type: OpenLayers.Filter.Spatial.INTERSECTS,
value: new OpenLayers.Filter.Function({
name : 'querySingle',
params: ['sf:restricted', 'the_geom', 'cat=3']
})
});
var out =
'<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
'<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>';
var node = parser.write(filter);
//test writer
t.xml_eq(node, out, "spatial intersect filter with functions correctly written");
//test logical filter with custom function
filter = new OpenLayers.Filter.Logical({
type: OpenLayers.Filter.Logical.AND,
filters: [
new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.NOT_EQUAL_TO,
property: "FOO",
value: new OpenLayers.Filter.Function({
name : 'customFunction',
params : ['param1', 'param2']
})
})
]
});
out =
'<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
'<ogc:And>' +
'<ogc:PropertyIsNotEqualTo>' +
'<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>';
node = parser.write(filter);
//test writer
t.xml_eq(node, out, "comparison filter with filter functions correctly written");
}
function test_NestedFilterFunctions(t) {
t.plan(1);
//test spatial dwithin with nested filter function
var filter = new OpenLayers.Filter.Spatial({
property: 'the_geom',
type: OpenLayers.Filter.Spatial.DWITHIN,
value: new OpenLayers.Filter.Function({
name : 'collectGeometries',
params: [
new OpenLayers.Filter.Function({
name : 'queryCollection',
params: ['sf:roads', 'the_geom', 'INCLUDE']
})
]
}),
distanceUnits: "meters",
distance: 200
});
var out =
'<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
'<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>';
var parser = new OpenLayers.Format.Filter.v1_0_0();
var node = parser.write(filter);
//test writer
t.xml_eq(node, out, "spatial dwithin filter with nested functions correctly written");
}
</script>
</head>

112
tests/Format/Filter/v1_1_0.html
View File

@@ -203,6 +203,118 @@
}
function test_FilterFunctions(t) {
t.plan(2);
var parser = new OpenLayers.Format.Filter.v1_1_0();
//test spatial intersects with filter function
var filter = new OpenLayers.Filter.Spatial({
property: 'the_geom',
type: OpenLayers.Filter.Spatial.INTERSECTS,
value: new OpenLayers.Filter.Function({
name : 'querySingle',
params: ['sf:restricted', 'the_geom', 'cat=3']
})
});
var out =
'<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
'<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>';
var node = parser.write(filter);
//test writer
t.xml_eq(node, out, "spatial intersect filter with functions correctly written");
//test logical filter with custom function
filter = new OpenLayers.Filter.Logical({
type: OpenLayers.Filter.Logical.AND,
filters: [
new OpenLayers.Filter.Comparison({
type: OpenLayers.Filter.Comparison.NOT_EQUAL_TO,
matchCase: false,
property: "FOO",
value: new OpenLayers.Filter.Function({
name : 'customFunction',
params : ['param1', 'param2']
})
})
]
});
out =
'<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
'<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>';
node = parser.write(filter);
//test writer
t.xml_eq(node, out, "comparison filter with filter functions correctly written");
}
function test_NestedFilterFunctions(t) {
t.plan(1);
//test spatial dwithin with nested filter function
var filter = new OpenLayers.Filter.Spatial({
property: 'the_geom',
type: OpenLayers.Filter.Spatial.DWITHIN,
value: new OpenLayers.Filter.Function({
name : 'collectGeometries',
params: [
new OpenLayers.Filter.Function({
name : 'queryCollection',
params: ['sf:roads', 'the_geom', 'INCLUDE']
})
]
}),
distanceUnits: "meters",
distance: 200
});
var out =
'<ogc:Filter xmlns:ogc="http://www.opengis.net/ogc">' +
'<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>';
var parser = new OpenLayers.Format.Filter.v1_1_0();
var node = parser.write(filter);
//test writer
t.xml_eq(node, out, "spatial dwithin filter with nested functions correctly written");
}
</script>
</head>
<body>