ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'openlayers/master' into vector-api

Browse Source
This commit is contained in:
Tom Payne
2013-12-13 20:22:06 +01:00
parent 12c96510c1 b242756f03
commit b59eec7a83
39 changed files with 555 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvasmaprenderer.js
+5 -4
View File
@@ -137,10 +137,11 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
var layerStates = frameState.layerStates;
var layersArray = frameState.layersArray;
var viewResolution = frameState.view2DState.resolution;
var canvasLayerRenderer, i, ii, layer, layerState;
var i, ii, layer, layerRenderer, layerState;
for (i = 0, ii = layersArray.length; i < ii; ++i) {
layer = layersArray[i];
canvasLayerRenderer = this.getCanvasLayerRenderer(layer);
layerRenderer = this.getLayerRenderer(layer);
goog.asserts.assertInstanceof(layerRenderer, ol.renderer.canvas.Layer);
layerState = layerStates[goog.getUid(layer)];
if (!layerState.visible ||
layerState.sourceState != ol.source.State.READY ||
@@ -148,8 +149,8 @@ ol.renderer.canvas.Map.prototype.renderFrame = function(frameState) {
viewResolution < layerState.minResolution) {
continue;
}
canvasLayerRenderer.prepareFrame(frameState, layerState);
canvasLayerRenderer.composeFrame(frameState, layerState, context);
layerRenderer.prepareFrame(frameState, layerState);
layerRenderer.composeFrame(frameState, layerState, context);
}
this.dispatchComposeEvent_(ol.render.EventType.POSTCOMPOSE, frameState);