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

Port ol.source.WMTS to new extents

Browse Source
This commit is contained in:
Tom Payne
2013-04-16 16:22:45 +02:00
parent 10354cf607
commit 9708fb4ea6
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/source/wmtssource.js
+6 -7
View File
@@ -6,10 +6,10 @@ 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');
goog.require('ol.extent');
goog.require('ol.projection'); goog.require('ol.projection');
goog.require('ol.source.ImageTileSource'); goog.require('ol.source.ImageTileSource');
goog.require('ol.tilegrid.WMTS'); goog.require('ol.tilegrid.WMTS');
@@ -114,7 +114,7 @@ ol.source.WMTS = function(options) {
})); }));
} }
var tmpExtent = new ol.Extent(0, 0, 0, 0); var tmpExtent = ol.extent.createEmptyExtent();
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) {
@@ -131,18 +131,17 @@ ol.source.WMTS = function(options) {
options.extent : projectionExtent; options.extent : projectionExtent;
if (!goog.isNull(extent) && projection.isGlobal() && if (!goog.isNull(extent) && projection.isGlobal() &&
extent.minX === projectionExtent.minX && extent[0] === projectionExtent[0] &&
extent.maxX === projectionExtent.maxX) { extent[1] === projectionExtent[1]) {
var numCols = Math.ceil( var numCols = Math.ceil(
(extent.maxX - extent.minX) / (extent[1] - extent[0]) / (tileExtent[1] - tileExtent[0]));
(tileExtent.maxX - tileExtent.minX));
x = goog.math.modulo(x, numCols); x = goog.math.modulo(x, numCols);
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, tmpExtent); tileExtent = tileGrid.getTileCoordExtent(tmpTileCoord, tmpExtent);
} }
if (!tileExtent.intersects(extent)) { if (!ol.extent.intersects(tileExtent, extent)) {
return null; return null;
} }
return new ol.TileCoord(tileCoord.z, x, y); return new ol.TileCoord(tileCoord.z, x, y);