Remove goog.asserts.*

This pull requests replaces type check hint assertions with type casts,
library sanity check assertions with conditional console.assert statements
in debug mode, and runtime sanity checks with assertions that throw an
ol.AssertionError with an error code for lookup outside the library.

src/ol/interaction/doubleclickzoominteraction.js

@@ -1,6 +1,5 @@
 goog.provide('ol.interaction.DoubleClickZoom');
 
-goog.require('goog.asserts');
 goog.require('ol.MapBrowserEvent');
 goog.require('ol.MapBrowserEvent.EventType');
 goog.require('ol.interaction.Interaction');
@@ -55,7 +54,7 @@ ol.interaction.DoubleClickZoom.handleEvent = function(mapBrowserEvent) {
     var anchor = mapBrowserEvent.coordinate;
     var delta = browserEvent.shiftKey ? -this.delta_ : this.delta_;
     var view = map.getView();
-    goog.asserts.assert(view, 'map must have a view');
+    ol.DEBUG && console.assert(view, 'map must have a view');
     ol.interaction.Interaction.zoomByDelta(
         map, view, delta, anchor, this.duration_);
     mapBrowserEvent.preventDefault();

src/ol/interaction/draganddropinteraction.js

@@ -3,7 +3,6 @@
 goog.provide('ol.interaction.DragAndDrop');
 goog.provide('ol.interaction.DragAndDropEvent');
 
-goog.require('goog.asserts');
 goog.require('ol.functions');
 goog.require('ol.events');
 goog.require('ol.events.Event');
@@ -97,13 +96,13 @@ ol.interaction.DragAndDrop.handleStop_ = function(event) {
 ol.interaction.DragAndDrop.prototype.handleResult_ = function(file, event) {
   var result = event.target.result;
   var map = this.getMap();
-  goog.asserts.assert(map, 'map must be set');
+  ol.DEBUG && console.assert(map, 'map must be set');
   var projection = this.projection_;
   if (!projection) {
     var view = map.getView();
-    goog.asserts.assert(view, 'map must have view');
+    ol.DEBUG && console.assert(view, 'map must have view');
     projection = view.getProjection();
-    goog.asserts.assert(projection !== undefined,
+    ol.DEBUG && console.assert(projection !== undefined,
         'projection should be defined');
   }
   var formatConstructors = this.formatConstructors_;

src/ol/interaction/dragpaninteraction.js

@@ -1,6 +1,5 @@
 goog.provide('ol.interaction.DragPan');
 
-goog.require('goog.asserts');
 goog.require('ol.Kinetic');
 
 goog.require('ol.ViewHint');
@@ -69,7 +68,7 @@ ol.inherits(ol.interaction.DragPan, ol.interaction.Pointer);
  * @private
  */
 ol.interaction.DragPan.handleDragEvent_ = function(mapBrowserEvent) {
-  goog.asserts.assert(this.targetPointers.length >= 1,
+  ol.DEBUG && console.assert(this.targetPointers.length >= 1,
       'the length of this.targetPointers should be more than 1');
   var centroid =
       ol.interaction.Pointer.centroid(this.targetPointers);
@@ -107,8 +106,7 @@ ol.interaction.DragPan.handleUpEvent_ = function(mapBrowserEvent) {
     if (!this.noKinetic_ && this.kinetic_ && this.kinetic_.end()) {
       var distance = this.kinetic_.getDistance();
       var angle = this.kinetic_.getAngle();
-      var center = view.getCenter();
-      goog.asserts.assert(center !== undefined, 'center should be defined');
+      var center = /** @type {!ol.Coordinate} */ (view.getCenter());
       this.kineticPreRenderFn_ = this.kinetic_.pan(center);
       map.beforeRender(this.kineticPreRenderFn_);
       var centerpx = map.getPixelFromCoordinate(center);

src/ol/interaction/dragzoominteraction.js

@@ -1,6 +1,5 @@
 goog.provide('ol.interaction.DragZoom');
 
-goog.require('goog.asserts');
 goog.require('ol.animation');
 goog.require('ol.easing');
 goog.require('ol.events.condition');
@@ -55,11 +54,9 @@ ol.inherits(ol.interaction.DragZoom, ol.interaction.DragBox);
 ol.interaction.DragZoom.prototype.onBoxEnd = function() {
   var map = this.getMap();
 
-  var view = map.getView();
-  goog.asserts.assert(view, 'map must have view');
+  var view = /** @type {!ol.View} */ (map.getView());
 
-  var size = map.getSize();
-  goog.asserts.assert(size !== undefined, 'size should be defined');
+  var size = /** @type {!ol.Size} */ (map.getSize());
 
   var extent = this.getGeometry().getExtent();
 
@@ -77,11 +74,9 @@ ol.interaction.DragZoom.prototype.onBoxEnd = function() {
   var resolution = view.constrainResolution(
       view.getResolutionForExtent(extent, size));
 
-  var currentResolution = view.getResolution();
-  goog.asserts.assert(currentResolution !== undefined, 'res should be defined');
+  var currentResolution = /** @type {number} */ (view.getResolution());
 
-  var currentCenter = view.getCenter();
-  goog.asserts.assert(currentCenter !== undefined, 'center should be defined');
+  var currentCenter = /** @type {!ol.Coordinate} */ (view.getCenter());
 
   map.beforeRender(ol.animation.zoom({
     resolution: currentResolution,

src/ol/interaction/drawinteraction.js

@@ -3,7 +3,6 @@ goog.provide('ol.interaction.DrawEvent');
 goog.provide('ol.interaction.DrawEventType');
 goog.provide('ol.interaction.DrawMode');
 
-goog.require('goog.asserts');
 goog.require('ol.events');
 goog.require('ol.events.Event');
 goog.require('ol.Collection');
@@ -175,10 +174,8 @@ ol.interaction.Draw = function(options) {
        * @return {ol.geom.SimpleGeometry} A geometry.
        */
       geometryFunction = function(coordinates, opt_geometry) {
-        var circle = opt_geometry ? opt_geometry :
+        var circle = opt_geometry ? /** @type {ol.geom.Circle} */ (opt_geometry) :
             new ol.geom.Circle([NaN, NaN]);
-        goog.asserts.assertInstanceof(circle, ol.geom.Circle,
-            'geometry must be an ol.geom.Circle');
         var squaredLength = ol.coordinate.squaredDistance(
             coordinates[0], coordinates[1]);
         circle.setCenterAndRadius(coordinates[0], Math.sqrt(squaredLength));
@@ -488,9 +485,7 @@ ol.interaction.Draw.prototype.createOrUpdateSketchPoint_ = function(event) {
     this.sketchPoint_ = new ol.Feature(new ol.geom.Point(coordinates));
     this.updateSketchFeatures_();
   } else {
-    var sketchPointGeom = this.sketchPoint_.getGeometry();
-    goog.asserts.assertInstanceof(sketchPointGeom, ol.geom.Point,
-        'sketchPointGeom should be an ol.geom.Point');
+    var sketchPointGeom = /** @type {ol.geom.Point} */ (this.sketchPoint_.getGeometry());
     sketchPointGeom.setCoordinates(coordinates);
   }
 };
@@ -520,7 +515,7 @@ ol.interaction.Draw.prototype.startDrawing_ = function(event) {
         new ol.geom.LineString(this.sketchLineCoords_));
   }
   var geometry = this.geometryFunction_(this.sketchCoords_);
-  goog.asserts.assert(geometry !== undefined, 'geometry should be defined');
+  ol.DEBUG && console.assert(geometry !== undefined, 'geometry should be defined');
   this.sketchFeature_ = new ol.Feature();
   if (this.geometryName_) {
     this.sketchFeature_.setGeometryName(this.geometryName_);
@@ -539,9 +534,7 @@ ol.interaction.Draw.prototype.startDrawing_ = function(event) {
  */
 ol.interaction.Draw.prototype.modifyDrawing_ = function(event) {
   var coordinate = event.coordinate;
-  var geometry = this.sketchFeature_.getGeometry();
-  goog.asserts.assertInstanceof(geometry, ol.geom.SimpleGeometry,
-      'geometry should be ol.geom.SimpleGeometry or subclass');
+  var geometry = /** @type {ol.geom.SimpleGeometry} */ (this.sketchFeature_.getGeometry());
   var coordinates, last;
   if (this.mode_ === ol.interaction.DrawMode.POINT) {
     last = this.sketchCoords_;
@@ -558,12 +551,12 @@ ol.interaction.Draw.prototype.modifyDrawing_ = function(event) {
   }
   last[0] = coordinate[0];
   last[1] = coordinate[1];
-  goog.asserts.assert(this.sketchCoords_, 'sketchCoords_ expected');
-  this.geometryFunction_(this.sketchCoords_, geometry);
+  ol.DEBUG && console.assert(this.sketchCoords_, 'sketchCoords_ expected');
+  this.geometryFunction_(
+      /** @type {!ol.Coordinate|!Array.<ol.Coordinate>|!Array.<Array.<ol.Coordinate>>} */ (this.sketchCoords_),
+      geometry);
   if (this.sketchPoint_) {
-    var sketchPointGeom = this.sketchPoint_.getGeometry();
-    goog.asserts.assertInstanceof(sketchPointGeom, ol.geom.Point,
-        'sketchPointGeom should be an ol.geom.Point');
+    var sketchPointGeom = /** @type {ol.geom.Point} */ (this.sketchPoint_.getGeometry());
     sketchPointGeom.setCoordinates(coordinate);
   }
   var sketchLineGeom;
@@ -573,15 +566,11 @@ ol.interaction.Draw.prototype.modifyDrawing_ = function(event) {
       this.sketchLine_ = new ol.Feature(new ol.geom.LineString(null));
     }
     var ring = geometry.getLinearRing(0);
-    sketchLineGeom = this.sketchLine_.getGeometry();
-    goog.asserts.assertInstanceof(sketchLineGeom, ol.geom.LineString,
-        'sketchLineGeom must be an ol.geom.LineString');
+    sketchLineGeom = /** @type {ol.geom.LineString} */ (this.sketchLine_.getGeometry());
     sketchLineGeom.setFlatCoordinates(
         ring.getLayout(), ring.getFlatCoordinates());
   } else if (this.sketchLineCoords_) {
-    sketchLineGeom = this.sketchLine_.getGeometry();
-    goog.asserts.assertInstanceof(sketchLineGeom, ol.geom.LineString,
-        'sketchLineGeom must be an ol.geom.LineString');
+    sketchLineGeom = /** @type {ol.geom.LineString} */ (this.sketchLine_.getGeometry());
     sketchLineGeom.setCoordinates(this.sketchLineCoords_);
   }
   this.updateSketchFeatures_();
@@ -595,9 +584,7 @@ ol.interaction.Draw.prototype.modifyDrawing_ = function(event) {
  */
 ol.interaction.Draw.prototype.addToDrawing_ = function(event) {
   var coordinate = event.coordinate;
-  var geometry = this.sketchFeature_.getGeometry();
-  goog.asserts.assertInstanceof(geometry, ol.geom.SimpleGeometry,
-      'geometry must be an ol.geom.SimpleGeometry');
+  var geometry = /** @type {ol.geom.SimpleGeometry} */ (this.sketchFeature_.getGeometry());
   var done;
   var coordinates;
   if (this.mode_ === ol.interaction.DrawMode.LINE_STRING) {
@@ -627,9 +614,7 @@ ol.interaction.Draw.prototype.addToDrawing_ = function(event) {
  * @api
  */
 ol.interaction.Draw.prototype.removeLastPoint = function() {
-  var geometry = this.sketchFeature_.getGeometry();
-  goog.asserts.assertInstanceof(geometry, ol.geom.SimpleGeometry,
-      'geometry must be an ol.geom.SimpleGeometry');
+  var geometry = /** @type {ol.geom.SimpleGeometry} */ (this.sketchFeature_.getGeometry());
   var coordinates, sketchLineGeom;
   if (this.mode_ === ol.interaction.DrawMode.LINE_STRING) {
     coordinates = this.sketchCoords_;
@@ -638,9 +623,7 @@ ol.interaction.Draw.prototype.removeLastPoint = function() {
   } else if (this.mode_ === ol.interaction.DrawMode.POLYGON) {
     coordinates = this.sketchCoords_[0];
     coordinates.splice(-2, 1);
-    sketchLineGeom = this.sketchLine_.getGeometry();
-    goog.asserts.assertInstanceof(sketchLineGeom, ol.geom.LineString,
-        'sketchLineGeom must be an ol.geom.LineString');
+    sketchLineGeom = /** @type {ol.geom.LineString} */ (this.sketchLine_.getGeometry());
     sketchLineGeom.setCoordinates(coordinates);
     this.geometryFunction_(this.sketchCoords_, geometry);
   }
@@ -661,11 +644,9 @@ ol.interaction.Draw.prototype.removeLastPoint = function() {
  */
 ol.interaction.Draw.prototype.finishDrawing = function() {
   var sketchFeature = this.abortDrawing_();
-  goog.asserts.assert(sketchFeature, 'sketchFeature expected to be truthy');
+  ol.DEBUG && console.assert(sketchFeature, 'sketchFeature expected to be truthy');
   var coordinates = this.sketchCoords_;
-  var geometry = sketchFeature.getGeometry();
-  goog.asserts.assertInstanceof(geometry, ol.geom.SimpleGeometry,
-      'geometry must be an ol.geom.SimpleGeometry');
+  var geometry = /** @type {ol.geom.SimpleGeometry} */ (sketchFeature.getGeometry());
   if (this.mode_ === ol.interaction.DrawMode.LINE_STRING) {
     // remove the redundant last point
     coordinates.pop();
@@ -729,10 +710,10 @@ ol.interaction.Draw.prototype.abortDrawing_ = function() {
  */
 ol.interaction.Draw.prototype.extend = function(feature) {
   var geometry = feature.getGeometry();
-  goog.asserts.assert(this.mode_ == ol.interaction.DrawMode.LINE_STRING,
+  ol.DEBUG && console.assert(this.mode_ == ol.interaction.DrawMode.LINE_STRING,
       'interaction mode must be "line"');
-  goog.asserts.assert(geometry, 'feature must have a geometry');
-  goog.asserts.assert(geometry.getType() == ol.geom.GeometryType.LINE_STRING,
+  ol.DEBUG && console.assert(geometry, 'feature must have a geometry');
+  ol.DEBUG && console.assert(geometry.getType() == ol.geom.GeometryType.LINE_STRING,
       'feature geometry must be a line string');
   var lineString = /** @type {ol.geom.LineString} */ (geometry);
   this.sketchFeature_ = feature;
@@ -811,10 +792,8 @@ ol.interaction.Draw.createRegularPolygon = function(opt_sides, opt_angle) {
         var end = coordinates[1];
         var radius = Math.sqrt(
             ol.coordinate.squaredDistance(center, end));
-        var geometry = opt_geometry ? opt_geometry :
+        var geometry = opt_geometry ? /** @type {ol.geom.Polygon} */ (opt_geometry) :
             ol.geom.Polygon.fromCircle(new ol.geom.Circle(center), opt_sides);
-        goog.asserts.assertInstanceof(geometry, ol.geom.Polygon,
-            'geometry must be a polygon');
         var angle = opt_angle ? opt_angle :
             Math.atan((end[1] - center[1]) / (end[0] - center[0]));
         ol.geom.Polygon.makeRegular(geometry, center, radius, angle);
@@ -845,8 +824,7 @@ ol.interaction.Draw.getMode_ = function(type) {
   } else if (type === ol.geom.GeometryType.CIRCLE) {
     mode = ol.interaction.DrawMode.CIRCLE;
   }
-  goog.asserts.assert(mode !== undefined, 'mode should be defined');
-  return mode;
+  return /** @type {!ol.interaction.DrawMode} */ (mode);
 };
 
 

src/ol/interaction/keyboardpaninteraction.js

@@ -1,6 +1,5 @@
 goog.provide('ol.interaction.KeyboardPan');
 
-goog.require('goog.asserts');
 goog.require('ol');
 goog.require('ol.coordinate');
 goog.require('ol.events.EventType');
@@ -88,7 +87,7 @@ ol.interaction.KeyboardPan.handleEvent = function(mapBrowserEvent) {
         keyCode == ol.events.KeyCode.UP)) {
       var map = mapBrowserEvent.map;
       var view = map.getView();
-      goog.asserts.assert(view, 'map must have view');
+      ol.DEBUG && console.assert(view, 'map must have view');
       var mapUnitsDelta = view.getResolution() * this.pixelDelta_;
       var deltaX = 0, deltaY = 0;
       if (keyCode == ol.events.KeyCode.DOWN) {

src/ol/interaction/keyboardzoominteraction.js

@@ -1,6 +1,5 @@
 goog.provide('ol.interaction.KeyboardZoom');
 
-goog.require('goog.asserts');
 goog.require('ol.events.EventType');
 goog.require('ol.events.condition');
 goog.require('ol.interaction.Interaction');
@@ -75,7 +74,7 @@ ol.interaction.KeyboardZoom.handleEvent = function(mapBrowserEvent) {
       var delta = (charCode == '+'.charCodeAt(0)) ? this.delta_ : -this.delta_;
       map.render();
       var view = map.getView();
-      goog.asserts.assert(view, 'map must have view');
+      ol.DEBUG && console.assert(view, 'map must have view');
       ol.interaction.Interaction.zoomByDelta(
           map, view, delta, undefined, this.duration_);
       mapBrowserEvent.preventDefault();

src/ol/interaction/modifyinteraction.js

@@ -1,7 +1,6 @@
 goog.provide('ol.interaction.Modify');
 goog.provide('ol.interaction.ModifyEvent');
 
-goog.require('goog.asserts');
 goog.require('ol.events');
 goog.require('ol.events.Event');
 goog.require('ol.events.EventType');
@@ -332,10 +331,7 @@ ol.interaction.Modify.prototype.setMap = function(map) {
  * @private
  */
 ol.interaction.Modify.prototype.handleFeatureAdd_ = function(evt) {
-  var feature = evt.element;
-  goog.asserts.assertInstanceof(feature, ol.Feature,
-      'feature should be an ol.Feature');
-  this.addFeature_(feature);
+  this.addFeature_(/** @type {ol.Feature} */ (evt.element));
 };
 
 
@@ -714,9 +710,7 @@ ol.interaction.Modify.handleEvent = function(mapBrowserEvent) {
   if (this.vertexFeature_ && this.deleteCondition_(mapBrowserEvent)) {
     if (mapBrowserEvent.type != ol.MapBrowserEvent.EventType.SINGLECLICK ||
         !this.ignoreNextSingleClick_) {
-      var geometry = this.vertexFeature_.getGeometry();
-      goog.asserts.assertInstanceof(geometry, ol.geom.Point,
-          'geometry should be an ol.geom.Point');
+      var geometry = /** @type {ol.geom.Point} */ (this.vertexFeature_.getGeometry());
       handled = this.removePoint();
     } else {
       handled = true;
@@ -817,7 +811,7 @@ ol.interaction.Modify.prototype.insertVertex_ = function(segmentData, vertex) {
   var feature = segmentData.feature;
   var geometry = segmentData.geometry;
   var depth = segmentData.depth;
-  var index = segmentData.index;
+  var index = /** @type {number} */ (segmentData.index);
   var coordinates;
 
   while (vertex.length < geometry.getStride()) {
@@ -826,26 +820,18 @@ ol.interaction.Modify.prototype.insertVertex_ = function(segmentData, vertex) {
 
   switch (geometry.getType()) {
     case ol.geom.GeometryType.MULTI_LINE_STRING:
-      goog.asserts.assertInstanceof(geometry, ol.geom.MultiLineString,
-          'geometry should be an ol.geom.MultiLineString');
       coordinates = geometry.getCoordinates();
       coordinates[depth[0]].splice(index + 1, 0, vertex);
       break;
     case ol.geom.GeometryType.POLYGON:
-      goog.asserts.assertInstanceof(geometry, ol.geom.Polygon,
-          'geometry should be an ol.geom.Polygon');
       coordinates = geometry.getCoordinates();
       coordinates[depth[0]].splice(index + 1, 0, vertex);
       break;
     case ol.geom.GeometryType.MULTI_POLYGON:
-      goog.asserts.assertInstanceof(geometry, ol.geom.MultiPolygon,
-          'geometry should be an ol.geom.MultiPolygon');
       coordinates = geometry.getCoordinates();
       coordinates[depth[1]][depth[0]].splice(index + 1, 0, vertex);
       break;
     case ol.geom.GeometryType.LINE_STRING:
-      goog.asserts.assertInstanceof(geometry, ol.geom.LineString,
-          'geometry should be an ol.geom.LineString');
       coordinates = geometry.getCoordinates();
       coordinates.splice(index + 1, 0, vertex);
       break;
@@ -855,9 +841,8 @@ ol.interaction.Modify.prototype.insertVertex_ = function(segmentData, vertex) {
 
   this.setGeometryCoordinates_(geometry, coordinates);
   var rTree = this.rBush_;
-  goog.asserts.assert(segment !== undefined, 'segment should be defined');
+  ol.DEBUG && console.assert(segment !== undefined, 'segment should be defined');
   rTree.remove(segmentData);
-  goog.asserts.assert(index !== undefined, 'index should be defined');
   this.updateSegmentIndices_(geometry, index, depth, 1);
   var newSegmentData = /** @type {ol.ModifySegmentDataType} */ ({
     segment: [segment[0], vertex],
@@ -997,7 +982,7 @@ ol.interaction.Modify.prototype.removeVertex_ = function() {
         segments.push(right.segment[1]);
       }
       if (left !== undefined && right !== undefined) {
-        goog.asserts.assert(newIndex >= 0, 'newIndex should be larger than 0');
+        ol.DEBUG && console.assert(newIndex >= 0, 'newIndex should be larger than 0');
 
         var newSegmentData = /** @type {ol.ModifySegmentDataType} */ ({
           depth: segmentData.depth,

src/ol/interaction/mousewheelzoominteraction.js

@@ -1,6 +1,5 @@
 goog.provide('ol.interaction.MouseWheelZoom');
 
-goog.require('goog.asserts');
 goog.require('ol');
 goog.require('ol.events.EventType');
 goog.require('ol.interaction.Interaction');
@@ -132,7 +131,7 @@ ol.interaction.MouseWheelZoom.prototype.doZoom_ = function(map) {
   var delta = ol.math.clamp(this.delta_, -maxDelta, maxDelta);
 
   var view = map.getView();
-  goog.asserts.assert(view, 'map must have view');
+  ol.DEBUG && console.assert(view, 'map must have view');
 
   map.render();
   ol.interaction.Interaction.zoomByDelta(map, view, -delta, this.lastAnchor_,

src/ol/interaction/pinchrotateinteraction.js

@@ -1,6 +1,5 @@
 goog.provide('ol.interaction.PinchRotate');
 
-goog.require('goog.asserts');
 goog.require('ol');
 goog.require('ol.functions');
 goog.require('ol.ViewHint');
@@ -74,7 +73,7 @@ ol.inherits(ol.interaction.PinchRotate, ol.interaction.Pointer);
  * @private
  */
 ol.interaction.PinchRotate.handleDragEvent_ = function(mapBrowserEvent) {
-  goog.asserts.assert(this.targetPointers.length >= 2,
+  ol.DEBUG && console.assert(this.targetPointers.length >= 2,
       'length of this.targetPointers should be greater than or equal to 2');
   var rotationDelta = 0.0;
 

src/ol/interaction/pinchzoominteraction.js

@@ -1,6 +1,5 @@
 goog.provide('ol.interaction.PinchZoom');
 
-goog.require('goog.asserts');
 goog.require('ol');
 goog.require('ol.functions');
 goog.require('ol.ViewHint');
@@ -62,7 +61,7 @@ ol.inherits(ol.interaction.PinchZoom, ol.interaction.Pointer);
  * @private
  */
 ol.interaction.PinchZoom.handleDragEvent_ = function(mapBrowserEvent) {
-  goog.asserts.assert(this.targetPointers.length >= 2,
+  ol.DEBUG && console.assert(this.targetPointers.length >= 2,
       'length of this.targetPointers should be 2 or more');
   var scaleDelta = 1.0;
 

src/ol/interaction/selectinteraction.js

@@ -2,7 +2,6 @@ goog.provide('ol.interaction.Select');
 goog.provide('ol.interaction.SelectEvent');
 goog.provide('ol.interaction.SelectEventType');
 
-goog.require('goog.asserts');
 goog.require('ol.functions');
 goog.require('ol.CollectionEventType');
 goog.require('ol.Feature');
@@ -156,23 +155,13 @@ ol.interaction.Select = function(opt_options) {
    */
   this.featureOverlay_ = featureOverlay;
 
+  /** @type {function(ol.layer.Layer): boolean} */
   var layerFilter;
   if (options.layers) {
     if (typeof options.layers === 'function') {
-      /**
-       * @param {ol.layer.Layer} layer Layer.
-       * @return {boolean} Include.
-       */
-      layerFilter = function(layer) {
-        goog.asserts.assertFunction(options.layers);
-        return options.layers(layer);
-      };
+      layerFilter = options.layers;
     } else {
       var layers = options.layers;
-      /**
-       * @param {ol.layer.Layer} layer Layer.
-       * @return {boolean} Include.
-       */
       layerFilter = function(layer) {
         return ol.array.includes(layers, layer);
       };
@@ -236,8 +225,8 @@ ol.interaction.Select.prototype.getFeatures = function() {
  * @api
  */
 ol.interaction.Select.prototype.getLayer = function(feature) {
-  goog.asserts.assertInstanceof(feature, ol.Feature,
-      'feature should be an ol.Feature');
+  ol.assert(feature instanceof ol.Feature,
+      42); // Expected an `ol.Feature`, but got an `ol.RenderFeature`
   var key = ol.getUid(feature);
   return /** @type {ol.layer.Vector} */ (this.featureLayerAssociation_[key]);
 };
@@ -370,12 +359,9 @@ ol.interaction.Select.getDefaultStyleFunction = function() {
  * @private
  */
 ol.interaction.Select.prototype.addFeature_ = function(evt) {
-  var feature = evt.element;
   var map = this.getMap();
-  goog.asserts.assertInstanceof(feature, ol.Feature,
-      'feature should be an ol.Feature');
   if (map) {
-    map.skipFeature(feature);
+    map.skipFeature(/** @type {ol.Feature} */ (evt.element));
   }
 };
 
@@ -385,12 +371,9 @@ ol.interaction.Select.prototype.addFeature_ = function(evt) {
  * @private
  */
 ol.interaction.Select.prototype.removeFeature_ = function(evt) {
-  var feature = evt.element;
   var map = this.getMap();
-  goog.asserts.assertInstanceof(feature, ol.Feature,
-      'feature should be an ol.Feature');
   if (map) {
-    map.unskipFeature(feature);
+    map.unskipFeature(/** @type {ol.Feature} */ (evt.element));
   }
 };
 

src/ol/interaction/snapinteraction.js

@@ -1,7 +1,6 @@
 goog.provide('ol.interaction.Snap');
 goog.provide('ol.interaction.SnapProperty');
 
-goog.require('goog.asserts');
 goog.require('ol');
 goog.require('ol.Collection');
 goog.require('ol.CollectionEvent');
@@ -228,8 +227,7 @@ ol.interaction.Snap.prototype.getFeatures_ = function() {
   } else if (this.source_) {
     features = this.source_.getFeatures();
   }
-  goog.asserts.assert(features !== undefined, 'features should be defined');
-  return features;
+  return /** @type {!Array.<ol.Feature>|!ol.Collection.<ol.Feature>} */ (features);
 };
 
 
@@ -244,9 +242,7 @@ ol.interaction.Snap.prototype.handleFeatureAdd_ = function(evt) {
   } else if (evt instanceof ol.CollectionEvent) {
     feature = evt.element;
   }
-  goog.asserts.assertInstanceof(feature, ol.Feature,
-      'feature should be an ol.Feature');
-  this.addFeature(feature);
+  this.addFeature(/** @type {ol.Feature} */ (feature));
 };
 
 
@@ -261,9 +257,7 @@ ol.interaction.Snap.prototype.handleFeatureRemove_ = function(evt) {
   } else if (evt instanceof ol.CollectionEvent) {
     feature = evt.element;
   }
-  goog.asserts.assertInstanceof(feature, ol.Feature,
-      'feature should be an ol.Feature');
-  this.removeFeature(feature);
+  this.removeFeature(/** @type {ol.Feature} */ (feature));
 };
 
 
@@ -272,8 +266,7 @@ ol.interaction.Snap.prototype.handleFeatureRemove_ = function(evt) {
  * @private
  */
 ol.interaction.Snap.prototype.handleGeometryChange_ = function(evt) {
-  var feature = evt.target;
-  goog.asserts.assertInstanceof(feature, ol.Feature);
+  var feature = /** @type {ol.Feature} */ (evt.target);
   this.removeFeature(feature, true);
   this.addFeature(feature, true);
 };

src/ol/interaction/translateinteraction.js

@@ -1,7 +1,6 @@
 goog.provide('ol.interaction.Translate');
 goog.provide('ol.interaction.TranslateEvent');
 
-goog.require('goog.asserts');
 goog.require('ol.events');
 goog.require('ol.events.Event');
 goog.require('ol.array');
@@ -107,23 +106,13 @@ ol.interaction.Translate = function(options) {
    */
   this.features_ = options.features !== undefined ? options.features : null;
 
+  /** @type {function(ol.layer.Layer): boolean} */
   var layerFilter;
   if (options.layers) {
     if (typeof options.layers === 'function') {
-      /**
-       * @param {ol.layer.Layer} layer Layer.
-       * @return {boolean} Include.
-       */
-      layerFilter = function(layer) {
-        goog.asserts.assertFunction(options.layers);
-        return options.layers(layer);
-      };
+      layerFilter = options.layers;
     } else {
       var layers = options.layers;
-      /**
-       * @param {ol.layer.Layer} layer Layer.
-       * @return {boolean} Include.
-       */
       layerFilter = function(layer) {
         return ol.array.includes(layers, layer);
       };