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

Addressing review comments

Browse Source 
* Do not write xmlns
* Make @this annotations consistent
* Handle numbers and strings for attribute values
* Fix defaultNamespaceURI scope
This commit is contained in:
ahocevar
2013-12-06 19:15:44 +01:00
parent e49464a573
commit 19cb3c5835
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/parser/ogc/wfsparser_v1.js
+4 -11
View File
@@ -152,9 +152,6 @@ ol.parser.ogc.WFS_v1 = function(opt_options) {
this.setAttributeNS(node, this.defaultNamespaceURI, 'handle', this.setAttributeNS(node, this.defaultNamespaceURI, 'handle',
options.handle); options.handle);
} }
if (goog.isDef(options.featureNS)) {
node.setAttribute('xmlns:' + options.featurePrefix, options.featureNS);
}
// add in fields // add in fields
var original = feature.getOriginal(); var original = feature.getOriginal();
@@ -200,7 +197,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) {
return node; return node;
}, },
/** /**
* @param {string|ol.geom.Geometry} obj Object. * @param {string|number|ol.geom.Geometry} obj Object.
* @return {Element} Node. * @return {Element} Node.
* @this {ol.parser.XML} * @this {ol.parser.XML}
*/ */
@@ -211,9 +208,8 @@ ol.parser.ogc.WFS_v1 = function(opt_options) {
node.appendChild( node.appendChild(
this.getFilterParser().getGmlParser().writeGeometry(obj)); this.getFilterParser().getGmlParser().writeGeometry(obj));
} else { } else {
goog.asserts.assertString(obj);
node = this.createElementNS('wfs:Value'); node = this.createElementNS('wfs:Value');
node.appendChild(this.createTextNode(obj)); node.appendChild(this.createTextNode(/** @type {string} */ (obj)));
} }
return node; return node;
}, },
@@ -221,7 +217,7 @@ ol.parser.ogc.WFS_v1 = function(opt_options) {
* @param {{feature: ol.Feature, * @param {{feature: ol.Feature,
* options: ol.parser.WFSWriteTransactionOptions}} obj Object. * options: ol.parser.WFSWriteTransactionOptions}} obj Object.
* @return {Element} Node. * @return {Element} Node.
* @this {ol.parser.ogc.GML} * @this {ol.parser.XML}
*/ */
'Delete': function(obj) { 'Delete': function(obj) {
var feature = obj.feature; var feature = obj.feature;
@@ -231,12 +227,9 @@ ol.parser.ogc.WFS_v1 = function(opt_options) {
(goog.isDef(options.featureNS) ? options.featurePrefix + ':' : '') + (goog.isDef(options.featureNS) ? options.featurePrefix + ':' : '') +
options.featureType); options.featureType);
if (goog.isDef(options.handle)) { if (goog.isDef(options.handle)) {
this.setAttributeNS(node, options.defaultNamespaceURI, 'handle', this.setAttributeNS(node, this.defaultNamespaceURI, 'handle',
options.handle); options.handle);
} }
if (goog.isDef(options.featureNS)) {
node.setAttribute('xmlns:' + options.featurePrefix, options.featureNS);
}
var fid = feature.getId(); var fid = feature.getId();
goog.asserts.assert(goog.isDef(fid)); goog.asserts.assert(goog.isDef(fid));
this.writeNode('Filter', new ol.expr.Call(new ol.expr.Identifier( this.writeNode('Filter', new ol.expr.Call(new ol.expr.Identifier(