Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-04 20:04:22 +01:00
commit f170b1eef8

View file

@ -75,6 +75,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
if(selectFromMapTouch) { if(selectFromMapTouch) {
LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y); LatLon latlon = tileBox.getLatLonFromPixel(point.x, point.y);
selectFromMapTouch = false; selectFromMapTouch = false;
//TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point
showDialog(); showDialog();
if(selectFromMapForTarget) { if(selectFromMapForTarget) {
getTargets().navigateToPoint(latlon, true, -1); getTargets().navigateToPoint(latlon, true, -1);
@ -82,8 +83,8 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
getTargets().setStartPoint(latlon, true, null); getTargets().setStartPoint(latlon, true, null);
} }
contextMenu.setLocation(latlon, null); contextMenu.setLocation(latlon, null);
hideDialog();
showDialog(); showDialog();
//TODO: Hardy: Looks like there is an old bug somewhere here: Re-selecting the From or To via "Select on map" during a route calculation does interrupt the ongoing route calculation, while reselecting From or To via "Fvorites" correctly re-starts any ongoing route recalculation with the updated point
return true; return true;
} }
return super.onSingleTap(point, tileBox); return super.onSingleTap(point, tileBox);