From cfe523410436859dbdb8b2e3a0bf91b55890c6e7 Mon Sep 17 00:00:00 2001
From: Tom Payne <twpayne@gmail.com>
Date: Fri, 5 Apr 2013 18:15:35 +0200
Subject: [PATCH] Add logo control by default

---
 src/objectliterals.exports | 2 ++
 src/ol/control/defaults.js | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/objectliterals.exports b/src/objectliterals.exports
index f2d96d7562..ce9a64c542 100644
--- a/src/objectliterals.exports
+++ b/src/objectliterals.exports
@@ -49,6 +49,8 @@
 @exportObjectLiteral ol.control.DefaultsOptions
 @exportObjectLiteralProperty ol.control.DefaultsOptions.attribution boolean|undefined
 @exportObjectLiteralProperty ol.control.DefaultsOptions.attributionOptions ol.control.AttributionOptions|undefined
+@exportObjectLiteralProperty ol.control.DefaultsOptions.logo boolean|undefined
+@exportObjectLiteralProperty ol.control.DefaultsOptions.logoOptions ol.control.LogoOptions|undefined
 @exportObjectLiteralProperty ol.control.DefaultsOptions.zoom boolean|undefined
 @exportObjectLiteralProperty ol.control.DefaultsOptions.zoomOptions ol.control.ZoomOptions|undefined
 
diff --git a/src/ol/control/defaults.js b/src/ol/control/defaults.js
index 90980c182b..95fa4d9f12 100644
--- a/src/ol/control/defaults.js
+++ b/src/ol/control/defaults.js
@@ -2,6 +2,7 @@ goog.provide('ol.control.defaults');
 
 goog.require('goog.array');
 goog.require('ol.control.Attribution');
+goog.require('ol.control.Logo');
 goog.require('ol.control.Zoom');
 
 
@@ -25,6 +26,14 @@ ol.control.defaults = function(opt_options, opt_controls) {
     controls.push(new ol.control.Attribution(attributionControlOptions));
   }
 
+  var logoControl = goog.isDef(options.logo) ?
+      options.logo : true;
+  if (logoControl) {
+    var logoControlOptions = goog.isDef(options.logoOptions) ?
+        options.logoOptions : undefined;
+    controls.push(new ol.control.Logo(logoControlOptions));
+  }
+
   var zoomControl = goog.isDef(options.zoom) ?
       options.zoom : true;
   if (zoomControl) {