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

Merged in filnet/librepilot/LP-363_opmap_version_upgrade (pull request #287)

Browse Source 
Lp 363_opmap_version_upgrade
This commit is contained in:
Alessio Morale 2016-07-21 19:54:16 +02:00
commit 282881ba74
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/gcs/src/libs/opmapcontrol/src/core/opmaps.cpp
View File

@ -183,6 +183,7 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
}
#ifdef DEBUG_GMAPS
qDebug() << "Timeout is " << Timeout;
qDebug() << "Get " << qheader.url();
#endif // DEBUG_GMAPS
reply = network.get(qheader);
#ifdef DEBUG_GMAPS
@ -199,7 +200,7 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
#endif // DEBUG_GMAPS
// If you are seeing Error 6 here you are dealing with a QT SSL Bug!!!
if ((reply->error() != QNetworkReply::NoError) | (time.elapsed() > Timeout * 6)) {
qDebug() << "reply error: " << reply->error() << " see table at - http://doc.qt.io/qt-5/qnetworkreply.html";
qWarning() << "Reply error: " << reply->errorString() << qheader.url();
return ret;
}
ret = reply->readAll();

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

@ -42,7 +42,7 @@ ProviderStrings::ProviderStrings()
// Google version strings
VersionGoogleMap = "m@301";
QString version = qgetenv("GCS_GOOGLE_SAT_VERSION").constData();
VersionGoogleSatellite = version.isEmpty() ? "193" : version;
VersionGoogleSatellite = version.isEmpty() ? "694" : version;
VersionGoogleLabels = "h@301";
VersionGoogleTerrain = "t@132,r@301";
SecGoogleWord = "Galileo";