1 files changed, 21 insertions, 13 deletions

diff --git a/src/net/cbaines/suma/BuildingNumOverlay.java b/src/net/cbaines/suma/BuildingNumOverlay.java
index 9825616..33b5efc 100644
--- a/src/net/cbaines/suma/BuildingNumOverlay.java
+++ b/src/net/cbaines/suma/BuildingNumOverlay.java
@@ -29,7 +29,6 @@ import org.osmdroid.views.MapView;
 import org.osmdroid.views.MapView.Projection;
 import org.osmdroid.views.overlay.Overlay;
 
-import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -92,25 +91,29 @@ public class BuildingNumOverlay extends Overlay {
     /**
      * Draw a marker on each of our items. populate() must have been called first.<br/>
      * <br/>
-     * The marker will be drawn twice for each Item in the Overlay--once in the shadow phase, skewed and darkened, then again in the non-shadow phase. The
-     * bottom-center of the marker will be aligned with the geographical coordinates of the Item.<br/>
+     * The marker will be drawn twice for each Item in the Overlay--once in the shadow phase, skewed and darkened, then
+     * again in the non-shadow phase. The bottom-center of the marker will be aligned with the geographical coordinates
+     * of the Item.<br/>
      * <br/>
-     * The order of drawing may be changed by overriding the getIndexToDraw(int) method. An item may provide an alternate marker via its
-     * OverlayItem.getMarker(int) method. If that method returns null, the default marker is used.<br/>
+     * The order of drawing may be changed by overriding the getIndexToDraw(int) method. An item may provide an
+     * alternate marker via its OverlayItem.getMarker(int) method. If that method returns null, the default marker is
+     * used.<br/>
      * <br/>
      * The focused item is always drawn last, which puts it visually on top of the other items.<br/>
      * 
      * @param canvas
-     *            the Canvas upon which to draw. Note that this may already have a transformation applied, so be sure to leave it the way you found it
+     *            the Canvas upon which to draw. Note that this may already have a transformation applied, so be sure to
+     *            leave it the way you found it
      * @param mapView
-     *            the MapView that requested the draw. Use MapView.getProjection() to convert between on-screen pixels and latitude/longitude pairs
+     *            the MapView that requested the draw. Use MapView.getProjection() to convert between on-screen pixels
+     *            and latitude/longitude pairs
      * @param shadow
      *            if true, draw the shadow layer. If false, draw the overlay contents.
      */
     @Override
     public void draw(final Canvas canvas, final MapView mapView, final boolean shadow) {
 
-	if (shadow) {
+	if (shadow || !isEnabled()) {
 	    return;
 	}
 
@@ -181,7 +184,8 @@ public class BuildingNumOverlay extends Overlay {
     @Override
     public boolean onSingleTapUp(final MotionEvent event, final MapView mapView) {
 
-	Log.v(TAG, "Pointer count for onSingleTapUp is " + event.getPointerCount() + " " + event.getAction() + " " + event.describeContents());
+	Log.v(TAG, "Pointer count for onSingleTapUp is " + event.getPointerCount() + " " + event.getAction() + " "
+		+ event.describeContents());
 	if (event.getPointerCount() != 1) {
 	    Log.v(TAG, "Pointer count for onSingleTapUp not 1, ignoring");
 	    return false;
@@ -199,7 +203,8 @@ public class BuildingNumOverlay extends Overlay {
 	    Log.i(TAG, "building Pressed " + building.id);
 
 	    if (context.activityToast == null) {
-		context.activityToast = Toast.makeText(context, building.name + " (" + building.id + ")", Toast.LENGTH_SHORT);
+		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 + ")");
@@ -218,7 +223,8 @@ public class BuildingNumOverlay extends Overlay {
     @Override
     public boolean onLongPress(final MotionEvent event, final MapView mapView) {
 
-	Log.v(TAG, "Pointer count for onLongPress is " + event.getPointerCount() + " " + event.getAction() + " " + event.describeContents());
+	Log.v(TAG, "Pointer count for onLongPress is " + event.getPointerCount() + " " + event.getAction() + " "
+		+ event.describeContents());
 	if (event.getPointerCount() != 1) {
 	    Log.v(TAG, "Pointer count for onLongPress not 1, ignoring");
 	    return false;
@@ -239,7 +245,8 @@ public class BuildingNumOverlay extends Overlay {
 		building.favourite = false;
 
 		if (context.activityToast == null) {
-		    context.activityToast = Toast.makeText(context, building.id + " removed from favourites", Toast.LENGTH_SHORT);
+		    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");
@@ -248,7 +255,8 @@ public class BuildingNumOverlay extends Overlay {
 
 	    } else {
 		if (context.activityToast == null) {
-		    context.activityToast = Toast.makeText(context, building.id + " made a favourite", Toast.LENGTH_SHORT);
+		    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");