From 689e755efcb72bdc4b8891af1d9a5fc227e22f8f Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Wed, 18 Nov 2015 11:06:59 +1000 Subject: Fix route requests with excluded areas Due to a typo in the loop condition excluded areas were excluded from the generated request string. [ChangeLog][QtLocation][Here plugin] Fix route requests with excluded areas. Change-Id: I3f5d5bb7b4b9ab660dc0288f0ed54d02a1e7068b Reviewed-by: Alex Blasche --- .../geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index af6cbcf0..a33d1ba8 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -376,18 +376,15 @@ QString QGeoRoutingManagerEngineNokia::routeRequestString(const QGeoRouteRequest { QString requestString; - const QList excludeAreas = request.excludeAreas(); - QList::const_iterator beg = excludeAreas.begin(); - QList::const_iterator end = excludeAreas.begin(); - for (QList::const_iterator it = beg; it != end; ++it) { + foreach (const QGeoRectangle &area, request.excludeAreas()) { requestString += QLatin1String("&avoidareas="); - requestString += trimDouble(it->topLeft().latitude()); + requestString += trimDouble(area.topLeft().latitude()); requestString += QLatin1String(","); - requestString += trimDouble(it->topLeft().longitude()); + requestString += trimDouble(area.topLeft().longitude()); requestString += QLatin1String(";"); - requestString += trimDouble(it->bottomRight().latitude()); + requestString += trimDouble(area.bottomRight().latitude()); requestString += QLatin1String(","); - requestString += trimDouble(it->bottomRight().longitude()); + requestString += trimDouble(area.bottomRight().longitude()); } // TODO: work out what was going on here -- cgit v1.2.1