From 8cabff9b7dfd80ffac7aa76b43869b604db5766a Mon Sep 17 00:00:00 2001 From: Peter Robins Date: Sat, 13 Aug 2016 11:00:18 +0000 Subject: [PATCH] Remove tilerange assert from tilegrid/wmts --- doc/errors/index.md | 4 ---- src/ol/tilegrid/tilegrid.js | 5 ----- test/spec/ol/tilegrid/tilegrid.test.js | 22 ---------------------- 3 files changed, 31 deletions(-) diff --git a/doc/errors/index.md b/doc/errors/index.md index 2f52e265fd..cbd52e8c35 100644 --- a/doc/errors/index.md +++ b/doc/errors/index.md @@ -85,10 +85,6 @@ Number of `tileSizes` and `resolutions` must be equal. Number of `origins` and `resolutions` must be equal. -### 21 - -Tile range for `extent` must not exceed tilegrid width and height. - ### 22 Either `tileSize` or `tileSizes` must be configured, never both. diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index 8b7f8309cd..4c165b07d6 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -122,11 +122,6 @@ ol.tilegrid.TileGrid = function(options) { var tileRange = new ol.TileRange( Math.min(0, size[0]), Math.max(size[0] - 1, -1), Math.min(0, size[1]), Math.max(size[1] - 1, -1)); - if (this.minZoom <= z && z <= this.maxZoom && extent !== undefined) { - ol.asserts.assert(tileRange.containsTileRange( - this.getTileRangeForExtentAndZ(extent, z)), - 21); // Tile range for `extent` must not exceed tilegrid width and height - } return tileRange; }, this); } else if (extent) { diff --git a/test/spec/ol/tilegrid/tilegrid.test.js b/test/spec/ol/tilegrid/tilegrid.test.js index ab89daf674..484afa0d63 100644 --- a/test/spec/ol/tilegrid/tilegrid.test.js +++ b/test/spec/ol/tilegrid/tilegrid.test.js @@ -159,28 +159,6 @@ describe('ol.tilegrid.TileGrid', function() { }); }); - describe('create with extent exceeding tile ranges', function() { - it('throws an exception', function() { - expect(function() { - return new ol.tilegrid.TileGrid({ - extent: [10, 20, 30, 40], - sizes: [[1, 1]], - tileSize: 10, - resolutions: [1] - }); - }).to.throwException(); - expect(function() { - return new ol.tilegrid.TileGrid({ - extent: [10, 20, 30, 40], - origin: [10, 40], // top-left origin - sizes: [[3, 3]], // would have to be [[3, -3]] for this to not throw - tileSize: 10, - resolutions: [1] - }); - }).to.throwException(); - }); - }); - describe('create with origin', function() { var tileGrid; beforeEach(function() {