Merge pull request #161 from elemoine/nullimage

Do not draw image if image is null
This commit is contained in:
Éric Lemoine
2013-01-28 03:51:17 -08:00
+4 -1
View File
@@ -118,6 +118,8 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
var layerRenderer = this.getLayerRenderer(layer); var layerRenderer = this.getLayerRenderer(layer);
layerRenderer.renderFrame(frameState, layerState); layerRenderer.renderFrame(frameState, layerState);
var image = layerRenderer.getImage();
if (!goog.isNull(image)) {
var transform = layerRenderer.getTransform(); var transform = layerRenderer.getTransform();
context.setTransform( context.setTransform(
goog.vec.Mat4.getElement(transform, 0, 0), goog.vec.Mat4.getElement(transform, 0, 0),
@@ -128,7 +130,8 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
goog.vec.Mat4.getElement(transform, 1, 3)); goog.vec.Mat4.getElement(transform, 1, 3));
context.globalAlpha = layerState.opacity; context.globalAlpha = layerState.opacity;
context.drawImage(layerRenderer.getImage(), 0, 0); context.drawImage(image, 0, 0);
}
}, this); }, this);