X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosMapOffline.java;h=1aebcd3656fbfd62fc837354b1655fecc1d1a08f;hb=4a257455b2dc57069c41e1845daf66239c5cbe1d;hp=3f74bbba2426853012081da4f7ca45d09591ab62;hpb=b6b5c64f93fa56bcb22ea1c4279e4f754e6e6f1c;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index 3f74bbba..1aebcd36 100644
--- 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.*;
@@ -86,7 +86,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 	AltosMap		map;
 	AltosDroid		altos_droid;
 
-	static int scale = 2;
+	static int scale = 1;
 
 	AltosLatLon	here;
 	AltosLatLon	there;
@@ -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 known launch areas";
 						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) {