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

Merge pull request #5230 from fredj/reuse_frameState

Browse Source 
Reuse frame state arrays
This commit is contained in:
Frédéric Junod
2016-04-14 14:57:30 +02:00
parent e46c8370d5 92c96b95f9
commit b7278f184c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/map.js
View File

@@ -1286,7 +1286,7 @@ ol.Map.prototype.renderFrame_ = function(time) {
/** @type {?olx.FrameState} */ /** @type {?olx.FrameState} */
var frameState = null; var frameState = null;
if (size !== undefined && ol.size.hasArea(size) && view && view.isDef()) { if (size !== undefined && ol.size.hasArea(size) && view && view.isDef()) {
var viewHints = view.getHints(); var viewHints = view.getHints(this.frameState_ ? this.frameState_.viewHints : undefined);
var layerStatesArray = this.getLayerGroup().getLayerStatesArray(); var layerStatesArray = this.getLayerGroup().getLayerStatesArray();
var layerStates = {}; var layerStates = {};
for (i = 0, ii = layerStatesArray.length; i < ii; ++i) { for (i = 0, ii = layerStatesArray.length; i < ii; ++i) {
@@ -1329,7 +1329,8 @@ ol.Map.prototype.renderFrame_ = function(time) {
preRenderFunctions.length = n; preRenderFunctions.length = n;
frameState.extent = ol.extent.getForViewAndSize(viewState.center, frameState.extent = ol.extent.getForViewAndSize(viewState.center,
viewState.resolution, viewState.rotation, frameState.size); viewState.resolution, viewState.rotation, frameState.size,
this.frameState_ ? this.frameState_.extent : undefined);
} }
this.frameState_ = frameState; this.frameState_ = frameState;

11
src/ol/view.js
View File

@@ -256,10 +256,17 @@ ol.View.prototype.getCenter = function() {
/** /**
* @param {Array.<number>=} opt_hints Destination array.
* @return {Array.<number>} Hint. * @return {Array.<number>} Hint.
*/ */
ol.View.prototype.getHints = function() { ol.View.prototype.getHints = function(opt_hints) {
return this.hints_.slice(); if (opt_hints !== undefined) {
opt_hints[0] = this.hints_[0];
opt_hints[1] = this.hints_[1];
return opt_hints;
} else {
return this.hints_.slice();
}
}; };