From c97588c1e2f49bdc8f279f5ae232f4d7aff27952 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Fri, 13 Dec 2013 20:24:20 +0100 Subject: [PATCH] Use assertInstanceof instead of getVectorLayer --- .../renderer/canvas/canvasvectorlayerrenderer.js | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index dc31b669b0..fd39e7fe2e 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -133,7 +133,8 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel = */ ol.renderer.canvas.VectorLayer.prototype.getRenderGeometryFunction_ = function() { - var vectorLayer = this.getVectorLayer(); + var vectorLayer = this.getLayer(); + goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector); var renderGeometryFunction = vectorLayer.getRenderGeometryFunction(); if (!goog.isDef(renderGeometryFunction)) { renderGeometryFunction = goog.functions.TRUE; @@ -142,14 +143,6 @@ ol.renderer.canvas.VectorLayer.prototype.getRenderGeometryFunction_ = }; -/** - * @return {ol.layer.Vector} Vector layer. - */ -ol.renderer.canvas.VectorLayer.prototype.getVectorLayer = function() { - return /** @type {ol.layer.Vector} */ (this.getLayer()); -}; - - /** * Handle changes in image style state. * @param {goog.events.Event} event Image style change event. @@ -175,7 +168,8 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame = return; } - var vectorLayer = this.getVectorLayer(); + var vectorLayer = this.getLayer(); + goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector); var vectorSource = vectorLayer.getVectorSource(); var frameStateExtent = frameState.extent; var frameStateResolution = frameState.view2DState.resolution;