--- android/TrainInfo/src/dk/thoerup/traininfo/StationLocator.java	2009/08/10 10:48:37	251
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationLocator.java	2009/08/10 10:49:43	252
@@ -153,15 +153,26 @@
 		// TODO Auto-generated method stub
 
 	}
-	
+
 	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);
 		
 		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");
 	}
 }