diff options
Diffstat (limited to 'src/plugins/geoservices/nokia')
19 files changed, 113 insertions, 103 deletions
diff --git a/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp b/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp index 1a18d15d..ac294d6e 100644 --- a/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp +++ b/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp @@ -200,6 +200,7 @@ QPlaceEditorial parseEditorial(const QJsonObject &editorialObject, void parseCollection(QPlaceContent::Type type, const QJsonObject &object, QPlaceContent::Collection *collection, int *totalCount, + QPlaceContentRequest *previous, QPlaceContentRequest *next, const QPlaceManagerEngineNokiaV2 *engine) { Q_ASSERT(engine); @@ -211,6 +212,16 @@ void parseCollection(QPlaceContent::Type type, const QJsonObject &object, if (object.contains(QLatin1String("offset"))) offset = object.value(QLatin1String("offset")).toDouble(); + if (previous && object.contains(QStringLiteral("previous"))) { + previous->setContentType(type); + previous->setContentContext(QUrl(object.value(QStringLiteral("previous")).toString())); + } + + if (next && object.contains(QStringLiteral("next"))) { + next->setContentType(type); + next->setContentContext(QUrl(object.value(QStringLiteral("next")).toString())); + } + if (collection) { QJsonArray items = object.value(QLatin1String("items")).toArray(); for (int i = 0; i < items.count(); ++i) { diff --git a/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.h b/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.h index 092addb9..ef01de19 100644 --- a/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.h +++ b/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.h @@ -54,6 +54,7 @@ class QPlaceImage; class QPlaceReview; class QPlaceEditorial; class QPlaceCategory; +class QPlaceContentRequest; class QPlaceManagerEngineNokiaV2; QGeoCoordinate parseCoordinate(const QJsonArray &coordinateArray); @@ -74,6 +75,7 @@ QPlaceEditorial parseEditorial(const QJsonObject &editorialObject, void parseCollection(QPlaceContent::Type type, const QJsonObject &object, QPlaceContent::Collection *collection, int *totalCount, + QPlaceContentRequest *previous, QPlaceContentRequest *next, const QPlaceManagerEngineNokiaV2 *engine); QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp index e47bd4d5..1b5a1776 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacecontentreplyimpl.cpp @@ -94,22 +94,29 @@ void QPlaceContentReplyImpl::setError(QPlaceReply::Error error_, const QString & void QPlaceContentReplyImpl::replyFinished() { - QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll()); - if (!document.isObject()) { - setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR)); - return; + if (m_reply->isOpen()) { + QJsonDocument document = QJsonDocument::fromJson(m_reply->readAll()); + if (!document.isObject()) { + setError(ParseError, QCoreApplication::translate(NOKIA_PLUGIN_CONTEXT_NAME, PARSE_ERROR)); + return; + } + + QJsonObject object = document.object(); + + QPlaceContent::Collection collection; + int totalCount; + QPlaceContentRequest previous; + QPlaceContentRequest next; + + parseCollection(request().contentType(), object, &collection, &totalCount, + &previous, &next, m_engine); + + setTotalCount(totalCount); + setContent(collection); + setPreviousPageRequest(previous); + setNextPageRequest(next); } - QJsonObject object = document.object(); - - QPlaceContent::Collection collection; - int totalCount; - - parseCollection(request().contentType(), object, &collection, &totalCount, m_engine); - - setTotalCount(totalCount); - setContent(collection); - m_reply->deleteLater(); m_reply = 0; diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp index fda0c776..a5386341 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp @@ -307,7 +307,7 @@ void QPlaceDetailsReplyImpl::replyFinished() parseCollection(QPlaceContent::ImageType, mediaObject.value(QLatin1String("images")).toObject(), - &collection, &totalCount, m_engine); + &collection, &totalCount, 0, 0, m_engine); place.setTotalContentCount(QPlaceContent::ImageType, totalCount); place.setContent(QPlaceContent::ImageType, collection); @@ -318,7 +318,7 @@ void QPlaceDetailsReplyImpl::replyFinished() parseCollection(QPlaceContent::EditorialType, mediaObject.value(QLatin1String("editorials")).toObject(), - &collection, &totalCount, m_engine); + &collection, &totalCount, 0, 0, m_engine); place.setTotalContentCount(QPlaceContent::EditorialType, totalCount); place.setContent(QPlaceContent::EditorialType, collection); @@ -329,7 +329,7 @@ void QPlaceDetailsReplyImpl::replyFinished() parseCollection(QPlaceContent::ReviewType, mediaObject.value(QLatin1String("reviews")).toObject(), - &collection, &totalCount, m_engine); + &collection, &totalCount, 0, 0, m_engine); place.setTotalContentCount(QPlaceContent::ReviewType, totalCount); place.setContent(QPlaceContent::ReviewType, collection); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp index 7bd20599..3b43c357 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp @@ -121,11 +121,11 @@ void QPlaceSearchReplyImpl::replyFinished() return; } - QJsonObject object = document.object(); + QJsonObject resultsObject = document.object(); - //QJsonObject searchObject = object.value(QLatin1String("search")).toObject(); + if (resultsObject.contains(QStringLiteral("results"))) + resultsObject = resultsObject.value(QStringLiteral("results")).toObject(); - QJsonObject resultsObject = object.value(QLatin1String("results")).toObject(); QJsonArray items = resultsObject.value(QLatin1String("items")).toArray(); QList<QPlaceSearchResult> results; @@ -139,6 +139,18 @@ void QPlaceSearchReplyImpl::replyFinished() results.append(parseSearchResult(item)); } + if (resultsObject.contains(QStringLiteral("next"))) { + QPlaceSearchRequest request; + request.setSearchContext(QUrl(resultsObject.value(QStringLiteral("next")).toString())); + setNextPageRequest(request); + } + + if (resultsObject.contains(QStringLiteral("previous"))) { + QPlaceSearchRequest request; + request.setSearchContext(QUrl(resultsObject.value(QStringLiteral("previous")).toString())); + setPreviousPageRequest(request); + } + setResults(results); m_reply->deleteLater(); diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp index d00f4fb9..cbdf98f2 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE QGeoCodingManagerEngineNokia::QGeoCodingManagerEngineNokia( QGeoNetworkAccessManager *networkManager, - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoCodingManagerEngine(parameters) diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h index 6b9bf1e2..b4e5c75d 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h @@ -66,7 +66,7 @@ class QGeoCodingManagerEngineNokia : public QGeoCodingManagerEngine Q_OBJECT public: QGeoCodingManagerEngineNokia(QGeoNetworkAccessManager *networkManager, - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeoCodingManagerEngineNokia(); diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp index 42da0070..69f3c9c9 100644 --- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp +++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp @@ -54,7 +54,7 @@ QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(QObject *pa { } -QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(const QMap<QString, QVariant> ¶meters, const QString &token, QObject *parent) +QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(const QVariantMap ¶meters, const QString &token, QObject *parent) : QGeoNetworkAccessManager(parent) , m_customProxyToken(token) , m_networkManager(new QNetworkAccessManager(this)) @@ -62,7 +62,7 @@ QGeoIntrinsicNetworkAccessManager::QGeoIntrinsicNetworkAccessManager(const QMap< configure(parameters); } -void QGeoIntrinsicNetworkAccessManager::configure(const QMap<QString, QVariant> ¶meters) +void QGeoIntrinsicNetworkAccessManager::configure(const QVariantMap ¶meters) { QString proxy = parameters.value(QStringLiteral("proxy")).toString(); if (proxy.isEmpty() && !m_customProxyToken.isEmpty()) diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h index 18f655f6..72ae2990 100644 --- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h +++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h @@ -54,13 +54,13 @@ class QGeoIntrinsicNetworkAccessManager : public QGeoNetworkAccessManager { public: explicit QGeoIntrinsicNetworkAccessManager(QObject *parent = 0); - QGeoIntrinsicNetworkAccessManager(const QMap<QString, QVariant> ¶meters, const QString &token = QString(), QObject *parent = 0); + QGeoIntrinsicNetworkAccessManager(const QVariantMap ¶meters, const QString &token = QString(), QObject *parent = 0); virtual QNetworkReply *get(const QNetworkRequest &request); virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data); private: - void configure(const QMap<QString, QVariant> ¶meters); + void configure(const QVariantMap ¶meters); const QString m_customProxyToken; QNetworkAccessManager *m_networkManager; diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index 9bd60155..4380494a 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia( QGeoNetworkAccessManager *networkManager, - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoRoutingManagerEngine(parameters) @@ -442,14 +442,14 @@ QString QGeoRoutingManagerEngineNokia::routeRequestString(const QGeoRouteRequest requestString += "&instructionformat=text"; - const QLocale loc(locale()); - requestString += "&metricSystem="; - if (QLocale::MetricSystem == loc.measurementSystem()) + if (QLocale::MetricSystem == measurementSystem()) requestString += "metric"; else requestString += "imperial"; + const QLocale loc(locale()); + if (QLocale::C != loc.language() && QLocale::AnyLanguage != loc.language()) { requestString += "&language="; requestString += loc.name(); diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h index 42a3c939..cf9caab0 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h @@ -64,7 +64,7 @@ class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine Q_OBJECT public: QGeoRoutingManagerEngineNokia(QGeoNetworkAccessManager *networkInterface, - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeoRoutingManagerEngineNokia(); diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index fbffcc5e..1c7c12e5 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( QGeoNetworkAccessManager *networkManager, - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QGeoTiledMappingManagerEngine() diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h index 3ba30d90..56af20c4 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h @@ -71,7 +71,7 @@ class QGeoTiledMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine public: QGeoTiledMappingManagerEngineNokia(QGeoNetworkAccessManager *networkManager, - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QGeoTiledMappingManagerEngineNokia(); diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp index 31fa12e0..13616dbe 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp @@ -110,7 +110,7 @@ namespace } } QGeoTileFetcherNokia::QGeoTileFetcherNokia( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoNetworkAccessManager *networkManager, QGeoTiledMappingManagerEngine *engine, const QSize &tileSize) diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h index 534dfddb..2d9c385f 100644 --- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h @@ -69,7 +69,7 @@ class QGeoTileFetcherNokia : public QGeoTileFetcher public: QGeoTileFetcherNokia( - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoNetworkAccessManager *networkManager, QGeoTiledMappingManagerEngine *engine, const QSize &tileSize); @@ -96,7 +96,7 @@ private: QPointer<QGeoTiledMappingManagerEngineNokia> m_engineNokia; QGeoNetworkAccessManager *m_networkManager; - QMap<QString, QVariant> m_parameters; + QVariantMap m_parameters; QSize m_tileSize; QString m_token; QNetworkReply *m_copyrightsReply; diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.cpp b/src/plugins/geoservices/nokia/qgeouriprovider.cpp index 0ce3611e..77c47b03 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.cpp +++ b/src/plugins/geoservices/nokia/qgeouriprovider.cpp @@ -68,7 +68,7 @@ namespace QGeoUriProvider::QGeoUriProvider( QObject *parent, - const QMap<QString, QVariant> & parameters, + const QVariantMap ¶meters, const QString &hostParameterName, const QString &internationalHost, const QString &localizedHost) diff --git a/src/plugins/geoservices/nokia/qgeouriprovider.h b/src/plugins/geoservices/nokia/qgeouriprovider.h index d9f3e570..82f2bb45 100644 --- a/src/plugins/geoservices/nokia/qgeouriprovider.h +++ b/src/plugins/geoservices/nokia/qgeouriprovider.h @@ -62,7 +62,7 @@ class QGeoUriProvider : public QObject public: QGeoUriProvider(QObject *parent, - const QMap<QString, QVariant> & parameters, + const QVariantMap ¶meters, const QString &hostParameterName, const QString &internationalHost, const QString &localizedHost = QString()); diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index 9c2a9b85..5543d001 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -198,7 +198,7 @@ void CategoryParser::processCategory(int level, const QString &id, const QString QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2( QGeoNetworkAccessManager *networkManager, - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString) : QPlaceManagerEngine(parameters) @@ -261,75 +261,63 @@ QPlaceDetailsReply *QPlaceManagerEngineNokiaV2::getPlaceDetails(const QString &p return reply; } -QPlaceContentReply *QPlaceManagerEngineNokiaV2::getPlaceContent(const QString &placeId, - const QPlaceContentRequest &request) +QPlaceContentReply *QPlaceManagerEngineNokiaV2::getPlaceContent(const QPlaceContentRequest &request) { - QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + - QLatin1String("/places/v1/places/") + placeId + QLatin1String("/media/")); - QNetworkReply *networkReply = 0; - QUrlQuery queryItems; + if (request.contentContext().userType() == qMetaTypeId<QUrl>()) { + QUrl u = request.contentContext().value<QUrl>(); - switch (request.contentType()) { - case QPlaceContent::ImageType: - requestUrl.setPath(requestUrl.path() + QLatin1String("images")); + networkReply = sendRequest(u); + } else { + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/places/") + request.placeId() + + QLatin1String("/media/")); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + QUrlQuery queryItems; - if (request.limit() > 0) { - queryItems.addQueryItem(QLatin1String("size"), - QString::number(request.limit())); - } - if (request.offset() > -1) { - queryItems.addQueryItem(QLatin1String("offset"), - QString::number(request.offset())); - } + switch (request.contentType()) { + case QPlaceContent::ImageType: + requestUrl.setPath(requestUrl.path() + QLatin1String("images")); - //queryItems.append(qMakePair<QString, QString>(QLatin1String("image_dimensions"), QLatin1String("w64-h64,w100"))); + queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); - requestUrl.setQuery(queryItems); + if (request.limit() > 0) + queryItems.addQueryItem(QLatin1String("size"), QString::number(request.limit())); - networkReply = sendRequest(requestUrl); - break; - case QPlaceContent::ReviewType: - requestUrl.setPath(requestUrl.path() + QLatin1String("reviews")); + //queryItems.append(qMakePair<QString, QString>(QLatin1String("image_dimensions"), QLatin1String("w64-h64,w100"))); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + requestUrl.setQuery(queryItems); - if (request.limit() > 0) { - queryItems.addQueryItem(QLatin1String("size"), - QString::number(request.limit())); - } - if (request.offset() > -1) { - queryItems.addQueryItem(QLatin1String("offset"), - QString::number(request.offset())); - } + networkReply = sendRequest(requestUrl); + break; + case QPlaceContent::ReviewType: + requestUrl.setPath(requestUrl.path() + QLatin1String("reviews")); - requestUrl.setQuery(queryItems); + queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); - networkReply = sendRequest(requestUrl); - break; - case QPlaceContent::EditorialType: - requestUrl.setPath(requestUrl.path() + QLatin1String("editorials")); + if (request.limit() > 0) + queryItems.addQueryItem(QLatin1String("size"), QString::number(request.limit())); - queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); + requestUrl.setQuery(queryItems); - if (request.limit() > 0) { - queryItems.addQueryItem(QLatin1String("size"), - QString::number(request.limit())); - } - if (request.offset() > -1) { - queryItems.addQueryItem(QLatin1String("offset"), - QString::number(request.offset())); - } + networkReply = sendRequest(requestUrl); + break; + case QPlaceContent::EditorialType: + requestUrl.setPath(requestUrl.path() + QLatin1String("editorials")); - requestUrl.setQuery(queryItems); + queryItems.addQueryItem(QLatin1String("tf"), QLatin1String("html")); - networkReply = sendRequest(requestUrl); - break; - case QPlaceContent::NoType: - ; + if (request.limit() > 0) + queryItems.addQueryItem(QLatin1String("size"), QString::number(request.limit())); + + requestUrl.setQuery(queryItems); + + networkReply = sendRequest(requestUrl); + break; + case QPlaceContent::NoType: + ; + } } QPlaceContentReply *reply = new QPlaceContentReplyImpl(request, networkReply, this); @@ -379,8 +367,6 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest unsupported |= query.visibilityScope() != QLocation::UnspecifiedVisibility && query.visibilityScope() != QLocation::PublicVisibility; - unsupported |= !query.searchTerm().isEmpty() && query.offset() > 0; - // Both a search term and search categories are not supported. unsupported |= !query.searchTerm().isEmpty() && !query.categories().isEmpty(); @@ -432,9 +418,6 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest if (query.limit() > 0) queryItems.addQueryItem(QStringLiteral("size"), QString::number(query.limit())); - if (query.offset() > -1) - queryItems.addQueryItem(QStringLiteral("offset"), QString::number(query.offset())); - u.setQuery(queryItems); networkReply = sendRequest(u); @@ -493,10 +476,6 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest queryItems.addQueryItem(QLatin1String("size"), QString::number(query.limit())); } - if (query.offset() > -1) { - queryItems.addQueryItem(QLatin1String("offset"), - QString::number(query.offset())); - } requestUrl.setQuery(queryItems); @@ -518,7 +497,6 @@ QPlaceSearchSuggestionReply *QPlaceManagerEngineNokiaV2::searchSuggestions(const unsupported |= query.visibilityScope() != QLocation::UnspecifiedVisibility && query.visibilityScope() != QLocation::PublicVisibility; - unsupported |= query.offset() > 0; unsupported |= !query.categories().isEmpty(); unsupported |= !query.recommendationId().isEmpty(); diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h index 6b31e165..c186d6bd 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h @@ -78,14 +78,14 @@ class QPlaceManagerEngineNokiaV2 : public QPlaceManagerEngine public: QPlaceManagerEngineNokiaV2(QGeoNetworkAccessManager *networkManager, - const QMap<QString, QVariant> ¶meters, + const QVariantMap ¶meters, QGeoServiceProvider::Error *error, QString *errorString); ~QPlaceManagerEngineNokiaV2(); QPlaceDetailsReply *getPlaceDetails(const QString &placeId); - QPlaceContentReply *getPlaceContent(const QString &placeId, const QPlaceContentRequest &request); + QPlaceContentReply *getPlaceContent(const QPlaceContentRequest &request) Q_DECL_OVERRIDE; QPlaceSearchReply *search(const QPlaceSearchRequest &query); |