Skip to content

Q
qgroundcontrol
Commit f576d9e0 authored by WillRam's avatar WillRam
Browse files
Options

whitespace

parent d043c24c
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 42 deletions
libs/opmapcontrol/src/core/urlfactory.cpp
View file @ f576d9e0
...@@ -54,24 +54,19 @@ namespace core { ...@@ -54,24 +54,19 @@ namespace core {
UrlFactory::~UrlFactory() UrlFactory::~UrlFactory()
{ {
} }
QString UrlFactory::TileXYToQuadKey(const int &tileX,const int &tileY,const int &levelOfDetail) const QString UrlFactory::TileXYToQuadKey(const int &tileX,const int &tileY,const int &levelOfDetail) const
{ {
QString quadKey; QString quadKey;
for(int i = levelOfDetail; i > 0; i--) for(int i = levelOfDetail; i > 0; i--)
{ {
char digit = '0'; char digit = '0';
int mask = 1 << (i - 1); int mask = 1 << (i - 1);
if((tileX & mask) != 0) if((tileX & mask) != 0)
{ {
digit++; digit++;
} }
if((tileY & mask) != 0) if((tileY & mask) != 0)
{ {
digit++; digit++;
digit++; digit++;
} }
...@@ -99,15 +94,11 @@ namespace core { ...@@ -99,15 +94,11 @@ namespace core {
if (versionRetrieved) if (versionRetrieved)
{ {
return; return;
} }
QMutexLocker locker(&mutex); QMutexLocker locker(&mutex);
if(CorrectGoogleVersions && !IsCorrectGoogleVersions()) if(CorrectGoogleVersions && !IsCorrectGoogleVersions())
{ {
QNetworkReply *reply; QNetworkReply *reply;
QNetworkRequest qheader; QNetworkRequest qheader;
QNetworkAccessManager network; QNetworkAccessManager network;
...@@ -131,7 +122,6 @@ namespace core { ...@@ -131,7 +122,6 @@ namespace core {
q.exec(); q.exec();
if(!tT.isActive()) if(!tT.isActive())
return; return;
tT.stop(); tT.stop();
if( (reply->error()!=QNetworkReply::NoError)) if( (reply->error()!=QNetworkReply::NoError))
{ {
...@@ -159,7 +149,6 @@ namespace core { ...@@ -159,7 +149,6 @@ namespace core {
QStringList gc=reg.capturedTexts(); QStringList gc=reg.capturedTexts();
VersionGoogleLabels = QString("h@%1").arg(gc[1]); VersionGoogleLabels = QString("h@%1").arg(gc[1]);
VersionGoogleLabelsChina = VersionGoogleLabels; VersionGoogleLabelsChina = VersionGoogleLabels;
#ifdef DEBUG_URLFACTORY #ifdef DEBUG_URLFACTORY
qDebug()<<"TryCorrectGoogleVersions, VersionGoogleLabels: "<<VersionGoogleLabels; qDebug()<<"TryCorrectGoogleVersions, VersionGoogleLabels: "<<VersionGoogleLabels;
#endif //DEBUG_URLFACTORY #endif //DEBUG_URLFACTORY
...@@ -171,7 +160,6 @@ namespace core { ...@@ -171,7 +160,6 @@ namespace core {
VersionGoogleSatellite = gc[1]; VersionGoogleSatellite = gc[1];
VersionGoogleSatelliteKorea = VersionGoogleSatellite; VersionGoogleSatelliteKorea = VersionGoogleSatellite;
VersionGoogleSatelliteChina = "s@" + VersionGoogleSatellite; VersionGoogleSatelliteChina = "s@" + VersionGoogleSatellite;
qDebug()<<"TryCorrectGoogleVersions, VersionGoogleSatellite: "<<VersionGoogleSatellite; qDebug()<<"TryCorrectGoogleVersions, VersionGoogleSatellite: "<<VersionGoogleSatellite;
} }
...@@ -181,14 +169,12 @@ namespace core { ...@@ -181,14 +169,12 @@ namespace core {
QStringList gc=reg.capturedTexts(); QStringList gc=reg.capturedTexts();
VersionGoogleTerrain = QString("t@%1,r@%2").arg(gc[1]).arg(gc[2]); VersionGoogleTerrain = QString("t@%1,r@%2").arg(gc[1]).arg(gc[2]);
VersionGoogleTerrainChina = VersionGoogleTerrain; VersionGoogleTerrainChina = VersionGoogleTerrain;
#ifdef DEBUG_URLFACTORY #ifdef DEBUG_URLFACTORY
qDebug()<<"TryCorrectGoogleVersions, VersionGoogleTerrain: "<<VersionGoogleTerrain; qDebug()<<"TryCorrectGoogleVersions, VersionGoogleTerrain: "<<VersionGoogleTerrain;
#endif //DEBUG_URLFACTORY #endif //DEBUG_URLFACTORY
} }
reply->deleteLater(); reply->deleteLater();
} }
} }
...@@ -200,7 +186,6 @@ namespace core { ...@@ -200,7 +186,6 @@ namespace core {
#endif //DEBUG_URLFACTORY #endif //DEBUG_URLFACTORY
switch(type) switch(type)
{ {
case MapType::GoogleMap: case MapType::GoogleMap:
{ {
QString server = "mts"; QString server = "mts";
...@@ -245,6 +230,7 @@ namespace core { ...@@ -245,6 +230,7 @@ namespace core {
QString sec2 = ""; // after &zoom=... QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2); GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions(); TryCorrectGoogleVersions();
return QString("https://%1%2.google.com/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleTerrain).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2); return QString("https://%1%2.google.com/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleTerrain).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
} }
break; break;
...@@ -295,6 +281,7 @@ namespace core { ...@@ -295,6 +281,7 @@ namespace core {
QString sec2 = ""; // after &zoom=... QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2); GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions(); TryCorrectGoogleVersions();
// http://mt0.google.cn/vt/v=w2p.110&hl=zh-CN&gl=cn&x=12&y=6&z=4&s=Ga // http://mt0.google.cn/vt/v=w2p.110&hl=zh-CN&gl=cn&x=12&y=6&z=4&s=Ga
return QString("http://%1%2.google.com/%3/lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleTerrainChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2); return QString("http://%1%2.google.com/%3/lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleTerrainChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
...@@ -308,12 +295,8 @@ namespace core { ...@@ -308,12 +295,8 @@ namespace core {
QString sec2 = ""; // after &zoom=... QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2); GetSecGoogleWords(pos, sec1, sec2);
//http://mt3.gmaptiles.co.kr/mt/v=kr1.11&hl=lt&x=109&y=49&z=7&s= //http://mt3.gmaptiles.co.kr/mt/v=kr1.11&hl=lt&x=109&y=49&z=7&s=
QString ret = QString("https://%1%2.gmaptiles.co.kr/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleMapKorea).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2); QString ret = QString("https://%1%2.gmaptiles.co.kr/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleMapKorea).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return ret; return ret;
} }
...@@ -326,7 +309,6 @@ namespace core { ...@@ -326,7 +309,6 @@ namespace core {
QString sec2 = ""; // after &zoom=... QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2); GetSecGoogleWords(pos, sec1, sec2);
// http://khm1.google.co.kr/kh/v=54&x=109&y=49&z=7&s= // http://khm1.google.co.kr/kh/v=54&x=109&y=49&z=7&s=
return QString("http://%1%2.google.co.kr/%3/v=%4&x=%5%6&y=%7&z=%8&s=%9").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatelliteKorea).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2); return QString("http://%1%2.google.co.kr/%3/v=%4&x=%5%6&y=%7&z=%8&s=%9").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleSatelliteKorea).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
...@@ -340,7 +322,6 @@ namespace core { ...@@ -340,7 +322,6 @@ namespace core {
QString sec2 = ""; // after &zoom=... QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2); GetSecGoogleWords(pos, sec1, sec2);
// http://mt1.gmaptiles.co.kr/mt/v=kr1t.11&hl=lt&x=109&y=50&z=7&s=G // http://mt1.gmaptiles.co.kr/mt/v=kr1t.11&hl=lt&x=109&y=50&z=7&s=G
return QString("https://%1%2.gmaptiles.co.kr/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabelsKorea).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2); return QString("https://%1%2.gmaptiles.co.kr/%3/v=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabelsKorea).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
...@@ -515,14 +496,12 @@ namespace core { ...@@ -515,14 +496,12 @@ namespace core {
sec2 = SecGoogleWord.left(seclen); sec2 = SecGoogleWord.left(seclen);
if(pos.Y() >= 10000 && pos.Y() < 100000) if(pos.Y() >= 10000 && pos.Y() < 100000)
{ {
sec1 = "&s="; sec1 = "&s=";
} }
} }
QString UrlFactory::MakeGeocoderUrl(QString keywords) QString UrlFactory::MakeGeocoderUrl(QString keywords)
{ {
QString key = keywords.replace(' ', '+'); QString key = keywords.replace(' ', '+');
return QString("http://maps.google.com/maps/geo?q=%1&output=csv&key=%2").arg(key).arg(GoogleMapsAPIKey); return QString("http://maps.google.com/maps/geo?q=%1&output=csv&key=%2").arg(key).arg(GoogleMapsAPIKey);
} }
QString UrlFactory::MakeReverseGeocoderUrl(internals::PointLatLng &pt,const QString &language) QString UrlFactory::MakeReverseGeocoderUrl(internals::PointLatLng &pt,const QString &language)
...@@ -572,9 +551,7 @@ namespace core { ...@@ -572,9 +551,7 @@ namespace core {
#endif //DEBUG_URLFACTORY #endif //DEBUG_URLFACTORY
QTime time; QTime time;
time.start(); time.start();
while( (!(reply->isFinished()) || (time.elapsed()>(6*Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);} while( (!(reply->isFinished()) || (time.elapsed()>(6*Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);}
#ifdef DEBUG_URLFACTORY #ifdef DEBUG_URLFACTORY
qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout*6); qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout*6);
#endif //DEBUG_URLFACTORY #endif //DEBUG_URLFACTORY
...@@ -595,7 +572,6 @@ namespace core { ...@@ -595,7 +572,6 @@ namespace core {
// cache geocoding // cache geocoding
if(useCache && geo.startsWith("200")) if(useCache && geo.startsWith("200"))
{ {
Cache::Instance()->CacheGeocoder(urlEnd, geo); Cache::Instance()->CacheGeocoder(urlEnd, geo);
} }
} }
...@@ -610,11 +586,9 @@ namespace core { ...@@ -610,11 +586,9 @@ namespace core {
QStringList values = geo.split(','); QStringList values = geo.split(',');
if(values.count() == 4) if(values.count() == 4)
{ {
status = (GeoCoderStatusCode::Types) QString(values[0]).toInt(); status = (GeoCoderStatusCode::Types) QString(values[0]).toInt();
if(status == GeoCoderStatusCode::G_GEO_SUCCESS) if(status == GeoCoderStatusCode::G_GEO_SUCCESS)
{ {
double lat = QString(values[2]).toDouble(); double lat = QString(values[2]).toDouble();
double lng = QString(values[3]).toDouble(); double lng = QString(values[3]).toDouble();
...@@ -637,7 +611,6 @@ namespace core { ...@@ -637,7 +611,6 @@ namespace core {
{ {
Placemark ret(""); Placemark ret("");
#ifdef DEBUG_URLFACTORY #ifdef DEBUG_URLFACTORY
qDebug()<<"Entered GetPlacemarkFromReverseGeocoderUrl:"; qDebug()<<"Entered GetPlacemarkFromReverseGeocoderUrl:";
#endif //DEBUG_URLFACTORY #endif //DEBUG_URLFACTORY
...@@ -672,9 +645,7 @@ namespace core { ...@@ -672,9 +645,7 @@ namespace core {
#endif //DEBUG_URLFACTORY #endif //DEBUG_URLFACTORY
QTime time; QTime time;
time.start(); time.start();
while( (!(reply->isFinished()) || (time.elapsed()>(6*Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);} while( (!(reply->isFinished()) || (time.elapsed()>(6*Timeout))) ){QCoreApplication::processEvents(QEventLoop::AllEvents);}
#ifdef DEBUG_URLFACTORY #ifdef DEBUG_URLFACTORY
qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout*6); qDebug()<<"Finished?"<<reply->error()<<" abort?"<<(time.elapsed()>Timeout*6);
#endif //DEBUG_URLFACTORY #endif //DEBUG_URLFACTORY
...@@ -698,7 +669,6 @@ namespace core { ...@@ -698,7 +669,6 @@ namespace core {
// cache geocoding // cache geocoding
if(useCache && reverse.startsWith("200")) if(useCache && reverse.startsWith("200"))
{ {
Cache::Instance()->CachePlacemark(urlEnd, reverse); Cache::Instance()->CachePlacemark(urlEnd, reverse);
} }
} }
...@@ -711,7 +681,6 @@ namespace core { ...@@ -711,7 +681,6 @@ namespace core {
// false: 602,0,0,0 // false: 602,0,0,0
if(reverse.startsWith("200")) if(reverse.startsWith("200"))
{ {
QString acc = reverse.left(reverse.indexOf('\"')); QString acc = reverse.left(reverse.indexOf('\"'));
ret = Placemark(reverse.remove(reverse.indexOf('\"'))); ret = Placemark(reverse.remove(reverse.indexOf('\"')));
ret.SetAccuracy ((int) (( (QString) acc.split(',')[1]).toInt()) ); ret.SetAccuracy ((int) (( (QString) acc.split(',')[1]).toInt()) );
...@@ -730,7 +699,6 @@ namespace core { ...@@ -730,7 +699,6 @@ namespace core {
double a = pow(sin(dLatitude / 2), 2) + cos(dLat1InRad) * cos(dLat2InRad) * pow(sin(dLongitude / 2), 2); double a = pow(sin(dLatitude / 2), 2) + cos(dLat1InRad) * cos(dLat2InRad) * pow(sin(dLongitude / 2), 2);
double c = 2 * atan2(sqrt(a), sqrt(1 - a)); double c = 2 * atan2(sqrt(a), sqrt(1 - a));
double dDistance = EarthRadiusKm * c; double dDistance = EarthRadiusKm * c;
return dDistance; return dDistance;
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment