From 8c61dbef8ae65202020d0869f3bdb1ac1e2f16b5 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 8 Jan 2014 11:38:12 +0100 Subject: [PATCH 1/2] Use ol.TileCoord.createOrUpdate function --- src/ol/tilegrid/xyztilegrid.js | 9 +-------- src/ol/tilegrid/zoomifytilegrid.js | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/ol/tilegrid/xyztilegrid.js b/src/ol/tilegrid/xyztilegrid.js index 239e282bc8..53c8a23f22 100644 --- a/src/ol/tilegrid/xyztilegrid.js +++ b/src/ol/tilegrid/xyztilegrid.js @@ -89,14 +89,7 @@ ol.tilegrid.XYZ.prototype.createTileCoordTransform = function(opt_options) { return null; } } - if (goog.isDef(opt_tileCoord)) { - opt_tileCoord.z = z; - opt_tileCoord.x = x; - opt_tileCoord.y = -y - 1; - return opt_tileCoord; - } else { - return new ol.TileCoord(z, x, -y - 1); - } + return ol.TileCoord.createOrUpdate(z, x, -y - 1, opt_tileCoord); }); }; diff --git a/src/ol/tilegrid/zoomifytilegrid.js b/src/ol/tilegrid/zoomifytilegrid.js index 115f1734c8..6bf221c8fd 100644 --- a/src/ol/tilegrid/zoomifytilegrid.js +++ b/src/ol/tilegrid/zoomifytilegrid.js @@ -74,13 +74,6 @@ ol.tilegrid.Zoomify.prototype.createTileCoordTransform = function(opt_options) { return null; } } - if (goog.isDef(opt_tileCoord)) { - opt_tileCoord.z = z; - opt_tileCoord.x = x; - opt_tileCoord.y = -y - 1; - return opt_tileCoord; - } else { - return new ol.TileCoord(z, x, -y - 1); - } + return ol.TileCoord.createOrUpdate(z, x, -y - 1, opt_tileCoord); }); }; From 34e75b3d9dc21a2b3ea944ba6a3de6d30a89a4ca Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 8 Jan 2014 11:48:15 +0100 Subject: [PATCH 2/2] Add @struct annotation to ol.TileCoord class --- src/ol/tilecoord.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ol/tilecoord.js b/src/ol/tilecoord.js index 2cee206180..013cc5af2c 100644 --- a/src/ol/tilecoord.js +++ b/src/ol/tilecoord.js @@ -21,6 +21,7 @@ ol.QuadKeyCharCode = { * @param {number} z Zoom level. * @param {number} x X. * @param {number} y Y. + * @struct */ ol.TileCoord = function(z, x, y) {