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-19 14:37:47 +02:00
commit 11fa1ffd04
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
OsmAnd-java/src/net/osmand/binary/RouteDataObject.java
View file

@ -224,7 +224,7 @@ public class RouteDataObject {
public float getMaximumSpeed(boolean direction){ public float getMaximumSpeed(boolean direction){
int sz = types.length; int sz = types.length;
float maxSpeed = 0; float maxSpeed = 0;
for (int i = 0; i < sz; i++) { for (int i = 0; i < sz; i++) {
RouteTypeRule r = region.quickGetEncodingRule(types[i]); RouteTypeRule r = region.quickGetEncodingRule(types[i]);
if(r.isForward() != 0) { if(r.isForward() != 0) {
@ -232,19 +232,18 @@ public class RouteDataObject {
continue; continue;
} }
} }
float mx = r.maxSpeed(); float mx = r.maxSpeed();
if (mx > 0) { if (mx > 0) {
maxSpeed = mx; maxSpeed = mx;
// conditional has priority // conditional has priority
if(r.conditional()) { if(r.conditional()) {
break; break;
} }
} }
} }
return maxSpeed ; return maxSpeed ;
} }
public static float parseSpeed(String v, float def) { public static float parseSpeed(String v, float def) {
if(v.equals("none")) { if(v.equals("none")) {
return RouteDataObject.NONE_MAX_SPEED; return RouteDataObject.NONE_MAX_SPEED;