diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 8c187f4b51..2e4a32129f 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -60,7 +60,6 @@ Rename marker A tap on the map toggles the control buttons and widgets. Full screen mode - Show on Top Bar Mark passed can be imported as Favorites points, or as track file. Import as GPX file diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java index ef194d4144..2194101513 100644 --- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java +++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java @@ -7,6 +7,8 @@ import net.osmand.data.PointDescription; import net.osmand.plus.IconsCache; import net.osmand.plus.MapMarkersHelper; import net.osmand.plus.MapMarkersHelper.MapMarker; +import net.osmand.plus.OsmandApplication; +import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.helpers.MapMarkerDialogHelper; @@ -20,10 +22,11 @@ public class MapMarkerMenuController extends MenuController { public MapMarkerMenuController(MapActivity mapActivity, PointDescription pointDescription, MapMarker mapMarker) { super(new MenuBuilder(mapActivity), pointDescription, mapActivity); + final OsmandApplication app = mapActivity.getMyApplication(); this.mapMarker = mapMarker; builder.setShowNearestWiki(true); - final MapMarkersHelper markersHelper = mapActivity.getMyApplication().getMapMarkersHelper(); + final MapMarkersHelper markersHelper = app.getMapMarkersHelper(); leftTitleButtonController = new TitleButtonController() { @Override public void buttonPressed() { @@ -38,11 +41,16 @@ public class MapMarkerMenuController extends MenuController { leftSubtitleButtonController = new TitleButtonController() { @Override public void buttonPressed() { + OsmandSettings.OsmandPreference indication = app.getSettings().MARKERS_DISTANCE_INDICATION_ENABLED; + if (!indication.get()) { + indication.set(true); + getMapActivity().getMapLayers().getMapWidgetRegistry().updateMapMarkersMode(getMapActivity()); + } markersHelper.moveMarkerToTop(getMapMarker()); getMapActivity().getContextMenu().close(); } }; - leftSubtitleButtonController.caption = getMapActivity().getString(R.string.show_on_top_bar); + leftSubtitleButtonController.caption = getMapActivity().getString(R.string.make_active); leftSubtitleButtonController.leftIcon = createShowOnTopbarIcon(); }