Merge 5.12 into 5.12.1

Change-Id: Ib65445a9e316252e7483d2878b8cdad252242177

1 files changed, 7 insertions, 1 deletions

diff --git a/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.cpp b/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.cpp
index e8db635f..29cf0167 100644
--- a/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.cpp
+++ b/src/plugins/geoservices/mapbox/qgeoroutingmanagerenginemapbox.cpp
@@ -238,7 +238,13 @@ QGeoRoutingManagerEngineMapbox::QGeoRoutingManagerEngineMapbox(const QVariantMap
 
     QGeoRouteParserOsrmV5 *parser = new QGeoRouteParserOsrmV5(this);
     parser->setExtension(new QGeoRouteParserOsrmV5ExtensionMapbox(m_accessToken, use_mapbox_text_instructions));
-
+    if (parameters.contains(QStringLiteral("mapbox.routing.traffic_side"))) {
+        QString trafficSide = parameters.value(QStringLiteral("mapbox.routing.traffic_side")).toString();
+        if (trafficSide == QStringLiteral("right"))
+            parser->setTrafficSide(QGeoRouteParser::RightHandTraffic);
+        else if (trafficSide == QStringLiteral("left"))
+            parser->setTrafficSide(QGeoRouteParser::LeftHandTraffic);
+    }
     m_routeParser = parser;
 
     *error = QGeoServiceProvider::NoError;