Merge pull request #729 from mavlink/gmaps

Google Maps fix

libs/opmapcontrol/src/core/urlfactory.h

@@ -61,6 +61,7 @@ namespace core {
         Placemark GetPlacemarkFromGeocoder(internals::PointLatLng location);
         int Timeout;
     private:
+        int Random(int low, int high);
         void GetSecGoogleWords(const core::Point &pos,  QString &sec1, QString &sec2);
         int GetServerNum(const core::Point &pos,const int &max) const;
         void TryCorrectGoogleVersions();

src/ui/map/QGCMapWidget.h

@@ -6,8 +6,8 @@
 #include "../../../libs/opmapcontrol/opmapcontrol.h"
 
 // Choose one default map type
-#define MAP_DEFAULT_TYPE_BING
-//#define MAP_DEFAULT_TYPE_GOOGLE
+//#define MAP_DEFAULT_TYPE_BING
+#define MAP_DEFAULT_TYPE_GOOGLE
 //#define MAP_DEFAULT_TYPE_OSM
 
 class UASInterface;