diff --git a/src/QtLocationPlugin/QGCMapEngine.cpp b/src/QtLocationPlugin/QGCMapEngine.cpp index 19d3129c7ac4c1fed34e2a0c00adade03450f81a..ae3858c1a21cdf9947b28690442f5b82d9b0ae57 100644 --- a/src/QtLocationPlugin/QGCMapEngine.cpp +++ b/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}, diff --git a/src/Settings/FlightMapSettings.cc b/src/Settings/FlightMapSettings.cc index d18f840fb7f9582c05700a7aa9093dc587ada713..7f3277ea3831c54f1b57382008f46f7f95ceddec 100644 --- a/src/Settings/FlightMapSettings.cc +++ b/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);