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

Merge pull request #2528 from fredj/wmts-source-optim

Browse Source 
ol.source.WMTS optimization
This commit is contained in:
Frédéric Junod
2014-08-18 11:24:41 +02:00
parent 9072fb1f2f b484801e4f
commit c7bf94e69b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/source/wmtssource.js
View File

@@ -6,12 +6,12 @@ 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.TileCoord');
goog.require('ol.TileUrlFunction'); goog.require('ol.TileUrlFunction');
goog.require('ol.TileUrlFunctionType'); goog.require('ol.TileUrlFunctionType');
goog.require('ol.extent'); goog.require('ol.extent');
goog.require('ol.proj'); goog.require('ol.proj');
goog.require('ol.source.TileImage'); goog.require('ol.source.TileImage');
goog.require('ol.tilecoord');
goog.require('ol.tilegrid.WMTS'); goog.require('ol.tilegrid.WMTS');
@@ -153,7 +153,7 @@ ol.source.WMTS = function(options) {
} }
var x = tileCoord[1]; var x = tileCoord[1];
var y = -tileCoord[2] - 1; var y = -tileCoord[2] - 1;
var tileExtent = tileGrid.getTileCoordExtent(tileCoord); var tileExtent = tileGrid.getTileCoordExtent(tileCoord, tmpExtent);
var extent = projection.getExtent(); var extent = projection.getExtent();
if (!goog.isNull(extent) && projection.isGlobal()) { if (!goog.isNull(extent) && projection.isGlobal()) {
@@ -170,7 +170,7 @@ ol.source.WMTS = function(options) {
ol.extent.touches(tileExtent, extent)) { ol.extent.touches(tileExtent, extent)) {
return null; return null;
} }
return [tileCoord[0], x, y]; return ol.tilecoord.createOrUpdate(tileCoord[0], x, y, opt_tileCoord);
}, },
tileUrlFunction); tileUrlFunction);