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-08-08 09:17:38 +02:00
commit b5d3925d88
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -604,7 +604,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
if (directionInfo >= 0 && routingHelper.getRouteDirections() != null if (directionInfo >= 0 && routingHelper.getRouteDirections() != null
&& directionInfo < routingHelper.getRouteDirections().size()) { && directionInfo < routingHelper.getRouteDirections().size()) {
RouteDirectionInfo ri = routingHelper.getRouteDirections().get(directionInfo); RouteDirectionInfo ri = routingHelper.getRouteDirections().get(directionInfo);
if (!ri.getDescriptionRoutePart().endsWith(" " + OsmAndFormatter.getFormattedDistance(ri.distance, ctx))) { if (!ri.getDescriptionRoutePart().endsWith(OsmAndFormatter.getFormattedDistance(ri.distance, ctx))) {
textView.setText((directionInfo + 1) + ". " + ri.getDescriptionRoutePart() + " " + OsmAndFormatter.getFormattedDistance(ri.distance, ctx)); textView.setText((directionInfo + 1) + ". " + ri.getDescriptionRoutePart() + " " + OsmAndFormatter.getFormattedDistance(ri.distance, ctx));
} else { } else {
textView.setText((directionInfo + 1) + ". " + ri.getDescriptionRoutePart()); textView.setText((directionInfo + 1) + ". " + ri.getDescriptionRoutePart());

2
OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java
View file

@ -37,7 +37,7 @@ public class RouteDirectionInfo {
} }
public String getDescriptionRoute(OsmandApplication ctx) { public String getDescriptionRoute(OsmandApplication ctx) {
if (!descriptionRoute.endsWith(" " + OsmAndFormatter.getFormattedDistance(distance, ctx))) { if (!descriptionRoute.endsWith(OsmAndFormatter.getFormattedDistance(distance, ctx))) {
descriptionRoute += " " + OsmAndFormatter.getFormattedDistance(distance, ctx); descriptionRoute += " " + OsmAndFormatter.getFormattedDistance(distance, ctx);
} }
return descriptionRoute.trim(); return descriptionRoute.trim();