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

Use by default instance of ol.format.GML.v3 in WFS format

Browse Source
This commit is contained in:
Florent gravin
2014-09-24 11:16:20 +02:00
parent 58485fc1f1
commit d3ac01445e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/wfsformat.js
+7 -7
View File
@@ -42,10 +42,10 @@ ol.format.WFS = function(opt_options) {
/** /**
* @private * @private
* @type {string} * @type {ol.format.GML}
*/ */
this.gmlFormat_ = goog.isDef(options.gmlFormat) ? this.gmlFormat_ = goog.isDef(options.gmlFormat) ?
options.gmlFormat : new ol.format.GML(); options.gmlFormat : new ol.format.GML.v3();
/** /**
* @private * @private
@@ -223,7 +223,7 @@ ol.format.WFS.prototype.readFeatureCollectionMetadataFromNode = function(node) {
goog.object.set(result, 'numberOfFeatures', value); goog.object.set(result, 'numberOfFeatures', value);
return ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {ol.format.WFS.FeatureCollectionMetadata} */ (result), /** @type {ol.format.WFS.FeatureCollectionMetadata} */ (result),
ol.format.WFS.FEATURE_COLLECTION_PARSERS_, node, []); ol.format.WFS.FEATURE_COLLECTION_PARSERS_, node, [], this.gmlFormat_);
}; };
@@ -371,7 +371,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.prototype.writeFeatureElement(child, feature, objectStack); ol.format.GML.v3.prototype.writeFeatureElement(child, feature, objectStack);
}; };
@@ -465,7 +465,7 @@ 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.prototype.writeGeometryElement(value, ol.format.GML.v3.prototype.writeGeometryElement(value,
pair.value, objectStack); pair.value, objectStack);
} else { } else {
ol.format.XSD.writeStringTextNode(value, pair.value); ol.format.XSD.writeStringTextNode(value, pair.value);
@@ -573,7 +573,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.prototype.writeGeometryElement(bboxNode, bbox, objectStack); ol.format.GML.v3.prototype.writeGeometryElement(bboxNode, bbox, objectStack);
}; };
@@ -755,7 +755,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.prototype.readGeometryElement(n, objectStack); this.gmlFormat_.readGeometryElement(n, objectStack);
return ol.proj.get(objectStack.pop().srsName); return ol.proj.get(objectStack.pop().srsName);
} }
} }