--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/09/30 11:20:53	367
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/09/30 13:32:20	368
@@ -18,10 +18,16 @@
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.ListView;
+
+
 import dk.thoerup.traininfo.provider.ProviderFactory;
 import dk.thoerup.traininfo.provider.StationProvider;
+import dk.thoerup.traininfo.stationmap.GeoPair;
+import dk.thoerup.traininfo.stationmap.StationMapView;
 import dk.thoerup.traininfo.util.MessageBox;
 
 public class StationList extends ListActivity  {
@@ -29,6 +35,9 @@
 	public static final int GOTSTATIONLIST = 1002;
 	public static final int NOPROVIDER = 1003;
 	public static final int LOCATIONFIXTIMEOUT = 1004;
+	
+	public static final int OPTIONS_MAP = 2001;
+	public static final int OPTIONS_ABOUT = 2002;
 
 	
 	public static final int DLG_PROGRESS = 1001;
@@ -76,6 +85,41 @@
 	
 
 	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		menu.add(0, OPTIONS_MAP, 0, "Show station map");
+		menu.add(0, OPTIONS_ABOUT, 0, "About");
+		
+		return true;
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		boolean retval;
+		
+		switch (item.getItemId()) {
+		case OPTIONS_MAP:
+			
+			Intent intent = new Intent(this,StationMapView.class);
+			intent.putExtra("userlocation", GeoPair.fromLocation(locator.getLocation()) );
+			
+			ArrayList<GeoPair> stationPoints = new ArrayList<GeoPair>();
+			for (StationBean st : stations ) {
+				stationPoints.add( new GeoPair(st.getLatitude(), st.getLongitude()) );
+			}
+			
+			intent.putExtra("stations", stationPoints);
+			
+			startActivity(intent);
+			retval = true;
+			break;
+		default:
+			retval = super.onOptionsItemSelected(item);
+		}
+		
+		return retval;
+	}
+
+	@Override
 	protected Dialog onCreateDialog(int id) {
 		switch (id) {
 		case DLG_PROGRESS: