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

Reuse the frame state viewHints array if defined

Browse Source
This commit is contained in:
Frederic Junod
2016-04-14 10:36:12 +02:00
parent 8e1ffbf91e
commit 92c96b95f9
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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) {

9
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) {
if (opt_hints !== undefined) {
opt_hints[0] = this.hints_[0];
opt_hints[1] = this.hints_[1];
return opt_hints;
} else {
return this.hints_.slice(); return this.hints_.slice();
}
}; };