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

write out GetFeature in WFS 1.1

Browse Source
This commit is contained in:
Bart van den Eijnden
2013-10-23 14:54:21 +02:00
parent 4df848fae0
commit a77632a88c
5 changed files with 62 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/parser/ogc/wfsparser_v1.js
View File

@@ -42,7 +42,7 @@ ol.parser.ogc.WFS_v1 = function() {
this.setAttributeNS(
node, 'http://www.w3.org/2001/XMLSchema-instance',
'xsi:schemaLocation', this.schemaLocation);
return node;
return {node: node, options: options};
}
};
goog.base(this);

7
src/ol/parser/ogc/wfsparser_v1_0_0.js
View File

@@ -1,6 +1,7 @@
goog.provide('ol.parser.ogc.WFS_v1_0_0');
goog.require('goog.array');
goog.require('goog.functions');
goog.require('goog.object');
goog.require('ol.parser.ogc.Filter_v1_0_0');
goog.require('ol.parser.ogc.WFS_v1');
@@ -40,6 +41,12 @@ ol.parser.ogc.WFS_v1_0_0 = function() {
}
});
goog.object.extend(this.writers[this.defaultNamespaceURI], {
'GetFeature': goog.functions.compose(
function(obj) {
return obj.node;
},
this.writers['http://www.opengis.net/wfs']['GetFeature']
),
'Query': function(options) {
var prefix = goog.isDef(options.featurePrefix) ? options.featurePrefix +
':' : '';

38
src/ol/parser/ogc/wfsparser_v1_1_0.js
View File

@@ -1,7 +1,9 @@
goog.provide('ol.parser.ogc.WFS_v1_1_0');
goog.require('goog.asserts');
goog.require('goog.functions');
goog.require('goog.object');
goog.require('ol.expr.Identifier');
goog.require('ol.parser.ogc.Filter_v1_1_0');
goog.require('ol.parser.ogc.WFS_v1');
@@ -47,18 +49,23 @@ ol.parser.ogc.WFS_v1_1_0 = function() {
}
});
goog.object.extend(this.writers[this.defaultNamespaceURI], {
'GetFeature': function(options) {
var node = this.writers['http://www.opengis.net/wfs']['GetFeature'].
apply(this, arguments);
if (goog.isDef(options)) {
node.setAttribute('resultType', options.resultType);
if (goog.isDef(options.startIndex)) {
node.setAttribute('startIndex', options.startIndex);
}
node.setAttribute('count', options.count);
}
return node;
},
'GetFeature': goog.functions.compose(
function(obj) {
var options = obj.options;
var node = obj.node;
if (goog.isDef(options)) {
node.setAttribute('resultType', options.resultType);
if (goog.isDef(options.startIndex)) {
node.setAttribute('startIndex', options.startIndex);
}
if (goog.isDef(options.count)) {
node.setAttribute('count', options.count);
}
}
return node;
},
this.writers['http://www.opengis.net/wfs']['GetFeature']
),
'Query': function(options) {
var prefix = goog.isDef(options.featurePrefix) ? options.featurePrefix +
':' : '';
@@ -70,9 +77,7 @@ ol.parser.ogc.WFS_v1_1_0 = function() {
}
if (goog.isDef(options.propertyNames)) {
for (var i = 0, ii = options.propertyNames.length; i < ii; i++) {
this.writeNode('wfs:PropertyName', {
property: options.propertyNames[i]
}, null, node);
this.writeNode('PropertyName', options.propertyNames[i], null, node);
}
}
if (goog.isDef(options.filter)) {
@@ -82,8 +87,9 @@ ol.parser.ogc.WFS_v1_1_0 = function() {
return node;
},
'PropertyName': function(obj) {
goog.asserts.assertInstanceof(obj, ol.expr.Identifier);
var node = this.createElementNS('wfs:PropertyName');
node.appendChild(this.createTextNode(obj.property));
node.appendChild(this.createTextNode(obj.getName()));
return node;
}
});

21
test/spec/ol/parser/ogc/wfs_v1_1_0.test.js
View File

@@ -68,6 +68,27 @@ describe('ol.parser.ogc.WFS_v1_1_0', function() {
expect(goog.dom.xml.loadXml(p.serialize(output))).to.xmleql(xml);
done();
});
});
it('handles writing GetFeature with PropertyName', function(done) {
var url = 'spec/ol/parser/ogc/xml/wfs_v1_1_0/getfeature0.xml';
afterLoadXml(url, function(xml) {
var p = new ol.parser.ogc.WFS_v1_1_0();
var output = p.writers[p.defaultNamespaceURI]['GetFeature'].apply(
p, [{
resultType: 'hits',
srsName: 'urn:ogc:def:crs:EPSG::4326',
propertyNames: [new ol.expr.Identifier('STATE_NAME'),
new ol.expr.Identifier('STATE_FIPS'),
new ol.expr.Identifier('STATE_ABBR')],
featureNS: 'http://www.openplans.org/topp',
featurePrefix: 'topp',
featureTypes: ['states']
}]);
expect(goog.dom.xml.loadXml(p.serialize(output))).to.xmleql(xml);
done();
});
});
});

11
test/spec/ol/parser/ogc/xml/wfs_v1_1_0/getfeature0.xml Normal file
View File

@@ -0,0 +1,11 @@
<wfs:GetFeature service="WFS" version="1.1.0" resultType="hits" xmlns:topp="http://www.openplans.org/topp"
xmlns:wfs="http://www.opengis.net/wfs"
xmlns:ogc="http://www.opengis.net/ogc"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengis.net/wfs/1.1.0/wfs.xsd">
<wfs:Query xmlns:wfs="http://www.opengis.net/wfs" typeName="topp:states" srsName="urn:ogc:def:crs:EPSG::4326" xmlns:topp="http://www.openplans.org/topp">
<wfs:PropertyName>STATE_NAME</wfs:PropertyName>
<wfs:PropertyName>STATE_FIPS</wfs:PropertyName>
<wfs:PropertyName>STATE_ABBR</wfs:PropertyName>
</wfs:Query>
</wfs:GetFeature>