Re-use ol.Extent objects
This commit is contained in:
@@ -201,6 +201,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
|
|||||||
tilesToDrawByZ, getTileIfLoaded);
|
tilesToDrawByZ, getTileIfLoaded);
|
||||||
|
|
||||||
var allTilesLoaded = true;
|
var allTilesLoaded = true;
|
||||||
|
var tmpExtent = new ol.Extent(0, 0, 0, 0);
|
||||||
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
|
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
|
||||||
var childTileRange, fullyLoaded, tile, tileState, x, y;
|
var childTileRange, fullyLoaded, tile, tileState, x, y;
|
||||||
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
|
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
|
||||||
@@ -217,10 +218,10 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
|
|||||||
|
|
||||||
allTilesLoaded = false;
|
allTilesLoaded = false;
|
||||||
fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
|
fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
|
||||||
tile.tileCoord, findLoadedTiles, null, tmpTileRange);
|
tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent);
|
||||||
if (!fullyLoaded) {
|
if (!fullyLoaded) {
|
||||||
childTileRange = tileGrid.getTileCoordChildTileRange(
|
childTileRange = tileGrid.getTileCoordChildTileRange(
|
||||||
tile.tileCoord, tmpTileRange);
|
tile.tileCoord, tmpTileRange, tmpExtent);
|
||||||
if (!goog.isNull(childTileRange)) {
|
if (!goog.isNull(childTileRange)) {
|
||||||
findLoadedTiles(z + 1, childTileRange);
|
findLoadedTiles(z + 1, childTileRange);
|
||||||
}
|
}
|
||||||
@@ -234,7 +235,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
|
|||||||
goog.array.sort(zs);
|
goog.array.sort(zs);
|
||||||
var opaque = tileSource.getOpaque();
|
var opaque = tileSource.getOpaque();
|
||||||
var origin = tileGrid.getTileCoordExtent(new ol.TileCoord(
|
var origin = tileGrid.getTileCoordExtent(new ol.TileCoord(
|
||||||
z, canvasTileRange.minX, canvasTileRange.maxY)).getTopLeft();
|
z, canvasTileRange.minX, canvasTileRange.maxY), tmpExtent).getTopLeft();
|
||||||
var currentZ, i, index, scale, tileCoordKey, tileExtent, tilesToDraw;
|
var currentZ, i, index, scale, tileCoordKey, tileExtent, tilesToDraw;
|
||||||
var ix, iy, interimTileExtent, interimTileRange, maxX, maxY;
|
var ix, iy, interimTileExtent, interimTileRange, maxX, maxY;
|
||||||
var height, width;
|
var height, width;
|
||||||
@@ -265,7 +266,7 @@ ol.renderer.canvas.TileLayer.prototype.renderFrame =
|
|||||||
scale = tileGrid.getResolution(currentZ) / tileResolution;
|
scale = tileGrid.getResolution(currentZ) / tileResolution;
|
||||||
for (tileCoordKey in tilesToDraw) {
|
for (tileCoordKey in tilesToDraw) {
|
||||||
tile = tilesToDraw[tileCoordKey];
|
tile = tilesToDraw[tileCoordKey];
|
||||||
tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord);
|
tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent);
|
||||||
x = (tileExtent.minX - origin[0]) / tileResolution;
|
x = (tileExtent.minX - origin[0]) / tileResolution;
|
||||||
y = (origin[1] - tileExtent.maxY) / tileResolution;
|
y = (origin[1] - tileExtent.maxY) / tileResolution;
|
||||||
width = scale * tileSize.width;
|
width = scale * tileSize.width;
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
|
|||||||
tilesToDrawByZ, getTileIfLoaded);
|
tilesToDrawByZ, getTileIfLoaded);
|
||||||
|
|
||||||
var allTilesLoaded = true;
|
var allTilesLoaded = true;
|
||||||
|
var tmpExtent = new ol.Extent(0, 0, 0, 0);
|
||||||
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
|
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
|
||||||
var childTileRange, fullyLoaded, tile, tileState, x, y;
|
var childTileRange, fullyLoaded, tile, tileState, x, y;
|
||||||
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
|
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
|
||||||
@@ -133,10 +134,10 @@ ol.renderer.dom.TileLayer.prototype.renderFrame =
|
|||||||
|
|
||||||
allTilesLoaded = false;
|
allTilesLoaded = false;
|
||||||
fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
|
fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
|
||||||
tile.tileCoord, findLoadedTiles, null, tmpTileRange);
|
tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent);
|
||||||
if (!fullyLoaded) {
|
if (!fullyLoaded) {
|
||||||
childTileRange = tileGrid.getTileCoordChildTileRange(
|
childTileRange = tileGrid.getTileCoordChildTileRange(
|
||||||
tile.tileCoord, tmpTileRange);
|
tile.tileCoord, tmpTileRange, tmpExtent);
|
||||||
if (!goog.isNull(childTileRange)) {
|
if (!goog.isNull(childTileRange)) {
|
||||||
findLoadedTiles(z + 1, childTileRange);
|
findLoadedTiles(z + 1, childTileRange);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -199,6 +199,7 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
|
|||||||
tilesToDrawByZ, getTileIfLoaded);
|
tilesToDrawByZ, getTileIfLoaded);
|
||||||
|
|
||||||
var allTilesLoaded = true;
|
var allTilesLoaded = true;
|
||||||
|
var tmpExtent = new ol.Extent(0, 0, 0, 0);
|
||||||
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
|
var tmpTileRange = new ol.TileRange(0, 0, 0, 0);
|
||||||
var childTileRange, fullyLoaded, tile, tileState, x, y;
|
var childTileRange, fullyLoaded, tile, tileState, x, y;
|
||||||
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
|
for (x = tileRange.minX; x <= tileRange.maxX; ++x) {
|
||||||
@@ -218,10 +219,10 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
|
|||||||
|
|
||||||
allTilesLoaded = false;
|
allTilesLoaded = false;
|
||||||
fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
|
fullyLoaded = tileGrid.forEachTileCoordParentTileRange(
|
||||||
tile.tileCoord, findLoadedTiles, null, tmpTileRange);
|
tile.tileCoord, findLoadedTiles, null, tmpTileRange, tmpExtent);
|
||||||
if (!fullyLoaded) {
|
if (!fullyLoaded) {
|
||||||
childTileRange = tileGrid.getTileCoordChildTileRange(
|
childTileRange = tileGrid.getTileCoordChildTileRange(
|
||||||
tile.tileCoord, tmpTileRange);
|
tile.tileCoord, tmpTileRange, tmpExtent);
|
||||||
if (!goog.isNull(childTileRange)) {
|
if (!goog.isNull(childTileRange)) {
|
||||||
findLoadedTiles(z + 1, childTileRange);
|
findLoadedTiles(z + 1, childTileRange);
|
||||||
}
|
}
|
||||||
@@ -237,7 +238,7 @@ ol.renderer.webgl.TileLayer.prototype.renderFrame =
|
|||||||
var u_tileOffset = goog.vec.Vec4.createFloat32();
|
var u_tileOffset = goog.vec.Vec4.createFloat32();
|
||||||
goog.array.forEach(zs, function(z) {
|
goog.array.forEach(zs, function(z) {
|
||||||
goog.object.forEach(tilesToDrawByZ[z], function(tile) {
|
goog.object.forEach(tilesToDrawByZ[z], function(tile) {
|
||||||
var tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord);
|
var tileExtent = tileGrid.getTileCoordExtent(tile.tileCoord, tmpExtent);
|
||||||
var sx = 2 * tileExtent.getWidth() / framebufferExtentSize.width;
|
var sx = 2 * tileExtent.getWidth() / framebufferExtentSize.width;
|
||||||
var sy = 2 * tileExtent.getHeight() / framebufferExtentSize.height;
|
var sy = 2 * tileExtent.getHeight() / framebufferExtentSize.height;
|
||||||
var tx = 2 * (tileExtent.minX - framebufferExtent.minX) /
|
var tx = 2 * (tileExtent.minX - framebufferExtent.minX) /
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ goog.require('goog.asserts');
|
|||||||
goog.require('goog.math');
|
goog.require('goog.math');
|
||||||
goog.require('goog.object');
|
goog.require('goog.object');
|
||||||
goog.require('goog.uri.utils');
|
goog.require('goog.uri.utils');
|
||||||
|
goog.require('ol.Extent');
|
||||||
goog.require('ol.TileCoord');
|
goog.require('ol.TileCoord');
|
||||||
goog.require('ol.TileUrlFunction');
|
goog.require('ol.TileUrlFunction');
|
||||||
goog.require('ol.TileUrlFunctionType');
|
goog.require('ol.TileUrlFunctionType');
|
||||||
@@ -113,6 +114,7 @@ ol.source.WMTS = function(options) {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var tmpExtent = new ol.Extent(0, 0, 0, 0);
|
||||||
var tmpTileCoord = new ol.TileCoord(0, 0, 0);
|
var tmpTileCoord = new ol.TileCoord(0, 0, 0);
|
||||||
tileUrlFunction = ol.TileUrlFunction.withTileCoordTransform(
|
tileUrlFunction = ol.TileUrlFunction.withTileCoordTransform(
|
||||||
function(tileCoord, projection) {
|
function(tileCoord, projection) {
|
||||||
@@ -138,7 +140,7 @@ ol.source.WMTS = function(options) {
|
|||||||
tmpTileCoord.z = tileCoord.z;
|
tmpTileCoord.z = tileCoord.z;
|
||||||
tmpTileCoord.x = x;
|
tmpTileCoord.x = x;
|
||||||
tmpTileCoord.y = tileCoord.y;
|
tmpTileCoord.y = tileCoord.y;
|
||||||
tileExtent = tileGrid.getTileCoordExtent(tmpTileCoord);
|
tileExtent = tileGrid.getTileCoordExtent(tmpTileCoord, tmpExtent);
|
||||||
}
|
}
|
||||||
if (!tileExtent.intersects(extent)) {
|
if (!tileExtent.intersects(extent)) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ ol.source.XYZ = function(options) {
|
|||||||
var extent = options.extent;
|
var extent = options.extent;
|
||||||
if (goog.isDefAndNotNull(extent)) {
|
if (goog.isDefAndNotNull(extent)) {
|
||||||
|
|
||||||
|
var tmpExtent = new ol.Extent(0, 0, 0, 0);
|
||||||
var tmpTileCoord = new ol.TileCoord(0, 0, 0);
|
var tmpTileCoord = new ol.TileCoord(0, 0, 0);
|
||||||
tileUrlFunction = ol.TileUrlFunction.withTileCoordTransform(
|
tileUrlFunction = ol.TileUrlFunction.withTileCoordTransform(
|
||||||
function(tileCoord) {
|
function(tileCoord) {
|
||||||
@@ -76,7 +77,7 @@ ol.source.XYZ = function(options) {
|
|||||||
tmpTileCoord.z = tileCoord.z;
|
tmpTileCoord.z = tileCoord.z;
|
||||||
tmpTileCoord.x = x;
|
tmpTileCoord.x = x;
|
||||||
tmpTileCoord.y = tileCoord.y;
|
tmpTileCoord.y = tileCoord.y;
|
||||||
var tileExtent = tileGrid.getTileCoordExtent(tmpTileCoord);
|
var tileExtent = tileGrid.getTileCoordExtent(tmpTileCoord, tmpExtent);
|
||||||
// FIXME we shouldn't need a typecast here
|
// FIXME we shouldn't need a typecast here
|
||||||
if (!tileExtent.intersects(/** @type {ol.Extent} */ (extent))) {
|
if (!tileExtent.intersects(/** @type {ol.Extent} */ (extent))) {
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ goog.provide('ol.TileUrlFunctionType');
|
|||||||
|
|
||||||
goog.require('goog.array');
|
goog.require('goog.array');
|
||||||
goog.require('goog.math');
|
goog.require('goog.math');
|
||||||
|
goog.require('ol.Extent');
|
||||||
goog.require('ol.TileCoord');
|
goog.require('ol.TileCoord');
|
||||||
|
|
||||||
|
|
||||||
@@ -68,6 +69,7 @@ ol.TileUrlFunction.createFromTileUrlFunctions = function(tileUrlFunctions) {
|
|||||||
*/
|
*/
|
||||||
ol.TileUrlFunction.createFromParamsFunction =
|
ol.TileUrlFunction.createFromParamsFunction =
|
||||||
function(baseUrl, params, paramsFunction) {
|
function(baseUrl, params, paramsFunction) {
|
||||||
|
var tmpExtent = new ol.Extent(0, 0, 0, 0);
|
||||||
return function(tileCoord, projection) {
|
return function(tileCoord, projection) {
|
||||||
if (goog.isNull(tileCoord)) {
|
if (goog.isNull(tileCoord)) {
|
||||||
return undefined;
|
return undefined;
|
||||||
@@ -77,7 +79,7 @@ ol.TileUrlFunction.createFromParamsFunction =
|
|||||||
tileGrid = ol.tilegrid.getForProjection(projection);
|
tileGrid = ol.tilegrid.getForProjection(projection);
|
||||||
}
|
}
|
||||||
var size = tileGrid.getTileSize(tileCoord.z);
|
var size = tileGrid.getTileSize(tileCoord.z);
|
||||||
var extent = tileGrid.getTileCoordExtent(tileCoord);
|
var extent = tileGrid.getTileCoordExtent(tileCoord, tmpExtent);
|
||||||
return paramsFunction.call(this, baseUrl, params,
|
return paramsFunction.call(this, baseUrl, params,
|
||||||
extent, size, projection);
|
extent, size, projection);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user