From 35b950cc4044c55b8779e371c57334506aee24b4 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 19 Dec 2016 14:00:34 -0700 Subject: [PATCH 1/2] Avoid modifying coordinate in forEachLayerAtCoordinate --- src/ol/renderer/canvas/intermediatecanvas.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/renderer/canvas/intermediatecanvas.js b/src/ol/renderer/canvas/intermediatecanvas.js index 694697c939..fe915771ab 100644 --- a/src/ol/renderer/canvas/intermediatecanvas.js +++ b/src/ol/renderer/canvas/intermediatecanvas.js @@ -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_) { From 289940d39e69192ca9e353c1fbd479148c8adcc8 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Tue, 20 Dec 2016 13:07:00 -0700 Subject: [PATCH 2/2] Regression test --- test/spec/ol/map.test.js | 62 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js index f2cc852f38..a1b2a7926e 100644 --- a/test/spec/ol/map.test.js +++ b/test/spec/ol/map.test.js @@ -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;