Merge lp:~nik90/unav/reverse-geocode into lp:unav

[Nekhelesh Ramananthan]

This MP implements,
- Reverse geocoding (clicking on a point will now check if it is a just generic point or a POI. If it is a generic point, we just show the address. If it is a POI, we show the POI popup)
- Minor bug fixes

[JkB (joergberroth)]

Hey, thanks a lot for finishing that!!
It's a great feature and it works perfectly!! Great work! Approve!

FavButtons Approve.

clickButtons approve.

Thx Joerg

review: Approve

[lp:~nik90/unav/reverse-geocode]

52. By Nekhelesh Ramananthan on 2016-04-13

Merged lp:unav

[costales (costales)]

So great improvement :)

What do you think about a bit smaller font for the address?

Issue:
 1. Click on map (reverse geolocation appears).
 2. Go to favorites and click in one.
 3. Bug: Popup is the previous.
Solution? Clear/Hide popup when user clicks on Route.

Improvement: It's working for a POI from coordinates. Is it possible working to for POIs from Search and Favorites?

Thanks in advance!

review: Needs Fixing

[lp:~nik90/unav/reverse-geocode]

53. By Nekhelesh Ramananthan on 2016-04-14

hide popover when clicking the menu

[Nekhelesh Ramananthan (nik90)]

Thanks Marcos. Good catch on the bug. I managed to fix it with your suggestion as well.

[costales (costales)]

+100 |o/
Thanks Nekhelesh!!

review: Approve

=== modified file 'qml/FavoritesPage.qml'
--- qml/FavoritesPage.qml	2016-04-12 14:07:12 +0000
+++ qml/FavoritesPage.qml	2016-04-14 19:07:42 +0000
@@ -294,6 +294,13 @@
                     anchors.horizontalCenter: parent.horizontalCenter
                     spacing: units.gu(2)
                     Button {
+                        text: i18n.tr("Cancel")
+                        onClicked: {
+                            clear()
+                            PopupUtils.close(dialogue)
+                        }
+                    }
+                    Button {
                         text: isOverwriteMode ? i18n.tr("Overwrite") : isAddFavoriteMode ? i18n.tr("Add") : i18n.tr("Update")
                         color: isOverwriteMode ? UbuntuColors.red : UbuntuColors.green
                         enabled: favNameField.text.trim() && (!isAddFavoriteMode ? favoritesPage.favName_edit !== favNameField.text : true)
@@ -305,13 +312,6 @@
                             PopupUtils.close(dialogue)
                         }
                     }
-                    Button {
-                        text: i18n.tr("Cancel")
-                        onClicked: {
-                            clear()
-                            PopupUtils.close(dialogue)
-                        }
-                    }
                 }
             }
         }
 
=== modified file 'qml/Main.qml'
--- qml/Main.qml	2016-04-13 17:52:10 +0000
+++ qml/Main.qml	2016-04-14 19:07:42 +0000
@@ -27,6 +27,7 @@
 import QtMultimedia 5.0
 import QtFeedback 5.0
 import QtSystemInfo 5.0
+import QtQuick.XmlListModel 2.0
 import "components"
 import "js/utils.js" as QmlJs
 
@@ -172,6 +173,7 @@
                             text: i18n.tr("Route")
                             enabled: navigationPage.buttonsEnabled
                             onTriggered: {
+                                goThereActionPopover.hide();
                                 mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
                             }
                         }
@@ -268,6 +270,11 @@
                                 mainPageStack.center_onpos = 1;
                             mainPageStack.favPopup = false;
                             goThereActionPopover.show();
+
+                            // Perform reverse geocoding only when it is a generic marker that the user clicked on the map
+                            if (goThereActionPopover.poiName === "" && goThereActionPopover.osm_id === 'none') {
+                                reverseXmlModel.reverseSearch(mainPageStack.clickedLat, mainPageStack.clickedLng);
+                            }
                             break;
                         
                         case "http://hide_popup/":
@@ -385,7 +392,10 @@
                     ActionIcon {
                         icon.name: "send"
                         enabled: navigationPage.buttonsEnabled
-                        onClicked: mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
+                        onClicked: {
+                            goThereActionPopover.hide();
+                            mainPageStack.push(Qt.resolvedUrl("RoutePage.qml"))
+                        }
                     }
 
                     ActionIcon {
@@ -419,22 +429,90 @@
                 onZoomedOut: mainPageStack.executeJavaScript("custom_zoom(-1)")
             }
 
