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

Respect extent when requesting TileJSON tiles

Browse Source
This commit is contained in:
Tom Payne
2012-08-21 14:35:03 +02:00
parent 36b8cb7845
commit 7c77b6a88b
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/tile/tilejson.js
+13 -6
View File
@@ -105,16 +105,17 @@ ol.tilestore.TileJSON.prototype.handleTileJSONResponse = function() {
var epsg4326Projection = ol.Projection.getFromCode('EPSG:4326'); var epsg4326Projection = ol.Projection.getFromCode('EPSG:4326');
var epsg4326Extent; var epsg4326Extent, extent;
if (goog.isDef(tileJSON.bounds)) { if (goog.isDef(tileJSON.bounds)) {
var bounds = tileJSON.bounds; var bounds = tileJSON.bounds;
epsg4326Extent = new ol.Extent( epsg4326Extent = new ol.Extent(
bounds[0], bounds[1], bounds[2], bounds[3]); bounds[0], bounds[1], bounds[2], bounds[3]);
var transformedExtent = epsg4326Extent.transform( extent = epsg4326Extent.transform(
ol.Projection.getTransform(epsg4326Projection, this.getProjection())); ol.Projection.getTransform(epsg4326Projection, this.getProjection()));
this.setExtent(transformedExtent); this.setExtent(extent);
} else { } else {
epsg4326Extent = null; epsg4326Extent = null;
extent = null;
} }
var scheme = goog.isDef(tileJSON.scheme) || 'xyz'; var scheme = goog.isDef(tileJSON.scheme) || 'xyz';
@@ -136,10 +137,16 @@ ol.tilestore.TileJSON.prototype.handleTileJSONResponse = function() {
var y = -tileCoord.y - 1; var y = -tileCoord.y - 1;
if (y < 0 || n <= y) { if (y < 0 || n <= y) {
return null; return null;
} else {
var x = goog.math.modulo(tileCoord.x, n);
return new ol.TileCoord(tileCoord.z, x, y);
} }
var x = goog.math.modulo(tileCoord.x, n);
if (!goog.isNull(extent)) {
var tileExtent = tileGrid.getTileCoordExtent(
new ol.TileCoord(tileCoord.z, x, tileCoord.y));
if (!tileExtent.intersects(extent)) {
return null;
}
}
return new ol.TileCoord(tileCoord.z, x, y);
}, },
ol.TileUrlFunction.createFromTemplates(tileJSON.tiles)); ol.TileUrlFunction.createFromTemplates(tileJSON.tiles));