From 015aab8af34a6a1c57aa3e659b12dceeaa712315 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Fri, 2 May 2014 10:13:28 -0600 Subject: [PATCH] Rename ol.extent.transform to ol.extent.applyTransform This gives more consistency with ol.proj.applyTransform, allowing us to add a more convenient ol.extent.transform method that takes projection-like arguments. --- src/ol/extent.js | 6 ++++-- src/ol/source/bingmapssource.js | 3 ++- src/ol/source/tilejsonsource.js | 2 +- test/spec/ol/extent.test.js | 8 +++++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/ol/extent.js b/src/ol/extent.js index 3e85f5a04e..fc3ec13806 100644 --- a/src/ol/extent.js +++ b/src/ol/extent.js @@ -714,13 +714,15 @@ ol.extent.touches = function(extent1, extent2) { /** + * Apply a transform function to the extent. * @param {ol.Extent} extent Extent. - * @param {ol.TransformFunction} transformFn Transform function. + * @param {ol.TransformFunction} transformFn Transform function. Called with + * [minX, minY, maxX, maxY] extent coordinates. * @param {ol.Extent=} opt_extent Destination extent. * @return {ol.Extent} Extent. * @todo api */ -ol.extent.transform = function(extent, transformFn, opt_extent) { +ol.extent.applyTransform = function(extent, transformFn, opt_extent) { var coordinates = [ extent[0], extent[1], extent[0], extent[3], diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmapssource.js index 457eb1a489..f2aee053fd 100644 --- a/src/ol/source/bingmapssource.js +++ b/src/ol/source/bingmapssource.js @@ -139,7 +139,8 @@ ol.source.BingMaps.prototype.handleImageryMetadataResponse = var maxZ = coverageArea.zoomMax; var bbox = coverageArea.bbox; var epsg4326Extent = [bbox[1], bbox[0], bbox[3], bbox[2]]; - var extent = ol.extent.transform(epsg4326Extent, transform); + var extent = ol.extent.applyTransform( + epsg4326Extent, transform); var tileRange, z, zKey; for (z = minZ; z <= maxZ; ++z) { zKey = z.toString(); diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejsonsource.js index 0cfd14c546..ffbda97f91 100644 --- a/src/ol/source/tilejsonsource.js +++ b/src/ol/source/tilejsonsource.js @@ -55,7 +55,7 @@ ol.source.TileJSON.prototype.handleTileJSONResponse = function(tileJSON) { if (goog.isDef(tileJSON.bounds)) { var transform = ol.proj.getTransformFromProjections( epsg4326Projection, this.getProjection()); - extent = ol.extent.transform(tileJSON.bounds, transform); + extent = ol.extent.applyTransform(tileJSON.bounds, transform); this.setExtent(extent); } diff --git a/test/spec/ol/extent.test.js b/test/spec/ol/extent.test.js index 23a21ea675..0be6ffa937 100644 --- a/test/spec/ol/extent.test.js +++ b/test/spec/ol/extent.test.js @@ -425,12 +425,13 @@ describe('ol.extent', function() { }); - describe('transform', function() { + describe('#applyTransform()', function() { it('does transform', function() { var transformFn = ol.proj.getTransform('EPSG:4326', 'EPSG:3857'); var sourceExtent = [-15, -30, 45, 60]; - var destinationExtent = ol.extent.transform(sourceExtent, transformFn); + var destinationExtent = ol.extent.applyTransform( + sourceExtent, transformFn); expect(destinationExtent).not.to.be(undefined); expect(destinationExtent).not.to.be(null); // FIXME check values with third-party tool @@ -456,7 +457,8 @@ describe('ol.extent', function() { return output; }; var sourceExtent = [-15, -30, 45, 60]; - var destinationExtent = ol.extent.transform(sourceExtent, transformFn); + var destinationExtent = ol.extent.applyTransform( + sourceExtent, transformFn); expect(destinationExtent).not.to.be(undefined); expect(destinationExtent).not.to.be(null); expect(destinationExtent[0]).to.be(-45);