diff --git a/apidoc/index.md b/apidoc/index.md index a0a54cfae3..5ac6d8ccc9 100644 --- a/apidoc/index.md +++ b/apidoc/index.md @@ -30,7 +30,7 @@ Interactions for [vector features](ol.Feature.html)
[Formats](ol.format.Feature.html) for reading/writing vector data
[ol.format.WMSCapabilities](ol.format.WMSCapabilities.html) Projections2-way bindingsOther components -

All coordinates and extents need to be provided in view projection (default: [EPSG:3857](ol.proj.EPSG3857.html)). To transform, use [ol.proj.transform()](ol.proj.html#transform) and [ol.extent.applyTransform()](ol.extent.html#applyTransform).

+

All coordinates and extents need to be provided in view projection (default: EPSG:3857). To transform, use [ol.proj.transform()](ol.proj.html#transform) and [ol.extent.applyTransform()](ol.extent.html#applyTransform).

[ol.proj](ol.proj.html)

[Objects](ol.Object.html) can be kept in sync using the [bindTo()](ol.Object.html#bindTo) method.

A [DOM Input](ol.dom.Input.html) class is available to bind Object properties to HTML Input elements.

diff --git a/src/ol/proj/epsg3857projection.js b/src/ol/proj/epsg3857projection.js index 14c3c34e34..1baae0cd3f 100644 --- a/src/ol/proj/epsg3857projection.js +++ b/src/ol/proj/epsg3857projection.js @@ -16,9 +16,9 @@ goog.require('ol.proj.Units'); * @constructor * @extends {ol.proj.Projection} * @param {string} code Code. - * @api + * @private */ -ol.proj.EPSG3857 = function(code) { +ol.proj.EPSG3857_ = function(code) { goog.base(this, { code: code, units: ol.proj.Units.METERS, @@ -26,7 +26,15 @@ ol.proj.EPSG3857 = function(code) { global: true }); }; -goog.inherits(ol.proj.EPSG3857, ol.proj.Projection); +goog.inherits(ol.proj.EPSG3857_, ol.proj.Projection); + + +/** + * @inheritDoc + */ +ol.proj.EPSG3857_.prototype.getPointResolution = function(resolution, point) { + return resolution / ol.math.cosh(point[1] / ol.proj.EPSG3857.RADIUS); +}; /** @@ -77,7 +85,7 @@ ol.proj.EPSG3857.CODES = [ ol.proj.EPSG3857.PROJECTIONS = goog.array.map( ol.proj.EPSG3857.CODES, function(code) { - return new ol.proj.EPSG3857(code); + return new ol.proj.EPSG3857_(code); }); @@ -139,11 +147,3 @@ ol.proj.EPSG3857.toEPSG4326 = function(input, opt_output, opt_dimension) { } return output; }; - - -/** - * @inheritDoc - */ -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/epsg4326projection.js b/src/ol/proj/epsg4326projection.js index e34962b21e..a2f2c01008 100644 --- a/src/ol/proj/epsg4326projection.js +++ b/src/ol/proj/epsg4326projection.js @@ -18,9 +18,9 @@ goog.require('ol.proj.Units'); * @extends {ol.proj.Projection} * @param {string} code Code. * @param {string=} opt_axisOrientation Axis orientation. - * @api + * @private */ -ol.proj.EPSG4326 = function(code, opt_axisOrientation) { +ol.proj.EPSG4326_ = function(code, opt_axisOrientation) { goog.base(this, { code: code, units: ol.proj.Units.DEGREES, @@ -29,7 +29,15 @@ ol.proj.EPSG4326 = function(code, opt_axisOrientation) { global: true }); }; -goog.inherits(ol.proj.EPSG4326, ol.proj.Projection); +goog.inherits(ol.proj.EPSG4326_, ol.proj.Projection); + + +/** + * @inheritDoc + */ +ol.proj.EPSG4326_.prototype.getPointResolution = function(resolution, point) { + return resolution; +}; /** @@ -48,19 +56,11 @@ ol.proj.EPSG4326.EXTENT = [-180, -90, 180, 90]; * @type {Array.} */ ol.proj.EPSG4326.PROJECTIONS = [ - new ol.proj.EPSG4326('CRS:84'), - new ol.proj.EPSG4326('EPSG:4326', 'neu'), - new ol.proj.EPSG4326('urn:ogc:def:crs:EPSG:6.6:4326', 'neu'), - new ol.proj.EPSG4326('urn:ogc:def:crs:OGC:1.3:CRS84'), - new ol.proj.EPSG4326('urn:ogc:def:crs:OGC:2:84'), - new ol.proj.EPSG4326('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'), - new ol.proj.EPSG4326('urn:x-ogc:def:crs:EPSG:4326', 'neu') + new ol.proj.EPSG4326_('CRS:84'), + new ol.proj.EPSG4326_('EPSG:4326', 'neu'), + new ol.proj.EPSG4326_('urn:ogc:def:crs:EPSG:6.6:4326', 'neu'), + new ol.proj.EPSG4326_('urn:ogc:def:crs:OGC:1.3:CRS84'), + new ol.proj.EPSG4326_('urn:ogc:def:crs:OGC:2:84'), + new ol.proj.EPSG4326_('http://www.opengis.net/gml/srs/epsg.xml#4326', 'neu'), + new ol.proj.EPSG4326_('urn:x-ogc:def:crs:EPSG:4326', 'neu') ]; - - -/** - * @inheritDoc - */ -ol.proj.EPSG4326.prototype.getPointResolution = function(resolution, point) { - return resolution; -};