add app_id support

6 files changed, 52 insertions, 1 deletions

diff --git a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
index c621230a83..f3eea39f92 100755
--- a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
@@ -242,6 +242,13 @@ QGeoMappingManagerEngineNokia::QGeoMappingManagerEngineNokia(const QMap<QString,
         m_logoPosition =  GetLogoPosition(parameters.value("logo.position").toString());
     }
 
+    if (parameters.contains("mapping.app_id")) {
+        m_applicationId = parameters.value("mapping.app_id").toString();
+    }
+    else if (parameters.contains("app_id")) {
+        m_applicationId = parameters.value("app_id").toString();
+    }
+
      setupServiceInfo();
 #ifdef DISK_CACHE_ENABLED
     QString cacheDir;
@@ -371,6 +378,11 @@ QString QGeoMappingManagerEngineNokia::getRequestString(const QGeoTiledMapReques
         requestString += m_referer;
     }
 
+    if (!m_applicationId.isEmpty()) {
+        requestString += "&app_id=";
+        requestString += m_applicationId;
+    }
+
     return requestString;
 }
 
diff --git a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
index 4684cd3932..e7fe8bea9d 100644
--- a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
+++ b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.h
@@ -101,6 +101,7 @@ private:
     QString m_host;
     QString m_token;
     QString m_referer;
+    QString m_applicationId;
     int m_logoPosition;
 
 #ifdef USE_CHINA_NETWORK_REGISTRATION
diff --git a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 53b4629f3d..09dd064518 100644
--- a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -94,6 +94,13 @@ QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(const QMap<QString,
         m_token = parameters.value("token").toString();
     }
 
+    if (parameters.contains("routing.app_id")) {
+        m_applicationId = parameters.value("routing.app_id").toString();
+    }
+    else if (parameters.contains("app_id")) {
+        m_applicationId = parameters.value("app_id").toString();
+    }
+
     setSupportsRouteUpdates(true);
     setSupportsAlternativeRoutes(true);
     setSupportsExcludeAreas(true);
@@ -437,6 +444,11 @@ QString QGeoRoutingManagerEngineNokia::routeRequestString(const QGeoRouteRequest
     requestString += "&language=";
     requestString += locale().name();
 
+    if (!m_applicationId.isEmpty()) {
+        requestString += "&app_id=";
+        requestString += m_applicationId;
+    }
+
     return requestString;
 }
 
diff --git a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index 438078dfb6..7c40798738 100644
--- a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -91,6 +91,8 @@ private:
     QString m_host;
     QString m_token;
     QString m_referer;
+    QString m_applicationId;
+
     bool m_serviceDisabled;
 #ifdef USE_CHINA_NETWORK_REGISTRATION
     QSystemNetworkInfo m_networkInfo;
diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
index a53b10a05c..ea21e65e66 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
@@ -95,6 +95,12 @@ QGeoSearchManagerEngineNokia::QGeoSearchManagerEngineNokia(const QMap<QString, Q
         m_token = parameters.value("token").toString();
     }
 
+    if (parameters.contains("places.app_id")) {
+        m_applicationId = parameters.value("places.app_id").toString();
+    }
+    else if (parameters.contains("app_id")) {
+        m_applicationId = parameters.value("app_id").toString();
+    }
 
     setSupportsGeocoding(true);
     setSupportsReverseGeocoding(true);
@@ -133,6 +139,11 @@ QGeoSearchReply* QGeoSearchManagerEngineNokia::geocode(const QGeoAddress &addres
     if (!m_token.isNull())
         requestString += "&token=" + m_token;
 
+    if (!m_applicationId.isEmpty()) {
+        requestString += "&app_id=";
+        requestString += m_applicationId;
+    }
+
     requestString += "&lg=";
     requestString += languageToMarc(locale().language());
 
@@ -157,7 +168,7 @@ QGeoSearchReply* QGeoSearchManagerEngineNokia::geocode(const QGeoAddress &addres
     if (!address.street().isEmpty()) {
         requestString += "&street=";
         requestString += address.street();
-    }
+    }    
 
     // TODO?
     // street number has been removed from QGeoAddress
@@ -187,6 +198,12 @@ QGeoSearchReply* QGeoSearchManagerEngineNokia::reverseGeocode(const QGeoCoordina
     requestString += "/geocoder/rgc/2.0?referer=" + m_referer;
     if (!m_token.isNull())
         requestString += "&token=" + m_token;
+
+    if (!m_applicationId.isEmpty()) {
+        requestString += "&app_id=";
+        requestString += m_applicationId;
+    }
+
     requestString += "&long=";
     requestString += trimDouble(coordinate.longitude());
     requestString += "&lat=";
@@ -221,6 +238,11 @@ QGeoSearchReply* QGeoSearchManagerEngineNokia::search(const QString &searchStrin
     if (!m_token.isNull())
         requestString += "&token=" + m_token;
 
+    if (!m_applicationId.isEmpty()) {
+        requestString += "&app_id=";
+        requestString += m_applicationId;
+    }
+
     requestString += "&lg=";
     requestString += languageToMarc(locale().language());
 
diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
index 19a252513f..cefa2b70d2 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.h
@@ -97,6 +97,8 @@ private:
     QString m_host;
     QString m_token;
     QString m_referer;
+    QString m_applicationId;
+
 #ifdef USE_CHINA_NETWORK_REGISTRATION
     QSystemNetworkInfo m_networkInfo;
 #endif