Merge pull request #2010 from fredj/goog.array.contains

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

src/ol/format/gpxformat.js

@@ -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) ==
+  if (!goog.array.contains(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI)) {
-      -1) {
     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) ==
+  if (!goog.array.contains(ol.format.GPX.NAMESPACE_URIS_, node.namespaceURI)) {
-      -1) {
     return [];
   }
   if (node.localName == 'gpx') {

src/ol/format/kmlformat.js

@@ -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(
+  goog.asserts.assert(goog.array.contains(
-      ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI) != -1);
+      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(
+  goog.asserts.assert(goog.array.contains(
-      ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI) != -1);
+      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(
+  goog.asserts.assert(goog.array.contains(
-      ol.format.KML.GX_NAMESPACE_URIS_, node.namespaceURI) != -1);
+      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) ==
+  if (!goog.array.contains(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI)) {
-      -1) {
     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) ==
+  if (!goog.array.contains(ol.format.KML.NAMESPACE_URIS_, node.namespaceURI)) {
-      -1) {
     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_,
+    if (goog.array.contains(ol.format.KML.NAMESPACE_URIS_, n.namespaceURI) &&
-                           n.namespaceURI) != -1 &&
         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_,
+    if (goog.array.contains(ol.format.KML.NAMESPACE_URIS_, n.namespaceURI) &&
-                           n.namespaceURI) != -1 &&
         (localName == 'Document' ||
          localName == 'Folder' ||
          localName == 'Placemark' ||

src/ol/interaction/selectinteraction.js

@@ -75,7 +75,7 @@ ol.interaction.Select = function(opt_options) {
          * @return {boolean} Include.
          */
         function(layer) {
-      return goog.array.indexOf(layers, layer) != -1;
+      return goog.array.contains(layers, layer);
     };
   } else {
     layerFilter = goog.functions.TRUE;

src/ol/source/wmtssource.js

@@ -269,7 +269,7 @@ ol.source.WMTS.optionsFromCapabilities = function(wmtsCap, layer) {
     var key = elt['identifier'];
     var value = elt['default'];
     if (goog.isDef(value)) {
-      goog.asserts.assert(goog.array.indexOf(elt['values'], value) >= 0);
+      goog.asserts.assert(goog.array.contains(elt['values'], value));
     } else {
       value = elt['values'][0];
     }