--- android/TrainInfo/src/dk/thoerup/traininfo/StationLocator.java	2009/08/09 11:48:36	242
+++ android/TrainInfo/src/dk/thoerup/traininfo/LocationLookup.java	2009/09/11 12:24:53	319
@@ -1,70 +1,59 @@
 package dk.thoerup.traininfo;
 
-import java.util.ArrayList;
 import java.util.List;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
-
 import android.content.Context;
 import android.location.Criteria;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
-import android.location.LocationProvider;
 import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
-import dk.thoerup.traininfo.util.DownloadUtil;
 
-public class StationLocator implements LocationListener{
+
+public class LocationLookup implements LocationListener{
 
 	LocationManager locManager;
 	Context cntx;
 	Handler hndl;
 
-	ArrayList<StationBean> stationList = new ArrayList<StationBean>();
-	List<StationBean> safeStationList = java.util.Collections.unmodifiableList(stationList);
-
-	
 	Location savedLocation = null;
+	
+	boolean hasGps;
 
-	public StationLocator(Context c, Handler h) {
+	public LocationLookup(Context c, Handler h) {
 		cntx = c;
 		hndl = h;
-	}
-	
-	public List<StationBean> getStations() {
-		return safeStationList;
+		
 	}
 	
 	public void abortLocationListener() {
 		locManager.removeUpdates(this);
 	}
+	
+	public boolean hasLocation() {
+		return savedLocation != null;
+	}
+	
+	public Location getLocation()
+	{
+		return savedLocation;
+	}
 
 	public void locateStations() {
-		//http://www.google.com/uds/GlocalSearch?callback=google.search.LocalSearch.RawCompletion&context=1&lstkp=0&rsz=small&hl=en&source=gsc&gss=.com&sig=fadf0e8d483d0f70bea11d5905010a16&q=Train%20station&near=56.377424%2C9.656695&key=ABQIAAAA1XbMiDxx_BTCY2_FkPh06RRaGTYH6UMl8mADNa0YKuWNNa8VNxQEerTAUcfkyrr6OwBovxn7TDAH5Q&v=1.0&nocache=1249640467498
-
+		hasGps = false;
 		locManager = (LocationManager) cntx.getSystemService(Context.LOCATION_SERVICE);
-		/*//testcode
-		List<String> provs = locManager.getAllProviders();
-		for (String p  : provs) {
-			Log.e("Provider", p);
-		}
-		provs = locManager.getProviders(true);
-		for (String p  : provs) {
-			Log.e("ActiveProvider", p);
-		}
-		*/
-		Criteria c = new Criteria();
-		c.setAccuracy(Criteria.ACCURACY_FINE);
-		String bestProv = locManager.getBestProvider(c, true);
-		Log.i("BestProvider", ""+bestProv);
-		
 
-		if (bestProv != null) {
-			savedLocation = locManager.getLastKnownLocation(bestProv);
-			locManager.requestLocationUpdates(bestProv, 0, 0, this);
+		List<String> providers = locManager.getProviders(true);		
+		
+		if (providers.size() > 0) {
+			for(String provider : providers) {
+				Log.i("Provider", ""+provider);
+				if (provider.equalsIgnoreCase("gps"))
+					hasGps = true;
+				locManager.requestLocationUpdates(provider, 0, 0, this);
+			}
 		} else {
 			// message that no suitable provider was found
 			hndl.sendEmptyMessage(TrainInfoList.NOPROVIDER);
@@ -74,77 +63,40 @@
 	public void onLocationChanged(Location location) {
 		Log.i("Location", "Got location fix " + location.getLatitude() + ", " + location.getLongitude() + " accuracy=" + location.getAccuracy() + " provider=" +location.getProvider());
 
-		savedLocation = new Location(location); //save a copy
+		if (savedLocation == null || location.getAccuracy() < savedLocation.getAccuracy())
+			savedLocation = new Location(location); //save a copy
 		
-		if (location.getProvider().equals("gps") && location.getAccuracy() > 100) //if we have a gps provider lets wait for a more precise fix
-			return;
+		if (hasGps) {
+			if (!location.getProvider().equals("gps")) {
+				return; // at least give the gps a chance
+			} else if (location.getAccuracy() > 100) {
+				return; //if we have a gps provider lets wait for a more precise fix
+			}
+
+		}
 
 		locManager.removeUpdates(this);
 		hndl.sendEmptyMessage(TrainInfoList.GOTLOCATION);
 	}
-	
-	public void findNearestStations() {
-		findNearestStations(savedLocation);
-	}
-	
-	public void findNearestStations(Location location) {
-		//ToDo: to be nice put the api key into the request
-		String urlSource = "http://www.google.com/uds/GlocalSearch?callback=google.search.LocalSearch.RawCompletion&context=1&q=Train%20station&near=" + location.getLatitude() + "%2C" + location.getLongitude() + "&v=1.0";
-		//String urlSource = "http://www.google.com/uds/GlocalSearch?callback=google.search.LocalSearch.RawCompletion&context=1&q=Train%20station&near=56.2%2C9.0&v=1.0";
-
-		try {
-			String data = DownloadUtil.getContent(urlSource, 30000, "UTF-8");
-			StringBuilder builder = new StringBuilder(data);
-
-			while (builder.charAt(0) != '{')
-				builder.deleteCharAt(0);
-			while (builder.charAt(builder.length()-1) != '}')
-				builder.deleteCharAt(builder.length()-1);
-
-			JSONObject json = new JSONObject(builder.toString());
-			// now have some fun with the results...
-			JSONArray res = json.getJSONArray("results");
-
-			Location tmpLocation = new Location("gps");
-			stationList.clear();
-			
-			for (int i=0; i<res.length(); i++) {
-				JSONObject jsonStation = res.getJSONObject(i);
-
-				double lat = jsonStation.getDouble("lat");
-				double lng = jsonStation.getDouble("lng");
-				String title = jsonStation.getString("title");
-				String addr = jsonStation.getString("streetAddress");
-				tmpLocation.setLatitude(lat);
-				tmpLocation.setLongitude(lng);
-
-				float distance = location.distanceTo(tmpLocation);
-
-				stationList.add( new StationBean(title,lat,lng,(int)distance,addr) );
+	/*
 
-				Log.e("Location", title + " " + lat +"," + lng);
-			}
+	public void findNearestStations(Location location) {
+		provider.lookupStations(location);
+		
+		if ( provider.getStations().size() > 0) 
 			hndl.sendEmptyMessage(TrainInfoList.GOTSTATIONLIST);
-
-		} catch (Exception e) {
-			Log.e("Location","Location",e);
+		else
 			hndl.sendEmptyMessage(TrainInfoList.LOOKUPSTATIONFAILED);
-		}
-			
-	}
+	}*/
 
 
 	@Override
 	public void onProviderDisabled(String provider) {
-		// TODO Auto-generated method stub
-
 	}
 
 
 	@Override
 	public void onProviderEnabled(String provider) {
-		// TODO Auto-generated method stub
-
 	}
 
 
@@ -154,14 +106,40 @@
 
 	}
 	
+
 	public static void injectMockLocation(Context cntx) {
-		Location loc = new Location("gps2"); 
-		loc.setLatitude(56.378084);
-		loc.setLongitude(9.659815);
+		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", loc);
-
+		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");
 	}
 }