Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix #2742(1)

Browse source
This commit is contained in:
Alexey Kulish 2016-07-03 11:55:56 +03:00
parent caa09cfc27
commit 187cdd1928
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -272,10 +272,8 @@ public class MapActivityActions implements DialogProvider {
ContextMenuItem.ItemBuilder itemBuilder = new ContextMenuItem.ItemBuilder(); ContextMenuItem.ItemBuilder itemBuilder = new ContextMenuItem.ItemBuilder();
adapter.addItem(itemBuilder.setTitleId(R.string.context_menu_item_search, mapActivity) adapter.addItem(itemBuilder.setTitleId(R.string.context_menu_item_search, mapActivity)
.setIcon(R.drawable.ic_action_search_dark).createItem()); .setIcon(R.drawable.ic_action_search_dark).createItem());
if (!mapActivity.getRoutingHelper().isFollowingMode() && !mapActivity.getRoutingHelper().isRoutePlanningMode()) { adapter.addItem(itemBuilder.setTitleId(R.string.context_menu_item_directions_from, mapActivity)
adapter.addItem(itemBuilder.setTitleId(R.string.context_menu_item_directions_from, mapActivity) .setIcon(R.drawable.ic_action_gdirections_dark).createItem());
.setIcon(R.drawable.ic_action_gdirections_dark).createItem());
}
if (getMyApplication().getTargetPointsHelper().getPointToNavigate() != null && if (getMyApplication().getTargetPointsHelper().getPointToNavigate() != null &&
(mapActivity.getRoutingHelper().isFollowingMode() || mapActivity.getRoutingHelper().isRoutePlanningMode())) { (mapActivity.getRoutingHelper().isFollowingMode() || mapActivity.getRoutingHelper().isRoutePlanningMode())) {
adapter.addItem(itemBuilder.setTitleId(R.string.context_menu_item_last_intermediate_point, mapActivity) adapter.addItem(itemBuilder.setTitleId(R.string.context_menu_item_last_intermediate_point, mapActivity)
@ -309,8 +307,13 @@ public class MapActivityActions implements DialogProvider {
&& getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) { && getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
setFirstMapMarkerAsTarget(); setFirstMapMarkerAsTarget();
} }
enterRoutePlanningMode(new LatLon(latitude, longitude), if (!mapActivity.getRoutingHelper().isFollowingMode() && !mapActivity.getRoutingHelper().isRoutePlanningMode()) {
mapActivity.getContextMenu().getPointDescription()); enterRoutePlanningMode(new LatLon(latitude, longitude),
mapActivity.getContextMenu().getPointDescription());
} else {
getMyApplication().getTargetPointsHelper().setStartPoint(new LatLon(latitude, longitude),
true, mapActivity.getContextMenu().getPointDescription());
}
} }
} }
}); });