Merge pull request #523 from jachym/master

Modifications for OpenLayers.Format.WPS* (p=@jachym,r=@bartvde)
This commit is contained in:
Bart van den Eijnden
2012-06-18 06:35:49 -07:00
4 changed files with 171 additions and 15 deletions

View File

@@ -4,7 +4,7 @@
<script type="text/javascript">
function test_read_WPSDescribeProcess(t) {
t.plan(16);
t.plan(17);
var parser = new OpenLayers.Format.WPSDescribeProcess();
var text =
@@ -109,6 +109,13 @@
' </Supported>' +
' </ComplexOutput>' +
' </Output>' +
' <Output>' +
' <ows:Identifier>literal</ows:Identifier>' +
' <ows:Title>literal output</ows:Title>' +
' <LiteralOutput>' +
' <ows:DataType ows:reference="http://www.w3.org/TR/xmlschema-2/#integer">integer</ows:DataType>'+
' </LiteralOutput>' +
' </Output>' +
' </ProcessOutputs>' +
' </ProcessDescription>' +
'</wps:ProcessDescriptions>';
@@ -135,6 +142,9 @@
t.eq(result.complexOutput["supported"].formats["text/xml; subtype=gml/3.1.1"], true, "processOutputs supported format read correctly [1/2]");
t.eq(result.complexOutput["supported"].formats["application/wkt"], true, "processOutputs supported format read correctly [1/2]");
var literalresult = buffer.processOutputs[1];
t.eq(literalresult.literalOutput.dataType, "integer", "processOutputs supported data type read corectly");
text = '<?xml version="1.0" encoding="UTF-8"?>' +
'<wps:ProcessDescriptions service="WPS" version="1.0.0" xmlns:wps="http://www.opengis.net/wps/1.0.0"' +
' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en"' +

View File

@@ -309,12 +309,12 @@
responseForm: {
responseDocument: {
storeExecuteResponse: true,
output: {
outputs: [{
asReference: true,
identifier: 'BufferedPolygon',
title: 'Area serviced by playground.',
'abstract': 'Area within which most users of this playground will live.'
}
}]
}
}
});
@@ -349,6 +349,11 @@
' <ows:Title>Area serviced by playground.</ows:Title>' +
' <ows:Abstract>Area within which most users of this playground will live.</ows:Abstract>' +
' </wps:Output>' +
' <wps:Output>' +
' <ows:Identifier>literal</ows:Identifier>' +
' <ows:Title/>' +
' <ows:Abstract/>' +
' </wps:Output>' +
' </wps:ResponseDocument>' +
' </wps:ResponseForm>' +
'</wps:Execute>';
@@ -381,12 +386,17 @@
storeExecuteResponse: true,
lineage: true,
status: true,
output: {
asReference: true,
identifier: 'BufferedPolygon',
title: 'Area serviced by playground.',
'abstract': 'Area within which most users of this playground will live.'
}
outputs: [
{
asReference: true,
identifier: 'BufferedPolygon',
title: 'Area serviced by playground.',
'abstract': 'Area within which most users of this playground will live.'
},
{
identifier: 'literal'
}
]
}
}
});
@@ -461,12 +471,12 @@
responseForm: {
responseDocument: {
storeExecuteResponse: true,
output: {
outputs: [{
asReference: true,
identifier: 'BufferedPolygon',
title: 'Area serviced by playground.',
'abstract': 'Area within which most users of this playground will live.'
}
}]
}
}
});