+            XmlListModel {
+                id: reverseXmlModel
+
+                readonly property string baseUrl: "https://nominatim.openstreetmap.org/reverse?format=xml&email=[e-mail]&addressdetails=0&extratags=1&zoom=18&namedetails=1&"
+
+                function reverseSearch(lat, lon) {
+                    source = (baseUrl + "lat=" + lat + "&lon=" + lon) ;
+                    console.log(source)
+                }
+
+                function clear() {
+                    goThereActionPopover.reverseGeoString = "";
+                    source = "";
+                }
+
+                onStatusChanged: {
+                    if (status === XmlListModel.Error || (status === XmlListModel.Ready && count === 0)) {
+                        goThereActionPopover.reverseGeoString = ""
+                        console.log("Error reverse geocoding the location!")
+                    }
+
+                    else if (status === XmlListModel.Ready && count > 0) {
+                        // Check if the location returned by reverse geocoding is a POI by looking for the existence of certain parameters
+                        // like cuisine, phone, opening_hours, internet_access, wheelchair etc that do not apply to a generic address.
+                        if (reverseXmlModel.get(0).description || reverseXmlModel.get(0).cuisine || reverseXmlModel.get(0).phone || reverseXmlModel.get(0).opening_hours
+                                || reverseXmlModel.get(0).website && reverseXmlModel.get(0).wheelchair || reverseXmlModel.get(0).internet_access) {
+
+                            // Check if the name, osm_id and osm_type are valid, otherwise the POI popup will break.
+                            if (reverseXmlModel.get(0).name && reverseXmlModel.get(0).osm_id && reverseXmlModel.get(0).osm_type) {
+                                goThereActionPopover.poiName = reverseXmlModel.get(0).name
+                                goThereActionPopover.osm_id = reverseXmlModel.get(0).osm_id
+                                goThereActionPopover.osm_type = reverseXmlModel.get(0).osm_type.charAt(0).toUpperCase()
+                                goThereActionPopover.phone = reverseXmlModel.get(0).phone
+                            } else {
+                                goThereActionPopover.reverseGeoString = reverseXmlModel.get(0).result
+                            }
+                        }
+
+                        // If nothing works, fall back to just showing the address in a generic popup
+                        else {
+                            goThereActionPopover.reverseGeoString = reverseXmlModel.get(0).result
+                        }
+                    }
+                }
+
+                source: ""
+                query: "/reversegeocode"
+
+                XmlRole { name: "osm_type"; query: "result/@osm_type/string()" }
+                XmlRole { name: "osm_id"; query: "result/@osm_id/string()" }
+                XmlRole { name: "result"; query: "result/string()" }
+                XmlRole { name: "name"; query: "namedetails/name/string()" }
+                XmlRole { name: "description"; query: "extratags/tag[@key='description']/@value/string()" }
+                XmlRole { name: "cuisine"; query: "extratags/tag[@key='cuisine']/@value/string()" }
+                XmlRole { name: "phone"; query: "extratags/tag[@key='phone']/@value/string()" }
+                XmlRole { name: "opening_hours"; query: "extratags/tag[@key='opening_hours']/@value/string()" }
+                XmlRole { name: "website"; query: "extratags/tag[@key='website']/@value/string()" }
+                XmlRole { name: "internet_access"; query: "extratags/tag[@key='internet_access']/@value/string()" }
+                XmlRole { name: "wheelchair"; query: "extratags/tag[@key='wheelchair']/@value/string()" }
+            }
+
             PoiPopup {
                 id: goThereActionPopover
 
                 // Dragons be here! Don't change these values
                 hidePosition: -3*height
                 showPosition: navApp.settings.headerVisible ? 0 : -navigationPage.header.height
-                anchors { top: navigationPage.header.bottom; topMargin: hidePosition }
+                anchors { top: navigationPage.header.bottom }
 
                 height: mainContentLoader.height + 2*mainContentLoader.anchors.margins
 
+                property string reverseGeoString: ""
                 property string poiName
                 property string osm_type
                 property string osm_id
                 property string website
                 property string phone
 
+                onIsShownChanged: {
+                    if (!goThereActionPopover.isShown) {
+                        reverseXmlModel.clear()
+                    }
+                }
+
                 Loader {
                     id: mainContentLoader
                     sourceComponent: goThereActionPopover.isShown ? (goThereActionPopover.osm_id === 'none' ? genericPopupComponent : poiPopupComponent) : undefined
@@ -447,12 +525,15 @@
                         spacing: units.gu(2)
 
                         Label {
-                            textSize: Label.Large
+                            id: geoCodeLabel
+                            maximumLineCount: 3
                             width: parent.width
-                            visible: !goThereActionPopover.poiName
+                            wrapMode: Text.WordWrap
+                            color: UbuntuColors.slate
                             horizontalAlignment: Text.AlignHCenter
-                            text: i18n.tr("Coord: %1, %2").arg(parseFloat(mainPageStack.clickedLat).toFixed(5)).arg(parseFloat(mainPageStack.clickedLng).toFixed(5))
-                            color: UbuntuColors.slate
+                            textSize: !truncated ? Label.Large : Label.Medium
+                            text: goThereActionPopover.reverseGeoString ? goThereActionPopover.reverseGeoString
+                                                                        : i18n.tr("Coord: %1, %2").arg(parseFloat(mainPageStack.clickedLat).toFixed(5)).arg(parseFloat(mainPageStack.clickedLng).toFixed(5));
                         }
 
                         Row {
 
=== modified file 'qml/components/PoiPopup.qml'
--- qml/components/PoiPopup.qml	2016-04-12 18:47:27 +0000
+++ qml/components/PoiPopup.qml	2016-04-14 19:07:42 +0000
@@ -37,10 +37,15 @@
         isShown = false
     }
 
+    Component.onCompleted: {
+        // Without this, the popup hides when the height is changed after the popup is visible
+        popup.anchors.topMargin = hidePosition
+    }
+
+    // This mouse area is to stop any user input from leaking from the popup into the map.
     MouseArea {
         z: -1
         anchors.fill: parent
-        propagateComposedEvents: true
     }
 
     UbuntuNumberAnimation {