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

Prepare for 0.8.3 release

Browse source
This commit is contained in:
Victor Shcherb 2012-09-20 00:59:41 +02:00
parent 043f5499fe
commit 26e80f5c90
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -945,13 +945,12 @@ public class MapActivity extends AccessibleActivity implements IMapLocationListe
} }
} }
public void navigateToPoint(LatLon point, boolean updateRoute, boolean intermediate){ public void navigateToPoint(LatLon point, boolean updateRoute, int intermediate){
if(point != null){ if(point != null){
if(!intermediate) { if(intermediate < 0) {
settings.setPointToNavigate(point.getLatitude(), point.getLongitude(), null); settings.setPointToNavigate(point.getLatitude(), point.getLongitude(), null);
} else { } else {
int sz = mapLayers.getNavigationLayer().getIntermediatePoints().size(); settings.insertIntermediatePoint(point.getLatitude(), point.getLongitude(), null, intermediate);
settings.insertIntermediatePoint(point.getLatitude(), point.getLongitude(), null, sz);
} }
} else { } else {
settings.clearPointToNavigate(); settings.clearPointToNavigate();

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

@ -768,10 +768,10 @@ public class MapActivityActions implements DialogProvider {
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
mapActivity.startActivity(intent); mapActivity.startActivity(intent);
} else if (standardId == R.string.context_menu_item_navigate_point) { } else if (standardId == R.string.context_menu_item_navigate_point) {
mapActivity.navigateToPoint(new LatLon(latitude, longitude), true, false); mapActivity.navigateToPoint(new LatLon(latitude, longitude), true, -1);
} else if (standardId == R.string.context_menu_item_directions) { } else if (standardId == R.string.context_menu_item_directions) {
Location loc = mapActivity.getLastKnownLocation(); Location loc = mapActivity.getLastKnownLocation();
mapActivity.navigateToPoint(new LatLon(latitude, longitude), false, false); mapActivity.navigateToPoint(new LatLon(latitude, longitude), false, -1);
// always enable and follow and let calculate it (GPS is not accessible in garage) // always enable and follow and let calculate it (GPS is not accessible in garage)
getDirections(loc, true); getDirections(loc, true);
} else if (standardId == R.string.context_menu_item_show_route) { } else if (standardId == R.string.context_menu_item_show_route) {
@ -782,11 +782,11 @@ public class MapActivityActions implements DialogProvider {
getDirections(loc, true); getDirections(loc, true);
} }
} else if (standardId == R.string.context_menu_item_intermediate_point) { } else if (standardId == R.string.context_menu_item_intermediate_point) {
mapActivity.navigateToPoint(new LatLon(latitude, longitude), true, true); mapActivity.navigateToPoint(new LatLon(latitude, longitude), true, mapActivity.getIntermediatePoints().size());
} else if (standardId == R.string.context_menu_item_first_intermediate_point) { } else if (standardId == R.string.context_menu_item_first_intermediate_point) {
mapActivity.navigateToPoint(new LatLon(latitude, longitude), true, true); mapActivity.navigateToPoint(new LatLon(latitude, longitude), true, 0);
} else if (standardId == R.string.context_menu_item_last_intermediate_point) { } else if (standardId == R.string.context_menu_item_last_intermediate_point) {
mapActivity.navigateToPoint(new LatLon(latitude, longitude), true, true); mapActivity.navigateToPoint(new LatLon(latitude, longitude), true, mapActivity.getIntermediatePoints().size());
} else if (standardId == R.string.context_menu_item_share_location) { } else if (standardId == R.string.context_menu_item_share_location) {
shareLocation(latitude, longitude, mapActivity.getMapView().getZoom()); shareLocation(latitude, longitude, mapActivity.getMapView().getZoom());
} else if (standardId == R.string.context_menu_item_add_favorite) { } else if (standardId == R.string.context_menu_item_add_favorite) {
@ -952,7 +952,7 @@ public class MapActivityActions implements DialogProvider {
mapActivity.updateApplicationModeSettings(); mapActivity.updateApplicationModeSettings();
mapView.refreshMap(changed); mapView.refreshMap(changed);
} else { } else {
mapActivity.navigateToPoint(null, true, false); mapActivity.navigateToPoint(null, true, -1);
} }
mapView.refreshMap(); mapView.refreshMap();
return true; return true;