From 83df6c0d36a8129ce54ea72fe29a2aac93322628 Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Wed, 11 Jan 2017 09:17:52 +0100 Subject: [PATCH] LP-470 bump google sat version from 694 to 711 also make sure to use the GCS_GOOGLE_SAT_VERSION env value only if higher to default --- .../gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp b/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp index 73a357560..e5440ce99 100644 --- a/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp +++ b/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp @@ -40,9 +40,10 @@ const QString ProviderStrings::levelsForSigPacSpainMap[] = { ProviderStrings::ProviderStrings() { // Google version strings - VersionGoogleMap = "m@301"; - QString version = qgetenv("GCS_GOOGLE_SAT_VERSION").constData(); - VersionGoogleSatellite = version.isEmpty() ? "694" : version; + VersionGoogleMap = "m@301"; + QString version = "711"; + QString envVersion = qgetenv("GCS_GOOGLE_SAT_VERSION").constData(); + VersionGoogleSatellite = (envVersion.toInt() > version.toInt()) ? envVersion : version; VersionGoogleLabels = "h@301"; VersionGoogleTerrain = "t@132,r@301"; SecGoogleWord = "Galileo";