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

Merge pull request #1760 from bartvde/gmlfix2

Browse Source 
Get rid of unneccessary if else statements in the GML format (r=@ahocevar)
This commit is contained in:
Bart van den Eijnden
2014-02-25 20:14:13 +01:00
parent c945768e0e a2c01b1090
commit a78b25cdca
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/format/gmlformat.js
+4 -24
View File
@@ -372,14 +372,9 @@ ol.format.GML.readLineString_ = function(node, objectStack) {
ol.format.GML.readPatch_ = function(node, objectStack) { ol.format.GML.readPatch_ = 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 == 'patches'); goog.asserts.assert(node.localName == 'patches');
var result = ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {Array.<Array.<number>>} */ ([null]), /** @type {Array.<Array.<number>>} */ ([null]),
ol.format.GML.PATCHES_PARSERS_, node, objectStack); ol.format.GML.PATCHES_PARSERS_, node, objectStack);
if (goog.isDef(result)) {
return result;
} else {
return undefined;
}
}; };
@@ -392,14 +387,9 @@ ol.format.GML.readPatch_ = function(node, objectStack) {
ol.format.GML.readSegment_ = function(node, objectStack) { ol.format.GML.readSegment_ = 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 == 'segments'); goog.asserts.assert(node.localName == 'segments');
var result = ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {Array.<number>} */ ([null]), /** @type {Array.<number>} */ ([null]),
ol.format.GML.SEGMENTS_PARSERS_, node, objectStack); ol.format.GML.SEGMENTS_PARSERS_, node, objectStack);
if (goog.isDef(result)) {
return result;
} else {
return undefined;
}
}; };
@@ -412,14 +402,9 @@ ol.format.GML.readSegment_ = function(node, objectStack) {
ol.format.GML.readPolygonPatch_ = function(node, objectStack) { ol.format.GML.readPolygonPatch_ = 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 == 'PolygonPatch'); goog.asserts.assert(node.localName == 'PolygonPatch');
var result = ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {Array.<Array.<number>>} */ ([null]), /** @type {Array.<Array.<number>>} */ ([null]),
ol.format.GML.FLAT_LINEAR_RINGS_PARSERS_, node, objectStack); ol.format.GML.FLAT_LINEAR_RINGS_PARSERS_, node, objectStack);
if (goog.isDef(result)) {
return result;
} else {
return undefined;
}
}; };
@@ -432,14 +417,9 @@ ol.format.GML.readPolygonPatch_ = function(node, objectStack) {
ol.format.GML.readLineStringSegment_ = function(node, objectStack) { ol.format.GML.readLineStringSegment_ = 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 == 'LineStringSegment'); goog.asserts.assert(node.localName == 'LineStringSegment');
var result = ol.xml.pushParseAndPop( return ol.xml.pushParseAndPop(
/** @type {Array.<number>} */ ([null]), /** @type {Array.<number>} */ ([null]),
ol.format.GML.GEOMETRY_FLAT_COORDINATES_PARSERS_, node, objectStack); ol.format.GML.GEOMETRY_FLAT_COORDINATES_PARSERS_, node, objectStack);
if (goog.isDef(result)) {
return result;
} else {
return undefined;
}
}; };