projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Fix ground station configure frequency list
[fw/altos]
/
altosdroid
/
src
/
org
/
altusmetrum
/
AltosDroid
/
TabMap.java
diff --git
a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 66669ad04208c15787775b209292e346324743c1..38922771f73f097e4938ccbddca1423ceca4a2a8 100644
(file)
--- a/
altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/
altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@
-19,7
+19,7
@@
package org.altusmetrum.AltosDroid;
import java.util.Arrays;
import java.util.Arrays;
-import org.altusmetrum.altoslib_
1
.*;
+import org.altusmetrum.altoslib_
4
.*;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.CameraUpdateFactory;
import com.google.android.gms.maps.GoogleMap;
@@
-35,7
+35,7
@@
import android.app.Activity;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
+
//
import android.support.v4.app.FragmentTransaction;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@
-151,12
+151,14
@@
public class TabMap extends Fragment implements AltosDroidTab {
mapAccuracy = accuracy;
}
}
mapAccuracy = accuracy;
}
}
+
public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+ if (from_receiver != null) {
+ mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+ mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
+ }
+
if (state != null) {
if (state != null) {
- if (state.from_pad != null) {
- mDistanceView.setText(String.format("%6.0f m", state.from_pad.distance));
- mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
- }
if (mapLoaded) {
if (state.gps != null) {
mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon));
if (mapLoaded) {
if (state.gps != null) {
mRocketMarker.setPosition(new LatLng(state.gps.lat, state.gps.lon));