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

Rename ol.xml.parse to ol.xml.parseNode

Browse Source
This commit is contained in:
Antoine Abt
2014-10-27 10:55:21 +01:00
parent ba2d39e683
commit 757b6a214c
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/gml/gml3.js
+2 -2
View File
@@ -142,7 +142,7 @@ ol.format.GML3.prototype.curveMemberParser_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'curveMember' || goog.asserts.assert(node.localName == 'curveMember' ||
node.localName == 'curveMembers'); node.localName == 'curveMembers');
ol.xml.parse(this.CURVEMEMBER_PARSERS_, node, objectStack, this); ol.xml.parseNode(this.CURVEMEMBER_PARSERS_, node, objectStack, this);
}; };
@@ -155,7 +155,7 @@ ol.format.GML3.prototype.surfaceMemberParser_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'surfaceMember' || goog.asserts.assert(node.localName == 'surfaceMember' ||
node.localName == 'surfaceMembers'); node.localName == 'surfaceMembers');
ol.xml.parse(this.SURFACEMEMBER_PARSERS_, ol.xml.parseNode(this.SURFACEMEMBER_PARSERS_,
node, objectStack, this); node, objectStack, this);
}; };
src/ol/format/gml/gmlbase.js
+3 -3
View File
@@ -274,7 +274,7 @@ ol.format.GMLBase.prototype.pointMemberParser_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'pointMember' || goog.asserts.assert(node.localName == 'pointMember' ||
node.localName == 'pointMembers'); node.localName == 'pointMembers');
ol.xml.parse(this.POINTMEMBER_PARSERS_, ol.xml.parseNode(this.POINTMEMBER_PARSERS_,
node, objectStack, this); node, objectStack, this);
}; };
@@ -289,7 +289,7 @@ ol.format.GMLBase.prototype.lineStringMemberParser_ =
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'lineStringMember' || goog.asserts.assert(node.localName == 'lineStringMember' ||
node.localName == 'lineStringMembers'); node.localName == 'lineStringMembers');
ol.xml.parse(this.LINESTRINGMEMBER_PARSERS_, ol.xml.parseNode(this.LINESTRINGMEMBER_PARSERS_,
node, objectStack, this); node, objectStack, this);
}; };
@@ -304,7 +304,7 @@ ol.format.GMLBase.prototype.polygonMemberParser_ =
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'polygonMember' || goog.asserts.assert(node.localName == 'polygonMember' ||
node.localName == 'polygonMembers'); node.localName == 'polygonMembers');
ol.xml.parse(this.POLYGONMEMBER_PARSERS_, node, ol.xml.parseNode(this.POLYGONMEMBER_PARSERS_, node,
objectStack, this); objectStack, this);
}; };
src/ol/format/gpxformat.js
+2 -2
View File
@@ -100,7 +100,7 @@ ol.format.GPX.parseLink_ = function(node, objectStack) {
if (!goog.isNull(href)) { if (!goog.isNull(href)) {
goog.object.set(values, 'link', href); goog.object.set(values, 'link', href);
} }
ol.xml.parse(ol.format.GPX.LINK_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.GPX.LINK_PARSERS_, node, objectStack);
}; };
@@ -164,7 +164,7 @@ ol.format.GPX.parseTrkSeg_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'trkseg'); goog.asserts.assert(node.localName == 'trkseg');
var values = /** @type {Object} */ (objectStack[objectStack.length - 1]); var values = /** @type {Object} */ (objectStack[objectStack.length - 1]);
ol.xml.parse(ol.format.GPX.TRKSEG_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.GPX.TRKSEG_PARSERS_, node, objectStack);
var flatCoordinates = /** @type {Array.<number>} */ var flatCoordinates = /** @type {Array.<number>} */
(goog.object.get(values, 'flatCoordinates')); (goog.object.get(values, 'flatCoordinates'));
var ends = /** @type {Array.<number>} */ (goog.object.get(values, 'ends')); var ends = /** @type {Array.<number>} */ (goog.object.get(values, 'ends'));
src/ol/format/kmlformat.js
+2 -2
View File
@@ -1000,7 +1000,7 @@ ol.format.KML.DataParser_ = function(node, objectStack) {
ol.format.KML.ExtendedDataParser_ = function(node, objectStack) { ol.format.KML.ExtendedDataParser_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'ExtendedData'); goog.asserts.assert(node.localName == 'ExtendedData');
ol.xml.parse(ol.format.KML.EXTENDED_DATA_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.KML.EXTENDED_DATA_PARSERS_, node, objectStack);
}; };
@@ -1066,7 +1066,7 @@ ol.format.KML.PlacemarkStyleMapParser_ = function(node, objectStack) {
ol.format.KML.SchemaDataParser_ = function(node, objectStack) { ol.format.KML.SchemaDataParser_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT); goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(node.localName == 'SchemaData'); goog.asserts.assert(node.localName == 'SchemaData');
ol.xml.parse(ol.format.KML.SCHEMA_DATA_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.KML.SCHEMA_DATA_PARSERS_, node, objectStack);
}; };
src/ol/format/wfsformat.js
+1 -1
View File
@@ -278,7 +278,7 @@ ol.format.WFS.OGC_FID_PARSERS_ = {
* @private * @private
*/ */
ol.format.WFS.fidParser_ = function(node, objectStack) { ol.format.WFS.fidParser_ = function(node, objectStack) {
ol.xml.parse(ol.format.WFS.OGC_FID_PARSERS_, node, objectStack); ol.xml.parseNode(ol.format.WFS.OGC_FID_PARSERS_, node, objectStack);
}; };
src/ol/xml.js
+2 -2
View File
@@ -643,7 +643,7 @@ ol.xml.makeStructureNS = function(namespaceURIs, structure, opt_structureNS) {
* @param {Array.<*>} objectStack Object stack. * @param {Array.<*>} objectStack Object stack.
* @param {*=} opt_this The object to use as `this`. * @param {*=} opt_this The object to use as `this`.
*/ */
ol.xml.parse = function(parsersNS, node, objectStack, opt_this) { ol.xml.parseNode = function(parsersNS, node, objectStack, opt_this) {
var n; var n;
for (n = node.firstElementChild; !goog.isNull(n); n = n.nextElementSibling) { for (n = node.firstElementChild; !goog.isNull(n); n = n.nextElementSibling) {
var parsers = parsersNS[n.namespaceURI]; var parsers = parsersNS[n.namespaceURI];
@@ -670,7 +670,7 @@ ol.xml.parse = function(parsersNS, node, objectStack, opt_this) {
ol.xml.pushParseAndPop = function( ol.xml.pushParseAndPop = function(
object, parsersNS, node, objectStack, opt_this) { object, parsersNS, node, objectStack, opt_this) {
objectStack.push(object); objectStack.push(object);
ol.xml.parse(parsersNS, node, objectStack, opt_this); ol.xml.parseNode(parsersNS, node, objectStack, opt_this);
return objectStack.pop(); return objectStack.pop();
}; };