summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@theqtcompany.com>2016-09-27 18:45:49 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2016-10-06 08:33:06 +0000
commita7c7a9bfc1f1d75f23f1e67ba3859e698e2e8965 (patch)
treebc7855bd5807a69a443f113038b74a19c5696108 /src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
parent26b2f917861e63091cf97a5acba04d7b813c2fed (diff)
downloadqtlocation-a7c7a9bfc1f1d75f23f1e67ba3859e698e2e8965.tar.gz
Add OSRMv5 support in osm plugin
This patch adds support for the OSRMv5 protocol (the only one currently available on the OSRM demo server router.project.osrm.org). Support for the old v4 protocol is retained, in case of users who supply their own osm.routing.host parameter pointing at a self hosted OSRMv4 server. The support for OSRMv4 and v5 has been moved away from the osm plugin and into the location module because this should be used in the mapbox plugin in a subsequent patch (the routing support in the mapbox plugin currently uses the text direction coming from the server, which does not support i18n) Task-number: QTBUG-56119 Change-Id: Id30fd536c7fd434011795f643221f55becfc9e18 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
Diffstat (limited to 'src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h')
-rw-r--r--src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
index 618ef900..8ffba6e3 100644
--- a/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
+++ b/src/plugins/geoservices/osm/qgeoroutingmanagerengineosm.h
@@ -36,6 +36,7 @@
#include <QtLocation/QGeoServiceProvider>
#include <QtLocation/QGeoRoutingManagerEngine>
+#include <QtLocation/private/qgeorouteparser_p.h>
QT_BEGIN_NAMESPACE
@@ -52,6 +53,7 @@ public:
~QGeoRoutingManagerEngineOsm();
QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request);
+ const QGeoRouteParser *routeParser() const;
private Q_SLOTS:
void replyFinished();
@@ -59,6 +61,7 @@ private Q_SLOTS:
private:
QNetworkAccessManager *m_networkManager;
+ QGeoRouteParser *m_routeParser;
QByteArray m_userAgent;
QString m_urlPrefix;
};