the API user does not know about UnreferencedBounds, and remove getResForZoom and getMaxRes from the map API

This commit is contained in:
Éric Lemoine
2012-06-22 12:34:15 +02:00
parent 1d114b4630
commit 2d50a35850
3 changed files with 27 additions and 96 deletions
+1 -23
View File
@@ -221,7 +221,7 @@ ol.Map.prototype.controls = function(opt_arg) {
/**
* @export
* @param {Array=} opt_arg
* @returns {ol.Map|ol.UnreferencedBounds|undefined} Map max extent.
* @returns {ol.Map|ol.Bounds|undefined} Map max extent.
*/
ol.Map.prototype.maxExtent = function(opt_arg) {
if (arguments.length == 1 && goog.isDef(opt_arg)) {
@@ -232,28 +232,6 @@ ol.Map.prototype.maxExtent = function(opt_arg) {
}
};
/**
* @export
* @param {number=} opt_arg
* @returns {ol.Map|number|undefined} Map maximum resolution
*/
ol.Map.prototype.maxRes = function(opt_arg) {
if (arguments.length == 1 && goog.isDef(opt_arg)) {
this.setMaxRes(opt_arg);
return this;
} else {
return this.getMaxRes();
}
};
/**
* @param {number} arg
* @returns {number} resolution for a given zoom level
*/
ol.Map.prototype.getResForZoom = function(arg) {
return this.getResolutionForZoom(arg);
};
/**
* @param {string|Element} arg Render the map to a container
* @returns {ol.Map}
+10 -4
View File
@@ -1,6 +1,7 @@
goog.provide('ol.Map');
goog.require('ol.Loc');
goog.require('ol.Bounds');
goog.require('ol.Projection');
goog.require('ol.event');
goog.require('ol.event.Events');
@@ -65,7 +66,7 @@ ol.Map = function() {
/**
* @private
* @type {ol.UnreferencedBounds}
* @type {ol.Bounds}
*/
this.maxExtent_ = null;
@@ -209,14 +210,19 @@ ol.Map.prototype.getControls = function() {
/**
* @return {ol.UnreferencedBounds} the maxExtent for the map
* @return {ol.Bounds} the maxExtent for the map
*/
ol.Map.prototype.getMaxExtent = function() {
if (goog.isDefAndNotNull(this.maxExtent_)) {
return this.maxExtent_;
} else {
var extent = this.getProjection().getExtent();
var projection = this.getProjection();
var extent = projection.getExtent();
if (goog.isDefAndNotNull(extent)) {
extent = new ol.Bounds(
extent.getMinX(), extent.getMinY(),
extent.getMaxX(), extent.getMaxY());
extent.setProjection(projection);
return extent;
} else {
throw('maxExtent must be defined either in the map or the projection');
@@ -332,7 +338,7 @@ ol.Map.prototype.setControls = function(opt_controls) {
};
/**
* @param {ol.UnreferencedBounds} extent the maxExtent for the map
* @param {ol.Bounds} extent the maxExtent for the map
*/
ol.Map.prototype.setMaxExtent = function(extent) {
this.maxExtent_ = extent;