Merge branch 'master' of github.com:openlayers/ol3

2012-06-22 08:09:59 -04:00
parent fdfeaa3c44 cf3da75d83
commit 5e3b18ae84
7 changed files with 251 additions and 222 deletions
@@ -17,10 +17,6 @@ ol.geom.Geometry = function() {
    this.bounds_ = undefined;
 };

-
-
-
-
 /**
 * @return {ol.Bounds|undefined} The ol.Bounds.
 */
@@ -36,17 +32,3 @@ ol.geom.Geometry.prototype.setBounds = function(bounds) {
    this.bounds_ = bounds;
    return this;
 };
-
-/**
- * @export
- * @param {ol.Bounds=} opt_arg new Bounds.
- * @return {ol.geom.Geometry|ol.Bounds|undefined} either a Geometry (when used as 
- *     setter) or a Bounds/undefined (if used as getter).
- */
-ol.geom.Geometry.prototype.bounds = function(opt_arg){
-    if (arguments.length == 1 && goog.isDef(opt_arg)) {
-        return this.setBounds(opt_arg);
-    } else {
-        return this.getBounds();
-    }
-};