--- android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/09/23 12:51:49	336
+++ android/TrainInfo/src/dk/thoerup/traininfo/StationList.java	2009/09/30 20:38:47	374
@@ -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;
@@ -39,6 +48,8 @@
 	LocationLookup locator = null;
 	LocatorTask locatorTask;
 	
+	GeoPair location = new GeoPair();
+	
 	boolean isRunning = false;
 	List<StationBean> stations = new ArrayList<StationBean>();
 	
@@ -52,8 +63,6 @@
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.main);
 		
-		LocationLookup.removeMockLocation(this);
-		//LocationLookup.injectMockLocation(this);
 		
 		adapter = new StationListAdapter(this);
 		setListAdapter(adapter);
@@ -64,20 +73,68 @@
 		} else {
 			stations = (ArrayList<StationBean>) savedInstanceState.getSerializable("stations");
 			adapter.setStations(stations);
+			location = (GeoPair) savedInstanceState.getSerializable("location");
 		}
 	}
-	
+
+
     @Override 
     public void onSaveInstanceState(Bundle outState) 
     {
     	if (dialog != null && dialog.isShowing())
     		dialog.dismiss();
     	outState.putSerializable("stations", (ArrayList<StationBean>) stations);
+    	outState.putSerializable("location", location);
     }
 	
 	
 
 	@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", location );
+			
+			ArrayList<GeoPair> stationPoints = new ArrayList<GeoPair>();
+			for (StationBean st : stations ) {
+				stationPoints.add( new GeoPair(st.getLatitude(), st.getLongitude(), st.getName()) );
+			}
+			
+			intent.putExtra("stations", stationPoints);
+			
+			startActivity(intent);
+			retval = true;
+			break;
+		case OPTIONS_ABOUT:
+			String ver = this.getResources().getString(R.string.app_version);
+			
+			StringBuffer message = new StringBuffer();
+			message.append("TrainInfo DK v").append(ver).append("\n");
+			message.append("By Torben Nielsen\n");
+
+			MessageBox.showMessage(this, message.toString());
+			retval = true;
+			break;
+		default:
+			retval = super.onOptionsItemSelected(item);
+		}
+		
+		return retval;
+	}
+
+	@Override
 	protected Dialog onCreateDialog(int id) {
 		switch (id) {
 		case DLG_PROGRESS:
@@ -125,6 +182,7 @@
 				dismissDialog(DLG_PROGRESS);
 				
 				startLocatorTask();
+				location = GeoPair.fromLocation( locator.getLocation() );
 				
 				break;