nokia plugin: add search china url for shifting

2 files changed, 23 insertions, 0 deletions

diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
index 04db58be18..5ca882deac 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
@@ -108,6 +108,11 @@ QGeoSearchManagerEngineNokia::QGeoSearchManagerEngineNokia(const QMap<QString, Q
 
     if (errorString)
         *errorString = "";
+#ifdef USE_CHINA_NETWORK_REGISTRATION
+    connect(&m_networkInfo, SIGNAL(currentMobileCountryCodeChanged(const QString&)), SLOT(currentMobileCountryCodeChanged(const QString&)));
+    currentMobileCountryCodeChanged(m_networkInfo.currentMobileCountryCode());
+#endif
+
 }
 
 QGeoSearchManagerEngineNokia::~QGeoSearchManagerEngineNokia() {}
@@ -297,3 +302,13 @@ void QGeoSearchManagerEngineNokia::placesError(QGeoSearchReply::Error error, con
 
     emit this->error(reply, error, errorString);
 }
+
+void QGeoSearchManagerEngineNokia::currentMobileCountryCodeChanged(const QString & mcc)
+{
+    if(mcc == "460" || mcc == "461"){
+        m_host="pr.geo.maps.svc.ovi.com.cn";
+    }
+     else{
+        m_host ="loc.desktop.maps.svc.ovi.com";
+    }
+}
diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
index 5fad069c91..19a252513f 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
@@ -57,6 +57,10 @@
 #include <QNetworkAccessManager>
 #include <QLocale>
 
+#ifdef  USE_CHINA_NETWORK_REGISTRATION
+#include "../../../src/systeminfo/qsystemnetworkinfo.h"
+#endif
+
 
 QTM_USE_NAMESPACE
 
@@ -83,6 +87,7 @@ public:
 private slots:
     void placesFinished();
     void placesError(QGeoSearchReply::Error error, const QString &errorString);
+    void currentMobileCountryCodeChanged(const QString& mcc);
 
 private:
     static QString trimDouble(double degree, int decimalDigits = 10);
@@ -92,6 +97,9 @@ private:
     QString m_host;
     QString m_token;
     QString m_referer;
+#ifdef USE_CHINA_NETWORK_REGISTRATION
+    QSystemNetworkInfo m_networkInfo;
+#endif
 };
 
 #endif