From f0c812482fadf7182f58749a66bd964141000b23 Mon Sep 17 00:00:00 2001 From: Tom Payne Date: Tue, 16 Apr 2013 16:21:05 +0200 Subject: [PATCH] Port ol.source.TileJSON to new extents --- src/ol/source/tilejsonsource.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index 5abf5b9104..41d39cdfd0 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -13,10 +13,10 @@ goog.require('goog.asserts'); goog.require('goog.math'); goog.require('goog.net.jsloader'); goog.require('ol.Attribution'); -goog.require('ol.Extent'); goog.require('ol.TileCoord'); goog.require('ol.TileRange'); goog.require('ol.TileUrlFunction'); +goog.require('ol.extent'); goog.require('ol.projection'); goog.require('ol.source.ImageTileSource'); goog.require('ol.tilegrid.XYZ'); @@ -80,10 +80,10 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function() { var epsg4326Extent, extent; if (goog.isDef(tileJSON.bounds)) { var bounds = tileJSON.bounds; - epsg4326Extent = new ol.Extent( - bounds[0], bounds[1], bounds[2], bounds[3]); - extent = epsg4326Extent.transform(ol.projection.getTransformFromProjections( - epsg4326Projection, this.getProjection())); + epsg4326Extent = [bounds[0], bounds[2], bounds[1], bounds[3]]; + var transform = ol.projection.getTransformFromProjections( + epsg4326Projection, this.getProjection()); + extent = ol.extent.transform(epsg4326Extent, transform); this.setExtent(extent); } else { epsg4326Extent = null; @@ -116,7 +116,7 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function() { if (!goog.isNull(extent)) { var tileExtent = tileGrid.getTileCoordExtent( new ol.TileCoord(tileCoord.z, x, tileCoord.y)); - if (!tileExtent.intersects(extent)) { + if (!ol.extent.intersects(tileExtent, extent)) { return null; } }