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

Merge pull request #5482 from ischneider/layer-extent

Browse Source 
Fix for regression in tile layer extent
This commit is contained in:
Tim Schaub
2016-06-30 15:19:13 -06:00
committed by GitHub
parent 6d41e87ff5 9d5232d9af
commit 728e1dd1f2
6 changed files with 79 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test_rendering/spec/ol/layer/expected/2-layers-canvas-extent-rotate.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
test_rendering/spec/ol/layer/expected/2-layers-canvas-extent.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

28
test_rendering/spec/ol/layer/tile.test.js
View File

@@ -29,7 +29,7 @@ describe('ol.rendering.layer.Tile', function() {
}
};
sources.forEach(function(source) {
sources.forEach(function(source, i) {
source.on('tileloadstart', function(event) {
tilesLoading++;
});
@@ -44,7 +44,7 @@ describe('ol.rendering.layer.Tile', function() {
var options = {
source: source
};
ol.object.assign(options, layerOptions);
ol.object.assign(options, layerOptions[i] || layerOptions);
map.addLayer(new ol.layer.Tile(options));
});
}
@@ -112,6 +112,30 @@ describe('ol.rendering.layer.Tile', function() {
IMAGE_TOLERANCE, done);
});
});
function centerExtent(map) {
var c = map.getView().calculateExtent(map.getSize());
var qw = ol.extent.getSize(c)[0] / 4;
var qh = ol.extent.getSize(c)[1] / 4;
return [c[0] + qw, c[1] + qh, c[2] - qw, c[3] - qh];
}
it('tests canvas layer extent clipping', function(done) {
map = createMap('canvas');
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'spec/ol/layer/expected/2-layers-canvas-extent.png',
IMAGE_TOLERANCE, done);
});
});
it('tests canvas layer extent clipping with rotation', function(done) {
map = createMap('canvas');
map.getView().setRotation(Math.PI / 2);
waitForTiles([source1, source2], [{}, {extent: centerExtent(map)}], function() {
expectResemble(map, 'spec/ol/layer/expected/2-layers-canvas-extent-rotate.png',
IMAGE_TOLERANCE, done);
});
});
});
describe('tile layer with opacity', function() {