hm/gcs-nf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b

Browse Source
This commit is contained in:
hm
2020-12-29 09:33:32 +08:00
parent 237fd25345
commit e87a82b255
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cockpit/Cockpit.cpp
+2 -2
View File
@@ -59,8 +59,8 @@ Cockpit::Cockpit(QWidget *parent): QWidget(parent)
m_Target.verticalspeed = 0;
m_Target.yaw = 0;
m_Target.airspeed_maximun = 1.3 * 340;
m_Target.airspeed_minimun = 95;
m_Target.airspeed_maximun = 40;
m_Target.airspeed_minimun = 20;
m_State.GPS = "GPS";
m_State.MODE = "MODE";
opmap/core/urlfactory.cpp
+31 -2
View File
@@ -191,14 +191,43 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
break;
case MapType::GoogleSatellite:
{
QString server = "khms";
QString server = QStringLiteral("khm");
QString request = QStringLiteral("kh");
QString sec1; // after &x=...
QString sec2; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions();
return QString(QStringLiteral("http://%1%2.google.com/%3/v=%4&x=%5%6&y=%7&z=%8&s=%9"))
.arg(server)
.arg(GetServerNum(pos, 4))
.arg(request)
.arg(VersionGoogleSatellite)
.arg(pos.X())
.arg(sec1)
.arg(pos.Y())
.arg(zoom)
.arg(sec2);
/*
QString server = "khm";
QString request = "kh";
QString sec1 = ""; // after &x=...
QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions();
return QString("http://%1%2.google.com/%3/v=%4?x=%5&y=%6&z=%7").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatellite).arg(pos.X()).arg(pos.Y()).arg(zoom);
return QString("http://%1%2.google.com/%3/v=%4?x=%5&y=%6&z=%7")
.arg(server)
.arg(GetServerNum(pos, 4))
.arg(request)
.arg(VersionGoogleSatellite)
.arg(pos.X())
.arg(pos.Y())
.arg(zoom);
//https://khms0.google.com/kh/v=865?x=15&y=5&z=4
*/
}
break;
case MapType::GoogleLabels: