The Nokia plugin now handles cases where no route can be found.

Change-Id: I5908170d63e9eb63b4dfd72268fa6b82d468bf82
Reviewed-by: Cristian Adam <cristian.adam@nokia.com>
Reviewed-by: Alex <alex.blasche@nokia.com>

2 files changed, 20 insertions, 1 deletions

diff --git a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
index a0db40dd..a41d7016 100644
--- a/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutereply_nokia.cpp
@@ -117,7 +117,19 @@ void QGeoRouteReplyNokia::networkError(QNetworkReply::NetworkError error)
     if (!m_reply)
         return;
 
-    setError(QGeoRouteReply::CommunicationError, m_reply->errorString());
+    bool resolvedError = false;
+
+    if (QNetworkReply::UnknownContentError == error) {
+        QGeoRouteXmlParser parser(request());
+        if (parser.parse(m_reply)) {
+            setRoutes(parser.results());
+            setFinished(true);
+            resolvedError = true;
+        }
+    }
+
+    if (!resolvedError)
+        setError(QGeoRouteReply::CommunicationError, m_reply->errorString());
 
     m_reply->deleteLater();
     m_reply = 0;
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
index ca5967ff..223fa733 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
@@ -100,6 +100,13 @@ bool QGeoRouteXmlParser::parseRootElement()
         return false;
     }
 
+    if (m_reader->name() == QLatin1String("Error")) {
+        QXmlStreamAttributes attributes = m_reader->attributes();
+        if (attributes.value(QLatin1String("type")) == QLatin1String("ApplicationError")
+            && attributes.value("subtype") == QLatin1String("NoRouteFound"))
+            return true;
+    }
+
     bool updateroute = false;
     if (m_reader->name() != "CalculateRoute" && m_reader->name() != "GetRoute")  {
         m_reader->raiseError(QString("The root element is expected to have the name \"CalculateRoute\" or \"GetRoute\" (root element was named \"%1\").").arg(m_reader->name().toString()));