diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-06-05 16:27:42 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-07 06:58:39 +0200 |
commit | 06c838b0b983f57177d17931e602303f98f3b437 (patch) | |
tree | a45571a284388b13e14deec8573b8d1f67e67cbb /src | |
parent | 02e30cb825e0bb587dae238cd24cbb8a86c5a4fa (diff) | |
download | qtlocation-06c838b0b983f57177d17931e602303f98f3b437.tar.gz |
Update Nokia places service URLs.
Update to the new places service URLs.
Remove the /places path from the host name.
Task-number: QTBUG-24984
Change-Id: Ib0be6505a457e16bb5ff2f309a2c56c8b3ef1c57
Reviewed-by: abcd <amos.choy@nokia.com>
Diffstat (limited to 'src')
5 files changed, 19 insertions, 30 deletions
diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp index 3fe94aee..74c39dcd 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp @@ -145,7 +145,6 @@ void QPlaceDetailsReplyImpl::replyFinished() place.setPlaceId(object.value(QLatin1String("placeId")).toString()); - //const QString refId = object.value(QLatin1String("refId")).toString(); //const QUrl view = object.value(QLatin1String("view")).toString(); place.setName(object.value(QLatin1String("name")).toString()); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp index cfbb6da9..9f32c217 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacerecommendationreplyimpl.cpp @@ -148,8 +148,6 @@ void QPlaceRecommendationReplyImpl::replyFinished() QUrl href = item.value(QLatin1String("href")).toString(); place.setPlaceId(href.path().mid(18, 41)); - //const QString refId = item.value(QLatin1String("refId")).toString(); - result.setPlace(place); results.append(result); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp index b4d6c2e5..fd98243d 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp @@ -161,8 +161,6 @@ void QPlaceSearchReplyImpl::replyFinished() place.setPlaceId(href.path().mid(18, 41)); - //const QString refId = item.value(QLatin1String("refId")).toString(); - QPlaceAttribute provider; provider.setText(QLatin1String("nokia")); place.setExtendedAttribute(QPlaceAttribute::Provider, provider); diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index 5cbc431a..02205e63 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -240,9 +240,8 @@ QPlaceManagerEngineNokiaV2::~QPlaceManagerEngineNokiaV2() {} QPlaceDetailsReply *QPlaceManagerEngineNokiaV2::getPlaceDetails(const QString &placeId) { - QUrl requestUrl(QString::fromLatin1("http://") - + m_uriProvider->getCurrentHost() - + QLatin1String("/v1/places/") + placeId); + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/places/") + placeId); QUrlQuery queryItems; @@ -265,9 +264,8 @@ QPlaceDetailsReply *QPlaceManagerEngineNokiaV2::getPlaceDetails(const QString &p QPlaceContentReply *QPlaceManagerEngineNokiaV2::getPlaceContent(const QString &placeId, const QPlaceContentRequest &request) { - QUrl requestUrl(QString::fromLatin1("http://") - + m_uriProvider->getCurrentHost() - + QLatin1String("/v1/places/") + placeId + QLatin1String("/media/")); + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/places/") + placeId + QLatin1String("/media/")); QNetworkReply *networkReply = 0; @@ -395,9 +393,8 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest if (!query.searchTerm().isEmpty()) { // search term query - QUrl requestUrl(QString::fromLatin1("http://") - + m_uriProvider->getCurrentHost() - + QLatin1String("/v1/discover/search")); + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/discover/search")); QUrlQuery queryItems; @@ -424,12 +421,11 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest return reply; } else { // category search - // The request URL should be "/v1/discover/explore" but that returns both places and + // The request URL should be "/places/v1/discover/explore" but that returns both places and // clusters of places. We don't support clusters so we use the undocumented - // "/v1/discover/explore/places" instead which only returns places. - QUrl requestUrl(QString::fromLatin1("http://") - + m_uriProvider->getCurrentHost() - + QLatin1String("/v1/discover/explore/places")); + // "/places/v1/discover/explore/places" instead which only returns places. + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/discover/explore/places")); QUrlQuery queryItems; @@ -470,9 +466,9 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::search(const QPlaceSearchRequest QPlaceSearchReply *QPlaceManagerEngineNokiaV2::recommendations(const QString &placeId, const QPlaceSearchRequest &query) { - QUrl requestUrl(QString::fromLatin1("http://") - + m_uriProvider->getCurrentHost() - + QLatin1String("/v1/places/") + placeId + QLatin1String("/related/recommended")); + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/places/") + placeId + + QLatin1String("/related/recommended")); QUrlQuery queryItems; @@ -501,9 +497,8 @@ QPlaceSearchReply *QPlaceManagerEngineNokiaV2::recommendations(const QString &pl QPlaceSearchSuggestionReply *QPlaceManagerEngineNokiaV2::searchSuggestions(const QPlaceSearchRequest &query) { - QUrl requestUrl(QString::fromLatin1("http://") - + m_uriProvider->getCurrentHost() - + QLatin1String("/v1/suggest")); + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/suggest")); QUrlQuery queryItems; @@ -605,9 +600,8 @@ QPlaceReply *QPlaceManagerEngineNokiaV2::initializeCategories() QStringList ids = m_tempTree.keys(); ids.removeAll(QString()); foreach (const QString &id, ids) { - QUrl requestUrl(QString::fromLatin1("http://") - + m_uriProvider->getCurrentHost() - + QLatin1String("/v1/categories/places/") + id); + QUrl requestUrl(QString::fromLatin1("http://") + m_uriProvider->getCurrentHost() + + QLatin1String("/places/v1/categories/places/") + id); QNetworkReply *networkReply = sendRequest(requestUrl); connect(networkReply, SIGNAL(finished()), this, SLOT(categoryReplyFinished())); connect(networkReply, SIGNAL(error(QNetworkReply::NetworkError)), diff --git a/src/plugins/geoservices/nokia/uri_constants.cpp b/src/plugins/geoservices/nokia/uri_constants.cpp index 3ef8c1ce..8f2104a8 100644 --- a/src/plugins/geoservices/nokia/uri_constants.cpp +++ b/src/plugins/geoservices/nokia/uri_constants.cpp @@ -52,8 +52,8 @@ QT_BEGIN_NAMESPACE const QString ROUTING_HOST = QLatin1String("route.nlp.nokia.com"); const QString GEOCODING_HOST = QLatin1String("loc.desktop.maps.svc.ovi.com"); const QString GEOCODING_HOST_CN = QLatin1String("pr.geo.maps.svc.nokia.com.cn"); -const QString PLACES_HOST = QLatin1String("api.places.lbs.maps.nokia.com/places"); -const QString PLACES_HOST_CN = QLatin1String("api.places.lbs.maps.nokia.com.cn/places"); +const QString PLACES_HOST = QLatin1String("places.nlp.nokia.com"); +const QString PLACES_HOST_CN = QLatin1String("places.nlp.nokia.com.cn"); const QString MAP_TILES_HOST = QLatin1String("1-4.maptile.lbs.ovi.com"); const QString MAP_TILES_HOST_CN = QLatin1String("a-k.maptile.maps.svc.nokia.com.cn"); |