--- android/TrainInfo/src/dk/thoerup/traininfo/LocationLookup.java	2009/09/24 08:19:23	341
+++ android/TrainInfo/src/dk/thoerup/traininfo/LocationLookup.java	2010/12/25 21:22:44	1208
@@ -3,29 +3,39 @@
 import java.util.List;
 
 import android.content.Context;
-import android.location.Criteria;
+import android.location.GpsSatellite;
+import android.location.GpsStatus;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
-import android.os.Handler;
 import android.util.Log;
 
 
-public class LocationLookup implements LocationListener{
+public class LocationLookup implements LocationListener, GpsStatus.Listener {
+	
+	public enum LookupStates {
+		GOTLOCATION,
+		NOPROVIDER,
+		STARTED,
+		IDLE
+	}
 
-	LocationManager locManager;
-	Context cntx;
-	Handler hndl;
+	private LocationManager locManager;
+	private Context cntx;
 
-	Location savedLocation = null;
+	private Location savedLocation = null;
+	private int satCount;
+	
+	private boolean hasGps;
+	
+	private LookupStates state;
 	
-	boolean isSearching = false;
-	boolean hasGps;
+	private long startTime;
 
-	public LocationLookup(Context c, Handler h) {
+	public LocationLookup(Context c) {
+		state = LookupStates.IDLE;
 		cntx = c;
-		hndl = h;
 	}
 	
 	
@@ -37,33 +47,57 @@
 	{
 		return savedLocation;
 	}
+	
+	public boolean hasGps() {
+		return hasGps;
+	}
+	
+	public int getSatCount() {
+		return satCount;
+	}
+	
+	public LookupStates getState() {
+		return state;
+	}
+	
+	
+	public long elapsedTime() {
+		long now = android.os.SystemClock.elapsedRealtime();
+		
+		return now - startTime;
+	}
 
 	public void locateStations() {
 		
-		isSearching = true;
+		state = LookupStates.STARTED;
 		
 		hasGps = false;
 		locManager = (LocationManager) cntx.getSystemService(Context.LOCATION_SERVICE);
+		satCount = 0;
+		
+		startTime = android.os.SystemClock.elapsedRealtime(); 
 
 		List<String> providers = locManager.getProviders(true);		
 		
 		if (providers.size() > 0) {
 			for(String provider : providers) {
 				Log.i("Provider", ""+provider);
-				if (provider.equalsIgnoreCase("gps"))
-					hasGps = true;
+				if (provider.equalsIgnoreCase("gps")) {
+					locManager.addGpsStatusListener(this);
+					hasGps = true;					
+				}
+
 				locManager.requestLocationUpdates(provider, 0, 0, this);
 			}
 		} else {
 			// message that no suitable provider was found
-			hndl.sendEmptyMessage(StationList.NOPROVIDER);
+			//hndl.sendEmptyMessage(StationList.NOPROVIDER);
+			state = LookupStates.NOPROVIDER;
+			
 		}
 	}
 	@Override
-	public void onLocationChanged(Location location) {
-		if (isSearching == false)
-			return;
-		
+	public void onLocationChanged(Location location) {		
 		Log.i("Location", "Got location fix " + location.getLatitude() + ", " + location.getLongitude() + " accuracy=" + location.getAccuracy() + " provider=" +location.getProvider());
 		
 
@@ -73,19 +107,22 @@
 		if (hasGps) {
 			if (!location.getProvider().equals("gps")) {
 				return; // at least give the gps a chance
-			} else if (location.getAccuracy() > 256) {
+			} else if (location.getAccuracy() > 512) {
 				return; //if we have a gps provider lets wait for a more precise fix
 			}
 
 		}
 		stopSearch();
-		hndl.sendEmptyMessage(StationList.GOTLOCATION);
+		state = LookupStates.GOTLOCATION;
+
 	}
 	
+	
 	public void stopSearch()
 	{
-		if (isSearching) {
-			isSearching = false;
+		if (state == LookupStates.STARTED) {
+			state = LookupStates.IDLE;
+			locManager.removeGpsStatusListener(this);
 			locManager.removeUpdates(this);
 		}
 	}
@@ -106,41 +143,19 @@
 		// 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);
-		
-		
+
+	@Override //GpsStatus.Listener
+	public void onGpsStatusChanged(int event) {
+		if (event == GpsStatus.GPS_EVENT_SATELLITE_STATUS) {
+			int count = 0;
+			GpsStatus status =  locManager.getGpsStatus(null);
+			for (GpsSatellite sat : status.getSatellites()) {
+				count ++;
+			}			
+			
+			satCount = count;
+		}
 		
-		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");
 	}
 }