From defffdada8ca983af88296846e369c0fe0d251a7 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Tue, 10 Jul 2012 16:56:28 +0200
Subject: [PATCH] Allow optional initial values to be passed to ol.Object

---
 src/ol/object.js      | 6 +++++-
 src/ol/object_test.js | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/ol/object.js b/src/ol/object.js
index c80c10ca18..98c96cebda 100644
--- a/src/ol/object.js
+++ b/src/ol/object.js
@@ -32,9 +32,13 @@ ol.ObjectProperty = {
 /**
  * @constructor
  * @extends {goog.events.EventTarget}
+ * @param {Object.<string, *>=} opt_values Values.
  */
-ol.Object = function() {
+ol.Object = function(opt_values) {
   goog.base(this);
+  if (goog.isDef(opt_values)) {
+    this.setValues(opt_values);
+  }
 };
 goog.inherits(ol.Object, goog.events.EventTarget);
 
diff --git a/src/ol/object_test.js b/src/ol/object_test.js
index 680bdc4c4f..65e02fcbaf 100644
--- a/src/ol/object_test.js
+++ b/src/ol/object_test.js
@@ -448,3 +448,9 @@ function testCreateFromObject() {
   var obj2 = ol.Object.create(obj1);
   assertTrue(obj2 === obj1);
 }
+
+
+function testCreateWithOptions() {
+  var obj = new ol.Object({k: 1});
+  assertEquals(1, obj.get('k'));
+}