From 483f573720a4e0a3db8f41af37acb8e137421192 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Thu, 21 Nov 2019 19:06:21 -0800 Subject: qml: fix route issue if already currently routed path Dropping a pin on map wouldn't function if a route was currently in progress. Remove several conditionals that would block another routing from starting. Bug-AGL: SPEC-2880 Change-Id: I2279f4ed6d89f818f469b5e24352cae5e3b5f60e Signed-off-by: Matt Ranostay --- app/navigation.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/navigation.qml b/app/navigation.qml index a5d20ea..71763c2 100644 --- a/app/navigation.qml +++ b/app/navigation.qml @@ -483,6 +483,9 @@ ApplicationWindow { } function updatePositon() { + if (!routeModel.get(0)) + return; + if(pathcounter <= routeModel.get(0).path.length - 1){ // calculate distance var next_distance = calculateDistance(map.currentpostion.latitude, @@ -646,16 +649,14 @@ ApplicationWindow { function doSetWaypointsSlot(latitude,longitue,startFromCurrentPosition){ - if(btn_guidance.state !== "idle") - btn_guidance.discardWaypoints(startFromCurrentPosition); + btn_guidance.discardWaypoints(startFromCurrentPosition); if(btn_present_position.state === "Optional"){ map.center = map.currentpostion btn_present_position.state = "Flowing" } - if((btn_guidance.state !== "onGuide") && (btn_guidance.state !== "Routing")) - map.addDestination(QtPositioning.coordinate(latitude,longitue)) + map.addDestination(QtPositioning.coordinate(latitude,longitue)) } states: [ -- cgit 1.2.3-korg