aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-01-03 11:23:36 -0500
committerScott Murray <scott.murray@konsulko.com>2020-01-03 11:27:32 -0500
commitbbbc193fbd9bc0252080b3ad8f48c2cf452aad69 (patch)
tree1da2445d039ff592a8e5276e78ca05308ad51393
parent992ab22d9eaa9e62138647bba833a1cb83185a32 (diff)
Add logic to enable re-center button when the view is centered but zoomed in/out, for consistency. Additionally, re-center when routing is started to improve user experience. Bug-AGL: SPEC-3081 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I6aa4686f5cb177f819fdee07d76dfa397c20179c
-rw-r--r--app/BtnEnlarge.qml5
-rw-r--r--app/BtnGuidance.qml2
-rw-r--r--app/BtnShrink.qml5
3 files changed, 10 insertions, 2 deletions
diff --git a/app/BtnEnlarge.qml b/app/BtnEnlarge.qml
index 1a261d6..779f14d 100644
--- a/app/BtnEnlarge.qml
+++ b/app/BtnEnlarge.qml
@@ -7,8 +7,11 @@ Item {
height: 100
function zoomUp() {
- map.zoomLevel += 1
+ map.zoomLevel += 1
+ if(map.zoomLevel != default_zoom_level) {
+ btn_present_position.state = "Optional"
}
+ }
onClicked: { zoomUp() }
diff --git a/app/BtnGuidance.qml b/app/BtnGuidance.qml
index 11955f5..4dea819 100644
--- a/app/BtnGuidance.qml
+++ b/app/BtnGuidance.qml
@@ -31,6 +31,8 @@ Item {
btn_present_position.state = "Flowing"
btn_guidance.sts_guide = 2
btn_guidance.state = "onGuide"
+ map.zoomLevel = default_zoom_level
+ map.bearing = 0
}
function discardWaypoints(startFromCurrentPosition) {
diff --git a/app/BtnShrink.qml b/app/BtnShrink.qml
index a028bce..551c3df 100644
--- a/app/BtnShrink.qml
+++ b/app/BtnShrink.qml
@@ -8,8 +8,11 @@ Item {
height: 100
function zoomDown() {
- map.zoomLevel -= 1
+ map.zoomLevel -= 1
+ if(map.zoomLevel != default_zoom_level) {
+ btn_present_position.state = "Optional"
}
+ }
onClicked: { zoomDown() }