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-10 09:50:48 +02:00
commit b839bcb511
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
View file

@ -499,6 +499,7 @@ public class RouteCalculationResult {
RouteDirectionInfo prev = directions.get(i - 1);
prev.setAverageSpeed((prev.distance + r.distance)
/ (prev.distance / prev.getAverageSpeed() + r.distance / r.getAverageSpeed()));
prev.setDistance(prev.distance + r.distance);
directions.remove(i);
} else {
i++;

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

@ -102,4 +102,8 @@ public class RouteDirectionInfo {
public int getDistance() {
return distance;
}
public int setDistance(int distance) {
this.distance = distance;
}
}