diff --git a/ground/src/libs/opmapcontrol/src/core/providerstrings.cpp b/ground/src/libs/opmapcontrol/src/core/providerstrings.cpp index 7ad3d5f1f..8d1f63e30 100644 --- a/ground/src/libs/opmapcontrol/src/core/providerstrings.cpp +++ b/ground/src/libs/opmapcontrol/src/core/providerstrings.cpp @@ -38,19 +38,19 @@ namespace core { ProviderStrings::ProviderStrings() { // VersionGoogleMap = "m@132"; -// VersionGoogleSatellite = "69"; +// VersionGoogleSatellite = "71"; // VersionGoogleLabels = "h@132"; // VersionGoogleTerrain = "t@125,r@132"; // Google version strings VersionGoogleMap = "m@132"; - VersionGoogleSatellite = "69"; + VersionGoogleSatellite = "71"; VersionGoogleLabels = "h@132"; VersionGoogleTerrain = "t@125,r@132"; SecGoogleWord = "Galileo"; // Google (China) version strings VersionGoogleMapChina = "m@132"; - VersionGoogleSatelliteChina = "s@69"; + VersionGoogleSatelliteChina = "s@71"; VersionGoogleLabelsChina = "h@132"; VersionGoogleTerrainChina = "t@125,r@132"; @@ -71,11 +71,11 @@ namespace core { VersionYahooLabels = "4.3"; // BingMaps - VersionBingMaps = "517"; + VersionBingMaps = "563"; // YandexMap - VersionYandexMap = "2.15.0"; - //VersionYandexSatellite = "1.18.0"; + VersionYandexMap = "2.16.0"; + //VersionYandexSatellite = "1.19.0"; //////////////////// /// diff --git a/ground/src/libs/opmapcontrol/src/internals/core.cpp b/ground/src/libs/opmapcontrol/src/internals/core.cpp index 84199b691..39fc29a8d 100644 --- a/ground/src/libs/opmapcontrol/src/internals/core.cpp +++ b/ground/src/libs/opmapcontrol/src/internals/core.cpp @@ -219,7 +219,7 @@ namespace internals { } void Core::SetZoom(const int &value) { - if (zoom!=value && !isDragging) + if (!isDragging) { zoom=value; minOfTiles=Projection()->GetTileMatrixMinXY(value); diff --git a/ground/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp b/ground/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp index 9d59448c3..815aa86f3 100644 --- a/ground/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp +++ b/ground/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp @@ -73,7 +73,7 @@ namespace mapcontrol localposition=map->FromLatLngToLocal(coord); this->setPos(localposition.X(),localposition.Y()); if(showsafearea) - localsafearea=safearea/map->Projection()->GetGroundResolution(map->Zoom(),coord.Lat()); + localsafearea=safearea/map->Projection()->GetGroundResolution(map->ZoomTotal(),coord.Lat()); }