File qlandkartegt-1.7.7_agent_osm.patch of Package QLandkarteGT
diff -ur qlandkartegt-1.7.7/3rdparty/qtsoap/qtsoap.cpp qlandkartegt-1.7.7_fix/3rdparty/qtsoap/qtsoap.cpp
--- qlandkartegt-1.7.7/3rdparty/qtsoap/qtsoap.cpp 2014-04-02 19:23:47.000000000 +0200
+++ qlandkartegt-1.7.7_fix/3rdparty/qtsoap/qtsoap.cpp 2014-12-30 12:14:02.698235795 +0100
@@ -38,6 +38,7 @@
****************************************************************************/
#include "qtsoap.h"
+#include "../../src/version.h"
#include <QtCore/QSet>
#include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkReply>
@@ -3151,6 +3152,7 @@
QNetworkRequest networkReq;
networkReq.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("text/xml;charset=utf-8"));
networkReq.setRawHeader("SOAPAction", soapAction.toLatin1());
+ networkReq.setRawHeader("User-Agent", AGENTSTRING);
url.setPath(path);
networkReq.setUrl(url);
diff -ur qlandkartegt-1.7.7/src/CDlgEditWpt.cpp qlandkartegt-1.7.7_fix/src/CDlgEditWpt.cpp
--- qlandkartegt-1.7.7/src/CDlgEditWpt.cpp 2014-04-02 19:23:47.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/CDlgEditWpt.cpp 2014-12-30 12:12:17.713747700 +0100
@@ -29,6 +29,7 @@
#include "CSettings.h"
#include "config.h"
+#include "version.h"
#include "CImageViewer.h"
@@ -672,6 +673,7 @@
QNetworkRequest request;
request.setUrl(wpt.link);
+ request.setRawHeader("User-Agent", AGENTSTRING);
networkAccessManager->get(request);
}
@@ -738,6 +740,7 @@
QNetworkRequest request;
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
networkAccessManager->get(request);
return;
}
@@ -758,6 +761,7 @@
QNetworkRequest request;
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
pendingRequests[networkAccessManager->get(request)] = text;
pos += re2.matchedLength();
diff -ur qlandkartegt-1.7.7/src/CDlgMapWmsConfig.cpp qlandkartegt-1.7.7_fix/src/CDlgMapWmsConfig.cpp
--- qlandkartegt-1.7.7/src/CDlgMapWmsConfig.cpp 2014-04-02 19:23:47.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/CDlgMapWmsConfig.cpp 2014-12-30 12:12:17.714747669 +0100
@@ -21,6 +21,7 @@
#include "CMapDB.h"
#include "CResources.h"
#include "CMainWindow.h"
+#include "version.h"
#include <QtGui>
#include <QtXml>
@@ -164,6 +165,7 @@
url.addQueryItem("request", "GetCapabilities");
#endif
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
accessManager->get(request);
}
diff -ur qlandkartegt-1.7.7/src/CMapDB.cpp qlandkartegt-1.7.7_fix/src/CMapDB.cpp
--- qlandkartegt-1.7.7/src/CMapDB.cpp 2014-05-07 19:58:39.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/CMapDB.cpp 2014-12-30 12:12:17.714747669 +0100
@@ -128,6 +128,22 @@
{
map_t m;
+ m.description = "OpenStreetMap";
+ m.filename = "http://tile.openstreetmap.org/%1/%2/%3.png";
+ m.type = IMap::eTMS;
+ m.key = QString::number(qHash(m.filename));
+ m.copyright = "Open Street Map, Creative Commons Attribution-ShareAlike 2.0 license";
+ knownMaps[m.key] = m;
+ builtInKeys << m.key;
+
+ m.description = "OpenCycleMap";
+ m.filename = "http://b.tile.opencyclemap.org/cycle/%1/%2/%3.png";
+ m.type = IMap::eTMS;
+ m.key = QString::number(qHash(m.filename));
+ m.copyright = "Open Street Map, Creative Commons Attribution-ShareAlike 2.0 license";
+ knownMaps[m.key] = m;
+ builtInKeys << m.key;
+
QStringList keys = cfg.value("tms/knownMaps").toString().split("|",QString::SkipEmptyParts);
foreach(const QString& key, keys)
{
@@ -156,7 +172,7 @@
}
}
- maps = cfg.value("maps/visibleMaps","").toString().split("|",QString::SkipEmptyParts);
+ maps = cfg.value("maps/visibleMaps","http://tile.openstreetmap.org/%1/%2/%3.png").toString().split("|",QString::SkipEmptyParts);
cfg.setValue("maps/visibleMaps","");
cfg.sync();
diff -ur qlandkartegt-1.7.7/src/CMapTms.cpp qlandkartegt-1.7.7_fix/src/CMapTms.cpp
--- qlandkartegt-1.7.7/src/CMapTms.cpp 2014-04-02 19:23:46.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/CMapTms.cpp 2014-12-30 12:13:19.145692747 +0100
@@ -26,6 +26,7 @@
#include "CDlgMapTmsConfig.h"
#include "CMapSelectionRaster.h"
#include "CSettings.h"
+#include "version.h"
#include <QtGui>
#include <QtNetwork>
@@ -614,6 +615,7 @@
request.setRawHeader(item.name.toLatin1(), item.value.toLatin1());
}
+ request.setRawHeader("User-Agent", AGENTSTRING);
req.reply = accessManager->get(request);
pendRequests[req.url.toString()] = req;
diff -ur qlandkartegt-1.7.7/src/CMapWms.cpp qlandkartegt-1.7.7_fix/src/CMapWms.cpp
--- qlandkartegt-1.7.7/src/CMapWms.cpp 2014-04-02 19:23:46.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/CMapWms.cpp 2014-12-30 12:12:17.714747669 +0100
@@ -24,6 +24,7 @@
#include "CDlgMapWmsConfig.h"
#include "CMapSelectionRaster.h"
#include "CSettings.h"
+#include "version.h"
#include <QtGui>
#include <QtXml>
@@ -639,6 +640,7 @@
QNetworkRequest request;
request.setUrl(req.url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
req.reply = accessManager->get(request);
pendRequests[req.url.toString()] = req;
@@ -675,6 +677,7 @@
QNetworkRequest request;
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
req.reply = accessManager->get(request);
pendRequests[url.toString()] = req;
diff -ur qlandkartegt-1.7.7/src/CRouteToolWidget.cpp qlandkartegt-1.7.7_fix/src/CRouteToolWidget.cpp
--- qlandkartegt-1.7.7/src/CRouteToolWidget.cpp 2014-04-02 19:23:46.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/CRouteToolWidget.cpp 2014-12-30 12:12:17.715747643 +0100
@@ -504,6 +504,7 @@
QNetworkRequest request;
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
QNetworkReply* reply = m_networkAccessManager->post(request, array);
pendingRequests[reply] = rte.getKey();
@@ -943,6 +944,7 @@
QNetworkRequest request;
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
m_networkAccessManager->get(request);
QNetworkReply* reply = m_networkAccessManager->get(request);
diff -ur qlandkartegt-1.7.7/src/CSearchDB.cpp qlandkartegt-1.7.7_fix/src/CSearchDB.cpp
--- qlandkartegt-1.7.7/src/CSearchDB.cpp 2014-04-02 19:23:46.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/CSearchDB.cpp 2014-12-30 12:12:17.715747643 +0100
@@ -23,6 +23,7 @@
#include "CCanvas.h"
#include "CMapDB.h"
#include "IMap.h"
+#include "version.h"
#include <QtGui>
#include <QtXml>
@@ -102,6 +103,7 @@
QNetworkRequest request;
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
QNetworkReply * reply = networkAccessManager.get(request);
pendingRequests[reply] = eGoogle;
}
@@ -169,6 +171,7 @@
QNetworkRequest request;
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
QNetworkReply * reply = networkAccessManager.post(request, array);
pendingRequests[reply] = eOpenRouteService;
diff -ur qlandkartegt-1.7.7/src/CTrack.cpp qlandkartegt-1.7.7_fix/src/CTrack.cpp
--- qlandkartegt-1.7.7/src/CTrack.cpp 2014-06-30 17:53:54.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/CTrack.cpp 2014-12-30 12:12:17.716747613 +0100
@@ -26,6 +26,7 @@
#include "CWptDB.h"
#include "CTrackDB.h"
#include "CSettings.h"
+#include "version.h"
#include <QtGui>
#include <QNetworkProxy>
@@ -1027,6 +1028,7 @@
QNetworkRequest request;
request.setUrl(url);
+ request.setRawHeader("User-Agent", AGENTSTRING);
QNetworkReply * reply = networkAccessManager->get(request);
reply2idx[reply] = idx;
diff -ur qlandkartegt-1.7.7/src/version.h qlandkartegt-1.7.7_fix/src/version.h
--- qlandkartegt-1.7.7/src/version.h 2014-04-02 19:23:46.000000000 +0200
+++ qlandkartegt-1.7.7_fix/src/version.h 2014-12-30 12:12:17.716747613 +0100
@@ -26,3 +26,5 @@
#define VER_STR _MKSTR(VER_MAJOR)"."_MKSTR(VER_MINOR)"."_MKSTR(VER_STEP)
#define WHAT_STR "QLandkarte GT, Version " VER_STR
#endif //VERSION_H
+
+#define AGENTSTRING "QLandkartGT/" VER_STR " (openSUSE)"
