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-07-26 01:48:25 +02:00
commit c35b868c37
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -386,7 +386,8 @@ public class RouteInfoWidgetsFactory {
@Override @Override
public boolean updateInfo(DrawSettings drawSettings) { public boolean updateInfo(DrawSettings drawSettings) {
float mx = 0; float mx = 0;
if ((rh == null || !rh.isFollowingMode() || rh.isDeviatedFromRoute()) && trackingUtilities.isMapLinkedToLocation()) { if ((rh == null || !rh.isFollowingMode() || rh.isDeviatedFromRoute() || rh.getCurrentGPXRoute() != null)
&& trackingUtilities.isMapLinkedToLocation()) {
RouteDataObject ro = locationProvider.getLastKnownRouteSegment(); RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
if(ro != null) { if(ro != null) {
boolean direction = true; boolean direction = true;
@ -795,8 +796,8 @@ public class RouteInfoWidgetsFactory {
int[] loclanes = null; int[] loclanes = null;
int dist = 0; int dist = 0;
// TurnType primary = null; // TurnType primary = null;
if ((rh == null || !rh.isFollowingMode() || rh.isDeviatedFromRoute()) && trackingUtilities.isMapLinkedToLocation() if ((rh == null || !rh.isFollowingMode() || rh.isDeviatedFromRoute() || rh.getCurrentGPXRoute() != null)
&& settings.SHOW_LANES.get()) { && trackingUtilities.isMapLinkedToLocation() && settings.SHOW_LANES.get()) {
RouteDataObject ro = locationProvider.getLastKnownRouteSegment(); RouteDataObject ro = locationProvider.getLastKnownRouteSegment();
Location lp = locationProvider.getLastKnownLocation(); Location lp = locationProvider.getLastKnownLocation();
if(ro != null) { if(ro != null) {
@ -1138,10 +1139,10 @@ public class RouteInfoWidgetsFactory {
boolean cams = settings.SHOW_CAMERAS.get(); boolean cams = settings.SHOW_CAMERAS.get();
boolean peds = settings.SHOW_PEDESTRIAN.get(); boolean peds = settings.SHOW_PEDESTRIAN.get();
boolean visible = false; boolean visible = false;
boolean eval = rh.isFollowingMode() || trackingUtilities.isMapLinkedToLocation(); if ((rh.isFollowingMode() || trackingUtilities.isMapLinkedToLocation())
if ((trafficWarnings || cams) && eval) { && (trafficWarnings || cams)) {
AlarmInfo alarm ; AlarmInfo alarm;
if(rh.isFollowingMode() && !rh.isDeviatedFromRoute()) { if(rh.isFollowingMode() && !rh.isDeviatedFromRoute() && rh.getCurrentGPXRoute() == null) {
alarm = wh.getMostImportantAlarm(settings.METRIC_SYSTEM.get(), cams); alarm = wh.getMostImportantAlarm(settings.METRIC_SYSTEM.get(), cams);
} else { } else {
RouteDataObject ro = locationProvider.getLastKnownRouteSegment(); RouteDataObject ro = locationProvider.getLastKnownRouteSegment();