Merge branch 'master' of ssh://github.com/osmandapp/Osmand

OsmAnd/res/values-be/strings.xml

@@ -1998,4 +1998,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
     <string name="wake_on_voice_descr">Уключаць экран тэлефона пры набліжэньні да павароту</string>
     <string name="wake_on_voice_never">Ніколі</string>
     <string name="lock_screen_request_explanation">%1$s патрабуе дазвол на выключэньне экрану для энергазберажэньня.</string>
+    <string name="advanced_settings">Пашыраны</string>
 	</resources>

OsmAnd/res/values-ca/strings.xml

@@ -1933,4 +1933,5 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
     <string name="wake_on_voice_descr">Activa la pantalla del mòbil en aproximar-se a un gir</string>
     <string name="lock_screen_request_explanation">"%1$s necessita  aquest permís per la funcionalitat de posar la pantalla en mode d\'estalvi d\'energia."</string>
     <string name="wake_on_voice_never">Mai</string>
+    <string name="advanced_settings">Avançat</string>
 	</resources>

OsmAnd/res/values-da/strings.xml

@@ -1859,4 +1859,5 @@ Nogle af de centrale funktioner:
     <string name="wake_on_voice_descr">Tænd for skærmen når et sving nærmer sig</string>
     <string name="lock_screen_request_explanation">%1$s behøver denne tilladelse til at slukke for skærmen for strømbesparende funktion.</string>
     <string name="wake_on_voice_never">Aldrig</string>
+    <string name="advanced_settings">Avanceret</string>
 	</resources>

OsmAnd/res/values-fr/strings.xml

@@ -1860,4 +1860,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
     <string name="wake_on_voice_descr">Allumer l\'écran à l\'approche d\'une bifurcation</string>
     <string name="lock_screen_request_explanation">%1$s a besoin de cette permission pour éteindre l\'écran en mode économie d\'énergie.</string>
     <string name="wake_on_voice_never">Jamais</string>
+    <string name="advanced_settings">Avancé</string>
 	</resources>

OsmAnd/res/values-ko/strings.xml

@@ -2084,4 +2084,5 @@
     <string name="wake_on_voice_descr">교차로에 접근할 때 전화 화면 켜기</string>
     <string name="lock_screen_request_explanation">%1$의 절전 기능에 대한 화면을 해제 하려면 이 권한이 필요 합니다.</string>
     <string name="wake_on_voice_never">결코</string>
+    <string name="advanced_settings">고급</string>
 	</resources>

OsmAnd/res/values-sc/strings.xml

@@ -1780,4 +1780,5 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
     <string name="rendering_category_hide">Cua</string>
     <string name="wake_on_voice_never">Mai</string>
     <string name="lock_screen_request_explanation">%1$s tenet bisòngiu de custa autorizatzione pro istudare s\'ischermu pro sa funtzionalidade de rispàrmiu energèticu.</string>
+    <string name="advanced_settings">Avantzadu</string>
 	</resources>

OsmAnd/res/values-sk/strings.xml

@@ -2033,4 +2033,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
     <string name="rendering_category_hide">Skryť</string>
     <string name="lock_screen_request_explanation">%1$s potrebuje toto oprávnenie na vypnutie obrazovky pre šetrenie energiou.</string>
     <string name="wake_on_voice_never">Nikdy</string>
+    <string name="advanced_settings">Pokročilé</string>
 	</resources>

OsmAnd/res/values/strings.xml

@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+	<string name="advanced_settings">Advanced</string>
 	<string name="rendering_attr_publicTransportMode_name">Bus, trolleybus, shuttle routes</string>
 	<string name="rendering_attr_tramTrainRoutes_name">Tram and train routes</string>
 	<string name="rendering_attr_subwayMode_name">Subway routes</string>

OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java

@@ -348,8 +348,12 @@ public class MapActivityActions implements DialogProvider {
 						standardId == R.string.context_menu_item_destination_point) {
 					boolean dest = standardId == R.string.context_menu_item_destination_point;
 					String selected = mapActivity.getMapLayers().getContextMenuLayer().getSelectedObjectName();
+					String target = null;
+					if(dest && selected != null){
+						target = selected.replaceAll(getString(R.string.context_menu_item_destination_point), "");
+					}
 					targets.navigateToPoint(new LatLon(latitude, longitude), true, 
-							dest ? -1 : targets.getIntermediatePoints().size(), selected);
+							dest ? -1 : targets.getIntermediatePoints().size(), dest? target : selected);
 					if(targets.getIntermediatePoints().size() > 0) {
 						openIntermediatePointsDialog();
 					}
@@ -650,7 +654,7 @@ public class MapActivityActions implements DialogProvider {
 	}
 	
 	public void prepareConfigureMap() {
-		prepareOptionsMenu(new ConfigureMapMenu().createListAdapter(mapActivity));
+		prepareOptionsMenu(new ConfigureMapMenu().createListAdapter(mapActivity, true));
 	}
 
 	private ContextMenuAdapter createOptionsMenu() {

OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java

@@ -35,7 +35,7 @@ public class ConfigureMapMenu {
 
 	private boolean allModes = false;
 
-	public ContextMenuAdapter createListAdapter(final MapActivity ma) {
+	public ContextMenuAdapter createListAdapter(final MapActivity ma, final boolean advanced) {
 		ContextMenuAdapter adapter = new ContextMenuAdapter(ma, allModes);
 		adapter.setDefaultLayoutId(R.layout.drawer_list_item);
 		adapter.item(R.string.configure_map).icons(R.drawable.ic_back_drawer_dark, R.drawable.ic_back_drawer_white)
@@ -52,12 +52,26 @@ public class ConfigureMapMenu {
 			@Override
 			public void onClick(boolean result) {
 				allModes = true;
-				ma.getMapActions().prepareOptionsMenu(createListAdapter(ma));
+				ma.getMapActions().prepareOptionsMenu(createListAdapter(ma, advanced));
 			}
 		});
 
 		createLayersItems(adapter, ma);
+		if (!advanced){
+			adapter.item(R.string.btn_advanced_mode).icons(R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_light)
+					.selected(advanced ? 1 : 0)
+					.listen(new OnContextMenuClick() {
+						@Override
+						public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
+							ma.getMapActions().prepareOptionsMenu(createListAdapter(ma, isChecked));
+							return false;
+						}
+					}).reg();
+		}
+
+		if (advanced) {
 			createRenderingAttributeItems(adapter, ma);
+		}
 		return adapter;
 	}
 	
@@ -191,7 +205,7 @@ public class ConfigureMapMenu {
 						}
 						adapter.setItemDescription(pos, getRenderDescr(activity));
 						dialog.dismiss();
-						activity.getMapActions().prepareOptionsMenu(createListAdapter(activity));
+						activity.getMapActions().prepareOptionsMenu(createListAdapter(activity, true));
 					}
 
 				});

OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java

@@ -57,7 +57,7 @@ public class WaypointHelper {
 	public static final int FAVORITES = 3;
 	public static final int ALARMS = 4;
 	public static final int MAX = 5;
-	public static final int[] SEARCH_RADIUS_VALUES = {50, 100, 250, 500, 1000, 1500};
+	public static final int[] SEARCH_RADIUS_VALUES = {50, 100, 150, 250, 500, 1000, 1500};
 	
 	private List<List<LocationPointWrapper>> locationPoints = new ArrayList<List<LocationPointWrapper>>();
 	private ConcurrentHashMap<LocationPoint, Integer> locationPointsStates = new ConcurrentHashMap<LocationPoint, Integer>();