From 64da2647a6ae63ef1f2d4246301e6db64809564f Mon Sep 17 00:00:00 2001 From: tsauerwein Date: Thu, 6 Nov 2014 17:09:34 +0100 Subject: [PATCH] Take `space` into account when checking size --- src/ol/renderer/webgl/webglatlasmanager.js | 3 ++- test/spec/ol/renderer/webgl/webglatlasmanager.test.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ol/renderer/webgl/webglatlasmanager.js b/src/ol/renderer/webgl/webglatlasmanager.js index edf1f5ffdb..f46bce4226 100644 --- a/src/ol/renderer/webgl/webglatlasmanager.js +++ b/src/ol/renderer/webgl/webglatlasmanager.js @@ -100,7 +100,8 @@ ol.renderer.webgl.AtlasManager.prototype.getInfo = function(id) { */ ol.renderer.webgl.AtlasManager.prototype.add = function(id, width, height, renderCallback, opt_this) { - if (width > this.maxSize_ || height > this.maxSize_) { + if (width + this.space_ > this.maxSize_ || + height + this.space_ > this.maxSize_) { return null; } diff --git a/test/spec/ol/renderer/webgl/webglatlasmanager.test.js b/test/spec/ol/renderer/webgl/webglatlasmanager.test.js index e9504b6686..465f448218 100644 --- a/test/spec/ol/renderer/webgl/webglatlasmanager.test.js +++ b/test/spec/ol/renderer/webgl/webglatlasmanager.test.js @@ -228,7 +228,7 @@ describe('ol.renderer.webgl.AtlasManager', function() { it('returns null if the size exceeds the maximum size', function() { var manager = new ol.renderer.webgl.AtlasManager(128); expect(manager.add('1', 100, 100, defaultRender)).to.be.ok(); - expect(manager.add('2', 3000, 3000, defaultRender)).to.eql(null); + expect(manager.add('2', 2048, 2048, defaultRender)).to.eql(null); }); });