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

Merge pull request #7206 from ahocevar/vectortile-load-extent

Browse Source 
Only load source tiles that intersect the source tile grid's extent
This commit is contained in:
Andreas Hocevar
2017-09-01 12:01:48 +02:00
committed by GitHub
parent 115b2eb937 b24e4c4f65
commit 8f28398684
2 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
test/spec/ol/vectorimagetile.test.js
View File

@@ -7,6 +7,7 @@ goog.require('ol.events');
goog.require('ol.format.GeoJSON');
goog.require('ol.proj');
goog.require('ol.tilegrid');
goog.require('ol.tilegrid.TileGrid');
describe('ol.VectorImageTile', function() {
@@ -14,8 +15,8 @@ describe('ol.VectorImageTile', function() {
it('configures loader that sets features on the source tile', function(done) {
var format = new ol.format.GeoJSON();
var url = 'spec/ol/data/point.json';
var tile = new ol.VectorImageTile([0, 0, 0], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, 0], function() {
var tile = new ol.VectorImageTile([0, 0, -1], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, ol.tilegrid.createXYZ(), ol.tilegrid.createXYZ(), {},
1, ol.proj.get('EPSG:3857'), ol.VectorTile, function() {});
@@ -34,8 +35,8 @@ describe('ol.VectorImageTile', function() {
it('sets LOADED state when source tiles fail to load', function(done) {
var format = new ol.format.GeoJSON();
var url = 'spec/ol/data/unavailable.json';
var tile = new ol.VectorImageTile([0, 0, 0], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, 0], function() {
var tile = new ol.VectorImageTile([0, 0, -1], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, ol.tilegrid.createXYZ(), ol.tilegrid.createXYZ(), {},
1, ol.proj.get('EPSG:3857'), ol.VectorTile, function() {});
@@ -52,11 +53,11 @@ describe('ol.VectorImageTile', function() {
var format = new ol.format.GeoJSON();
var url = 'spec/ol/data/unavailable.json';
var sourceTile;
var tile = new ol.VectorImageTile([0, 0, 0], 0, url, format,
var tile = new ol.VectorImageTile([0, 0, 0] /* one world away */, 0, url, format,
function(tile, url) {
sourceTile = tile;
ol.VectorImageTile.defaultLoadFunction(tile, url);
}, [0, 0, 0], function() {
}, [0, 0, -1], function() {
return url;
}, ol.tilegrid.createXYZ(), ol.tilegrid.createXYZ(), {},
1, ol.proj.get('EPSG:3857'), ol.VectorTile, function() {});
@@ -79,8 +80,8 @@ describe('ol.VectorImageTile', function() {
it('sets EMPTY state when all source tiles fail to load', function(done) {
var format = new ol.format.GeoJSON();
var url = 'spec/ol/data/unavailable.json';
var tile = new ol.VectorImageTile([0, 0, 0], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, 0], function() {
var tile = new ol.VectorImageTile([0, 0, -1], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, ol.tilegrid.createXYZ(), ol.tilegrid.createXYZ(), {},
1, ol.proj.get('EPSG:3857'), ol.VectorTile, function() {});
@@ -96,8 +97,8 @@ describe('ol.VectorImageTile', function() {
it('sets EMPTY state when tile has only empty source tiles', function(done) {
var format = new ol.format.GeoJSON();
var url = '';
var tile = new ol.VectorImageTile([0, 0, 0], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, 0], function() {},
var tile = new ol.VectorImageTile([0, 0, -1], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {},
ol.tilegrid.createXYZ(), ol.tilegrid.createXYZ(), {},
1, ol.proj.get('EPSG:3857'), ol.VectorTile, function() {});
@@ -109,11 +110,31 @@ describe('ol.VectorImageTile', function() {
});
});
it('only loads tiles within the source tileGrid\'s extent', function() {
var format = new ol.format.GeoJSON();
var url = 'spec/ol/data/point.json';
var tileGrid = new ol.tilegrid.TileGrid({
resolutions: [0.02197265625, 0.010986328125, 0.0054931640625],
origin: [-180, 90],
extent: [-88, 35, -87, 36]
});
var sourceTiles = {};
var tile = new ol.VectorImageTile([1, 0, -1], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [1, 0, -1], function(zxy) {
return url;
}, tileGrid,
ol.tilegrid.createXYZ({extent: [-180, -90, 180, 90], tileSize: 512}),
sourceTiles, 1, ol.proj.get('EPSG:4326'), ol.VectorTile, function() {});
tile.load();
expect(tile.tileKeys.length).to.be(1);
expect(tile.getTile(tile.tileKeys[0]).tileCoord).to.eql([0, 16, -10]);
});
it('#dispose() while loading', function() {
var format = new ol.format.GeoJSON();
var url = 'spec/ol/data/point.json';
var tile = new ol.VectorImageTile([0, 0, 0], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, 0], function() {
var tile = new ol.VectorImageTile([0, 0, 0] /* one world away */, 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, ol.tilegrid.createXYZ(), ol.tilegrid.createXYZ({tileSize: 512}), {},
1, ol.proj.get('EPSG:3857'), ol.VectorTile, function() {});
@@ -132,8 +153,8 @@ describe('ol.VectorImageTile', function() {
it('#dispose() when loaded', function(done) {
var format = new ol.format.GeoJSON();
var url = 'spec/ol/data/point.json';
var tile = new ol.VectorImageTile([0, 0, 0], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, 0], function() {
var tile = new ol.VectorImageTile([0, 0, -1], 0, url, format,
ol.VectorImageTile.defaultLoadFunction, [0, 0, -1], function() {
return url;
}, ol.tilegrid.createXYZ(), ol.tilegrid.createXYZ({tileSize: 512}), {},
1, ol.proj.get('EPSG:3857'), ol.VectorTile, function() {});