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

Ensure we cannot set both origin and origins in the tilegrid

Browse Source
This commit is contained in:
Bruno Binet
2013-03-03 20:32:39 +01:00
parent f7a895a823
commit 7c440d087f
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/tilegrid/tilegrid.js
View File

@@ -58,6 +58,9 @@ ol.tilegrid.TileGrid = function(tileGridOptions) {
this.origins_ = tileGridOptions.origins;
goog.asserts.assert(this.origins_.length == this.resolutions_.length);
}
goog.asserts.assert(
(goog.isNull(this.origin_) && !goog.isNull(this.origins_)) ||
(!goog.isNull(this.origin_) && goog.isNull(this.origins_)));
/**
* @private

14
test/spec/ol/tilegrid.test.js
View File

@@ -68,6 +68,20 @@ describe('ol.tilegrid.TileGrid', function() {
});
});
describe('create with both origin and multiple origins', function() {
it('throws an exception', function() {
expect(function() {
return new ol.tilegrid.TileGrid({
resolutions: [100, 50, 25, 10],
extent: extent,
origins: [origin, origin, origin, origin],
origin: origin,
tileSize: tileSize
});
}).toThrow();
});
});
describe('create with too few origins', function() {
it('throws an exception', function() {
expect(function() {