From f435bb18743f403e32dbf1c549a67ac6b01d722d Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 19 Jun 2012 13:00:24 +0200
Subject: [PATCH 1/3] Bounds fixes.

---
 src/api/bounds.js | 7 +------
 src/ol/Bounds.js  | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/api/bounds.js b/src/api/bounds.js
index 4b520fa390..129035c86a 100644
--- a/src/api/bounds.js
+++ b/src/api/bounds.js
@@ -44,12 +44,7 @@ ol.bounds = function(opt_arg){
         throw new Error('ol.bounds');
     }
 
-    var bounds = new ol.Bounds();
-    bounds.setMinX(minX);
-    bounds.setMinY(minY);
-    bounds.setMaxX(maxX);
-    bounds.setMaxY(maxY);
-    bounds.setProjection(projection);
+    var bounds = new ol.Bounds(minX, minY, maxX, maxY, projection);
     return bounds;
 
 };
diff --git a/src/ol/Bounds.js b/src/ol/Bounds.js
index 0b8e99179e..0b9d7ddf9d 100644
--- a/src/ol/Bounds.js
+++ b/src/ol/Bounds.js
@@ -30,13 +30,13 @@ ol.Bounds = function(minX, minY, maxX, maxY, opt_projection) {
      * @private
      * @type {number}
      */
-    this.minX_ = minX;
+    this.maxX_ = maxX;
 
     /**
      * @private
      * @type {number}
      */
-    this.minY_ = minY;
+    this.maxY_ = maxY;
 
     /**
      * @private

From 7358529c4ee76486c989b2a285c49dde8cd7b90f Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 19 Jun 2012 13:08:50 +0200
Subject: [PATCH 2/3] Map fixes.

---
 src/api/map.js           | 46 +++++++++++++++++++++++++---------------
 src/ol/Map.js            |  6 +++---
 test/spec/ol/Map.test.js |  4 ++--
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/api/map.js b/src/api/map.js
index 31ed31f877..fa8d967551 100644
--- a/src/api/map.js
+++ b/src/api/map.js
@@ -19,31 +19,31 @@ ol.MapLike;
  */
 ol.map = function(opt_arg){
 
-    /** @type {ol.Loc|undefined} */
     var center;
     var target;
+    var zoom;
     
     if (arguments.length == 1) {
         if (opt_arg instanceof ol.Map) {
             return opt_arg;
         }
-        else 
-            if (goog.isObject(opt_arg)) {
-                var config = opt_arg;
-                if (goog.isDef(config.center)) {
-                    center = ol.loc(config.center);
-                }
-                if (goog.isDef(config.target)) {
-                    target = config.target;
-                }
-            }
-            else {
-                throw new Error('ol.map');
-            }
+        else if (goog.isObject(opt_arg)) {
+            center = opt_arg['center'];
+            target = opt_arg['target'];
+            zoom = opt_arg['zoom'];
+        }
+        else {
+            throw new Error('ol.map');
+        }
     }
     
     var map = new ol.Map();
-    
+    if (goog.isDef(center)) {
+        map.setCenter(ol.loc(center));
+    }
+    if (goog.isDef(zoom)) {
+        map.setZoom(zoom);
+    }
     return map;
     
 };
@@ -62,7 +62,7 @@ ol.Map.prototype.center = function(opt_arg) {
 
 /**
  * @param {ol.ProjectionLike=} opt_arg
- * @returns {ol.Map|ol.Loc|undefined}
+ * @returns {ol.Map|ol.Projection|undefined}
  */
 ol.Map.prototype.projection = function(opt_arg) {
     if (arguments.length == 1 && goog.isDef(opt_arg)) {
@@ -74,7 +74,7 @@ ol.Map.prototype.projection = function(opt_arg) {
 
 /**
  * @param {ol.ProjectionLike=} opt_arg
- * @returns {ol.Map|ol.Loc|undefined}
+ * @returns {ol.Map|ol.Projection|undefined}
  */
 ol.Map.prototype.userProjection = function(opt_arg) {
     if (arguments.length == 1 && goog.isDef(opt_arg)) {
@@ -83,3 +83,15 @@ ol.Map.prototype.userProjection = function(opt_arg) {
         return this.getUserProjection();
     }
 };
+
+/**
+ * @param {number=} opt_arg
+ * @returns {ol.Map|number|undefined} Map center.
+ */
+ol.Map.prototype.zoom = function(opt_arg) {
+    if (arguments.length == 1 && goog.isDef(opt_arg)) {
+        return this.setZoom(opt_arg);
+    } else {
+        return this.getZoom();
+    }
+};
diff --git a/src/ol/Map.js b/src/ol/Map.js
index d480d46033..af1a9cf6e3 100644
--- a/src/ol/Map.js
+++ b/src/ol/Map.js
@@ -14,13 +14,13 @@ ol.Map = function() {
      * @private
      * @type {ol.Projection}
      */
-    this.projection_ = new ol.Projection();
+    this.projection_ = new ol.Projection('EPSG:900913');
 
     /**
      * @private
      * @type {ol.Projection}
      */
-    this.userProjection_ = new ol.Projection();
+    this.userProjection_ = new ol.Projection('EPSG:4326');
 
     /**
      * @private
@@ -93,7 +93,7 @@ ol.Map.prototype.setProjection = function(projection) {
  * @param {ol.Projection} userProjection User projection.
  * @return {ol.Map} This.
  */
-ol.Map.prototype.setProjection = function(userProjection) {
+ol.Map.prototype.setUserProjection = function(userProjection) {
     this.userProjection_ = userProjection;
     return this;
 };
diff --git a/test/spec/ol/Map.test.js b/test/spec/ol/Map.test.js
index 7e93171d65..15b6105cf0 100644
--- a/test/spec/ol/Map.test.js
+++ b/test/spec/ol/Map.test.js
@@ -63,8 +63,8 @@ describe("ol.Map", function() {
 
         center = map.center();
         zoom = map.zoom();
-        expect(center.x().toFixed(3)).toBe("4.000");
-        expect(center.y().toFixed(3)).toBe("5.000");
+        expect(center.x().toFixed(3)).toBe("1.000");
+        expect(center.y().toFixed(3)).toBe("2.000");
         expect(zoom).toBe(6);
         
     });

From 116c26422ed1cf3c6915186099613de61248ef33 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 19 Jun 2012 13:09:07 +0200
Subject: [PATCH 3/3] Loc fixes.

---
 src/api/loc.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/api/loc.js b/src/api/loc.js
index 18da81d568..3afe6d6cd2 100644
--- a/src/api/loc.js
+++ b/src/api/loc.js
@@ -47,11 +47,7 @@ ol.loc = function(opt_arg){
         projection = ol.projection(projection);
     }
     
-    var loc = new ol.Loc();
-    loc.setX(x);
-    loc.setY(y);
-    loc.setZ(z);
-    loc.setProjection(projection);
+    var loc = new ol.Loc(x, y, z, projection);
     return loc;
     
 };