From 68da4de643d616a52990d7c109b33dca14ff61f3 Mon Sep 17 00:00:00 2001
From: "Lubomir I. Ivanov" <neolit123@gmail.com>
Date: Thu, 8 Mar 2018 22:22:35 +0200
Subject: main.qml: modify showMap() to not accept location

showMap() uses a location to open Google Maps in a browser.
Make showMap() a generic function to push the mapPage on the view
stack.

Update the calls to this function from child widgets and pages.
Also either call mapPage.centerOnLocation()
or mapPage.centerOnDiveSiteUUID() depending if the caller
wants the map to center on a dive site or on map coordinates.

Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
---
 mobile-widgets/qml/DiveDetails.qml     |  3 ++-
 mobile-widgets/qml/DiveDetailsView.qml |  8 ++++----
 mobile-widgets/qml/GpsList.qml         |  3 ++-
 mobile-widgets/qml/main.qml            | 10 ++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'mobile-widgets/qml')

diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml
index 5ab1f627d..82150cc5b 100644
--- a/mobile-widgets/qml/DiveDetails.qml
+++ b/mobile-widgets/qml/DiveDetails.qml
@@ -170,7 +170,8 @@ Kirigami.Page {
 			name: "gps"
 		}
 		onTriggered: {
-			showMap(currentItem.modelData.dive.gps_decimal)
+			showMap()
+			mapPage.centerOnDiveSiteUUID(currentItem.modelData.dive.dive_site_uuid)
 		}
 	}
 
diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index 3a3adf62a..31524df38 100644
--- a/mobile-widgets/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
@@ -51,8 +51,8 @@ Item {
 				anchors.fill: parent
 				enabled: dive.gps_decimal !== ""
 				onClicked: {
-					if (dive.gps_decimal !== "")
-						showMap(dive.gps_decimal)
+					showMap()
+					mapPage.centerOnDiveSiteUUID(dive.dive_site_uuid)
 				}
 			}
 		}
@@ -62,8 +62,8 @@ Item {
 			enabled: dive.gps !== ""
 			text: qsTr("Map it")
 			onClicked: {
-				if (dive.gps_decimal !== "")
-					showMap(dive.gps_decimal)
+				showMap()
+				mapPage.centerOnDiveSiteUUID(dive.dive_site_uuid)
 			}
 		}
 		Row {
diff --git a/mobile-widgets/qml/GpsList.qml b/mobile-widgets/qml/GpsList.qml
index 51025299f..ea5098943 100644
--- a/mobile-widgets/qml/GpsList.qml
+++ b/mobile-widgets/qml/GpsList.qml
@@ -86,7 +86,8 @@ Kirigami.ScrollablePage {
 						name: "gps"
 					}
 					onTriggered: {
-						showMap(latitude + " " + longitude)
+						showMap()
+						mapPage.centerOnLocation(latitude, longitude)
 					}
 				}
 
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index 31c4d14b7..746c419f1 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -67,12 +67,10 @@ Kirigami.ApplicationWindow {
 		diveList.scrollToTop()
 	}
 
-	function showMap(location) {
-		var urlPrefix = "https://www.google.com/maps/place/"
-		var locationPair = location + "/@" + location
-		var urlSuffix = ",5000m/data=!3m1!1e3!4m2!3m1!1s0x0:0x0"
-		Qt.openUrlExternally(urlPrefix + locationPair + urlSuffix)
-
+	function showMap() {
+		globalDrawer.close()
+		returnTopPage()
+		stackView.push(mapPage)
 	}
 
 	function startAddDive() {
-- 
cgit v1.2.3-70-g09d2