From a71714e8b6c28054dd6394e3af40f7283a451754 Mon Sep 17 00:00:00 2001
From: Antoine Abt <antoine@abt.im>
Date: Mon, 21 Jul 2014 13:49:17 +0200
Subject: [PATCH] Allow string & object to be passed as map logo

---
 src/ol/map.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/ol/map.js b/src/ol/map.js
index 0bdf3f0f5d..9e3841d942 100644
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -1415,6 +1415,15 @@ ol.Map.createOptionsInternal = function(options) {
   if (!goog.isDef(options.logo) ||
       (goog.isBoolean(options.logo) && options.logo)) {
     logos[ol.OL3_LOGO_URL] = ol.OL3_URL;
+  } else {
+    var logo = options.logo;
+    if (goog.isString(logo)) {
+      logos[logo] = '';
+    } else if (goog.isObject(logo)) {
+      goog.asserts.assertString(logo.href);
+      goog.asserts.assertString(logo.src);
+      logos[logo.src] = logo.href;
+    }
   }
 
   var layerGroup = (options.layers instanceof ol.layer.Group) ?