diff --git a/rendering/cases/layer-tile-render-listener/expected.png b/rendering/cases/layer-tile-render-listener/expected.png new file mode 100644 index 0000000000..e4755778b6 Binary files /dev/null and b/rendering/cases/layer-tile-render-listener/expected.png differ diff --git a/rendering/cases/layer-tile-render-listener/main.js b/rendering/cases/layer-tile-render-listener/main.js new file mode 100644 index 0000000000..ad16f713ba --- /dev/null +++ b/rendering/cases/layer-tile-render-listener/main.js @@ -0,0 +1,46 @@ +import Map from '../../../src/ol/Map.js'; +import View from '../../../src/ol/View.js'; +import TileLayer from '../../../src/ol/layer/Tile.js'; +import {transform, fromLonLat} from '../../../src/ol/proj'; +import XYZ from '../../../src/ol/source/XYZ'; +import CircleStyle from '../../../src/ol/style/Circle.js'; +import Fill from '../../../src/ol/style/Fill.js'; +import Stroke from '../../../src/ol/style/Stroke.js'; +import Point from '../../../src/ol/geom/Point.js'; +import {getVectorContext} from '../../../src/ol/render.js'; + +const center = fromLonLat([8.6, 50.1]); + +const layer = new TileLayer({ + source: new XYZ({ + url: '/data/tiles/satellite/{z}/{x}/{y}.jpg', + transition: 0 + }) +}); + +const onRender = function(event) { + const context = event.context; + context.restore(); + const vectorContext = getVectorContext(event); + vectorContext.setImageStyle(new CircleStyle({ + radius: 12, + fill: new Fill({color: 'yellow'}), + stroke: new Stroke({color: 'red', width: 1}) + })); + vectorContext.drawPoint(new Point( + transform([13, 37], 'EPSG:4326', 'EPSG:3857'))); +}; +layer.on('postrender', onRender); + +const map = new Map({ + layers: [ + ], + target: 'map', + view: new View({ + center: center, + zoom: 3 + }) +}); +map.addLayer(layer); + +render(); diff --git a/test/rendering/ol/data/me0.svg b/test/rendering/ol/data/me0.svg deleted file mode 100644 index 55ed860cd3..0000000000 --- a/test/rendering/ol/data/me0.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - -image/svg+xml - - \ No newline at end of file diff --git a/test/rendering/ol/data/tiles/192x256/5/6/9.png b/test/rendering/ol/data/tiles/192x256/5/6/9.png deleted file mode 100644 index 787fbe4fe2..0000000000 Binary files a/test/rendering/ol/data/tiles/192x256/5/6/9.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/192x256/5/7/9.png b/test/rendering/ol/data/tiles/192x256/5/7/9.png deleted file mode 100644 index 5a0db7a555..0000000000 Binary files a/test/rendering/ol/data/tiles/192x256/5/7/9.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/4326/0/0/0.png b/test/rendering/ol/data/tiles/4326/0/0/0.png deleted file mode 100644 index 0b99038d5a..0000000000 Binary files a/test/rendering/ol/data/tiles/4326/0/0/0.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/512x256/5/3/12.png b/test/rendering/ol/data/tiles/512x256/5/3/12.png deleted file mode 100644 index 00f5a32857..0000000000 Binary files a/test/rendering/ol/data/tiles/512x256/5/3/12.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/mvt/14-8938-5680.vector.pbf b/test/rendering/ol/data/tiles/mvt/14-8938-5680.vector.pbf deleted file mode 100644 index 0ed0c1ee24..0000000000 Binary files a/test/rendering/ol/data/tiles/mvt/14-8938-5680.vector.pbf and /dev/null differ diff --git a/test/rendering/ol/data/tiles/osm-512x256/5/3/12.png b/test/rendering/ol/data/tiles/osm-512x256/5/3/12.png deleted file mode 100644 index b25a05ace1..0000000000 Binary files a/test/rendering/ol/data/tiles/osm-512x256/5/3/12.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/osm/0/0/0.png b/test/rendering/ol/data/tiles/osm/0/0/0.png deleted file mode 100644 index 732e9096b1..0000000000 Binary files a/test/rendering/ol/data/tiles/osm/0/0/0.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/osm/5/4/12.png b/test/rendering/ol/data/tiles/osm/5/4/12.png deleted file mode 100644 index 4468321919..0000000000 Binary files a/test/rendering/ol/data/tiles/osm/5/4/12.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/osm/5/5/12.png b/test/rendering/ol/data/tiles/osm/5/5/12.png deleted file mode 100644 index ada08786c9..0000000000 Binary files a/test/rendering/ol/data/tiles/osm/5/5/12.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/osm/5/5/13.png b/test/rendering/ol/data/tiles/osm/5/5/13.png deleted file mode 100644 index 84a6879b3e..0000000000 Binary files a/test/rendering/ol/data/tiles/osm/5/5/13.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/osm/5/6/12.png b/test/rendering/ol/data/tiles/osm/5/6/12.png deleted file mode 100644 index 54b877726e..0000000000 Binary files a/test/rendering/ol/data/tiles/osm/5/6/12.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/osm/5/6/13.png b/test/rendering/ol/data/tiles/osm/5/6/13.png deleted file mode 100644 index 9fe6d7bc55..0000000000 Binary files a/test/rendering/ol/data/tiles/osm/5/6/13.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/stamen-labels/5/5/12.png b/test/rendering/ol/data/tiles/stamen-labels/5/5/12.png deleted file mode 100644 index b88d09eb76..0000000000 Binary files a/test/rendering/ol/data/tiles/stamen-labels/5/5/12.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/wms/wms0.png b/test/rendering/ol/data/tiles/wms/wms0.png deleted file mode 100644 index 55c3ce686f..0000000000 Binary files a/test/rendering/ol/data/tiles/wms/wms0.png and /dev/null differ diff --git a/test/rendering/ol/data/tiles/wms/wms20.png b/test/rendering/ol/data/tiles/wms/wms20.png deleted file mode 100644 index 34a5a73d2f..0000000000 Binary files a/test/rendering/ol/data/tiles/wms/wms20.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/192x256-canvas.png b/test/rendering/ol/layer/expected/192x256-canvas.png deleted file mode 100644 index 3ce0b9d27f..0000000000 Binary files a/test/rendering/ol/layer/expected/192x256-canvas.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/192x256-webgl.png b/test/rendering/ol/layer/expected/192x256-webgl.png deleted file mode 100644 index 3ce0b9d27f..0000000000 Binary files a/test/rendering/ol/layer/expected/192x256-webgl.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/2-layers-canvas-extent-hidpi.png b/test/rendering/ol/layer/expected/2-layers-canvas-extent-hidpi.png deleted file mode 100644 index fff644a675..0000000000 Binary files a/test/rendering/ol/layer/expected/2-layers-canvas-extent-hidpi.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/2-layers-canvas-extent-rotate-hidpi.png b/test/rendering/ol/layer/expected/2-layers-canvas-extent-rotate-hidpi.png deleted file mode 100644 index d0b115cca4..0000000000 Binary files a/test/rendering/ol/layer/expected/2-layers-canvas-extent-rotate-hidpi.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/2-layers-canvas-extent-rotate.png b/test/rendering/ol/layer/expected/2-layers-canvas-extent-rotate.png deleted file mode 100644 index 806e331357..0000000000 Binary files a/test/rendering/ol/layer/expected/2-layers-canvas-extent-rotate.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/2-layers-canvas-extent.png b/test/rendering/ol/layer/expected/2-layers-canvas-extent.png deleted file mode 100644 index 2ec76c289f..0000000000 Binary files a/test/rendering/ol/layer/expected/2-layers-canvas-extent.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/2-layers-webgl.png b/test/rendering/ol/layer/expected/2-layers-webgl.png deleted file mode 100644 index a982b089de..0000000000 Binary files a/test/rendering/ol/layer/expected/2-layers-webgl.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/512x256-canvas.png b/test/rendering/ol/layer/expected/512x256-canvas.png deleted file mode 100644 index e78df46f51..0000000000 Binary files a/test/rendering/ol/layer/expected/512x256-canvas.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/512x256-webgl.png b/test/rendering/ol/layer/expected/512x256-webgl.png deleted file mode 100644 index e78df46f51..0000000000 Binary files a/test/rendering/ol/layer/expected/512x256-webgl.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/image-canvas.png b/test/rendering/ol/layer/expected/image-canvas.png deleted file mode 100644 index 86f9bedd38..0000000000 Binary files a/test/rendering/ol/layer/expected/image-canvas.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/image-scaled.png b/test/rendering/ol/layer/expected/image-scaled.png deleted file mode 100644 index a1b50feb2a..0000000000 Binary files a/test/rendering/ol/layer/expected/image-scaled.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/image-webgl.png b/test/rendering/ol/layer/expected/image-webgl.png deleted file mode 100644 index c258cb1ac2..0000000000 Binary files a/test/rendering/ol/layer/expected/image-webgl.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/inverted-star.png b/test/rendering/ol/layer/expected/inverted-star.png deleted file mode 100644 index 07399ffcb4..0000000000 Binary files a/test/rendering/ol/layer/expected/inverted-star.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/opacity-canvas.png b/test/rendering/ol/layer/expected/opacity-canvas.png deleted file mode 100644 index a69bb84d85..0000000000 Binary files a/test/rendering/ol/layer/expected/opacity-canvas.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/opacity-webgl.png b/test/rendering/ol/layer/expected/opacity-webgl.png deleted file mode 100644 index 389d138042..0000000000 Binary files a/test/rendering/ol/layer/expected/opacity-webgl.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/osm-canvas.png b/test/rendering/ol/layer/expected/osm-canvas.png deleted file mode 100644 index 86f9bedd38..0000000000 Binary files a/test/rendering/ol/layer/expected/osm-canvas.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/osm-webgl.png b/test/rendering/ol/layer/expected/osm-webgl.png deleted file mode 100644 index 86f9bedd38..0000000000 Binary files a/test/rendering/ol/layer/expected/osm-webgl.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/render-canvas.png b/test/rendering/ol/layer/expected/render-canvas.png deleted file mode 100644 index 1f24f74434..0000000000 Binary files a/test/rendering/ol/layer/expected/render-canvas.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-declutter-group.png b/test/rendering/ol/layer/expected/vector-canvas-declutter-group.png deleted file mode 100644 index 790327f5de..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-declutter-group.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-declutter-image-zindex.png b/test/rendering/ol/layer/expected/vector-canvas-declutter-image-zindex.png deleted file mode 100644 index 1a8896618e..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-declutter-image-zindex.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-declutter-line-zindex.png b/test/rendering/ol/layer/expected/vector-canvas-declutter-line-zindex.png deleted file mode 100644 index b4a115521f..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-declutter-line-zindex.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-declutter-zindex.png b/test/rendering/ol/layer/expected/vector-canvas-declutter-zindex.png deleted file mode 100644 index dd44e26090..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-declutter-zindex.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-opaque.png b/test/rendering/ol/layer/expected/vector-canvas-opaque.png deleted file mode 100644 index dcdff4669b..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-opaque.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-rotated.png b/test/rendering/ol/layer/expected/vector-canvas-rotated.png deleted file mode 100644 index fb1efcf21f..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-rotated.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-simplified-fill.png b/test/rendering/ol/layer/expected/vector-canvas-simplified-fill.png deleted file mode 100644 index 47956d7011..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-simplified-fill.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-simplified-stroke.png b/test/rendering/ol/layer/expected/vector-canvas-simplified-stroke.png deleted file mode 100644 index 035e1537d2..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-simplified-stroke.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-simplified.png b/test/rendering/ol/layer/expected/vector-canvas-simplified.png deleted file mode 100644 index 26c028bcda..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-simplified.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-stroke.png b/test/rendering/ol/layer/expected/vector-canvas-stroke.png deleted file mode 100644 index 9627e9c34f..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-stroke.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas-transparent.png b/test/rendering/ol/layer/expected/vector-canvas-transparent.png deleted file mode 100644 index 4bf3ff79d4..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas-transparent.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector-canvas.png b/test/rendering/ol/layer/expected/vector-canvas.png deleted file mode 100644 index 988080016e..0000000000 Binary files a/test/rendering/ol/layer/expected/vector-canvas.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vector.png b/test/rendering/ol/layer/expected/vector.png deleted file mode 100644 index 9227b57208..0000000000 Binary files a/test/rendering/ol/layer/expected/vector.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vectortile-canvas-declutter.png b/test/rendering/ol/layer/expected/vectortile-canvas-declutter.png deleted file mode 100644 index 2f44b10f35..0000000000 Binary files a/test/rendering/ol/layer/expected/vectortile-canvas-declutter.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vectortile-canvas-hidpi.png b/test/rendering/ol/layer/expected/vectortile-canvas-hidpi.png deleted file mode 100644 index 0b864fea62..0000000000 Binary files a/test/rendering/ol/layer/expected/vectortile-canvas-hidpi.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vectortile-canvas-rotated-hidpi.png b/test/rendering/ol/layer/expected/vectortile-canvas-rotated-hidpi.png deleted file mode 100644 index 9b2be43351..0000000000 Binary files a/test/rendering/ol/layer/expected/vectortile-canvas-rotated-hidpi.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vectortile-canvas-rotated.png b/test/rendering/ol/layer/expected/vectortile-canvas-rotated.png deleted file mode 100644 index 1323da2399..0000000000 Binary files a/test/rendering/ol/layer/expected/vectortile-canvas-rotated.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vectortile-canvas.png b/test/rendering/ol/layer/expected/vectortile-canvas.png deleted file mode 100644 index 8c34f9259c..0000000000 Binary files a/test/rendering/ol/layer/expected/vectortile-canvas.png and /dev/null differ diff --git a/test/rendering/ol/layer/expected/vectortile-vector-rotated.png b/test/rendering/ol/layer/expected/vectortile-vector-rotated.png deleted file mode 100644 index e15480331e..0000000000 Binary files a/test/rendering/ol/layer/expected/vectortile-vector-rotated.png and /dev/null differ diff --git a/test/rendering/ol/layer/tile.test.js b/test/rendering/ol/layer/tile.test.js deleted file mode 100644 index 266d3a59da..0000000000 --- a/test/rendering/ol/layer/tile.test.js +++ /dev/null @@ -1,100 +0,0 @@ -import Map from '../../../../src/ol/Map.js'; -import View from '../../../../src/ol/View.js'; -import Point from '../../../../src/ol/geom/Point.js'; -import TileLayer from '../../../../src/ol/layer/Tile.js'; -import {assign} from '../../../../src/ol/obj.js'; -import {transform} from '../../../../src/ol/proj.js'; -import XYZ from '../../../../src/ol/source/XYZ.js'; -import CircleStyle from '../../../../src/ol/style/Circle.js'; -import Fill from '../../../../src/ol/style/Fill.js'; -import Stroke from '../../../../src/ol/style/Stroke.js'; - -describe('ol.rendering.layer.Tile', function() { - - let map; - - function createMap(renderer, opt_center, opt_size, opt_pixelRatio, opt_resolutions) { - const MapConstructor = Map; - const size = opt_size !== undefined ? opt_size : [50, 50]; - - map = new MapConstructor({ - pixelRatio: opt_pixelRatio || 1, - target: createMapDiv(size[0], size[1]), - view: new View({ - center: opt_center !== undefined ? opt_center : transform( - [-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'), - resolutions: opt_resolutions, - zoom: 5 - }) - }); - } - - afterEach(function() { - if (map) { - disposeMap(map); - } - map = null; - }); - - function waitForTiles(renderer, sources, layerOptions, onTileLoaded) { - const LayerConstructor = TileLayer; - let tilesLoading = 0; - let tileLoaded = 0; - - const update = function() { - if (tilesLoading === tileLoaded) { - onTileLoaded(); - } - }; - - sources.forEach(function(source, i) { - source.on('tileloadstart', function(event) { - tilesLoading++; - }); - source.on('tileloadend', function(event) { - tileLoaded++; - update(); - }); - source.on('tileloaderror', function(event) { - expect().fail('Tile failed to load'); - }); - - const options = { - source: source - }; - assign(options, layerOptions[i] || layerOptions); - map.addLayer(new LayerConstructor(options)); - }); - } - - describe('tile layer with render listener', function() { - let source, onAddLayer; - - beforeEach(function() { - source = new XYZ({ - url: 'rendering/ol/data/tiles/osm/{z}/{x}/{y}.png', - transition: 0 - }); - onAddLayer = function(evt) { - evt.element.on('render', function(e) { - e.vectorContext.setImageStyle(new CircleStyle({ - radius: 5, - fill: new Fill({color: 'yellow'}), - stroke: new Stroke({color: 'red', width: 1}) - })); - e.vectorContext.drawPoint(new Point( - transform([-123, 38], 'EPSG:4326', 'EPSG:3857'))); - }); - }; - }); - - it('works with the canvas renderer', function(done) { - createMap('canvas', undefined, [100, 100]); - map.getLayers().on('add', onAddLayer); - waitForTiles('canvas', [source], {}, function() { - expectResemble(map, 'rendering/ol/layer/expected/render-canvas.png', - IMAGE_TOLERANCE, done); - }); - }); - }); -});