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

move "current" and "next" characters to routingHelper

Browse source
This commit is contained in:
sonora 2013-09-01 11:56:11 +02:00
parent e13864e868
commit 9d8655c270
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
View file

@ -643,14 +643,14 @@ public class RoutingHelper {
String nm = n.directionInfo.getStreetName(); String nm = n.directionInfo.getStreetName();
String rf = n.directionInfo.getRef(); String rf = n.directionInfo.getRef();
String dn = n.directionInfo.getDestinationName(); String dn = n.directionInfo.getDestinationName();
return formatStreetName(nm, rf, dn); return "\u2551 " + formatStreetName(nm, rf, dn);
} }
RouteSegmentResult rs = getCurrentSegmentResult(); RouteSegmentResult rs = getCurrentSegmentResult();
if(rs != null) { if(rs != null) {
String nm = rs.getObject().getName(); String nm = rs.getObject().getName();
String rf = rs.getObject().getRef(); String rf = rs.getObject().getRef();
String dn = rs.getObject().getDestinationName(); String dn = rs.getObject().getDestinationName();
return formatStreetName(nm, rf, dn); return "\u2566 " + formatStreetName(nm, rf, dn);
} }
return null; return null;
} }

2
OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
View file

@ -314,7 +314,7 @@ public class MapInfoWidgetsFactory {
String text = null; String text = null;
if (routingHelper != null && routingHelper.isRouteCalculated()) { if (routingHelper != null && routingHelper.isRouteCalculated()) {
if (routingHelper.isFollowingMode()) { if (routingHelper.isFollowingMode()) {
text = "\u2551 " + routingHelper.getCurrentName(); text = routingHelper.getCurrentName();
} else { } else {
int di = map.getMapLayers().getRouteInfoLayer().getDirectionInfo(); int di = map.getMapLayers().getRouteInfoLayer().getDirectionInfo();
if (di >= 0 && map.getMapLayers().getRouteInfoLayer().isVisible() && if (di >= 0 && map.getMapLayers().getRouteInfoLayer().isVisible() &&