Merge pull request #4060 from fredj/unnecessary_cast

Remove unnecessary cast
openlayers · Sep 7, 2015 · cb9054f · cb9054f
2 parents ad56dea + 529f869
commit cb9054f
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 18 deletions.
diff --git a/src/ol/feature.js b/src/ol/feature.js
@@ -302,13 +302,10 @@ ol.FeatureStyleFunction;
  * @return {ol.FeatureStyleFunction} A style function.
  */
 ol.Feature.createStyleFunction = function(obj) {
-  /**
-   * @type {ol.FeatureStyleFunction}
-   */
   var styleFunction;
 
   if (goog.isFunction(obj)) {
-    styleFunction = /** @type {ol.FeatureStyleFunction} */ (obj);
+    styleFunction = obj;
   } else {
     /**
      * @type {Array.<ol.style.Style>}

diff --git a/src/ol/format/topojsonformat.js b/src/ol/format/topojsonformat.js
@@ -291,8 +291,7 @@ ol.format.TopoJSON.prototype.readFeaturesFromObject = function(
     var topoJSONTopology = /** @type {TopoJSONTopology} */ (object);
     var transform, scale = null, translate = null;
     if (goog.isDef(topoJSONTopology.transform)) {
-      transform = /** @type {TopoJSONTransform} */
-          (topoJSONTopology.transform);
+      transform = topoJSONTopology.transform;
       scale = transform.scale;
       translate = transform.translate;
     }

diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/webglmaprenderer.js
@@ -393,9 +393,7 @@ ol.renderer.webgl.Map.prototype.handleWebGLContextLost = function(event) {
       function(layerRenderer, key, object) {
         goog.asserts.assertInstanceof(layerRenderer, ol.renderer.webgl.Layer,
             'renderer is an instance of ol.renderer.webgl.Layer');
-        var webGLLayerRenderer = /** @type {ol.renderer.webgl.Layer} */
-            (layerRenderer);
-        webGLLayerRenderer.handleWebGLContextLost();
+        layerRenderer.handleWebGLContextLost();
       });
 };
 

diff --git a/src/ol/source/rastersource.js b/src/ol/source/rastersource.js
@@ -429,11 +429,9 @@ ol.source.Raster.createRenderers_ = function(sources) {
 ol.source.Raster.createRenderer_ = function(source) {
   var renderer = null;
   if (source instanceof ol.source.Tile) {
-    renderer = ol.source.Raster.createTileRenderer_(
-        /** @type {ol.source.Tile} */ (source));
+    renderer = ol.source.Raster.createTileRenderer_(source);
   } else if (source instanceof ol.source.Image) {
-    renderer = ol.source.Raster.createImageRenderer_(
-        /** @type {ol.source.Image} */ (source));
+    renderer = ol.source.Raster.createImageRenderer_(source);
   } else {
     goog.asserts.fail('Unsupported source type: ' + source);
   }

diff --git a/src/ol/style/style.js b/src/ol/style/style.js
@@ -214,13 +214,10 @@ ol.style.StyleFunction;
  * @return {ol.style.StyleFunction} A style function.
  */
 ol.style.createStyleFunction = function(obj) {
-  /**
-   * @type {ol.style.StyleFunction}
-   */
   var styleFunction;
 
   if (goog.isFunction(obj)) {
-    styleFunction = /** @type {ol.style.StyleFunction} */ (obj);
+    styleFunction = obj;
   } else {
     /**
      * @type {Array.<ol.style.Style>}

diff --git a/src/ol/tilecache.js b/src/ol/tilecache.js
@@ -42,7 +42,7 @@ ol.TileCache.prototype.canExpireCache = function() {
 ol.TileCache.prototype.expireCache = function(usedTiles) {
   var tile, zKey;
   while (this.canExpireCache()) {
-    tile = /** @type {ol.Tile} */ (this.peekLast());
+    tile = this.peekLast();
     zKey = tile.tileCoord[0].toString();
     if (zKey in usedTiles && usedTiles[zKey].contains(tile.tileCoord)) {
       break;