1 files changed, 29 insertions, 6 deletions

diff --git a/src/net/cbaines/suma/BuildingNumOverlay.java b/src/net/cbaines/suma/BuildingNumOverlay.java
index 4bd5f3a..baa92b5 100644
--- a/src/net/cbaines/suma/BuildingNumOverlay.java
+++ b/src/net/cbaines/suma/BuildingNumOverlay.java
@@ -25,7 +25,6 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.MapView.Projection;
 import org.osmdroid.views.overlay.Overlay;
@@ -62,13 +61,13 @@ public class BuildingNumOverlay extends Overlay {
 
     private static final String TAG = "BuildingNumOverlay";
 
-    private final Context context;
+    private final SouthamptonUniversityMapActivity context;
 
     private Dao<Building, String> buildingDao;
 
     private float userScale = 1f;
 
-    public BuildingNumOverlay(Context context, List<Building> buildings) throws SQLException {
+    public BuildingNumOverlay(SouthamptonUniversityMapActivity context, List<Building> buildings) throws SQLException {
 	super(context);
 
 	this.context = context;
@@ -192,12 +191,23 @@ public class BuildingNumOverlay extends Overlay {
 	} else {
 	    Log.i(TAG, "building Pressed " + building.id);
 
-	    Toast.makeText(context, building.name + " (" + building.id + ")", Toast.LENGTH_SHORT).show();
+	    if (context.activityToast == null) {
+		context.activityToast = Toast.makeText(context, building.name + " (" + building.id + ")", Toast.LENGTH_SHORT);
+	    } else {
+		context.activityToast.setDuration(Toast.LENGTH_SHORT);
+		context.activityToast.setText(building.name + " (" + building.id + ")");
+	    }
+	    context.activityToast.show();
+
 	    return true;
 	}
 
     }
 
+    public boolean onDoubleTap(final MotionEvent e, final MapView mapView) {
+	return false;
+    }
+
     @Override
     public boolean onLongPress(final MotionEvent event, final MapView mapView) {
 	if (!this.isEnabled())
@@ -214,9 +224,22 @@ public class BuildingNumOverlay extends Overlay {
 	    if (building.favourite) {
 		building.favourite = false;
 
-		Toast.makeText(context, building.id + " removed from favourites", Toast.LENGTH_SHORT).show();
+		if (context.activityToast == null) {
+		    context.activityToast = Toast.makeText(context, building.id + " removed from favourites", Toast.LENGTH_SHORT);
+		} else {
+		    context.activityToast.setDuration(Toast.LENGTH_SHORT);
+		    context.activityToast.setText(building.id + " removed from favourites");
+		}
+		context.activityToast.show();
+
 	    } else {
-		Toast.makeText(context, building.id + " made a favourite", Toast.LENGTH_SHORT).show();
+		if (context.activityToast == null) {
+		    context.activityToast = Toast.makeText(context, building.id + " made a favourite", Toast.LENGTH_SHORT);
+		} else {
+		    context.activityToast.setDuration(Toast.LENGTH_SHORT);
+		    context.activityToast.setText(building.id + " made a favourite");
+		}
+		context.activityToast.show();
 
 		building.favourite = true;
 	    }