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

Fix https://github.com/osmandapp/Osmand/issues/1283

Browse source
This commit is contained in:
Victor Shcherb 2015-05-31 18:54:52 +02:00
parent eb1a94c4f6
commit 4f108b05ae
2 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java
View file

@ -64,7 +64,6 @@ public class NextTurnInfoWidget extends TextInfoWidget {
public void setTurnImminent(int turnImminent, boolean deviatedFromRoute) { public void setTurnImminent(int turnImminent, boolean deviatedFromRoute) {
if(turnDrawable.turnImminent != turnImminent || turnDrawable.deviatedFromRoute != deviatedFromRoute) { if(turnDrawable.turnImminent != turnImminent || turnDrawable.deviatedFromRoute != deviatedFromRoute) {
turnDrawable.setTurnImminent(turnImminent, deviatedFromRoute); turnDrawable.setTurnImminent(turnImminent, deviatedFromRoute);
updateDistance();
} }
} }
@ -93,14 +92,6 @@ public class NextTurnInfoWidget extends TextInfoWidget {
} }
} }
public void setExitOut(int exit) {
// TODO exit
// if(turnDrawable.exitOut != exit) {
// turnDrawable.e
// }
// TODO;
}
@Override @Override
public boolean updateInfo(DrawSettings drawSettings) { public boolean updateInfo(DrawSettings drawSettings) {
return false; return false;
@ -152,6 +143,7 @@ public class NextTurnInfoWidget extends TextInfoWidget {
} else { } else {
paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow_distant)); paintRouteDirection.setColor(ctx.getResources().getColor(R.color.nav_arrow_distant));
} }
invalidateSelf();
} }

1
OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
View file

@ -77,7 +77,6 @@ public class RouteInfoWidgetsFactory {
NextDirectionInfo r = routingHelper.getNextRouteDirectionInfo(calc1, true); NextDirectionInfo r = routingHelper.getNextRouteDirectionInfo(calc1, true);
if (r != null && r.distanceTo > 0 && r.directionInfo != null) { if (r != null && r.distanceTo > 0 && r.directionInfo != null) {
turnType = r.directionInfo.getTurnType(); turnType = r.directionInfo.getTurnType();
setExitOut(turnType.getExitOut());
nextTurnDistance = r.distanceTo; nextTurnDistance = r.distanceTo;
turnImminent = r.imminent; turnImminent = r.imminent;
} }