Merge lp:~costales/unav/0.60-nik-conv2-coord-georeverse into lp:unav

[costales]

If you click on map, the coordinate of Details page is the georeverse. It should be the POI, because if not, you will not share or add that real POI.

=== modified file 'qml/PoiDetailsPage.qml'
--- qml/PoiDetailsPage.qml	2016-04-28 16:07:19 +0000
+++ qml/PoiDetailsPage.qml	2016-05-14 18:14:22 +0000
@@ -69,12 +69,12 @@
                 website.title = poiDetailsModel.get(0).website
                 internet.title = poiDetailsModel.get(0).internet_access
                 wheelchair.title = poiDetailsModel.get(0).wheelchair
-                lat = poiDetailsModel.get(0).lat
-                lng = poiDetailsModel.get(0).lng
+                lat = parseFloat(mainPageStack.clickedLat)
+                lng = parseFloat(mainPageStack.clickedLng)
 
                 distance = QmlJs.formatDistance(QmlJs.calcPoiDistance(mainPageStack.currentLat, mainPageStack.currentLng, lat, lng, 10), navApp.settings.unit)
 
-                coordinates.title = "%1 %2, %3 %4".arg(i18n.tr("Lat, Long:")).arg(parseFloat(lat).toFixed(6)).arg(parseFloat(lng).toFixed(6)).arg((distance ? '| '+distance : ''))
+                coordinates.title = "%1 %2, %3 %4".arg(i18n.tr("Lat, Long:")).arg(parseFloat(lat).toFixed(5)).arg(parseFloat(lng).toFixed(5)).arg((distance ? '| '+distance : ''))
 
                 // Internet access values returned by OSM are (yes, no, wlan, terminal and wired) which
                 // are too short and not translated. They are converted to meaningful phrases and also
@@ -199,9 +199,9 @@
                             }
                             mainPageStack.center_onpos = 2;
                             mainPageStack.routeState = 'yes'
-                            mainPageStack.executeJavaScript("calc2coord("+ poiDetailsModel.lat + "," + poiDetailsModel.lng + ");");
+                            mainPageStack.executeJavaScript("calc2coord("+ mainPageStack.clickedLat + "," + mainPageStack.clickedLng + ");");
                         } else if (model.mode === "SAVE") {
-                            var incubator = mainPageStack.addPageToCurrentColumn(poiDetailsPage, Qt.resolvedUrl("SearchPage.qml"), {favLat: poiDetailsModel.lat, favLng: poiDetailsModel.lng, favName: poiName});
+                            var incubator = mainPageStack.addPageToCurrentColumn(poiDetailsPage, Qt.resolvedUrl("SearchPage.qml"), {favLat: mainPageStack.clickedLat, favLng: mainPageStack.clickedLng, favName: poiName});
                             if (incubator && incubator.status == Component.Loading) {
                                 incubator.onStatusChanged = function(status) {
                                     if (status == Component.Ready) {
@@ -210,9 +210,9 @@
                                 }
                             }
                         } else if (model.mode === "SHARE") {
-                            mainPageStack.addPageToCurrentColumn(poiDetailsPage, Qt.resolvedUrl("Share.qml"), {"lat": poiDetailsModel.lat, "lon": poiDetailsModel.lng})
+                            mainPageStack.addPageToCurrentColumn(poiDetailsPage, Qt.resolvedUrl("Share.qml"), {"lat": mainPageStack.clickedLat, "lon": mainPageStack.clickedLng})
                         } else if (model.mode === "NEARBY") {
-                            mainPageStack.addPageToCurrentColumn(poiDetailsPage, Qt.resolvedUrl("PoiPage.qml"), {"lat": poiDetailsModel.lat, "lng": poiDetailsModel.lng})
+                            mainPageStack.addPageToCurrentColumn(poiDetailsPage, Qt.resolvedUrl("PoiPage.qml"), {"lat": mainPageStack.clickedLat, "lng": mainPageStack.clickedLng})
                         } else if (model.mode === "PTFROM") {
                             if (mainPageStack.columns === 1) {
                                 mainPageStack.removePages(mainPageStack.primaryPage)