altosdroid: Add map types and map preloading UIs

[fw/altos] / altoslib / AltosEepromFile.java

diff --git a/altoslib/AltosEepromFile.java b/altoslib/AltosEepromFile.java
index f59585f8a9f132c55a63fb172f920a7bbf49c136..ac537856191c579904aa72caa2609e86d51951f6 100644 (file)
--- a/altoslib/AltosEepromFile.java
+++ b/altoslib/AltosEepromFile.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_4;
+package org.altusmetrum.altoslib_7;
 
 import java.io.*;
 import java.util.*;
@@ -72,7 +72,8 @@ public class AltosEepromFile extends AltosStateIterable {
                headers = new AltosEepromIterable(AltosEepromHeader.read(input));
 
                start = headers.state();
-               start.set_state(AltosLib.ao_flight_pad);
+               if (start.state != AltosLib.ao_flight_stateless)
+                       start.set_state(AltosLib.ao_flight_pad);
 
                if (start.log_format == AltosLib.MISSING) {
                        if (start.product != null) {
@@ -93,7 +94,8 @@ public class AltosEepromFile extends AltosStateIterable {
                case AltosLib.AO_LOG_FORMAT_TELEMETRY:
                case AltosLib.AO_LOG_FORMAT_TELESCIENCE:
                case AltosLib.AO_LOG_FORMAT_TELEMEGA:
-                       body = new AltosEepromIterable(AltosEepromMega.read(input));
+               case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
+                       body = new AltosEepromIterable(AltosEepromMega.read(input, start.log_format));
                        break;
                case AltosLib.AO_LOG_FORMAT_TELEMETRUM:
                        body = new AltosEepromIterable(AltosEepromMetrum2.read(input));