Merged in f5soh/librepilot/LP-470_sat_version (pull request #516)

f5soh · f5soh · commit a2c529079a85 · 2018-09-29T10:00:57.000Z
LP-470 Bump map version

Approved-by: Lalanne Laurent &lt;f5soh@free.fr&gt;
diff --git a/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp b/ground/gcs/src/libs/opmapcontrol/src/core/providerstrings.cpp
@@ -41,7 +41,7 @@ ProviderStrings::ProviderStrings()
 {
     // Google version strings
     VersionGoogleMap = "m@301";
-    QString version    = "794";
+    QString version    = "810";
     QString envVersion = qgetenv("GCS_GOOGLE_SAT_VERSION").constData();
     VersionGoogleSatellite = (envVersion.toInt() > version.toInt()) ? envVersion : version;
     VersionGoogleLabels    = "h@301";

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ ProviderStrings::ProviderStrings()`
`41`	`41`	`{`
`42`	`42`	`// Google version strings`
`43`	`43`	`VersionGoogleMap = "m@301";`
`44`		`- QString version = "794";`
	`44`	`+ QString version = "810";`
`45`	`45`	`QString envVersion = qgetenv("GCS_GOOGLE_SAT_VERSION").constData();`
`46`	`46`	`VersionGoogleSatellite = (envVersion.toInt() > version.toInt()) ? envVersion : version;`
`47`	`47`	`VersionGoogleLabels = "h@301";`