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

Improve readability and reduce garbage creation

Browse Source
This commit is contained in:
Andreas Hocevar
2015-09-24 14:45:37 +02:00
parent bda3a6803c
commit 29b64d8628
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/ol/renderer/canvas/canvasvectortilelayerrenderer.js
View File

@@ -123,7 +123,7 @@ ol.renderer.canvas.VectorTileLayer.prototype.composeFrame =
tileSize = tileGrid.getTileSize(currentZ); tileSize = tileGrid.getTileSize(currentZ);
tilePixelSize = source.getTilePixelSize(currentZ, pixelRatio, projection); tilePixelSize = source.getTilePixelSize(currentZ, pixelRatio, projection);
tilePixelRatio = tilePixelSize[0] / tilePixelRatio = tilePixelSize[0] /
ol.size.toSize(tileGrid.getTileSize(currentZ), this.tmpSize_)[0]; ol.size.toSize(tileSize, this.tmpSize_)[0];
tileResolution = tileGrid.getResolution(currentZ); tileResolution = tileGrid.getResolution(currentZ);
tilePixelResolution = tileResolution / tilePixelRatio; tilePixelResolution = tileResolution / tilePixelRatio;
if (tile.getProjection().getUnits() == ol.proj.Units.TILE_PIXELS) { if (tile.getProjection().getUnits() == ol.proj.Units.TILE_PIXELS) {
@@ -183,16 +183,22 @@ ol.renderer.canvas.VectorTileLayer.prototype.createReplayGroup = function(tile,
'Source is an ol.source.VectorTile'); 'Source is an ol.source.VectorTile');
var tileGrid = source.getTileGrid(); var tileGrid = source.getTileGrid();
var tileCoord = tile.getTileCoord(); var tileCoord = tile.getTileCoord();
var resolution = tileGrid.getTileCoordResolution(tileCoord);
var pixelSpace = tile.getProjection().getUnits() == ol.proj.Units.TILE_PIXELS; var pixelSpace = tile.getProjection().getUnits() == ol.proj.Units.TILE_PIXELS;
var extent = pixelSpace ? var extent;
[0, 0].concat(source.getTilePixelSize(tileCoord[0], pixelRatio, if (pixelSpace) {
tile.getProjection())) : var tilePixelSize = source.getTilePixelSize(tileCoord[0], pixelRatio,
tileGrid.getTileCoordExtent(tileCoord); tile.getProjection());
extent = [0, 0, tilePixelSize[0], tilePixelSize[1]];
} else {
extent = tileGrid.getTileCoordExtent(tileCoord);
}
var resolution = tileGrid.getResolution(tileCoord[0]);
var tileResolution = pixelSpace ? source.getTilePixelRatio() : resolution; var tileResolution = pixelSpace ? source.getTilePixelRatio() : resolution;
var replayGroup = new ol.render.canvas.ReplayGroup(pixelSpace ? 0 : replayState.dirty = false;
ol.renderer.vector.getTolerance(tileResolution, pixelRatio), extent, var replayGroup = new ol.render.canvas.ReplayGroup(0, extent,
tileResolution, layer.getRenderBuffer(), source.getRightHandedPolygons()); tileResolution, layer.getRenderBuffer(), source.getRightHandedPolygons());
var squaredTolerance = ol.renderer.vector.getSquaredTolerance(
tileResolution, pixelRatio);
/** /**
* @param {ol.Feature|ol.render.Feature} feature Feature. * @param {ol.Feature|ol.render.Feature} feature Feature.
@@ -206,8 +212,6 @@ ol.renderer.canvas.VectorTileLayer.prototype.createReplayGroup = function(tile,
} else if (goog.isDef(layer.getStyleFunction())) { } else if (goog.isDef(layer.getStyleFunction())) {
styles = layer.getStyleFunction()(feature, resolution); styles = layer.getStyleFunction()(feature, resolution);
} }
var squaredTolerance = pixelSpace ? -1 :
ol.renderer.vector.getSquaredTolerance(resolution, pixelRatio);
if (goog.isDefAndNotNull(styles)) { if (goog.isDefAndNotNull(styles)) {
var dirty = this.renderFeature(feature, squaredTolerance, styles, var dirty = this.renderFeature(feature, squaredTolerance, styles,
replayGroup); replayGroup);
@@ -254,13 +258,13 @@ ol.renderer.canvas.VectorTileLayer.prototype.forEachFeatureAtCoordinate =
tileCoord = tile.getTileCoord(); tileCoord = tile.getTileCoord();
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');
tileExtent = source.getTileGrid().getTileCoordExtent(tileCoord); tileExtent = source.getTileGrid().getTileCoordExtent(tileCoord,
this.tmpExtent_);
if (!ol.extent.containsCoordinate(tileExtent, coordinate)) { if (!ol.extent.containsCoordinate(tileExtent, coordinate)) {
continue; continue;
} }
if (tile.getProjection().getUnits() === ol.proj.Units.TILE_PIXELS) { if (tile.getProjection().getUnits() === ol.proj.Units.TILE_PIXELS) {
origin = ol.extent.getTopLeft( origin = ol.extent.getTopLeft(tileExtent);
source.getTileGrid().getTileCoordExtent(tileCoord));
tilePixelRatio = source.getTilePixelRatio(); tilePixelRatio = source.getTilePixelRatio();
tileResolution = tileGrid.getResolution(tileCoord[0]) / tilePixelRatio; tileResolution = tileGrid.getResolution(tileCoord[0]) / tilePixelRatio;
tileSize = ol.size.toSize(tileGrid.getTileSize(tileCoord[0])); tileSize = ol.size.toSize(tileGrid.getTileSize(tileCoord[0]));