From 1160644877a334c4cff608ae1386d2fa8ade6eee Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Mon, 14 May 2018 13:47:42 +0200 Subject: Change nominatim base URL to HTTPS Nominatim switched to HTTPS only recently. This updates the endpoint url. Task-number: QTBUG-68261 Change-Id: I8a5328db61fe4f510ecdc70bf442fc069ae0a998 Reviewed-by: Alex Blasche (cherry picked from commit d4702774718a64e6190a786bab03fcbedddbc14d) --- src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp | 2 +- src/plugins/geoservices/osm/qplacemanagerengineosm.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp index 693a80a1..5fb5c75a 100644 --- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp @@ -83,7 +83,7 @@ QGeoCodingManagerEngineOsm::QGeoCodingManagerEngineOsm(const QVariantMap ¶me if (parameters.contains(QStringLiteral("osm.geocoding.host"))) m_urlPrefix = parameters.value(QStringLiteral("osm.geocoding.host")).toString().toLatin1(); else - m_urlPrefix = QStringLiteral("http://nominatim.openstreetmap.org"); + m_urlPrefix = QStringLiteral("https://nominatim.openstreetmap.org"); *error = QGeoServiceProvider::NoError; errorString->clear(); diff --git a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp index dcf02b13..b304c77d 100644 --- a/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qplacemanagerengineosm.cpp @@ -189,7 +189,9 @@ QPlaceSearchReply *QPlaceManagerEngineOsm::search(const QPlaceSearchRequest &req QUrl requestUrl(m_urlPrefix); requestUrl.setQuery(queryItems); - QNetworkReply *networkReply = m_networkManager->get(QNetworkRequest(requestUrl)); + QNetworkRequest rq(requestUrl); + rq.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); + QNetworkReply *networkReply = m_networkManager->get(rq); QPlaceSearchReplyOsm *reply = new QPlaceSearchReplyOsm(request, networkReply, this); connect(reply, SIGNAL(finished()), this, SLOT(replyFinished())); -- cgit v1.2.3