Merge pull request #1226 from tschaub/dirty-buffer
Buffer dirty extent when rendering,
This commit is contained in:
@@ -52,6 +52,19 @@ ol.extent.boundingExtentXYs_ = function(xs, ys, opt_extent) {
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Increase an extent by the provided value.
|
||||
* @param {ol.Extent} extent The extent to buffer.
|
||||
* @param {number} value The amount by wich the extent should be buffered.
|
||||
*/
|
||||
ol.extent.buffer = function(extent, value) {
|
||||
extent[0] -= value;
|
||||
extent[1] -= value;
|
||||
extent[2] += value;
|
||||
extent[3] += value;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
* Creates a clone of an extent.
|
||||
*
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
goog.provide('ol.renderer.canvas.VectorLayer');
|
||||
|
||||
goog.require('goog.asserts');
|
||||
goog.require('goog.dom');
|
||||
goog.require('goog.dom.TagName');
|
||||
goog.require('goog.events');
|
||||
@@ -101,6 +102,13 @@ ol.renderer.canvas.VectorLayer = function(mapRenderer, layer) {
|
||||
*/
|
||||
this.tileArchetype_ = null;
|
||||
|
||||
/**
|
||||
* The maximum symbol size ever rendered for this layer (in pixels).
|
||||
* @private
|
||||
* @type {number}
|
||||
*/
|
||||
this.maxSymbolPixelDim_ = 0;
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @type {number}
|
||||
@@ -168,12 +176,18 @@ goog.inherits(ol.renderer.canvas.VectorLayer, ol.renderer.canvas.Layer);
|
||||
* @private
|
||||
*/
|
||||
ol.renderer.canvas.VectorLayer.prototype.expireTiles_ = function(extents) {
|
||||
// buffer by max symbolizer size at rendered resolution
|
||||
var resolution = this.renderedResolution_;
|
||||
goog.asserts.assertNumber(resolution);
|
||||
var tileCache = this.tileCache_;
|
||||
var length = extents.length;
|
||||
var extent;
|
||||
if (length > 0) {
|
||||
for (var i = 0; i < length; ++i) {
|
||||
extent = ol.extent.clone(extents[i]);
|
||||
ol.extent.buffer(extent, this.maxSymbolPixelDim_ * resolution / 2);
|
||||
tileCache.pruneTileRange(
|
||||
this.tileGrid_.getTileRangeForExtentAndZ(extents[i], 0));
|
||||
this.tileGrid_.getTileRangeForExtentAndZ(extent, 0));
|
||||
}
|
||||
} else {
|
||||
tileCache.clear();
|
||||
@@ -509,6 +523,11 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame =
|
||||
var symbolSizes = sketchCanvasRenderer.getSymbolSizes(),
|
||||
maxSymbolSize = sketchCanvasRenderer.getMaxSymbolSize(),
|
||||
symbolOffsets = sketchCanvasRenderer.getSymbolOffsets();
|
||||
|
||||
// keep track of maximum pixel size for symbols rendered on this layer
|
||||
this.maxSymbolPixelDim_ = Math.max(maxSymbolSize[0] / tileResolution,
|
||||
maxSymbolSize[1] / tileResolution);
|
||||
|
||||
for (key in tilesToRender) {
|
||||
tileCoord = tilesToRender[key];
|
||||
if (this.tileCache_.containsKey(key)) {
|
||||
|
||||
@@ -3,6 +3,16 @@ goog.provide('ol.test.extent');
|
||||
|
||||
describe('ol.extent', function() {
|
||||
|
||||
describe('buffer', function() {
|
||||
|
||||
it('buffers an extent by some value', function() {
|
||||
var extent = [-10, -20, 10, 20];
|
||||
ol.extent.buffer(extent, 15);
|
||||
expect(extent).to.eql([-25, -35, 25, 35]);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe('clone', function() {
|
||||
|
||||
it('creates a copy of an extent', function() {
|
||||
|
||||
Reference in New Issue
Block a user