From 12d5a1e9aadc26ddd4aceadb96234bc4f378b39e Mon Sep 17 00:00:00 2001
From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Tue, 21 Nov 2017 14:23:04 -0800
Subject: navigation: qml: remove start address and use current GPS location

Change RouteAddress form to use start location from current GPS
coordinate instead of entering a start address.

Bug-AGL: SPEC-1068
Change-Id: Id1a42ba409d24e527e613b67b9ac4583aff92ed4
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---
 app/forms/RouteAddress.qml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'app/forms/RouteAddress.qml')

diff --git a/app/forms/RouteAddress.qml b/app/forms/RouteAddress.qml
index 248396d..e41277e 100644
--- a/app/forms/RouteAddress.qml
+++ b/app/forms/RouteAddress.qml
@@ -44,31 +44,25 @@ import QtPositioning 5.5
 
 RouteAddressForm {
     property alias plugin : tempGeocodeModel.plugin;
-    property variant fromAddress;
     property variant toAddress;
+    property variant fromCoordinate;
     signal showMessage(string topic, string message)
     signal showRoute(variant startCoordinate,variant endCoordinate)
     signal closeForm()
 
     goButton.onClicked: {
         tempGeocodeModel.reset()
-        fromAddress.country =  fromCountry.text
-        fromAddress.street = fromStreet.text
-        fromAddress.city =  fromCity.text
         toAddress.country = toCountry.text
         toAddress.street = toStreet.text
         toAddress.city = toCity.text
-        tempGeocodeModel.startCoordinate = QtPositioning.coordinate()
+        tempGeocodeModel.startCoordinate = fromCoordinate
         tempGeocodeModel.endCoordinate = QtPositioning.coordinate()
-        tempGeocodeModel.query = fromAddress
+        tempGeocodeModel.query = fromCoordinate
         tempGeocodeModel.update();
         goButton.enabled = false;
     }
 
     clearButton.onClicked: {
-        fromStreet.text = ""
-        fromCity.text = ""
-        fromCountry.text = ""
         toStreet.text = ""
         toCity.text = ""
         toCountry.text = ""
@@ -79,9 +73,6 @@ RouteAddressForm {
     }
 
     Component.onCompleted: {
-        fromStreet.text  = fromAddress.street
-        fromCity.text =  fromAddress.city
-        fromCountry.text = fromAddress.country
         toStreet.text = toAddress.street
         toCity.text = toAddress.city
         toCountry.text = toAddress.country
@@ -102,7 +93,7 @@ RouteAddressForm {
         }
 
         onStatusChanged: {
-            if ((status == GeocodeModel.Ready) && (count == 1)) {
+            if ((status == GeocodeModel.Ready) && count >= 1) {
                 success++
                 if (success == 1) {
                     startCoordinate.latitude = get(0).coordinate.latitude
-- 
cgit 1.2.3-korg