Merge branch 'prefs_interface' into altosdroid

[fw/altos] / altoslib / AltosRecord.java

diff --git a/altoslib/AltosRecord.java b/altoslib/AltosRecord.java
index e468f84b425b705a1b6a498d309679c11449b18d..8bab1d0cad2ad0c7b2700f809fc8ac09d14a6eff 100644 (file)
--- a/altoslib/AltosRecord.java
+++ b/altoslib/AltosRecord.java
@@ -17,11 +17,6 @@
 
 package org.altusmetrum.AltosLib;
 
-import java.lang.*;
-import java.text.*;
-import java.util.HashMap;
-import java.io.*;
-
 public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
 
        public static final int seen_flight = 1;
@@ -127,7 +122,7 @@ public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
 
                double  p = filtered_pressure();
                if (p == MISSING)
-                       return MISSING;
+                       return raw_altitude();
                return AltosConvert.pressure_to_altitude(p);
        }
 
@@ -173,7 +168,7 @@ public class AltosRecord implements Comparable <AltosRecord>, Cloneable {
                speed = old.speed;
                height = old.height;
                gps = new AltosGPS(old.gps);
-               new_gps = false;
+               new_gps = old.new_gps;
                companion = old.companion;
        }