From 71d924288d45b09ae655d06df9780ba286e3f3be Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 24 Jun 2015 12:02:22 -0700 Subject: altosdroid: Display direction in map view Use direction in map view when available, otherwise use bearing Signed-off-by: Keith Packard --- altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java') diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index db7815f3..b87b51b5 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -998,6 +998,12 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener { static String direction(AltosGreatCircle from_receiver, Location receiver) { + if (from_receiver == null) + return null; + + if (receiver == null) + return null; + if (!receiver.hasBearing()) return null; @@ -1016,8 +1022,8 @@ public class AltosDroid extends FragmentActivity implements AltosUnitsListener { else if (iheading < -179 || 179 < iheading) return "backwards"; else if (iheading < 0) - return String.format("left %d", -iheading); + return String.format("left %d°", -iheading); else - return String.format("right %d", iheading); + return String.format("right %d°", iheading); } } -- cgit v1.2.3