From b152f06973655fa235cb45a0338d89d0a2996342 Mon Sep 17 00:00:00 2001 From: Jan Klaas Kollhof Date: Mon, 13 Feb 2017 13:50:09 +1100 Subject: [PATCH 1/2] Fix rendered.canvas.TileLayer to calculate correct canvas height for drawing. --- src/ol/renderer/canvas/tilelayer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/renderer/canvas/tilelayer.js b/src/ol/renderer/canvas/tilelayer.js index 2e1da77895..160a0f9609 100644 --- a/src/ol/renderer/canvas/tilelayer.js +++ b/src/ol/renderer/canvas/tilelayer.js @@ -180,7 +180,7 @@ ol.renderer.canvas.TileLayer.prototype.prepareFrame = function(frameState, layer var tilePixelSize = tileSource.getTilePixelSize(z, pixelRatio, projection); var width = Math.round(tileRange.getWidth() * tilePixelSize[0] / oversampling); - var height = Math.round(tileRange.getHeight() * tilePixelSize[0] / oversampling); + var height = Math.round(tileRange.getHeight() * tilePixelSize[1] / oversampling); var context = this.context; var canvas = context.canvas; var opaque = tileSource.getOpaque(projection); From 7037ca211d538ff9d3906c4378025e9ba8d7ba28 Mon Sep 17 00:00:00 2001 From: Andreas Hocevar Date: Mon, 13 Feb 2017 18:27:34 +0100 Subject: [PATCH 2/2] Add rendering test for 192x256 tiles --- examples/wms-tiled.js | 10 +++- .../spec/ol/data/tiles/192x256/5/6/9.png | Bin 0 -> 7009 bytes .../spec/ol/data/tiles/192x256/5/7/9.png | Bin 0 -> 12403 bytes .../data/tiles/512x256/5/3/{19.png => 12.png} | Bin .../spec/ol/layer/expected/192x256-canvas.png | Bin 0 -> 2149 bytes .../spec/ol/layer/expected/192x256-webgl.png | Bin 0 -> 2149 bytes test_rendering/spec/ol/layer/tile.test.js | 52 +++++++++++------- 7 files changed, 41 insertions(+), 21 deletions(-) create mode 100644 test_rendering/spec/ol/data/tiles/192x256/5/6/9.png create mode 100644 test_rendering/spec/ol/data/tiles/192x256/5/7/9.png rename test_rendering/spec/ol/data/tiles/512x256/5/3/{19.png => 12.png} (100%) create mode 100644 test_rendering/spec/ol/layer/expected/192x256-canvas.png create mode 100644 test_rendering/spec/ol/layer/expected/192x256-webgl.png diff --git a/examples/wms-tiled.js b/examples/wms-tiled.js index c6bd093ef7..2bbb6f74f4 100644 --- a/examples/wms-tiled.js +++ b/examples/wms-tiled.js @@ -3,6 +3,7 @@ goog.require('ol.View'); goog.require('ol.layer.Tile'); goog.require('ol.source.OSM'); goog.require('ol.source.TileWMS'); +goog.require('ol.tilegrid'); var layers = [ @@ -14,7 +15,11 @@ var layers = [ source: new ol.source.TileWMS({ url: 'https://ahocevar.com/geoserver/wms', params: {'LAYERS': 'topp:states', 'TILED': true}, - serverType: 'geoserver' + serverType: 'geoserver', + tileGrid: ol.tilegrid.createXYZ({tileSize: [192, 256]}), + tileLoadFunction: function(tile, src) { + tile.getImage().src = src + '&tc=' + tile.getTileCoord().toString(); + } }) }) ]; @@ -23,6 +28,7 @@ var map = new ol.Map({ target: 'map', view: new ol.View({ center: [-10997148, 4569099], - zoom: 4 + zoom: 5, + resolutions: layers[1].getSource().getTileGrid().getResolutions() }) }); diff --git a/test_rendering/spec/ol/data/tiles/192x256/5/6/9.png b/test_rendering/spec/ol/data/tiles/192x256/5/6/9.png new file mode 100644 index 0000000000000000000000000000000000000000..787fbe4fe2a2b9f7b7a8cecace52e769238b2010 GIT binary patch literal 7009 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 literal 0 HcmV?d00001 diff --git a/test_rendering/spec/ol/data/tiles/192x256/5/7/9.png b/test_rendering/spec/ol/data/tiles/192x256/5/7/9.png new file mode 100644 index 0000000000000000000000000000000000000000..5a0db7a5553cb315f1b9e3fa05f6cb0c04a71cef GIT binary patch literal 12403 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 C%?soJ literal 0 HcmV?d00001 diff --git a/test_rendering/spec/ol/layer/expected/192x256-webgl.png b/test_rendering/spec/ol/layer/expected/192x256-webgl.png new file mode 100644 index 0000000000000000000000000000000000000000..3ce0b9d27f1b46eed9b2a8e83b848bedf41c6060 GIT binary patch literal 2149 zcmdT``9Bkk174EWBpPzxqcx2jDc7sEsaeHdM{JIjtComzwj5zmy)-o1gfYbC$ZX`R zmt2WA7xu8tL z!unlP*V>{4OJZe`k0D?ms7-Vz&d;KEQOTm80Nbsp2seCzPULzTkea<$EchPS4^62U z=E!8y8F=?nB1ZEB6*ZySZoY0eEBT~q_Ar%#~CJ&pWc4v~nr8FRs_CKp_t8fDl4g z6yD5m!)wm&H>^LWP&nl~cSi>c1h}LE>+8$ES8e6z7HyF3nT@0wLF40fBzX)(Cq1ha z?$n?k@#97(Di$=$CEULIe58hA^gCQ03L4u7vw@UI4YlYb9POe=Xf@ZYdOG~ND#N)R zA1sqY^c#}xoL%Igy#slSjFU15)_yWYTGaNPk*GYBs9Z$3C+kkid99ayeBM#7KMoW` zC(-Hbx8YvsK-5E!DRVJk$9Fz9jbUX<0Kq1?YnO+1#N5_Wm7Vs=sY>#o@dt|_DgWyk z2s2PtssHN6L6(Hpq+5htuk`0|wY@Sg;d8`W6--K!R{oDvWZD#O>|tBC3M-^&{2{D=g(N z9rCSOv+s+CrgZZ|t(p?kFjH&a`}(#nlqGeCdp{Ve@;ZYH^)NOQu!z3X$T*MPZFt<+ z5*Onn+oqTA&1^#_zI9VIP&;jRueNSDszzt}aT|Nr#nR+A|82KhApc8WAK`aM$g472 z+qzOUg@~^Kyt>oZOw`r4ODyfB3?dRfYcbOJZ;|`%HR$>c#UmzqIy(pd#uRkqV8}FqKwpq=Zz z4_Ecwr=}8G{j0)SDW(d&QQ?rqo@n4w3`GZZ@$&&Q0rqfebZsV0Bc z#lL!Y74PgEnTB_-92gi75;Ayv1ja;hlB)Z;74!2%ePIuN|GW9b> zMR4t&o1aUag8iJ`!)FEG_CGGk;!M;hSy=RaemF65^DgNMWZeD}7ji&% zve>%PYeq_s*xUF1P=!mfT_AxQ3sSg0olLarKojV~w$16NU0E{XdJ>TAYA@1jr(39s zia*x#xK@UW7rs2^U<^NcYTZw56*cwHfd%Q*@NUgukG=ZJ zz63yy(bSeiYD^wJFO3C4ZC6goAUdUt_mN}9A^$J2YO&M;;mu9_1G!*SrUgF*H2VWu zdR-oeEw_?4qIu9KvR5nGBEVtMBjk+-a@502Tfu`7&Rjpiw1qP&t(h{e-c;oA>83Il zW&eUs+eGaxDM?051RE;IytsT3sjYqRSWRWy{0=f3{aoJ>3S+{kkyAl4U%9236dLUr zx3W_0pSK<}7EOuMX>BhIQe3u8tpD6OeJ;%CFHG8HF*^qtUQS*STgJMj*>mJ5y|7+e zhUK%o@gSzKW@cMF9iHyh$l<7MV$pQb_pJo|;F?i|E0FEuC!YMgQn`J;qrjf{^_*)a zNd$Ta*}N3>NHlK0>wVJt(~0Fx-zRzL8W-UyKaxS@b~zS1+UnKkD&H1|#BkZh(!7_Q z{<34Q+0?uuYPHtVYav#hvFql%{!Dd2McZPs+z(QYs1y7&6=s>|)VFaOBqNlaveEfx zajsk46VSd+3e9`7!>&gze5f#-0 zHa1@HH?w_Zsqn1pu5R(_Aa`%pEsRe`?)&#;nR7gc4?>_LY{&)K6p?{`E@?KFoFo(& zRBw&gjW2IjYnX4J!hvm;Uzvw)Tjr4HYfap5Xn#>eF4r2`w;eF|r9al%+HOn3qlfo8 z&?983{b9J~*vNXKn5$kIHOjX_nb0$r^UYCO7!5F0UQh<#62$M_2Y`*WEvgK0E%smh C%?soJ literal 0 HcmV?d00001 diff --git a/test_rendering/spec/ol/layer/tile.test.js b/test_rendering/spec/ol/layer/tile.test.js index bf64f20188..2ab6e129d9 100644 --- a/test_rendering/spec/ol/layer/tile.test.js +++ b/test_rendering/spec/ol/layer/tile.test.js @@ -12,14 +12,14 @@ goog.require('ol.source.XYZ'); goog.require('ol.style.Circle'); goog.require('ol.style.Fill'); goog.require('ol.style.Stroke'); -goog.require('ol.tilegrid.TileGrid'); +goog.require('ol.tilegrid'); describe('ol.rendering.layer.Tile', function() { var target, map; - function createMap(renderer, opt_center, opt_size, opt_pixelRatio) { + function createMap(renderer, opt_center, opt_size, opt_pixelRatio, opt_resolutions) { var size = opt_size !== undefined ? opt_size : [50, 50]; target = createMapDiv(size[0], size[1]); @@ -30,6 +30,7 @@ describe('ol.rendering.layer.Tile', function() { view: new ol.View({ center: opt_center !== undefined ? opt_center : ol.proj.transform( [-122.416667, 37.783333], 'EPSG:4326', 'EPSG:3857'), + resolutions: opt_resolutions, zoom: 5 }) }); @@ -205,30 +206,22 @@ describe('ol.rendering.layer.Tile', function() { }); describe('tile layer with non-square tiles', function() { - var source; - beforeEach(function() { - source = new ol.source.TileImage({ - tileUrlFunction: function(tileCoord, ratio, projection) { - return 'spec/ol/data/tiles/512x256/' + tileCoord[0] + '/' + - tileCoord[1] + '/' + tileCoord[2] + '.png'; - }, - tileGrid: new ol.tilegrid.TileGrid({ - origin: [-20037508.342789244, -20037508.342789244], - resolutions: [ - 156543.03392804097, 78271.51696402048, 39135.75848201024, - 19567.87924100512, 9783.93962050256, 4891.96981025128 - ], - tileSize: [512, 256] + function createSource(tileSize) { + return new ol.source.TileImage({ + url: 'spec/ol/data/tiles/' + tileSize + '/{z}/{x}/{y}.png', + tileGrid: ol.tilegrid.createXYZ({ + tileSize: tileSize.split('x') }) }); - }); + } afterEach(function() { disposeMap(map); }); - it('renders correcly using the canvas renderer', function(done) { + it('512x256 renders correcly using the canvas renderer', function(done) { + var source = createSource('512x256'); map = createMap('canvas', [-10997148, 4569099]); waitForTiles([source], {}, function() { expectResemble(map, 'spec/ol/layer/expected/512x256-canvas.png', @@ -236,8 +229,9 @@ describe('ol.rendering.layer.Tile', function() { }); }); - it('renders correcly using the webgl renderer', function(done) { + it('512x256 renders correcly using the webgl renderer', function(done) { assertWebGL(); + var source = createSource('512x256'); map = createMap('webgl', [-10997148, 4569099]); waitForTiles([source], {}, function() { expectResemble(map, 'spec/ol/layer/expected/512x256-webgl.png', @@ -245,6 +239,26 @@ describe('ol.rendering.layer.Tile', function() { }); }); + it('192x256 renders correcly using the canvas renderer', function(done) { + var source = createSource('192x256'); + map = createMap('canvas', [-11271098, 3747248], [100, 100], undefined, + source.getTileGrid().getResolutions()); + waitForTiles([source], {}, function() { + expectResemble(map, 'spec/ol/layer/expected/192x256-canvas.png', + IMAGE_TOLERANCE, done); + }); + }); + + it('192x256 renders correcly using the webgl renderer', function(done) { + assertWebGL(); + var source = createSource('192x256'); + map = createMap('webgl', [-11271098, 3747248], [100, 100], undefined, + source.getTileGrid().getResolutions()); + waitForTiles([source], {}, function() { + expectResemble(map, 'spec/ol/layer/expected/192x256-webgl.png', + IMAGE_TOLERANCE, done); + }); + }); }); describe('tile layer with render listener', function() {