From 8076401c0f29f5a3ee57b062e93b035e7271da1d Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 13 Aug 2014 11:34:02 +0200 Subject: [PATCH 1/2] Use opt_tileCoord in ol.source.WMTS tileUrlFunction --- src/ol/source/wmtssource.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 09b83c4e1b..5f27f52ab9 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -6,12 +6,12 @@ goog.require('goog.asserts'); goog.require('goog.math'); goog.require('goog.object'); goog.require('goog.uri.utils'); -goog.require('ol.TileCoord'); goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunctionType'); goog.require('ol.extent'); goog.require('ol.proj'); goog.require('ol.source.TileImage'); +goog.require('ol.tilecoord'); goog.require('ol.tilegrid.WMTS'); @@ -170,7 +170,7 @@ ol.source.WMTS = function(options) { ol.extent.touches(tileExtent, extent)) { return null; } - return [tileCoord[0], x, y]; + return ol.tilecoord.createOrUpdate(tileCoord[0], x, y, opt_tileCoord); }, tileUrlFunction); From b484801e4fb367806c8fe95333f857ec436d4cd1 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Wed, 13 Aug 2014 12:33:51 +0200 Subject: [PATCH 2/2] Use tmpExtent in ol.source.WMTS tileUrlFunction --- src/ol/source/wmtssource.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmtssource.js index 5f27f52ab9..cd8ecef9ec 100644 --- a/src/ol/source/wmtssource.js +++ b/src/ol/source/wmtssource.js @@ -153,7 +153,7 @@ ol.source.WMTS = function(options) { } var x = tileCoord[1]; var y = -tileCoord[2] - 1; - var tileExtent = tileGrid.getTileCoordExtent(tileCoord); + var tileExtent = tileGrid.getTileCoordExtent(tileCoord, tmpExtent); var extent = projection.getExtent(); if (!goog.isNull(extent) && projection.isGlobal()) {