Updated to version 2.0 of the search server.

2 files changed, 9 insertions, 9 deletions

diff --git a/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/plugins/geoservices/nokia/qgeocodexmlparser.cpp
index 3e86b06e25..51b0565753 100644
--- a/plugins/geoservices/nokia/qgeocodexmlparser.cpp
+++ b/plugins/geoservices/nokia/qgeocodexmlparser.cpp
@@ -456,11 +456,11 @@ bool QGeoCodeXmlParser::parseBoundingBox(QGeoBoundingBox *bounds)
 
     QGeoCoordinate nw;
 
-    if (m_reader->name() == "northWest") {
-        if (!parseCoordinate(&nw, "northWest"))
+    if (m_reader->name() == "topLeft") {
+        if (!parseCoordinate(&nw, "topLeft"))
             return false;
     } else {
-        m_reader->raiseError(QString("The element \"boundingBox\" expected this child element to be named \"northWest\" (found an element named \"%1\")").arg(m_reader->name().toString()));
+        m_reader->raiseError(QString("The element \"boundingBox\" expected this child element to be named \"topLeft\" (found an element named \"%1\")").arg(m_reader->name().toString()));
         return false;
     }
 
@@ -471,11 +471,11 @@ bool QGeoCodeXmlParser::parseBoundingBox(QGeoBoundingBox *bounds)
 
     QGeoCoordinate se;
 
-    if (m_reader->name() == "southEast") {
-        if (!parseCoordinate(&se, "southEast"))
+    if (m_reader->name() == "bottomRight") {
+        if (!parseCoordinate(&se, "bottomRight"))
             return false;
     } else {
-        m_reader->raiseError(QString("The element \"boundingBox\" expected this child element to be named \"southEast\" (found an element named \"%1\")").arg(m_reader->name().toString()));
+        m_reader->raiseError(QString("The element \"boundingBox\" expected this child element to be named \"bottomRight\" (found an element named \"%1\")").arg(m_reader->name().toString()));
         return false;
     }
 
diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
index 5ca882deac..a53b10a05c 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
@@ -128,7 +128,7 @@ QGeoSearchReply* QGeoSearchManagerEngineNokia::geocode(const QGeoAddress &addres
 
     QString requestString = "http://";
     requestString += m_host;
-    requestString += "/geocoder/gc/1.0?referer=" + m_referer;
+    requestString += "/geocoder/gc/2.0?referer=" + m_referer;
 
     if (!m_token.isNull())
         requestString += "&token=" + m_token;
@@ -184,7 +184,7 @@ QGeoSearchReply* QGeoSearchManagerEngineNokia::reverseGeocode(const QGeoCoordina
 
     QString requestString = "http://";
     requestString += m_host;
-    requestString += "/geocoder/rgc/1.0?referer=" + m_referer;
+    requestString += "/geocoder/rgc/2.0?referer=" + m_referer;
     if (!m_token.isNull())
         requestString += "&token=" + m_token;
     requestString += "&long=";
@@ -216,7 +216,7 @@ QGeoSearchReply* QGeoSearchManagerEngineNokia::search(const QString &searchStrin
 
     QString requestString = "http://";
     requestString += m_host;
-    requestString += "/geocoder/gc/1.0?referer=" + m_referer;
+    requestString += "/geocoder/gc/2.0?referer=" + m_referer;
 
     if (!m_token.isNull())
         requestString += "&token=" + m_token;