File Changing-nominatim-to-https.patch of Package marble4

Overview Repositories Revisions Requests Users Attributes Meta

File Changing-nominatim-to-https.patch of Package marble4

From c70d0c97fdf5f213f3aa95699105de72b98d67d8 Mon Sep 17 00:00:00 2001
From: Torsten Rahn <rahn@kde.org>
Date: Fri, 21 Sep 2018 09:59:52 +0200
Subject: BUG: 394517 Changing nominatim to https.

---
 .../nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp  | 2 +-
 src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
index 708fee2..cbb7415 100644
--- a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
+++ b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
@@ -50,7 +50,7 @@ void OsmNominatimRunner::returnNoReverseGeocodingResult()
 void OsmNominatimRunner::reverseGeocoding( const GeoDataCoordinates &coordinates )
 {
     m_coordinates = coordinates;
-    QString base = "http://nominatim.openstreetmap.org/reverse?format=xml&addressdetails=1";
+    QString base = "https://nominatim.openstreetmap.org/reverse?format=xml&addressdetails=1";
     // @todo: Alternative URI with addressdetails=1 could be used for shorther placemark name
     QString query = "&lon=%1&lat=%2&accept-language=%3";
     double lon = coordinates.longitude( GeoDataCoordinates::Degree );
diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
index bb59a28..9c0c5b2 100644
--- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
@@ -48,7 +48,7 @@ void OsmNominatimRunner::returnNoResults()
 
 void OsmNominatimRunner::search( const QString &searchTerm, const GeoDataLatLonBox &preferred )
 {    
-    QString base = "http://nominatim.openstreetmap.org/search?";
+    QString base = "https://nominatim.openstreetmap.org/search?";
     QString query = "q=%1&format=xml&addressdetails=1&accept-language=%2";
     QString url = QString(base + query).arg(searchTerm).arg(MarbleLocale::languageCode());
     if( !preferred.isEmpty() ) {
@@ -94,6 +94,7 @@ void OsmNominatimRunner::handleResult( QNetworkReply* reply )
     QDomDocument xml;
     if (!xml.setContent(reply->readAll())) {
         qWarning() << "Cannot parse osm nominatim result";
+        qWarning() << reply->error();
         returnNoResults();
         return;
     }
-- 
cgit v0.11.2

Places

File Changing-nominatim-to-https.patch of Package marble4

Places