altosdroid: East and West were flipped in all GPS output

East is positive, West is negative

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
index fa4e3c8b3da13e7c5c957a422bf7e85ab1da9d62..2c4063396cbd1b5d58e454c9d05d3206feecfe0e 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
@@ -101,7 +101,7 @@ public class TabAscent extends AltosDroidTab {
 
                        if (state.gps != null) {
                                mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
 
                        if (state.gps != null) {
                                mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));

-                               mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+                               mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));

                        } else {
                                mLatitudeView.setText("");
                                mLongitudeView.setText("");
                        } else {
                                mLatitudeView.setText("");
                                mLongitudeView.setText("");

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index 28068666a4df627de6302450d8182936706205fa..cc5b21833353ea0163c5c36781b41e35ade5407a 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
@@ -110,7 +110,7 @@ public class TabDescent extends AltosDroidTab {
                        }
                        if (state.gps != null) {
                                mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
                        }
                        if (state.gps != null) {
                                mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));

-                               mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+                               mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));

                        }
 
                        mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
                        }
 
                        mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
index b257b9365d652c51fc67a3db2676138bb1fe53c6..013be0cdc1404d04973d7a19c5254fd970efc09d 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
@@ -82,12 +82,12 @@ public class TabLanded extends AltosDroidTab {
                }
                if (state != null && state.gps != null) {
                        mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
                }
                if (state != null && state.gps != null) {
                        mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));

-                       mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+                       mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));

                }
 
                if (receiver != null) {
                        mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
                }
 
                if (receiver != null) {
                        mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));

-                       mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
+                       mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));

                }
 
                if (state != null) {
                }
 
                if (state != null) {

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
index 5cbd7469afd90fd5d530425f3fcaaee6dee27fb6..a625aa19478cde8f45224bb5b5a932e8d0f038e6 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabMap.java
@@ -179,7 +179,7 @@ public class TabMap extends AltosDroidTab {
                        }
                        if (state.gps != null) {
                                mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
                        }
                        if (state.gps != null) {
                                mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));

-                               mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+                               mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));

                                if (state.gps.locked && state.gps.nsat >= 4)
                                        center (state.gps.lat, state.gps.lon, 10);
                        }
                                if (state.gps.locked && state.gps.nsat >= 4)
                                        center (state.gps.lat, state.gps.lon, 10);
                        }


@@ -193,7 +193,7 @@ public class TabMap extends AltosDroidTab {
                        else
                                accuracy = 1000;
                        mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
                        else
                                accuracy = 1000;
                        mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));

-                       mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
+                       mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));

                        center (receiver.getLatitude(), receiver.getLongitude(), accuracy);
                }
 
                        center (receiver.getLatitude(), receiver.getLongitude(), accuracy);
                }
 

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
index 32df71d760a2543d55945f967ce2edfcd4a99a5f..c8e2ed644040bc35277c91d92bcf7ce784b0a660 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabPad.java
@@ -163,7 +163,7 @@ public class TabPad extends AltosDroidTab {
                        if (receiver.hasAltitude())
                                altitude = receiver.getAltitude();
                        mPadLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
                        if (receiver.hasAltitude())
                                altitude = receiver.getAltitude();
                        mPadLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));

-                       mPadLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "W", "E"));
+                       mPadLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));

                        set_value(mPadAltitudeView, AltosConvert.height, 6, altitude);
                }
        }
                        set_value(mPadAltitudeView, AltosConvert.height, 6, altitude);
                }
        }