rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-02 19:29:15 +01:00
Code Issues Releases Activity

LP-470 bump google sat version from 694 to 711

Browse Source 
also make sure to use the GCS_GOOGLE_SAT_VERSION env value only if higher to default
This commit is contained in:
Philippe Renon 2017-01-11 09:17:52 +01:00
parent cf1b64966e
commit 83df6c0d36
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp
View File

@ -41,8 +41,9 @@ ProviderStrings::ProviderStrings()
{ {
// Google version strings // Google version strings
VersionGoogleMap = "m@301"; VersionGoogleMap = "m@301";
QString version = qgetenv("GCS_GOOGLE_SAT_VERSION").constData(); QString version = "711";
VersionGoogleSatellite = version.isEmpty() ? "694" : version; QString envVersion = qgetenv("GCS_GOOGLE_SAT_VERSION").constData();
VersionGoogleSatellite = (envVersion.toInt() > version.toInt()) ? envVersion : version;
VersionGoogleLabels = "h@301"; VersionGoogleLabels = "h@301";
VersionGoogleTerrain = "t@132,r@301"; VersionGoogleTerrain = "t@132,r@301";
SecGoogleWord = "Galileo"; SecGoogleWord = "Galileo";