uNav

Merge lp:~joergberroth/unav/force_https into lp:unav

  1. force_https
  2. Merge into trunk
Proposed by JkB
Status: Merged
Merged at revision: 68
Proposed branch: lp:~joergberroth/unav/force_https
Merge into: lp:unav
Prerequisite: lp:~joergberroth/unav/poi_quick_access_feature
Diff against target: 25 lines (+2/-2) (has conflicts)
2 files modified
qml/PoiDetailsPage.qml (+1/-1)
qml/PoiListPage.qml (+1/-1)
Text conflict in qml/Main.qml
Conflict adding file qml/components/CloseHeaderAction.qml.  Moved existing file to qml/components/CloseHeaderAction.qml.moved.
To merge this branch: bzr merge lp:~joergberroth/unav/force_https
Reviewer Review Type Date Requested Status
costales Approve
Nekhelesh Ramananthan Approve
Review via email: mp+293923@code.launchpad.net

Commit message

*changed http:// queries to https://

Description of the change

*changed http:// queries to https://

To post a comment you must log in.
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

LGTM!

review: Approve
Revision history for this message
costales (costales) wrote :

+1 :))

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/PoiDetailsPage.qml'
2--- qml/PoiDetailsPage.qml 2016-04-28 16:07:19 +0000
3+++ qml/PoiDetailsPage.qml 2016-05-05 16:48:24 +0000
4@@ -52,7 +52,7 @@
5 XmlListModel {
6 id: poiDetailsModel
7
8- readonly property string baseUrl: "http://nominatim.openstreetmap.org/reverse?format=xml&addressdetails=1&email=costales.marcos@gmail.com&extratags=1"
9+ readonly property string baseUrl: "https://nominatim.openstreetmap.org/reverse?format=xml&addressdetails=1&email=costales.marcos@gmail.com&extratags=1"
10 readonly property string url: baseUrl + "&osm_type=" + osm_type + "&osm_id=" + osm_id
11
12 property string lat
13
14=== modified file 'qml/PoiListPage.qml'
15--- qml/PoiListPage.qml 2016-04-30 09:20:05 +0000
16+++ qml/PoiListPage.qml 2016-05-05 16:48:24 +0000
17@@ -160,7 +160,7 @@
18 if (status === XmlListModel.Loading) { statusLabel.text = i18n.tr("Searching…") }
19 }
20
21- readonly property string baseUrl: "http://nominatim.openstreetmap.org/search?format=xml&bounded=1&limit=50&email=costales.marcos@gmail.com&extratags=1"
22+ readonly property string baseUrl: "https://nominatim.openstreetmap.org/search?format=xml&bounded=1&limit=50&email=costales.marcos@gmail.com&extratags=1"
23 readonly property double geoDist: navApp.settings.unit === 0 ? 0.01 : 0.01 / 0.621371192
24 // geographic distance ~1.1km / ~1.1mi
25 // rough estimation only. Could be redefined.

Subscribers

People subscribed via source and target branches