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

Merge pull request #6283 from tschaub/fix-6282

Browse Source 
Avoid modifying coordinate in forEachLayerAtCoordinate
This commit is contained in:
Tim Schaub
2016-12-20 13:56:31 -07:00
committed by GitHub
parent d342748563 289940d39e
commit d6a57968fd
2 changed files with 63 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ol/renderer/canvas/intermediatecanvas.js
View File

@@ -129,7 +129,7 @@ ol.renderer.canvas.IntermediateCanvas.prototype.forEachLayerAtCoordinate = funct
// so that for example also transparent polygons are detected
return ol.renderer.canvas.Layer.prototype.forEachLayerAtCoordinate.apply(this, arguments);
} else {
var pixel = ol.transform.apply(this.coordinateToCanvasPixelTransform, coordinate);
var pixel = ol.transform.apply(this.coordinateToCanvasPixelTransform, coordinate.slice());
ol.coordinate.scale(pixel, frameState.viewState.resolution / this.renderedResolution);
if (!this.hitCanvasContext_) {

62
test/spec/ol/map.test.js
View File

@@ -132,6 +132,68 @@ describe('ol.Map', function() {
});
describe('#forEachLayerAtPixel()', function() {
var target, map, original, log;
beforeEach(function(done) {
log = [];
original = ol.renderer.canvas.IntermediateCanvas.prototype.forEachLayerAtCoordinate;
ol.renderer.canvas.IntermediateCanvas.prototype.forEachLayerAtCoordinate = function(coordinate) {
log.push(coordinate.slice());
};
target = document.createElement('div');
var style = target.style;
style.position = 'absolute';
style.left = '-1000px';
style.top = '-1000px';
style.width = '360px';
style.height = '180px';
document.body.appendChild(target);
map = new ol.Map({
target: target,
view: new ol.View({
center: [0, 0],
zoom: 1
}),
layers: [
new ol.layer.Tile({
source: new ol.source.XYZ()
}),
new ol.layer.Tile({
source: new ol.source.XYZ()
}),
new ol.layer.Tile({
source: new ol.source.XYZ()
})
]
});
map.once('postrender', function() {
done();
});
});
afterEach(function() {
ol.renderer.canvas.IntermediateCanvas.prototype.forEachLayerAtCoordinate = original;
map.dispose();
document.body.removeChild(target);
log = null;
});
it('calls each layer renderer with the same coordinate', function() {
var pixel = [10, 20];
map.forEachLayerAtPixel(pixel, function() {});
expect(log.length).to.equal(3);
expect(log[0].length).to.equal(2);
expect(log[0]).to.eql(log[1]);
expect(log[1]).to.eql(log[2]);
});
});
describe('#render()', function() {
var target, map;