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 2014-12-09 12:07:17 +01:00
commit c8045095ed
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-java/src/net/osmand/router/TurnType.java
View file

@ -162,12 +162,13 @@ public class TurnType {
this.lanes = lanes; this.lanes = lanes;
} }
// Note that there is no "weight" or ordering between the primary and secondary turns. // Note that the primary turn will be the one displayed on the map.
public static void setPrimaryTurn(int[] lanes, int lane, int turnType) { public static void setPrimaryTurn(int[] lanes, int lane, int turnType) {
lanes[lane] |= (turnType << 1); lanes[lane] |= (turnType << 1);
} }
public void setPrimaryTurn(int lane, int turnType) { public void setPrimaryTurn(int lane, int turnType) {
lanes[lane] &= ~(15 << 1);
lanes[lane] |= (turnType << 1); lanes[lane] |= (turnType << 1);
} }
@ -177,6 +178,7 @@ public class TurnType {
} }
public static void setSecondaryTurn(int[] lanes, int lane, int turnType) { public static void setSecondaryTurn(int[] lanes, int lane, int turnType) {
lanes[lane] &= ~(15 << 5);
lanes[lane] |= (turnType << 5); lanes[lane] |= (turnType << 5);
} }