--- android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2009/09/29 21:30:16	362
+++ android/TrainInfo/src/dk/thoerup/traininfo/DepartureList.java	2010/01/26 21:17:26	552
@@ -3,7 +3,6 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -11,12 +10,9 @@
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.location.Address;
-import android.location.Geocoder;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -72,16 +68,26 @@
 		format.setMinimumFractionDigits(1);
 		int distance = launchedBy.getIntExtra("distance", 0);
 		((TextView) findViewById(R.id.stationDistance)).setText( format.format((double)distance/1000.0) + " km." );
-	
 		
-		provider = ProviderFactory.getDepartureProvider();
+		boolean isRegional = launchedBy.getBooleanExtra("isregional", false);
+		boolean isSTrain = launchedBy.getBooleanExtra("isstrain", false);
+		//boolean isMetro = launchedBy.getBooleanExtra("ismetro", false); // not currently used
 		
-		if (savedInstanceState == null) {
-			startDepartureFetcher();
+	
+		if (isRegional == false && isSTrain == false) {
+			getListView().setVisibility( View.GONE );		
+			findViewById(R.id.metroonly).setVisibility( View.VISIBLE );
+			
 		} else {
-			departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
-			adapter.setDepartures(departures);
-			selectedItemId = savedInstanceState.getInt("selectedItemId");	
+			provider = ProviderFactory.getDepartureProvider();
+			
+			if (savedInstanceState == null) {
+				startDepartureFetcher();
+			} else {
+				departures = (List<DepartureBean>) savedInstanceState.getSerializable("departures");
+				adapter.setDepartures(departures);
+				selectedItemId = savedInstanceState.getInt("selectedItemId");	
+			}
 		}
 	}
 	
@@ -101,9 +107,11 @@
 		super.onListItemClick(l, v, position, id);
 		
 		selectedItemId = position;
+		
+		DepartureBean dep = departures.get(selectedItemId);
 	
 		Intent intent = new Intent(this, TimetableList.class);
-		intent.putExtra("asd", 0); //Add all necessary data
+		intent.putExtra("departure", dep);
 		
 		startActivity(intent);
 				
@@ -151,10 +159,8 @@
 		public void onClick(View v) {
 			if (dlg.isShowing())
 				dlg.dismiss();
-		}
-
-	
-}
+		}	
+	}
 	
 	View.OnClickListener mapLauncher = new View.OnClickListener() {
 		@Override
@@ -169,7 +175,7 @@
 	class DepartureFetcher extends AsyncTask<Integer, Void, Void> {
 
 		boolean success;
-		String addr;
+
 		@Override
 		protected void onPostExecute(Void result) {
 			super.onPostExecute(result);