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

Use goog.array.contains instead of goog.array.indexOf

Browse Source
This commit is contained in:
Frederic Junod
2014-04-26 08:31:40 +02:00
parent 928e3244cf
commit 68773941d3
4 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/format/gpxformat.js
View File

@@ -378,8 +378,7 @@ ol.format.GPX.prototype.readFeature;
*/
ol.format.GPX.prototype.readFeatureFromNode = function(node) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
if (goog.array.indexOf(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI) ==
-1) {
if (!goog.array.contains(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI)) {
return null;
}
var featureReader = ol.format.GPX.FEATURE_READER_[node.localName];
@@ -409,8 +408,7 @@ ol.format.GPX.prototype.readFeatures;
*/
ol.format.GPX.prototype.readFeaturesFromNode = function(node) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
if (goog.array.indexOf(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI) ==
-1) {
if (!goog.array.contains(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI)) {
return [];
}
if (node.localName == 'gpx') {

24
src/ol/format/kmlformat.js
View File

@@ -568,8 +568,8 @@ ol.format.KML.readFlatLinearRing_ = function(node, objectStack) {
*/
ol.format.KML.gxCoordParser_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(goog.array.indexOf(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI) != -1);
goog.asserts.assert(goog.array.contains(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI));
goog.asserts.assert(node.localName == 'coord');
var gxTrackObject = /** @type {ol.format.KMLGxTrackObject_} */
(objectStack[objectStack.length - 1]);
@@ -598,8 +598,8 @@ ol.format.KML.gxCoordParser_ = function(node, objectStack) {
*/
ol.format.KML.readGxMultiTrack_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(goog.array.indexOf(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI) != -1);
goog.asserts.assert(goog.array.contains(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI));
goog.asserts.assert(node.localName == 'MultiTrack');
var lineStrings = ol.xml.pushParseAndPop(
/** @type {Array.<ol.geom.LineString>} */ ([]),
@@ -621,8 +621,8 @@ ol.format.KML.readGxMultiTrack_ = function(node, objectStack) {
*/
ol.format.KML.readGxTrack_ = function(node, objectStack) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
goog.asserts.assert(goog.array.indexOf(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI) != -1);
goog.asserts.assert(goog.array.contains(
ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI));
goog.asserts.assert(node.localName == 'Track');
var gxTrackObject = ol.xml.pushParseAndPop(
/** @type {ol.format.KMLGxTrackObject_} */ ({
@@ -1459,8 +1459,7 @@ ol.format.KML.prototype.readFeature;
*/
ol.format.KML.prototype.readFeatureFromNode = function(node) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
if (goog.array.indexOf(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI) ==
-1) {
if (!goog.array.contains(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI)) {
return null;
}
goog.asserts.assert(node.localName == 'Placemark');
@@ -1488,8 +1487,7 @@ ol.format.KML.prototype.readFeatures;
*/
ol.format.KML.prototype.readFeaturesFromNode = function(node) {
goog.asserts.assert(node.nodeType == goog.dom.NodeType.ELEMENT);
if (goog.array.indexOf(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI) ==
-1) {
if (!goog.array.contains(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI)) {
return [];
}
var features;
@@ -1570,16 +1568,14 @@ ol.format.KML.prototype.readNameFromDocument = function(doc) {
ol.format.KML.prototype.readNameFromNode = function(node) {
var n;
for (n = node.firstElementChild; !goog.isNull(n); n = n.nextElementSibling) {
if (goog.array.indexOf(ol.format.KML.NAMESPACE_URIS_,
n.namespaceURI) != -1 &&
if (goog.array.contains(ol.format.KML.NAMESPACE_URIS_, n.namespaceURI) &&
n.localName == 'name') {
return ol.format.XSD.readString(n);
}
}
for (n = node.firstElementChild; !goog.isNull(n); n = n.nextElementSibling) {
var localName = ol.xml.getLocalName(n);
if (goog.array.indexOf(ol.format.KML.NAMESPACE_URIS_,
n.namespaceURI) != -1 &&
if (goog.array.contains(ol.format.KML.NAMESPACE_URIS_, n.namespaceURI) &&
(localName == 'Document' ||
localName == 'Folder' ||
localName == 'Placemark' ||