Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java

@@ -1006,6 +1006,7 @@ public class RouteResultPreparation {
 		int[] lanes = new int[splitLaneOptions.length];
 		for (int i = 0; i < splitLaneOptions.length; i++) {
 			String[] laneOptions = splitLaneOptions[i].split(";");
+			boolean isTertiaryTurn = false;
 
 			for (int j = 0; j < laneOptions.length; j++) {
 				int turn;
@@ -1039,10 +1040,13 @@ public class RouteResultPreparation {
                     	(TurnType.isLeftTurn(calcTurnType) && TurnType.isLeftTurn(turn)) 
                     	) {
                     	TurnType.setPrimaryTurnShiftOthers(lanes, i, turn);
-                    } else {
+                    } else if (!isTertiaryTurn) {
                     	TurnType.setSecondaryTurnShiftOthers(lanes, i, turn);
+						isTertiaryTurn = true;
+                    } else {
+						TurnType.setTertiaryTurn(lanes, i, turn);
+						break;
                     }
-					break; // Move on to the next lane
 				}
 			}
 		}

OsmAnd-java/src/net/osmand/router/TurnType.java

@@ -180,7 +180,7 @@ public class TurnType {
 	}
 
 	public static int getSecondaryTurn(int laneValue) {
-		// Get the primary turn modifier for the lane
+		// Get the secondary turn modifier for the lane
 		return (laneValue >> 5);
 	}
 	
@@ -206,7 +206,7 @@ public class TurnType {
 	}
 
 	public static int getTertiaryTurn(int laneValue) {
-		// Get the primary turn modifier for the lane
+		// Get the tertiary turn modifier for the lane
 		return (laneValue >> 10);
 	}
 

OsmAnd-java/test/resources/test_turn_lanes.json

@@ -216,6 +216,21 @@
     "expectedResults": {
       "14418": "TL, +TL, C, C, TR"
    }
+  },
+  {
+    "testName": "11.Figure 8 TL",
+    "startPoint": {
+      "latitude": 45.69816447596442,
+      "longitude": 35.74885922431952
+    },
+    "endPoint": {
+      "latitude": 45.700075267731705,
+      "longitude": 35.7467134571076
+    },
+    "expectedResults": {
+      "43906": null,
+      "43905": "+TL;C;TR"
+    }
   }
 
 ]

OsmAnd/src/net/osmand/plus/ContextMenuAdapter.java

@@ -1,7 +1,6 @@
 package net.osmand.plus;
 
 import android.app.Activity;
-import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.IdRes;
@@ -130,12 +129,6 @@ public class ContextMenuAdapter {
 				convertView.setTag(layoutId);
 			}
 			TextView tv = (TextView) convertView.findViewById(R.id.title);
-
-			if (item.isCategory()) {
-				tv.setTypeface(Typeface.DEFAULT_BOLD);
-			} else {
-				tv.setTypeface(null);
-			}
 			tv.setText(item.getTitle());
 
 			if (this.layoutId == R.layout.simple_list_menu_item) {

OsmAnd/src/net/osmand/plus/OsmandSettings.java

@@ -2531,7 +2531,7 @@ public class OsmandSettings {
 		AUTO(R.string.daynight_mode_auto, R.drawable.ic_action_map_sunst),
 		DAY(R.string.daynight_mode_day, R.drawable.ic_action_map_day),
 		NIGHT(R.string.daynight_mode_night, R.drawable.ic_action_map_night),
-		SENSOR(R.string.daynight_mode_sensor, R.drawable.ic_action_map_sunst);
+		SENSOR(R.string.daynight_mode_sensor, R.drawable.ic_action_map_light_sensor);
 
 		private final int key;
 		@DrawableRes