1 files changed, 24 insertions, 10 deletions

diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 457b06c..b2bb8a6 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -4,6 +4,7 @@ import butterknife.ButterKnife;
 
 import cgeo.geocaching.CacheListActivity;
 import cgeo.geocaching.CgeoApplication;
+import cgeo.geocaching.CompassActivity;
 import cgeo.geocaching.DataStore;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Intents;
@@ -22,7 +23,6 @@ import cgeo.geocaching.enumerations.WaypointType;
 import cgeo.geocaching.list.StoredList;
 import cgeo.geocaching.location.Geopoint;
 import cgeo.geocaching.location.Viewport;
-import cgeo.geocaching.maps.LiveMapStrategy.Strategy;
 import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl;
 import cgeo.geocaching.maps.interfaces.GeoPointImpl;
 import cgeo.geocaching.maps.interfaces.MapActivityImpl;
@@ -449,11 +449,14 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
         mapView.clearOverlays();
 
         overlayCaches = mapView.createAddMapOverlay(mapView.getContext(), getResources().getDrawable(R.drawable.marker));
-        overlayPositionAndScale = mapView.createAddPositionAndScaleOverlay();
+
+
+        overlayPositionAndScale = mapView.createAddPositionAndScaleOverlay(coordsIntent, geocodeIntent);
         if (trailHistory != null) {
             overlayPositionAndScale.setHistory(trailHistory);
         }
 
+
         mapView.repaintRequired(null);
 
         setZoom(Settings.getMapZoom(mapMode));
@@ -508,7 +511,6 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
     /**
      * Set the zoom of the map. The zoom is restricted to a certain minimum in case of live map.
      *
-     * @param zoom
      */
     private void setZoom(final int zoom) {
         mapView.getMapController().setZoom(isLiveEnabled ? Math.max(zoom, MIN_LIVEMAP_ZOOM) : zoom);
@@ -663,7 +665,7 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
             item = menu.findItem(R.id.menu_theme_mode); // show theme selection
             item.setVisible(mapView.hasMapThemes());
 
-            menu.findItem(R.id.menu_as_list).setVisible(!isLoading());
+            menu.findItem(R.id.menu_as_list).setVisible(!isLoading() && caches.size() > 1);
 
             menu.findItem(R.id.submenu_strategy).setVisible(isLiveEnabled);
 
@@ -680,6 +682,8 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
                 default: // DETAILED
                     menu.findItem(R.id.menu_strategy_detailed).setChecked(true);
             }
+            menu.findItem(R.id.menu_hint).setVisible(mapMode == MapMode.SINGLE);
+            menu.findItem(R.id.menu_compass).setVisible(mapMode == MapMode.SINGLE);
         } catch (final RuntimeException e) {
             Log.e("CGeoMap.onPrepareOptionsMenu", e);
         }
@@ -765,24 +769,34 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
             }
             case R.id.menu_strategy_fastest: {
                 item.setChecked(true);
-                Settings.setLiveMapStrategy(Strategy.FASTEST);
+                Settings.setLiveMapStrategy(LivemapStrategy.FASTEST);
                 return true;
             }
             case R.id.menu_strategy_fast: {
                 item.setChecked(true);
-                Settings.setLiveMapStrategy(Strategy.FAST);
+                Settings.setLiveMapStrategy(LivemapStrategy.FAST);
                 return true;
             }
             case R.id.menu_strategy_auto: {
                 item.setChecked(true);
-                Settings.setLiveMapStrategy(Strategy.AUTO);
+                Settings.setLiveMapStrategy(LivemapStrategy.AUTO);
                 return true;
             }
             case R.id.menu_strategy_detailed: {
                 item.setChecked(true);
-                Settings.setLiveMapStrategy(Strategy.DETAILED);
+                Settings.setLiveMapStrategy(LivemapStrategy.DETAILED);
                 return true;
             }
+            case R.id.menu_hint:
+                if (caches.size() == 1) {
+                    caches.iterator().next().showHintToast(getActivity());
+                }
+                return true;
+            case R.id.menu_compass:
+                if (caches.size() == 1) {
+                    CompassActivity.startActivityCache(this.getActivity(), caches.iterator().next());
+                }
+                return true;
             default:
                 final MapSource mapSource = MapProviderFactory.getMapSource(id);
                 if (mapSource != null) {
@@ -994,12 +1008,13 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
                         final boolean needsRepaintForHeading = needsRepaintForHeading();
 
                         if (needsRepaintForDistanceOrAccuracy) {
-                            if (map.followMyLocation) {
+                            if (CGeoMap.followMyLocation) {
                                 map.centerMap(new Geopoint(currentLocation));
                             }
                         }
 
                         if (needsRepaintForDistanceOrAccuracy || needsRepaintForHeading) {
+
                             map.overlayPositionAndScale.setCoordinates(currentLocation);
                             map.overlayPositionAndScale.setHeading(currentHeading);
                             map.mapView.repaintRequired(map.overlayPositionAndScale);
@@ -1116,7 +1131,6 @@ public class CGeoMap extends AbstractMap implements ViewFactory {
     /**
      * get if map is loading something
      *
-     * @return
      */
     public boolean isLoading() {
         return !loadTimer.isUnsubscribed() &&