Merge pull request #4176 from tschaub/remove-isdefandnotnull

Remove use of goog.isDefAndNotNull().
This commit is contained in:
Tim Schaub
2015-10-01 00:05:57 -06:00
45 changed files with 116 additions and 135 deletions

View File

@@ -125,7 +125,7 @@ ol.render.webgl.Immediate.prototype.drawCircleGeometry =
*/
ol.render.webgl.Immediate.prototype.drawFeature = function(feature, style) {
var geometry = style.getGeometryFunction()(feature);
if (!goog.isDefAndNotNull(geometry) ||
if (!geometry ||
!ol.extent.intersects(this.extent_, geometry.getExtent())) {
return;
}

View File

@@ -821,7 +821,7 @@ ol.render.webgl.ImageReplay.prototype.drawHitDetectionReplayOneByOne_ =
featureUid = goog.getUid(feature).toString();
if (skippedFeaturesHash[featureUid] === undefined &&
goog.isDefAndNotNull(feature.getGeometry()) &&
feature.getGeometry() &&
(opt_hitExtent === undefined || ol.extent.intersects(
/** @type {Array<number>} */ (opt_hitExtent),
feature.getGeometry().getExtent()))) {