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

Rename size to initialSize

Browse Source
This commit is contained in:
tsauerwein
2014-12-04 11:49:50 +01:00
parent 0fd1a575a9
commit e109be4b57
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/symbol-atlas-webgl.js
View File

@@ -12,9 +12,9 @@ goog.require('ol.style.Stroke');
goog.require('ol.style.Style');
var atlasManager = new ol.style.AtlasManager({
// we increase the default size so that all symbols fit into
// we increase the initial size so that all symbols fit into
// a single atlas image
size: 512
initialSize: 512
});
var symbolInfo = [{

4
externs/olx.js
View File

@@ -6254,7 +6254,7 @@ olx.ViewState.prototype.rotation;
/**
* @typedef {{size: (number|undefined),
* @typedef {{initialSize: (number|undefined),
* maxSize: (number|undefined),
* space: (number|undefined)}}
* @api
@@ -6267,7 +6267,7 @@ olx.style.AtlasManagerOptions;
* @type {number|undefined}
* @api
*/
olx.style.AtlasManagerOptions.prototype.size;
olx.style.AtlasManagerOptions.prototype.initialSize;
/**

3
src/ol/style/atlasmanager.js
View File

@@ -47,7 +47,8 @@ ol.style.AtlasManager = function(opt_options) {
* @private
* @type {number}
*/
this.currentSize_ = goog.isDef(options.size) ? options.size : 256;
this.currentSize_ = goog.isDef(options.initialSize) ?
options.initialSize : 256;
/**
* The maximum size in pixels of atlas images.

15
test/spec/ol/style/atlasmanager.test.js
View File

@@ -186,7 +186,7 @@ describe('ol.style.AtlasManager', function() {
describe('#add', function() {
it('adds one entry', function() {
var manager = new ol.style.AtlasManager({size: 128});
var manager = new ol.style.AtlasManager({initialSize: 128});
var info = manager.add('1', 32, 32, defaultRender);
expect(info).to.eql({
@@ -197,7 +197,7 @@ describe('ol.style.AtlasManager', function() {
});
it('adds one entry (also to the hit detection atlas)', function() {
var manager = new ol.style.AtlasManager({size: 128});
var manager = new ol.style.AtlasManager({initialSize: 128});
var info = manager.add('1', 32, 32, defaultRender, defaultRender);
expect(info).to.eql({
@@ -209,7 +209,7 @@ describe('ol.style.AtlasManager', function() {
});
it('creates a new atlas if needed', function() {
var manager = new ol.style.AtlasManager({size: 128});
var manager = new ol.style.AtlasManager({initialSize: 128});
expect(manager.add('1', 100, 100, defaultRender, defaultRender))
.to.be.ok();
var info = manager.add('2', 100, 100, defaultRender, defaultRender);
@@ -221,7 +221,7 @@ describe('ol.style.AtlasManager', function() {
});
it('creates new atlases until one is large enough', function() {
var manager = new ol.style.AtlasManager({size: 128});
var manager = new ol.style.AtlasManager({initialSize: 128});
expect(manager.add('1', 100, 100, defaultRender, defaultRender))
.to.be.ok();
expect(manager.atlases_).to.have.length(1);
@@ -235,7 +235,7 @@ describe('ol.style.AtlasManager', function() {
});
it('checks all existing atlases and create a new if needed', function() {
var manager = new ol.style.AtlasManager({size: 128});
var manager = new ol.style.AtlasManager({initialSize: 128});
expect(manager.add('1', 100, 100, defaultRender, defaultRender))
.to.be.ok();
expect(manager.add('2', 100, 100, defaultRender, defaultRender))
@@ -251,7 +251,8 @@ describe('ol.style.AtlasManager', function() {
});
it('returns null if the size exceeds the maximum size', function() {
var manager = new ol.style.AtlasManager({size: 128, maxSize: 2048});
var manager = new ol.style.AtlasManager(
{initialSize: 128, maxSize: 2048});
expect(manager.add('1', 100, 100, defaultRender, defaultRender))
.to.be.ok();
expect(manager.add('2', 2048, 2048, defaultRender, defaultRender))
@@ -262,7 +263,7 @@ describe('ol.style.AtlasManager', function() {
describe('#getInfo', function() {
it('returns null if no entry for the given id', function() {
var manager = new ol.style.AtlasManager({size: 128});
var manager = new ol.style.AtlasManager({initialSize: 128});
expect(manager.getInfo('123456')).to.eql(null);
});
});

4
test/spec/ol/style/circlestyle.test.js
View File

@@ -39,7 +39,7 @@ describe('ol.style.Circle', function() {
});
it('adds itself to an atlas manager (no fill-style)', function() {
var atlasManager = new ol.style.AtlasManager({size: 512});
var atlasManager = new ol.style.AtlasManager({initialSize: 512});
var style = new ol.style.Circle({radius: 10, atlasManager: atlasManager});
expect(style.getImage()).to.be.an(HTMLCanvasElement);
expect(style.getSize()).to.eql([21, 21]);
@@ -54,7 +54,7 @@ describe('ol.style.Circle', function() {
});
it('adds itself to an atlas manager (fill-style)', function() {
var atlasManager = new ol.style.AtlasManager({size: 512});
var atlasManager = new ol.style.AtlasManager({initialSize: 512});
var style = new ol.style.Circle({
radius: 10,
atlasManager: atlasManager,

4
test/spec/ol/style/regularshapestyle.test.js
View File

@@ -39,7 +39,7 @@ describe('ol.style.RegularShape', function() {
});
it('adds itself to an atlas manager (no fill-style)', function() {
var atlasManager = new ol.style.AtlasManager({size: 512});
var atlasManager = new ol.style.AtlasManager({initialSize: 512});
var style = new ol.style.RegularShape(
{radius: 10, atlasManager: atlasManager});
expect(style.getImage()).to.be.an(HTMLCanvasElement);
@@ -55,7 +55,7 @@ describe('ol.style.RegularShape', function() {
});
it('adds itself to an atlas manager (fill-style)', function() {
var atlasManager = new ol.style.AtlasManager({size: 512});
var atlasManager = new ol.style.AtlasManager({initialSize: 512});
var style = new ol.style.RegularShape({
radius: 10,
atlasManager: atlasManager,