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

label Issue 1929 - back out for now

Browse source
This commit is contained in:
sonora 2013-06-12 01:35:07 +02:00
parent 16b326c4bd
commit 83db0810f7
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -801,11 +801,13 @@ public class MapActivityActions implements DialogProvider {
getDirections(loc, null, true);
}
} else if (standardId == R.string.context_menu_item_intermediate_point) {
// Issue 1929: navigatePointDialogAndLaunchMap(activity, latitude, longitude, null);
targets.navigateToPoint(new LatLon(latitude, longitude),
true, targets.getIntermediatePoints().size());
IntermediatePointsDialog.openIntermediatePointsDialog(mapActivity);
// For button-less search UI
} else if (standardId == R.string.context_menu_item_destination_point) {
// Issue 1929: navigatePointDialogAndLaunchMap(activity, latitude, longitude, null);
targets.navigateToPoint(new LatLon(latitude, longitude),
true, -1);
IntermediatePointsDialog.openIntermediatePointsDialog(mapActivity);
@ -1278,7 +1280,7 @@ public class MapActivityActions implements DialogProvider {
}
public void navigatePointDialogAndLaunchMap(final Activity act, final double lat, final double lon, final String name){
public static void navigatePointDialogAndLaunchMap(final Activity act, final double lat, final double lon, final String name){
OsmandApplication ctx = (OsmandApplication) act.getApplication();
final TargetPointsHelper targetPointsHelper = ctx.getTargetPointsHelper();
final OsmandSettings settings = ctx.getSettings();
@ -1307,16 +1309,16 @@ public class MapActivityActions implements DialogProvider {
settings.insertIntermediatePoint(lat, lon, name, 0, true);
}
targetPointsHelper.updatePointsFromSettings();
IntermediatePointsDialog.openIntermediatePointsDialog(mapActivity);
//MapActivity.launchMapActivityMoveToTop(act);
// Issue 1929: IntermediatePointsDialog.openIntermediatePointsDialog(mapActivity);
MapActivity.launchMapActivityMoveToTop(act);
}
});
builder.show();
} else {
settings.setPointToNavigate(lat, lon, true, name);
targetPointsHelper.updatePointsFromSettings();
IntermediatePointsDialog.openIntermediatePointsDialog(mapActivity);
//MapActivity.launchMapActivityMoveToTop(act);
// Issue 1929: IntermediatePointsDialog.openIntermediatePointsDialog(mapActivity);
MapActivity.launchMapActivityMoveToTop(act);
}
}