rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-18 08:54:15 +01:00
Code Issues Releases Activity

Merge branch 'kfinisterre/GMapsAndGeoCodeSearchFix' into next

Browse Source
This commit is contained in:
abeck70 2015-05-13 17:49:32 +10:00
commit cb70fa8846
14 changed files with 203 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/libs/opmapcontrol/opmapcontrol.pro
View File

@ -2,3 +2,5 @@ TEMPLATE = subdirs
SUBDIRS = src \ SUBDIRS = src \
QT += xml

7
ground/openpilotgcs/src/libs/opmapcontrol/src/core/alllayersoftype.cpp
View File

@ -55,13 +55,6 @@ QVector<MapType::Types> AllLayersOfType::GetAllLayersOfType(const MapType::Types
} }
break; break;
case MapType::YahooHybrid:
{
types.append(MapType::YahooSatellite);
types.append(MapType::YahooLabels);
}
break;
case MapType::ArcGIS_MapsLT_Map_Hybrid: case MapType::ArcGIS_MapsLT_Map_Hybrid:
{ {
types.append(MapType::ArcGIS_MapsLT_OrtoFoto); types.append(MapType::ArcGIS_MapsLT_OrtoFoto);

2
ground/openpilotgcs/src/libs/opmapcontrol/src/core/core.pro
View File

@ -38,3 +38,5 @@ HEADERS += opmaps.h \
kibertilecache.h \ kibertilecache.h \
debugheader.h \ debugheader.h \
diagnostics.h diagnostics.h
QT += xml

5
ground/openpilotgcs/src/libs/opmapcontrol/src/core/maptype.h
View File

@ -52,11 +52,6 @@ public:
OpenStreetMapSurfer = 34, OpenStreetMapSurfer = 34,
OpenStreetMapSurferTerrain = 35, OpenStreetMapSurferTerrain = 35,
YahooMap = 64,
YahooSatellite = 128,
YahooLabels = 256,
YahooHybrid = 333,
BingMap = 444, BingMap = 444,
BingSatellite = 555, BingSatellite = 555,
BingHybrid = 666, BingHybrid = 666,

9
ground/openpilotgcs/src/libs/opmapcontrol/src/core/opmaps.cpp
View File

@ -153,15 +153,6 @@ QByteArray OPMaps::GetImageFrom(const MapType::Types &type, const Point &pos, co
} }
break; break;
case MapType::YahooHybrid:
case MapType::YahooLabels:
case MapType::YahooMap:
case MapType::YahooSatellite:
{
qheader.setRawHeader("Referrer", "http://maps.yahoo.com/");
}
break;
case MapType::ArcGIS_MapsLT_Map_Labels: case MapType::ArcGIS_MapsLT_Map_Labels:
case MapType::ArcGIS_MapsLT_Map: case MapType::ArcGIS_MapsLT_Map:
case MapType::ArcGIS_MapsLT_OrtoFoto: case MapType::ArcGIS_MapsLT_OrtoFoto:

5
ground/openpilotgcs/src/libs/opmapcontrol/src/core/providerstrings.cpp
View File

@ -61,11 +61,6 @@ ProviderStrings::ProviderStrings()
/// </summary> /// </summary>
GoogleMapsAPIKey = "ABQIAAAAWaQgWiEBF3lW97ifKnAczhRAzBk5Igf8Z5n2W3hNnMT0j2TikxTLtVIGU7hCLLHMAuAMt-BO5UrEWA"; GoogleMapsAPIKey = "ABQIAAAAWaQgWiEBF3lW97ifKnAczhRAzBk5Igf8Z5n2W3hNnMT0j2TikxTLtVIGU7hCLLHMAuAMt-BO5UrEWA";
// Yahoo version strings
VersionYahooMap = "4.3";
VersionYahooSatellite = "1.9";
VersionYahooLabels = "4.3";
// BingMaps // BingMaps
VersionBingMaps = "563"; VersionBingMaps = "563";

5
ground/openpilotgcs/src/libs/opmapcontrol/src/core/providerstrings.h
View File

@ -60,11 +60,6 @@ public:
/// </summary> /// </summary>
// Yahoo version strings
QString VersionYahooMap;
QString VersionYahooSatellite;
QString VersionYahooLabels;
// BingMaps // BingMaps
QString VersionBingMaps; QString VersionBingMaps;

201
ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.cpp
View File

@ -26,7 +26,8 @@
*/ */
#include "urlfactory.h" #include "urlfactory.h"
#include <QRegExp> #include <QRegExp>
#include <QDomDocument>
#include <QtXml>
namespace core { namespace core {
const double UrlFactory::EarthRadiusKm = 6378.137; // WGS-84 const double UrlFactory::EarthRadiusKm = 6378.137; // WGS-84
@ -97,6 +98,12 @@ void UrlFactory::TryCorrectGoogleVersions()
if (CorrectGoogleVersions && !IsCorrectGoogleVersions()) { if (CorrectGoogleVersions && !IsCorrectGoogleVersions()) {
QNetworkReply *reply; QNetworkReply *reply;
QNetworkRequest qheader; QNetworkRequest qheader;
// This SSL Hack is half assed... technically bad *security* joojoo.
// Required due to a QT5 bug on linux and Mac
//
QSslConfiguration conf = qheader.sslConfiguration();
conf.setPeerVerifyMode(QSslSocket::VerifyNone);
qheader.setSslConfiguration(conf);
QNetworkAccessManager network; QNetworkAccessManager network;
QEventLoop q; QEventLoop q;
QTimer tT; QTimer tT;
@ -109,7 +116,10 @@ void UrlFactory::TryCorrectGoogleVersions()
qDebug() << "Correct GoogleVersion"; qDebug() << "Correct GoogleVersion";
#endif // DEBUG_URLFACTORY #endif // DEBUG_URLFACTORY
// setIsCorrectGoogleVersions(true); // setIsCorrectGoogleVersions(true);
QString url = "https://maps.google.com/maps?output=classic"; // QString url = "https://www.google.com/maps/@0,-0,7z?dg=dbrw&newdg=1";
// We need to switch to the Above url... the /lochp method will be depreciated soon
// https://productforums.google.com/forum/#!category-topic/maps/navigation/k6EFrp7J7Jk
QString url = "https://www.google.com/lochp";
qheader.setUrl(QUrl(url)); qheader.setUrl(QUrl(url));
qheader.setRawHeader("User-Agent", UserAgent); qheader.setRawHeader("User-Agent", UserAgent);
@ -126,7 +136,12 @@ void UrlFactory::TryCorrectGoogleVersions()
#endif // DEBUG_URLFACTORY #endif // DEBUG_URLFACTORY
return; return;
} }
QString html = QString(reply->readAll()); QString html = QString(reply->readAll());
#ifdef DEBUG_URLFACTORY
qDebug() << html;
#endif // DEBUG_URLFACTORY
QRegExp reg("\"*https://mts0.google.com/vt/lyrs=m@(\\d*)", Qt::CaseInsensitive); QRegExp reg("\"*https://mts0.google.com/vt/lyrs=m@(\\d*)", Qt::CaseInsensitive);
if (reg.indexIn(html) != -1) { if (reg.indexIn(html) != -1) {
QStringList gc = reg.capturedTexts(); QStringList gc = reg.capturedTexts();
@ -148,6 +163,7 @@ void UrlFactory::TryCorrectGoogleVersions()
qDebug() << "TryCorrectGoogleVersions, VersionGoogleLabels: " << VersionGoogleLabels; qDebug() << "TryCorrectGoogleVersions, VersionGoogleLabels: " << VersionGoogleLabels;
#endif // DEBUG_URLFACTORY #endif // DEBUG_URLFACTORY
} }
reg = QRegExp("\"*https://khms0.google.com/kh/v=(\\d*)", Qt::CaseInsensitive); reg = QRegExp("\"*https://khms0.google.com/kh/v=(\\d*)", Qt::CaseInsensitive);
if (reg.indexIn(html) != -1) { if (reg.indexIn(html) != -1) {
QStringList gc = reg.capturedTexts(); QStringList gc = reg.capturedTexts();
@ -157,6 +173,7 @@ void UrlFactory::TryCorrectGoogleVersions()
qDebug() << "TryCorrectGoogleVersions, VersionGoogleSatellite: " << VersionGoogleSatellite; qDebug() << "TryCorrectGoogleVersions, VersionGoogleSatellite: " << VersionGoogleSatellite;
} }
reg = QRegExp("\"*https://mts0.google.com/vt/lyrs=t@(\\d*),r@(\\d*)", Qt::CaseInsensitive); reg = QRegExp("\"*https://mts0.google.com/vt/lyrs=t@(\\d*),r@(\\d*)", Qt::CaseInsensitive);
if (reg.indexIn(html) != -1) { if (reg.indexIn(html) != -1) {
QStringList gc = reg.capturedTexts(); QStringList gc = reg.capturedTexts();
@ -208,7 +225,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
QString sec2 = ""; // after &zoom=... QString sec2 = ""; // after &zoom=...
GetSecGoogleWords(pos, sec1, sec2); GetSecGoogleWords(pos, sec1, sec2);
TryCorrectGoogleVersions(); TryCorrectGoogleVersions();
qDebug() << QString("http://%1%2.google.com/%3/lyrs=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabels).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("http://%1%2.google.com/%3/lyrs=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabels).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2); return QString("http://%1%2.google.com/%3/lyrs=%4&hl=%5&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabels).arg(language).arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
} }
break; break;
@ -259,6 +276,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
TryCorrectGoogleVersions(); TryCorrectGoogleVersions();
// http://mt0.google.cn/vt/v=w2t.110&hl=zh-CN&gl=cn&x=12&y=6&z=4&s=Ga // http://mt0.google.cn/vt/v=w2t.110&hl=zh-CN&gl=cn&x=12&y=6&z=4&s=Ga
qDebug() << QString("http://%1%2.google.cn/%3/imgtp=png32&lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabelsChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
return QString("http://%1%2.google.cn/%3/imgtp=png32&lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabelsChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2); return QString("http://%1%2.google.cn/%3/imgtp=png32&lyrs=%4&hl=%5&gl=cn&x=%6%7&y=%8&z=%9&s=%10").arg(server).arg(GetServerNum(pos, 4)).arg(request).arg(VersionGoogleLabelsChina).arg("zh-CN").arg(pos.X()).arg(sec1).arg(pos.Y()).arg(zoom).arg(sec2);
} }
break; break;
@ -318,37 +336,26 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
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);
} }
break; break;
case MapType::YahooMap: // *.yimg.com has been depreciated. "Here" is what Yahoo uses now. https://developer.here.com/rest-apis/documentation/enterprise-map-tile/topics/request-constructing.html
{
return QString("http://maps%1.yimg.com/hx/tl?v=%2&.intl=%3&x=%4&y=%5&z=%6&r=1").arg(((GetServerNum(pos, 2)) + 1)).arg(VersionYahooMap).arg(language).arg(pos.X()).arg((((1 << zoom) >> 1) - 1 - pos.Y())).arg((zoom + 1));
}
case MapType::YahooSatellite:
{
return QString("http://maps%1.yimg.com/ae/ximg?v=%2&t=a&s=256&.intl=%3&x=%4&y=%5&z=%6&r=1").arg("3").arg(VersionYahooSatellite).arg(language).arg(pos.X()).arg(((1 << zoom) >> 1) - 1 - pos.Y()).arg(zoom + 1);
}
break;
case MapType::YahooLabels:
{
return QString("http://maps%1.yimg.com/hx/tl?v=%2&t=h&.intl=%3&x=%4&y=%5&z=%6&r=1").arg("1").arg(VersionYahooLabels).arg(language).arg(pos.X()).arg(((1 << zoom) >> 1) - 1 - pos.Y()).arg(zoom + 1);
}
break;
case MapType::OpenStreetMap: case MapType::OpenStreetMap:
{ {
char letter = "abc"[GetServerNum(pos, 3)]; char letter = "abc"[GetServerNum(pos, 3)];
return QString("http://%1.tile.openstreetmap.org/%2/%3/%4.png").arg(letter).arg(zoom).arg(pos.X()).arg(pos.Y()); return QString("http://%1.tile.openstreetmap.org/%2/%3/%4.png").arg(letter).arg(zoom).arg(pos.X()).arg(pos.Y());
} }
break; break;
// Need to update tile format to fit http://wiki.openstreetmap.org/wiki/Tile_servers
case MapType::OpenStreetOsm: case MapType::OpenStreetOsm:
{ {
char letter = "abc"[GetServerNum(pos, 3)]; char letter = "abc"[GetServerNum(pos, 3)];
return QString("http://%1.tah.openstreetmap.org/Tiles/tile/%2/%3/%4.png").arg(letter).arg(zoom).arg(pos.X()).arg(pos.Y()); qDebug() << QString("http://%1.tile.openstreetmap.org/%2/%3/%4.png").arg(letter).arg(zoom).arg(pos.X()).arg(pos.Y());
return QString("http://%1.tile.openstreetmap.org/%2/%3/%4.png").arg(letter).arg(zoom).arg(pos.X()).arg(pos.Y());
} }
break; break;
case MapType::OpenStreetMapSurfer: case MapType::OpenStreetMapSurfer:
{ {
// http://tiles1.mapsurfer.net/tms_r.ashx?x=37378&y=20826&z=16 // http://tiles1.mapsurfer.net/tms_r.ashx?x=37378&y=20826&z=16
qDebug() << QString("http://tiles1.mapsurfer.net/tms_r.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom);
return QString("http://tiles1.mapsurfer.net/tms_r.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); return QString("http://tiles1.mapsurfer.net/tms_r.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom);
} }
break; break;
@ -356,6 +363,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
{ {
// http://tiles2.mapsurfer.net/tms_t.ashx?x=9346&y=5209&z=14 // http://tiles2.mapsurfer.net/tms_t.ashx?x=9346&y=5209&z=14
qDebug() << QString("http://tiles2.mapsurfer.net/tms_t.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom);
return QString("http://tiles2.mapsurfer.net/tms_t.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom); return QString("http://tiles2.mapsurfer.net/tms_t.ashx?x=%1&y=%2&z=%3").arg(pos.X()).arg(pos.Y()).arg(zoom);
} }
break; break;
@ -395,7 +403,8 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
{ {
// http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_ShadedRelief_World_2D/MapServer/tile/1/0/1.jpg // http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_ShadedRelief_World_2D/MapServer/tile/1/0/1.jpg
return QString("http://server.arcgisonline.com/ArcGIS/rest/services/ESRI_ShadedRelief_World_2D/MapServer/tile/%1/%2/%3").arg(zoom).arg(pos.Y()).arg(pos.X()); qDebug() << QString("http://server.arcgisonline.com/ArcGIS/rest/services/World_Shaded_Relief/MapServer/tile/%1/%2/%3").arg(zoom).arg(pos.Y()).arg(pos.X());
return QString("http://server.arcgisonline.com/ArcGIS/rest/services/World_Shaded_Relief/MapServer/tile/%1/%2/%3").arg(zoom).arg(pos.Y()).arg(pos.X());
} }
break; break;
case MapType::ArcGIS_Terrain: case MapType::ArcGIS_Terrain:
@ -414,6 +423,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
// return string.Format("http://arcgis.maps.lt/ArcGIS/rest/services/mapslt_ortofoto/MapServer/tile/{0}/{1}/{2}", zoom, pos.Y(), pos.X()); // return string.Format("http://arcgis.maps.lt/ArcGIS/rest/services/mapslt_ortofoto/MapServer/tile/{0}/{1}/{2}", zoom, pos.Y(), pos.X());
// http://dc1.maps.lt/cache/mapslt_ortofoto_512/map/_alllayers/L03/R0000001d/C0000002a.jpg // http://dc1.maps.lt/cache/mapslt_ortofoto_512/map/_alllayers/L03/R0000001d/C0000002a.jpg
// TODO verificar // TODO verificar
qDebug() << QString("http://dc1.maps.lt/cache/mapslt_ortofoto/map/_alllayers/L%1/R%2/C%3.jpg").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0');
return QString("http://dc1.maps.lt/cache/mapslt_ortofoto/map/_alllayers/L%1/R%2/C%3.jpg").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0'); return QString("http://dc1.maps.lt/cache/mapslt_ortofoto/map/_alllayers/L%1/R%2/C%3.jpg").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0');
} }
break; break;
@ -426,6 +436,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
// http://dc1.maps.lt/cache/mapslt_512/map/_alllayers/L03/R0000001b/C00000029.png // http://dc1.maps.lt/cache/mapslt_512/map/_alllayers/L03/R0000001b/C00000029.png
// TODO verificar // TODO verificar
// http://dc1.maps.lt/cache/mapslt/map/_alllayers/L02/R0000001c/C00000029.png // http://dc1.maps.lt/cache/mapslt/map/_alllayers/L02/R0000001c/C00000029.png
qDebug() << QString("http://dc1.maps.lt/cache/mapslt/map/_alllayers/L%1/R%2/C%3.png").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0');
return QString("http://dc1.maps.lt/cache/mapslt/map/_alllayers/L%1/R%2/C%3.png").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0'); return QString("http://dc1.maps.lt/cache/mapslt/map/_alllayers/L%1/R%2/C%3.png").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0');
} }
break; break;
@ -435,6 +446,7 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
// return string.Format("http://arcgis.maps.lt/ArcGIS/rest/services/mapslt_ortofoto_overlay/MapServer/tile/{0}/{1}/{2}", zoom, pos.Y(), pos.X()); // return string.Format("http://arcgis.maps.lt/ArcGIS/rest/services/mapslt_ortofoto_overlay/MapServer/tile/{0}/{1}/{2}", zoom, pos.Y(), pos.X());
// http://dc1.maps.lt/cache/mapslt_ortofoto_overlay_512/map/_alllayers/L03/R0000001d/C00000029.png // http://dc1.maps.lt/cache/mapslt_ortofoto_overlay_512/map/_alllayers/L03/R0000001d/C00000029.png
// TODO verificar // TODO verificar
qDebug() << QString("http://dc1.maps.lt/cache/mapslt_ortofoto_overlay/map/_alllayers/L%1/R%2/C%3.png").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0');
return QString("http://dc1.maps.lt/cache/mapslt_ortofoto_overlay/map/_alllayers/L%1/R%2/C%3.png").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0'); return QString("http://dc1.maps.lt/cache/mapslt_ortofoto_overlay/map/_alllayers/L%1/R%2/C%3.png").arg(zoom, 2, 10, (QChar)'0').arg(pos.Y(), 8, 16, (QChar)'0').arg(pos.X(), 8, 16, (QChar)'0');
} }
break; break;
@ -455,22 +467,33 @@ QString UrlFactory::MakeImageUrl(const MapType::Types &type, const Point &pos, c
QString y = QString("%1").arg(QString::number(pos.Y()), 9, (QChar)'0'); QString y = QString("%1").arg(QString::number(pos.Y()), 9, (QChar)'0');
y.insert(3, "/").insert(7, "/"); y.insert(3, "/").insert(7, "/");
// "http://map03.pergo.com.tr/tile/2/000/000/003/000/000/002.png" // "http://map03.pergo.com.tr/tile/2/000/000/003/000/000/002.png"
// This has changed map03 does not exist. (neither does map3) Servers have changed to map1 and map2?
return QString("http://map%1.pergo.com.tr/tile/%2/%3/%4.png").arg(GetServerNum(pos, 4)).arg(zoom, 2, 10, (QChar)'0').arg(x).arg(y); return QString("http://map%1.pergo.com.tr/tile/%2/%3/%4.png").arg(GetServerNum(pos, 4)).arg(zoom, 2, 10, (QChar)'0').arg(x).arg(y);
} }
break; break;
case MapType::SigPacSpainMap: case MapType::SigPacSpainMap:
{ {
return QString("http://sigpac.mapa.es/kmlserver/raster/%1@3785/%2.%3.%4.img").arg(levelsForSigPacSpainMap[zoom]).arg(zoom).arg(pos.X()).arg((2 << (zoom - 1)) - pos.Y() - 1); // http://sigpac.magrama.es/fega/h5visor/ is new server location
qDebug() << QString("http://sigpac.mapa.es/kmlserver/raster/%1@3785/%2.%3.%4.img").arg(levelsForSigPacSpainMap[zoom]).arg(zoom).arg(pos.X()).arg((2 << (zoom - 1)) - pos.Y() - 1);
return QString("http://sigpac.magrama.es/SDG/%1@3785/%2.%3.%4.img").arg(levelsForSigPacSpainMap[zoom]).arg(zoom).arg(pos.X()).arg((2 << (zoom - 1)) - pos.Y() - 1);
} }
break; break;
case MapType::YandexMapRu: case MapType::YandexMapRu:
{ {
/*
Used "oldmaps" to determine map types - https://old.maps.yandex.ru/?ll=-83.110960%2C40.091250&spn=7.745361%2C6.015476&z=7&l=map
map: 'https:\/\/vec0%d.maps.yandex.net\/tiles?l=map&%c&%l',
sat: 'https:\/\/sat0%d.maps.yandex.net\/tiles?l=sat&%c&%l',
skl: 'https:\/\/vec0%d.maps.yandex.net\/tiles?l=skl&%c&%l',
*/
QString server = "vec"; QString server = "vec";
return QString("http://%1").arg(server) + QString("0%2.maps.yandex.net/tiles?l=map&v=%3&x=%4&y=%5&z=%6").arg(GetServerNum(pos, 4) + 1).arg(VersionYandexMap).arg(pos.X()).arg(pos.Y()).arg(zoom);
// http://vec01.maps.yandex.ru/tiles?l=map&v=2.10.2&x=1494&y=650&z=11 // Satllite maps are poor quality, but available.
// QString server = "sat";
return QString("http://%1").arg(server) + QString("0%2.maps.yandex.ru/tiles?l=map&v=%3&x=%4&y=%5&z=%6").arg(GetServerNum(pos, 4) + 1).arg(VersionYandexMap).arg(pos.X()).arg(pos.Y()).arg(zoom); // return QString("http://%1").arg(server) + QString("0%2.maps.yandex.net/tiles?l=sat&v=%3&x=%4&y=%5&z=%6").arg(GetServerNum(pos, 4) + 1).arg(VersionYandexMap).arg(pos.X()).arg(pos.Y()).arg(zoom);
} }
break; break;
default: default:
@ -492,23 +515,29 @@ void UrlFactory::GetSecGoogleWords(const Point &pos, QString &sec1, QString &sec
QString UrlFactory::MakeGeocoderUrl(QString keywords) QString UrlFactory::MakeGeocoderUrl(QString keywords)
{ {
QString key = keywords.replace(' ', '+'); QString key = keywords.replace(' ', '+');
// CSV output has been depreciated. API key is no longer needed.
return QString("http://maps.google.com/maps/geo?q=%1&output=csv&key=%2").arg(key).arg(GoogleMapsAPIKey); return QString("https://maps.googleapis.com/maps/api/geocode/xml?sensor=false&address=%1").arg(key);
} }
QString UrlFactory::MakeReverseGeocoderUrl(internals::PointLatLng &pt, const QString &language) QString UrlFactory::MakeReverseGeocoderUrl(internals::PointLatLng &pt, const QString &language)
{ {
return QString("http://maps.google.com/maps/geo?hl=%1&ll=%2,%3&output=csv&key=%4").arg(language).arg(QString::number(pt.Lat())).arg(QString::number(pt.Lng())).arg(GoogleMapsAPIKey); // CSV output has been depreciated. API key is no longer needed.
return QString("https://maps.googleapis.com/maps/api/geocode/xml?latlng=%1,%2").arg(QString::number(pt.Lat())).arg(QString::number(pt.Lng()));
} }
internals::PointLatLng UrlFactory::GetLatLngFromGeodecoder(const QString &keywords, GeoCoderStatusCode::Types &status) internals::PointLatLng UrlFactory::GetLatLngFromGeodecoder(const QString &keywords, QString &status)
{ {
return GetLatLngFromGeocoderUrl(MakeGeocoderUrl(keywords), UseGeocoderCache, status); return GetLatLngFromGeocoderUrl(MakeGeocoderUrl(keywords), UseGeocoderCache, status);
} }
internals::PointLatLng UrlFactory::GetLatLngFromGeocoderUrl(const QString &url, const bool &useCache, GeoCoderStatusCode::Types &status)
QString latxml;
QString lonxml;
//QString status;
internals::PointLatLng UrlFactory::GetLatLngFromGeocoderUrl(const QString &url, const bool &useCache, QString &status)
{ {
#ifdef DEBUG_URLFACTORY #ifdef DEBUG_URLFACTORY
qDebug() << "Entered GetLatLngFromGeocoderUrl:"; qDebug() << "Entered GetLatLngFromGeocoderUrl:";
#endif // DEBUG_URLFACTORY #endif // DEBUG_URLFACTORY
status = GeoCoderStatusCode::Unknow; status = "ZERO_RESULTS";
internals::PointLatLng ret(0, 0); internals::PointLatLng ret(0, 0);
QString urlEnd = url.mid(url.indexOf("geo?q=") + 6); QString urlEnd = url.mid(url.indexOf("geo?q=") + 6);
urlEnd.replace(QRegExp( urlEnd.replace(QRegExp(
@ -529,6 +558,10 @@ internals::PointLatLng UrlFactory::GetLatLngFromGeocoderUrl(const QString &url,
#endif // DEBUG_URLFACTORY #endif // DEBUG_URLFACTORY
QNetworkReply *reply; QNetworkReply *reply;
QNetworkRequest qheader; QNetworkRequest qheader;
// Lame hack *SSL security == none, bypass QT bug
QSslConfiguration conf = qheader.sslConfiguration();
conf.setPeerVerifyMode(QSslSocket::VerifyNone);
qheader.setSslConfiguration(conf);
QNetworkAccessManager network; QNetworkAccessManager network;
network.setProxy(Proxy); network.setProxy(Proxy);
qheader.setUrl(QUrl(url)); qheader.setUrl(QUrl(url));
@ -552,11 +585,86 @@ internals::PointLatLng UrlFactory::GetLatLngFromGeocoderUrl(const QString &url,
return internals::PointLatLng(0, 0); return internals::PointLatLng(0, 0);
} }
{ {
geo = reply->readAll();
#ifdef DEBUG_URLFACTORY #ifdef DEBUG_URLFACTORY
qDebug() << "GetLatLngFromGeocoderUrl:Reply ok"; qDebug() << "GetLatLngFromGeocoderUrl:Reply ok";
qDebug() << geo; // This is the response from the geocode request (no longer in CSV)
#endif // DEBUG_URLFACTORY #endif // DEBUG_URLFACTORY
geo = reply->readAll();
// This is SOOOO horribly hackish, code duplication needs to go. Needed a quick fix.
QXmlStreamReader reader(geo);
while(!reader.atEnd())
{
reader.readNext();
if(reader.isStartElement())
{
if(reader.name() == "lat")
{
reader.readNext();
if(reader.atEnd())
break;
if(reader.isCharacters())
{
QString text = reader.text().toString();
qDebug() << text;
latxml = text;
break;
}
}
}
}
while(!reader.atEnd())
{
reader.readNext();
if(reader.isStartElement())
{
if(reader.name() == "lng")
{
reader.readNext();
if(reader.atEnd())
break;
if(reader.isCharacters())
{
QString text = reader.text().toString();
qDebug() << text;
lonxml = text;
break;
}
}
}
}
QXmlStreamReader reader2(geo);
while(!reader2.atEnd())
{
reader2.readNext();
if(reader2.isStartElement())
{
if(reader2.name() == "status")
{
reader2.readNext();
if(reader2.atEnd())
break;
if(reader2.isCharacters())
{
QString text = reader2.text().toString();
qDebug() << text;
status = text;
break;
}
}
}
}
// cache geocoding // cache geocoding
if (useCache && geo.startsWith("200")) { if (useCache && geo.startsWith("200")) {
@ -567,22 +675,35 @@ internals::PointLatLng UrlFactory::GetLatLngFromGeocoderUrl(const QString &url,
} }
// parse values
// true : 200,4,56.1451640,22.0681787
// false: 602,0,0,0
{ {
QStringList values = geo.split(','); if (status == "OK") {
if (values.count() == 4) { double lat = QString(latxml).toDouble();
status = (GeoCoderStatusCode::Types)QString(values[0]).toInt(); double lng = QString(lonxml).toDouble();
if (status == GeoCoderStatusCode::G_GEO_SUCCESS) {
double lat = QString(values[2]).toDouble();
double lng = QString(values[3]).toDouble();
ret = internals::PointLatLng(lat, lng); ret = internals::PointLatLng(lat, lng);
#ifdef DEBUG_URLFACTORY #ifdef DEBUG_URLFACTORY
qDebug() << "Status is: " << status;
qDebug() << "Lat=" << lat << " Lng=" << lng; qDebug() << "Lat=" << lat << " Lng=" << lng;
#endif // DEBUG_URLFACTORY #endif // DEBUG_URLFACTORY
} }
else if (status == "ZERO_RESULTS") {
qDebug() << "No results";
}
else if (status == "OVER_QUERY_LIMIT") {
qDebug() << "You are over quota on queries";
}
else if (status == "REQUEST_DENIED") {
qDebug() << "Request was denied";
}
else if (status == "INVALID_REQUEST") {
qDebug() << "Invalid request, missing address, lat long or location";
}
else if (status == "UNKNOWN_ERROR") {
qDebug() << "Some sort of server error.";
}
else
{
qDebug() << "UrlFactory loop error";
} }
} }
return ret; return ret;

4
ground/openpilotgcs/src/libs/opmapcontrol/src/core/urlfactory.h
View File

@ -56,7 +56,7 @@ public:
UrlFactory(); UrlFactory();
~UrlFactory(); ~UrlFactory();
QString MakeImageUrl(const MapType::Types &type, const core::Point &pos, const int &zoom, const QString &language); QString MakeImageUrl(const MapType::Types &type, const core::Point &pos, const int &zoom, const QString &language);
internals::PointLatLng GetLatLngFromGeodecoder(const QString &keywords, GeoCoderStatusCode::Types &status); internals::PointLatLng GetLatLngFromGeodecoder(const QString &keywords, QString &status);
Placemark GetPlacemarkFromGeocoder(internals::PointLatLng location); Placemark GetPlacemarkFromGeocoder(internals::PointLatLng location);
int Timeout; int Timeout;
private: private:
@ -79,7 +79,7 @@ protected:
void setIsCorrectGoogleVersions(bool value); void setIsCorrectGoogleVersions(bool value);
QString MakeGeocoderUrl(QString keywords); QString MakeGeocoderUrl(QString keywords);
QString MakeReverseGeocoderUrl(internals::PointLatLng &pt, const QString &language); QString MakeReverseGeocoderUrl(internals::PointLatLng &pt, const QString &language);
internals::PointLatLng GetLatLngFromGeocoderUrl(const QString &url, const bool &useCache, GeoCoderStatusCode::Types &status); internals::PointLatLng GetLatLngFromGeocoderUrl(const QString &url, const bool &useCache, QString &status);
Placemark GetPlacemarkFromReverseGeocoderUrl(const QString &url, const bool &useCache); Placemark GetPlacemarkFromReverseGeocoderUrl(const QString &url, const bool &useCache);
}; };
} }

11
ground/openpilotgcs/src/libs/opmapcontrol/src/internals/core.cpp
View File

@ -377,15 +377,18 @@ void Core::OnMapClose()
CancelAsyncTasks(); CancelAsyncTasks();
} }
GeoCoderStatusCode::Types Core::SetCurrentPositionByKeywords(QString const & keys) QString Core::SetCurrentPositionByKeywords(QString const & keys)
{ {
GeoCoderStatusCode::Types status = GeoCoderStatusCode::Unknow; QString status = "ZERO_RESULTS";
PointLatLng pos = OPMaps::Instance()->GetLatLngFromGeodecoder(keys, status); PointLatLng pos = OPMaps::Instance()->GetLatLngFromGeodecoder(keys, status);
if (!pos.IsEmpty() && (status == GeoCoderStatusCode::G_GEO_SUCCESS)) { if (!pos.IsEmpty() && (status == "OK")) {
SetCurrentPosition(pos); SetCurrentPosition(pos);
} }
else
{
qDebug() << "Status is not OK: " << status;
}
return status; return status;
} }
RectLatLng Core::CurrentViewArea() RectLatLng Core::CurrentViewArea()

2
ground/openpilotgcs/src/libs/opmapcontrol/src/internals/core.h
View File

@ -266,7 +266,7 @@ public:
void OnMapClose(); // TODO had as slot void OnMapClose(); // TODO had as slot
GeoCoderStatusCode::Types SetCurrentPositionByKeywords(QString const & keys); QString SetCurrentPositionByKeywords(QString const & keys);
RectLatLng CurrentViewArea(); RectLatLng CurrentViewArea();

2
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.h
View File

@ -229,7 +229,7 @@ private:
{ {
core->ReloadMap(); core->ReloadMap();
} }
GeoCoderStatusCode::Types SetCurrentPositionByKeywords(QString const & keys) QString SetCurrentPositionByKeywords(QString const & keys)
{ {
return core->SetCurrentPositionByKeywords(keys); return core->SetCurrentPositionByKeywords(keys);
} }

2
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/opmapwidget.h
View File

@ -350,7 +350,7 @@ public:
map->ReloadMap(); map->resize(); map->ReloadMap(); map->resize();
} }
GeoCoderStatusCode::Types SetCurrentPositionByKeywords(QString const & keys) QString SetCurrentPositionByKeywords(QString const & keys)
{ {
return map->SetCurrentPositionByKeywords(keys); return map->SetCurrentPositionByKeywords(keys);
} }

28
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -2320,16 +2320,38 @@ void OPMapGadgetWidget::on_tbFind_clicked()
{ {
QPalette pal = m_widget->leFind->palette(); QPalette pal = m_widget->leFind->palette();
int result = m_map->SetCurrentPositionByKeywords(m_widget->leFind->text()); QString status = m_map->SetCurrentPositionByKeywords(m_widget->leFind->text());
if (result == core::GeoCoderStatusCode::G_GEO_SUCCESS) { if (status == "OK") {
pal.setColor(m_widget->leFind->backgroundRole(), Qt::green); pal.setColor(m_widget->leFind->backgroundRole(), Qt::green);
m_widget->leFind->setPalette(pal); m_widget->leFind->setPalette(pal);
m_map->SetZoom(12); m_map->SetZoom(12);
} else { } else if (status == "ZERO_RESULTS") {
pal.setColor(m_widget->leFind->backgroundRole(), Qt::red); pal.setColor(m_widget->leFind->backgroundRole(), Qt::red);
m_widget->leFind->setPalette(pal); m_widget->leFind->setPalette(pal);
qDebug() << "No results";
} else if (status == "OVER_QUERY_LIMIT") {
pal.setColor(m_widget->leFind->backgroundRole(), Qt::yellow);
m_widget->leFind->setPalette(pal);
qDebug() << "You are over quota on queries";
} else if (status == "REQUEST_DENIED") {
pal.setColor(m_widget->leFind->backgroundRole(), Qt::darkRed);
m_widget->leFind->setPalette(pal);
qDebug() << "Request was denied";
} else if (status == "INVALID_REQUEST") {
pal.setColor(m_widget->leFind->backgroundRole(), Qt::darkYellow);
m_widget->leFind->setPalette(pal);
qDebug() << "Invalid request, missing address, lat long or location";
} else if (status == "UNKNOWN_ERROR") {
pal.setColor(m_widget->leFind->backgroundRole(), Qt::darkYellow);
m_widget->leFind->setPalette(pal);
qDebug() << "Some sort of server error.";
} else {
pal.setColor(m_widget->leFind->backgroundRole(), Qt::gray);
m_widget->leFind->setPalette(pal);
qDebug() << "Some sort of code error!";
} }
} }
void OPMapGadgetWidget::onHomeDoubleClick(HomeItem *) void OPMapGadgetWidget::onHomeDoubleClick(HomeItem *)