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

More sensible split between direct and canvas rendering

Browse Source
This commit is contained in:
Andreas Hocevar
2015-12-17 10:00:22 +01:00
parent 80f10ce824
commit 9affb99899
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/renderer/canvas/canvasvectortilelayerrenderer.js
+4 -2
View File
@@ -94,6 +94,8 @@ ol.renderer.canvas.VectorTileLayer.prototype.composeFrame =
var source = layer.getSource(); var source = layer.getSource();
goog.asserts.assertInstanceof(source, ol.source.VectorTile, goog.asserts.assertInstanceof(source, ol.source.VectorTile,
'Source is an ol.source.VectorTile'); 'Source is an ol.source.VectorTile');
var tilePixelRatio = source.getTilePixelRatio();
var maxScale = tilePixelRatio / pixelRatio;
var transform = this.getTransform(frameState, 0); var transform = this.getTransform(frameState, 0);
@@ -130,13 +132,13 @@ ol.renderer.canvas.VectorTileLayer.prototype.composeFrame =
tileSize = ol.size.toSize(tileGrid.getTileSize(currentZ), this.tmpSize_); tileSize = ol.size.toSize(tileGrid.getTileSize(currentZ), this.tmpSize_);
pixelSpace = tile.getProjection().getUnits() == ol.proj.Units.TILE_PIXELS; pixelSpace = tile.getProjection().getUnits() == ol.proj.Units.TILE_PIXELS;
tileResolution = tileGrid.getResolution(currentZ); tileResolution = tileGrid.getResolution(currentZ);
tilePixelResolution = tileResolution / source.getTilePixelRatio(); tilePixelResolution = tileResolution / tilePixelRatio;
scale = tileResolution / resolution; scale = tileResolution / resolution;
offsetX = Math.round(pixelRatio * size[0] / 2); offsetX = Math.round(pixelRatio * size[0] / 2);
offsetY = Math.round(pixelRatio * size[1] / 2); offsetY = Math.round(pixelRatio * size[1] / 2);
width = tileSize[0] * pixelRatio * scale; width = tileSize[0] * pixelRatio * scale;
height = tileSize[1] * pixelRatio * scale; height = tileSize[1] * pixelRatio * scale;
if (width < 1 || width > size[0]) { if (width < 1 || scale > maxScale) {
if (pixelSpace) { if (pixelSpace) {
origin = ol.extent.getTopLeft(tileExtent); origin = ol.extent.getTopLeft(tileExtent);
tileTransform = ol.vec.Mat4.makeTransform2D(this.tmpTransform_, tileTransform = ol.vec.Mat4.makeTransform2D(this.tmpTransform_,