--- android/TrainInfo/src/dk/thoerup/traininfo/LocationLookup.java	2009/09/23 12:51:49	336
+++ android/TrainInfo/src/dk/thoerup/traininfo/LocationLookup.java	2010/01/29 12:34:17	570
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import android.content.Context;
-import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
@@ -18,6 +17,7 @@
 	Context cntx;
 	Handler hndl;
 
+	Location lastKnownLocation = null;
 	Location savedLocation = null;
 	
 	boolean isSearching = false;
@@ -37,6 +37,10 @@
 	{
 		return savedLocation;
 	}
+	
+	public Location getLastKnownLocation() {
+		return lastKnownLocation;
+	}
 
 	public void locateStations() {
 		
@@ -53,6 +57,10 @@
 				if (provider.equalsIgnoreCase("gps"))
 					hasGps = true;
 				locManager.requestLocationUpdates(provider, 0, 0, this);
+				Location tmpLastKnown = locManager.getLastKnownLocation(provider);
+				if (tmpLastKnown != null) {
+					saveLastKnownLocation(tmpLastKnown);
+				}
 			}
 		} else {
 			// message that no suitable provider was found
@@ -73,7 +81,7 @@
 		if (hasGps) {
 			if (!location.getProvider().equals("gps")) {
 				return; // at least give the gps a chance
-			} else if (location.getAccuracy() > 128) {
+			} else if (location.getAccuracy() > 256) {
 				return; //if we have a gps provider lets wait for a more precise fix
 			}
 
@@ -82,6 +90,16 @@
 		hndl.sendEmptyMessage(StationList.GOTLOCATION);
 	}
 	
+	private void saveLastKnownLocation(Location loc) {
+		if (lastKnownLocation == null) { 
+			lastKnownLocation = loc; 
+		} else {
+			if (loc.getTime() > lastKnownLocation.getTime()) {//if loc is more recent than saved
+				lastKnownLocation = loc;
+			}
+		}
+	}
+	
 	public void stopSearch()
 	{
 		if (isSearching) {
@@ -106,41 +124,4 @@
 		// TODO Auto-generated method stub
 
 	}
-	
-
-	public static void injectMockLocation(Context cntx) {
-		Location odder = new Location("gps2"); 
-		odder.setLatitude(55.976632);
-		odder.setLongitude(10.16407);
-		
-		Location kbh = new Location("gps2"); //Christiansborg 55.675092,12.578573
-		kbh.setLatitude(55.675092);
-		kbh.setLongitude(12.578573);
-		
-		Location bjbro = new Location("gps2");
-		bjbro.setLatitude(56.380745);
-		bjbro.setLongitude(9.655609);
-		
-		Location hillerod = new Location("gps");
-		hillerod.setLatitude(55.929177);
-		hillerod.setLongitude(12.308095);
-		
-		Location aarhus = new Location("gps"); //Aros
-		aarhus.setLatitude(56.153828);
-		aarhus.setLongitude(10.200369);
-		
-		
-		
-		LocationManager lm = (LocationManager) cntx.getSystemService(Context.LOCATION_SERVICE);
-		if (lm.getProvider("gps2") == null)
-			lm.addTestProvider("gps2", false, true, true, false, false, false, false, 0, Criteria.ACCURACY_FINE );
-		lm.setTestProviderEnabled("gps2", true);
-		lm.setTestProviderLocation("gps2", kbh);
-	}
-	
-	public static void removeMockLocation(Context cntx) {
-		LocationManager lm = (LocationManager) cntx.getSystemService(Context.LOCATION_SERVICE);
-		if (lm.getProvider("gps2") != null)
-			lm.removeTestProvider("gps2");
-	}
 }