google map hybrid option

src/QtLocationPlugin/QGCMapEngine.cpp

@@ -50,6 +50,7 @@ static stQGeoTileCacheQGCMapTypes kMapTypes[] = {
     {"Google Street Map",       UrlFactory::GoogleMap},
     {"Google Satellite Map",    UrlFactory::GoogleSatellite},
     {"Google Terrain Map",      UrlFactory::GoogleTerrain},
+    {"Google Hybrid Map",       UrlFactory::GoogleHybrid},
 #endif
     {"Bing Street Map",         UrlFactory::BingMap},
     {"Bing Satellite Map",      UrlFactory::BingSatellite},

src/Settings/FlightMapSettings.cc

@@ -86,7 +86,7 @@ void FlightMapSettings::_newMapProvider(QVariant value)
         _removeEnumValue(mapTypeTerrain, enumStrings, enumValues);
         break;
     case mapProviderGoogle:
-        _removeEnumValue(mapTypeHybrid, enumStrings, enumValues);
+        //_removeEnumValue(mapTypeHybrid, enumStrings, enumValues);
         break;
     case mapProviderStarkart:
         _removeEnumValue(mapTypeStreet, enumStrings, enumValues);