--- android/TrainInfo/src/dk/thoerup/traininfo/StationLocator.java	2009/08/10 16:58:22	253
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationLocator.java	2009/08/28 06:34:42	285
@@ -1,23 +1,17 @@
 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.provider.ProviderFactory;
 import dk.thoerup.traininfo.provider.StationProvider;
-import dk.thoerup.traininfo.util.DownloadUtil;
 
 public class StationLocator implements LocationListener{
 
@@ -25,23 +19,27 @@
 	Context cntx;
 	Handler hndl;
 
-	List<StationBean> stationList = new ArrayList<StationBean>();
-
-	
+	StationProvider provider; 
 	Location savedLocation = null;
 
 	public StationLocator(Context c, Handler h) {
 		cntx = c;
 		hndl = h;
+		
+		provider = ProviderFactory.getStationProvider();
 	}
 	
 	public List<StationBean> getStations() {
-		return stationList;
+		return provider.getStations();
 	}
 	
 	public void abortLocationListener() {
 		locManager.removeUpdates(this);
 	}
+	
+	public boolean hasLocation() {
+		return savedLocation != null;
+	}
 
 	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
@@ -64,7 +62,6 @@
 		
 
 		if (bestProv != null) {
-			savedLocation = locManager.getLastKnownLocation(bestProv);
 			locManager.requestLocationUpdates(bestProv, 0, 0, this);
 		} else {
 			// message that no suitable provider was found
@@ -89,11 +86,9 @@
 	}
 	
 	public void findNearestStations(Location location) {
-		StationProvider prov = ProviderFactory.getStationProvider();
-		prov.lookupStations(location);
-		this.stationList = prov.getStations();
+		provider.lookupStations(location);
 		
-		if (stationList.size() > 0) 
+		if ( provider.getStations().size() > 0) 
 			hndl.sendEmptyMessage(TrainInfoList.GOTSTATIONLIST);
 		else
 			hndl.sendEmptyMessage(TrainInfoList.LOOKUPSTATIONFAILED);
@@ -134,12 +129,15 @@
 		bjbro.setLatitude(56.380745);
 		bjbro.setLongitude(9.655609);
 		
+		Location hillerod = new Location("gps");
+		hillerod.setLatitude(55.929177);
+		hillerod.setLongitude(12.308095);
 		
 		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);
+		lm.setTestProviderLocation("gps2", hillerod);
 	}
 	
 	public static void removeMockLocation(Context cntx) {