mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-03-15 07:29:15 +01:00
Merged in filnet/librepilot/LP-363_opmap_version_upgrade (pull request #287)
Lp 363_opmap_version_upgrade
This commit is contained in:
commit
282881ba74
@ -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();
|
||||
|
@ -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";
|
||||
|
Loading…
x
Reference in New Issue
Block a user