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
@@ -127,6 +127,10 @@ OpenLayers.Format.WPSDescribeProcess = OpenLayers.Class(
|
||||
output.complexOutput = {};
|
||||
this.readChildNodes(node, output.complexOutput);
|
||||
},
|
||||
"LiteralOutput": function(node, output) {
|
||||
output.literalOutput = {};
|
||||
this.readChildNodes(node, output.literalOutput);
|
||||
},
|
||||
"Input": function(node, dataInputs) {
|
||||
var input = {
|
||||
maxOccurs: parseInt(node.getAttribute("maxOccurs")),
|
||||
|
||||
@@ -93,6 +93,28 @@ OpenLayers.Format.WPSExecute = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
return OpenLayers.Format.XML.prototype.write.apply(this, [node]);
|
||||
},
|
||||
|
||||
/**
|
||||
* APIMethod: read
|
||||
* Parse a WPS Execute and return an object with its information.
|
||||
*
|
||||
* Parameters:
|
||||
* data - {String} or {DOMElement} data to read/parse.
|
||||
*
|
||||
* Returns:
|
||||
* {Object}
|
||||
*/
|
||||
read: function(data) {
|
||||
if(typeof data == "string") {
|
||||
data = OpenLayers.Format.XML.prototype.read.apply(this, [data]);
|
||||
}
|
||||
if(data && data.nodeType == 9) {
|
||||
data = data.documentElement;
|
||||
}
|
||||
var info = {};
|
||||
this.readNode(data, info);
|
||||
return info;
|
||||
},
|
||||
|
||||
/**
|
||||
* Property: writers
|
||||
* As a compliment to the readers property, this structure contains public
|
||||
@@ -131,15 +153,20 @@ OpenLayers.Format.WPSExecute = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
status: responseDocument.status
|
||||
}
|
||||
});
|
||||
if (responseDocument.output) {
|
||||
this.writeNode("wps:Output", responseDocument.output, node);
|
||||
if (responseDocument.outputs) {
|
||||
for (var i = 0, len = responseDocument.outputs.length; i < len; i++) {
|
||||
this.writeNode("wps:Output", responseDocument.outputs[i], node);
|
||||
}
|
||||
}
|
||||
return node;
|
||||
},
|
||||
"Output": function(output) {
|
||||
var node = this.createElementNSPlus("wps:Output", {
|
||||
attributes: {
|
||||
asReference: output.asReference
|
||||
asReference: output.asReference,
|
||||
mimeType: output.mimeType,
|
||||
encoding: output.encoding,
|
||||
schema: output.schema
|
||||
}
|
||||
});
|
||||
this.writeNode("ows:Identifier", output.identifier, node);
|
||||
@@ -150,7 +177,9 @@ OpenLayers.Format.WPSExecute = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
"RawDataOutput": function(rawDataOutput) {
|
||||
var node = this.createElementNSPlus("wps:RawDataOutput", {
|
||||
attributes: {
|
||||
mimeType: rawDataOutput.mimeType
|
||||
mimeType: rawDataOutput.mimeType,
|
||||
encoding: rawDataOutput.encoding,
|
||||
schema: rawDataOutput.schema
|
||||
}
|
||||
});
|
||||
this.writeNode("ows:Identifier", rawDataOutput.identifier, node);
|
||||
@@ -186,6 +215,8 @@ OpenLayers.Format.WPSExecute = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
this.writeNode("wps:LiteralData", data.literalData, node);
|
||||
} else if (data.complexData) {
|
||||
this.writeNode("wps:ComplexData", data.complexData, node);
|
||||
} else if (data.boundingBoxData) {
|
||||
this.writeNode("ows:BoundingBox", data.boundingBoxData, node);
|
||||
}
|
||||
return node;
|
||||
},
|
||||
@@ -256,6 +287,107 @@ OpenLayers.Format.WPSExecute = OpenLayers.Class(OpenLayers.Format.XML, {
|
||||
"ogc": OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc,
|
||||
"ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows
|
||||
},
|
||||
|
||||
/**
|
||||
* Property: readers
|
||||
* Contains public functions, grouped by namespace prefix, that will
|
||||
* be applied when a namespaced node is found matching the function
|
||||
* name. The function will be applied in the scope of this parser
|
||||
* with two arguments: the node being read and a context object passed
|
||||
* from the parent.
|
||||
*/
|
||||
readers: {
|
||||
"wps": {
|
||||
"ExecuteResponse": function(node, obj) {
|
||||
obj.executeResponse = {
|
||||
lang: node.getAttribute("lang"),
|
||||
statusLocation: node.getAttribute("statusLocation"),
|
||||
serviceInstance: node.getAttribute("serviceInstance"),
|
||||
service: node.getAttribute("service")
|
||||
};
|
||||
this.readChildNodes(node, obj.executeResponse);
|
||||
},
|
||||
"Process":function(node,obj) {
|
||||
obj.process = {};
|
||||
this.readChildNodes(node, obj.process);
|
||||
},
|
||||
"Status":function(node,obj) {
|
||||
obj.status = {
|
||||
creationTime: node.getAttribute("creationTime")
|
||||
};
|
||||
this.readChildNodes(node, obj.status);
|
||||
},
|
||||
"ProcessSucceeded": function(node,obj) {
|
||||
obj.processSucceeded = true;
|
||||
},
|
||||
"ProcessOutputs": function(node, processDescription) {
|
||||
processDescription.processOutputs = [];
|
||||
this.readChildNodes(node, processDescription.processOutputs);
|
||||
},
|
||||
"Output": function(node, processOutputs) {
|
||||
var output = {};
|
||||
this.readChildNodes(node, output);
|
||||
processOutputs.push(output);
|
||||
},
|
||||
"Reference": function(node, output) {
|
||||
output.reference = {
|
||||
href: node.getAttribute("href"),
|
||||
mimeType: node.getAttribute("mimeType"),
|
||||
encoding: node.getAttribute("encoding"),
|
||||
schema: node.getAttribute("schema")
|
||||
};
|
||||
},
|
||||
"Data": function(node, output) {
|
||||
output.data = {};
|
||||
this.readChildNodes(node, output);
|
||||
},
|
||||
"LiteralData": function(node, output) {
|
||||
output.literalData = {
|
||||
dataType: node.getAttribute("dataType"),
|
||||
uom: node.getAttribute("uom"),
|
||||
value: this.getChildValue(node)
|
||||
};
|
||||
},
|
||||
"ComplexData": function(node, output) {
|
||||
output.complexData = {
|
||||
mimeType: node.getAttribute("mimeType"),
|
||||
schema: node.getAttribute("schema"),
|
||||
encoding: node.getAttribute("encoding"),
|
||||
value: ""
|
||||
};
|
||||
|
||||
// try to get *some* value, ignore the empty text values
|
||||
if (this.isSimpleContent(node)) {
|
||||
var child;
|
||||
for(child=node.firstChild; child; child=child.nextSibling) {
|
||||
switch(child.nodeType) {
|
||||
case 3: // text node
|
||||
case 4: // cdata section
|
||||
output.complexData.value += child.nodeValue;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
for(child=node.firstChild; child; child=child.nextSibling) {
|
||||
if (child.nodeType == 1) {
|
||||
output.complexData.value = child;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
"BoundingBox": function(node, output) {
|
||||
output.boundingBoxData = {
|
||||
dimensions: node.getAttribute("dimensions"),
|
||||
crs: node.getAttribute("crs")
|
||||
};
|
||||
this.readChildNodes(node, output.boundingBoxData);
|
||||
}
|
||||
},
|
||||
|
||||
// TODO: we should add Exception parsing here
|
||||
"ows": OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers["ows"]
|
||||
},
|
||||
|
||||
CLASS_NAME: "OpenLayers.Format.WPSExecute"
|
||||
|
||||
|
||||
@@ -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"' +
|
||||
|
||||
@@ -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.'
|
||||
}
|
||||
}]
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user