--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/08/08 19:02:20	237
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/08/09 12:12:33	243
@@ -7,11 +7,13 @@
 import android.app.ListActivity;
 import android.app.ProgressDialog;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
+import android.widget.Toast;
 import dk.thoerup.traininfo.provider.DepartureFactory;
 import dk.thoerup.traininfo.provider.DepartureProvider;
 
@@ -29,6 +31,10 @@
 	
 	ProgressDialog pgDialog;
 	
+	DepartureFetcher fetcher;
+	
+	double latitude,longitude;
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -38,12 +44,17 @@
 		setListAdapter(adapter);
 		
 		Intent launchedBy = getIntent();
+		
+		latitude = launchedBy.getDoubleExtra("latitude", 0.0);
+		longitude = launchedBy.getDoubleExtra("longitude", 0.0);
+		
 		String name = launchedBy.getStringExtra("name");
 		((TextView) findViewById(R.id.stationName)).setText( name );
 		
 		String addr = launchedBy.getStringExtra("address");
 		((TextView) findViewById(R.id.stationAddr)).setText( addr );
 		
+		findViewById(R.id.header).setOnClickListener( mapLauncher );
 		
 		NumberFormat format = NumberFormat.getNumberInstance();
 		format.setMaximumFractionDigits(1);
@@ -51,14 +62,21 @@
 		int distance = launchedBy.getIntExtra("distance", 0);
 		((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." );
 	
+		
 		showDialog(DLG_PROGRESS);
 		provider = DepartureFactory.getProvider();
-		provider.lookupDepartures(name);
-		departures = provider.getDepartures();
-		adapter.setDepartures(departures);
-		pgDialog.dismiss();
+		
+		fetcher = new DepartureFetcher();
+		fetcher.execute(name);
 	}
 	
+    @Override 
+    public void onSaveInstanceState(Bundle outState) 
+    {
+    	if (pgDialog.isShowing())
+    		pgDialog.dismiss();
+    }
+	
 	@Override
 	protected void onListItemClick(ListView l, View v, int position, long id) {
 		super.onListItemClick(l, v, position, id);
@@ -125,4 +143,35 @@
 				dlg.dismiss();
 		}
 	}
+	
+	View.OnClickListener mapLauncher = new View.OnClickListener() {
+		@Override
+		public void onClick(View v) {
+			Uri uri = Uri.parse("geo:" + latitude + "," + longitude);
+			startActivity( new Intent(Intent.ACTION_VIEW, uri));
+		}
+	};
+	
+	
+	class DepartureFetcher extends AsyncTask<String, Void, Void> {
+
+		@Override
+		protected void onPostExecute(Void result) {
+			super.onPostExecute(result);
+			
+			adapter.setDepartures(departures);
+			pgDialog.dismiss();
+			
+			if (departures.size() == 0)
+				Toast.makeText(DepartureList.this, "No departures found", Toast.LENGTH_LONG);
+		}
+
+		@Override
+		protected Void doInBackground(String... params) {
+			provider.lookupDepartures(params[0]);
+			departures = provider.getDepartures();
+			return null;
+		}
+		
+	}
 }