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

Merge pull request #1003 from fredj/extent

Browse Source 
Minor coding style and simplification for ol.Extent
This commit is contained in:
Frédéric Junod
2013-09-10 07:06:31 -07:00
parent b4c2cd0eb2 f1bce39fa9
commit 2e4ffb3591
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/extent.js
+9 -17
View File
@@ -44,15 +44,7 @@ ol.extent.boundingExtentXYs_ = function(xs, ys, opt_extent) {
var maxX = Math.max.apply(null, xs); var maxX = Math.max.apply(null, xs);
var minY = Math.min.apply(null, ys); var minY = Math.min.apply(null, ys);
var maxY = Math.max.apply(null, ys); var maxY = Math.max.apply(null, ys);
if (goog.isDef(opt_extent)) { return ol.extent.createOrUpdate(minX, maxX, minY, maxY, opt_extent);
opt_extent[0] = minX;
opt_extent[1] = maxX;
opt_extent[2] = minY;
opt_extent[3] = maxY;
return opt_extent;
} else {
return [minX, maxX, minY, maxY];
}
}; };
@@ -95,16 +87,16 @@ ol.extent.createEmpty = function() {
* @param {number} maxX Maximum X. * @param {number} maxX Maximum X.
* @param {number} minY Minimum Y. * @param {number} minY Minimum Y.
* @param {number} maxY Maximum Y. * @param {number} maxY Maximum Y.
* @param {ol.Extent|undefined} extent Extent. * @param {ol.Extent=} opt_extent Destination extent.
* @return {ol.Extent} Extent. * @return {ol.Extent} Extent.
*/ */
ol.extent.createOrUpdate = function(minX, maxX, minY, maxY, extent) { ol.extent.createOrUpdate = function(minX, maxX, minY, maxY, opt_extent) {
if (goog.isDef(extent)) { if (goog.isDef(opt_extent)) {
extent[0] = minX; opt_extent[0] = minX;
extent[1] = maxX; opt_extent[1] = maxX;
extent[2] = minY; opt_extent[2] = minY;
extent[3] = maxY; opt_extent[3] = maxY;
return extent; return opt_extent;
} else { } else {
return [minX, maxX, minY, maxY]; return [minX, maxX, minY, maxY];
} }