summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp12
-rw-r--r--src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp2
-rw-r--r--src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp6
-rw-r--r--src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp17
-rw-r--r--src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp16
-rw-r--r--src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp8
-rw-r--r--src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp6
7 files changed, 35 insertions, 32 deletions
diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
index 055beec9..2e0eae42 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
@@ -56,18 +56,16 @@ QGeoCodingManagerEngineNokia::QGeoCodingManagerEngineNokia(
QString *errorString)
: QGeoCodingManagerEngine(parameters)
, m_networkManager(networkManager)
- , m_uriProvider(new QGeoUriProvider(this, parameters, "geocoding.host", GEOCODING_HOST, GEOCODING_HOST_CN))
+ , m_uriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.geocoding.host"), GEOCODING_HOST, GEOCODING_HOST_CN))
{
Q_ASSERT(networkManager);
m_networkManager->setParent(this);
- if (parameters.contains("token")) {
- m_token = parameters.value("token").toString();
- }
+ if (parameters.contains(QStringLiteral("here.token")))
+ m_token = parameters.value(QStringLiteral("here.token")).toString();
- if (parameters.contains("app_id")) {
- m_applicationId = parameters.value("app_id").toString();
- }
+ if (parameters.contains(QStringLiteral("here.app_id")))
+ m_applicationId = parameters.value(QStringLiteral("here.app_id")).toString();
if (error)
*error = QGeoServiceProvider::NoError;
diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
index 6ae7ca28..267c4cae 100644
--- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
+++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
@@ -59,7 +59,7 @@ QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(const QVari
void QGeoIntrinsicNetworkAccessManager::configure(const QVariantMap &parameters)
{
- QString proxy = parameters.value(QStringLiteral("proxy")).toString();
+ QString proxy = parameters.value(QStringLiteral("here.proxy")).toString();
if (proxy.isEmpty() && !m_customProxyToken.isEmpty())
proxy = parameters.value(m_customProxyToken).toString();
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 921d2487..af6cbcf0 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -54,14 +54,14 @@ QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(
QString *errorString)
: QGeoRoutingManagerEngine(parameters)
, m_networkManager(networkManager)
- , m_uriProvider(new QGeoUriProvider(this, parameters, "routing.host", ROUTING_HOST))
+ , m_uriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.routing.host"), ROUTING_HOST))
{
Q_ASSERT(networkManager);
m_networkManager->setParent(this);
- m_appId = parameters.value(QStringLiteral("app_id")).toString();
- m_token = parameters.value(QStringLiteral("token")).toString();
+ m_appId = parameters.value(QStringLiteral("here.app_id")).toString();
+ m_token = parameters.value(QStringLiteral("here.token")).toString();
QGeoRouteRequest::FeatureTypes featureTypes;
featureTypes |= QGeoRouteRequest::TollFeature;
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index 0192b6ce..f6d05c36 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -75,14 +75,19 @@ namespace
void checkUsageTerms(const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString)
{
- const QString appId = parameters.value(QStringLiteral("app_id")).toString();
- const QString token = parameters.value(QStringLiteral("token")).toString();
+ QString appId, token;
- if (!isValidParameter(appId) || !isValidParameter(token)) {
+ appId = parameters.value(QStringLiteral("here.app_id")).toString();
+ token = parameters.value(QStringLiteral("here.token")).toString();
- *error = QGeoServiceProvider::MissingRequiredParameterError;
- *errorString = QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, MISSED_CREDENTIALS);
- }
+ if (isValidParameter(appId) && isValidParameter(token))
+ return;
+
+ if (parameters.contains(QStringLiteral("app_id")) || parameters.contains(QStringLiteral("token")))
+ qWarning() << QStringLiteral("Please prefix 'app_id' and 'token' with prefix 'here' (e.g.: 'here.app_id')");
+
+ *error = QGeoServiceProvider::MissingRequiredParameterError;
+ *errorString = QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, MISSED_CREDENTIALS);
}
template<class TInstance>
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index f96e0a74..0074fca9 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -102,8 +102,8 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
// don't need this boilerplate or hardcode plugin name
QString cacheDir;
- if (parameters.contains(QStringLiteral("mapping.cache.directory"))) {
- cacheDir = parameters.value(QStringLiteral("mapping.cache.directory")).toString();
+ if (parameters.contains(QStringLiteral("here.mapping.cache.directory"))) {
+ cacheDir = parameters.value(QStringLiteral("here.mapping.cache.directory")).toString();
} else {
// managerName() is not yet set, we have to hardcode the plugin name below
cacheDir = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)
@@ -112,23 +112,23 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
QGeoTileCache *tileCache = createTileCacheWithDir(cacheDir);
- if (parameters.contains(QStringLiteral("mapping.cache.disk.size"))) {
+ if (parameters.contains(QStringLiteral("here.mapping.cache.disk.size"))) {
bool ok = false;
- int cacheSize = parameters.value(QStringLiteral("mapping.cache.disk.size")).toString().toInt(&ok);
+ int cacheSize = parameters.value(QStringLiteral("here.mapping.cache.disk.size")).toString().toInt(&ok);
if (ok)
tileCache->setMaxDiskUsage(cacheSize);
}
- if (parameters.contains(QStringLiteral("mapping.cache.memory.size"))) {
+ if (parameters.contains(QStringLiteral("here.mapping.cache.memory.size"))) {
bool ok = false;
- int cacheSize = parameters.value(QStringLiteral("mapping.cache.memory.size")).toString().toInt(&ok);
+ int cacheSize = parameters.value(QStringLiteral("here.mapping.cache.memory.size")).toString().toInt(&ok);
if (ok)
tileCache->setMaxMemoryUsage(cacheSize);
}
- if (parameters.contains(QStringLiteral("mapping.cache.texture.size"))) {
+ if (parameters.contains(QStringLiteral("here.mapping.cache.texture.size"))) {
bool ok = false;
- int cacheSize = parameters.value(QStringLiteral("mapping.cache.texture.size")).toString().toInt(&ok);
+ int cacheSize = parameters.value(QStringLiteral("here.mapping.cache.texture.size")).toString().toInt(&ok);
if (ok)
tileCache->setExtraTextureUsage(cacheSize);
}
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index 0e76fbdf..50acc2a0 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -77,14 +77,14 @@ QGeoTileFetcherNokia::QGeoTileFetcherNokia(const QVariantMap &parameters,
const QSize &tileSize)
: QGeoTileFetcher(engine), m_engineNokia(engine), m_networkManager(networkManager),
m_tileSize(tileSize), m_copyrightsReply(0),
- m_baseUriProvider(new QGeoUriProvider(this, parameters, "mapping.host", MAP_TILES_HOST)),
- m_aerialUriProvider(new QGeoUriProvider(this, parameters, "mapping.host.aerial", MAP_TILES_HOST_AERIAL))
+ m_baseUriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.mapping.host"), MAP_TILES_HOST)),
+ m_aerialUriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.mapping.host.aerial"), MAP_TILES_HOST_AERIAL))
{
Q_ASSERT(networkManager);
m_networkManager->setParent(this);
- m_applicationId = parameters.value(QStringLiteral("app_id")).toString();
- m_token = parameters.value(QStringLiteral("token")).toString();
+ m_applicationId = parameters.value(QStringLiteral("here.app_id")).toString();
+ m_token = parameters.value(QStringLiteral("here.token")).toString();
}
QGeoTileFetcherNokia::~QGeoTileFetcherNokia()
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
index 52a3eaaf..ac20c262 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
@@ -200,15 +200,15 @@ QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2(
QString *errorString)
: QPlaceManagerEngine(parameters)
, m_manager(networkManager)
- , m_uriProvider(new QGeoUriProvider(this, parameters, "places.host", PLACES_HOST, PLACES_HOST_CN))
+ , m_uriProvider(new QGeoUriProvider(this, parameters, QStringLiteral("here.places.host"), PLACES_HOST, PLACES_HOST_CN))
{
Q_ASSERT(networkManager);
m_manager->setParent(this);
m_locales.append(QLocale());
- m_appId = parameters.value(QStringLiteral("app_id")).toString();
- m_appCode = parameters.value(QStringLiteral("token")).toString();
+ m_appId = parameters.value(QStringLiteral("here.app_id")).toString();
+ m_appCode = parameters.value(QStringLiteral("here.token")).toString();
m_theme = parameters.value(IconThemeKey, QString()).toString();