Change GML method call signature from WFS format

This commit is contained in:
Florent gravin
2014-09-23 12:24:04 +02:00
parent 074330707c
commit 13f10f6a98
+6 -5
View File
@@ -196,7 +196,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadataFromDocument =
ol.format.WFS.FEATURE_COLLECTION_PARSERS_ = { ol.format.WFS.FEATURE_COLLECTION_PARSERS_ = {
'http://www.opengis.net/gml': { 'http://www.opengis.net/gml': {
'boundedBy': ol.xml.makeObjectPropertySetter( 'boundedBy': ol.xml.makeObjectPropertySetter(
ol.format.GML.readGeometry, 'bounds') ol.format.GML.prototype.readGeometryElement, 'bounds')
} }
}; };
@@ -363,7 +363,7 @@ ol.format.WFS.writeFeature_ = function(node, feature, objectStack) {
var featureNS = goog.object.get(context, 'featureNS'); var featureNS = goog.object.get(context, 'featureNS');
var child = ol.xml.createElementNS(featureNS, featureType); var child = ol.xml.createElementNS(featureNS, featureType);
node.appendChild(child); node.appendChild(child);
ol.format.GML.writeFeature(child, feature, objectStack); ol.format.GML.prototype.writeFeatureElement(child, feature, objectStack);
}; };
@@ -457,7 +457,8 @@ ol.format.WFS.writeProperty_ = function(node, pair, objectStack) {
var value = ol.xml.createElementNS('http://www.opengis.net/wfs', 'Value'); var value = ol.xml.createElementNS('http://www.opengis.net/wfs', 'Value');
node.appendChild(value); node.appendChild(value);
if (pair.value instanceof ol.geom.Geometry) { if (pair.value instanceof ol.geom.Geometry) {
ol.format.GML.writeGeometry(value, pair.value, objectStack); ol.format.GML.prototype.writeGeometryElement(value,
pair.value, objectStack);
} else { } else {
ol.format.XSD.writeStringTextNode(value, pair.value); ol.format.XSD.writeStringTextNode(value, pair.value);
} }
@@ -564,7 +565,7 @@ ol.format.WFS.writeOgcBBOX_ = function(node, bbox, objectStack) {
var bboxNode = ol.xml.createElementNS('http://www.opengis.net/ogc', 'BBOX'); var bboxNode = ol.xml.createElementNS('http://www.opengis.net/ogc', 'BBOX');
node.appendChild(bboxNode); node.appendChild(bboxNode);
ol.format.WFS.writeOgcPropertyName_(bboxNode, geometryName, objectStack); ol.format.WFS.writeOgcPropertyName_(bboxNode, geometryName, objectStack);
ol.format.GML.writeGeometry(bboxNode, bbox, objectStack); ol.format.GML.prototype.writeGeometryElement(bboxNode, bbox, objectStack);
}; };
@@ -746,7 +747,7 @@ ol.format.WFS.prototype.readProjectionFromNode = function(node) {
(n.childNodes.length === 1 && (n.childNodes.length === 1 &&
n.firstChild.nodeType === 3))) { n.firstChild.nodeType === 3))) {
var objectStack = [{}]; var objectStack = [{}];
ol.format.GML.readGeometry(n, objectStack); ol.format.GML.prototype.readGeometryElement(n, objectStack);
return ol.proj.get(objectStack.pop().srsName); return ol.proj.get(objectStack.pop().srsName);
} }
} }