rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-17 02:52:12 +01:00
Code Issues Releases Activity

OP37/GCS MapLib - Update to new google maps versions. Fixes safe area size update with digital zooming.

Browse Source 
TODO: fix auto find google maps version.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1941 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota 2010-10-10 23:27:03 +00:00 committed by zedamota
parent ccdc107ad8
commit d64892069a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ground/src/libs/opmapcontrol/src/core/providerstrings.cpp
View File

@ -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";
////////////////////
/// <summary>

2
ground/src/libs/opmapcontrol/src/internals/core.cpp
View File

@ -219,7 +219,7 @@ namespace internals {
}
void Core::SetZoom(const int &value)
{
if (zoom!=value && !isDragging)
if (!isDragging)
{
zoom=value;
minOfTiles=Projection()->GetTileMatrixMinXY(value);

2
ground/src/libs/opmapcontrol/src/mapwidget/homeitem.cpp
View File

@ -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());
}