Use assertInstanceof instead of getVectorLayer

This commit is contained in:
Tom Payne
2013-12-13 20:24:20 +01:00
parent 7ee2747948
commit c97588c1e2
@@ -133,7 +133,8 @@ ol.renderer.canvas.VectorLayer.prototype.forEachFeatureAtPixel =
*/ */
ol.renderer.canvas.VectorLayer.prototype.getRenderGeometryFunction_ = ol.renderer.canvas.VectorLayer.prototype.getRenderGeometryFunction_ =
function() { function() {
var vectorLayer = this.getVectorLayer(); var vectorLayer = this.getLayer();
goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector);
var renderGeometryFunction = vectorLayer.getRenderGeometryFunction(); var renderGeometryFunction = vectorLayer.getRenderGeometryFunction();
if (!goog.isDef(renderGeometryFunction)) { if (!goog.isDef(renderGeometryFunction)) {
renderGeometryFunction = goog.functions.TRUE; 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. * Handle changes in image style state.
* @param {goog.events.Event} event Image style change event. * @param {goog.events.Event} event Image style change event.
@@ -175,7 +168,8 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
return; return;
} }
var vectorLayer = this.getVectorLayer(); var vectorLayer = this.getLayer();
goog.asserts.assertInstanceof(vectorLayer, ol.layer.Vector);
var vectorSource = vectorLayer.getVectorSource(); var vectorSource = vectorLayer.getVectorSource();
var frameStateExtent = frameState.extent; var frameStateExtent = frameState.extent;
var frameStateResolution = frameState.view2DState.resolution; var frameStateResolution = frameState.view2DState.resolution;