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

Merge pull request #5 from ahocevar/gml-context

Browse Source 
Always use a context for GML parsing
This commit is contained in:
Bart van den Eijnden
2014-02-25 14:48:10 +01:00
parent 679b152852 71e1dc9f45
commit 346aa730e5
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/gmlformat.js
+14 -7
View File
@@ -68,7 +68,7 @@ ol.format.GML.NAMESPACE_URIS_ = [
ol.format.GML.readFeatures_ = function(node, objectStack) { ol.format.GML.readFeatures_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
var localName = ol.xml.getLocalName(node); var localName = ol.xml.getLocalName(node);
var context = objectStack[objectStack.length - 1]; var context = objectStack[0];
goog.asserts.assert(goog.isObject(context)); goog.asserts.assert(goog.isObject(context));
var featureType = goog.object.get(context, 'featureType'); var featureType = goog.object.get(context, 'featureType');
var features; var features;
@@ -106,9 +106,12 @@ ol.format.GML.FEATURE_COLLECTION_PARSERS_ = {
* @private * @private
*/ */
ol.format.GML.readGeometry_ = function(node, objectStack) { ol.format.GML.readGeometry_ = function(node, objectStack) {
objectStack = [{srsName: node.firstElementChild.getAttribute('srsName')}]; var context = objectStack[0];
ol.xml.parse(ol.format.GML.GEOMETRY_PARSERS_, node, objectStack); goog.asserts.assert(goog.isObject(context));
return objectStack.pop(); goog.object.set(context, 'srsName',
node.firstElementChild.getAttribute('srsName'));
return /** @type {ol.geom.Geometry} */ (ol.xml.pushParseAndPop(null,
ol.format.GML.GEOMETRY_PARSERS_, node, objectStack));
}; };
@@ -645,7 +648,9 @@ ol.format.GML.readFlatCoordinatesFromNode_ = function(node, objectStack) {
ol.format.GML.readFlatPos_ = function(node, objectStack) { ol.format.GML.readFlatPos_ = function(node, objectStack) {
var s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, ''); var s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, '');
var flatCoordinates = goog.array.map(s.split(/\s+/), parseFloat); var flatCoordinates = goog.array.map(s.split(/\s+/), parseFloat);
var containerSrs = objectStack[0].srsName; var context = objectStack[0];
goog.asserts.assert(goog.isObject(context));
var containerSrs = goog.object.get(context, 'srsName');
var axisOrientation = 'enu'; var axisOrientation = 'enu';
if (containerSrs !== null) { if (containerSrs !== null) {
var proj = ol.proj.get(containerSrs); var proj = ol.proj.get(containerSrs);
@@ -673,7 +678,9 @@ ol.format.GML.readFlatPos_ = function(node, objectStack) {
*/ */
ol.format.GML.readFlatPosList_ = function(node, objectStack) { ol.format.GML.readFlatPosList_ = function(node, objectStack) {
var s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, ''); var s = ol.xml.getAllTextContent(node, false).replace(/^\s*|\s*$/g, '');
var containerSrs = objectStack[0].srsName; var context = objectStack[0];
goog.asserts.assert(goog.isObject(context));
var containerSrs = goog.object.get(context, 'srsName');
var containerDimension = node.parentNode.getAttribute('srsDimension'); var containerDimension = node.parentNode.getAttribute('srsDimension');
var axisOrientation = 'enu'; var axisOrientation = 'enu';
if (containerSrs !== null) { if (containerSrs !== null) {
@@ -971,7 +978,7 @@ ol.format.GML.FLAT_LINEAR_RING_PARSERS_ = ol.xml.makeParsersNS(
* @inheritDoc * @inheritDoc
*/ */
ol.format.GML.prototype.readGeometryFromNode = function(node) { ol.format.GML.prototype.readGeometryFromNode = function(node) {
return ol.format.GML.readGeometry_(node, []); return ol.format.GML.readGeometry_(node, [{}]);
}; };