Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
Marble
Commits
fc7166ee
Commit
fc7166ee
authored
Sep 21, 2018
by
Torsten Rahn
Committed by
Torsten Rahn
Sep 21, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG: 394517
Changing nominatim to https.
parent
abf20e92
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
...m-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
+1
-1
src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
...gins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
+2
-1
No files found.
src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeocodingRunner.cpp
View file @
fc7166ee
...
...
@@ -49,7 +49,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
=
"http
s
://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
);
...
...
src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.cpp
View file @
fc7166ee
...
...
@@ -50,7 +50,7 @@ void OsmNominatimRunner::returnNoResults()
void
OsmNominatimRunner
::
search
(
const
QString
&
searchTerm
,
const
GeoDataLatLonBox
&
preferred
)
{
QString
base
=
"http://nominatim.openstreetmap.org/search?"
;
QString
base
=
"http
s
://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
()
)
{
...
...
@@ -107,6 +107,7 @@ void OsmNominatimRunner::handleResult( QNetworkReply* reply )
QDomDocument
xml
;
if
(
!
xml
.
setContent
(
reply
->
readAll
()))
{
qWarning
()
<<
"Cannot parse osm nominatim result"
;
qWarning
()
<<
reply
->
error
();
returnNoResults
();
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment