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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-01-30 08:54:40 +01:00
commit 99aa6135f7
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -416,7 +416,9 @@ public class MapActivityActions implements DialogProvider {
app.getRoutingHelper().setFollowingMode(false); app.getRoutingHelper().setFollowingMode(false);
app.getRoutingHelper().setRoutePlanningMode(true); app.getRoutingHelper().setRoutePlanningMode(true);
// reset start point // reset start point
targets.setStartPoint(from, false, fromName); if (targets.getPointToStart() == null) {
targets.setStartPoint(from, false, fromName);
}
// then set gpx // then set gpx
setGPXRouteParams(gpxFile); setGPXRouteParams(gpxFile);
// then update start and destination point // then update start and destination point
@ -758,7 +760,7 @@ public class MapActivityActions implements DialogProvider {
routingHelper.setRoutePlanningMode(false); routingHelper.setRoutePlanningMode(false);
settings.LAST_ROUTING_APPLICATION_MODE = settings.APPLICATION_MODE.get(); settings.LAST_ROUTING_APPLICATION_MODE = settings.APPLICATION_MODE.get();
settings.APPLICATION_MODE.set(settings.DEFAULT_APPLICATION_MODE.get()); settings.APPLICATION_MODE.set(settings.DEFAULT_APPLICATION_MODE.get());
getMyApplication().getTargetPointsHelper().clearStartPoint(false); //getMyApplication().getTargetPointsHelper().clearStartPoint(false);
mapActivity.updateApplicationModeSettings(); mapActivity.updateApplicationModeSettings();
mapActivity.getDashboard().clearDeletedPoints(); mapActivity.getDashboard().clearDeletedPoints();
} }

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
View file

@ -419,7 +419,7 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
public int getFabIconId() { public int getFabIconId() {
RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper(); RoutingHelper routingHelper = mapActivity.getMyApplication().getRoutingHelper();
if (routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode()) { if (routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode()) {
return R.drawable.map_action_flag_dark; return R.drawable.map_action_waypoint;
} else { } else {
return R.drawable.map_directions; return R.drawable.map_directions;
} }