diff --git a/src/ol/ellipsoid/ellipsoid.js b/src/ol/ellipsoid/ellipsoid.js index 775d1d6fab..88ef01335f 100644 --- a/src/ol/ellipsoid/ellipsoid.js +++ b/src/ol/ellipsoid/ellipsoid.js @@ -13,20 +13,35 @@ goog.require('ol.Coordinate'); ol.Ellipsoid = function(a, flattening) { /** + * @const * @type {number} */ this.a = a; /** + * @const * @type {number} */ this.flattening = flattening; /** + * @const * @type {number} */ this.b = this.a * (1 - this.flattening); + /** + * @const + * @type {number} + */ + this.eSquared = 2 * flattening - flattening * flattening; + + /** + * @const + * @type {number} + */ + this.e = Math.sqrt(this.eSquared); + }; diff --git a/src/ol/proj/epsg3857projection.js b/src/ol/proj/epsg3857projection.js index 25a0f036b6..f9b8ad3c53 100644 --- a/src/ol/proj/epsg3857projection.js +++ b/src/ol/proj/epsg3857projection.js @@ -140,7 +140,6 @@ ol.proj.EPSG3857.toEPSG4326 = function(input, opt_output, opt_dimension) { /** * @inheritDoc */ -ol.proj.EPSG3857.prototype.getPointResolution = - function(resolution, point) { +ol.proj.EPSG3857.prototype.getPointResolution = function(resolution, point) { return resolution / ol.math.cosh(point[1] / ol.proj.EPSG3857.RADIUS); }; diff --git a/src/ol/proj/proj.js b/src/ol/proj/proj.js index c35453a2f9..0224674607 100644 --- a/src/ol/proj/proj.js +++ b/src/ol/proj/proj.js @@ -87,8 +87,7 @@ ol.Projection = function(options) { * @private * @type {boolean} */ - this.global_ = goog.isDef(options.global) ? - options.global : false; + this.global_ = goog.isDef(options.global) ? options.global : false; /** * @private