From af4b8ccea1ad91e6657a56e001f2d0f3a6d08a04 Mon Sep 17 00:00:00 2001
From: David Goodman <dagoodma@gmail.com>
Date: Thu, 29 Aug 2013 16:22:31 -0700
Subject: [PATCH] Default map type checked and defined in QGCMapWidget.h.

---
 src/ui/map/QGCMapToolBar.cc | 11 ++++++++++-
 src/ui/map/QGCMapWidget.cc  |  6 ++++++
 src/ui/map/QGCMapWidget.h   |  5 +++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/ui/map/QGCMapToolBar.cc b/src/ui/map/QGCMapToolBar.cc
index 067544bcd..c9596efaf 100644
--- a/src/ui/map/QGCMapToolBar.cc
+++ b/src/ui/map/QGCMapToolBar.cc
@@ -60,18 +60,27 @@ void QGCMapToolBar::setMap(QGCMapWidget* map)
         action =  mapTypesMenu.addAction(tr("Bing Hybrid"),this,SLOT(setMapType()));
         action->setData(MapType::BingHybrid);
         action->setCheckable(true);
+#ifdef MAP_DEFAULT_TYPE_BING
+        action->setChecked(true);
+#endif
         mapTypesGroup->addAction(action);
 
         action =  mapTypesMenu.addAction(tr("Google Hybrid"),this,SLOT(setMapType()));
         action->setData(MapType::GoogleHybrid);
         action->setCheckable(true);
+#ifdef MAP_DEFAULT_TYPE_GOOGLE
+        action->setChecked(true);
+#endif
         mapTypesGroup->addAction(action);
 
         action =  mapTypesMenu.addAction(tr("OpenStreetMap"),this,SLOT(setMapType()));
         action->setData(MapType::OpenStreetMap);
         action->setCheckable(true);
+#ifdef MAP_DEFAULT_TYPE_OSM
+        action->setChecked(true);
+#endif
         mapTypesGroup->addAction(action);
-        //TODO check current item
+
         optionsMenu.addMenu(&mapTypesMenu);
 
 
diff --git a/src/ui/map/QGCMapWidget.cc b/src/ui/map/QGCMapWidget.cc
index 748d1c2df..8e2e82165 100644
--- a/src/ui/map/QGCMapWidget.cc
+++ b/src/ui/map/QGCMapWidget.cc
@@ -34,7 +34,13 @@ QGCMapWidget::QGCMapWidget(QWidget *parent) :
     //this->SetShowTileGridLines(true);
 
     //default appears to be Google Hybrid, and is broken currently
+#if defined MAP_DEFAULT_TYPE_BING
     this->SetMapType(MapType::BingHybrid);
+#elif defined MAP_DEFAULT_TYPE_GOOGLE
+    this->SetMapType(MapType::GoogleHybrid);
+#else
+    this->SetMapType(MapType::OpenStreetMap);
+#endif
 
     this->setContextMenuPolicy(Qt::ActionsContextMenu);
 
diff --git a/src/ui/map/QGCMapWidget.h b/src/ui/map/QGCMapWidget.h
index 8657ede17..2f169a9ef 100644
--- a/src/ui/map/QGCMapWidget.h
+++ b/src/ui/map/QGCMapWidget.h
@@ -5,6 +5,11 @@
 #include <QTimer>
 #include "../../../libs/opmapcontrol/opmapcontrol.h"
 
+// Choose one default map type
+#define MAP_DEFAULT_TYPE_BING
+//#define MAP_DEFAULT_TYPE_GOOGLE
+//#define MAP_DEFAULT_TYPE_OSM
+
 class UASInterface;
 class UASWaypointManager;
 class Waypoint;
-- 
2.22.0