X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosMapOffline.java;h=9909ba7fbf8b134ca95ae67753d9f8dc4cfbb3c1;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=e7edf3c043d0e1f7c33cc11ed2bb8717e0f5d0f0;hpb=2ec7e14f0104e3a227ff566fa2fc1f6286ddd9d0;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
index e7edf3c0..9909ba7f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosMapOffline.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +21,7 @@ package org.altusmetrum.AltosDroid;
 import java.util.*;
 import java.io.*;
 
-import org.altusmetrum.altoslib_10.*;
+import org.altusmetrum.altoslib_12.*;
 
 import android.app.Activity;
 import android.graphics.*;
@@ -163,6 +164,7 @@ public class AltosMapOffline extends View implements ScaleGestureDetector.OnScal
 						break;
 					case AltosMapTile.forbidden:
 						message = "Too many requests, try later";
+						AltosDebug.debug("Forbidden map response %d\n", AltosMapStore.forbidden_response);
 						break;
 					}
 					if (message != null) {
@@ -475,11 +477,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.serial == serial)
+					if (state.cal_data.serial == serial)
 						there = latlon;
 				}
 				if (state != null)
-					rocket.set_active(state.serial == serial);
+					rocket.set_active(state.cal_data.serial == serial);
 			}
 		}
 		if (receiver != null) {