altosdroid: Fix offline map messages to match new meanings

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosMapOffline.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 3f74bbba2426853012081da4f7ca45d09591ab62..39392ff3cfb10ff12a3ec3b2268fde0b03ddc167 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -21,7 +21,7 @@ package org.altusmetrum.AltosDroid;
 import java.util.*;
 import java.io.*;
 
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_13.*;
 
 import android.app.Activity;
 import android.graphics.*;
@@ -160,11 +160,10 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
                                                message = "Internal error";
                                                break;
                                        case AltosMapTile.failed:
-                                               message = "Network error, check connection";
+                                               message = "Network error";
                                                break;
                                        case AltosMapTile.forbidden:
-                                               message = "Too many requests, try later";
-                                               AltosDebug.debug("Forbidden map response %d\n", AltosMapStore.forbidden_response);
+                                               message = "Outside of launch area";
                                                break;
                                        }
                                        if (message != null) {
@@ -477,11 +476,11 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
                                if (t_state.gps != null) {
                                        AltosLatLon     latlon = new AltosLatLon(t_state.gps.lat, t_state.gps.lon);
                                        rocket.set_position(latlon, t_state.received_time);
-                                       if (state.cal_data.serial == serial)
+                                       if (state.cal_data().serial == serial)
                                                there = latlon;
                                }
                                if (state != null)
-                                       rocket.set_active(state.cal_data.serial == serial);
+                                       rocket.set_active(state.cal_data().serial == serial);
                        }
                }
                if (receiver != null) {