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-17 22:57:30 +02:00
commit 94f7f8f0db
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/CurrentPositionHelper.java
View file

@ -57,7 +57,7 @@ public class CurrentPositionHelper {
if (loc == null || loc.getAccuracy() > 50) {
return null;
}
if(last != null && last.distanceTo(loc) < 20) {
if(last != null && last.distanceTo(loc) < 10) {
return r;
}
if (r == null) {
@ -65,7 +65,7 @@ public class CurrentPositionHelper {
return null;
}
double d = getOrthogonalDistance(r, loc);
if (d > 25) {
if (d > 15) {
scheduleRouteSegmentFind(loc, true, null, null);
}
if (d < 70) {

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

@ -755,14 +755,14 @@ public class RoutingHelper {
if(next != null) {
next[0] = n.directionInfo.getTurnType();
}
return formatStreetName(nm, rf, dn, ">>");
return formatStreetName(nm, rf, dn, "»");
}
RouteSegmentResult rs = getCurrentSegmentResult();
if(rs != null) {
String nm = rs.getObject().getName(settings.MAP_PREFERRED_LOCALE.get());
String rf = rs.getObject().getRef();
String dn = rs.getObject().getDestinationName(settings.MAP_PREFERRED_LOCALE.get());
return formatStreetName(nm, rf, dn, ">>");
return formatStreetName(nm, rf, dn, "»");
}
return null;
}

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

@ -566,7 +566,7 @@ public class MapInfoWidgetsFactory {
RouteDirectionInfo next = routingHelper.getRouteDirections().get(di);
type[0] = next.getTurnType();
turnDrawable.setColor(R.color.nav_arrow_distant);
text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName(), ">>");
text = RoutingHelper.formatStreetName(next.getStreetName(), next.getRef(), next.getDestinationName(), "»");
// if (next.distance > 0) {
// text += " " + OsmAndFormatter.getFormattedDistance(next.distance, map.getMyApplication());
// }
@ -581,7 +581,7 @@ public class MapInfoWidgetsFactory {
RouteDataObject rt = locationProvider.getLastKnownRouteSegment();
if (rt != null) {
text = RoutingHelper.formatStreetName(rt.getName(settings.MAP_PREFERRED_LOCALE.get()),
rt.getRef(), rt.getDestinationName(settings.MAP_PREFERRED_LOCALE.get()), ">>");
rt.getRef(), rt.getDestinationName(settings.MAP_PREFERRED_LOCALE.get()), "»");
}
if (text == null) {
text = "";