From b71bf9607c2081eb835edad54436469278a3c731 Mon Sep 17 00:00:00 2001 From: ahocevar Date: Mon, 17 Jun 2013 16:46:47 +0200 Subject: [PATCH] Do not set center constraint This change slipped in accidently. Thanks @twpayne for catching this. --- src/objectliterals.jsdoc | 2 -- src/ol/view2d.js | 12 +----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index cf8dad720b..cc20492def 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -89,8 +89,6 @@ * Object literal with config options for the view. * @typedef {Object} ol.View2DOptions * @property {ol.Coordinate|undefined} center The view center in map projection. - * @property {ol.Extent|undefined} maxExtent The maximum extent for the view. - * If configured, the view's center cannot be outside this extent. * @property {number|undefined} maxResolution The maximum resolution in map * units per pixel. * @property {number|undefined} maxZoom The maximum zoom level for this view. diff --git a/src/ol/view2d.js b/src/ol/view2d.js index b807da9ad4..68730a4dfe 100644 --- a/src/ol/view2d.js +++ b/src/ol/view2d.js @@ -4,7 +4,6 @@ goog.provide('ol.View2D'); goog.provide('ol.View2DProperty'); goog.require('goog.asserts'); -goog.require('goog.math'); goog.require('ol.Constraints'); goog.require('ol.IView2D'); goog.require('ol.IView3D'); @@ -60,12 +59,6 @@ ol.View2D = function(opt_options) { values[ol.View2DProperty.PROJECTION] = ol.proj.createProjection( options.projection, 'EPSG:3857'); - /** - * @private - * @type {ol.Extent} - */ - this.maxExtent_ = goog.isDef(options.maxExtent) ? options.maxExtent : null; - var parts = ol.View2D.createResolutionConstraint_(options); /** @@ -359,10 +352,7 @@ ol.View2D.prototype.isDef = function() { * @param {ol.Coordinate|undefined} center Center. */ ol.View2D.prototype.setCenter = function(center) { - this.set(ol.View2DProperty.CENTER, goog.isNull(this.maxExtent_) ? center : [ - goog.math.clamp(center[0], this.maxExtent_[0], this.maxExtent_[1]), - goog.math.clamp(center[1], this.maxExtent_[2], this.maxExtent_[3]) - ]); + this.set(ol.View2DProperty.CENTER, center); }; goog.exportProperty( ol.View2D.prototype,