From 1aca93d297c45489c2cf53c22cfc8090634370ae Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 29 Sep 2015 09:48:19 -0600 Subject: [PATCH] Remove goog.isDefAndNotNull() from vector sources --- src/ol/source/tilevectorsource.js | 3 +-- src/ol/source/vectorsource.js | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ol/source/tilevectorsource.js b/src/ol/source/tilevectorsource.js index af66f75ed9..0f2864e10f 100644 --- a/src/ol/source/tilevectorsource.js +++ b/src/ol/source/tilevectorsource.js @@ -134,8 +134,7 @@ ol.source.TileVector.prototype.forEachFeatureAtCoordinateAndResolution = for (i = 0, ii = features.length; i < ii; ++i) { var feature = features[i]; var geometry = feature.getGeometry(); - goog.asserts.assert(goog.isDefAndNotNull(geometry), - 'feature geometry is defined and not null'); + goog.asserts.assert(geometry, 'feature geometry is defined and not null'); if (geometry.containsCoordinate(coordinate)) { var result = callback.call(opt_this, feature); if (result) { diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js index 638f5bfb0f..c562df0eb7 100644 --- a/src/ol/source/vectorsource.js +++ b/src/ol/source/vectorsource.js @@ -450,8 +450,7 @@ ol.source.Vector.prototype.forEachFeatureAtCoordinateDirect = var extent = [coordinate[0], coordinate[1], coordinate[0], coordinate[1]]; return this.forEachFeatureInExtent(extent, function(feature) { var geometry = feature.getGeometry(); - goog.asserts.assert(goog.isDefAndNotNull(geometry), - 'feature geometry is defined and not null'); + goog.asserts.assert(geometry, 'feature geometry is defined and not null'); if (geometry.containsCoordinate(coordinate)) { return callback.call(opt_this, feature); } else { @@ -533,7 +532,7 @@ ol.source.Vector.prototype.forEachFeatureIntersectingExtent = */ function(feature) { var geometry = feature.getGeometry(); - goog.asserts.assert(goog.isDefAndNotNull(geometry), + goog.asserts.assert(geometry, 'feature geometry is defined and not null'); if (geometry.intersectsExtent(extent)) { var result = callback.call(opt_this, feature); @@ -645,7 +644,7 @@ ol.source.Vector.prototype.getClosestFeatureToCoordinate = */ function(feature) { var geometry = feature.getGeometry(); - goog.asserts.assert(goog.isDefAndNotNull(geometry), + goog.asserts.assert(geometry, 'feature geometry is defined and not null'); var previousMinSquaredDistance = minSquaredDistance; minSquaredDistance = geometry.closestPointXY(