Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-05 21:49:50 +01:00
commit 72932cfef8

View file

@ -79,8 +79,6 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
getTargets().navigateToPoint(latlon, true, -1);
} else {
//TODO: Hardy: Looks like there is a small bug somewhere: Re-selecting the "From" or "To" point during an ongoing route calculation (and only then) seems to only interrupt the ongoing route calculation. but not restart it, if (and only if) a route origin other than "Current position" is set. (Looks like this case is treated like a mere position update in our RoutingHelper, so normally no complete re-calculation is needed.)
//So let's see if we can trigger route-recalculation during an ongoing calculation by the inserting the following line
getTargets().clearStartPoint(false);
getTargets().setStartPoint(latlon, true, null);
}
contextMenu.setLocation(latlon, null);
@ -180,7 +178,7 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
} else if(position == 1) {
selectFavorite(parentView, false);
} else if(position == 2) {
selectOnScreen(parentView, false);
(parentView, false);
}
}