Upgraded Nokia Route API from 6.2 to 7.2

Since the 7.2 API supports many more lanugages(23 compared to 4) and is the
only version that supports China it was necessary to upgrade the nokia route
plugin to 7.2.

The major change is that 7.2 does not support multiple mode parameters which
6.2 did. Now if the user selects multiple route optimizations multiple
requests will be made, one for each optimization. Nokia has also reduced
the amount of different route modes, only fastest and shortest are supported
now.

In the response part noting has changed, so no parsing fixes were necessary.

Task-number: QTBUG-24808

Change-Id: I256079f9a1e91e11c961849c95b95b712021ace0
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index 34da6200..42a3c939 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -77,13 +77,14 @@ private Q_SLOTS:
     void routeError(QGeoRouteReply::Error error, const QString &errorString);
 
 private:
-    QString calculateRouteRequestString(const QGeoRouteRequest &request);
-    QString updateRouteRequestString(const QGeoRoute &route, const QGeoCoordinate &position);
+    QStringList calculateRouteRequestString(const QGeoRouteRequest &request);
+    QStringList updateRouteRequestString(const QGeoRoute &route, const QGeoCoordinate &position);
     QString routeRequestString(const QGeoRouteRequest &request) const;
     bool checkEngineSupport(const QGeoRouteRequest &request,
                             QGeoRouteRequest::TravelModes travelModes) const;
     QString modesRequestString(const QGeoRouteRequest &request,
-                               QGeoRouteRequest::TravelModes travelModes) const;
+                               QGeoRouteRequest::TravelModes travelModes,
+                               const QString &optimization) const;
     static QString trimDouble(double degree, int decimalDigits = 10);
 
     QGeoNetworkAccessManager *m_networkManager;